797 files changed, 88023 insertions, 104486 deletions

diff --git a/.asan-blacklist b/.asan-blacklist
deleted file mode 100644
index 63558170b3..0000000000
--- a/.asan-blacklist
+++ /dev/null
@@ -1,3 +0,0 @@
-# libuv queue.h pointer arithmetic is not accepted by asan
-fun:queue_node_data
-fun:dictwatcher_node_data
diff --git a/.ci/after_success.sh b/.ci/after_success.sh
index 580b988061..0215eb139b 100755
--- a/.ci/after_success.sh
+++ b/.ci/after_success.sh
@@ -3,8 +3,6 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
-  exit
+if [[ -n "${GCOV}" ]]; then
+  coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.'
 fi
-
-[ "$USE_GCOV" = on ] && { coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.' ; }
diff --git a/.ci/before_cache.sh b/.ci/before_cache.sh
index b5678bc20c..dd1fcf2bf7 100755
--- a/.ci/before_cache.sh
+++ b/.ci/before_cache.sh
@@ -3,12 +3,6 @@
 set -e
 set -o pipefail
 
-if [[ "${TRAVIS_OS_NAME}" != linux ]]; then
-  # Caches are only enabled for Travis's Linux container infrastructure,
-  # but this script is still executed on OS X.
-  exit
-fi
-
 # Don't cache pip's log and selfcheck.
 rm -rf "${HOME}/.cache/pip/log"
 rm -f "${HOME}/.cache/pip/selfcheck.json"
@@ -16,7 +10,7 @@ rm -f "${HOME}/.cache/pip/selfcheck.json"
 # Update the third-party dependency cache only if the build was successful.
 if [[ -f "${SUCCESS_MARKER}" ]]; then
   rm -rf "${HOME}/.cache/nvim-deps"
-  mv -T "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
+  mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
   touch "${CACHE_MARKER}"
   echo "Updated third-party dependencies (timestamp: $(stat -c '%y' "${CACHE_MARKER}"))."
 fi
diff --git a/.ci/before_install.sh b/.ci/before_install.sh
index 2a1ac05569..9aac37de12 100755
--- a/.ci/before_install.sh
+++ b/.ci/before_install.sh
@@ -11,18 +11,15 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew update
 fi
 
-echo "Upgrade Python 2's pip."
-pip2.7 install --user --upgrade pip
+echo "Upgrade Python 2 pip."
+pip2.7 -q install --user --upgrade pip
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   echo "Install Python 3."
   brew install python3
-  echo "Upgrade Python 3's pip."
-  pip3 install --user --upgrade pip
+  echo "Upgrade Python 3 pip."
+  pip3 -q install --user --upgrade pip
 else
-  # TODO: Replace with upgrade when Travis gets python3-pip package.
-  echo "Install pip for Python 3."
-  curl -sSL https://bootstrap.pypa.io/get-pip.py -o "${HOME}/get-pip.py"
-  # After this, pip in PATH will refer to Python 3's pip.
-  python3.3 "${HOME}/get-pip.py" --user --upgrade
+  echo "Upgrade Python 3 pip."
+  pip3 -q install --user --upgrade pip
 fi
diff --git a/.ci/before_script.sh b/.ci/before_script.sh
index 6babc582ea..4a75e89fbe 100755
--- a/.ci/before_script.sh
+++ b/.ci/before_script.sh
@@ -19,20 +19,16 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
   echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable."
   exit 1
 fi
-if [ "${BUILD_32BIT}" = ON ] && [ "${BUILD_MINGW}" = ON ]; then
-  >&2 echo "32-bit MinGW builds not supported."
-  exit 1
-fi
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   # Adds user to a dummy group.
   # That allows to test changing the group of the file by `os_fchown`.
   sudo dscl . -create /Groups/chown_test
   sudo dscl . -append /Groups/chown_test GroupMembership "${USER}"
-else
-  # Compile dependencies.
-  build_deps
 fi
 
+# Compile dependencies.
+build_deps
+
 rm -rf "${LOG_DIR}"
 mkdir -p "${LOG_DIR}"
diff --git a/.ci/build.bat b/.ci/build.bat
new file mode 100644
index 0000000000..87a171b994
--- /dev/null
+++ b/.ci/build.bat
@@ -0,0 +1,54 @@
+:: 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.
+echo on
+if "%CONFIGURATION%" == "MINGW_32" (
+  set ARCH=i686
+  set BITS=32
+) else (
+  set ARCH=x86_64
+  set BITS=64
+)
+:: We cannot have sh.exe in the PATH (MinGW)
+set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+set PATH=C:\msys64\mingw%BITS%\bin;C:\Windows\System32;C:\Windows;%PATH%
+:: The default cpack in the PATH is not CMake
+set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH%
+
+:: Build third-party dependencies
+C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" || goto :error
+C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils gperf" || goto :error
+
+:: Setup python (use AppVeyor system python)
+C:\Python27\python.exe -m pip install neovim || goto :error
+C:\Python35\python.exe -m pip install neovim || goto :error
+:: Disambiguate python3
+move c:\Python35\python.exe c:\Python35\python3.exe
+set PATH=C:\Python35;C:\Python27;%PATH%
+:: Sanity check
+python  -c "import neovim; print(str(neovim))" || goto :error
+python3 -c "import neovim; print(str(neovim))" || goto :error
+
+mkdir .deps
+cd .deps
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release ..\third-party\ || goto :error
+mingw32-make VERBOSE=1 || goto :error
+cd ..
+
+:: Build Neovim
+mkdir build
+cd build
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=gtest -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
+mingw32-make VERBOSE=1 || goto :error
+bin\nvim --version || goto :error
+
+:: Functional tests
+mingw32-make functionaltest VERBOSE=1 || goto :error
+
+:: Build artifacts
+cpack -G ZIP -C Release
+if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C Release
+
+goto :EOF
+:error
+exit /b %errorlevel%
diff --git a/.ci/common/build.sh b/.ci/common/build.sh
index 06bdab707f..5cf34935d6 100644
--- a/.ci/common/build.sh
+++ b/.ci/common/build.sh
@@ -2,9 +2,6 @@ build_deps() {
   if [[ "${BUILD_32BIT}" == ON ]]; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
-  if [[ "${BUILD_MINGW}" == ON ]]; then
-    DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_MINGW}"
-  fi
   if [[ "${FUNCTIONALTEST}" == "functionaltest-lua" ]]; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
@@ -14,10 +11,15 @@ build_deps() {
   # If there is a valid cache and we're not forced to recompile,
   # use cached third-party dependencies.
   if [[ -f "${CACHE_MARKER}" ]] && [[ "${BUILD_NVIM_DEPS}" != true ]]; then
-    echo "Using third-party dependencies from Travis's cache (last updated: $(stat -c '%y' "${CACHE_MARKER}"))."
+    if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+      local statcmd="stat -f '%Sm'"
+    else
+      local statcmd="stat -c '%y'"
+    fi
+    echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))."
 
      mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
-     mv -T "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
+     mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
   else
     mkdir -p "${DEPS_BUILD_DIR}"
   fi
@@ -26,7 +28,7 @@ build_deps() {
   # update CMake configuration and update to newer deps versions.
   cd "${DEPS_BUILD_DIR}"
   echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
-  cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
+  CC= cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
 
   if ! ${MAKE_CMD}; then
     exit 1
@@ -42,9 +44,6 @@ build_nvim() {
   if [[ "${BUILD_32BIT}" == ON ]]; then
     CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
-  if [[ "${BUILD_MINGW}" == ON ]]; then
-    CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_MINGW}"
-  fi
 
   mkdir -p "${BUILD_DIR}"
   cd "${BUILD_DIR}"
diff --git a/.ci/common/test.sh b/.ci/common/test.sh
index 225d88e072..dc59f4f793 100644
--- a/.ci/common/test.sh
+++ b/.ci/common/test.sh
@@ -49,11 +49,11 @@ asan_check() {
 }
 
 run_unittests() {
-  ${MAKE_CMD} unittest
+  ${MAKE_CMD} -C "${BUILD_DIR}" unittest
 }
 
 run_functionaltests() {
-  if ! ${MAKE_CMD} ${FUNCTIONALTEST}; then
+  if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then
     asan_check "${LOG_DIR}"
     valgrind_check "${LOG_DIR}"
     exit 1
@@ -63,7 +63,8 @@ run_functionaltests() {
 }
 
 run_oldtests() {
-  if ! make oldtest; then
+  ${MAKE_CMD} -C "${BUILD_DIR}" helptags
+  if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
     reset
     asan_check "${LOG_DIR}"
     valgrind_check "${LOG_DIR}"
@@ -83,8 +84,9 @@ install_nvim() {
     exit 1
   }
 
+  local genvimsynf=syntax/vim/generated.vim
   # Check that all runtime files were installed
-  for file in doc/tags syntax/vim/generated.vim $(
+  for file in doc/tags $genvimsynf $(
     cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
   ) ; do
     if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
@@ -93,6 +95,13 @@ install_nvim() {
     fi
   done
 
+  # Check that generated syntax file has function names, #5060.
+  local gpat='syn keyword vimFuncName .*eval'
+  if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then
+    echo "It appears that $genvimsynf does not contain $gpat."
+    exit 1
+  fi
+
   for file in $(
     cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
   ) ; do
diff --git a/.ci/install.sh b/.ci/install.sh
index fb5d1c09c1..98d3dc01cb 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -9,24 +9,15 @@ fi
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   brew install gettext
-elif [[ "${BUILD_MINGW}" == ON ]]; then
-  # TODO: When Travis gets a recent version of Mingw-w64 use packages:
-  # binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64-dev mingw-w64-tools
-
-  echo "Downloading MinGW..."
-  curl -sSL "https://github.com/neovim/deps/raw/master/opt/i686-w64-mingw32-gcc-4.8.0-linux64_rubenvb.tar.xz" \
-    | tar xJf - -C "${HOME}/.local"
-  
+  brew reinstall -s libtool
 fi
 
-# Set CC to default to avoid compilation problems
-# when installing Python modules.
+# Use default CC to avoid compilation problems when installing Python modules.
 echo "Install neovim module and coveralls for Python 2."
-CC=cc pip2.7 install --user --upgrade neovim cpp-coveralls
+CC=cc pip2.7 -q install --user --upgrade neovim cpp-coveralls
 
 echo "Install neovim module for Python 3."
-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  CC=cc pip3 install --user --upgrade neovim
-else
-  CC=cc pip3.3 install --user --upgrade neovim
-fi
+CC=cc pip3 -q install --user --upgrade neovim
+
+echo "Install neovim RubyGem."
+gem install --no-document --version ">= 0.2.0" neovim
diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh
index 656ea16e37..d542a2f121 100755
--- a/.ci/run_tests.sh
+++ b/.ci/run_tests.sh
@@ -3,14 +3,6 @@
 set -e
 set -o pipefail
 
-# TODO: Stop here for MinGW builds,
-#       building Neovim doesn't work yet.
-if [[ "${BUILD_MINGW}" == ON ]]; then
-  echo "Neovim doesn't build on MinGW yet; stopping build."
-  touch "${SUCCESS_MARKER}"
-  exit
-fi
-
 CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
diff --git a/.ci/script.sh b/.ci/script.sh
index c3c7b8dfa9..46c4eecf38 100755
--- a/.ci/script.sh
+++ b/.ci/script.sh
@@ -12,9 +12,6 @@ fi
 # as $USER, while retaining the environment variables defined and belonging
 # to secondary groups given above in usermod.
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  # Set up precompiled third-party dependencies.
-  eval "$(curl -Ss https://raw.githubusercontent.com/neovim/bot-ci/master/scripts/travis-setup.sh) deps-x64"
-
   sudo -E su "${USER}" -c ".ci/run_tests.sh"
 else
   .ci/run_tests.sh
diff --git a/.gitignore b/.gitignore
index ccb2299582..3fb3d62517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ tags
 # Files generated by the tests
 /src/nvim/testdir/del
 /src/nvim/testdir/test*.out
+/src/nvim/testdir/test*.res
 /src/nvim/testdir/test.log
 /src/nvim/testdir/messages
 /src/nvim/testdir/viminfo
@@ -42,27 +43,12 @@ tags
 # luarocks, not added as a subtree because of the large number of blobs
 /third-party/luarocks
 
-# luajit files
-/third-party/luajit/src/host/buildvm
-/third-party/luajit/src/host/buildvm_arch.h
-/third-party/luajit/src/host/minilua
-/third-party/luajit/src/jit/vmdef.lua
-/third-party/luajit/src/libluajit.a
-/third-party/luajit/src/lj_bcdef.h
-/third-party/luajit/src/lj_ffdef.h
-/third-party/luajit/src/lj_folddef.h
-/third-party/luajit/src/lj_libdef.h
-/third-party/luajit/src/lj_recdef.h
-/third-party/luajit/src/lj_vm.s
-/third-party/luajit/src/luajit
-
 # local make targets
 local.mk
 
 # runtime/doc
 /runtime/doc/*.html
 /runtime/doc/tags.ref
-/runtime/doc/doctags
 /runtime/doc/errors.log
 
 # clint errors, generated by `make lint`
diff --git a/.travis.yml b/.travis.yml
index 985a5c5381..0baf3feb74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 sudo: false
 language: c
 
@@ -8,10 +9,8 @@ env:
     # Travis has 1.5 virtual cores according to
     # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM
     - MAKE_CMD="make -j2"
-    # Update PATH for pip and MinGW.
-    - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$HOME/.local/mingw32/bin:$PATH"
-    # LLVM symbolizer path.
-    - LLVM_SYMBOLIZER="$(which llvm-symbolizer-3.6)"
+    # Update PATH for pip.
+    - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:/usr/lib/llvm-symbolizer-3.8/bin:$PATH"
     # Build directory for Neovim.
     - BUILD_DIR="$TRAVIS_BUILD_DIR/build"
     # Build directory for third-party dependencies.
@@ -34,14 +33,10 @@ env:
     - CMAKE_FLAGS_32BIT="-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32
                          -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib
                          -DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/i386-linux-gnu.toolchain.cmake"
-    # Additional CMake flags for MinGW builds.
-    - CMAKE_FLAGS_MINGW="-DCMAKE_TOOLCHAIN_FILE=$TRAVIS_BUILD_DIR/cmake/mingw32-w64-cross-travis.toolchain.cmake"
     # Environment variables for Clang sanitizers.
     - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan"
-    - ASAN_SYMBOLIZER_PATH="$LLVM_SYMBOLIZER"
-    - MSAN_SYMBOLIZER_PATH="$LLVM_SYMBOLIZER"
-    - TSAN_OPTIONS="external_symbolizer_path=$LLVM_SYMBOLIZER log_path=$LOG_DIR/tsan"
-    - UBSAN_OPTIONS="log_path=$LOG_DIR/ubsan"
+    - TSAN_OPTIONS="log_path=$LOG_DIR/tsan"
+    - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan"
     # Environment variables for Valgrind.
     - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log"
     # Cache marker for third-party dependencies cache.
@@ -62,6 +57,7 @@ matrix:
       env: CI_TARGET=lint
     - os: linux
       compiler: gcc-5
+      env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
     - os: linux
       compiler: gcc-5
       env: FUNCTIONALTEST=functionaltest-lua
@@ -72,24 +68,20 @@ matrix:
       compiler: gcc-5 -m32
       env: BUILD_32BIT=ON
     - os: linux
-      compiler: clang-3.6
-      env: GCOV=llvm-cov-3.6 CLANG_SANITIZER=ASAN_UBSAN CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+      compiler: clang-3.8
+      env: CLANG_SANITIZER=ASAN_UBSAN
     - os: linux
-      compiler: clang-3.6
-      env: CLANG_SANITIZER=MSAN
-    - os: linux
-      compiler: clang-3.6
+      compiler: clang-3.8
       env: CLANG_SANITIZER=TSAN
     - os: osx
       compiler: clang
+      osx_image: xcode7.3  # macOS 10.11
     - os: osx
       compiler: gcc-4.9
-    - os: linux
-      env: BUILD_MINGW=ON
-  fast_finish: true
+      osx_image: xcode7.3  # macOS 10.11
   allow_failures:
-    # TODO: Remove when all MSan errors have been fixed.
-    - env: CLANG_SANITIZER=MSAN
+    - env: GCOV=gcov-5 CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+  fast_finish: true
 
 before_install: .ci/before_install.sh
 install:        .ci/install.sh
@@ -101,16 +93,15 @@ after_success:  .ci/after_success.sh
 addons:
   apt:
     sources:
-      # TODO: Remove PPA when Travis gets Python >=3.3.
-      - deadsnakes
-      - llvm-toolchain-precise-3.6
       - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise-3.8
     packages:
       - autoconf
       - automake
       - build-essential
-      - clang-3.6
+      - clang-3.8
       - cmake
+      - cscope
       - g++-5-multilib
       - g++-multilib
       - gcc-5-multilib
@@ -118,9 +109,8 @@ addons:
       - gdb
       - libc6-dev-i386
       - libtool
-      - llvm-3.6-dev
+      - llvm-3.8-dev
       - pkg-config
-      - python3.3-dev
       - unzip
       - valgrind
       - xclip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 317d2a1a5b..7fdbad8fca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,9 @@ endif()
 # Point CMake at any custom modules we may ship
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
+# We don't support building in-tree.
+include(PreventInTreeBuilds)
+
 # Prefer our bundled versions of dependencies.
 set(DEPS_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/.deps/usr" CACHE PATH "Path prefix for finding dependencies")
 if(CMAKE_CROSSCOMPILING AND NOT UNIX)
@@ -39,8 +42,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
   endif()
+endif()
 
-  # Enable fixing case-insensitive filenames for Mac.
+if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+  # Enable fixing case-insensitive filenames for Windows and Mac.
   set(USE_FNAME_CASE TRUE)
 endif()
 
@@ -56,12 +61,17 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
   STRINGS "Debug" "Dev" "Release" "MinSizeRel" "RelWithDebInfo")
 
 # If not in a git repo (e.g., a tarball) these tokens define the complete
-# version string, else it is combined with the result of `git describe`.
+# version string, else they are combined with the result of `git describe`.
 set(NVIM_VERSION_MAJOR 0)
-set(NVIM_VERSION_MINOR 1)
-set(NVIM_VERSION_PATCH 5)
+set(NVIM_VERSION_MINOR 2)
+set(NVIM_VERSION_PATCH 0)
 set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers
 
+# API level
+set(NVIM_API_LEVEL 1)         # Bump this after any API change.
+set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
+set(NVIM_API_PRERELEASE false)
+
 file(TO_CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR}/.git FORCED_GIT_DIR)
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC NVIM_VERSION_COMMIT)
@@ -247,12 +257,15 @@ if(HAS_DIAG_COLOR_FLAG)
   add_definitions(-fdiagnostics-color=auto)
 endif()
 
-option(
-  TRAVIS_CI_BUILD "Travis CI build.  Extra compilation flags will be set." OFF)
+option(TRAVIS_CI_BUILD "Travis/QuickBuild CI. Extra flags will be set." OFF)
 
 if(TRAVIS_CI_BUILD)
-  message(STATUS "Travis CI build enabled.")
+  message(STATUS "Travis/QuickBuild CI build enabled.")
   add_definitions(-Werror)
+  if(DEFINED ENV{BUILD_32BIT})
+    # Get some test coverage for unsigned char
+    add_definitions(-funsigned-char)
+  endif()
 endif()
 
 if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -291,20 +304,25 @@ endif()
 include_directories("${PROJECT_BINARY_DIR}/config")
 include_directories("${PROJECT_SOURCE_DIR}/src")
 
-# Modules used by platform auto-detection
-include(CheckLibraryExists)
-
 find_package(LibUV REQUIRED)
 include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})
 
 find_package(Msgpack 1.0.0 REQUIRED)
 include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})
 
-find_package(Unibilium REQUIRED)
-include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS})
+if(UNIX)
+  option(FEAT_TUI "Enable the Terminal UI" ON)
+else()
+  option(FEAT_TUI "Enable the Terminal UI" OFF)
+endif()
+
+if(FEAT_TUI)
+  find_package(Unibilium REQUIRED)
+  include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS})
 
-find_package(LibTermkey REQUIRED)
-include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
+  find_package(LibTermkey REQUIRED)
+  include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
+endif()
 
 find_package(LibVterm REQUIRED)
 include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})
@@ -323,7 +341,12 @@ 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()
 
-option(ENABLE_JEMALLOC "enable jemalloc" ON)
+if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD|FreeBSD")
+  message(STATUS "detected OpenBSD/FreeBSD; disabled jemalloc. #5318")
+  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)
@@ -366,7 +389,7 @@ endforeach()
 include(LuaHelpers)
 set(LUA_DEPENDENCIES lpeg mpack bit)
 if(NOT LUA_PRG)
-  foreach(CURRENT_LUA_PRG luajit lua)
+  foreach(CURRENT_LUA_PRG luajit lua5.1 lua5.2 lua)
     # If LUA_PRG is set find_program() will not search
     unset(LUA_PRG CACHE)
     unset(LUA_PRG_WORKS)
@@ -390,14 +413,20 @@ endif()
 message(STATUS "Using the Lua interpreter ${LUA_PRG}.")
 
 # Setup busted.
-find_program(BUSTED_PRG busted)
+find_program(BUSTED_PRG NAMES busted busted.bat)
 find_program(BUSTED_LUA_PRG busted-lua)
 if(NOT BUSTED_OUTPUT_TYPE)
-  set(BUSTED_OUTPUT_TYPE "utfTerminal")
+  if(WIN32)
+    set(BUSTED_OUTPUT_TYPE "plainTerminal")
+  else()
+    set(BUSTED_OUTPUT_TYPE "utfTerminal")
+  endif()
 endif()
 
 find_program(LUACHECK_PRG luacheck)
 
+find_program(GPERF_PRG gperf)
+
 include(InstallHelpers)
 
 file(GLOB MANPAGES
@@ -461,7 +490,10 @@ if(BUSTED_PRG)
     ${CMAKE_BINARY_DIR}/test/config/paths.lua)
 
   set(UNITTEST_PREREQS nvim-test unittest-headers)
-  set(FUNCTIONALTEST_PREREQS nvim tty-test shell-test)
+  set(FUNCTIONALTEST_PREREQS nvim printargs-test shell-test)
+  if(NOT WIN32)
+    list(APPEND FUNCTIONALTEST_PREREQS tty-test)
+  endif()
   set(BENCHMARK_PREREQS nvim tty-test)
 
   # Useful for automated build systems, if they want to manually run the tests.
@@ -485,6 +517,7 @@ 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})
@@ -496,12 +529,14 @@ if(BUSTED_PRG)
   add_custom_target(functionaltest
     COMMAND ${CMAKE_COMMAND}
       -DBUSTED_PRG=${BUSTED_PRG}
+      -DLUA_PRG=${LUA_PRG}
       -DNVIM_PRG=$<TARGET_FILE:nvim>
       -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
       -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})
@@ -509,12 +544,14 @@ if(BUSTED_PRG)
   add_custom_target(benchmark
     COMMAND ${CMAKE_COMMAND}
       -DBUSTED_PRG=${BUSTED_PRG}
+      -DLUA_PRG=${LUA_PRG}
       -DNVIM_PRG=$<TARGET_FILE:nvim>
       -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
       -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})
@@ -524,12 +561,14 @@ if(BUSTED_LUA_PRG)
   add_custom_target(functionaltest-lua
     COMMAND ${CMAKE_COMMAND}
       -DBUSTED_PRG=${BUSTED_LUA_PRG}
+      -DLUA_PRG=${LUA_PRG}
       -DNVIM_PRG=$<TARGET_FILE:nvim>
       -DWORKING_DIR=${CMAKE_CURRENT_SOURCE_DIR}
       -DBUSTED_OUTPUT_TYPE=${BUSTED_OUTPUT_TYPE}
       -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})
@@ -540,6 +579,7 @@ if(LUACHECK_PRG)
     COMMAND ${CMAKE_COMMAND}
       -DLUACHECK_PRG=${LUACHECK_PRG}
       -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
+      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
       -P ${PROJECT_SOURCE_DIR}/cmake/RunTestsLint.cmake)
 endif()
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1787a4322b..f7389ece75 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,162 +1,124 @@
 # Contributing to Neovim
 
-## Getting started
-
-- Help us review [open pull requests](https://github.com/neovim/neovim/pulls)!
-- Look for [entry-level issues][entry-level] to work on.
-    - [Documentation](https://github.com/neovim/neovim/labels/documentation)
-      improvements are also much appreciated.
-- Look at [Waffle][waffle] to see who is working on what issues.
-- If needed, refer to [the wiki][wiki-contributing] for guidance.
-
-## Reporting problems
-
-Before reporting an issue, see the following wiki articles:
-
-- [Troubleshooting][wiki-troubleshooting]
-- [Frequently asked questions][wiki-faq]
-
-If your issue isn't mentioned there:
-
-- Verify that it hasn't already been reported.
-- If not already running the latest version of Neovim, update to it to see if
-  your problem persists.
-- If you're experiencing compile or runtime warnings/failures, try searching for
-  the error message(s) you received (if any) on [Neovim's issue tracker][github-issues].
-- For runtime issues, try reproducing it using `nvim` with the smallest
-  possible `vimrc` (or none at all via `nvim -u NONE`), to rule out bugs in
-  plugins you're using. If you're using a plugin manager, comment out your
-  plugins, then add them back in one by one.
-
-Include as much detail as possible; we generally need to know:
-
-- What operating system you're using.
-- Which version of Neovim you're using. To get this, run `nvim --version` from
-  a shell, or run `:version` from inside `nvim`.
-- Whether the bug is present in Vim (not Neovim), and if so which version of
-  Vim. It's fine to report Vim bugs on the Neovim bug tracker, but it saves
-  everyone time if we know from the start that the bug is not a regression
-  caused by Neovim.
-- This isn't required, but what commit introduced the issue for you. You can
-  use [`git bisect`][git-bisect] for this.
-
-## Submitting contributions
-
-- Make it clear in the issue tracker what you are working on.
-- Be descriptive in your pull request description: what is it for, why is it
-  needed, etc.
-- Do ***not*** make cosmetic changes to unrelated files in the same pull
-  request. This creates noise, making reviews harder to do. If your text
-  editor strips all trailing whitespace in a file when you edit it, disable
-  it.
-
-### Tagging in the issue tracker
-
-When submitting pull requests (commonly referred to as "PRs"), include one of
-the following tags prepended to the title:
-
-- `[WIP]` - Work In Progress: the PR will change, so while there is no
-  immediate need for review, the submitter still might appreciate it.
-- `[RFC]` - Request For Comment: the PR needs reviewing and/or comments.
-- `[RDY]` - Ready: the PR has been reviewed by at least one other person and
-  has no outstanding issues.
-
-Assuming the above criteria has been met, feel free to change your PR's tag
-yourself, as opposed to waiting for a contributor to do it for you.
-
-### Branching & history
-
-- Do ***not*** work on your PR on the master branch, [use a feature branch
-  instead][git-feature-branch].
-- [Rebase your feature branch onto][git-rebasing] (upstream) master before
+Getting started
+---------------
+
+If you want to help but don't know where to start, here are some
+low-risk/isolated tasks:
+
+- Help us [review pull requests](#reviewing)!
+- Merge a [Vim patch].
+- Try a [complexity:low] issue.
+- Fix [clang-scan] or [coverity](#coverity) warnings.
+
+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.
+- If you're using a plugin manager, comment out your plugins, then add them back
+  in one by one, to narrow down the cause of the issue.
+- Crash reports which include a stacktrace are 10x more valuable.
+- [Bisecting][git-bisect] to the cause of a regression often leads to an
+  immediate fix.
+
+Pull requests ("PRs")
+---------------------
+
+- To avoid duplicate work, you may want to create a `[WIP]` pull request so that
+  others know what you are working on.
+- Avoid cosmetic changes to unrelated files in the same commit: extra noise
+  makes reviews more difficult.
+- Use a [feature branch][git-feature-branch] instead of the master branch.
+- [Rebase your feature branch][git-rebasing] onto (upstream) master before
   opening the PR.
-- Keep up to date with changes in (upstream) master so your PR is easy to
-  merge.
-- [Try to actively tidy your history][git-history-rewriting]: combine related
-  commits with interactive rebasing, separate monolithic commits, etc. If your
-  PR is still `[WIP]`, feel free to force-push to your feature branch to tidy
-  your history.
-
-### For code pull requests
-
-#### Testing
-
-We are unlikely to merge your PR if the Travis build fails:
-
-- Travis builds are compiled with the [`-Werror`][gcc-warnings] flag, so if
-  your PR introduces any compiler warnings then the Travis build will fail.
-- If any tests fail, the Travis build will fail.
-  See [Building Neovim#running-tests][wiki-building-running-tests] for
-  information on running tests locally.
-  Tests passing locally doesn't guarantee they'll pass in the Travis
-  build, as different compilers and platforms will be used.
-- Travis runs [Valgrind][valgrind] for the GCC/Linux build, but you may also
-  do so locally by running the following from a shell: `VALGRIND=1 make test`
-
-#### Coding style
-
-We have a [style guide][style-guide] that all new code should follow.
-However, large portions of the existing Vim codebase violate it to some
-degree, and fixing them would increase merge conflicts and add noise to `git
-blame`.
-
-Weigh those costs when making cosmetic changes. In general, avoid pull
-requests dominated by style changes, but feel free to fix up lines that you
-happen to be modifying anyway. Fix anything that looks outright
-[barbarous](http://www.orwell.ru/library/essays/politics/english/e_polit), but
-otherwise prefer to leave things as they are.
-
-For new code, run `make lint` (which runs [clint.py][clint]) to detect style
-errors. It's not perfect, so some warnings may be false positives/negatives.
-To have `clint.py` ignore certain cases, put `// NOLINT` at the end of the
-line.
-
-We also provide a configuration file for [`clang-format`][clang-format], which
-can be used to format code according to the style guidelines. Be aware that
-this formatting method might need user supervision. To have `clang-format`
-ignore certain line ranges, use the following special comments:
-
-```c
-int formatted_code;
-// clang-format off
-    void    unformatted_code  ;
-// clang-format on
-    void formatted_code_again;
-```
-
-### Commit guidelines
-
-The purpose of these guidelines is to *make reviews easier* and make the
-[VCS][vcs] logs more valuable.
+- After addressing the review comments, it's fine to rebase and force-push to
+  your review.
+- Try to [tidy your history][git-history-rewriting]: combine related commits
+  with interactive rebasing, separate monolithic commits, etc.
+
+### Stages: WIP, RFC, RDY
+
+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]`.
+
+### Commit messages
+
+Follow [commit message hygiene][hygiene] to *make reviews easier* and to make
+the VCS/git logs more valuable.
 
 - Try to keep the first line under 72 characters.
-- If necessary, include further description after a blank line.
-    - Don't make the description too verbose by including obvious things, but
-      don't spare clarifications for anything that may be not so obvious.
-      Some commit messages are pages long, and that's fine if there's no
-      better place for those comments to live.
-    - **Recommended:** Prefix logically-related commits with a consistent
-      identifier in each commit message. For already used identifiers, see the
-      commit history for the respective file(s) you're editing.
-      [For example](https://github.com/neovim/neovim/commits?author=elmart),
-      the following commits are related by task (*Introduce nvim namespace*) and
-      sub-task (*Contrib YCM*).
-      <br/> `Introduce nvim namespace: Contrib YCM: Fix style issues`
-      <br/> `Introduce nvim namespace: Contrib YCM: Fix build dir calculation`
-        - Sub-tasks can be *activity-oriented* (doing different things on the same area)
-          or *scope-oriented* (doing the same thing in different areas).
-    - Granularity helps, but it's conceptual size that matters, not extent size.
-- Use the [imperative voice][imperative]: "Fix bug" rather than "Fixed bug" or "Fixes bug."
-
-### Reviewing pull requests
-
-Using a checklist during reviews is highly recommended, so we [provide one at
-the wiki][wiki-review-checklist]. If you think it could be improved, feel free
-to edit it.
+- **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`.
+- 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 ([travis CI] and [quickbuild]).
+
+- CI builds are compiled with [`-Werror`][gcc-warnings], so if your PR
+  introduces any compiler warnings, the build will fail.
+- If any tests fail, the build will fail.
+  See [Building Neovim#running-tests][wiki-run-tests] to run tests locally.
+  Passing locally doesn't guarantee passing the CI build, because of the
+  different compilers and platforms tested against.
+- CI runs [ASan] and other analyzers. To run valgrind locally:
+  `VALGRIND=1 make test`
+- 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.
+- [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350)
+
+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
+
+
+### Coverity
+
+[Coverity](https://scan.coverity.com/projects/neovim-neovim) runs against the
+master build. If you want to view the defects, just request access at the
+_Contributor_ level. An Admin will grant you permission.
+
+Use this commit-message format for coverity fixes:
+
+    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).
+
+Reviewing
+---------
+
+To help review pull requests, start with [this checklist][review-checklist].
 
 Reviewing can be done on GitHub, but you may find it easier to do locally.
-Using [`hub`][hub], you can do the following to create a new branch with the
-contents of a pull request, such as [#1820][github-pr-1820]:
+Using [`hub`][hub], you can create a new branch with the contents of a pull
+request, e.g. [#1820][1820]:
 
     hub checkout https://github.com/neovim/neovim/pull/1820
 
@@ -165,12 +127,6 @@ commits in the feature branch which aren't in the `master` branch; `-p`
 shows each commit's diff. To show the whole surrounding function of a change
 as context, use the `-W` argument as well.
 
-You may find it easier to instead use an interactive program for code reviews,
-such as [`tig`][tig].
-
-[clang-format]: http://clang.llvm.org/docs/ClangFormat.html
-[clint]: clint.py
-[entry-level]: https://github.com/neovim/neovim/issues?labels=entry-level&state=open
 [gcc-warnings]: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 [git-bisect]: http://git-scm.com/book/tr/v2/Git-Tools-Debugging-with-Git
 [git-feature-branch]: https://www.atlassian.com/git/tutorials/comparing-workflows
@@ -178,16 +134,17 @@ such as [`tig`][tig].
 [git-history-rewriting]: http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
 [git-rebasing]: http://git-scm.com/book/en/v2/Git-Branching-Rebasing
 [github-issues]: https://github.com/neovim/neovim/issues
-[github-pr-1820]: https://github.com/neovim/neovim/pull/1820
+[1820]: https://github.com/neovim/neovim/pull/1820
 [hub]: https://hub.github.com/
-[imperative]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+[hygiene]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 [style-guide]: http://neovim.io/develop/style-guide.xml
-[tig]: https://github.com/jonas/tig
-[valgrind]: http://valgrind.org/
-[vcs]: https://en.wikipedia.org/wiki/Revision_control
-[waffle]: https://waffle.io/neovim/neovim
-[wiki-building-running-tests]: https://github.com/neovim/neovim/wiki/Building-Neovim#running-tests
-[wiki-contributing]: https://github.com/neovim/neovim/wiki/Contributing
+[ASan]: http://clang.llvm.org/docs/AddressSanitizer.html
+[wiki-run-tests]: https://github.com/neovim/neovim/wiki/Building-Neovim#running-tests
 [wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ
-[wiki-review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
-[wiki-troubleshooting]: https://github.com/neovim/neovim/wiki/Troubleshooting
+[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
+[Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
+[clang-scan]: https://neovim.io/doc/reports/clang/
+[complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index d9fd758177..011739396d 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
-- Neovim version:
-- [ ] Vim behaves differently? Vim version:
+- `nvim --version`:
+- Vim (version: ) behaves differently?
 - Operating system/version:
 - Terminal name/version:
 - `$TERM`:
diff --git a/Makefile b/Makefile
index 9d01347989..4696131cc2 100644
--- a/Makefile
+++ b/Makefile
@@ -85,11 +85,11 @@ endif
 	mkdir -p build
 	touch $@
 
-oldtest: | nvim tags
+oldtest: | nvim helptags
 	+$(SINGLE_MAKE) -C src/nvim/testdir $(MAKEOVERRIDES)
 
-tags: | nvim
-	+$(BUILD_CMD) -C build runtime/doc/tags
+helptags: | nvim
+	+$(BUILD_CMD) -C build helptags
 
 functionaltest: | nvim
 	+$(BUILD_CMD) -C build functionaltest
@@ -111,6 +111,7 @@ test: functionaltest unittest
 clean:
 	+test -d build && $(BUILD_CMD) -C build clean || true
 	$(MAKE) -C src/nvim/testdir clean
+	$(MAKE) -C runtime/doc clean
 
 distclean: clean
 	rm -rf .deps build
@@ -119,7 +120,7 @@ install: | nvim
 	+$(BUILD_CMD) -C build install
 
 clint:
-	cmake -DLINT_PRG=./clint.py \
+	cmake -DLINT_PRG=./src/clint.py \
 		-DLINT_DIR=src \
 		-DLINT_SUPPRESS_URL="$(DOC_DOWNLOAD_URL_BASE)$(CLINT_ERRORS_FILE_PATH)" \
 		-P cmake/RunLint.cmake
diff --git a/README.md b/README.md
index c6f668c425..990bcfcb27 100644
--- a/README.md
+++ b/README.md
@@ -1,61 +1,59 @@
-![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo.png)
+[![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo.png)](https://neovim.io)
 
-[Website](http://neovim.io) |
-[Community](http://neovim.io/community/) |
 [Wiki](https://github.com/neovim/neovim/wiki) |
-[Documentation](http://neovim.io/doc) |
-[Mailing List](https://groups.google.com/forum/#!forum/neovim) |
-[Twitter](http://twitter.com/Neovim) |
-[Bountysource](https://www.bountysource.com/teams/neovim)
+[Documentation](https://neovim.io/doc) |
+[Twitter](https://twitter.com/Neovim) |
+[Community](https://neovim.io/community/) |
+[Gitter **Chat**](https://gitter.im/neovim/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/cf1jwc29198748we/branch/master?svg=true)](https://ci.appveyor.com/project/neovim/neovim/branch/master)
+[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/urdqjrik5u521fac/branch/master?svg=true)](https://ci.appveyor.com/project/neovim/neovim/branch/master)
 [![Pull requests waiting for review](https://badge.waffle.io/neovim/neovim.svg?label=RFC&title=RFCs)](https://waffle.io/neovim/neovim)
 [![Coverage Status](https://img.shields.io/coveralls/neovim/neovim.svg)](https://coveralls.io/r/neovim/neovim)
 [![Coverity Scan Build](https://scan.coverity.com/projects/2227/badge.svg)](https://scan.coverity.com/projects/2227)
-[![Clang Scan Build](http://neovim.io/doc/reports/clang/badge.svg)](http://neovim.io/doc/reports/clang)
-[![Join the chat at https://gitter.im/neovim/neovim](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/neovim/neovim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Clang Scan Build](https://neovim.io/doc/reports/clang/badge.svg)](https://neovim.io/doc/reports/clang)
+<a href="https://buildd.debian.org/neovim"><img src="https://www.debian.org/logos/openlogo-nd-25.png" width="13" height="15">Debian</a>
 
 Neovim is a project that seeks to aggressively refactor Vim in order to:
 
-- Simplify maintenance and encourage [contributions](https://github.com/neovim/neovim/wiki/Contributing)
+- Simplify maintenance and encourage [contributions](CONTRIBUTING.md)
 - Split the work between multiple developers
-- Enable the implementation of new/modern user interfaces without any
-  modifications to the core source
+- Enable advanced [external UIs] without modifications to the core
 - Improve extensibility with a new [plugin architecture](https://github.com/neovim/neovim/wiki/Plugin-UI-architecture)
 
-For lots more details, see
+For more details, see
 [the wiki](https://github.com/neovim/neovim/wiki/Introduction)!
 
-### What's been done so far
+[![Throughput Graph](https://graphs.waffle.io/neovim/neovim/throughput.svg)](https://waffle.io/neovim/neovim/metrics)
+
+What's been done so far
+-----------------------
 
-- Automatic [history merge](https://github.com/neovim/neovim/pull/2506) between multiple editor instances
-- [XDG-compliant](https://github.com/neovim/neovim/pull/3470) configuration
+- RPC API based on [MessagePack](https://msgpack.org)
 - Embedded [terminal emulator](https://neovim.io/doc/user/nvim_terminal_emulator.html)
 - Asynchronous [job control](https://github.com/neovim/neovim/pull/2247)
-- [MessagePack](https://msgpack.org) remote API
-- [Pushdown automaton](https://github.com/neovim/neovim/pull/3413) for state transitions
-
-See the [progress page](https://github.com/neovim/neovim/wiki/Progress) for a comprehensive list.
+- [Shared data (shada)](https://github.com/neovim/neovim/pull/2506) among multiple editor instances
+- [XDG base directories](https://github.com/neovim/neovim/pull/3470) support
+- [libuv](https://github.com/libuv/libuv/)-based platform/OS/"mch" layer
+- [Pushdown automaton](https://github.com/neovim/neovim/pull/3413) input model
+- 1000s of new tests
+- Legacy tests converted to Lua tests
 
-[![Throughput Graph](https://graphs.waffle.io/neovim/neovim/throughput.svg)](https://waffle.io/neovim/neovim/metrics)
+See [`:help nvim-features`][nvim-features] for a comprehensive list.
 
-### What's being worked on now
+What's being worked on now
+--------------------------
 
-- Port all IO to [libuv](https://github.com/libuv/libuv/blob/master/README.md)
-- Convert legacy tests to Lua tests
-- VimL => Lua translator
+See the [Roadmap].
 
-### How do I get it?
+How do I get it?
+----------------
 
-There is a formula for OSX/homebrew, a PKGBUILD for Arch Linux, RPM, deb, and
+There is a Debian package, homebrew formula, PKGBUILD for Arch Linux, RPM, and
 more. See [the wiki](https://github.com/neovim/neovim/wiki/Installing-Neovim)!
 
-### Contributing
-
-...would be awesome! See [the wiki](https://github.com/neovim/neovim/wiki/Contributing) for more details.
-
-### License
+License
+-------
 
 Neovim is licensed under the terms of the Apache 2.0 license, except for
 parts that were contributed under the Vim license.
@@ -81,5 +79,8 @@ See `LICENSE` for details.
     features.  The money goes to Uganda anyway.
 
 [license-commit]: https://github.com/neovim/neovim/commit/b17d9691a24099c9210289f16afb1a498a89d803
+[nvim-features]: https://neovim.io/doc/user/vim_diff.html#nvim-features
+[Roadmap]: https://neovim.io/roadmap/
+[external UIs]: https://github.com/neovim/neovim/wiki/Related-projects#gui-projects
 
 <!-- vim: set tw=80: -->
diff --git a/appveyor.yml b/appveyor.yml
index c5a768cb41..eb3064c3b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,23 +1,10 @@
 version: '{build}'
-skip_tags: true
-os: Windows Server 2012 R2
-environment:
-  GYP_MSVS_VERSION: 2015
-  matrix:
-  - GENERATOR: Visual Studio 14 Win64
-    DEPS_PATH: deps64
-  - GENERATOR: Visual Studio 14
-    DEPS_PATH: deps32
-matrix:
-  # Allow builds to fail
-  allow_failures:
-  - os: Windows Server 2012 R2
+configuration:
+- MINGW_64
+- MINGW_32
 install: []
 build_script:
-# See http://help.appveyor.com/discussions/problems/539-cloning-gyp-fails
-- git config --global url."http://".insteadOf https://
-- mkdir %DEPS_PATH%
-- cd %DEPS_PATH%
-- cmake -G "%GENERATOR%" ..\third-party\
-- cmake --build .
-- cd ..
+- call .ci\build.bat
+artifacts:
+- path: build/Neovim.zip
+- path: build/bin/nvim.exe
diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake
index 015737d658..8881a34332 100644
--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
@@ -42,7 +42,12 @@ if(MSGPACK_USE_STATIC)
     "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
 endif()
 
-list(APPEND MSGPACK_NAMES msgpackc msgpack)
+if(MSVC)
+  # The import library for the msgpack DLL has a different name
+  list(APPEND MSGPACK_NAMES msgpack_import)
+else()
+  list(APPEND MSGPACK_NAMES msgpackc msgpack)
+endif()
 
 find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
   # Check each directory for all names to avoid using headers/libraries from
diff --git a/cmake/PreventInTreeBuilds.cmake b/cmake/PreventInTreeBuilds.cmake
new file mode 100644
index 0000000000..9c0ce1c0a2
--- /dev/null
+++ b/cmake/PreventInTreeBuilds.cmake
@@ -0,0 +1,23 @@
+function(PreventInTreeBuilds)
+  get_filename_component(srcdir "${CMAKE_SOURCE_DIR}" REALPATH)
+  get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH)
+
+  if("${srcdir}" STREQUAL "${bindir}")
+    message("")
+    message("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    message("Neovim doesn't support in-tree builds.  It's recommended that you")
+    message("use a build/ subdirectory:")
+    message("    mkdir build")
+    message("    cd build")
+    message("    cmake <OPTIONS> ..")
+    message("")
+    message("Make sure to cleanup some CMake artifacts from this failed build")
+    message("with:")
+    message("    rm -rf CMakeFiles CMakeCache.txt")
+    message("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+    message("")
+    message(FATAL_ERROR "Stopping build.")
+  endif()
+endfunction()
+
+PreventInTreeBuilds()
diff --git a/cmake/RunTests.cmake b/cmake/RunTests.cmake
index 0858ea24ac..58f19b6fa5 100644
--- a/cmake/RunTests.cmake
+++ b/cmake/RunTests.cmake
@@ -2,6 +2,9 @@ get_filename_component(BUSTED_DIR ${BUSTED_PRG} PATH)
 set(ENV{PATH} "${BUSTED_DIR}:$ENV{PATH}")
 
 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)
 
 if(NVIM_PRG)
   set(ENV{NVIM_PROG} "${NVIM_PRG}")
@@ -25,15 +28,19 @@ if(DEFINED ENV{TEST_FILTER})
   set(TEST_TAG "--filter=$ENV{TEST_FILTER}")
 endif()
 
+set(ENV{SYSTEM_NAME} ${SYSTEM_NAME})
 execute_process(
   COMMAND ${BUSTED_PRG} ${TEST_TAG} ${TEST_FILTER} -v -o ${BUSTED_OUTPUT_TYPE}
-    --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
+    --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
     --lpath=${BUILD_DIR}/?.lua ${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)
+
 if(NOT res EQUAL 0)
   message(STATUS "Output to stderr:\n${err}")
   message(FATAL_ERROR "Running ${TEST_TYPE} tests failed with error: ${res}.")
diff --git a/cmake/WindowsDllCopy.cmake b/cmake/WindowsDllCopy.cmake
new file mode 100644
index 0000000000..fbbabf3a0c
--- /dev/null
+++ b/cmake/WindowsDllCopy.cmake
@@ -0,0 +1,30 @@
+# In Windows we need to find dependency DLLs and install them along with our
+# binaries. This script uses the following variables:
+#
+# - BINARY: The binary file whose dependencies need to be installed
+# - DST: The destination path
+# - CMAKE_PREFIX_PATH: A list of directories to search for dependencies
+
+if(NOT DEFINED BINARY)
+  message(FATAL_ERROR "Missing required argument -DBINARY=")
+endif()
+if(NOT DEFINED DST)
+  message(FATAL_ERROR "Missing required arguments -DDST=")
+endif()
+if(NOT DEFINED CMAKE_PREFIX_PATH)
+  message(FATAL_ERROR "Missing required arguments -DCMAKE_PREFIX_PATH=")
+endif()
+
+include(GetPrerequisites)
+get_prerequisites(${BINARY} DLLS 1 1 "" "${CMAKE_PREFIX_PATH}")
+foreach(DLL_NAME ${DLLS})
+  find_program(DLL_PATH ${DLL_NAME})
+  if(NOT DLL_PATH)
+    message(FATAL_ERROR "Unable to find dependency ${DLL_NAME}")
+  endif()
+
+  message("Copying ${DLL_NAME} to ${DST}")
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${DLL_PATH} ${DST})
+  unset(DLL_PATH CACHE)
+endforeach()
+
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index e794a8c5b9..c3643db205 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -26,13 +26,17 @@ if(NOT HAVE_SYS_WAIT_H AND UNIX)
   message(SEND_ERROR "header sys/wait.h is required for 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
 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)
@@ -139,12 +143,16 @@ configure_file (
 find_program(WHOAMI_PROG whoami)
 find_program(HOSTNAME_PROG hostname)
 
-if (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PROG})
+if (DEFINED ENV{USERNAME})
+  set(USERNAME $ENV{USERNAME})
+elseif (NOT DEFINED USERNAME AND EXISTS ${WHOAMI_PROG})
   execute_process(COMMAND ${WHOAMI_PROG}
     OUTPUT_STRIP_TRAILING_WHITESPACE
     OUTPUT_VARIABLE USERNAME)
 endif()
-if (EXISTS ${HOSTNAME_PROG})
+if (DEFINED ENV{HOSTNAME})
+  set(HOSTNAME $ENV{HOSTNAME})
+elseif (EXISTS ${HOSTNAME_PROG})
   execute_process(COMMAND ${HOSTNAME_PROG}
     OUTPUT_STRIP_TRAILING_WHITESPACE
     OUTPUT_VARIABLE HOSTNAME)
diff --git a/config/config.h.in b/config/config.h.in
index 5c5b008f7e..f26b5a50a8 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -30,6 +30,7 @@
 #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
@@ -42,14 +43,22 @@
 #cmakedefine HAVE_STRNCASECMP
 #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 UNIX
 #cmakedefine USE_FNAME_CASE
+#cmakedefine HAVE_SYS_UIO_H
+#ifdef HAVE_SYS_UIO_H
+#cmakedefine HAVE_READV
+# ifndef HAVE_READV
+#  undef HAVE_SYS_UIO_H
+# endif
+#endif
 
-#define FEAT_CSCOPE
+#cmakedefine FEAT_TUI
 
 #ifndef UNIT_TESTING
 #cmakedefine HAVE_JEMALLOC
diff --git a/config/versiondef.h.in b/config/versiondef.h.in
index c91bb29c90..b9565735b3 100644
--- a/config/versiondef.h.in
+++ b/config/versiondef.h.in
@@ -7,6 +7,10 @@
 #define NVIM_VERSION_PRERELEASE "@NVIM_VERSION_PRERELEASE@"
 #cmakedefine NVIM_VERSION_MEDIUM "@NVIM_VERSION_MEDIUM@"
 
+#define NVIM_API_LEVEL @NVIM_API_LEVEL@
+#define NVIM_API_LEVEL_COMPAT @NVIM_API_LEVEL_COMPAT@
+#define NVIM_API_PRERELEASE @NVIM_API_PRERELEASE@
+
 #define NVIM_VERSION_CFLAGS "@NVIM_VERSION_CFLAGS@"
 #define NVIM_VERSION_BUILD_TYPE "@NVIM_VERSION_BUILD_TYPE@"
 
diff --git a/man/nvim.1 b/man/nvim.1
index 2fa3ab8ff5..98d97c2d5a 100644
--- a/man/nvim.1
+++ b/man/nvim.1
@@ -353,7 +353,7 @@ Like
 but used to store data not generally edited by the user,
 namely swap, backup, and ShaDa files.
 Defaults to
-.Pa ~/.local/share/nvim
+.Pa ~/.local/share
 if not set.
 .It Ev VIMINIT
 A string of Ex commands to be executed at startup.
@@ -372,9 +372,10 @@ Used to set the 'shell' option, which determines the shell used by the
 .Ic :terminal
 command.
 .It Ev NVIM_TUI_ENABLE_CURSOR_SHAPE
-If defined, change the cursor shape to a vertical bar while in insert mode.
-Requires that the host terminal supports the DECSCUSR CSI escape sequence.
-Has no effect in GUIs.
+Set to 0 to prevent Nvim from changing the cursor shape.
+Set to 1 to enable non-blinking mode-sensitive cursor (this is the default).
+Set to 2 to enable blinking mode-sensitive cursor.
+Host terminal must support the DECSCUSR CSI escape sequence.
 .Pp
 Depending on the terminal emulator, using this option with
 .Nm
diff --git a/neovim.rb b/neovim.rb
deleted file mode 100644
index 859ebdf39d..0000000000
--- a/neovim.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-odie <<-EOS.undent
-
-  Whoops, the neovim Homebrew Formula has moved! Please instead run:
-
-    brew tap neovim/homebrew-neovim
-    brew install --HEAD neovim
-
-  Thanks!
-EOS
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index cad8da6ffb..69498dc1a1 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -2,6 +2,8 @@ set(SYN_VIM_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genvimvim.lua)
 set(GENERATED_RUNTIME_DIR ${PROJECT_BINARY_DIR}/runtime)
 set(GENERATED_SYN_VIM ${GENERATED_RUNTIME_DIR}/syntax/vim/generated.vim)
 set(GENERATED_HELP_TAGS ${GENERATED_RUNTIME_DIR}/doc/tags)
+set(GENERATED_PACKAGE_DIR ${GENERATED_RUNTIME_DIR}/pack/dist/opt)
+set(FUNCS_DATA ${PROJECT_BINARY_DIR}/funcs_data.mpack)
 
 file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR})
 file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR}/syntax)
@@ -9,15 +11,57 @@ file(MAKE_DIRECTORY ${GENERATED_RUNTIME_DIR}/syntax/vim)
 
 add_custom_command(OUTPUT ${GENERATED_SYN_VIM}
   COMMAND ${LUA_PRG} ${SYN_VIM_GENERATOR}
-          ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_SYN_VIM}
+          ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_SYN_VIM} ${FUNCS_DATA}
   DEPENDS
     ${SYN_VIM_GENERATOR}
     ${PROJECT_SOURCE_DIR}/src/nvim/ex_cmds.lua
     ${PROJECT_SOURCE_DIR}/src/nvim/auevents.lua
     ${PROJECT_SOURCE_DIR}/src/nvim/options.lua
     ${PROJECT_SOURCE_DIR}/src/nvim/eval.c
+    ${FUNCS_DATA}
 )
 
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 OLD)
+endif()
+
+file(GLOB PACKAGES ${PROJECT_SOURCE_DIR}/runtime/pack/dist/opt/*)
+
+set(GENERATED_PACKAGE_TAGS)
+foreach(PACKAGE ${PACKAGES})
+  get_filename_component(PACKNAME ${PACKAGE} NAME)
+  file(GLOB "${PACKNAME}_DOC_FILES" ${PACKAGE}/doc/*.txt)
+  if("${PACKNAME}_DOC_FILES")
+    file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME})
+    add_custom_target("${PACKNAME}-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
+      WORKING_DIRECTORY "${GENERATED_PACKAGE_DIR}/${PACKNAME}"
+    )
+
+    add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
+      DEPENDS
+        "${PACKNAME}-tags"
+      )
+
+    set("${PACKNAME}_DOC_NAMES")
+    foreach(DF "${${PACKNAME}_DOC_FILES}")
+      get_filename_component(F ${DF} NAME)
+      list(APPEND "${PACKNAME}_DOC_NAMES" ${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/${F})
+    endforeach()
+
+    install_helper(
+      FILES ${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags "${${PACKNAME}_DOC_NAMES}"
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/nvim/runtime/pack/dist/opt/${PACKNAME}/doc)
+
+    list(APPEND GENERATED_PACKAGE_TAGS "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags")
+  endif()
+endforeach()
+
 file(GLOB DOCFILES ${PROJECT_SOURCE_DIR}/runtime/doc/*.txt)
 
 set(BUILDDOCFILES)
@@ -26,22 +70,25 @@ foreach(DF ${DOCFILES})
   list(APPEND BUILDDOCFILES ${GENERATED_RUNTIME_DIR}/doc/${F})
 endforeach()
 
-add_custom_command(OUTPUT copy_docfiles
-    COMMAND ${CMAKE_COMMAND} -E copy_directory
+add_custom_target(helptags
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
     ${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
+  COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
+    -u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit
+  DEPENDS
+    nvim
+  WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}"
 )
 
 add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
-  COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
-    -u NONE
-    -i NONE
-    -e
-    --headless
-    -c "helptags ++t ."
-    -c quit
   DEPENDS
-    copy_docfiles
-    nvim
+    helptags
+)
+
+add_custom_target(doc_html
+  COMMAND make html
+  DEPENDS
+    ${GENERATED_HELP_TAGS}
   WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
 )
 
@@ -50,8 +97,23 @@ add_custom_target(
   DEPENDS
     ${GENERATED_SYN_VIM}
     ${GENERATED_HELP_TAGS}
+    ${GENERATED_PACKAGE_TAGS}
 )
 
+# Optional targets for nvim.desktop file and icon.
+find_program(XDG_MENU_PRG xdg-desktop-menu)
+find_program(XDG_ICON_PRG xdg-icon-resource)
+if(XDG_MENU_PRG)
+  add_custom_target(desktop-file
+    COMMAND xdg-desktop-menu install --novendor ${PROJECT_SOURCE_DIR}/runtime/nvim.desktop)
+  # add_dependencies(runtime desktop-file)
+endif()
+if(XDG_ICON_PRG)
+  add_custom_target(desktop-icon
+    COMMAND xdg-icon-resource install --novendor --size 128 ${PROJECT_SOURCE_DIR}/runtime/nvim.png)
+  # add_dependencies(runtime desktop-icon)
+endif()
+
 # CMake is painful here.  It will create the destination using the user's
 # current umask, and we don't want that.  And we don't just want to install
 # the target directory, as it will mess with existing permissions.  So this
@@ -78,7 +140,7 @@ endforeach()
 
 file(GLOB_RECURSE RUNTIME_FILES
   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  *.vim *.dict *.py *.ps *.tutor)
+  *.vim *.dict *.py *.rb *.ps *.tutor)
 
 foreach(F ${RUNTIME_FILES})
   get_filename_component(BASEDIR ${F} PATH)
diff --git a/runtime/autoload/clojurecomplete.vim b/runtime/autoload/clojurecomplete.vim
index 708bb31104..030785e901 100644
--- a/runtime/autoload/clojurecomplete.vim
+++ b/runtime/autoload/clojurecomplete.vim
@@ -1,14 +1,14 @@
 " Vim completion script
-" Language:	Clojure
-" Maintainer:	Sung Pae <self@sungpae.com>
-" URL:		https://github.com/guns/vim-clojure-static
-" License:	Same as Vim
-" Last Change:	27 March 2014
+" Language:     Clojure
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  18 July 2016
 
 " -*- COMPLETION WORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.6.0
-let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","empty","empty?","ensure","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unsigned-bit-shift-right","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-011/clj/src/vim_clojure_static/generate.clj
+" Clojure version 1.8.0
+let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
 function! clojurecomplete#Complete(findstart, base)
diff --git a/runtime/autoload/csscomplete.vim b/runtime/autoload/csscomplete.vim
index 9eebb87d5b..50048a37fd 100644
--- a/runtime/autoload/csscomplete.vim
+++ b/runtime/autoload/csscomplete.vim
@@ -1,429 +1,740 @@
 " Vim completion script
-" Language:	CSS 2.1
-" Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2007 May 5
+" Language: CSS
+"           Based on MDN CSS Reference at 2016 Jan <https://developer.mozilla.org/en-US/docs/Web/CSS/Reference>
+"           plus CSS Speech Module <http://www.w3.org/TR/css3-speech/>
+" Maintainer: Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Original Author: Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change: 2016 Jan 11
 
-	let s:values = split("azimuth background background-attachment background-color background-image background-position background-repeat border bottom border-collapse border-color border-spacing border-style border-top border-right border-bottom border-left border-top-color border-right-color border-bottom-color border-left-color  border-top-style border-right-style border-bottom-style border-left-style border-top-width border-right-width border-bottom-width border-left-width border-width caption-side clear clip color content counter-increment counter-reset cue cue-after cue-before cursor display direction elevation empty-cells float font font-family font-size font-style font-variant font-weight height left letter-spacing line-height list-style list-style-image list-style-position list-style-type margin margin-right margin-left margin-top margin-bottom max-height max-width min-height min-width orphans outline outline-color outline-style outline-width overflow padding padding-top padding-right padding-bottom padding-left page-break-after page-break-before page-break-inside pause pause-after pause-before pitch pitch-range play-during position quotes right richness speak speak-header speak-numeral speak-punctuation speech-rate stress table-layout text-align text-decoration text-indent text-transform top unicode-bidi vertical-align visibility voice-family volume white-space width widows word-spacing z-index")
+let s:values = split("all additive-symbols align-content align-items align-self animation animation-delay animation-direction animation-duration animation-fill-mode animation-iteration-count animation-name animation-play-state animation-timing-function backface-visibility background background-attachment background-blend-mode background-clip background-color background-image background-origin background-position background-repeat background-size block-size border border-block-end border-block-end-color border-block-end-style border-block-end-width border-block-start border-block-start-color border-block-start-style border-block-start-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-collapse border-color border-image border-image-outset border-image-repeat border-image-slice border-image-source border-image-width border-inline-end border-inline-end-color border-inline-end-style border-inline-end-width border-inline-start border-inline-start-color border-inline-start-style border-inline-start-width border-left border-left-color border-left-style border-left-width border-radius border-right border-right-color border-right-style border-right-width border-spacing border-style border-top border-top-color border-top-left-radius border-top-right-radius border-top-style border-top-width border-width bottom box-decoration-break box-shadow box-sizing break-after break-before break-inside caption-side clear clip clip-path color columns column-count column-fill column-gap column-rule column-rule-color column-rule-style column-rule-width column-span column-width content counter-increment counter-reset cue cue-before cue-after cursor direction display empty-cells fallback filter flex flex-basis flex-direction flex-flow flex-grow flex-shrink flex-wrap float font font-family font-feature-settings font-kerning font-language-override font-size font-size-adjust font-stretch font-style font-synthesis font-variant font-variant-alternates font-variant-caps font-variant-east-asian font-variant-ligatures font-variant-numeric font-variant-position font-weight grid grid-area grid-auto-columns grid-auto-flow grid-auto-position grid-auto-rows grid-column grid-column-start grid-column-end grid-row grid-row-start grid-row-end grid-template grid-template-areas grid-template-rows grid-template-columns height hyphens image-rendering image-resolution image-orientation ime-mode inline-size isolation justify-content left letter-spacing line-break line-height list-style list-style-image list-style-position list-style-type margin margin-block-end margin-block-start margin-bottom margin-inline-end margin-inline-start margin-left margin-right margin-top marks mask mask-type max-block-size max-height max-inline-size max-width max-zoom min-block-size min-height min-inline-size min-width min-zoom mix-blend-mode negative object-fit object-position offset-block-end offset-block-start offset-inline-end offset-inline-start opacity order orientation orphans outline outline-color outline-offset outline-style outline-width overflow overflow-wrap overflow-x overflow-y pad padding padding-block-end padding-block-start padding-bottom padding-inline-end padding-inline-start padding-left padding-right padding-top page-break-after page-break-before page-break-inside pause-before pause-after pause perspective perspective-origin pointer-events position prefix quotes range resize rest rest-before rest-after right ruby-align ruby-merge ruby-position scroll-behavior scroll-snap-coordinate scroll-snap-destination scroll-snap-points-x scroll-snap-points-y scroll-snap-type scroll-snap-type-x scroll-snap-type-y shape-image-threshold shape-margin shape-outside speak speak-as suffix symbols system table-layout tab-size text-align text-align-last text-combine-upright text-decoration text-decoration-color text-decoration-line text-emphasis text-emphasis-color text-emphasis-position text-emphasis-style text-indent text-orientation text-overflow text-rendering text-shadow text-transform text-underline-position top touch-action transform transform-box transform-origin transform-style transition transition-delay transition-duration transition-property transition-timing-function unicode-bidi unicode-range user-zoom vertical-align visibility voice-balance voice-duration voice-family voice-pitch voice-rate voice-range voice-stress voice-volume white-space widows width will-change word-break word-spacing word-wrap writing-mode z-index zoom")
 
-function! csscomplete#CompleteCSS(findstart, base)
-
-if a:findstart
-	" We need whole line to proper checking
-	let line = getline('.')
-	let start = col('.') - 1
-	let compl_begin = col('.') - 2
-	while start >= 0 && line[start - 1] =~ '\%(\k\|-\)'
-		let start -= 1
-	endwhile
-	let b:compl_context = line[0:compl_begin]
-	return start
-endif
-
-" There are few chars important for context:
-" ^ ; : { } /* */
-" Where ^ is start of line and /* */ are comment borders
-" Depending on their relative position to cursor we will know what should
-" be completed. 
-" 1. if nearest are ^ or { or ; current word is property
-" 2. if : it is value (with exception of pseudo things)
-" 3. if } we are outside of css definitions
-" 4. for comments ignoring is be the easiest but assume they are the same
-"    as 1. 
-" 5. if @ complete at-rule
-" 6. if ! complete important
-if exists("b:compl_context")
-	let line = b:compl_context
-	unlet! b:compl_context
-else
-	let line = a:base
-endif
-
-let res = []
-let res2 = []
-let borders = {}
-
-" Check last occurrence of sequence
-
-let openbrace  = strridx(line, '{')
-let closebrace = strridx(line, '}')
-let colon      = strridx(line, ':')
-let semicolon  = strridx(line, ';')
-let opencomm   = strridx(line, '/*')
-let closecomm  = strridx(line, '*/')
-let style      = strridx(line, 'style\s*=')
-let atrule     = strridx(line, '@')
-let exclam     = strridx(line, '!')
-
-if openbrace > -1
-	let borders[openbrace] = "openbrace"
-endif
-if closebrace > -1
-	let borders[closebrace] = "closebrace"
-endif
-if colon > -1
-	let borders[colon] = "colon"
-endif
-if semicolon > -1
-	let borders[semicolon] = "semicolon"
-endif
-if opencomm > -1
-	let borders[opencomm] = "opencomm"
-endif
-if closecomm > -1
-	let borders[closecomm] = "closecomm"
-endif
-if style > -1
-	let borders[style] = "style"
-endif
-if atrule > -1
-	let borders[atrule] = "atrule"
-endif
-if exclam > -1
-	let borders[exclam] = "exclam"
-endif
-
-
-if len(borders) == 0 || borders[max(keys(borders))] =~ '^\%(openbrace\|semicolon\|opencomm\|closecomm\|style\)$'
-	" Complete properties
-
-
-	let entered_property = matchstr(line, '.\{-}\zs[a-zA-Z-]*$')
-
-	for m in s:values
-		if m =~? '^'.entered_property
-			call add(res, m . ':')
-		elseif m =~? entered_property
-			call add(res2, m . ':')
-		endif
-	endfor
-
-	return res + res2
-
-elseif borders[max(keys(borders))] == 'colon'
-	" Get name of property
-	let prop = tolower(matchstr(line, '\zs[a-zA-Z-]*\ze\s*:[^:]\{-}$'))
-
-	if prop == 'azimuth'
-		let values = ["left-side", "far-left", "left", "center-left", "center", "center-right", "right", "far-right", "right-side", "behind", "leftwards", "rightwards"]
-	elseif prop == 'background-attachment'
-		let values = ["scroll", "fixed"]
-	elseif prop == 'background-color'
-		let values = ["transparent", "rgb(", "#"]
-	elseif prop == 'background-image'
-		let values = ["url(", "none"]
-	elseif prop == 'background-position'
-		let vals = matchstr(line, '.*:\s*\zs.*')
-		if vals =~ '^\%([a-zA-Z]\+\)\?$'
-			let values = ["top", "center", "bottom"]
-		elseif vals =~ '^[a-zA-Z]\+\s\+\%([a-zA-Z]\+\)\?$'
-			let values = ["left", "center", "right"]
-		else
-			return []
-		endif
-	elseif prop == 'background-repeat'
-		let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
-	elseif prop == 'background'
-		let values = ["url(", "scroll", "fixed", "transparent", "rgb(", "#", "none", "top", "center", "bottom" , "left", "right", "repeat", "repeat-x", "repeat-y", "no-repeat"]
-	elseif prop == 'border-collapse'
-		let values = ["collapse", "separate"]
-	elseif prop == 'border-color'
-		let values = ["rgb(", "#", "transparent"]
-	elseif prop == 'border-spacing'
-		return []
-	elseif prop == 'border-style'
-		let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-	elseif prop =~ 'border-\%(top\|right\|bottom\|left\)$'
-		let vals = matchstr(line, '.*:\s*\zs.*')
-		if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
-			let values = ["thin", "thick", "medium"]
-		elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
-			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-		elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-			let values = ["rgb(", "#", "transparent"]
-		else
-			return []
-		endif
-	elseif prop =~ 'border-\%(top\|right\|bottom\|left\)-color'
-		let values = ["rgb(", "#", "transparent"]
-	elseif prop =~ 'border-\%(top\|right\|bottom\|left\)-style'
-		let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-	elseif prop =~ 'border-\%(top\|right\|bottom\|left\)-width'
-		let values = ["thin", "thick", "medium"]
-	elseif prop == 'border-width'
-		let values = ["thin", "thick", "medium"]
-	elseif prop == 'border'
-		let vals = matchstr(line, '.*:\s*\zs.*')
-		if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
-			let values = ["thin", "thick", "medium"]
-		elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
-			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-		elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-			let values = ["rgb(", "#", "transparent"]
-		else
-			return []
-		endif
-	elseif prop == 'bottom'
-		let values = ["auto"]
-	elseif prop == 'caption-side'
-		let values = ["top", "bottom"]
-	elseif prop == 'clear'
-		let values = ["none", "left", "right", "both"]
-	elseif prop == 'clip'
-		let values = ["auto", "rect("]
-	elseif prop == 'color'
-		let values = ["rgb(", "#"]
-	elseif prop == 'content'
-		let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"]
-	elseif prop =~ 'counter-\%(increment\|reset\)$'
-		let values = ["none"]
-	elseif prop =~ '^\%(cue-after\|cue-before\|cue\)$'
-		let values = ["url(", "none"]
-	elseif prop == 'cursor'
-		let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"]
-	elseif prop == 'direction'
-		let values = ["ltr", "rtl"]
-	elseif prop == 'display'
-		let values = ["inline", "block", "list-item", "run-in", "inline-block", "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none"]
-	elseif prop == 'elevation'
-		let values = ["below", "level", "above", "higher", "lower"]
-	elseif prop == 'empty-cells'
-		let values = ["show", "hide"]
-	elseif prop == 'float'
-		let values = ["left", "right", "none"]
-	elseif prop == 'font-family'
-		let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy"]
-	elseif prop == 'font-size'
-		 let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
-	elseif prop == 'font-style'
-		let values = ["normal", "italic", "oblique"]
-	elseif prop == 'font-variant'
-		let values = ["normal", "small-caps"]
-	elseif prop == 'font-weight'
-		let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
-	elseif prop == 'font'
-		let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
-	elseif prop =~ '^\%(height\|width\)$'
-		let values = ["auto"]
-	elseif prop =~ '^\%(left\|rigth\)$'
-		let values = ["auto"]
-	elseif prop == 'letter-spacing'
-		let values = ["normal"]
-	elseif prop == 'line-height'
-		let values = ["normal"]
-	elseif prop == 'list-style-image'
-		let values = ["url(", "none"]
-	elseif prop == 'list-style-position'
-		let values = ["inside", "outside"]
-	elseif prop == 'list-style-type'
-		let values = ["disc", "circle", "square", "decimal", "decimal-leading-zero", "lower-roman", "upper-roman", "lower-latin", "upper-latin", "none"]
-	elseif prop == 'list-style'
-		return []
-	elseif prop == 'margin'
-		let values = ["auto"]
-	elseif prop =~ 'margin-\%(right\|left\|top\|bottom\)$'
-		let values = ["auto"]
-	elseif prop == 'max-height'
-		let values = ["auto"]
-	elseif prop == 'max-width'
-		let values = ["none"]
-	elseif prop == 'min-height'
-		let values = ["none"]
-	elseif prop == 'min-width'
-		let values = ["none"]
-	elseif prop == 'orphans'
-		return []
-	elseif prop == 'outline-color'
-		let values = ["rgb(", "#"]
-	elseif prop == 'outline-style'
-		let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-	elseif prop == 'outline-width'
-		let values = ["thin", "thick", "medium"]
-	elseif prop == 'outline'
-		let vals = matchstr(line, '.*:\s*\zs.*')
-		if vals =~ '^\%([a-zA-Z0-9,()#]\+\)\?$'
-			let values = ["rgb(", "#"]
-		elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\%([a-zA-Z]\+\)\?$'
-			let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-		elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-			let values = ["thin", "thick", "medium"]
-		else
-			return []
-		endif
-	elseif prop == 'overflow'
-		let values = ["visible", "hidden", "scroll", "auto"]
-	elseif prop == 'padding'
-		return []
-	elseif prop =~ 'padding-\%(top\|right\|bottom\|left\)$'
-		return []
-	elseif prop =~ 'page-break-\%(after\|before\)$'
-		let values = ["auto", "always", "avoid", "left", "right"]
-	elseif prop == 'page-break-inside'
-		let values = ["auto", "avoid"]
-	elseif prop =~ 'pause-\%(after\|before\)$'
-		return []
-	elseif prop == 'pause'
-		return []
-	elseif prop == 'pitch-range'
-		return []
-	elseif prop == 'pitch'
-		let values = ["x-low", "low", "medium", "high", "x-high"]
-	elseif prop == 'play-during'
-		let values = ["url(", "mix", "repeat", "auto", "none"]
-	elseif prop == 'position'
-		let values = ["static", "relative", "absolute", "fixed"]
-	elseif prop == 'quotes'
-		let values = ["none"]
-	elseif prop == 'richness'
-		return []
-	elseif prop == 'speak-header'
-		let values = ["once", "always"]
-	elseif prop == 'speak-numeral'
-		let values = ["digits", "continuous"]
-	elseif prop == 'speak-punctuation'
-		let values = ["code", "none"]
-	elseif prop == 'speak'
-		let values = ["normal", "none", "spell-out"]
-	elseif prop == 'speech-rate'
-		let values = ["x-slow", "slow", "medium", "fast", "x-fast", "faster", "slower"]
-	elseif prop == 'stress'
-		return []
-	elseif prop == 'table-layout'
-		let values = ["auto", "fixed"]
-	elseif prop == 'text-align'
-		let values = ["left", "right", "center", "justify"]
-	elseif prop == 'text-decoration'
-		let values = ["none", "underline", "overline", "line-through", "blink"]
-	elseif prop == 'text-indent'
-		return []
-	elseif prop == 'text-transform'
-		let values = ["capitalize", "uppercase", "lowercase", "none"]
-	elseif prop == 'top'
-		let values = ["auto"]
-	elseif prop == 'unicode-bidi'
-		let values = ["normal", "embed", "bidi-override"]
-	elseif prop == 'vertical-align'
-		let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"]
-	elseif prop == 'visibility'
-		let values = ["visible", "hidden", "collapse"]
-	elseif prop == 'voice-family'
-		return []
-	elseif prop == 'volume'
-		let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"]
-	elseif prop == 'white-space'
-		let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"]
-	elseif prop == 'widows'
-		return []
-	elseif prop == 'word-spacing'
-		let values = ["normal"]
-	elseif prop == 'z-index'
-		let values = ["auto"]
-	else
-		" If no property match it is possible we are outside of {} and
-		" trying to complete pseudo-(class|element)
-		let element = tolower(matchstr(line, '\zs[a-zA-Z1-6]*\ze:[^:[:space:]]\{-}$'))
-		if stridx(',a,abbr,acronym,address,area,b,base,bdo,big,blockquote,body,br,button,caption,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,fieldset,form,head,h1,h2,h3,h4,h5,h6,hr,html,i,img,input,ins,kbd,label,legend,li,link,map,meta,noscript,object,ol,optgroup,option,p,param,pre,q,samp,script,select,small,span,strong,style,sub,sup,table,tbody,td,textarea,tfoot,th,thead,title,tr,tt,ul,var,', ','.element.',') > -1
-			let values = ["first-child", "link", "visited", "hover", "active", "focus", "lang", "first-line", "first-letter", "before", "after"]
-		else
-			return []
-		endif
-	endif
-
-	" Complete values
-	let entered_value = matchstr(line, '.\{-}\zs[a-zA-Z0-9#,.(_-]*$')
-
-	for m in values
-		if m =~? '^'.entered_value
-			call add(res, m)
-		elseif m =~? entered_value
-			call add(res2, m)
-		endif
-	endfor
-
-	return res + res2
-
-elseif borders[max(keys(borders))] == 'closebrace'
-
-	return []
-
-elseif borders[max(keys(borders))] == 'exclam'
-
-	" Complete values
-	let entered_imp = matchstr(line, '.\{-}!\s*\zs[a-zA-Z ]*$')
-
-	let values = ["important"]
-
-	for m in values
-		if m =~? '^'.entered_imp
-			call add(res, m)
-		endif
-	endfor
-
-	return res
-
-elseif borders[max(keys(borders))] == 'atrule'
-
-	let afterat = matchstr(line, '.*@\zs.*')
-
-	if afterat =~ '\s'
-
-		let atrulename = matchstr(line, '.*@\zs[a-zA-Z-]\+\ze')
-
-		if atrulename == 'media'
-			let values = ["screen", "tty", "tv", "projection", "handheld", "print", "braille", "aural", "all"]
-
-			let entered_atruleafter = matchstr(line, '.*@media\s\+\zs.*$')
-
-		elseif atrulename == 'import'
-			let entered_atruleafter = matchstr(line, '.*@import\s\+\zs.*$')
-
-			if entered_atruleafter =~ "^[\"']"
-				let filestart = matchstr(entered_atruleafter, '^.\zs.*')
-				let files = split(glob(filestart.'*'), '\n')
-				let values = map(copy(files), '"\"".v:val')
-
-			elseif entered_atruleafter =~ "^url("
-				let filestart = matchstr(entered_atruleafter, "^url([\"']\\?\\zs.*")
-				let files = split(glob(filestart.'*'), '\n')
-				let values = map(copy(files), '"url(".v:val')
-				
-			else
-				let values = ['"', 'url(']
-
-			endif
-
-		else
-			return []
-
-		endif
-
-		for m in values
-			if m =~? '^'.entered_atruleafter
-				call add(res, m)
-			elseif m =~? entered_atruleafter
-				call add(res2, m)
-			endif
-		endfor
-
-		return res + res2
-
-	endif
-
-	let values = ["charset", "page", "media", "import", "font-face"]
 
-	let entered_atrule = matchstr(line, '.*@\zs[a-zA-Z-]*$')
-
-	for m in values
-		if m =~? '^'.entered_atrule
-			call add(res, m .' ')
-		elseif m =~? entered_atrule
-			call add(res2, m .' ')
-		endif
-	endfor
-
-	return res + res2
-
-endif
+function! csscomplete#CompleteCSS(findstart, base)
 
-return []
+  if a:findstart
+    " We need whole line to proper checking
+    let line = getline('.')
+    let start = col('.') - 1
+    let compl_begin = col('.') - 2
+    while start >= 0 && line[start - 1] =~ '\%(\k\|-\)'
+      let start -= 1
+    endwhile
+    let b:after = line[compl_begin :]
+    let b:compl_context = line[0:compl_begin]
+    return start
+  endif
+
+  " There are few chars important for context:
+  " ^ ; : { } /* */
+  " Where ^ is start of line and /* */ are comment borders
+  " Depending on their relative position to cursor we will know what should
+  " be completed. 
+  " 1. if nearest are ^ or { or ; current word is property
+  " 2. if : it is value (with exception of pseudo things)
+  " 3. if } we are outside of css definitions
+  " 4. for comments ignoring is be the easiest but assume they are the same
+  "    as 1. 
+  " 5. if @ complete at-rule
+  " 6. if ! complete important
+  if exists("b:compl_context")
+    let line = b:compl_context
+    let after = b:after
+    unlet! b:compl_context
+  else
+    let line = a:base
+  endif
+
+  let res = []
+  let res2 = []
+  let borders = {}
+
+  " Check last occurrence of sequence
+
+  let openbrace  = strridx(line, '{')
+  let closebrace = strridx(line, '}')
+  let colon      = strridx(line, ':')
+  let semicolon  = strridx(line, ';')
+  let opencomm   = strridx(line, '/*')
+  let closecomm  = strridx(line, '*/')
+  let style      = strridx(line, 'style\s*=')
+  let atrule     = strridx(line, '@')
+  let exclam     = strridx(line, '!')
+
+  if openbrace > -1
+    let borders[openbrace] = "openbrace"
+  endif
+  if closebrace > -1
+    let borders[closebrace] = "closebrace"
+  endif
+  if colon > -1
+    let borders[colon] = "colon"
+  endif
+  if semicolon > -1
+    let borders[semicolon] = "semicolon"
+  endif
+  if opencomm > -1
+    let borders[opencomm] = "opencomm"
+  endif
+  if closecomm > -1
+    let borders[closecomm] = "closecomm"
+  endif
+  if style > -1
+    let borders[style] = "style"
+  endif
+  if atrule > -1
+    let borders[atrule] = "atrule"
+  endif
+  if exclam > -1
+    let borders[exclam] = "exclam"
+  endif
+
+
+  if len(borders) == 0 || borders[max(keys(borders))] =~ '^\%(openbrace\|semicolon\|opencomm\|closecomm\|style\)$'
+    " Complete properties
+
+
+    let entered_property = matchstr(line, '.\{-}\zs[a-zA-Z-]*$')
+
+    for m in s:values
+      if m =~? '^'.entered_property
+        call add(res, m . ':')
+      elseif m =~? entered_property
+        call add(res2, m . ':')
+      endif
+    endfor
+
+    return res + res2
+
+  elseif borders[max(keys(borders))] == 'colon'
+    " Get name of property
+    let prop = tolower(matchstr(line, '\zs[a-zA-Z-]*\ze\s*:[^:]\{-}$'))
+
+    let wide_keywords = ["initial", "inherit", "unset"]
+    let color_values = ["transparent", "rgb(", "rgba(", "hsl(", "hsla(", "#"]
+    let border_style_values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+    let border_width_values = ["thin", "thick", "medium"]
+    let list_style_type_values = ["decimal", "decimal-leading-zero", "arabic-indic", "armenian", "upper-armenian", "lower-armenian", "bengali", "cambodian", "khmer", "cjk-decimal", "devanagari", "georgian", "gujarati", "gurmukhi", "hebrew", "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian", "lower-roman", "upper-roman", "tamil", "telugu", "thai", "tibetan", "lower-alpha", "lower-latin", "upper-alpha", "upper-latin", "cjk-earthly-branch", "cjk-heavenly-stem", "lower-greek", "hiragana", "hiragana-iroha", "katakana", "katakana-iroha", "disc", "circle", "square", "disclosure-open", "disclosure-closed"]
+    let timing_functions = ["cubic-bezier(", "steps(", "linear", "ease", "ease-in", "ease-in-out", "ease-out", "step-start", "step-end"]
+
+    if prop == 'all'
+      let values = []
+    elseif prop == 'additive-symbols'
+      let values = []
+    elseif prop == 'align-content'
+      let values = ["flex-start", "flex-end", "center", "space-between", "space-around", "stretch"]
+    elseif prop == 'align-items'
+      let values = ["flex-start", "flex-end", "center", "baseline", "stretch"]
+    elseif prop == 'align-self'
+      let values = ["auto", "flex-start", "flex-end", "center", "baseline", "stretch"]
+    elseif prop == 'animation'
+      let values = timing_functions + ["normal", "reverse", "alternate", "alternate-reverse"] + ["none", "forwards", "backwards", "both"] + ["running", "paused"]
+    elseif prop == 'animation-delay'
+      let values = []
+    elseif prop == 'animation-direction'
+      let values = ["normal", "reverse", "alternate", "alternate-reverse"]
+    elseif prop == 'animation-duration'
+      let values = []
+    elseif prop == 'animation-fill-mode'
+      let values = ["none", "forwards", "backwards", "both"]
+    elseif prop == 'animation-iteration-count'
+      let values = []
+    elseif prop == 'animation-name'
+      let values = []
+    elseif prop == 'animation-play-state'
+      let values = ["running", "paused"]
+    elseif prop == 'animation-timing-function'
+      let values = timing_functions
+    elseif prop == 'background-attachment'
+      let values = ["scroll", "fixed"]
+    elseif prop == 'background-color'
+      let values = color_values
+    elseif prop == 'background-image'
+      let values = ["url(", "none"]
+    elseif prop == 'background-position'
+      let vals = matchstr(line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z]\+\)\?$'
+        let values = ["top", "center", "bottom"]
+      elseif vals =~ '^[a-zA-Z]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = ["left", "center", "right"]
+      else
+        return []
+      endif
+    elseif prop == 'background-repeat'
+      let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
+    elseif prop == 'background-size'
+      let values = ["auto", "contain", "cover"]
+    elseif prop == 'background'
+      let values = ["scroll", "fixed"] + color_values + ["url(", "none"] + ["top", "center", "bottom", "left", "right"] + ["repeat", "repeat-x", "repeat-y", "no-repeat"] + ["auto", "contain", "cover"]
+    elseif prop =~ 'border\%(-top\|-right\|-bottom\|-left\|-block-start\|-block-end\)\?$'
+      let vals = matchstr(line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
+        let values = border_width_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = border_style_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = color_values
+      else
+        return []
+      endif
+    elseif prop =~ 'border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-color'
+      let values = color_values
+    elseif prop =~ 'border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-style'
+      let values = border_style_values
+    elseif prop =~ 'border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-width'
+      let values = border_width_values
+    elseif prop == 'border-color'
+      let values = color_values
+    elseif prop == 'border-style'
+      let values = border_style_values
+    elseif prop == 'border-width'
+      let values = border_width_values
+    elseif prop == 'bottom'
+      let values = ["auto"]
+    elseif prop == 'box-decoration-break'
+      let values = ["slice", "clone"]
+    elseif prop == 'box-shadow'
+      let values = ["inset"]
+    elseif prop == 'box-sizing'
+      let values = ["border-box", "content-box"]
+    elseif prop =~ 'break-\%(before\|after\)'
+      let values = ["auto", "always", "avoid", "left", "right", "page", "column", "region", "recto", "verso", "avoid-page", "avoid-column", "avoid-region"]
+    elseif prop == 'break-inside'
+      let values = ["auto", "avoid", "avoid-page", "avoid-column", "avoid-region"]
+    elseif prop == 'caption-side'
+      let values = ["top", "bottom"]
+    elseif prop == 'clear'
+      let values = ["none", "left", "right", "both"]
+    elseif prop == 'clip'
+      let values = ["auto", "rect("]
+    elseif prop == 'clip-path'
+      let values = ["fill-box", "stroke-box", "view-box", "none"]
+    elseif prop == 'color'
+      let values = color_values
+    elseif prop == 'columns'
+      let values = []
+    elseif prop == 'column-count'
+      let values = ['auto']
+    elseif prop == 'column-fill'
+      let values = ['auto', 'balance']
+    elseif prop == 'column-rule-color'
+      let values = color_values
+    elseif prop == 'column-rule-style'
+      let values = border_style_values
+    elseif prop == 'column-rule-width'
+      let values = border_width_values
+    elseif prop == 'column-rule'
+      let vals = matchstr(line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
+        let values = border_width_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = border_style_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = color_values
+      else
+        return []
+      endif
+    elseif prop == 'column-span'
+      let values = ["none", "all"]
+    elseif prop == 'column-width'
+      let values = ["auto"]
+    elseif prop == 'content'
+      let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"]
+    elseif prop =~ 'counter-\%(increment\|reset\)$'
+      let values = ["none"]
+    elseif prop =~ 'cue\%(-after\|-before\)\=$'
+      let values = ["url("]
+    elseif prop == 'cursor'
+      let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"]
+    elseif prop == 'direction'
+      let values = ["ltr", "rtl"]
+    elseif prop == 'display'
+      let values = ["inline", "block", "list-item", "inline-list-item", "run-in", "inline-block", "table", "inline-table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none", "flex", "inline-flex", "grid", "inline-grid", "ruby", "ruby-base", "ruby-text", "ruby-base-container", "ruby-text-container", "contents"]
+    elseif prop == 'elevation'
+      let values = ["below", "level", "above", "higher", "lower"]
+    elseif prop == 'empty-cells'
+      let values = ["show", "hide"]
+    elseif prop == 'fallback'
+      let values = list_style_type_values
+    elseif prop == 'filter'
+      let values = ["blur(", "brightness(", "contrast(", "drop-shadow(", "grayscale(", "hue-rotate(", "invert(", "opacity(", "sepia(", "saturate("]
+    elseif prop == 'flex-basis'
+      let values = ["auto", "content"]
+    elseif prop == 'flex-flow'
+      let values = ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"]
+    elseif prop == 'flex-grow'
+      let values = []
+    elseif prop == 'flex-shrink'
+      let values = []
+    elseif prop == 'flex-wrap'
+      let values = ["nowrap", "wrap", "wrap-reverse"]
+    elseif prop == 'flex'
+      let values = ["nowrap", "wrap", "wrap-reverse"] + ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"] + ["auto", "content"]
+    elseif prop == 'float'
+      let values = ["left", "right", "none"]
+    elseif prop == 'font-family'
+      let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy"]
+    elseif prop == 'font-feature-settings'
+      let values = ["normal", '"aalt"', '"abvf"', '"abvm"', '"abvs"', '"afrc"', '"akhn"', '"blwf"', '"blwm"', '"blws"', '"calt"', '"case"', '"ccmp"', '"cfar"', '"cjct"', '"clig"', '"cpct"', '"cpsp"', '"cswh"', '"curs"', '"cv', '"c2pc"', '"c2sc"', '"dist"', '"dlig"', '"dnom"', '"dtls"', '"expt"', '"falt"', '"fin2"', '"fin3"', '"fina"', '"flac"', '"frac"', '"fwid"', '"half"', '"haln"', '"halt"', '"hist"', '"hkna"', '"hlig"', '"hngl"', '"hojo"', '"hwid"', '"init"', '"isol"', '"ital"', '"jalt"', '"jp78"', '"jp83"', '"jp90"', '"jp04"', '"kern"', '"lfbd"', '"liga"', '"ljmo"', '"lnum"', '"locl"', '"ltra"', '"ltrm"', '"mark"', '"med2"', '"medi"', '"mgrk"', '"mkmk"', '"mset"', '"nalt"', '"nlck"', '"nukt"', '"numr"', '"onum"', '"opbd"', '"ordn"', '"ornm"', '"palt"', '"pcap"', '"pkna"', '"pnum"', '"pref"', '"pres"', '"pstf"', '"psts"', '"pwid"', '"qwid"', '"rand"', '"rclt"', '"rkrf"', '"rlig"', '"rphf"', '"rtbd"', '"rtla"', '"rtlm"', '"ruby"', '"salt"', '"sinf"', '"size"', '"smcp"', '"smpl"', '"ss01"', '"ss02"', '"ss03"', '"ss04"', '"ss05"', '"ss06"', '"ss07"', '"ss08"', '"ss09"', '"ss10"', '"ss11"', '"ss12"', '"ss13"', '"ss14"', '"ss15"', '"ss16"', '"ss17"', '"ss18"', '"ss19"', '"ss20"', '"ssty"', '"stch"', '"subs"', '"sups"', '"swsh"', '"titl"', '"tjmo"', '"tnam"', '"tnum"', '"trad"', '"twid"', '"unic"', '"valt"', '"vatu"', '"vert"', '"vhal"', '"vjmo"', '"vkna"', '"vkrn"', '"vpal"', '"vrt2"', '"zero"']
+    elseif prop == 'font-kerning'
+      let values = ["auto", "normal", "none"]
+    elseif prop == 'font-language-override'
+      let values = ["normal"]
+    elseif prop == 'font-size'
+      let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
+    elseif prop == 'font-size-adjust'
+      let values = []
+    elseif prop == 'font-stretch'
+      let values = ["normal", "ultra-condensed", "extra-condensed", "condensed", "semi-condensed", "semi-expanded", "expanded", "extra-expanded", "ultra-expanded"]
+    elseif prop == 'font-style'
+      let values = ["normal", "italic", "oblique"]
+    elseif prop == 'font-synthesis'
+      let values = ["none", "weight", "style"]
+    elseif prop == 'font-variant-alternates'
+      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("]
+    elseif prop == 'font-variant-caps'
+      let values = ["normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"]
+    elseif prop == 'font-variant-asian'
+      let values = ["normal", "ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"]
+    elseif prop == 'font-variant-ligatures'
+      let values = ["normal", "none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"]
+    elseif prop == 'font-variant-numeric'
+      let values = ["normal", "ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"]
+    elseif prop == 'font-variant-position'
+      let values = ["normal", "sub", "super"]
+    elseif prop == 'font-variant'
+      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("] + ["small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"] + ["ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"] + ["none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"] + ["ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"] + ["sub", "super"]
+    elseif prop == 'font-weight'
+      let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
+    elseif prop == 'font'
+      let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
+    elseif prop =~ '^\%(height\|width\)$'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop =~ '^\%(left\|rigth\)$'
+      let values = ["auto"]
+    elseif prop == 'image-rendering'
+      let values = ["auto", "crisp-edges", "pixelated"]
+    elseif prop == 'image-orientation'
+      let values = ["from-image", "flip"]
+    elseif prop == 'ime-mode'
+      let values = ["auto", "normal", "active", "inactive", "disabled"]
+    elseif prop == 'inline-size'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == 'isolation'
+      let values = ["auto", "isolate"]
+    elseif prop == 'justify-content'
+      let values = ["flex-start", "flex-end", "center", "space-between", "space-around"]
+    elseif prop == 'letter-spacing'
+      let values = ["normal"]
+    elseif prop == 'line-break'
+      let values = ["auto", "loose", "normal", "strict"]
+    elseif prop == 'line-height'
+      let values = ["normal"]
+    elseif prop == 'list-style-image'
+      let values = ["url(", "none"]
+    elseif prop == 'list-style-position'
+      let values = ["inside", "outside"]
+    elseif prop == 'list-style-type'
+      let values = list_style_type_values
+    elseif prop == 'list-style'
+      let values = list_style_type_values + ["inside", "outside"] + ["url(", "none"]
+    elseif prop == 'margin'
+      let values = ["auto"]
+    elseif prop =~ 'margin-\%(right\|left\|top\|bottom\|block-start\|block-end\|inline-start\|inline-end\)$'
+      let values = ["auto"]
+    elseif prop == 'marks'
+      let values = ["crop", "cross", "none"]
+    elseif prop == 'mask'
+      let values = ["url("]
+    elseif prop == 'mask-type'
+      let values = ["luminance", "alpha"]
+    elseif prop == '\%(max\|min\)-\%(block\|inline\)-size'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == '\%(max\|min\)-\%(height\|width\)'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == '\%(max\|min\)-zoom'
+      let values = ["auto"]
+    elseif prop == 'mix-blend-mode'
+      let values = ["normal", "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity"]
+    elseif prop == 'opacity'
+      let values = []
+    elseif prop == 'orientation'
+      let values = ["auto", "portrait", "landscape"]
+    elseif prop == 'orphans'
+      let values = []
+    elseif prop == 'outline-offset'
+      let values = []
+    elseif prop == 'outline-color'
+      let values = color_values
+    elseif prop == 'outline-style'
+      let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+    elseif prop == 'outline-width'
+      let values = ["thin", "thick", "medium"]
+    elseif prop == 'outline'
+      let vals = matchstr(line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9,()#]\+\)\?$'
+        let values = color_values
+      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = ["thin", "thick", "medium"]
+      else
+        return []
+      endif
+    elseif prop == 'overflow-wrap'
+      let values = ["normal", "break-word"]
+    elseif prop =~ 'overflow\%(-x\|-y\)\='
+      let values = ["visible", "hidden", "scroll", "auto"]
+    elseif prop == 'pad'
+      let values = []
+    elseif prop == 'padding'
+      let values = []
+    elseif prop =~ 'padding-\%(top\|right\|bottom\|left\|inline-start\|inline-end\|block-start\|block-end\)$'
+      let values = []
+    elseif prop =~ 'page-break-\%(after\|before\)$'
+      let values = ["auto", "always", "avoid", "left", "right", "recto", "verso"]
+    elseif prop == 'page-break-inside'
+      let values = ["auto", "avoid"]
+    elseif prop =~ 'pause\%(-after\|-before\)\=$'
+      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
+    elseif prop == 'perspective'
+      let values = ["none"]
+    elseif prop == 'perspective-origin'
+      let values = ["top", "bottom", "left", "center", " right"]
+    elseif prop == 'pointer-events'
+      let values = ["auto", "none", "visiblePainted", "visibleFill", "visibleStroke", "visible", "painted", "fill", "stroke", "all"]
+    elseif prop == 'position'
+      let values = ["static", "relative", "absolute", "fixed", "sticky"]
+    elseif prop == 'prefix'
+      let values = []
+    elseif prop == 'quotes'
+      let values = ["none"]
+    elseif prop == 'range'
+      let values = ["auto", "infinite"]
+    elseif prop == 'resize'
+      let values = ["none", "both", "horizontal", "vertical"]
+    elseif prop =~ 'rest\%(-after\|-before\)\=$'
+      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
+    elseif prop == 'ruby-align'
+      let values = ["start", "center", "space-between", "space-around"]
+    elseif prop == 'ruby-merge'
+      let values = ["separate", "collapse", "auto"]
+    elseif prop == 'ruby-position'
+      let values = ["over", "under", "inter-character"]
+    elseif prop == 'scroll-behavior'
+      let values = ["auto", "smooth"]
+    elseif prop == 'scroll-snap-coordinate'
+      let values = ["none"]
+    elseif prop == 'scroll-snap-destination'
+      return []
+    elseif prop == 'scroll-snap-points-\%(x\|y\)$'
+      let values = ["none", "repeat("]
+    elseif prop == 'scroll-snap-type\%(-x\|-y\)\=$'
+      let values = ["none", "mandatory", "proximity"]
+    elseif prop == 'shape-image-threshold'
+      let values = []
+    elseif prop == 'shape-margin'
+      let values = []
+    elseif prop == 'shape-outside'
+      let values = ["margin-box", "border-box", "padding-box", "content-box", 'inset(', 'circle(', 'ellipse(', 'polygon(', 'url(']
+    elseif prop == 'speak'
+      let values = ["auto", "none", "normal"]
+    elseif prop == 'speak-as'
+      let values = ["auto", "normal", "spell-out", "digits"]
+    elseif prop == 'src'
+      let values = ["url("]
+    elseif prop == 'suffix'
+      let values = []
+    elseif prop == 'symbols'
+      let values = []
+    elseif prop == 'system'
+      let vals = matchstr(line, '.*:\s*\zs.*')
+      if vals =~ '^extends'
+        let values = list_style_type_values
+      else
+        let values = ["cyclic", "numeric", "alphabetic", "symbolic", "additive", "fixed", "extends"]
+      endif
+    elseif prop == 'table-layout'
+      let values = ["auto", "fixed"]
+    elseif prop == 'tab-size'
+      let values = []
+    elseif prop == 'text-align'
+      let values = ["start", "end", "left", "right", "center", "justify", "match-parent"]
+    elseif prop == 'text-align-last'
+      let values = ["auto", "start", "end", "left", "right", "center", "justify"]
+    elseif prop == 'text-combine-upright'
+      let values = ["none", "all", "digits"]
+    elseif prop == 'text-decoration-line'
+      let values = ["none", "underline", "overline", "line-through", "blink"]
+    elseif prop == 'text-decoration-color'
+      let values = color_values
+    elseif prop == 'text-decoration-style'
+      let values = ["solid", "double", "dotted", "dashed", "wavy"]
+    elseif prop == 'text-decoration'
+      let values = ["none", "underline", "overline", "line-through", "blink"] + ["solid", "double", "dotted", "dashed", "wavy"] + color_values
+    elseif prop == 'text-emphasis-color'
+      let values = color_values
+    elseif prop == 'text-emphasis-position'
+      let values = ["over", "under", "left", "right"]
+    elseif prop == 'text-emphasis-style'
+      let values = ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
+    elseif prop == 'text-emphasis'
+      let values = color_values + ["over", "under", "left", "right"] + ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
+    elseif prop == 'text-indent'
+      let values = ["hanging", "each-line"]
+    elseif prop == 'text-orientation'
+      let values = ["mixed", "upright", "sideways", "sideways-right", "use-glyph-orientation"]
+    elseif prop == 'text-overflow'
+      let values = ["clip", "ellipsis"]
+    elseif prop == 'text-rendering'
+      let values = ["auto", "optimizeSpeed", "optimizeLegibility", "geometricPrecision"]
+    elseif prop == 'text-shadow'
+      let values = color_values
+    elseif prop == 'text-transform'
+      let values = ["capitalize", "uppercase", "lowercase", "full-width", "none"]
+    elseif prop == 'text-underline-position'
+      let values = ["auto", "under", "left", "right"]
+    elseif prop == 'touch-action'
+      let values = ["auto", "none", "pan-x", "pan-y", "manipulation", "pan-left", "pan-right", "pan-top", "pan-down"]
+    elseif prop == 'transform'
+      let values = ["matrix(", "translate(", "translateX(", "translateY(", "scale(", "scaleX(", "scaleY(", "rotate(", "skew(", "skewX(", "skewY(", "matrix3d(", "translate3d(", "translateZ(", "scale3d(", "scaleZ(", "rotate3d(", "rotateX(", "rotateY(", "rotateZ(", "perspective("]
+    elseif prop == 'transform-box'
+      let values = ["border-box", "fill-box", "view-box"]
+    elseif prop == 'transform-origin'
+      let values = ["left", "center", "right", "top", "bottom"]
+    elseif prop == 'transform-style'
+      let values = ["flat", "preserve-3d"]
+    elseif prop == 'top'
+      let values = ["auto"]
+    elseif prop == 'transition-property'
+      let values = ["all", "none"] + s:values
+    elseif prop == 'transition-duration'
+      let values = []
+    elseif prop == 'transition-delay'
+      let values = []
+    elseif prop == 'transition-timing-function'
+      let values = timing_functions
+    elseif prop == 'transition'
+      let values = ["all", "none"] + s:values + timing_functions
+    elseif prop == 'unicode-bidi'
+      let values = ["normal", "embed", "isolate", "bidi-override", "isolate-override", "plaintext"]
+    elseif prop == 'unicode-range'
+      let values = ["U+"]
+    elseif prop == 'user-zoom'
+      let values = ["zoom", "fixed"]
+    elseif prop == 'vertical-align'
+      let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"]
+    elseif prop == 'visibility'
+      let values = ["visible", "hidden", "collapse"]
+    elseif prop == 'voice-volume'
+      let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"]
+    elseif prop == 'voice-balance'
+      let values = ["left", "center", "right", "leftwards", "rightwards"]
+    elseif prop == 'voice-family'
+      let values = []
+    elseif prop == 'voice-rate'
+      let values = ["normal", "x-slow", "slow", "medium", "fast", "x-fast"]
+    elseif prop == 'voice-pitch'
+      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
+    elseif prop == 'voice-range'
+      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
+    elseif prop == 'voice-stress'
+      let values = ["normal", "strong", "moderate", "none", "reduced "]
+    elseif prop == 'voice-duration'
+      let values = ["auto"]
+    elseif prop == 'white-space'
+      let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"]
+    elseif prop == 'widows'
+      let values = []
+    elseif prop == 'will-change'
+      let values = ["auto", "scroll-position", "contents"] + s:values
+    elseif prop == 'word-break'
+      let values = ["normal", "break-all", "keep-all"]
+    elseif prop == 'word-spacing'
+      let values = ["normal"]
+    elseif prop == 'word-wrap'
+      let values = ["normal", "break-word"]
+    elseif prop == 'writing-mode'
+      let values = ["horizontal-tb", "vertical-rl", "vertical-lr", "sideways-rl", "sideways-lr"]
+    elseif prop == 'z-index'
+      let values = ["auto"]
+    elseif prop == 'zoom'
+      let values = ["auto"]
+    else
+      " If no property match it is possible we are outside of {} and
+      " trying to complete pseudo-(class|element)
+      let element = tolower(matchstr(line, '\zs[a-zA-Z1-6]*\ze:[^:[:space:]]\{-}$'))
+      if stridx('a,abbr,address,area,article,aside,audio,b,base,bdi,bdo,bgsound,blockquote,body,br,button,canvas,caption,center,cite,code,col,colgroup,command,content,data,datalist,dd,del,details,dfn,dialog,div,dl,dt,element,em,embed,fieldset,figcaption,figure,font,footer,form,frame,frameset,head,header,hgroup,hr,html,i,iframe,image,img,input,ins,isindex,kbd,keygen,label,legend,li,link,main,map,mark,menu,menuitem,meta,meter,nav,nobr,noframes,noscript,object,ol,optgroup,option,output,p,param,picture,pre,progress,q,rp,rt,rtc,ruby,s,samp,script,section,select,shadow,small,source,span,strong,style,sub,summary,sup,table,tbody,td,template,textarea,tfoot,th,thead,time,title,tr,track,u,ul,var,video,wbr', ','.element.',') > -1
+        let values = ["active", "any", "checked", "default", "dir(", "disabled", "empty", "enabled", "first", "first-child", "first-of-type", "fullscreen", "focus", "hover", "indeterminate", "in-range", "invalid", "lang(", "last-child", "last-of-type", "left", "link", "not(", "nth-child(", "nth-last-child(", "nth-last-of-type(", "nth-of-type(", "only-child", "only-of-type", "optional", "out-of-range", "read-only", "read-write", "required", "right", "root", "scope", "target", "valid", "visited", "first-line", "first-letter", "before", "after", "selection", "backdrop"]
+      else
+        return []
+      endif
+    endif
+
+    let values = wide_keywords + values
+    " Complete values
+    let entered_value = matchstr(line, '.\{-}\zs[a-zA-Z0-9#,.(_-]*$')
+
+    for m in values
+      if m =~? '^'.entered_value
+        call add(res, m)
+      elseif m =~? entered_value
+        call add(res2, m)
+      endif
+    endfor
+
+    return res + res2
+
+  elseif borders[max(keys(borders))] == 'closebrace'
+
+    return []
+
+  elseif borders[max(keys(borders))] == 'exclam'
+
+    " Complete values
+    let entered_imp = matchstr(line, '.\{-}!\s*\zs[a-zA-Z ]*$')
+
+    let values = ["important"]
+
+    for m in values
+      if m =~? '^'.entered_imp
+        call add(res, m)
+      endif
+    endfor
+
+    return res
+
+  elseif borders[max(keys(borders))] == 'atrule'
+
+    let afterat = matchstr(line, '.*@\zs.*')
+
+    if afterat =~ '\s'
+
+      let atrulename = matchstr(line, '.*@\zs[a-zA-Z-]\+\ze')
+
+      if atrulename == 'media'
+        let entered_atruleafter = matchstr(line, '.*@media\s\+\zs.*$')
+
+        if entered_atruleafter =~ "([^)]*$"
+          let entered_atruleafter = matchstr(entered_atruleafter, '(\s*\zs[^)]*$')
+          let values = ["max-width", "min-width", "width", "max-height", "min-height", "height", "max-aspect-ration", "min-aspect-ration", "aspect-ratio", "orientation", "max-resolution", "min-resolution", "resolution", "scan", "grid", "update-frequency", "overflow-block", "overflow-inline", "max-color", "min-color", "color", "max-color-index", "min-color-index", "color-index", "monochrome", "inverted-colors", "pointer", "hover", "any-pointer", "any-hover", "light-level", "scripting"]
+        else
+          let values = ["screen", "print", "speech", "all", "not", "and", "("]
+        endif
+
+      elseif atrulename == 'supports'
+        let entered_atruleafter = matchstr(line, '.*@supports\s\+\zs.*$')
+
+        if entered_atruleafter =~ "([^)]*$"
+          let entered_atruleafter = matchstr(entered_atruleafter, '(\s*\zs.*$')
+          let values = s:values
+        else
+          let values = ["("]
+        endif
+
+      elseif atrulename == 'charset'
+        let entered_atruleafter = matchstr(line, '.*@charset\s\+\zs.*$')
+        let values = [
+          \ '"UTF-8";', '"ANSI_X3.4-1968";', '"ISO_8859-1:1987";', '"ISO_8859-2:1987";', '"ISO_8859-3:1988";', '"ISO_8859-4:1988";', '"ISO_8859-5:1988";', 
+          \ '"ISO_8859-6:1987";', '"ISO_8859-7:1987";', '"ISO_8859-8:1988";', '"ISO_8859-9:1989";', '"ISO-8859-10";', '"ISO_6937-2-add";', '"JIS_X0201";', 
+          \ '"JIS_Encoding";', '"Shift_JIS";', '"Extended_UNIX_Code_Packed_Format_for_Japanese";', '"Extended_UNIX_Code_Fixed_Width_for_Japanese";',
+          \ '"BS_4730";', '"SEN_850200_C";', '"IT";', '"ES";', '"DIN_66003";', '"NS_4551-1";', '"NF_Z_62-010";', '"ISO-10646-UTF-1";', '"ISO_646.basic:1983";',
+          \ '"INVARIANT";', '"ISO_646.irv:1983";', '"NATS-SEFI";', '"NATS-SEFI-ADD";', '"NATS-DANO";', '"NATS-DANO-ADD";', '"SEN_850200_B";', '"KS_C_5601-1987";',
+          \ '"ISO-2022-KR";', '"EUC-KR";', '"ISO-2022-JP";', '"ISO-2022-JP-2";', '"JIS_C6220-1969-jp";', '"JIS_C6220-1969-ro";', '"PT";', '"greek7-old";', 
+          \ '"latin-greek";', '"NF_Z_62-010_(1973)";', '"Latin-greek-1";', '"ISO_5427";', '"JIS_C6226-1978";', '"BS_viewdata";', '"INIS";', '"INIS-8";', 
+          \ '"INIS-cyrillic";', '"ISO_5427:1981";', '"ISO_5428:1980";', '"GB_1988-80";', '"GB_2312-80";', '"NS_4551-2";', '"videotex-suppl";', '"PT2";', 
+          \ '"ES2";', '"MSZ_7795.3";', '"JIS_C6226-1983";', '"greek7";', '"ASMO_449";', '"iso-ir-90";', '"JIS_C6229-1984-a";', '"JIS_C6229-1984-b";', 
+          \ '"JIS_C6229-1984-b-add";', '"JIS_C6229-1984-hand";', '"JIS_C6229-1984-hand-add";', '"JIS_C6229-1984-kana";', '"ISO_2033-1983";', 
+          \ '"ANSI_X3.110-1983";', '"T.61-7bit";', '"T.61-8bit";', '"ECMA-cyrillic";', '"CSA_Z243.4-1985-1";', '"CSA_Z243.4-1985-2";', '"CSA_Z243.4-1985-gr";', 
+          \ '"ISO_8859-6-E";', '"ISO_8859-6-I";', '"T.101-G2";', '"ISO_8859-8-E";', '"ISO_8859-8-I";', '"CSN_369103";', '"JUS_I.B1.002";', '"IEC_P27-1";', 
+          \ '"JUS_I.B1.003-serb";', '"JUS_I.B1.003-mac";', '"greek-ccitt";', '"NC_NC00-10:81";', '"ISO_6937-2-25";', '"GOST_19768-74";', '"ISO_8859-supp";', 
+          \ '"ISO_10367-box";', '"latin-lap";', '"JIS_X0212-1990";', '"DS_2089";', '"us-dk";', '"dk-us";', '"KSC5636";', '"UNICODE-1-1-UTF-7";', '"ISO-2022-CN";', 
+          \ '"ISO-2022-CN-EXT";', '"ISO-8859-13";', '"ISO-8859-14";', '"ISO-8859-15";', '"ISO-8859-16";', '"GBK";', '"GB18030";', '"OSD_EBCDIC_DF04_15";', 
+          \ '"OSD_EBCDIC_DF03_IRV";', '"OSD_EBCDIC_DF04_1";', '"ISO-11548-1";', '"KZ-1048";', '"ISO-10646-UCS-2";', '"ISO-10646-UCS-4";', '"ISO-10646-UCS-Basic";',
+          \ '"ISO-10646-Unicode-Latin1";', '"ISO-10646-J-1";', '"ISO-Unicode-IBM-1261";', '"ISO-Unicode-IBM-1268";', '"ISO-Unicode-IBM-1276";', 
+          \ '"ISO-Unicode-IBM-1264";', '"ISO-Unicode-IBM-1265";', '"UNICODE-1-1";', '"SCSU";', '"UTF-7";', '"UTF-16BE";', '"UTF-16LE";', '"UTF-16";', '"CESU-8";', 
+          \ '"UTF-32";', '"UTF-32BE";', '"UTF-32LE";', '"BOCU-1";', '"ISO-8859-1-Windows-3.0-Latin-1";', '"ISO-8859-1-Windows-3.1-Latin-1";', 
+          \ '"ISO-8859-2-Windows-Latin-2";', '"ISO-8859-9-Windows-Latin-5";', '"hp-roman8";', '"Adobe-Standard-Encoding";', '"Ventura-US";', 
+          \ '"Ventura-International";', '"DEC-MCS";', '"IBM850";', '"PC8-Danish-Norwegian";', '"IBM862";', '"PC8-Turkish";', '"IBM-Symbols";', '"IBM-Thai";', 
+          \ '"HP-Legal";', '"HP-Pi-font";', '"HP-Math8";', '"Adobe-Symbol-Encoding";', '"HP-DeskTop";', '"Ventura-Math";', '"Microsoft-Publishing";', 
+          \ '"Windows-31J";', '"GB2312";', '"Big5";', '"macintosh";', '"IBM037";', '"IBM038";', '"IBM273";', '"IBM274";', '"IBM275";', '"IBM277";', '"IBM278";', 
+          \ '"IBM280";', '"IBM281";', '"IBM284";', '"IBM285";', '"IBM290";', '"IBM297";', '"IBM420";', '"IBM423";', '"IBM424";', '"IBM437";', '"IBM500";', '"IBM851";', 
+          \ '"IBM852";', '"IBM855";', '"IBM857";', '"IBM860";', '"IBM861";', '"IBM863";', '"IBM864";', '"IBM865";', '"IBM868";', '"IBM869";', '"IBM870";', '"IBM871";', 
+          \ '"IBM880";', '"IBM891";', '"IBM903";', '"IBM904";', '"IBM905";', '"IBM918";', '"IBM1026";', '"EBCDIC-AT-DE";', '"EBCDIC-AT-DE-A";', '"EBCDIC-CA-FR";', 
+          \ '"EBCDIC-DK-NO";', '"EBCDIC-DK-NO-A";', '"EBCDIC-FI-SE";', '"EBCDIC-FI-SE-A";', '"EBCDIC-FR";', '"EBCDIC-IT";', '"EBCDIC-PT";', '"EBCDIC-ES";', 
+          \ '"EBCDIC-ES-A";', '"EBCDIC-ES-S";', '"EBCDIC-UK";', '"EBCDIC-US";', '"UNKNOWN-8BIT";', '"MNEMONIC";', '"MNEM";', '"VISCII";', '"VIQR";', '"KOI8-R";', 
+          \ '"HZ-GB-2312";', '"IBM866";', '"IBM775";', '"KOI8-U";', '"IBM00858";', '"IBM00924";', '"IBM01140";', '"IBM01141";', '"IBM01142";', '"IBM01143";', 
+          \ '"IBM01144";', '"IBM01145";', '"IBM01146";', '"IBM01147";', '"IBM01148";', '"IBM01149";', '"Big5-HKSCS";', '"IBM1047";', '"PTCP154";', '"Amiga-1251";', 
+          \ '"KOI7-switched";', '"BRF";', '"TSCII";', '"windows-1250";', '"windows-1251";', '"windows-1252";', '"windows-1253";', '"windows-1254";', '"windows-1255";', 
+          \ '"windows-1256";', '"windows-1257";', '"windows-1258";', '"TIS-620";']
+
+      elseif atrulename == 'namespace'
+        let entered_atruleafter = matchstr(line, '.*@namespace\s\+\zs.*$')
+        let values = ["url("]
+
+      elseif atrulename == 'document'
+        let entered_atruleafter = matchstr(line, '.*@document\s\+\zs.*$')
+        let values = ["url(", "url-prefix(", "domain(", "regexp("]
+
+      elseif atrulename == 'import'
+        let entered_atruleafter = matchstr(line, '.*@import\s\+\zs.*$')
+
+        if entered_atruleafter =~ "^[\"']"
+          let filestart = matchstr(entered_atruleafter, '^.\zs.*')
+          let files = split(glob(filestart.'*'), '\n')
+          let values = map(copy(files), '"\"".v:val')
+
+        elseif entered_atruleafter =~ "^url("
+          let filestart = matchstr(entered_atruleafter, "^url([\"']\\?\\zs.*")
+          let files = split(glob(filestart.'*'), '\n')
+          let values = map(copy(files), '"url(".v:val')
+
+        else
+          let values = ['"', 'url(']
+
+        endif
+
+      else
+        return []
+
+      endif
+
+      for m in values
+        if m =~? '^'.entered_atruleafter
+          if entered_atruleafter =~? '^"' && m =~? '^"'
+            let m = m[1:]
+          endif
+          if b:after =~? '"' && stridx(m, '"') > -1
+            let m = m[0:stridx(m, '"')-1]
+          endif 
+          call add(res, m)
+        elseif m =~? entered_atruleafter
+          if m =~? '^"'
+            let m = m[1:]
+          endif
+          call add(res2, m)
+        endif
+      endfor
+
+      return res + res2
+
+    endif
+
+    let values = ["charset", "page", "media", "import", "font-face", "namespace", "supports", "keyframes", "viewport", "document"]
+
+    let entered_atrule = matchstr(line, '.*@\zs[a-zA-Z-]*$')
+
+    for m in values
+      if m =~? '^'.entered_atrule
+        call add(res, m .' ')
+      elseif m =~? entered_atrule
+        call add(res2, m .' ')
+      endif
+    endfor
+
+    return res + res2
+
+  endif
+
+  return []
 
 endfunction
diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim
new file mode 100644
index 0000000000..93ca4dfc54
--- /dev/null
+++ b/runtime/autoload/health.vim
@@ -0,0 +1,178 @@
+function! s:enhance_syntax() abort
+  syntax case match
+
+  syntax keyword healthError ERROR
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  highlight link healthError Error
+
+  syntax keyword healthWarning WARNING
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  highlight link healthWarning WarningMsg
+
+  syntax keyword healthInfo INFO
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  highlight link healthInfo ModeMsg
+
+  syntax keyword healthSuccess SUCCESS
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  highlight link healthSuccess ModeMsg
+
+  syntax keyword healthSuggestion SUGGESTIONS
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  highlight link healthSuggestion String
+
+  syntax match healthHelp "|.\{-}|" contains=healthBar
+        \ containedin=markdownCodeBlock,mkdListItemLine
+  syntax match healthBar  "|" contained conceal
+  highlight link healthHelp Identifier
+
+  " We do not care about markdown syntax errors in :CheckHealth output.
+  highlight! link markdownError Normal
+endfunction
+
+" Runs the specified healthchecks.
+" Runs all discovered healthchecks if a:plugin_names is empty.
+function! health#check(plugin_names) abort
+  let healthchecks = empty(a:plugin_names)
+        \ ? s:discover_health_checks()
+        \ : s:to_fn_names(a:plugin_names)
+
+  tabnew
+  setlocal wrap breakindent
+  setlocal filetype=markdown
+  setlocal conceallevel=2 concealcursor=nc
+  setlocal keywordprg=:help
+  call s:enhance_syntax()
+
+  if empty(healthchecks)
+    call setline(1, 'ERROR: No healthchecks found.')
+  else
+    redraw|echo 'Running healthchecks...'
+    for c in healthchecks
+      let output = ''
+      call append('$', split(printf("\n%s\n%s", c, repeat('=',72)), "\n"))
+      try
+        let output = "\n\n".execute('call '.c.'()')
+      catch
+        if v:exception =~# '^Vim\%((\a\+)\)\=:E117.*\V'.c
+          let output = execute(
+                \ 'call health#report_error(''No healthcheck found for "'
+                \ .s:to_plugin_name(c)
+                \ .'" plugin.'')')
+        else
+          let output = execute(
+                \ 'call health#report_error(''Failed to run healthcheck for "'
+                \ .s:to_plugin_name(c)
+                \ .'" plugin. Exception:''."\n".v:throwpoint."\n".v:exception)')
+        endif
+      endtry
+      call append('$', split(output, "\n") + [''])
+      redraw
+    endfor
+  endif
+
+  " needed for plasticboy/vim-markdown, because it uses fdm=expr
+  normal! zR
+  setlocal nomodified
+  redraw|echo ''
+endfunction
+
+" Starts a new report.
+function! health#report_start(name) abort
+  echo "\n## " . a:name
+endfunction
+
+" Indents lines *except* line 1 of a string if it contains newlines.
+function! s:indent_after_line1(s, columns) abort
+  let lines = split(a:s, "\n", 0)
+  if len(lines) < 2  " We do not indent line 1, so nothing to do.
+    return a:s
+  endif
+  for i in range(1, len(lines)-1)  " Indent lines after the first.
+    let lines[i] = substitute(lines[i], '^\s*', repeat(' ', a:columns), 'g')
+  endfor
+  return join(lines, "\n")
+endfunction
+
+" Changes ':h clipboard' to ':help |clipboard|'.
+function! s:help_to_link(s) abort
+  return substitute(a:s, '\v[''"]?:h%[elp] ([^''"]+)[''"]?', '":help |\1|"', 'g')
+endfunction
+
+" Format a message for a specific report item
+function! s:format_report_message(status, msg, ...) abort " {{{
+  let output = '  - ' . a:status . ': ' . s:indent_after_line1(a:msg, 4)
+  let suggestions = []
+
+  " Optional parameters
+  if a:0 > 0
+    let suggestions = type(a:1) == type("") ? [a:1] : a:1
+    if type(suggestions) != type([])
+      echoerr "Expected String or List"
+    endif
+  endif
+
+  " Report each suggestion
+  if len(suggestions) > 0
+    let output .= "\n    - SUGGESTIONS:"
+  endif
+  for suggestion in suggestions
+    let output .= "\n      - " . s:indent_after_line1(suggestion, 10)
+  endfor
+
+  return s:help_to_link(output)
+endfunction " }}}
+
+" Use {msg} to report information in the current section
+function! health#report_info(msg) abort " {{{
+  echo s:format_report_message('INFO', a:msg)
+endfunction " }}}
+
+" Reports a successful healthcheck.
+function! health#report_ok(msg) abort " {{{
+  echo s:format_report_message('SUCCESS', a:msg)
+endfunction " }}}
+
+" Reports a health warning.
+function! health#report_warn(msg, ...) abort " {{{
+  if a:0 > 0
+    echo s:format_report_message('WARNING', a:msg, a:1)
+  else
+    echo s:format_report_message('WARNING', a:msg)
+  endif
+endfunction " }}}
+
+" Reports a failed healthcheck.
+function! health#report_error(msg, ...) abort " {{{
+  if a:0 > 0
+    echo s:format_report_message('ERROR', a:msg, a:1)
+  else
+    echo s:format_report_message('ERROR', a:msg)
+  endif
+endfunction " }}}
+
+function! s:filepath_to_function(name) abort
+  return substitute(substitute(substitute(a:name, '.*autoload[\/]', '', ''),
+        \ '\.vim', '#check', ''), '[\/]', '#', 'g')
+endfunction
+
+function! s:discover_health_checks() abort
+  let healthchecks = globpath(&runtimepath, 'autoload/health/*.vim', 1, 1)
+  let healthchecks = map(healthchecks, '<SID>filepath_to_function(v:val)')
+  return healthchecks
+endfunction
+
+" Translates a list of plugin names to healthcheck function names.
+function! s:to_fn_names(plugin_names) abort
+  let healthchecks = []
+  for p in a:plugin_names
+    call add(healthchecks, 'health#'.p.'#check')
+  endfor
+  return healthchecks
+endfunction
+
+" Extracts 'foo' from 'health#foo#check'.
+function! s:to_plugin_name(fn_name) abort
+  return substitute(a:fn_name,
+        \ '\v.*health\#(.+)\#check.*', '\1', '')
+endfunction
diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim
new file mode 100644
index 0000000000..e2ad9f7ccb
--- /dev/null
+++ b/runtime/autoload/health/nvim.vim
@@ -0,0 +1,152 @@
+let s:suggest_faq = 'See https://github.com/neovim/neovim/wiki/FAQ'
+
+function! s:check_config() abort
+  call health#report_start('Configuration')
+  if !get(g:, 'loaded_sensible', 0)
+    call health#report_ok('no issues found')
+  else
+    let sensible_pi = globpath(&runtimepath, '**/sensible.vim', 1, 1)
+    call health#report_info("found sensible.vim plugin:\n".join(sensible_pi, "\n"))
+    call health#report_error("sensible.vim plugin is not needed; Nvim has the same defaults built-in."
+      \ ." Also, sensible.vim sets 'ttimeoutlen' to a sub-optimal value.",
+      \ ["Remove sensible.vim plugin, or wrap it in a `if !has('nvim')` check."])
+  endif
+endfunction
+
+" Load the remote plugin manifest file and check for unregistered plugins
+function! s:check_rplugin_manifest() abort
+  call health#report_start('Remote Plugins')
+  let existing_rplugins = {}
+
+  for item in remote#host#PluginsForHost('python')
+    let existing_rplugins[item.path] = 'python'
+  endfor
+
+  for item in remote#host#PluginsForHost('python3')
+    let existing_rplugins[item.path] = 'python3'
+  endfor
+
+  let require_update = 0
+
+  for path in map(split(&runtimepath, ','), 'resolve(v:val)')
+    let python_glob = glob(path.'/rplugin/python*', 1, 1)
+    if empty(python_glob)
+      continue
+    endif
+
+    let python_dir = python_glob[0]
+    let python_version = fnamemodify(python_dir, ':t')
+
+    for script in glob(python_dir.'/*.py', 1, 1)
+          \ + glob(python_dir.'/*/__init__.py', 1, 1)
+      let contents = join(readfile(script))
+      if contents =~# '\<\%(from\|import\)\s\+neovim\>'
+        if script =~# '[\/]__init__\.py$'
+          let script = fnamemodify(script, ':h')
+        endif
+
+        if !has_key(existing_rplugins, script)
+          let msg = printf('"%s" is not registered.', fnamemodify(path, ':t'))
+          if python_version ==# 'pythonx'
+            if !has('python2') && !has('python3')
+              let msg .= ' (python2 and python3 not available)'
+            endif
+          elseif !has(python_version)
+            let msg .= printf(' (%s not available)', python_version)
+          else
+            let require_update = 1
+          endif
+
+          call health#report_warn(msg)
+        endif
+
+        break
+      endif
+    endfor
+  endfor
+
+  if require_update
+    call health#report_warn('Out of date', ['Run `:UpdateRemotePlugins`'])
+  else
+    call health#report_ok('Up to date')
+  endif
+endfunction
+
+function! s:check_performance() abort
+  call health#report_start('Performance')
+
+  " check buildtype
+  let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
+  if empty(buildtype)
+    call health#report_error('failed to get build type from :version')
+  elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
+    call health#report_ok(buildtype)
+  else
+    call health#report_info(buildtype)
+    call health#report_warn(
+          \ "Non-optimized build-type. Nvim will be slower.",
+          \ ["Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.",
+          \  s:suggest_faq])
+  endif
+endfunction
+
+function! s:check_tmux() abort
+  if empty($TMUX) || !executable('tmux')
+    return
+  endif
+  call health#report_start('tmux')
+
+  " check escape-time
+  let suggestions = ["Set escape-time in ~/.tmux.conf:\nset-option -sg escape-time 10",
+        \ s:suggest_faq]
+  let cmd = 'tmux show-option -qvgs escape-time'
+  let out = system(cmd)
+  let tmux_esc_time = substitute(out, '\v(\s|\r|\n)', '', 'g')
+  if v:shell_error
+    call health#report_error('command failed: '.cmd."\n".out)
+  elseif empty(tmux_esc_time)
+    call health#report_error('escape-time is not set', suggestions)
+  elseif tmux_esc_time > 300
+    call health#report_error(
+        \ 'escape-time ('.tmux_esc_time.') is higher than 300ms', suggestions)
+  else
+    call health#report_ok('escape-time: '.tmux_esc_time.'ms')
+  endif
+
+  " check $TERM
+  call health#report_info('$TERM: '.$TERM)
+  if $TERM !~# '\v(tmux-256color|screen-256color)'
+    call health#report_error(
+          \ '$TERM should be "screen-256color" or "tmux-256color" when running tmux.',
+          \ ["Set default-terminal in ~/.tmux.conf:\nset-option -g default-terminal \"screen-256color\"",
+          \  s:suggest_faq])
+  endif
+endfunction
+
+function! s:check_terminal() abort
+  if !executable('infocmp')
+    return
+  endif
+  call health#report_start('terminal')
+  let cmd = 'infocmp -L'
+  let out = system(cmd)
+  let kbs_entry   = matchstr(out, 'key_backspace=[^,[:space:]]*')
+  let kdch1_entry = matchstr(out, 'key_dc=[^,[:space:]]*')
+
+  if v:shell_error
+    call health#report_error('command failed: '.cmd."\n".out)
+  else
+    call health#report_info('key_backspace (kbs) terminfo entry: '
+        \ .(empty(kbs_entry) ? '? (not found)' : kbs_entry))
+    call health#report_info('key_dc (kdch1) terminfo entry: '
+        \ .(empty(kbs_entry) ? '? (not found)' : kdch1_entry))
+  endif
+endfunction
+
+function! health#nvim#check() abort
+  call s:check_config()
+  call s:check_performance()
+  call s:check_rplugin_manifest()
+  call s:check_terminal()
+  call s:check_tmux()
+endfunction
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
new file mode 100644
index 0000000000..417426c101
--- /dev/null
+++ b/runtime/autoload/health/provider.vim
@@ -0,0 +1,461 @@
+let s:shell_error = 0
+
+function! s:is_bad_response(s) abort
+  return a:s =~? '\v(^unable)|(^error)|(^outdated)'
+endfunction
+
+function! s:trim(s) abort
+  return substitute(a:s, '^\_s*\|\_s*$', '', 'g')
+endfunction
+
+" Simple version comparison.
+function! s:version_cmp(a, b) abort
+  let a = split(a:a, '\.', 0)
+  let b = split(a:b, '\.', 0)
+
+  for i in range(len(a))
+    if str2nr(a[i]) > str2nr(b[i])
+      return 1
+    elseif str2nr(a[i]) < str2nr(b[i])
+      return -1
+    endif
+  endfor
+
+  return 0
+endfunction
+
+" Handler for s:system() function.
+function! s:system_handler(jobid, data, event) dict abort
+  if a:event == 'stdout' || a:event == 'stderr'
+    let self.output .= join(a:data, '')
+  elseif a:event == 'exit'
+    let s:shell_error = a:data
+  endif
+endfunction
+
+" Run a system command and timeout after 30 seconds.
+function! s:system(cmd, ...) abort
+  let stdin = a:0 ? a:1 : ''
+  let ignore_stderr = a:0 > 1 ? a:2 : 0
+  let ignore_error = a:0 > 2 ? a:3 : 0
+  let opts = {
+        \ 'output': '',
+        \ 'on_stdout': function('s:system_handler'),
+        \ 'on_exit': function('s:system_handler'),
+        \ }
+  if !ignore_stderr
+    let opts.on_stderr = function('s:system_handler')
+  endif
+  let jobid = jobstart(a:cmd, opts)
+
+  if jobid < 1
+    call health#report_error(printf('Command error %d: %s', jobid,
+          \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd)))
+    let s:shell_error = 1
+    return opts.output
+  endif
+
+  if !empty(stdin)
+    call jobsend(jobid, stdin)
+  endif
+
+  let res = jobwait([jobid], 30000)
+  if res[0] == -1
+    call health#report_error(printf('Command timed out: %s',
+          \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd))
+    call jobstop(jobid)
+  elseif s:shell_error != 0 && !ignore_error
+    call health#report_error(printf("Command error (%d) %s: %s", jobid,
+          \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd,
+          \ opts.output))
+  endif
+
+  return opts.output
+endfunction
+
+function! s:systemlist(cmd, ...) abort
+  let stdout = split(s:system(a:cmd, a:0 ? a:1 : ''), "\n")
+  if a:0 > 1 && !empty(a:2)
+    return filter(stdout, '!empty(v:val)')
+  endif
+  return stdout
+endfunction
+
+" Fetch the contents of a URL.
+function! s:download(url) abort
+  if executable('curl')
+    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')
+    let script = "
+          \try:\n
+          \    from urllib.request import urlopen\n
+          \except ImportError:\n
+          \    from urllib2 import urlopen\n
+          \\n
+          \response = urlopen('".a:url."')\n
+          \print(response.read().decode('utf8'))\n
+          \"
+    let rv = s:system(['python', '-c', script])
+    return empty(rv) && s:shell_error
+          \ ? 'python urllib.request error: '.s:shell_error
+          \ : rv
+  endif
+  return 'missing `curl` and `python`, cannot make pypi request'
+endfunction
+
+" Check for clipboard tools.
+function! s:check_clipboard() abort
+  call health#report_start('Clipboard')
+
+  let clipboard_tool = provider#clipboard#Executable()
+  if empty(clipboard_tool)
+    call health#report_warn(
+          \ "No clipboard tool found. Clipboard registers will not work.",
+          \ ['See ":help clipboard".'])
+  else
+    call health#report_ok('Clipboard tool found: '. clipboard_tool)
+  endif
+endfunction
+
+" Get the latest Neovim Python client version from PyPI.
+function! s:latest_pypi_version() abort
+  let pypi_version = 'unable to get pypi response'
+  let pypi_response = s:download('https://pypi.python.org/pypi/neovim/json')
+  if !empty(pypi_response)
+    try
+      let pypi_data = json_decode(pypi_response)
+    catch /E474/
+      return 'error: '.pypi_response
+    endtry
+    let pypi_version = get(get(pypi_data, 'info', {}), 'version', 'unable to parse')
+  endif
+  return pypi_version
+endfunction
+
+" Get version information using the specified interpreter.  The interpreter is
+" used directly in case breaking changes were introduced since the last time
+" Neovim's Python client was updated.
+"
+" Returns: [
+"     {python executable version},
+"     {current nvim version},
+"     {current pypi nvim status},
+"     {installed version status}
+" ]
+function! s:version_info(python) abort
+  let pypi_version = s:latest_pypi_version()
+  let python_version = s:trim(s:system([
+        \ a:python,
+        \ '-c',
+        \ 'import sys; print(".".join(str(x) for x in sys.version_info[:3]))',
+        \ ]))
+
+  if empty(python_version)
+    let python_version = 'unable to parse python response'
+  endif
+
+  let nvim_path = s:trim(s:system([
+        \ a:python, '-c', 'import neovim; print(neovim.__file__)']))
+  if s:shell_error || empty(nvim_path)
+    return [python_version, 'unable to load neovim Python module', pypi_version,
+          \ nvim_path]
+  endif
+
+  " Assuming that multiple versions of a package are installed, sort them
+  " numerically in descending order.
+  function! s:compare(metapath1, metapath2)
+    let a = matchstr(fnamemodify(a:metapath1, ':p:h:t'), '[0-9.]\+')
+    let b = matchstr(fnamemodify(a:metapath2, ':p:h:t'), '[0-9.]\+')
+    return a == b ? 0 : a > b ? 1 : -1
+  endfunction
+
+  " Try to get neovim.VERSION (added in 0.1.11dev).
+  let nvim_version = s:system(['python', '-c',
+        \ 'from neovim import VERSION as v; '.
+        \ 'print("{}.{}.{}{}".format(v.major, v.minor, v.patch, v.prerelease))'],
+        \ '', 1, 1)
+  if empty(nvim_version)
+    let nvim_version = 'unable to find neovim Python module version'
+    let base = fnamemodify(nvim_path, ':h')
+    let metas = glob(base.'-*/METADATA', 1, 1)
+          \ + glob(base.'-*/PKG-INFO', 1, 1)
+          \ + glob(base.'.egg-info/PKG-INFO', 1, 1)
+    let metas = sort(metas, 's:compare')
+
+    if !empty(metas)
+      for meta_line in readfile(metas[0])
+        if meta_line =~# '^Version:'
+          let nvim_version = matchstr(meta_line, '^Version: \zs\S\+')
+          break
+        endif
+      endfor
+    endif
+  endif
+
+  let nvim_path_base = fnamemodify(nvim_path, ':~:h')
+  let version_status = 'unknown; '.nvim_path_base
+  if !s:is_bad_response(nvim_version) && !s:is_bad_response(pypi_version)
+    if s:version_cmp(nvim_version, pypi_version) == -1
+      let version_status = 'outdated; from '.nvim_path_base
+    else
+      let version_status = 'up to date'
+    endif
+  endif
+
+  return [python_version, nvim_version, pypi_version, version_status]
+endfunction
+
+" Check the Python interpreter's usability.
+function! s:check_bin(bin) abort
+  if !filereadable(a:bin)
+    call health#report_error(printf('"%s" was not found.', a:bin))
+    return 0
+  elseif executable(a:bin) != 1
+    call health#report_error(printf('"%s" is not executable.', a:bin))
+    return 0
+  endif
+  return 1
+endfunction
+
+function! s:check_python(version) abort
+  call health#report_start('Python ' . a:version . ' provider')
+
+  let python_bin_name = 'python'.(a:version == 2 ? '' : '3')
+  let pyenv = resolve(exepath('pyenv'))
+  let pyenv_root = exists('$PYENV_ROOT') ? resolve($PYENV_ROOT) : 'n'
+  let venv = exists('$VIRTUAL_ENV') ? resolve($VIRTUAL_ENV) : ''
+  let host_prog_var = python_bin_name.'_host_prog'
+  let python_bin = ''
+  let python_multiple = []
+
+  if exists('g:'.host_prog_var)
+    call health#report_info(printf('Using: g:%s = "%s"', host_prog_var, get(g:, host_prog_var)))
+  endif
+
+  let [python_bin_name, pythonx_errs] = provider#pythonx#Detect(a:version)
+  if empty(python_bin_name)
+    call health#report_warn('No Python interpreter was found with the neovim '
+            \ . 'module.  Using the first available for diagnostics.')
+    if !empty(pythonx_errs)
+      call health#report_warn(pythonx_errs)
+    endif
+  endif
+
+  if !empty(python_bin_name)
+    if exists('g:'.host_prog_var)
+      let python_bin = exepath(python_bin_name)
+    endif
+    let python_bin_name = fnamemodify(python_bin_name, ':t')
+  endif
+
+  if !empty(pythonx_errs)
+    call health#report_error('Python provider error', pythonx_errs)
+  endif
+
+  if !empty(python_bin_name) && empty(python_bin) && empty(pythonx_errs)
+    if !exists('g:'.host_prog_var)
+      call health#report_info(printf('`g:%s` is not set.  Searching for '
+            \ . '%s in the environment.', host_prog_var, python_bin_name))
+    endif
+
+    if !empty(pyenv)
+      if empty(pyenv_root)
+        call health#report_warn(
+              \ 'pyenv was found, but $PYENV_ROOT is not set.',
+              \ ['Did you follow the final install instructions?']
+              \ )
+      else
+        call health#report_ok(printf('pyenv found: "%s"', pyenv))
+      endif
+
+      let python_bin = s:trim(s:system([pyenv, 'which', python_bin_name], '', 1))
+
+      if empty(python_bin)
+        call health#report_warn(printf('pyenv could not find %s.', python_bin_name))
+      endif
+    endif
+
+    if empty(python_bin)
+      let python_bin = exepath(python_bin_name)
+
+      if exists('$PATH')
+        for path in split($PATH, ':')
+          let path_bin = path.'/'.python_bin_name
+          if path_bin != python_bin && index(python_multiple, path_bin) == -1
+                \ && executable(path_bin)
+            call add(python_multiple, path_bin)
+          endif
+        endfor
+
+        if len(python_multiple)
+          " This is worth noting since the user may install something
+          " that changes $PATH, like homebrew.
+          call health#report_info(printf('Multiple %s executables found.  '
+                \ . 'Set `g:%s` to avoid surprises.', python_bin_name, host_prog_var))
+        endif
+
+        if python_bin =~# '\<shims\>'
+          call health#report_warn(printf('`%s` appears to be a pyenv shim.', python_bin), [
+                      \ 'The `pyenv` executable is not in $PATH,',
+                      \ 'Your pyenv installation is broken. You should set '
+                      \ . '`g:'.host_prog_var.'` to avoid surprises.',
+                      \ ])
+        endif
+      endif
+    endif
+  endif
+
+  if !empty(python_bin)
+    if empty(venv) && !empty(pyenv) && !exists('g:'.host_prog_var)
+          \ && !empty(pyenv_root) && resolve(python_bin) !~# '^'.pyenv_root.'/'
+      call health#report_warn('pyenv is not set up optimally.', [
+            \ printf('Create a virtualenv specifically '
+            \ . 'for Neovim using pyenv, and set `g:%s`.  This will avoid '
+            \ . 'the need to install Neovim''s Python module in each '
+            \ . 'version/virtualenv.', host_prog_var)
+            \ ])
+    elseif !empty(venv) && exists('g:'.host_prog_var)
+      if !empty(pyenv_root)
+        let venv_root = pyenv_root
+      else
+        let venv_root = fnamemodify(venv, ':h')
+      endif
+
+      if resolve(python_bin) !~# '^'.venv_root.'/'
+        call health#report_warn('Your virtualenv is not set up optimally.', [
+              \ printf('Create a virtualenv specifically '
+              \ . 'for Neovim and use `g:%s`.  This will avoid '
+              \ . 'the need to install Neovim''s Python module in each '
+              \ . 'virtualenv.', host_prog_var)
+              \ ])
+      endif
+    endif
+  endif
+
+  if empty(python_bin) && !empty(python_bin_name)
+    " An error message should have already printed.
+    call health#report_error(printf('`%s` was not found.', python_bin_name))
+  elseif !empty(python_bin) && !s:check_bin(python_bin)
+    let python_bin = ''
+  endif
+
+  " Check if $VIRTUAL_ENV is active
+  let virtualenv_inactive = 0
+
+  if exists('$VIRTUAL_ENV')
+    if !empty(pyenv)
+      let pyenv_prefix = resolve(s:trim(s:system([pyenv, 'prefix'])))
+      if $VIRTUAL_ENV != pyenv_prefix
+        let virtualenv_inactive = 1
+      endif
+    elseif !empty(python_bin_name) && exepath(python_bin_name) !~# '^'.$VIRTUAL_ENV.'/'
+      let virtualenv_inactive = 1
+    endif
+  endif
+
+  if virtualenv_inactive
+    call health#report_warn(
+      \ '$VIRTUAL_ENV exists but appears to be inactive. '
+      \ . 'This could lead to unexpected results.',
+      \ [ 'If you are using Zsh, see: http://vi.stackexchange.com/a/7654/5229' ])
+  endif
+
+  " Diagnostic output
+  call health#report_info('Executable: ' . (empty(python_bin) ? 'Not found' : python_bin))
+  if len(python_multiple)
+    for path_bin in python_multiple
+      call health#report_info('Other python executable: ' . path_bin)
+    endfor
+  endif
+
+  if !empty(python_bin)
+    let [pyversion, current, latest, status] = s:version_info(python_bin)
+    if a:version != str2nr(pyversion)
+      call health#report_warn('Unexpected Python version.' .
+                  \ ' This could lead to confusing error messages.')
+    endif
+    if a:version == 3 && str2float(pyversion) < 3.3
+      call health#report_warn('Python 3.3+ is recommended.')
+    endif
+
+    call health#report_info('Python'.a:version.' version: ' . pyversion)
+    if s:is_bad_response(status)
+      call health#report_info(printf('%s-neovim version: %s (%s)', python_bin_name, current, status))
+    else
+      call health#report_info(printf('%s-neovim version: %s', python_bin_name, current))
+    endif
+
+    if s:is_bad_response(current)
+      call health#report_error(
+        \ "Neovim Python client is not installed.\nError: ".current,
+        \ ['Run in shell: pip' . a:version . ' install neovim'])
+    endif
+
+    if s:is_bad_response(latest)
+      call health#report_warn('Could not contact PyPI to get latest version.')
+      call health#report_error('HTTP request failed: '.latest)
+    elseif s:is_bad_response(status)
+      call health#report_warn(printf('Latest %s-neovim is NOT installed: %s',
+            \ python_bin_name, latest))
+    elseif !s:is_bad_response(current)
+      call health#report_ok(printf('Latest %s-neovim is installed: %s',
+            \ python_bin_name, latest))
+    endif
+  endif
+
+endfunction
+
+function! s:check_ruby() abort
+  call health#report_start('Ruby provider')
+
+  if !executable('ruby') || !executable('gem')
+    call health#report_warn(
+          \ "`ruby` and `gem` must be in $PATH.",
+          \ ["Install Ruby and verify that `ruby` and `gem` commands work."])
+    return
+  endif
+  call health#report_info('Ruby: '. s:system('ruby -v'))
+
+  let host = provider#ruby#Detect()
+  if empty(host)
+    call health#report_warn('Missing "neovim" gem.',
+          \ ['Run in shell: gem install neovim'])
+    return
+  endif
+  call health#report_info('Host: '. host)
+
+  let latest_gem_cmd = 'gem list -ra ^neovim$'
+  let latest_gem = s:system(split(latest_gem_cmd))
+  if s:shell_error || empty(latest_gem)
+    call health#report_error('Failed to run: '. latest_gem_cmd,
+          \ ["Make sure you're connected to the internet.",
+          \  "Are you behind a firewall or proxy?"])
+    return
+  endif
+  let latest_gem = get(split(latest_gem, ' (\|, \|)$' ), 1, 'not found')
+
+  let current_gem_cmd = host .' --version'
+  let current_gem = s:system(current_gem_cmd)
+  if s:shell_error
+    call health#report_error('Failed to run: '. current_gem_cmd,
+          \ ["Report this issue with the output of: ", current_gem_cmd])
+    return
+  endif
+
+  if s:version_cmp(current_gem, latest_gem) == -1
+    call health#report_warn(
+          \ printf('Gem "neovim" is out-of-date. Installed: %s, latest: %s',
+          \ current_gem, latest_gem),
+          \ ['Run in shell: gem update neovim'])
+  else
+    call health#report_ok('Gem "neovim" is up-to-date: '. current_gem)
+  endif
+endfunction
+
+function! health#provider#check() abort
+  call s:check_clipboard()
+  call s:check_python(2)
+  call s:check_python(3)
+  call s:check_ruby()
+endfunction
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index 0dfcc424e2..a6be00c0a9 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -1,137 +1,338 @@
-let s:man_tag_depth = 0
-let s:man_sect_arg = ''
-let s:man_find_arg = '-w'
+" Maintainer: Anmol Sethi <anmol@aubble.com>
 
+let s:man_find_arg = "-w"
+
+" TODO(nhooyr) Completion may work on SunOS; I'm not sure if `man -l` displays
+" the list of searched directories.
 try
-  if !has('win32') && $OSTYPE !~? 'cygwin\|linux' && system('uname -s') =~? 'SunOS' && system('uname -r') =~? '^5'
-    let s:man_sect_arg = '-s'
+  if !has('win32') && $OSTYPE !~? 'cygwin\|linux' && system('uname -s') =~? 'SunOS' && system('uname -r') =~# '^5'
     let s:man_find_arg = '-l'
   endif
 catch /E145:/
   " Ignore the error in restricted mode
 endtry
 
-" Load man page {page} from {section}
-"   call man#get_page([{section}, ]{page})
-function man#get_page(...) abort
-  let invoked_from_man = (&filetype ==# 'man')
-
-  if a:0 == 0
-    echoerr 'argument required'
-    return
-  elseif a:0 > 2
-    echoerr 'too many arguments'
+function! man#open_page(count, count1, mods, ...) abort
+  if a:0 > 2
+    call s:error('too many arguments')
     return
+  elseif a:0 == 0
+    let ref = &filetype ==# 'man' ? expand('<cWORD>') : expand('<cword>')
+    if empty(ref)
+      call s:error('no identifier under cursor')
+      return
+    endif
+  elseif a:0 ==# 1
+    let ref = a:1
+  else
+    " Combine the name and sect into a manpage reference so that all
+    " verification/extraction can be kept in a single function.
+    " If a:2 is a reference as well, that is fine because it is the only
+    " reference that will match.
+    let ref = a:2.'('.a:1.')'
   endif
+  try
+    let [sect, name] = man#extract_sect_and_name_ref(ref)
+    if a:count ==# a:count1
+      " v:count defaults to 0 which is a valid section, and v:count1 defaults to
+      " 1, also a valid section. If they are equal, count explicitly set.
+      let sect = string(a:count)
+    endif
+    let [sect, name, path] = s:verify_exists(sect, name)
+  catch
+    call s:error(v:exception)
+    return
+  endtry
 
-  let sect = get(a:000, 0)
-  let page = get(a:000, 1, sect)
+  call s:push_tag()
+  let bufname = 'man://'.name.(empty(sect)?'':'('.sect.')')
+  if a:mods !~# 'tab' && s:find_man()
+    noautocmd execute 'silent edit' fnameescape(bufname)
+  else
+    noautocmd execute 'silent' a:mods 'split' fnameescape(bufname)
+  endif
 
-  let [page, sect] = s:parse_page_and_section(sect, page)
+  try
+    let page = s:get_page(path)
+  catch
+    close
+    call s:error(v:exception)
+    return
+  endtry
 
-  if !empty(sect) && s:find_page(sect, page) == 0
-    let sect = ''
-  endif
+  let b:man_sect = sect
+  call s:put_page(page)
+endfunction
 
-  if s:find_page(sect, page) == 0
-    echo 'No manual entry for '.page
+function! man#read_page(ref) abort
+  try
+    let [sect, name] = man#extract_sect_and_name_ref(a:ref)
+    let [b:man_sect, name, path] = s:verify_exists(sect, name)
+    let page = s:get_page(path)
+  catch
+    " call to s:error() is unnecessary
     return
+  endtry
+  call s:put_page(page)
+endfunction
+
+" Handler for s:system() function.
+function! s:system_handler(jobid, data, event) dict abort
+  if a:event == 'stdout'
+    let self.stdout .= join(a:data, "\n")
+  elseif a:event == 'stderr'
+    let self.stderr .= join(a:data, "\n")
+  else
+    let self.exit_code = a:data
   endif
+endfunction
 
-  exec 'let s:man_tag_buf_'.s:man_tag_depth.' = '.bufnr('%')
-  exec 'let s:man_tag_lin_'.s:man_tag_depth.' = '.line('.')
-  exec 'let s:man_tag_col_'.s:man_tag_depth.' = '.col('.')
-  let s:man_tag_depth = s:man_tag_depth + 1
-
-  let editcmd = 'edit'
-  " Use an existing 'man' window, else open a new one.
-  if &filetype !=# 'man'
-    let thiswin = winnr()
-    wincmd b
-    if winnr() > 1
-      exec thiswin . 'wincmd w'
-      while 1
-        if &filetype ==# 'man'
-          break
-        endif
-        wincmd w
-        if thiswin == winnr()
-          break
-        endif
-      endwhile
-    endif
+" Run a system command and timeout after 30 seconds.
+function! s:system(cmd, ...) abort
+  let opts = {
+        \ 'stdout': '',
+        \ 'stderr': '',
+        \ 'exit_code': 0,
+        \ 'on_stdout': function('s:system_handler'),
+        \ 'on_stderr': function('s:system_handler'),
+        \ 'on_exit': function('s:system_handler'),
+        \ }
+  let jobid = jobstart(a:cmd, opts)
 
-    if &filetype !=# 'man'
-      let editcmd = 'tabnew'
-    endif
+  if jobid < 1
+    throw printf('command error %d: %s', jobid, join(a:cmd))
+  endif
+
+  let res = jobwait([jobid], 30000)
+  if res[0] == -1
+    try
+      call jobstop(jobid)
+      throw printf('command timed out: %s', join(a:cmd))
+    catch /^Vim\%((\a\+)\)\=:E900/
+    endtry
+  elseif res[0] == -2
+    throw printf('command interrupted: %s', join(a:cmd))
+  endif
+  if opts.exit_code != 0
+    throw printf("command error (%d) %s: %s", jobid, join(a:cmd), substitute(opts.stderr, '\_s\+$', '', &gdefault ? '' : 'g'))
   endif
 
-  silent exec editcmd.' man://'.page.(empty(sect)?'':'('.sect.')')
+  return opts.stdout
+endfunction
 
+function! s:get_page(path) abort
+  " Respect $MANWIDTH or default to window width.
+  let manwidth = 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
+  return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path])
+endfunction
+
+function! s:put_page(page) abort
   setlocal modifiable
-  silent keepjumps norm! 1G"_dG
-  if empty($MANWIDTH)
-    let $MANWIDTH = winwidth(0)
-  endif
-  silent exec 'r!/usr/bin/man '.s:cmd(sect, page).' | col -b'
-  " Remove blank lines from top and bottom.
+  setlocal noreadonly
+  silent keepjumps %delete _
+  silent put =a:page
+  " Remove all backspaced/escape characters.
+  execute 'silent keeppatterns keepjumps %substitute,.\b\|\e\[\d\+m,,e'.(&gdefault?'':'g')
   while getline(1) =~# '^\s*$'
     silent keepjumps 1delete _
   endwhile
-  while getline('$') =~# '^\s*$'
-    silent keepjumps $delete _
-  endwhile
-  setlocal nomodified
   setlocal filetype=man
+endfunction
+
+" attempt to extract the name and sect out of 'name(sect)'
+" otherwise just return the largest string of valid characters in ref
+function! man#extract_sect_and_name_ref(ref) abort
+  if a:ref[0] ==# '-' " try ':Man -pandoc' with this disabled.
+    throw 'manpage name cannot start with ''-'''
+  endif
+  let ref = matchstr(a:ref, '[^()]\+([^()]\+)')
+  if empty(ref)
+    let name = matchstr(a:ref, '[^()]\+')
+    if empty(name)
+      throw 'manpage reference cannot contain only parentheses'
+    endif
+    return [get(b:, 'man_default_sects', ''), name]
+  endif
+  let left = split(ref, '(')
+  " see ':Man 3X curses' on why tolower.
+  " TODO(nhooyr) Not sure if this is portable across OSs
+  " but I have not seen a single uppercase section.
+  return [tolower(split(left[1], ')')[0]), left[0]]
+endfunction
 
-  if invoked_from_man || editcmd ==# 'tabnew'
-    call s:set_window_local_options()
+function! s:get_path(sect, name) abort
+  if empty(a:sect)
+    return s:system(['man', s:man_find_arg, a:name])
   endif
+  " '-s' flag handles:
+  "   - tokens like 'printf(echo)'
+  "   - sections starting with '-'
+  "   - 3pcap section (found on macOS)
+  "   - commas between sections (for section priority)
+  return s:system(['man', s:man_find_arg, '-s', a:sect, a:name])
 endfunction
 
-function s:set_window_local_options() abort
-  setlocal colorcolumn=0 foldcolumn=0 nonumber
-  setlocal nolist norelativenumber nofoldenable
+function! s:verify_exists(sect, name) abort
+  let path = s:get_path(a:sect, a:name)
+  if path !~# '^\/'
+    let path = s:get_path(get(b:, 'man_default_sects', ''), a:name)
+    if path !~# '^\/'
+      let path = s:get_path('', a:name)
+    endif
+  endif
+  " We need to extract the section from the path because sometimes
+  " the actual section of the manpage is more specific than the section
+  " we provided to `man`. Try ':Man 3 App::CLI'.
+  " Also on linux, it seems that the name is case insensitive. So if one does
+  " ':Man PRIntf', we still want the name of the buffer to be 'printf' or
+  " whatever the correct capitilization is.
+  let path = path[:len(path)-2]
+  return s:extract_sect_and_name_path(path) + [path]
 endfunction
 
-function man#pop_page() abort
-  if s:man_tag_depth > 0
-    let s:man_tag_depth = s:man_tag_depth - 1
-    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
-    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
-    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
-    exec s:man_tag_buf."b"
-    exec s:man_tag_lin
-    exec "norm! ".s:man_tag_col."|"
-    exec "unlet s:man_tag_buf_".s:man_tag_depth
-    exec "unlet s:man_tag_lin_".s:man_tag_depth
-    exec "unlet s:man_tag_col_".s:man_tag_depth
-    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
+let s:tag_stack = []
+
+function! s:push_tag() abort
+  let s:tag_stack += [{
+        \ 'buf':  bufnr('%'),
+        \ 'lnum': line('.'),
+        \ 'col':  col('.'),
+        \ }]
+endfunction
+
+function! man#pop_tag() abort
+  if !empty(s:tag_stack)
+    let tag = remove(s:tag_stack, -1)
+    execute 'silent' tag['buf'].'buffer'
+    call cursor(tag['lnum'], tag['col'])
   endif
 endfunction
 
-" Expects a string like 'access' or 'access(2)'.
-function s:parse_page_and_section(sect, str) abort
-  try
-    let [page, sect] = matchlist(a:str, '\v\C([-.[:alnum:]_]+)%(\(([-.[:alnum:]_]+)\))?')[1:2]
-    if empty(sect)
-      let sect = a:sect
+" extracts the name and sect out of 'path/name.sect'
+function! s:extract_sect_and_name_path(path) abort
+  let tail = fnamemodify(a:path, ':t')
+  if a:path =~# '\.\%([glx]z\|bz2\|lzma\|Z\)$' " valid extensions
+    let tail = fnamemodify(tail, ':r')
+  endif
+  let sect = matchstr(tail, '\.\zs[^.]\+$')
+  let name = matchstr(tail, '^.\+\ze\.')
+  return [sect, name]
+endfunction
+
+function! s:find_man() abort
+  if &filetype ==# 'man'
+    return 1
+  elseif winnr('$') ==# 1
+    return 0
+  endif
+  let thiswin = winnr()
+  while 1
+    wincmd w
+    if &filetype ==# 'man'
+      return 1
+    elseif thiswin ==# winnr()
+      return 0
+    endif
+  endwhile
+endfunction
+
+function! s:error(msg) abort
+  redraw
+  echohl ErrorMsg
+  echon 'man.vim: ' a:msg
+  echohl None
+endfunction
+
+" see man#extract_sect_and_name_ref on why tolower(sect)
+function! man#complete(arg_lead, cmd_line, cursor_pos) abort
+  let args = split(a:cmd_line)
+  let l = len(args)
+  if l > 3
+    return
+  elseif l ==# 1
+    let name = ''
+    let sect = ''
+  elseif a:arg_lead =~# '^[^()]\+([^()]*$'
+    " cursor (|) is at ':Man printf(|' or ':Man 1 printf(|'
+    " The later is is allowed because of ':Man pri<TAB>'.
+    " It will offer 'priclass.d(1m)' even though section is specified as 1.
+    let tmp = split(a:arg_lead, '(')
+    let name = tmp[0]
+    let sect = tolower(get(tmp, 1, ''))
+    return s:complete(sect, '', name)
+  elseif args[1] !~# '^[^()]\+$'
+    " cursor (|) is at ':Man 3() |' or ':Man (3|' or ':Man 3() pri|'
+    " or ':Man 3() pri |'
+    return
+  elseif l ==# 2
+    if empty(a:arg_lead)
+      " cursor (|) is at ':Man 1 |'
+      let name = ''
+      let sect = tolower(args[1])
+    else
+      " cursor (|) is at ':Man pri|'
+      if a:arg_lead =~# '\/'
+        " if the name is a path, complete files
+        " TODO(nhooyr) why does this complete the last one automatically
+        return glob(a:arg_lead.'*', 0, 1)
+      endif
+      let name = a:arg_lead
+      let sect = ''
     endif
+  elseif a:arg_lead !~# '^[^()]\+$'
+    " cursor (|) is at ':Man 3 printf |' or ':Man 3 (pr)i|'
+    return
+  else
+    " cursor (|) is at ':Man 3 pri|'
+    let name = a:arg_lead
+    let sect = tolower(args[1])
+  endif
+  return s:complete(sect, sect, name)
+endfunction
+
+function! s:complete(sect, psect, name) abort
+  try
+    let mandirs = join(split(s:system(['man', s:man_find_arg]), ':\|\n'), ',')
   catch
-    echoerr 'man.vim: failed to parse: "'.a:str.'"'
+    call s:error(v:exception)
+    return
   endtry
-
-  return [page, sect]
+  let pages = globpath(mandirs,'man?/'.a:name.'*.'.a:sect.'*', 0, 1)
+  " We remove duplicates in case the same manpage in different languages was found.
+  return uniq(sort(map(pages, 's:format_candidate(v:val, a:psect)'), 'i'))
 endfunction
 
-function s:cmd(sect, page) abort
-  if !empty(a:sect)
-    return s:man_sect_arg.' '.a:sect.' '.a:page
+function! s:format_candidate(path, psect) abort
+  if a:path =~# '\.\%(pdf\|in\)$' " invalid extensions
+    return
+  endif
+  let [sect, name] = s:extract_sect_and_name_path(a:path)
+  if sect ==# a:psect
+    return name
+  elseif sect =~# a:psect.'.\+$'
+    " We include the section if the user provided section is a prefix
+    " of the actual section.
+    return name.'('.sect.')'
   endif
-  return a:page
 endfunction
 
-function s:find_page(sect, page) abort
-  let where = system('/usr/bin/man '.s:man_find_arg.' '.s:cmd(a:sect, a:page))
-  return (where =~# '^ */')
+function! man#init_pager() abort
+  " Remove all backspaced/escape characters.
+  execute 'silent keeppatterns keepjumps %substitute,.\b\|\e\[\d\+m,,e'.(&gdefault?'':'g')
+  if getline(1) =~# '^\s*$'
+    silent keepjumps 1delete _
+  else
+    keepjumps 1
+  endif
+  " This is not perfect. See `man glDrawArraysInstanced`. Since the title is
+  " all caps it is impossible to tell what the original capitilization was.
+  let ref = substitute(matchstr(getline(1), '^[^)]\+)'), ' ', '_', 'g')
+  try
+    let b:man_sect = man#extract_sect_and_name_ref(ref)[0]
+  catch
+    let b:man_sect = ''
+  endtry
+  execute 'silent file man://'.fnameescape(ref)
 endfunction
diff --git a/runtime/autoload/msgpack.vim b/runtime/autoload/msgpack.vim
index 2e2697c57f..a10ac32469 100644
--- a/runtime/autoload/msgpack.vim
+++ b/runtime/autoload/msgpack.vim
@@ -665,11 +665,15 @@ function msgpack#eval(s, special_objs) abort
       call add(expr, ']}')
       let s = s[1:]
     elseif s[0] is# ''''
-      let char = matchstr(s, '\m\C^''\zs.\ze''')
+      let char = matchstr(s, '\v\C^\''\zs%(\\\d+|.)\ze\''')
       if empty(char)
         throw 'char-invalid:Invalid integer character literal format: ' . s
       endif
-      call add(expr, char2nr(char))
+      if char[0] is# '\'
+        call add(expr, +char[1:])
+      else
+        call add(expr, char2nr(char))
+      endif
       let s = s[len(char) + 2:]
     else
       throw 'unknown:Invalid non-space character: ' . s
diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 53668b15be..de85844d5d 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -1,10 +1,10 @@
 " netrw.vim: Handles file transfer and remote directory listing across
 "            AUTOLOAD SECTION
-" Date:		Oct 23, 2015
-" Version:	154
+" Date:		Apr 20, 2016
+" Version:	156
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
-" Copyright:    Copyright (C) 1999-2015 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2016 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -13,7 +13,7 @@
 "               expressed or implied. By using this plugin, you agree that
 "               in no event will the copyright holder be liable for any damages
 "               resulting from the use of this software.
-"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore(,'~'.expand("<slnum>"))
+"redraw!|call DechoSep()|call inputsave()|call input("Press <cr> to continue")|call inputrestore()
 "
 "  But be doers of the Word, and not only hearers, deluding your own selves {{{1
 "  (James 1:22 RSV)
@@ -30,7 +30,7 @@ if v:version < 704 || !has("patch213")
  let s:needpatch213= 1
  finish
 endif
-let g:loaded_netrw = "v154"
+let g:loaded_netrw = "v156"
 if !exists("s:NOTE")
  let s:NOTE    = 0
  let s:WARNING = 1
@@ -55,7 +55,7 @@ setl cpo&vim
 "   Usage: netrw#ErrorMsg(s:NOTE | s:WARNING | s:ERROR,"some message",error-number)
 "          netrw#ErrorMsg(s:NOTE | s:WARNING | s:ERROR,["message1","message2",...],error-number)
 "          (this function can optionally take a list of messages)
-"  Oct 09, 2015 : max errnum currently is 102
+"  Jan 19, 2016 : max errnum currently is 103
 fun! netrw#ErrorMsg(level,msg,errnum)
 "  call Dfunc("netrw#ErrorMsg(level=".a:level." msg<".a:msg."> errnum=".a:errnum.") g:netrw_use_errorwindow=".g:netrw_use_errorwindow)
 
@@ -77,7 +77,7 @@ fun! netrw#ErrorMsg(level,msg,errnum)
    " (default) netrw creates a one-line window to show error/warning
    " messages (reliably displayed)
 
-   " record current window number for NetrwRestorePosn()'s benefit
+   " record current window number
    let s:winBeforeErr= winnr()
 "   call Decho("s:winBeforeErr=".s:winBeforeErr,'~'.expand("<slnum>"))
 
@@ -416,18 +416,20 @@ if !exists("g:netrw_localmovecmd")
   let g:netrw_localmovecmd= ""
  endif
 endif
-if exists("g:netrw_local_rmdir")
- let g:netrw_localrmdir= g:netrw_local_rmdir
- call netrw#ErrorMsg(s:NOTE,"g:netrw_local_rmdir is deprecated in favor of g:netrw_localrmdir",86)
-endif
-if has("win32") || has("win95") || has("win64") || has("win16")
-  if g:netrw_cygwin
-   call s:NetrwInit("g:netrw_localrmdir","rmdir")
-  else
-   let g:netrw_localrmdir= expand("$COMSPEC")." /c rmdir"
-  endif
-else
- call s:NetrwInit("g:netrw_localrmdir","rmdir")
+if v:version < 704 || !has("patch1109")
+ if exists("g:netrw_local_rmdir")
+  let g:netrw_localrmdir= g:netrw_local_rmdir
+  call netrw#ErrorMsg(s:NOTE,"g:netrw_local_rmdir is deprecated in favor of g:netrw_localrmdir",86)
+ endif
+ if has("win32") || has("win95") || has("win64") || has("win16")
+   if g:netrw_cygwin
+    call s:NetrwInit("g:netrw_localrmdir","rmdir")
+   else
+    let g:netrw_localrmdir= expand("$COMSPEC")." /c rmdir"
+   endif
+ else
+  call s:NetrwInit("g:netrw_localrmdir","rmdir")
+ endif
 endif
 call s:NetrwInit("g:netrw_liststyle"  , s:THINLIST)
 " sanity checks
@@ -442,7 +444,7 @@ call s:NetrwInit("g:netrw_markfileesc"   , '*./[\~')
 call s:NetrwInit("g:netrw_maxfilenamelen", 32)
 call s:NetrwInit("g:netrw_menu"          , 1)
 call s:NetrwInit("g:netrw_mkdir_cmd"     , g:netrw_ssh_cmd." USEPORT HOSTNAME mkdir")
-call s:NetrwInit("g:netrw_mousemaps"     , (exists("+mouse") && &mouse =~ '[anh]'))
+call s:NetrwInit("g:netrw_mousemaps"     , (exists("+mouse") && &mouse =~# '[anh]'))
 call s:NetrwInit("g:netrw_retmap"        , 0)
 if has("unix") || (exists("g:netrw_cygwin") && g:netrw_cygwin)
  call s:NetrwInit("g:netrw_chgperm"       , "chmod PERM FILENAME")
@@ -488,7 +490,9 @@ if !exists("g:netrw_sort_sequence")
 endif
 call s:NetrwInit("g:netrw_special_syntax"   , 0)
 call s:NetrwInit("g:netrw_ssh_browse_reject", '^total\s\+\d\+$')
+call s:NetrwInit("g:netrw_suppress_gx_mesg",  1)
 call s:NetrwInit("g:netrw_use_noswf"        , 1)
+call s:NetrwInit("g:netrw_sizestyle"        ,"b")
 " Default values - t-w ---------- {{{3
 call s:NetrwInit("g:netrw_timefmt","%c")
 if !exists("g:netrw_xstrlen")
@@ -523,6 +527,7 @@ if has("gui_running") && (&enc == 'utf-8' || &enc == 'utf-16' || &enc == 'ucs-4'
 else
  let s:treedepthstring= "| "
 endif
+call s:NetrwInit("s:netrw_nbcd",'{}')
 
 " BufEnter event ignored by decho when following variable is true
 "  Has a side effect that doau BufReadPost doesn't work, so
@@ -548,7 +553,7 @@ if v:version >= 700 && has("balloon_eval") && !exists("s:initbeval") && !exists(
 endif
 au WinEnter *	if &ft == "netrw"|call s:NetrwInsureWinVars()|endif
 
-if g:netrw_keepj =~ "keepj"
+if g:netrw_keepj =~# "keepj"
  com! -nargs=*	NetrwKeepj	keepj <args>
 else
  let g:netrw_keepj= ""
@@ -614,7 +619,7 @@ endif
 "                == 4: Vexplore    style == 5: Vexplore!
 "                == 6: Texplore
 fun! netrw#Explore(indx,dosplit,style,...)
-"  call Dfunc("netrw#Explore(indx=".a:indx." dosplit=".a:dosplit." style=".a:style.",a:1<".a:1.">) &modified=".&modified." modifiable=".&modifiable." a:0=".a:0." win#".winnr()." buf#".bufnr("%"))
+"  call Dfunc("netrw#Explore(indx=".a:indx." dosplit=".a:dosplit." style=".a:style.",a:1<".a:1.">) &modified=".&modified." modifiable=".&modifiable." a:0=".a:0." win#".winnr()." buf#".bufnr("%")." ft=".&ft)
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
   if !exists("b:netrw_curdir")
    let b:netrw_curdir= getcwd()
@@ -818,7 +823,7 @@ fun! netrw#Explore(indx,dosplit,style,...)
     let dirname= curfiledir
 "    call Decho("..empty dirname, using current file's directory<".dirname.">",'~'.expand("<slnum>"))
    endif
-   if dirname =~ '^scp://' || dirname =~ '^ftp://'
+   if dirname =~# '^scp://' || dirname =~ '^ftp://'
     call netrw#Nread(2,dirname)
    else
     if dirname == ""
@@ -1165,7 +1170,8 @@ fun! netrw#Lexplore(count,rightside,...)
 "  call Decho("t:netrw_lexbufnr#".t:netrw_lexbufnr.": close down netrw window",'~'.expand("<slnum>"))
    exe lexwinnr."wincmd w"
    let g:netrw_winsize = -winwidth(0)
-   let t:netrw_lexposn = netrw#SavePosn()
+   let t:netrw_lexposn = winsaveview()
+"   call Decho("saving posn to t:netrw_lexposn<".string(t:netrw_lexposn).">",'~'.expand("<slnum>"))
 "   call Decho("saving t:netrw_lexposn",'~'.expand("<slnum>"))
    close
    if lexwinnr < curwin
@@ -1205,7 +1211,8 @@ fun! netrw#Lexplore(count,rightside,...)
    let t:netrw_lexbufnr = bufnr("%")
    if exists("t:netrw_lexposn")
 "    call Decho("restoring to t:netrw_lexposn",'~'.expand("<slnum>"))
-    call netrw#RestorePosn(t:netrw_lexposn)
+"    call Decho("restoring posn to t:netrw_lexposn<".string(t:netrw_lexposn).">",'~'.expand("<slnum>"))
+    call winrestview(t:netrw_lexposn)
     unlet t:netrw_lexposn
    endif
   endif
@@ -1273,7 +1280,8 @@ endfun
 fun! netrw#MakeTgt(dname)
 "  call Dfunc("netrw#MakeTgt(dname<".a:dname.">)")
    " simplify the target (eg. /abc/def/../ghi -> /abc/ghi)
-  let svpos               = netrw#SavePosn()
+  let svpos               = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let s:netrwmftgt_islocal= (a:dname !~ '^\a\{3,}://')
 "  call Decho("s:netrwmftgt_islocal=".s:netrwmftgt_islocal,'~'.expand("<slnum>"))
   if s:netrwmftgt_islocal
@@ -1290,7 +1298,8 @@ fun! netrw#MakeTgt(dname)
   if g:netrw_fastbrowse <= 1
    call s:NetrwRefresh((b:netrw_curdir !~ '\a\{3,}://'),b:netrw_curdir)
   endif
-  call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))"
+  call winrestview(svpos)
 "  call Dret("netrw#MakeTgt")
 endfun
 
@@ -1532,9 +1541,11 @@ endfun
 " netrw#Nread: save position, call netrw#NetRead(), and restore position {{{2
 fun! netrw#Nread(mode,fname)
 "  call Dfunc("netrw#Nread(mode=".a:mode." fname<".a:fname.">)")
-  call netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   call netrw#NetRead(a:mode,a:fname)
-  call netrw#RestorePosn()
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  call winrestview(svpos)
 
   if exists("w:netrw_liststyle") && w:netrw_liststyle != s:TREELIST
    if exists("w:netrw_bannercnt")
@@ -1551,15 +1562,7 @@ fun! s:NetrwOptionRestore(vt)
 "  call Dfunc("s:NetrwOptionRestore(vt<".a:vt.">) win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> winnr($)=".winnr("$"))
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
   if !exists("{a:vt}netrw_optionsave")
-   if exists("s:nbcd_curpos_{bufnr('%')}")
-"    call Decho("restoring previous position  (s:nbcd_curpos_".bufnr('%')." exists)",'~'.expand("<slnum>"))
-    NetrwKeepj call netrw#RestorePosn(s:nbcd_curpos_{bufnr('%')})
-"    call Decho("win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
-"    call Decho("unlet s:nbcd_curpos_".bufnr('%'),'~'.expand("<slnum>"))
-    unlet s:nbcd_curpos_{bufnr('%')}
-   else
-"    call Decho("no previous position",'~'.expand("<slnum>"))
-   endif
+   call s:RestorePosn(s:netrw_nbcd)
 "   call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo." a:vt=".a:vt,'~'.expand("<slnum>"))
 "   call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
 "   call Dret("s:NetrwOptionRestore : ".a:vt."netrw_optionsave doesn't exist")
@@ -1629,8 +1632,10 @@ fun! s:NetrwOptionRestore(vt)
     setl directory=
     unlet {a:vt}netrw_swfkeep
    elseif &l:swf != {a:vt}netrw_swfkeep
-    " following line causes a Press ENTER in windows -- can't seem to work around it!!!
-    sil! let &l:swf= {a:vt}netrw_swfkeep
+    if !g:netrw_use_noswf
+     " following line causes a Press ENTER in windows -- can't seem to work around it!!!
+     sil! let &l:swf= {a:vt}netrw_swfkeep
+    endif
     unlet {a:vt}netrw_swfkeep
    endif
   endif
@@ -1645,16 +1650,7 @@ fun! s:NetrwOptionRestore(vt)
    if exists("{a:vt}netrw_regstar") |sil! let @*= {a:vt}netrw_regstar |unlet {a:vt}netrw_regstar |endif
   endif
   if exists("{a:vt}netrw_regslash")|sil! let @/= {a:vt}netrw_regslash|unlet {a:vt}netrw_regslash|endif
-  if exists("s:nbcd_curpos_{bufnr('%')}")
-"   call Decho("restoring previous position  (s:nbcd_curpos_".bufnr('%')." exists)",'~'.expand("<slnum>"))
-   NetrwKeepj call netrw#RestorePosn(s:nbcd_curpos_{bufnr('%')})
-"   call Decho("unlet s:nbcd_curpos_".bufnr('%'),'~'.expand("<slnum>"))
-   if exists("s:nbcd_curpos_".bufnr('%'))
-    unlet s:nbcd_curpos_{bufnr('%')}
-   endif
-  else
-"   call Decho("no previous position",'~'.expand("<slnum>"))
-  endif
+  call s:RestorePosn(s:netrw_nbcd)
 
 "  call Decho("g:netrw_keepdir=".g:netrw_keepdir.": getcwd<".getcwd()."> acd=".&acd,'~'.expand("<slnum>"))
 "  call Decho("fo=".&fo.(exists("+acd")? " acd=".&acd : " acd doesn't exist"),'~'.expand("<slnum>"))
@@ -1729,11 +1725,11 @@ fun! s:NetrwOptionSave(vt)
   let {a:vt}netrw_rokeep    = &l:ro
   let {a:vt}netrw_selkeep   = &l:sel
   let {a:vt}netrw_spellkeep = &l:spell
-  if g:netrw_use_noswf
-   let {a:vt}netrw_swfkeep   = &l:swf
+  if !g:netrw_use_noswf
+   let {a:vt}netrw_swfkeep  = &l:swf
   endif
   if has("clipboard")
-   let {a:vt}netrw_starkeep  = @*
+   let {a:vt}netrw_starkeep = @*
   endif
   let {a:vt}netrw_tskeep    = &l:ts
   let {a:vt}netrw_twkeep    = &l:tw           " textwidth
@@ -2664,7 +2660,9 @@ fun! netrw#NetSource(...)
 "     call Decho("exe so ".fnameescape(s:netrw_tmpfile),'~'.expand("<slnum>"))
      exe "so ".fnameescape(s:netrw_tmpfile)
 "     call Decho("delete(".s:netrw_tmpfile.")",'~'.expand("<slnum>"))
-     call delete(s:netrw_tmpfile)
+     if delete(s:netrw_tmpfile)
+      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".s:netrw_tmpfile.">!",103)
+     endif
      unlet s:netrw_tmpfile
     else
      call netrw#ErrorMsg(s:ERROR,"unable to source <".a:{i}.">!",48)
@@ -3003,10 +3001,10 @@ fun! s:NetrwMethod(choice)
     if exists("s:netrw_hup[host]")
      call NetUserPass("ftp:".host)
 
-    elseif (has("win32") || has("win95") || has("win64") || has("win16")) && s:netrw_ftp_cmd =~ '-[sS]:'
+    elseif (has("win32") || has("win95") || has("win64") || has("win16")) && s:netrw_ftp_cmd =~# '-[sS]:'
 "     call Decho("has -s: : s:netrw_ftp_cmd<".s:netrw_ftp_cmd.">",'~'.expand("<slnum>"))
 "     call Decho("          g:netrw_ftp_cmd<".g:netrw_ftp_cmd.">",'~'.expand("<slnum>"))
-     if g:netrw_ftp_cmd =~ '-[sS]:\S*MACHINE\>'
+     if g:netrw_ftp_cmd =~# '-[sS]:\S*MACHINE\>'
       let s:netrw_ftp_cmd= substitute(g:netrw_ftp_cmd,'\<MACHINE\>',g:netrw_machine,'')
 "      call Decho("s:netrw_ftp_cmd<".s:netrw_ftp_cmd.">",'~'.expand("<slnum>"))
      endif
@@ -3504,7 +3502,11 @@ fun! s:NetrwBookHistSave()
   let savefile= s:NetrwHome()."/.netrwhist"
   1split
   call s:NetrwEnew()
-  setl cino= com= cpo-=a cpo-=A fo=nroql2 tw=0 report=10000 noswf
+  if g:netrw_use_noswf
+   setl cino= com= cpo-=a cpo-=A fo=nroql2 tw=0 report=10000 noswf
+  else
+   setl cino= com= cpo-=a cpo-=A fo=nroql2 tw=0 report=10000
+  endif
   setl nocin noai noci magic nospell nohid wig= noaw
   setl ma noro write
   if exists("+acd") | setl noacd | endif
@@ -3566,6 +3568,7 @@ fun! s:NetrwBrowse(islocal,dirname)
   " This is useful when one edits a local file, then :e ., then :Rex
   if a:islocal && !exists("w:netrw_rexfile") && bufname("#") != ""
    let w:netrw_rexfile= bufname("#")
+"   call Decho("setting w:netrw_rexfile<".w:netrw_rexfile."> win#".winnr(),'~'.expand("<slnum>"))
   endif
 
   " s:NetrwBrowse : initialize history {{{3
@@ -3683,7 +3686,8 @@ fun! s:NetrwBrowse(islocal,dirname)
 
   " get/set-up buffer {{{3
 "  call Decho("saving position across a buffer refresh",'~'.expand("<slnum>"))
-  let svpos  = netrw#SavePosn()
+  let svpos  = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let reusing= s:NetrwGetBuffer(a:islocal,dirname)
 
   " maintain markfile highlighting
@@ -3754,7 +3758,7 @@ fun! s:NetrwBrowse(islocal,dirname)
 
    " analyze dirname and g:netrw_list_cmd {{{3
 "   call Decho("b:netrw_curdir<".(exists("b:netrw_curdir")? b:netrw_curdir : "doesn't exist")."> dirname<".dirname.">",'~'.expand("<slnum>"))
-   if dirname =~ "^NetrwTreeListing\>"
+   if dirname =~# "^NetrwTreeListing\>"
     let dirname= b:netrw_curdir
 "    call Decho("(dirname was <NetrwTreeListing>) dirname<".dirname.">",'~'.expand("<slnum>"))
    elseif exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("b:netrw_curdir")
@@ -3792,10 +3796,18 @@ fun! s:NetrwBrowse(islocal,dirname)
   NetrwKeepj call s:NetrwCommands(a:islocal)
   NetrwKeepj call s:PerformListing(a:islocal)
 
+  " restore option(s)
+  call s:NetrwOptionRestore("w:")
+"  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
+
   " If there is a rexposn: restore position with rexposn
   " Otherwise            : set rexposn
   if exists("s:rexposn_".bufnr("%"))
-   NetrwKeepj call netrw#RestorePosn(s:rexposn_{bufnr('%')})
+"   call Decho("restoring posn to s:rexposn_".bufnr('%')."<".string(s:rexposn_{bufnr('%')}).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(s:rexposn_{bufnr('%')})
+   if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt
+    NetrwKeepj exe w:netrw_bannercnt
+   endif
   else
    NetrwKeepj call s:SetRexDir(a:islocal,b:netrw_curdir)
   endif
@@ -3804,13 +3816,11 @@ fun! s:NetrwBrowse(islocal,dirname)
 "   call Decho("set up balloon help: l:bexpr=".&l:bexpr,'~'.expand("<slnum>"))
    setl beval
   endif
-  call s:NetrwOptionRestore("w:")
-"  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 
   " restore position
   if reusing
-"   call Decho("reusing=".reusing.": restoring position across buffer refresh",'~'.expand("<slnum>"))
-   call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   call winrestview(svpos)
   endif
 
   " The s:LocalBrowseRefresh() function is called by an autocmd
@@ -3828,7 +3838,19 @@ endfun
 " differ from vim's.  This function insures that netrw's idea of the current
 " directory is used.
 fun! s:NetrwFile(fname)
-"  call Dfunc("s:NetrwFile(fname<".a:fname.">)")
+"  call Dfunc("s:NetrwFile(fname<".a:fname.">) win#".winnr())
+"  call Decho("g:netrw_keepdir  =".(exists("g:netrw_keepdir")?   g:netrw_keepdir   : 'n/a'),'~'.expand("<slnum>"))
+"  call Decho("g:netrw_cygwin   =".(exists("g:netrw_cygwin")?    g:netrw_cygwin    : 'n/a'),'~'.expand("<slnum>"))
+"  call Decho("g:netrw_liststyle=".(exists("g:netrw_liststyle")? g:netrw_liststyle : 'n/a'),'~'.expand("<slnum>"))
+"  call Decho("w:netrw_liststyle=".(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a'),'~'.expand("<slnum>"))
+
+  " clean up any leading treedepthstring
+  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
+   let fname= substitute(a:fname,'^'.s:treedepthstring.'\+','','')
+"   call Decho("clean up any leading treedepthstring: fname<".fname.">",'~'.expand("<slnum>"))
+  else
+   let fname= a:fname
+  endif
 
   if g:netrw_keepdir
    " vim's idea of the current directory possibly may differ from netrw's
@@ -3837,29 +3859,31 @@ fun! s:NetrwFile(fname)
    endif
 
    if !exists("g:netrw_cygwin") && (has("win32") || has("win95") || has("win64") || has("win16"))
-    if a:fname =~ '^\' || a:fname =~ '^\a:\'
+    if fname =~ '^\' || fname =~ '^\a:\'
      " windows, but full path given
-     let ret= a:fname
-"     call Decho("windows+full path: isdirectory(".a:fname.")",'~'.expand("<slnum>"))
+     let ret= fname
+"     call Decho("windows+full path: isdirectory(".fname.")",'~'.expand("<slnum>"))
     else
      " windows, relative path given
-     let ret= s:ComposePath(b:netrw_curdir,a:fname)
-"     call Decho("windows+rltv path: isdirectory(".a:fname.")",'~'.expand("<slnum>"))
+     let ret= s:ComposePath(b:netrw_curdir,fname)
+"     call Decho("windows+rltv path: isdirectory(".fname.")",'~'.expand("<slnum>"))
     endif
 
-   elseif a:fname =~ '^/'
+   elseif fname =~ '^/'
     " not windows, full path given
-    let ret= a:fname
-"    call Decho("unix+full path: isdirectory(".a:fname.")",'~'.expand("<slnum>"))
+    let ret= fname
+"    call Decho("unix+full path: isdirectory(".fname.")",'~'.expand("<slnum>"))
    else
     " not windows, relative path given
-    let ret= s:ComposePath(b:netrw_curdir,a:fname)
-"    call Decho("unix+rltv path: isdirectory(".a:fname.")",'~'.expand("<slnum>"))
+    let ret= s:ComposePath(b:netrw_curdir,fname)
+"    call Decho("unix+rltv path: isdirectory(".fname.")",'~'.expand("<slnum>"))
    endif
   else
    " vim and netrw agree on the current directory
-   let ret= a:fname
+   let ret= fname
 "   call Decho("vim and netrw agree on current directory (g:netrw_keepdir=".g:netrw_keepdir.")",'~'.expand("<slnum>"))
+"   call Decho("vim   directory: ".getcwd(),'~'.expand("<slnum>"))
+"   call Decho("netrw directory: ".(exists("b:netrw_curdir")? b:netrw_curdir : 'n/a'),'~'.expand("<slnum>"))
   endif
 
 "  call Dret("s:NetrwFile ".ret)
@@ -3872,23 +3896,29 @@ fun! s:NetrwFileInfo(islocal,fname)
 "  call Dfunc("s:NetrwFileInfo(islocal=".a:islocal." fname<".a:fname.">) b:netrw_curdir<".b:netrw_curdir.">")
   let ykeep= @@
   if a:islocal
+   let lsopt= "-lsad"
+   if g:netrw_sizestyle =~# 'H'
+    let lsopt= "-lsadh"
+   elseif g:netrw_sizestyle =~# 'h'
+    let lsopt= "-lsadh --si"
+   endif
    if (has("unix") || has("macunix")) && executable("/bin/ls")
 
     if getline(".") == "../"
-     echo system("/bin/ls -lsad ".s:ShellEscape(".."))
+     echo system("/bin/ls ".lsopt." ".s:ShellEscape(".."))
 "     call Decho("#1: echo system(/bin/ls -lsad ".s:ShellEscape(..).")",'~'.expand("<slnum>"))
 
     elseif w:netrw_liststyle == s:TREELIST && getline(".") !~ '^'.s:treedepthstring
-     echo system("/bin/ls -lsad ".s:ShellEscape(b:netrw_curdir))
+     echo system("/bin/ls ".lsopt." ".s:ShellEscape(b:netrw_curdir))
 "     call Decho("#2: echo system(/bin/ls -lsad ".s:ShellEscape(b:netrw_curdir).")",'~'.expand("<slnum>"))
 
     elseif exists("b:netrw_curdir")
-      echo system("/bin/ls -lsad ".s:ShellEscape(s:ComposePath(b:netrw_curdir,a:fname)))
+      echo system("/bin/ls ".lsopt." ".s:ShellEscape(s:ComposePath(b:netrw_curdir,a:fname)))
 "      call Decho("#3: echo system(/bin/ls -lsad ".s:ShellEscape(b:netrw_curdir.a:fname).")",'~'.expand("<slnum>"))
 
     else
 "     call Decho('using ls '.a:fname." using cwd<".getcwd().">",'~'.expand("<slnum>"))
-     echo system("/bin/ls -lsad ".s:ShellEscape(s:NetrwFile(a:fname)))
+     echo system("/bin/ls ".lsopt." ".s:ShellEscape(s:NetrwFile(a:fname)))
 "     call Decho("#5: echo system(/bin/ls -lsad ".s:ShellEscape(a:fname).")",'~'.expand("<slnum>"))
     endif
    else
@@ -3901,6 +3931,9 @@ fun! s:NetrwFileInfo(islocal,fname)
     endif
     let t  = getftime(s:NetrwFile(fname))
     let sz = getfsize(s:NetrwFile(fname))
+    if g:netrw_sizestyle =~# "[hH]"
+     let sz= s:NetrwHumanReadable(sz)
+    endif
     echo a:fname.":  ".sz."  ".strftime(g:netrw_timefmt,getftime(s:NetrwFile(fname)))
 "    call Decho("fname.":  ".sz."  ".strftime(g:netrw_timefmt,getftime(fname)),'~'.expand("<slnum>"))
    endif
@@ -3912,108 +3945,49 @@ fun! s:NetrwFileInfo(islocal,fname)
 endfun
 
 " ---------------------------------------------------------------------
+" s:NetrwFullPath: returns the full path to a directory and/or file {{{2
+fun! s:NetrwFullPath(filename)
+"  " call Dfunc("s:NetrwFullPath(filename<".a:filename.">)")
+  let filename= a:filename
+  if filename !~ '^/'
+   let filename= resolve(getcwd().'/'.filename)
+  endif
+  if filename != "/" && filename =~ '/$'
+   let filename= substitute(filename,'/$','','')
+  endif
+"  " call Dret("s:NetrwFullPath <".filename.">")
+  return filename
+endfun
+
+" ---------------------------------------------------------------------
 " s:NetrwGetBuffer: {{{2
 "   returns 0=cleared buffer
 "           1=re-used buffer (buffer not cleared)
 fun! s:NetrwGetBuffer(islocal,dirname)
 "  call Dfunc("s:NetrwGetBuffer(islocal=".a:islocal." dirname<".a:dirname.">) liststyle=".g:netrw_liststyle)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
+"  call Decho("netrwbuf dictionary=".string(s:netrwbuf),'~'.expand("<slnum>"))
   let dirname= a:dirname
 
   " re-use buffer if possible {{{3
 "  call Decho("--re-use a buffer if possible--",'~'.expand("<slnum>"))
-  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
-   " find NetrwTreeList buffer if there is one
-"   call Decho("case liststyle=treelist: find NetrwTreeList buffer if there is one",'~'.expand("<slnum>"))
-   if exists("w:netrw_treebufnr") && w:netrw_treebufnr > 0
-"    call Decho("  re-using w:netrw_treebufnr=".w:netrw_treebufnr,'~'.expand("<slnum>"))
-    let eikeep= &ei
-    setl ei=all
-    exe "sil! keepj noswapfile keepalt b ".w:netrw_treebufnr
-    let &ei= eikeep
-    setl ma
-    sil! NetrwKeepj %d _
-"    call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
-"    call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
-"    call Dret("s:NetrwGetBuffer 0<buffer cleared> : bufnum#".w:netrw_treebufnr."<NetrwTreeListing>")
-    return 0
+  if !exists("s:netrwbuf")
+   let s:netrwbuf= {}
+  endif
+  if has_key(s:netrwbuf,s:NetrwFullPath(dirname))
+   let bufnum= s:netrwbuf[s:NetrwFullPath(dirname)]
+"   call Decho("lookup netrwbuf dictionary: s:netrwbuf[".s:NetrwFullPath(dirname)."]=".bufnum)
+   if !bufexists(bufnum)
+    call remove(s:netrwbuf,s:NetrwFullPath(dirname))
+    let bufnum= -1
    endif
-   let bufnum= -1
-"   call Decho("  liststyle=TREE but w:netrw_treebufnr doesn't exist",'~'.expand("<slnum>"))
-
   else
-   " find buffer number of buffer named precisely the same as dirname {{{3
-"   call Decho("case listtyle not treelist: find buffer numnber of buffer named precisely the same as dirname--",'~'.expand("<slnum>"))
-"   call Dredir("(NetrwGetBuffer) ls!","ls!")
-
-   " get dirname and associated buffer number
-   let bufnum  = bufnr(escape(dirname,'\'))
-"   call Decho("  find buffer<".dirname.">'s number ",'~'.expand("<slnum>"))
-"   call Decho("  bufnr(dirname<".escape(dirname,'\').">)=".bufnum,'~'.expand("<slnum>"))
-
-   if bufnum < 0 && dirname !~ '/$'
-    " try appending a trailing /
-"    call Decho("  try appending a trailing / to dirname<".dirname.">",'~'.expand("<slnum>"))
-    let bufnum= bufnr(escape(dirname.'/','\'))
-    if bufnum > 0
-     let dirname= dirname.'/'
-    endif
-   endif
-
-   if bufnum < 0 && dirname =~ '/$'
-    " try removing a trailing /
-"    call Decho("  try removing a trailing / from dirname<".dirname.">",'~'.expand("<slnum>"))
-    let bufnum= bufnr(escape(substitute(dirname,'/$','',''),'\'))
-    if bufnum > 0
-     let dirname= substitute(dirname,'/$','','')
-    endif
-   endif
-
-"   call Decho("  findbuf1: bufnum=bufnr('".dirname."')=".bufnum." bufname(".bufnum.")<".bufname(bufnum)."> (initial)",'~'.expand("<slnum>"))
-   " note: !~ was used just below, but that means using ../ to go back would match (ie. abc/def/  and abc/ matches)
-   if bufnum > 0 && bufname(bufnum) != dirname && bufname(bufnum) != '.'
-    " handle approximate matches
-"    call Decho("  handling approx match: bufnum#".bufnum.">0 AND bufname<".bufname(bufnum).">!=dirname<".dirname."> AND bufname(".bufnum.")!='.'",'~'.expand("<slnum>"))
-    let ibuf    = 1
-    let buflast = bufnr("$")
-"    call Decho("  findbuf2: buflast=bufnr($)=".buflast,'~'.expand("<slnum>"))
-    while ibuf <= buflast
-     let bname= substitute(bufname(ibuf),'\\','/','g')
-     let bname= substitute(bname,'.\zs/$','','')
-"     call Decho("  findbuf3: while [ibuf=",ibuf."]<=[buflast=".buflast."]: dirname<".dirname."> bname=bufname(".ibuf.")<".bname.">",'~'.expand("<slnum>"))
-     if bname != '' && dirname =~ '/'.bname.'/\=$' && dirname !~ '^/'
-      " bname is not empty
-      " dirname ends with bname,
-      " dirname doesn't start with /, so its not a absolute path
-"      call Decho("  findbuf3a: passes test 1 : dirname<".dirname.'> =~ /'.bname.'/\=$ && dirname !~ ^/','~'.expand("<slnum>"))
-      break
-     endif
-     if bname =~ '^'.dirname.'/\=$'
-      " bname begins with dirname
-"      call Decho('  findbuf3b: passes test 2 : bname<'.bname.'>=~^'.dirname.'/\=$','~'.expand("<slnum>"))
-      break
-     endif
-     if dirname =~ '^'.bname.'/$'
-"      call Decho('  findbuf3c: passes test 3 : dirname<'.dirname.'>=~^'.bname.'/$','~'.expand("<slnum>"))
-      break
-     endif
-     if bname != '' && dirname =~ '/'.bname.'$' && bname == bufname("%") && line("$") == 1
-"      call Decho('  findbuf3d: passes test 4 : dirname<'.dirname.'>=~ /'.bname.'$','~'.expand("<slnum>"))
-      break
-     endif
-     let ibuf= ibuf + 1
-    endwhile
-    if ibuf > buflast
-     let bufnum= -1
-    else
-     let bufnum= ibuf
-    endif
-"    call Decho("  findbuf4: bufnum=".bufnum." (ibuf=".ibuf." buflast=".buflast.")",'~'.expand("<slnum>"))
-   endif
+"   call Decho("lookup netrwbuf dictionary: s:netrwbuf[".s:NetrwFullPath(dirname)."] not a key")
+   let bufnum= -1
   endif
 
   " get enew buffer and name it -or- re-use buffer {{{3
-  if bufnum < 0 || !bufexists(bufnum)   " get enew buffer and name it
+  if bufnum < 0      " get enew buffer and name it
 "   call Decho("--get enew buffer and name it  (bufnum#".bufnum."<0 OR bufexists(".bufnum.")=".bufexists(bufnum)."==0)",'~'.expand("<slnum>"))
    call s:NetrwEnew(dirname)
 "   call Decho("  got enew buffer#".bufnr("%")." (altbuf<".expand("#").">)",'~'.expand("<slnum>"))
@@ -4029,11 +4003,15 @@ fun! s:NetrwGetBuffer(islocal,dirname)
     let w:netrw_treebufnr= bufnr("%")
 "    call Decho("  exe sil! keepalt file NetrwTreeListing ".fnameescape(s:netrw_treelistnum),'~'.expand("<slnum>"))
     exe 'sil! keepalt file NetrwTreeListing\ '.fnameescape(s:netrw_treelistnum)
-    setl bt=nofile noswf
-    nnoremap <silent> <buffer> [	:sil call <SID>TreeListMove('[')<cr>
-    nnoremap <silent> <buffer> ]	:sil call <SID>TreeListMove(']')<cr>
-    nnoremap <silent> <buffer> [[       :sil call <SID>TreeListMove('[')<cr>
-    nnoremap <silent> <buffer> ]]       :sil call <SID>TreeListMove(']')<cr>
+    if g:netrw_use_noswf
+     setl nobl bt=nofile noswf
+    else
+     setl nobl bt=nofile
+    endif
+    nnoremap <silent> <buffer> [[       :sil call <SID>TreeListMove('[[')<cr>
+    nnoremap <silent> <buffer> ]]       :sil call <SID>TreeListMove(']]')<cr>
+    nnoremap <silent> <buffer> []       :sil call <SID>TreeListMove('[]')<cr>
+    nnoremap <silent> <buffer> ][       :sil call <SID>TreeListMove('][')<cr>
 "    call Decho("  tree listing#".s:netrw_treelistnum." bufnr=".w:netrw_treebufnr,'~'.expand("<slnum>"))
    else
 "    let v:errmsg   = "" " Decho
@@ -4043,6 +4021,10 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "    let v:errmsg= "" " Decho
     exe 'sil! keepj keepalt file '.escdirname
 "    call Decho("  errmsg<".v:errmsg."> bufnr(".escdirname.")=".bufnr(escdirname)."<".bufname(bufnr(escdirname)).">",'~'.expand("<slnum>"))
+    " enter the new buffer into the s:netrwbuf dictionary
+    let s:netrwbuf[s:NetrwFullPath(dirname)]= bufnr("%")
+"    call Decho("update netrwbuf dictionary: s:netrwbuf[".s:NetrwFullPath(dirname)."]=".bufnr("%"),'~'.expand("<slnum>"))
+"    call Decho("netrwbuf dictionary=".string(s:netrwbuf),'~'.expand("<slnum>"))
    endif
 "   call Decho("  named enew buffer#".bufnr("%")."<".bufname("%").">",'~'.expand("<slnum>"))
 
@@ -4050,7 +4032,7 @@ fun! s:NetrwGetBuffer(islocal,dirname)
 "   call Decho("--re-use buffer#".bufnum." (bufnum#".bufnum.">=0 AND bufexists(".bufnum.")=".bufexists(bufnum)."!=0)",'~'.expand("<slnum>"))
    let eikeep= &ei
    setl ei=all
-   if getline(2) =~ '^" Netrw Directory Listing'
+   if getline(2) =~# '^" Netrw Directory Listing'
 "    call Decho("  getline(2)<".getline(2).'> matches "Netrw Directory Listing" : using keepalt b '.bufnum,'~'.expand("<slnum>"))
     exe "sil! NetrwKeepj noswapfile keepalt b ".bufnum
    else
@@ -4165,20 +4147,20 @@ fun! s:NetrwGetWord()
    let dirname= "./"
    let curline= getline('.')
 
-   if curline =~ '"\s*Sorted by\s'
+   if curline =~# '"\s*Sorted by\s'
     NetrwKeepj norm s
     let s:netrw_skipbrowse= 1
     echo 'Pressing "s" also works'
 
-   elseif curline =~ '"\s*Sort sequence:'
+   elseif curline =~# '"\s*Sort sequence:'
     let s:netrw_skipbrowse= 1
     echo 'Press "S" to edit sorting sequence'
 
-   elseif curline =~ '"\s*Quick Help:'
+   elseif curline =~# '"\s*Quick Help:'
     NetrwKeepj norm ?
     let s:netrw_skipbrowse= 1
 
-   elseif curline =~ '"\s*\%(Hiding\|Showing\):'
+   elseif curline =~# '"\s*\%(Hiding\|Showing\):'
     NetrwKeepj norm a
     let s:netrw_skipbrowse= 1
     echo 'Pressing "a" also works'
@@ -4197,7 +4179,7 @@ fun! s:NetrwGetWord()
    NetrwKeepj norm! 0
    let dirname= substitute(getline('.'),'^\(\%(\S\+ \)*\S\+\).\{-}$','\1','e')
 
-  elseif w:netrw_liststyle == s:TREELIST
+  elseif exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("treelist handling",'~'.expand("<slnum>"))
    let dirname= substitute(getline('.'),'^\('.s:treedepthstring.'\)*','','e')
    let dirname= substitute(dirname,'\t -->.*$','','')
@@ -4286,7 +4268,8 @@ fun! s:NetrwListStyle(islocal)
   let ykeep             = @@
   let fname             = s:NetrwGetWord()
   if !exists("w:netrw_liststyle")|let w:netrw_liststyle= g:netrw_liststyle|endif
-  let svpos            = netrw#SavePosn()
+  let svpos            = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let w:netrw_liststyle = (w:netrw_liststyle + 1) % s:MAXLIST
 "  call Decho("fname<".fname.">",'~'.expand("<slnum>"))
 "  call Decho("chgd w:netrw_liststyle to ".w:netrw_liststyle,'~'.expand("<slnum>"))
@@ -4307,7 +4290,7 @@ fun! s:NetrwListStyle(islocal)
 "   call Decho("use wide list",'~'.expand("<slnum>"))
    let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
 
-  elseif w:netrw_liststyle == s:TREELIST
+  elseif exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("use tree list",'~'.expand("<slnum>"))
    let g:netrw_list_cmd = substitute(g:netrw_list_cmd,' -l','','ge')
 
@@ -4334,7 +4317,8 @@ fun! s:NetrwListStyle(islocal)
   NetrwKeepj call s:NetrwCursor()
 
   " restore position; keep cursor on the filename
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
   let @@= ykeep
 
 "  call Dret("NetrwListStyle".(exists("w:netrw_liststyle")? ' : w:netrw_liststyle='.w:netrw_liststyle : ""))
@@ -4350,7 +4334,8 @@ fun! s:NetrwBannerCtrl(islocal)
   let g:netrw_banner= !g:netrw_banner
 
   " refresh the listing
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
 
   " keep cursor on the filename
@@ -4385,7 +4370,8 @@ fun! s:NetrwBookmark(del,...)
     if exists("s:netrwmarkfilelist_{curbufnr}")
      " for every filename in the marked list
 "     call Decho("bookmark every filename in marked list",'~'.expand("<slnum>"))
-     let svpos  = netrw#SavePosn()
+     let svpos  = winsaveview()
+"     call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
      let islocal= expand("%") !~ '^\a\{3,}://'
      for fname in s:netrwmarkfilelist_{curbufnr}
       if a:del|call s:DeleteBookmark(fname)|else|call s:MakeBookmark(fname)|endif
@@ -4393,7 +4379,8 @@ fun! s:NetrwBookmark(del,...)
      let curdir  = exists("b:netrw_curdir")? b:netrw_curdir : getcwd()
      call s:NetrwUnmarkList(curbufnr,curdir)
      NetrwKeepj call s:NetrwRefresh(islocal,s:NetrwBrowseChgDir(islocal,'./'))
-     NetrwKeepj call netrw#RestorePosn(svpos)
+"     call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+     NetrwKeepj call winrestview(svpos)
     else
      let fname= s:NetrwGetWord()
      if a:del|call s:DeleteBookmark(fname)|else|call s:MakeBookmark(fname)|endif
@@ -4416,10 +4403,10 @@ fun! s:NetrwBookmark(del,...)
    let i = 1
    while i <= a:0
     if islocal
-     if v:version == 704 && has("patch656")
-      let mbfiles= glob(a:{i},0,1,1)
+     if v:version > 704 || (v:version == 704 && has("patch656"))
+      let mbfiles= glob(fnameescape(a:{i}),0,1,1)
      else
-      let mbfiles= glob(a:{i},0,1)
+      let mbfiles= glob(fnameescape(a:{i}),0,1)
      endif
     else
      let mbfiles= [a:{i}]
@@ -4523,14 +4510,13 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "   call Dret("s:NetrwBrowseChgDir")
    return
   endif
+"  call Decho("b:netrw_curdir<".b:netrw_curdir.">")
 
   " NetrwBrowseChgDir: save options and initialize {{{3
 "  call Decho("saving options",'~'.expand("<slnum>"))
+  call s:SavePosn(s:netrw_nbcd)
   NetrwKeepj call s:NetrwOptionSave("s:")
   NetrwKeepj call s:NetrwSafeOptions()
-  let nbcd_curpos                = netrw#SavePosn()
-  let s:nbcd_curpos_{bufnr('%')} = nbcd_curpos
-"  call Decho("setting s:nbcd_curpos_".bufnr('%')." to SavePosn",'~'.expand("<slnum>"))
   if (has("win32") || has("win95") || has("win64") || has("win16"))
    let dirname = substitute(b:netrw_curdir,'\\','/','ge')
   else
@@ -4546,14 +4532,14 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
   if g:netrw_banner
 "   call Decho("w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'n/a')." line(.)#".line('.')." line($)#".line("#"),'~'.expand("<slnum>"))
    if exists("w:netrw_bannercnt") && line(".") < w:netrw_bannercnt && line("$") >= w:netrw_bannercnt
-    if getline(".") =~ 'Quick Help'
+    if getline(".") =~# 'Quick Help'
 "     call Decho("#1: quickhelp=".g:netrw_quickhelp." ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
      let g:netrw_quickhelp= (g:netrw_quickhelp + 1)%len(s:QuickHelp)
 "     call Decho("#2: quickhelp=".g:netrw_quickhelp." ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
      setl ma noro nowrap
      NetrwKeepj call setline(line('.'),'"   Quick Help: <F1>:help  '.s:QuickHelp[g:netrw_quickhelp])
      setl noma nomod nowrap
-     NetrwKeepj call netrw#RestorePosn(nbcd_curpos)
+     call s:RestorePosn(s:netrw_nbcd)
      NetrwKeepj call s:NetrwOptionRestore("s:")
 "     call Decho("ro=".&l:ro." ma=".&l:ma." mod=".&l:mod." wrap=".&l:wrap." (filename<".expand("%")."> win#".winnr()." ft<".&ft.">)",'~'.expand("<slnum>"))
     endif
@@ -4577,7 +4563,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "   call Decho("adjusting dirname<".dirname.'>  (put trailing "/" back)','~'.expand("<slnum>"))
   endif
 
-"  "  call Decho("[newdir<".newdir."> ".((newdir =~ dirpat)? "=~" : "!~")." dirpat<".dirpat.">] && [islocal=".a:islocal."] && [newdir is ".(isdirectory(s:NetrwFile(newdir))? "" : "not ")."a directory]",'~'.expand("<slnum>"))
+"  call Decho("[newdir<".newdir."> ".((newdir =~ dirpat)? "=~" : "!~")." dirpat<".dirpat.">] && [islocal=".a:islocal."] && [newdir is ".(isdirectory(s:NetrwFile(newdir))? "" : "not ")."a directory]",'~'.expand("<slnum>"))
   if newdir !~ dirpat && !(a:islocal && isdirectory(s:NetrwFile(s:ComposePath(dirname,newdir))))
    " ------------------------------
    " NetrwBrowseChgDir: edit a file {{{3
@@ -4585,8 +4571,8 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "   call Decho('edit-a-file: case "handling a file": newdir<'.newdir.'> !~ dirpat<'.dirpat.">",'~'.expand("<slnum>"))
 
    " save position for benefit of Rexplore
-   let s:rexposn_{bufnr("%")}= netrw#SavePosn()
-"   call Decho("edit-a-file: setting s:rexposn_".bufnr("%")."<".bufname("%")."> to SavePosn",'~'.expand("<slnum>"))
+   let s:rexposn_{bufnr("%")}= winsaveview()
+"   call Decho("edit-a-file: saving posn to s:rexposn_".bufnr("%")."<".string(s:rexposn_{bufnr("%")}).">",'~'.expand("<slnum>"))
 "   call Decho("edit-a-file: win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> ft=".&ft,'~'.expand("<slnum>"))
 "   call Decho("edit-a-file: w:netrw_liststyle=".(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a')." w:netrw_treedict:".(exists("w:netrw_treedict")? "exists" : 'n/a')." newdir<".newdir.">",'~'.expand("<slnum>"))
 
@@ -4602,6 +4588,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "    call Decho("edit-a-file: dirname<".dirname.">",'~'.expand("<slnum>"))
 "    call Decho("edit-a-file: tree listing",'~'.expand("<slnum>"))
    elseif newdir =~ '^\(/\|\a:\)'
+"    call Decho("edit-a-file: handle an url or path starting with /: <".newdir.">",'~'.expand("<slnum>"))
     let dirname= newdir
    else
     let dirname= s:ComposePath(dirname,newdir)
@@ -4609,8 +4596,9 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "   call Decho("edit-a-file: handling a file: dirname<".dirname."> (a:0=".a:0.")",'~'.expand("<slnum>"))
    " this lets netrw#BrowseX avoid the edit
    if a:0 < 1
-"    call Decho("edit-a-file: set up windows for editing<".fnameescape(dirname).">  didsplit=".(exists("s:didsplit")? s:didsplit : "doesn't exist"),'~'.expand("<slnum>"))
+"    call Decho("edit-a-file: (a:0=".a:0."<1) set up windows for editing<".fnameescape(dirname).">  didsplit=".(exists("s:didsplit")? s:didsplit : "doesn't exist"),'~'.expand("<slnum>"))
     NetrwKeepj call s:NetrwOptionRestore("s:")
+    let curdir= b:netrw_curdir
     if !exists("s:didsplit")
 "     call Decho("edit-a-file: s:didsplit does not exist; g:netrw_browse_split=".string(g:netrw_browse_split)." win#".winnr(),'~'.expand("<slnum>"))
      if type(g:netrw_browse_split) == 3
@@ -4627,6 +4615,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
       if !&ea
        keepalt wincmd _
       endif
+      call s:SetRexDir(a:islocal,curdir)
      elseif g:netrw_browse_split == 2
       " vertically splitting the window first
 "      call Decho("edit-a-file: vertically splitting window prior to edit",'~'.expand("<slnum>"))
@@ -4634,10 +4623,15 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
       if !&ea
        keepalt wincmd |
       endif
+      call s:SetRexDir(a:islocal,curdir)
      elseif g:netrw_browse_split == 3
       " open file in new tab
 "      call Decho("edit-a-file: opening new tab prior to edit",'~'.expand("<slnum>"))
       keepalt tabnew
+      if !exists("b:netrw_curdir")
+       let b:netrw_curdir= getcwd()
+      endif
+      call s:SetRexDir(a:islocal,curdir)
      elseif g:netrw_browse_split == 4
       " act like "P" (ie. open previous window)
 "      call Decho("edit-a-file: use previous window for edit",'~'.expand("<slnum>"))
@@ -4646,6 +4640,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "       call Dret("s:NetrwBrowseChgDir")
        return
       endif
+      call s:SetRexDir(a:islocal,curdir)
      else
       " handling a file, didn't split, so remove menu
 "      call Decho("edit-a-file: handling a file+didn't split, so remove menu",'~'.expand("<slnum>"))
@@ -4663,6 +4658,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
        endif
        exe "NetrwKeepj keepalt ".g:netrw_chgwin."wincmd w"
       endif
+      call s:SetRexDir(a:islocal,curdir)
      endif
     endif
 
@@ -4797,12 +4793,12 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
    endif
    let treedir      = s:NetrwTreeDir(a:islocal)
 "   call Decho("tree-list: treedir<".treedir.">",'~'.expand("<slnum>"))
-   let s:treecurpos = nbcd_curpos
+   let s:treecurpos = winsaveview()
    let haskey       = 0
 "   call Decho("tree-list: w:netrw_treedict<".string(w:netrw_treedict).">",'~'.expand("<slnum>"))
 
    " search treedict for tree dir as-is
-"   call Decho("search treedict for tree dir as-is",'~'.expand("<slnum>"))
+"   call Decho("tree-list: search treedict for tree dir as-is",'~'.expand("<slnum>"))
    if has_key(w:netrw_treedict,treedir)
 "    call Decho('tree-list: ....searched for treedir<'.treedir.'> : found it!','~'.expand("<slnum>"))
     let haskey= 1
@@ -4811,7 +4807,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
    endif
 
    " search treedict for treedir with a [/@] appended
-"   call Decho("search treedict for treedir with a [/@] appended",'~'.expand("<slnum>"))
+"   call Decho("tree-list: search treedict for treedir with a [/@] appended",'~'.expand("<slnum>"))
    if !haskey && treedir !~ '[/@]$'
     if has_key(w:netrw_treedict,treedir."/")
      let treedir= treedir."/"
@@ -4823,7 +4819,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
    endif
 
    " search treedict for treedir with any trailing / elided
-"   call Decho("search treedict for treedir with any trailing / elided",'~'.expand("<slnum>"))
+"   call Decho("tree-list: search treedict for treedir with any trailing / elided",'~'.expand("<slnum>"))
    if !haskey && treedir =~ '/$'
     let treedir= substitute(treedir,'/$','','')
     if has_key(w:netrw_treedict,treedir)
@@ -4873,6 +4869,7 @@ fun! s:NetrwBrowseChgDir(islocal,newdir,...)
 "  else " Decho
 "   call Decho("skipping option restore (dorestore==0): hidden=".&hidden." bufhidden=".&bufhidden." mod=".&mod,'~'.expand("<slnum>"))
   endif
+  call s:RestorePosn(s:netrw_nbcd)
   if dolockout && dorestore
 "   call Decho("restore: filewritable(dirname<".dirname.">)=".filewritable(dirname),'~'.expand("<slnum>"))
    if filewritable(dirname)
@@ -4908,6 +4905,10 @@ fun! s:NetrwBrowseUpDir(islocal)
    return
   endif
 
+  if !exists("w:netrw_liststyle") || w:netrw_liststyle != s:TREELIST
+   call s:SavePosn(s:netrw_nbcd)
+  endif
+
   norm! 0
   if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict")
 "   call Decho("case: treestyle",'~'.expand("<slnum>"))
@@ -4947,7 +4948,9 @@ fun! s:NetrwBrowseUpDir(islocal)
    else
     call s:NetrwBrowse(0,s:NetrwBrowseChgDir(0,'../'))
    endif
-   if exists("w:netrw_bannercnt")
+   if has_key(s:netrw_nbcd,bufnr("%"))
+    call s:RestorePosn(s:netrw_nbcd)
+   elseif exists("w:netrw_bannercnt")
 "    call Decho("moving to line#".w:netrw_bannercnt,'~'.expand("<slnum>"))
     exe w:netrw_bannercnt
    else
@@ -4967,14 +4970,15 @@ fun! netrw#BrowseX(fname,remote)
 "  call Dfunc("netrw#BrowseX(fname<".a:fname."> remote=".a:remote.")")
 
   " if its really just a directory, then do a "gf" instead
-  if a:fname =~ '/$'
+  if (a:remote == 0 && isdirectory(a:fname)) || (a:remote == 1 && fname =~ '/$' && fname !~ '^https\=:')
    norm! gf
 "   call Dret("netrw#BrowseX : did gf instead")
   endif
 
 
   let ykeep      = @@
-  let screenposn = netrw#SavePosn()
+  let screenposn = winsaveview()
+"  call Decho("saving posn to screenposn<".string(screenposn).">",'~'.expand("<slnum>"))
 
   " need to save and restore aw setting as gx can invoke this function from non-netrw buffers
   let awkeep     = &aw
@@ -4996,7 +5000,8 @@ fun! netrw#BrowseX(fname,remote)
       endif
      endfor
     endif
-    call netrw#RestorePosn(screenposn)
+"    call Decho("restoring posn to screenposn<".string(screenposn).">,'~'.expand("<slnum>"))"
+    call winrestview(screenposn)
     let @@= ykeep
     let &aw= awkeep
 "    call Dret("netrw#BrowseX : coredump handler invoked")
@@ -5041,17 +5046,20 @@ fun! netrw#BrowseX(fname,remote)
 "  call Decho("fname<".fname.">",'~'.expand("<slnum>"))
 "  call Decho("exten<".exten."> "."netrwFileHandlers#NFH_".exten."():exists=".exists("*netrwFileHandlers#NFH_".exten),'~'.expand("<slnum>"))
 
-  " set up redirection
-  if &srr =~ "%s"
-   if (has("win32") || has("win95") || has("win64") || has("win16"))
-    let redir= substitute(&srr,"%s","nul","")
+  " set up redirection (avoids browser messages)
+  " by default, g:netrw_suppress_gx_mesg is true
+  if g:netrw_suppress_gx_mesg
+   if &srr =~ "%s"
+    if (has("win32") || has("win95") || has("win64") || has("win16"))
+     let redir= substitute(&srr,"%s","nul","")
+    else
+     let redir= substitute(&srr,"%s","/dev/null","")
+    endif
+   elseif (has("win32") || has("win95") || has("win64") || has("win16"))
+    let redir= &srr . "nul"
    else
-    let redir= substitute(&srr,"%s","/dev/null","")
+    let redir= &srr . "/dev/null"
    endif
-  elseif (has("win32") || has("win95") || has("win64") || has("win16"))
-   let redir= &srr . "nul"
-  else
-   let redir= &srr . "/dev/null"
   endif
 "  call Decho("set up redirection: redir{".redir."} srr{".&srr."}",'~'.expand("<slnum>"))
 
@@ -5167,7 +5175,8 @@ fun! netrw#BrowseX(fname,remote)
    exe "sil! NetrwKeepj norm! \<c-o>"
 "   redraw!
   endif
-  call netrw#RestorePosn(screenposn)
+"  call Decho("restoring posn to screenposn<".string(screenposn).">",'~'.expand("<slnum>"))
+  call winrestview(screenposn)
   let @@ = ykeep
   let &aw= awkeep
 
@@ -5310,6 +5319,43 @@ fun! s:NetrwForceChgDir(islocal,newdir)
 endfun
 
 " ---------------------------------------------------------------------
+" s:NetrwGlob: does glob() if local, remote listing otherwise {{{2
+"     direntry: this is the name of the directory.  Will be fnameescape'd to prevent wildcard handling by glob()
+"     expr    : this is the expression to follow the directory.  Will use s:ComposePath()
+"     pare    =1: remove the current directory from the resulting glob() filelist
+"             =0: leave  the current directory   in the resulting glob() filelist
+fun! s:NetrwGlob(direntry,expr,pare)
+"  call Dfunc("s:NetrwGlob(direntry<".a:direntry."> expr<".a:expr."> pare=".a:pare.")")
+  if netrw#CheckIfRemote()
+   keepalt 1sp
+   keepalt enew
+   let keep_liststyle    = w:netrw_liststyle
+   let w:netrw_liststyle = s:THINLIST
+   if s:NetrwRemoteListing() == 0
+    keepj keepalt %s@/@@
+    let filelist= getline(1,$)
+    q!
+   else
+    " remote listing error -- leave treedict unchanged
+    let filelist= w:netrw_treedict[a:direntry]
+   endif
+   let w:netrw_liststyle= keep_liststyle
+  elseif v:version > 704 || (v:version == 704 && has("patch656"))
+   let filelist= glob(s:ComposePath(fnameescape(a:direntry),a:expr),0,1,1)
+   if a:pare
+    let filelist= map(filelist,'substitute(v:val, "^.*/", "", "")')
+   endif
+  else
+   let filelist= glob(s:ComposePath(fnameescape(a:direntry),a:expr),0,1)
+   if a:pare
+    let filelist= map(filelist,'substitute(v:val, "^.*/", "", "")')
+   endif
+  endif
+"  call Dret("s:NetrwGlob ".string(filelist))
+  return filelist
+endfun
+
+" ---------------------------------------------------------------------
 " s:NetrwForceFile: (gf support) Force treatment as a file {{{2
 fun! s:NetrwForceFile(islocal,newfile)
 "  call Dfunc("s:NetrwForceFile(islocal=".a:islocal." newdir<".a:newfile.">)")
@@ -5336,7 +5382,8 @@ endfun
 fun! s:NetrwHide(islocal)
 "  call Dfunc("NetrwHide(islocal=".a:islocal.") g:netrw_hide=".g:netrw_hide)
   let ykeep= @@
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   if exists("s:netrwmarkfilelist_{bufnr('%')}")
 "   call Decho("((g:netrw_hide == 1)? "unhide" : "hide")." files in markfilelist<".string(s:netrwmarkfilelist_{bufnr("%")}).">",'~'.expand("<slnum>"))
@@ -5378,7 +5425,8 @@ fun! s:NetrwHide(islocal)
   endif
 
   NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
   let @@= ykeep
 "  call Dret("NetrwHide")
 endfun
@@ -5390,7 +5438,8 @@ fun! s:NetrwHideEdit(islocal)
 
   let ykeep= @@
   " save current cursor position
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   " get new hiding list from user
   call inputsave()
@@ -5403,7 +5452,8 @@ fun! s:NetrwHideEdit(islocal)
   sil NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,"./"))
 
   " restore cursor position
-  call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  call winrestview(svpos)
   let @@= ykeep
 
 "  call Dret("NetrwHideEdit")
@@ -5415,7 +5465,8 @@ fun! s:NetrwHidden(islocal)
 "  call Dfunc("s:NetrwHidden()")
   let ykeep= @@
   "  save current position
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   if g:netrw_list_hide =~ '\(^\|,\)\\(^\\|\\s\\s\\)\\zs\\.\\S\\+'
    " remove pattern from hiding list
@@ -5428,7 +5479,8 @@ fun! s:NetrwHidden(islocal)
 
   " refresh screen and return to saved position
   NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
   let @@= ykeep
 "  call Dret("s:NetrwHidden")
 endfun
@@ -5540,10 +5592,10 @@ fun! s:NetrwServerEdit(islocal,fname)
 
   if (islocal && isdirectory(s:NetrwFile(a:fname))) || (!islocal && a:fname =~ '/$')
    " handle directories in the local window -- not in the remote vim server
-   " user must have closed the NETRWSERVER window.  Treat as a normal editing from netrw.
+   " user must have closed the NETRWSERVER window.  Treat as normal editing from netrw.
 "   call Decho("handling directory in client window",'~'.expand("<slnum>"))
    let g:netrw_browse_split= 0
-   if exists("s:netrw_browse_split_".winnr())
+   if exists("s:netrw_browse_split") && exists("s:netrw_browse_split_".winnr())
     let g:netrw_browse_split= s:netrw_browse_split_{winnr()}
     unlet s:netrw_browse_split_{winnr()}
    endif
@@ -5820,9 +5872,11 @@ fun! s:NetrwMakeDir(usrhost)
    if v:shell_error == 0
     " refresh listing
 "    call Decho("refresh listing",'~'.expand("<slnum>"))
-    let svpos= netrw#SavePosn()
+    let svpos= winsaveview()
+"    call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
     call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
-    call netrw#RestorePosn(svpos)
+"    call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+    call winrestview(svpos)
    elseif !exists("g:netrw_quiet")
     call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",26)
    endif
@@ -5836,9 +5890,11 @@ fun! s:NetrwMakeDir(usrhost)
    call s:NetrwExe("sil! !".mkdircmd." ".s:ShellEscape(newdirname,1))
    if v:shell_error == 0
     " refresh listing
-    let svpos= netrw#SavePosn()
+    let svpos= winsaveview()
+"    call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
     NetrwKeepj call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
-    NetrwKeepj call netrw#RestorePosn(svpos)
+"    call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+    NetrwKeepj call winrestview(svpos)
    elseif !exists("g:netrw_quiet")
     NetrwKeepj call netrw#ErrorMsg(s:ERROR,"unable to make directory<".newdirname.">",27)
    endif
@@ -5846,7 +5902,8 @@ fun! s:NetrwMakeDir(usrhost)
 
   elseif b:netrw_method == 2
    " Remote mkdir:  using ftp+.netrc
-   let svpos= netrw#SavePosn()
+   let svpos= winsaveview()
+"   call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 "   call Decho("b:netrw_curdir<".b:netrw_curdir.">",'~'.expand("<slnum>"))
    if exists("b:netrw_fname")
 "    call Decho("b:netrw_fname<".b:netrw_fname.">",'~'.expand("<slnum>"))
@@ -5856,11 +5913,13 @@ fun! s:NetrwMakeDir(usrhost)
    endif
    call s:NetrwRemoteFtpCmd(remotepath,g:netrw_remote_mkdir.' "'.newdirname.'"')
    NetrwKeepj call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
 
   elseif b:netrw_method == 3
    " Remote mkdir: using ftp + machine, id, passwd, and fname (ie. no .netrc)
-   let svpos= netrw#SavePosn()
+   let svpos= winsaveview()
+"   call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 "   call Decho("b:netrw_curdir<".b:netrw_curdir.">",'~'.expand("<slnum>"))
    if exists("b:netrw_fname")
 "    call Decho("b:netrw_fname<".b:netrw_fname.">",'~'.expand("<slnum>"))
@@ -5870,7 +5929,8 @@ fun! s:NetrwMakeDir(usrhost)
    endif
    call s:NetrwRemoteFtpCmd(remotepath,g:netrw_remote_mkdir.' "'.newdirname.'"')
    NetrwKeepj call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   endif
 
   let @@= ykeep
@@ -5884,22 +5944,30 @@ fun! s:TreeSqueezeDir(islocal)
   if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST && exists("w:netrw_treedict")
    " its a tree-listing style
    let curdepth = substitute(getline('.'),'^\(\%('.s:treedepthstring.'\)*\)[^'.s:treedepthstring.'].\{-}$','\1','e')
-   let iline    = line(".") - 1
    let stopline = (exists("w:netrw_bannercnt")? (w:netrw_bannercnt + 1) : 1)
-"   call Decho("curdepth=".curdepth,'~'.expand("<slnum>"))
+   let depth    = strchars(substitute(curdepth,' ','','g'))
+   let srch     = -1
+"   call Decho("curdepth<".curdepth.'>','~'.expand("<slnum>"))
+"   call Decho("depth   =".depth,'~'.expand("<slnum>"))
 "   call Decho("stopline#".stopline,'~'.expand("<slnum>"))
-"   call Decho("starting with line#".line(".").": ".getline('.'),'~'.expand("<slnum>"))
-   while iline > stopline
-    " find a line that has less depth
-    let depth = substitute(getline('.'),'^\(\%('.s:treedepthstring.'\)*\)[^'.s:treedepthstring.'].\{-}$','\1','e')
-"    call Decho("considering  line#".line(".").": ".getline('.'),'~'.expand("<slnum>"))
-    if depth < curdepth
-     break
-    endif
-    norm! k
-   endwhile
-"   call Decho("squeezing at line#".line(".").": ".getline('.'),'~'.expand("<slnum>"))
-   call s:NetrwBrowse(a:islocal,s:NetrwBrowseChgDir(a:islocal,s:NetrwGetWord()))
+"   call Decho("curline#".line(".")."<".getline('.').'>','~'.expand("<slnum>"))
+   if depth >= 2
+    NetrwKeepj norm! 0
+    let curdepthm1= substitute(curdepth,'^'.s:treedepthstring,'','')
+    let srch      = search('^'.curdepthm1.'\%('.s:treedepthstring.'\)\@!','bW',stopline)
+"    call Decho("curdepthm1<".curdepthm1.'>','~'.expand("<slnum>"))
+"    call Decho("case depth>=2: srch<".srch.'>','~'.expand("<slnum>"))
+   elseif depth == 1
+    NetrwKeepj norm! 0
+    let treedepthchr= substitute(s:treedepthstring,' ','','')
+    let srch        = search('^[^'.treedepthchr.']','bW',stopline)
+"    call Decho("case depth==1: srch<".srch.'>','~'.expand("<slnum>"))
+   endif
+   if srch > 0
+"    call Decho("squeezing at line#".line(".").": ".getline('.'),'~'.expand("<slnum>"))
+    call s:NetrwBrowse(a:islocal,s:NetrwBrowseChgDir(a:islocal,s:NetrwGetWord()))
+    exe srch
+   endif
   endif
 "  call Dret("s:TreeSqueezeDir")
 endfun
@@ -5927,23 +5995,24 @@ fun! s:NetrwMaps(islocal)
   if a:islocal
 "   call Decho("make local maps",'~'.expand("<slnum>"))
    " local normal-mode maps
-   nnoremap <buffer> <silent> <nowait> a	:call <SID>NetrwHide(1)<cr>
-   nnoremap <buffer> <silent> <nowait> %	:call <SID>NetrwOpenFile(1)<cr>
-   nnoremap <buffer> <silent> <nowait> c	:call <SID>NetrwLcd(b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> a	:<c-u>call <SID>NetrwHide(1)<cr>
+   nnoremap <buffer> <silent> <nowait> -	:<c-u>call <SID>NetrwBrowseUpDir(1)<cr>
+   nnoremap <buffer> <silent> <nowait> %	:<c-u>call <SID>NetrwOpenFile(1)<cr>
+   nnoremap <buffer> <silent> <nowait> c	:<c-u>call <SID>NetrwLcd(b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> C	:<c-u>call <SID>NetrwSetChgwin()<cr>
-   nnoremap <buffer> <silent> <nowait> <cr>	:call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord()))<cr>
-   nnoremap <buffer> <silent> <nowait> <s-cr>	:call <SID>TreeSqueezeDir(1)<cr>
-   nnoremap <buffer> <silent> <nowait> <c-r>	:call <SID>NetrwServerEdit(3,<SID>NetrwGetWord())<cr>
-   nnoremap <buffer> <silent> <nowait> d	:call <SID>NetrwMakeDir("")<cr>
-   nnoremap <buffer> <silent> <nowait> -	:call <SID>NetrwBrowseUpDir(1)<cr>
+   nnoremap <buffer> <silent> <nowait> <cr>	:<c-u>call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord()))<cr>
+   nnoremap <buffer> <silent> <nowait> <c-r>	:<c-u>call <SID>NetrwServerEdit(3,<SID>NetrwGetWord())<cr>
+   nnoremap <buffer> <silent> <nowait> d	:<c-u>call <SID>NetrwMakeDir("")<cr>
    nnoremap <buffer> <silent> <nowait> gb	:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> gd	:<c-u>call <SID>NetrwForceChgDir(1,<SID>NetrwGetWord())<cr>
    nnoremap <buffer> <silent> <nowait> gf	:<c-u>call <SID>NetrwForceFile(1,<SID>NetrwGetWord())<cr>
    nnoremap <buffer> <silent> <nowait> gh	:<c-u>call <SID>NetrwHidden(1)<cr>
    nnoremap <buffer> <silent> <nowait> gn	:<c-u>call netrw#SetTreetop(<SID>NetrwGetWord())<cr>
    nnoremap <buffer> <silent> <nowait> gp	:<c-u>call <SID>NetrwChgPerm(1,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> I	:call <SID>NetrwBannerCtrl(1)<cr>
-   nnoremap <buffer> <silent> <nowait> i	:call <SID>NetrwListStyle(1)<cr>
+   nnoremap <buffer> <silent> <nowait> I	:<c-u>call <SID>NetrwBannerCtrl(1)<cr>
+   nnoremap <buffer> <silent> <nowait> i	:<c-u>call <SID>NetrwListStyle(1)<cr>
+   nnoremap <buffer> <silent> <nowait> ma	:<c-u>call <SID>NetrwMarkFileArgList(1,0)<cr>
+   nnoremap <buffer> <silent> <nowait> mA	:<c-u>call <SID>NetrwMarkFileArgList(1,1)<cr>
    nnoremap <buffer> <silent> <nowait> mb	:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> mB	:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> mc	:<c-u>call <SID>NetrwMarkFileCopy(1)<cr>
@@ -5957,104 +6026,110 @@ fun! s:NetrwMaps(islocal)
    nnoremap <buffer> <silent> <nowait> mp	:<c-u>call <SID>NetrwMarkFilePrint(1)<cr>
    nnoremap <buffer> <silent> <nowait> mr	:<c-u>call <SID>NetrwMarkFileRegexp(1)<cr>
    nnoremap <buffer> <silent> <nowait> ms	:<c-u>call <SID>NetrwMarkFileSource(1)<cr>
-   nnoremap <buffer> <silent> <nowait> mt	:<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
    nnoremap <buffer> <silent> <nowait> mT	:<c-u>call <SID>NetrwMarkFileTag(1)<cr>
+   nnoremap <buffer> <silent> <nowait> mt	:<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
    nnoremap <buffer> <silent> <nowait> mu	:<c-u>call <SID>NetrwUnMarkFile(1)<cr>
    nnoremap <buffer> <silent> <nowait> mv	:<c-u>call <SID>NetrwMarkFileVimCmd(1)<cr>
    nnoremap <buffer> <silent> <nowait> mx	:<c-u>call <SID>NetrwMarkFileExe(1,0)<cr>
    nnoremap <buffer> <silent> <nowait> mX	:<c-u>call <SID>NetrwMarkFileExe(1,1)<cr>
    nnoremap <buffer> <silent> <nowait> mz	:<c-u>call <SID>NetrwMarkFileCompress(1)<cr>
-   nnoremap <buffer> <silent> <nowait> O	:call <SID>NetrwObtain(1)<cr>
+   nnoremap <buffer> <silent> <nowait> O	:<c-u>call <SID>NetrwObtain(1)<cr>
    nnoremap <buffer> <silent> <nowait> o	:call <SID>NetrwSplit(3)<cr>
-   nnoremap <buffer> <silent> <nowait> p	:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
-   nnoremap <buffer> <silent> <nowait> P	:call <SID>NetrwPrevWinOpen(1)<cr>
+   nnoremap <buffer> <silent> <nowait> p	:<c-u>call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+   nnoremap <buffer> <silent> <nowait> P	:<c-u>call <SID>NetrwPrevWinOpen(1)<cr>
    nnoremap <buffer> <silent> <nowait> qb	:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> qf	:<c-u>call <SID>NetrwFileInfo(1,<SID>NetrwGetWord())<cr>
    nnoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(1,getqflist())<cr>
-   nnoremap <buffer> <silent> <nowait> r	:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
+   nnoremap <buffer> <silent> <nowait> qL	:<c-u>call <SID>NetrwMarkFileQFEL(1,getloclist(v:count))<cr>
+   nnoremap <buffer> <silent> <nowait> r	:<c-u>let g:netrw_sort_direction= (g:netrw_sort_direction =~# 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
    nnoremap <buffer> <silent> <nowait> s	:call <SID>NetrwSortStyle(1)<cr>
-   nnoremap <buffer> <silent> <nowait> S	:call <SID>NetSortSequence(1)<cr>
+   nnoremap <buffer> <silent> <nowait> S	:<c-u>call <SID>NetSortSequence(1)<cr>
+   nnoremap <buffer> <silent> <nowait> Tb	:<c-u>call <SID>NetrwSetTgt(1,'b',v:count1)<cr>
    nnoremap <buffer> <silent> <nowait> t	:call <SID>NetrwSplit(4)<cr>
-   nnoremap <buffer> <silent> <nowait> Tb	:<c-u>call <SID>NetrwSetTgt('b',v:count1)<cr>
-   nnoremap <buffer> <silent> <nowait> Th	:<c-u>call <SID>NetrwSetTgt('h',v:count)<cr>
+   nnoremap <buffer> <silent> <nowait> Th	:<c-u>call <SID>NetrwSetTgt(1,'h',v:count)<cr>
    nnoremap <buffer> <silent> <nowait> u	:<c-u>call <SID>NetrwBookHistHandler(4,expand("%"))<cr>
    nnoremap <buffer> <silent> <nowait> U	:<c-u>call <SID>NetrwBookHistHandler(5,expand("%"))<cr>
    nnoremap <buffer> <silent> <nowait> v	:call <SID>NetrwSplit(5)<cr>
-   nnoremap <buffer> <silent> <nowait> x	:call netrw#BrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
-   nnoremap <buffer> <silent> <nowait> X	:call <SID>NetrwLocalExecute(expand("<cword>"))"<cr>
-   " local insert-mode maps
-   inoremap <buffer> <silent> <nowait> a	<c-o>:call <SID>NetrwHide(1)<cr>
-   inoremap <buffer> <silent> <nowait> c	<c-o>:exe "NetrwKeepj lcd ".fnameescape(b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> c	<c-o>:call <SID>NetrwLcd(b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> C	<c-o>:call <SID>NetrwSetChgwin()<cr>
-   inoremap <buffer> <silent> <nowait> %	<c-o>:call <SID>NetrwOpenFile(1)<cr>
-   inoremap <buffer> <silent> <nowait> -	<c-o>:call <SID>NetrwBrowseUpDir(1)<cr>
-   inoremap <buffer> <silent> <nowait> <cr>	<c-o>:call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord()))<cr>
-   inoremap <buffer> <silent> <nowait> <s-cr>	<c-o>:call <SID>TreeSqueezeDir(1)<cr>
-   inoremap <buffer> <silent> <nowait> d	<c-o>:call <SID>NetrwMakeDir("")<cr>
-   inoremap <buffer> <silent> <nowait> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> gh	<c-o>:<c-u>call <SID>NetrwHidden(1)<cr>
-   nnoremap <buffer> <silent> <nowait> gn	:<c-u>call netrw#SetTreetop(<SID>NetrwGetWord())<cr>
-   inoremap <buffer> <silent> <nowait> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(1,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> I	<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
-   inoremap <buffer> <silent> <nowait> i	<c-o>:call <SID>NetrwListStyle(1)<cr>
-   inoremap <buffer> <silent> <nowait> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(1)<cr>
-   inoremap <buffer> <silent> <nowait> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(1)<cr>
-   inoremap <buffer> <silent> <nowait> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(1)<cr>
-   inoremap <buffer> <silent> <nowait> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
-   inoremap <buffer> <silent> <nowait> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(1)<cr>
-   inoremap <buffer> <silent> <nowait> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(1)<cr>
-   inoremap <buffer> <silent> <nowait> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(1)<cr>
-   inoremap <buffer> <silent> <nowait> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(1)<cr>
-   inoremap <buffer> <silent> <nowait> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(1)<cr>
-   inoremap <buffer> <silent> <nowait> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(1)<cr>
-   inoremap <buffer> <silent> <nowait> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(1)<cr>
-   inoremap <buffer> <silent> <nowait> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
-   inoremap <buffer> <silent> <nowait> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(1)<cr>
-   inoremap <buffer> <silent> <nowait> mv	<c-o>:<c-u>call <SID>NetrwMarkFileVimCmd(1)<cr>
-   inoremap <buffer> <silent> <nowait> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(1,0)<cr>
-   inoremap <buffer> <silent> <nowait> mX	<c-o>:<c-u>call <SID>NetrwMarkFileExe(1,1)<cr>
-   inoremap <buffer> <silent> <nowait> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(1)<cr>
-   inoremap <buffer> <silent> <nowait> O	<c-o>:call <SID>NetrwObtain(1)<cr>
-   inoremap <buffer> <silent> <nowait> o	<c-o>:call <SID>NetrwSplit(3)<cr>
-   inoremap <buffer> <silent> <nowait> p	<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
-   inoremap <buffer> <silent> <nowait> P	<c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
-   inoremap <buffer> <silent> <nowait> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(1,<SID>NetrwGetWord())<cr>
-   inoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(1,getqflist())<cr>
-   inoremap <buffer> <silent> <nowait> r	<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
-   inoremap <buffer> <silent> <nowait> s	<c-o>:call <SID>NetrwSortStyle(1)<cr>
-   inoremap <buffer> <silent> <nowait> S	<c-o>:call <SID>NetSortSequence(1)<cr>
-   inoremap <buffer> <silent> <nowait> t	<c-o>:call <SID>NetrwSplit(4)<cr>
-   inoremap <buffer> <silent> <nowait> Tb	<c-o>:<c-u>call <SID>NetrwSetTgt('b',v:count1)<cr>
-   inoremap <buffer> <silent> <nowait> Th	<c-o>:<c-u>call <SID>NetrwSetTgt('h',v:count)<cr>
-   inoremap <buffer> <silent> <nowait> u	<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,expand("%"))<cr>
-   inoremap <buffer> <silent> <nowait> U	<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,expand("%"))<cr>
-   inoremap <buffer> <silent> <nowait> v	<c-o>:call <SID>NetrwSplit(5)<cr>
-   inoremap <buffer> <silent> <nowait> x	<c-o>:call netrw#BrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
+   nnoremap <buffer> <silent> <nowait> x	:<c-u>call netrw#BrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
+   nnoremap <buffer> <silent> <nowait> X	:<c-u>call <SID>NetrwLocalExecute(expand("<cword>"))"<cr>
+"   " local insert-mode maps
+"   inoremap <buffer> <silent> <nowait> a	<c-o>:call <SID>NetrwHide(1)<cr>
+"   inoremap <buffer> <silent> <nowait> c	<c-o>:exe "NetrwKeepj lcd ".fnameescape(b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> c	<c-o>:call <SID>NetrwLcd(b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> C	<c-o>:call <SID>NetrwSetChgwin()<cr>
+"   inoremap <buffer> <silent> <nowait> %	<c-o>:call <SID>NetrwOpenFile(1)<cr>
+"   inoremap <buffer> <silent> <nowait> -	<c-o>:call <SID>NetrwBrowseUpDir(1)<cr>
+"   inoremap <buffer> <silent> <nowait> <cr>	<c-o>:call netrw#LocalBrowseCheck(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord()))<cr>
+"   inoremap <buffer> <silent> <nowait> d	<c-o>:call <SID>NetrwMakeDir("")<cr>
+"   inoremap <buffer> <silent> <nowait> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> gh	<c-o>:<c-u>call <SID>NetrwHidden(1)<cr>
+"   nnoremap <buffer> <silent> <nowait> gn	:<c-u>call netrw#SetTreetop(<SID>NetrwGetWord())<cr>
+"   inoremap <buffer> <silent> <nowait> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(1,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> I	<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
+"   inoremap <buffer> <silent> <nowait> i	<c-o>:call <SID>NetrwListStyle(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(1)<cr>
+"   inoremap <buffer> <silent> <nowait> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(1)<cr>
+"   inoremap <buffer> <silent> <nowait> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
+"   inoremap <buffer> <silent> <nowait> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(1)<cr>
+"   inoremap <buffer> <silent> <nowait> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mv	<c-o>:<c-u>call <SID>NetrwMarkFileVimCmd(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(1,0)<cr>
+"   inoremap <buffer> <silent> <nowait> mX	<c-o>:<c-u>call <SID>NetrwMarkFileExe(1,1)<cr>
+"   inoremap <buffer> <silent> <nowait> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(1)<cr>
+"   inoremap <buffer> <silent> <nowait> O	<c-o>:call <SID>NetrwObtain(1)<cr>
+"   inoremap <buffer> <silent> <nowait> o	<c-o>:call <SID>NetrwSplit(3)<cr>
+"   inoremap <buffer> <silent> <nowait> p	<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+"   inoremap <buffer> <silent> <nowait> P	<c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
+"   inoremap <buffer> <silent> <nowait> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(1,<SID>NetrwGetWord())<cr>
+"   inoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(1,getqflist())<cr>
+"   inoremap <buffer> <silent> <nowait> qL	:<c-u>call <SID>NetrwMarkFileQFEL(1,getloclist(v:count))<cr>
+"   inoremap <buffer> <silent> <nowait> r	<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~# 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,'./'))<cr>
+"   inoremap <buffer> <silent> <nowait> s	<c-o>:call <SID>NetrwSortStyle(1)<cr>
+"   inoremap <buffer> <silent> <nowait> S	<c-o>:call <SID>NetSortSequence(1)<cr>
+"   inoremap <buffer> <silent> <nowait> t	<c-o>:call <SID>NetrwSplit(4)<cr>
+"   inoremap <buffer> <silent> <nowait> Tb	<c-o>:<c-u>call <SID>NetrwSetTgt(1,'b',v:count1)<cr>
+"   inoremap <buffer> <silent> <nowait> Th	<c-o>:<c-u>call <SID>NetrwSetTgt(1,'h',v:count)<cr>
+"   inoremap <buffer> <silent> <nowait> u	<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,expand("%"))<cr>
+"   inoremap <buffer> <silent> <nowait> U	<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,expand("%"))<cr>
+"   inoremap <buffer> <silent> <nowait> v	<c-o>:call <SID>NetrwSplit(5)<cr>
+"   inoremap <buffer> <silent> <nowait> x	<c-o>:call netrw#BrowseX(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),0),0)"<cr>
    if !hasmapto('<Plug>NetrwHideEdit')
     nmap <buffer> <unique> <c-h> <Plug>NetrwHideEdit
-    imap <buffer> <unique> <c-h> <Plug>NetrwHideEdit
+"    imap <buffer> <unique> <c-h> <c-o><Plug>NetrwHideEdit
    endif
-   nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(1)<cr>
+   nnoremap <buffer> <silent> <Plug>NetrwHideEdit		:call <SID>NetrwHideEdit(1)<cr>
    if !hasmapto('<Plug>NetrwRefresh')
     nmap <buffer> <unique> <c-l> <Plug>NetrwRefresh
-    imap <buffer> <unique> <c-l> <Plug>NetrwRefresh
+"    imap <buffer> <unique> <c-l> <c-o><Plug>NetrwRefresh
    endif
-   nnoremap <buffer> <silent> <Plug>NetrwRefresh		:call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,(w:netrw_liststyle == 3)? w:netrw_treetop : './'))<cr>
+   nnoremap <buffer> <silent> <Plug>NetrwRefresh		<c-l>:call <SID>NetrwRefresh(1,<SID>NetrwBrowseChgDir(1,(w:netrw_liststyle == 3)? w:netrw_treetop : './'))<cr>
    if s:didstarstar || !mapcheck("<s-down>","n")
     nnoremap <buffer> <silent> <s-down>	:Nexplore<cr>
-    inoremap <buffer> <silent> <s-down>	:Nexplore<cr>
+"    inoremap <buffer> <silent> <s-down>	<c-o>:Nexplore<cr>
    endif
    if s:didstarstar || !mapcheck("<s-up>","n")
     nnoremap <buffer> <silent> <s-up>	:Pexplore<cr>
-    inoremap <buffer> <silent> <s-up>	:Pexplore<cr>
+"    inoremap <buffer> <silent> <s-up>	<c-o>:Pexplore<cr>
    endif
+   if !hasmapto('<Plug>NetrwTreeSqueeze')
+    nmap <buffer> <silent> <nowait> <s-cr>			<Plug>NetrwTreeSqueeze
+"    imap <buffer> <silent> <nowait> <s-cr>			<c-o><Plug>NetrwTreeSqueeze
+   endif
+   nnoremap <buffer> <silent> <Plug>NetrwTreeSqueeze		:call <SID>TreeSqueezeDir(1)<cr>
    let mapsafecurdir = escape(b:netrw_curdir, s:netrw_map_escape)
    if g:netrw_mousemaps == 1
-    nmap <buffer> <leftmouse>   	<Plug>NetrwLeftmouse
+    nmap <buffer> <leftmouse>   				<Plug>NetrwLeftmouse
     nno  <buffer> <silent>		<Plug>NetrwLeftmouse	<leftmouse>:call <SID>NetrwLeftmouse(1)<cr>
     nmap <buffer> <c-leftmouse>		<Plug>NetrwCLeftmouse
     nno  <buffer> <silent>		<Plug>NetrwCLeftmouse	<leftmouse>:call <SID>NetrwCLeftmouse(1)<cr>
@@ -6067,14 +6142,14 @@ fun! s:NetrwMaps(islocal)
     nmap <buffer> <2-leftmouse>		<Plug>Netrw2Leftmouse
     nmap <buffer> <silent>		<Plug>Netrw2Leftmouse	-
     imap <buffer> <leftmouse>		<Plug>ILeftmouse
-    ino  <buffer> <silent>		<Plug>ILeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(1)<cr>
+"    ino  <buffer> <silent>		<Plug>ILeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(1)<cr>
     imap <buffer> <middlemouse>		<Plug>IMiddlemouse
-    ino  <buffer> <silent>		<Plug>IMiddlemouse	<c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
-    imap <buffer> <s-leftmouse>		<Plug>ISLeftmouse
-    ino  <buffer> <silent>		<Plug>ISLeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
+"    ino  <buffer> <silent>		<Plug>IMiddlemouse	<c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(1)<cr>
+"    imap <buffer> <s-leftmouse>		<Plug>ISLeftmouse
+"    ino  <buffer> <silent>		<Plug>ISLeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(1,<SID>NetrwGetWord())<cr>
     exe 'nnoremap <buffer> <silent> <rightmouse>  <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
     exe 'vnoremap <buffer> <silent> <rightmouse>  <leftmouse>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
-    exe 'inoremap <buffer> <silent> <rightmouse>  <c-o><leftmouse><c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+"    exe 'inoremap <buffer> <silent> <rightmouse>  <c-o><leftmouse><c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
    endif
    exe 'nnoremap <buffer> <silent> <nowait> <del>	:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
    exe 'nnoremap <buffer> <silent> <nowait> D		:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
@@ -6083,10 +6158,10 @@ fun! s:NetrwMaps(islocal)
    exe 'vnoremap <buffer> <silent> <nowait> <del>	:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
    exe 'vnoremap <buffer> <silent> <nowait> D		:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
    exe 'vnoremap <buffer> <silent> <nowait> R		:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> <del>	<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> D		<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> R		<c-o>:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> d		<c-o>:call <SID>NetrwMakeDir("")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> <del>	<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> D		<c-o>:call <SID>NetrwLocalRm("'.mapsafecurdir.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> R		<c-o>:call <SID>NetrwLocalRename("'.mapsafecurdir.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> d		<c-o>:call <SID>NetrwMakeDir("")<cr>'
    nnoremap <buffer> <F1>			:he netrw-quickhelp<cr>
 
    " support user-specified maps
@@ -6096,13 +6171,24 @@ fun! s:NetrwMaps(islocal)
 "   call Decho("make remote maps",'~'.expand("<slnum>"))
    call s:RemotePathAnalysis(b:netrw_curdir)
    " remote normal-mode maps
-   nnoremap <buffer> <silent> <nowait> <cr>	:call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()))<cr>
-   nnoremap <buffer> <silent> <nowait> <s-cr>	:call <SID>TreeSqueezeDir(0)<cr>
-   nnoremap <buffer> <silent> <nowait> <c-l>	:call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
-   nnoremap <buffer> <silent> <nowait> <c-r>	:call <SID>NetrwServerEdit(2,<SID>NetrwGetWord())<cr>
-   nnoremap <buffer> <silent> <nowait> -	:call <SID>NetrwBrowseUpDir(0)<cr>
-   nnoremap <buffer> <silent> <nowait> a	:call <SID>NetrwHide(0)<cr>
+   nnoremap <buffer> <silent> <nowait> a	:<c-u>call <SID>NetrwHide(0)<cr>
+   nnoremap <buffer> <silent> <nowait> -	:<c-u>call <SID>NetrwBrowseUpDir(0)<cr>
+   nnoremap <buffer> <silent> <nowait> %	:<c-u>call <SID>NetrwOpenFile(0)<cr>
+   nnoremap <buffer> <silent> <nowait> C	:<c-u>call <SID>NetrwSetChgwin()<cr>
+   nnoremap <buffer> <silent> <nowait> <c-l>	:<c-u>call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+   nnoremap <buffer> <silent> <nowait> <cr>	:<c-u>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()))<cr>
+   nnoremap <buffer> <silent> <nowait> <c-r>	:<c-u>call <SID>NetrwServerEdit(2,<SID>NetrwGetWord())<cr>
+   nnoremap <buffer> <silent> <nowait> gb	:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> gd	:<c-u>call <SID>NetrwForceChgDir(0,<SID>NetrwGetWord())<cr>
+   nnoremap <buffer> <silent> <nowait> gf	:<c-u>call <SID>NetrwForceFile(0,<SID>NetrwGetWord())<cr>
+   nnoremap <buffer> <silent> <nowait> gh	:<c-u>call <SID>NetrwHidden(0)<cr>
+   nnoremap <buffer> <silent> <nowait> gp	:<c-u>call <SID>NetrwChgPerm(0,b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> I	:<c-u>call <SID>NetrwBannerCtrl(1)<cr>
+   nnoremap <buffer> <silent> <nowait> i	:<c-u>call <SID>NetrwListStyle(0)<cr>
+   nnoremap <buffer> <silent> <nowait> ma	:<c-u>call <SID>NetrwMarkFileArgList(0,0)<cr>
+   nnoremap <buffer> <silent> <nowait> mA	:<c-u>call <SID>NetrwMarkFileArgList(0,1)<cr>
    nnoremap <buffer> <silent> <nowait> mb	:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> mB	:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> mc	:<c-u>call <SID>NetrwMarkFileCopy(0)<cr>
    nnoremap <buffer> <silent> <nowait> md	:<c-u>call <SID>NetrwMarkFileDiff(0)<cr>
    nnoremap <buffer> <silent> <nowait> me	:<c-u>call <SID>NetrwMarkFileEdit(0)<cr>
@@ -6114,99 +6200,96 @@ fun! s:NetrwMaps(islocal)
    nnoremap <buffer> <silent> <nowait> mp	:<c-u>call <SID>NetrwMarkFilePrint(0)<cr>
    nnoremap <buffer> <silent> <nowait> mr	:<c-u>call <SID>NetrwMarkFileRegexp(0)<cr>
    nnoremap <buffer> <silent> <nowait> ms	:<c-u>call <SID>NetrwMarkFileSource(0)<cr>
-   nnoremap <buffer> <silent> <nowait> mt	:<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
    nnoremap <buffer> <silent> <nowait> mT	:<c-u>call <SID>NetrwMarkFileTag(0)<cr>
+   nnoremap <buffer> <silent> <nowait> mt	:<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
    nnoremap <buffer> <silent> <nowait> mu	:<c-u>call <SID>NetrwUnMarkFile(0)<cr>
    nnoremap <buffer> <silent> <nowait> mv	:<c-u>call <SID>NetrwMarkFileVimCmd(0)<cr>
    nnoremap <buffer> <silent> <nowait> mx	:<c-u>call <SID>NetrwMarkFileExe(0,0)<cr>
    nnoremap <buffer> <silent> <nowait> mX	:<c-u>call <SID>NetrwMarkFileExe(0,1)<cr>
    nnoremap <buffer> <silent> <nowait> mz	:<c-u>call <SID>NetrwMarkFileCompress(0)<cr>
-   nnoremap <buffer> <silent> <nowait> gb	:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> gd	:<c-u>call <SID>NetrwForceChgDir(0,<SID>NetrwGetWord())<cr>
-   nnoremap <buffer> <silent> <nowait> gf	:<c-u>call <SID>NetrwForceFile(0,<SID>NetrwGetWord())<cr>
-   nnoremap <buffer> <silent> <nowait> gh	:<c-u>call <SID>NetrwHidden(0)<cr>
-   nnoremap <buffer> <silent> <nowait> gp	:<c-u>call <SID>NetrwChgPerm(0,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> C		:<c-u>call <SID>NetrwSetChgwin()<cr>
-   nnoremap <buffer> <silent> <nowait> i		:call <SID>NetrwListStyle(0)<cr>
-   nnoremap <buffer> <silent> <nowait> I		:call <SID>NetrwBannerCtrl(1)<cr>
-   nnoremap <buffer> <silent> <nowait> o		:call <SID>NetrwSplit(0)<cr>
-   nnoremap <buffer> <silent> <nowait> O		:call <SID>NetrwObtain(0)<cr>
-   nnoremap <buffer> <silent> <nowait> p		:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
-   nnoremap <buffer> <silent> <nowait> P		:call <SID>NetrwPrevWinOpen(0)<cr>
+   nnoremap <buffer> <silent> <nowait> O	:<c-u>call <SID>NetrwObtain(0)<cr>
+   nnoremap <buffer> <silent> <nowait> o	:call <SID>NetrwSplit(0)<cr>
+   nnoremap <buffer> <silent> <nowait> p	:<c-u>call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+   nnoremap <buffer> <silent> <nowait> P	:<c-u>call <SID>NetrwPrevWinOpen(0)<cr>
    nnoremap <buffer> <silent> <nowait> qb	:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> mB	:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
    nnoremap <buffer> <silent> <nowait> qf	:<c-u>call <SID>NetrwFileInfo(0,<SID>NetrwGetWord())<cr>
    nnoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(0,getqflist())<cr>
-   nnoremap <buffer> <silent> <nowait> r		:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
-   nnoremap <buffer> <silent> <nowait> s		:call <SID>NetrwSortStyle(0)<cr>
-   nnoremap <buffer> <silent> <nowait> S		:call <SID>NetSortSequence(0)<cr>
-   nnoremap <buffer> <silent> <nowait> t		:call <SID>NetrwSplit(1)<cr>
-   nnoremap <buffer> <silent> <nowait> Tb	:<c-u>call <SID>NetrwSetTgt('b',v:count1)<cr>
-   nnoremap <buffer> <silent> <nowait> Th	:<c-u>call <SID>NetrwSetTgt('h',v:count)<cr>
-   nnoremap <buffer> <silent> <nowait> u		:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> U		:<c-u>call <SID>NetrwBookHistHandler(5,b:netrw_curdir)<cr>
-   nnoremap <buffer> <silent> <nowait> v		:call <SID>NetrwSplit(2)<cr>
-   nnoremap <buffer> <silent> <nowait> x		:call netrw#BrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
-   nnoremap <buffer> <silent> <nowait> %		:call <SID>NetrwOpenFile(0)<cr>
-   " remote insert-mode maps
-   inoremap <buffer> <silent> <nowait> <cr>	<c-o>:call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()))<cr>
-   inoremap <buffer> <silent> <nowait> <c-l>	<c-o>:call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
-   inoremap <buffer> <silent> <nowait> <s-cr>	<c-o>:call <SID>TreeSqueezeDir(0)<cr>
-   inoremap <buffer> <silent> <nowait> -		<c-o>:call <SID>NetrwBrowseUpDir(0)<cr>
-   inoremap <buffer> <silent> <nowait> a		<c-o>:call <SID>NetrwHide(0)<cr>
-   inoremap <buffer> <silent> <nowait> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(0)<cr>
-   inoremap <buffer> <silent> <nowait> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(0)<cr>
-   inoremap <buffer> <silent> <nowait> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(0)<cr>
-   inoremap <buffer> <silent> <nowait> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
-   inoremap <buffer> <silent> <nowait> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(0)<cr>
-   inoremap <buffer> <silent> <nowait> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(0)<cr>
-   inoremap <buffer> <silent> <nowait> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(0)<cr>
-   inoremap <buffer> <silent> <nowait> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(0)<cr>
-   inoremap <buffer> <silent> <nowait> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(0)<cr>
-   inoremap <buffer> <silent> <nowait> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(0)<cr>
-   inoremap <buffer> <silent> <nowait> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
-   inoremap <buffer> <silent> <nowait> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(0)<cr>
-   inoremap <buffer> <silent> <nowait> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(0)<cr>
-   nnoremap <buffer> <silent> <nowait> mv	:<c-u>call <SID>NetrwMarkFileVimCmd(1)<cr>
-   inoremap <buffer> <silent> <nowait> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(0,0)<cr>
-   inoremap <buffer> <silent> <nowait> mX	<c-o>:<c-u>call <SID>NetrwMarkFileExe(0,1)<cr>
-   inoremap <buffer> <silent> <nowait> mv	<c-o>:<c-u>call <SID>NetrwMarkFileVimCmd(0)<cr>
-   inoremap <buffer> <silent> <nowait> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(0)<cr>
-   inoremap <buffer> <silent> <nowait> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> gh	<c-o>:<c-u>call <SID>NetrwHidden(0)<cr>
-   inoremap <buffer> <silent> <nowait> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(0,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> C		<c-o>:call <SID>NetrwSetChgwin()<cr>
-   inoremap <buffer> <silent> <nowait> i		<c-o>:call <SID>NetrwListStyle(0)<cr>
-   inoremap <buffer> <silent> <nowait> I		<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
-   inoremap <buffer> <silent> <nowait> o		<c-o>:call <SID>NetrwSplit(0)<cr>
-   inoremap <buffer> <silent> <nowait> O		<c-o>:call <SID>NetrwObtain(0)<cr>
-   inoremap <buffer> <silent> <nowait> p		<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
-   inoremap <buffer> <silent> <nowait> P		<c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
-   inoremap <buffer> <silent> <nowait> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(0,<SID>NetrwGetWord())<cr>
-   inoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(0,getqflist())<cr>
-   inoremap <buffer> <silent> <nowait> r		<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~ 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
-   inoremap <buffer> <silent> <nowait> s		<c-o>:call <SID>NetrwSortStyle(0)<cr>
-   inoremap <buffer> <silent> <nowait> S		<c-o>:call <SID>NetSortSequence(0)<cr>
-   inoremap <buffer> <silent> <nowait> t		<c-o>:call <SID>NetrwSplit(1)<cr>
-   inoremap <buffer> <silent> <nowait> Tb	<c-o>:<c-u>call <SID>NetrwSetTgt('b',v:count1)<cr>
-   inoremap <buffer> <silent> <nowait> Th	<c-o>:<c-u>call <SID>NetrwSetTgt('h',v:count)<cr>
-   inoremap <buffer> <silent> <nowait> u		<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> U		<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,b:netrw_curdir)<cr>
-   inoremap <buffer> <silent> <nowait> v		<c-o>:call <SID>NetrwSplit(2)<cr>
-   inoremap <buffer> <silent> <nowait> x		<c-o>:call netrw#BrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
-   inoremap <buffer> <silent> <nowait> %		<c-o>:call <SID>NetrwOpenFile(0)<cr>
+   nnoremap <buffer> <silent> <nowait> qL	:<c-u>call <SID>NetrwMarkFileQFEL(0,getloclist(v:count))<cr>
+   nnoremap <buffer> <silent> <nowait> r	:<c-u>let g:netrw_sort_direction= (g:netrw_sort_direction =~# 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+   nnoremap <buffer> <silent> <nowait> s	:call <SID>NetrwSortStyle(0)<cr>
+   nnoremap <buffer> <silent> <nowait> S	:<c-u>call <SID>NetSortSequence(0)<cr>
+   nnoremap <buffer> <silent> <nowait> Tb	:<c-u>call <SID>NetrwSetTgt(0,'b',v:count1)<cr>
+   nnoremap <buffer> <silent> <nowait> t	:call <SID>NetrwSplit(1)<cr>
+   nnoremap <buffer> <silent> <nowait> Th	:<c-u>call <SID>NetrwSetTgt(0,'h',v:count)<cr>
+   nnoremap <buffer> <silent> <nowait> u	:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> U	:<c-u>call <SID>NetrwBookHistHandler(5,b:netrw_curdir)<cr>
+   nnoremap <buffer> <silent> <nowait> v	:call <SID>NetrwSplit(2)<cr>
+   nnoremap <buffer> <silent> <nowait> x	:<c-u>call netrw#BrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
+"   " remote insert-mode maps
+"   inoremap <buffer> <silent> <nowait> <cr>	<c-o>:call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()))<cr>
+"   inoremap <buffer> <silent> <nowait> <c-l>	<c-o>:call <SID>NetrwRefresh(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+"   inoremap <buffer> <silent> <nowait> <s-cr>	<c-o>:call <SID>TreeSqueezeDir(0)<cr>
+"   inoremap <buffer> <silent> <nowait> -		<c-o>:call <SID>NetrwBrowseUpDir(0)<cr>
+"   inoremap <buffer> <silent> <nowait> a		<c-o>:call <SID>NetrwHide(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(0,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> mc	<c-o>:<c-u>call <SID>NetrwMarkFileCopy(0)<cr>
+"   inoremap <buffer> <silent> <nowait> md	<c-o>:<c-u>call <SID>NetrwMarkFileDiff(0)<cr>
+"   inoremap <buffer> <silent> <nowait> me	<c-o>:<c-u>call <SID>NetrwMarkFileEdit(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mf	<c-o>:<c-u>call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
+"   inoremap <buffer> <silent> <nowait> mg	<c-o>:<c-u>call <SID>NetrwMarkFileGrep(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mh	<c-o>:<c-u>call <SID>NetrwMarkHideSfx(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mm	<c-o>:<c-u>call <SID>NetrwMarkFileMove(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mp	<c-o>:<c-u>call <SID>NetrwMarkFilePrint(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mr	<c-o>:<c-u>call <SID>NetrwMarkFileRegexp(0)<cr>
+"   inoremap <buffer> <silent> <nowait> ms	<c-o>:<c-u>call <SID>NetrwMarkFileSource(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mt	<c-o>:<c-u>call <SID>NetrwMarkFileTgt(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mT	<c-o>:<c-u>call <SID>NetrwMarkFileTag(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mu	<c-o>:<c-u>call <SID>NetrwUnMarkFile(0)<cr>
+"   nnoremap <buffer> <silent> <nowait> mv	:<c-u>call <SID>NetrwMarkFileVimCmd(1)<cr>
+"   inoremap <buffer> <silent> <nowait> mx	<c-o>:<c-u>call <SID>NetrwMarkFileExe(0,0)<cr>
+"   inoremap <buffer> <silent> <nowait> mX	<c-o>:<c-u>call <SID>NetrwMarkFileExe(0,1)<cr>
+"   inoremap <buffer> <silent> <nowait> mv	<c-o>:<c-u>call <SID>NetrwMarkFileVimCmd(0)<cr>
+"   inoremap <buffer> <silent> <nowait> mz	<c-o>:<c-u>call <SID>NetrwMarkFileCompress(0)<cr>
+"   inoremap <buffer> <silent> <nowait> gb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(1,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> gh	<c-o>:<c-u>call <SID>NetrwHidden(0)<cr>
+"   inoremap <buffer> <silent> <nowait> gp	<c-o>:<c-u>call <SID>NetrwChgPerm(0,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> C		<c-o>:call <SID>NetrwSetChgwin()<cr>
+"   inoremap <buffer> <silent> <nowait> i		<c-o>:call <SID>NetrwListStyle(0)<cr>
+"   inoremap <buffer> <silent> <nowait> I		<c-o>:call <SID>NetrwBannerCtrl(1)<cr>
+"   inoremap <buffer> <silent> <nowait> o		<c-o>:call <SID>NetrwSplit(0)<cr>
+"   inoremap <buffer> <silent> <nowait> O		<c-o>:call <SID>NetrwObtain(0)<cr>
+"   inoremap <buffer> <silent> <nowait> p		<c-o>:call <SID>NetrwPreview(<SID>NetrwBrowseChgDir(1,<SID>NetrwGetWord(),1))<cr>
+"   inoremap <buffer> <silent> <nowait> P		<c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
+"   inoremap <buffer> <silent> <nowait> qb	<c-o>:<c-u>call <SID>NetrwBookHistHandler(2,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> mB	<c-o>:<c-u>call <SID>NetrwBookHistHandler(6,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> qf	<c-o>:<c-u>call <SID>NetrwFileInfo(0,<SID>NetrwGetWord())<cr>
+"   inoremap <buffer> <silent> <nowait> qF	:<c-u>call <SID>NetrwMarkFileQFEL(0,getqflist())<cr>
+"   inoremap <buffer> <silent> <nowait> qL	:<c-u>call <SID>NetrwMarkFileQFEL(0,getloclist(v:count))<cr>
+"   inoremap <buffer> <silent> <nowait> r		<c-o>:let g:netrw_sort_direction= (g:netrw_sort_direction =~# 'n')? 'r' : 'n'<bar>exe "norm! 0"<bar>call <SID>NetrwBrowse(0,<SID>NetrwBrowseChgDir(0,'./'))<cr>
+"   inoremap <buffer> <silent> <nowait> s		<c-o>:call <SID>NetrwSortStyle(0)<cr>
+"   inoremap <buffer> <silent> <nowait> S		<c-o>:call <SID>NetSortSequence(0)<cr>
+"   inoremap <buffer> <silent> <nowait> t		<c-o>:call <SID>NetrwSplit(1)<cr>
+"   inoremap <buffer> <silent> <nowait> Tb	<c-o>:<c-u>call <SID>NetrwSetTgt('b',v:count1)<cr>
+"   inoremap <buffer> <silent> <nowait> Th	<c-o>:<c-u>call <SID>NetrwSetTgt('h',v:count)<cr>
+"   inoremap <buffer> <silent> <nowait> u		<c-o>:<c-u>call <SID>NetrwBookHistHandler(4,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> U		<c-o>:<c-u>call <SID>NetrwBookHistHandler(5,b:netrw_curdir)<cr>
+"   inoremap <buffer> <silent> <nowait> v		<c-o>:call <SID>NetrwSplit(2)<cr>
+"   inoremap <buffer> <silent> <nowait> x		<c-o>:call netrw#BrowseX(<SID>NetrwBrowseChgDir(0,<SID>NetrwGetWord()),1)<cr>
+"   inoremap <buffer> <silent> <nowait> %		<c-o>:call <SID>NetrwOpenFile(0)<cr>
    if !hasmapto('<Plug>NetrwHideEdit')
     nmap <buffer> <c-h> <Plug>NetrwHideEdit
-    imap <buffer> <c-h> <Plug>NetrwHideEdit
+"    imap <buffer> <c-h> <Plug>NetrwHideEdit
    endif
    nnoremap <buffer> <silent> <Plug>NetrwHideEdit	:call <SID>NetrwHideEdit(0)<cr>
    if !hasmapto('<Plug>NetrwRefresh')
     nmap <buffer> <c-l> <Plug>NetrwRefresh
-    imap <buffer> <c-l> <Plug>NetrwRefresh
+"    imap <buffer> <c-l> <Plug>NetrwRefresh
    endif
+   if !hasmapto('<Plug>NetrwTreeSqueeze')
+    nmap <buffer> <silent> <nowait> <s-cr>	<Plug>NetrwTreeSqueeze
+"    imap <buffer> <silent> <nowait> <s-cr>	<c-o><Plug>NetrwTreeSqueeze
+   endif
+   nnoremap <buffer> <silent> <Plug>NetrwTreeSqueeze	:call <SID>TreeSqueezeDir(0)<cr>
 
    let mapsafepath     = escape(s:path, s:netrw_map_escape)
    let mapsafeusermach = escape(((s:user == "")? "" : s:user."@").s:machine, s:netrw_map_escape)
@@ -6226,14 +6309,14 @@ fun! s:NetrwMaps(islocal)
     nmap <buffer> <2-leftmouse>		<Plug>Netrw2Leftmouse
     nmap <buffer> <silent>		<Plug>Netrw2Leftmouse	-
     imap <buffer> <leftmouse>		<Plug>ILeftmouse
-    ino  <buffer> <silent>		<Plug>ILeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(0)<cr>
+"    ino  <buffer> <silent>		<Plug>ILeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwLeftmouse(0)<cr>
     imap <buffer> <middlemouse>		<Plug>IMiddlemouse
-    ino  <buffer> <silent>		<Plug>IMiddlemouse	<c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
+"    ino  <buffer> <silent>		<Plug>IMiddlemouse	<c-o><leftmouse><c-o>:call <SID>NetrwPrevWinOpen(0)<cr>
     imap <buffer> <s-leftmouse>		<Plug>ISLeftmouse
-    ino  <buffer> <silent>		<Plug>ISLeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
+"    ino  <buffer> <silent>		<Plug>ISLeftmouse	<c-o><leftmouse><c-o>:call <SID>NetrwMarkFile(0,<SID>NetrwGetWord())<cr>
     exe 'nnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
     exe 'vnoremap <buffer> <silent> <rightmouse> <leftmouse>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-    exe 'inoremap <buffer> <silent> <rightmouse> <c-o><leftmouse><c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+"    exe 'inoremap <buffer> <silent> <rightmouse> <c-o><leftmouse><c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
    endif
    exe 'nnoremap <buffer> <silent> <nowait> <del>	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
    exe 'nnoremap <buffer> <silent> <nowait> d		:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
@@ -6242,12 +6325,12 @@ fun! s:NetrwMaps(islocal)
    exe 'vnoremap <buffer> <silent> <nowait> <del>	:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
    exe 'vnoremap <buffer> <silent> <nowait> D		:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
    exe 'vnoremap <buffer> <silent> <nowait> R		:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> <del>	<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> d		<c-o>:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> D		<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
-   exe 'inoremap <buffer> <silent> <nowait> R		<c-o>:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> <del>	<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> d		<c-o>:call <SID>NetrwMakeDir("'.mapsafeusermach.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> D		<c-o>:call <SID>NetrwRemoteRm("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
+"   exe 'inoremap <buffer> <silent> <nowait> R		<c-o>:call <SID>NetrwRemoteRename("'.mapsafeusermach.'","'.mapsafepath.'")<cr>'
    nnoremap <buffer> <F1>			:he netrw-quickhelp<cr>
-   inoremap <buffer> <F1>			<c-o>:he netrw-quickhelp<cr>
+"   inoremap <buffer> <F1>			<c-o>:he netrw-quickhelp<cr>
 
    " support user-specified maps
    call netrw#UserMaps(0)
@@ -6257,7 +6340,7 @@ fun! s:NetrwMaps(islocal)
 endfun
 
 " ---------------------------------------------------------------------
-" s:NetrwCommands: sets up commands 				{{{2
+" s:NetrwCommands: set up commands 				{{{2
 "  If -buffer, the command is only available from within netrw buffers
 "  Otherwise, the command is available from any window, so long as netrw
 "  has been used at least once in the session.
@@ -6266,7 +6349,7 @@ fun! s:NetrwCommands(islocal)
 
   com! -nargs=* -complete=file -bang	NetrwMB	call s:NetrwBookmark(<bang>0,<f-args>)
   com! -nargs=*			    	NetrwC	call s:NetrwSetChgwin(<q-args>)
-  com! Rexplore if exists("w:netrw_rexlocal")|call s:NetrwRexplore(w:netrw_rexlocal,exists("w:netrw_rexdir")? w:netrw_rexdir : ".")|else|call netrw#ErrorMsg(s:WARNING,"not a former netrw window",79)|endif
+  com! Rexplore if exists("w:netrw_rexlocal")|call s:NetrwRexplore(w:netrw_rexlocal,exists("w:netrw_rexdir")? w:netrw_rexdir : ".")|else|call netrw#ErrorMsg(s:WARNING,"win#".winnr()." not a former netrw window",79)|endif
   if a:islocal
    com! -buffer -nargs=+ -complete=file	MF	call s:NetrwMarkFiles(1,<f-args>)
   else
@@ -6286,10 +6369,10 @@ fun! s:NetrwMarkFiles(islocal,...)
   let i      = 1
   while i <= a:0
    if a:islocal
-    if v:version == 704 && has("patch656")
-     let mffiles= glob(a:{i},0,1,1)
+    if v:version > 704 || (v:version == 704 && has("patch656"))
+     let mffiles= glob(fnameescape(a:{i}),0,1,1)
     else
-     let mffiles= glob(a:{i},0,1)
+     let mffiles= glob(fnameescape(a:{i}),0,1)
     endif
    else
     let mffiles= [a:{i}]
@@ -6319,9 +6402,11 @@ fun! s:NetrwMarkTarget(...)
   let s:netrwmftgt         = tgt
   let s:netrwmftgt_islocal = tgt !~ '^\a\{3,}://'
   let curislocal           = b:netrw_curdir !~ '^\a\{3,}://'
-  let svpos                = netrw#SavePosn()
+  let svpos                = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   call s:NetrwRefresh(curislocal,s:NetrwBrowseChgDir(curislocal,'./'))
-  call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  call winrestview(svpos)
 "  call Dret("s:NetrwMarkTarget")
 endfun
 
@@ -6460,6 +6545,48 @@ fun! s:NetrwMarkFile(islocal,fname)
 endfun
 
 " ---------------------------------------------------------------------
+" s:NetrwMarkFileArgList: ma: move the marked file list to the argument list (tomflist=0) {{{2
+"                         mA: move the argument list to marked file list     (tomflist=1)
+"                            Uses the global marked file list
+fun! s:NetrwMarkFileArgList(islocal,tomflist)
+"  call Dfunc("s:NetrwMarkFileArgList(islocal=".a:islocal.",tomflist=".a:tomflist.")")
+
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  let curdir   = s:NetrwGetCurdir(a:islocal)
+  let curbufnr = bufnr("%")
+
+  if a:tomflist
+   " mA: move argument list to marked file list
+   while argc()
+    let fname= argv(0)
+"    call Decho("exe argdel ".fname,'~'.expand("<slnum>"))
+    exe "argdel ".fnameescape(fname)
+    call s:NetrwMarkFile(a:islocal,fname)
+   endwhile
+
+  else
+   " ma: move marked file list to argument list
+   if exists("s:netrwmarkfilelist")
+
+    " for every filename in the marked list
+    for fname in s:netrwmarkfilelist
+"     call Decho("exe argadd ".fname,'~'.expand("<slnum>"))
+     exe "argadd ".fnameescape(fname)
+    endfor	" for every file in the marked list
+
+    " unmark list and refresh
+    call s:NetrwUnmarkList(curbufnr,curdir)
+    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
+"    call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+    NetrwKeepj call winrestview(svpos)
+   endif
+  endif
+
+"  call Dret("s:NetrwMarkFileArgList")
+endfun
+
+" ---------------------------------------------------------------------
 " s:NetrwMarkFileCompress: (invoked by mz) This function is used to {{{2
 "                          compress/decompress files using the programs
 "                          in g:netrw_compress and g:netrw_uncompress,
@@ -6469,7 +6596,8 @@ endfun
 "                            g:netrw_decompress      = { ".gz" : "gunzip" , ".bz2" : "bunzip2" , ".zip" : "unzip" , ".tar" : "tar -xf", ".xz" : "unxz"}
 fun! s:NetrwMarkFileCompress(islocal)
 "  call Dfunc("s:NetrwMarkFileCompress(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curdir   = s:NetrwGetCurdir(a:islocal)
   let curbufnr = bufnr("%")
 
@@ -6524,7 +6652,8 @@ fun! s:NetrwMarkFileCompress(islocal)
 
    call s:NetrwUnmarkList(curbufnr,curdir)
    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   endif
 "  call Dret("s:NetrwMarkFileCompress")
 endfun
@@ -6541,6 +6670,12 @@ fun! s:NetrwMarkFileCopy(islocal,...)
 
   let curdir   = s:NetrwGetCurdir(a:islocal)
   let curbufnr = bufnr("%")
+  if b:netrw_curdir !~ '/$'
+   if !exists("b:netrw_curdir")
+    let b:netrw_curdir= curdir
+   endif
+   let b:netrw_curdir= b:netrw_curdir."/"
+  endif
 
   " sanity check
   if !exists("s:netrwmarkfilelist_{curbufnr}") || empty(s:netrwmarkfilelist_{curbufnr})
@@ -6557,7 +6692,7 @@ fun! s:NetrwMarkFileCopy(islocal,...)
   endif
 "  call Decho("sanity chk passed: s:netrwmftgt<".s:netrwmftgt.">",'~'.expand("<slnum>"))
 
-  if      a:islocal &&  s:netrwmftgt_islocal
+  if a:islocal &&  s:netrwmftgt_islocal
    " Copy marked files, local directory to local directory
 "   call Decho("copy from local to local",'~'.expand("<slnum>"))
    if !executable(g:netrw_localcopycmd) && g:netrw_localcopycmd !~ '^'.expand("$COMSPEC").'\s'
@@ -6571,12 +6706,12 @@ fun! s:NetrwMarkFileCopy(islocal,...)
     if len(s:netrwmarkfilelist_{bufnr('%')}) == 1
      " only one marked file
 "     call Decho("case: only one marked file",'~'.expand("<slnum>"))
-     let args    = s:ShellEscape(b:netrw_curdir."/".s:netrwmarkfilelist_{bufnr('%')}[0])
+     let args    = s:ShellEscape(b:netrw_curdir.s:netrwmarkfilelist_{bufnr('%')}[0])
      let oldname = s:netrwmarkfilelist_{bufnr('%')}[0]
     elseif a:0 == 1
 "     call Decho("case: handling one input argument",'~'.expand("<slnum>"))
      " this happens when the next case was used to recursively call s:NetrwMarkFileCopy()
-     let args    = s:ShellEscape(b:netrw_curdir."/".a:1)
+     let args    = s:ShellEscape(b:netrw_curdir.a:1)
      let oldname = a:1
     else
      " copy multiple marked files inside the same directory
@@ -6611,9 +6746,12 @@ fun! s:NetrwMarkFileCopy(islocal,...)
     let args= substitute(args,'/','\\','g')
     let tgt = substitute(tgt, '/','\\','g')
    endif
-   if args =~ "'"|let args= substitute(args,"'\\(.*\\)'",'\1','')|endif
-   if tgt  =~ "'"|let tgt = substitute(tgt,"'\\(.*\\)'",'\1','') |endif
-   if args =~ '//$'|let args= substitute(args,'//$','/','')|endif
+   if args =~ "'" |let args= substitute(args,"'\\(.*\\)'",'\1','')|endif
+   if tgt  =~ "'" |let tgt = substitute(tgt ,"'\\(.*\\)'",'\1','')|endif
+   if args =~ '//'|let args= substitute(args,'//','/','g')|endif
+   if tgt  =~ '//'|let tgt = substitute(tgt ,'//','/','g')|endif
+"   call Decho("args   <".args.">",'~'.expand("<slnum>"))
+"   call Decho("tgt    <".tgt.">",'~'.expand("<slnum>"))
    if isdirectory(s:NetrwFile(args))
 "    call Decho("args<".args."> is a directory",'~'.expand("<slnum>"))
     let copycmd= g:netrw_localcopydircmd
@@ -6688,11 +6826,17 @@ fun! s:NetrwMarkFileCopy(islocal,...)
       NetrwKeepj call s:NetrwDelete(fname)
      endfor
      call s:NetrwLcd(curdir)
-     call s:NetrwExe("sil !".g:netrw_localrmdir." ".s:ShellEscape(tmpdir,1))
-     if v:shell_error != 0
-      call netrw#ErrorMsg(s:WARNING,"consider setting g:netrw_localrmdir<".g:netrw_localrmdir."> to something that works",80)
-"      call Dret("s:NetrwMarkFileCopy : failed: sil !".g:netrw_localrmdir." ".s:ShellEscape(tmpdir,1) )
-      return
+     if v:version < 704 || !has("patch1109")
+      call s:NetrwExe("sil !".g:netrw_localrmdir." ".s:ShellEscape(tmpdir,1))
+      if v:shell_error != 0
+       call netrw#ErrorMsg(s:WARNING,"consider setting g:netrw_localrmdir<".g:netrw_localrmdir."> to something that works",80)
+" "      call Dret("s:NetrwMarkFileCopy : failed: sil !".g:netrw_localrmdir." ".s:ShellEscape(tmpdir,1) )
+       return
+      endif
+     else
+      if delete(tmpdir,"d")
+       call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".tmpdir.">!",103)
+      endif
      endif
     else
      call s:NetrwLcd(curdir)
@@ -6703,21 +6847,40 @@ fun! s:NetrwMarkFileCopy(islocal,...)
   " -------
   " cleanup
   " -------
-"   call Decho("cleanup",'~'.expand("<slnum>"))
-  if !exists("s:recursive")
-   " remove markings from local buffer
-   call s:NetrwUnmarkList(curbufnr,curdir)
-  endif
-
-  " refresh buffers
-  if !s:netrwmftgt_islocal
-   call s:NetrwRefreshDir(s:netrwmftgt_islocal,s:netrwmftgt)
-  endif
-  if a:islocal
-   NetrwKeepj call s:NetrwRefreshDir(a:islocal,curdir)
+"  call Decho("cleanup",'~'.expand("<slnum>"))
+  " remove markings from local buffer
+  call s:NetrwUnmarkList(curbufnr,curdir)                   " remove markings from local buffer
+"  call Decho(" g:netrw_fastbrowse  =".g:netrw_fastbrowse,'~'.expand("<slnum>"))
+"  call Decho(" s:netrwmftgt        =".s:netrwmftgt,'~'.expand("<slnum>"))
+"  call Decho(" s:netrwmftgt_islocal=".s:netrwmftgt_islocal,'~'.expand("<slnum>"))
+"  call Decho(" curdir              =".curdir,'~'.expand("<slnum>"))
+"  call Decho(" a:islocal           =".a:islocal,'~'.expand("<slnum>"))
+"  call Decho(" curbufnr            =".curbufnr,'~'.expand("<slnum>"))
+  if exists("s:recursive")
+"   call Decho(" s:recursive         =".s:recursive,'~'.expand("<slnum>"))
+  else
+"   call Decho(" s:recursive         =n/a",'~'.expand("<slnum>"))
   endif
+  " see s:LocalFastBrowser() for g:netrw_fastbrowse interpretation (refreshing done for both slow and medium)
   if g:netrw_fastbrowse <= 1
    NetrwKeepj call s:LocalBrowseRefresh()
+  else
+   " refresh local and targets for fast browsing
+   if !exists("s:recursive")
+    " remove markings from local buffer
+"    call Decho(" remove markings from local buffer",'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwUnmarkList(curbufnr,curdir)
+   endif
+
+   " refresh buffers
+   if s:netrwmftgt_islocal
+"    call Decho(" refresh s:netrwmftgt=".s:netrwmftgt,'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwRefreshDir(s:netrwmftgt_islocal,s:netrwmftgt)
+   endif
+   if a:islocal && s:netrwmftgt != curdir
+"    call Decho(" refresh curdir=".curdir,'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwRefreshDir(a:islocal,curdir)
+   endif
   endif
 
 "  call Dret("s:NetrwMarkFileCopy 1")
@@ -6798,7 +6961,7 @@ fun! s:NetrwMarkFileEdit(islocal)
 endfun
 
 " ---------------------------------------------------------------------
-" s:NetrwMarkFileQFEL: convert a quickfix-error list into a marked file list {{{2
+" s:NetrwMarkFileQFEL: convert a quickfix-error or location list into a marked file list {{{2
 fun! s:NetrwMarkFileQFEL(islocal,qfel)
 "  call Dfunc("s:NetrwMarkFileQFEL(islocal=".a:islocal.",qfel)")
   call s:NetrwUnmarkAll()
@@ -6834,7 +6997,8 @@ endfun
 "                     mX enbloc=1: Uses the global marked-file list, applies command to entire list
 fun! s:NetrwMarkFileExe(islocal,enbloc)
 "  call Dfunc("s:NetrwMarkFileExe(islocal=".a:islocal.",enbloc=".a:enbloc.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curdir   = s:NetrwGetCurdir(a:islocal)
   let curbufnr = bufnr("%")
 
@@ -6894,7 +7058,8 @@ fun! s:NetrwMarkFileExe(islocal,enbloc)
 
    " refresh the listing
    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   else
    NetrwKeepj call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
   endif
@@ -6926,7 +7091,8 @@ fun! s:NetrwMarkFileExe(islocal,enbloc)
 
   " refresh the listing
   NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
 
  endif
 
@@ -6939,7 +7105,8 @@ endfun
 "                  Uses the local marked file list.
 fun! s:NetrwMarkHideSfx(islocal)
 "  call Dfunc("s:NetrwMarkHideSfx(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curbufnr = bufnr("%")
 
   " s:netrwmarkfilelist_{curbufnr}: the List of marked files
@@ -6982,7 +7149,8 @@ fun! s:NetrwMarkHideSfx(islocal)
 
    " refresh the listing
    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   else
    NetrwKeepj call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
   endif
@@ -6995,7 +7163,8 @@ endfun
 "                     Uses the local marked-file list.
 fun! s:NetrwMarkFileVimCmd(islocal)
 "  call Dfunc("s:NetrwMarkFileVimCmd(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curdir   = s:NetrwGetCurdir(a:islocal)
   let curbufnr = bufnr("%")
 
@@ -7039,7 +7208,8 @@ fun! s:NetrwMarkFileVimCmd(islocal)
 
    " refresh the listing
    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   else
    NetrwKeepj call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
   endif
@@ -7053,7 +7223,8 @@ endfun
 "                  Uses the local marked file list.
 fun! s:NetrwMarkHideSfx(islocal)
 "  call Dfunc("s:NetrwMarkHideSfx(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curbufnr = bufnr("%")
 
   " s:netrwmarkfilelist_{curbufnr}: the List of marked files
@@ -7096,7 +7267,8 @@ fun! s:NetrwMarkHideSfx(islocal)
 
    " refresh the listing
    NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   else
    NetrwKeepj call netrw#ErrorMsg(s:ERROR,"no files marked!",59)
   endif
@@ -7109,7 +7281,8 @@ endfun
 "                     Uses the global markfilelist
 fun! s:NetrwMarkFileGrep(islocal)
 "  call Dfunc("s:NetrwMarkFileGrep(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curbufnr = bufnr("%")
   let curdir   = s:NetrwGetCurdir(a:islocal)
 
@@ -7150,12 +7323,13 @@ fun! s:NetrwMarkFileGrep(islocal)
   echo "(use :cn, :cp to navigate, :Rex to return)"
 
   2match none
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
 
   if exists("nonisi")
    " original, user-supplied pattern did not begin with a character from isident
 "   call Decho("looking for trailing nonisi<".nonisi."> followed by a j, gj, or jg",'~'.expand("<slnum>"))
-   if pat =~ nonisi.'j$\|'.nonisi.'gj$\|'.nonisi.'jg$'
+   if pat =~# nonisi.'j$\|'.nonisi.'gj$\|'.nonisi.'jg$'
     call s:NetrwMarkFileQFEL(a:islocal,getqflist())
    endif
   endif
@@ -7353,7 +7527,7 @@ fun! s:NetrwMarkFileRegexp(islocal)
    " get the matching list of files using local glob()
 "   call Decho("handle local regexp",'~'.expand("<slnum>"))
    let dirname = escape(b:netrw_curdir,g:netrw_glob_escape)
-   if v:version == 704 && has("patch656")
+   if v:version > 704 || (v:version == 704 && has("patch656"))
     let files   = glob(s:ComposePath(dirname,regexp),0,0,1)
    else
     let files   = glob(s:ComposePath(dirname,regexp),0,0)
@@ -7456,7 +7630,8 @@ endfun
 "                     Uses the global markfilelist
 fun! s:NetrwMarkFileTag(islocal)
 "  call Dfunc("s:NetrwMarkFileTag(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curdir   = s:NetrwGetCurdir(a:islocal)
   let curbufnr = bufnr("%")
 
@@ -7494,7 +7669,8 @@ fun! s:NetrwMarkFileTag(islocal)
    endif
    2match none
    call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-   call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   call winrestview(svpos)
   endif
 
 "  call Dret("s:NetrwMarkFileTag")
@@ -7507,8 +7683,9 @@ endfun
 "     s:netrwmftgt_islocal : 0=target directory is remote
 "                            1=target directory is local
 fun! s:NetrwMarkFileTgt(islocal)
-"  call Dfunc("s:NetrwMarkFileTgt(islocal=".a:islocal.")")
-  let svpos  = netrw#SavePosn()
+" call Dfunc("s:NetrwMarkFileTgt(islocal=".a:islocal.")")
+  let svpos  = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curdir = s:NetrwGetCurdir(a:islocal)
   let hadtgt = exists("s:netrwmftgt")
   if !exists("w:netrw_bannercnt")
@@ -7526,7 +7703,8 @@ fun! s:NetrwMarkFileTgt(islocal)
      call s:LocalBrowseRefresh()
     endif
     call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-    call netrw#RestorePosn(svpos)
+"    call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+    call winrestview(svpos)
 "    call Dret("s:NetrwMarkFileTgt : removed target")
     return
    else
@@ -7566,16 +7744,17 @@ fun! s:NetrwMarkFileTgt(islocal)
   " need to do refresh so that the banner will be updated
   "  s:LocalBrowseRefresh handles all local-browsing buffers when not fast browsing
   if g:netrw_fastbrowse <= 1
-"   call Decho("g:netrw_fastbrowse=".g:netrw_fastbrowse.", so refreshing all local netrw buffers")
+"   call Decho("g:netrw_fastbrowse=".g:netrw_fastbrowse.", so refreshing all local netrw buffers",'~'.expand("<slnum>"))
    call s:LocalBrowseRefresh()
   endif
 "  call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  if w:netrw_liststyle == s:TREELIST
+  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
    call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,w:netrw_treetop))
   else
    call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
   endif
-  call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  call winrestview(svpos)
   if !hadtgt
    sil! NetrwKeepj norm! j
   endif
@@ -7590,7 +7769,7 @@ endfun
 fun! s:NetrwGetCurdir(islocal)
 "  call Dfunc("s:NetrwGetCurdir(islocal=".a:islocal.")")
 
-  if w:netrw_liststyle == s:TREELIST
+  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
    let b:netrw_curdir = s:NetrwTreePath(w:netrw_treetop)
 "   call Decho("set b:netrw_curdir<".b:netrw_curdir."> (used s:NetrwTreeDir)",'~'.expand("<slnum>"))
   elseif !exists("b:netrw_curdir")
@@ -7598,10 +7777,10 @@ fun! s:NetrwGetCurdir(islocal)
 "   call Decho("set b:netrw_curdir<".b:netrw_curdir."> (used getcwd)",'~'.expand("<slnum>"))
   endif
 
-"  call Decho("b:netrw_curdir<".b:netrw_curdir."> ".((b:netrw_curdir !~ '\<\a\{3,}://')? "does not match" : "matches")." url pattern")
+"  call Decho("b:netrw_curdir<".b:netrw_curdir."> ".((b:netrw_curdir !~ '\<\a\{3,}://')? "does not match" : "matches")." url pattern",'~'.expand("<slnum>"))
   if b:netrw_curdir !~ '\<\a\{3,}://'
    let curdir= b:netrw_curdir
-"   call Decho("g:netrw_keepdir=".g:netrw_keepdir)
+"   call Decho("g:netrw_keepdir=".g:netrw_keepdir,'~'.expand("<slnum>"))
    if g:netrw_keepdir == 0
     call s:NetrwLcd(curdir)
    endif
@@ -7626,8 +7805,8 @@ fun! s:NetrwOpenFile(islocal)
     endif
     let g:netrw_quiet = 1
     " save position for benefit of Rexplore
-    let s:rexposn_{bufnr("%")}= netrw#SavePosn()
-"    call Decho("setting s:rexposn_".bufnr("%")."<".bufname("%")."> to SavePosn",'~'.expand("<slnum>"))
+    let s:rexposn_{bufnr("%")}= winsaveview()
+"    call Decho("saving posn to s:rexposn_".bufnr("%")."<".string(s:rexposn_{bufnr("%")}).">",'~'.expand("<slnum>"))
     if b:netrw_curdir =~ '/$'
      exe "NetrwKeepj e ".fnameescape(b:netrw_curdir.fname)
     else
@@ -7702,7 +7881,8 @@ fun! s:NetSortSequence(islocal)
 "  call Dfunc("NetSortSequence(islocal=".a:islocal.")")
 
   let ykeep= @@
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   call inputsave()
   let newsortseq= input("Edit Sorting Sequence: ",g:netrw_sort_sequence)
   call inputrestore()
@@ -7710,7 +7890,8 @@ fun! s:NetSortSequence(islocal)
   " refresh the listing
   let g:netrw_sort_sequence= newsortseq
   NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
   let @@= ykeep
 
 "  call Dret("NetSortSequence")
@@ -7785,7 +7966,8 @@ endfun
 "    s:netrwmarkfilemtch_#   -- used with 2match to display marked files
 fun! s:NetrwUnMarkFile(islocal)
 "  call Dfunc("s:NetrwUnMarkFile(islocal=".a:islocal.")")
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let curbufnr = bufnr("%")
 
   " unmark marked file list
@@ -7806,7 +7988,8 @@ fun! s:NetrwUnMarkFile(islocal)
   2match none
 
 "  call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  call netrw#RestorePosn(svpos)
+"call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+call winrestview(svpos)
 "  call Dret("s:NetrwUnMarkFile")
 endfun
 
@@ -7898,7 +8081,7 @@ fun! s:NetrwMenu(domenu)
    elseif !a:domenu
     let s:netrwcnt = 0
     let curwin     = winnr()
-    windo if getline(2) =~ "Netrw" | let s:netrwcnt= s:netrwcnt + 1 | endif
+    windo if getline(2) =~# "Netrw" | let s:netrwcnt= s:netrwcnt + 1 | endif
     exe curwin."wincmd w"
 
     if s:netrwcnt <= 1
@@ -8276,7 +8459,8 @@ fun! s:NetrwRefresh(islocal,dirname)
   let ykeep      = @@
 
   " save the cursor position before refresh.
-  let screenposn = netrw#SavePosn()
+  let screenposn = winsaveview()
+"  call Decho("saving posn to screenposn<".string(screenposn).">",'~'.expand("<slnum>"))
 
 "  call Decho("win#".winnr().": ".winheight(0)."x".winwidth(0)." curfile<".expand("%").">",'~'.expand("<slnum>"))
 "  call Decho("clearing buffer prior to refresh",'~'.expand("<slnum>"))
@@ -8288,7 +8472,8 @@ fun! s:NetrwRefresh(islocal,dirname)
   endif
 
   " restore position
-  NetrwKeepj call netrw#RestorePosn(screenposn)
+"  call Decho("restoring posn to screenposn<".string(screenposn).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(screenposn)
 
   " restore file marks
   if exists("s:netrwmarkfilemtch_{bufnr('%')}") && s:netrwmarkfilemtch_{bufnr("%")} != ""
@@ -8439,8 +8624,8 @@ endfun
 "    Implements [count]Tb  (bookhist<b>)
 "               [count]Th  (bookhist<h>)
 "               See :help netrw-qb for how to make the choice.
-fun! s:NetrwSetTgt(bookhist,choice)
-"  call Dfunc("s:NetrwSetTgt(bookhist<".a:bookhist."> choice#".a:choice.")")
+fun! s:NetrwSetTgt(islocal,bookhist,choice)
+"  call Dfunc("s:NetrwSetTgt(islocal=".a:islocal." bookhist<".a:bookhist."> choice#".a:choice.")")
 
   if     a:bookhist == 'b'
    " supports choosing a bookmark as a target using a qb-generated list
@@ -8462,6 +8647,12 @@ fun! s:NetrwSetTgt(bookhist,choice)
    endif
   endif
 
+  " refresh the display
+  if !exists("b:netrw_curdir")
+   let b:netrw_curdir= getcwd()
+  endif
+  call s:NetrwRefresh(a:islocal,b:netrw_curdir)
+
 "  call Dret("s:NetrwSetTgt")
 endfun
 
@@ -8470,12 +8661,14 @@ endfun
 fun! s:NetrwSortStyle(islocal)
 "  call Dfunc("s:NetrwSortStyle(islocal=".a:islocal.") netrw_sort_by<".g:netrw_sort_by.">")
   NetrwKeepj call s:NetrwSaveWordPosn()
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
-  let g:netrw_sort_by= (g:netrw_sort_by =~ '^n')? 'time' : (g:netrw_sort_by =~ '^t')? 'size' : (g:netrw_sort_by =~ '^siz')? 'exten' : 'name'
+  let g:netrw_sort_by= (g:netrw_sort_by =~# '^n')? 'time' : (g:netrw_sort_by =~# '^t')? 'size' : (g:netrw_sort_by =~# '^siz')? 'exten' : 'name'
   NetrwKeepj norm! 0
   NetrwKeepj call s:NetrwRefresh(a:islocal,s:NetrwBrowseChgDir(a:islocal,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
 
 "  call Dret("s:NetrwSortStyle : netrw_sort_by<".g:netrw_sort_by.">")
 endfun
@@ -8574,7 +8767,6 @@ fun! s:NetrwSplit(mode)
    let s:didsplit= 1
    NetrwKeepj call s:RestoreWinVars()
    NetrwKeepj call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,s:NetrwGetWord()))
-   "call netrw#LocalBrowseCheck(s:NetrwBrowseChgDir(1,s:NetrwGetWord()))
    unlet s:didsplit
 
   else
@@ -8653,6 +8845,9 @@ endfun
 " (full path directory with trailing slash returned)
 fun! s:NetrwTreeDir(islocal)
 "  call Dfunc("s:NetrwTreeDir(islocal=".a:islocal.") getline(".line(".").")"."<".getline('.')."> b:netrw_curdir<".b:netrw_curdir."> tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> ft=".&ft)
+"  call Decho("g:netrw_keepdir  =".(exists("g:netrw_keepdir")?   g:netrw_keepdir   : 'n/a'),'~'.expand("<slnum>"))
+"  call Decho("w:netrw_liststyle=".(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a'),'~'.expand("<slnum>"))
+"  call Decho("w:netrw_treetop  =".(exists("w:netrw_treetop")?   w:netrw_treetop   : 'n/a'),'~'.expand("<slnum>"))
 
   if exists("s:treedir")
    " s:NetrwPrevWinOpen opens a "previous" window -- and thus needs to and does call s:NetrwTreeDir early
@@ -8665,12 +8860,13 @@ fun! s:NetrwTreeDir(islocal)
   if !exists("b:netrw_curdir") || b:netrw_curdir == ""
    let b:netrw_curdir= getcwd()
   endif
-
   let treedir = b:netrw_curdir
 "  call Decho("set initial treedir<".treedir.">",'~'.expand("<slnum>"))
-  let s:treecurpos= netrw#SavePosn()
 
-  if w:netrw_liststyle == s:TREELIST
+  let s:treecurpos= winsaveview()
+"  call Decho("saving posn to s:treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+
+  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Decho("w:netrw_liststyle is TREELIST:",'~'.expand("<slnum>"))
 "   call Decho("line#".line(".")." getline(.)<".getline('.')."> treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
 
@@ -8692,7 +8888,7 @@ fun! s:NetrwTreeDir(islocal)
    " detect user attempting to close treeroot
 "   call Decho("check if user is attempting to close treeroot",'~'.expand("<slnum>"))
 "   call Decho(".win#".winnr()." buf#".bufnr("%")."<".bufname("%").">",'~'.expand("<slnum>"))
-"   call Decho(".getline(".line(".").")<".getline('.').'> '.((getline('.') =~ '^'.s:treedepthstring)? '=~' : '!~').' ^'.s:treedepthstring,'~'.expand("<slnum>"))
+"   call Decho(".getline(".line(".").")<".getline('.').'> '.((getline('.') =~# '^'.s:treedepthstring)? '=~#' : '!~').' ^'.s:treedepthstring,'~'.expand("<slnum>"))
    if curline !~ '^'.s:treedepthstring && getline('.') != '..'
 "    call Decho(".user may have attempted to close treeroot",'~'.expand("<slnum>"))
     " now force a refresh
@@ -8701,13 +8897,12 @@ fun! s:NetrwTreeDir(islocal)
 "    call Dret("s:NetrwTreeDir <".treedir."> : (side effect) s:treecurpos<".(exists("s:treecurpos")? string(s:treecurpos) : 'n/a').">")
     return b:netrw_curdir
 "   else " Decho
-"    call Decho(".user did not attempt to close treeroot",'~'.expand("<slnum>"))
+"    call Decho(".user not attempting to close treeroot",'~'.expand("<slnum>"))
    endif
 
 "   call Decho("islocal=".a:islocal." curline<".curline.">",'~'.expand("<slnum>"))
-"   call Decho("after subst<".substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)$','\1','').">",'~'.expand("<slnum>"))
-   let potentialdir= substitute(curline,'^'.s:treedepthstring.'* \(.*\)@$','\1','')
-"   call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(s:NetrwFile(potentialdir)),'~'.expand("<slnum>"))
+   let potentialdir= s:NetrwFile(substitute(curline,'^'.s:treedepthstring.'\+ \(.*\)@$','\1',''))
+"   call Decho("potentialdir<".potentialdir."> isdir=".isdirectory(potentialdir),'~'.expand("<slnum>"))
 
    " COMBAK: a symbolic link may point anywhere -- so it will be used to start a new treetop
 "   if a:islocal && curline =~ '@$' && isdirectory(s:NetrwFile(potentialdir))
@@ -8763,9 +8958,13 @@ fun! s:NetrwTreeDisplay(dir,depth)
   let depth= s:treedepthstring.a:depth
 "  call Decho("display subtrees with depth<".depth."> and current leaves",'~'.expand("<slnum>"))
 
-"  call Decho("w:netrw_treedict[".dir."]=".string(w:netrw_treedict[dir]),'~'.expand("<slnum>"))
+"  call Decho("for every entry in w:netrw_treedict[".dir."]=".string(w:netrw_treedict[dir]),'~'.expand("<slnum>"))
   for entry in w:netrw_treedict[dir]
-   let direntry= substitute(dir.'/'.entry,'[@/]$','','e')
+   if dir =~ '/$'
+    let direntry= substitute(dir.entry,'[@/]$','','e')
+   else
+    let direntry= substitute(dir.'/'.entry,'[@/]$','','e')
+   endif
 "   call Decho("dir<".dir."> entry<".entry."> direntry<".direntry.">",'~'.expand("<slnum>"))
    if entry =~ '/$' && has_key(w:netrw_treedict,direntry)
 "    call Decho("<".direntry."> is a key in treedict - display subtree for it",'~'.expand("<slnum>"))
@@ -8786,10 +8985,48 @@ fun! s:NetrwTreeDisplay(dir,depth)
 endfun
 
 " ---------------------------------------------------------------------
+" s:NetrwRefreshTreeDict: updates the contents information for a tree (w:netrw_treedict) {{{2
+fun! s:NetrwRefreshTreeDict(dir)
+"  call Dfunc("s:NetrwRefreshTreeDict(dir<".a:dir.">)")
+  for entry in w:netrw_treedict[a:dir]
+   let direntry= substitute(a:dir.'/'.entry,'[@/]$','','e')
+"   call Decho("a:dir<".a:dir."> entry<".entry."> direntry<".direntry.">",'~'.expand("<slnum>"))
+
+   if entry =~ '/$' && has_key(w:netrw_treedict,direntry)
+"    call Decho("<".direntry."> is a key in treedict - display subtree for it",'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwRefreshTreeDict(direntry)
+    let liststar                   = s:NetrwGlob(direntry,'*',1)
+    let listdotstar                = s:NetrwGlob(direntry,'.*',1)
+    let w:netrw_treedict[direntry] = liststar + listdotstar
+"    call Decho("updating w:netrw_treedict[".direntry.']='.string(w:netrw_treedict[direntry]),'~'.expand("<slnum>"))
+
+   elseif entry =~ '/$' && has_key(w:netrw_treedict,direntry.'/')
+"    call Decho("<".direntry."/> is a key in treedict - display subtree for it",'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwRefreshTreeDict(direntry.'/')
+    let liststar   = s:NetrwGlob(direntry.'/','*',1)
+    let listdotstar= s:NetrwGlob(direntry.'/','.*',1)
+    let w:netrw_treedict[direntry]= liststar + listdotstar
+"    call Decho("updating w:netrw_treedict[".direntry.']='.string(w:netrw_treedict[direntry]),'~'.expand("<slnum>"))
+
+   elseif entry =~ '@$' && has_key(w:netrw_treedict,direntry.'@')
+"    call Decho("<".direntry."/> is a key in treedict - display subtree for it",'~'.expand("<slnum>"))
+    NetrwKeepj call s:NetrwRefreshTreeDict(direntry.'/')
+    let liststar   = s:NetrwGlob(direntry.'/','*',1)
+    let listdotstar= s:NetrwGlob(direntry.'/','.*',1)
+"    call Decho("updating w:netrw_treedict[".direntry.']='.string(w:netrw_treedict[direntry]),'~'.expand("<slnum>"))
+
+   else
+"    call Decho('not updating w:netrw_treedict['.direntry.'] with entry<'.entry.'> (no subtree)',,'~'.expand("<slnum>"))
+   endif
+  endfor
+"  call Dret("s:NetrwRefreshTreeDict")
+endfun
+
+" ---------------------------------------------------------------------
 " s:NetrwTreeListing: displays tree listing from treetop on down, using NetrwTreeDisplay() {{{2
 "                     Called by s:PerformListing()
 fun! s:NetrwTreeListing(dirname)
-  if w:netrw_liststyle == s:TREELIST
+  if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
 "   call Dfunc("NetrwTreeListing() bufname<".expand("%").">")
 "   call Decho("curdir<".a:dirname.">",'~'.expand("<slnum>"))
 "   call Decho("win#".winnr().": w:netrw_treetop ".(exists("w:netrw_treetop")? "exists" : "doesn't exist")." w:netrw_treedict ".(exists("w:netrw_treedict")? "exists" : "doesn't exit"),'~'.expand("<slnum>"))
@@ -8811,13 +9048,13 @@ fun! s:NetrwTreeListing(dirname)
     let w:netrw_treedict= {}
    endif
 
-   " update the directory listing for the current directory
-"   call Decho("updating dictionary with ".a:dirname.":[..directory listing..]",'~'.expand("<slnum>"))
+   " update the dictionary for the current directory
+"   call Decho("updating: w:netrw_treedict[".a:dirname.'] -> [directory listing]','~'.expand("<slnum>"))
 "   call Decho("w:netrw_bannercnt=".w:netrw_bannercnt." line($)=".line("$"),'~'.expand("<slnum>"))
-   exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$g@^\.\.\=/$@d'
+   exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$g@^\.\.\=/$@d _'
    let w:netrw_treedict[a:dirname]= getline(w:netrw_bannercnt,line("$"))
 "   call Decho("w:treedict[".a:dirname."]= ".string(w:netrw_treedict[a:dirname]),'~'.expand("<slnum>"))
-   exe "sil! NetrwKeepj ".w:netrw_bannercnt.",$d"
+   exe "sil! NetrwKeepj ".w:netrw_bannercnt.",$d _"
 
    " if past banner, record word
    if exists("w:netrw_bannercnt") && line(".") > w:netrw_bannercnt
@@ -8852,6 +9089,8 @@ endfun
 "                  wipes that out prior to calling this function
 fun! s:NetrwTreePath(treetop)
 "  call Dfunc("s:NetrwTreePath() line#".line(".")."<".getline(".").">")
+  let svpos = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let depth = substitute(getline('.'),'^\(\%('.s:treedepthstring.'\)*\)[^'.s:treedepthstring.'].\{-}$','\1','e')
 "  call Decho("depth<".depth."> 1st subst",'~'.expand("<slnum>"))
   let depth = substitute(depth,'^'.s:treedepthstring,'','')
@@ -8886,6 +9125,8 @@ fun! s:NetrwTreePath(treetop)
    let treedir= a:treetop.'/'.treedir
   endif
   let treedir= substitute(treedir,'//$','/','')
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))"
+  call winrestview(svpos)
 "  call Dret("s:NetrwTreePath <".treedir.">")
   return treedir
 endfun
@@ -8930,6 +9171,7 @@ fun! s:NetrwWideListing()
 "   call Decho("bannercnt=".w:netrw_bannercnt." fpl=".w:netrw_fpl." fpc=".fpc." newcol[".newcolstart.",".newcolend."]",'~'.expand("<slnum>"))
    if has("clipboard")
     sil! let keepregstar = @*
+    sil! let keepregplus = @+
    endif
    while line("$") >= newcolstart
     if newcolend > line("$") | let newcolend= line("$") | endif
@@ -8940,11 +9182,12 @@ fun! s:NetrwWideListing()
     else
      exe "sil! NetrwKeepj norm! 0\<c-v>".newcolqty.'j$hx'.w:netrw_bannercnt.'G$p'
     endif
-    exe "sil! NetrwKeepj ".newcolstart.','.newcolend.'d'
+    exe "sil! NetrwKeepj ".newcolstart.','.newcolend.'d _'
     exe 'sil! NetrwKeepj '.w:netrw_bannercnt
    endwhile
    if has("clipboard")
     sil! let @*= keepregstar
+    sil! let @+= keepregplus
    endif
    exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$s/\s\+$//e'
    NetrwKeepj call histdel("/",-1)
@@ -9027,14 +9270,14 @@ fun! s:PerformListing(islocal)
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol()." line($)=".line("$"),'~'.expand("<slnum>"))
 
   let sortby= g:netrw_sort_by
-  if g:netrw_sort_direction =~ "^r"
+  if g:netrw_sort_direction =~# "^r"
    let sortby= sortby." reversed"
   endif
 
   " Sorted by... {{{3
   if g:netrw_banner
 "   call Decho("--handle specified sorting: g:netrw_sort_by<".g:netrw_sort_by.">",'~'.expand("<slnum>"))
-   if g:netrw_sort_by =~ "^n"
+   if g:netrw_sort_by =~# "^n"
 "   call Decho("directories will be sorted by name",'~'.expand("<slnum>"))
     " sorted by name
     NetrwKeepj put ='\"   Sorted by      '.sortby
@@ -9131,13 +9374,13 @@ fun! s:PerformListing(islocal)
    if !g:netrw_banner || line("$") >= w:netrw_bannercnt
 "    call Decho("manipulate directory listing (sort) : g:netrw_sort_by<".g:netrw_sort_by.">",'~'.expand("<slnum>"))
 
-    if g:netrw_sort_by =~ "^n"
+    if g:netrw_sort_by =~# "^n"
      " sort by name
      NetrwKeepj call s:NetrwSetSort()
 
      if !g:netrw_banner || w:netrw_bannercnt < line("$")
 "      call Decho("g:netrw_sort_direction=".g:netrw_sort_direction." (bannercnt=".w:netrw_bannercnt.")",'~'.expand("<slnum>"))
-      if g:netrw_sort_direction =~ 'n'
+      if g:netrw_sort_direction =~# 'n'
        " normal direction sorting
        exe 'sil NetrwKeepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
       else
@@ -9150,7 +9393,7 @@ fun! s:PerformListing(islocal)
      exe 'sil! NetrwKeepj '.w:netrw_bannercnt.',$s/^\d\{3}'.g:netrw_sepchr.'//e'
      NetrwKeepj call histdel("/",-1)
 
-    elseif g:netrw_sort_by =~ "^ext"
+    elseif g:netrw_sort_by =~# "^ext"
      " sort by extension
      exe 'sil NetrwKeepj '.w:netrw_bannercnt.',$g+/+s/^/001'.g:netrw_sepchr.'/'
      NetrwKeepj call histdel("/",-1)
@@ -9160,7 +9403,7 @@ fun! s:PerformListing(islocal)
      NetrwKeepj call histdel("/",-1)
      if !g:netrw_banner || w:netrw_bannercnt < line("$")
 "      call Decho("g:netrw_sort_direction=".g:netrw_sort_direction." (bannercnt=".w:netrw_bannercnt.")",'~'.expand("<slnum>"))
-      if g:netrw_sort_direction =~ 'n'
+      if g:netrw_sort_direction =~# 'n'
        " normal direction sorting
        exe 'sil NetrwKeepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
       else
@@ -9174,7 +9417,7 @@ fun! s:PerformListing(islocal)
     elseif a:islocal
      if !g:netrw_banner || w:netrw_bannercnt < line("$")
 "      call Decho("g:netrw_sort_direction=".g:netrw_sort_direction,'~'.expand("<slnum>"))
-      if g:netrw_sort_direction =~ 'n'
+      if g:netrw_sort_direction =~# 'n'
 "       call Decho('exe sil NetrwKeepj '.w:netrw_bannercnt.',$sort','~'.expand("<slnum>"))
        exe 'sil! NetrwKeepj '.w:netrw_bannercnt.',$sort'.' '.g:netrw_sort_options
       else
@@ -9186,7 +9429,7 @@ fun! s:PerformListing(islocal)
      endif
     endif
 
-   elseif g:netrw_sort_direction =~ 'r'
+   elseif g:netrw_sort_direction =~# 'r'
 "    call Decho('(s:PerformListing) reverse the sorted listing','~'.expand("<slnum>"))
     if !g:netrw_banner || w:netrw_bannercnt < line('$')
      exe 'sil! NetrwKeepj '.w:netrw_bannercnt.',$g/^/m '.w:netrw_bannercnt
@@ -9205,7 +9448,7 @@ fun! s:PerformListing(islocal)
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo. " (internal#3)",'~'.expand("<slnum>"))
 
   " resolve symbolic links if local and (thin or tree)
-  if a:islocal && (w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:TREELIST)
+  if a:islocal && (w:netrw_liststyle == s:THINLIST || (exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST))
 "   call Decho("--resolve symbolic links if local and thin|tree",'~'.expand("<slnum>"))
    g/@$/call s:ShowLink()
   endif
@@ -9247,7 +9490,8 @@ fun! s:PerformListing(islocal)
   if exists("s:treecurpos")
 "   call Decho("s:treecurpos exists; restore posn",'~'.expand("<slnum>"))
 "   call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo. " (internal#8)",'~'.expand("<slnum>"))
-   NetrwKeepj call netrw#RestorePosn(s:treecurpos)
+"   call Decho("restoring posn to s:treecurpos<".string(s:treecurpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(s:treecurpos)
    unlet s:treecurpos
   endif
 
@@ -9310,7 +9554,7 @@ endfun
 "  enforced here.
 fun! s:NetrwRemoteFtpCmd(path,listcmd)
 "  call Dfunc("NetrwRemoteFtpCmd(path<".a:path."> listcmd<".a:listcmd.">) w:netrw_method=".(exists("w:netrw_method")? w:netrw_method : (exists("b:netrw_method")? b:netrw_method : "???")))
-"  call Decho("line($)=".line("$")." w:netrw_bannercnt=".w:netrw_bannercnt,'~'.expand("<slnum>"))
+"  call Decho("line($)=".line("$")." win#".winnr()." w:netrw_bannercnt=".w:netrw_bannercnt,'~'.expand("<slnum>"))
   " sanity check: {{{3
   if !exists("w:netrw_method")
    if exists("b:netrw_method")
@@ -9329,8 +9573,8 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
 
   " clear off any older non-banner lines	" {{{3
   " note that w:netrw_bannercnt indexes the line after the banner
-"  call Decho('exe sil! NetrwKeepj '.w:netrw_bannercnt.",$d  (clear off old non-banner lines)",'~'.expand("<slnum>"))
-  exe "sil! NetrwKeepj ".w:netrw_bannercnt.",$d"
+"  call Decho('exe sil! NetrwKeepj '.w:netrw_bannercnt.",$d _  (clear off old non-banner lines)",'~'.expand("<slnum>"))
+  exe "sil! NetrwKeepj ".w:netrw_bannercnt.",$d _"
 
   ".........................................
   if w:netrw_method == 2 || w:netrw_method == 5	" {{{3
@@ -9427,7 +9671,7 @@ fun! s:NetrwRemoteFtpCmd(path,listcmd)
    sil! NetrwKeepj g/l\%([-r][-w][-x]\)\{3}/NetrwKeepj s/$/@/e
    NetrwKeepj call histdel("/",-1)
    NetrwKeepj call histdel("/",-1)
-   if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || w:netrw_liststyle == s:TREELIST
+   if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || (exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST)
     exe "sil! NetrwKeepj ".w:netrw_bannercnt.',$s/^\%(\S\+\s\+\)\{8}//e'
     NetrwKeepj call histdel("/",-1)
    endif
@@ -9451,7 +9695,7 @@ endfun
 " ---------------------------------------------------------------------
 " s:NetrwRemoteListing: {{{2
 fun! s:NetrwRemoteListing()
-"  call Dfunc("s:NetrwRemoteListing() b:netrw_curdir<".b:netrw_curdir.">)")
+"  call Dfunc("s:NetrwRemoteListing() b:netrw_curdir<".b:netrw_curdir.">) win#".winnr())
 
   if !exists("w:netrw_bannercnt") && exists("s:bannercnt")
    let w:netrw_bannercnt= s:bannercnt
@@ -9501,9 +9745,9 @@ fun! s:NetrwRemoteListing()
 "   call Decho("use ftp to get remote file listing",'~'.expand("<slnum>"))
    let s:method  = "ftp"
    let listcmd = g:netrw_ftp_list_cmd
-   if g:netrw_sort_by =~ '^t'
+   if g:netrw_sort_by =~# '^t'
     let listcmd= g:netrw_ftp_timelist_cmd
-   elseif g:netrw_sort_by =~ '^s'
+   elseif g:netrw_sort_by =~# '^s'
     let listcmd= g:netrw_ftp_sizelist_cmd
    endif
 "   call Decho("listcmd<".listcmd."> (using g:netrw_ftp_list_cmd)",'~'.expand("<slnum>"))
@@ -9515,7 +9759,7 @@ fun! s:NetrwRemoteListing()
     let mesg= getline(".")
     if exists("w:netrw_bannercnt")
      setl ma
-     exe w:netrw_bannercnt.",$d"
+     exe w:netrw_bannercnt.",$d _"
      setl noma
     endif
     NetrwKeepj call s:NetrwOptionRestore("w:")
@@ -9524,7 +9768,7 @@ fun! s:NetrwRemoteListing()
     return -1
    endif
 
-   if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || w:netrw_liststyle == s:TREELIST
+   if w:netrw_liststyle == s:THINLIST || w:netrw_liststyle == s:WIDELIST || (exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST)
     " shorten the listing
 "    call Decho("generate short listing",'~'.expand("<slnum>"))
     exe "sil! keepalt NetrwKeepj ".w:netrw_bannercnt
@@ -9610,7 +9854,7 @@ fun! s:NetrwRemoteListing()
    if s:method == "ftp"
     " cleanup
     exe "sil! NetrwKeepj ".w:netrw_bannercnt
-    while getline('.') =~ g:netrw_ftp_browse_reject
+    while getline('.') =~# g:netrw_ftp_browse_reject
      sil! NetrwKeepj d
     endwhile
     " if there's no ../ listed, then put ../ in
@@ -9654,7 +9898,8 @@ endfun
 fun! s:NetrwRemoteRm(usrhost,path) range
 "  call Dfunc("s:NetrwRemoteRm(usrhost<".a:usrhost."> path<".a:path.">) virtcol=".virtcol("."))
 "  call Decho("firstline=".a:firstline." lastline=".a:lastline,'~'.expand("<slnum>"))
-  let svpos= netrw#SavePosn()
+  let svpos= winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   let all= 0
   if exists("s:netrwmarkfilelist_{bufnr('%')}")
@@ -9662,9 +9907,9 @@ fun! s:NetrwRemoteRm(usrhost,path) range
 "   call Decho("remove all marked files with bufnr#".bufnr("%"),'~'.expand("<slnum>"))
    for fname in s:netrwmarkfilelist_{bufnr("%")}
     let ok= s:NetrwRemoteRmFile(a:path,fname,all)
-    if ok =~ 'q\%[uit]'
+    if ok =~# 'q\%[uit]'
      break
-    elseif ok =~ 'a\%[ll]'
+    elseif ok =~# 'a\%[ll]'
      let all= 1
     endif
    endfor
@@ -9683,9 +9928,9 @@ fun! s:NetrwRemoteRm(usrhost,path) range
    while ctr <= a:lastline
     exe "NetrwKeepj ".ctr
     let ok= s:NetrwRemoteRmFile(a:path,s:NetrwGetWord(),all)
-    if ok =~ 'q\%[uit]'
+    if ok =~# 'q\%[uit]'
      break
-    elseif ok =~ 'a\%[ll]'
+    elseif ok =~# 'a\%[ll]'
      let all= 1
     endif
     let ctr= ctr + 1
@@ -9696,7 +9941,8 @@ fun! s:NetrwRemoteRm(usrhost,path) range
   " refresh the (remote) directory listing
 "  call Decho("refresh remote directory listing",'~'.expand("<slnum>"))
   NetrwKeepj call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
 
 "  call Dret("s:NetrwRemoteRm")
 endfun
@@ -9723,12 +9969,12 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
      let ok="no"
     endif
     let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
-    if ok =~ 'a\%[ll]'
+    if ok =~# 'a\%[ll]'
      let all= 1
     endif
    endif
 
-   if all || ok =~ 'y\%[es]' || ok == ""
+   if all || ok =~# 'y\%[es]' || ok == ""
 "    call Decho("case all=".all." or ok<".ok.">".(exists("w:netrw_method")? ': netrw_method='.w:netrw_method : ""),'~'.expand("<slnum>"))
     if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
 "     call Decho("case ftp:",'~'.expand("<slnum>"))
@@ -9736,7 +9982,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
      if path =~ '^\a\{3,}://'
       let path= substitute(path,'^\a\{3,}://[^/]\+/','','')
      endif
-     sil! NetrwKeepj .,$d
+     sil! NetrwKeepj .,$d _
      call s:NetrwRemoteFtpCmd(path,"delete ".'"'.a:rmfile.'"')
     else
 "     call Decho("case ssh: g:netrw_rm_cmd<".g:netrw_rm_cmd.">",'~'.expand("<slnum>"))
@@ -9763,13 +10009,13 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
        else
         call netrw#ErrorMsg(s:WARNING,"cmd<".netrw_rm_cmd."> failed",60)
        endif
-      else if ret != 0
+      elseif ret != 0
        call netrw#ErrorMsg(s:WARNING,"cmd<".netrw_rm_cmd."> failed",60)
       endif
 "      call Decho("returned=".ret." errcode=".v:shell_error,'~'.expand("<slnum>"))
      endif
     endif
-   elseif ok =~ 'q\%[uit]'
+   elseif ok =~# 'q\%[uit]'
 "    call Decho("ok==".ok,'~'.expand("<slnum>"))
    endif
 
@@ -9784,12 +10030,12 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
      let ok="no"
     endif
     let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
-    if ok =~ 'a\%[ll]'
+    if ok =~# 'a\%[ll]'
      let all= 1
     endif
    endif
 
-   if all || ok =~ 'y\%[es]' || ok == ""
+   if all || ok =~# 'y\%[es]' || ok == ""
     if exists("w:netrw_method") && (w:netrw_method == 2 || w:netrw_method == 3)
      NetrwKeepj call s:NetrwRemoteFtpCmd(a:path,"rmdir ".a:rmfile)
     else
@@ -9812,7 +10058,7 @@ fun! s:NetrwRemoteRmFile(path,rmfile,all)
      endif
     endif
 
-   elseif ok =~ 'q\%[uit]'
+   elseif ok =~# 'q\%[uit]'
 "    call Decho("ok==".ok,'~'.expand("<slnum>"))
    endif
   endif
@@ -9827,7 +10073,8 @@ fun! s:NetrwRemoteRename(usrhost,path) range
 "  call Dfunc("NetrwRemoteRename(usrhost<".a:usrhost."> path<".a:path.">)")
 
   " preparation for removing multiple files/directories
-  let svpos      = netrw#SavePosn()
+  let svpos      = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
   let ctr        = a:firstline
   let rename_cmd = s:MakeSshCmd(g:netrw_rename_cmd)
 
@@ -9893,7 +10140,8 @@ fun! s:NetrwRemoteRename(usrhost,path) range
 
   " refresh the directory
   NetrwKeepj call s:NetrwRefresh(0,s:NetrwBrowseChgDir(0,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
 
 "  call Dret("NetrwRemoteRename")
 endfun
@@ -9955,7 +10203,7 @@ endfun
 " ---------------------------------------------------------------------
 " netrw#LocalBrowseCheck: {{{2
 fun! netrw#LocalBrowseCheck(dirname)
-  " This function is called by netrwPlugin.vim's s:LocalBrowse() and by s:NetrwRexplore()
+  " This function is called by netrwPlugin.vim's s:LocalBrowse(), s:NetrwRexplore(), and by <cr> when atop listed file/directory
   " unfortunate interaction -- split window debugging can't be
   " used here, must use D-echoRemOn or D-echoTabOn -- the BufEnter
   " event triggers another call to LocalBrowseCheck() when attempts
@@ -9964,7 +10212,7 @@ fun! netrw#LocalBrowseCheck(dirname)
   " would hit when re-entering netrw windows, creating unexpected
   " refreshes (and would do so in the middle of NetrwSaveOptions(), too)
 "  call Dfunc("netrw#LocalBrowseCheck(dirname<".a:dirname.">")
-"  call Decho("isdir<".a:dirname.">=".isdirectory(s:NetrwFile(a:dirname)).((exists("s:treeforceredraw")? " treeforceredraw" : "")).expand("<slnum>"))
+"  call Decho("isdir<".a:dirname."> =".isdirectory(s:NetrwFile(a:dirname)).((exists("s:treeforceredraw")? " treeforceredraw" : "")).'~'.expand("<slnum>"))
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
 "  call Dredir("ls!","ls!")
 "  call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
@@ -9988,7 +10236,6 @@ fun! netrw#LocalBrowseCheck(dirname)
     unlet s:treeforceredraw
     sil! NetrwKeepj keepalt call s:NetrwBrowse(1,a:dirname)
    endif
-
 "   call Decho("tab#".tabpagenr()." win#".winnr()." buf#".bufnr("%")."<".bufname("%")."> line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol(),'~'.expand("<slnum>"))
 "   call Dret("netrw#LocalBrowseCheck")
    return
@@ -10068,12 +10315,15 @@ fun! s:LocalBrowseRefresh()
     " refresh any netrw buffer
 "    call Decho("refresh buf#".ibuf.'-> win#'.bufwinnr(ibuf),'~'.expand("<slnum>"))
     exe bufwinnr(ibuf)."wincmd w"
-    if getline(".") =~ 'Quick Help'
+    if getline(".") =~# 'Quick Help'
      " decrement g:netrw_quickhelp to prevent refresh from changing g:netrw_quickhelp
      " (counteracts s:NetrwBrowseChgDir()'s incrementing)
      let g:netrw_quickhelp= g:netrw_quickhelp - 1
     endif
 "    call Decho("#3: quickhelp=".g:netrw_quickhelp,'~'.expand("<slnum>"))
+    if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
+     NetrwKeepj call s:NetrwRefreshTreeDict(w:netrw_treetop)
+    endif
     NetrwKeepj call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
    endif
    let ibl= ibl + 1
@@ -10171,15 +10421,8 @@ fun! s:LocalListing()
   " get the list of files contained in the current directory
   let dirname    = b:netrw_curdir
   let dirnamelen = strlen(b:netrw_curdir)
-  if v:version == 704 && has("patch656")
-"   call Decho("using glob with patch656",'~'.expand("<slnum>"))
-   let filelist   = glob(s:ComposePath(dirname,"*"),0,1,1)
-   let filelist   = filelist + glob(s:ComposePath(dirname,".*"),0,1,1)
-  else
-"   call Decho("using glob without patch656",'~'.expand("<slnum>"))
-   let filelist   = glob(s:ComposePath(dirname,"*"),0,1)
-   let filelist   = filelist + glob(s:ComposePath(dirname,".*"),0,1)
-  endif
+  let filelist   = s:NetrwGlob(dirname,"*",0)
+  let filelist   = filelist + s:NetrwGlob(dirname,".*",0)
 "  call Decho("filelist=".string(filelist),'~'.expand("<slnum>"))
 
   if g:netrw_cygwin == 0 && (has("win32") || has("win95") || has("win64") || has("win16"))
@@ -10191,9 +10434,9 @@ fun! s:LocalListing()
 "   call Decho("filelist=".string(filelist),'~'.expand("<slnum>"))
   endif
 
-"  call Decho("before while: dirname<".dirname.">",'~'.expand("<slnum>"))
+"  call Decho("before while: dirname   <".dirname.">",'~'.expand("<slnum>"))
 "  call Decho("before while: dirnamelen<".dirnamelen.">",'~'.expand("<slnum>"))
-"  call Decho("before while: filelist=".string(filelist),'~'.expand("<slnum>"))
+"  call Decho("before while: filelist  =".string(filelist),'~'.expand("<slnum>"))
 
   if get(g:, 'netrw_dynamic_maxfilenamelen', 0)
    let filelistcopy           = map(deepcopy(filelist),'fnamemodify(v:val, ":t")')
@@ -10263,12 +10506,15 @@ fun! s:LocalListing()
 
    if w:netrw_liststyle == s:LONGLIST
     let sz   = getfsize(filename)
+    if g:netrw_sizestyle =~# "[hH]"
+     let sz= s:NetrwHumanReadable(sz)
+    endif
     let fsz  = strpart("               ",1,15-strlen(sz)).sz
     let pfile= pfile."\t".fsz." ".strftime(g:netrw_timefmt,getftime(filename))
-"    call Decho("sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
+"    call Decho("longlist support: sz=".sz." fsz=".fsz,'~'.expand("<slnum>"))
    endif
 
-   if     g:netrw_sort_by =~ "^t"
+   if     g:netrw_sort_by =~# "^t"
     " sort by time (handles time up to 1 quintillion seconds, US)
 "    call Decho("getftime(".filename.")=".getftime(filename),'~'.expand("<slnum>"))
     let t  = getftime(filename)
@@ -10281,6 +10527,9 @@ fun! s:LocalListing()
     " sort by size (handles file sizes up to 1 quintillion bytes, US)
 "    call Decho("getfsize(".filename.")=".getfsize(filename),'~'.expand("<slnum>"))
     let sz   = getfsize(filename)
+    if g:netrw_sizestyle =~# "[hH]"
+     let sz= s:NetrwHumanReadable(sz)
+    endif
     let fsz  = strpart("000000000000000000",1,18-strlen(sz)).sz
 "    call Decho("exe NetrwKeepj put ='".fsz.'/'.filename."'",'~'.expand("<slnum>"))
     let fszpfile= fsz.'/'.pfile
@@ -10339,7 +10588,8 @@ fun! s:NetrwLocalRename(path) range
   " preparation for removing multiple files/directories
   let ykeep    = @@
   let ctr      = a:firstline
-  let svpos    = netrw#SavePosn()
+  let svpos    = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   " rename files given by the markfilelist
   if exists("s:netrwmarkfilelist_{bufnr('%')}")
@@ -10405,7 +10655,8 @@ fun! s:NetrwLocalRename(path) range
   " refresh the directory
 "  call Decho("refresh the directory listing",'~'.expand("<slnum>"))
   NetrwKeepj call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
-  NetrwKeepj call netrw#RestorePosn(svpos)
+"  call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+  NetrwKeepj call winrestview(svpos)
   let @@= ykeep
 
 "  call Dret("NetrwLocalRename")
@@ -10421,16 +10672,17 @@ fun! s:NetrwLocalRm(path) range
   let ykeep = @@
   let ret   = 0
   let all   = 0
-  let svpos = netrw#SavePosn()
+  let svpos = winsaveview()
+"  call Decho("saving posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
 
   if exists("s:netrwmarkfilelist_{bufnr('%')}")
    " remove all marked files
 "   call Decho("remove all marked files",'~'.expand("<slnum>"))
    for fname in s:netrwmarkfilelist_{bufnr("%")}
     let ok= s:NetrwLocalRmFile(a:path,fname,all)
-    if ok =~ 'q\%[uit]' || ok == "no"
+    if ok =~# 'q\%[uit]' || ok == "no"
      break
-    elseif ok =~ 'a\%[ll]'
+    elseif ok =~# 'a\%[ll]'
      let all= 1
     endif
    endfor
@@ -10457,9 +10709,9 @@ fun! s:NetrwLocalRm(path) range
      continue
     endif
     let ok= s:NetrwLocalRmFile(a:path,curword,all)
-    if ok =~ 'q\%[uit]' || ok == "no"
+    if ok =~# 'q\%[uit]' || ok == "no"
      break
-    elseif ok =~ 'a\%[ll]'
+    elseif ok =~# 'a\%[ll]'
      let all= 1
     endif
     let ctr= ctr + 1
@@ -10471,7 +10723,8 @@ fun! s:NetrwLocalRm(path) range
 "  call Decho("bufname<".bufname("%").">",'~'.expand("<slnum>"))
   if bufname("%") != "NetrwMessage"
    NetrwKeepj call s:NetrwRefresh(1,s:NetrwBrowseChgDir(1,'./'))
-   NetrwKeepj call netrw#RestorePosn(svpos)
+"   call Decho("restoring posn to svpos<".string(svpos).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(svpos)
   endif
   let @@= ykeep
 
@@ -10505,12 +10758,12 @@ fun! s:NetrwLocalRmFile(path,fname,all)
 "    call Decho("response: ok<".ok.">",'~'.expand("<slnum>"))
     let ok= substitute(ok,'\[{y(es)},n(o),a(ll),q(uit)]\s*','','e')
 "    call Decho("response: ok<".ok."> (after sub)",'~'.expand("<slnum>"))
-    if ok =~ 'a\%[ll]'
+    if ok =~# 'a\%[ll]'
      let all= 1
     endif
    endif
 
-   if all || ok =~ 'y\%[es]' || ok == ""
+   if all || ok =~# 'y\%[es]' || ok == ""
     let ret= s:NetrwDelete(rmfile)
 "    call Decho("errcode=".v:shell_error." ret=".ret,'~'.expand("<slnum>"))
    endif
@@ -10526,35 +10779,41 @@ fun! s:NetrwLocalRmFile(path,fname,all)
     if ok == ""
      let ok="no"
     endif
-    if ok =~ 'a\%[ll]'
+    if ok =~# 'a\%[ll]'
      let all= 1
     endif
    endif
    let rmfile= substitute(rmfile,'[\/]$','','e')
 
-   if all || ok =~ 'y\%[es]' || ok == ""
-"    call Decho("1st attempt: system(netrw#WinPath(".g:netrw_localrmdir.') '.s:ShellEscape(rmfile).')','~'.expand("<slnum>"))
-    call system(netrw#WinPath(g:netrw_localrmdir).' '.s:ShellEscape(rmfile))
-"    call Decho("v:shell_error=".v:shell_error,'~'.expand("<slnum>"))
+   if all || ok =~# 'y\%[es]' || ok == ""
+    if v:version < 704 || !has("patch1109")
+" "    call Decho("1st attempt: system(netrw#WinPath(".g:netrw_localrmdir.') '.s:ShellEscape(rmfile).')','~'.expand("<slnum>"))
+     call system(netrw#WinPath(g:netrw_localrmdir).' '.s:ShellEscape(rmfile))
+" "    call Decho("v:shell_error=".v:shell_error,'~'.expand("<slnum>"))
 
-    if v:shell_error != 0
-"     call Decho("2nd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-     let errcode= s:NetrwDelete(rmfile)
-"     call Decho("errcode=".errcode,'~'.expand("<slnum>"))
-
-     if errcode != 0
-      if has("unix")
-"       call Decho("3rd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
-       call system("rm ".s:ShellEscape(rmfile))
-       if v:shell_error != 0 && !exists("g:netrw_quiet")
-        call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
+     if v:shell_error != 0
+" "     call Decho("2nd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
+      let errcode= s:NetrwDelete(rmfile)
+" "     call Decho("errcode=".errcode,'~'.expand("<slnum>"))
+
+      if errcode != 0
+       if has("unix")
+" "       call Decho("3rd attempt to remove directory<".rmfile.">",'~'.expand("<slnum>"))
+	call system("rm ".s:ShellEscape(rmfile))
+	if v:shell_error != 0 && !exists("g:netrw_quiet")
+	 call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",34)
+	 let ok="no"
+	endif
+       elseif !exists("g:netrw_quiet")
+	call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
 	let ok="no"
        endif
-      elseif !exists("g:netrw_quiet")
-       call netrw#ErrorMsg(s:ERROR,"unable to remove directory<".rmfile."> -- is it empty?",35)
-       let ok="no"
       endif
      endif
+    else
+     if delete(rmfile,"d")
+      call netrw#ErrorMsg(s:ERROR,"unable to delete directory <".rmfile.">!",103)
+     endif
     endif
    endif
   endif
@@ -10567,6 +10826,17 @@ endfun
 " Support Functions: {{{1
 
 " ---------------------------------------------------------------------
+" s:WinNames: COMBAK {{{2
+fun! s:WinNames(id)
+  let curwin= winnr()
+  1wincmd w
+"  call Decho("--- Windows By Name --- #".a:id)
+"  windo call Decho("win#".winnr()."<".expand("%").">")
+"  call Decho("--- --- --- --- --- ---")
+  exe curwin."wincmd w"
+endfun
+
+" ---------------------------------------------------------------------
 " netrw#Access: intended to provide access to variable values for netrw's test suite {{{2
 "   0: marked file list of current buffer
 "   1: marked file target
@@ -10593,83 +10863,6 @@ fun! netrw#Call(funcname,...)
 "  call Dret("netrw#Call")
 endfun
 
-" ------------------------------------------------------------------------
-" netrw#RestorePosn: restores the cursor and file position as saved by netrw#SavePosn() {{{2
-fun! netrw#RestorePosn(...)
-"  call Dfunc("netrw#RestorePosn() a:0=".a:0." winnr=".(exists("w:netrw_winnr")? w:netrw_winnr : -1)." line=".(exists("w:netrw_line")? w:netrw_line : -1)." col=".(exists("w:netrw_col")? w:netrw_col : -1)." hline=".(exists("w:netrw_hline")? w:netrw_hline : -1))
-  let eikeep= &ei
-  setl ei=all
-  if expand("%") == "NetrwMessage"
-   if exists("s:winBeforeErr")
-    exe s:winBeforeErr."wincmd w"
-   endif
-  endif
-
-  if a:0 > 0
-   exe "keepj ".a:1
-  endif
-"  "call Decho("a:1             = ".((a:0 > 0)?              a:1       : 'n/a'),'~'.expand("<slnum>"))
-"  "call Decho("liststyle       = ".(exists("liststyle")?    liststyle : 'n/a'). " w:netrw_liststyle=".(exists("w:netrw_liststyle")? w:netrw_liststyle : 'n/a'),'~'.expand("<slnum>"))
-  if exists("liststyle") && exists("w:netrw_liststyle") && liststyle != w:netrw_liststyle
-   let usesrch= 1
-  else
-   let usesrch= 0
-  endif
-
-"  "call Decho("winh            = ".(exists("w:netrw_winh")?    w:netrw_winh    : -1),'~'.expand("<slnum>"))
-"  "call Decho("winw            = ".(exists("w:netrw_winw")?    w:netrw_winw    : -1),'~'.expand("<slnum>"))
-"  "call Decho("cur    winheight=".winheight(0)." winwidth=".winwidth(0),'~'.expand("<slnum>"))
-"  "call Decho("w:netrw_winfile = ".(exists("w:netrw_winfile")? w:netrw_winfile : 'n/a'),'~'.expand("<slnum>"))
-
-  " restore window
-  if exists("w:netrw_winnr")
-"   "call Decho("restore window: exe sil! ".w:netrw_winnr."wincmd w",'~'.expand("<slnum>"))
-   exe "sil! ".w:netrw_winnr."wincmd w"
-  endif
-"  if v:shell_error == 0
-   " as suggested by Bram M: redraw on no error
-   " allows protocol error messages to remain visible
-"   redraw!
-"  endif
-
-  " restore top-of-screen line
-  if exists("w:netrw_hline")
-"   "call Decho("restore topofscreen: exe keepj norm! ".w:netrw_hline."G0z",'~'.expand("<slnum>"))
-   exe "keepj norm! ".w:netrw_hline."G0z\<CR>"
-  endif
-
-  " restore position
-  " when the window's height x width has changed, the line,col is no longer useful
-  if w:netrw_winh == winheight(0) && w:netrw_winw == winwidth(0) && exists("w:netrw_line") && exists("w:netrw_col") && !usesrch
-"   "call Decho("using posn: exe keepj norm! ".w:netrw_line."G0".w:netrw_col."|",'~'.expand("<slnum>"))
-   exe "keepj norm! ".w:netrw_line."G0".w:netrw_col."\<bar>"
-
-  elseif exists("w:netrw_winfile")
-   if !search('\<'.escape(w:netrw_winfile,g:netrw_fname_escape),'cw')
-    if exists("w:netrw_bannercnt")
-"     "call Decho("using bannercnt: win#".winnr()." ".winheight(0)."x".winwidth(0)." w:netrw_winfile<".w:netrw_winfile.">",'~'.expand("<slnum>"))
-     exe "keepj ".w:netrw_bannercnt
-     norm! 0
-    else
-     " go to upper left corner
-"     "call Decho("goto ulc: win#".winnr()." ".winheight(0)."x".winwidth(0)." w:netrw_winfile<".w:netrw_winfile.">",'~'.expand("<slnum>"))
-     keepj 1
-     norm! 0
-    endif
-   else
-"    "call Decho("used search: w:netrw_winfile<".w:netrw_winfile.">",'~'.expand("<slnum>"))
-   endif
-
-  else
-"   "call Decho("goto ulc: win#".winnr()." ".winheight(0)."x".winwidth(0),'~'.expand("<slnum>"))
-   keepj 1
-   norm! 0
-  endif
-
-  let &ei= eikeep
-"  call Dret("netrw#RestorePosn : line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol())
-endfun
-
 " ---------------------------------------------------------------------
 " netrw#Expose: allows UserMaps and pchk to look at otherwise script-local variables {{{2
 "               I expect this function to be used in
@@ -10677,18 +10870,22 @@ endfun
 "               for example.
 fun! netrw#Expose(varname)
 "   call Dfunc("netrw#Expose(varname<".a:varname.">)")
-  exe "let retval= s:".a:varname
-  if exists("g:netrw_pchk")
-   if type(retval) == 3
-    let retval = copy(retval)
-    let i      = 0
-    while i < len(retval)
-     let retval[i]= substitute(retval[i],expand("$HOME"),'~','')
-     let i        = i + 1
-    endwhile
+  if exists("s:".a:varname)
+   exe "let retval= s:".a:varname
+   if exists("g:netrw_pchk")
+    if type(retval) == 3
+     let retval = copy(retval)
+     let i      = 0
+     while i < len(retval)
+      let retval[i]= substitute(retval[i],expand("$HOME"),'~','')
+      let i        = i + 1
+     endwhile
+    endif
+"     call Dret("netrw#Expose ".string(retval))
+    return string(retval)
    endif
-"    call Dret("netrw#Expose ".string(retval))
-   return string(retval)
+  else
+   let retval= "n/a"
   endif
 
 "  call Dret("netrw#Expose ".string(retval))
@@ -10713,48 +10910,6 @@ fun! netrw#RFC2396(fname)
 endfun
 
 " ---------------------------------------------------------------------
-" netrw#SavePosn: saves position of cursor on screen {{{2
-fun! netrw#SavePosn()
-"  call Dfunc("netrw#SavePosn() win#".winnr()." line#".line(".")." col#".col(".")." winline#".winline()." wincol#".wincol())
-  " Save current line and column
-  let w:netrw_winnr= winnr()
-  let w:netrw_line = line(".")
-  let w:netrw_col  = virtcol(".")
-"  "call Decho("currently, win#".w:netrw_winnr." line#".w:netrw_line." col#".w:netrw_col,'~'.expand("<slnum>"))
-
-  " save filename under cursor
-"  "call Decho("line#".line(".")." w:netrw_bannercnt=".(exists("w:netrw_bannercnt")? w:netrw_bannercnt : 'n/a'),'~'.expand("<slnum>"))
-  if exists("w:netrw_bannercnt") && line(".") >= w:netrw_bannercnt && &ft == "netrw"
-   let winfile = "|let w:netrw_winfile=\"".fnameescape(s:NetrwGetWord())."\""
-  else
-   let winfile= ""
-  endif
-"  "call Decho("winfile<".winfile.">",'~'.expand("<slnum>"))
-  if exists("w:netrw_liststyle")
-   let liststyle = "|let liststyle=".w:netrw_liststyle
-  else
-   let liststyle= ""
-  endif
-"  "call Decho("liststyle=".liststyle,'~'.expand("<slnum>"))
-
-  " Save top-of-screen line
-  keepj norm! H0
-  let w:netrw_hline= line(".")
-
-  " save up alternate position information
-  " use this when window height x width has changed
-  let w:netrw_winh = winheight(0)
-  let w:netrw_winw = winwidth(0)
-
-  " set up string holding position parameters
-  let ret          = "let w:netrw_winnr=".w:netrw_winnr."|let w:netrw_line=".w:netrw_line."|let w:netrw_col=".w:netrw_col."|let w:netrw_hline=".w:netrw_hline."|let w:netrw_winh=".w:netrw_winh."|let w:netrw_winw=".w:netrw_winw.liststyle.winfile
-
-  keepj call netrw#RestorePosn()
-"  call Dret("netrw#SavePosn : win#=".(exists("w:netrw_winnr")? w:netrw_winnr : "n/a")." line=".(exists("w:netrw_line")? w:netrw_line : "n/a")." col=".(exists("w:netrw_col")? w:netrw_col : "n/a")." hline=".(exists("w:netrw_hline")? w:netrw_hline : "n/a"))
-  return ret
-endfun
-
-" ---------------------------------------------------------------------
 " netrw#UserMaps: supports user-specified maps {{{2
 "                 see :help function()
 "
@@ -10823,9 +10978,9 @@ fun! s:ComposePath(base,subdir)
 "   call Decho("amiga",'~'.expand("<slnum>"))
    let ec = a:base[s:Strlen(a:base)-1]
    if ec != '/' && ec != ':'
-    let ret = a:base . "/" . a:subdir
+    let ret = a:base."/" . a:subdir
    else
-    let ret = a:base . a:subdir
+    let ret = a:base.a:subdir
    endif
 
   elseif a:subdir =~ '^\a:[/\\][^/\\]' && (has("win32") || has("win95") || has("win64") || has("win16"))
@@ -11053,10 +11208,10 @@ fun! s:NetrwBMShow()
   redir END
   let bmshowlist = split(bmshowraw,'\n')
   if bmshowlist != []
-   let bmshowfuncs= filter(bmshowlist,'v:val =~ "<SNR>\\d\\+_BMShow()"')
+   let bmshowfuncs= filter(bmshowlist,'v:val =~# "<SNR>\\d\\+_BMShow()"')
    if bmshowfuncs != []
     let bmshowfunc = substitute(bmshowfuncs[0],'^.*:\(call.*BMShow()\).*$','\1','')
-    if bmshowfunc =~ '^call.*BMShow()'
+    if bmshowfunc =~# '^call.*BMShow()'
      exe "sil! NetrwKeepj ".bmshowfunc
     endif
    endif
@@ -11198,10 +11353,14 @@ fun! s:NetrwEnew(...)
 
   NetrwKeepj call s:NetrwOptionRestore("w:")
 "  call Decho("generate a buffer with NetrwKeepj keepalt enew!",'~'.expand("<slnum>"))
+  " when tree listing uses file TreeListing... a new buffer is made.
+  " Want the old buffer to be unlisted.
+  " COMBAK: this causes a problem, see P43
+"  setl nobl
   let netrw_keepdiff= &l:diff
   noswapfile NetrwKeepj keepalt enew!
   let &l:diff= netrw_keepdiff
-"  call Decho("bufnr($)=".bufnr("$")." winnr($)=".winnr("$"),'~'.expand("<slnum>"))
+"  call Decho("bufnr($)=".bufnr("$")."<".bufname(bufnr("$"))."> winnr($)=".winnr("$"),'~'.expand("<slnum>"))
   NetrwKeepj call s:NetrwOptionSave("w:")
 
   " copy function-local-variables to buffer variable equivalents
@@ -11227,8 +11386,9 @@ fun! s:NetrwEnew(...)
    let b:netrw_curdir= a:1
    if b:netrw_curdir =~ '/$'
     if exists("w:netrw_liststyle") && w:netrw_liststyle == s:TREELIST
+     setl nobl
      file NetrwTreeListing
-     setl bt=nowrite noswf bh=hide
+     setl nobl bt=nowrite bh=hide
      nno <silent> <buffer> [	:sil call <SID>TreeListMove('[')<cr>
      nno <silent> <buffer> ]	:sil call <SID>TreeListMove(']')<cr>
     else
@@ -11259,8 +11419,8 @@ endfun
 " ---------------------------------------------------------------------
 " s:NetrwInsureWinVars: insure that a netrw buffer has its w: variables in spite of a wincmd v or s {{{2
 fun! s:NetrwInsureWinVars()
-"  call Dfunc("s:NetrwInsureWinVars() win#".winnr())
   if !exists("w:netrw_liststyle")
+"   call Dfunc("s:NetrwInsureWinVars() win#".winnr())
    let curbuf = bufnr("%")
    let curwin = winnr()
    let iwin   = 1
@@ -11280,8 +11440,8 @@ fun! s:NetrwInsureWinVars()
      let w:{k}= winvars[k]
     endfor
    endif
+"   call Dret("s:NetrwInsureWinVars win#".winnr())
   endif
-"  call Dret("s:NetrwInsureWinVars win#".winnr())
 endfun
 
 " ---------------------------------------------------------------------
@@ -11331,6 +11491,50 @@ fun! s:NetrwSaveWordPosn()
 endfun
 
 " ---------------------------------------------------------------------
+" s:NetrwHumanReadable: takes a number and makes it "human readable" {{{2
+"                       1000 -> 1K, 1000000 -> 1M, 1000000000 -> 1G
+fun! s:NetrwHumanReadable(sz)
+"  call Dfunc("s:NetrwHumanReadable(sz=".a:sz.") type=".type(a:sz)." style=".g:netrw_sizestyle )
+
+  if g:netrw_sizestyle == 'h'
+   if a:sz >= 1000000000 
+    let sz = printf("%.1f",a:sz/1000000000.0)."g"
+   elseif a:sz >= 10000000
+    let sz = printf("%d",a:sz/1000000)."m"
+   elseif a:sz >= 1000000
+    let sz = printf("%.1f",a:sz/1000000.0)."m"
+   elseif a:sz >= 10000
+    let sz = printf("%d",a:sz/1000)."k"
+   elseif a:sz >= 1000
+    let sz = printf("%.1f",a:sz/1000.0)."k"
+   else
+    let sz= a:sz
+   endif
+
+  elseif g:netrw_sizestyle == 'H'
+   if a:sz >= 1073741824
+    let sz = printf("%.1f",a:sz/1073741824.0)."G"
+   elseif a:sz >= 10485760
+    let sz = printf("%d",a:sz/1048576)."M"
+   elseif a:sz >= 1048576
+    let sz = printf("%.1f",a:sz/1048576.0)."M"
+   elseif a:sz >= 10240
+    let sz = printf("%d",a:sz/1024)."K"
+   elseif a:sz >= 1024
+    let sz = printf("%.1f",a:sz/1024.0)."K"
+   else
+    let sz= a:sz
+   endif
+
+  else
+   let sz= a:sz
+  endif
+
+"  call Dret("s:NetrwHumanReadable ".sz)
+  return sz
+endfun
+
+" ---------------------------------------------------------------------
 " s:NetrwRestoreWordPosn: used to keep cursor on same word after refresh, {{{2
 "  changed sorting, etc.  Also see s:NetrwSaveWordPosn().
 fun! s:NetrwRestoreWordPosn()
@@ -11442,14 +11646,14 @@ endfun
 "             s:SetRexDir() sets up <2-leftmouse> maps (if g:netrw_retmap
 "             is true) and a command, :Rexplore, which call this function.
 "
-"             s:nbcd_curpos_{bufnr('%')} is set up by s:NetrwBrowseChgDir()
+"             s:netrw_nbcd is set up by s:NetrwBrowseChgDir()
 "
 "             s:rexposn_BUFNR used to save/restore cursor position
 fun! s:NetrwRexplore(islocal,dirname)
   if exists("s:netrwdrag")
    return
   endif
-"  call Dfunc("s:NetrwRexplore() w:netrw_rexlocal=".w:netrw_rexlocal." w:netrw_rexdir<".w:netrw_rexdir.">")
+"  call Dfunc("s:NetrwRexplore() w:netrw_rexlocal=".w:netrw_rexlocal." w:netrw_rexdir<".w:netrw_rexdir."> win#".winnr())
 "  call Decho("currently in bufname<".bufname("%").">",'~'.expand("<slnum>"))
 "  call Decho("ft=".&ft." win#".winnr()." w:netrw_rexfile<".(exists("w:netrw_rexfile")? w:netrw_rexfile : 'n/a').">",'~'.expand("<slnum>"))
 
@@ -11474,7 +11678,7 @@ fun! s:NetrwRexplore(islocal,dirname)
 "  call Decho("set w:netrw_rexfile<".w:netrw_rexfile.">  (win#".winnr().")",'~'.expand("<slnum>"))
 
   if !exists("w:netrw_rexlocal")
-"   call Dret("s:NetrwRexplore w:netrw_rexlocal doesn't exist (".&ft.")")
+"   call Dret("s:NetrwRexplore w:netrw_rexlocal doesn't exist (".&ft." win#".winnr().")")
    return
   endif
 "  call Decho("settings buf#".bufnr("%")."<".bufname("%").">: ".((&l:ma == 0)? "no" : "")."ma ".((&l:mod == 0)? "no" : "")."mod ".((&l:bl == 0)? "no" : "")."bl ".((&l:ro == 0)? "no" : "")."ro fo=".&l:fo,'~'.expand("<slnum>"))
@@ -11489,7 +11693,8 @@ fun! s:NetrwRexplore(islocal,dirname)
   if exists("s:rexposn_".bufnr("%"))
 "   call Decho("restore posn, then unlet s:rexposn_".bufnr('%')."<".bufname("%").">",'~'.expand("<slnum>"))
    " restore position in directory listing
-   NetrwKeepj call netrw#RestorePosn(s:rexposn_{bufnr('%')})
+"   call Decho("restoring posn to s:rexposn_".bufnr('%')."<".string(s:rexposn_{bufnr('%')}).">",'~'.expand("<slnum>"))
+   NetrwKeepj call winrestview(s:rexposn_{bufnr('%')})
    if exists("s:rexposn_".bufnr('%'))
     unlet s:rexposn_{bufnr('%')}
    endif
@@ -11522,6 +11727,29 @@ fun! s:SaveBufVars()
 endfun
 
 " ---------------------------------------------------------------------
+" s:SavePosn: saves position associated with current buffer into a dictionary {{{2
+fun! s:SavePosn(posndict)
+"  call Dfunc("s:SavePosn(posndict) curbuf#".bufnr("%")."<".bufname("%").">")
+
+  let a:posndict[bufnr("%")]= winsaveview()
+"  call Decho("saving posn: posndict[".bufnr("%")."]=".string(winsaveview()),'~'.expand("<slnum>"))
+
+"  call Dret("s:SavePosn posndict")
+  return a:posndict
+endfun
+
+" ---------------------------------------------------------------------
+" s:RestorePosn: restores position associated with current buffer using dictionary {{{2
+fun! s:RestorePosn(posndict)
+"  call Dfunc("s:RestorePosn(posndict) curbuf#".bufnr("%")."<".bufname("%").">")
+  if has_key(a:posndict,bufnr("%"))
+   call winrestview(a:posndict[bufnr("%")])
+"   call Decho("restoring posn: posndict[".bufnr("%")."]=".string(a:posndict[bufnr("%")]),'~'.expand("<slnum>"))
+  endif
+"  call Dret("s:RestorePosn")
+endfun
+
+" ---------------------------------------------------------------------
 " s:SaveWinVars: (used by Explore() and NetrwSplit()) {{{2
 fun! s:SaveWinVars()
 "  call Dfunc("s:SaveWinVars() win#".winnr())
@@ -11571,11 +11799,14 @@ endfun
 " ---------------------------------------------------------------------
 " s:SetRexDir: set directory for :Rexplore {{{2
 fun! s:SetRexDir(islocal,dirname)
-"  call Dfunc("s:SetRexDir(islocal=".a:islocal." dirname<".a:dirname.">)")
+"  call Dfunc("s:SetRexDir(islocal=".a:islocal." dirname<".a:dirname.">) win#".winnr())
   let w:netrw_rexdir         = a:dirname
   let w:netrw_rexlocal       = a:islocal
-  let s:rexposn_{bufnr("%")} = netrw#SavePosn()
-"  call Decho("setting s:rexposn_".bufnr("%")."<".bufname("%")."> to SavePosn",'~'.expand("<slnum>"))
+  let s:rexposn_{bufnr("%")} = winsaveview()
+"  call Decho("setting w:netrw_rexdir  =".w:netrw_rexdir,'~'.expand("<slnum>"))
+"  call Decho("setting w:netrw_rexlocal=".w:netrw_rexlocal,'~'.expand("<slnum>"))
+"  call Decho("saving posn to s:rexposn_".bufnr("%")."<".string(s:rexposn_{bufnr("%")}).">",'~'.expand("<slnum>"))
+"  call Decho("setting s:rexposn_".bufnr("%")."<".bufname("%")."> to ".string(winsaveview()),'~'.expand("<slnum>"))
 "  call Dret("s:SetRexDir : win#".winnr()." ".(a:islocal? "local" : "remote")." dir: ".a:dirname)
 endfun
 
@@ -11685,56 +11916,39 @@ fun! s:ShellEscape(s, ...)
 endfun
 
 " ---------------------------------------------------------------------
-" s:TreeListMove: {{{2
+" s:TreeListMove: supports [[, ]], [], and ][ in tree mode {{{2
 fun! s:TreeListMove(dir)
 "  call Dfunc("s:TreeListMove(dir<".a:dir.">)")
-  let curline  = getline('.')
-  let prvline  = (line(".") > 1)?         getline(line(".")-1) : ''
-  let nxtline  = (line(".") < line("$"))? getline(line(".")+1) : ''
-  let curindent= substitute(curline,'^\([| ]*\).\{-}$','\1','')
-  let indentm1 = substitute(curindent,'^'.s:treedepthstring.' ','','')
-"  call Decho("prvline  <".prvline."> #".line(".")-1,'~'.expand("<slnum>"))
-"  call Decho("curline  <".curline."> #".line("."),'~'.expand("<slnum>"))
-"  call Decho("nxtline  <".nxtline."> #".line(".")+1,'~'.expand("<slnum>"))
-"  call Decho("curindent<".curindent.">",'~'.expand("<slnum>"))
-"  call Decho("indentm1 <".indentm1.">",'~'.expand("<slnum>"))
-
+  let curline      = getline('.')
+  let prvline      = (line(".") > 1)?         getline(line(".")-1) : ''
+  let nxtline      = (line(".") < line("$"))? getline(line(".")+1) : ''
+  let curindent    = substitute(getline('.'),'^\(\%('.s:treedepthstring.'\)*\)[^'.s:treedepthstring.'].\{-}$','\1','e')
+  let indentm1     = substitute(curindent,'^'.s:treedepthstring,'','')
+  let treedepthchr = substitute(s:treedepthstring,' ','','g')
+  let stopline     = exists("w:netrw_bannercnt")? w:netrw_bannercnt : 1
+"  call Decho("prvline  <".prvline."> #".(line(".")-1), '~'.expand("<slnum>"))
+"  call Decho("curline  <".curline."> #".line(".")    , '~'.expand("<slnum>"))
+"  call Decho("nxtline  <".nxtline."> #".(line(".")+1), '~'.expand("<slnum>"))
+"  call Decho("curindent<".curindent.">"              , '~'.expand("<slnum>"))
+"  call Decho("indentm1 <".indentm1.">"               , '~'.expand("<slnum>"))
+  "  COMBAK : need to handle when on a directory
+  "  COMBAK : need to handle ]] and ][.  In general, needs work!!!
   if curline !~ '/$'
-"   call Decho('regfile','~'.expand("<slnum>"))
-   if     a:dir == '[' && prvline != ''
+   if     a:dir == '[[' && prvline != ''
     NetrwKeepj norm! 0
-    let nl = search('^'.indentm1.'[^'.s:treedepthstring.']','bWe')    " search backwards from regular file
+    let nl = search('^'.indentm1.'\%('.s:treedepthstring.'\)\@!','bWe',stopline) " search backwards
 "    call Decho("regfile srch back: ".nl,'~'.expand("<slnum>"))
-   elseif a:dir == ']' && nxtline != ''
-    NetrwKeepj norm! $
-    let nl = search('^'.indentm1.'[^'.s:treedepthstring.']','We')     " search forwards from regular file
-"    call Decho("regfile srch fwd: ".nl,'~'.expand("<slnum>"))
-   endif
-
-  elseif a:dir == '[' && prvline != ''
-   NetrwKeepj norm! 0
-   let curline= line(".")
-   let nl     = search('^'.curindent.'[^'.s:treedepthstring.']','bWe') " search backwards From directory, same indentation
-"   call Decho("dir srch back ind: ".nl,'~'.expand("<slnum>"))
-   if nl != 0
-    if line(".") == curline-1
-     let nl= search('^'.indentm1.'[^'.s:treedepthstring.']','bWe')     " search backwards from directory, indentation - 1
-"     call Decho("dir srch back ind-1: ".nl,'~'.expand("<slnum>"))
-    endif
-   endif
-
-  elseif a:dir == ']' && nxtline != ''
-   NetrwKeepj norm! $
-   let curline = line(".")
-   let nl      = search('^'.curindent.'[^'.s:treedepthstring.']','We') " search forwards from directory, same indentation
-"   call Decho("dir srch fwd ind: ".nl,'~'.expand("<slnum>"))
-   if nl != 0
-    if line(".") == curline+1
-     let nl= search('^'.indentm1.'[^'.s:treedepthstring.']','We')         " search forwards from directory, indentation - 1
-"     call Decho("dir srch fwd ind-1: ".nl,'~'.expand("<slnum>"))
+   elseif a:dir == '[]' && nxtline != ''
+    NetrwKeepj norm! 0
+"    call Decho('srchpat<'.'^\%('.curindent.'\)\@!'.'>','~'.expand("<slnum>"))
+    let nl = search('^\%('.curindent.'\)\@!','We') " search forwards
+    if nl != 0
+     NetrwKeepj norm! k
+    else
+     NetrwKeepj norm! G
     endif
+"    call Decho("regfile srch fwd: ".nl,'~'.expand("<slnum>"))
    endif
-
   endif
 
 "  call Dret("s:TreeListMove")
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index c7cb14ded7..1bcc1dea74 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -22,54 +22,85 @@ function! s:try_cmd(cmd, ...)
   let argv = split(a:cmd, " ")
   let out = a:0 ? systemlist(argv, a:1, 1) : systemlist(argv, [''], 1)
   if v:shell_error
-    echohl WarningMsg
-    echo "clipboard: error: ".(len(out) ? out[0] : '')
-    echohl None
+    if !exists('s:did_error_try_cmd')
+      echohl WarningMsg
+      echomsg "clipboard: error: ".(len(out) ? out[0] : '')
+      echohl None
+      let s:did_error_try_cmd = 1
+    endif
     return 0
   endif
   return out
 endfunction
 
+" Returns TRUE if `cmd` exits with success, else FALSE.
+function! s:cmd_ok(cmd)
+  call system(a:cmd)
+  return v:shell_error == 0
+endfunction
+
 let s:cache_enabled = 1
-if executable('pbcopy')
-  let s:copy['+'] = 'pbcopy'
-  let s:paste['+'] = 'pbpaste'
-  let s:copy['*'] = s:copy['+']
-  let s:paste['*'] = s:paste['+']
-  let s:cache_enabled = 0
-elseif exists('$DISPLAY') && executable('xsel')
-  let s:copy['+'] = 'xsel --nodetach -i -b'
-  let s:paste['+'] = 'xsel -o -b'
-  let s:copy['*'] = 'xsel --nodetach -i -p'
-  let s:paste['*'] = 'xsel -o -p'
-elseif exists('$DISPLAY') && executable('xclip')
-  let s:copy['+'] = 'xclip -quiet -i -selection clipboard'
-  let s:paste['+'] = 'xclip -o -selection clipboard'
-  let s:copy['*'] = 'xclip -quiet -i -selection primary'
-  let s:paste['*'] = 'xclip -o -selection primary'
-elseif executable('lemonade')
-  let s:copy['+'] = 'lemonade copy'
-  let s:paste['+'] = 'lemonade paste'
-  let s:copy['*'] = 'lemonade copy'
-  let s:paste['*'] = 'lemonade paste'
-elseif executable('doitclient')
-  let s:copy['+'] = 'doitclient wclip'
-  let s:paste['+'] = 'doitclient wclip -r'
-  let s:copy['*'] = s:copy['+']
-  let s:paste['*'] = s:paste['+']
-else
-  echom 'clipboard: No clipboard tool available. See :help nvim-clipboard'
+let s:err = ''
+
+function! provider#clipboard#Error() abort
+  return s:err
+endfunction
+
+function! provider#clipboard#Executable() abort
+  if has('mac') && executable('pbcopy')
+    let s:copy['+'] = 'pbcopy'
+    let s:paste['+'] = 'pbpaste'
+    let s:copy['*'] = s:copy['+']
+    let s:paste['*'] = s:paste['+']
+    let s:cache_enabled = 0
+    return 'pbcopy'
+  elseif exists('$DISPLAY') && executable('xsel') && s:cmd_ok('xsel -o -b')
+    let s:copy['+'] = 'xsel --nodetach -i -b'
+    let s:paste['+'] = 'xsel -o -b'
+    let s:copy['*'] = 'xsel --nodetach -i -p'
+    let s:paste['*'] = 'xsel -o -p'
+    return 'xsel'
+  elseif exists('$DISPLAY') && executable('xclip')
+    let s:copy['+'] = 'xclip -quiet -i -selection clipboard'
+    let s:paste['+'] = 'xclip -o -selection clipboard'
+    let s:copy['*'] = 'xclip -quiet -i -selection primary'
+    let s:paste['*'] = 'xclip -o -selection primary'
+    return 'xclip'
+  elseif executable('lemonade')
+    let s:copy['+'] = 'lemonade copy'
+    let s:paste['+'] = 'lemonade paste'
+    let s:copy['*'] = 'lemonade copy'
+    let s:paste['*'] = 'lemonade paste'
+    return 'lemonade'
+  elseif executable('doitclient')
+    let s:copy['+'] = 'doitclient wclip'
+    let s:paste['+'] = 'doitclient wclip -r'
+    let s:copy['*'] = s:copy['+']
+    let s:paste['*'] = s:paste['+']
+    return 'doitclient'
+  elseif executable('win32yank')
+    let s:copy['+'] = 'win32yank -i --crlf'
+    let s:paste['+'] = 'win32yank -o --lf'
+    let s:copy['*'] = s:copy['+']
+    let s:paste['*'] = s:paste['+']
+    return 'win32yank'
+  endif
+
+  let s:err = 'clipboard: No clipboard tool available. See :help clipboard'
+  return ''
+endfunction
+
+if empty(provider#clipboard#Executable())
   finish
 endif
 
 let s:clipboard = {}
 
 function! s:clipboard.get(reg)
-  let reg = a:reg == '"' ? '+' : a:reg
-  if s:selections[reg].owner > 0
-    return s:selections[reg].data
+  if s:selections[a:reg].owner > 0
+    return s:selections[a:reg].data
   end
-  return s:try_cmd(s:paste[reg])
+  return s:try_cmd(s:paste[a:reg])
 endfunction
 
 function! s:clipboard.set(lines, regtype, reg)
@@ -94,6 +125,7 @@ function! s:clipboard.set(lines, regtype, reg)
   let selection.data = [a:lines, a:regtype]
   let argv = split(s:copy[a:reg], " ")
   let selection.detach = s:cache_enabled
+  let selection.cwd = "/"
   let jobid = jobstart(argv, selection)
   if jobid <= 0
     echohl WarningMsg
diff --git a/runtime/autoload/provider/python.vim b/runtime/autoload/provider/python.vim
index cb9d5c5296..b99a046375 100644
--- a/runtime/autoload/provider/python.vim
+++ b/runtime/autoload/provider/python.vim
@@ -1,5 +1,5 @@
 " The Python provider uses a Python host to emulate an environment for running
-" python-vim plugins. See ":help nvim-provider" for more information.
+" python-vim plugins. See ":help provider".
 "
 " Associating the plugin with the Python host is the first step because plugins
 " will be passed as command-line arguments
diff --git a/runtime/autoload/provider/python3.vim b/runtime/autoload/provider/python3.vim
index f4a751e7a2..4f47a03a9b 100644
--- a/runtime/autoload/provider/python3.vim
+++ b/runtime/autoload/provider/python3.vim
@@ -1,5 +1,5 @@
 " The Python3 provider uses a Python3 host to emulate an environment for running
-" python3 plugins. See ":help nvim-provider" for more information.
+" python3 plugins. See ":help provider".
 "
 " Associating the plugin with the Python3 host is the first step because
 " plugins will be passed as command-line arguments
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index 05815a4896..08a0f39b01 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -5,11 +5,24 @@ endif
 
 let s:loaded_pythonx_provider = 1
 
+let s:stderr = {}
+let s:job_opts = {'rpc': v:true}
+
+" TODO(bfredl): this logic is common and should be builtin
+function! s:job_opts.on_stderr(chan_id, data, event)
+  let stderr = get(s:stderr, a:chan_id, [''])
+  let last = remove(stderr, -1)
+  let a:data[0] = last.a:data[0]
+  call extend(stderr, a:data)
+  let s:stderr[a:chan_id] = stderr
+endfunction
+
 function! provider#pythonx#Require(host) abort
   let ver = (a:host.orig_name ==# 'python') ? 2 : 3
 
   " Python host arguments
-  let args = ['-c', 'import sys; sys.path.remove(""); import neovim; neovim.start_host()']
+  let prog = (ver == '2' ?  provider#python#Prog() : provider#python3#Prog())
+  let args = [prog, '-c', 'import sys; sys.path.remove(""); import neovim; neovim.start_host()']
 
   " Collect registered Python plugins into args
   let python_plugins = remote#host#PluginsForHost(a:host.name)
@@ -18,46 +31,44 @@ function! provider#pythonx#Require(host) abort
   endfor
 
   try
-    let channel_id = rpcstart((ver == '2' ?
-          \ provider#python#Prog() : provider#python3#Prog()), args)
-    if rpcrequest(channel_id, 'poll') == 'ok'
+    let channel_id = jobstart(args, s:job_opts)
+    if rpcrequest(channel_id, 'poll') ==# 'ok'
       return channel_id
     endif
   catch
     echomsg v:throwpoint
     echomsg v:exception
+    for row in get(s:stderr, channel_id, [])
+      echomsg row
+    endfor
   endtry
   throw remote#host#LoadErrorForHost(a:host.orig_name,
         \ '$NVIM_PYTHON_LOG_FILE')
 endfunction
 
 function! provider#pythonx#Detect(major_ver) abort
-  let host_var = (a:major_ver == 2) ?
-        \ 'g:python_host_prog' : 'g:python3_host_prog'
-  let skip_var = (a:major_ver == 2) ?
-        \ 'g:python_host_skip_check' : 'g:python3_host_skip_check'
-  let skip = exists(skip_var) ? {skip_var} : 0
-  if exists(host_var)
-    " Disable auto detection.
-    let [result, err] = s:check_interpreter({host_var}, a:major_ver, skip)
-    if result
-      return [{host_var}, err]
+  if a:major_ver == 2
+    if exists('g:python_host_prog')
+      return [g:python_host_prog, '']
+    else
+      let progs = ['python2', 'python2.7', 'python2.6', 'python']
+    endif
+  else
+    if exists('g:python3_host_prog')
+      return [g:python3_host_prog, '']
+    else
+      let progs = ['python3', 'python3.7', 'python3.6', 'python3.5',
+            \ 'python3.4', 'python3.3', 'python']
     endif
-    return ['', 'provider/pythonx: Could not load Python ' . a:major_ver
-          \ . ' from ' . host_var . ': ' . err]
   endif
 
-  let prog_suffixes = (a:major_ver == 2) ?
-        \   ['2', '2.7', '2.6', '']
-        \ : ['3', '3.5', '3.4', '3.3', '']
-
   let errors = []
-  for prog in map(prog_suffixes, "'python' . v:val")
-    let [result, err] = s:check_interpreter(prog, a:major_ver, skip)
+
+  for prog in progs
+    let [result, err] = s:check_interpreter(prog, a:major_ver)
     if result
       return [prog, err]
     endif
-
     " Accumulate errors in case we don't find
     " any suitable Python interpreter.
     call add(errors, err)
@@ -68,23 +79,19 @@ function! provider#pythonx#Detect(major_ver) abort
         \ . ":\n" .  join(errors, "\n")]
 endfunction
 
-function! s:check_interpreter(prog, major_ver, skip) abort
+function! s:check_interpreter(prog, major_ver) abort
   let prog_path = exepath(a:prog)
-  if prog_path == ''
+  if prog_path ==# ''
     return [0, a:prog . ' not found in search path or not executable.']
   endif
 
-  if a:skip
-    return [1, '']
-  endif
-
   let min_version = (a:major_ver == 2) ? '2.6' : '3.3'
 
   " Try to load neovim module, and output Python version.
   " Return codes:
   "   0  Neovim module can be loaded.
-  "   1  Something else went wrong.
   "   2  Neovim module cannot be loaded.
+  "   Otherwise something else went wrong (e.g. 1 or 127).
   let prog_ver = system([ a:prog , '-c' ,
         \ 'import sys; ' .
         \ 'sys.path.remove(""); ' .
@@ -93,7 +100,8 @@ function! s:check_interpreter(prog, major_ver, skip) abort
         \ 'exit(2*int(pkgutil.get_loader("neovim") is None))'
         \ ])
 
-  if prog_ver
+  if v:shell_error == 2 || v:shell_error == 0
+    " Check version only for expected return codes.
     if prog_ver !~ '^' . a:major_ver
       return [0, prog_path . ' is Python ' . prog_ver . ' and cannot provide Python '
             \ . a:major_ver . '.']
@@ -103,12 +111,16 @@ function! s:check_interpreter(prog, major_ver, skip) abort
     endif
   endif
 
-  if v:shell_error == 1
+  if v:shell_error == 2
+    return [0, prog_path . ' does not have the neovim module installed. '
+          \ . 'See ":help provider-python".']
+  elseif v:shell_error == 127
+    " This can happen with pyenv's shims.
+    return [0, prog_path . ' does not exist: ' . prog_ver]
+  elseif v:shell_error
     return [0, 'Checking ' . prog_path . ' caused an unknown error. '
-          \ . 'Please report this at github.com/neovim/neovim.']
-  elseif v:shell_error == 2
-    return [0, prog_path . ' does have not have the neovim module installed. '
-          \ . 'See ":help nvim-python".']
+          \ . '(' . v:shell_error . ', output: ' . prog_ver . ')'
+          \ . ' Please report this at github.com/neovim/neovim.']
   endif
 
   return [1, '']
diff --git a/runtime/autoload/provider/ruby.vim b/runtime/autoload/provider/ruby.vim
index aad8c09d28..c8ede20a75 100644
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -1,13 +1,30 @@
 " The Ruby provider helper
-if exists('s:loaded_ruby_provider')
+if exists('g:loaded_ruby_provider')
   finish
 endif
+let g:loaded_ruby_provider = 1
 
-let s:loaded_ruby_provider = 1
+let s:stderr = {}
+let s:job_opts = {'rpc': v:true}
+
+function! s:job_opts.on_stderr(chan_id, data, event)
+  let stderr = get(s:stderr, a:chan_id, [''])
+  let last = remove(stderr, -1)
+  let a:data[0] = last.a:data[0]
+  call extend(stderr, a:data)
+  let s:stderr[a:chan_id] = stderr
+endfunction
+
+function! provider#ruby#Detect() abort
+  return exepath('neovim-ruby-host')
+endfunction
+
+function! provider#ruby#Prog()
+  return s:prog
+endfunction
 
 function! provider#ruby#Require(host) abort
-  " Collect registered Ruby plugins into args
-  let args = []
+  let args = [provider#ruby#Prog()]
   let ruby_plugins = remote#host#PluginsForHost(a:host.name)
 
   for plugin in ruby_plugins
@@ -15,20 +32,47 @@ function! provider#ruby#Require(host) abort
   endfor
 
   try
-    let channel_id = rpcstart(provider#ruby#Prog(), args)
-
-    if rpcrequest(channel_id, 'poll') == 'ok'
+    let channel_id = jobstart(args, s:job_opts)
+    if rpcrequest(channel_id, 'poll') ==# 'ok'
       return channel_id
     endif
   catch
     echomsg v:throwpoint
     echomsg v:exception
+    for row in get(s:stderr, channel_id, [])
+      echomsg row
+    endfor
   endtry
-
-  throw remote#host#LoadErrorForHost(a:host.orig_name,
-        \ '$NVIM_RUBY_LOG_FILE')
+  throw remote#host#LoadErrorForHost(a:host.orig_name, '$NVIM_RUBY_LOG_FILE')
 endfunction
 
-function! provider#ruby#Prog() abort
-  return 'neovim-ruby-host'
+function! provider#ruby#Call(method, args)
+  if s:err != ''
+    echoerr s:err
+    return
+  endif
+
+  if !exists('s:host')
+    try
+      let s:host = remote#host#Require('legacy-ruby-provider')
+    catch
+      let s:err = v:exception
+      echohl WarningMsg
+      echomsg v:exception
+      echohl None
+      return
+    endtry
+  endif
+  return call('rpcrequest', insert(insert(a:args, 'ruby_'.a:method), s:host))
 endfunction
+
+let s:err = ''
+let s:prog = provider#ruby#Detect()
+let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
+
+if empty(s:prog)
+  let s:err = 'Cannot find the neovim RubyGem. Try :CheckHealth'
+endif
+
+call remote#host#RegisterClone('legacy-ruby-provider', 'ruby')
+call remote#host#RegisterPlugin('legacy-ruby-provider', s:plugin_path, [])
diff --git a/runtime/autoload/provider/script_host.rb b/runtime/autoload/provider/script_host.rb
new file mode 100644
index 0000000000..1dade766c7
--- /dev/null
+++ b/runtime/autoload/provider/script_host.rb
@@ -0,0 +1,8 @@
+begin
+  require "neovim/ruby_provider"
+rescue LoadError
+  warn(
+    "Your neovim RubyGem is missing or out of date. " +
+    "Install the latest version using `gem install neovim`."
+  )
+end
diff --git a/runtime/autoload/remote/host.vim b/runtime/autoload/remote/host.vim
index a63c6a923b..51f7e5886f 100644
--- a/runtime/autoload/remote/host.vim
+++ b/runtime/autoload/remote/host.vim
@@ -1,7 +1,5 @@
 let s:hosts = {}
 let s:plugin_patterns = {}
-let s:remote_plugins_manifest = fnamemodify(expand($MYVIMRC, 1), ':h')
-      \.'/.'.fnamemodify($MYVIMRC, ':t').'-rplugin~'
 let s:plugins_for_host = {}
 
 
@@ -120,9 +118,59 @@ function! remote#host#RegisterPlugin(host, path, specs) abort
 endfunction
 
 
+" Get the path to the rplugin manifest file.
+function! s:GetManifestPath() abort
+  let manifest_base = ''
+
+  if exists('$NVIM_RPLUGIN_MANIFEST')
+    return fnamemodify($NVIM_RPLUGIN_MANIFEST, ':p')
+  endif
+
+  let dest = has('win32') ? '$LOCALAPPDATA' : '$XDG_DATA_HOME'
+  if !exists(dest)
+    let dest = has('win32') ? '~/AppData/Local' : '~/.local/share'
+  endif
+
+  let dest = fnamemodify(expand(dest), ':p')
+  if !empty(dest) && !filereadable(dest)
+    let dest .= ('/' ==# dest[-1:] ? '' : '/') . 'nvim'
+    call mkdir(dest, 'p', 0700)
+    let manifest_base = dest
+  endif
+
+  return manifest_base.'/rplugin.vim'
+endfunction
+
+
+" Old manifest file based on known script locations.
+function! s:GetOldManifestPath() abort
+  let prefix = exists('$MYVIMRC')
+        \ ? $MYVIMRC
+        \ : matchstr(get(split(execute('scriptnames'), '\n'), 0, ''), '\f\+$')
+  return fnamemodify(expand(prefix, 1), ':h')
+        \.'/.'.fnamemodify(prefix, ':t').'-rplugin~'
+endfunction
+
+
+function! s:GetManifest() abort
+  let manifest = s:GetManifestPath()
+
+  if !filereadable(manifest)
+    " Check if an old manifest file exists and move it to the new location.
+    let old_manifest = s:GetOldManifestPath()
+    if filereadable(old_manifest)
+      call rename(old_manifest, manifest)
+    endif
+  endif
+
+  return manifest
+endfunction
+
+
 function! remote#host#LoadRemotePlugins() abort
-  if filereadable(s:remote_plugins_manifest)
-    exe 'source '.s:remote_plugins_manifest
+  let manifest = s:GetManifest()
+  if filereadable(manifest)
+    execute 'source' fnameescape(manifest)
   endif
 endfunction
 
@@ -130,7 +178,9 @@ endfunction
 function! remote#host#LoadRemotePluginsEvent(event, pattern) abort
   autocmd! nvim-rplugin
   call remote#host#LoadRemotePlugins()
-  execute 'silent doautocmd <nomodeline>' a:event a:pattern
+  if exists('#'.a:event.'#'.a:pattern)  " Avoid 'No matching autocommands'.
+    execute 'silent doautocmd <nomodeline>' a:event a:pattern
+  endif
 endfunction
 
 
@@ -140,7 +190,8 @@ function! s:RegistrationCommands(host) abort
   call remote#host#RegisterClone(host_id, a:host)
   let pattern = s:plugin_patterns[a:host]
   let paths = globpath(&rtp, 'rplugin/'.a:host.'/'.pattern, 0, 1)
-  let paths = map(paths, 'tr(v:val,"\\","/")') " Normalize slashes #4795
+  let paths = map(paths, 'tr(resolve(v:val),"\\","/")') " Normalize slashes #4795
+  let paths = uniq(sort(paths))
   if empty(paths)
     return []
   endif
@@ -194,9 +245,9 @@ function! remote#host#UpdateRemotePlugins() abort
       endtry
     endif
   endfor
-  call writefile(commands, s:remote_plugins_manifest)
-  echomsg printf('remote/host: generated the manifest file in "%s"',
-        \ s:remote_plugins_manifest)
+  call writefile(commands, s:GetManifest())
+  echomsg printf('remote/host: generated rplugin manifest: %s',
+        \ s:GetManifest())
 endfunction
 
 
@@ -210,12 +261,9 @@ endfunction
 
 function! remote#host#LoadErrorForHost(host, log) abort
   return 'Failed to load '. a:host . ' host. '.
-    \ 'You can try to see what happened '.
-    \ 'by starting Neovim with the environment variable '.
-    \ a:log . ' set to a file and opening the generated '.
-    \ 'log file. Also, the host stderr will be available '.
-    \ 'in Neovim log, so it may contain useful information. '.
-    \ 'See also ~/.nvimlog.'
+        \ 'You can try to see what happened by starting nvim with '.
+        \ a:log . ' set and opening the generated log file.'.
+        \ ' Also, the host stderr is available in messages.'
 endfunction
 
 
diff --git a/runtime/autoload/shada.vim b/runtime/autoload/shada.vim
index 9be85b6f2e..cf27ee608a 100644
--- a/runtime/autoload/shada.vim
+++ b/runtime/autoload/shada.vim
@@ -241,8 +241,6 @@ function s:shada_check_type(type, val) abort
     if msg isnot# 0
       return msg
     endif
-    if a:val > 0 || a:val < 1
-    endif
     return 0
   elseif a:type is# 'binarray'
     if type isnot# 'array'
@@ -359,9 +357,14 @@ function s:shada_string(type, v) abort
   if (has_key(s:SHADA_ENUMS, a:type) && type(a:v) == type(0)
      \&& has_key(s:SHADA_REV_ENUMS[a:type], a:v))
     return s:SHADA_REV_ENUMS[a:type][a:v]
-  elseif (a:type is# 'intchar' && type(a:v) == type(0)
-         \&& strtrans(nr2char(a:v)) is# nr2char(a:v))
-    return "'" . nr2char(a:v) . "'"
+  " Restricting a:v to be <= 127 is not necessary, but intchar constants are
+  " normally expected to be either ASCII printable characters or NUL.
+  elseif a:type is# 'intchar' && type(a:v) == type(0) && a:v >= 0 && a:v <= 127
+    if a:v > 0 && strtrans(nr2char(a:v)) is# nr2char(a:v)
+      return "'" . nr2char(a:v) . "'"
+    else
+      return "'\\" . a:v . "'"
+    endif
   else
     return msgpack#string(a:v)
   endif
diff --git a/runtime/autoload/sqlcomplete.vim b/runtime/autoload/sqlcomplete.vim
index 4a8863e15f..e80729add4 100644
--- a/runtime/autoload/sqlcomplete.vim
+++ b/runtime/autoload/sqlcomplete.vim
@@ -1,8 +1,8 @@
 " Vim OMNI completion script for SQL
 " Language:    SQL
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Version:     15.0
-" Last Change: 2013 May 13
+" Version:     16.0
+" Last Change: 2015 Dec 29
 " Homepage:    http://www.vim.org/scripts/script.php?script_id=1572
 " Usage:       For detailed help
 "              ":help sql.txt"
@@ -16,6 +16,12 @@
 "       look backwards to a FROM clause and find the first table
 "       and complete it.
 "
+" Version 16.0 (Dec 2015)
+"     - NF: If reseting the cache and table, procedure or view completion
+"           had been used via dbext, have dbext delete or recreate the 
+"           dictionary so that new objects are picked up for the 
+"           next completion.
+"
 " Version 15.0 (May 2013)
 "     - NF: Changed the SQL precached syntax items, omni_sql_precache_syntax_groups,
 "           to use regular expressions to pick up extended syntax group names.
@@ -103,7 +109,7 @@ endif
 if exists('g:loaded_sql_completion')
     finish
 endif
-let g:loaded_sql_completion = 150
+let g:loaded_sql_completion = 160
 let s:keepcpo= &cpo
 set cpo&vim
 
@@ -459,6 +465,29 @@ function! sqlcomplete#Complete(findstart, base)
         let s:tbl_cols           = []
         let s:syn_list           = []
         let s:syn_value          = []
+
+        if s:sql_file_table != ""
+            if g:loaded_dbext >= 2300
+                call DB_DictionaryDelete("table")
+            else
+                DBCompleteTables!
+            endif
+        endif
+        if s:sql_file_procedure != ""
+            if g:loaded_dbext >= 2300
+                call DB_DictionaryDelete("procedure")
+            else
+                DBCompleteProcedures!
+            endif
+        endif
+        if s:sql_file_view != ""
+            if g:loaded_dbext >= 2300
+                call DB_DictionaryDelete("view")
+            else
+                DBCompleteViews!
+            endif
+        endif
+
         let s:sql_file_table     = ""
         let s:sql_file_procedure = ""
         let s:sql_file_view      = ""
diff --git a/runtime/autoload/vimexpect.vim b/runtime/autoload/vimexpect.vim
index 16e7d30d6c..0ed888d2a4 100644
--- a/runtime/autoload/vimexpect.vim
+++ b/runtime/autoload/vimexpect.vim
@@ -140,7 +140,7 @@ endfunction
 
 
 " Job handler that simply forwards lines to the parser.
-function! s:JobOutput(id, lines)
+function! s:JobOutput(_id, lines, _event) dict
   call self._parser.feed(a:lines)
 endfunction
 
diff --git a/runtime/compiler/gcc.vim b/runtime/compiler/gcc.vim
index aee31d92c2..19ea2edc12 100644
--- a/runtime/compiler/gcc.vim
+++ b/runtime/compiler/gcc.vim
@@ -2,6 +2,7 @@
 " Compiler:         GNU C Compiler
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
 " Latest Revision:  2010-10-14
+" 			added line suggested by Anton Lindqvist 2016 Mar 31
 
 if exists("current_compiler")
   finish
@@ -24,6 +25,7 @@ CompilerSet errorformat=
       \%f:%l:\ %trror:\ %m,
       \%f:%l:\ %tarning:\ %m,
       \%f:%l:\ %m,
+      \%f:\\(%*[^\\)]\\):\ %m,
       \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
       \%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f',
       \%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f',
diff --git a/runtime/compiler/tidy.vim b/runtime/compiler/tidy.vim
index 56baee2224..75be8b83d9 100644
--- a/runtime/compiler/tidy.vim
+++ b/runtime/compiler/tidy.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	HTML Tidy
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 Jul 7
+" Last Change:	2016 Apr 21
 
 if exists("current_compiler")
   finish
@@ -12,8 +12,8 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
 
-" sample warning: foo.html:8:1: Warning: inserting missing 'foobar' element
-" sample error:   foo.html:9:2: Error: <foobar> is not recognized!
-CompilerSet errorformat=%f:%l:%c:\ Error:%m,%f:%l:%c:\ Warning:%m,%-G%.%#
+" foo.html:8:1: Warning: inserting missing 'foobar' element
+" foo.html:9:2: Error: <foobar> is not recognized!
+CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 7423e63673..dabbcd08d9 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -6,32 +6,14 @@
 
 AWK = awk
 
-# Set to $(VIMTARGET) when executed from src/Makefile.
-VIMEXE = vim
-
 DOCS = $(wildcard *.txt)
 HTMLS = $(DOCS:.txt=.html)
 
 .SUFFIXES:
 .SUFFIXES: .c .o .txt .html
 
-all: tags html
-
-# Use Vim to generate the tags file.  Can only be used when Vim has been
-# compiled and installed.  Supports multiple languages.
-vimtags: $(DOCS)
-	$(VIMEXE) -u NONE -es -c "helptags ++t ." -c quit
-
-# Use "doctags" to generate the tags file.  Only works for English!
-tags: doctags $(DOCS)
-	./doctags $(DOCS) | LANG=C LC_ALL=C sort >tags
-	uniq -d -2 tags
-
-doctags: doctags.c
-	$(CC) doctags.c -o doctags
-
 # Awk version of .txt to .html conversion.
-html: noerrors tags $(HTMLS)
+html: noerrors $(HTMLS)
 	@if test -f errors.log; then cat errors.log; fi
 
 noerrors:
@@ -54,5 +36,5 @@ tags.ref tags.html: tags
 	$(AWK) -f maketags.awk tags >tags.html
 
 clean:
-	-rm -f doctags *.html tags.ref $(HTMLS) errors.log
+	-rm -f *.html tags.ref $(HTMLS) errors.log tags
 
diff --git a/runtime/doc/api-funcs.txt b/runtime/doc/api-funcs.txt
new file mode 100644
index 0000000000..706941fd12
--- /dev/null
+++ b/runtime/doc/api-funcs.txt
@@ -0,0 +1,716 @@
+*api-funcs.txt*         Neovim API Function Reference                   {Nvim}
+
+Note: This documentation is generated from Neovim's API source code.
+
+Contents:
+
+1. Global Functions   |api-global|
+2. Buffer Functions   |api-buffer|
+3. Window Functions   |api-window|
+4. Tabpage Functions  |api-tabpage|
+5. UI Functions       |api-ui|
+
+==============================================================================
+1. Global Functions                                               *api-global*
+
+nvim_command({command})                                       *nvim_command()*
+                Executes an ex-command. On VimL error: Returns the VimL error;
+                v:errmsg is not updated.
+
+                Parameters:~
+                    {command}  Ex-command string
+
+nvim_feedkeys({keys}, {mode}, {escape_csi})                  *nvim_feedkeys()*
+                Passes input keys to Nvim. On VimL error: Does not fail, but
+                updates v:errmsg.
+
+                Parameters:~
+                    {keys}        to be typed
+                    {mode}        mapping options
+                    {escape_csi}  If true, escape K_SPECIAL/CSI bytes in
+                                  `keys`
+
+nvim_input({keys})                                              *nvim_input()*
+                Passes keys to Nvim as raw user-input. On VimL error: Does not
+                fail, but updates v:errmsg.
+
+                Unlike `nvim_feedkeys`, this uses a lower-level input buffer
+                and the call is not deferred. This is the most reliable way to
+                emulate real user input.
+
+                Parameters:~
+                    {keys}  to be typed
+
+                Return:~
+                    Number of bytes actually written (can be fewer than
+                    requested if the buffer becomes full).
+
+                                                    *nvim_replace_termcodes()*
+nvim_replace_termcodes({str}, {from_part}, {do_lt}, {special})
+                Replaces any terminal codes with the internal representation
+
+nvim_command_output({str})                             *nvim_command_output()*
+                TODO: Documentation
+
+nvim_eval({expr})                                                *nvim_eval()*
+                Evaluates a VimL expression (:help expression). Dictionaries
+                and Lists are recursively expanded. On VimL error: Returns a
+                generic error; v:errmsg is not updated.
+
+                Parameters:~
+                    {expr}  VimL expression string
+
+                Return:~
+                    Evaluation result or expanded object
+
+nvim_call_function({fname}, {args})                     *nvim_call_function()*
+                Calls a VimL function with the given arguments. On VimL error:
+                Returns a generic error; v:errmsg is not updated.
+
+                Parameters:~
+                    {fname}  Function to call
+                    {args}   Function arguments packed in an Array
+
+                Return:~
+                    Result of the function call
+
+nvim_strwidth({str})                                         *nvim_strwidth()*
+                Calculates the number of display cells occupied by `text`.
+                <Tab> counts as one cell.
+
+                Parameters:~
+                    {text}  Some text
+
+                Return:~
+                    Number of cells
+
+nvim_list_runtime_paths()                          *nvim_list_runtime_paths()*
+                Gets the paths contained in 'runtimepath'.
+
+                Return:~
+                    List of paths
+
+nvim_set_current_dir({dir})                           *nvim_set_current_dir()*
+                Changes the global working directory.
+
+                Parameters:~
+                    {dir}  Directory path
+
+nvim_get_current_line()                              *nvim_get_current_line()*
+                Gets the current line
+
+                Parameters:~
+
+                Return:~
+                    Current line string
+
+nvim_set_current_line({line})                        *nvim_set_current_line()*
+                Sets the current line
+
+                Parameters:~
+                    {line}  Line contents
+
+nvim_del_current_line()                              *nvim_del_current_line()*
+                Deletes the current line
+
+                Parameters:~
+
+nvim_get_var({name})                                          *nvim_get_var()*
+                Gets a global (g:) variable
+
+                Parameters:~
+                    {name}  Variable name
+
+                Return:~
+                    Variable value
+
+nvim_set_var({name}, {value})                                 *nvim_set_var()*
+                Sets a global (g:) variable
+
+                Parameters:~
+                    {name}   Variable name
+                    {value}  Variable value
+
+nvim_del_var({name})                                          *nvim_del_var()*
+                Removes a global (g:) variable
+
+                Parameters:~
+                    {name}  Variable name
+
+nvim_get_vvar({name})                                        *nvim_get_vvar()*
+                Gets a v: variable
+
+                Parameters:~
+                    {name}  Variable name
+
+                Return:~
+                    Variable value
+
+nvim_get_option({name})                                    *nvim_get_option()*
+                Gets an option value string
+
+                Parameters:~
+                    {name}  Option name
+
+                Return:~
+                    Option value
+
+nvim_set_option({name}, {value})                           *nvim_set_option()*
+                Sets an option value
+
+                Parameters:~
+                    {name}   Option name
+                    {value}  New option value
+
+nvim_out_write({str})                                       *nvim_out_write()*
+                Writes a message to vim output buffer
+
+                Parameters:~
+                    {str}  Message
+
+nvim_err_write({str})                                       *nvim_err_write()*
+                Writes a message to vim error buffer
+
+                Parameters:~
+                    {str}  Message
+
+nvim_err_writeln({str})                                   *nvim_err_writeln()*
+                Writes a message to vim error buffer. Appends a linefeed to
+                ensure all contents are written.
+
+                Parameters:~
+                    {str}  Message
+
+nvim_list_bufs()                                            *nvim_list_bufs()*
+                Gets the current list of buffer handles
+
+                Return:~
+                    List of buffer handles
+
+nvim_get_current_buf()                                *nvim_get_current_buf()*
+                Gets the current buffer
+
+                Return:~
+                    Buffer handle
+
+nvim_set_current_buf({buffer})                        *nvim_set_current_buf()*
+                Sets the current buffer
+
+                Parameters:~
+                    {id}  Buffer handle
+
+nvim_list_wins()                                            *nvim_list_wins()*
+                Gets the current list of window handles
+
+                Return:~
+                    List of window handles
+
+nvim_get_current_win()                                *nvim_get_current_win()*
+                Gets the current window
+
+                Return:~
+                    Window handle
+
+nvim_set_current_win({window})                        *nvim_set_current_win()*
+                Sets the current window
+
+                Parameters:~
+                    {handle}  Window handle
+
+nvim_list_tabpages()                                    *nvim_list_tabpages()*
+                Gets the current list of tabpage handles
+
+                Return:~
+                    List of tabpage handles
+
+nvim_get_current_tabpage()                        *nvim_get_current_tabpage()*
+                Gets the current tabpage
+
+                Return:~
+                    Tabpage handle
+
+nvim_set_current_tabpage({tabpage})               *nvim_set_current_tabpage()*
+                Sets the current tabpage
+
+                Parameters:~
+                    {handle}  Tabpage handle
+
+nvim_subscribe({event})                                     *nvim_subscribe()*
+                Subscribes to event broadcasts
+
+                Parameters:~
+                    {event}  Event type string
+
+nvim_unsubscribe({event})                                 *nvim_unsubscribe()*
+                Unsubscribes to event broadcasts
+
+                Parameters:~
+                    {event}  Event type string
+
+nvim_get_color_by_name({name})                      *nvim_get_color_by_name()*
+                TODO: Documentation
+
+nvim_get_color_map()                                    *nvim_get_color_map()*
+                TODO: Documentation
+
+nvim_get_api_info()                                      *nvim_get_api_info()*
+                TODO: Documentation
+
+nvim_call_atomic({calls})                                 *nvim_call_atomic()*
+                Call many api methods atomically
+
+                This has two main usages: Firstly, to perform several requests
+                from an async context atomically, i.e. without processing
+                requests from other rpc clients or redrawing or allowing user
+                interaction in between. Note that api methods that could fire
+                autocommands or do event processing still might do so. For
+                instance invoking the :sleep command might call timer
+                callbacks. Secondly, it can be used to reduce rpc overhead
+                (roundtrips) when doing many requests in sequence.
+
+                Parameters:~
+                    {calls}  an array of calls, where each call is described
+                             by an array with two elements: the request name,
+                             and an array of arguments.
+
+                Return:~
+                    an array with two elements. The first is an array of
+                    return values. The second is NIL if all calls succeeded.
+                    If a call resulted in an error, it is a three-element
+                    array with the zero-based index of the call which resulted
+                    in an error, the error type and the error message. If an
+                    error ocurred, the values from all preceding calls will
+                    still be returned.
+
+
+==============================================================================
+2. Buffer Functions                                               *api-buffer*
+
+nvim_buf_line_count({buffer})                          *nvim_buf_line_count()*
+                Gets the buffer line count
+
+                Parameters:~
+                    {buffer}  Buffer handle
+
+                Return:~
+                    Line count
+
+                                                        *nvim_buf_get_lines()*
+nvim_buf_get_lines({buffer}, {start}, {end}, {strict_indexing})
+                Retrieves a line range from the buffer
+
+                Indexing is zero-based, end-exclusive. Negative indices are
+                interpreted as length+1+index, i e -1 refers to the index past
+                the end. So to get the last element set start=-2 and end=-1.
+
+                Out-of-bounds indices are clamped to the nearest valid value,
+                unless `strict_indexing` is set.
+
+                Parameters:~
+                    {buffer}           Buffer handle
+                    {start}            First line index
+                    {end}              Last line index (exclusive)
+                    {strict_indexing}  Whether out-of-bounds should be an
+                                       error.
+
+                Return:~
+                    Array of lines
+
+                                                        *nvim_buf_set_lines()*
+nvim_buf_set_lines({buffer}, {start}, {end}, {strict_indexing},
+                   {replacement})
+                Replaces line range on the buffer
+
+                Indexing is zero-based, end-exclusive. Negative indices are
+                interpreted as length+1+index, i e -1 refers to the index past
+                the end. So to change or delete the last element set start=-2
+                and end=-1.
+
+                To insert lines at a given index, set both start and end to
+                the same index. To delete a range of lines, set replacement to
+                an empty array.
+
+                Out-of-bounds indices are clamped to the nearest valid value,
+                unless `strict_indexing` is set.
+
+                Parameters:~
+                    {buffer}           Buffer handle
+                    {start}            First line index
+                    {end}              Last line index (exclusive)
+                    {strict_indexing}  Whether out-of-bounds should be an
+                                       error.
+                    {replacement}      Array of lines to use as replacement
+
+nvim_buf_get_var({buffer}, {name})                        *nvim_buf_get_var()*
+                Gets a buffer-scoped (b:) variable.
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Variable name
+
+                Return:~
+                    Variable value
+
+nvim_buf_set_var({buffer}, {name}, {value})               *nvim_buf_set_var()*
+                Sets a buffer-scoped (b:) variable
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Variable name
+                    {value}   Variable value
+
+nvim_buf_del_var({buffer}, {name})                        *nvim_buf_del_var()*
+                Removes a buffer-scoped (b:) variable
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Variable name
+
+nvim_buf_get_option({buffer}, {name})                  *nvim_buf_get_option()*
+                Gets a buffer option value
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Option name
+
+                Return:~
+                    Option value
+
+nvim_buf_set_option({buffer}, {name}, {value})         *nvim_buf_set_option()*
+                Sets a buffer option value. Passing 'nil' as value deletes the
+                option (only works if there's a global fallback)
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Option name
+                    {value}   Option value
+
+nvim_buf_get_number({buffer})                          *nvim_buf_get_number()*
+                Gets the buffer number
+
+                Parameters:~
+                    {buffer}  Buffer handle
+
+                Return:~
+                    Buffer number
+
+nvim_buf_get_name({buffer})                              *nvim_buf_get_name()*
+                Gets the full file name for the buffer
+
+                Parameters:~
+                    {buffer}  Buffer handle
+
+                Return:~
+                    Buffer name
+
+nvim_buf_set_name({buffer}, {name})                      *nvim_buf_set_name()*
+                Sets the full file name for a buffer
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Buffer name
+
+nvim_buf_is_valid({buffer})                              *nvim_buf_is_valid()*
+                Checks if a buffer is valid
+
+                Parameters:~
+                    {buffer}  Buffer handle
+
+                Return:~
+                    true if the buffer is valid, false otherwise
+
+nvim_buf_get_mark({buffer}, {name})                      *nvim_buf_get_mark()*
+                Return a tuple (row,col) representing the position of the
+                named mark
+
+                Parameters:~
+                    {buffer}  Buffer handle
+                    {name}    Mark name
+
+                Return:~
+                    (row, col) tuple
+
+                                                    *nvim_buf_add_highlight()*
+nvim_buf_add_highlight({buffer}, {src_id}, {hl_group}, {line},
+                       {col_start}, {col_end})
+                Adds a highlight to buffer.
+
+                This can be used for plugins which dynamically generate
+                highlights to a buffer (like a semantic highlighter or
+                linter). The function adds a single highlight to a buffer.
+                Unlike matchaddpos() highlights follow changes to line
+                numbering (as lines are inserted/removed above the highlighted
+                line), like signs and marks do.
+
+                "src_id" is useful for batch deletion/updating of a set of
+                highlights. When called with src_id = 0, an unique source id
+                is generated and returned. Succesive calls can pass in it as
+                "src_id" to add new highlights to the same source group. All
+                highlights in the same group can then be cleared with
+                nvim_buf_clear_highlight. If the highlight never will be
+                manually deleted pass in -1 for "src_id".
+
+                If "hl_group" is the empty string no highlight is added, but a
+                new src_id is still returned. This is useful for an external
+                plugin to synchrounously request an unique src_id at
+                initialization, and later asynchronously add and clear
+                highlights in response to buffer changes.
+
+                Parameters:~
+                    {buffer}     Buffer handle
+                    {src_id}     Source group to use or 0 to use a new group,
+                                 or -1 for ungrouped highlight
+                    {hl_group}   Name of the highlight group to use
+                    {line}       Line to highlight
+                    {col_start}  Start of range of columns to highlight
+                    {col_end}    End of range of columns to highlight, or -1
+                                 to highlight to end of line
+
+                Return:~
+                    The src_id that was used
+
+                                                  *nvim_buf_clear_highlight()*
+nvim_buf_clear_highlight({buffer}, {src_id}, {line_start}, {line_end})
+                Clears highlights from a given source group and a range of
+                lines
+
+                To clear a source group in the entire buffer, pass in 1 and -1
+                to line_start and line_end respectively.
+
+                Parameters:~
+                    {buffer}      Buffer handle
+                    {src_id}      Highlight source group to clear, or -1 to
+                                  clear all.
+                    {line_start}  Start of range of lines to clear
+                    {line_end}    End of range of lines to clear (exclusive)
+                                  or -1 to clear to end of file.
+
+
+==============================================================================
+3. Window Functions                                               *api-window*
+
+nvim_win_get_buf({window})                                *nvim_win_get_buf()*
+                Gets the current buffer in a window
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    Buffer handle
+
+nvim_win_get_cursor({window})                          *nvim_win_get_cursor()*
+                Gets the cursor position in the window
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    (row, col) tuple
+
+nvim_win_set_cursor({window}, {pos})                   *nvim_win_set_cursor()*
+                Sets the cursor position in the window
+
+                Parameters:~
+                    {window}  Window handle
+                    {pos}     (row, col) tuple representing the new position
+
+nvim_win_get_height({window})                          *nvim_win_get_height()*
+                Gets the window height
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    Height as a count of rows
+
+nvim_win_set_height({window}, {height})                *nvim_win_set_height()*
+                Sets the window height. This will only succeed if the screen
+                is split horizontally.
+
+                Parameters:~
+                    {window}  Window handle
+                    {height}  Height as a count of rows
+
+nvim_win_get_width({window})                            *nvim_win_get_width()*
+                Gets the window width
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    Width as a count of columns
+
+nvim_win_set_width({window}, {width})                   *nvim_win_set_width()*
+                Sets the window width. This will only succeed if the screen is
+                split vertically.
+
+                Parameters:~
+                    {window}  Window handle
+                    {width}   Width as a count of columns
+
+nvim_win_get_var({window}, {name})                        *nvim_win_get_var()*
+                Gets a window-scoped (w:) variable
+
+                Parameters:~
+                    {window}  Window handle
+                    {name}    Variable name
+
+                Return:~
+                    Variable value
+
+nvim_win_set_var({window}, {name}, {value})               *nvim_win_set_var()*
+                Sets a window-scoped (w:) variable
+
+                Parameters:~
+                    {window}  Window handle
+                    {name}    Variable name
+                    {value}   Variable value
+
+nvim_win_del_var({window}, {name})                        *nvim_win_del_var()*
+                Removes a window-scoped (w:) variable
+
+                Parameters:~
+                    {window}  Window handle
+                    {name}    Variable name
+
+nvim_win_get_option({window}, {name})                  *nvim_win_get_option()*
+                Gets a window option value
+
+                Parameters:~
+                    {window}  Window handle
+                    {name}    Option name
+
+                Return:~
+                    Option value
+
+nvim_win_set_option({window}, {name}, {value})         *nvim_win_set_option()*
+                Sets a window option value. Passing 'nil' as value deletes the
+                option(only works if there's a global fallback)
+
+                Parameters:~
+                    {window}  Window handle
+                    {name}    Option name
+                    {value}   Option value
+
+nvim_win_get_position({window})                      *nvim_win_get_position()*
+                Gets the window position in display cells. First position is
+                zero.
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    (row, col) tuple with the window position
+
+nvim_win_get_tabpage({window})                        *nvim_win_get_tabpage()*
+                Gets the window tabpage
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    Tabpage that contains the window
+
+nvim_win_get_number({window})                          *nvim_win_get_number()*
+                Gets the window number
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    Window number
+
+nvim_win_is_valid({window})                              *nvim_win_is_valid()*
+                Checks if a window is valid
+
+                Parameters:~
+                    {window}  Window handle
+
+                Return:~
+                    true if the window is valid, false otherwise
+
+
+==============================================================================
+4. Tabpage Functions                                             *api-tabpage*
+
+nvim_tabpage_list_wins({tabpage})                   *nvim_tabpage_list_wins()*
+                Gets the windows in a tabpage
+
+                Parameters:~
+                    {tabpage}  Tabpage
+
+                Return:~
+                    List of windows in tabpage
+
+nvim_tabpage_get_var({tabpage}, {name})               *nvim_tabpage_get_var()*
+                Gets a tab-scoped (t:) variable
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+                    {name}     Variable name
+
+                Return:~
+                    Variable value
+
+nvim_tabpage_set_var({tabpage}, {name}, {value})      *nvim_tabpage_set_var()*
+                Sets a tab-scoped (t:) variable
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+                    {name}     Variable name
+                    {value}    Variable value
+
+nvim_tabpage_del_var({tabpage}, {name})               *nvim_tabpage_del_var()*
+                Removes a tab-scoped (t:) variable
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+                    {name}     Variable name
+
+nvim_tabpage_get_win({tabpage})                       *nvim_tabpage_get_win()*
+                Gets the current window in a tabpage
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+
+                Return:~
+                    Window handle
+
+nvim_tabpage_get_number({tabpage})                 *nvim_tabpage_get_number()*
+                Gets the tabpage number
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+
+                Return:~
+                    Tabpage number
+
+nvim_tabpage_is_valid({tabpage})                     *nvim_tabpage_is_valid()*
+                Checks if a tabpage is valid
+
+                Parameters:~
+                    {tabpage}  Tabpage handle
+
+                Return:~
+                    true if the tabpage is valid, false otherwise
+
+
+==============================================================================
+5. UI Functions                                                       *api-ui*
+
+remote_ui_disconnect()                                *remote_ui_disconnect()*
+                TODO: Documentation
+
+nvim_ui_attach({width}, {height}, {options})                *nvim_ui_attach()*
+                TODO: Documentation
+
+nvim_ui_detach()                                            *nvim_ui_detach()*
+                TODO: Documentation
+
+nvim_ui_try_resize({width}, {height})                   *nvim_ui_try_resize()*
+                TODO: Documentation
+
+nvim_ui_set_option({name}, {value})                     *nvim_ui_set_option()*
+                TODO: Documentation
+
+ vim:tw=78:ts=8:ft=help:norl:
\ No newline at end of file
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index ca79465e0d..171b0124f6 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -1,31 +1,32 @@
-*api.txt*    For Nvim.							 {Nvim}
+*api.txt*		 						{Nvim}
 
 
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
-The C API of Nvim						     *nvim-api*
 
-1. Introduction			|nvim-api-intro|
-2. API Types			|nvim-api-types|
-3. API metadata			|nvim-api-metadata|
-4. Buffer highlighting		|nvim-api-highlights|
+C API for Nvim							   *API* *api*
+
+1. Introduction			|api-intro|
+2. API Types			|api-types|
+3. API metadata			|api-metadata|
+4. Buffer highlighting		|api-highlights|
 
 ==============================================================================
-1. Introduction			*nvim-api-intro*
+1. Introduction							   *api-intro*
 
-Nvim defines a C API as the primary way for external code to interact with
-the NVim core. In the present version of Nvim the API is primarily used by
-external processes to interact with Nvim using the msgpack-rpc protocol, see
-|msgpack-rpc|. The API will also be used from vimscript to access new Nvim core
-features, but this is not implemented yet. Later on, Nvim might be embeddable
-in C applications as libnvim, and the application will then control the
-embedded instance by calling the C API directly.
+Nvim exposes a public API for external code to interact with the Nvim core.
+The API is used by external processes to interact with Nvim using the
+msgpack-rpc protocol, see |msgpack-rpc|. The API is used from vimscript to
+access some new Nvim core features. See |eval-api| for how api functions are
+called from vimscript. Later on, Nvim might be embeddable in C applications as
+libnvim, and the application will then control the embedded instance by calling
+the C API directly.
 
 ==============================================================================
-2. API Types						       *nvim-api-types*
+2. API Types							   *api-types*
 
 Nvim's C API uses custom types for all functions. Some are just typedefs
-around C99 standard types, and some are Nvim defined data structures.
+around C99 standard types, and some are Nvim-defined data structures.
 
 Boolean				  -> bool
 Integer (signed 64-bit integer)	  -> int64_t
@@ -46,19 +47,25 @@ Window				  -> enum value kObjectTypeWindow
 Tabpage				  -> enum value kObjectTypeTabpage
 
 ==============================================================================
-3. API metadata						    *nvim-api-metadata*
+3. API metadata							 *api-metadata*
 
-Nvim exposes metadata about the API as a Dictionary with the following keys:
+Nvim exposes API metadata as a Dictionary. Some items are described below:
 
-functions  	calling signature of the API functions
-types		The custom handle types defined by Nvim
-error_types	The possible kinds of errors an API function can exit with.
+version			Nvim version, API level/compatibility
+version.api_level	Current API level
+version.api_compatible	API is backwards-compatible with this level
+version.api_prerelease	Declares the current API level as unstable >
+			(version.api_prerelease && fn.since == version.api_level)
+functions		API function signatures
+{fn}.since		API level where function {fn} was introduced
+{fn}.deprecated_since	API level where function {fn} was deprecated
+types			Custom handle types defined by Nvim
+error_types		Possible error types returned by API functions
 
-This metadata is mostly useful for external programs accessing the api over
-msgpack-api, see |msgpack-rpc-api|.
+External programs ("clients") can use the metadata to discover the |rpc-api|.
 
 ==============================================================================
-4. Buffer highlighting					  *nvim-api-highlights*
+4. Buffer highlighting					       *api-highlights*
 
 Nvim allows plugins to add position-based highlights to buffers. This is
 similar to |matchaddpos()| but with some key differences. The added highlights
@@ -72,10 +79,10 @@ Another use case are plugins that show output in an append-only buffer, and
 want to add highlights to the outputs. Highlight data cannot be preserved
 on writing and loading a buffer to file, nor in undo/redo cycles.
 
-Highlights are registered using the |buffer_add_highlight| function, see the
+Highlights are registered using the |nvim_buf_add_highlight| function, see the
 generated API documentation for details. If an external highlighter plugin is
 adding a large number of highlights in a batch, performance can be improved by
-calling |buffer_add_highlight| as an asynchronous notification, after first
+calling |nvim_buf_add_highlight| as an asynchronous notification, after first
 (synchronously) reqesting a source id. Here is an example using wrapper
 functions in the python client:
 >
@@ -90,10 +97,19 @@ functions in the python client:
     buf.clear_highlight(src)
 <
 If the highlights don't need to be deleted or updated, just pass -1 as
-src_id (this is the default in python). |buffer_clear_highlight| can be used
-to clear highligts from a specific source, in a specific line range or the
-entire buffer by passing in the line range 0, -1 (the later is the default
+src_id (this is the default in python). |nvim_buf_clear_highlight| can be used
+to clear highlights from a specific source, in a specific line range or the
+entire buffer by passing in the line range 0, -1 (the latter is the default
 in python as used above).
 
+An example of calling the api from vimscript: >
+
+    call nvim_buf_set_lines(0, 0, 0, v:true, ["test text"])
+    let src = nvim_buf_add_highlight(0, 0, "String", 1, 0, 4)
+    call nvim_buf_add_highlight(0, src, "Identifier", 0, 5, -1)
+
+    " later
+    call nvim_buf_clear_highlight(0, src, 0, -1)
+>
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 25ae94f784..180127cd52 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt*   For Vim version 7.4.  Last change: 2015 Dec 05
+*autocmd.txt*   For Vim version 7.4.  Last change: 2016 Jun 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -49,9 +49,6 @@ effects.  Be careful not to destroy your text.
 ==============================================================================
 2. Defining autocommands				*autocmd-define*
 
-Note: The ":autocmd" command cannot be followed by another command, since any
-'|' is considered part of the command.
-
 							*:au* *:autocmd*
 :au[tocmd] [group] {event} {pat} [nested] {cmd}
 			Add {cmd} to the list of commands that Vim will
@@ -64,6 +61,12 @@ Note: The ":autocmd" command cannot be followed by another command, since any
 The special pattern <buffer> or <buffer=N> defines a buffer-local autocommand.
 See |autocmd-buflocal|.
 
+Note: The ":autocmd" command can only be followed by another command when the
+'|' appears before {cmd}.  This works: >
+	:augroup mine | au! BufRead | augroup END
+But this sees "augroup" as part of the defined command: >
+	:augroup mine | au BufRead * set tw=70 | augroup END
+
 Note that special characters (e.g., "%", "<cword>") in the ":autocmd"
 arguments are not expanded when the autocommand is defined.  These will be
 expanded when the Event is recognized, and the {cmd} is executed.  The only
@@ -256,7 +259,6 @@ Name			triggered by ~
 	Options
 |FileType|		when the 'filetype' option has been set
 |Syntax|		when the 'syntax' option has been set
-|EncodingChanged|	after the 'encoding' option has been changed
 |TermChanged|		after the value of 'term' has changed
 |OptionSet|		after setting any option
 
@@ -271,8 +273,10 @@ Name			triggered by ~
 |VimLeave|		before exiting Vim, after writing the shada file
 
 	Various
+|DirChanged|		after the |current-directory| was changed
+
 |FileChangedShell|	Vim notices that a file changed since editing started
-|FileChangedShellPost|	After handling a file changed since editing started
+|FileChangedShellPost|	after handling a file changed since editing started
 |FileChangedRO|		before making the first change to a read-only file
 
 |ShellCmdPost|		after executing a shell command
@@ -292,6 +296,7 @@ Name			triggered by ~
 |CursorMoved|		the cursor was moved in Normal mode
 |CursorMovedI|		the cursor was moved in Insert mode
 
+|WinNew|		after creating a new window
 |WinEnter|		after entering another window
 |WinLeave|		before leaving a window
 |TabEnter|		after entering another tab page
@@ -542,6 +547,9 @@ CursorHold			When the user doesn't press a key for the time
 
 							*CursorHoldI*
 CursorHoldI			Just like CursorHold, but in Insert mode.
+				Not triggered when waiting for another key,
+				e.g. after CTRL-V, and not when in CTRL-X mode
+				|insert_expand|.
 
 							*CursorMoved*
 CursorMoved			After the cursor was moved in Normal or Visual
@@ -557,9 +565,12 @@ CursorMoved			After the cursor was moved in Normal or Visual
 CursorMovedI			After the cursor was moved in Insert mode.
 				Not triggered when the popup menu is visible.
 				Otherwise the same as CursorMoved.
-							*EncodingChanged*
-EncodingChanged			Fires off after the 'encoding' option has been
-				changed.  Useful to set up fonts, for example.
+							*DirChanged*
+DirChanged			After the |current-directory| was changed.
+				Sets these |v:event| keys:
+				    cwd:   current working directory
+				    scope: "global", "tab", "window"
+				Recursion is ignored.
 							*FileAppendCmd*
 FileAppendCmd			Before appending to a file.  Should do the
 				appending to the file.  Use the '[ and ']
@@ -618,9 +629,6 @@ FileChangedShell		When Vim notices that the modification time of
 							*FileChangedShellPost*
 FileChangedShellPost		After handling a file that was changed outside
 				of Vim.  Can be used to update the statusline.
-							*FileEncoding*
-FileEncoding			Obsolete.  It still works and is equivalent
-				to |EncodingChanged|.
 							*FileReadCmd*
 FileReadCmd			Before reading a file with a ":read" command.
 				Should do the reading of the file. |Cmd-event|
@@ -727,13 +735,12 @@ InsertCharPre			When a character is typed in Insert mode,
 							*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 * because its
-				meaning may change in the future.
+				for |setreg()|. Pattern must be *.
 				Sets these |v:event| keys:
-					operator
-					regcontents
-					regname
-					regtype
+				    operator
+				    regcontents
+				    regname
+				    regtype
 				Recursion is ignored.
 				It is not allowed to change the text |textlock|.
 							*InsertEnter*
@@ -912,8 +919,7 @@ TermClose			When a terminal buffer ends.
 						 {Nvim} *TermOpen*
 TermOpen			When a terminal buffer is starting.  This can
 				be used to configure the terminal emulator by
-				setting buffer variables.
-				See |nvim-terminal-emulator| for details.
+				setting buffer variables. |terminal-emulator|
 							*TermResponse*
 TermResponse			After the response to |t_RV| is received from
 				the terminal.  The value of |v:termresponse|
@@ -948,7 +954,15 @@ VimEnter			After doing all the startup stuff, including
 				loading vimrc files, executing the "-c cmd"
 				arguments, creating all windows and loading
 				the buffers in them.
-							*VimLeave*
+				Just before this event is triggered the
+				|v:vim_did_enter| variable is set, so that you
+				can do: >
+				   if v:vim_did_enter
+				     call s:init()
+				   else
+ 	  			     au VimEnter * call s:init()
+				   endif
+<							*VimLeave*
 VimLeave			Before exiting Vim, just after writing the
 				.shada file.  Executed only once, like
 				VimLeavePre.
@@ -986,6 +1000,11 @@ WinLeave			Before leaving a window.  If the window to be
 				WinLeave autocommands (but not for ":new").
 				Not used for ":qa" or ":q" when exiting Vim.
 
+							*WinNew*
+WinNew				When a new window was created.  Not done for
+				the fist window, when Vim has just started.
+				Before a WinEnter event.
+
 ==============================================================================
 6. Patterns					*autocmd-patterns* *{pat}*
 
@@ -1223,6 +1242,8 @@ option will not cause any commands to be executed.
 			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.
 
 						*:doautoa* *:doautoall*
 :doautoa[ll] [<nomodeline>] [group] {event} [fname]
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index c8eb0705f6..31a46f53bb 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.4.  Last change: 2016 Jan 02
+*change.txt*    For Vim version 7.4.  Last change: 2016 Apr 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -97,10 +97,10 @@ These commands delete text.  You can repeat them with the `.` command
 
 An exception for the d{motion} command: If the motion is not linewise, the
 start and end of the motion are not in the same line, and there are only
-blanks before the start and after the end of the motion, the delete becomes
-linewise.  This means that the delete also removes the line of blanks that you
-might expect to remain. Use the |o_v| operator to force the motion to be
-characterwise.
+blanks before the start and there are no non-blanks after the end of the
+motion, the delete becomes linewise.  This means that the delete also removes
+the line of blanks that you might expect to remain. Use the |o_v| operator to
+force the motion to be characterwise.
 
 Trying to delete an empty region of text (e.g., "d0" in the first column)
 is an error when 'cpoptions' includes the 'E' flag.
@@ -108,7 +108,9 @@ is an error when 'cpoptions' includes the 'E' flag.
 							*J*
 J			Join [count] lines, with a minimum of two lines.
 			Remove the indent and insert up to two spaces (see
-			below).
+			below).  Fails when on the last line of the buffer.
+			If [count] is too big it is reduce to the number of
+			lines available.
 
 							*v_J*
 {Visual}J		Join the highlighted lines, with a minimum of two
@@ -396,6 +398,11 @@ CTRL-X			Subtract [count] from the number or alphabetic
 {Visual}CTRL-X		Subtract [count] from the number or alphabetic
 			character in the highlighted text.  {not in Vi}
 
+			On MS-Windows, this is mapped to cut Visual text
+			|dos-standard-mappings|.  If you want to disable the
+			mapping, use this: >
+				silent! vunmap <C-X>
+<
 							*v_g_CTRL-X*
 {Visual}g CTRL-X	Subtract [count] from the number or alphabetic
 			character in the highlighted text. If several lines
@@ -806,7 +813,7 @@ Examples: >
   :s/abcde/abc^Mde/		 modifies "abcde"    to "abc", "de" (two lines)
   :s/$/\^M/			 modifies "abcde"    to "abcde^M"
   :s/\w\+/\u\0/g		 modifies "bla bla"  to "Bla Bla"
-  :s/\w\+/\L\u/g		 modifies "BLA bla"  to "Bla Bla"
+  :s/\w\+/\L\u\0/g		 modifies "BLA bla"  to "Bla Bla"
 
 Note: "\L\u" can be used to capitalize the first letter of a word.  This is
 not compatible with Vi and older versions of Vim, where the "\u" would cancel
@@ -1157,7 +1164,7 @@ which does not specify a register.  Additionally you can access it with the
 name '"'.  This means you have to type two double quotes.  Writing to the ""
 register writes to register "0.
 
-2. Numbered registers "0 to "9		*quote_number* *quote0*	*quote1*
+2. Numbered registers "0 to "9		*quote_number* *quote0* *quote1*
 					*quote2* *quote3* *quote4* *quote9*
 Vim fills these registers with text from yank and delete commands.
    Numbered register 0 contains the text from the most recent yank command,
@@ -1245,7 +1252,7 @@ register.
 Use these registers for storing and retrieving the selected text for the GUI.
 See |quotestar| and |quoteplus|.  When the clipboard is not available or not
 working, the unnamed register is used instead.  For Unix systems and Mac OS X,
-see |nvim-clipboard|.
+see |primary-selection|.
 
 9. Black hole register "_				*quote_*
 When writing to this register, nothing happens.  This can be used to delete
diff --git a/runtime/doc/deprecated.txt b/runtime/doc/deprecated.txt
new file mode 100644
index 0000000000..6997d331e4
--- /dev/null
+++ b/runtime/doc/deprecated.txt
@@ -0,0 +1,48 @@
+*deprecated.txt*                                                        {Nvim}
+
+
+                             NVIM REFERENCE MANUAL
+
+
+Nvim                                                             *deprecated*
+
+The items listed below are "deprecated". This means they will be removed in
+the future. They should not be used in new scripts, and old scripts should be
+updated.
+
+==============================================================================
+
+Normal commands ~
+*]f*
+*[f*			Same as "gf".
+
+
+Commands ~
+*:rv*
+*:rviminfo*		Deprecated alias to |:rshada| command.
+*:wv*
+*:wviminfo*		Deprecated alias to |:wshada| command.
+
+
+Events ~
+*EncodingChanged*	Never fired; 'encoding' is always "utf-8".
+*FileEncoding*		Never fired; equivalent to |EncodingChanged|.
+
+Highlight groups ~
+*hl-VisualNOS*		Obsolete. |vim-differences| {Nvim}
+
+Functions ~
+*buffer_exists()*	Obsolete name for |bufexists()|.
+*buffer_name()*		Obsolete name for |bufname()|.
+*buffer_number()*	Obsolete name for |bufnr()|.
+*file_readable()*	Obsolete name for |filereadable()|.
+*highlight_exists()*	Obsolete name for |hlexists()|.
+*highlightID()*		Obsolete name for |hlID()|.
+*last_buffer_nr()*	Obsolete name for bufnr("$").
+
+Options ~
+*'fe'*			'fenc'+'enc' before Vim 6.0; no longer used.
+*'vi'*
+*'viminfo'*		Deprecated alias to 'shada' option.
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 668790358b..b738da9bec 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -1,23 +1,19 @@
-*develop.txt*   For Vim version 7.4.  Last change: 2014 Mar 27
+*develop.txt*
 
 
-		  VIM REFERENCE MANUAL    by Bram Moolenaar
+                            NVIM REFERENCE MANUAL
 
 
-Development of Vim.					*development*
-
-This text is important for those who want to be involved in further developing
-Vim.
+Development of Nvim.					*development*
 
 1. Design goals		|design-goals|
 2. Design decisions	|design-decisions|
 
-See the file "src/nvim/README.md" for a high-level overview of the source
-code.
+Nvim is open source software.  Everybody is encouraged to contribute.
+    https://github.com/neovim/neovim/blob/master/CONTRIBUTING.md
 
-Vim is open source software.  Everybody is encouraged to contribute to help
-improving Vim.  For sending patches a context diff "diff -c" is preferred.
-Also see http://vim.wikia.com/wiki/How_to_make_and_submit_a_patch.
+See src/nvim/README.md for a high-level overview of the source code:
+    https://github.com/neovim/neovim/blob/master/src/nvim/README.md
 
 ==============================================================================
 1. Design goals						*design-goals*
@@ -28,7 +24,7 @@ Note that quite a few items are contradicting.  This is intentional.  A
 balance must be found between them.
 
 
-VIM IS... IMPROVED					*design-improved*
+NVIM IS... IMPROVED					*design-improved*
 
 The IMproved bits of Vim should make it a better Vi, without becoming a
 completely different editor.  Extensions are done with a "Vi spirit".
@@ -49,7 +45,7 @@ completely different editor.  Extensions are done with a "Vi spirit".
   implement and (3) someone actually implementing it.
 
 
-VIM IS... MULTI PLATFORM				*design-multi-platform*
+NVIM IS... MULTI PLATFORM				*design-multi-platform*
 
 Vim tries to help as many users on as many platforms as possible.
 - Support many kinds of terminals.  The minimal demands are cursor positioning
@@ -68,7 +64,7 @@ Vim tries to help as many users on as many platforms as possible.
   contradicts the previous item, these two must be balanced.]
 
 
-VIM IS... WELL DOCUMENTED				*design-documented*
+NVIM IS... WELL DOCUMENTED				*design-documented*
 
 - A feature that isn't documented is a useless feature.  A patch for a new
   feature must include the documentation.
@@ -76,9 +72,14 @@ VIM IS... WELL DOCUMENTED				*design-documented*
   recommended.
 - Don't make the text unnecessarily long.  Less documentation means that an
   item is easier to find.
+- Do not prefix doc-tags with "nvim-". Use |vim_diff.txt| to document
+  differences from Vim. The {Nvim} annotation is also available
+  to mark a specific feature. No other distinction is necessary.
+- If a feature is removed, delete its doc entry and move its tag to
+  |vim_diff.txt|.
 
 
-VIM IS... HIGH SPEED AND SMALL IN SIZE			*design-speed-size*
+NVIM IS... HIGH SPEED AND SMALL IN SIZE			*design-speed-size*
 
 Using Vim must not be a big attack on system resources.  Keep it small and
 fast.
@@ -89,13 +90,11 @@ fast.
   possible.  Useful commands may take longer.
 - Don't forget that some people use Vim over a slow connection.  Minimize the
   communication overhead.
-- Items that add considerably to the size and are not used by many people
-  should be a feature that can be disabled.
 - Vim is a component among other components.  Don't turn it into a massive
   application, but have it work well together with other programs.
 
 
-VIM IS... MAINTAINABLE					*design-maintain*
+NVIM IS... MAINTAINABLE					*design-maintain*
 
 - The source code should not become a mess.  It should be reliable code.
 - Use comments in a useful way!  Quoting the function name and argument names
@@ -106,7 +105,7 @@ VIM IS... MAINTAINABLE					*design-maintain*
   knowledge spread to other parts of the code.
 
 
-VIM IS... FLEXIBLE					*design-flexible*
+NVIM IS... FLEXIBLE					*design-flexible*
 
 Vim should make it easy for users to work in their preferred styles rather
 than coercing its users into particular patterns of work.  This can be for
@@ -117,28 +116,35 @@ be used to adjust Vim to the desire of the user and its environment.
 
 NVIM IS... NOT						*design-not*
 
-Nvim is not an Operating System; instead it should be composed with other
-tools, or hosted as a component. Marvim once said: "Unlike Emacs, Nvim does
-not attempt to include everything but the kitchen sink, but some people use it
-for plumbing."
+Nvim is not an operating system; instead it should be composed with other
+tools or hosted as a component. Marvim once said: "Unlike Emacs, Nvim does not
+include the kitchen sink... but you can use it for plumbing."
 
 
 ==============================================================================
 2. Design decisions					*design-decisions*
 
-Folding
-
-Several forms of folding should be possible for the same buffer.  For example,
-have one window that shows the text with function bodies folded, another
-window that shows a function body.
+JARGON	 							*dev-jargon*
 
-Folding is a way to display the text.  It should not change the text itself.
-Therefore the folding has been implemented as a filter between the text stored
-in a buffer (buffer lines) and the text displayed in a window (logical lines).
+API client ~
+All external UIs and remote plugins (as opposed to regular Vim plugins) are
+"clients" in general; but we call something an "API client" if its purpose is
+to abstract or wrap the RPC API for the convenience of other applications
+(just like a REST client or SDK such as boto3 for AWS: you can speak AWS REST
+using an HTTP client like curl, but boto3 wraps that in a convenient python
+interface). For example, the Nvim lua-client is an API client:
+    https://github.com/neovim/lua-client
 
+Host ~
+A plugin "host" is both a client (of the Nvim API) and a server (of an
+external platform, e.g. python). It is a remote plugin that hosts other
+plugins.
 
-Naming the window
+Remote plugin ~
+Arbitrary code registered via |:UpdateRemotePlugins|, that runs in a separate
+process and communicates with Nvim via the |api|.
 
+Window ~
 The word "window" is commonly used for several things: A window on the screen,
 the xterm window, a window inside Vim to view a buffer.
 To avoid confusion, other items that are sometimes called window have been
@@ -152,111 +158,79 @@ window		View on a buffer.  There can be several windows in Vim,
 		together with the command line, menubar, toolbar, etc. they
 		fit in the shell.
 
+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.
+
+Consider two examples of integration with external systems that are
+implemented in Vim and are now decoupled from Nvim core as providers:
+
+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
+   shell commands such as xclip or pbcopy/pbpaste.
+
+2. Python scripting support: Vim has three files dedicated to embedding the
+   Python interpreter: if_python.c, if_python3.c and if_py_both.h. Together
+   these files sum about 9.5k lines of C source code. In contrast, Nvim Python
+   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 helps call vimscript from C. It is composed of two
+functions in eval.c:
+
+- 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.
+
+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.
+
+
+API								*dev-api*
+
+Use this pattern to name new API functions:
+    nvim_{thing}_{action}_{arbitrary-qualifiers}
+
+If the function acts on an object then {thing} is the name of that object
+(e.g. "buf" or "win"). If the function operates in a "global" context then
+{thing} is usually omitted (but consider "namespacing" your global operations
+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
+    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
+{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_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.
 
-Spell checking						*develop-spell*
-
-When spell checking was going to be added to Vim a survey was done over the
-available spell checking libraries and programs.  Unfortunately, the result
-was that none of them provided sufficient capabilities to be used as the spell
-checking engine in Vim, for various reasons:
-
-- Missing support for multi-byte encodings.  At least UTF-8 must be supported,
-  so that more than one language can be used in the same file.
-  Doing on-the-fly conversion is not always possible (would require iconv
-  support).
-- For the programs and libraries: Using them as-is would require installing
-  them separately from Vim.  That's mostly not impossible, but a drawback.
-- Performance: A few tests showed that it's possible to check spelling on the
-  fly (while redrawing), just like syntax highlighting.  But the mechanisms
-  used by other code are much slower.  Myspell uses a hashtable, for example.
-  The affix compression that most spell checkers use makes it slower too.
-- For using an external program like aspell a communication mechanism would
-  have to be setup.  That's complicated to do in a portable way (Unix-only
-  would be relatively simple, but that's not good enough).  And performance
-  will become a problem (lots of process switching involved).
-- Missing support for words with non-word characters, such as "Etten-Leur" and
-  "et al.", would require marking the pieces of them OK, lowering the
-  reliability.
-- Missing support for regions or dialects.  Makes it difficult to accept
-  all English words and highlight non-Canadian words differently.
-- Missing support for rare words.  Many words are correct but hardly ever used
-  and could be a misspelled often-used word.
-- For making suggestions the speed is less important and requiring to install
-  another program or library would be acceptable.  But the word lists probably
-  differ, the suggestions may be wrong words.
-
-
-Spelling suggestions				*develop-spell-suggestions*
-
-For making suggestions there are two basic mechanisms:
-1. Try changing the bad word a little bit and check for a match with a good
-   word.  Or go through the list of good words, change them a little bit and
-   check for a match with the bad word.  The changes are deleting a character,
-   inserting a character, swapping two characters, etc.
-2. Perform soundfolding on both the bad word and the good words and then find
-   matches, possibly with a few changes like with the first mechanism.
-
-The first is good for finding typing mistakes.  After experimenting with
-hashtables and looking at solutions from other spell checkers the conclusion
-was that a trie (a kind of tree structure) is ideal for this.  Both for
-reducing memory use and being able to try sensible changes.  For example, when
-inserting a character only characters that lead to good words need to be
-tried.  Other mechanisms (with hashtables) need to try all possible letters at
-every position in the word.  Also, a hashtable has the requirement that word
-boundaries are identified separately, while a trie does not require this.
-That makes the mechanism a lot simpler.
-
-Soundfolding is useful when someone knows how the words sounds but doesn't
-know how it is spelled.  For example, the word "dictionary" might be written
-as "daktonerie".  The number of changes that the first method would need to
-try is very big, it's hard to find the good word that way.  After soundfolding
-the words become "tktnr" and "tkxnry", these differ by only two letters.
-
-To find words by their soundfolded equivalent (soundalike word) we need a list
-of all soundfolded words.  A few experiments have been done to find out what
-the best method is.  Alternatives:
-1. Do the sound folding on the fly when looking for suggestions.  This means
-   walking through the trie of good words, soundfolding each word and
-   checking how different it is from the bad word.  This is very efficient for
-   memory use, but takes a long time.  On a fast PC it takes a couple of
-   seconds for English, which can be acceptable for interactive use.  But for
-   some languages it takes more than ten seconds (e.g., German, Catalan),
-   which is unacceptable slow.  For batch processing (automatic corrections)
-   it's too slow for all languages.
-2. Use a trie for the soundfolded words, so that searching can be done just
-   like how it works without soundfolding.  This requires remembering a list
-   of good words for each soundfolded word.  This makes finding matches very
-   fast but requires quite a lot of memory, in the order of 1 to 10 Mbyte.
-   For some languages more than the original word list.
-3. Like the second alternative, but reduce the amount of memory by using affix
-   compression and store only the soundfolded basic word.  This is what Aspell
-   does.  Disadvantage is that affixes need to be stripped from the bad word
-   before soundfolding it, which means that mistakes at the start and/or end
-   of the word will cause the mechanism to fail.  Also, this becomes slow when
-   the bad word is quite different from the good word.
-
-The choice made is to use the second mechanism and use a separate file.  This
-way a user with sufficient memory can get very good suggestions while a user
-who is short of memory or just wants the spell checking and no suggestions
-doesn't use so much memory.
-
-
-Word frequency
-
-For sorting suggestions it helps to know which words are common.  In theory we
-could store a word frequency with the word in the dictionary.  However, this
-requires storing a count per word.  That degrades word tree compression a lot.
-And maintaining the word frequency for all languages will be a heavy task.
-Also, it would be nice to prefer words that are already in the text.  This way
-the words that appear in the specific text are preferred for suggestions.
-
-What has been implemented is to count words that have been seen during
-displaying.  A hashtable is used to quickly find the word count.  The count is
-initialized from words listed in COMMON items in the affix file, so that it
-also works when starting a new file.
-
-This isn't ideal, because the longer Vim is running the higher the counts
-become.  But in practice it is a noticeable improvement over not using the word
-count.
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 12bc655edc..6b45f8552f 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,12 +1,12 @@
-*diff.txt*      For Vim version 7.4.  Last change: 2015 Nov 01
+*diff.txt*      For Vim version 7.4.  Last change: 2016 Aug 24
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
 							*diff* *diff-mode*
-This file describes |diff-mode|, which shows the differences between two,
-three, or four versions of the same file.
+This file describes the |+diff| feature: Showing differences between two to
+eight versions of the same file.
 
 The basics are explained in section |08.7| of the user manual.
 
@@ -109,7 +109,7 @@ To make these commands use a vertical split, prepend |:vertical|.  Examples: >
 If you always prefer a vertical split include "vertical" in 'diffopt'.
 
 							*E96*
-There can be up to four buffers with 'diff' set.
+There can be up to eight buffers with 'diff' set.
 
 Since the option values are remembered with the buffer, you can edit another
 file for a moment and come back to the same file and be in diff mode again.
diff --git a/runtime/doc/doctags.c b/runtime/doc/doctags.c
deleted file mode 100644
index 9213dd9c1e..0000000000
--- a/runtime/doc/doctags.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* vim:set ts=4 sw=4:
- * this program makes a tags file for vim_ref.txt
- *
- * Usage: doctags vim_ref.txt vim_win.txt ... >tags
- *
- * A tag in this context is an identifier between stars, e.g. *c_files*
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#define LINELEN 200
-
-	int
-main(argc, argv)
-	int		argc;
-	char	**argv;
-{
-	char	line[LINELEN];
-	char	*p1, *p2;
-	char	*p;
-	FILE	*fd;
-
-	if (argc <= 1)
-	{
-		fprintf(stderr, "Usage: doctags docfile ... >tags\n");
-		exit(1);
-	}
-	printf("help-tags\ttags\t1\n");
-	while (--argc > 0)
-	{
-		++argv;
-		fd = fopen(argv[0], "r");
-		if (fd == NULL)
-		{
-			fprintf(stderr, "Unable to open %s for reading\n", argv[0]);
-			continue;
-		}
-		while (fgets(line, LINELEN, fd) != NULL)
-		{
-			p1 = strchr(line, '*');				/* find first '*' */
-			while (p1 != NULL)
-			{
-				p2 = strchr(p1 + 1, '*');		/* find second '*' */
-				if (p2 != NULL && p2 > p1 + 1)	/* skip "*" and "**" */
-				{
-					for (p = p1 + 1; p < p2; ++p)
-						if (*p == ' ' || *p == '\t' || *p == '|')
-							break;
-					/*
-					 * Only accept a *tag* when it consists of valid
-					 * characters, there is white space before it and is
-					 * followed by a white character or end-of-line.
-					 */
-					if (p == p2
-							&& (p1 == line || p1[-1] == ' ' || p1[-1] == '\t')
-								&& (strchr(" \t\n\r", p[1]) != NULL
-									|| p[1] == '\0'))
-					{
-						*p2 = '\0';
-						++p1;
-						printf("%s\t%s\t/*", p1, argv[0]);
-						while (*p1)
-						{
-							/* insert backslash before '\\' and '/' */
-							if (*p1 == '\\' || *p1 == '/')
-								putchar('\\');
-							putchar(*p1);
-							++p1;
-						}
-						printf("*\n");
-						p2 = strchr(p2 + 1, '*');		/* find next '*' */
-					}
-				}
-				p1 = p2;
-			}
-		}
-		fclose(fd);
-	}
-	return 0;
-}
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index c51286a350..5bfffac1f1 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt*   For Vim version 7.4.  Last change: 2016 Jan 03
+*editing.txt*   For Vim version 7.4.  Last change: 2016 Aug 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -267,9 +267,6 @@ CTRL-^			Edit the alternate file.  Mostly the alternate file is
 			files.
 			See |CTRL-^| above for further details.
 
-[count]]f						*]f* *[f*
-[count][f		Same as "gf".  Deprecated.
-
 							*gf* *E446* *E447*
 [count]gf		Edit the file whose name is under or after the cursor.
 			Mnemonic: "goto file".
@@ -358,7 +355,7 @@ These are the common ones:
 To avoid the special meaning of the wildcards prepend a backslash.  However,
 on MS-Windows the backslash is a path separator and "path\[abc]" is still seen
 as a wildcard when "[" is in the 'isfname' option.  A simple way to avoid this
-is to use "path\[[]abc]".  Then the file "path[abc]" literally.
+is to use "path\[[]abc]", this matches the file "path\[abc]".
 
 					*starstar-wildcard*
 Expanding "**" is possible on Unix, Win32, Mac OS/X and a few other systems.
@@ -368,16 +365,21 @@ Note there are some commands where this works slightly differently, see
 Example: >
 	:n **/*.txt
 Finds files:
-	ttt.txt
-	subdir/ttt.txt
-	a/b/c/d/ttt.txt
-When non-wildcard characters are used these are only matched in the first
-directory.  Example: >
-	:n /usr/inc**/*.h
+	aaa.txt ~
+	subdir/bbb.txt ~
+	a/b/c/d/ccc.txt ~
+When non-wildcard characters are used right before or after "**" these are
+only matched in the top directory.  They are not used for directories further
+down in the tree. For example: >
+	:n /usr/inc**/types.h
 Finds files:
-	/usr/include/types.h
-	/usr/include/sys/types.h
-	/usr/inc_old/types.h
+	/usr/include/types.h ~
+	/usr/include/sys/types.h ~
+	/usr/inc/old/types.h ~
+Note that the path with "/sys" is included because it does not need to match
+"/inc".  Thus it's like matching "/usr/inc*/*/*...", not
+"/usr/inc*/inc*/inc*".
+
 					*backtick-expansion* *`-expansion*
 On Unix and a few other systems you can also use backticks for the file name
 argument, for example: >
@@ -596,6 +598,7 @@ list of the current window.
 				:0argadd x	x a b c
 				:1argadd x	a x b c
 				:$argadd x	a b c x
+			And after the last one:
 				:+2argadd y	a b c x y
 			There is no check for duplicates, it is possible to
 			add a file to the argument list twice.
@@ -946,7 +949,7 @@ the newly written file (it might be there but contain bogus data).  In that
 case try recovery, because the swap file is synced to disk and might still be
 there. |:recover|
 
-The directories given with the 'backupdir' option is used to put the backup
+The directories given with the 'backupdir' option are used to put the backup
 file in.  (default: same directory as the written file).
 
 Whether the backup is a new file, which is a copy of the original file, or the
@@ -1043,10 +1046,12 @@ The names can be in upper- or lowercase.
 			edited.  See |:confirm| and 'confirm'.
 
 :q[uit]!		Quit without writing, also when the current buffer has
-			changes.  If this is the last window and there is a
-			modified hidden buffer, the current buffer is
-			abandoned and the first changed hidden buffer becomes
-			the current buffer.
+			changes.  The buffer is unloaded, also when it has
+			'hidden' set.
+			If this is the last window and there is a modified
+			hidden buffer, the current buffer is abandoned and the
+			first changed hidden buffer becomes the current
+			buffer.
 			Use ":qall!" to exit always.
 
 :cq[uit]		Quit always, without writing, and return an error
@@ -1147,7 +1152,7 @@ Examples: >
 
 If you want to always use ":confirm", set the 'confirm' option.
 
-			*:browse* *:bro* *E338* *E614* *E615* *E616* *E578*
+			*:browse* *:bro* *E338* *E614* *E615* *E616*
 :bro[wse] {command}	Open a file selection dialog for an argument to
 			{command}.  At present this works for |:e|, |:w|,
 			|:wall|, |:wq|, |:wqall|, |:x|, |:xall|, |:exit|,
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index eebdabd154..9aa60657e0 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*	For Vim version 7.4.  Last change: 2016 Jan 16
+*eval.txt*	For Vim version 7.4.  Last change: 2016 Aug 27
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -43,11 +43,15 @@ Number		A 32 or 64 bit signed number.  |expr-number| *Number*
 Float		A floating point number. |floating-point-format| *Float*
 		Examples: 123.456  1.15e-6  -1.1e3
 
+							*E928*
 String		A NUL terminated string of 8-bit unsigned characters (bytes).
 		|expr-string| Examples: "ab\txx\"--"  'x-z''a,c'
 
 Funcref		A reference to a function |Funcref|.
 		Example: function("strlen")
+		It can be bound to a dictionary and arguments, it then works
+		like a Partial.
+		Example: function("Callback", [arg], myDict)
 
 List		An ordered sequence of items |List|.
 		Example: [1, 2, ['a', 'b']]
@@ -100,18 +104,12 @@ When mixing Number and Float the Number is converted to Float.	Otherwise
 there is no automatic conversion of Float.  You can use str2float() for String
 to Float, printf() for Float to String and float2nr() for Float to Number.
 
-						*E706* *sticky-type-checking*
-You will get an error if you try to change the type of a variable.  You need
-to |:unlet| it first to avoid this error.  String and Number are considered
-equivalent though, as well are Float and Number.  Consider this sequence of
-commands: >
-	:let l = "string"
-	:let l = 44		" changes type from String to Number
-	:let l = [1, 2, 3]	" error!  l is still a Number
-	:let l = 4.4		" changes type from Number to Float
-	:let l = "string"	" error!
-
+						*E891* *E892* *E893* *E894*
+When expecting a Float a Number can also be used, but nothing else.
 
+					*no-type-checking*
+You will not get an error if you try to change the type of a variable.
+	
 1.2 Function references ~
 					*Funcref* *E695* *E718*
 A Funcref variable is obtained with the |function()| function.	It can be used
@@ -144,6 +142,40 @@ The name of the referenced function can be obtained with |string()|. >
 You can use |call()| to invoke a Funcref and use a list variable for the
 arguments: >
 	:let r = call(Fn, mylist)
+<
+								*Partial*
+A Funcref optionally binds a Dictionary and/or arguments.  This is also called
+a Partial.  This is created by passing the Dictionary and/or arguments to
+function().  When calling the function the Dictionary and/or arguments will be
+passed to the function.  Example: >
+
+	let Cb = function('Callback', ['foo'], myDict)
+	call Cb()
+
+This will invoke the function as if using: >
+	call myDict.Callback('foo')
+
+Note that binding a function to a Dictionary also happens when the function is
+a member of the Dictionary: >
+
+	let myDict.myFunction = MyFunction
+	call myDict.myFunction()
+
+Here MyFunction() will get myDict passed as "self".  This happens when the
+"myFunction" member is accessed.  When assigning "myFunction" to otherDict
+and calling it, it will be bound to otherDict: >
+
+	let otherDict.myFunction = myDict.myFunction
+	call otherDict.myFunction()
+
+Now "self" will be "otherDict".  But when the dictionary was bound explicitly
+this won't happen: >
+
+	let myDict.myFunction = function(MyFunction, myDict)
+	let otherDict.myFunction = myDict.myFunction
+	call otherDict.myFunction()
+
+Here "self" will be "myDict", because it was bound explitly.
 
 
 1.3 Lists ~
@@ -410,7 +442,8 @@ only appear once.  Examples: >
 A key is always a String.  You can use a Number, it will be converted to a
 String automatically.  Thus the String '4' and the number 4 will find the same
 entry.	Note that the String '04' and the Number 04 are different, since the
-Number will be converted to the String '4'.
+Number will be converted to the String '4'.  The empty string can be used as a
+key.
 
 A value can be any expression.	Using a Dictionary for a value creates a
 nested Dictionary: >
@@ -750,22 +783,40 @@ A |Dictionary| can only be compared with a |Dictionary| and only "equal", "not
 equal" and "is" can be used.  This compares the key/values of the |Dictionary|
 recursively.  Ignoring case means case is ignored when comparing item values.
 
-							*E693* *E694*
-A |Funcref| can only be compared with a |Funcref| and only "equal" and "not
-equal" can be used.  Case is never ignored.
+							*E694*
+A |Funcref| can only be compared with a |Funcref| and only "equal", "not
+equal", "is" and "isnot" can be used.  Case is never ignored.  Whether
+arguments or a Dictionary are bound (with a partial) matters.  The
+Dictionaries must also be equal (or the same, in case of "is") and the
+arguments must be equal (or the same).
+
+To compare Funcrefs to see if they refer to the same function, ignoring bound
+Dictionary and arguments, use |get()| to get the function name: >
+	if get(Part1, 'name') == get(Part2, 'name')
+	   " Part1 and Part2 refer to the same function
 
 When using "is" or "isnot" with a |List| or a |Dictionary| this checks if the
 expressions are referring to the same |List| or |Dictionary| instance.  A copy
 of a |List| is different from the original |List|.  When using "is" without
 a |List| or a |Dictionary| it is equivalent to using "equal", using "isnot"
 equivalent to using "not equal".  Except that a different type means the
-values are different: "4 == '4'" is true, "4 is '4'" is false and "0 is []" is
-false and not an error. "is#"/"isnot#" and "is?"/"isnot?" can be used to match
-and ignore case.
+values are different: >
+	echo 4 == '4'
+	1
+	echo 4 is '4'
+	0
+	echo 0 is []
+	0
+"is#"/"isnot#" and "is?"/"isnot?" can be used to match and ignore case.
 
 When comparing a String with a Number, the String is converted to a Number,
-and the comparison is done on Numbers.	This means that "0 == 'x'" is TRUE,
-because 'x' converted to a Number is zero.
+and the comparison is done on Numbers. This means that: >
+	echo 0 == 'x'
+	1
+because 'x' converted to a Number is zero. However: >
+	echo 0 == 'x'
+	0
+Inside a List or Dictionary this conversion is not used.
 
 When comparing two Strings, this is done with strcmp() or stricmp().  This
 results in the mathematical difference (comparing byte values), not
@@ -858,11 +909,12 @@ These three can be repeated and mixed.	Examples:
 expr8							*expr8*
 -----
 expr8[expr1]		item of String or |List|	*expr-[]* *E111*
+							*subscript*
 
 If expr8 is a Number or String this results in a String that contains the
 expr1'th single byte from expr8.  expr8 is used as a String, expr1 as a
 Number.  This doesn't recognize multi-byte encodings, see |byteidx()| for
-an alternative.
+an alternative, or use `split()` to turn the string into a list of characters.
 
 Index zero gives the first byte.  This is like it works in C.  Careful:
 text column numbers start with one!  Example, to get the byte under the
@@ -870,7 +922,7 @@ cursor: >
 	:let c = getline(".")[col(".") - 1]
 
 If the length of the String is less than the index, the result is an empty
-String.  A negative index always results in an empty string (reason: backwards
+String.  A negative index always results in an empty string (reason: backward
 compatibility).  Use [-1:] to get the last byte.
 
 If expr8 is a |List| then it results the item at index expr1.  See |list-index|
@@ -1022,8 +1074,8 @@ A string constant accepts these special characters:
 \x.	byte specified with one hex number (must be followed by non-hex char)
 \X..	same as \x..
 \X.	same as \x.
-\u....	character specified with up to 4 hex numbers, stored according to the
-	current value of 'encoding' (e.g., "\u02a4")
+\u....	character specified with up to 4 hex numbers, stored as UTF-8
+	(e.g., "\u02a4")
 \U....	same as \u but allows up to 8 hex numbers.
 \b	backspace <BS>
 \e	escape <Esc>
@@ -1038,8 +1090,7 @@ A string constant accepts these special characters:
 	utf-8 character, use \uxxxx as mentioned above.
 
 Note that "\xff" is stored as the byte 255, which may be invalid in some
-encodings.  Use "\u00ff" to store character 255 according to the current value
-of 'encoding'.
+encodings.  Use "\u00ff" to store character 255 correctly as UTF-8.
 
 Note that "\000" and "\x00" force the end of the string.
 
@@ -1299,6 +1350,10 @@ v:beval_winnr	The number of the window, over which the mouse pointer is. Only
 		window has number zero (unlike most other places where a
 		window gets a number).
 
+					*v:beval_winid* *beval_winid-variable*
+v:beval_winid	The window ID of the window, over which the mouse pointer is.
+		Otherwise like v:beval_winnr.
+
 					*v:char* *char-variable*
 v:char		Argument for evaluating 'formatexpr' and used for the typed
 		character when using <expr> in an abbreviation |:map-<expr>|.
@@ -1373,6 +1428,9 @@ v:dying		Normally zero.	When a deadly signal is caught it's set to
 <		Note: if another deadly signal is caught when v:dying is one,
 		VimLeave autocommands will not be executed.
 
+					*v:exiting* *exiting-variable*
+v:exiting	The exit value Nvim will use. Before exiting, it is |v:null|.
+
 					*v:errmsg* *errmsg-variable*
 v:errmsg	Last given error message.  It's allowed to set this variable.
 		Example: >
@@ -1420,7 +1478,7 @@ v:exception	The value of the exception most recently caught and not
 
 					*v:false* *false-variable*
 v:false		Special value used to put "false" in JSON and msgpack.  See 
-		|json_encode()|.  This value is converted to "false" when used 
+		|json_encode()|.  This value is converted to "v:false" when used 
 		as a String (e.g. in |expr5| with string concatenation 
 		operator) and to zero when used as a Number (e.g. in |expr5| 
 		or |expr7| when used with numeric operators).
@@ -1548,6 +1606,10 @@ v:mouse_win	Window number for a mouse click obtained with |getchar()|.
 		First window has number 1, like with |winnr()|.  The value is
 		zero when there was no mouse button click.
 
+					*v:mouse_winid* *mouse_winid-variable*
+v:mouse_winid	Window ID for a mouse click obtained with |getchar()|.
+		The value is zero when there was no mouse button click.
+
 					*v:mouse_lnum* *mouse_lnum-variable*
 v:mouse_lnum	Line number for a mouse click obtained with |getchar()|.
 		This is the text line number, not the screen line number.  The
@@ -1566,7 +1628,7 @@ v:msgpack_types	Dictionary containing msgpack types used by |msgpackparse()|
 
 					*v:null* *null-variable*
 v:null		Special value used to put "null" in JSON and NIL in msgpack.  
-		See |json_encode()|.  This value is converted to "null" when 
+		See |json_encode()|.  This value is converted to "v:null" when 
 		used as a String (e.g. in |expr5| with string concatenation 
 		operator) and to zero when used as a Number (e.g. in |expr5| 
 		or |expr7| when used with numeric operators).
@@ -1650,9 +1712,9 @@ v:scrollstart	String describing the script or function that caused the
 		hit-enter prompt.
 
 					*v:servername* *servername-variable*
+					*$NVIM_LISTEN_ADDRESS*
 v:servername	Default {Nvim} server address. Equivalent to
-		|$NVIM_LISTEN_ADDRESS| on startup, but may differ if the
-		latter is modified or unset. |serverstop()|
+		|$NVIM_LISTEN_ADDRESS| on startup. |serverstop()|
 		Read-only.
 
 		
@@ -1704,6 +1766,21 @@ v:swapcommand	Normal mode command to be executed after a file has been
 		example, when jumping to a tag the value is ":tag tagname\r".
 		For ":edit +cmd file" the value is ":cmd\r".
 
+				*v:t_TYPE* *v:t_bool* *t_bool-varialble*
+v:t_bool	Value of Boolean type.  Read-only.  See: |type()|
+					*v:t_dict* *t_dict-varialble*
+v:t_dict	Value of Dictionary type.  Read-only.  See: |type()|
+					*v:t_float* *t_float-varialble*
+v:t_float	Value of Float type.  Read-only.  See: |type()|
+					*v:t_func* *t_func-varialble*
+v:t_func	Value of Funcref type.  Read-only.  See: |type()|
+					*v:t_list* *t_list-varialble*
+v:t_list	Value of List type.  Read-only.  See: |type()|
+					*v:t_number* *t_number-varialble*
+v:t_number	Value of Number type.  Read-only.  See: |type()|
+					*v:t_string* *t_string-varialble*
+v:t_string	Value of String type.  Read-only.  See: |type()|
+
 				*v:termresponse* *termresponse-variable*
 v:termresponse	The escape sequence returned by the terminal for the |t_RV|
 		termcap entry.	It is set when Vim receives an escape sequence
@@ -1738,7 +1815,7 @@ v:throwpoint	The point where the exception most recently caught and not
 
 					*v:true* *true-variable*
 v:true		Special value used to put "true" in JSON and msgpack.  See 
-		|json_encode()|.  This value is converted to "true" when used 
+		|json_encode()|.  This value is converted to "v:true" when used 
 		as a String (e.g. in |expr5| with string concatenation 
 		operator) and to one when used as a Number (e.g. in |expr5| or 
 		|expr7| when used with numeric operators).
@@ -1759,13 +1836,17 @@ v:version	Version number of Vim: Major version number times 100 plus
 		version 5.0 and 5.1 may have a patch 123, but these are
 		completely different.
 
+				*v:vim_did_enter* *vim_did_enter-variable*
+v:vim_did_enter	Zero until most of startup is done.  It is set to one just
+		before |VimEnter| autocommands are triggered.
+
 					*v:warningmsg* *warningmsg-variable*
 v:warningmsg	Last given warning message.  It's allowed to set this variable.
 
 					*v:windowid* *windowid-variable* {Nvim}
 v:windowid	Application-specific window ID ("window handle" in MS-Windows)
 		which may be set by any attached UI. Defaults to zero.
-		Note: for windows inside Vim use |winnr()|.
+		Note: for windows inside Vim use |winnr()| or |win_getid()|.
 
 ==============================================================================
 4. Builtin Functions					*functions*
@@ -1780,6 +1861,7 @@ abs({expr})			Float or Number  absolute value of {expr}
 acos({expr})			Float	arc cosine of {expr}
 add({list}, {item})		List	append {item} to |List| {list}
 and({expr}, {expr})		Number  bitwise AND
+api_info()			Dict	api metadata
 append({lnum}, {string})	Number	append {string} below line {lnum}
 append({lnum}, {list})		Number	append lines {list} below line {lnum}
 argc()				Number	number of files in the argument list
@@ -1787,9 +1869,13 @@ argidx()			Number	current index in the argument list
 arglistid([{winnr} [, {tabnr}]]) Number	argument list id
 argv({nr})			String	{nr} entry of the argument list
 argv()				List	the argument list
-assert_equal({exp}, {act} [, {msg}]) none  assert {exp} equals {act}
-assert_exception({error} [, {msg}])   none  assert {error} is in v:exception
+assert_equal({exp}, {act} [, {msg}]) none  assert {exp} is equal to {act}
+assert_exception( {error} [, {msg}]) none  assert {error} is in v:exception
+assert_fails( {cmd} [, {error}])     none  assert {cmd} fails
 assert_false({actual} [, {msg}])     none  assert {actual} is false
+assert_match( {pat}, {text} [, {msg}]) none  assert {pat} matches {text}
+assert_notequal( {exp}, {act} [, {msg}]) none  assert {exp} is not equal {act}
+assert_notmatch( {pat}, {text} [, {msg}]) none  assert {pat} not matches {text}
 assert_true({actual} [, {msg}])      none  assert {actual} is true
 asin({expr})			Float	arc sine of {expr}
 atan({expr})			Float	arc tangent of {expr}
@@ -1802,6 +1888,7 @@ buflisted({expr})		Number	TRUE if buffer {expr} is listed
 bufloaded({expr})		Number	TRUE if buffer {expr} is loaded
 bufname({expr})		String	Name of the buffer {expr}
 bufnr({expr} [, {create}])	Number	Number of the buffer {expr}
+bufwinid({expr})		Number	window ID of buffer {expr}
 bufwinnr({expr})		Number	window number of buffer {expr}
 byte2line({byte})		Number	line number at byte count {byte}
 byteidx({expr}, {nr})		Number	byte index of {nr}'th char in {expr}
@@ -1843,6 +1930,7 @@ escape({string}, {chars})	String	escape {chars} in {string} with '\'
 eval({string})			any	evaluate {string} into its value
 eventhandler()			Number	TRUE if inside an event handler
 executable({expr})		Number	1 if executable {expr} exists
+execute({command})		String	execute and capture output of {command}
 exepath({expr})		String  full path of the command {expr}
 exists({expr})			Number	TRUE if {expr} exists
 extend({expr1}, {expr2} [, {expr3}])
@@ -1870,10 +1958,13 @@ foldlevel({lnum})		Number	fold level at {lnum}
 foldtext()			String	line displayed for closed fold
 foldtextresult({lnum})		String	text for closed fold at {lnum}
 foreground()			Number	bring the Vim window to the foreground
-function({name})		Funcref reference to function {name}
+function({name} [, {arglist}] [, {dict}])
+				Funcref reference to function {name}
 garbagecollect([{atexit}])	none	free memory, breaking cyclic references
 get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
 get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
+get({func}, {what})		any	get property of funcref/partial {func}
+getbufinfo( [{expr}])		List  	information about buffers
 getbufline({expr}, {lnum} [, {end}])
 				List	lines {lnum} to {end} of buffer {expr}
 getbufvar({expr}, {varname} [, {def}])
@@ -1885,8 +1976,10 @@ getcmdline()			String	return the current command-line
 getcmdpos()			Number	return cursor position in command-line
 getcmdtype()			String	return current command-line type
 getcmdwintype()			String	return current command-line window type
+getcompletion({pat}, {type} [, {filtered}])
+				List	list of cmdline completion matches
 getcurpos()			List	position of the cursor
-getcwd([{scope}])		String	the current working directory
+getcwd([{winnr} [, {tabnr}]])	String	the current working directory
 getfontname([{name}])		String	name of font being used
 getfperm({fname})		String	file permissions of file {fname}
 getfsize({fname})		Number	size in bytes of file {fname}
@@ -1902,10 +1995,12 @@ getqflist()			List	list of quickfix items
 getreg([{regname} [, 1 [, {list}]]])
 				String or List   contents of register
 getregtype([{regname}])	String	type of register
+gettabinfo( [{expr}])		List  	list of tab pages
 gettabvar({nr}, {varname} [, {def}])
 				any	variable {varname} in tab {nr} or {def}
 gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
 				any	{name} in {winnr} in tab page {tabnr}
+getwininfo( [{winid}])		List  	list of windows
 getwinposx()			Number	X coord in pixels of GUI Vim window
 getwinposy()			Number	Y coord in pixels of GUI Vim window
 getwinvar({nr}, {varname} [, {def}])
@@ -1917,10 +2012,11 @@ globpath({path}, {expr} [, {nosuf} [, {list} [, {alllinks}]]])
 				String	do glob({expr}) for all dirs in {path}
 has({feature})			Number	TRUE if feature {feature} supported
 has_key({dict}, {key})		Number	TRUE if {dict} has entry {key}
-haslocaldir()			Number	TRUE if current window executed |:lcd|
+haslocaldir([{winnr} [, {tabnr}]])
+				Number	TRUE if current window executed |:lcd|
 hasmapto({what} [, {mode} [, {abbr}]])
 				Number	TRUE if mapping to {what} exists
-histadd({history},{item})	String	add an item to a history
+histadd({history}, {item})	String	add an item to a history
 histdel({history} [, {item}])	String	remove an item from a history
 histget({history} [, {index}])	String	get the item {index} from a history
 histnr({history})		Number	highest index of a history
@@ -1986,6 +2082,8 @@ matchlist({expr}, {pat}[, {start}[, {count}]])
 				List	match and submatches of {pat} in {expr}
 matchstr({expr}, {pat}[, {start}[, {count}]])
 				String	{count}'th match of {pat} in {expr}
+matchstrpos( {expr}, {pat}[, {start}[, {count}]])
+				List	{count}'th match of {pat} in {expr}
 max({list})			Number	maximum value of items in {list}
 min({list})			Number	minimum value of items in {list}
 mkdir({name} [, {path} [, {prot}]])
@@ -1995,6 +2093,7 @@ msgpackdump({list})		List	dump a list of objects to msgpack
 msgpackparse({list})		List	parse msgpack to a list of objects
 nextnonblank({lnum})		Number	line nr of non-blank line >= {lnum}
 nr2char({expr}[, {utf8}])	String	single char with ASCII/UTF8 value {expr}
+nvim_...({args}...)		any	call nvim |api| functions
 or({expr}, {expr})		Number  bitwise OR
 pathshorten({expr})		String	shorten directory names in a path
 pow({x}, {y})			Float	{x} to the power of {y}
@@ -2018,7 +2117,7 @@ remote_peek({serverid} [, {retvar}])
 remote_read({serverid})	String	read reply string
 remote_send({server}, {string} [, {idvar}])
 				String	send key sequence
-remove({list}, {idx} [, {end}])  any	remove items {idx}-{end} from {list}
+remove({list}, {idx} [, {end}])	any	remove items {idx}-{end} from {list}
 remove({dict}, {key})		any	remove entry {key} from {dict}
 rename({from}, {to})		Number	rename (move) file from {from} to {to}
 repeat({expr}, {count})	String	repeat {expr} {count} times
@@ -2026,11 +2125,10 @@ resolve({filename})		String	get filename a shortcut points to
 reverse({list})		List	reverse {list} in-place
 round({expr})			Float	round off {expr}
 rpcnotify({channel}, {event}[, {args}...])
-				Sends a |msgpack-rpc| notification to {channel}
+				Sends an |RPC| notification to {channel}
 rpcrequest({channel}, {method}[, {args}...])
-				Sends a |msgpack-rpc| request to {channel}
-rpcstart({prog}[, {argv}])	Spawns {prog} and opens a |msgpack-rpc| channel
-rpcstop({channel})		Closes a |msgpack-rpc| {channel}
+				Sends an |RPC| request to {channel}
+rpcstop({channel})		Closes an |RPC| {channel}
 screenattr({row}, {col})	Number	attribute at screen position
 screenchar({row}, {col})	Number	character at screen position
 screencol()			Number	current cursor column
@@ -2084,14 +2182,17 @@ sqrt({expr})			Float	square root of {expr}
 str2float({expr})		Float	convert String to Float
 str2nr({expr} [, {base}])	Number	convert String to Number
 strchars({expr} [, {skipcc}])	Number	character length of the String {expr}
+strcharpart({str}, {start}[, {len}])
+				String	{len} characters of {str} at {start}
 strdisplaywidth({expr} [, {col}]) Number display length of the String {expr}
 strftime({format}[, {time}])	String	time in specified format
+strgetchar({str}, {index})	Number	get char {index} from {str}
 stridx({haystack}, {needle}[, {start}])
 				Number	index of {needle} in {haystack}
 string({expr})			String	String representation of {expr} value
 strlen({expr})			Number	length of the String {expr}
-strpart({src}, {start}[, {len}])
-				String	{len} characters of {src} at {start}
+strpart({str}, {start}[, {len}])
+				String	{len} characters of {str} at {start}
 strridx({haystack}, {needle} [, {start}])
 				Number	last index of {needle} in {haystack}
 strtrans({expr})		String	translate string to make it printable
@@ -2108,15 +2209,18 @@ synconcealed({lnum}, {col})	List    info about concealing
 synstack({lnum}, {col})	List	stack of syntax IDs at {lnum} and {col}
 system({cmd} [, {input}])	String	output of shell command/filter {cmd}
 systemlist({cmd} [, {input}])	List	output of shell command/filter {cmd}
-tabpagebuflist([{arg}])	List	list of buffer numbers in tab page
+tabpagebuflist([{arg}])		List	list of buffer numbers in tab page
 tabpagenr([{arg}])		Number	number of current or last tab page
 tabpagewinnr({tabarg}[, {arg}])
 				Number	number of current window in tab page
 taglist({expr})		List	list of tags matching {expr}
 tagfiles()			List	tags files used
-tempname()			String	name for a temporary file
 tan({expr})			Float	tangent of {expr}
 tanh({expr})			Float	hyperbolic tangent of {expr}
+tempname()			String	name for a temporary file
+timer_start({time}, {callback} [, {options}])
+				Number	create a timer
+timer_stop({timer})		none	stop a timer
 tolower({expr})		String	the String {expr} switched to lowercase
 toupper({expr})		String	the String {expr} switched to uppercase
 tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
@@ -2131,6 +2235,11 @@ values({dict})			List	values in {dict}
 virtcol({expr})		Number	screen column of cursor or mark
 visualmode([expr])		String	last visual mode used
 wildmenumode()			Number	whether 'wildmenu' mode is active
+win_findbuf( {bufnr}) 		List	find windows containing {bufnr}
+win_getid( [{win} [, {tab}]])   Number  get window ID for {win} in {tab}
+win_gotoid( {expr})             Number  go to window with ID {expr}
+win_id2tabwin( {expr})          List    get tab window nr from window ID
+win_id2win( {expr})             Number  get window nr from window ID
 winbufnr({nr})			Number	buffer number of window {nr}
 wincol()			Number	window column of the cursor
 winheight({nr})		Number	height of window {nr}
@@ -2145,6 +2254,7 @@ writefile({list}, {fname} [, {flags}])
 				Number	write list of lines to file {fname}
 xor({expr}, {expr})		Number  bitwise XOR
 
+
 abs({expr})							*abs()*
 		Return the absolute value of {expr}.  When {expr} evaluates to
 		a |Float| abs() returns a |Float|.  When {expr} can be
@@ -2187,6 +2297,8 @@ and({expr}, {expr})					*and()*
 		Example: >
 			:let flag = and(bits, 0x80)
 
+api_info()						*api_info()*
+		Returns Dictionary of |api-metadata|.
 
 append({lnum}, {expr})					*append()*
 		When {expr} is a |List|: Append each item of the |List| as a
@@ -2208,7 +2320,7 @@ argidx()	The result is the current index in the argument list.  0 is
 		the first file.  argc() - 1 is the last one.  See |arglist|.
 
 							*arglistid()*
-arglistid([{winnr}, [ {tabnr} ]])
+arglistid([{winnr} [, {tabnr}]])
 		Return the argument list ID.  This is a number which
 		identifies the argument list being used.  Zero is used for the
 		global argument list.  See |arglist|.
@@ -2218,6 +2330,7 @@ arglistid([{winnr}, [ {tabnr} ]])
 		With {winnr} only use this window in the current tab page.
 		With {winnr} and {tabnr} use the window in the specified tab
 		page.
+		{winnr} can be the window number or the window ID.
 
 							*argv()*
 argv([{nr}])	The result is the {nr}th file in the argument list of the
@@ -2260,6 +2373,11 @@ assert_exception({error} [, {msg}])			*assert_exception()*
 			  call assert_exception('E492:')
 			endtry
 
+assert_fails({cmd} [, {error}])					*assert_fails()*
+		Run {cmd} and add an error message to |v:errors| if it does
+		NOT produce an error.
+		When {error} is given it must match |v:errmsg|.
+
 assert_false({actual} [, {msg}])				*assert_false()*
 		When {actual} is not false an error message is added to
 		|v:errors|, like with |assert_equal()|.
@@ -2268,6 +2386,36 @@ assert_false({actual} [, {msg}])				*assert_false()*
 		When {msg} is omitted an error in the form "Expected False but
 		got {actual}" is produced.
 
+								*assert_match()*
+assert_match({pattern}, {actual} [, {msg}])
+		When {pattern} does not match {actual} an error message is
+		added to |v:errors|.
+
+		{pattern} is used as with |=~|: The matching is always done
+		like 'magic' was set and 'cpoptions' is empty, no matter what
+		the actual value of 'magic' or 'cpoptions' is.
+
+		{actual} is used as a string, automatic conversion applies.
+		Use "^" and "$" to match with the start and end of the text.
+		Use both to match the whole text.
+
+		When {msg} is omitted an error in the form "Pattern {pattern}
+		does not match {actual}" is produced.
+		Example: >
+	assert_match('^f.*o$', 'foobar')
+<		Will result in a string to be added to |v:errors|:
+	test.vim line 12: Pattern '^f.*o$' does not match 'foobar' ~
+
+							*assert_notequal()*
+assert_notequal({expected}, {actual} [, {msg}])
+		The opposite of `assert_equal()`: add an error message to
+		|v:errors| when {expected} and {actual} are equal.
+
+							*assert_notmatch()*
+assert_notmatch({pattern}, {actual} [, {msg}])
+		The opposite of `assert_match()`: add an error message to
+		|v:errors| when {pattern} matches {actual}.
+
 assert_true({actual} [, {msg}])					*assert_true()*
 		When {actual} is not true an error message is added to
 		|v:errors|, like with |assert_equal()|.
@@ -2354,8 +2502,6 @@ bufexists({expr})					*bufexists()*
 		for MS-Windows 8.3 names in the form "c:\DOCUME~1"
 		Use "bufexists(0)" to test for the existence of an alternate
 		file name.
-							*buffer_exists()*
-		Obsolete name: buffer_exists().
 
 buflisted({expr})					*buflisted()*
 		The result is a Number, which is non-zero if a buffer called
@@ -2394,8 +2540,6 @@ bufname({expr})						*bufname()*
 	bufname(3)		name of buffer 3
 	bufname("%")		name of current buffer
 	bufname("file2")	name of buffer where "file2" matches.
-<							*buffer_name()*
-		Obsolete name: buffer_name().
 
 							*bufnr()*
 bufnr({expr} [, {create}])
@@ -2411,10 +2555,16 @@ bufnr({expr} [, {create}])
 		of existing buffers.  Note that not all buffers with a smaller
 		number necessarily exist, because ":bwipeout" may have removed
 		them.  Use bufexists() to test for the existence of a buffer.
-							*buffer_number()*
-		Obsolete name: buffer_number().
-							*last_buffer_nr()*
-		Obsolete name for bufnr("$"): last_buffer_nr().
+
+bufwinid({expr})					*bufwinid()*
+		The result is a Number, which is the window ID of the first
+		window associated with buffer {expr}.  For the use of {expr},
+		see |bufname()| above.  If buffer {expr} doesn't exist or
+		there is no such window, -1 is returned.  Example: >
+
+	echo "A window containing buffer 1 is " . (bufwinid(1))
+<
+		Only deals with the current tab page.
 
 bufwinnr({expr})					*bufwinnr()*
 		The result is a Number, which is the number of the first
@@ -2452,7 +2602,9 @@ byteidx({expr}, {nr})					*byteidx()*
 		same: >
 			let s = strpart(str, byteidx(str, 3))
 			echo strpart(s, 0, byteidx(s, 1))
-<		If there are less than {nr} characters -1 is returned.
+<		Also see |strgetchar()| and |strcharpart()|.
+
+		If there are less than {nr} characters -1 is returned.
 		If there are exactly {nr} characters the length of the string
 		in bytes is returned.
 
@@ -2466,8 +2618,6 @@ byteidxcomp({expr}, {nr})					*byteidxcomp()*
 <		The first and third echo result in 3 ('e' plus composing
 		character is 3 bytes), the second echo results in 1 ('e' is
 		one byte).
-		Only works different from byteidx() when 'encoding' is set to
-		a Unicode encoding.
 
 call({func}, {arglist} [, {dict}])			*call()* *E699*
 		Call function {func} with the items in |List| {arglist} as
@@ -2502,11 +2652,11 @@ char2nr({expr}[, {utf8}])					*char2nr()*
 		Return number value of the first char in {expr}.  Examples: >
 			char2nr(" ")		returns 32
 			char2nr("ABC")		returns 65
-<		When {utf8} is omitted or zero, the current 'encoding' is used.
-		Example for "utf-8": >
 			char2nr("á")		returns 225
 			char2nr("á"[0])		returns 195
-<		With {utf8} set to 1, always treat as utf-8 characters.
+<		Non-ASCII characters are always treated as UTF-8 characters.
+		{utf8} has no effect, and exists only for
+		backwards-compatibility.
 		A combining character is a separate character.
 		|nr2char()| does the opposite.
 
@@ -2745,6 +2895,7 @@ cursor({list})
 
 		When there is one argument {list} this is used as a |List|
 		with two, three or four item:
+			[{lnum}, {col}]
 			[{lnum}, {col}, {off}]
 			[{lnum}, {col}, {off}, {curswant}]
 		This is like the return value of |getpos()| or |getcurpos()|,
@@ -2811,6 +2962,13 @@ dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
 		After this is called, every change on {dict} and on keys
 		matching {pattern} will result in {callback} being invoked.
 
+		For example, to watch all global variables: >
+			silent! call dictwatcherdel(g:, '*', 'OnDictChanged')
+			function! OnDictChanged(d,k,z)
+			  echomsg string(a:k) string(a:z)
+			endfunction
+			call dictwatcheradd(g:, '*', 'OnDictChanged')
+<
 		For now {pattern} only accepts very simple patterns that can
 		contain a '*' at the end of the string, in which case it will
 		match every key that begins with the substring before the '*'.
@@ -2821,7 +2979,7 @@ dictwatcheradd({dict}, {pattern}, {callback})		      *dictwatcheradd()*
 
 		- The dictionary being watched.
 		- The key which changed.
-		- A dictionary containg the new and old values for the key.
+		- A dictionary containing the new and old values for the key.
 
 		The type of change can be determined by examining the keys
 		present on the third argument:
@@ -2920,6 +3078,31 @@ executable({expr})					*executable()*
 			0	does not exist
 			-1	not implemented on this system
 
+execute({command} [, {silent}])				*execute()*
+		Execute {command} and capture its output.
+		If {command} is a |String|, returns {command} output.
+		If {command} is a |List|, returns concatenated outputs.
+		Examples: >
+			echo execute('echon "foo"')
+<			foo >
+			echo execute(['echon "foo"', 'echon "bar"'])
+<			foobar
+
+		The optional {silent} argument can have these values:
+			""		no `:silent` used
+			"silent"	`:silent` used
+			"silent!"	`:silent!` used
+		The default is 'silent'.  Note that with "silent!", unlike
+		`:redir`, error messages are dropped.
+
+		To get a list of lines use |split()| on the result: >
+			split(execute('args'), "\n")
+
+<		This function is not available in the |sandbox|.
+		Note: If nested, an outer execute() will not observe output of
+		the inner calls.
+		Note: Text attributes (highlights) are not captured.
+
 exepath({expr})						*exepath()*
 		If {expr} is an executable and is either an absolute path, a
 		relative path or found in $PATH, return the full path.
@@ -3162,6 +3345,18 @@ feedkeys({string} [, {mode}])				*feedkeys()*
 			if coming from a mapping.  This matters for undo,
 			opening folds, etc.
 		'i'	Insert the string instead of appending (see above).
+		'x'	Execute commands until typeahead is empty.  This is
+			similar to using ":normal!".  You can call feedkeys()
+			several times without 'x' and then one time with 'x'
+			(possibly with an empty {string}) to execute all the
+			typeahead.  Note that when Vim ends in Insert mode it
+			will behave as if <Esc> is typed, to avoid getting
+			stuck, waiting for a character to be typed before the
+			script continues.
+		'!'	When used with 'x' will not end Insert mode. Can be
+			used in a test when a timer is set to exit Insert mode
+			a little later.  Useful for testing CursorHoldI.
+
 		Return value is always 0.
 
 filereadable({file})					*filereadable()*
@@ -3171,8 +3366,6 @@ filereadable({file})					*filereadable()*
 		expression, which is used as a String.
 		If you don't care about the file being readable you can use
 		|glob()|.
-							*file_readable()*
-		Obsolete name: file_readable().
 
 
 filewritable({file})					*filewritable()*
@@ -3359,10 +3552,46 @@ foreground()	Move the Vim window to the foreground.	Useful when sent from
 		{only in the Win32 GUI and console version}
 
 
-function({name})					*function()* *E700*
+				       *function()* *E700* *E922* *E923*
+function({name} [, {arglist}] [, {dict}])
 		Return a |Funcref| variable that refers to function {name}.
 		{name} can be a user defined function or an internal function.
 
+		When {arglist} or {dict} is present this creates a partial.
+		That mans the argument list and/or the dictionary is stored in
+		the Funcref and will be used when the Funcref is called.
+		
+		The arguments are passed to the function in front of other
+		arguments.  Example: >
+			func Callback(arg1, arg2, name)
+			...
+			let Func = function('Callback', ['one', 'two'])
+			...
+			call Func('name')
+<		Invokes the function as with: >
+			call Callback('one', 'two', 'name')
+
+<		The Dictionary is only useful when calling a "dict" function.
+		In that case the {dict} is passed in as "self". Example: >
+			function Callback() dict
+			   echo "called for " . self.name
+			endfunction
+			...
+			let context = {"name": "example"}
+			let Func = function('Callback', context)
+			...
+			call Func()	" will echo: called for example
+
+<		The argument list and the Dictionary can be combined: >
+			function Callback(arg1, count) dict
+			...
+			let context = {"name": "example"}
+			let Func = function('Callback', ['one'], context)
+			...
+			call Func(500)
+<		Invokes the function as with: >
+			call context.Callback('one', 500)
+
 
 garbagecollect([{atexit}])				*garbagecollect()*
 		Cleanup unused |Lists| and |Dictionaries| that have circular
@@ -3386,7 +3615,68 @@ get({dict}, {key} [, {default}])
 		Get item with key {key} from |Dictionary| {dict}.  When this
 		item is not available return {default}.  Return zero when
 		{default} is omitted.
+get({func}, {what})
+		Get item {what} from Funcref {func}.  Possible values for
+		{what} are:
+			'name'	The function name
+			'func'	The function
+			'dict'	The dictionary
+			'args'	The list with arguments
+
+							*getbufinfo()*
+getbufinfo([{expr}])
+getbufinfo([{dict}])
+		Get information about buffers as a List of Dictionaries.
+
+		Without an argument information about all the buffers is
+		returned.
+
+		When the argument is a Dictionary only the buffers matching
+		the specified criteria are returned.  The following keys can
+		be specified in {dict}:
+			buflisted	include only listed buffers.
+			bufloaded	include only loaded buffers.
+
+		Otherwise, {expr} specifies a particular buffer to return
+		information for.  For the use of {expr}, see |bufname()|
+		above.  If the buffer is found the returned List has one item.
+		Otherwise the result is an empty list.
+
+		Each returned List item is a dictionary with the following
+		entries:
+			bufnr		buffer number.
+			changed		TRUE if the buffer is modified.
+			changedtick	number of changes made to the buffer.
+			hidden		TRUE if the buffer is hidden.
+			listed		TRUE if the buffer is listed.
+			lnum		current line number in buffer.
+			loaded		TRUE if the buffer is loaded.
+			name		full path to the file in the buffer.
+			signs		list of signs placed in the buffer.
+					Each list item is a dictionary with
+					the following fields:
+					    id	  sign identifier
+					    lnum  line number
+					    name  sign name
+			variables	a reference to the dictionary with
+					buffer-local variables.
+			windows		list of |window-ID|s that display this
+					buffer
 
+		Examples: >
+			for buf in getbufinfo()
+			    echo buf.name
+			endfor
+			for buf in getbufinfo({'buflisted':1})
+			    if buf.changed
+				....
+			    endif
+			endfor
+<
+		To get buffer-local options use: >
+			getbufvar({bufnr}, '&')
+
+<
 							*getbufline()*
 getbufline({expr}, {lnum} [, {end}])
 		Return a |List| with the lines starting from {lnum} to {end}
@@ -3418,6 +3708,10 @@ getbufvar({expr}, {varname} [, {def}])				*getbufvar()*
 		must be used.
 		When {varname} is empty returns a dictionary with all the
 		buffer-local variables.
+		When {varname} is equal to "&" returns a dictionary with all
+		the buffer-local options.
+		Otherwise, when {varname} starts with "&" returns the value of
+		a buffer-local option.
 		This also works for a global or buffer-local option, but it
 		doesn't work for a global variable, window-local variable or
 		window-local option.
@@ -3458,8 +3752,8 @@ getchar([expr])						*getchar()*
 
 		When the user clicks a mouse button, the mouse event will be
 		returned.  The position can then be found in |v:mouse_col|,
-		|v:mouse_lnum| and |v:mouse_win|.  This example positions the
-		mouse as it would normally happen: >
+		|v:mouse_lnum|, |v:mouse_winid| and |v:mouse_win|.  This
+		example positions the mouse as it would normally happen: >
 			let c = getchar()
 			if c == "\<LeftMouse>" && v:mouse_win > 0
 			  exe v:mouse_win . "wincmd w"
@@ -3570,10 +3864,57 @@ getcmdwintype()						*getcmdwintype()*
 		values are the same as |getcmdtype()|. Returns an empty string
 		when not in the command-line window.
 
+getcompletion({pat}, {type} [, {filtered}])		*getcompletion()*
+		Return a list of command-line completion matches. {type}
+		specifies what for.  The following completion types are
+		supported:
+
+		augroup		autocmd groups
+		buffer		buffer names
+		behave		:behave suboptions
+		color		color schemes
+		command		Ex command (and arguments)
+		compiler	compilers
+		cscope		|:cscope| suboptions
+		dir		directory names
+		environment	environment variable names
+		event		autocommand events
+		expression	Vim expression
+		file		file and directory names
+		file_in_path	file and directory names in |'path'|
+		filetype	filetype names |'filetype'|
+		function	function name
+		help		help subjects
+		highlight	highlight groups
+		history		:history suboptions
+		locale		locale names (as output of locale -a)
+		mapping		mapping name
+		menu		menus
+		option		options
+		shellcmd	Shell command
+		sign		|:sign| suboptions
+		syntax		syntax file names |'syntax'|
+		syntime		|:syntime| suboptions
+		tag		tags
+		tag_listfiles	tags, file names
+		user		user names
+		var		user variables
+
+		If {pat} is an empty string, then all the matches are returned.
+		Otherwise only items matching {pat} are returned. See
+		|wildcards| for the use of special characters in {pat}.
+
+		If the optional {filtered} flag is set to 1, then 'wildignore'
+		is applied to filter the results.  Otherwise all the matches
+		are returned. The 'wildignorecase' option always applies.
+
+		If there are no matches, an empty list is returned.  An
+		invalid value for {type} produces an error.
+
 							*getcurpos()*
 getcurpos()	Get the position of the cursor.  This is like getpos('.'), but
 		includes an extra item in the list:
-		    [bufnum, lnum, col, off, curswant]
+		    [bufnum, lnum, col, off, curswant] ~
 		The "curswant" number is the preferred column when moving the
 		cursor vertically.
 		This can be used to save and restore the cursor position: >
@@ -3581,17 +3922,18 @@ getcurpos()	Get the position of the cursor.  This is like getpos('.'), but
 			MoveTheCursorAround
 			call setpos('.', save_cursor)
 <
-getcwd([{window}[, {tab}]])				*getcwd()*
+getcwd([{winnr}[, {tabnr}]])				*getcwd()*
 		With no arguments the result is a String, which is the name of
-		the current effective working directory. With {window} or
-		{tab} the working directory of that scope is returned.
+		the current effective working directory. With {winnr} or
+		{tabnr} the working directory of that scope is returned.
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing argument implies 0.
 		Thus the following are equivalent: >
 			getcwd()
 			getcwd(0)
 			getcwd(0, 0)
-<		If {window} is -1 it is ignored, only the tab is resolved.
+<		If {winnr} is -1 it is ignored, only the tab is resolved.
+		{winnr} can be the window number or the window ID.
 
 
 getfsize({fname})					*getfsize()*
@@ -3656,7 +3998,8 @@ getftype({fname})					*getftype()*
 			getftype("/home")
 <		Note that a type such as "link" will only be returned on
 		systems that support it.  On some systems only "dir" and
-		"file" are returned.
+		"file" are returned.  On MS-Windows a symbolic link to a
+		directory returns "dir" instead of "link".
 
 							*getline()*
 getline({lnum} [, {end}])
@@ -3685,7 +4028,9 @@ getline({lnum} [, {end}])
 
 getloclist({nr})					*getloclist()*
 		Returns a list with all the entries in the location list for
-		window {nr}. When {nr} is zero the current window is used.
+		window {nr}. {nr} can be the window number or the window ID.
+		When {nr} is zero the current window is used.
+
 		For a location list window, the displayed location list is
 		returned.  For an invalid window number {nr}, an empty list is
 		returned. Otherwise, same as |getqflist()|.
@@ -3770,16 +4115,21 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >
 			:let cliptext = getreg('*')
-<		getreg('=') returns the last evaluated value of the expression
+<		When {regname} was not set the result is a empty string.
+
+		getreg('=') returns the last evaluated value of the expression
 		register.  (For use in maps.)
 		getreg('=', 1) returns the expression itself, so that it can
 		be restored with |setreg()|.  For other registers the extra
 		argument is ignored, thus you can always give it.
-		If {list} is present and non-zero result type is changed to 
-		|List|. Each list item is one text line. Use it if you care
+
+		If {list} is present and non-zero, the result type is changed
+		to |List|. Each list item is one text line. Use it if you care
 		about zero bytes possibly present inside register: without
 		third argument both NLs and zero bytes are represented as NLs
 		(see |NL-used-for-Nul|).
+		When the register was not set an empty list is returned.
+
 		If {regname} is not specified, |v:register| is used.
 
 
@@ -3793,6 +4143,19 @@ getregtype([{regname}])					*getregtype()*
 		<CTRL-V> is one character with value 0x16.
 		If {regname} is not specified, |v:register| is used.
 
+gettabinfo([{arg}])					*gettabinfo()*
+		If {arg} is not specified, then information about all the tab
+		pages is returned as a List. Each List item is a Dictionary.
+		Otherwise, {arg} specifies the tab page number and information
+		about that one is returned.  If the tab page does not exist an
+		empty List is returned.
+
+		Each List item is a Dictionary with the following entries:
+			nr		tab page number.
+			variables	a reference to the dictionary with
+					tabpage-local variables
+			windows		List of window IDs in the tag page.
+
 gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
 		{tabnr}. |t:var|
@@ -3806,13 +4169,16 @@ gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 		Get the value of window-local variable {varname} in window
 		{winnr} in tab page {tabnr}.
-		When {varname} starts with "&" get the value of a window-local
-		option.
 		When {varname} is empty a dictionary with all window-local
 		variables is returned.
+		When {varname} is equal to "&" get the values of all
+		window-local options in a Dictionary.
+		Otherwise, when {varname} starts with "&" get the value of a
+		window-local option.
 		Note that {varname} must be the name without "w:".
 		Tabs are numbered starting with one.  For the current tabpage
 		use |getwinvar()|.
+		{winnr} can be the window number or the window ID.
 		When {winnr} is zero the current window is used.
 		This also works for a global option, buffer-local option and
 		window-local option, but it doesn't work for a global variable
@@ -3833,6 +4199,31 @@ getwinposy()	The result is a Number, which is the Y coordinate in pixels of
 		the top of the GUI Vim window.	The result will be -1 if the
 		information is not available.
 
+getwininfo([{winid}])					*getwininfo()*
+		Returns information about windows as a List with Dictionaries.
+
+		If {winid} is given Information about the window with that ID
+		is returned.  If the window does not exist the result is an
+		empty list.
+
+		Without an information about all the windows in all the tab
+		pages is returned.
+
+		Each List item is a Dictionary with the following entries:
+			bufnum		number of buffer in the window
+			height		window height
+			loclist		1 if showing a location list
+			nr		window number
+			quickfix	1 if quickfix or location list window
+			tpnr		tab page number
+			variables	a reference to the dictionary with
+					window-local variables
+			width		window width
+			winid		window ID
+
+		To obtain all window-local variables use: >
+			gettabwinvar({tabnr}, {winnr}, '&')
+
 getwinvar({winnr}, {varname} [, {def}])				*getwinvar()*
 		Like |gettabwinvar()| for the current tabpage.
 		Examples: >
@@ -3929,7 +4320,7 @@ has_key({dict}, {key})					*has_key()*
 		The result is a Number, which is 1 if |Dictionary| {dict} has
 		an entry with key {key}.  Zero otherwise.
 
-haslocaldir([{window}[, {tab}]])			*haslocaldir()*
+haslocaldir([{winnr}[, {tabnr}]])			*haslocaldir()*
 		The result is a Number, which is 1 when the specified tabpage
 		or window has a local path set via |:lcd| or |:tcd|, and
 		0 otherwise.
@@ -3940,7 +4331,8 @@ haslocaldir([{window}[, {tab}]])			*haslocaldir()*
 			haslocaldir()
 			haslocaldir(0)
 			haslocaldir(0, 0)
-<		If {window} is -1 it is ignored, only the tab is resolved.
+<		{winnr} can be the window number or the window ID.
+		If {winnr} is -1 it is ignored, only the tab is resolved.
 
 hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
 		The result is a Number, which is 1 if there is a mapping that
@@ -4051,8 +4443,6 @@ hlexists({name})					*hlexists()*
 		defined in some way.  Not necessarily when highlighting has
 		been defined for it, it may also have been used for a syntax
 		item.
-							*highlight_exists()*
-		Obsolete name: highlight_exists().
 
 							*hlID()*
 hlID({name})	The result is a Number, which is the ID of the highlight group
@@ -4062,8 +4452,6 @@ hlID({name})	The result is a Number, which is the ID of the highlight group
 		group.	For example, to get the background color of the
 		"Comment" group: >
 	:echo synIDattr(synIDtrans(hlID("Comment")), "bg")
-<							*highlightID()*
-		Obsolete name: highlightID().
 
 hostname()						*hostname()*
 		The result is a String, which is the name of the machine on
@@ -4081,11 +4469,7 @@ iconv({expr}, {from}, {to})				*iconv()*
 		Most conversions require Vim to be compiled with the |+iconv|
 		feature.  Otherwise only UTF-8 to latin1 conversion and back
 		can be done.
-		This can be used to display messages with special characters,
-		no matter what 'encoding' is set to.  Write the message in
-		UTF-8 and use: >
-			echo iconv(utf8_str, "utf-8", &enc)
-<		Note that Vim uses UTF-8 for all Unicode encodings, conversion
+		Note that Vim uses UTF-8 for all Unicode encodings, conversion
 		from/to UCS-2 is automatically changed to use UTF-8.  You
 		cannot use UCS-2 in a string anyway, because of the NUL bytes.
 		{only available when compiled with the |+multi_byte| feature}
@@ -4259,8 +4643,11 @@ items({dict})						*items()*
 		order.
 
 jobclose({job}[, {stream}])				{Nvim} *jobclose()*
-		Close {job}'s {stream}, which can be one "stdin", "stdout" or
-		"stderr". If {stream} is omitted, all streams are closed.
+		Close {job}'s {stream}, which can be one of "stdin", "stdout",
+		"stderr" or "rpc" (closes the rpc channel for a job started
+		with the "rpc" option.) If {stream} is omitted, all streams
+		are closed. If the job is a pty job, this will then close the
+		pty master, sending SIGHUP to the job process.
 
 jobpid({job})						{Nvim} *jobpid()*
 		Return the pid (process id) of {job}.
@@ -4282,42 +4669,55 @@ jobsend({job}, {data})					{Nvim} *jobsend()*
 			:call jobsend(j, ["abc", "123\n456", ""])
 < 		will send "abc<NL>123<NUL>456<NL>".
 
+		If the job was started with the rpc option this function
+		cannot be used, instead use |rpcnotify()| and |rpcrequest()|
+		to communicate with the job.
+
 jobstart({cmd}[, {opts}])				{Nvim} *jobstart()*
-		Spawns {cmd} as a job.  If {cmd} is a |List|, it will be run
-		directly.  If {cmd} is a |string|, it will be roughly 
-		equivalent to >
-			:call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
-<		NOTE: read |shell-unquoting| before constructing any lists 
-		with 'shell' or 'shellcmdflag' options.  The above call is 
-		only written to show the idea, one needs to perform unquoting 
-		and do split taking quotes into account.
-		If passed, {opts} must be a dictionary with any of the
-		following keys:
-		  - on_stdout: stdout event handler
-		  - on_stderr: stderr event handler
-		  - on_exit: exit event handler
-		  - pty: If set, the job will be connected to a new pseudo
-		    terminal, and the job streams are connected to the master
-		    file descriptor.
-		  - width: Width of the terminal screen(only if pty is set)
-		  - height: Height of the terminal screen(only if pty is set)
-		  - TERM: $TERM environment variable(only if pty is set)
-		  - detach: Detach the job process from the nvim process. The
-		    process won't get killed when nvim exists. If the process
-		    dies before nvim exits, on_exit will still be invoked.
-		    This option is only allowed for non-pty jobs.
-		Either funcrefs or function names can be passed as event
-		handlers. The {opts} object is also used as the "self"
-		argument for the callback, so the caller may pass arbitrary
-		data by setting other key.(see |Dictionary-function| for more
-		information).
+		Spawns {cmd} as a job.  If {cmd} is a |List| it is run
+		directly.  If {cmd} is a |String| it is processed like this: >
+		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
+<		NOTE: This only shows the idea; see |shell-unquoting| before
+		constructing lists with 'shell' or 'shellcmdflag'.
+
+		NOTE: On Windows if {cmd} is a List, cmd[0] must be a valid
+		executable (.exe, .com).  If the executable is in $PATH it can
+		be called by name, with or without an extension: >
+		   :call jobstart(['ping', 'neovim.io'])
+<		If it is a path (not a name), it must include the extension: >
+		   :call jobstart(['System32\ping.exe', 'neovim.io'])
+<
+		{opts} is a dictionary with these keys:
+		  on_stdout: stdout event handler (function name or |Funcref|)
+		  on_stderr: stderr event handler (function name or |Funcref|)
+		  on_exit  : exit event handler (function name or |Funcref|)
+		  cwd      : Working directory of the job; defaults to
+		             |current-directory|.
+		  rpc      : If set, |msgpack-rpc| will be used to communicate
+			     with the job over stdin and stdout. "on_stdout" is
+			     then ignored, but "on_stderr" can still be used.
+		  pty      : If set, the job will be connected to a new pseudo
+			     terminal, and the job streams are connected to
+			     the master file descriptor. "on_stderr" is ignored
+			     as all output will be received on stdout.
+
+		  width    : (pty only) Width of the terminal screen
+		  height   : (pty only) Height of the terminal screen
+		  TERM     : (pty only) $TERM environment variable
+		  detach   : (non-pty only) Detach the job process from the
+			     nvim process. The process will not get killed
+			     when nvim exits. If the process dies before
+			     nvim exits, on_exit will still be invoked.
+
+		{opts} is passed as |self| to the callback; the caller may
+		pass arbitrary data by setting other keys.
 		Returns:
-		  - The job ID on success, which is used by |jobsend()| and
-		    |jobstop()|
-		  - 0 when the job table is full or on invalid arguments
-		  - -1 when {cmd}[0] is not executable.  Will never fail if
-		    {cmd} is a string unless 'shell' is not executable.
-		See |job-control| for more information.
+		  - The job ID on success, which is used by |jobsend()| (or
+		    |rpcnotify()| and |rpcrequest()| if "rpc" option was used)
+		    and |jobstop()|
+		  - 0 on invalid arguments or if the job table is full
+		  - -1 if {cmd}[0] is not executable.
+		See |job-control| and |msgpack-rpc| for more information.
 
 jobstop({job})						{Nvim} *jobstop()*
 		Stop a job created with |jobstart()| by sending a `SIGTERM`
@@ -4359,9 +4759,7 @@ join({list} [, {sep}])					*join()*
 json_decode({expr})					*json_decode()*
 		Convert {expr} from JSON object.  Accepts |readfile()|-style 
 		list as the input, as well as regular string.  May output any 
-		Vim value.  When 'encoding' is not UTF-8 string is converted 
-		from UTF-8 to 'encoding', failing conversion fails 
-		json_decode().  In the following cases it will output 
+		Vim value. In the following cases it will output
 		|msgpack-special-dict|:
 		1. Dictionary contains duplicate key.
 		2. Dictionary contains empty key.
@@ -4369,33 +4767,22 @@ json_decode({expr})					*json_decode()*
 		   dictionary and for string will be emitted in case string 
 		   with NUL byte was a dictionary key.
 
-		Note: function treats its input as UTF-8 always regardless of 
-		'encoding' value.  This is needed because JSON source is 
-		supposed to be external (e.g. |readfile()|) and JSON standard 
-		allows only a few encodings, of which UTF-8 is recommended and 
-		the only one required to be supported.  Non-UTF-8 characters 
-		are an error.
+		Note: function treats its input as UTF-8 always.  The JSON
+		standard allows only a few encodings, of which UTF-8 is
+		recommended and the only one required to be supported.
+		Non-UTF-8 characters are an error.
 
 json_encode({expr})					*json_encode()*
 		Convert {expr} into a JSON string.  Accepts 
-		|msgpack-special-dict| as the input.  Converts from 'encoding' 
-		to UTF-8 when encoding strings.  Will not convert |Funcref|s, 
+		|msgpack-special-dict| as the input.  Will not convert |Funcref|s, 
 		mappings with non-string keys (can be created as 
 		|msgpack-special-dict|), values with self-referencing 
 		containers, strings which contain non-UTF-8 characters, 
 		pseudo-UTF-8 strings which contain codepoints reserved for 
 		surrogate pairs (such strings are not valid UTF-8 strings).  
-		When converting 'encoding' is taken into account, if it is not 
-		"utf-8", then conversion is performed before encoding strings.  
 		Non-printable characters are converted into "\u1234" escapes 
 		or special escapes like "\t", other are dumped as-is.
 
-		Note: all characters above U+0079 are considered non-printable 
-		when 'encoding' is not UTF-8.  This function always outputs 
-		UTF-8 strings as required by the standard thus when 'encoding' 
-		is not unicode resulting string will look incorrect if 
-		"\u1234" notation is not used.
-
 keys({dict})						*keys()*
 		Return a |List| with all the keys of {dict}.  The |List| is in
 		arbitrary order.
@@ -4497,9 +4884,9 @@ line2byte({lnum})					*line2byte()*
 		Return the byte count from the start of the buffer for line
 		{lnum}.  This includes the end-of-line character, depending on
 		the 'fileformat' option for the current buffer.  The first
-		line returns 1. 'encoding' matters, 'fileencoding' is ignored.
-		This can also be used to get the byte count for the line just
-		below the last line: >
+		line returns 1. UTF-8 encoding is used, 'fileencoding' is
+		ignored.  This can also be used to get the byte count for the
+		line just below the last line: >
 			line2byte(line("$") + 1)
 <		This is the buffer size plus one.  If 'fileencoding' is empty
 		it is the file size plus one.
@@ -4737,8 +5124,8 @@ matchadd({group}, {pattern}[, {priority}[, {id} [, {dict}]]])
 		respectively.  If the {id} argument is not specified or -1,
 		|matchadd()| automatically chooses a free ID.
 
-		The optional {dict} argmument allows for further custom
-		values. Currently this is used to specify a match specifc
+		The optional {dict} argument allows for further custom
+		values. Currently this is used to specify a match specific
 		conceal character that will be shown for |hl-Conceal|
 		highlighted matches. The dict can have the following members:
 
@@ -4854,6 +5241,24 @@ matchstr({expr}, {pat}[, {start}[, {count}]])			*matchstr()*
 		When {expr} is a |List| then the matching item is returned.
 		The type isn't changed, it's not necessarily a String.
 
+matchstrpos({expr}, {pat}[, {start}[, {count}]])		*matchstrpos()*
+		Same as |matchstr()|, but return the matched string, the start
+		position and the end position of the match.  Example: >
+			:echo matchstrpos("testing", "ing")
+<		results in ["ing", 4, 7].
+		When there is no match ["", -1, -1] is returned.
+		The {start}, if given, has the same meaning as for |match()|. >
+			:echo matchstrpos("testing", "ing", 2)
+<		results in ["ing", 4, 7]. >
+			:echo matchstrpos("testing", "ing", 5)
+<		result is ["", -1, -1].
+		When {expr} is a |List| then the matching item, the index
+		of first item where {pat} matches, the start position and the
+		end position of the match are returned. >
+			:echo matchstrpos([1, '__x'], '\a')
+<		result is ["x", 1, 2, 3].
+		The type isn't changed, it's not necessarily a String.
+
 							*max()*
 max({list})	Return the maximum value of all items in {list}.
 		If {list} is not a list or one of the items in {list} cannot
@@ -4923,7 +5328,7 @@ msgpackdump({list})				   {Nvim} *msgpackdump()*
 		(dictionary with zero items is represented by 0x80 byte in
 		messagepack).
 
-		Limitations:				*E951* *E952* *E953*
+		Limitations:				*E5004* *E5005*
 		1. |Funcref|s cannot be dumped.
 		2. Containers that reference themselves cannot be dumped.
 		3. Dictionary keys are always dumped as STR strings.
@@ -5018,15 +5423,26 @@ nr2char({expr}[, {utf8}])				*nr2char()*
 		value {expr}.  Examples: >
 			nr2char(64)		returns "@"
 			nr2char(32)		returns " "
-<		When {utf8} is omitted or zero, the current 'encoding' is used.
-		Example for "utf-8": >
+<		Example for "utf-8": >
 			nr2char(300)		returns I with bow character
-<		With {utf8} set to 1, always return utf-8 characters.
+<		UTF-8 encoding is always used, {utf8} option has no effect,
+		and exists only for backwards-compatibility.
 		Note that a NUL character in the file is specified with
 		nr2char(10), because NULs are represented with newline
 		characters.  nr2char(0) is a real NUL and terminates the
 		string, thus results in an empty string.
 
+nvim_...({...})						*nvim_...()* *eval-api*
+		Call nvim |api| functions. The type checking of arguments will
+		be stricter than for most other builtins. For instance,
+		if Integer is expected, a |Number| must be passed in, a
+		|String| will not be autoconverted.
+		Buffer numbers, as returned by |bufnr()| could be used as
+		first argument to nvim_buf_... functions.  All functions
+		expecting an object (buffer, window or tabpage) can
+		also take the numerical value 0 to indicate the current
+		(focused) object.
+
 or({expr}, {expr})					*or()*
 		Bitwise OR on the two arguments.  The arguments are converted
 		to a number.  A List, Dict or Float argument causes an error.
@@ -5180,6 +5596,16 @@ printf({fmt}, {expr1} ...)				*printf()*
 			numeric field; if the result of a conversion is wider
 			than the field width, the field is expanded to contain
 			the conversion result.
+			The 'h' modifier indicates the argument is 16 bits.
+			The 'l' modifier indicates the argument is 32 bits.
+			The 'L' modifier indicates the argument is 64 bits.
+			Generally, these modifiers are not useful. They are
+			ignored when type is known from the argument.
+
+		i	alias for d
+		D	alias for ld
+		U	alias for lu
+		O	alias for lo
 
 							*printf-c*
 		c	The Number argument is converted to a byte, and the
@@ -5196,7 +5622,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 			feature works just like 's'.
 
 							*printf-f* *E807*
-		f	The Float argument is converted into a string of the 
+		f F	The Float argument is converted into a string of the 
 			form 123.456.  The precision specifies the number of
 			digits after the decimal point.  When the precision is
 			zero the decimal point is omitted.  When the precision
@@ -5246,13 +5672,12 @@ pumvisible()						*pumvisible()*
 		This can be used to avoid some things that would remove the
 		popup menu.
 
-							*E860*
 py3eval({expr})						*py3eval()*
 		Evaluate Python expression {expr} and return its result
 		converted to Vim data structures.
 		Numbers and strings are returned as they are (strings are 
 		copied though, Unicode strings are additionally converted to 
-		'encoding').
+		UTF-8).
 		Lists are represented as Vim |List| type.
 		Dictionaries are represented as Vim |Dictionary| type with 
 		keys converted to strings.
@@ -5302,8 +5727,7 @@ readfile({fname} [, {binary} [, {max}]])
 		Otherwise:
 		- CR characters that appear before a NL are removed.
 		- Whether the last line ends in a NL or not does not matter.
-		- When 'encoding' is Unicode any UTF-8 byte order mark is
-		  removed from the text.
+		- Any UTF-8 byte order mark is removed from the text.
 		When {max} is given this specifies the maximum number of lines
 		to be read.  Useful if you only want to check the first ten
 		lines of a file: >
@@ -5325,14 +5749,20 @@ reltime([{start} [, {end}]])				*reltime()*
 		the item depends on the system.  It can be passed to
 		|reltimestr()| to convert it to a string or |reltimefloat()| 
 		to convert to a float.
-		Without an argument it returns the current time.
-		With one argument is returns the time passed since the time
+
+		Without an argument it returns the current "relative time", an
+		implementation-defined value meaningful only when used as an
+		argument to |reltime()|, |reltimestr()| and |reltimefloat()|.
+
+		With one argument it returns the time passed since the time
 		specified in the argument.
 		With two arguments it returns the time passed between {start}
 		and {end}.
 		The {start} and {end} arguments must be values returned by
 		reltime().
 
+		Note: |localtime()| returns the current (non-relative) time.
+
 reltimefloat({time})				*reltimefloat()*
 		Return a Float that represents the time value of {time}.
 		Unit of time is seconds.
@@ -5504,31 +5934,31 @@ round({expr})							*round()*
 <			-5.0
 
 rpcnotify({channel}, {event}[, {args}...])		  {Nvim} *rpcnotify()*
-		Sends {event} to {channel} via |msgpack-rpc| and returns
-		immediately. If {channel} is 0, the event is broadcast to all
-		channels. Example: >
+		Sends {event} to {channel} via |RPC| and returns immediately.
+		If {channel} is 0, the event is broadcast to all channels.
+		Example: >
 			:au VimLeave call rpcnotify(0, "leaving")
 
 rpcrequest({channel}, {method}[, {args}...])		 {Nvim} *rpcrequest()*
 		Sends a request to {channel} to invoke {method} via
-		|msgpack-rpc| and blocks until a response is received.
+		|RPC| and blocks until a response is received.
 		Example: >
 			:let result = rpcrequest(rpc_chan, "func", 1, 2, 3)
 
 rpcstart({prog}[, {argv}])				   {Nvim} *rpcstart()*
-		Spawns {prog} as a job (optionally passing the list {argv}),
-		and opens a |msgpack-rpc| channel with the spawned process's
-		stdin/stdout. It returns:
-		  - The channel id on success, which is used by |rpcrequest()|,
-		    |rpcnotify()| and |rpcstop()|
-		  - 0 on failure.
-		Example: >
-			:let rpc_chan = rpcstart('prog', ['arg1', 'arg2'])
+		Deprecated. Replace  >
+			:let id = rpcstart('prog', ['arg1', 'arg2'])
+<		with >
+			:let id = jobstart(['prog', 'arg1', 'arg2'], {'rpc': v:true})
 
 rpcstop({channel})					    {Nvim} *rpcstop()*
-		Closes a |msgpack-rpc| {channel}, possibly created via
-		|rpcstart()|. Also closes channels created by connections to
-		|$NVIM_LISTEN_ADDRESS|.
+		Closes an |RPC| {channel}.  If the channel is a job
+		started with |jobstart()|  the job is killed.
+		It is better to use |jobstop()| in this case, or use
+		|jobclose|(id, "rpc") to only close the channel without
+		killing the job.
+		Closes the socket connection if the channel was opened by
+		connecting to |v:servername|.
 
 screenattr(row, col)						*screenattr()*
 		Like screenchar(), but return the attribute.  This is a rather
@@ -5591,7 +6021,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]])	*search()*
 
 		'ignorecase', 'smartcase' and 'magic' are used.
 		
-		When the 'z' flag is not given seaching always starts in
+		When the 'z' flag is not given, searching always starts in
 		column zero and then matches before the cursor are skipped.
 		When the 'c' flag is present in 'cpo' the next search starts
 		after the match.  Without the 'c' flag the next search starts
@@ -5906,11 +6336,13 @@ setline({lnum}, {text})					*setline()*
 
 setloclist({nr}, {list} [, {action}[, {title}]])	*setloclist()*
 		Create or replace or add to the location list for window {nr}.
-		When {nr} is zero the current window is used. For a location
-		list window, the displayed location list is modified.  For an
-		invalid window number {nr}, -1 is returned. If {title} is
-		given, it will be used to set |w:quickfix_title| after opening
-		the location window.
+		{nr} can be the window number or the window ID.
+		When {nr} is zero the current window is used.
+
+		For a location list window, the displayed location list is
+		modified.  For an invalid window number {nr}, -1 is returned. If
+		{title} is given, it will be used to set |w:quickfix_title|
+		after opening the location window.
 		Otherwise, same as |setqflist()|.
 		Also see |location-list|.
 
@@ -5999,12 +6431,18 @@ setqflist({list} [, {action}[, {title}]])		*setqflist()*
 		Note that the list is not exactly the same as what
 		|getqflist()| returns.
 
+							*E927*
 		If {action} is set to 'a', then the items from {list} are
 		added to the existing quickfix list. If there is no existing
-		list, then a new list is created. If {action} is set to 'r',
-		then the items from the current quickfix list are replaced
-		with the items from {list}. If {action} is not present or is
-		set to ' ', then a new list is created.
+		list, then a new list is created.
+		
+		If {action} is set to 'r', then the items from the current
+		quickfix list are replaced with the items from {list}.  This
+		can also be used to clear the list: >
+			:call setqflist([], 'r')
+<	
+		If {action} is not present or is set to ' ', then a new list
+		is created.
 
 		If {title} is given, it will be used to set |w:quickfix_title|
 		after opening the quickfix window.
@@ -6017,7 +6455,7 @@ setqflist({list} [, {action}[, {title}]])		*setqflist()*
 
 
 							*setreg()*
-setreg({regname}, {value} [,{options}])
+setreg({regname}, {value} [, {options}])
 		Set the register {regname} to {value}.
 		{value} may be any value returned by |getreg()|, including 
 		a |List|.
@@ -6074,6 +6512,7 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		{val}.
 		Tabs are numbered starting with one.  For the current tabpage
 		use |setwinvar()|.
+		{winnr} can be the window number or the window ID.
 		When {winnr} is zero the current window is used.
 		This also works for a global or local buffer option, but it
 		doesn't work for a global or local buffer variable.
@@ -6198,6 +6637,9 @@ sort({list} [, {func} [, {dict}]])			*sort()* *E702*
 		sorted numerical. This is like 'n' but a string containing
 		digits will be used as the number they represent.
 
+		When {func} is given and it is 'f' then all items will be
+		sorted numerical. All values must be a Number or a Float.
+
 		When {func} is a |Funcref| or a function name, this function
 		is called to compare items.  The function is invoked with two
 		items as argument and must return zero if they are equal, 1 or
@@ -6355,7 +6797,6 @@ strchars({expr} [, {skipcc}])					*strchars()*
 		counted separately.
 		When {skipcc} set to 1, Composing characters are ignored.
 		Also see |strlen()|, |strdisplaywidth()| and |strwidth()|.
-
 		
 		{skipcc} is only available after 7.4.755.  For backward
 		compatibility, you can define a wrapper function: >
@@ -6373,6 +6814,13 @@ strchars({expr} [, {skipcc}])					*strchars()*
 		      endfunction
 		    endif
 <
+strcharpart({src}, {start}[, {len}])			*strcharpart()*
+		Like |strpart()| but using character index and length instead
+		of byte index and length.
+		When a character index is used where a character does not
+		exist it is assumed to be one byte.  For example: >
+			strcharpart('abc', -1, 2)
+<		results in 'a'.
 
 strdisplaywidth({expr}[, {col}])			*strdisplaywidth()*
 		The result is a Number, which is the number of display cells
@@ -6406,6 +6854,12 @@ strftime({format} [, {time}])				*strftime()*
 <		Not available on all systems.  To check use: >
 			:if exists("*strftime")
 
+strgetchar({str}, {index})				*strgetchar()*
+		Get character {index} from {str}.  This uses a character
+		index, not a byte index.  Composing characters are considered
+		separate characters here.
+		Also see |strcharpart()| and |strchars()|.
+
 stridx({haystack}, {needle} [, {start}])		*stridx()*
 		The result is a Number, which gives the byte index in
 		{haystack} of the first occurrence of the String {needle}.
@@ -6443,8 +6897,7 @@ string({expr})	Return {expr} converted to a String.  If {expr} is a Number,
 		for infinite and NaN floating-point values representations 
 		which use |str2float()|.  Strings are also dumped literally, 
 		only single quote is escaped, which does not allow using YAML 
-		for parsing back binary strings (including text when 
-		'encoding' is not UTF-8).  |eval()| should always work for 
+		for parsing back binary strings.  |eval()| should always work for 
 		strings and floats though and this is the only official 
 		method, use |msgpackdump()| or |json_encode()| if you need to 
 		share data with other application.
@@ -6461,14 +6914,17 @@ strlen({expr})	The result is a Number, which is the length of the String
 strpart({src}, {start}[, {len}])			*strpart()*
 		The result is a String, which is part of {src}, starting from
 		byte {start}, with the byte length {len}.
-		When non-existing bytes are included, this doesn't result in
-		an error, the bytes are simply omitted.
+		To count characters instead of bytes use |strcharpart()|.
+
+		When bytes are selected which do not exist, this doesn't
+		result in an error, the bytes are simply omitted.
 		If {len} is missing, the copy continues from {start} till the
 		end of the {src}. >
 			strpart("abcdefg", 3, 2)    == "de"
 			strpart("abcdefg", -2, 4)   == "ab"
 			strpart("abcdefg", 5, 4)    == "fg"
 			strpart("abcdefg", 3)	    == "defg"
+
 <		Note: To get the first character, {start} must be 0.  For
 		example, to get three bytes under and after the cursor: >
 			strpart(getline("."), col(".") - 1, 3)
@@ -6574,9 +7030,9 @@ synID({lnum}, {col}, {trans})				*synID()*
 		that's where the cursor can be in Insert mode, synID() returns
 		zero.
 
-		When {trans} is non-zero, transparent items are reduced to the
+		When {trans} is |TRUE|, transparent items are reduced to the
 		item that they reveal.	This is useful when wanting to know
-		the effective color.  When {trans} is zero, the transparent
+		the effective color.  When {trans} is |FALSE|, the transparent
 		item is returned.  This is useful when wanting to know which
 		syntax item is effective (e.g. inside parens).
 		Warning: This function can be very slow.  Best speed is
@@ -6659,26 +7115,32 @@ synstack({lnum}, {col})					*synstack()*
 		valid positions.
 
 system({cmd} [, {input}])				*system()* *E677*
-		Get the output of the shell command {cmd} as a |string|.  {cmd}
-		will be run the same as in |jobstart()|.  See |systemlist()|
-		to get the output as a |List|.
-
-		When {input} is given and is a string this string is written 
-		to a file and passed as stdin to the command.  The string is 
-		written as-is, you need to take care of using the correct line 
-		separators yourself.
-		If {input} is given and is a |List| it is written to the file
-		in a way |writefile()| does with {binary} set to "b" (i.e.
-		with a newline between each list item with newlines inside
-		list items converted to NULs).  
-		Pipes are not used.
+		Get the output of {cmd} as a |string| (use |systemlist()| to
+		get a |List|). {cmd} is treated exactly as in |jobstart()|.
+		Not to be used for interactive commands.
+
+		If {input} is a string it is written to a pipe and passed as
+		stdin to the command.  The string is written as-is, line
+		separators are not changed.
+		If {input} is a |List| it is written to the pipe as
+		|writefile()| does with {binary} set to "b" (i.e. with
+		a newline between each list item, and newlines inside list
+		items converted to NULs).
+								*E5677*
+		Note: system() cannot write to or read from backgrounded ("&")
+		shell commands, e.g.: >
+		    :echo system("cat - &", "foo"))
+<		which is equivalent to: >
+		    $ echo foo | bash -c 'cat - &'
+<		The pipes are disconnected (unless overridden by shell
+		redirection syntax) before input can reach it. Use
+		|jobstart()| instead.
 
 		Note: Use |shellescape()| or |::S| with |expand()| or 
 		|fnamemodify()| to escape special characters in a command 
 		argument.  Newlines in {cmd} may cause the command to fail.  
 		The characters in 'shellquote' and 'shellxquote' may also 
 		cause trouble.
-		This is not to be used for interactive commands.
 
 		The result is a String.  Example: >
 		    :let files = system("ls " .  shellescape(expand('%:h')))
@@ -6693,9 +7155,6 @@ system({cmd} [, {input}])				*system()* *E677*
 		The command executed is constructed using several options when
 		{cmd} is a string: 'shell' 'shellcmdflag' {cmd}
 
-		The command will be executed in "cooked" mode, so that a
-		CTRL-C will interrupt the command (on Unix at least).
-
 		The resulting error code can be found in |v:shell_error|.
 		This function will fail in |restricted-mode|.
 
@@ -6816,7 +7275,7 @@ termopen({cmd}[, {opts}])			{Nvim} *termopen()*
 		and `$TERM` is set to "xterm-256color".
 		Returns the same values as |jobstart()|.
 
-		See |nvim-terminal-emulator| for more information.
+		See |terminal-emulator| for more information.
 
 tan({expr})						*tan()*
 		Return the tangent of {expr}, measured in radians, as a |Float|
@@ -6840,6 +7299,38 @@ tanh({expr})						*tanh()*
 <			-0.761594
 
 
+							*timer_start()*
+timer_start({time}, {callback} [, {options}])
+		Create a timer and return the timer ID.
+
+		{time} is the waiting time in milliseconds. This is the
+		minimum time before invoking the callback.  When the system is
+		busy or Vim is not waiting for input the time will be longer.
+
+		{callback} is the function to call.  It can be the name of a
+		function or a Funcref.  It is called with one argument, which
+		is the timer ID.  The callback is only invoked when Vim is
+		waiting for input.
+
+		{options} is a dictionary.  Supported entries:
+		   "repeat"	Number of times to repeat calling the
+		   		callback.  -1 means forever.
+
+		Example: >
+			func MyHandler(timer)
+			  echo 'Handler called'
+			endfunc
+			let timer = timer_start(500, 'MyHandler',
+				\ {'repeat': 3})
+<		This will invoke MyHandler() three times at 500 msec
+		intervals.
+		{only available when compiled with the |+timers| feature}
+
+timer_stop({timer})					*timer_stop()*
+		Stop a timer.  The timer callback will no longer be invoked.
+		{timer} is an ID returned by timer_start(), thus it must be a
+		Number.
+
 tolower({expr})						*tolower()*
 		The result is a copy of the String given, with all uppercase
 		characters turned into lowercase (just like applying |gu| to
@@ -7039,11 +7530,40 @@ wildmenumode()					*wildmenumode()*
 		(Note, this needs the 'wildcharm' option set appropriately).
 
 
+win_findbuf({bufnr})					*win_findbuf()*
+		Returns a list with window IDs for windows that contain buffer
+		{bufnr}.  When there is none the list is empty.
+
+win_getid([{win} [, {tab}]])				*win_getid()*
+		Get the window ID for the specified window.
+		When {win} is missing use the current window.
+		With {win} this is the window number.  The top window has
+		number 1.
+		Without {tab} use the current tab, otherwise the tab with
+		number {tab}.  The first tab has number one.
+		Return zero if the window cannot be found.
+
+win_gotoid({expr})					*win_gotoid()*
+		Go to window with ID {expr}.  This may also change the current
+		tabpage.
+		Return 1 if successful, 0 if the window cannot be found.
+
+win_id2tabwin({expr}					*win_id2tabwin()*
+		Return a list with the tab number and window number of window
+		with ID {expr}: [tabnr, winnr].
+		Return [0, 0] if the window cannot be found.
+
+win_id2win({expr})					*win_id2win()*
+		Return the window number of window with ID {expr}.
+		Return 0 if the window cannot be found in the current tabpage.
+
 							*winbufnr()*
 winbufnr({nr})	The result is a Number, which is the number of the buffer
-		associated with window {nr}.  When {nr} is zero, the number of
-		the buffer in the current window is returned.  When window
-		{nr} doesn't exist, -1 is returned.
+		associated with window {nr}.  {nr} can be the window number or
+		the window ID.
+		When {nr} is zero, the number of the buffer in the current
+		window is returned.
+		When window {nr} doesn't exist, -1 is returned.
 		Example: >
   :echo "The file in the current window is " . bufname(winbufnr(0))
 <
@@ -7054,6 +7574,7 @@ wincol()	The result is a Number, which is the virtual column of the
 
 winheight({nr})						*winheight()*
 		The result is a Number, which is the height of window {nr}.
+		{nr} can be the window number or the window ID.
 		When {nr} is zero, the height of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a height of zero or more.
@@ -7133,6 +7654,7 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 
 winwidth({nr})						*winwidth()*
 		The result is a Number, which is the width of window {nr}.
+		{nr} can be the window number or the window ID.
 		When {nr} is zero, the width of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
@@ -7208,7 +7730,11 @@ There are four types of features:
     Example: >
 	:if has("gui_running")
 <							*has-patch*
-3.  Included patches.  The "patch123" feature means that patch 123 has been
+3.  {Nvim} version. The "nvim-1.2.3" feature means that the Nvim version is
+    1.2.3 or later. Example: >
+	:if has("nvim-1.2.3")
+<
+4.  Included patches.  The "patch123" feature means that patch 123 has been
     included.  Note that this form does not check the version of Vim, you need
     to inspect |v:version| for that.
     Example (checking version 6.2.148 or later): >
@@ -7216,7 +7742,7 @@ There are four types of features:
 <    Note that it's possible for patch 147 to be omitted even though 148 is
     included.
 
-4.  Beyond a certain version or at a certain version and including a specific
+5.  Beyond a certain version or at a certain version and including a specific
     patch.  The "patch-7.4.237" feature means that the Vim version is 7.5 or
     later, or it is version 7.4 and patch 237 was included.
     Note that this only works for patch 7.4.237 and later, before that you
@@ -7247,7 +7773,7 @@ dialog_gui		Compiled with GUI dialog support.
 digraphs		Compiled with support for digraphs.
 eval			Compiled with expression evaluation support.  Always
 			true, of course!
-ex_extra		Compiled with extra Ex commands |+ex_extra|.
+ex_extra		|+ex_extra|, always true now
 extra_search		Compiled with support for |'incsearch'| and
 			|'hlsearch'|
 farsi			Compiled with Farsi support |farsi|.
@@ -7288,6 +7814,7 @@ multi_byte		Compiled with support for 'encoding'
 multi_byte_encoding	'encoding' is set to a multi-byte encoding.
 multi_byte_ime		Compiled with support for IME input method.
 multi_lang		Compiled with support for multiple languages.
+nvim			This is Nvim. |has-patch|
 ole			Compiled with OLE automation support for Win32.
 path_extra		Compiled with up/downwards search in 'path' and 'tags'
 persistent_undo		Compiled with support for persistent undo history.
@@ -7323,12 +7850,14 @@ termresponse		Compiled with support for |t_RV| and |v:termresponse|.
 textobjects		Compiled with support for |text-objects|.
 tgetent			Compiled with tgetent support, able to use a termcap
 			or terminfo file.
+timers			Compiled with |timer_start()| support.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
 unix			Unix version of Vim.
 user_commands		User-defined commands.
 vertsplit		Compiled with vertically split windows |:vsplit|.
 vim_starting		True while initial source'ing takes place. |startup|
+			*vim_starting*
 virtualedit		Compiled with 'virtualedit' option.
 visual			Compiled with Visual mode.
 visualextra		Compiled with extra Visual mode commands.
@@ -7953,7 +8482,7 @@ This does NOT work: >
 			From Vim version 4.5 until 5.0, every Ex command in
 			between the ":if" and ":endif" is ignored.  These two
 			commands were just to allow for future expansions in a
-			backwards compatible way.  Nesting was allowed.  Note
+			backward compatible way.  Nesting was allowed.  Note
 			that any ":else" or ":elseif" was ignored, the "else"
 			part was not executed either.
 
@@ -8020,14 +8549,6 @@ This does NOT work: >
 				endfor
 <			Note that reordering the list (e.g., with sort() or
 			reverse()) may have unexpected effects.
-			Note that the type of each list item should be
-			identical to avoid errors for the type of {var}
-			changing.  Unlet the variable at the end of the loop
-			to allow multiple item types: >
-				for item in ["foo", ["bar"]]
-				   echo item
-				   unlet item  " E706 without this
-				endfor
 
 :for [{var1}, {var2}, ...] in {listlist}
 :endfo[r]
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 76aa3a50ce..d15815191e 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -1,4 +1,4 @@
-*filetype.txt*  For Vim version 7.4.  Last change: 2015 Dec 06
+*filetype.txt*  For Vim version 7.4.  Last change: 2016 Jun 20
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -500,7 +500,7 @@ Options:
 		avoid that a Subject line with "Vim:" in it will cause an
 		error message.
 'textwidth'	is set to 72.  This is often recommended for e-mail.
-'formatoptions'  is set to break text lines and to repeat the comment leader
+'formatoptions'	is set to break text lines and to repeat the comment leader
 		in new lines, so that a leading ">" for quotes is repeated.
 		You can also format quoted text with |gq|.
 
@@ -512,37 +512,44 @@ Local mappings:
 
 MAN					*ft-man-plugin* *:Man* *man.vim*
 
-Displays a manual page in a nice way.  Also see the user manual
-|find-manpage|.
+View manpages in Nvim. Supports highlighting, completion, locales, and
+navigation. Also see |find-manpage|.
 
-To start using the ":Man" command before any manual page was loaded, source
-this script from your startup vimrc file: >
+To use Nvim as a manpager: >
+     export MANPAGER="nvim -c 'set ft=man' -"
 
-	runtime ftplugin/man.vim
+man.vim will always attempt to reuse the closest man window (above/left) but
+otherwise create a split.
 
-Options:
-'iskeyword'	the '.' character is added to be able to use CTRL-] on the
-		manual page name.
+The case sensitivity of completion is controlled by 'fileignorecase'.
 
 Commands:
-Man {name}	Display the manual page for {name} in a window.
-Man {number} {name}
-		Display the manual page for {name} in a section {number}.
-
-Global mapping:
-<Leader>K	Displays the manual page for the word under the cursor.
+Man {name}                Display the manpage for {name}.
+Man {sect} {name}         Display the manpage for {name} and section {sect}.
+Man {name}({sect})        Alternate syntax which completes the section.
+Man {sect} {name}({sect}) Used during completion to show the real section of
+                          when the provided section is a prefix, e.g. 1m vs 1.
+Man {path}                Open the manpage specified by path. Prepend "./" if
+                          page is in the current directory.
+Man                       Open the manpage for the <cWORD> (man buffers)
+                          or <cword> (non-man buffers) under the cursor.
+
+|:Man| accepts command modifiers. For example, to use a vertical split: >
+     :vertical Man printf
 
 Local mappings:
-CTRL-]		Jump to the manual page for the word under the cursor.
-CTRL-T		Jump back to the previous manual page.
-q		Same as ":quit"
-
-To enable folding use this: >
-  	let g:ft_man_folding_enable = 1
-If you do not like the default folding, use an autocommand to add your desired
-folding style instead.  For example: >
-        autocmd FileType man setlocal foldmethod=indent foldenable
+K or CTRL-]               Jump to the manpage for the <cWORD> under the
+                          cursor. Takes a count for the section.
+CTRL-T                    Jump back to the location that the manpage was
+                          opened from.
+q                         :quit if invoked as $MANPAGER, otherwise :close.
 
+Variables:
+*g:no_man_maps*             Do not create mappings in manpage buffers.
+*g:ft_man_folding_enable*   Fold manpages with foldmethod=indent foldnestmax=1.
+*b:man_default_sects*       Comma-separated, ordered list of preferred sections.
+                          For example in C one usually wants section 3 or 2: >
+                               :let b:man_default_sections = '3,2'
 
 PDF							*ft-pdf-plugin*
 
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 8d97678af2..1e8bb408d9 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -395,9 +395,9 @@ You may make selections with the mouse (see |gui-mouse-select|), or by using
 Vim's Visual mode (see |v|).  If 'a' is present in 'guioptions', then
 whenever a selection is started (Visual or Select mode), or when the selection
 is changed, Vim becomes the owner of the windowing system's primary selection
-(on MS-Windows the |gui-clipboard| is used).
+(on MS-Windows the |clipboard| is used).
 
-							*clipboard*
+							*primary-selection*
 There is a special register for storing this selection, it is the "*
 register.  Nothing is put in here unless the information about what text is
 selected is about to change (e.g. with a left mouse click somewhere), or when
@@ -825,13 +825,13 @@ the <CR> key.  |<>|)
 
 See section |42.4| in the user manual.
 
-							*:tmenu* *:tm*
+							*:tmenu*
 :tm[enu] {menupath} {rhs}	Define a tip for a menu or tool.  {only in
 				X11 and Win32 GUI}
 
 :tm[enu] [menupath]		List menu tips. {only in X11 and Win32 GUI}
 
-							*:tunmenu* *:tu*
+							*:tunmenu*
 :tu[nmenu] {menupath}		Remove a tip for a menu or tool.
 				{only in X11 and Win32 GUI}
 
diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt
deleted file mode 100644
index 228be9eab2..0000000000
--- a/runtime/doc/gui_w32.txt
+++ /dev/null
@@ -1,437 +0,0 @@
-*gui_w32.txt*   For Vim version 7.4.  Last change: 2014 Dec 20
-
-
-		  VIM REFERENCE MANUAL    by Bram Moolenaar
-
-
-Vim's Win32 Graphical User Interface			*gui-w32* *win32-gui*
-
-1. Starting the GUI		|gui-w32-start|
-2. Vim as default editor	|vim-default-editor|
-3. Using the clipboard		|gui-clipboard|
-4. Shell Commands		|gui-shell-win32|
-5. Special colors		|win32-colors|
-6. Windows dialogs & browsers	|gui-w32-dialogs|
-7. Command line arguments	|gui-w32-cmdargs|
-8. Various			|gui-w32-various|
-
-Other relevant documentation:
-|gui.txt|	For generic items of the GUI.
-|os_win32.txt| 	For Win32 specific items.
-
-==============================================================================
-1. Starting the GUI					*gui-w32-start*
-
-The Win32 GUI version of Vim will always start the GUI, no matter how you
-start it or what it's called.
-
-The GUI will always run in the Windows subsystem.  Mostly shells automatically
-return with a command prompt after starting gvim.  If not, you should use the
-"start" command: >
-	start gvim [options] file ..
-
-Note: All fonts (bold, italic) must be of the same size!!!  If you don't do
-this, text will disappear or mess up the display.  Vim does not check the font
-sizes.  It's the size in screen pixels that must be the same.  Note that some
-fonts that have the same point size don't have the same pixel size!
-Additionally, the positioning of the fonts must be the same (ascent and
-descent).
-
-The Win32 GUI has an extra menu item:  "Edit/Select Font".  It brings up the
-standard Windows font selector.
-
-Setting the menu height doesn't work for the Win32 GUI.
-
-							*gui-win32-maximized*
-If you want Vim to start with a maximized window, add this command to your
-vimrc or gvimrc file: >
-	au GUIEnter * simalt ~x
-<
-==============================================================================
-2. Vim as default editor				*vim-default-editor*
-
-To set Vim as the default editor for a file type:
-1. Start a Windows Explorer
-2. Choose View/Options -> File Types
-3. Select the path to gvim for every file type that you want to use it for.
-   (you can also use three spaces in the file type field, for files without an
-   extension).
-   In the "open" action, use: >
-	gvim "%1"
-<  The quotes are required for using file names with embedded spaces.
-   You can also use this: >
-	gvim "%L"
-<  This should avoid short (8.3 character) file names in some situations.  But
-   I'm not sure if this works everywhere.
-
-When you open a file in Vim by double clicking it, Vim changes to that
-file's directory.
-
-If you want Vim to start full-screen, use this for the Open action: >
-	gvim -c "simalt ~x" "%1"
-
-Another method, which also works when you put Vim in another directory (e.g.,
-when you have got a new version):
-1. select a file you want to use Vim with
-2. <Shift-F10>
-3. select "Open With..." menu entry
-4. click "Other..."
-5. browse to the (new) location of Vim and click "Open"
-6. make "Always Use this program..." checked
-7. <OK>
-
-						*send-to-menu* *sendto*
-You can also install Vim in the "Send To" menu:
-1. Start a Windows Explorer
-2. Navigate to your sendto directory:
-   Windows NT: %windir%\profiles\%user%\sendto (e.g.
-	       "c:\winnt\profiles\mattha\sendto").
-3. Right-click in the file pane and select New->Shortcut
-4. Follow the shortcut wizard, using the full path to VIM/GVIM.
-
-When you 'send a file to Vim', Vim changes to that file's directory.  Note,
-however, that any long directory names will appear in their short (MS-DOS)
-form.  This is a limitation of the Windows "Send To" mechanism.
-
-						*notepad*
-You could replace notepad.exe with gvim.exe, but that has a few side effects.
-Some programs rely on notepad arguments, which are not recognized by Vim.  For
-example "notepad -p" is used by some applications to print a file.  It's
-better to leave notepad where it is and use another way to start Vim.
-
-						*win32-popup-menu*
-A more drastic approach is to install an "Edit with Vim" entry in the popup
-menu for the right mouse button.  With this you can edit any file with Vim.
-
-This can co-exist with the file associations mentioned above.  The difference
-is that the file associations will make starting Vim the default action.  With
-the "Edit with Vim" menu entry you can keep the existing file association for
-double clicking on the file, and edit the file with Vim when you want.  For
-example, you can associate "*.mak" with your make program.  You can execute
-the makefile by double clicking it and use the "Edit with Vim" entry to edit
-the makefile.
-
-You can select any files and right-click to see a menu option called "Edit
-with gvim".  Choosing this menu option will invoke gvim with the file you have
-selected.  If you select multiple files, you will find two gvim-related menu
-options:
-"Edit with multiple gvims"  -- one gvim for each file in the selection
-"Edit with single gvim"     -- one gvim for all the files in the selection
-And if there already is a gvim running:
-"Edit with existing gvim"   -- edit the file with the running gvim
-
-The "edit with existing Vim" entries can be disabled by adding an entry in the
-registry under HKLM\Software\Vim\Gvim, named DisableEditWithExisting, and with
-any value.
-						*install-registry*
-You can add the "Edit with Vim" menu entry in an easy way by using the
-"install.exe" program.  It will add several registry entries for you.
-
-You can also do this by hand.  This is complicated!  Use the install.exe if
-you can.
-
-1. Start the registry editor with "regedit".
-2. Add these keys:
-   key		value name		    value ~
-   HKEY_CLASSES_ROOT\CLSID\{51EEE242-AD87-11d3-9C1E-0090278BBD99}
-		{default}		    Vim Shell Extension
-   HKEY_CLASSES_ROOT\CLSID\{51EEE242-AD87-11d3-9C1E-0090278BBD99}\InProcServer32
-		{default}		    {path}\gvimext.dll
-		ThreadingModel		    Apartment
-   HKEY_CLASSES_ROOT\*\shellex\ContextMenuHandlers\gvim
-		{default}		    {51EEE242-AD87-11d3-9C1E-0090278BBD99}
-   HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved
-		{51EEE242-AD87-11d3-9C1E-0090278BBD99}
-					    Vim Shell Extension
-   HKEY_LOCAL_MACHINE\Software\Vim\Gvim
-		path			    {path}\gvim.exe
-   HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\vim 5.6
-		DisplayName		    Vim 5.6: Edit with Vim popup menu entry
-		UninstallString		    {path}\uninstal.exe
-
-   Replace {path} with the path that leads to the executable.
-   Don't type {default}, this is the value for the key itself.
-
-To remove "Edit with Vim" from the popup menu, just remove the registry
-entries mentioned above.  The "uninstal.exe" program can do this for you.  You
-can also use the entry in the Windows standard "Add/Remove Programs" list.
-
-If you notice that this entry overrules other file type associations, set
-those associations again by hand (using Windows Explorer, see above).  This
-only seems to happen on some Windows NT versions (Windows bug?).  Procedure:
-1. Find the name of the file type.  This can be done by starting the registry
-   editor, and searching for the extension in \\HKEY_CLASSES_ROOT
-2. In a Windows Explorer, use View/Options/File Types.  Search for the file
-   type in the list and click "Edit".  In the actions list, you can select on
-   to be used as the default (normally the "open" action) and click on the
-   "Set Default" button.
-
-
-Vim in the "Open With..." context menu			*win32-open-with-menu*
-
-If you use the Vim install program you have the choice to add Vim to the "Open
-With..." menu.  This means you can use Vim to edit many files.  Not every file
-(for unclear reasons...), thus the "Edit with Vim" menu entry is still useful.
-
-One reason to add this is to be able to edit HTML files directly from Internet
-Explorer.  To enable this use the "Tools" menu, "Internet Options..." entry.
-In the dialog select the "Programs" tab and select Vim in the "HTML editor"
-choice.  If it's not there than installing didn't work properly.
-
-Doing this manually can be done with this script:
-
-----------------------------------------------------------
-REGEDIT4
-
-[HKEY_CLASSES_ROOT\Applications\gvim.exe]
-
-[HKEY_CLASSES_ROOT\Applications\gvim.exe\shell]
-
-[HKEY_CLASSES_ROOT\Applications\gvim.exe\shell\edit]
-
-[HKEY_CLASSES_ROOT\Applications\gvim.exe\shell\edit\command]
-@="c:\\vim\\vim62\\gvim.exe \"%1\""
-
-[HKEY_CLASSES_ROOT\.htm\OpenWithList\gvim.exe]
-
-[HKEY_CLASSES_ROOT\*\OpenWithList\gvim.exe]
-
-----------------------------------------------------------
-
-Change the "c:\\vim\\vim62" bit to where gvim.exe is actually located.
-
-To uninstall this run the Vim uninstall program or manually delete the
-registry entries with "regedit".
-
-==============================================================================
-3. Using the clipboard					*gui-clipboard*
-
-Windows has a clipboard, where you can copy text to, and paste text from.  Vim
-supports this in several ways.  For other systems see |gui-selections|.
-
-The "* register reflects the contents of the clipboard.  |quotestar|
-
-When the "unnamed" string is included in the 'clipboard' option, the unnamed
-register is the same.  Thus you can yank to and paste from the clipboard
-without prepending "* to commands.
-
-The 'a' flag in 'guioptions' is not included by default.  This means that text
-is only put on the clipboard when an operation is performed on it.  Just
-Visually selecting text doesn't put it on the clipboard.  When the 'a' flag is
-included, the text is copied to the clipboard even when it is not operated
-upon.
-
-							*mswin.vim*
-To use the standard MS-Windows way of CTRL-X, CTRL-C and CTRL-V, use the
-$VIMRUNTIME/mswin.vim script.  You could add this line to your _vimrc file: >
-	source $VIMRUNTIME/mswin.vim
-
-Since CTRL-C is used to copy the text to the clipboard, it can't be used to
-cancel an operation.  Use CTRL-Break for that.
-
-CTRL-Z is used for undo.  This means you can't suspend Vim with this key, use
-|:suspend| instead (if it's supported at all).
-
-						*CTRL-V-alternative* *CTRL-Q*
-Since CTRL-V is used to paste, you can't use it to start a blockwise Visual
-selection.  You can use CTRL-Q instead.  You can also use CTRL-Q in Insert
-mode and Command-line mode to get the old meaning of CTRL-V.  But CTRL-Q
-doesn't work for terminals when it's used for control flow.
-
-NOTE: The clipboard support still has a number of bugs.
-
-==============================================================================
-4. Shell Commands					*gui-shell-win32*
-
-Vim uses another window for external commands, to make it possible to run any
-command.  The external command gets its own environment for running, just like
-it was started from a DOS prompt.
-
-							*win32-vimrun*
-Executing an external command is done indirectly by the "vimrun" command.  The
-"vimrun.exe" must be in the path for this to work.  Or it must be in the same
-directory as the Vim executable.  If "vimrun" cannot be found, the command is
-executed directly, but then the DOS window closes immediately after the
-external command has finished.
-WARNING: If you close this window with the "X" button, and confirm the
-question if you really want to kill the application, Vim may be killed too!
-(This does not apply to commands run asynchronously with ":!start".)
-
-							*win32-!start*
-Normally, Vim waits for a command to complete before continuing (this makes
-sense for most shell commands which produce output for Vim to use).  If you
-want Vim to start a program and return immediately, you can use the following
-syntax on W95 & NT: >
-	:!start [/min] {command}
-The optional "/min" causes the window to be minimized.
-
-==============================================================================
-5. Special colors					*win32-colors*
-
-On Win32, the normal DOS colors can be used.  See |dos-colors|.
-
-Additionally the system configured colors can also be used.  These are known
-by the names Sys_XXX, where XXX is the appropriate system color name, from the
-following list (see the Win32 documentation for full descriptions).  Case is
-ignored.
-
-Sys_3DDKShadow		Sys_3DFace			Sys_BTNFace
-Sys_3DHilight		Sys_3DHighlight			Sys_BTNHilight
-Sys_BTNHighlight	Sys_3DLight			Sys_3DShadow
-Sys_BTNShadow		Sys_ActiveBorder		Sys_ActiveCaption
-Sys_AppWorkspace	Sys_Background			Sys_Desktop
-Sys_BTNText		Sys_CaptionText			Sys_GrayText
-Sys_Highlight		Sys_HighlightText		Sys_InactiveBorder
-Sys_InactiveCaption	Sys_InactiveCaptionText		Sys_InfoBK
-Sys_InfoText		Sys_Menu			Sys_MenuText
-Sys_ScrollBar		Sys_Window			Sys_WindowFrame
-Sys_WindowText
-
-Probably the most useful values are
-	Sys_Window	    Normal window background
-	Sys_WindowText      Normal window text
-	Sys_Highlight       Highlighted background
-	Sys_HighlightText   Highlighted text
-
-These extra colors are also available:
-Gray, Grey, LightYellow, SeaGreen, Orange, Purple, SlateBlue, Violet,
-
-								*rgb.txt*
-Additionally, colors defined by a "rgb.txt" file can be used.  This file is
-well known from X11.  A few lines from it: >
-
-  255 218 185		   peach puff
-  205 133  63		   peru
-  255 181 197		   pink
-
-This shows the layout of the file:  First the R, G and B value as a decimal
-number, followed by the name of the color.  The four fields are separated by
-spaces.
-
-You can get an rgb.txt file from any X11 distribution.  It is located in a
-directory like "/usr/X11R6/lib/X11/".  For Vim it must be located in the
-$VIMRUNTIME directory.  Thus the file can be found with "$VIMRUNTIME/rgb.txt".
-
-==============================================================================
-						*gui-w32-dialogs* *dialog*
-6. Windows dialogs & browsers
-
-The Win32 GUI can use familiar Windows components for some operations, as well
-as the traditional interface shared with the console version.
-
-
-6.1 Dialogs
-
-The dialogs displayed by the "confirm" family (i.e. the 'confirm' option,
-|:confirm| command and |confirm()| function) are GUI-based rather than the
-console-based ones used by other versions.  The 'c' flag in 'guioptions'
-changes this.
-
-
-6.2 File Browsers
-
-When prepending ":browse" before file editing commands, a file requester is
-used to allow you to select an existing file.  See |:browse|.
-
-==============================================================================
-7. Command line arguments				*gui-w32-cmdargs*
-
-Analysis of a command line into parameters is not standardised in MS Windows.
-Gvim has to provide logic to analyse a command line.  This logic is likely to
-be different from the default logic provided by a compilation system used to
-build vim.  The differences relate to unusual double quote (") usage.
-The arguments "C:\My Music\freude.txt" and "+/Sch\"iller" are handled in the
-same way.  The argument "+/Sch""iller" may be handled different by gvim and
-vim, depending what it was compiled with.
-
-The rules are:
-      a) A parameter is a sequence of graphic characters.
-      b) Parameters are separated by white space.
-      c) A parameter can be enclosed in double quotes to include white space.
-      d) A sequence of zero or more backslashes (\) and a double quote (")
-	is special.  The effective number of backslashes is halved, rounded
-	down.  An even number of backslashes reverses the acceptability of
-	spaces and tabs, an odd number of backslashes produces a literal
-	double quote.
-
-So:
-	"	is a special double quote
-	\"	is a literal double quote
-	\\"	is a literal backslash and a special double quote
-	\\\"	is a literal backslash and a literal double quote
-	\\\\"	is 2 literal backslashes and a special double quote
-	\\\\\"	is 2 literal backslashes and a literal double quote
-	etc.
-
-Example: >
-	gvim "C:\My Music\freude" +"set ignorecase" +/"\"foo\\" +\"bar\\\"
-
-opens "C:\My Music\freude" and executes the line mode commands: >
-	set ignorecase; /"foo\ and /bar\"
-
-==============================================================================
-8. Various						*gui-w32-various*
-
-							*gui-w32-printing*
-The "File/Print" menu prints the text with syntax highlighting, see
-|:hardcopy|.  If you just want to print the raw text and have a default
-printer installed this should also work: >
-	:w >>prn
-
-Vim supports a number of standard MS Windows features.  Some of these are
-detailed elsewhere: see |'mouse'|, |win32-hidden-menus|.
-
-							*drag-n-drop-win32*
-You can drag and drop one or more files into the Vim window, where they will
-be opened as normal.  See |drag-n-drop|.
-
-							*:simalt* *:sim*
-:sim[alt] {key}		simulate pressing {key} while holding Alt pressed.
-			{only for Win32 versions}
-
-Normally, Vim takes control of all Alt-<Key> combinations, to increase the
-number of possible mappings.  This clashes with the standard use of Alt as the
-key for accessing menus.
-The quick way of getting standard behavior is to set the 'winaltkeys' option
-to "yes".  This however prevents you from mapping Alt keys at all.
-Another way is to set 'winaltkeys' to "menu".  Menu shortcut keys are then
-handled by windows, other ALT keys can be mapped.  This doesn't allow a
-dependency on the current state though.
-To get round this, the :simalt command allows Vim (when 'winaltkeys' is not
-"yes") to fake a Windows-style Alt keypress.  You can use this to map Alt key
-combinations (or anything else for that matter) to produce standard Windows
-actions.  Here are some examples: >
-
-	:map <M-f> :simalt f<CR>
-This makes Alt-F pop down the 'File' menu (with the stock Menu.vim) by
-simulating the keystrokes Alt, F. >
-	:map <M-Space> :simalt ~<CR>
-This maps Alt-Space to pop down the system menu for the Vim window.  Note that
-~ is used by simalt to represent the <Space> character. >
-	:map <C-n> :simalt ~n<CR>
-Maps Control-N to produce the keys Alt-Space followed by N.  This minimizes the
-Vim window via the system menu.
-
-Note that the key changes depending on the language you are using.
-
-						*intellimouse-wheel-problems*
-When using the Intellimouse mouse wheel causes Vim to stop accepting input, go
-to:
-	ControlPanel - Mouse - Wheel - UniversalScrolling - Exceptions
-
-And add gvim to the list of applications.  This problem only appears to happen
-with the Intellimouse driver 2.2 and when "Universal Scrolling" is turned on.
-
-
-XPM support						*w32-xpm-support*
-
-Gvim can be build on MS-Windows with support for XPM files.  |+xpm_w32|
-See the Make_mvc.mak file for instructions, search for XPM.
-
-To try out if XPM support works do this: >
-	:help
-	:exe 'sign define vimxpm icon=' . $VIMRUNTIME . '\\vim16x16.xpm'
-	:exe 'sign place 1 line=1 name=vimxpm file=' . expand('%:p')
-<
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 19bcb35da8..a81d32831b 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*	For Vim version 7.4.  Last change: 2015 Apr 15
+*help.txt*	For Vim version 7.4.  Last change: 2016 Mar 31
 
 			VIM - main help file
 									 k
@@ -9,14 +9,14 @@ Close this window:  Use ":q<Enter>".
 
 Jump to a subject:  Position the cursor on a tag (e.g. |bars|) and hit CTRL-].
    With the mouse:  Double-click the left mouse button on a tag, e.g. |bars|.
-	Jump back:  Type CTRL-T or CTRL-O (repeat to go further back).
+	Jump back:  Type CTRL-T or CTRL-O.  Repeat to go further back.
 
 Get specific help:  It is possible to go directly to whatever you want help
 		    on, by giving an argument to the |:help| command.
-		    It is possible to further specify the context:
-							*help-context*
+		    Prepend something to specify the context:  *help-context*
+
 			  WHAT			PREPEND    EXAMPLE	~
-		      Normal mode command      (nothing)   :help x
+		      Normal mode command		   :help x
 		      Visual mode command	  v_	   :help v_u
 		      Insert mode command	  i_	   :help i_<Esc>
 		      Command-line command	  :	   :help :quit
@@ -24,6 +24,8 @@ Get specific help:  It is possible to go directly to whatever you want help
 		      Vim command argument	  -	   :help -r
 		      Option			  '	   :help 'textwidth'
 		      Regular expression	  /	   :help /[
+		    See |help-summary| for more contexts and an explanation.
+
   Search for help:  Type ":help word", then hit CTRL-D to see matching
 		    help entries for "word".
 		    Or use ":helpgrep word". |:helpgrep|
@@ -152,6 +154,7 @@ GUI ~
 Interfaces ~
 |if_cscop.txt|	using Cscope with Vim
 |if_pyth.txt|	Python interface
+|if_ruby.txt|	Ruby interface
 |debugger.txt|	Interface with a debugger
 |sign.txt|	debugging signs
 
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index f3533b8815..ad1611133a 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -1,4 +1,4 @@
-*helphelp.txt*	For Vim version 7.4.  Last change: 2014 Sep 19
+*helphelp.txt*	For Vim version 7.4.  Last change: 2016 Apr 01
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -185,9 +185,12 @@ command: >
 <
 
 					*:helpt* *:helptags*
-				*E154* *E150* *E151* *E152* *E153* *E670*
+			*E154* *E150* *E151* *E152* *E153* *E670* *E856*
 :helpt[ags] [++t] {dir}
 			Generate the help tags file(s) for directory {dir}.
+			When {dir} is ALL then all "doc" directories in
+			'runtimepath' will be used.
+
 			All "*.txt" and "*.??x" files in the directory and
 			sub-directories are scanned for a help tag definition
 			in between stars.  The "*.??x" files are for
@@ -196,9 +199,11 @@ command: >
 			sorted.
 			When there are duplicates an error message is given.
 			An existing tags file is silently overwritten.
+
 			The optional "++t" argument forces adding the
 			"help-tags" tag.  This is also done when the {dir} is
 			equal to $VIMRUNTIME/doc.
+
 			To rebuild the help tags in the runtime directory
 			(requires write permission there): >
 				:helptags $VIMRUNTIME/doc
@@ -249,7 +254,9 @@ The second one finds the English user manual, even when 'helplang' is set to
 
 When using command-line completion for the ":help" command, the "@en"
 extension is only shown when a tag exists for multiple languages.  When the
-tag only exists for English "@en" is omitted.
+tag only exists for English "@en" is omitted.  When the first candidate has an
+"@ab" extension and it matches the first language in 'helplang' "@ab" is also
+omitted.
 
 When using |CTRL-]| or ":help!" in a non-English help file Vim will try to
 find the tag in the same language.  If not found then 'helplang' will be used
@@ -306,6 +313,10 @@ aligned on a line.
 When referring to an existing help tag and to create a hot-link, place the
 name between two bars (|) eg. |help-writing|.
 
+When referring to a Vim command and to create a hot-link, place the
+name between two backticks, eg. inside `:filetype`.  You will see this is
+highlighted as a command, like a code block (see below).
+
 When referring to a Vim option in the help file, place the option name between
 two single quotes, eg. 'statusline'
 
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 70f8d1c6f3..7482f5eebb 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -96,8 +96,8 @@ command does the same and also splits the window (short: "scs").
 
 The available subcommands are:
 
-			*E563* *E564* *E566* *E568* *E569* *E622* *E623*
-			*E625* *E626* *E609*
+			*E563* *E564* *E566* *E568* *E622* *E623* *E625*
+			*E626* *E609*
     add   : Add a new cscope database/connection.
 
 	USAGE	:cs add {file|dir} [pre-path] [flags]
@@ -128,6 +128,7 @@ The available subcommands are:
 		6 or e: Find this egrep pattern
 		7 or f: Find this file
 		8 or i: Find files #including this file
+		9 or a: Find places where this symbol is assigned a value
 
 	For all types, except 4 and 6, leading white space for {name} is
 	removed.  For 4 and 6 there is exactly one space between {querytype}
@@ -254,13 +255,13 @@ started will have no effect!
 {not available when compiled without the |+quickfix| feature}
 'cscopequickfix' specifies whether to use quickfix window to show cscope
 results.  This is a list of comma-separated values. Each item consists of
-|cscope-find| command (s, g, d, c, t, e, f or i) and flag (+, - or 0).
+|cscope-find| command (s, g, d, c, t, e, f, i or a) and flag (+, - or 0).
 '+' indicates that results must be appended to quickfix window,
 '-' implies previous results clearance, '0' or command absence - don't use
 quickfix.  Search is performed from start until first command occurrence.
 The default value is "" (don't use quickfix anyway).  The following value
 seems to be useful: >
-	:set cscopequickfix=s-,c-,d-,i-,t-,e-
+	:set cscopequickfix=s-,c-,d-,i-,t-,e-,a-
 <
 							*cscopetag* *cst*
 If 'cscopetag' is set, the commands ":tag" and CTRL-] as well as "vim -t"
@@ -418,6 +419,7 @@ Cscope Home Page (http://cscope.sourceforge.net/): >
 	nmap <C-_>f :cs find f <C-R>=expand("<cfile>")<CR><CR>
 	nmap <C-_>i :cs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
 	nmap <C-_>d :cs find d <C-R>=expand("<cword>")<CR><CR>
+	nmap <C-_>a :cs find a <C-R>=expand("<cword>")<CR><CR>
 
 	" Using 'CTRL-spacebar' then a search type makes the vim window
 	" split horizontally, with search result displayed in
@@ -431,6 +433,7 @@ Cscope Home Page (http://cscope.sourceforge.net/): >
 	nmap <C-Space>f :scs find f <C-R>=expand("<cfile>")<CR><CR>
 	nmap <C-Space>i :scs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
 	nmap <C-Space>d :scs find d <C-R>=expand("<cword>")<CR><CR>
+	nmap <C-Space>a :scs find a <C-R>=expand("<cword>")<CR><CR>
 
 	" Hitting CTRL-space *twice* before the search type does a vertical
 	" split instead of a horizontal one
@@ -449,6 +452,8 @@ Cscope Home Page (http://cscope.sourceforge.net/): >
 		\:vert scs find i ^<C-R>=expand("<cfile>")<CR>$<CR>
 	nmap <C-Space><C-Space>d
 		\:vert scs find d <C-R>=expand("<cword>")<CR><CR>
+	nmap <C-Space><C-Space>a
+		\:vert scs find a <C-R>=expand("<cword>")<CR><CR>
 
 ==============================================================================
 7. Cscope availability and information			*cscope-info*
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index f6bd365299..b6fe234de4 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -16,7 +16,7 @@ The Python Interface to Vim				*python* *Python*
 8. pyeval(), py3eval() Vim functions		|python-pyeval|
 9. Python 3					|python3|
 
-See |nvim-python| for more information. {Nvim}
+See |provider-python| for more information. {Nvim}
 
 ==============================================================================
 1. Commands						*python-commands*
@@ -699,7 +699,7 @@ if the `:py3` command is working: >
 	:py3 print("Hello")
 <							*:py3file*
 The `:py3file` command works similar to `:pyfile`.
-							*:py3do* *E863*
+							*:py3do*
 The `:py3do` command works similar to `:pydo`.
 
 							*E880*
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
new file mode 100644
index 0000000000..fdd63501ea
--- /dev/null
+++ b/runtime/doc/if_ruby.txt
@@ -0,0 +1,185 @@
+*if_ruby.txt*
+
+
+		  VIM REFERENCE MANUAL    by Shugo Maeda
+
+The Ruby Interface to Vim				*ruby* *Ruby*
+
+
+1. Commands			|ruby-commands|
+2. The VIM module		|ruby-vim|
+3. VIM::Buffer objects		|ruby-buffer|
+4. VIM::Window objects		|ruby-window|
+5. Global variables		|ruby-globals|
+
+			*E266* *E267* *E268* *E269* *E270* *E271* *E272* *E273*
+
+The home page for ruby is http://www.ruby-lang.org/.  You can find links for
+downloading Ruby there.
+
+==============================================================================
+1. Commands						*ruby-commands*
+
+							*:ruby* *:rub*
+:rub[y] {cmd}		Execute Ruby command {cmd}.  A command to try it out: >
+				:ruby print "Hello"
+
+:rub[y] << {endpattern}
+{script}
+{endpattern}
+			Execute Ruby script {script}.
+			{endpattern} must NOT be preceded by any white space.
+			If {endpattern} is omitted, it defaults to a dot '.'
+			like for the |:append| and |:insert| commands.  This
+			form of the |:ruby| command is mainly useful for
+			including ruby code in vim scripts.
+			Note: This command doesn't work when the Ruby feature
+			wasn't compiled in.  To avoid errors, see
+			|script-here|.
+
+Example Vim script: >
+
+	function! RedGem()
+	ruby << EOF
+	class Garnet
+		def initialize(s)
+			@buffer = VIM::Buffer.current
+			vimputs(s)
+		end
+		def vimputs(s)
+			@buffer.append(@buffer.count,s)
+		end
+	end
+	gem = Garnet.new("pretty")
+	EOF
+	endfunction
+<
+
+						*:rubydo* *:rubyd* *E265*
+:[range]rubyd[o] {cmd}	Evaluate Ruby command {cmd} for each line in the
+			[range], with $_ being set to the text of each line in
+			turn, without a trailing <EOL>.  Setting $_ will change
+			the text, but note that it is not possible to add or
+			delete lines using this command.
+			The default for [range] is the whole file: "1,$".
+
+							*:rubyfile* *:rubyf*
+:rubyf[ile] {file}	Execute the Ruby script in {file}.  This is the same as
+			":ruby load 'file'", but allows file name completion.
+
+Executing Ruby commands is not possible in the |sandbox|.
+
+==============================================================================
+2. The VIM module					*ruby-vim*
+
+Ruby code gets all of its access to vim via the "VIM" module.
+
+Overview >
+	print "Hello"			      # displays a message
+	VIM.command(cmd)		      # execute an Ex command
+	num = VIM::Window.count		      # gets the number of windows
+	w = VIM::Window[n]		      # gets window "n"
+	cw = VIM::Window.current	      # gets the current window
+	num = VIM::Buffer.count		      # gets the number of buffers
+	b = VIM::Buffer[n]		      # gets buffer "n"
+	cb = VIM::Buffer.current	      # gets the current buffer
+	w.height = lines		      # sets the window height
+	w.cursor = [row, col]		      # sets the window cursor position
+	pos = w.cursor			      # gets an array [row, col]
+	name = b.name			      # gets the buffer file name
+	line = b[n]			      # gets a line from the buffer
+	num = b.count			      # gets the number of lines
+	b[n] = str			      # sets a line in the buffer
+	b.delete(n)			      # deletes a line
+	b.append(n, str)		      # appends a line after n
+	line = VIM::Buffer.current.line       # gets the current line
+	num = VIM::Buffer.current.line_number # gets the current line number
+	VIM::Buffer.current.line = "test"     # sets the current line number
+<
+
+Module Functions:
+
+							*ruby-message*
+VIM::message({msg})
+	Displays the message {msg}.
+
+							*ruby-set_option*
+VIM::set_option({arg})
+	Sets a vim option.  {arg} can be any argument that the ":set" command
+	accepts.  Note that this means that no spaces are allowed in the
+	argument!  See |:set|.
+
+							*ruby-command*
+VIM::command({cmd})
+	Executes Ex command {cmd}.
+
+							*ruby-evaluate*
+VIM::evaluate({expr})
+	Evaluates {expr} using the vim internal expression evaluator (see
+	|expression|).  Returns the expression result as a string.
+	A |List| is turned into a string by joining the items and inserting
+	line breaks.
+
+==============================================================================
+3. VIM::Buffer objects					*ruby-buffer*
+
+VIM::Buffer objects represent vim buffers.
+
+Class Methods:
+
+current		Returns the current buffer object.
+count		Returns the number of buffers.
+self[{n}]	Returns the buffer object for the number {n}.  The first number
+		is 0.
+
+Methods:
+
+name		Returns the name of the buffer.
+number		Returns the number of the buffer.
+count		Returns the number of lines.
+length		Returns the number of lines.
+self[{n}]	Returns a line from the buffer. {n} is the line number.
+self[{n}] = {str}
+		Sets a line in the buffer. {n} is the line number.
+delete({n})	Deletes a line from the buffer. {n} is the line number.
+append({n}, {str})
+		Appends a line after the line {n}.
+line		Returns the current line of the buffer if the buffer is
+		active.
+line = {str}    Sets the current line of the buffer if the buffer is active.
+line_number     Returns the number of the current line if the buffer is
+		active.
+
+==============================================================================
+4. VIM::Window objects					*ruby-window*
+
+VIM::Window objects represent vim windows.
+
+Class Methods:
+
+current		Returns the current window object.
+count		Returns the number of windows.
+self[{n}]	Returns the window object for the number {n}.  The first number
+		is 0.
+
+Methods:
+
+buffer		Returns the buffer displayed in the window.
+height		Returns the height of the window.
+height = {n}	Sets the window height to {n}.
+width		Returns the width of the window.
+width = {n}	Sets the window width to {n}.
+cursor		Returns a [row, col] array for the cursor position.
+cursor = [{row}, {col}]
+		Sets the cursor position to {row} and {col}.
+
+==============================================================================
+5. Global variables					*ruby-globals*
+
+There are two global variables.
+
+$curwin		The current window object.
+$curbuf		The current buffer object.
+
+==============================================================================
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 6e96d9b816..496ccbc703 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -810,7 +810,7 @@ PHP indenting can be altered in several ways by modifying the values of some
 global variables:
 
 					*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
 own 'formatoptions'): >
     :let g:PHP_autoformatcomment = 0
 
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index e6c1ccc0cf..7388652f16 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt*     For Vim version 7.4.  Last change: 2016 Jan 03
+*index.txt*     For Vim version 7.4.  Last change: 2016 Jun 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -48,6 +48,7 @@ tag		char		action in Insert mode	~
 |i_CTRL-G_k|	CTRL-G k	line up, to column where inserting started
 |i_CTRL-G_k|	CTRL-G <Up>	line up, to column where inserting started
 |i_CTRL-G_u|	CTRL-G u	start new undoable edit
+|i_CTRL-G_U|	CTRL-G U	don't break undo with next cursor movement
 |i_<BS>|	<BS>		delete character before the cursor
 |i_digraph|	{char1}<BS>{char2}
 				enter digraph (only when 'digraph' option set)
@@ -857,6 +858,7 @@ tag		command	      note action in Visual mode	~
 ------------------------------------------------------------------------------
 |v_CTRL-\_CTRL-N| CTRL-\ CTRL-N	   stop Visual mode
 |v_CTRL-\_CTRL-G| CTRL-\ CTRL-G	   go to mode specified with 'insertmode'
+|v_CTRL-A|	CTRL-A		2  add N to number in highlighted text
 |v_CTRL-C|	CTRL-C		   stop Visual mode
 |v_CTRL-G|	CTRL-G		   toggle between Visual mode and Select mode
 |v_<BS>|	<BS>		2  Select mode: delete highlighted area
@@ -865,6 +867,7 @@ tag		command	      note action in Visual mode	~
 				   command
 |v_CTRL-V|	CTRL-V		   make Visual mode blockwise or stop Visual
 				   mode
+|v_CTRL-X|	CTRL-X		2  subtract N from number in highlighted text
 |v_<Esc>|	<Esc>		   stop Visual mode
 |v_CTRL-]|	CTRL-]		   jump to highlighted tag
 |v_!|		!{filter}	2  filter the highlighted lines through the
@@ -921,6 +924,8 @@ tag		command	      note action in Visual mode	~
 |v_a}|		a}		   same as aB
 |v_c|		c		2  delete highlighted area and start insert
 |v_d|		d		2  delete highlighted area
+|v_g_CTRL-A|	g CTRL-A	2  add N to number in highlighted text
+|v_g_CTRL-X|	g CTRL-X	2  subtract N from number in highlighted text
 |v_gJ|		gJ		2  join the highlighted lines without
 				   inserting spaces
 |v_gq|		gq		2  format the highlighted lines
@@ -1129,6 +1134,7 @@ tag	      command	      action ~
 |:caddfile|	:caddf[ile]	add error message to current quickfix list
 |:call|		:cal[l]		call a function
 |:catch|	:cat[ch]	part of a :try command
+|:cbottom|	:cbo[ttom]	scroll to the bottom of the quickfix window
 |:cbuffer|	:cb[uffer]	parse error messages and jump to first error
 |:cc|		:cc		go to specific error
 |:cclose|	:ccl[ose]	close quickfix window
@@ -1146,8 +1152,9 @@ tag	      command	      action ~
 |:chdir|	:chd[ir]	change directory
 |:checkpath|	:che[ckpath]	list included files
 |:checktime|	:checkt[ime]	check timestamp of loaded buffers
-|:clist|	:cl[ist]	list all errors
 |:clast|	:cla[st]	go to the specified error, default last one
+|:clearjumps|	:cle[arjumps]	clear the jump list
+|:clist|	:cl[ist]	list all errors
 |:close|	:clo[se]	close current window
 |:cmap|		:cm[ap]		like ":map" but for Command-line mode
 |:cmapclear|	:cmapc[lear]	clear all mappings for Command-line mode
@@ -1171,7 +1178,7 @@ tag	      command	      action ~
 |:cpfile|	:cpf[ile]	go to last error in previous file
 |:cquit|	:cq[uit]	quit Vim with an error code
 |:crewind|	:cr[ewind]	go to the specified error, default first one
-|:cscope|	:cs[cope]       execute cscope command
+|:cscope|	:cs[cope]	execute cscope command
 |:cstag|	:cst[ag]	use cscope to jump to a tag
 |:cunmap|	:cu[nmap]	like ":unmap" but for Command-line mode
 |:cunabbrev|	:cuna[bbrev]	like ":unabbrev" but for Command-line mode
@@ -1286,11 +1293,12 @@ tag	      command	      action ~
 |:last|		:la[st]		go to the last file in the argument list
 |:language|	:lan[guage]	set the language (locale)
 |:later|	:lat[er]	go to newer change, redo
+|:lbottom|	:lbo[ttom]	scroll to the bottom of the location window
 |:lbuffer|	:lb[uffer]	parse locations and jump to first location
 |:lcd|		:lc[d]		change directory locally
 |:lchdir|	:lch[dir]	change directory locally
 |:lclose|	:lcl[ose]	close location window
-|:lcscope|	:lcs[cope]      like ":cscope" but uses location list
+|:lcscope|	:lcs[cope]	like ":cscope" but uses location list
 |:ldo|		:ld[o]		execute command in valid location list entries
 |:lfdo|		:lfd[o]		execute command in each file in location list
 |:left|		:le[ft]		left align lines
@@ -1341,7 +1349,7 @@ tag	      command	      action ~
 |:marks|	:marks		list all marks
 |:match|	:mat[ch]	define a match to highlight
 |:menu|		:me[nu]		enter a new menu item
-|:menutranslate| :menut[ranslate] add a menu translation item
+|:menutranslate|  :menut[ranslate] add a menu translation item
 |:messages|	:mes[sages]	view previously displayed messages
 |:mkexrc|	:mk[exrc]	write current mappings and settings to a file
 |:mksession|	:mks[ession]	write session info to a file
@@ -1378,6 +1386,8 @@ tag	      command	      action ~
 |:ounmap|	:ou[nmap]	like ":unmap" but for Operator-pending mode
 |:ounmenu|	:ounme[nu]	remove menu for Operator-pending mode
 |:ownsyntax|	:ow[nsyntax]	set new local syntax highlight for this window
+|:packadd|	:pa[ckadd]	add a plugin from 'packpath'
+|:packloadall|	:packl[oadall]	load all packages under 'packpath'
 |:pclose|	:pc[lose]	close preview window
 |:pedit|	:ped[it]	edit file in the preview window
 |:print|	:p[rint]	print lines
@@ -1494,7 +1504,7 @@ tag	      command	      action ~
 |:stop|		:st[op]		suspend the editor or escape to a shell
 |:stag|		:sta[g]		split window and jump to a tag
 |:startinsert|	:star[tinsert]	start Insert mode
-|:startgreplace| :startg[replace] start Virtual Replace mode
+|:startgreplace|  :startg[replace] start Virtual Replace mode
 |:startreplace|	:startr[eplace]	start Replace mode
 |:stopinsert|	:stopi[nsert]	stop Insert mode
 |:stjump|	:stj[ump]	do ":tjump" and split window
@@ -1515,14 +1525,14 @@ tag	      command	      action ~
 |:tabdo|	:tabdo		execute command in each tab page
 |:tabedit|	:tabe[dit]	edit a file in a new tab page
 |:tabfind|	:tabf[ind]	find file in 'path', edit it in a new tab page
-|:tabfirst|	:tabfir[st]	got to first tab page
-|:tablast|	:tabl[ast]	got to last tab page
+|:tabfirst|	:tabfir[st]	go to first tab page
+|:tablast|	:tabl[ast]	go to last tab page
 |:tabmove|	:tabm[ove]	move tab page to other position
 |:tabnew|	:tabnew		edit a file in a new tab page
 |:tabnext|	:tabn[ext]	go to next tab page
 |:tabonly|	:tabo[nly]	close all tab pages except the current one
 |:tabprevious|	:tabp[revious]	go to previous tab page
-|:tabrewind|	:tabr[ewind]	got to first tab page
+|:tabrewind|	:tabr[ewind]	go to first tab page
 |:tabs|		:tabs		list the tab pages and what they contain
 |:tab|		:tab		create new tab when opening new window
 |:tag|		:ta[g]		jump to tag
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index f931dfa341..a82e17c857 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.4.  Last change: 2015 Sep 15
+*insert.txt*    For Vim version 7.4.  Last change: 2016 Jan 31
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1436,7 +1436,7 @@ original HTML files completion of tags (and only tags) isn't context aware.
 
 RUBY						 *ft-ruby-omni* {Nvim}
 
-NOTE: Completion for ruby code is not currently provided by Nvim.
+NOTE: |compl-omni| for Ruby code requires |provider-ruby| to be installed.
 
 Ruby completion will parse your buffer on demand in order to provide a list of
 completions.  These completions will be drawn from modules loaded by 'require'
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index cbe017e051..786097dd74 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -450,7 +450,7 @@ notation	meaning		    equivalent	decimal value(s)	~
 <k0> - <k9>	keypad 0 to 9			*keypad-0* *keypad-9*
 <S-...>		shift-key			*shift* *<S-*
 <C-...>		control-key			*control* *ctrl* *<C-*
-<M-...>		alt-key or meta-key		*meta* *alt* *<M-*
+<M-...>		alt-key or meta-key		*META* *meta* *alt* *<M-*
 <A-...>		same as <M-...>			*<A-*
 <D-...>		command-key or "super" key	*<D-*
 <t_xx>		key with "xx" entry in termcap
diff --git a/runtime/doc/job_control.txt b/runtime/doc/job_control.txt
index 587eba4162..1aa7ce06d6 100644
--- a/runtime/doc/job_control.txt
+++ b/runtime/doc/job_control.txt
@@ -40,7 +40,7 @@ for details.
 Job control is achieved by calling a combination of the |jobstart()|,
 |jobsend()| and |jobstop()| functions. Here's an example:
 >
-    function s:JobHandler(job_id, data, event)
+    function! s:JobHandler(job_id, data, event) dict
       if a:event == 'stdout'
         let str = self.shell.' stdout: '.join(a:data)
       elseif a:event == 'stderr'
@@ -84,28 +84,41 @@ Here's what is happening:
      program.
   2: The event type, which is "stdout", "stderr" or "exit".
 
+  Note: Buffered stdout/stderr data which has not been flushed by the sender
+        will not trigger the "stdout" callback (but if the process ends, the
+        "exit" callback will be triggered).
+        For example, "ruby -e" buffers output, so small strings will be
+        buffered unless "auto-flushing" ($stdout.sync=true) is enabled. >
+          function! Receive(job_id, data, event)
+            echom printf('%s: %s',a:event,string(a:data))
+          endfunction
+          call jobstart(['ruby', '-e',
+            \ '$stdout.sync = true; 5.times do sleep 1 and puts "Hello Ruby!" end'],
+            \ {'on_stdout': 'Receive'})
+<       https://github.com/neovim/neovim/issues/1592
+
 The options dictionary is passed as the "self" variable to the callback
 function. Here's a more object-oriented version of the above:
 >
     let Shell = {}
 
-    function Shell.on_stdout(job_id, data)
+    function Shell.on_stdout(job_id, data) dict
       call append(line('$'), self.get_name().' stdout: '.join(a:data))
     endfunction
 
-    function Shell.on_stderr(job_id, data)
+    function Shell.on_stderr(job_id, data) dict
       call append(line('$'), self.get_name().' stderr: '.join(a:data))
     endfunction
 
-    function Shell.on_exit(job_id, data)
+    function Shell.on_exit(job_id, data) dict
       call append(line('$'), self.get_name().' exited')
     endfunction
 
-    function Shell.get_name()
+    function Shell.get_name() dict
       return 'shell '.self.name
     endfunction
 
-    function Shell.new(name, ...)
+    function Shell.new(name, ...) dict
       let instance = extend(copy(g:Shell), {'name': a:name})
       let argv = ['bash']
       if a:0 > 0
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 464c700a4d..53b152dc06 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt*       For Vim version 7.4.  Last change: 2014 Dec 08
+*map.txt*       For Vim version 7.4.  Last change: 2016 Jul 06
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -55,6 +55,7 @@ modes.
 :im[ap]	{lhs} {rhs}		|mapmode-i|		*:im* *:imap*
 :lm[ap]	{lhs} {rhs}		|mapmode-l|		*:lm* *:lmap*
 :cm[ap]	{lhs} {rhs}		|mapmode-c|		*:cm* *:cmap*
+:tm[ap]	{lhs} {rhs}		|mapmode-t|		*:tm* *:tmap*
 			Map the key sequence {lhs} to {rhs} for the modes
 			where the map command applies.  The result, including
 			{rhs}, is then further scanned for mappings.  This
@@ -71,6 +72,7 @@ modes.
 :ino[remap] {lhs} {rhs}		|mapmode-i|	*:ino* *:inoremap*
 :ln[oremap] {lhs} {rhs}		|mapmode-l|	*:ln*  *:lnoremap*
 :cno[remap] {lhs} {rhs}		|mapmode-c|	*:cno* *:cnoremap*
+:tno[remap] {lhs} {rhs}		|mapmode-t|	*:tno* *:tnoremap*
 			Map the key sequence {lhs} to {rhs} for the modes
 			where the map command applies.  Disallow mapping of
 			{rhs}, to avoid nested and recursive mappings.  Often
@@ -87,6 +89,7 @@ modes.
 :iu[nmap] {lhs}			|mapmode-i|		*:iu*   *:iunmap*
 :lu[nmap] {lhs}			|mapmode-l|		*:lu*   *:lunmap*
 :cu[nmap] {lhs}			|mapmode-c|		*:cu*   *:cunmap*
+:tu[nmap] {lhs}			|mapmode-t|		*:tu*   *:tunmap*
 			Remove the mapping of {lhs} for the modes where the
 			map command applies.  The mapping may remain defined
 			for other modes where it applies.
@@ -105,6 +108,7 @@ modes.
 :imapc[lear]			|mapmode-i|		*:imapc*  *:imapclear*
 :lmapc[lear]			|mapmode-l|		*:lmapc*  *:lmapclear*
 :cmapc[lear]			|mapmode-c|		*:cmapc*  *:cmapclear*
+:tmapc[lear]			|mapmode-t|		*:tmapc*  *:tmapclear*
 			Remove ALL mappings for the modes where the map
 			command applies.
 			Use the <buffer> argument to remove buffer-local
@@ -121,6 +125,7 @@ modes.
 :im[ap]				|mapmode-i|
 :lm[ap]				|mapmode-l|
 :cm[ap]				|mapmode-c|
+:tm[ap]				|mapmode-t|
 			List all key mappings for the modes where the map
 			command applies.  Note that ":map" and ":map!" are
 			used most often, because they include the other modes.
@@ -135,6 +140,7 @@ modes.
 :im[ap] {lhs}			|mapmode-i|		*:imap_l*
 :lm[ap] {lhs}			|mapmode-l|		*:lmap_l*
 :cm[ap] {lhs}			|mapmode-c|		*:cmap_l*
+:tm[ap] {lhs}			|mapmode-t|		*:tmap_l*
 			List the key mappings for the key sequences starting
 			with {lhs} in the modes where the map command applies.
 
@@ -288,9 +294,9 @@ as a special key.
 
 
 1.3 MAPPING AND MODES					*:map-modes*
-			*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*
+		*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o* *mapmode-t*
 
-There are six sets of mappings
+There are seven sets of mappings
 - For Normal mode: When typing commands.
 - For Visual mode: When typing commands while the Visual area is highlighted.
 - For Select mode: like Visual mode but typing text replaces the selection.
@@ -298,6 +304,7 @@ There are six sets of mappings
   etc.).  See below: |omap-info|.
 - For Insert mode.  These are also used in Replace mode.
 - For Command-line mode: When entering a ":" or "/" command.
+- For Terminal mode: When typing in a |:terminal| buffer.
 
 Special case: While typing a count for a command in Normal mode, mapping zero
 is disabled.  This makes it possible to map zero without making it impossible
@@ -316,6 +323,7 @@ Overview of which map command works in which mode.  More details below.
 :imap  :inoremap :iunmap    Insert
 :lmap  :lnoremap :lunmap    Insert, Command-line, Lang-Arg
 :cmap  :cnoremap :cunmap    Command-line
+:tmap  :tnoremap :tunmap    Terminal
 
 
     COMMANDS				      MODES ~
@@ -481,7 +489,7 @@ internal code is written to the script file.
 
 
 1.6 SPECIAL CHARACTERS					*:map-special-chars*
-							*map_backslash*
+						*map_backslash* *map-backslash*
 Note that only CTRL-V is mentioned here as a special character for mappings
 and abbreviations.  When 'cpoptions' does not contain 'B', a backslash can
 also be used like CTRL-V.  The <> notation can be fully used then |<>|.  But
@@ -492,21 +500,21 @@ To map a backslash, or use a backslash literally in the {rhs}, the special
 sequence "<Bslash>" can be used.  This avoids the need to double backslashes
 when using nested mappings.
 
-							*map_CTRL-C*
+						*map_CTRL-C* *map-CTRL-C*
 Using CTRL-C in the {lhs} is possible, but it will only work when Vim is
 waiting for a key, not when Vim is busy with something.  When Vim is busy
 CTRL-C interrupts/breaks the command.
 When using the GUI version on MS-Windows CTRL-C can be mapped to allow a Copy
 command to the clipboard.  Use CTRL-Break to interrupt Vim.
 
-							*map_space_in_lhs*
+					*map_space_in_lhs* *map-space_in_lhs*
 To include a space in {lhs} precede it with a CTRL-V (type two CTRL-Vs for
 each space).
-							*map_space_in_rhs*
+					*map_space_in_rhs* *map-space_in_rhs*
 If you want a {rhs} that starts with a space, use "<Space>".  To be fully Vi
 compatible (but unreadable) don't use the |<>| notation, precede {rhs} with a
 single CTRL-V (you have to type CTRL-V two times).
-							*map_empty_rhs*
+						*map_empty_rhs* *map-empty-rhs*
 You can create an empty {rhs} by typing nothing after a single CTRL-V (you
 have to type CTRL-V two times).  Unfortunately, you cannot do this in a vimrc
 file.
@@ -581,7 +589,7 @@ Upper and lowercase differences are ignored.
 It is not possible to put a comment after these commands, because the '"'
 character is considered to be part of the {lhs} or {rhs}.
 
-							*map_bar*
+							*map_bar* *map-bar*
 Since the '|' character is used to separate a map command from the next
 command, you will have to do something special to include  a '|' in {rhs}.
 There are three methods:
@@ -599,7 +607,7 @@ When 'b' is present in 'cpoptions', "\|" will be recognized as a mapping
 ending in a '\' and then another command.  This is Vi compatible, but
 illogical when compared to other commands.
 
-							*map_return*
+						*map_return* *map-return*
 When you have a mapping that contains an Ex command, you need to put a line
 terminator after it to have it executed.  The use of <CR> is recommended for
 this (see |<>|).  Example: >
@@ -1260,6 +1268,7 @@ completion can be enabled:
 	-complete=mapping	mapping name
 	-complete=menu		menus
 	-complete=option	options
+	-complete=packadd	optional package |pack-add| names
 	-complete=shellcmd	Shell command
 	-complete=sign		|:sign| suboptions
 	-complete=syntax	syntax file names |'syntax'|
@@ -1344,7 +1353,7 @@ Possible attributes are:
 Note that -range=N and -count=N are mutually exclusive - only one should be
 specified.
 
-                                                  *E889* *:command-addr*
+                                                  *:command-addr*
 It is possible that the special characters in the range like `.`, `$` or `%`
 which by default correspond to the current line, last line and the whole
 buffer, relate to arguments, (loaded) buffers, windows or tab pages.
@@ -1398,6 +1407,27 @@ The valid escape sequences are
 	<bang>	(See the '-bang' attribute) Expands to a ! if the
 		command was executed with a ! modifier, otherwise
 		expands to nothing.
+						*<mods>*
+	<mods>  The command modifiers, if specified. Otherwise, expands to
+		nothing. Supported modifiers are |:aboveleft|, |:belowright|,
+		|:botright|, |:browse|, |:confirm|, |:hide|, |:keepalt|,
+		|:keepjumps|, |:keepmarks|, |:keeppatterns|, |:lockmarks|,
+		|:noswapfile|, |:silent|, |:tab|, |:topleft|, |:verbose|, and
+		|:vertical|.
+		Examples: >
+		    command! -nargs=+ -complete=file MyEdit
+				\ for f in expand(<q-args>, 0, 1) |
+				\ exe '<mods> split ' . f |
+				\ endfor
+
+		    function! SpecialEdit(files, mods)
+			for f in expand(a:files, 0, 1)
+			    exe a:mods . ' split ' . f
+			endfor
+		    endfunction
+		    command! -nargs=+ -complete=file Sedit
+				\ call SpecialEdit(<q-args>, <q-mods>)
+<
 						*<reg>* *<register>*
 	<reg>	(See the '-register' attribute) The optional register,
 		if specified.  Otherwise, expands to nothing.  <register>
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index c87ed317d4..355a1da423 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt*     For Vim version 7.4.  Last change: 2013 May 18
+*mbyte.txt*     For Vim version 7.4.  Last change: 2016 Jul 21
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar et al.
@@ -70,29 +70,24 @@ See |mbyte-locale| for details.
 
 ENCODING
 
-If your locale works properly, Vim will try to set the 'encoding' option
-accordingly.  If this doesn't work you can overrule its value: >
+Nvim always uses UTF-8 internally. Thus 'encoding' option is always set
+to "utf-8" and cannot be changed.
 
-	:set encoding=utf-8
+All the text that is used inside Vim will be in UTF-8. Not only the text in
+the buffers, but also in registers, variables, etc.
 
-See |encoding-values| for a list of acceptable values.
-
-The result is that all the text that is used inside Vim will be in this
-encoding.  Not only the text in the buffers, but also in registers, variables,
-etc. 'encoding' is read-only after startup because changing it would make the
-existing text invalid.
-
-You can edit files in another encoding than what 'encoding' is set to.  Vim
+You can edit files in different encodings than UTF-8.  Nvim
 will convert the file when you read it and convert it back when you write it.
 See 'fileencoding', 'fileencodings' and |++enc|.
 
 
 DISPLAY AND FONTS
 
-If you are working in a terminal (emulator) you must make sure it accepts the
-same encoding as which Vim is working with.
+If you are working in a terminal (emulator) you must make sure it accepts
+UTF-8, the encoding which Vim is working with. Otherwise only ASCII can
+be displayed and edited correctly.
 
-For the GUI you must select fonts that work with the current 'encoding'.  This
+For the GUI you must select fonts that work with UTF-8.  This
 is the difficult part.  It depends on the system you are using, the locale and
 a few other things.  See the chapters on fonts: |mbyte-fonts-X11| for
 X-Windows and |mbyte-fonts-MSwin| for MS-Windows.
@@ -216,10 +211,9 @@ You could make a small shell script for this.
 ==============================================================================
 3.  Encoding				*mbyte-encoding*
 
-Vim uses the 'encoding' option to specify how characters are identified and
-encoded when they are used inside Vim.  This applies to all the places where
-text is used, including buffers (files loaded into memory), registers and
-variables.
+In Nvim UTF-8 is always used internally to encode characters.
+ This applies to all the places where text is used, including buffers (files
+ loaded into memory), registers and variables.
 
 							*charset* *codeset*
 Charset is another name for encoding.  There are subtle differences, but these
@@ -240,7 +234,7 @@ matter what language is used.  Thus you might see the right text even when the
 encoding was set wrong.
 
 							*encoding-names*
-Vim can use many different character encodings.  There are three major groups:
+Vim can edit files in different character encodings.  There are three major groups:
 
 1   8bit	Single-byte encodings, 256 different characters.  Mostly used
 		in USA and Europe.  Example: ISO-8859-1 (Latin1).  All
@@ -255,11 +249,10 @@ u   Unicode	Universal encoding, can replace all others.  ISO 10646.
 		Millions of different characters.  Example: UTF-8.  The
 		relation between bytes and screen cells is complex.
 
-Other encodings cannot be used by Vim internally.  But files in other
+Only UTF-8 is used by Vim internally.  But files in other
 encodings can be edited by using conversion, see 'fileencoding'.
-Note that all encodings must use ASCII for the characters up to 128.
 
-Supported 'encoding' values are:			*encoding-values*
+Recognized 'fileencoding' values include:		*encoding-values*
 1   latin1	8-bit characters (ISO 8859-1, also used for cp1252)
 1   iso-8859-n	ISO_8859 variant (n = 2 to 15)
 1   koi8-r	Russian
@@ -311,11 +304,11 @@ u   ucs-4	32 bit UCS-4 encoded Unicode (ISO/IEC 10646-1)
 u   ucs-4le	like ucs-4, little endian
 
 The {name} can be any encoding name that your system supports.  It is passed
-to iconv() to convert between the encoding of the file and the current locale.
+to iconv() to convert between UTF-8 and the encoding of the file.
 For MS-Windows "cp{number}" means using codepage {number}.
 Examples: >
-		:set encoding=8bit-cp1252
-		:set encoding=2byte-cp932
+		:set fileencoding=8bit-cp1252
+		:set fileencoding=2byte-cp932
 
 The MS-Windows codepage 1252 is very similar to latin1.  For practical reasons
 the same encoding is used and it's called latin1.  'isprint' can be used to
@@ -337,8 +330,7 @@ u   ucs-2be	same as ucs-2 (big endian)
 u   ucs-4be	same as ucs-4 (big endian)
 u   utf-32	same as ucs-4
 u   utf-32le	same as ucs-4le
-    default     stands for the default value of 'encoding', depends on the
-		environment
+    default     the encoding of the current locale.
 
 For the UCS codes the byte order matters.  This is tricky, use UTF-8 whenever
 you can.  The default is to use big-endian (most significant byte comes
@@ -363,13 +355,12 @@ or when conversion is not possible:
 CONVERSION						*charset-conversion*
 
 Vim will automatically convert from one to another encoding in several places:
-- When reading a file and 'fileencoding' is different from 'encoding'
-- When writing a file and 'fileencoding' is different from 'encoding'
+- When reading a file and 'fileencoding' is different from "utf-8"
+- When writing a file and 'fileencoding' is different from "utf-8"
 - When displaying messages and the encoding used for LC_MESSAGES differs from
-  'encoding' (requires a gettext version that supports this).
+  "utf-8" (requires a gettext version that supports this).
 - When reading a Vim script where |:scriptencoding| is different from
-  'encoding'.
-- When reading or writing a |shada| file.
+  "utf-8".
 Most of these require the |+iconv| feature.  Conversion for reading and
 writing files may also be specified with the 'charconvert' option.
 
@@ -408,11 +399,11 @@ Useful utilities for converting the charset:
 
 
 							*mbyte-conversion*
-When reading and writing files in an encoding different from 'encoding',
+When reading and writing files in an encoding different from "utf-8",
 conversion needs to be done.  These conversions are supported:
 - All conversions between Latin-1 (ISO-8859-1), UTF-8, UCS-2 and UCS-4 are
   handled internally.
-- For MS-Windows, when 'encoding' is a Unicode encoding, conversion from and
+- For MS-Windows, conversion from and
   to any codepage should work.
 - Conversion specified with 'charconvert'
 - Conversion with the iconv library, if it is available.
@@ -468,8 +459,6 @@ and you will have a working UTF-8 terminal emulator.  Try both >
 with the demo text that comes with ucs-fonts.tar.gz in order to see
 whether there are any problems with UTF-8 in your xterm.
 
-For Vim you may need to set 'encoding' to "utf-8".
-
 ==============================================================================
 5.  Fonts on X11					*mbyte-fonts-X11*
 
@@ -860,15 +849,16 @@ text, you can use the 'keymap' option.  This will translate one or more
 (English) characters to another (non-English) character.  This only happens
 when typing text, not when typing Vim commands.  This avoids having to switch
 between two keyboard settings.
+{only available when compiled with the |+keymap| feature}
 
 The value of the 'keymap' option specifies a keymap file to use.  The name of
 this file is one of these two:
 
-	keymap/{keymap}_{encoding}.vim
+	keymap/{keymap}_utf-8.vim
 	keymap/{keymap}.vim
 
-Here {keymap} is the value of the 'keymap' option and {encoding} of the
-'encoding' option.  The file name with the {encoding} included is tried first.
+Here {keymap} is the value of the 'keymap' option.
+The file name with "utf-8" included is tried first.
 
 'runtimepath' is used to find these files.  To see an overview of all
 available keymap files, use this: >
@@ -950,7 +940,7 @@ this is unusual.  But you can use various ways to specify the character: >
 	A	<char-0141>	octal value
 	x	<Space>		special key name
 
-The characters are assumed to be encoded for the current value of 'encoding'.
+The characters are assumed to be encoded in UTF-8.
 It's possible to use ":scriptencoding" when all characters are given
 literally.  That doesn't work when using the <char-> construct, because the
 conversion is done on the keymap file, not on the resulting character.
@@ -1170,21 +1160,13 @@ Useful commands:
   message is truncated, use ":messages").
 - "g8" shows the bytes used in a UTF-8 character, also the composing
   characters, as hex numbers.
-- ":set encoding=utf-8 fileencodings=" forces using UTF-8 for all files.  The
-  default is to use the current locale for 'encoding' and set 'fileencodings'
-  to automatically detect the encoding of a file.
+- ":set fileencodings=" forces using UTF-8 for all files.  The
+  default is to automatically detect the encoding of a file.
 
 
 STARTING VIM
 
-If your current locale is in an utf-8 encoding, Vim will automatically start
-in utf-8 mode.
-
-If you are using another locale: >
-
-	set encoding=utf-8
-
-You might also want to select the font used for the menus.  Unfortunately this
+You might want to select the font used for the menus.  Unfortunately this
 doesn't always work.  See the system specific remarks below, and 'langmenu'.
 
 
@@ -1245,10 +1227,9 @@ not everybody is able to type a composing character.
 These options are relevant for editing multi-byte files.  Check the help in
 options.txt for detailed information.
 
-'encoding'	Encoding used for the keyboard and display.  It is also the
-		default encoding for files.
+'encoding'	Internal text encoding, always "utf-8".
 
-'fileencoding'	Encoding of a file.  When it's different from 'encoding'
+'fileencoding'	Encoding of a file.  When it's different from "utf-8"
 		conversion is done when reading or writing the file.
 
 'fileencodings'	List of possible encodings of a file.  When opening a file
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 114bb61d99..fd66a5dafb 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt*   For Vim version 7.4.  Last change: 2013 Feb 23
+*message.txt*   For Vim version 7.4.  Last change: 2016 Jul 14
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -19,6 +19,15 @@ The ":messages" command can be used to view previously given messages.  This
 is especially useful when messages have been overwritten or truncated.  This
 depends on the 'shortmess' option.
 
+	:messages		Show all messages.
+
+	:{count}messages	Show the {count} most recent messages.
+
+	:messages clear		Clear all messages.
+
+	:{count}messages clear	Clear messages, keeping only the {count} most
+				recent ones.
+
 The number of remembered messages is fixed at 20 for the tiny version and 200
 for other versions.
 
@@ -58,9 +67,9 @@ If you are lazy, it also works without the shift key: >
 When an error message is displayed, but it is removed before you could read
 it, you can see it again with: >
   :echo errmsg
-or view a list of recent messages with: >
+Or view a list of recent messages with: >
   :messages
-
+See `:messages` above.
 
 LIST OF MESSAGES
 			*E222* *E228* *E232* *E256* *E293* *E298* *E304* *E317*
@@ -656,6 +665,12 @@ You must be using an awful lot of buffers.  It's now possible that two buffers
 have the same number, which causes various problems.  You might want to exit
 Vim and restart it.
 
+							*E931*  >
+  Buffer cannot be registered
+
+Out of memory or a duplicate buffer number.  May habben after W14.  Looking up
+a buffer will not always work, better restart Vim.
+
 							*E296* *E297*  >
   Seek error in swap file write
   Write error in swap file
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index 5f4642274c..a2be3cfd49 100644
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt*     For Vim version 7.4.  Last change: 2012 Jan 15
+*mlang.txt*     For Vim version 7.4.  Last change: 2016 Jan 16
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -94,13 +94,15 @@ If you used the self-installing .exe file, message translations should work
 already.  Otherwise get the libintl.dll file if you don't have it yet:
 
 	http://sourceforge.net/projects/gettext
+Or:
+	https://mlocati.github.io/gettext-iconv-windows/
 
 This also contains tools xgettext, msgformat and others.
 
 libintl.dll should be placed in same directory with (g)vim.exe, or some
-place where PATH environment value describe.  Message files (vim.mo)
-have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES", where "xx" is the
-abbreviation of the language (mostly two letters).
+place where PATH environment value describe.  Vim also finds libintl-8.dll.
+Message files (vim.mo) have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES",
+where "xx" is the abbreviation of the language (mostly two letters).
 
 If you write your own translations you need to generate the .po file and
 convert it to a .mo file.  You need to get the source distribution and read
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 7f84f2d2a3..606fd53fee 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -1,4 +1,4 @@
-*motion.txt*    For Vim version 7.4.  Last change: 2015 Jun 06
+*motion.txt*    For Vim version 7.4.  Last change: 2016 Jul 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -569,7 +569,7 @@ i[			"inner [] block", select [count] '[' ']' blocks.  This
 			When used in Visual mode it is made characterwise.
 
 a)							*v_a)* *a)* *a(*
-a(							*v_ab* *v_a(* *ab*
+a(							*vab* *v_ab* *v_a(* *ab*
 ab			"a block", select [count] blocks, from "[count] [(" to
 			the matching ')', including the '(' and ')' (see
 			|[(|).  Does not include white space outside of the
@@ -577,7 +577,7 @@ ab			"a block", select [count] blocks, from "[count] [(" to
 			When used in Visual mode it is made characterwise.
 
 i)							*v_i)* *i)* *i(*
-i(							*v_ib* *v_i(* *ib*
+i(							*vib* *v_ib* *v_i(* *ib*
 ib			"inner block", select [count] blocks, from "[count] [("
 			to the matching ')', excluding the '(' and ')' (see
 			|[(|).
@@ -1013,6 +1013,9 @@ CTRL-I			Go to [count] newer cursor position in jump list
 							*:ju* *:jumps*
 :ju[mps]		Print the jump list (not a motion command).
 
+							*:cle* *:clearjumps*
+:cle[arjumps]		Clear the jump list of the current window.
+
 							*jumplist*
 Jumps are remembered in a jump list.  With the CTRL-O and CTRL-I command you
 can go to cursor positions before older jumps, and back again.  Thus you can
diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index bafb9dfc2c..c074eb43ff 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -1,97 +1,93 @@
-*msgpack_rpc.txt*    For Nvim.						 {Nvim}
+*msgpack_rpc.txt*							{Nvim}
 
 
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
 
-The Msgpack-RPC Interface to Nvim				  *msgpack-rpc*
+RPC API for Nvim				     *RPC* *rpc* *msgpack-rpc*
 
-1. Introduction			|msgpack-rpc-intro|
-2. API mapping			|msgpack-rpc-api|
-3. Connecting			|msgpack-rpc-connecting|
-4. Clients			|msgpack-rpc-clients|
-5. Types			|msgpack-rpc-types|
-6. Wrapping methods		|msgpack-rpc-wrap-methods|
-7. Vimscript functions		|msgpack-rpc-vim-functions|
+1. Introduction			|rpc-intro|
+2. API mapping			|rpc-api|
+3. Connecting			|rpc-connecting|
+4. Clients			|rpc-api-client|
+5. Types			|rpc-types|
+6. Remote UIs			|rpc-remote-ui|
 
 ==============================================================================
-1. Introduction						    *msgpack-rpc-intro*
+1. Introduction						            *rpc-intro*
 
-The primary way to control a running Nvim instance is through
-MessagePack-RPC, a messaging protocol that uses the MessagePack serialization
-format: https://github.com/msgpack/msgpack/blob/7498cf3/spec.md.
-From now on, we refer to the protocol as msgpack-rpc.
+The primary way to control Nvim programmatically is the RPC API, which speaks
+MessagePack-RPC ("msgpack-rpc"), a messaging protocol that uses the
+MessagePack serialization format:
+  https://github.com/msgpack/msgpack/blob/0b8f5ac/spec.md
 
-At this point, only plugins use msgpack-rpc, but eventually even user
-interaction will happen through it, since user interfaces will be separate
-programs that control a headless Nvim instance.
+All kinds of Nvim "clients" use the RPC API: user interfaces (GUIs), remote
+plugins, scripts like "nvr" (https://github.com/mhinz/neovim-remote), and even
+`nvim` itself can control other `nvim` instances. By connecting to the RPC API
+programs can:
 
-By connecting to the msgpack-rpc interface, programs can:
+  - Call any API function
+  - Listen for events
+  - Receive remote calls from Nvim
 
-- Call any Nvim API function
-- Listen for Nvim events
-- Receive remote calls from Nvim
-
-Nvim's msgpack-rpc interface is like a more powerful version of Vim's
-`clientserver` feature.
+The RPC API is like a more powerful version of Vim's `clientserver` feature.
 
 ==============================================================================
-2. API mapping						      *msgpack-rpc-api*
+ 2. API mapping							    *rpc-api*
 
-The Nvim C API, see |nvim-api|, is automatically exposed to the msgpack-rpc
-interface by the build system, which parses headers at src/nvim/api from the
-project root. A dispatch function is generated, which matches msgpack-rpc method
-names with non-static API functions, converting/validating arguments and return
-values back to msgpack.
+The Nvim C |API| is automatically exposed to the RPC API by the build system,
+which parses headers at src/nvim/api/*. A dispatch function is generated which
+matches RPC API method names with public API functions, converting/validating
+arguments and return values back to msgpack.
 
-Client libraries will normally provide wrappers that hide msgpack-rpc details
-from programmers. The wrappers can be automatically generated by reading
-bundled API metadata from a compiled Nvim instance.
+Client libraries (|api-client|s) normally provide wrappers that hide
+msgpack-rpc details from application developers. The wrappers can be
+automatically generated by reading bundled API metadata from a compiled Nvim
+instance.
 
-There are two ways to obtain API metadata:
+There are three ways to obtain API metadata:
 
-1. By connecting to a running Nvim instance and calling `vim_get_api_info`
-   via msgpack-rpc. This is best for clients written in dynamically-typed
-   languages, which can define functions at runtime.
+  1. Connect to a running Nvim instance and call `nvim_get_api_info` via
+     msgpack-rpc. This is best for clients written in dynamic languages which
+     can define functions at runtime.
 
-2. By starting Nvim with the `--api-info` command-line option, which makes Nvim
-   dump a blob of msgpack metadata to standard output and exit. This is best
-   for clients written in statically-typed languages, which require a separate
-   compilation step.
+  2. Start Nvim with the |--api-info| option. Useful for clients written in
+     statically-compiled languages.
 
-Here's a simple way to get human-readable description of the API (requires
-Python and the `pyyaml`/`msgpack-python` pip packages):
->
-    nvim --api-info | python -c 'import msgpack, sys, yaml; print yaml.dump(msgpack.unpackb(sys.stdin.read()))' > api.yaml
+  3. Use the |api_info()| vimscript function.
+
+To get a human-readable list of API functions: >
+    :new|put =map(api_info().functions, 'v:val.name')
+<
+To get a formatted dump of the API using python (requires the `pyyaml` and
+`msgpack-python` packages): >
+    nvim --api-info | python -c 'import msgpack, sys, yaml; print yaml.dump(msgpack.unpackb(sys.stdin.read()))'
 <
 ==============================================================================
-3. Connecting					       *msgpack-rpc-connecting*
+3. Connecting						      *rpc-connecting*
 
-There are four ways to open msgpack-rpc streams to Nvim:
+There are several ways to open a msgpack-rpc channel to an Nvim instance:
 
-1. Through Nvim's stdin/stdout when it's started with the `--embed` option.
-   This is how other programs can embed Nvim.
+  1. Through stdin/stdout when `nvim` is started with `--embed`. This is how
+     applications can embed Nvim.
 
-2. Through the stdin/stdout of a program spawned by the |rpcstart()| function.
+  2. Through stdin/stdout of some other process spawned by |jobstart()|.
+     Set the "rpc" key to |v:true| in the options dict to use the job's stdin
+     and stdout as a single msgpack channel that is processed directly by
+     Nvim.  Then it is not possible to process raw data to or from the
+     process's stdin and stdout. stderr can still be used, though.
 
-							*$NVIM_LISTEN_ADDRESS*
-3. Through the socket automatically created with each instance. To get the
-   socket location for a running Nvim instance (which is random by default),
-   see the |$NVIM_LISTEN_ADDRESS| environment variable:
->
-       :echo $NVIM_LISTEN_ADDRESS
-<
-   See also |v:servername|.
+  3. Through the socket automatically created with each instance. The socket
+     location is stored in |v:servername|.
 
-4. Through a TCP/IP socket. To make Nvim listen on a TCP/IP socket, set the
-   |$NVIM_LISTEN_ADDRESS| environment variable in a shell before starting Nvim:
->
+  4. Through a TCP/IP socket. To make Nvim listen on a TCP/IP socket, set the
+     |$NVIM_LISTEN_ADDRESS| environment variable before starting Nvim: >
         NVIM_LISTEN_ADDRESS=127.0.0.1:6666 nvim
 <
-Connecting to the socket is the easiest way a programmer can test the API, which
-can be done through any msgpack-rpc client library or fully-featured Nvim client
-(which we'll see in the next section). Here's a Ruby script that prints 'hello
-world!' in the current Nvim instance:
+Connecting to the socket is the easiest way a programmer can test the API,
+which can be done through any msgpack-rpc client library or full-featured
+|api-client|. Here's a Ruby script that prints 'hello world!' in the current
+Nvim instance:
 >
     #!/usr/bin/env ruby
     # Requires msgpack-rpc: gem install msgpack-rpc
@@ -109,7 +105,7 @@ world!' in the current Nvim instance:
     require 'msgpack/rpc/transport/unix'
 
     nvim = MessagePack::RPC::Client.new(MessagePack::RPC::UNIXTransport.new, ENV['NVIM_LISTEN_ADDRESS'])
-    result = nvim.call(:vim_command, 'echo "hello world!"')
+    result = nvim.call(:nvim_command, 'echo "hello world!"')
 <
 A better way is to use the Python REPL with the `neovim` package, where API
 functions can be called interactively:
@@ -118,72 +114,110 @@ functions can be called interactively:
     >>> nvim = attach('socket', path='[address]')
     >>> nvim.command('echo "hello world!"')
 <
-One can also spawn and connect to an embedded Nvim instance via |rpcstart()|
+You can also embed an Nvim instance via |jobstart()|, and communicate using
+|rpcrequest()| and |rpcnotify()|:
 >
-    let vim = rpcstart('nvim', ['--embed'])
-    echo rpcrequest(vim, 'vim_eval', '"Hello " . "world!"')
-    call rpcstop(vim)
+    let nvim = jobstart(['nvim', '--embed'], {'rpc': v:true})
+    echo rpcrequest(nvim, 'nvim_eval', '"Hello " . "world!"')
+    call jobstop(nvim)
 <
 ==============================================================================
-4. Implementing new clients				  *msgpack-rpc-clients*
-
-Nvim is still in alpha, so there's no in-depth documentation explaining how to
-properly implement a client library yet. The Python client (the pip package
-"neovim") will always be up-to-date with the latest API changes, so its source
-code is the best documentation currently available. There are some guidelines
-however:
-
-- Separate the transport layer from the rest of the library. See
-  |msgpack-rpc-connecting| for details on how clients can connect to Nvim.
-- Use a MessagePack library that implements at least version 5 of the
-  MessagePack spec, which supports the `bin` and `ext` types used by Nvim.
-- Read API metadata in order to create client-side wrappers for all
-  msgpack-rpc methods.
-- 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 that responses to msgpack-rpc requests
-  will arrive.
-- Clients should expect msgpack-rpc requests, which need to be handled
-  immediately because Nvim is blocked while waiting for the client response.
-- Clients should expect to receive msgpack-rpc notifications, but these don't
-  need to be handled immediately because they won't block Nvim (although they
-  should probably be handled immediately anyway).
-
-Most of the complexity could be handled by a msgpack-rpc library that supports
-server to client requests and notifications, but it's not clear if this is part
-of the msgpack-rpc spec. At least the Ruby msgpack-rpc library does not seem
-to support it:
-
+4. Implementing API clients			*rpc-api-client* *api-client*
+
+"API clients" wrap the Nvim API to provide idiomatic "SDKs" for their
+respective platforms (see |dev-jargon|). You can build a new API client for
+your favorite platform or programming language.
+
+Existing API clients are listed here:
+    https://github.com/neovim/neovim/wiki/Related-projects#api-clients
+
+The Python client is the reference implementation for API clients. It is
+always up-to-date with the Nvim API, so its source code and test suite are
+authoritative references.
+    https://github.com/neovim/python-client
+
+API client implementation guidelines ~
+
+  - Separate the transport layer from the rest of the library. See
+    |rpc-connecting| for details on how clients can connect to Nvim.
+  - Use a MessagePack library that implements at least version 5 of the
+    MessagePack spec, which supports the `bin` and `ext` types used by Nvim.
+  - Read API metadata in order to create client-side wrappers for all
+    msgpack-rpc methods.
+  - 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 that responses to msgpack-rpc
+    requests will arrive.
+  - Clients should expect msgpack-rpc requests, which need to be handled
+    immediately because Nvim is blocked while waiting for the client response.
+  - Clients should expect to receive msgpack-rpc notifications, but these
+    don't need to be handled immediately because they won't block Nvim
+    (although they should probably be handled immediately anyway).
+
+Note: Most of the complexity could be handled by a msgpack-rpc library that
+supports server to client requests and notifications, but it's not clear if
+this is part of the msgpack-rpc spec. At least the Ruby msgpack-rpc library
+does not seem to support it:
 https://github.com/msgpack-rpc/msgpack-rpc-ruby/blob/master/lib/msgpack/rpc/transport/tcp.rb#L150-L158
 
+API metadata object ~
+
+API clients exist to hide msgpack-rpc details. The API metadata object
+contains information that makes this task easier (see also |rpc-types|):
+
+  - The "version" key contains the Nvim version, API level, and API
+    backwards-compatibility level.
+  - The "functions" key contains a list of metadata objects for individual
+    functions.
+  - Each function metadata object has |rpc-types| information about the return
+    value and parameters. These can be used for generating strongly-typed APIs
+    in static languages.
+  - Container types may be decorated with type/size constraints, e.g.
+    ArrayOf(Buffer) or ArrayOf(Integer, 2). This can be useful to generate
+    even more strongly-typed APIs.
+  - Functions that are considered to be methods that operate on instances of
+    Nvim special types (msgpack EXT) will have the `"method"` attribute set to
+    `true`. The reciever type is the type of the first argument. The method
+    names are prefixed with `nvim_` plus a shortened type name, e.g.
+    `nvim_buf_get_lines` represents the `get_lines` method of a Buffer instance.
+    - Global functions have `"method"` set to `false` and are prefixed with just
+    `nvim_`, e.g. `nvim_get_buffers`.
+
+So for an object-oriented language, an API client contains the classes
+representing Nvim special types, and the methods of each class could be
+defined by stripping the prefix for the type as defined in the `types` metadata
+(this will always be the first two "_"-separated parts of the function name).
+There could also be a singleton Vim class with methods where the `nvim_`
+prefix is stripped off.
+
 ==============================================================================
-5. Types						    *msgpack-rpc-types*
+5. Types							    *rpc-types*
 
-Nvim's C API uses custom types for all functions, se |nvim-api-types|.
-For the purpose of mapping to msgpack, he types can be split into two groups:
+The Nvim C API uses custom types for all functions. |api-types|
+For the purpose of mapping to msgpack, the types can be split into two groups:
 
-- Basic types that map natively to msgpack (and probably have a default
-  representation in msgpack-supported programming languages)
-- Special Nvim types that map to msgpack EXT with custom type codes.
+  - Basic types that map natively to msgpack (and probably have a default
+    representation in msgpack-supported programming languages)
+  - Special Nvim types that map to msgpack EXT with custom type codes.
 
-Basic type mapping:
+Basic types ~
 
-Nil				  -> msgpack nil
-Boolean				  -> msgpack boolean
-Integer (signed 64-bit integer)	  -> msgpack integer
-Float (IEEE 754 double precision) -> msgpack float
-String				  -> msgpack string
-Array				  -> msgpack array
-Dictionary			  -> msgpack map
+  Nil                               -> msgpack nil
+  Boolean                           -> msgpack boolean
+  Integer (signed 64-bit integer)   -> msgpack integer
+  Float (IEEE 754 double precision) -> msgpack float
+  String                            -> msgpack string
+  Array                             -> msgpack array
+  Dictionary                        -> msgpack map
 
-Special Nvim types that use msgpack EXT:
+Special types (msgpack EXT) ~
 
-Buffer				  -> enum value kObjectTypeBuffer
-Window				  -> enum value kObjectTypeWindow
-Tabpage				  -> enum value kObjectTypeTabpage
+  Buffer                            -> enum value kObjectTypeBuffer
+  Window                            -> enum value kObjectTypeWindow
+  Tabpage                           -> enum value kObjectTypeTabpage
 
 An API method expecting one of these types may be passed an integer instead,
 although they are not interchangeable. For example, a Buffer may be passed as
@@ -191,70 +225,193 @@ an integer, but not a Window or Tabpage.
 
 The most reliable way of determining the type codes for the special Nvim types
 is to inspect the `types` key of metadata dictionary returned by the
-`vim_get_api_info` method at runtime. Here's an example JSON representation of
+`nvim_get_api_info` method at runtime. Here's a sample JSON representation of
 the `types` object:
 >
   "types": {
     "Buffer": {
-      "id": 0
+      "id": 0,
+      "prefix": "nvim_buf_"
     },
     "Window": {
-      "id": 1
+      "id": 1,
+      "prefix": "nvim_win_"
     },
     "Tabpage": {
-      "id": 2
+      "id": 2,
+      "prefix": "nvim_tabpage_"
     }
   }
 <
-Even for statically compiled clients, it's a good practice to avoid hardcoding
-the type codes, because a client may be built against one Nvim version but connect
-to another with different type codes.
-
-==============================================================================
-6. Wrapping methods				     *msgpack-rpc-wrap-methods*
-
-As mentioned before, clients should provide an API that hides msgpack-rpc
-details from programmers, and the API metadata object contains information
-that makes this task easier:
-
-- The "functions" key contains a list of metadata objects for individual
-  functions.
-- Each function metadata object has type information about the return value
-  and parameters. These can be used for generating strongly-typed APIs in
-  static languages.
-- Container types may be decorated with type/size constraints, e.g.
-  ArrayOf(Buffer) or ArrayOf(Integer, 2). This can be useful to generate even
-  more strongly-typed APIs.
-- Methods that operate instances of Nvim's types are prefixed with the type
-  name in lower case, e.g. `buffer_get_line` represents the `get_line` method
-  of a Buffer instance.
-- Global methods are prefixed with `vim`, e.g. `vim_get_buffers`.
-
-So, for an object-oriented language, a client library would have the classes
-that represent Nvim's types, and the methods of each class could be defined
-by inspecting the method name prefix. There could also be a singleton Vim
-class with methods mapped to functions prefixed with `vim_`
+Even for statically compiled clients it is good practice to avoid hardcoding
+the type codes, because a client may be built against one Nvim version but
+connect to another with different type codes.
 
 ==============================================================================
-7. Vimscript functions				   *msgpack-rpc-vim-functions*
-
-Four msgpack-rpc functions are available in Vimscript:
-
-1. |rpcstart()|: Similarly to |jobstart()|, this will spawn a co-process with
-   its standard handles connected to Nvim. The difference is that it's not
-   possible to process raw data to or from the process's stdin, stdout, or
-   stderr.  This is because the job's stdin and stdout are used as a single
-   msgpack channel that is processed directly by Nvim.
-
-2. |rpcstop()|: Same as |jobstop()|, but operates on handles returned by
-   |rpcstart()|.
-
-3. |rpcrequest()|: Sends a msgpack-rpc request to the process.
-
-4. |rpcnotify()|: Sends a msgpack-rpc notification to the process.
-
-The last two functions may also be used with channels created from
-connections to |$NVIM_LISTEN_ADDRESS|.
+6. Remote UIs					           *rpc-remote-ui*
+
+Nvim allows Graphical user interfaces to be implemented by separate processes
+communicating with Nvim over the RPC API. Currently the ui model conists of a
+terminal-like grid with one single, monospace font size, with a few elements
+that could be drawn separately from the grid (for the momemnt only the popup
+menu)
+
+After connecting to a nvim instance (typically a spawned, embedded instance)
+use the |nvim_ui_attach|(width, height, options) API method to tell nvim that your
+program wants to draw the nvim screen on a grid with "width" times
+"height" cells. "options" should be a dictionary with the following (all
+optional) keys:
+	`rgb`:			Controls what color format to use.
+				Set to true (default) to use 24-bit rgb
+				colors.
+				Set to false to use terminal color codes (at
+				most 256 different colors).
+	`popupmenu_external`:	Instead of drawing the completion popupmenu on
+				the grid, Nvim will send higher-level events to
+				the ui and let it draw the popupmenu.
+				Defaults to false.
+
+Nvim will then send msgpack-rpc notifications, with the method name "redraw"
+and a single argument, an array of screen updates (described below).
+These should be processed in order. Preferably the user should only be able to
+see the screen state after all updates are processed (not any intermediate
+state after processing only a part of the array).
+
+Screen updates are arrays. The first element a string describing the kind
+of update.
+
+["resize", width, height]
+	The grid is resized to `width` and `height` cells.
+
+["clear"]
+	Clear the screen.
+
+["eol_clear"]
+	Clear from the cursor position to the end of the current line.
+
+["cursor_goto", row, col]
+	Move the cursor to position (row, col). Currently, the same cursor is
+	used to define the position for text insertion and the visible cursor.
+	However, only the last cursor position, after processing the entire
+	array in the "redraw" event, is intended to be a visible cursor
+	position.
+
+["update_fg", color]
+["update_bg", color]
+["update_sp", color]
+	Set the default foreground, background and special colors
+	respectively.
+
+["highlight_set", attrs]
+	Set the attributes that the next text put on the screen will have.
+	`attrs` is a dict with the keys below. Any absent key is reset
+	to its default value. Color defaults are set by the `update_fg` etc
+	updates. All boolean keys default to false.
+
+	`foreground`:	foreground color.
+	`background`:	backround color.
+	`special`:	color to use for underline and undercurl, when present.
+	`reverse`:	reverse video. Foreground and background colors are
+			switched.
+	`italic`:	italic text.
+	`bold`:		bold text.
+	`underline`:	underlined text. The line has `special` color.
+	`undercurl`:	undercurled text. The curl has `special` color.
+
+["put", text]
+	The (utf-8 encoded) string `text` is put at the cursor position
+	(and the cursor is advanced), with the highlights as set by the
+	last `highlight_set` update.
+
+["set_scroll_region", top, bot, left, right]
+	Define the scroll region used by `scroll` below.
+
+["scroll", count]
+	Scroll the text in the scroll region. The diagrams below illustrate
+	what will happen, depending on the scroll direction. "=" is used to
+	represent the SR(scroll region) boundaries and "-" the moved rectangles.
+	Note that dst and src share a common region.
+
+	If count is bigger than 0, move a rectangle in the SR up, this can
+	happen while scrolling down.
+>
+		+-------------------------+
+		| (clipped above SR)      |            ^
+		|=========================| dst_top    |
+		| dst (still in SR)       |            |
+		+-------------------------+ src_top    |
+		| src (moved up) and dst  |            |
+		|-------------------------| dst_bot    |
+		| src (cleared)           |            |
+		+=========================+ src_bot
+<
+	If count is less than zero, move a rectangle in the SR down, this can
+	happen while scrolling up.
+>
+		+=========================+ src_top
+		| src (cleared)           |            |
+		|------------------------ | dst_top    |
+		| src (moved down) and dst|            |
+		+-------------------------+ src_bot    |
+		| dst (still in SR)       |            |
+		|=========================| dst_bot    |
+		| (clipped below SR)      |            v
+		+-------------------------+
+<
+["set_title", title]
+["set_icon", icon]
+	Set the window title, and icon (minimized) window title, respectively.
+	In windowing systems not distinguishing between the two, "set_icon"
+	can be ignored.
+
+["mouse_on"]
+["mouse_off"]
+	Tells the client whether mouse support, as determined by |'mouse'|
+	option, is considered to be active in the current mode. This is mostly
+	useful for a terminal frontend, or other situations where nvim mouse
+	would conflict with other usages of the mouse. It is safe for a client
+	to ignore this and always send mouse events.
+
+["busy_on"]
+["busy_off"]
+	Nvim started or stopped being busy, and possibly not responsible to user
+	input. This could be indicated to the user by hiding the cursor.
+
+["suspend"]
+	|:suspend| command or |Ctrl-Z| mapping is used. A terminal client (or other
+	client where it makes sense) could suspend itself.  Other clients can
+	safely ignore it.
+
+["bell"]
+["visual_bell"]
+	Notify the user with an audible or visual bell, respectively.
+
+["update_menu"]
+	The menu mappings changed.
+
+["mode_change", mode]
+	The mode changed. Currently sent when "insert", "replace", "cmdline" and
+	"normal" modes are entered. A client could for instance change the cursor
+	shape.
+
+["popupmenu_show", items, selected, row, col]
+	When `popupmenu_external` is set to true, nvim will not draw the
+	popupmenu on the grid, instead when the popupmenu is to be displayed
+	this update is sent. `items` is an array of the items to show, the
+	items are themselves arrays of the form [word, kind, menu, info]
+	as defined at |complete-items|, except that `word` is replaced by
+	`abbr` if present.  `selected` is the initially selected item, either a
+	zero-based index into the array of items, or -1 if no item is
+	selected. `row` and `col` is the anchor position, where the first
+	character of the completed word will be.
+
+["popupmenu_select", selected]
+	An item in the currently displayed popupmenu is selected. `selected`
+	is either a zero-based index into the array of items from the last
+	`popupmenu_show` event, or -1 if no item is selected.
+
+["popupmenu_hide"]
+	The popupmenu is hidden.
 
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim.txt b/runtime/doc/nvim.txt
index a7c512d1dc..7dfbbd0cf0 100644
--- a/runtime/doc/nvim.txt
+++ b/runtime/doc/nvim.txt
@@ -1,24 +1,59 @@
-*nvim.txt*    For Nvim.						{Nvim}
+*nvim.txt*								{Nvim}
 
 
-		 NVIM REFERENCE MANUAL				*nvim*
+			    NVIM REFERENCE MANUAL
 
 
-Introduction to Nvim				*nvim-intro*
+Nvim						*nvim* *nvim-intro*
 
-This is an introduction for Vim users who are just getting started with Nvim.
-It is not meant for Vim beginners. For a basic introduction to Vim,
-see |help.txt|.
+If you are new to Vim (and Nvim) see |help.txt| or type ":Tutor".
+If you already use Vim (but not Nvim) see |nvim-from-vim| for a quickstart.
 
-1. Transitioning from Vim	 |nvim-from-vim|
-2. Differences from Vim		 |vim-differences|
-3. Msgpack-RPC			 |msgpack-rpc|
-4. Job control			 |job-control|
-5. Python plugins		 |nvim-python|
-6. Clipboard integration	 |nvim-clipboard|
-7. Remote plugins		 |remote-plugin|
-8. Provider infrastructure	 |nvim-provider|
-9. Integrated terminal emulator	 |nvim-terminal-emulator|
+Nvim is emphatically a fork of Vim, not a clone: compatibility with Vim is
+maintained where possible. See |vim_diff.txt| for the complete reference of
+differences from Vim.
+
+==============================================================================
+Transitioning from Vim				*nvim-from-vim*
+
+To start the transition, link your previous configuration so Nvim can use it:
+>
+    mkdir ~/.config
+    ln -s ~/.vim ~/.config/nvim
+    ln -s ~/.vimrc ~/.config/nvim/init.vim
+<
+Note: If your system sets `$XDG_CONFIG_HOME`, use that instead of `~/.config`
+in the code above. Nvim follows the XDG |base-directories| convention.
+
+See |provider-python| and |provider-clipboard| for additional software you
+might need to use some features.
+
+Your Vim configuration might not be entirely compatible with Nvim. For a
+full list of differences between Vim and Nvim see |vim-differences|.
+
+The |'ttymouse'| option, for example, was removed from Nvim (mouse support
+should work without it). If you use the same |vimrc| for Vim and Nvim,
+consider guarding |'ttymouse'| in your configuration like so:
+>
+    if !has('nvim')
+        set ttymouse=xterm2
+    endif
+<
+Conversely, if you have Nvim specific configuration items, you could do
+this:
+>
+    if has('nvim')
+        tnoremap <Esc> <C-\><C-n>
+    endif
+<
+For a more granular approach use |exists()|:
+>
+    if exists(':tnoremap')
+        tnoremap <Esc> <C-\><C-n>
+    endif
+<
+Now you should be able to explore Nvim more comfortably. Check |nvim-features|
+for more information.
 
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim_clipboard.txt b/runtime/doc/nvim_clipboard.txt
deleted file mode 100644
index 078382c7a7..0000000000
--- a/runtime/doc/nvim_clipboard.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-*nvim_clipboard.txt*    For Nvim.					{Nvim}
-
-
-		 NVIM REFERENCE MANUAL    by Thiago de Arruda
-
-
-Clipboard integration for Nvim					*nvim-clipboard*
-
-1. Intro			|nvim-clipboard-intro|
-2. X11 selection mechanism	|nvim-clipboard-x11|
-
-==============================================================================
-1. Intro						  *nvim-clipboard-intro*
-
-Nvim has no direct connection to the system clipboard. Instead, it is
-accessible through the |nvim-provider| infrastructure, which transparently
-uses shell commands for communicating with the clipboard.
-
-Clipboard access is implicitly enabled if any of the following clipboard tools
-is found in your `$PATH`.
-
-- xclip
-- xsel (newer alternative to xclip)
-- pbcopy/pbpaste (only for Mac OS X)
-- lemonade (useful for SSH machine)
-  https://github.com/pocke/lemonade
-- doitclient (another option for SSH setups from the maintainer of PuTTY)
-  http://www.chiark.greenend.org.uk/~sgtatham/doit/
-
-The presence of a suitable clipboard tool implicitly enables the '+' and '*'
-registers.
-
-If you want to ALWAYS use the clipboard for ALL operations (as opposed
-to interacting with the '+' and/or '*' registers explicitly), set the
-following option:
->
-    set clipboard+=unnamedplus
-<
-See 'clipboard' for details and more options.
-
-==============================================================================
-2. X11 selection mechanism		      *nvim-clipboard-x11* *x11-selection*
-
-The clipboard providers for X11 store text in what is known as "selections".
-Selections are "owned" by an application, so when the application is closed,
-the selection text is lost.
-
-The contents of selections are held by the originating application (e.g., upon
-a copy), and only passed on to another application when that other application
-asks for them (e.g., upon a paste).
-
-							      *quoteplus* *quote+*
-
-There are three documented X11 selections: `PRIMARY`, `SECONDARY`, and `CLIPBOARD`.
-`CLIPBOARD` is typically used in X11 applications for copy/paste operations
-(`Ctrl-c`/`v`), while `PRIMARY` is used for the last selected text, which is
-generally inserted with the middle mouse button.
-
-Nvim's X11 clipboard providers only utilize the `PRIMARY` and `CLIPBOARD`
-selections, used for the '*' and '+' registers, respectively.
-
-==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim_from_vim.txt b/runtime/doc/nvim_from_vim.txt
deleted file mode 100644
index 299eeb05f5..0000000000
--- a/runtime/doc/nvim_from_vim.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-*nvim_from_vim.txt*    For Nvim.						{Nvim}
-
-
-		 NVIM REFERENCE MANUAL
-
-
-Transitioning from Vim				*nvim-from-vim*
-
-Nvim is emphatically a fork of Vim, so compatibility to Vim should be pretty
-good.
-
-To start the transition, link your previous configuration so Nvim can use
-it:
->
-    mkdir -p ${XDG_CONFIG_HOME:=$HOME/.config}
-    ln -s ~/.vim $XDG_CONFIG_HOME/nvim
-    ln -s ~/.vimrc $XDG_CONFIG_HOME/nvim/init.vim
-<
-See |nvim-intro|, especially |nvim-python| and |nvim-clipboard|, for
-additional software you might need to install to use all of Nvim's features.
-
-Your Vim configuration might not be entirely compatible with Nvim. For a
-full list of differences between Vim and Nvim, see |vim-differences|.
-
-The |'ttymouse'| option, for example, was removed from Nvim (mouse support
-should work without it). If you use the same |vimrc| for Vim and Nvim,
-consider guarding |'ttymouse'| in your configuration like so:
->
-    if !has('nvim')
-        set ttymouse=xterm2
-    endif
-<
-Conversely, if you have Nvim specific configuration items, you could do
-this:
->
-    if has('nvim')
-        tnoremap <Esc> <C-\><C-n>
-    endif
-<
-For a more granular approach, use |exists()|:
->
-    if exists(':tnoremap')
-        tnoremap <Esc> <C-\><C-n>
-    endif
-<
-Now you should be able to explore Nvim more comfortably. Check |nvim| for more
-information.
-
-==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim_provider.txt b/runtime/doc/nvim_provider.txt
deleted file mode 100644
index 91cd5fbfc7..0000000000
--- a/runtime/doc/nvim_provider.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-*nvim_provider.txt*    For Nvim.					{Nvim}
-
-
-		 NVIM REFERENCE MANUAL    by Thiago de Arruda
-
-
-Nvim provider infrastructure			       *nvim-provider*
-
-First of all, this document is meant to be read by developers interested in
-contributing to the refactoring effort. If you are a normal user or plugin
-developer looking to learn about Nvim |msgpack-rpc| infrastructure for
-implementing plugins in other programming languages, see |remote-plugin|.
-For instructions on how to enable Python plugins, see |nvim-python|. For
-clipboard, see |nvim-clipboard|.
-
-Instead of doing everything by itself, Nvim aims to simplify its own
-maintenance by delegating as much work as possible to external systems. But
-some Vim components are too tightly coupled and in some cases the refactoring
-work necessary to swap in-house implementations by code that integrates to
-other systems is too great. Nvim provider infrastructure is a facility that
-aims to make this task simpler.
-
-To understand why the provider infrastructure is useful, let us consider two
-examples of integration with external systems that are implemented in Vim and
-are now decoupled from Nvim core as providers:
-
-The first example is clipboard integration: in the original Vim source code,
-clipboard functions account for more than 1k lines of C source code (and that
-is just on ui.c), all to perform two tasks that are now accomplished with
-simple shell commands such as xclip or pbcopy/pbpaste.
-
-The other example is Python scripting support: Vim has three files dedicated to
-embedding the Python interpreter: if_python.c, if_python3.c and if_py_both.h.
-Together these files sum about 9.5k lines of C source code. On Nvim, Python
-scripting is performed by an external host process that is running 2k sloc
-Python program.
-
-In a perfect world, we would implement Python and clipboard integration in
-pure vimscript and without touching the C code. Unfortunately we can't achieve
-these goals without severely compromising backwards compatibility with Vim.
-That's where providers come to the rescue.
-
-In essence, this infrastructure is a simple framework that simplifies the task
-of calling vimscript from C code, making it simpler to rewrite C functions that
-interact with external systems in pure vimscript. It is composed of two
-functions in eval.c:
-
-- eval_call_provider(name, method, arguments): Call a provider(name) method
-  with arguments
-- eval_has_provider(name): Checks if a provider is implemented
-
-What these functions do is simple:
-
-- eval_call_provider will call the provider#(name)#Call function passing in
-  the method and arguments.
-- eval_has_provider will return true if the provider#(name)#Call function is
-  implemented, and is called by the "has" vimscript function to check if
-  features are available.
-
-The basic idea is that the provider#(name)#Call function should implement
-integration with an external system, because calling shell commands and
-|msgpack-rpc| clients (Nvim only) is easier to do in vimscript.
-
-Now, back to the Python example. Instead of modifying vimscript to allow for
-the definition of lowercase functions and commands (for the |:python|,
-|:pyfile|, and |:pydo| commands, and the |pyeval()| function), which would
-break backwards compatibility with Vim, we implemented the
-autoload/provider/python.vim script and the provider#python#Call function
-that is only defined if an external Python host is started successfully.
-
-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 |+python| feature.
-
-==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim_python.txt b/runtime/doc/nvim_python.txt
deleted file mode 100644
index a2fc968db4..0000000000
--- a/runtime/doc/nvim_python.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-*nvim_python.txt*    For Nvim.						{Nvim}
-
-
-		 NVIM REFERENCE MANUAL    by Thiago de Arruda
-
-
-Python plugins and scripting in Nvim				  *nvim-python*
-
-1. Introduction			|nvim-python-intro|
-2. Quickstart			|nvim-python-quickstart|
-
-==============================================================================
-1. Introduction						    *nvim-python-intro*
-
-Through external Python 2/3 interpreters connected via |msgpack-rpc|, Nvim
-offers some support for the legacy |python-vim| and |python3| interfaces.
-
-Note: For now only the old Vim 7.3 API is supported.
-
-==============================================================================
-2. Quickstart						 *nvim-python-quickstart*
-
-If you used a package manager to install Nvim, there's a good chance that
-it also provides the `neovim` Python package. If it doesn't, follow these
-steps to install the package with Python's package manager, `pip`.
-
-Note: Depending on your system, `pip` might refer to Python 2 or Python 3,
-      which is why the following instructions mention `pip2` or `pip3`
-      explicitly. If one of these is not available for you, maybe `pip`
-      is what you want.
-
-To use Vim Python 2/3 plugins with Nvim, do the following:
-
-- For Python 2 plugins, make sure an interpreter for Python 2.6 or 2.7 is
-  available in your `$PATH`, then install the `neovim` Python package systemwide:
-  >
-    $ sudo pip2 install neovim
-<
-  or for the current user:
->
-    $ pip2 install --user neovim
-<
-- For Python 3 plugins, make sure an interpreter for Python 3.3 or above is
-  available in your `$PATH`, then install the `neovim` Python package systemwide:
-  >
-    $ sudo pip3 install neovim
-<
-  or for the current user:
->
-    $ pip3 install --user neovim
-<
-Note: If you previously installed the package, get the latest version by
-      appending the `--upgrade` flag to the commands above.
-
-==============================================================================
-							   *g:python_host_prog*
-
-To point Nvim to a specific Python 2 interpreter, set |g:python_host_prog|:
->
-    let g:python_host_prog = '/path/to/python'
-<
-							   *g:python3_host_prog*
-
-To point Nvim to a specific Python 3 interpreter, set |g:python3_host_prog|:
->
-    let g:python3_host_prog = '/path/to/python3'
-<
-						   *g:loaded_python_provider*
-
-To disable Python 2 interface, set `g:loaded_python_provider` to 1:
->
-    let g:loaded_python_provider = 1
-<
-						   *g:loaded_python3_provider*
-
-To disable Python 3 interface, set `g:loaded_python3_provider` to 1:
->
-    let g:loaded_python3_provider = 1
-<
-						   *g:python_host_skip_check*
-
-To disable Python 2 interpreter check, set `g:python_host_skip_check` to 1:
-Note: If you disable Python 2 check, you must install neovim module properly.
->
-    let g:python_host_skip_check = 1
-<
-						   *g:python3_host_skip_check*
-
-To disable Python 3 interpreter check, set `g:python3_host_skip_check` to 1:
-Note: If you disable Python 3 check, you must install neovim module properly.
->
-    let g:python3_host_skip_check = 1
-<
-==============================================================================
- vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 6ef3aaebaa..8f7dc0dbf0 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -1,34 +1,31 @@
-*nvim_terminal_emulator.txt*    For Nvim.				{Nvim}
+*terminal_emulator.txt*    						{Nvim}
 
 
 		 NVIM REFERENCE MANUAL    by Thiago de Arruda
 
 
-Nvim integrated terminal emulator		     *nvim-terminal-emulator*
+Embedded terminal emulator				   *terminal-emulator*
 
-1. Introduction			|nvim-terminal-emulator-introduction|
-2. Spawning			|nvim-terminal-emulator-spawning|
-3. Input			|nvim-terminal-emulator-input|
-4. Configuration		|nvim-terminal-emulator-configuration|
+1. Introduction			|terminal-emulator-intro|
+2. Spawning			|terminal-emulator-spawning|
+3. Input			|terminal-emulator-input|
+4. Configuration		|terminal-emulator-configuration|
+5. Status Variables		|terminal-emulator-status|
 
 ==============================================================================
-1. Introduction			      *nvim-terminal-emulator-introduction*
+1. Introduction					     *terminal-emulator-intro*
 
-One feature that distinguishes Nvim from Vim is that it implements a mostly
-complete VT220/xterm-like terminal emulator. The terminal is presented to the
-user as a special buffer type, one that is asynchronously updated to mirror
-the virtual terminal display as data is received from the program connected
-to it. For most purposes, terminal buffers behave a lot like normal buffers
-with 'nomodifiable' set.
+Nvim offers a mostly complete VT220/xterm terminal emulator. The terminal is
+presented as a special buffer type, asynchronously updated to mirror the
+virtual terminal display as data is received from the program connected to it.
+For most purposes, terminal buffers behave a lot like normal buffers with
+'nomodifiable' set.
 
-
-The implementation is powered by libvterm[1], a powerful abstract terminal
-emulation library.
-
-[1]: http://www.leonerd.org.uk/code/libvterm/
+The implementation is powered by libvterm, a powerful abstract terminal
+emulation library. http://www.leonerd.org.uk/code/libvterm/
 
 ==============================================================================
-2. Spawning			      *nvim-terminal-emulator-spawning*
+2. Spawning					  *terminal-emulator-spawning*
 
 There are 3 ways to create a terminal buffer:
 
@@ -37,16 +34,22 @@ There are 3 ways to create a terminal buffer:
 - By editing a file with a name matching `term://(.{-}//(\d+:)?)?\zs.*`.
   For example:
 >
-    :e term://bash
-    :vsp term://top
+    :edit term://bash
+    :vsplit term://top
 <
+    Note: The "term://" pattern is handled by a BufReadCmd handler, so the
+    |autocmd-nested| modifier is required to use it in an autocmd. >
+        autocmd VimEnter * nested split term://sh
+<    This is only mentioned for reference; you should use the |:terminal|
+    command instead.
+
 When the terminal spawns the program, the buffer will start to mirror the
 terminal display and change its name to `term://$CWD//$PID:$COMMAND`.
 Note that |:mksession| will "save" the terminal buffers by restarting all
 programs when the session is restored.
 
 ==============================================================================
-3. Input			      *nvim-terminal-emulator-input*
+3. Input					     *terminal-emulator-input*
 
 Sending input is possible by entering terminal mode, which is achieved by
 pressing any key that would enter insert mode in a normal buffer (|i| or |a|
@@ -90,7 +93,7 @@ Mouse input is also fully supported, and has the following behavior:
   the terminal wont lose focus and the hovered window will be scrolled.
 
 ==============================================================================
-4. Configuration		     *nvim-terminal-emulator-configuration*
+4. Configuration			     *terminal-emulator-configuration*
 
 Terminal buffers can be customized through the following global/buffer-local
 variables (set via the |TermOpen| autocmd):
@@ -111,4 +114,25 @@ The terminal cursor can be highlighted via |hl-TermCursor| and
 |hl-TermCursorNC|.
 
 ==============================================================================
+5. Status Variables				    *terminal-emulator-status*
+
+Terminal buffers maintain some information about the terminal in buffer-local
+variables:
+
+- *b:term_title* The settable title of the terminal, typically displayed in
+  the window title or tab title of a graphical terminal emulator. Programs
+  running in the terminal can set this title via an escape sequence.
+- *b:terminal_job_id* The nvim job ID of the job running in the terminal. See
+  |job-control| for more information.
+- *b:terminal_job_pid* The PID of the top-level process running in the
+  terminal.
+
+These variables will have a value by the time the TermOpen autocmd runs, and
+will continue to have a value for the lifetime of the terminal buffer, making
+them suitable for use in 'statusline'. For example, to show the terminal title
+as the status line:
+>
+    :autocmd TermOpen * setlocal statusline=%{b:term_title}
+<
+==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 83ae96a651..97d56af369 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.4.  Last change: 2016 Jan 03
+*options.txt*	For Vim version 7.4.  Last change: 2016 Jul 12
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -52,7 +52,6 @@ achieve special effects.  These options come in three forms:
 :se[t] all&		Set all options to their default value.  The values of
 			these options are not changed:
 			  'columns'
-			  'encoding'
 			  'lines'
 			Warning: This may have a lot of side effects.
 
@@ -247,10 +246,10 @@ global value, which is used for new buffers.  With ":set" both the local and
 global value is changed.  With "setlocal" only the local value is changed,
 thus this value is not used when editing a new buffer.
 
-When editing a buffer that has been edited before, the last used window
-options are used again.  If this buffer has been edited in this window, the
-values from back then are used.  Otherwise the values from the window where
-the buffer was edited last are used.
+When editing a buffer that has been edited before, the options from the window
+that was last closed are used again.  If this buffer has been edited in this
+window, the values from back then are used.  Otherwise the values from the
+last closed window where the buffer was edited last are used.
 
 It's possible to set a local window option specifically for a type of buffer.
 When you edit another buffer in the same window, you don't want to keep
@@ -497,6 +496,7 @@ For example, to use a modeline only for Vim 7.0:
 To use a modeline for Vim after version 7.2:
 	/* vim>702: set cole=2: */ ~
 There can be no blanks between "vim" and the ":".
+The modeline is ignored if {vers} does not fit in an integer. {Nvim}
 
 
 The number of lines that are checked can be set with the 'modelines' option.
@@ -614,7 +614,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{only available when compiled with the |+multi_byte|
 			feature}
-	Only effective when 'encoding' is "utf-8" or another Unicode encoding.
 	Tells Vim what to do with characters with East Asian Width Class
 	Ambiguous (such as Euro, Registered Sign, Copyright Sign, Greek
 	letters, Cyrillic letters).
@@ -667,7 +666,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- Set the 'keymap' option to "arabic"; in Insert mode CTRL-^ toggles
 	  between typing English and Arabic key mapping.
 	- Set the 'delcombine' option
-	Note that 'encoding' must be "utf-8" for working with Arabic text.
 
 	Resetting this option will:
 	- Reset the 'rightleft' option.
@@ -899,7 +897,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	- The backup file will be created in the first directory in the list
 	  where this is possible.  The directory must exist, Vim will not
 	  create it for you.
-	- Empty means that no backup file will be created ( 'patchmode' is
+	- Empty means that no backup file will be created ('patchmode' is
 	  impossible!).  Writing may fail because of this.
 	- A directory "." means to put the backup file in the same directory
 	  as the edited file.
@@ -1077,8 +1075,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{not available when compiled without the |+linebreak|
 			feature}
 	This option lets you choose which characters might cause a line
-	break if 'linebreak' is on.  Only works for ASCII and also for 8-bit
-	characters when 'encoding' is an 8-bit encoding.
+	break if 'linebreak' is on.  Only works for ASCII characters.
 
 						*'breakindent'* *'bri'*
 'breakindent' 'bri'	boolean (default off)
@@ -1158,22 +1155,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'buftype'* *'bt'* *E382*
 'buftype' 'bt'		string (default: "")
 			local to buffer
-			{not available when compiled without the |+quickfix|
-			feature}
 	The value of this option specifies the type of a buffer:
 	  <empty>	normal buffer
-	  nofile	buffer which is not related to a file and will not be
-			written
-	  nowrite	buffer which will not be written
-	  acwrite	buffer which will always be written with BufWriteCmd
-			autocommands.
-	  quickfix	quickfix buffer, contains list of errors |:cwindow|
-			or list of locations |:lwindow|
-	  help		help buffer (you are not supposed to set this
-			manually)
-	  terminal	terminal buffer, this is set automatically when a 
-			terminal is created. See |nvim-terminal-emulator| for
-			more information.
+	  acwrite	buffer will always be written with |BufWriteCmd|s
+	  help		help buffer (do not set this manually)
+	  nofile	buffer is not related to a file, will not be written
+	  nowrite	buffer will not be written
+	  quickfix	list of errors |:cwindow| or locations |:lwindow|
+	  terminal	|terminal-emulator| buffer
 
 	This option is used together with 'bufhidden' and 'swapfile' to
 	specify special kinds of buffers.   See |special-buffers|.
@@ -1214,11 +1203,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Specifies details about changing the case of letters.  It may contain
 	these words, separated by a comma:
 	internal	Use internal case mapping functions, the current
-			locale does not change the case mapping.  This only
-			matters when 'encoding' is a Unicode encoding,
-			"latin1" or "iso-8859-15".  When "internal" is
-			omitted, the towupper() and towlower() system library
-			functions are used when available.
+			locale does not change the case mapping. When
+			"internal" is omitted, the towupper() and towlower()
+			system library functions are used when available.
 	keepascii	For the ASCII characters (0x00 to 0x7f) use the US
 			case mapping, the current locale is not effective.
 			This probably only matters for Turkish.
@@ -1251,8 +1238,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Only non-printable keys are allowed.
 	The key can be specified as a single character, but it is difficult to
 	type.  The preferred way is to use the <> notation.  Examples: >
-		:set cedit=<C-Y>
-		:set cedit=<Esc>
+		:exe "set cedit=\<C-Y>"
+		:exe "set cedit=\<Esc>"
 <	|Nvi| also has this option, but it only uses the first character.
 	See |cmdwin|.
 
@@ -1271,13 +1258,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	file to convert from.  You will have to save the text in a file first.
 	The expression must return zero or an empty string for success,
 	non-zero for failure.
-	The possible encoding names encountered are in 'encoding'.
+	See |encoding-names| for possible encoding names.
 	Additionally, names given in 'fileencodings' and 'fileencoding' are
 	used.
 	Conversion between "latin1", "unicode", "ucs-2", "ucs-4" and "utf-8"
 	is done internally by Vim, 'charconvert' is not used for this.
-	'charconvert' is also used to convert the shada file, if 'encoding' is 
-	not "utf-8".  Also used for Unicode conversion.
+	Also used for Unicode conversion.
 	Example: >
 		set charconvert=CharConvert()
 		fun CharConvert()
@@ -1292,8 +1278,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		v:fname_in		name of the input file
 		v:fname_out		name of the output file
 	Note that v:fname_in and v:fname_out will never be the same.
-	Note that v:charconvert_from and v:charconvert_to may be different
-	from 'encoding'.  Vim internally uses UTF-8 instead of UCS-2 or UCS-4.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -1353,7 +1337,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			used regardless of whether "unnamed" is in 'clipboard'
 			or not.  The clipboard register can always be
 			explicitly accessed using the "* notation.  Also see
-			|gui-clipboard|.
+			|clipboard|.
 
 						*clipboard-unnamedplus*
 	unnamedplus	A variant of the "unnamed" flag which uses the
@@ -1363,7 +1347,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			register.  When "unnamed" is also included to the
 			option, yank and delete operations (but not put)
 			will additionally copy the text into register
-			'*'. See |nvim-clipboard|.
+			'*'. See |clipboard|.
 
 						*clipboard-autoselect*
 	autoselect	Works like the 'a' flag in 'guioptions': If present,
@@ -1450,9 +1434,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	comment text.  Currently only used to add markers for folding, see
 	|fold-marker|.
 
-			*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp'	Removed. |vim-differences| {Nvim}
-
 						*'complete'* *'cpt'* *E535*
 'complete' 'cpt'	string	(default: ".,w,b,u,t")
 			local to buffer
@@ -1460,7 +1441,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when CTRL-P or CTRL-N are used.  It is also used for whole-line
 	completion |i_CTRL-X_CTRL-L|.  It indicates the type of completion
 	and the places to scan.  It is a comma separated list of flags:
-	.	scan the current buffer ( 'wrapscan' is ignored)
+	.	scan the current buffer ('wrapscan' is ignored)
 	w	scan buffers from other windows
 	b	scan other loaded buffers that are in the buffer list
 	u	scan the unloaded buffers that are in the buffer list
@@ -1602,7 +1583,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	line, the remaining space is filled in the normal manner.
 	See 'preserveindent'.
 
-						*'cpoptions'* *'cpo'*
+						*'cpoptions'* *'cpo'* *cpo*
 'cpoptions' 'cpo'	string	(Vim default: "aABceFs",
 				 Vi default: all flags)
 			global
@@ -1849,9 +1830,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			the cursor would skip over it and jump to the
 			following occurrence.
 
-						*'cryptmethod'* *'cm'*
-'cryptmethod'		Removed. |vim-differences| {Nvim}
-
 						*'cscopepathcomp'* *'cspc'*
 'cscopepathcomp' 'cspc'	number	(default 0)
 			global
@@ -2117,11 +2095,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Change the way text is displayed.  This is comma separated list of
 	flags:
 	lastline	When included, as much as possible of the last line
-			in a window will be displayed.  When not included, a
-			last line that doesn't fit is replaced with "@" lines.
+			in a window will be displayed.  "@@@" is put in the
+			last columns of the last screen line to indicate the
+			rest of the line is not displayed.
+	truncate	Like "lastline", but "@@@" is displayed in the first
+			column of the last screen line.  Overrules "lastline".
 	uhex		Show unprintable characters hexadecimal as <xx>
 			instead of using ^C and ~C.
 
+	When neither "lastline" or "truncate" is included, a last line that
+	doesn't fit is replaced with "@" lines.
+
 						*'eadirection'* *'ead'*
 'eadirection' 'ead'	string	(default "both")
 			global
@@ -2130,48 +2114,24 @@ A jump table for the options with a short description can be found at |Q_op|.
 		hor	horizontally, height of windows is not affected
 		both	width and height of windows is affected
 
-			   *'ed'* *'edcompatible'* *'noed'* *'noedcompatible'*
-'edcompatible' 'ed'	Removed. |vim-differences| {Nvim}
-
-					*'encoding'* *'enc'* *E543*
-'encoding' 'enc'	string (default: "utf-8")
+						*'emoji'* *'emo'*
+'emoji' 'emo'	boolean (default: on)
 			global
+			{not in Vi}
 			{only available when compiled with the |+multi_byte|
 			feature}
-	Sets the character encoding used inside Vim.  It applies to text in
-	the buffers, registers, Strings in expressions, text stored in the
-	shada file, etc.  It sets the kind of characters which Vim can work
-	with.  See |encoding-names| for the possible values.
+	When on all Unicode emoji characters are considered to be full width.
 
-	'encoding' cannot be changed after startup, because (1) it causes
-	non-ASCII text inside Vim to become invalid, and (2) it complicates
-	runtime logic.  The recommended 'encoding' is "utf-8".  Remote plugins
-	and GUIs only support utf-8. See |multibyte|.
 
-	The character encoding of files can be different from 'encoding'.
+					*'encoding'* *'enc'* *E543*
+'encoding' 'enc'	Removed. |vim-differences| {Nvim}
+	Nvim always uses UTF-8 internally. RPC communication
+	(remote plugins/GUIs) must use UTF-8 strings.
+
+	The character encoding of files can be different than UTF-8.
 	This is specified with 'fileencoding'.  The conversion is done with
 	iconv() or as specified with 'charconvert'.
 
-	If you need to know whether 'encoding' is a multi-byte encoding, you
-	can use: >
-		if has("multi_byte_encoding")
-<
-	When you set this option, it fires the |EncodingChanged| autocommand
-	event so that you can set up fonts if necessary.
-
-	When the option is set, the value is converted to lowercase.  Thus
-	you can set it with uppercase values too.  Underscores are translated
-	to '-' signs.
-	When the encoding is recognized, it is changed to the standard name.
-	For example "Latin-1" becomes "latin1", "ISO_88592" becomes
-	"iso-8859-2" and "utf8" becomes "utf-8".
-
-	When "unicode", "ucs-2" or "ucs-4" is used, Vim internally uses utf-8.
-	You don't notice this while editing, but it does matter for the
-	|shada-file|.  And Vim expects the terminal to use utf-8 too.  Thus
-	setting 'encoding' to one of these values instead of utf-8 only has
-	effect for encoding used for files when 'fileencoding' is empty.
-
 			*'endofline'* *'eol'* *'noendofline'* *'noeol'*
 'endofline' 'eol'	boolean	(default on)
 			local to buffer
@@ -2298,20 +2258,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 			feature}
 	Sets the character encoding for the file of this buffer.
 
-	When 'fileencoding' is different from 'encoding', conversion will be
+	When 'fileencoding' is different from "utf-8", conversion will be
 	done when writing the file.  For reading see below.
-	When 'fileencoding' is empty, the same value as 'encoding' will be
-	used (no conversion when reading or writing a file).
-	Conversion will also be done when 'encoding' and 'fileencoding' are
-	both a Unicode encoding and 'fileencoding' is not utf-8.  That's
-	because internally Unicode is always stored as utf-8.
-		WARNING: Conversion can cause loss of information!  When
-		'encoding' is "utf-8" or another Unicode encoding, conversion
-		is most likely done in a way that the reverse conversion
-		results in the same text.  When 'encoding' is not "utf-8" some
-		characters may be lost!
-
-	See 'encoding' for the possible values.  Additionally, values may be
+	When 'fileencoding' is empty, the file will be saved with utf-8
+	encoding.  (no conversion when reading or writing a file).
+		WARNING: Conversion to a non-Unicode encoding can cause loss of
+		information! 
+
+	See |encoding-names| for the possible values.  Additionally, values may be
 	specified that can be handled by the converter, see
 	|mbyte-conversion|.
 
@@ -2324,8 +2278,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Prepending "8bit-" and "2byte-" has no meaning here, they are ignored.
 	When the option is set, the value is converted to lowercase.  Thus
 	you can set it with uppercase values too.  '_' characters are
-	replaced with '-'.  If a name is recognized from the list for
-	'encoding', it is replaced by the standard name.  For example
+	replaced with '-'.  If a name is recognized from the list at
+	|encoding-names|, it is replaced by the standard name.  For example
 	"ISO8859-2" becomes "iso-8859-2".
 
 	When this option is set, after starting to edit a file, the 'modified'
@@ -2338,11 +2292,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	This option can not be changed when 'modifiable' is off.
 
-							*'fe'*
-	NOTE: Before version 6.0 this option specified the encoding for the
-	whole of Vim, this was a mistake.  Now use 'encoding' instead.  The
-	old short name was 'fe', which is no longer used.
-
 					*'fileencodings'* *'fencs'*
 'fileencodings' 'fencs'	string (default: "ucs-bom,utf-8,default,latin1")
 			global
@@ -2353,12 +2302,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	mentioned character encoding.  If an error is detected, the next one
 	in the list is tried.  When an encoding is found that works,
 	'fileencoding' is set to it.  If all fail, 'fileencoding' is set to
-	an empty string, which means the value of 'encoding' is used.
-		WARNING: Conversion can cause loss of information!  When
-		'encoding' is "utf-8" (or one of the other Unicode variants)
-		conversion is most likely done in a way that the reverse
-		conversion results in the same text.  When 'encoding' is not
-		"utf-8" some non-ASCII characters may be lost!  You can use
+	an empty string, which means that UTF-8 is used.
+		WARNING: Conversion can cause loss of information! You can use
 		the |++bad| argument to specify what is done with characters
 		that can't be converted.
 	For an empty file or a file with only ASCII characters most encodings
@@ -2384,11 +2329,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	because Vim cannot detect an error, thus the encoding is always
 	accepted.
 	The special value "default" can be used for the encoding from the
-	environment.  It is useful when 'encoding' is set to "utf-8" and
-	your environment uses a non-latin1 encoding, such as Russian.
-	When 'encoding' is "utf-8" and a file contains an illegal byte
-	sequence it won't be recognized as UTF-8.  You can use the |8g8|
-	command to find the illegal byte sequence.
+	environment.  It is useful when your environment uses a non-latin1
+	encoding, such as Russian.
+	When a file contains an illegal UTF-8 byte sequence it won't be
+	recognized as "utf-8".  You can use the |8g8| command to find the
+	illegal byte sequence.
 	WRONG VALUES:			WHAT'S WRONG:
 		latin1,utf-8		"latin1" will always be used
 		utf-8,ucs-bom,latin1	BOM won't be recognized in an utf-8
@@ -2459,8 +2404,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  file only, the option is not changed.
 	When 'binary' is set, the value of 'fileformats' is not used.
 
-	Note that when Vim starts up with an empty buffer this option is not
-	used.  Set 'fileformat' in your vimrc instead.
+	When Vim starts up with an empty buffer the first item is used.  You
+	can overrule this by setting 'fileformat' in your .vimrc.
 
 	For systems with a Dos-like <EOL> (<CR><NL>), when reading files that
 	are ":source"ed and for vimrc files, automatic <EOL> detection may be
@@ -2515,17 +2460,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	  item		default		Used for ~
 	  stl:c		' ' or '^'	statusline of the current window
-	  stlnc:c	' ' or '-'	statusline of the non-current windows
+	  stlnc:c	' ' or '='	statusline of the non-current windows
 	  vert:c	'|'		vertical separators |:vsplit|
 	  fold:c	'-'		filling 'foldtext'
 	  diff:c	'-'		deleted lines of the 'diff' option
 
 	Any one that is omitted will fall back to the default.  For "stl" and
-	"stlnc" the space will be used when there is highlighting, '^' or '-'
+	"stlnc" the space will be used when there is highlighting, '^' or '='
 	otherwise.
 
 	Example: >
-	    :set fillchars=stl:^,stlnc:-,vert:\|,fold:-,diff:-
+	    :set fillchars=stl:^,stlnc:=,vert:\|,fold:-,diff:-
 <	This is similar to the default, except that these characters will also
 	be used when there is highlighting.
 
@@ -2737,6 +2682,40 @@ A jump table for the options with a short description can be found at |Q_op|.
 	It is not allowed to change text or jump to another window while
 	evaluating 'foldtext' |textlock|.
 
+						*'formatexpr'* *'fex'*
+'formatexpr' 'fex'	string (default "")
+			local to buffer
+			{not available when compiled without the |+eval|
+			feature}
+	Expression which is evaluated to format a range of lines for the |gq|
+	operator or automatic formatting (see 'formatoptions').  When this
+	option is empty 'formatprg' is used.
+
+	The |v:lnum|  variable holds the first line to be formatted.
+	The |v:count| variable holds the number of lines to be formatted.
+	The |v:char|  variable holds the character that is going to be
+		      inserted if the expression is being evaluated due to
+		      automatic formatting.  This can be empty.  Don't insert
+		      it yet!
+
+	Example: >
+		:set formatexpr=mylang#Format()
+<	This will invoke the mylang#Format() function in the
+	autoload/mylang.vim file in 'runtimepath'. |autoload|
+
+	The expression is also evaluated when 'textwidth' is set and adding
+	text beyond that limit.  This happens under the same conditions as
+	when internal formatting is used.  Make sure the cursor is kept in the
+	same spot relative to the text then!  The |mode()| function will
+	return "i" or "R" in this situation.
+	
+	When the expression evaluates to non-zero Vim will fall back to using
+	the internal format mechanism.
+
+	The expression will be evaluated in the |sandbox| when set from a
+	modeline, see |sandbox-option|.  That stops the option from working,
+	since changing the buffer text is not allowed.
+
 					*'formatoptions'* *'fo'*
 'formatoptions' 'fo'	string (default: "tcqj", Vi default: "vt")
 			local to buffer
@@ -2775,40 +2754,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
-						*'formatexpr'* *'fex'*
-'formatexpr' 'fex'	string (default "")
-			local to buffer
-			{not available when compiled without the |+eval|
-			feature}
-	Expression which is evaluated to format a range of lines for the |gq|
-	operator or automatic formatting (see 'formatoptions').  When this
-	option is empty 'formatprg' is used.
-
-	The |v:lnum|  variable holds the first line to be formatted.
-	The |v:count| variable holds the number of lines to be formatted.
-	The |v:char|  variable holds the character that is going to be
-		      inserted if the expression is being evaluated due to
-		      automatic formatting.  This can be empty.  Don't insert
-		      it yet!
-
-	Example: >
-		:set formatexpr=mylang#Format()
-<	This will invoke the mylang#Format() function in the
-	autoload/mylang.vim file in 'runtimepath'. |autoload|
-
-	The expression is also evaluated when 'textwidth' is set and adding
-	text beyond that limit.  This happens under the same conditions as
-	when internal formatting is used.  Make sure the cursor is kept in the
-	same spot relative to the text then!  The |mode()| function will
-	return "i" or "R" in this situation.
-	
-	When the expression evaluates to non-zero Vim will fall back to using
-	the internal format mechanism.
-
-	The expression will be evaluated in the |sandbox| when set from a
-	modeline, see |sandbox-option|.  That stops the option from working,
-	since changing the buffer text is not allowed.
-
 						*'fsync'* *'fs'*
 'fsync' 'fs'		boolean	(default on)
 			global
@@ -3047,8 +2992,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note: The size of these fonts must be exactly twice as wide as the one
 	specified with 'guifont' and the same height.
 
-	'guifontwide' is only used when 'encoding' is set to "utf-8" and
-	'guifontset' is empty or invalid.
+	'guifontwide' is only used when 'guifontset' is empty or invalid.
 	When 'guifont' is set and a valid font is found in it and
 	'guifontwide' is empty Vim will attempt to find a matching
 	double-width font and set 'guifontwide' to it.
@@ -3097,7 +3041,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		The same applies to the modeless selection.
 								*'go-P'*
 	  'P'	Like autoselect but using the "+ register instead of the "*
-	  	register.
+		register.
 								*'go-A'*
 	  'A'	Autoselect for the modeless selection.  Like 'a', but only
 		applies to the modeless selection.
@@ -3165,9 +3109,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		removing it after the GUI has started has no effect.
 
 
-						*'guipty'* *'noguipty'*
-'guipty'		Removed. |vim-differences| {Nvim}
-
 						*'guitablabel'* *'gtl'*
 'guitablabel' 'gtl'	string	(default empty)
 			global
@@ -3328,8 +3269,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 		-	no highlighting
 		:	use a highlight group
 	The default is used for occasions that are not included.
-	If you want to change what the display modes do, see |dos-colors|
-	for an example.
 	When using the ':' display mode, this must be followed by the name of
 	a highlight group.  A highlight group can be used to define any type
 	of highlighting, including using color.  See |:highlight| on how to
@@ -3414,12 +3353,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Can be overruled by using "\c" or "\C" in the pattern, see
 	|/ignorecase|.
 
-						*'imactivatefunc'* *'imaf'*
-'imactivatefunc' 'imaf'	Removed. |vim-differences| {Nvim}
-
-						*'imactivatekey'* *'imak'*
-'imactivatekey' 'imak'	Removed. |vim-differences| {Nvim}
-
 				*'imcmdline'* *'imc'* *'noimcmdline'* *'noimc'*
 'imcmdline' 'imc'	boolean (default off)
 			global
@@ -3476,8 +3409,17 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The value is set to 1 when it is not -1 and setting the 'keymap'
 	option to a valid keymap name.
 
-						*'imstatusfunc'* *'imsf'*
-'imstatusfunc' 'imsf'	Removed. |vim-differences| {Nvim}
+						*'inccommand'* *'icm'*
+'inccommand' 'icm'	string	(default "")
+			global
+			
+	"nosplit": Shows the effects of a command incrementally, as you type.
+	"split"	 : Also shows partial off-screen results in a preview window.
+
+	Works for |:substitute|, |:smagic|, |:snomagic|. |hl-Substitute|
+
+	If the preview is too slow (exceeds 'redrawtime') then 'inccommand' is
+	automatically disabled until |Command-line-mode| is done.
 
 						*'include'* *'inc'*
 'include' 'inc'		string	(default "^\s*#\s*include")
@@ -3696,6 +3638,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'*', '"' and '|' (so that CTRL-] on a command finds the help for that
 	command).
 	When the 'lisp' option is on the '-' character is always included.
+	This option also influences syntax highlighting, unless the syntax
+	uses |:syn-iskeyword|.
 
 						*'isprint'* *'isp'*
 'isprint' 'isp'	string	(default: "@,161-255")
@@ -3713,7 +3657,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		128 - 159	"~@" - "~_"
 		160 - 254	"| " - "|~"
 		   255		"~?"
-	When 'encoding' is a Unicode one, illegal bytes from 128 to 255 are
+	Illegal bytes from 128 to 255 (invalid UTF-8) are
 	displayed as <xx>, with the hexadecimal value of the byte.
 	When 'display' contains "uhex" all unprintable characters are
 	displayed as <xx>.
@@ -3733,9 +3677,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Insert two spaces after a '.', '?' and '!' with a join command.
 	Otherwise only one space is inserted.
 
-					*'key'*
-'key'			Removed. |vim-differences| {Nvim}
-
 					*'keymap'* *'kmp'* *E544*
 'keymap' 'kmp'		string	(default "")
 			local to buffer
@@ -3960,6 +3901,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Strings to use in 'list' mode and for the |:list| command.  It is a
 	comma separated list of string settings.
+
 							*lcs-eol*
 	  eol:c		Character to show at the end of each line.  When
 			omitted, there is no extra character at the end of the
@@ -3994,8 +3936,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			omitted.
 
 	The characters ':' and ',' should not be used.  UTF-8 characters can
-	be used when 'encoding' is "utf-8", otherwise only printable
-	characters are allowed.  All characters must be single width.
+	be used.  All characters must be single width.
 
 	Examples: >
 	    :set lcs=tab:>-,trail:-
@@ -4014,9 +3955,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Note that using the "-u NONE" and "--noplugin" command line arguments
 	reset this option. |-u| |--noplugin|
 
-						*'macatsui'* *'nomacatsui'*
-'macatsui'		Removed. |vim-differences| {Nvim}
-
 						*'magic'* *'nomagic'*
 'magic'			boolean	(default on)
 			global
@@ -4095,7 +4033,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			{only available when compiled with the |+multi_byte|
 			feature}
 	The maximum number of combining characters supported for displaying.
-	Only used when 'encoding' is "utf-8".
 	The default is OK for most languages.  Hebrew may require 4.
 	Maximum value is 6.
 	Even when this option is set to 2 you can still edit text with more
@@ -4239,6 +4176,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   written.  A ":set nomodified" command also resets the original
 	   values to the current values and the 'modified' option will be
 	   reset.
+	   Similarly for 'eol' and 'bomb'.
 	This option is not set when a change is made to the buffer as the
 	result of a BufNewFile, BufRead/BufReadPost, BufWritePost,
 	FileAppendPost or VimLeave autocommand event.  See |gzip-example| for
@@ -4399,9 +4337,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'mousetime'* *'mouset'*
 'mousetime' 'mouset'	number	(default 500)
 			global
-	Only for GUI, Windows and Unix with xterm.  Defines the maximum
-	time in msec between two mouse clicks for the second click to be
-	recognized as a multi click.
+	Defines the maximum time in msec between two mouse clicks for the
+	second click to be recognized as a multi click.
 
 							*'nrformats'* *'nf'*
 'nrformats' 'nf'	string	(default "bin,hex")
@@ -4411,7 +4348,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	respectively; see |CTRL-A| for more info on these commands.
 	alpha	If included, single alphabetical characters will be
 		incremented or decremented.  This is useful for a list with a
-		letter index a), b), etc.	  	*octal-nrformats*
+		letter index a), b), etc.		*octal-nrformats*
 	octal	If included, numbers that start with a zero will be considered
 		to be octal.  Example: Using CTRL-A on "007" results in "010".
 	hex	If included, numbers starting with "0x" or "0X" will be
@@ -4441,7 +4378,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	relative to the cursor.  Together with 'number' there are these
 	four combinations (cursor in line 3):
 
-              	'nonu'          'nu'            'nonu'          'nu'
+		'nonu'          'nu'            'nonu'          'nu'
 		'nornu'         'nornu'         'rnu'           'rnu'
 
 	    |apple          |  1 apple      |  2 apple      |  2 apple
@@ -4500,6 +4437,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
+				*'packpath'* *'pp'*
+'packpath' 'pp'		string	(default: see 'runtimepath')
+			{not in Vi}
+	Directories used to find packages.  See |packages|.
+
+
 						*'paragraphs'* *'para'*
 'paragraphs' 'para'	string	(default "IPLPPPQPP TPHPLIPpLpItpplpipbp")
 			global
@@ -4793,8 +4736,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 			{only available when compiled with the |+reltime|
 			feature}
-	The time in milliseconds for redrawing the display.  This applies to
-	searching for patterns for 'hlsearch' and |:match| highlighting.
+	Time in milliseconds for redrawing the display.  Applies to
+	'hlsearch', 'inccommand' and |:match| highlighting.
 	When redrawing takes more than this many milliseconds no further
 	matches will be highlighted.  This is used to avoid that Vim hangs
 	when using a very complicated pattern.
@@ -4854,9 +4797,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	For the ":substitute" command the number of substitutions is used
 	instead of the number of lines.
 
-			 *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
-'restorescreen' 'rs'	Removed. |vim-differences| {Nvim}
-
 				*'revins'* *'ri'* *'norevins'* *'nori'*
 'revins' 'ri'		boolean	(default off)
 			global
@@ -4937,7 +4877,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 					       $XDG_CONFIG_DIRS[1]/nvim,
 					       $XDG_CONFIG_DIRS[2]/nvim,
 					       …
-					       $XDG_DATA_HOME/nvim,
+					       $XDG_DATA_HOME/nvim/site,
 					       $XDG_DATA_DIRS[1]/nvim/site,
 					       $XDG_DATA_DIRS[2]/nvim/site,
 					       …
@@ -4945,7 +4885,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 					       …
 					       $XDG_DATA_DIRS[2]/nvim/site/after,
 					       $XDG_DATA_DIRS[1]/nvim/site/after,
-					       $XDG_DATA_HOME/nvim/after,
+					       $XDG_DATA_HOME/nvim/site/after,
 					       …
 					       $XDG_CONFIG_DIRS[2]/nvim/after,
 					       $XDG_CONFIG_DIRS[1]/nvim/after,
@@ -4964,6 +4904,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	  keymap/	key mapping files |mbyte-keymap|
 	  lang/		menu translations |:menutrans|
 	  menu.vim	GUI menus |menu.vim|
+	  pack/		packages |:packadd|
 	  plugin/	plugin scripts |write-plugin|
 	  print/	files for printing |postscript-print-encoding|
 	  spell/	spell checking files |spell|
@@ -4990,6 +4931,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   ordering.  This is for preferences to overrule or add to the 
 	   distributed defaults or system-wide settings (rarely needed).
 
+	More entries are added when using |packages|.
+
 	Note that, unlike 'path', no wildcards like "**" are allowed.  Normal
 	wildcards are allowed, but can significantly slow down searching for
 	runtime files.  For speed, use as few items as possible and avoid
@@ -5257,10 +5200,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 		has been used since the last search command.
 							*shada-n*
 	n	Name of the shada file.  The name must immediately follow
-		the 'n'.  Must be the last one!  If the "-i" argument was
-		given when starting Vim, that file name overrides the one
-		given here with 'shada'.  Environment variables are expanded
-		when opening the file, not when setting the option.
+		the 'n'.  Must be at the end of the option!  If the "-i"
+		argument was given when starting Vim, that file name overrides
+		the one given here with 'shada'.  Environment variables are
+		expanded when opening the file, not when setting the option.
 							*shada-r*
 	r	Removable media.  The argument is a string (up to the next
 		',').  This parameter can be given several times.  Each
@@ -5466,6 +5409,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The |FilterReadPre|, |FilterReadPost| and |FilterWritePre|,
 	|FilterWritePost| autocommands event are not triggered when
 	'shelltemp' is off.
+	|system()| does not respect this option, it always uses pipes.
 
 						*'shellxescape'* *'sxe'*
 'shellxescape' 'sxe'	string	(default: "";
@@ -5564,9 +5508,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	    shm=a	Abbreviation, but no loss of information.
 	    shm=at	Abbreviation, and truncate message when necessary.
 
-				 *'shortname'* *'sn'* *'noshortname'* *'nosn'*
-'shortname' 'sn'	Removed. |vim-differences| {Nvim}
-
 						*'showbreak'* *'sbr'* *E595*
 'showbreak' 'sbr'	string	(default "")
 			global
@@ -5683,10 +5624,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 	Example: Try this together with 'sidescroll' and 'listchars' as
 		 in the following example to never allow the cursor to move
-		 onto the "extends" character:
+		 onto the "extends" character: >
 
 		 :set nowrap sidescroll=1 listchars=extends:>,precedes:<
 		 :set sidescrolloff=1
+<
+						*'signcolumn'* *'scl'*
+'signcolumn' 'scl'	string	(default "auto")
+			local to window
+	Whether or not to draw the signcolumn. Valid values are:
+	   "auto"   	only when there is a sign to display
+	   "no"	    	never
+	   "yes"    	always
 
 
 			*'smartcase'* *'scs'* *'nosmartcase'* *'noscs'*
@@ -5837,9 +5786,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	(_xx is an underscore, two letters and followed by a non-letter).
 	This is mainly for testing purposes.  You must make sure the correct
 	encoding is used, Vim doesn't check it.
-	When 'encoding' is set the word lists are reloaded.  Thus it's a good
-	idea to set 'spelllang' after setting 'encoding' to avoid loading the
-	files twice.
 	How the related spell files are found is explained here: |spell-load|.
 
 	If the |spellfile.vim| plugin is active and you use a language name
@@ -5955,7 +5901,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	The option consists of printf style '%' items interspersed with
 	normal text.  Each status line item is of the form:
 	  %-0{minwid}.{maxwid}{item}
-	All fields except the {item} is optional.  A single percent sign can
+	All fields except the {item} are optional.  A single percent sign can
 	be given as "%%".  Up to 80 items can be specified.  *E541*
 
 	When the option starts with "%!" then it is used as an expression,
@@ -6068,7 +6014,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	            feature use `has('tablineat')`.
 	< -   Where to truncate line if too long.  Default is at the start.
 	      No width fields allowed.
-	= -   Separation point between left and right aligned items.
+	= -   Separation point between alignment sections. Each section will
+	      be separated by an equal number of spaces.
 	      No width fields allowed.
 	# -   Set highlight group.  The name must follow and then a # again.
 	      Thus use %#HLname# for highlight group HLname.  The same
@@ -6179,9 +6126,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	This option is used together with 'bufhidden' and 'buftype' to
 	specify special kinds of buffers.   See |special-buffers|.
 
-						*'swapsync'* *'sws'*
-'swapsync' 'sws'	Removed. |vim-differences| {Nvim}
-
 						*'switchbuf'* *'swb'*
 'switchbuf' 'swb'	string	(default "")
 			global
@@ -6405,9 +6349,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Resetting this option is useful when using a ":tag" command in a
 	mapping which should not change the tagstack.
 
-						*'term'* *E529* *E530* *E531*
-'term'			Removed. |vim-differences| {Nvim}
-
 						*'termbidi'* *'tbidi'*
 						*'notermbidi'* *'notbidi'*
 'termbidi' 'tbidi'	boolean (default off)
@@ -6421,9 +6362,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'arabicshape' is ignored, but 'rightleft' isn't changed automatically.
 	For further details see |arabic.txt|.
 
-					*'termencoding'* *'tenc'*
-'termencoding' 'tenc'	Removed. |vim-differences| {Nvim}
-
 						*'termguicolors'* *'tgc'*
 'termguicolors' 'tgc'	boolean (default off)
 			global
@@ -6461,6 +6399,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	non-keyword characters (white space is preferred).  Maximum line
 	length is 510 bytes.
 	To obtain a file to be used here, check out this ftp site:
+	[Sorry this link doesn't work anymore, do you know the right one?] 
 	ftp://ftp.ox.ac.uk/pub/wordlists/  First get the README file.
 	To include a comma in a file name precede it with a backslash.  Spaces
 	after a comma are ignored, otherwise spaces are included in the file
@@ -6577,28 +6516,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	to be garbled (e.g., when it contains a CR or NL character).
 	{not available when compiled without the |+statusline| feature}
 
-				*'toolbar'* *'tb'*
-'toolbar' 'tb'		Removed. |vim-differences| {Nvim}
-
-						*'toolbariconsize'* *'tbis'*
-'toolbariconsize' 'tbis'	Removed. |vim-differences| {Nvim}
-
-			     *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
-'ttybuiltin' 'tbi'	Removed. |vim-differences| {Nvim}
-
 				     *'ttyfast'* *'tf'* *'nottyfast'* *'notf'*
 'ttyfast' 'tf'		Removed. |vim-differences| {Nvim}
 
-						*'ttymouse'* *'ttym'*
-'ttymouse' 'ttym'	Removed. |vim-differences| {Nvim}
-
-						*'ttyscroll'* *'tsl'*
-'ttyscroll' 'tsl'	Removed. |vim-differences| {Nvim}
-
-						*'ttytype'* *'tty'*
-'ttytype' 'tty'		Alias for 'term'. Removed. |vim-differences| {Nvim}
-
-						*'undodir'* *'udir'* *E926*
+						*'undodir'* *'udir'* *E5003*
 'undodir' 'udir'	string	(default "$XDG_DATA_HOME/nvim/undo")
 			global
 			{only when compiled with the |+persistent_undo| feature}
@@ -6752,12 +6673,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	with Unix.  The Unix version of Vim cannot source dos format scripts,
 	but the Windows version of Vim can source unix format scripts.
 
-				*'viminfo'* *'vi'*
-'viminfo' 'vi'		string
-			global
-	Deprecated alias for 'shada' option. Is kept for compatibility 
-	reasons.
-
 					    *'virtualedit'* *'ve'*
 'virtualedit' 've'	string	(default "")
 			global
@@ -6803,9 +6718,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	Give a warning message when a shell command is used while the buffer
 	has been changed.
 
-		     *'weirdinvert'* *'wiv'* *'noweirdinvert'* *'nowiv'*
-'weirdinvert' 'wiv'	Removed. |vim-differences| {Nvim}
-
 						*'whichwrap'* *'ww'*
 'whichwrap' 'ww'	string	(Vim default: "b,s", Vi default: "")
 			global
@@ -7162,7 +7074,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'writedelay'* *'wd'*
 'writedelay' 'wd'	number	(default 0)
 			global
-	The number of microseconds to wait for each character sent to the
+	The number of milliseconds to wait for each character sent to the
 	screen.  When non-zero, characters are sent to the terminal one by
 	one.  For debugging purposes.
 
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index 3c7ca4e36a..5dc276c9df 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt*  For Vim version 7.4.  Last change: 2014 Sep 25
+*os_win32.txt*  For Vim version 7.4.  Last change: 2016 Mar 05
 
 
 		  VIM REFERENCE MANUAL    by George Reilly
@@ -75,6 +75,31 @@ The directory of the Vim executable is appended to $PATH.  This is mostly to
 make "!xxd" work, as it is in the Tools menu.  And it also means that when
 executable() returns 1 the executable can actually be executed.
 
+Quotes in file names					*win32-quotes*
+
+Quotes inside a file name (or any other command line argument) can be escaped
+with a backslash.  E.g. >
+	vim -c "echo 'foo\"bar'"
+
+Alternatively use three quotes to get one: >
+	vim -c "echo 'foo"""bar'"
+
+The quotation rules are:
+
+1. A `"` starts quotation.
+2. Another `"` or `""` ends quotation. If the quotation ends with `""`, a `"`
+   is produced at the end of the quoted string.
+
+Examples, with [] around an argument:
+        "foo"           -> [foo]
+        "foo""          -> [foo"]
+        "foo"bar        -> [foobar]
+        "foo" bar       -> [foo], [bar]
+        "foo""bar       -> [foo"bar]
+        "foo"" bar      -> [foo"], [bar]
+        "foo"""bar"     -> [foo"bar]
+
+
 ==============================================================================
 3. Using the mouse					*win32-mouse*
 
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 5897f756d8..f3f5bcbd66 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt*   For Vim version 7.4.  Last change: 2016 Jan 03
+*pattern.txt*   For Vim version 7.4.  Last change: 2016 Jun 08
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -573,7 +573,7 @@ An atom can be followed by an indication of how many times the atom can be
 matched and in what way.  This is called a multi.  See |/multi| for an
 overview.
 
-						*/star* */\star* *E56*
+							*/star* */\star*
 *	(use \* when 'magic' is not set)
 	Matches 0 or more of the preceding atom, as many as possible.
 	Example  'nomagic'	matches ~
@@ -593,7 +593,7 @@ overview.
 	the end of the file and then tries matching "END", backing up one
 	character at a time.
 
-							*/\+* *E57*
+							*/\+*
 \+	Matches 1 or more of the preceding atom, as many as possible.
 	Example		matches ~
 	^.\+$		any non-empty line
@@ -608,7 +608,7 @@ overview.
 \?	Just like \=.  Cannot be used when searching backwards with the "?"
 	command.
 
-					*/\{* *E58* *E60* *E554* *E870*
+					*/\{* *E60* *E554* *E870*
 \{n,m}	Matches n to m of the preceding atom, as many as possible
 \{n}	Matches n of the preceding atom
 \{n,}	Matches at least n of the preceding atom, as many as possible
@@ -947,14 +947,18 @@ $	At end of pattern or in front of "\|", "\)" or "\n" ('magic' on):
 <	When 'hlsearch' is set and you move the cursor around and make changes
 	this will clearly show when the match is updated or not.
 	To match the text up to column 17: >
-		/.*\%17v
-<	Column 17 is included, because that's where the "\%17v" matches,
-	even though this is a |/zero-width| match.  Adding a dot to match the
-	next character has the same result: >
-		/.*\%17v.
+		/^.*\%17v
+<	Column 17 is not included, because this is a |/zero-width| match. To
+	include the column use: >
+		/^.*\%17v.
 <	This command does the same thing, but also matches when there is no
 	character in column 17: >
-		/.*\%<18v.
+		/^.*\%<18v.
+<	Note that without the "^" to anchor the match in the first column,
+	this will also highlight column 17: >
+		/.*\%17v
+<	Column 17 is highlighted by 'hlsearch' because there is another match
+	where ".*" matches zero characters.
 <
 
 Character classes:
@@ -1071,8 +1075,8 @@ x	A single character, with no special meaning, matches itself
 	  belonging to that character class.  The following character classes
 	  are supported:
 			  Name		Contents ~
-*[:alnum:]*		  [:alnum:]     letters and digits
-*[:alpha:]*		  [:alpha:]     letters
+*[:alnum:]*		  [:alnum:]     ASCII letters and digits
+*[:alpha:]*		  [:alpha:]     ASCII letters
 *[:blank:]*		  [:blank:]     space and tab characters
 *[:cntrl:]*		  [:cntrl:]     control characters
 *[:digit:]*		  [:digit:]     decimal digits
@@ -1080,7 +1084,7 @@ x	A single character, with no special meaning, matches itself
 *[:lower:]*		  [:lower:]     lowercase letters (all letters when
 					'ignorecase' is used)
 *[:print:]*		  [:print:]     printable characters including space
-*[:punct:]*		  [:punct:]     punctuation characters
+*[:punct:]*		  [:punct:]     ASCII punctuation characters
 *[:space:]*		  [:space:]     whitespace characters
 *[:upper:]*		  [:upper:]     uppercase letters (all letters when
 					'ignorecase' is used)
@@ -1096,8 +1100,9 @@ x	A single character, with no special meaning, matches itself
 	  '/', alphabetic, numeric, '_' or '~'.
 	  These items only work for 8-bit characters, except [:lower:] and
 	  [:upper:] also work for multi-byte characters when using the new
-	  regexp engine.  In the future these items may work for multi-byte
-	  characters.
+	  regexp engine.  See |two-engines|.  In the future these items may
+	  work for multi-byte characters.  For now, to get all "alpha"
+	  characters you can use: [[:lower:][:upper:]].
 							*/[[=* *[==]*
 	- An equivalence class.  This means that characters are matched that
 	  have almost the same meaning, e.g., when ignoring accents.  This
diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
new file mode 100644
index 0000000000..69833103d1
--- /dev/null
+++ b/runtime/doc/pi_health.txt
@@ -0,0 +1,127 @@
+*pi_health.txt*   Healthcheck framework
+
+Author: TJ DeVries <devries.timothyj@gmail.com>
+
+==============================================================================
+1. Introduction				|health.vim-intro|
+2. Commands and functions		|health.vim-manual|
+3. Create a healthcheck			|health.vim-dev|
+
+==============================================================================
+Introduction				*healthcheck* *health.vim-intro*
+
+Troubleshooting user configuration problems is a time-consuming task that
+developers want to minimize. health.vim provides a simple framework for plugin
+authors to hook into, and for users to invoke, to check and report the user's
+configuration and environment. Type this command to try it: >
+
+        :CheckHealth
+<
+For example, some users have broken or unusual Python setups, which breaks the
+|:python| command. |:CheckHealth| detects several common Python configuration
+problems and reports them. If the Neovim Python module is not installed, it
+shows a warning: >
+
+	You have not installed the Neovim Python module
+	You might want to try `pip install Neovim`
+< 
+Plugin authors are encouraged to add healthchecks, see |health.vim-dev|.
+
+==============================================================================
+Commands and functions			*health.vim-manual*
+
+Commands
+------------------------------------------------------------------------------
+							*:CheckHealth*
+:CheckHealth          Run all healthchecks and show the output in a new
+                      tabpage. These healthchecks are included by default:
+                        - python2
+                        - python3
+                        - ruby
+                        - remote plugin
+
+:CheckHealth {plugins}
+                      Run healthchecks for one or more plugins. E.g. to run
+                      only the standard Nvim healthcheck: >
+                        :CheckHealth nvim
+<                      To run the healthchecks for the "foo" and "bar" plugins
+                      (assuming these plugins are on your 'runtimepath' and
+                      they have implemented health#foo#check() and
+                      health#bar#check(), respectively): >
+                        :CheckHealth foo bar
+<
+Functions
+------------------------------------------------------------------------------
+
+health.vim functions are for creating new healthchecks. They mostly just do
+some layout and formatting, to give users a consistent presentation.
+
+health#report_start({name})				*health#report_start*
+	Starts a new report. Most plugins should call this only once, but if
+        you want different sections to appear in your report, call this once
+        per section.
+
+health#report_info({msg})				*health#report_info*
+	Displays an informational message.
+
+health#report_ok({msg})					*health#report_ok*
+	Displays a "success" message.
+
+health#report_warn({msg}, [{suggestions}])		*health#report_warn*
+        Displays a warning. {suggestions} is an optional List of suggestions.
+
+health#report_error({msg}, [{suggestions}])		*health#report_error*
+        Displays an error. {suggestions} is an optional List of suggestions.
+
+health#{plugin}#check()					*health.user_checker*
+        This is the form of a healthcheck definition. Call the above functions
+        from this function, then |:CheckHealth| does the rest. Example: >
+
+                function! health#my_plug#check() abort
+                  silent call s:check_environment_vars()
+                  silent call s:check_python_configuration()
+                endfunction
+<
+        The function will be found and called automatically when the user
+        invokes |:CheckHealth|.
+
+	All output will be captured from the healthcheck. Use the
+        health#report_* functions so that your healthcheck has a format
+        consistent with the standard healthchecks.
+
+==============================================================================
+Create a healthcheck			*health.vim-dev*
+
+Healthchecks are functions that check the health of the system. Neovim has
+built-in checkers, found in $VIMRUNTIME/autoload/health/.
+
+To add a new checker for your own plugin, simply define a
+health#{plugin}#check() function in autoload/health/{plugin}.vim.
+|:CheckHealth| automatically finds and invokes such functions.
+
+If your plugin is named "jslint", then its healthcheck function must be >
+
+        health#jslint#check()
+<
+defined in this file on 'runtimepath': >
+
+        autoload/health/jslint.vim
+<
+Here's a sample to get started: >
+
+        function! health#jslint#check() abort
+          call health#report_start('sanity checks')
+          " perform arbitrary checks
+          " ...
+
+          if looks_good
+            call health#report_ok('found required dependencies')
+          else
+            call health#report_error('cannot find jslint', 
+              \ ['npm install --save jslint'])
+          endif
+        endfunction
+<
+==============================================================================
+
+vim:tw=78:ts=8:ft=help:fdm=marker
diff --git a/runtime/doc/pi_msgpack.txt b/runtime/doc/pi_msgpack.txt
index 95d6ff7467..d695ac42cb 100644
--- a/runtime/doc/pi_msgpack.txt
+++ b/runtime/doc/pi_msgpack.txt
@@ -128,6 +128,11 @@ msgpack#eval({string}, {dict})				*msgpack#eval()*
 	always evaluated to |msgpack-special-dict| values, as well as 
 	hexadecimal digits.  When evaluating maps order of keys is preserved.
 
+	Note that in addition to regular integer representations that may be 
+	obtained using |msgpack#string()| msgpack#eval() also supports C-style 
+	“character” integer constants like `'/'` (equivalent to 
+	`char2nr('/')`: `47`). This also allows `'\0'` (number is decimal).
+
 							*msgpack#equal*
 msgpack#equal({msgpack-value}, {msgpack-value})		*msgpack#equal()*
 	Returns 1 if given values are equal, 0 otherwise.  When comparing 
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 1705010ff2..f740143c61 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt*  For Vim version 7.4.  Last change: 2015 Oct 31
+*pi_netrw.txt*  For Vim version 7.4.  Last change: 2016 Apr 20
 
 	    ------------------------------------------------
 	    NETRW REFERENCE MANUAL    by Charles E. Campbell
@@ -6,7 +6,7 @@
 Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
 
-Copyright: Copyright (C) 1999-2015 Charles E Campbell    *netrw-copyright*
+Copyright: Copyright (C) 2016 Charles E Campbell    *netrw-copyright*
 	The VIM LICENSE applies to the files in this package, including
 	netrw.vim, pi_netrw.txt, netrwFileHandlers.vim, netrwSettings.vim, and
 	syntax/netrw.vim.  Like anything else that's free, netrw.vim and its
@@ -48,9 +48,10 @@ Copyright: Copyright (C) 1999-2015 Charles E Campbell    *netrw-copyright*
       Introduction To Browsing............................|netrw-intro-browse|
       Quick Reference: Maps...............................|netrw-browse-maps|
       Quick Reference: Commands...........................|netrw-browse-cmds|
+      Banner Display......................................|netrw-I|
       Bookmarking A Directory.............................|netrw-mb|
       Browsing............................................|netrw-cr|
-        Squeezing the Current Tree-Listing Directory......|:netrw-s-cr|
+      Squeezing the Current Tree-Listing Directory........|netrw-s-cr|
       Browsing With A Horizontally Split Window...........|netrw-o|
       Browsing With A New Tab.............................|netrw-t|
       Browsing With A Vertically Split Window.............|netrw-v|
@@ -75,11 +76,13 @@ Copyright: Copyright (C) 1999-2015 Charles E Campbell    *netrw-copyright*
       Making The Browsing Directory The Current Directory.|netrw-c|
       Marking Files.......................................|netrw-mf|
       Unmarking Files.....................................|netrw-mF|
+      Marking Files By Location List......................|netrw-qL|
       Marking Files By QuickFix List......................|netrw-qF|
       Marking Files By Regular Expression.................|netrw-mr|
       Marked Files: Arbitrary Shell Command...............|netrw-mx|
       Marked Files: Arbitrary Shell Command, En Bloc......|netrw-mX|
       Marked Files: Arbitrary Vim Command.................|netrw-mv|
+      Marked Files: Argument List.........................|netrw-ma| |netrw-mA|
       Marked Files: Compression And Decompression.........|netrw-mz|
       Marked Files: Copying...............................|netrw-mc|
       Marked Files: Diff..................................|netrw-md|
@@ -1111,6 +1114,7 @@ QUICK REFERENCE: MAPS				*netrw-browse-maps* {{{2
 	   qb	List bookmarked directories and history              |netrw-qb|
 	   qf	Display information on file                          |netrw-qf|
 	   qF	Mark files using a quickfix list                     |netrw-qF|
+	   qL	Mark files using a |location-list|                     |netrw-qL|
 	   r	Reverse sorting order                                |netrw-r|
 	   R	Rename the designated file(s)/directory(ies)         |netrw-R|
 	   s	Select sorting style: by name, time, or file size    |netrw-s|
@@ -1160,6 +1164,14 @@ QUICK REFERENCE: COMMANDS	*netrw-explore-cmds* *netrw-browse-cmds* {{{2
      :Texplore[!] [dir] Tab & Explore..........................|netrw-explore|
      :Vexplore[!] [dir] Vertical Split & Explore...............|netrw-explore|
 
+
+BANNER DISPLAY						*netrw-I*
+
+One may toggle the banner display on and off by pressing "I".
+
+Also See: |g:netrw_banner|
+
+
 BOOKMARKING A DIRECTORY *netrw-mb* *netrw-bookmark* *netrw-bookmarks* {{{2
 
 One may easily "bookmark" the currently browsed directory by using >
@@ -1201,7 +1213,7 @@ Related Topics:
 	|g:netrw_home| controls where .netrwbook is kept
 
 
-BROWSING						*netrw-cr* {{{2
+BROWSING					*netrw-enter*	*netrw-cr* {{{2
 
 Browsing is simple: move the cursor onto a file or directory of interest.
 Hitting the <cr> (the return key) will select the file or directory.
@@ -1242,11 +1254,21 @@ The price for such re-use is that when changes are made (such as new files
 are introduced into a directory), the listing may become out-of-date.  One may
 always refresh directory listing buffers by pressing ctrl-L (see
 |netrw-ctrl-l|).
-								*:netrw-s-cr*
-    Squeezing the Current Tree-Listing Directory~
-    When the tree listing style is enabled (see |netrw-i|) and one is using
-    gvim, then the <s-cr> mapping may be used to squeeze (close) the
-    directory currently containing the cursor.
+
+								*netrw-s-cr*
+Squeezing the Current Tree-Listing Directory~
+
+When the tree listing style is enabled (see |netrw-i|) and one is using
+gvim, then the <s-cr> mapping may be used to squeeze (close) the
+directory currently containing the cursor.
+
+Otherwise, one may remap a key combination of one's own choice to get
+this effect: >
+
+    nmap <buffer> <silent> <nowait> YOURKEYCOMBO  <Plug>NetrwTreeSqueeze
+<
+Put this line in $HOME/ftplugin/netrw/netrw.vim; it needs to be generated
+for netrw buffers only.
 
 Related topics:
 	|netrw-ctrl-r|	|netrw-o|	|netrw-p|
@@ -1495,11 +1517,13 @@ One may also use visual mode (see |visual-start|) to select the text that the
 special handler will use.  Normally gx uses expand("<cfile>") to pick up the
 text under the cursor; one may change what |expand()| uses via the
 |g:netrw_gx| variable.  Alternatively, one may select the text to be used by
-gx via first making a visual selection (see |visual-block|).
+gx via first making a visual selection (see |visual-block|) or by changing
+the |'isfname'| option (which is global, so netrw doesn't modify it).
 
 Associated setting variables:
 	|g:netrw_gx|	control how gx picks up the text under the cursor
 	|g:netrw_nogx|	prevent gx map while editing
+	|g:netrw_suppress_gx_mesg| controls gx's suppression of browser messages
 
 							*netrw_filehandler*
 
@@ -1713,8 +1737,9 @@ Also see: |g:netrw_alto| |g:netrw_altv| |g:netrw_winsize|
 EXPLORING WITH STARS AND PATTERNS {{{2
 
 When Explore, Sexplore, Hexplore, or Vexplore are used with one of the
-following four patterns Explore generates a list of files which satisfy
-the request. >
+following four patterns Explore generates a list of files which satisfy the
+request for the local file system.  These exploration patterns will not work
+with remote file browsing.
 
     */filepat	files in current directory which satisfy filepat
     **/filepat	files in current directory or below which satisfy the
@@ -2079,15 +2104,22 @@ Netrw provides several ways to mark files:
 
 		:MF *.c
 <
-	* Note that :MF uses |<f-args>| to break the line
-	  at spaces.
+	  (Note that :MF uses |<f-args>| to break the line
+	  at spaces)
+
+	* Mark files using the |argument-list| (|netrw-mA|)
+
+	* Mark files based upon a |location-list| (|netrw-qL|)
 
 	* Mark files based upon the quickfix list (|netrw-qF|)
+	  (|quickfix-error-lists|)
 
 The following netrw maps make use of marked files:
 
     |netrw-a|	Hide marked files/directories
     |netrw-D|	Delete marked files/directories
+    |netrw-ma|	Move marked files' names to |arglist|
+    |netrw-mA|	Move |arglist| filenames to marked file list
     |netrw-mb|	Append marked files to bookmarks
     |netrw-mB|	Delete marked files from bookmarks
     |netrw-mc|	Copy marked files to target
@@ -2146,8 +2178,14 @@ UNMARKING FILES							*netrw-mF* {{{2
 The "mF" command will unmark all files in the current buffer.  One may also use
 mf (|netrw-mf|) on a specific, already marked, file to unmark just that file.
 
+MARKING FILES BY LOCATION LIST					*netrw-qL* {{{2
+	(also see |netrw-mf|)
+
+One may convert |location-list|s into a marked file list using "qL".
+You may then proceed with commands such as me (|netrw-me|) to edit them.
 
-MARKING FILES BY QUICKFIX LIST				*netrw-qF* {{{2
+
+MARKING FILES BY QUICKFIX LIST					*netrw-qF* {{{2
 	(also see |netrw-mf|)
 
 One may convert |quickfix-error-lists| into a marked file list using "qF".
@@ -2223,6 +2261,16 @@ The command that will be run with this example:
 	tar cf mynewtarball.tar 'file1' 'file2' ...
 
 
+MARKED FILES: ARGUMENT LIST				*netrw-ma* *netrw-mA*
+	    (See |netrw-mf| and |netrw-mr| for how to mark files)
+		      (uses the global marked-file list)
+
+Using ma, one moves filenames from the marked file list to the argument list.
+Using mA, one moves filenames from the argument list to the marked file list.
+
+See Also: |netrw-qF| |argument-list| |:args|
+
+
 MARKED FILES: COMPRESSION AND DECOMPRESSION		*netrw-mz* {{{2
 	    (See |netrw-mf| and |netrw-mr| for how to mark files)
 		      (uses the local marked file list)
@@ -2232,7 +2280,7 @@ If any marked files are decompressed, then "mz" will compress them
 using the command specified by |g:netrw_compress|; by default,
 that's "gzip".
 
-For decompression, netrw provides a |Dictionary| of suffices and their
+For decompression, netrw uses a |Dictionary| of suffices and their
 associated decompressing utilities; see |g:netrw_decompress|.
 
 Remember that one can mark multiple files by regular expression
@@ -2287,7 +2335,7 @@ The command will ask for the requested pattern; one may then enter: >
 	pattern
 <
 With /pattern/, editing will start with the first item on the |quickfix| list
-that vimgrep sets up (see |:copen|, |:cnext|, |:cprevious|).  The |:vimgrep|
+that vimgrep sets up (see |:copen|, |:cnext|, |:cprevious|, |:cclose|).  The |:vimgrep|
 command is in use, so without 'g' each line is added to quickfix list only
 once; with 'g' every match is included.
 
@@ -2756,6 +2804,16 @@ your browsing preferences.  (see also: |netrw-settings|)
 				evaluation will be suppressed
 				(see |'ballooneval'|)
 
+ *g:netrw_sizestyle*		not defined: actual bytes (default)
+ 				="b" : actual bytes       (default)
+ 				="h" : human-readable (ex. 5k, 4m, 3g)
+				       uses 1000 base
+ 				="H" : human-readable (ex. 5K, 4M, 3G)
+				       uses 1024 base
+				The long listing (|netrw-i|) and query-file
+				maps (|netrw-qf|) will display file size
+				using the specified style.
+
   *g:netrw_usetab*		if this variable exists and is non-zero, then
 				the <tab> map supporting shrinking/expanding a
 				Lexplore or netrw window will be enabled.
@@ -2872,6 +2930,13 @@ your browsing preferences.  (see also: |netrw-settings|)
 				such as listing, file removal, etc.
 				 default: ssh
 
+ *g:netrw_suppress_gx_mesg*	=1 : browsers sometimes produce messages
+				which are normally unwanted intermixed
+				with the page.
+				However, when using links, for example,
+				those messages are what the browser produces.
+				By setting this option to 0, netrw will not
+				suppress browser messages.
 
   *g:netrw_tmpfile_escape*	=' &;'
 				escape() is applied to all temporary files
@@ -3024,14 +3089,14 @@ These will:
 	Related: if you like this idea, you may also find :Lexplore
 	         (|netrw-:Lexplore|) or |g:netrw_chgwin| of interest
 
-Also see: |g:netrw_chgwin| |netrw-P| |'previewwindow'|
+Also see: |g:netrw_chgwin| |netrw-P| |'previewwindow'| |CTRL-W_z| |:pclose|
 
 
 PREVIOUS WINDOW					*netrw-P* *netrw-prvwin* {{{2
 
-To edit a file or directory in the previously used (last accessed) window (see
-:he |CTRL-W_p|), press a "P".  If there's only one window, then the one window
-will be horizontally split (by default).
+To edit a file or directory under the cursor in the previously used (last
+accessed) window (see :he |CTRL-W_p|), press a "P".  If there's only one
+window, then the one window will be horizontally split (by default).
 
 If there's more than one window, the previous window will be re-used on
 the selected file/directory.  If the previous window's associated buffer
@@ -3170,7 +3235,7 @@ only if your terminal supports differentiating <c-tab> from a plain
   * Else bring up a |:Lexplore| window
 
 If |g:netrw_usetab| exists or is zero, or if there is a pre-existing mapping
-for <c-tab>, then the <tab> will not be mapped.  One may map something other
+for <c-tab>, then the <c-tab> will not be mapped.  One may map something other
 than a <c-tab>, too: (but you'll still need to have had g:netrw_usetab set) >
 
 	nmap <unique> (whatever)	<Plug>NetrwShrink
@@ -3637,13 +3702,13 @@ called netrw.vimrc with the following contents: >
 <
 Then run netrw as follows: >
 
-	vim -u netrw.vimrc --noplugins [some path here]
+	vim -u netrw.vimrc --noplugins -i NONE [some path here]
 <
 Perform whatever netrw commands you need to, and check that the problem is
 still present.  This procedure sidesteps any issues due to personal .vimrc
-settings and other plugins.  If the problem does not appear, then you need
-to determine what setting in your .vimrc is causing the conflict with netrw
-or which plugin.
+settings, .viminfo file, and other plugins.  If the problem does not appear,
+then you need to determine which setting in your .vimrc is causing the
+conflict with netrw or which plugin(s) is/are involved.
 
 Step 3: If the problem still is present, then get a debugging trace from
 netrw:
@@ -3698,6 +3763,54 @@ netrw:
 ==============================================================================
 12. History						*netrw-history* {{{1
 
+	v156:	Feb 18, 2016	* Changed =~ to =~# where appropriate
+		Feb 23, 2016	* s:ComposePath(base,subdir) now uses
+				  fnameescape() on the base portion
+		Mar 01, 2016	* (gt_macki) reported where :Explore would
+				  make file unlisted. Fixed (tst943)
+		Apr 04, 2016	* (reported by John Little) netrw normally
+				  suppresses browser messages, but sometimes
+				  those "messages" are what is wanted.
+				  See |g:netrw_suppress_gx_mesg|
+		Apr 06, 2016	* (reported by Carlos Pita) deleting a remote
+				  file was giving an error message.  Fixed.
+		Apr 08, 2016	* (Charles Cooper) had a problem with an
+				  undefined b:netrw_curdir.  He also provided
+				  a fix.
+		Apr 20, 2016	* Changed s:NetrwGetBuffer(); now uses
+				  dictionaries.  Also fixed the "No Name"
+				  buffer problem.
+	v155:	Oct 29, 2015	* (Timur Fayzrakhmanov) reported that netrw's
+				  mapping of ctrl-l was not allowing refresh of
+				  other windows when it was done in a netrw
+				  window.
+		Nov 05, 2015	* Improved s:TreeSqueezeDir() to use search()
+				  instead of a loop
+				* NetrwBrowse() will return line to
+				  w:netrw_bannercnt if cursor ended up in
+				  banner
+		Nov 16, 2015	* Added a <Plug>NetrwTreeSqueeze (|netrw-s-cr|)
+		Nov 17, 2015	* Commented out imaps -- perhaps someone can
+				  tell me how they're useful and should be
+				  retained?
+		Nov 20, 2015	* Added |netrw-ma| and |netrw-mA| support
+		Nov 20, 2015	* gx (|netrw-gx|) on an url downloaded the
+				  file in addition to simply bringing up the
+				  url in a browser.  Fixed.
+		Nov 23, 2015	* Added |g:netrw_sizestyle| support
+		Nov 27, 2015	* Inserted a lot of <c-u>s into various netrw
+				  maps.
+		Jan 05, 2016	* |netrw-qL| implemented to mark files based
+				  upon |location-list|s; similar to |netrw-qF|.
+		Jan 19, 2016	* using - call delete(directoryname,"d") -
+				  instead of using g:netrw_localrmdir if
+				  v7.4 + patch#1107 is available
+		Jan 28, 2016	* changed to using |winsaveview()| and
+				  |winrestview()|
+		Jan 28, 2016	* s:NetrwTreePath() now does a save and
+				  restore of view
+		Feb 08, 2016	* Fixed a tree-listing problem with remote
+				  directories
 	v154:	Feb 26, 2015	* (Yuri Kanivetsky) reported a situation where
 				  a file was not treated properly as a file
 				  due to g:netrw_keepdir == 1
@@ -3858,7 +3971,7 @@ netrw:
 				  handling.
 				* |:Lexplore| path: will be used to update
 				  a left-side netrw browsing directory.
-		Mar 12, 2014	* |:netrw-s-cr|: use <s-cr>  to close
+		Mar 12, 2014	* |netrw-s-cr|: use <s-cr>  to close
 				  tree directory implemented
 		Mar 13, 2014	* (Tony Mechylynck) reported that using
 				  the browser with ftp on a directory,
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
new file mode 100644
index 0000000000..3cd53e3e50
--- /dev/null
+++ b/runtime/doc/provider.txt
@@ -0,0 +1,133 @@
+*provider.txt*								{Nvim}
+
+
+		 NVIM REFERENCE MANUAL    by Thiago de Arruda
+
+
+Providers	 						    *provider*
+
+Nvim delegates some features to dynamic "providers".
+
+==============================================================================
+Python integration		    	      *provider-python*
+
+Nvim supports the Vim legacy |python-vim| and |python3| interfaces via
+external Python interpreters connected via |RPC|.
+Note: Only the Vim 7.3 API is supported; bindeval (Vim 7.4) is not.
+
+PYTHON QUICKSTART ~
+
+If you used a package manager to install Nvim, you might already have the
+required `neovim` Python package. Run |:CheckHealth| to see if your system is
+up-to-date.
+
+Following are steps to install the package with Python's `pip` tool.
+
+Note: Depending on your system, `pip` might refer to Python 2 or Python 3,
+      which is why the following instructions mention `pip2` or `pip3`
+      explicitly. If one of these is not available, try `pip`.
+
+To use Vim Python 2/3 plugins with Nvim:
+
+- For Python 2 plugins, make sure an interpreter for Python 2.6 or 2.7 is
+  available in your `$PATH`, then install the `neovim` Python package systemwide: >
+    $ sudo pip2 install --upgrade neovim
+<
+  or for the current user: >
+    $ pip2 install --user --upgrade neovim
+<
+- For Python 3 plugins, make sure an interpreter for Python 3.3 or above is
+  available in your `$PATH`, then install the `neovim` Python package systemwide: >
+    $ sudo pip3 install --upgrade neovim
+<
+  or for the current user: >
+    $ pip3 install --user --upgrade neovim
+<
+Note: The `--upgrade` flag ensures you have the latest version even if
+      a previous version was already installed.
+
+PYTHON PROVIDER CONFIGURATION ~
+						*g:python_host_prog*
+						*g:python3_host_prog*
+Program to use for evaluating Python code. Setting this makes startup faster. >
+    let g:python_host_prog  = '/path/to/python'
+    let g:python3_host_prog = '/path/to/python3'
+<
+						*g:loaded_python_provider*
+To disable Python 2 support: >
+    let g:loaded_python_provider = 1
+<
+						*g:loaded_python3_provider*
+To disable Python 3 support: >
+    let g:loaded_python3_provider = 1
+
+
+==============================================================================
+Ruby integration		    	      *provider-ruby*
+
+Nvim supports the Vim legacy |ruby-vim| interface via external Ruby
+interpreters connected via |RPC|.
+
+Run |:CheckHealth| to see if your system is up-to-date.
+
+RUBY QUICKSTART ~
+
+To use Vim Ruby plugins with Nvim, just install the latest `neovim` RubyGem: >
+    $ gem install neovim
+
+RUBY PROVIDER CONFIGURATION ~
+						*g:loaded_ruby_provider*
+To disable Ruby support: >
+    let g:loaded_ruby_provider = 1
+
+
+==============================================================================
+Clipboard integration 			      *provider-clipboard* *clipboard*
+
+Nvim has no direct connection to the system clipboard. Instead it is
+accessible through a |provider| which transparently uses shell commands for
+communicating with the clipboard.
+
+Clipboard access is implicitly enabled if any of the following clipboard tools
+are found in your `$PATH`.
+
+  - xclip
+  - xsel (newer alternative to xclip)
+  - pbcopy/pbpaste (Mac OS X)
+  - lemonade (for SSH) https://github.com/pocke/lemonade
+  - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/
+
+The presence of a suitable clipboard tool implicitly enables the '+' and '*'
+registers.
+
+If you want to ALWAYS use the clipboard for ALL operations (as opposed
+to interacting with the '+' and/or '*' registers explicitly), set the
+following option:
+>
+    set clipboard+=unnamedplus
+<
+See 'clipboard' for details and more options.
+
+==============================================================================
+X11 selection mechanism			      *clipboard-x11* *x11-selection*
+
+The clipboard providers for X11 store text in what is known as "selections".
+Selections are "owned" by an application, so when the application is closed,
+the selection text is lost.
+
+The contents of selections are held by the originating application (e.g., upon
+a copy), and only passed on to another application when that other application
+asks for them (e.g., upon a paste).
+
+							      *quoteplus* *quote+*
+
+There are three documented X11 selections: `PRIMARY`, `SECONDARY`, and `CLIPBOARD`.
+`CLIPBOARD` is typically used in X11 applications for copy/paste operations
+(`Ctrl-c`/`v`), while `PRIMARY` is used for the last selected text, which is
+generally inserted with the middle mouse button.
+
+Nvim's X11 clipboard providers only utilize the `PRIMARY` and `CLIPBOARD`
+selections, used for the '*' and '+' registers, respectively.
+
+==============================================================================
+ vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index ff4fded0d9..0b7907e364 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.4.  Last change: 2015 Sep 08
+*quickfix.txt*  For Vim version 7.4.  Last change: 2016 Jul 07
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -30,10 +30,14 @@ positions in files.  For example, |:vimgrep| finds pattern matches.  You can
 use the positions in a script with the |getqflist()| function.  Thus you can
 do a lot more than the edit/compile/fix cycle!
 
-You should save your compiler's error messages to a file and start vim with
-"vim -q filename".  An easy way to do this is with the |:make| command (see
-below).  The 'errorformat' option should be set to match the error messages
-from your compiler (see |errorformat| below).
+If you have the error messages in a file you can start Vim with: >
+	vim -q filename
+
+From inside Vim an easy way to run a command and handle the output is with the
+|:make| command (see below).
+
+The 'errorformat' option should be set to match the error messages from your
+compiler (see |errorformat| below).
 
 						*location-list* *E776*
 A location list is similar to a quickfix list and contains a list of positions
@@ -42,13 +46,21 @@ have a separate location list.  A location list can be associated with only
 one window.  The location list is independent of the quickfix list.
 
 When a window with a location list is split, the new window gets a copy of the
-location list.  When there are no references to a location list, the location
-list is destroyed.
+location list.  When there are no longer any references to a location list,
+the location list is destroyed.
 
 The following quickfix commands can be used.  The location list commands are
 similar to the quickfix commands, replacing the 'c' prefix in the quickfix
 command with 'l'.
 
+							*E924*
+If the current window was closed by an |autocommand| while processing a
+location list command, it will be aborted.
+
+							*E925* *E926*
+If the current quickfix or location list was changed by an |autocommand| while
+processing a quickfix or location list command, it will be aborted.
+
 							*:cc*
 :cc[!] [nr]		Display error [nr].  If [nr] is omitted, the same
 			error is displayed again.  Without [!] this doesn't
@@ -255,9 +267,23 @@ command with 'l'.
 			The 'switchbuf' settings are respected when jumping
 			to a buffer.
 
+:cl[ist] +{count}	List the current and next {count} valid errors.  This
+			is similar to ":clist from from+count", where "from"
+			is the current error position.
+
 :cl[ist]! [from] [, [to]]
 			List all errors.
 
+:cl[ist]! +{count}	List the current and next {count} error lines.  This
+			is useful to see unrecognized lines after the current
+			one.  For example, if ":clist" shows:
+        8384 testje.java:252: error: cannot find symbol ~
+			Then using ":cl! +3" shows the reason:
+        8384 testje.java:252: error: cannot find symbol ~
+        8385:   ZexitCode = Fmainx(); ~
+        8386:               ^ ~
+        8387:   symbol:   method Fmainx() ~
+
 							*:lli* *:llist*
 :lli[st] [from] [, [to]]
 			Same as ":clist", except the location list for the
@@ -302,7 +328,7 @@ EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
 				etc.
 <			When the current file can't be |abandon|ed and the [!]
 			is not present, the command fails.
-			When an error is detected excecution stops.
+			When an error is detected execution stops.
 			The last buffer (or where an error occurred) becomes
 			the current buffer.
 			{cmd} can contain '|' to concatenate several commands.
@@ -406,6 +432,17 @@ EXECUTE A COMMAND IN ALL THE BUFFERS IN QUICKFIX OR LOCATION LIST:
 :lw[indow] [height]	Same as ":cwindow", except use the window showing the
 			location list for the current window.
 
+							*:cbo* *:cbottom*
+:cbo[ttom]		Put the cursor in the last line of the quickfix window
+			and scroll to make it visible.  This is useful for
+			when errors are added by an asynchronous callback.
+			Only call it once in a while if there are many
+			updates to avoid a lot of redrawing.
+
+							*:lbo* *:lbottom*
+:lbo[ttom]		Same as ":cbottom", except use the window showing the
+			location list for the current window.
+
 Normally the quickfix window is at the bottom of the screen.  If there are
 vertical splits, it's at the bottom of the rightmost column of windows.  To
 make it always occupy the full width: >
@@ -441,6 +478,9 @@ expression.
 The BufWinEnter event is also triggered, again using "quickfix" for the buffer
 name.
 
+Note: When adding to an existing quickfix list the autocommand are not
+triggered.
+
 Note: Making changes in the quickfix window has no effect on the list of
 errors.  'modifiable' is off to avoid making changes.  If you delete or insert
 lines anyway, the relation between the text and the error number is messed up.
@@ -1489,12 +1529,6 @@ However, to properly parse such a complex file, an external filter should
 be used.  See the description further above how to make such a filter known
 by Vim.
 
-						*errorformat-Perl*
-In $VIMRUNTIME/tools you can find the efm_perl.pl script, which filters Perl
-error messages into a format that quickfix mode will understand.  See the
-start of the file about how to use it.  (This script is deprecated, see
-|compiler-perl|.)
-
 
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 8e40628e25..a7644fab84 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt*  For Vim version 7.4.  Last change: 2015 Nov 10
+*quickref.txt*  For Vim version 7.4.  Last change: 2016 Aug 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -794,6 +794,7 @@ Short explanation of each option:		*option-list*
 'omnifunc'	  'ofu'     function for filetype-specific completion
 'opendevice'	  'odev'    allow reading/writing devices on MS-Windows
 'operatorfunc'	  'opfunc'  function to be called for |g@| operator
+'packpath'	  'pp'      list of directories used for packages
 'paragraphs'	  'para'    nroff macros that separate paragraphs
 'paste'			    allow pasting text
 'pastetoggle'	  'pt'	    key code that causes 'paste' to toggle
@@ -812,6 +813,7 @@ Short explanation of each option:		*option-list*
 'printmbcharset'  'pmbcs'   CJK character set to be used for :hardcopy
 'printmbfont'	  'pmbfn'   font names to be used for CJK output of :hardcopy
 'printoptions'	  'popt'    controls the format of :hardcopy output
+'prompt'	  'prompt'  enable prompt in Ex mode
 'pumheight'	  'ph'	    maximum height of the popup menu
 'pythondll'		    name of the Python 2 dynamic library
 'pythonthreedll'	    name of the Python 3 dynamic library
@@ -860,6 +862,7 @@ Short explanation of each option:		*option-list*
 'showtabline'	  'stal'    tells when the tab pages line is displayed
 'sidescroll'	  'ss'	    minimum number of columns to scroll horizontal
 'sidescrolloff'   'siso'    min. nr. of columns to left and right of cursor
+'signcolumn'	  'scl'	    when to display the sign column
 'smartcase'	  'scs'     no ignore case when pattern has uppercase
 'smartindent'	  'si'	    smart autoindenting for C programs
 'smarttab'	  'sta'     use 'shiftwidth' when inserting <Tab>
diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt
deleted file mode 100644
index c35fb2f139..0000000000
--- a/runtime/doc/quotes.txt
+++ /dev/null
@@ -1,275 +0,0 @@
-*quotes.txt*    For Vim version 7.4.  Last change: 2010 Nov 03
-
-
-		  VIM REFERENCE MANUAL    by Bram Moolenaar
-
-
-							*quotes*
-Here are some nice quotes about Vim that I collected from news and mail.
-
-
-vim (vim) noun - Ebullient vitality and energy.  [Latin, accusative of vis,
-strength]  (Dictionary)
-
-Vim is so much better than vi that a great many of my old vi :map's became
-immediately obsolete! (Tony Nugent, Australia)
-
-Coming with a very GUI mindset from Windows, I always thought of people using
-Vi as some kind of outer space alien in human clothes.  Once I tried I really
-got addicted by its power and now I found myself typing Vim keypresses in the
-oddest places! That's why I would like to see Vim embedded in every
-application which deals with text editing.  (Jos� Fonseca)
-
-I was a 12-year emacs user who switched to Vim about a year ago after finally
-giving up on the multiple incompatible versions, flaky contributed packages,
-disorganized keystrokes, etc.  And it was one of the best moves I ever made.
-(Joel Burton)
-
-Although all of the programs were used during the preparation of the new and
-revised material, most of the editing was done with Vim versions 4.5 and 5.0
-under GNU-Linux (Redhat 4.2).  (Arnold Robbins, Israel, author of "Learning
-the Vi editor")
-
-Out of all the open software i've ever seen and used, and i've seen a lot, Vim
-is the best, most useful and highest quality to work with, second only to the
-linux kernel itself.  (Peter Jay Salzman)
-
-It's well worth noting that the _entirety_ of SourceForge was written using
-Vim and its nifty PHP syntax highlighting.  I think the entire SF.net tech
-staff uses Vim and we're all excited to have you aboard! (Tim Perdue)
-
-Vim is one of a select bunch of tools for which I have no substitute.  It is
-a brilliant piece of work! (Biju Chacko)
-
-A previous girlfriend of mine switched to emacs.  Needless to say, the
-relationship went nowhere.  (Geoffrey Mann)
-
-I rarely think about Vim, in the same way that I guess a fish rarely thinks
-about water.  It's the environment in which everything else happens.  I'm a
-fairly busy system administrator working on a lot of different platforms.  Vim
-is the only thing that's consistent across all my systems, and it's just about
-the only thing that doesn't break from time to time.  When a new system comes
-in the door without Vim, I install it right away.  Great to have a tool that's
-the same everywhere, that's completely reliable, so I can ignore it and think
-about other things.  (Pete Schaeffer)
-
-Having recently succeeded in running Vim via telnet through a Nokia
-Communicator, I can now report that it works nicely on a Palm Pilot too.
-(Allan Kelly, Scotland)
-
-You've done a tremendous job with 'VIM', Bram!  The more I use it, the more
-impressed I get (I am an old 'vi' die hard who once started out with early
-versions of 'emacs' in the late 1970's and was relieved by finding 'vi' in the
-first UNIX I came across in 1983).  In my opinion, it's about time 'VIM'
-replace 'emacs' as the standard for top editors.  (Bo Thide', Sweden)
-
-I love and use VIM heavily too.  (Larry Wall)
-
-Vi is like a Ferrari, if you're a beginner, it handles like a bitch, but once
-you get the hang of it, it's small, powerful and FAST! (Unknown)
-VIM is like a new model Ferrari, and sounds like one too - "VIIIIIIMMM!"
-(Stephen Riehm, Germany)
-
-Schon bei Nutzung eines Bruchteils der VIM-Funktionen wird der Benutzer recht
-schnell die Vorzuege dieses Editors kennen- und schaetzenlernen.
-Translated: Even when only using a fraction of VIM-functions, the user will
-quickly get used to and appreciate the advantages of this editor.  (Garry
-Glendown, conclusion of an article on VIM in iX magazine 9/1998)
-
-I've recently acquired the O'Reilly book on VI (it also discusses VIM
-in-depth), and I'm amazed at just how powerful this application is.  (Jeffrey
-Rankin)
-
-This guide was written using the Windows 9.x distribution of GVIM, which is
-quite possibly the greatest thing to come along since God created the naked
-girl.  (Michael DiBernardo)
-
-Boy, I thought I knew almost everything about VIM, but every time I browse the
-online documentation, I hit upon a minor but cool aspect of a VIM feature that
-I didn't know before!  I must say the documentation is one the finest I've
-ever seen in a product -- even better than most commercial products.
-(Gautam Mudunuri)
-
-VIM 4.5 is really a fantastic editor.  It has sooooo many features and more
-importantly, the defaults are so well thought out that you really don't have
-to change anything!!  Words cannot express my amazement and gratitude to the
-creators of VIM.  Keep it up.  (Vikas, USA)
-
-I wonder how long it will be before people will refer to other Vi editors as
-VIM clones?  (Darren Hiebert)
-
-I read about [auto-positioning-in-file-based-on-the-errors-from-make] in one
-of those "Perfect Programmer's Editor" threads and was delighted to discover
-that VIM already supports it.  (Brendan Macmillan, Australia)
-
-I just discovered VIM (5.0) and I'm telling everyone I know about it!
-I tell them VIM stands for VI for the new (M)illenium.  Thanks so much!
-(Matt F. Valentine)
-
-I think from now on "vi" should be called "Vim Imitation", not the other way
-around.  (Rungun Ramanathan)
-
-The Law of VIM:
-For each member b of the possible behaviour space B of program P, there exists
-a finite time t before which at least one user u in the total user space U of
-program P will request b becomes a member of the allowed behaviour space B'
-(B' <= B).
-In other words: Sooner or later everyone wants everything as an option.
-(Negri)
-
-Whenever I move to a new computing platform, the first thing I do is to port
-VIM.  Lately, I am simply stunned by its ease of compilation using the
-configure facility.  (A.M. Sabuncu, Turkey)
-
-The options are really excellent and very powerful.  (Anish Maharaj)
-
-The Spring user-interface designs are in, and word from the boutiques is that
-80x24 text-only mode is back with a *vengeance! Vi editor clone VIM burst onto
-March desk-tops with a dazzling show of pastel syntax highlights for its 5.0
-look.  Strident and customizable, VIM raises eyebrows with its interpretation
-of the classic Vi single-key macro collection.
-http://www.ntk.net/index.cgi?back=archive98/now0327.txt&line=179#l
-
-I just wanted to take this opportunity to let you know that VIM 5 ROCKS!
-Syntax highlighting: how did I survive without it?!  Thank you for creating
-mankind's best editor!  (Mun Johl, USA)
-
-Thanks again for VIM.  I use it every day on Linux.  (Eric Foster-Johnson,
-author of the book "UNIX Programming Tools")
-
-The BEST EDITOR EVER (Stuart Woolford)
-
-I have used most of VIM's fancy features at least once, many frequently, and I
-can honestly say that I couldn't live with anything less anymore.  My
-productivity has easily doubled compared to what it was when I used vi.
-(Sitaram Chamarty)
-
-I luv VIM.  It is incredible.  I'm naming my first-born Vimberly.  (Jose
-Unpingco, USA)
-
-Hint:  "VIM" is "vi improved" - much better! (Sven Guckes, Germany)
-
-I use VIM every day.  I spend more time in VIM than in any other program...
-It's the best vi clone there is.  I think it's great.  (Craig Sanders,
-Australia)
-
-I strongly advise using VIM--its infinite undo/redo saved me much grief.
-(Terry Brown)
-
-Thanks very much for writing what in my opinion is the finest text editor on
-the planet.  If I were to get another cat, I would name it "Vim".
-(Bob Sheehan, USA)
-
-I typed :set all and the screen FILLED up with options.  A whole screen of
-things to be set and unset.  I saw some of my old friends like wrapmargin,
-modelines and showmode, but the screen was FILLED with new friends!   I love
-them all!   I love VIM!   I'm so happy that I've found this editor!  I feel
-like how I once felt when I started using vi after a couple of years of using
-ed.  I never thought I'd forsake my beloved ed, but vi ... oh god, vi was
-great.  And now, VIM.  (Peter Jay Salzman, USA)
-
-I am really happy with such a wonderful software package.  Much better than
-almost any expensive, off the shelf program.  (Jeff Walker)
-
-Whenever I reread the VIM documentation I'm overcome with excitement at the
-power of the editor.  (William Edward Webber, Australia)
-
-Hurrah for VIM!! It is "at your fingertips" like vi, and has the extensions
-that vi sorely needs: highlighting for executing commands on blocks, an easily
-navigable and digestible help screen, and more.  (Paul Pax)
-
-The reason WHY I don't have this amazingly useful macro anymore, is that I
-now use VIM - and this is built in!! (Stephen Riehm, Germany)
-
-I am a user of VIM and I love it.  I use it to do all my programming, C,
-C++, HTML what ever.  (Tim Allwine)
-
-I discovered VIM after years of struggling with the original vi, and I just
-can't live without it anymore.  (Emmanuel Mogenet, USA)
-
-Emacs has not a bit of chance to survive so long as VIM is around.  Besides,
-it also has the most detailed software documentation I have ever seen---much
-better than most commercial software!  (Leiming Qian)
-
-This version of VIM will just blow people apart when they discover just how
-fantastic it is! (Tony Nugent, Australia)
-
-I took your advice & finally got VIM & I'm really impressed.  Instant convert.
-(Patrick Killelea, USA)
-
-VIM is by far my favorite piece of shareware and I have been particularly
-pleased with version 3.0.  This is really a solid piece of work.  (Robert
-Colon, USA)
-
-VIM is a joy to use, it is so well thought and practical that I wonder why
-anybody would use visual development tools.  VIM is powerful and elegant, it
-looks deceptively simple but is almost as complex as a 747 (especially when I
-look at my growing vimrc), keep up that wonderful job, VIM is a centerpiece
-of the free software world.  (Louis-David Mitterand, USA)
-
-I cannot believe how great it is to use VIM.  I think the guys at work are
-getting tired of hearing me bragging about it.  Others eyes are lighting up.
-(Rick Croote)
-
-Emacs takes way too much time to start up and run, it is too big and bulky for
-effective use and the interface is more confusing than it is of any help.  VIM
-however is short, it is fast, it is powerful, it has a good interface and it
-is all purpose.  (Paal Ditlefsen Ekran)
-
-From the first time I got VIM3.0, I was very enthusiastic.  It has almost no
-problems.  The swapfile handling and the backup possibilities are robust, also
-the protection against editing one file twice.  It is very compatible to the
-real VI (and that is a MUST, because my brain is trained over years in using
-it).  (Gert van Antwerpen, Holland)
-
-Visual mode in VIM is a very powerful thing! (Tony Nugent, Australia)
-
-I have to say that VIM is =THE= single greatest piece of source code to ever
-come across the net (Jim Battle, USA).
-
-In fact, if you do want to get a new vi I'd suggest VIM-3.0.  This is, by
-far, the best version of vi I've ever seen (Albert W. Schueller).
-
-I should mention that VIM is a very good editor and can compete with anything
-(Ilya Beloozerov).
-
-To tell the truth sometimes I used elvis, vile, xvi, calvin, etc.  And this is
-the reason that I can state that VIM is the best! (Ferenc Deak, Hungary)
-
-VIM is by far the best editor that I have used in a long time, and I have
-looked at just about every thing that is available for every platform that I
-use.  VIM is the best on all of them.  (Guy L. Oliver)
-
-VIM is the greatest editor since the stone chisel.  (Jose Unpingco, USA)
-
-I would like to say that with VIM I am finally making the 'emacs to vi'
-transition - as an Editor it is so much better in many ways: keyboard layout,
-memory usage, text alteration to name 3.  (Mark Adam)
-
-In fact, now if I want to know what a particular setting does in vi, I fire up
-VIM and check out its help!  (Nikhil Patel, USA)
-
-As a vi user, VIM has made working with text a far more pleasant task than
-before I encountered this program.  (Steinar Knutsen, Norway)
-
-I use VIM since version 3.0.  Since that time, it is the ONLY editor I use,
-with Solaris, Linux and OS/2 Warp.  I suggest all my friends to use VIM, they
-try, and they continue using it.  VIM is really the best software I have ever
-downloaded from the Internet, and the best editor I know of.  (Marco
-Eccettuato, Italy)
-
-
-In summary:
-     __     ___		    _	    _	_  ___ _____ `
-     \ \   / (_)_ __ ___   (_)___  | | | |/ _ \_   _| `
-      \ \ / /| | '_ ` _ \  | / __| | |_| | | | || | `
-       \ V / | | | | | | | | \__ \ |  _  | |_| || | `
-	\_/  |_|_| |_| |_| |_|___/ |_| |_|\___/ |_| `
-	     ____ _____ _   _ _____ _____ _ _ `
-	    / ___|_   _| | | |	___|  ___| | | `
-	    \___ \ | | | | | | |_  | |_  | | | `
-	     ___) || | | |_| |	_| |  _| |_|_| `
-	    |____/ |_|	\___/|_|   |_|	 (_|_)	    (Tony Nugent, Australia) `
-
-
- vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/remote_plugin.txt b/runtime/doc/remote_plugin.txt
index 139fcd83b9..dddc021d68 100644
--- a/runtime/doc/remote_plugin.txt
+++ b/runtime/doc/remote_plugin.txt
@@ -16,8 +16,8 @@ Nvim support for remote plugins 		  *remote-plugin*
 
 Extensibility is a primary goal of Nvim. Any programming language may be used
 to extend Nvim without changes to Nvim itself. This is achieved with remote
-plugins, coprocesses that have a direct communication channel (via
-|msgpack-rpc|) with the Nvim process.
+plugins, coprocesses that have a direct communication channel (via |RPC|) with
+the Nvim process.
 
 Even though these plugins run in separate processes they can call, be called,
 and receive events just as if the plugin's code were executed in the main
@@ -33,9 +33,9 @@ check whether a plugin host is available for their chosen programming language.
 
 Plugin hosts are programs that provide a high-level environment for plugins,
 taking care of most boilerplate involved in defining commands, autocmds, and
-functions that are implemented over |msgpack-rpc| connections. Hosts are
-loaded only when one of their registered plugins require it, keeping Nvim's
-startup as fast as possible, even if many plugins/hosts are installed.
+functions that are implemented over |RPC| connections. Hosts are loaded only
+when one of their registered plugins require it, keeping Nvim's startup as
+fast as possible, even if many plugins/hosts are installed.
 
 ==============================================================================
 3. Example					    *remote-plugin-example*
@@ -93,22 +93,22 @@ approach with |rpcnotify()|, meaning return values or exceptions raised in the
 handler function are ignored.
 
 To test the above plugin, it must be saved in "rplugin/python" in a
-'runtimepath' directory (~/.config/nvim/rplugin/python/limit.py for example). 
-Then, the remote plugin manifest must be generated with 
-`:UpdateRemotePlugins`.
+'runtimepath' directory (~/.config/nvim/rplugin/python/limit.py for example).
+Then, the remote plugin manifest must be generated with
+|:UpdateRemotePlugins|.
 
 ==============================================================================
 4. Remote plugin manifest			    *remote-plugin-manifest*
+						      *:UpdateRemotePlugins*
 
 Just installing remote plugins to "rplugin/{host}" isn't enough for them to be
-automatically loaded when required. You must execute `:UpdateRemotePlugins`
+automatically loaded when required. You must execute |:UpdateRemotePlugins|
 every time a remote plugin is installed, updated, or deleted.
 
-`:UpdateRemotePlugins` generates the remote plugin manifest, a special
+|:UpdateRemotePlugins| generates the remote plugin manifest, a special
 Vimscript file containing declarations for all Vimscript entities
 (commands/autocommands/functions) defined by all remote plugins, with each
-entity associated with the host and plugin path. The manifest is a generated
-extension to the user's vimrc (it even has the vimrc filename prepended).
+entity associated with the host and plugin path.
 
 Manifest declarations are just calls to the `remote#host#RegisterPlugin`
 function, which takes care of bootstrapping the host as soon as the declared
@@ -125,10 +125,20 @@ the example, say the Java plugin is a semantic completion engine for Java code.
 If it defines the autocommand "BufEnter *.java", then the Java host is spawned
 only when Nvim loads a buffer matching "*.java".
 
-If the explicit call to `:UpdateRemotePlugins` seems incovenient, try to see it
+If the explicit call to |:UpdateRemotePlugins| seems incovenient, try to see it
 like this: It's a way to provide IDE capabilities in Nvim while still keeping
 it fast and lightweight for general use. It's also analogous to the |:helptags|
 command.
 
+						*$NVIM_RPLUGIN_MANIFEST*
+Unless $NVIM_RPLUGIN_MANIFEST is set the manifest will be written to a file
+named `rplugin.vim` at:
+
+	Unix ~
+	  $XDG_DATA_HOME/nvim/ or ~/.local/share/nvim/
+
+	Windows ~
+	  $LOCALAPPDATA/nvim/ or ~/AppData/Local/nvim/
+
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 343d3e62cf..ef98556260 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -1,4 +1,4 @@
-*repeat.txt*    For Vim version 7.4.  Last change: 2016 Jan 16
+*repeat.txt*    For Vim version 7.4.  Last change: 2016 Jul 21
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -8,12 +8,14 @@ Repeating commands, Vim scripts and debugging			*repeating*
 
 Chapter 26 of the user manual introduces repeating |usr_26.txt|.
 
-1. Single repeats	|single-repeat|
-2. Multiple repeats	|multi-repeat|
-3. Complex repeats	|complex-repeat|
-4. Using Vim scripts	|using-scripts|
-5. Debugging scripts	|debug-scripts|
-6. Profiling		|profiling|
+1. Single repeats		|single-repeat|
+2. Multiple repeats		|multi-repeat|
+3. Complex repeats		|complex-repeat|
+4. Using Vim scripts		|using-scripts|
+5. Using Vim packages		|packages|
+6. Creating Vim packages	|package-create|
+7. Debugging scripts		|debug-scripts|
+8. Profiling			|profiling|
 
 ==============================================================================
 1. Single repeats					*single-repeat*
@@ -68,8 +70,8 @@ examples.
 The global commands work by first scanning through the [range] lines and
 marking each line where a match occurs (for a multi-line pattern, only the
 start of the match matters).
-In a second scan the [cmd] is executed for each marked line with its line
-number prepended.  For ":v" and ":g!" the command is executed for each not
+In a second scan the [cmd] is executed for each marked line, as if the cursor
+was in that line.  For ":v" and ":g!" the command is executed for each not
 marked line.  If a line is deleted its mark disappears.
 The default for [range] is the whole buffer (1,$).  Use "CTRL-C" to interrupt
 the command.  If an error message is given for a line, the command for that
@@ -173,10 +175,12 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			commands.
 
 							*:ru* *:runtime*
-:ru[ntime][!] {file} ..
+:ru[ntime][!] [where] {file} ..
 			Read Ex commands from {file} in each directory given
-			by 'runtimepath'.  There is no error for non-existing
-			files.  Example: >
+			by 'runtimepath' and/or 'packpath'.  There is no error
+			for non-existing files.
+			
+			Example: >
 				:runtime syntax/c.vim
 
 <			There can be multiple {file} arguments, separated by
@@ -190,6 +194,15 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			When it is not included only the first found file is
 			sourced.
 
+			When [where] is omitted only 'runtimepath' is used.
+			Other values:
+				START	search under "start" in 'packpath'
+				OPT 	search under "opt" in 'packpath'
+				PACK	search under "start" and "opt" in
+					'packpath'
+				ALL	first use 'runtimepath', then search
+					under "start" and "opt" in 'packpath'
+
 			When {file} contains wildcards it is expanded to all
 			matching files.  Example: >
 				:runtime! plugin/*.vim
@@ -203,6 +216,59 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 			When 'verbose' is two or higher, there is a message
 			about each searched file.
 
+							*:pa* *:packadd* *E919*
+:pa[ckadd][!] {name}	Search for an optional plugin directory in 'packpath'
+			and source any plugin files found.  The directory must
+			match:
+				pack/*/opt/{name} ~
+			The directory is added to 'runtimepath' if it wasn't
+			there yet.
+			If the directory pack/*/opt/{name}/after exists it is
+			added at the end of 'runtimepath'.
+
+			Note that {name} is the directory name, not the name
+			of the .vim file.  All the files matching the pattern
+				pack/*/opt/{name}/plugin/**/*.vim ~
+			will be sourced.  This allows for using subdirectories
+			below "plugin", just like with plugins in
+			'runtimepath'.
+
+			If the filetype detection was not enabled yet (this
+			is usually done with a "syntax enable" or "filetype
+			on" command in your .vimrc file), this will also look
+			for "{name}/ftdetect/*.vim" files.
+
+			When the optional ! is added no plugin files or
+			ftdetect scripts are loaded, only the matching
+			directories are added to 'runtimepath'.  This is
+			useful in your .vimrc.  The plugins will then be
+			loaded during initialization, see |load-plugins|.
+
+			Also see |pack-add|.
+
+						*:packl* *:packloadall*
+:packl[oadall][!]	Load all packages in the "start" directory under each
+			entry in 'packpath'.
+			
+			First all the directories found are added to
+			'runtimepath', then the plugins found in the
+			directories are sourced.  This allows for a plugin to
+			depend on something of another plugin, e.g. an
+			"autoload" directory.  See |packload-two-steps| for
+			how this can be useful.
+
+			This is normally done automatically during startup,
+			after loading your .vimrc file.  With this command it
+			can be done earlier.
+
+			Packages will be loaded only once.  After this command
+			it won't happen again.  When the optional ! is added
+			this command will load packages even when done before.
+
+			An error only causes sourcing the script where it
+			happens to be aborted, further plugins will be loaded.
+			See |packages|.
+
 :scripte[ncoding] [encoding]		*:scripte* *:scriptencoding* *E167*
 			Specify the character encoding used in the script.
 			The following lines will be converted from [encoding]
@@ -220,7 +286,9 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
 				... not converted ...
 
 <			When conversion isn't supported by the system, there
-			is no error message and no conversion is done.
+			is no error message and no conversion is done.  When a
+			line can't be converted there is no error and the
+			original line is kept.
 
 			Don't use "ucs-2" or "ucs-4", scripts cannot be in
 			these encodings (they would contain NUL bytes).
@@ -373,7 +441,189 @@ Rationale:
 <	Therefore the unusual leading backslash is used.
 
 ==============================================================================
-5. Debugging scripts					*debug-scripts*
+5. Using Vim packages					*packages*
+
+A Vim package is a directory that contains one or more plugins.  The
+advantages over normal plugins:
+- A package can be downloaded as an archive and unpacked in its own directory.
+  Thus the files are not mixed with files of other plugins.  That makes it
+  easy to update and remove.
+- A package can be a git, mercurial, etc. repository.  That makes it really
+  easy to update.
+- A package can contain multiple plugins that depend on each other.
+- A package can contain plugins that are automatically loaded on startup and
+  ones that are only loaded when needed with `:packadd`.
+
+
+Using a package and loading automatically ~
+
+Let's assume your Vim files are in the "~/.local/share/nvim/site" directory
+and you want to add a package from a zip archive "/tmp/foopack.zip":
+	% mkdir -p ~/.local/share/nvim/site/pack/foo
+	% cd ~/.local/share/nvim/site/pack/foo
+	% unzip /tmp/foopack.zip
+
+The directory name "foo" is arbitrary, you can pick anything you like.
+
+You would now have these files under ~/.local/share/nvim/site:
+	pack/foo/README.txt
+	pack/foo/start/foobar/plugin/foo.vim
+	pack/foo/start/foobar/syntax/some.vim
+	pack/foo/opt/foodebug/plugin/debugger.vim
+
+When Vim starts up, after processing your .vimrc, it scans all directories in
+'packpath' for plugins under the "pack/*/start" directory.  First all those
+directories are added to 'runtimepath'.  Then all the plugins are loaded.
+See |packload-two-steps| for how these two steps can be useful.
+
+In the example Vim will find "pack/foo/start/foobar/plugin/foo.vim" and adds 
+"~/.local/share/nvim/site/pack/foo/start/foobar" to 'runtimepath'.
+
+If the "foobar" plugin kicks in and sets the 'filetype' to "some", Vim will
+find the syntax/some.vim file, because its directory is in 'runtimepath'.
+
+Vim will also load ftdetect files, if there are any.
+
+Note that the files under "pack/foo/opt" are not loaded automatically, only the
+ones under "pack/foo/start".  See |pack-add| below for how the "opt" directory
+is used.
+
+Loading packages automatically will not happen if loading plugins is disabled,
+see |load-plugins|.
+
+To load packages earlier, so that 'runtimepath' gets updated: >
+	:packloadall
+This also works when loading plugins is disabled.  The automatic loading will
+only happen once.
+
+If the package has an "after" directory, that directory is added to the end of
+'runtimepath', so that anything there will be loaded later.
+
+
+Using a single plugin and loading it automatically ~
+
+If you don't have a package but a single plugin, you need to create the extra
+directory level:
+	% mkdir -p ~/.local/share/nvim/site/pack/foo/start/foobar
+	% cd ~/.local/share/nvim/site/pack/foo/start/foobar
+	% unzip /tmp/someplugin.zip
+
+You would now have these files:
+	pack/foo/start/foobar/plugin/foo.vim
+	pack/foo/start/foobar/syntax/some.vim
+
+From here it works like above.
+
+
+Optional plugins ~
+							*pack-add*
+To load an optional plugin from a pack use the `:packadd` command: >
+	:packadd foodebug
+This searches for "pack/*/opt/foodebug" in 'packpath' and will find
+~/.local/share/nvim/site/pack/foo/opt/foodebug/plugin/debugger.vim and source
+it.
+
+This could be done if some conditions are met.  For example, depending on
+whether Vim supports a feature or a dependency is missing.
+
+You can also load an optional plugin at startup, by putting this command in
+your |.vimrc|: >
+	:packadd! foodebug
+The extra "!" is so that the plugin isn't loaded if Vim was started with
+|--noplugin|.
+
+It is perfectly normal for a package to only have files in the "opt"
+directory.  You then need to load each plugin when you want to use it.
+
+
+Where to put what ~
+
+Since color schemes, loaded with `:colorscheme`, are found below
+"pack/*/start" and "pack/*/opt", you could put them anywhere.  We recommend
+you put them below "pack/*/opt", for example
+".vim/pack/mycolors/opt/dark/colors/very_dark.vim".
+
+Filetype plugins should go under "pack/*/start", so that they are always
+found.  Unless you have more than one plugin for a file type and want to
+select which one to load with `:packadd`.  E.g. depending on the compiler
+version: >
+	if foo_compiler_version > 34
+	  packadd foo_new
+	else
+	  packadd foo_old
+	endif
+
+The "after" directory is most likely not useful in a package.  It's not
+disallowed though.
+
+==============================================================================
+6. Creating Vim packages				*package-create*
+
+This assumes you write one or more plugins that you distribute as a package.
+
+If you have two unrelated plugins you would use two packages, so that Vim
+users can chose what they include or not.  Or you can decide to use one
+package with optional plugins, and tell the user to add the ones he wants with
+`:packadd`.
+
+Decide how you want to distribute the package.  You can create an archive or
+you could use a repository.  An archive can be used by more users, but is a
+bit harder to update to a new version.  A repository can usually be kept
+up-to-date easily, but it requires a program like "git" to be available.
+You can do both, github can automatically create an archive for a release.
+
+Your directory layout would be like this:
+   start/foobar/plugin/foo.vim    	" always loaded, defines commands
+   start/foobar/plugin/bar.vim    	" always loaded, defines commands
+   start/foobar/autoload/foo.vim  	" loaded when foo command used
+   start/foobar/doc/foo.txt       	" help for foo.vim
+   start/foobar/doc/tags          	" help tags
+   opt/fooextra/plugin/extra.vim  	" optional plugin, defines commands
+   opt/fooextra/autoload/extra.vim  	" loaded when extra command used
+   opt/fooextra/doc/extra.txt  	        " help for extra.vim
+   opt/fooextra/doc/tags  	        " help tags
+
+This allows for the user to do: >
+	mkdir ~/.local/share/nvim/site/pack/myfoobar
+	cd ~/.local/share/nvim/site/pack/myfoobar
+	git clone https://github.com/you/foobar.git
+
+Here "myfoobar" is a name that the user can choose, the only condition is that
+it differs from other packages.
+
+In your documentation you explain what the plugins do, and tell the user how
+to load the optional plugin: >
+	:packadd! fooextra
+
+You could add this packadd command in one of your plugins, to be executed when
+the optional plugin is needed.
+
+Run the `:helptags` command to generate the doc/tags file.  Including this
+generated file in the package means that the user can drop the package in his
+pack directory and the help command works right away.  Don't forget to re-run
+the command after changing the plugin help: >
+	:helptags path/start/foobar/doc
+	:helptags path/opt/fooextra/doc
+
+
+Dependencies between plugins ~
+							*packload-two-steps*
+Suppose you have two plugins that depend on the same functionality. You can
+put the common functionality in an autoload directory, so that it will be
+found automatically.  Your package would have these files:
+
+	pack/foo/start/one/plugin/one.vim  >
+		call foolib#getit()
+<	pack/foo/start/two/plugin/two.vim >
+		call foolib#getit()
+<	pack/foo/start/lib/autoload/foolib.vim >
+		func foolib#getit()
+
+This works, because loading packages will first add all found directories to
+'runtimepath' before sourcing the plugins.
+
+==============================================================================
+7. Debugging scripts					*debug-scripts*
 
 Besides the obvious messages that you can add to your scripts to find out what
 they are doing, Vim offers a debug mode.  This allows you to step through a
@@ -484,7 +734,7 @@ Additionally, these commands can be used:
 About the additional commands in debug mode:
 - There is no command-line completion for them, you get the completion for the
   normal Ex commands only.
-- You can shorten them, up to a single character, unless more then one command
+- You can shorten them, up to a single character, unless more than one command
   starts with the same letter.  "f" stands for "finish", use "fr" for "frame".
 - Hitting <CR> will repeat the previous one.  When doing another command, this
   is reset (because it's not clear what you want to repeat).
@@ -597,7 +847,7 @@ OBSCURE
 		user, don't use typeahead for debug commands.
 
 ==============================================================================
-6. Profiling						*profile* *profiling*
+8. Profiling						*profile* *profiling*
 
 Profiling means that Vim measures the time that is spent on executing
 functions and/or scripts.  The |+profile| feature is required for this.
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 44a5361c5d..fd1fe8dce3 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -1,4 +1,4 @@
-*sign.txt*      For Vim version 7.4.  Last change: 2014 May 07
+*sign.txt*      For Vim version 7.4.  Last change: 2016 Aug 12
 
 
 		  VIM REFERENCE MANUAL    by Gordon Prieur
@@ -40,8 +40,10 @@ There are two steps in using signs:
 
 When signs are defined for a file, Vim will automatically add a column of two
 characters to display them in.  When the last sign is unplaced the column
-disappears again.  The color of the column is set with the SignColumn group
-|hl-SignColumn|.  Example to set the color: >
+disappears again.  This behavior can be changed with the 'signcolumn' option.
+
+The color of the column is set with the SignColumn group |hl-SignColumn|.
+Example to set the color: >
 
 	:highlight SignColumn guibg=darkgrey
 
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 752444a3bd..0902d5d10f 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt*	For Vim version 7.4.  Last change: 2014 Sep 19
+*spell.txt*
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -11,10 +11,6 @@ Spell checking						*spell*
 3. Generating a spell file	|spell-mkspell|
 4. Spell file format		|spell-file-format|
 
-Note: There also is a vimspell plugin.  If you have it you can do ":help
-vimspell" to find about it.  But you will probably want to get rid of the
-plugin and use the 'spell' option instead, it works better.
-
 ==============================================================================
 1. Quick start					*spell-quickstart* *E756*
 
@@ -1373,6 +1369,14 @@ the item name.  Case is always ignored.
 
 The Hunspell feature to use three arguments and flags is not supported.
 
+							*spell-NOCOMPOUNDSUGS*
+This item indicates that using compounding to make suggestions is not a good
+idea.  Use this when compounding is used with very short or one-character
+words.  E.g. to make numbers out of digits.  Without this flag creating
+suggestions would spend most time trying all kind of weird compound words.
+
+	NOCOMPOUNDSUGS ~
+
 							*spell-SYLLABLE*
 The SYLLABLE item defines characters or character sequences that are used to
 count the number of syllables in a word.  Example:
@@ -1625,4 +1629,111 @@ WORDCHARS	(Hunspell)				*spell-WORDCHARS*
 		is no need to separate words before checking them (using a
 		trie instead of a hashtable).
 
+==============================================================================
+5. Spell checker design					*develop-spell*
+
+When spell checking was going to be added to Vim a survey was done over the
+available spell checking libraries and programs.  Unfortunately, the result
+was that none of them provided sufficient capabilities to be used as the spell
+checking engine in Vim, for various reasons:
+
+- Missing support for multi-byte encodings.  At least UTF-8 must be supported,
+  so that more than one language can be used in the same file.
+  Doing on-the-fly conversion is not always possible (would require iconv
+  support).
+- For the programs and libraries: Using them as-is would require installing
+  them separately from Vim.  That's mostly not impossible, but a drawback.
+- Performance: A few tests showed that it's possible to check spelling on the
+  fly (while redrawing), just like syntax highlighting.  But the mechanisms
+  used by other code are much slower.  Myspell uses a hashtable, for example.
+  The affix compression that most spell checkers use makes it slower too.
+- For using an external program like aspell a communication mechanism would
+  have to be setup.  That's complicated to do in a portable way (Unix-only
+  would be relatively simple, but that's not good enough).  And performance
+  will become a problem (lots of process switching involved).
+- Missing support for words with non-word characters, such as "Etten-Leur" and
+  "et al.", would require marking the pieces of them OK, lowering the
+  reliability.
+- Missing support for regions or dialects.  Makes it difficult to accept
+  all English words and highlight non-Canadian words differently.
+- Missing support for rare words.  Many words are correct but hardly ever used
+  and could be a misspelled often-used word.
+- For making suggestions the speed is less important and requiring to install
+  another program or library would be acceptable.  But the word lists probably
+  differ, the suggestions may be wrong words.
+
+
+Spelling suggestions				*develop-spell-suggestions*
+
+For making suggestions there are two basic mechanisms:
+1. Try changing the bad word a little bit and check for a match with a good
+   word.  Or go through the list of good words, change them a little bit and
+   check for a match with the bad word.  The changes are deleting a character,
+   inserting a character, swapping two characters, etc.
+2. Perform soundfolding on both the bad word and the good words and then find
+   matches, possibly with a few changes like with the first mechanism.
+
+The first is good for finding typing mistakes.  After experimenting with
+hashtables and looking at solutions from other spell checkers the conclusion
+was that a trie (a kind of tree structure) is ideal for this.  Both for
+reducing memory use and being able to try sensible changes.  For example, when
+inserting a character only characters that lead to good words need to be
+tried.  Other mechanisms (with hashtables) need to try all possible letters at
+every position in the word.  Also, a hashtable has the requirement that word
+boundaries are identified separately, while a trie does not require this.
+That makes the mechanism a lot simpler.
+
+Soundfolding is useful when someone knows how the words sounds but doesn't
+know how it is spelled.  For example, the word "dictionary" might be written
+as "daktonerie".  The number of changes that the first method would need to
+try is very big, it's hard to find the good word that way.  After soundfolding
+the words become "tktnr" and "tkxnry", these differ by only two letters.
+
+To find words by their soundfolded equivalent (soundalike word) we need a list
+of all soundfolded words.  A few experiments have been done to find out what
+the best method is.  Alternatives:
+1. Do the sound folding on the fly when looking for suggestions.  This means
+   walking through the trie of good words, soundfolding each word and
+   checking how different it is from the bad word.  This is very efficient for
+   memory use, but takes a long time.  On a fast PC it takes a couple of
+   seconds for English, which can be acceptable for interactive use.  But for
+   some languages it takes more than ten seconds (e.g., German, Catalan),
+   which is unacceptable slow.  For batch processing (automatic corrections)
+   it's too slow for all languages.
+2. Use a trie for the soundfolded words, so that searching can be done just
+   like how it works without soundfolding.  This requires remembering a list
+   of good words for each soundfolded word.  This makes finding matches very
+   fast but requires quite a lot of memory, in the order of 1 to 10 Mbyte.
+   For some languages more than the original word list.
+3. Like the second alternative, but reduce the amount of memory by using affix
+   compression and store only the soundfolded basic word.  This is what Aspell
+   does.  Disadvantage is that affixes need to be stripped from the bad word
+   before soundfolding it, which means that mistakes at the start and/or end
+   of the word will cause the mechanism to fail.  Also, this becomes slow when
+   the bad word is quite different from the good word.
+
+The choice made is to use the second mechanism and use a separate file.  This
+way a user with sufficient memory can get very good suggestions while a user
+who is short of memory or just wants the spell checking and no suggestions
+doesn't use so much memory.
+
+
+Word frequency
+
+For sorting suggestions it helps to know which words are common.  In theory we
+could store a word frequency with the word in the dictionary.  However, this
+requires storing a count per word.  That degrades word tree compression a lot.
+And maintaining the word frequency for all languages will be a heavy task.
+Also, it would be nice to prefer words that are already in the text.  This way
+the words that appear in the specific text are preferred for suggestions.
+
+What has been implemented is to count words that have been seen during
+displaying.  A hashtable is used to quickly find the word count.  The count is
+initialized from words listed in COMMON items in the affix file, so that it
+also works when starting a new file.
+
+This isn't ideal, because the longer Vim is running the higher the counts
+become.  But in practice it is a noticeable improvement over not using the word
+count.
+
  vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 46efe1996a..9284aaea58 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.4.  Last change: 2015 Jan 15
+*starting.txt*  For Vim version 7.4.  Last change: 2016 Jul 03
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -10,9 +10,11 @@ Starting Vim						*starting*
 2. Initialization		|initialization|
 3. $VIM and $VIMRUNTIME		|$VIM|
 4. Suspending			|suspend|
-5. Saving settings		|save-settings|
-6. Views and Sessions		|views-sessions|
-7. The ShaDa file		|shada-file|
+5. Exiting			|exiting|
+6. Saving settings		|save-settings|
+7. Views and Sessions		|views-sessions|
+8. The ShaDa file		|shada-file|
+9. Base Directories     	|base-directories|
 
 ==============================================================================
 1. Vim arguments					*vim-arguments*
@@ -40,6 +42,7 @@ filename	One or more file names.  The first one will be the current
 			nvim -- -filename
 <		All arguments after the "--" will be interpreted as file names,
 		no other options or "+command" argument can follow.
+		For behavior of quotes on MS-Windows, see |win32-quotes|.
 
 							*--*
 -		This argument can mean two things, depending on whether Ex
@@ -195,7 +198,8 @@ argument.
 -Z		Restricted mode.  All commands that make use of an external
 		shell are disabled.  This includes suspending with CTRL-Z,
 		":sh", filtering, the system() function, backtick expansion,
-		delete(), rename(), mkdir(), writefile(), libcall(), etc.
+		delete(), rename(), mkdir(), writefile(), libcall(),
+		jobstart(), etc.
 
 							*-e*
 -e		Start Vim in Ex mode |Q|.
@@ -349,6 +353,9 @@ argument.
 							*-W*
 -W {scriptout}	Like -w, but do not append, overwrite an existing file.
 
+							*--api-info*
+--api-info 	Print msgpack-encoded |api-metadata| and exit.
+
 ==============================================================================
 2. Initialization				*initialization* *startup*
 
@@ -377,7 +384,7 @@ accordingly.  Vim proceeds in this order:
 	name, "init.vim" is Neovim specific location for vimrc file.  Also see 
 	|vimrc-intro|.
 
-	Places for your personal initializations:
+	Places for your personal initializations (see |base-directories|):
 		Unix		$XDG_CONFIG_HOME/nvim/init.vim
 				(default for $XDG_CONFIG_HOME is ~/.config)
 		Windows		$XDG_CONFIG_HOME/nvim/init.vim
@@ -459,6 +466,11 @@ accordingly.  Vim proceeds in this order:
 	commands from the command line have not been executed yet.  You can
 	use "--cmd 'set noloadplugins'" |--cmd|.
 
+	Packages are loaded.  These are plugins, as above, but found in the
+	"start" directory of each entry in 'packpath'.  Every plugin directory
+	found is added in 'runtimepath' and then the plugins are sourced.  See
+	|packages|.
+
 7. Set 'shellpipe' and 'shellredir'
 	The 'shellpipe' and 'shellredir' options are set according to the
 	value of the 'shell' option, unless they have been set before.
@@ -494,8 +506,9 @@ accordingly.  Vim proceeds in this order:
 14. Execute startup commands
 	If a "-t" flag was given to Vim, the tag is jumped to.
 	The commands given with the |-c| and |+cmd| arguments are executed.
-	The starting flag is reset, has("vim_starting") will now return zero.
 	If the 'insertmode' option is set, Insert mode is entered.
+	The starting flag is reset, has("vim_starting") will now return zero.
+	The |v:vim_did_enter| variable is set to 1.
 	The |VimEnter| autocommands are executed.
 
 Some hints on using initializations:
@@ -696,7 +709,20 @@ can't paste it in another application (since Vim is going to sleep an attempt
 to get the selection would make the program hang).
 
 ==============================================================================
-5. Saving settings					*save-settings*
+5. Exiting						*exiting*
+
+There are several ways to exit Vim:
+- Close the last window with `:quit`.  Only when there are no changes.
+- Close the last window with `:quit!`.  Also when there are changes.
+- Close all windows with `:qall`.  Only when there are no changes.
+- Close all windows with `:qall!`.  Also when there are changes.
+- Use `:cquit`.  Also when there are changes.
+
+When using `:cquit` or when there was an error message Vim exits with exit
+code 1.  Errors can be avoided by using `:silent!`.
+
+==============================================================================
+6. Saving settings					*save-settings*
 
 Mostly you will edit your vimrc files manually.  This gives you the greatest
 flexibility.  There are a few commands to generate a vimrc file automatically.
@@ -753,7 +779,7 @@ these steps:
    You need to escape special characters, esp. spaces.
 
 ==============================================================================
-6. Views and Sessions					*views-sessions*
+7. Views and Sessions					*views-sessions*
 
 This is introduced in sections |21.4| and |21.5| of the user manual.
 
@@ -897,7 +923,7 @@ To automatically save and restore views for *.c files: >
 	au BufWinEnter *.c silent loadview
 
 ==============================================================================
-7. The ShaDa file				*shada* *shada-file*
+8. The ShaDa file				*shada* *shada-file*
 
 If you exit Vim and later start it again, you would normally lose a lot of
 information.  The ShaDa file can be used to remember that information, which
@@ -1059,7 +1085,7 @@ even if other entries (with known name/type/etc) are merged. |shada-merging|
 SHADA FILE NAME						*shada-file-name*
 
 - The default name of the ShaDa file is "$XDG_DATA_HOME/nvim/shada/main.shada" 
-  for Unix. Default for $XDG_DATA_HOME is ~/.local/share.
+  for Unix. Default for $XDG_DATA_HOME is ~/.local/share. |base-directories|
 - The 'n' flag in the 'shada' option can be used to specify another ShaDa
   file name |'shada'|.
 - The "-i" Vim argument can be used to set another file name, |-i|.  When the
@@ -1109,7 +1135,7 @@ files for different types of files (e.g., C code) and load them based on the
 file name, using the ":autocmd" command (see |:autocmd|).  More information on 
 ShaDa file format is contained in |shada-format| section.
 
-					  *E136* *E138* *shada-error-handling*
+					  *E136* *E929* *shada-error-handling*
 Some errors make Neovim leave temporary file named `{basename}.tmp.X` (X is 
 any free letter from `a` to `z`) while normally it will create this file, 
 write to it and then rename `{basename}.tmp.X` to `{basename}`. Such errors 
@@ -1129,7 +1155,7 @@ include:
 
 Do not forget to remove the temporary file or replace the target file with 
 temporary one after getting one of the above errors or all attempts to create 
-a ShaDa file may fail with |E138|.  If you got one of them when using 
+a ShaDa file may fail with |E929|.  If you got one of them when using 
 |:wshada| (and not when exiting Neovim: i.e. when you have Neovim session 
 running) you have additional options:
 
@@ -1153,9 +1179,6 @@ running) you have additional options:
 			already set (registers, marks, |v:oldfiles|, etc.)
 			will be overwritten.
 
-						   *:rv* *:rviminfo*
-:rv[iminfo][!] [file]	Deprecated alias to |:rshada| command.
-
 						    *:wsh* *:wshada* *E137*
 :wsh[ada][!] [file]	Write to ShaDa file [file] (default: see above).
 			The information in the file is first read in to make
@@ -1164,22 +1187,18 @@ running) you have additional options:
 			internal info is written (also disables safety checks 
 			described in |shada-error-handling|).  If 'shada' is 
 			empty, marks for up to 100 files will be written.
-			When you get error "E138: All .tmp.X files exist, 
+			When you get error "E929: All .tmp.X files exist, 
 			cannot write ShaDa file!" check that no old temp files 
 			were left behind (e.g. 
 			~/.local/share/nvim/shada/main.shada.tmp*).
 
 			Note: Executing :wshada will reset all |'quote| marks.
 
-						   *:wv* *:wviminfo*
-:wv[iminfo][!] [file]	Deprecated alias to |:wshada| command.
-
 						*:o* *:ol* *:oldfiles*
-:o[ldfiles][!]		List the files that have marks stored in the ShaDa
+:o[ldfiles]		List the files that have marks stored in the ShaDa
 			file.  This list is read on startup and only changes
 			afterwards with ":rshada!".  Also see |v:oldfiles|.
 			The number can be used with |c_#<|.
-			Use ! to get a file selection prompt.
 
 :bro[wse] o[ldfiles][!]
 			List file names as with |:oldfiles|, and then prompt
@@ -1346,4 +1365,40 @@ file when reading and include:
   either contains more then one MessagePack object or it does not contain 
   complete MessagePack object.
 
+==============================================================================
+9. Base Directories				*base-directories* *xdg*
+
+Nvim conforms to the XDG Base Directory Specification for application
+configuration and data file locations. This just means Nvim looks for some
+optional settings and uses them if they exist, otherwise defaults are chosen.
+https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+
+CONFIGURATION DIRECTORY				*$XDG_CONFIG_HOME*
+
+    Base directory default:
+        Unix:     ~/.config
+        Windows:  ~/AppData/Local
+
+    Nvim directory:
+        Unix:     ~/.config/nvim/
+        Windows:  ~/AppData/Local/nvim/
+
+DATA DIRECTORY					*$XDG_DATA_HOME*
+
+    Base directory default:
+        Unix:     ~/.local/share
+        Windows:  ~/AppData/Local
+
+    Nvim directory:
+        Unix:     ~/.local/share/nvim/
+        Windows:  ~/AppData/Local/nvim-data/
+
+Note on Windows the configuration and data directory defaults are the same
+(for lack of an alternative), but the sub-directory for data is named
+"nvim-data" to separate it from the configuration sub-directory "nvim".
+
+Throughout other sections of the user manual, the defaults are used as generic
+placeholders, e.g. where "~/.config" is mentioned it should be understood to
+mean "$XDG_CONFIG_HOME or ~/.config".
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 81ba639dbe..e59f567826 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.4.  Last change: 2015 Dec 19
+*syntax.txt*	For Vim version 7.4.  Last change: 2016 Aug 10
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -936,26 +936,29 @@ To disable them use ":unlet".  Example: >
 	:unlet c_comment_strings
 
 Variable		Highlight ~
-c_gnu			GNU gcc specific items
-c_comment_strings	strings and numbers inside a comment
-c_space_errors		trailing white space and spaces before a <Tab>
-c_no_trail_space_error	 ... but no trailing spaces
-c_no_tab_space_error	 ... but no spaces before a <Tab>
-c_no_bracket_error	don't highlight {}; inside [] as errors
-c_no_curly_error	don't highlight {}; inside [] and () as errors;
+*c_gnu*			GNU gcc specific items
+*c_comment_strings*	strings and numbers inside a comment
+*c_space_errors*		trailing white space and spaces before a <Tab>
+*c_no_trail_space_error*	 ... but no trailing spaces
+*c_no_tab_space_error*	 ... but no spaces before a <Tab>
+*c_no_bracket_error*	don't highlight {}; inside [] as errors
+*c_no_curly_error*	don't highlight {}; inside [] and () as errors;
 				except { and } in first column
-c_curly_error		highlight a missing }; this forces syncing from the
+				Default is to highlight them, otherwise you
+				can't spot a missing ")".
+*c_curly_error*		highlight a missing }; this forces syncing from the
 			start of the file, can be slow
-c_no_ansi		don't do standard ANSI types and constants
-c_ansi_typedefs		 ... but do standard ANSI types
-c_ansi_constants	 ... but do standard ANSI constants
-c_no_utf		don't highlight \u and \U in strings
-c_syntax_for_h		for *.h files use C syntax instead of C++ and use objc
+*c_no_ansi*		don't do standard ANSI types and constants
+*c_ansi_typedefs*		 ... but do standard ANSI types
+*c_ansi_constants*	 ... but do standard ANSI constants
+*c_no_utf*		don't highlight \u and \U in strings
+*c_syntax_for_h*		for *.h files use C syntax instead of C++ and use objc
 			syntax instead of objcpp
-c_no_if0		don't highlight "#if 0" blocks as comments
-c_no_cformat		don't highlight %-formats in strings
-c_no_c99		don't highlight C99 standard items
-c_no_c11		don't highlight C11 standard items
+*c_no_if0*		don't highlight "#if 0" blocks as comments
+*c_no_cformat*		don't highlight %-formats in strings
+*c_no_c99*		don't highlight C99 standard items
+*c_no_c11*		don't highlight C11 standard items
+*c_no_bsd*		don't highlight BSD specific types
 
 When 'foldmethod' is set to "syntax" then /* */ comments and { } blocks will
 become a fold.  If you don't want comments to become a fold use: >
@@ -1037,6 +1040,21 @@ This works immediately.
 
 CLOJURE							*ft-clojure-syntax*
 
+The default syntax groups can be augmented through the
+*g:clojure_syntax_keywords* and *b:clojure_syntax_keywords* variables. The
+value should be a |Dictionary| of syntax group names to a |List| of custom
+identifiers:
+>
+	let g:clojure_syntax_keywords = {
+	    \ 'clojureMacro': ["defproject", "defcustom"],
+	    \ 'clojureFunc': ["string/join", "string/replace"]
+	    \ }
+<
+Refer to the Clojure syntax script for valid syntax group names.
+
+If the |buffer-variable| *b:clojure_syntax_without_core_keywords* is set, only
+language constants and special forms are matched.
+
 Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
 Any list, vector, or map that extends over more than one line can be folded
 using the standard Vim |fold-commands|.
@@ -1569,15 +1587,6 @@ as Fvwm2 configuration files, add the following: >
   :au! BufNewFile,BufRead /etc/X11/fvwm2/*  let b:fvwm_version = 2 |
 					 \ set filetype=fvwm
 
-If you'd like Vim to highlight all valid color names, tell it where to
-find the color database (rgb.txt) on your system.  Do this by setting
-"rgb_file" to its location.  Assuming your color database is located
-in /usr/X11/lib/X11/, you should add the line >
-
-	:let rgb_file = "/usr/X11/lib/X11/rgb.txt"
-
-to your vimrc file.
-
 
 GSP						*gsp.vim* *ft-gsp-syntax*
 
@@ -2886,7 +2895,7 @@ You may wish to embed languages into sh.  I'll give an example courtesy of
 Lorance Stinson on how to do this with awk as an example. Put the following
 file into $HOME/.config/nvim/after/syntax/sh/awkembed.vim: >
 
-    " AWK Embedding: {{{1
+    " AWK Embedding:
     " ==============
     " Shamelessly ripped from aspperl.vim by Aaron Hope.
     if exists("b:current_syntax")
@@ -3345,6 +3354,13 @@ Note that schemas are not actually limited to plain scalars, but this is the
 only difference between schemas defined in YAML specification and the only 
 difference defined in the syntax file.
 
+
+ZSH						    *zsh.vim* *ft-zsh-syntax*
+
+The syntax script for zsh allows for syntax-based folding: >
+
+	:let g:zsh_fold_enable = 1
+
 ==============================================================================
 5. Defining a syntax					*:syn-define* *E410*
 
@@ -3422,6 +3438,32 @@ SPELL CHECKING						*:syn-spell*
 
 	To activate spell checking the 'spell' option must be set.
 
+SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
+
+:sy[ntax] iskeyword [clear | {option}]
+	This defines the keyword characters.  It's like the 'iskeyword' option
+	for but only applies to syntax highlighting.
+
+	clear:		Syntax specific iskeyword setting is disabled and the
+			buffer-local 'iskeyword' setting is used.
+	{option}        Set the syntax 'iskeyword' option to a new value. 
+
+	Example: >
+  :syntax iskeyword @,48-57,192-255,$,_
+<
+	This would set the syntax specific iskeyword option to include all
+	alphabetic characters, plus the numeric characters, all accented
+	characters and also includes the "_" and the "$".
+
+	If no argument is given, the current value will be output.
+
+	Setting this option influences what |/\k| matches in syntax patterns
+	and also determines where |:syn-keyword| will be checked for a new
+	match.
+
+	It is recommended when writing syntax files, to use this command
+	to the correct value for the specific syntax language and not change
+	the 'iskeyword' option.
 
 DEFINING KEYWORDS					*:syn-keyword*
 
@@ -3453,6 +3495,7 @@ DEFINING KEYWORDS					*:syn-keyword*
 	isn't, the keyword will never be recognized.
 	Multi-byte characters can also be used.  These do not have to be in
 	'iskeyword'.
+	See |:syn-iskeyword| for defining syntax specific iskeyword settings.
 
 	A keyword always has higher priority than a match or region, the
 	keyword is used if more than one item matches.	Keywords do not nest
@@ -4484,9 +4527,9 @@ in their own color.
 :colo[rscheme] {name}	Load color scheme {name}.  This searches 'runtimepath'
 			for the file "colors/{name}.vim".  The first one that
 			is found is loaded.
-			To see the name of the currently active color scheme: >
-				:colo
-<			The name is also stored in the g:colors_name variable.
+			Also searches all plugins in 'packpath', first below
+			"start" and then under "opt".
+
 			Doesn't work recursively, thus you can't use
 			":colorscheme" in a color scheme script.
 			After the color scheme has been loaded the
@@ -4727,6 +4770,10 @@ font={font-name}					*highlight-font*
 	All fonts used, except for Menu and Tooltip, should be of the same
 	character size as the default font!  Otherwise redrawing problems will
 	occur.
+	To use a font name with an embedded space or other special character,
+	put it in single quotes.  The single quote cannot be used then.
+	Example: >
+	    :hi comment font='Monospace 10'
 
 guifg={color-name}					*highlight-guifg*
 guibg={color-name}					*highlight-guibg*
@@ -4817,6 +4864,9 @@ SignColumn	column where |signs| are displayed
 							*hl-IncSearch*
 IncSearch	'incsearch' highlighting; also used for the text replaced with
 		":s///c"
+							*hl-Substitute*
+Substitute	|:substitute| replacement text highlighting
+
 							*hl-LineNr*
 LineNr		Line number for ":number" and ":#" commands, and when 'number'
 		or 'relativenumber' option is set.
@@ -4848,6 +4898,10 @@ PmenuSbar	Popup menu: scrollbar.
 PmenuThumb	Popup menu: Thumb of the scrollbar.
 							*hl-Question*
 Question	|hit-enter| prompt and yes/no questions
+							*hl-QuickFixLine*
+QuickFixLine	The selected |quickfix| item in the quickfix window.
+		|hl-CursorLine| is combined with this when the cursor is on
+		the currently selected quickfix item.
 							*hl-Search*
 Search		Last search pattern highlighting (see 'hlsearch').
 		Also used for highlighting the current line in the quickfix
@@ -4887,8 +4941,6 @@ TabLineSel	tab pages line, active tab page label
 Title		titles for output from ":set all", ":autocmd" etc.
 							*hl-Visual*
 Visual		Visual mode selection
-							*hl-VisualNOS*
-VisualNOS	Removed. |vim-differences| {Nvim}
 							*hl-WarningMsg*
 WarningMsg	warning messages
 							*hl-WildMenu*
@@ -4992,6 +5044,9 @@ defaults back: >
 
   :syntax reset
 
+It is a bit of a wrong name, since it does not reset any syntax items, it only
+affects the highlighting.
+
 This doesn't change the colors for the 'highlight' option.
 
 Note that the syntax colors that you set in your vimrc file will also be reset
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 70e6953211..4ab5b3c759 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -83,14 +83,21 @@ In the GUI tab pages line you can use the right mouse button to open menu.
 		Execute {cmd} and when it opens a new window open a new tab
 		page instead.  Doesn't work for |:diffsplit|, |:diffpatch|,
 		|:execute| and |:normal|.
-		When [count] is omitted the tab page appears after the current
-		one.
-		When [count] is specified the new tab page comes after tab
-		page [count].  Use ":0tab cmd" to get the new tab page as the
-		first one.
+		If [count] is given the new tab page appears after the tab
+		page [count] otherwise the new tab page will appear after the
+		current one.
 		Examples: >
-			:tab split	" opens current buffer in new tab page
-			:tab help gt	" opens tab page with help for "gt"
+		    :tab split	    " opens current buffer in new tab page
+		    :tab help gt    " opens tab page with help for "gt"
+		    :.tab help gt   " as above
+		    :+tab help	    " opens tab page with help after the next
+				    " tab page
+		    :-tab help	    " opens tab page with help before the
+				    " current one
+		    :0tab help	    " opens tab page with help before the
+				    " first one
+		    :$tab help	    " opens tab page with help after the last
+				    " one
 
 CTRL-W gf	Open a new tab page and edit the file name under the cursor.
 		See |CTRL-W_gf|.
@@ -140,7 +147,7 @@ something else.
 
 :{count}tabo[nly][!]
 		Close all tab pages except the {count}th one. >
-		    :.tabonly " one
+		    :.tabonly " as above
 		    :-tabonly " close all tab pages except the previous one
 		    :+tabonly " close all tab pages except the next one
 		    :1tabonly " close all tab pages except the first one
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 7d47368ba3..08ffee7a2f 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -473,7 +473,7 @@ correct values.
 
 One command can be used to set the screen size:
 
-						*:mod* *:mode* *E359* *E362*
+						*:mod* *:mode*
 :mod[e]
 
 Detects the screen size and redraws the screen.
diff --git a/runtime/doc/usr_02.txt b/runtime/doc/usr_02.txt
index 6a288f8965..c10643940d 100644
--- a/runtime/doc/usr_02.txt
+++ b/runtime/doc/usr_02.txt
@@ -1,4 +1,4 @@
-*usr_02.txt*	For Vim version 7.4.  Last change: 2015 Apr 12
+*usr_02.txt*	For Vim version 7.4.  Last change: 2016 Jan 16
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -397,7 +397,15 @@ original version of the file.
 
 Everything you always wanted to know can be found in the Vim help files.
 Don't be afraid to ask!
-   To get generic help use this command: >
+
+If you know what you are looking for, it is usually easier to search for it
+using the help system, instead of using Google.  Because the subjects follow
+a certain style guide.
+
+Also the help has the advantage of belonging to your particular Vim version.
+You won't see help for commands added later.  These would not work for you.
+
+To get generic help use this command: >
 
 	:help
 
@@ -471,7 +479,7 @@ example, use the following command: >
 
 	:help 'number'
 
-The table with all mode prefixes can be found here: |help-context|.
+The table with all mode prefixes can be found below: |help-summary|.
 
 Special keys are enclosed in angle brackets.  To find help on the up-arrow key
 in Insert mode, for instance, use this command: >
@@ -488,64 +496,191 @@ You can use the error ID at the start to find help about it: >
 
 
 Summary: 					*help-summary*  >
-	:help
-<		Gives you very general help.  Scroll down to see a list of all
-		helpfiles, including those added locally (i.e. not distributed
-		with Vim). >
-	:help user-toc.txt
-<		Table of contents of the User Manual. >
-	:help :subject
-<		Ex-command "subject", for instance the following: >
-	:help :help
-<		Help on getting help. >
-	:help abc
-<		normal-mode command "abc". >
-	:help CTRL-B
-<		Control key <C-B> in Normal mode. >
-	:help i_abc
-	:help i_CTRL-B
-<		The same in Insert mode. >
-	:help v_abc
-	:help v_CTRL-B
-<		The same in Visual mode. >
-	:help c_abc
-	:help c_CTRL-B
-<		The same in Command-line mode. >
-	:help 'subject'
-<		Option 'subject'. >
-	:help subject()
-<		Function "subject". >
-	:help -subject
-<		Command-line argument "-subject". >
-	:help +subject
-<		Compile-time feature "+subject". >
-	:help /*
-<		Regular expression item "*" >
-	:help EventName
-<		Autocommand event "EventName". >
-	:help digraphs.txt
-<		The top of the helpfile "digraph.txt".
-		Similarly for any other helpfile. >
-	:help pattern<Tab>
-<		Find a help tag starting with "pattern".  Repeat <Tab> for
-		others. >
-	:help pattern<Ctrl-D>
-<		See all possible help tag matches "pattern" at once. >
-	:helpgrep pattern
-<		Search the whole text of all help files for pattern "pattern".
-		Jumps to the first match.  Jump to other matches with: >
-	    :cn
-<			next match >
-	    :cprev
-	    :cN
-<			previous match >
-	    :cfirst
-	    :clast
-<			first or last match >
-	    :copen
-	    :cclose
-<			open/close the quickfix window; press <Enter> to jump
-			to the item under the cursor
+
+1) Use Ctrl-D after typing a topic and let Vim show all available topics.
+   Or press Tab to complete: >
+    	:help some<Tab>
+<   More information on how to use the help: >
+	:help helphelp
+
+2) Follow the links in bars to related help.  You can go from the detailed
+   help to the user documentation, which describes certain commands more from
+   a user perspective and less detailed.  E.g. after: >
+   	:help pattern.txt
+<   You can see the user guide topics |03.9| and |usr_27.txt| in the
+   introduction.
+
+3) Options are enclosed in single apostrophes.  To go to the help topic for the
+   list option: >
+	:help 'list'
+<   If you only know you are looking for a certain option, you can also do: >
+	:help options.txt
+<   to open the help page which describes all option handling and then search
+   using regular expressions, e.g. textwidth.
+   Certain options have their own namespace, e.g.: >
+   	:help cpo-<letter>
+<   for the corresponding flag of the 'cpoptions' settings, substitute <letter>
+   by a specific flag, e.g.: >
+  	:help cpo-;
+<   And for the guioption flags: >
+  	:help go-<letter>
+
+4) Normal mode commands do not have a prefix. To go to the help page for the
+   "gt" command: >
+   	:help gt
+
+5) Insert mode commands start with i_.  Help for deleting a word: >
+   	:help i_CTRL-W
+
+6) Visual mode commands start with v_.  Help for jumping to the other side of
+   the Visual area: >
+   	:help v_o
+
+7) Command line editing and arguments start with c_.  Help for using the
+   command argument %: >
+   	:help c_%
+
+8) Ex-commands always start with ":", so to go to the :s command help: >
+	:help :s
+
+9) Commands specifically for debugging start with ">".  To go to to the help
+   for the "cont" debug command: >
+	:help >cont
+
+10) Key combinations.  They usually start with a single letter indicating
+    the mode for which they can be used.  E.g.: >
+   	:help i_CTRL-X
+<    takes you to the family of Ctrl-X commands for insert mode which can be
+    used to auto complete different things.  Note, that certain keys will
+    always be written the same, e.g. Control will always be CTRL.
+    For normal mode commands there is no prefix and the topic is available at
+    :h CTRL-<Letter>. E.g.  >
+   	:help CTRL-W
+<    In contrast >
+	:help c_CTRL-R
+<    will describe what the Ctrl-R does when entering commands in the Command
+    line and >
+   	:help v_Ctrl-A
+<    talks about incrementing numbers in visual mode and >
+	:help g_CTRL-A
+<    talks about the g<C-A> command (e.g. you have to press "g" then <Ctrl-A>).
+    Here the "g" stand for the normal command "g" which always expects a second
+    key before doing something similar to the commands starting with "z"
+
+11) Regexp items always start with /.  So to get help for the "\+" quantifier
+    in Vim regexes: >
+   	:help /\+
+<    If you need to know everything about regular expressions, start reading
+    at: >
+   	:help pattern.txt
+
+12) Registers always start with "quote". To find out about the special ":"
+    register: >
+   	:help quote:
+
+13) Vim Script (VimL) is available at >
+	:help eval.txt
+<   Certain aspects of the language are available at :h expr-X where "X" is a
+   single letter. E.g.  >
+   	:help expr-!
+<   will take you to the topic describing the "!" (Not) operator for
+   VimScript.
+   Also important is >
+   	:help function-list
+<   to find a short description of all functions available.  Help topics for
+   VimL functions always include the "()", so: >
+   	:help append()
+<   talks about the append VimL function rather than how to append text in the
+   current buffer.
+
+14) Mappings are talked about in the help page :h |map.txt|. Use >
+    	:help mapmode-i
+<    to find out about the |:imap| command.  Also use :map-topic
+    to find out about certain subtopics particular for mappings.  e.g: >
+    	:help :map-local
+<    for buffer-local mappings or >
+	:help map-bar
+<    for how the '|' is handled in mappings.
+
+15) Command definitions are talked about :h command-topic, so use >
+	:help command-bar
+<    to find out about the '!' argument for custom commands.
+
+16) Window management commands always start with CTRL-W, so you find the
+    corresponding help at :h CTRL-W_letter.  E.g. >
+   	:help CTRL-W_p
+<    for moving the previous accessed window.  You can also access >
+	:help windows.txt
+<    and read your way through if you are looking for window handling
+    commands.
+
+17) Use |:helpgrep| to search in all help pages (and also of any installed
+    plugins).  See |:helpgrep| for how to use it.
+    To search for a topic: >
+    	:helpgrep topic
+<    This takes you to the first match.  To go to the next one: >
+	:cnext
+<    All matches are available in the quickfix window which can be opened
+    with: >
+    	:copen
+<    Move around to the match you like and press Enter to jump to that help.
+
+18) The user manual.  This describes help topics for beginners in a rather
+    friendly way.  Start at |usr_toc.txt| to find the table of content (as you
+    might have guessed): >
+    	:help usr_toc.txt
+<    Skim over the contents to find interesting topics. The "Digraphs" and
+    "Entering special characters" items are in chapter 24, so to go to that
+    particular help page: >
+    	:help usr_24.txt
+<    Also if you want to access a certain chapter in the help, the chapter
+    number can be accessed directly like this: >
+    	:help 10.1
+<    goes to chapter 10.1 in |usr_10.txt| and talks about recording macros.
+
+19) Highlighting groups.  Always start with hl-groupname.  E.g. >
+    	:help hl-WarningMsg
+<    talks about the WarningMsg highlighting group.
+
+20) Syntax highlighting is namespaced to :syn-topic e.g. >
+	:help :syn-conceal
+<    talks about the conceal argument for the :syn command.
+
+21) Quickfix commands usually start with :c while location list commands
+    usually start with :l
+
+22) Autocommand events can be found by their name: >
+     	:help BufWinLeave
+<    To see all possible events: >
+	:help autocommands-events
+
+23) Command-line switches always start with "-".  So for the help of the -f
+    command switch of Vim use: >
+    	:help -f
+
+24) Optional features always start with "+".  To find out about the
+    conceal feature use: >
+    	:help +conceal
+
+25) Documentation for included filetype specific functionality is usually
+    available  in the form ft-<filetype>-<functionality>.  So >
+    	:help ft-c-syntax
+<    talks about the C syntax file and the option it provides.  Sometimes,
+    additional sections for omni completion >
+    	:help ft-php-omni
+<    or filetype plugins >
+	:help ft-tex-plugin
+<    are available.
+
+26) Error and Warning codes can be looked up directly in the help.  So >
+	:help E297
+<    takes you exactly to the description of the swap error message and >
+	:help W10
+<    talks about the warning "Changing a readonly file".
+    Sometimes however, those error codes are not described, but rather are
+    listed at the Vim command that usually causes this.  So: >
+    	:help E128
+<    takes you to the |:function| command
 
 
 ==============================================================================
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index b8f65d9309..943d7b528c 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -1,4 +1,4 @@
-*usr_03.txt*	For Vim version 7.4.  Last change: 2015 Dec 12
+*usr_03.txt*	For Vim version 7.4.  Last change: 2016 Jan 05
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -414,8 +414,8 @@ in "the" use: >
 	/the\>
 
 The "\>" item is a special marker that only matches at the end of a word.
-Similarly "\<" only matches at the begin of a word.  Thus to search for the
-word "the" only: >
+Similarly "\<" only matches at the beginning of a word.  Thus to search for
+the word "the" only: >
 
 	/\<the\>
 
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index 5aecf33557..f920fd4591 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt*	For Vim version 7.4.  Last change: 2012 Nov 20
+*usr_05.txt*	For Vim version 7.4.  Last change: 2016 Mar 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -12,10 +12,11 @@ Vim's capabilities.  Or define your own macros.
 |05.1|	The vimrc file
 |05.2|	The example vimrc file explained
 |05.3|	Simple mappings
-|05.4|	Adding a plugin
-|05.5|	Adding a help file
-|05.6|	The option window
-|05.7|	Often used options
+|05.4|	Adding a package
+|05.5|	Adding a plugin
+|05.6|	Adding a help file
+|05.7|	The option window
+|05.8|	Often used options
 
      Next chapter: |usr_06.txt|  Using syntax highlighting
  Previous chapter: |usr_04.txt|  Making small changes
@@ -245,7 +246,47 @@ The ":map" command (with no arguments) lists your current mappings.  At
 least the ones for Normal mode.  More about mappings in section |40.1|.
 
 ==============================================================================
-*05.4*	Adding a plugin					*add-plugin* *plugin*
+*05.4*	Adding a package			*add-package* *vimball-install*
+
+A package is a set of files that you can add to Vim.  There are two kinds of
+packages: optional and automatically loaded on startup.
+
+The Vim distribution comes with a few packages that you can optionally use.
+For example, the vimball plugin.  This plugin supports creating and using
+vimballs (self-installing Vim plugin archives).
+
+To start using the vimball plugin, add one line to your vimrc file: >
+	packadd vimball
+
+That's all!  You can also type the command to try it out.  Now you can find
+help about this plugin: >
+	:help vimball
+
+This works, because when `:packadd` loaded the plugin it also added the
+package directory in 'runtimepath', so that the help file can be found.  The
+tags for vimball's help are already created.  If you need to generate the help
+tags for a package, see the `:helptags` command.
+
+You can find packages on the Internet in various places.  It usually comes as
+an archive or as a repository.  For an archive you can follow these steps:
+	1. create the package directory: >
+		mkdir -p ~/.local/share/nvim/site/pack/fancy
+<	   "fancy" can be any name of your liking.  Use one that describes the
+	   package.
+	2. unpack the archive in that directory.  This assumes the top
+	   directory in the archive is "start": >
+	   	cd ~/.local/share/nvim/site/pack/fancy
+		unzip /tmp/fancy.zip
+<	   If the archive layout is different make sure that you end up with a
+	   path like this:
+		~/.local/share/nvim/site/pack/fancy/start/fancytext/plugin/fancy.vim ~
+	   Here "fancytext" is the name of the package, it can be anything
+	   else.
+
+More information about packages can be found here: |packages|.
+
+==============================================================================
+*05.5*	Adding a plugin					*add-plugin* *plugin*
 
 Vim's functionality can be extended by adding plugins.  A plugin is nothing
 more than a Vim script file that is loaded automatically when Vim starts.  You
@@ -299,10 +340,9 @@ Then copy the file to your plugin directory:
 Example for Unix (assuming you didn't have a plugin directory yet): >
 
 	mkdir -p ~/.local/share/nvim/site/plugin
-	cp /usr/local/share/vim/vim60/macros/justify.vim ~/.local/share/nvim/site/plugin
+	cp /tmp/yourplugin.vim ~/.local/share/nvim/site/plugin
 
-That's all!  Now you can use the commands defined in this plugin to justify
-text.
+That's all!  Now you can use the commands defined in this plugin.
 
 Instead of putting plugins directly into the plugin/ directory, you may
 better organize them by putting them into subdirectories under plugin/.
@@ -384,7 +424,7 @@ Further reading:
 |new-filetype|		How to detect a new file type.
 
 ==============================================================================
-*05.5*	Adding a help file		                   *add-local-help*
+*05.6*	Adding a help file		                   *add-local-help*
 
 If you are lucky, the plugin you installed also comes with a help file.  We
 will explain how to install the help file, so that you can easily find help
@@ -417,7 +457,7 @@ them through the tag.
 For writing a local help file, see |write-local-help|.
 
 ==============================================================================
-*05.6*	The option window
+*05.7*	The option window
 
 If you are looking for an option that does what you want, you can search in
 the help files here: |options|.  Another way is by using this command: >
@@ -456,7 +496,7 @@ border.  This is what the 'scrolloff' option does, it specifies an offset
 from the window border where scrolling starts.
 
 ==============================================================================
-*05.7*	Often used options
+*05.8*	Often used options
 
 There are an awful lot of options.  Most of them you will hardly ever use.
 Some of the more useful ones will be mentioned here.  Don't forget you can
diff --git a/runtime/doc/usr_12.txt b/runtime/doc/usr_12.txt
index 237abae55f..f64a230576 100644
--- a/runtime/doc/usr_12.txt
+++ b/runtime/doc/usr_12.txt
@@ -237,19 +237,8 @@ simple way: Move the cursor to the word you want to find help on and press >
 
 	K
 
-Vim will run the external "man" program on the word.  If the man page is
-found, it is displayed.  This uses the normal pager to scroll through the text
-(mostly the "more" program).  When you get to the end pressing <Enter> will
-get you back into Vim.
-
-A disadvantage is that you can't see the man page and the text you are working
-on at the same time.  There is a trick to make the man page appear in a Vim
-window.  First, load the man filetype plugin: >
-
-	:runtime! ftplugin/man.vim
-
-Put this command in your vimrc file if you intend to do this often.  Now you
-can use the ":Man" command to open a window on a man page: >
+Nvim will run |:Man| on the word.  If the man page is found, it is displayed.
+You can also use the |:Man| command to open a window on a man page: >
 
 	:Man csh
 
@@ -267,15 +256,14 @@ window.
 
 To display a man page for the word under the cursor, use this: >
 
-	\K
+	K
 
-(If you redefined the <Leader>, use it instead of the backslash).
 For example, you want to know the return value of "strstr()" while editing
 this line:
 
 	if ( strstr (input, "aap") == ) ~
 
-Move the cursor to somewhere on "strstr" and type "\K".  A window will open
+Move the cursor to somewhere on "strstr" and type "K".  A window will open
 to display the man page for strstr().
 
 ==============================================================================
diff --git a/runtime/doc/usr_25.txt b/runtime/doc/usr_25.txt
index 23d76a8b0f..24420353dd 100644
--- a/runtime/doc/usr_25.txt
+++ b/runtime/doc/usr_25.txt
@@ -1,4 +1,4 @@
-*usr_25.txt*	For Vim version 7.4.  Last change: 2014 Oct 29
+*usr_25.txt*	For Vim version 7.4.  Last change: 2016 Mar 28
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -196,12 +196,16 @@ Vim has no built-in way of justifying text.  However, there is a neat macro
 package that does the job.  To use this package, execute the following
 command: >
 
-	:runtime macros/justify.vim
+	:packadd justify
+
+Or put this line in your |vimrc|: >
+
+	packadd! justify
 
 This Vim script file defines a new visual command "_j".  To justify a block of
 text, highlight the text in Visual mode and then execute "_j".
    Look in the file for more explanations.  To go there, do "gf" on this name:
-$VIMRUNTIME/macros/justify.vim.
+$VIMRUNTIME/pack/dist/opt/justify/plugin/justify.vim.
 
 An alternative is to filter the text through an external program.  Example: >
 
diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt
index e495aad06d..9eb66ce83c 100644
--- a/runtime/doc/usr_29.txt
+++ b/runtime/doc/usr_29.txt
@@ -1,4 +1,4 @@
-*usr_29.txt*	For Vim version 7.4.  Last change: 2008 Jun 28
+*usr_29.txt*	For Vim version 7.4.  Last change: 2016 Feb 27
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index fc8419a522..191b0871f4 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -1,4 +1,4 @@
-*usr_41.txt*	For Vim version 7.4.  Last change: 2015 Nov 30
+*usr_41.txt*	For Vim version 7.4.  Last change: 2016 Aug 07
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -592,6 +592,7 @@ String manipulation:					*string-functions*
 	match()			position where a pattern matches in a string
 	matchend()		position where a pattern match ends in a string
 	matchstr()		match of a pattern in a string
+	matchstrpos()		match and positions of a pattern in a string
 	matchlist()		like matchstr() and also return submatches
 	stridx()		first index of a short string in a long string
 	strridx()		last index of a short string in a long string
@@ -601,13 +602,16 @@ String manipulation:					*string-functions*
 	strdisplaywidth()	size of string when displayed, deals with tabs
 	substitute()		substitute a pattern match with a string
 	submatch()		get a specific match in ":s" and substitute()
-	strpart()		get part of a string
+	strpart()		get part of a string using byte index
+	strcharpart()		get part of a string using char index
+	strgetchar()		get character from a string using char index
 	expand()		expand special keywords
 	iconv()			convert text from one encoding to another
 	byteidx()		byte index of a character in a string
 	byteidxcomp()		like byteidx() but count composing characters
 	repeat()		repeat a string multiple times
 	eval()			evaluate a string expression
+	execute()		execute an Ex command and get the output
 
 List manipulation:					*list-functions*
 	get()			get an item without error for wrong index
@@ -731,11 +735,14 @@ Working with text in the current buffer:		*text-functions*
 	searchpair()		find the other end of a start/skip/end
 	searchpairpos()		find the other end of a start/skip/end
 	searchdecl()		search for the declaration of a name
+	getcharsearch()		return character search information
+	setcharsearch()		set character search information
 
 					*system-functions* *file-functions*
 System functions and manipulation of files:
 	glob()			expand wildcards
 	globpath()		expand wildcards in a number of directories
+	glob2regpat()		convert a glob pattern into a search pattern
 	findfile()		find a file in a list of directories
 	finddir()		find a directory in a list of directories
 	resolve()		find out where a shortcut points to
@@ -747,6 +754,7 @@ System functions and manipulation of files:
 	filereadable()		check if a file can be read
 	filewritable()		check if a file can be written to
 	getfperm()		get the permissions of a file
+	setfperm()		set the permissions of a file
 	getftype()		get the kind of a file
 	isdirectory()		check if a directory exists
 	getfsize()		get the size of a file
@@ -768,6 +776,7 @@ Date and Time:				*date-functions* *time-functions*
 	strftime()		convert time to a string
 	reltime()		get the current or elapsed time accurately
 	reltimestr()		convert reltime() result to a string
+	reltimefloat()		convert reltime() result to a Float
 
 			*buffer-functions* *window-functions* *arg-functions*
 Buffers, windows and the argument list:
@@ -784,9 +793,18 @@ Buffers, windows and the argument list:
 	tabpagenr()		get the number of a tab page
 	tabpagewinnr()		like winnr() for a specified tab page
 	winnr()			get the window number for the current window
+	bufwinid()		get the window ID of a specific buffer
 	bufwinnr()		get the window number of a specific buffer
 	winbufnr()		get the buffer number of a specific window
 	getbufline()		get a list of lines from the specified buffer
+	win_findbuf()		find windows containing a buffer
+	win_getid()		get window ID of a window
+	win_gotoid()		go to window with ID
+	win_id2tabwin()		get tab and window nr from window ID
+	win_id2win()		get window nr from window ID
+	getbufinfo()		get a list with buffer information
+	gettabinfo()		get a list with tab page information
+	getwininfo()		get a list with window information
 
 Command line:					*command-line-functions*
 	getcmdline()		get the current command line
@@ -794,6 +812,7 @@ Command line:					*command-line-functions*
 	setcmdpos()		set position of the cursor in the command line
 	getcmdtype()		return the current command-line type
 	getcmdwintype()		return the current command-line window type
+	getcompletion()		list of command-line completion matches
 
 Quickfix and location lists:			*quickfix-functions*
 	getqflist()		list of quickfix errors
@@ -889,9 +908,19 @@ Mappings:				    *mapping-functions*
 	wildmenumode()		check if the wildmode is active
 
 Testing:				    *test-functions*
-	assert_equal()       	assert that two expressions values are equal
+	assert_equal()		assert that two expressions values are equal
+	assert_notequal()	assert that two expressions values are not equal
+	assert_inrange()	assert that an expression is inside a range
+	assert_match()		assert that a pattern matches the value
+	assert_notmatch()	assert that a pattern does not match the value
 	assert_false()		assert that an expression is false
 	assert_true()		assert that an expression is true
+	assert_exception()	assert that a command throws an exception
+	assert_fails()		assert that a function call fails
+
+Timers:						*timer-functions*
+	timer_start()		create a timer
+	timer_stop()		stop a timer
 
 Various:					*various-functions*
 	mode()			get current editing mode
@@ -916,12 +945,13 @@ Various:					*various-functions*
 
 	shiftwidth()		effective value of 'shiftwidth'
 
+	wordcount()		get byte/word/char count of buffer
+
 	taglist()		get list of matching tags
 	tagfiles()		get a list of tags files
 
 	py3eval()		evaluate Python expression (|+python3|)
 	pyeval()		evaluate Python expression (|+python|)
-	wordcount()		get byte/word/char count of buffer
 
 ==============================================================================
 *41.7*	Defining a function
@@ -1389,9 +1419,9 @@ Now we can instantiate a Dutch translation object: >
 And a German translator: >
 
 	:let uk2de = copy(transdict)
-	:let uk2de.words = {'one': 'ein', 'two': 'zwei', 'three': 'drei'}
+	:let uk2de.words = {'one': 'eins', 'two': 'zwei', 'three': 'drei'}
 	:echo uk2de.translate('three one')
-<	drei ein ~
+<	drei eins ~
 
 You see that the copy() function is used to make a copy of the "transdict"
 Dictionary and then the copy is changed to add the words.  The original
@@ -2224,7 +2254,7 @@ This construct makes sure the function is only defined once: >
 	:endif
 <
 
-UNDO							*undo_ftplugin*
+UNDO						*undo_indent* *undo_ftplugin*
 
 When the user does ":setfiletype xyz" the effect of the previous filetype
 should be undone.  Set the b:undo_ftplugin variable to the commands that will
@@ -2239,6 +2269,9 @@ global value.  That is mostly the best way to reset the option value.
 This does require removing the "C" flag from 'cpoptions' to allow line
 continuation, as mentioned above |use-cpo-save|.
 
+For undoing the effect of an indent script, the b:undo_indent variable should
+be set accordingly.
+
 
 FILE NAME
 
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index 77ea462a23..e021b806e3 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt*	For Vim version 7.4.  Last change: 2010 Jul 20
+*usr_toc.txt*	For Vim version 7.4.  Last change: 2016 Mar 25
 
 		     VIM USER MANUAL - by Bram Moolenaar
 
@@ -101,10 +101,11 @@ Read this from start to end to learn the essential commands.
 		|05.1|	The vimrc file
 		|05.2|	The example vimrc file explained
 		|05.3|	Simple mappings
-		|05.4|	Adding a plugin
-		|05.5|	Adding a help file
-		|05.6|	The option window
-		|05.7|	Often used options
+		|05.4|	Adding a package
+		|05.5|	Adding a plugin
+		|05.6|	Adding a help file
+		|05.7|	The option window
+		|05.8|	Often used options
 
 |usr_06.txt|  Using syntax highlighting
 		|06.1|	Switching it on
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index af4224993f..7d08a6f32a 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt*   For Vim version 7.4.  Last change: 2015 Nov 15
+*various.txt*   For Vim version 7.4.  Last change: 2016 Jul 09
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -220,7 +220,7 @@ g8			Print the hex values of the bytes used in the
 
 			Like |:enew|, it will fail if the current buffer is
 			modified, but can be forced with "!".  See |termopen()|
-			and |nvim-terminal-emulator| for more information.
+			and |terminal-emulator|.
 
 			To switch to terminal mode automatically:
 >
@@ -255,14 +255,20 @@ g8			Print the hex values of the bytes used in the
 			backslashes are before the newline, only one is
 			removed.
 
-			On Unix the command normally runs in a non-interactive
-			shell.  If you want an interactive shell to be used
-			(to use aliases) set 'shellcmdflag' to "-ic".
+			The command runs in a non-interactive shell connected
+			to a pipe (not a terminal). Use |:terminal| to run an
+			interactive shell connected to a terminal.
+
 			For Win32 also see |:!start|.
 
 			After the command has been executed, the timestamp and
 			size of the current file is checked |timestamp|.
 
+			If the command produces too much output some lines may
+			be skipped so the command can execute quickly.  No
+			data is lost, this only affects the display.  The last
+			few lines are always displayed (never skipped).
+
 			Vim redraws the screen after the command is finished,
 			because it may have printed any text.  This requires a
 			hit-enter prompt, so that you can read any messages.
@@ -319,8 +325,7 @@ N  *+dialog_con*	Support for |:confirm| with console dialog.
 N  *+dialog_con_gui*	Support for |:confirm| with GUI and console dialog.
 N  *+digraphs*		|digraphs| *E196*
 N  *+eval*		expression evaluation |eval.txt|
-N  *+ex_extra*		Vim's extra Ex commands: |:center|, |:left|,
-			|:normal|, |:retab| and |:right|
+N  *+ex_extra*		always on now, used to be for Vim's extra Ex commands
 N  *+extra_search*	|'hlsearch'| and |'incsearch'| options.
 B  *+farsi*		|farsi| language
 N  *+file_in_path*	|gf|, |CTRL-W_f| and |<cfile>|
@@ -376,6 +381,7 @@ B  *+termguicolors*	24-bit color in xterm-compatible terminals support
 N  *+termresponse*	support for |t_RV| and |v:termresponse|
 N  *+textobjects*	|text-objects| selection
    *+tgetent*		non-Unix only: able to use external termcap
+N  *+timers*		the |timer_start()| function
 N  *+title*		Setting the window 'title' and 'icon'
 N  *+toolbar*		|gui-toolbar|
 N  *+user_commands*	User-defined commands. |user-commands|
@@ -410,14 +416,18 @@ m  *+xpm_w32*		Win32 GUI only: pixmap support |w32-xpm-support|
 			shown on the screen.  When [!] is included, an
 			existing file is overwritten.  When [!] is omitted,
 			and {file} exists, this command fails.
+
 			Only one ":redir" can be active at a time.  Calls to
 			":redir" will close any active redirection before
-			starting redirection to the new target.
+			starting redirection to the new target.  For recursive
+			use check out |execute()|.
+
 			To stop the messages and commands from being echoed to
 			the screen, put the commands in a function and call it
 			with ":silent call Function()".
-			An alternative is to use the 'verbosefile' option,
-			this can be used in combination with ":redir".
+			Alternatives are the 'verbosefile' option or
+			|execute()| function, these can be used in combination
+			with ":redir".
 
 :redi[r] >> {file}	Redirect messages to file {file}.  Append if {file}
 			already exists.
@@ -449,13 +459,15 @@ m  *+xpm_w32*		Win32 GUI only: pixmap support |w32-xpm-support|
 			redirection starts, if the variable is removed or
 			locked or the variable type is changed, then further
 			command output messages will cause errors.
+			To get the output of one command the |execute()|
+			function can be used.
 
 :redi[r] =>> {var}	Append messages to an existing variable.  Only string
 			variables can be used.
 
 :redi[r] END		End redirecting messages.
 
-						*:sil* *:silent*
+						*:sil* *:silent* *:silent!*
 :sil[ent][!] {command}	Execute {command} silently.  Normal messages will not
 			be given or added to the message history.
 			When [!] is added, error messages will also be
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index ec35694c9e..54ef8fecb2 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -1,4 +1,4 @@
-*vi_diff.txt*   For Vim version 7.4.  Last change: 2015 Nov 01
+*vi_diff.txt*   For Vim version 7.4.  Last change: 2016 Feb 12
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 508712ca75..20002c1118 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -12,8 +12,8 @@ these differences.
 
 1. Configuration		|nvim-configuration|
 2. Defaults			|nvim-defaults|
-3. Changed features		|nvim-features-changed|
-4. New features			|nvim-features-new|
+3. New features			|nvim-features|
+4. Changed features		|nvim-features-changed|
 5. Missing legacy features	|nvim-features-missing|
 6. Removed features		|nvim-features-removed|
 
@@ -36,9 +36,10 @@ these differences.
 - 'autoindent' is set by default
 - 'autoread' is set by default
 - 'backspace' defaults to "indent,eol,start"
+- 'backupdir' defaults to .,~/.local/share/nvim/backup (|xdg|)
 - 'complete' doesn't include "i"
+- 'directory' defaults to ~/.local/share/nvim/swap// (|xdg|), auto-created
 - 'display' defaults to "lastline"
-- 'encoding' defaults to "utf-8"
 - 'formatoptions' defaults to "tcqj"
 - 'history' defaults to 10000 (the maximum)
 - 'hlsearch' is set by default
@@ -46,7 +47,6 @@ these differences.
 - 'langnoremap' is set by default
 - 'laststatus' defaults to 2 (statusline is always shown)
 - 'listchars' defaults to "tab:> ,trail:-,nbsp:+"
-- 'mouse' defaults to "a"
 - 'nocompatible' is always set
 - 'nrformats' defaults to "bin,hex"
 - 'sessionoptions' doesn't include "options"
@@ -54,11 +54,94 @@ these differences.
 - 'tabpagemax' defaults to 50
 - 'tags' defaults to "./tags;,tags"
 - 'ttyfast' is always set
+- 'undodir' defaults to ~/.local/share/nvim/undo (|xdg|), auto-created
 - 'viminfo' includes "!"
 - 'wildmenu' is set by default
 
 ==============================================================================
-3. Changed features					 *nvim-features-changed*
+3. New Features						       *nvim-features*
+
+
+MAJOR COMPONENTS ~
+
+Embedded terminal emulator	|terminal-emulator|
+RPC API				|RPC|
+Shared data			|shada|
+XDG base directories		|xdg|
+Job control			|job-control|
+Remote plugins			|remote-plugin|
+Python plugins			|provider-python|
+Clipboard integration		|provider-clipboard|
+
+
+USER EXPERIENCE  ~
+
+Working intuitively and consistently is a major goal of Nvim. Examples:
+
+- Nvim does not have `-X`, a platform-specific option "sometimes" available in
+  Vim (with potential surprises: http://stackoverflow.com/q/14635295). Nvim
+  avoids features that cannot be provided on all platforms--instead that is
+  delegated to external plugins/extensions.
+
+- Test-only globals and functions such as test_autochdir(), test_settime(),
+  etc., are not exposed (because they don't exist).
+
+ARCHITECTURE ~
+
+External plugins run in separate processes. |remote-plugin| This improves
+stability and allows those plugins to perform tasks without blocking the
+editor. Even "legacy" Python and Ruby plugins which use the old Vim interfaces
+(|if_py| and |if_ruby|) run out-of-process.
+
+
+FEATURES ~
+
+|bracketed-paste-mode| is built-in and enabled by default.
+
+|META| (ALT) chords are recognized, even in the terminal. Any |<M-| mapping
+will work. Some examples: <M-1>, <M-2>, <M-BS>, <M-Del>, <M-Ins>, <M-/>,
+<M-\>, <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
+META chords are case-sensitive: <M-a> and <M-A> are two different keycodes.
+
+Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants
+(even in the terminal). Specifically, the following are known to work:
+  <C-Tab>, <C-S-Tab>, <C-BS>, <C-S-BS>, <C-Enter>, <C-S-Enter>
+
+Options:
+  'inccommand' shows results while typing a |:substitute| command
+  'statusline' supports unlimited alignment sections
+  'tabline' %@Func@foo%X can call any function on mouse-click
+
+Variables:
+  |v:event|
+  |v:windowid| is always available (for use by external UIs)
+
+Commands:
+  |:CheckHealth|
+  |:drop| is available on all platforms
+  |:Man| is available by default, with many improvements such as completion
+
+Functions:
+  |dictwatcheradd()| notifies a callback whenever a |Dict| is modified
+  |dictwatcherdel()|
+  |execute()| works with |:redir|
+  |msgpackdump()|, |msgpackparse()| provide msgpack de/serialization
+
+Events:
+  |DirChanged|
+  |TabNewEntered|
+  |TermClose|
+  |TermOpen|
+  |TextYankPost|
+
+Highlight groups:
+  |hl-QuickFixLine|
+  |hl-Substitute|
+  |hl-TermCursor|
+  |hl-TermCursorNC|
+
+==============================================================================
+4. Changed features					 *nvim-features-changed*
 
 Nvim always builds with all features, in contrast to Vim which may have
 certain features removed/added at compile-time.  This is like if Vim's "HUGE"
@@ -68,7 +151,16 @@ build).
 If a Python interpreter is available on your `$PATH`, |:python| and |:python3|
 are always available and may be used simultaneously in separate plugins.  The
 `neovim` pip package must be installed to use Python plugins in Nvim (see
-|nvim-python|).
+|provider-python|).
+
+|:!| does not support "interactive" commands. Use |:terminal| instead.
+(GUI Vim has a similar limitation, see ":help gui-pty" in Vim.)
+
+|system()| does not support writing/reading "backgrounded" commands. |E5677|
+
+Nvim may throttle (skip) messages from shell commands (|:!|, |:grep|, |:make|)
+if there is too much output. No data is lost, this only affects display and
+makes things faster. |:terminal| output is never throttled.
 
 |mkdir()| behaviour changed:
 1. Assuming /tmp/foo does not exist and /tmp can be written to
@@ -78,7 +170,7 @@ are always available and may be used simultaneously in separate plugins.  The
    'p')) mkdir() will silently exit. In Vim this was an error.
 3. mkdir() error messages now include strerror() text when mkdir fails.
 
-'encoding' cannot be changed after startup.
+'encoding' is always "utf-8".
 
 |string()| and |:echo| behaviour changed:
 1. No maximum recursion depth limit is applied to nested container
@@ -127,7 +219,6 @@ Additional differences:
   compatibility reasons.
 - |:wviminfo| was renamed to |:wshada|, |:rviminfo| to |:rshada|.  Old
   commands are still kept.
-- |:oldfiles| supports !.
 - When writing (|:wshada| without bang or at exit) it merges much more data,
   and does this according to the timestamp.  Vim merges only marks.
   |shada-merging|
@@ -141,47 +232,13 @@ Additional differences:
 - ShaDa file keeps search direction (|v:searchforward|), viminfo does not.
 
 ==============================================================================
-4. New Features						     *nvim-features-new*
-
-See |nvim-intro| for a list of Nvim's largest new features.
-
-|bracketed-paste-mode| is built-in and enabled by default.
-
-Meta (alt) chords are recognized (even in the terminal).
-  <M-1>, <M-2>, ...
-  <M-BS>, <M-Del>, <M-Ins>, ...
-  <M-/>, <M-\>, ...
-  <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
-
-  Note: Meta chords are case-sensitive (<M-a> is distinguished from <M-A>).
-
-Some `CTRL-SHIFT-...` key chords are distinguished from `CTRL-...` variants
-(even in the terminal). Specifically, the following are known to work:
-  <C-Tab>, <C-S-Tab>
-  <C-BS>, <C-S-BS>
-  <C-Enter>, <C-S-Enter>
-
-Events:
-  |TabNew|
-  |TabNewEntered|
-  |TabClosed|
-  |TermOpen|
-  |TermClose|
-
-Highlight groups:
-  |hl-EndOfBuffer|
-  |hl-TermCursor|
-  |hl-TermCursorNC|
-
-==============================================================================
 5. Missing legacy features				 *nvim-features-missing*
-				     *if_ruby* *if_lua* *if_perl* *if_mzscheme* *if_tcl*
+				     *if_lua* *if_perl* *if_mzscheme* *if_tcl*
 
 These legacy Vim features may be implemented in the future, but they are not
 planned for the current milestone.
 
-- vim.bindeval() (new feature in Vim 7.4 Python interface)
-- |if_ruby|
+- |if_py|: vim.bindeval() and vim.Function() are not supported
 - |if_lua|
 - |if_perl|
 - |if_mzscheme|
@@ -192,10 +249,12 @@ planned for the current milestone.
 
 These features are in Vim, but have been intentionally removed from Nvim.
 
-Vi-compatible mode:
+			*'cp'* *'nocompatible'* *'nocp'* *'compatible'*
+Nvim is always "non-compatible" with Vi.
   ":set nocompatible" is ignored
   ":set compatible" is an error
 
+			*'ed'* *'edcompatible'* *'noed'* *'noedcompatible'*
 Ed-compatible mode:
   ":set noedcompatible" is ignored
   ":set edcompatible" is an error
@@ -205,8 +264,8 @@ Ed-compatible mode:
   ":set nottyfast" is an error
 
 Encryption support:
-  'cryptmethod'
-  'key'
+  *'cryptmethod'* *'cm'*
+  *'key'*
 
 MS-DOS support:
   'bioskey'
@@ -215,29 +274,43 @@ MS-DOS support:
 Highlight groups:
   |hl-VisualNOS|
 
+Test functions:
+  test_alloc_fail()
+  test_autochdir()
+  test_disable_char_avail()
+  test_garbagecollect_now()
+  test_null_channel()
+  test_null_dict()
+  test_null_job()
+  test_null_list()
+  test_null_partial()
+  test_null_string()
+  test_settime()
+
 Other options:
   'antialias'
-  'cpoptions' ('g', 'w', 'H', '*', '-', 'j', and all POSIX flags were removed)
-  'guioptions' (only the 't' flag was removed)
-  'guipty'
-  'imactivatefunc'
-  'imactivatekey'
-  'imstatusfunc'
-  'macatsui'
-  'restorescreen'
+  'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed)
+  'encoding' ("utf-8" is always used)
+  'guioptions' "t" flag was removed
+  *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
+  *'imactivatefunc'* *'imaf'*
+  *'imactivatekey'* *'imak'*
+  *'imstatusfunc'* *'imsf'*
+  *'macatsui'*
+  *'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
   'shelltype'
-  'shortname'
-  'swapsync'
-  'term'
-  'termencoding' (Vim 7.4.852 also removed this for Windows)
+  *'shortname'* *'sn'* *'noshortname'* *'nosn'*
+  *'swapsync'* *'sws'*
+  *'term'* *E529* *E530* *E531*
+  *'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
   'textauto'
   'textmode'
-  'toolbar'
-  'toolbariconsize'
-  'ttybuiltin'
-  'ttymouse'
-  'ttyscroll'
-  'ttytype'
+  *'toolbar'* *'tb'*
+  *'toolbariconsize'* *'tbis'*
+  *'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
+  *'ttymouse'* *'ttym'*
+  *'ttyscroll'* *'tsl'*
+  *'ttytype'* *'tty'*
   'weirdinvert'
 
 Other commands:
@@ -247,6 +320,7 @@ Other commands:
   :mode (no longer accepts an argument)
   :open
   :shell
+  :smile
   :tearoff
 
 Other compile-time features:
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 51b73223b6..5b94626e36 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.4.  Last change: 2015 Nov 14
+*windows.txt*   For Vim version 7.4.  Last change: 2016 Jun 10
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -70,6 +70,16 @@ places where a Normal mode command can't be used or is inconvenient.
 The main Vim window can hold several split windows.  There are also tab pages
 |tab-page|, each of which can hold multiple windows.
 
+Each window has a unique identifier called the window ID.  This identifier
+will not change within a Vim session. The |win_getid()| and |win_id2tabwin()|
+functions can be used to convert between the window/tab number and the
+identifier.  There is also the window number, which may change whenever
+windows are opened or closed, see |winnr()|.
+
+Each buffer has a unique number and the number will not change within a Vim
+session.  The |bufnr()| and |bufname()| functions can be used to convert
+between a buffer name and the buffer number.
+
 ==============================================================================
 2. Starting Vim						*windows-starting*
 
@@ -707,8 +717,8 @@ can also get to them with the buffer list commands, like ":bnext".
 							*:bufdo*
 :[range]bufdo[!] {cmd}	Execute {cmd} in each buffer in the buffer list or if
 			[range] is given only for buffers for which their
-			buffer name is in the [range]. It works like doing
-                        this: >
+			buffer number is in the [range]. It works like doing
+			this: >
 				:bfirst
 				:{cmd}
 				:bnext
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5a3577a62..24587c56dc 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2015 Oct 13
+" Last Change:	2016 Jul 21
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -530,7 +530,7 @@ au BufNewFile,BufRead configure.in,configure.ac setf config
 au BufNewFile,BufRead *.cu			setf cuda
 
 " Dockerfile
-au BufNewFile,BufRead Dockerfile		setf dockerfile
+au BufNewFile,BufRead Dockerfile,*.Dockerfile	setf dockerfile
 
 " WildPackets EtherPeek Decoder
 au BufNewFile,BufRead *.dcd			setf dcd
@@ -1015,7 +1015,7 @@ au BufNewFile,BufRead *.jgr			setf jgraph
 au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
 
 " JSON
-au BufNewFile,BufRead *.json,*.jsonp		setf json
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
 
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
@@ -1143,7 +1143,7 @@ au BufNewFile,BufRead *.ist,*.mst		setf ist
 au BufNewFile,BufRead *.page			setf mallard
 
 " Manpage
-au BufNewFile,BufRead *.man			setf man
+au BufNewFile,BufRead *.man			setf nroff
 
 " Man config
 au BufNewFile,BufRead */etc/man.conf,man.config	setf manconf
@@ -1617,11 +1617,9 @@ au BufNewFile,BufRead */etc/protocols		setf protocols
 " Pyrex
 au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
 
-" Python
-au BufNewFile,BufRead *.py,*.pyw		setf python
-
+" Python, Python Shell Startup Files
 " Quixote (Python-based web framework)
-au BufNewFile,BufRead *.ptl			setf python
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl  setf python
 
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
diff --git a/runtime/ftplugin/c.vim b/runtime/ftplugin/c.vim
index 487ce7a165..3717ea92a9 100644
--- a/runtime/ftplugin/c.vim
+++ b/runtime/ftplugin/c.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Jul 10
+" Last Change:	2016 Jun 12
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -32,7 +32,7 @@ setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 " When the matchit plugin is loaded, this makes the % command skip parens and
 " braces in comments.
 let b:match_words = &matchpairs . ',^\s*#\s*if\(\|def\|ndef\)\>:^\s*#\s*elif\>:^\s*#\s*else\>:^\s*#\s*endif\>'
-let b:match_skip = 's:comment\|string\|character'
+let b:match_skip = 's:comment\|string\|character\|special'
 
 " Win32 can filter files in the browse dialog
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
@@ -55,5 +55,7 @@ if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   endif
 endif
 
+let b:man_default_sects = '3,2'
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/clojure.vim b/runtime/ftplugin/clojure.vim
index 10fcb9f205..217711f26e 100644
--- a/runtime/ftplugin/clojure.vim
+++ b/runtime/ftplugin/clojure.vim
@@ -1,11 +1,11 @@
 " Vim filetype plugin file
-" Language:	Clojure
-" Author:	Meikel Brandmeyer <mb@kotka.de>
+" Language:     Clojure
+" Author:       Meikel Brandmeyer <mb@kotka.de>
 "
-" Maintainer:	Sung Pae <self@sungpae.com>
-" URL:		https://github.com/guns/vim-clojure-static
-" License:	Same as Vim
-" Last Change:	27 March 2014
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  18 July 2016
 
 if exists("b:did_ftplugin")
 	finish
@@ -43,7 +43,7 @@ setlocal commentstring=;\ %s
 " specially and hence are not indented specially.
 "
 " -*- LISPWORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-011/clj/src/vim_clojure_static/generate.clj
 setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
 
 " Provide insert mode completions for special forms and clojure.core. As
@@ -82,9 +82,9 @@ endif
 " Win32 can filter files in the browse dialog
 if has("gui_win32") && !exists("b:browsefilter")
 	let b:browsefilter = "Clojure Source Files (*.clj)\t*.clj\n" .
-			   \ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
-			   \ "Java Source Files (*.java)\t*.java\n" .
-			   \ "All Files (*.*)\t*.*\n"
+	                   \ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
+	                   \ "Java Source Files (*.java)\t*.java\n" .
+	                   \ "All Files (*.*)\t*.*\n"
 	let b:undo_ftplugin .= ' | unlet! b:browsefilter'
 endif
 
diff --git a/runtime/ftplugin/eiffel.vim b/runtime/ftplugin/eiffel.vim
new file mode 100644
index 0000000000..216fdde162
--- /dev/null
+++ b/runtime/ftplugin/eiffel.vim
@@ -0,0 +1,96 @@
+" Vim filetype plugin
+" Language:	Eiffel
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2010 Aug 29
+
+if (exists("b:did_ftplugin"))
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:--
+setlocal commentstring=--\ %s
+
+setlocal formatoptions-=t formatoptions+=croql
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Eiffel Source Files (*.e)\t*.e\n" .
+		     \ "Eiffel Control Files (*.ecf, *.ace, *.xace)\t*.ecf;*.ace;*.xace\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+  " Silly \%^ trick to match note at head of pair and in middle prevents
+  " 'g%' wrapping from 'note' to 'end'
+  let b:match_words = '\%^:' .
+		  \	'\<\%(^note\|indexing\|class\|^obsolete\|inherit\|insert\|^create\|convert\|feature\|^invariant\)\>:' .
+		  \   '^end\>,' .
+		  \   '\<\%(do\|deferred\|external\|once\%(\s\+"\)\@!\|check\|debug\|if\|inspect\|from\|across\)\>:' .
+		  \	'\%(\%(^\s\+\)\@<=\%(then\|until\|loop\)\|\%(then\|until\|loop\)\s\+[^ -]\|' .
+		  \	'\<\%(ensure\%(\s\+then\)\=\|rescue\|_then\|elseif\|else\|when\|\s\@<=invariant\|_until\|_loop\|variant\|_as\|alias\)\>\):' .
+		  \   '\s\@<=end\>'
+  let b:match_skip = 's:\<eiffel\%(Comment\|String\|Operator\)\>'
+  noremap  [% <Nop>
+  noremap  ]% <Nop>
+  vnoremap a% <Nop>
+endif
+
+let b:undo_ftplugin = "setl fo< com< cms<" .
+  \ "| unlet! b:browsefilter b:match_ignorecase b:match_words b:match_skip"
+
+if !exists("g:no_plugin_maps") && !exists("g:no_eiffel_maps")
+  function! s:DoMotion(pattern, count, flags) abort
+    normal! m'
+    for i in range(a:count)
+      call search(a:pattern, a:flags)
+    endfor
+  endfunction
+
+  let sections = '^\%(note\|indexing\|' .
+	     \	 '\%(\%(deferred\|expanded\|external\|frozen\)\s\+\)*class\|' .
+	     \	 'obsolete\|inherit\|insert\|create\|convert\|feature\|' .
+	     \	 'invariant\|end\)\>'
+
+  nnoremap <silent> <buffer> ]] :<C-U>call <SID>DoMotion(sections, v:count1, 'W')<CR>
+  xnoremap <silent> <buffer> ]] :<C-U>exe "normal! gv"<Bar>call <SID>DoMotion(sections, v:count1, 'W')<CR>
+  nnoremap <silent> <buffer> [[ :<C-U>call <SID>DoMotion(sections, v:count1, 'Wb')<CR>
+  xnoremap <silent> <buffer> [[ :<C-U>exe "normal! gv"<Bar>call <SID>DoMotion(sections, v:count1, 'Wb')<CR>
+
+  function! s:DoFeatureMotion(count, flags)
+    let view = winsaveview()
+    call cursor(1, 1)
+    let [features_start, _] = searchpos('^feature\>')
+    call search('^\s\+\a') " find the first feature
+    let spaces = indent(line('.'))
+    let [features_end, _] = searchpos('^\%(invariant\|note\|end\)\>')
+    call winrestview(view)
+    call s:DoMotion('\%>' . features_start . 'l\%<' . features_end . 'l^\s*\%' . (spaces + 1) . 'v\zs\a', a:count, a:flags)
+  endfunction
+
+  nnoremap <silent> <buffer> ]m :<C-U>call <SID>DoFeatureMotion(v:count1, 'W')<CR>
+  xnoremap <silent> <buffer> ]m :<C-U>exe "normal! gv"<Bar>call <SID>DoFeatureMotion(v:count1, 'W')<CR>
+  nnoremap <silent> <buffer> [m :<C-U>call <SID>DoFeatureMotion(v:count1, 'Wb')<CR>
+  xnoremap <silent> <buffer> [m :<C-U>exe "normal! gv"<Bar>call <SID>DoFeatureMotion(v:count1, 'Wb')<CR>
+
+  let comment_block_start = '^\%(\s\+--.*\n\)\@<!\s\+--'
+  let comment_block_end = '^\s\+--.*\n\%(\s\+--\)\@!'
+
+  nnoremap <silent> <buffer> ]- :<C-U>call <SID>DoMotion(comment_block_start, 1, 'W')<CR>
+  xnoremap <silent> <buffer> ]- :<C-U>exe "normal! gv"<Bar>call <SID>DoMotion(comment_block_start, 1, 'W')<CR>
+  nnoremap <silent> <buffer> [- :<C-U>call <SID>DoMotion(comment_block_end, 1, 'Wb')<CR>
+  xnoremap <silent> <buffer> [- :<C-U>exe "normal! gv"<Bar>call <SID>DoMotion(comment_block_end, 1, 'Wb')<CR>
+
+  let b:undo_ftplugin = b:undo_ftplugin .
+    \ "| silent! execute 'unmap <buffer> [[' | silent! execute 'unmap <buffer> ]]'" .
+    \ "| silent! execute 'unmap <buffer> [m' | silent! execute 'unmap <buffer> ]m'" .
+    \ "| silent! execute 'unmap <buffer> [-' | silent! execute 'unmap <buffer> ]-'"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
diff --git a/runtime/ftplugin/groovy.vim b/runtime/ftplugin/groovy.vim
new file mode 100644
index 0000000000..cc7d6e35eb
--- /dev/null
+++ b/runtime/ftplugin/groovy.vim
@@ -0,0 +1,19 @@
+" Vim filetype plugin file
+" Language:	groovy
+" Maintainer:	Justin M. Keyes <justinkz@gmail.com>
+" Last Change:	2016 May 22
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+setlocal commentstring=//%s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/ftplugin/hgcommit.vim b/runtime/ftplugin/hgcommit.vim
new file mode 100644
index 0000000000..d5a6c0a383
--- /dev/null
+++ b/runtime/ftplugin/hgcommit.vim
@@ -0,0 +1,16 @@
+" Vim filetype plugin file
+" Language:	hg (Mercurial) commit file
+" Maintainer:	Ken Takata <kentkt at csc dot jp>
+" Last Change:	2016 Jan 6
+" Filenames:	hg-editor-*.txt
+" License:	VIM License
+" URL:		https://github.com/k-takata/hg-vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal nomodeline
+
+let b:undo_ftplugin = 'setl modeline<'
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 04ab539fb1..5d83886f56 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -1,41 +1,51 @@
-" Vim filetype plugin file
-" Language:	man
-" Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Maintainer:          Anmol Sethi <anmol@aubble.com>
+" Previous Maintainer: SungHyun Nam <goweol@gmail.com>
 
-if has('vim_starting') && &filetype !=# 'man'
-  finish
-endif
-
-" Only do this when not done yet for this buffer
-if exists('b:did_ftplugin')
+if exists('b:did_ftplugin') || &filetype !=# 'man'
   finish
 endif
 let b:did_ftplugin = 1
 
-" Ensure Vim is not recursively invoked (man-db does this)
-" when doing ctrl-[ on a man page reference.
-if exists('$MANPAGER')
-  let $MANPAGER = ''
-endif
+let s:pager = !exists('b:man_sect')
 
-setlocal iskeyword+=\.,-,(,)
-
-setlocal buftype=nofile noswapfile
-setlocal nomodifiable readonly bufhidden=hide nobuflisted tabstop=8
+if s:pager
+  call man#init_pager()
+endif
 
-if !exists("g:no_plugin_maps") && !exists("g:no_man_maps")
-  nnoremap <silent> <buffer> <C-]>    :call man#get_page(v:count, expand('<cword>'))<CR>
-  nnoremap <silent> <buffer> <C-T>    :call man#pop_page()<CR>
-  nnoremap <silent> <nowait><buffer>  q <C-W>c
-  if &keywordprg !=# ':Man'
-    nnoremap <silent> <buffer> K      :call man#get_page(v:count, expand('<cword>'))<CR>
+setlocal buftype=nofile
+setlocal noswapfile
+setlocal bufhidden=hide
+setlocal nomodified
+setlocal readonly
+setlocal nomodifiable
+setlocal noexpandtab
+setlocal tabstop=8
+setlocal softtabstop=8
+setlocal shiftwidth=8
+
+setlocal nonumber
+setlocal norelativenumber
+setlocal foldcolumn=0
+setlocal colorcolumn=0
+setlocal nolist
+setlocal nofoldenable
+
+if !exists('g:no_plugin_maps') && !exists('g:no_man_maps')
+  nnoremap <silent> <buffer> <C-]>      :Man<CR>
+  nnoremap <silent> <buffer> K          :Man<CR>
+  nnoremap <silent> <buffer> <C-T>      :call man#pop_tag()<CR>
+  if s:pager
+    nnoremap <silent> <buffer> <nowait> q :q<CR>
+  else
+    nnoremap <silent> <buffer> <nowait> q <C-W>c
   endif
 endif
 
-if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
-  setlocal foldmethod=indent foldnestmax=1 foldenable
+if get(g:, 'ft_man_folding_enable', 0)
+  setlocal foldenable
+  setlocal foldmethod=indent
+  setlocal foldnestmax=1
 endif
 
-let b:undo_ftplugin = 'setlocal iskeyword<'
-
+let b:undo_ftplugin = ''
 " vim: set sw=2:
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index 75c7e87996..df5dab8afc 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -1,8 +1,9 @@
 " Vim filetype plugin file
 " Language:	python
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	2014 Feb 09
-" Last Change By Johannes: Wed, 21 Apr 2004 13:13:08 CEST
+" Maintainer:	James Sully <sullyj3@gmail.com>
+" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
+" Last Change:	Wed, 29 June 2016
+" https://github.com/sullyj3/vim-ftplugin-python
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
@@ -21,28 +22,38 @@ setlocal omnifunc=pythoncomplete#Complete
 
 set wildignore+=*.pyc
 
-nnoremap <silent> <buffer> ]] :call <SID>Python_jump('/^\(class\\|def\)')<cr>
-nnoremap <silent> <buffer> [[ :call <SID>Python_jump('?^\(class\\|def\)')<cr>
-nnoremap <silent> <buffer> ]m :call <SID>Python_jump('/^\s*\(class\\|def\)')<cr>
-nnoremap <silent> <buffer> [m :call <SID>Python_jump('?^\s*\(class\\|def\)')<cr>
+nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '\v%$\|^(class\|def)>', 'W')<cr>
+nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '\v^(class\|def)>', 'Wb')<cr>
+nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '\v%$\|^\s*(class\|def)>', 'W')<cr>
+nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '\v^\s*(class\|def)>', 'Wb')<cr>
+
+xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '\v%$\|^(class\|def)>', 'W')<cr>
+xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '\v^(class\|def)>', 'Wb')<cr>
+xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '\v%$\|^\s*(class\|def)>', 'W')<cr>
+xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '\v^\s*(class\|def)>', 'Wb')<cr>
 
 if !exists('*<SID>Python_jump')
-  fun! <SID>Python_jump(motion) range
+  fun! <SID>Python_jump(mode, motion, flags) range
+      if a:mode == 'x'
+          normal! gv
+      endif
+
+      normal! 0
+
       let cnt = v:count1
-      let save = @/    " save last search pattern
       mark '
       while cnt > 0
-	  silent! exe a:motion
-	  let cnt = cnt - 1
+          call search(a:motion, a:flags)
+          let cnt = cnt - 1
       endwhile
-      call histdel('/', -1)
-      let @/ = save    " restore last search pattern
+
+      normal! ^
   endfun
 endif
 
 if has("browsefilter") && !exists("b:browsefilter")
     let b:browsefilter = "Python Files (*.py)\t*.py\n" .
-		       \ "All Files (*.*)\t*.*\n"
+                \ "All Files (*.*)\t*.*\n"
 endif
 
 " As suggested by PEP8.
diff --git a/runtime/ftplugin/r.vim b/runtime/ftplugin/r.vim
index 43b208b842..4ea3073922 100644
--- a/runtime/ftplugin/r.vim
+++ b/runtime/ftplugin/r.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language: R
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Sun Feb 23, 2014  04:07PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/rhelp.vim b/runtime/ftplugin/rhelp.vim
index 9b72fb42f9..fdac38f3e9 100644
--- a/runtime/ftplugin/rhelp.vim
+++ b/runtime/ftplugin/rhelp.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language: R help file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Wed Jul 09, 2014  06:23PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:37PM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim
index 55723ff396..ec64a07675 100644
--- a/runtime/ftplugin/rmd.vim
+++ b/runtime/ftplugin/rmd.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language: R help file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Wed Jul 09, 2014  06:23PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:37PM
 " Original work by Alex Zvoleff (adjusted for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
diff --git a/runtime/ftplugin/rnoweb.vim b/runtime/ftplugin/rnoweb.vim
index baf53d0108..e184399dcb 100644
--- a/runtime/ftplugin/rnoweb.vim
+++ b/runtime/ftplugin/rnoweb.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language: Rnoweb
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Wed Jul 09, 2014  06:23PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:37PM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/rrst.vim b/runtime/ftplugin/rrst.vim
index 8140169e61..ecfd6e87a1 100644
--- a/runtime/ftplugin/rrst.vim
+++ b/runtime/ftplugin/rrst.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
 " Language: reStructuredText documentation format with R code
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Wed Jul 09, 2014  06:23PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 " Original work by Alex Zvoleff
 
 " Only do this when not yet done for this buffer
diff --git a/runtime/ftplugin/spec.vim b/runtime/ftplugin/spec.vim
index 6d5bf4b806..2a961f8244 100644
--- a/runtime/ftplugin/spec.vim
+++ b/runtime/ftplugin/spec.vim
@@ -36,10 +36,11 @@ except ImportError:
 else:
     specfile = vim.current.buffer.name
     if specfile:
+        rpm.delMacro("dist")
         spec = rpm.spec(specfile)
-        headers = spec.packages[0].header
-        version = headers['Version']
-        release = ".".join(headers['Release'].split(".")[:-1])
+        headers = spec.sourceHeader
+        version = headers["Version"]
+        release = headers["Release"]
         vim.command("let ver = " + version)
         vim.command("let rel = " + release)
 PYEND
@@ -113,7 +114,10 @@ if !exists("*s:SpecChangelog")
 			endif
 		endif
 		if (chgline != -1)
+			let tmptime = v:lc_time
+			language time C
 			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
+			execute "language time" tmptime
 			let release_info = "+ ".name."-".ver."-".rel
 			let wrong_format = 0
 			let wrong_release = 0
@@ -179,12 +183,8 @@ if !exists("*s:ParseRpmVars")
 		endif
 		let varname = strpart(a:str, start+2, end-(start+2))
 		execute a:strline
-		let definestr = "^[ \t]*%define[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$"
+		let definestr = "^[ \t]*%(?:global|define)[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$"
 		let linenum = search(definestr, "bW")
-		if (linenum == 0)
-			let definestr = substitute(definestr, "%define", "%global", "")
-			let linenum = search(definestr, "bW")
-		endif
 		if (linenum != -1)
 			let ret = ret .  substitute(getline(linenum), definestr, "\\1", "")
 		else
@@ -201,7 +201,7 @@ endif
 
 let b:match_ignorecase = 0
 let b:match_words =
-  \ '^Name:^%description:^%clean:^%setup:^%build:^%install:^%files:' .
+  \ '^Name:^%description:^%clean:^%(?:auto)?setup:^%build:^%install:^%files:' .
   \ '^%package:^%preun:^%postun:^%changelog'
 
 let &cpo = s:cpo_save
diff --git a/runtime/indent/clojure.vim b/runtime/indent/clojure.vim
index 476ac1de1c..7592b10d7d 100644
--- a/runtime/indent/clojure.vim
+++ b/runtime/indent/clojure.vim
@@ -1,17 +1,12 @@
 " Vim indent file
-" Language:	Clojure
-" Author:	Meikel Brandmeyer <mb@kotka.de>
-" URL:		http://kotka.de/projects/clojure/vimclojure.html
+" Language:     Clojure
+" Author:       Meikel Brandmeyer <mb@kotka.de>
+" URL:          http://kotka.de/projects/clojure/vimclojure.html
 "
-" Maintainer:	Sung Pae <self@sungpae.com>
-" URL:		https://github.com/guns/vim-clojure-static
-" License:	Same as Vim
-" Last Change:	27 March 2014
-
-" TODO: Indenting after multibyte characters is broken:
-"       (let [Δ (if foo
-"                bar    ; Indent error
-"                baz)])
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  18 July 2016
 
 if exists("b:did_indent")
 	finish
@@ -57,36 +52,39 @@ if exists("*searchpairpos")
 		let g:clojure_align_subforms = 0
 	endif
 
-	function! s:SynIdName()
+	function! s:syn_id_name()
 		return synIDattr(synID(line("."), col("."), 0), "name")
 	endfunction
 
-	function! s:CurrentChar()
+	function! s:ignored_region()
+		return s:syn_id_name() =~? '\vstring|regex|comment|character'
+	endfunction
+
+	function! s:current_char()
 		return getline('.')[col('.')-1]
 	endfunction
 
-	function! s:CurrentWord()
+	function! s:current_word()
 		return getline('.')[col('.')-1 : searchpos('\v>', 'n', line('.'))[1]-2]
 	endfunction
 
-	function! s:IsParen()
-		return s:CurrentChar() =~# '\v[\(\)\[\]\{\}]' &&
-		     \ s:SynIdName() !~? '\vstring|regex|comment|character'
+	function! s:is_paren()
+		return s:current_char() =~# '\v[\(\)\[\]\{\}]' && !s:ignored_region()
 	endfunction
 
 	" Returns 1 if string matches a pattern in 'patterns', which may be a
 	" list of patterns, or a comma-delimited string of implicitly anchored
 	" patterns.
-	function! s:MatchesOne(patterns, string)
+	function! s:match_one(patterns, string)
 		let list = type(a:patterns) == type([])
-			   \ ? a:patterns
-			   \ : map(split(a:patterns, ','), '"^" . v:val . "$"')
+		           \ ? a:patterns
+		           \ : map(split(a:patterns, ','), '"^" . v:val . "$"')
 		for pat in list
 			if a:string =~# pat | return 1 | endif
 		endfor
 	endfunction
 
-	function! s:MatchPairs(open, close, stopat)
+	function! s:match_pairs(open, close, stopat)
 		" Stop only on vector and map [ resp. {. Ignore the ones in strings and
 		" comments.
 		if a:stopat == 0
@@ -95,11 +93,11 @@ if exists("*searchpairpos")
 			let stopat = a:stopat
 		endif
 
-		let pos = searchpairpos(a:open, '', a:close, 'bWn', "!s:IsParen()", stopat)
-		return [pos[0], virtcol(pos)]
+		let pos = searchpairpos(a:open, '', a:close, 'bWn', "!s:is_paren()", stopat)
+		return [pos[0], col(pos)]
 	endfunction
 
-	function! s:ClojureCheckForStringWorker()
+	function! s:clojure_check_for_string_worker()
 		" Check whether there is the last character of the previous line is
 		" highlighted as a string. If so, we check whether it's a ". In this
 		" case we have to check also the previous character. The " might be the
@@ -113,17 +111,17 @@ if exists("*searchpairpos")
 
 		call cursor(nb, 0)
 		call cursor(0, col("$") - 1)
-		if s:SynIdName() !~? "string"
+		if s:syn_id_name() !~? "string"
 			return -1
 		endif
 
 		" This will not work for a " in the first column...
-		if s:CurrentChar() == '"'
+		if s:current_char() == '"'
 			call cursor(0, col("$") - 2)
-			if s:SynIdName() !~? "string"
+			if s:syn_id_name() !~? "string"
 				return -1
 			endif
-			if s:CurrentChar() != '\\'
+			if s:current_char() != '\\'
 				return -1
 			endif
 			call cursor(0, col("$") - 1)
@@ -138,40 +136,40 @@ if exists("*searchpairpos")
 		return indent(".")
 	endfunction
 
-	function! s:CheckForString()
+	function! s:check_for_string()
 		let pos = getpos('.')
 		try
-			let val = s:ClojureCheckForStringWorker()
+			let val = s:clojure_check_for_string_worker()
 		finally
 			call setpos('.', pos)
 		endtry
 		return val
 	endfunction
 
-	function! s:StripNamespaceAndMacroChars(word)
+	function! s:strip_namespace_and_macro_chars(word)
 		return substitute(a:word, "\\v%(.*/|[#'`~@^,]*)(.*)", '\1', '')
 	endfunction
 
-	function! s:ClojureIsMethodSpecialCaseWorker(position)
+	function! s:clojure_is_method_special_case_worker(position)
 		" Find the next enclosing form.
 		call search('\S', 'Wb')
 
 		" Special case: we are at a '(('.
-		if s:CurrentChar() == '('
+		if s:current_char() == '('
 			return 0
 		endif
 		call cursor(a:position)
 
-		let nextParen = s:MatchPairs('(', ')', 0)
+		let next_paren = s:match_pairs('(', ')', 0)
 
 		" Special case: we are now at toplevel.
-		if nextParen == [0, 0]
+		if next_paren == [0, 0]
 			return 0
 		endif
-		call cursor(nextParen)
+		call cursor(next_paren)
 
 		call search('\S', 'W')
-		let w = s:StripNamespaceAndMacroChars(s:CurrentWord())
+		let w = s:strip_namespace_and_macro_chars(s:current_word())
 		if g:clojure_special_indent_words =~# '\V\<' . w . '\>'
 			return 1
 		endif
@@ -179,27 +177,43 @@ if exists("*searchpairpos")
 		return 0
 	endfunction
 
-	function! s:IsMethodSpecialCase(position)
+	function! s:is_method_special_case(position)
 		let pos = getpos('.')
 		try
-			let val = s:ClojureIsMethodSpecialCaseWorker(a:position)
+			let val = s:clojure_is_method_special_case_worker(a:position)
 		finally
 			call setpos('.', pos)
 		endtry
 		return val
 	endfunction
 
-	function! GetClojureIndent()
+	" Check if form is a reader conditional, that is, it is prefixed by #?
+	" or @#?
+	function! s:is_reader_conditional_special_case(position)
+		if getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
+			return 1
+		endif
+
+		return 0
+	endfunction
+
+	" Returns 1 for opening brackets, -1 for _anything else_.
+	function! s:bracket_type(char)
+		return stridx('([{', a:char) > -1 ? 1 : -1
+	endfunction
+
+	" Returns: [opening-bracket-lnum, indent]
+	function! s:clojure_indent_pos()
 		" Get rid of special case.
 		if line(".") == 1
-			return 0
+			return [0, 0]
 		endif
 
 		" We have to apply some heuristics here to figure out, whether to use
 		" normal lisp indenting or not.
-		let i = s:CheckForString()
+		let i = s:check_for_string()
 		if i > -1
-			return i + !!g:clojure_align_multiline_strings
+			return [0, i + !!g:clojure_align_multiline_strings]
 		endif
 
 		call cursor(0, 1)
@@ -207,28 +221,28 @@ if exists("*searchpairpos")
 		" Find the next enclosing [ or {. We can limit the second search
 		" to the line, where the [ was found. If no [ was there this is
 		" zero and we search for an enclosing {.
-		let paren = s:MatchPairs('(', ')', 0)
-		let bracket = s:MatchPairs('\[', '\]', paren[0])
-		let curly = s:MatchPairs('{', '}', bracket[0])
+		let paren = s:match_pairs('(', ')', 0)
+		let bracket = s:match_pairs('\[', '\]', paren[0])
+		let curly = s:match_pairs('{', '}', bracket[0])
 
 		" In case the curly brace is on a line later then the [ or - in
 		" case they are on the same line - in a higher column, we take the
 		" curly indent.
 		if curly[0] > bracket[0] || curly[1] > bracket[1]
 			if curly[0] > paren[0] || curly[1] > paren[1]
-				return curly[1]
+				return curly
 			endif
 		endif
 
 		" If the curly was not chosen, we take the bracket indent - if
 		" there was one.
 		if bracket[0] > paren[0] || bracket[1] > paren[1]
-			return bracket[1]
+			return bracket
 		endif
 
 		" There are neither { nor [ nor (, ie. we are at the toplevel.
 		if paren == [0, 0]
-			return 0
+			return paren
 		endif
 
 		" Now we have to reimplement lispindent. This is surprisingly easy, as
@@ -246,58 +260,120 @@ if exists("*searchpairpos")
 		" - In any other case we use the column of the end of the word + 2.
 		call cursor(paren)
 
-		if s:IsMethodSpecialCase(paren)
-			return paren[1] + &shiftwidth - 1
+		if s:is_method_special_case(paren)
+			return [paren[0], paren[1] + &shiftwidth - 1]
+		endif
+
+		if s:is_reader_conditional_special_case(paren)
+			return paren
 		endif
 
 		" In case we are at the last character, we use the paren position.
 		if col("$") - 1 == paren[1]
-			return paren[1]
+			return paren
 		endif
 
 		" In case after the paren is a whitespace, we search for the next word.
 		call cursor(0, col('.') + 1)
-		if s:CurrentChar() == ' '
+		if s:current_char() == ' '
 			call search('\v\S', 'W')
 		endif
 
 		" If we moved to another line, there is no word after the (. We
 		" use the ( position for indent.
 		if line(".") > paren[0]
-			return paren[1]
+			return paren
 		endif
 
 		" We still have to check, whether the keyword starts with a (, [ or {.
 		" In that case we use the ( position for indent.
-		let w = s:CurrentWord()
-		if stridx('([{', w[0]) > -1
-			return paren[1]
+		let w = s:current_word()
+		if s:bracket_type(w[0]) == 1
+			return paren
 		endif
 
 		" Test words without namespace qualifiers and leading reader macro
 		" metacharacters.
 		"
 		" e.g. clojure.core/defn and #'defn should both indent like defn.
-		let ww = s:StripNamespaceAndMacroChars(w)
+		let ww = s:strip_namespace_and_macro_chars(w)
 
 		if &lispwords =~# '\V\<' . ww . '\>'
-			return paren[1] + &shiftwidth - 1
+			return [paren[0], paren[1] + &shiftwidth - 1]
 		endif
 
 		if g:clojure_fuzzy_indent
-			\ && !s:MatchesOne(g:clojure_fuzzy_indent_blacklist, ww)
-			\ && s:MatchesOne(g:clojure_fuzzy_indent_patterns, ww)
-			return paren[1] + &shiftwidth - 1
+			\ && !s:match_one(g:clojure_fuzzy_indent_blacklist, ww)
+			\ && s:match_one(g:clojure_fuzzy_indent_patterns, ww)
+			return [paren[0], paren[1] + &shiftwidth - 1]
 		endif
 
 		call search('\v\_s', 'cW')
 		call search('\v\S', 'W')
 		if paren[0] < line(".")
-			return paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)
+			return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)]
 		endif
 
 		call search('\v\S', 'bW')
-		return virtcol(".") + 1
+		return [line('.'), col('.') + 1]
+	endfunction
+
+	function! GetClojureIndent()
+		let lnum = line('.')
+		let orig_lnum = lnum
+		let orig_col = col('.')
+		let [opening_lnum, indent] = s:clojure_indent_pos()
+
+		" Account for multibyte characters
+		if opening_lnum > 0
+			let indent -= indent - virtcol([opening_lnum, indent])
+		endif
+
+		" Return if there are no previous lines to inherit from
+		if opening_lnum < 1 || opening_lnum >= lnum - 1
+			call cursor(orig_lnum, orig_col)
+			return indent
+		endif
+
+		let bracket_count = 0
+
+		" Take the indent of the first previous non-white line that is
+		" at the same sexp level. cf. src/misc1.c:get_lisp_indent()
+		while 1
+			let lnum = prevnonblank(lnum - 1)
+			let col = 1
+
+			if lnum <= opening_lnum
+				break
+			endif
+
+			call cursor(lnum, col)
+
+			" Handle bracket counting edge case
+			if s:is_paren()
+				let bracket_count += s:bracket_type(s:current_char())
+			endif
+
+			while 1
+				if search('\v[(\[{}\])]', '', lnum) < 1
+					break
+				elseif !s:ignored_region()
+					let bracket_count += s:bracket_type(s:current_char())
+				endif
+			endwhile
+
+			if bracket_count == 0
+				" Check if this is part of a multiline string
+				call cursor(lnum, 1)
+				if s:syn_id_name() !~? '\vstring|regex'
+					call cursor(orig_lnum, orig_col)
+					return indent(lnum)
+				endif
+			endif
+		endwhile
+
+		call cursor(orig_lnum, orig_col)
+		return indent
 	endfunction
 
 	setlocal indentexpr=GetClojureIndent()
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index d492889fc7..e19a19fb1f 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,11 +1,11 @@
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.42
-" Last Change:	2015 Nov. 30
+" Version:	0.44
+" Last Change:	2016 Jan. 26
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
-"  Useful suggestions were made by: Albert Oliver Serra.
+"  Useful suggestions were made by: Albert Oliver Serra and Takuya Fujiwara.
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -92,10 +92,10 @@ function FortranGetIndent(lnum)
   "Indent do loops only if they are all guaranteed to be of do/end do type
   if exists("b:fortran_do_enddo") || exists("g:fortran_do_enddo")
     if prevstat =~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*do\>'
-      let ind = ind + &sw
+      let ind = ind + shiftwidth()
     endif
     if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*end\s*do\>'
-      let ind = ind - &sw
+      let ind = ind - shiftwidth()
     endif
   endif
 
@@ -105,14 +105,14 @@ function FortranGetIndent(lnum)
 	\ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>'
 	\ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>'
 	\ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>'
-     let ind = ind + &sw
+     let ind = ind + shiftwidth()
     " Remove unwanted indent after logical and arithmetic ifs
     if prevstat =~? '\<if\>' && prevstat !~? '\<then\>'
-      let ind = ind - &sw
+      let ind = ind - shiftwidth()
     endif
     " Remove unwanted indent after type( statements
     if prevstat =~? '^\s*type\s*('
-      let ind = ind - &sw
+      let ind = ind - shiftwidth()
     endif
   endif
 
@@ -125,12 +125,12 @@ function FortranGetIndent(lnum)
             \ ||prevstat =~? '^\s*'.prefix.'subroutine\>'
             \ ||prevstat =~? '^\s*'.prefix.type.'function\>'
             \ ||prevstat =~? '^\s*'.type.prefix.'function\>'
-      let ind = ind + &sw
+      let ind = ind + shiftwidth()
     endif
     if getline(v:lnum) =~? '^\s*contains\>'
           \ ||getline(v:lnum)=~? '^\s*end\s*'
           \ .'\(function\|subroutine\|module\|program\)\>'
-      let ind = ind - &sw
+      let ind = ind - shiftwidth()
     endif
   endif
 
@@ -141,23 +141,23 @@ function FortranGetIndent(lnum)
         \. '\(else\|else\s*if\|else\s*where\|case\|'
         \. 'end\s*\(if\|where\|select\|interface\|'
         \. 'type\|forall\|associate\|enum\|block\)\)\>'
-    let ind = ind - &sw
+    let ind = ind - shiftwidth()
     " Fix indent for case statement immediately after select
     if prevstat =~? '\<select\s\+\(case\|type\)\>'
-      let ind = ind + &sw
+      let ind = ind + shiftwidth()
     endif
   endif
 
   "First continuation line
   if prevstat =~ '&\s*$' && prev2stat !~ '&\s*$'
-    let ind = ind + &sw
+    let ind = ind + shiftwidth()
   endif
   if prevstat =~ '&\s*$' && prevstat =~ '\<else\s*if\>'
-    let ind = ind - &sw
+    let ind = ind - shiftwidth()
   endif
   "Line after last continuation line
   if prevstat !~ '&\s*$' && prev2stat =~ '&\s*$' && prevstat !~? '\<then\>'
-    let ind = ind - &sw
+    let ind = ind - shiftwidth()
   endif
 
   return ind
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 8aaf82e21f..828bc3120b 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -2,7 +2,7 @@
 " Header: "{{{
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2015 Sep 25
+" Last Change:	2016 Mar 30
 " Version:	1.0
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -240,13 +240,13 @@ call s:AddITags(s:indent_tags, [
     \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
     \ 'tr', 'tbody', 'tfoot', 'thead'])
 
-" Tags added 2011 Sep 09 (especially HTML5 tags):
+" New HTML5 elements:
 call s:AddITags(s:indent_tags, [
     \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
-    \ 'command', 'datalist', 'details', 'embed', 'figure', 'footer',
-    \ 'header', 'group', 'keygen', 'mark', 'math', 'meter', 'nav', 'output',
-    \ 'progress', 'ruby', 'section', 'svg', 'texture', 'time', 'video',
-    \ 'wbr', 'text'])
+    \ 'command', 'data', 'datalist', 'details', 'embed', 'figcaption',
+    \ 'figure', 'footer', 'header', 'keygen', 'mark', 'meter', 'nav', 'output',
+    \ 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', 
+    \ 'time', 'track', 'video', 'wbr'])
 
 " Tags added for web components:
 call s:AddITags(s:indent_tags, [
diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim
index 21c8fff86c..3507e305ed 100644
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -1,18 +1,192 @@
 " Vim indent file
-" Language:	Javascript
-" Maintainer:	Going to be Darrick Wiebe
-" Last Change:	2015 Jun 09
+" Language: Javascript
+" Maintainer: vim-javascript community
+" URL: https://github.com/pangloss/vim-javascript
+" Last Change: August 12, 2016
 
 " Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-   finish
+if exists('b:did_indent')
+  finish
 endif
 let b:did_indent = 1
 
-" C indenting is not too bad.
-setlocal cindent
+" Now, set up our indentation expression and keys that trigger it.
+setlocal indentexpr=GetJavascriptIndent()
+setlocal nolisp
+setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
-setlocal cinkeys-=0#
-setlocal cinkeys+=0]
 
-let b:undo_indent = "setl cin<"
+let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
+
+" Only define the function once.
+if exists('*GetJavascriptIndent')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Get shiftwidth value
+if exists('*shiftwidth')
+  function s:sw()
+    return shiftwidth()
+  endfunction
+else
+  function s:sw()
+    return &sw
+  endfunction
+endif
+
+let s:line_pre = '^\s*\%(\/\*.\{-}\*\/\s*\)*'
+let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
+" Regex of syntax group names that are or delimit string or are comments.
+let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
+
+" Regex of syntax group names that are strings or documentation.
+let s:syng_comment = '\%(comment\|doc\)'
+
+" Expression used to check whether we should skip a match with searchpair().
+let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
+
+function s:lookForParens(start,end,flags,time)
+  if has('reltime')
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time)
+  else
+    return searchpair(a:start,'',a:end,a:flags,0,0)
+  endif
+endfunction
+
+let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
+
+" configurable regexes that define continuation lines, not including (, {, or [.
+if !exists('g:javascript_opfirst')
+  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)'
+endif
+let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
+
+if !exists('g:javascript_continuation')
+  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)'
+endif
+let g:javascript_continuation .= s:line_term
+
+function s:Onescope(lnum,text,add)
+  return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
+        \ ((a:add && a:text =~ s:line_pre . '$' && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
+        \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
+        \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
+        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
+        \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
+        \ (a:add || (expand('<cword>') ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+endfunction
+
+" Auxiliary Functions {{{2
+
+" strip line of comment
+function s:StripLine(c)
+  return a:c !~# s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
+endfunction
+
+" Find line above 'lnum' that isn't empty, in a comment, or in a string.
+function s:PrevCodeLine(lnum)
+  let l:lnum = prevnonblank(a:lnum)
+  while l:lnum > 0
+    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
+      break
+    endif
+    let l:lnum = prevnonblank(l:lnum - 1)
+  endwhile
+  return l:lnum
+endfunction
+
+" Check if line 'lnum' has a balanced amount of parentheses.
+function s:Balanced(lnum)
+  let open_0 = 0
+  let open_2 = 0
+  let open_4 = 0
+  let l:line = getline(a:lnum)
+  let pos = match(l:line, '[][(){}]', 0)
+  while pos != -1
+    if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
+      let idx = stridx('(){}[]', l:line[pos])
+      if idx % 2 == 0
+        let open_{idx} = open_{idx} + 1
+      else
+        let open_{idx - 1} = open_{idx - 1} - 1
+      endif
+    endif
+    let pos = match(l:line, '[][(){}]', pos + 1)
+  endwhile
+  return (!open_4 + !open_2 + !open_0) - 2
+endfunction
+" }}}
+
+function GetJavascriptIndent()
+  if !exists('b:js_cache')
+    let b:js_cache = [0,0,0]
+  endif
+  " Get the current line.
+  let l:line = getline(v:lnum)
+  let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
+
+  " start with strings,comments,etc.{{{2
+  if (l:line !~ '^[''"`]' && syns =~? 'string\|template') ||
+        \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
+    return -1
+  endif
+  if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
+    return cindent(v:lnum)
+  endif
+  let l:lnum = s:PrevCodeLine(v:lnum - 1)
+  if l:lnum == 0
+    return 0
+  endif
+
+  if (l:line =~# s:expr_case)
+    let cpo_switch = &cpo
+    set cpo+=%
+    let ind = cindent(v:lnum)
+    let &cpo = cpo_switch
+    return ind
+  endif
+  "}}}
+
+  " the containing paren, bracket, curly. Memoize, last lineNr either has the
+  " same scope or starts a new one, unless if it closed a scope.
+  call cursor(v:lnum,1)
+  if b:js_cache[0] >= l:lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
+    let num = b:js_cache[1]
+  elseif syns != '' && l:line[0] =~ '\s'
+    let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
+          \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
+    let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
+  else
+    let num = s:lookForParens('[({[]','[])}]','bW',2000)
+  endif
+  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
+
+  if l:line =~ s:line_pre . '[])}]'
+    return indent(num)
+  endif
+
+  let pline = s:StripLine(getline(l:lnum))
+  let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
+        \ (l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < l:lnum
+  let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
+        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
+
+  " most significant, find the indent amount
+  if (inb && (l:line =~# g:javascript_opfirst ||
+        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || l:line !~#
+        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
+        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) && l:line !~ s:line_pre . '{')
+    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
+  elseif num > 0
+    return indent(num) + s:sw() + switch_offset
+  endif
+
+endfunction
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/indent/lua.vim b/runtime/indent/lua.vim
index 393994c590..d1d2c0d600 100644
--- a/runtime/indent/lua.vim
+++ b/runtime/indent/lua.vim
@@ -2,7 +2,7 @@
 " Language:	Lua script
 " Maintainer:	Marcus Aurelius Farias <marcus.cf 'at' bol.com.br>
 " First Author:	Max Ischenko <mfi 'at' ukr.net>
-" Last Change:	2014 Nov 12
+" Last Change:	2016 Jan 10
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -52,7 +52,7 @@ function! GetLuaIndent()
     endif
   endif
 
-  " Subtract a 'shiftwidth' on end, else (and elseif), until and '}'
+  " Subtract a 'shiftwidth' on end, else, elseif, until and '}'
   " This is the part that requires 'indentkeys'.
   let midx = match(getline(v:lnum), '^\s*\%(end\>\|else\>\|elseif\>\|until\>\|}\)')
   if midx != -1 && synIDattr(synID(v:lnum, midx + 1, 1), "name") != "luaComment"
diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim
index 1bffa7f195..07ecd8f141 100644
--- a/runtime/indent/php.vim
+++ b/runtime/indent/php.vim
@@ -3,8 +3,8 @@
 " Author:	John Wellesz <John.wellesz (AT) teaser (DOT) fr>
 " URL:		http://www.2072productions.com/vim/indent/php.vim
 " Home:		https://github.com/2072/PHP-Indenting-for-VIm
-" Last Change:	2014 November 26th
-" Version:	1.57
+" Last Change:	2015 September 8th
+" Version:	1.60
 "
 "
 "	Type :help php-indent for available options
@@ -50,16 +50,25 @@ let b:did_indent = 1
 
 let g:php_sync_method = 0
 
+if exists('*shiftwidth')
+  function! s:sw()
+    return shiftwidth()
+  endfunction
+else
+  function! s:sw()
+    return &shiftwidth
+  endfunction
+endif
 
 
 if exists("PHP_default_indenting")
-    let b:PHP_default_indenting = PHP_default_indenting * &sw
+    let b:PHP_default_indenting = PHP_default_indenting * s:sw()
 else
     let b:PHP_default_indenting = 0
 endif
 
 if exists("PHP_outdentSLComments")
-    let b:PHP_outdentSLComments = PHP_outdentSLComments * &sw
+    let b:PHP_outdentSLComments = PHP_outdentSLComments * s:sw()
 else
     let b:PHP_outdentSLComments = 0
 endif
@@ -124,7 +133,7 @@ endif
 
 if exists("*GetPhpIndent")
     call ResetPhpOptions()
-    finish " XXX -- comment this line for easy dev
+    finish
 endif
 
 
@@ -135,7 +144,7 @@ let s:functionDecl = '\<function\>\%(\s\+'.s:PHP_validVariable.'\)\=\s*(.*'
 let s:endline= '\s*\%(//.*\|#.*\|/\*.*\*/\s*\)\=$'
 
 
-let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)\|^[^''"`]*[''"`]$'
+let s:terminated = '\%(\%(;\%(\s*\%(?>\|}\)\)\=\|<<<\s*[''"]\=\a\w*[''"]\=$\|^\s*}\|^\s*'.s:PHP_validVariable.':\)'.s:endline.'\)\|^[^''"`]*[''"`]$'
 let s:PHP_startindenttag = '<?\%(.*?>\)\@!\|<script[^>]*>\%(.*<\/script>\)\@!'
 
 
@@ -200,7 +209,7 @@ function! GetLastRealCodeLNum(startline) " {{{
 
 
 	elseif lastline =~? '^\a\w*;\=$' && lastline !~? s:notPhpHereDoc
-	    let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<''\\=\1''\\=$', '')
+	    let tofind=substitute( lastline, '\(\a\w*\);\=', '<<<\\s*[''"]\\=\1[''"]\\=$', '')
 	    while getline(lnum) !~? tofind && lnum > 1
 		let lnum = lnum - 1
 	    endwhile
@@ -314,7 +323,7 @@ function! FindTheSwitchIndent (lnum) " {{{
     let test = GetLastRealCodeLNum(a:lnum - 1)
 
     if test <= 1
-	return indent(1) - &sw * b:PHP_vintage_case_default_indent
+	return indent(1) - s:sw() * b:PHP_vintage_case_default_indent
     end
 
     while getline(test) =~ '^\s*}' && test > 1
@@ -328,7 +337,7 @@ function! FindTheSwitchIndent (lnum) " {{{
     if getline(test) =~# '^\s*switch\>'
 	return indent(test)
     elseif getline(test) =~# s:defaultORcase
-	return indent(test) - &sw * b:PHP_vintage_case_default_indent
+	return indent(test) - s:sw() * b:PHP_vintage_case_default_indent
     else
 	return FindTheSwitchIndent(test)
     endif
@@ -401,7 +410,7 @@ function! GetPhpIndent()
     endif
 
     if b:PHP_default_indenting
-	let b:PHP_default_indenting = g:PHP_default_indenting * &sw
+	let b:PHP_default_indenting = g:PHP_default_indenting * s:sw()
     endif
 
     let cline = getline(v:lnum)
@@ -439,6 +448,7 @@ function! GetPhpIndent()
 
     if !b:InPHPcode_checked " {{{ One time check
 	let b:InPHPcode_checked = 1
+	let b:UserIsTypingComment = 0
 
 	let synname = ""
 	if cline !~ '<?.*?>'
@@ -447,8 +457,7 @@ function! GetPhpIndent()
 
 	if synname!=""
 	    if synname == "SpecStringEntrails"
-		let b:InPHPcode = -1 " thumb down
-		let b:UserIsTypingComment = 0
+		let b:InPHPcode = -1
 		let b:InPHPcode_tofind = ""
 	    elseif synname != "phpHereDoc" && synname != "phpHereDocDelimiter"
 		let b:InPHPcode = 1
@@ -456,8 +465,7 @@ function! GetPhpIndent()
 
 		if synname =~# '^php\%(Doc\)\?Comment'
 		    let b:UserIsTypingComment = 1
-		else
-		    let b:UserIsTypingComment = 0
+		    let b:InPHPcode_checked = 0
 		endif
 
 		if synname =~? '^javaScript'
@@ -466,18 +474,16 @@ function! GetPhpIndent()
 
 	    else
 		let b:InPHPcode = 0
-		let b:UserIsTypingComment = 0
 
 		let lnum = v:lnum - 1
-		while getline(lnum) !~? '<<<''\=\a\w*''\=$' && lnum > 1
+		while getline(lnum) !~? '<<<\s*[''"]\=\a\w*[''"]\=$' && lnum > 1
 		    let lnum = lnum - 1
 		endwhile
 
-		let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '')
+		let b:InPHPcode_tofind = substitute( getline(lnum), '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
 	    endif
 	else
 	    let b:InPHPcode = 0
-	    let b:UserIsTypingComment = 0
 	    let b:InPHPcode_tofind = s:PHP_startindenttag
 	endif
     endif "!b:InPHPcode_checked }}}
@@ -537,9 +543,9 @@ function! GetPhpIndent()
 	elseif last_line =~ '^[^''"`]\+[''"`]$'
 	    let b:InPHPcode = -1
 	    let b:InPHPcode_tofind = substitute( last_line, '^.*\([''"`]\).*$', '^[^\1]*\1[;,]$', '')
-	elseif last_line =~? '<<<''\=\a\w*''\=$'
+	elseif last_line =~? '<<<\s*[''"]\=\a\w*[''"]\=$'
 	    let b:InPHPcode = 0
-	    let b:InPHPcode_tofind = substitute( last_line, '^.*<<<''\=\(\a\w*\)''\=$', '^\\s*\1;\\=$', '')
+	    let b:InPHPcode_tofind = substitute( last_line, '^.*<<<\s*[''"]\=\(\a\w*\)[''"]\=$', '^\\s*\1;\\=$', '')
 
 	elseif !UserIsEditing && cline =~ '^\s*/\*\%(.*\*/\)\@!' && getline(v:lnum + 1) !~ '^\s*\*'
 	    let b:InPHPcode = 0
@@ -660,7 +666,7 @@ function! GetPhpIndent()
 	let b:PHP_CurrentIndentLevel = b:PHP_default_indenting
 	return indent(FindTheIfOfAnElse(v:lnum, 1))
     elseif cline =~# s:defaultORcase
-	return FindTheSwitchIndent(v:lnum) + &sw * b:PHP_vintage_case_default_indent
+	return FindTheSwitchIndent(v:lnum) + s:sw() * b:PHP_vintage_case_default_indent
     elseif cline =~ '^\s*)\=\s*{'
 	let previous_line = last_line
 	let last_line_num = lnum
@@ -672,7 +678,7 @@ function! GetPhpIndent()
 		let ind = indent(last_line_num)
 
 		if  b:PHP_BracesAtCodeLevel
-		    let ind = ind + &sw
+		    let ind = ind + s:sw()
 		endif
 
 		return ind
@@ -683,7 +689,7 @@ function! GetPhpIndent()
 	endwhile
 
     elseif last_line =~# unstated && cline !~ '^\s*);\='.endline
-	let ind = ind + &sw
+	let ind = ind + s:sw()
 	return ind + addSpecial
 
     elseif (ind != b:PHP_default_indenting || last_line =~ '^[)\]]' ) && last_line =~ terminated
@@ -782,7 +788,7 @@ function! GetPhpIndent()
 	    endif
 
 	    if !dontIndent && (!b:PHP_BracesAtCodeLevel || last_line !~# '^\s*{')
-		let ind = ind + &sw
+		let ind = ind + s:sw()
 	    endif
 
 	    if b:PHP_BracesAtCodeLevel || b:PHP_vintage_case_default_indent == 1
@@ -800,17 +806,17 @@ function! GetPhpIndent()
 	    endif
 
 	elseif last_line =~ '^\s*'.s:blockstart
-	    let ind = ind + &sw
+	    let ind = ind + s:sw()
 
 
     elseif AntepenultimateLine =~ '{'.endline || AntepenultimateLine =~ terminated || AntepenultimateLine =~# s:defaultORcase
-	    let ind = ind + &sw
+	    let ind = ind + s:sw()
 	endif
 
     endif
 
     if cline =~  '^\s*[)\]];\='
-	let ind = ind - &sw
+	let ind = ind - s:sw()
     endif
 
     let b:PHP_CurrentIndentLevel = ind
diff --git a/runtime/indent/r.vim b/runtime/indent/r.vim
index 105f0cd7ad..01f3812ed2 100644
--- a/runtime/indent/r.vim
+++ b/runtime/indent/r.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	R
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Thu Mar 26, 2015  05:36PM
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Thu Feb 18, 2016  06:32AM
 
 
 " Only load this indent file when no other was loaded.
@@ -32,7 +33,7 @@ if ! exists("g:r_indent_ess_compatible")
   let g:r_indent_ess_compatible = 0
 endif
 if ! exists("g:r_indent_op_pattern")
-  let g:r_indent_op_pattern = '\(+\|-\|\*\|/\|=\|\~\|%\)$'
+  let g:r_indent_op_pattern = '\(&\||\|+\|-\|\*\|/\|=\|\~\|%\|->\)\s*$'
 endif
 
 function s:RDelete_quotes(line)
@@ -265,7 +266,7 @@ function GetRIndent()
     return 0
   endif
 
-  if cline =~ '^\s*{'
+  if cline =~ '^\s*{' && s:Get_paren_balance(cline, '{', '}') > 0
     if g:r_indent_ess_compatible && line =~ ')$'
       let nlnum = lnum
       let nline = line
@@ -283,7 +284,7 @@ function GetRIndent()
   endif
 
   " line is an incomplete command:
-  if line =~ '\<\(if\|while\|for\|function\)\s*()$' || line =~ '\<else$' || line =~ '<-$'
+  if line =~ '\<\(if\|while\|for\|function\)\s*()$' || line =~ '\<else$' || line =~ '<-$' || line =~ '->$'
     return indent(lnum) + &sw
   endif
 
@@ -344,7 +345,7 @@ function GetRIndent()
   endif
 
   let post_block = 0
-  if line =~ '}$'
+  if line =~ '}$' && s:Get_paren_balance(line, '{', '}') < 0
     let lnum = s:Get_matching_brace(lnum, '{', '}', 0)
     let line = SanitizeRLine(getline(lnum))
     if lnum > 0 && line =~ '^\s*{'
@@ -359,14 +360,14 @@ function GetRIndent()
   let olnum = s:Get_prev_line(lnum)
   let oline = getline(olnum)
   if olnum > 0
-    if line =~ g:r_indent_op_pattern
-      if oline =~ g:r_indent_op_pattern
+    if line =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
+      if oline =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
         return indent(lnum)
       else
         return indent(lnum) + &sw
       endif
     else
-      if oline =~ g:r_indent_op_pattern
+      if oline =~ g:r_indent_op_pattern && s:Get_paren_balance(line, "(", ")") == 0
         return indent(lnum) - &sw
       endif
     endif
@@ -471,7 +472,6 @@ function GetRIndent()
   endif
 
   let ind = indent(lnum)
-  let pind = indent(plnum)
 
   if g:r_indent_align_args == 0 && pb != 0
     let ind += pb * &sw
@@ -483,6 +483,12 @@ function GetRIndent()
     return ind
   endif
 
+  if plnum > 0
+    let pind = indent(plnum)
+  else
+    let pind = 0
+  endif
+
   if ind == pind || (ind == (pind  + &sw) && pline =~ '{$' && ppost_else == 0)
     return ind
   endif
diff --git a/runtime/indent/rhelp.vim b/runtime/indent/rhelp.vim
index 3b37128b2c..9dc2031cb6 100644
--- a/runtime/indent/rhelp.vim
+++ b/runtime/indent/rhelp.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	R Documentation (Help), *.Rd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Thu Oct 16, 2014  07:07AM
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 
 
 " Only load this indent file when no other was loaded.
diff --git a/runtime/indent/rmd.vim b/runtime/indent/rmd.vim
index 9a8a3cb719..88904405e8 100644
--- a/runtime/indent/rmd.vim
+++ b/runtime/indent/rmd.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Rmd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Thu Jul 10, 2014  07:11PM
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 
 
 " Only load this indent file when no other was loaded.
diff --git a/runtime/indent/rnoweb.vim b/runtime/indent/rnoweb.vim
index d0cad3d8d9..29fa5bc78f 100644
--- a/runtime/indent/rnoweb.vim
+++ b/runtime/indent/rnoweb.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Rnoweb
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Sun Mar 22, 2015  09:28AM
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 
 
 " Only load this indent file when no other was loaded.
diff --git a/runtime/indent/rrst.vim b/runtime/indent/rrst.vim
index 8bfa8344ce..f3ee53e7fb 100644
--- a/runtime/indent/rrst.vim
+++ b/runtime/indent/rrst.vim
@@ -1,7 +1,8 @@
 " Vim indent file
 " Language:	Rrst
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
-" Last Change:	Wed Jul 09, 2014  07:33PM
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
 
 
 " Only load this indent file when no other was loaded.
diff --git a/runtime/indent/sh.vim b/runtime/indent/sh.vim
index 5bd8c77fab..aca110f504 100644
--- a/runtime/indent/sh.vim
+++ b/runtime/indent/sh.vim
@@ -3,23 +3,29 @@
 " Maintainer:          Christian Brabandt <cb@256bit.org>
 " Previous Maintainer: Peter Aronoff <telemachus@arpinum.org>
 " Original Author:     Nikolai Weibull <now@bitwi.se>
-" Latest Revision:     2015-12-15
+" Latest Revision:     2016-06-27
 " License:             Vim (see :h license)
 " Repository:          https://github.com/chrisbra/vim-sh-indent
+" Changelog:
+"          20160627: - detect heredocs correctly
+"          20160213: - detect function definition correctly
+"          20160202: - use shiftwidth() function
+"          20151215: - set b:undo_indent variable
+"          20150728: - add foreach detection for zsh
 
 if exists("b:did_indent")
   finish
 endif
 let b:did_indent = 1
 
-let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
-
 setlocal indentexpr=GetShIndent()
 setlocal indentkeys+=0=then,0=do,0=else,0=elif,0=fi,0=esac,0=done,0=end,),0=;;,0=;&
 setlocal indentkeys+=0=fin,0=fil,0=fip,0=fir,0=fix
 setlocal indentkeys-=:,0#
 setlocal nosmartindent
 
+let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
+
 if exists("*GetShIndent")
   finish
 endif
@@ -28,7 +34,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 function s:buffer_shiftwidth()
-  return &shiftwidth
+  return shiftwidth()
 endfunction
 
 let s:sh_indent_defaults = {
@@ -67,7 +73,7 @@ function! GetShIndent()
     if !s:is_case_ended(line)
       let ind += s:indent_value('case-statements')
     endif
-  elseif line =~ '^\s*\<\k\+\>\s*()\s*{' || line =~ '^\s*{'
+  elseif line =~ '^\s*\<\k\+\>\s*()\s*{' || line =~ '^\s*{' || line =~ '^\s*function\s*\w\S\+\s*\%(()\)\?\s*{'
     if line !~ '}\s*\%(#.*\)\=$'
       let ind += s:indent_value('default')
     endif
@@ -102,6 +108,8 @@ function! GetShIndent()
     endif
   elseif s:is_case_break(line)
     let ind -= s:indent_value('case-breaks')
+  elseif s:is_here_doc(line)
+    let ind = 0
   endif
 
   return ind
@@ -160,6 +168,14 @@ function! s:is_case_break(line)
   return a:line =~ '^\s*;[;&]'
 endfunction
 
+function! s:is_here_doc(line)
+    if a:line =~ '^\w\+$'
+	let here_pat = '<<-\?'. s:escape(a:line). '\$'
+	return search(here_pat, 'bnW') > 0
+    endif
+    return 0
+endfunction
+
 function! s:is_case_ended(line)
   return s:is_case_break(a:line) || a:line =~ ';[;&]\s*\%(#.*\)\=$'
 endfunction
@@ -172,5 +188,9 @@ function! s:is_case_empty(line)
   endif
 endfunction
 
+function! s:escape(pattern)
+    return '\V'. escape(a:pattern, '\\')
+endfunction
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/indent/tex.vim b/runtime/indent/tex.vim
index 7e3a351083..0150bb9623 100644
--- a/runtime/indent/tex.vim
+++ b/runtime/indent/tex.vim
@@ -2,10 +2,9 @@
 " Language:     LaTeX
 " Maintainer:   YiChao Zhou <broken.zhou AT gmail.com>
 " Created:      Sat, 16 Feb 2002 16:50:19 +0100
-" Last Change:	2012 Mar 18 19:19:50
-" Version: 0.7
-"   Please email me if you found something we can do.  Bug report and
-"   feature request is welcome.
+" Version: 0.9.2
+"   Please email me if you found something I can do.  Comments, bug report and
+"   feature request are welcome.
 
 " Last Update:  {{{
 "               25th Sep 2002, by LH :
@@ -41,7 +40,7 @@
 "               (*) Trust user when in "verbatim" and "lstlisting"
 "               2012/03/11 by Zhou Yichao <broken.zhou AT gmail.com>
 "               (*) Modify "&" so that only indent when current line start with
-"               "&".
+"                   "&".
 "               2012/03/12 by Zhou Yichao <broken.zhou AT gmail.com>
 "               (*) Modify indentkeys.
 "               2012/03/18 by Zhou Yichao <broken.zhou AT gmail.com>
@@ -49,6 +48,17 @@
 "               2013/05/02 by Zhou Yichao <broken.zhou AT gmail.com>
 "               (*) Fix problem about GetTeXIndent checker. Thank Albert Netymk
 "                   for reporting this.
+"               2014/06/23 by Zhou Yichao <broken.zhou AT gmail.com>
+"               (*) Remove the feature g:tex_indent_and because it is buggy.
+"               (*) If there is not any obvious indentation hints, we do not
+"                   alert our user's current indentation.
+"               (*) g:tex_indent_brace now only works if the open brace is the
+"                   last character of that line.
+"               2014/08/03 by Zhou Yichao <broken.zhou AT gmail.com>
+"               (*) Indent current line if last line has larger indentation
+"               2014/08/09 by Zhou Yichao <broken.zhou AT gmail.com>
+"               (*) Add missing return value for s:GetEndIndentation(...)
+"
 " }}}
 
 " Document: {{{
@@ -60,7 +70,17 @@
 " * g:tex_indent_brace
 "
 "   If this variable is unset or non-zero, it will use smartindent-like style
-"   for "{}" and "[]"
+"   for "{}" and "[]".  Now this only works if the open brace is the last
+"   character of that line.
+"
+"         % Example 1
+"         \usetikzlibrary{
+"           external
+"         }
+"
+"         % Example 2
+"         \tikzexternalize[
+"           prefix=tikz]
 "   
 " * g:tex_indent_items
 "
@@ -98,14 +118,6 @@
 "
 "   A list of environment names. separated with '\|', where no indentation is 
 "   required. The default is 'document\|verbatim'.
-"
-" * g:tex_indent_and
-"
-"   If this variable is unset or zero, vim will try to align the line with first
-"   "&". This is pretty useful when you use environment like table or align.
-"   Note that this feature need to search back some line, so vim may become
-"   a little slow.
-"
 " }}} 
 
 " Only define the function once
@@ -126,8 +138,8 @@ endif
 if !exists("g:tex_indent_brace")
     let g:tex_indent_brace = 1
 endif
-if !exists("g:tex_indent_and")
-    let g:tex_indent_and = 1
+if !exists("g:tex_max_scan_line")
+    let g:tex_max_scan_line = 60
 endif
 if g:tex_indent_items
     if !exists("g:tex_itemize_env")
@@ -140,10 +152,6 @@ else
     let g:tex_items = ''
 endif
 
-if !exists("g:tex_indent_paretheses")
-    let g:tex_indent_paretheses = 1
-endif
-
 if !exists("g:tex_noindent_env")
     let g:tex_noindent_env = 'document\|verbatim\|lstlisting'
 endif "}}}
@@ -160,6 +168,7 @@ let g:tex_items = '^\s*' . substitute(g:tex_items, '^\(\^\\s\*\)*', '', '')
 function! GetTeXIndent() " {{{
     " Find a non-blank line above the current line.
     let lnum = prevnonblank(v:lnum - 1)
+    let cnum = v:lnum
 
     " Comment line is not what we need.
     while lnum != 0 && getline(lnum) =~ '^\s*%'
@@ -171,8 +180,8 @@ function! GetTeXIndent() " {{{
         return 0 
     endif
 
-    let line = substitute(getline(lnum), '%.*', ' ','g')     " last line
-    let cline = substitute(getline(v:lnum), '%.*', ' ', 'g') " current line
+    let line = substitute(getline(lnum), '\s*%.*', '','g')     " last line
+    let cline = substitute(getline(v:lnum), '\s*%.*', '', 'g') " current line
 
     "  We are in verbatim, so do what our user what.
     if synIDattr(synID(v:lnum, indent(v:lnum), 1), "name") == "texZone"
@@ -183,26 +192,12 @@ function! GetTeXIndent() " {{{
         end
     endif
     
-    " You want to align with "&"
-    if g:tex_indent_and
-        " Align only when current line start with "&"
-        if line =~ '&.*\\\\' && cline =~ '^\s*&'
-            return indent(v:lnum) + stridx(line, "&") - stridx(cline, "&")
-        endif
-
-        " set line & lnum to the line which doesn't contain "&"
-        while lnum != 0 && (stridx(line, "&") != -1 || line =~ '^\s*%')
-            let lnum = prevnonblank(lnum - 1)
-            let line = getline(lnum)
-        endwhile
-    endif
-
-
     if lnum == 0
         return 0 
     endif
 
     let ind = indent(lnum)
+    let stay = 1
 
     " New code for comment: retain the indent of current line
     if cline =~ '^\s*%'
@@ -216,77 +211,197 @@ function! GetTeXIndent() " {{{
     " ZYC modification : \end after \begin won't cause wrong indent anymore
     if line =~ '\\begin{.*}' && line !~ g:tex_noindent_env
         let ind = ind + &sw
+        let stay = 0
 
         if g:tex_indent_items
             " Add another sw for item-environments
             if line =~ g:tex_itemize_env
                 let ind = ind + &sw
+                let stay = 0
             endif
         endif
     endif
 
+    if cline =~ '\\end{.*}'
+        let retn = s:GetEndIndentation(v:lnum)
+        if retn != -1
+            return retn
+        endif
+    end
     " Subtract a 'shiftwidth' when an environment ends
-    if cline =~ '\\end{.*}' && cline !~ g:tex_noindent_env
-
+    if cline =~ '\\end{.*}'
+                \ && cline !~ g:tex_noindent_env
+                \ && cline !~ '\\begin{.*}.*\\end{.*}'
         if g:tex_indent_items
             " Remove another sw for item-environments
             if cline =~ g:tex_itemize_env
                 let ind = ind - &sw
+                let stay = 0
             endif
         endif
 
         let ind = ind - &sw
+        let stay = 0
     endif
 
     if g:tex_indent_brace
-        let sum1 = 0
-        for i in range(0, strlen(line)-1)
-            if line[i] == "}" || line[i] == "]" ||
-                        \ strpart(line, i, 7) == '\right)'
-                let sum1 = max([0, sum1-1])
-            endif
-            if line[i] == "{" || line[i] == "[" ||
-                        \ strpart(line, i, 6) == '\left('
-                let sum1 += 1
-            endif
-        endfor
+        let char = line[strlen(line)-1]
+        if char == '[' || char == '{'
+            let ind += &sw
+            let stay = 0
+        endif
 
-        let sum2 = 0
-        for i in reverse(range(0, strlen(cline)-1))
-            if cline[i] == "{" || cline[i] == "[" ||
-                        \ strpart(cline, i, 6) == '\left('
-                let sum2 = max([0, sum2-1])
-            endif
-            if cline[i] == "}" || cline[i] == "]" ||
-                        \ strpart(cline, i, 7) == '\right)'
-                let sum2 += 1
+        let cind = indent(v:lnum)
+        let char = cline[cind]
+        if (char == ']' || char == '}') &&
+                    \ s:CheckPairedIsLastCharacter(v:lnum, cind)
+            let ind -= &sw
+            let stay = 0
+        endif
+
+        for i in range(indent(lnum)+1, strlen(line)-1)
+            let char = line[i]
+            if char == ']' || char == '}'
+                if s:CheckPairedIsLastCharacter(lnum, i)
+                    let ind -= &sw
+                    let stay = 0
+                endif
             endif
         endfor
-
-        let ind += (sum1 - sum2) * &sw
-    endif
-
-    if g:tex_indent_paretheses
     endif
 
     " Special treatment for 'item'
     " ----------------------------
 
     if g:tex_indent_items
-
         " '\item' or '\bibitem' itself:
         if cline =~ g:tex_items
             let ind = ind - &sw
+            let stay = 0
         endif
-
         " lines following to '\item' are intented once again:
         if line =~ g:tex_items
             let ind = ind + &sw
+            let stay = 0
+        endif
+    endif
+
+    if stay
+        " If there is no obvious indentation hint, we trust our user.
+        if empty(cline)
+            return ind
+        else
+            return max([indent(v:lnum), s:GetLastBeginIndentation(v:lnum)])
+        endif
+    else
+        return ind
+    endif
+endfunction "}}}
+
+function! s:GetLastBeginIndentation(lnum) " {{{
+    let matchend = 1
+    for lnum in range(a:lnum-1, max([a:lnum - g:tex_max_scan_line, 1]), -1)
+        let line = getline(lnum)
+        if line =~ '\\end{.*}'
+            let matchend += 1
+        endif
+        if line =~ '\\begin{.*}'
+            let matchend -= 1
         endif
+        if matchend == 0
+            if line =~ g:tex_itemize_env
+                return indent(lnum) + 2 * &sw
+            endif
+            if line =~ g:tex_noindent_env
+                return indent(lnum)
+            endif
+            return indent(lnum) + &sw
+        endif
+    endfor
+    return -1
+endfunction
+
+function! s:GetEndIndentation(lnum) " {{{
+    if getline(a:lnum) =~ '\\begin{.*}.*\\end{.*}'
+        return -1
+    endif
+
+    let min_indent = 100
+    let matchend = 1
+    for lnum in range(a:lnum-1, max([a:lnum-g:tex_max_scan_line, 1]), -1)
+        let line = getline(lnum)
+        if line =~ '\\end{.*}'
+            let matchend += 1
+        endif
+        if line =~ '\\begin{.*}'
+            let matchend -= 1
+        endif
+        if matchend == 0
+            return indent(lnum)
+        endif
+        if !empty(line)
+            let min_indent = min([min_indent, indent(lnum)])
+        endif
+    endfor
+    return min_indent - &sw
+endfunction
+
+" Most of the code is from matchparen.vim
+function! s:CheckPairedIsLastCharacter(lnum, col) "{{{
+    " Get the character under the cursor and check if it's in 'matchpairs'.
+    let c_lnum = a:lnum
+    let c_col = a:col+1
+
+
+    let c = getline(c_lnum)[c_col-1]
+    let plist = split(&matchpairs, '.\zs[:,]')
+    let i = index(plist, c)
+    if i < 0
+        return 0
+    endif
+
+    " Figure out the arguments for searchpairpos().
+    if i % 2 == 0
+        let s_flags = 'nW'
+        let c2 = plist[i + 1]
+    else
+        let s_flags = 'nbW'
+        let c2 = c
+        let c = plist[i - 1]
+    endif
+    if c == '['
+        let c = '\['
+        let c2 = '\]'
+    endif
+
+    " Find the match.  When it was just before the cursor move it there for a
+    " moment.
+    let save_cursor = winsaveview()
+    call cursor(c_lnum, c_col)
+
+    " When not in a string or comment ignore matches inside them.
+    " We match "escape" for special items, such as lispEscapeSpecial.
+    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
+                \ '=~?  "string\\|character\\|singlequote\\|escape\\|comment"'
+    execute 'if' s_skip '| let s_skip = 0 | endif'
+
+    let stopline = max([0, c_lnum - g:tex_max_scan_line])
+
+    " Limit the search time to 300 msec to avoid a hang on very long lines.
+    " This fails when a timeout is not supported.
+    try
+        let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 100)
+    catch /E118/
+    endtry
+
+    call winrestview(save_cursor)
 
+    if m_lnum > 0
+        let line = getline(m_lnum)
+        return strlen(line) == m_col
     endif
 
-    return ind
+    return 0
 endfunction "}}}
 
 let &cpo = s:cpo_save
diff --git a/runtime/indent/vhdl.vim b/runtime/indent/vhdl.vim
index 3e847b9575..6982859670 100644
--- a/runtime/indent/vhdl.vim
+++ b/runtime/indent/vhdl.vim
@@ -1,8 +1,8 @@
 " VHDL indent ('93 syntax)
 " Language:    VHDL
 " Maintainer:  Gerald Lai <laigera+vim?gmail.com>
-" Version:     1.58
-" Last Change: 2011 Sep 27
+" Version:     1.60
+" Last Change: 2016 Feb 26
 " URL:         http://www.vim.org/scripts/script.php?script_id=1450
 
 " only load this indent file when no other was loaded
@@ -104,7 +104,7 @@ function GetVHDLindent()
     let pn = prevnonblank(pn - 1)
     let ps = getline(pn)
   endwhile
-  if (curs =~ '^\s*)' || curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*\%(=>\s*\S\+\|:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\w\+\s\+:=\)\)') && (prevs =~? s:NC.'\<\%(procedure\s\+\S\+\|generic\|map\|port\)\s*(\%(\s*\w\)\=' || (ps =~? s:NC.'\<\%(procedure\|generic\|map\|port\)'.s:ES && prevs =~ '^\s*('))
+  if (curs =~ '^\s*)' || curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*\((.*)\)*\s*\%(=>\s*\S\+\|:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\s\+\)\)') && (prevs =~? s:NC.'\<\%(procedure\s\+\S\+\|generic\|map\|port\)\s*(\%(\s*\w\)\=' || (ps =~? s:NC.'\<\%(procedure\|generic\|map\|port\)'.s:ES && prevs =~ '^\s*('))
     " align closing ")" with opening "("
     if curs =~ '^\s*)'
       return ind2 + stridx(prevs_noi, '(')
@@ -412,11 +412,22 @@ function GetVHDLindent()
 
   " ****************************************************************************************
   " indent:   maintain indent of previous opening statement
-  " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + "in", "out", "inout", "buffer", "linkage", variable & ":="
+  " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$
   " where:    start of current line
-  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\w\+\s\+:=\)'
+  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
     return ind2
   endif
+  " ****************************************************************************************
+  " indent:     maintain indent of previous opening statement, corner case which
+  "             does not end in ;, but is part of a mapping
+  " keywords:   without "procedure", "generic", "map", "port" + ":" but not ":=", never + ;$ and
+  "             prevline without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$
+  " where:      start of current line
+  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*[^;].*$'
+      if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
+         return ind2
+     endif
+ endif
 
   " return leftover filtered indent
   return ind
diff --git a/runtime/indent/vim.vim b/runtime/indent/vim.vim
index 7511325af4..8ebfa12caf 100644
--- a/runtime/indent/vim.vim
+++ b/runtime/indent/vim.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Dec 12
+" Last Change:	2016 Jun 27
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -58,19 +58,19 @@ function GetVimIndentIntern()
     if exists("g:vim_indent_cont")
       let ind = ind + g:vim_indent_cont
     else
-      let ind = ind + &sw * 3
+      let ind = ind + shiftwidth() * 3
     endif
-  elseif prev_text =~ '^\s*aug\%[roup]' && prev_text !~ '^\s*aug\%[roup]\s*!\=\s\+END'
-    let ind = ind + &sw
+  elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>'
+    let ind = ind + shiftwidth()
   else
     " A line starting with :au does not increment/decrement indent.
     if prev_text !~ '^\s*au\%[tocmd]'
       let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
       if i >= 0
-	let ind += &sw
+	let ind += shiftwidth()
 	if strpart(prev_text, i, 1) == '|' && has('syntax_items')
 	      \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
-	  let ind -= &sw
+	  let ind -= shiftwidth()
 	endif
       endif
     endif
@@ -82,15 +82,15 @@ function GetVimIndentIntern()
   let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
   if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
     if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
-      let ind = ind - &sw
+      let ind = ind - shiftwidth()
     endif
   endif
 
 
   " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
   " :endfun, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s*!\=\s\+[eE][nN][dD]\)'
-    let ind = ind - &sw
+  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
+    let ind = ind - shiftwidth()
   endif
 
   return ind
diff --git a/runtime/indent/zimbu.vim b/runtime/indent/zimbu.vim
index 9565b10843..5451877ea7 100644
--- a/runtime/indent/zimbu.vim
+++ b/runtime/indent/zimbu.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Zimbu
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Sep 08
+" Last Change:	2016 Jan 25
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -74,9 +74,9 @@ func GetZimbuIndent(lnum)
 	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
 	  \ . " =~ '\\(Comment\\|String\\|Char\\)$'")
       if pp > 0
-	return indent(prevLnum) + &sw
+	return indent(prevLnum) + shiftwidth()
       endif
-      return indent(prevLnum) + &sw * 2
+      return indent(prevLnum) + shiftwidth() * 2
     endif
     if plnumstart == p
       return indent(prevLnum)
@@ -102,13 +102,13 @@ func GetZimbuIndent(lnum)
   endif
 
   if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|INTERFACE\|BITS\|MODULE\|SHARED\)\>'
-    let plindent += &sw
+    let plindent += shiftwidth()
   endif
   if thisline =~ '^\s*\(}\|ELSEIF\>\|ELSE\>\|CATCH\|FINALLY\|GENERATE_ELSEIF\>\|GENERATE_ELSE\>\|UNTIL\>\)'
-    let plindent -= &sw
+    let plindent -= shiftwidth()
   endif
   if thisline =~ '^\s*\(CASE\>\|DEFAULT\>\)' && prevline !~ '^\s*SWITCH\>'
-    let plindent -= &sw
+    let plindent -= shiftwidth()
   endif
 
   " line up continued comment that started after some code
diff --git a/runtime/keymap/armenian-eastern_utf-8.vim b/runtime/keymap/armenian-eastern_utf-8.vim
new file mode 100644
index 0000000000..7b03c5ac73
--- /dev/null
+++ b/runtime/keymap/armenian-eastern_utf-8.vim
@@ -0,0 +1,108 @@
+" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Last Changed: 2016 July 20
+" URL: https://github.com/blinskey/vim-armenian-keymaps
+
+let b:keymap_name = "hy"
+
+loadkeymap
+
+" Capital letters
+A   Ա
+B   Բ
+C   Գ
+D   Դ
+Y   Ե
+Z   Զ
+E   Է
+U   Ը
+:   Թ
++   Ժ
+I   Ի
+L   Լ
+Q   Խ
+?   Ծ
+K   Կ
+H   Հ
+@   Ձ
+>   Ղ
+J   Ճ
+M   Մ
+#   Յ
+N   Ն
+<   Շ
+O   Ո
+{   Չ
+P   Պ
+}   Ջ
+_   Ռ
+S   Ս
+V   Վ
+T   Տ
+R   Ր
+X   Ց
+W   Ւ
+\"  Փ
+G   Ք
+)   Օ
+F   Ֆ
+
+" Lowercase letters
+a   ա
+b   բ
+c   գ
+d   դ
+y   ե
+z   զ
+e   է
+u   ը
+;   թ
+=   ժ
+i   ի
+l   լ
+q   խ
+/   ծ
+k   կ
+h   հ
+2   ձ
+.   ղ
+j   ճ
+m   մ
+3   յ
+n   ն
+,   շ
+o   ո
+[   չ
+p   պ
+]   ջ
+-   ռ
+s   ս
+v   վ
+t   տ
+r   ր
+x   ց
+w   ւ
+'   փ
+g   ք
+0   օ
+f   ֆ
+
+&   և
+
+" Punctuation
+`   ՝
+~   ՜
+1   ։
+4   ՛
+5   ,
+6   -
+7   .
+8   «
+9   »
+\\  '
+|   ՞
+
+" Numbers
+!   1
+$   3
+%   4
+^   9
diff --git a/runtime/keymap/armenian-western_utf-8.vim b/runtime/keymap/armenian-western_utf-8.vim
new file mode 100644
index 0000000000..e02485ed8c
--- /dev/null
+++ b/runtime/keymap/armenian-western_utf-8.vim
@@ -0,0 +1,108 @@
+" Maintainer: Benjamin Linskey <vim@benlinskey.com>
+" Last Changed: 2016 July 20
+" URL: https://github.com/blinskey/vim-armenian-keymaps
+
+let b:keymap_name = "hy"
+
+loadkeymap
+
+" Capital letters
+A   Ա
+P   Բ
+C   Գ
+T   Դ
+Y   Ե
+Z   Զ
+E   Է
+U   Ը
+:   Թ
++   Ժ
+I   Ի
+L   Լ
+Q   Խ
+?   Ծ
+G   Կ
+H   Հ
+@   Ձ
+>   Ղ
+J   Ճ
+M   Մ
+#   Յ
+N   Ն
+<   Շ
+O   Ո
+{   Չ
+B   Պ
+}   Ջ
+_   Ռ
+S   Ս
+W   Վ
+D   Տ
+R   Ր
+X   Ց
+V   Ւ
+\"  Փ
+K   Ք
+)   Օ
+F   Ֆ
+
+" Lowercase letters
+a   ա
+p   բ
+c   գ
+t   դ
+y   ե
+z   զ
+e   է
+u   ը
+;   թ
+=   ժ
+i   ի
+l   լ
+q   խ
+/   ծ
+g   կ
+h   հ
+2   ձ
+.   ղ
+j   ճ
+m   մ
+3   յ
+n   ն
+,   շ
+o   ո
+[   չ
+b   պ
+]   ջ
+-   ռ
+s   ս
+w   վ
+d   տ
+r   ր
+x   ց
+v   ւ
+'   փ
+k   ք
+0   օ
+f   ֆ
+
+&   և
+
+" Punctuation
+`   ՝
+~   ՜
+1   ։
+4   ՛
+5   ,
+6   -
+7   .
+8   «
+9   »
+\\  '
+|   ՞
+
+" Numbers
+!   1
+$   3
+%   4
+^   9
diff --git a/runtime/keymap/vietnamese-telex_utf-8.vim b/runtime/keymap/vietnamese-telex_utf-8.vim
new file mode 100644
index 0000000000..f9fd055d14
--- /dev/null
+++ b/runtime/keymap/vietnamese-telex_utf-8.vim
@@ -0,0 +1,196 @@
+" Vim Keymap file for Vietnamese through Telex method
+" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
+" Last Change: 2016-06-13
+
+scriptencoding utf-8
+
+let b:keymap_name = "vi"
+
+loadkeymap
+
+A\\	A
+AF	À
+AS	Á
+AR	Ả
+AX	Ã
+AJ	Ạ
+
+AW	Ă
+AW\\	Ă
+AWF	Ằ
+AWS	Ắ
+AWR	Ẳ
+AWX	Ẵ
+AWJ	Ặ
+
+AA	Â
+AA\\	Â
+AAF	Ầ
+AAS	Ấ
+AAR	Ẩ
+AAX	Ẫ
+AAJ	Ậ
+
+D\\	D
+DD	Đ
+
+E	E
+E\\	E
+EF	È
+ES	É
+ER	Ẻ
+EX	Ẽ
+EJ	Ẹ
+
+EE	Ê
+EE\\	Ê
+EEF	Ề
+EES	Ế
+EER	Ể
+EEX	Ễ
+EEJ	Ệ
+
+I\\	I
+IF	Ì
+IS	Í
+IR	Ỉ
+IX	Ĩ
+IJ	Ị
+
+O\\	O
+OF	Ò
+OS	Ó
+OR	Ỏ
+OX	Õ
+OJ	Ọ
+
+OO	Ô
+OO\\	Ô
+OOF	Ồ
+OOS	Ố
+OOR	Ổ
+OOX	Ỗ
+OOJ	Ộ
+
+OW	Ơ
+OW\\	Ơ
+OWF	Ờ
+OWS	Ớ
+OWR	Ở
+OWX	Ỡ
+OWJ	Ợ
+
+U\\	U
+UF	Ù
+US	Ú
+UR	Ủ
+UX	Ũ
+UJ	Ụ
+
+UW	Ư
+UW\\	Ư
+UWF	Ừ
+UWS	Ứ
+UWR	Ử
+UWX	Ữ
+UWJ	Ự
+
+Y\\	Y
+YF	Ỳ
+YS	Ý
+YR	Ỷ
+YX	Ỹ
+YJ	Ỵ
+
+a\\	a
+af	à
+as	á
+ar	ả
+ax	ã
+aj	ạ
+
+aw	ă
+aw\\	ă
+awf	ằ
+aws	ắ
+awr	ẳ
+awx	ẵ
+awj	ặ
+
+aa	â
+aa\\	â
+aaf	ầ
+aas	ấ
+aar	ẩ
+aax	ẫ
+aaj	ậ
+
+d\\	d
+dd	đ
+
+e\\	e
+ef	è
+es	é
+er	ẻ
+ex	ẽ
+ej	ẹ
+
+ee	ê
+ee\\	ê
+eef	ề
+ees	ế
+eer	ể
+eex	ễ
+eej	ệ
+
+i\\	i
+if	ì
+is	í
+ir	ỉ
+ix	ĩ
+ij	ị
+
+o\\	o
+of	ò
+os	ó
+or	ỏ
+ox	õ
+oj	ọ
+
+oo	ô
+oo\\	ô
+oof	ồ
+oos	ố
+oor	ổ
+oox	ỗ
+ooj	ộ
+
+ow	ơ
+ow\\	ơ
+owf	ờ
+ows	ớ
+owr	ở
+owx	ỡ
+owj	ợ
+
+u\\	u
+uf	ù
+us	ú
+ur	ủ
+ux	ũ
+uj	ụ
+
+uw	ư
+uw\\	ư
+uwf	ừ
+uws	ứ
+uwr	ử
+uwx	ữ
+uwj	ự
+
+y\\	y
+yf	ỳ
+ys	ý
+yr	ỷ
+yx	ỹ
+yj	ỵ
diff --git a/runtime/keymap/vietnamese-vni_utf-8.vim b/runtime/keymap/vietnamese-vni_utf-8.vim
new file mode 100644
index 0000000000..c9312c6854
--- /dev/null
+++ b/runtime/keymap/vietnamese-vni_utf-8.vim
@@ -0,0 +1,196 @@
+" Vim Keymap file for Vietnamese through VNI method
+" Maintainer: Raphael McSinyx <vn.mcsinyx@gmail.com>
+" Last Change: 2016-06-13
+
+scriptencoding utf-8
+
+let b:keymap_name = "vi"
+
+loadkeymap
+
+A\\	A
+A1	Á
+A2	À
+A3	Ả
+A4	Ã
+A5	Ạ
+
+A8	Ă
+A8\\	Ă
+A81	Ắ
+A82	Ằ
+A83	Ẳ
+A84	Ẵ
+A85	Ặ
+
+A6	Â
+A6\\	Â
+A61	Ấ
+A62	Ầ
+A63	Ẩ
+A64	Ẫ
+A65	Ậ
+
+D	D
+D\\	D
+D9	Đ
+
+E\\	E
+E1	É
+E2	È
+E3	Ẻ
+E4	Ẽ
+E5	Ẹ
+
+E6	Ê
+E6\\	Ê
+E61	Ế
+E62	Ề
+E63	Ể
+E64	Ễ
+E65	Ệ
+
+I\\	I
+I1	Í
+I2	Ì
+I3	Ỉ
+I4	Ĩ
+I5	Ị
+
+O\\	O
+O1	Ó
+O2	Ò
+O3	Ỏ
+O4	Õ
+O5	Ọ
+
+O6	Ô
+O6\\	Ô
+O61	Ố
+O62	Ồ
+O63	Ổ
+O64	Ỗ
+O65	Ộ
+
+O7	Ơ
+O7\\	Ơ
+O71	Ớ
+O72	Ờ
+O73	Ở
+O74	Ỡ
+O75	Ợ
+
+U\\	U
+U1	Ú
+U2	Ù
+U3	Ủ
+U4	Ũ
+U5	Ụ
+
+U7	Ư
+U7\\	Ư
+U71	Ứ
+U72	Ừ
+U73	Ử
+U74	Ữ
+U75	Ự
+
+Y\\	Y
+Y1	Ý
+Y2	Ỳ
+Y3	Ỷ
+Y4	Ỹ
+Y5	Ỵ
+
+a\\	a
+a1	á
+a2	à
+a3	ả
+a4	ã
+a5	ạ
+
+a8	ă
+a8\\	ă
+a81	ắ
+a82	ằ
+a83	ẳ
+a84	ẵ
+a85	ặ
+
+a6	â
+a6\\	â
+a61	ấ
+a62	ầ
+a63	ẩ
+a64	ẫ
+a65	ậ
+
+d\\	d
+d9	đ
+
+e\\	e
+e1	é
+e2	è
+e3	ẻ
+e4	ẽ
+e5	ẹ
+
+e6	ê
+e6\\	ê
+e61	ế
+e62	ề
+e63	ể
+e64	ễ
+e65	ệ
+
+i\\	i
+i1	í
+i2	ì
+i3	ỉ
+i4	ĩ
+i5	ị
+
+o\\	o
+o1	ó
+o2	ò
+o3	ỏ
+o4	õ
+o5	ọ
+
+o6	ô
+o6\\	ô
+o61	ố
+o62	ồ
+o63	ổ
+o64	ỗ
+o65	ộ
+
+o7	ơ
+o7\\	ơ
+o71	ớ
+o72	ờ
+o73	ở
+o74	ỡ
+o75	ợ
+
+u\\	u
+u1	ú
+u2	ù
+u3	ủ
+u4	ũ
+u5	ụ
+
+u7	ư
+u7\\	ư
+u71	ứ
+u72	ừ
+u73	ử
+u74	ữ
+u75	ự
+
+y\\	y
+y1	ý
+y2	ỳ
+y3	ỷ
+y4	ỹ
+y5	ỵ
diff --git a/runtime/macros/justify.vim b/runtime/macros/justify.vim
index 4ef3bf95fa..011a911401 100644
--- a/runtime/macros/justify.vim
+++ b/runtime/macros/justify.vim
@@ -1,316 +1,3 @@
-" Function to left and right align text.
-"
-" Written by:	Preben "Peppe" Guldberg <c928400@student.dtu.dk>
-" Created:	980806 14:13 (or around that time anyway)
-" Revised:	001103 00:36 (See "Revisions" below)
-
-
-" function Justify( [ textwidth [, maxspaces [, indent] ] ] )
-"
-" Justify()  will  left  and  right  align  a  line  by  filling  in  an
-" appropriate amount of spaces.  Extra  spaces  are  added  to  existing
-" spaces starting from the right side of the line.  As an  example,  the
-" following documentation has been justified.
-"
-" The function takes the following arguments:
-
-" textwidth argument
-" ------------------
-" If not specified, the value of the 'textwidth'  option  is  used.   If
-" 'textwidth' is zero a value of 80 is used.
-"
-" Additionally the arguments 'tw' and '' are  accepted.   The  value  of
-" 'textwidth' will be used. These are handy, if you just want to specify
-" the maxspaces argument.
-
-" maxspaces argument
-" ------------------
-" If specified, alignment will only be done, if the  longest  space  run
-" after alignment is no longer than maxspaces.
-"
-" An argument of '' is accepted, should the user  like  to  specify  all
-" arguments.
-"
-" To aid user defined commands, negative  values  are  accepted  aswell.
-" Using a negative value specifies the default behaviour: any length  of
-" space runs will be used to justify the text.
-
-" indent argument
-" ---------------
-" This argument specifies how a line should be indented. The default  is
-" to keep the current indentation.
-"
-" Negative  values:  Keep  current   amount   of   leading   whitespace.
-" Positive values: Indent all lines with leading whitespace  using  this
-" amount of whitespace.
-"
-" Note that the value 0, needs to be quoted as  a  string.   This  value
-" leads to a left flushed text.
-"
-" Additionally units of  'shiftwidth'/'sw'  and  'tabstop'/'ts'  may  be
-" added. In this case, if the value of indent is positive, the amount of
-" whitespace to be  added  will  be  multiplied  by  the  value  of  the
-" 'shiftwidth' and 'tabstop' settings.  If these  units  are  used,  the
-"  argument must  be  given  as  a  string,  eg.   Justify('','','2sw').
-"
-" If the values of 'sw' or 'tw' are negative, they  are  treated  as  if
-" they were 0, which means that the text is flushed left.  There  is  no
-" check if a negative number prefix is used to  change  the  sign  of  a
-" negative 'sw' or 'ts' value.
-"
-" As with the other arguments,  ''  may  be  used  to  get  the  default
-" behaviour.
-
-
-" Notes:
-"
-" If the line, adjusted for space runs and leading/trailing  whitespace,
-" is wider than the used textwidth, the line will be left untouched  (no
-" whitespace removed).  This should be equivalent to  the  behaviour  of
-" :left, :right and :center.
-"
-" If the resulting line is shorter than the used textwidth  it  is  left
-" untouched.
-"
-" All space runs in the line  are  truncated  before  the  alignment  is
-" carried out.
-"
-" If you have set 'noexpandtab', :retab!  is used to replace space  runs
-"  with whitespace  using  the  value  of  'tabstop'.   This  should  be
-" conformant with :left, :right and :center.
-"
-" If joinspaces is set, an extra space is added after '.', '?' and  '!'.
-" If 'cpooptions' include 'j', extra space  is  only  added  after  '.'.
-" (This may on occasion conflict with maxspaces.)
-
-
-" Related mappings:
-"
-" Mappings that will align text using the current text width,  using  at
-" most four spaces in a  space  run  and  keeping  current  indentation.
-nmap _j :%call Justify('tw',4)<CR>
-vmap _j :call Justify('tw',4)<CR>
-"
-" Mappings that will remove space runs and format lines (might be useful
-" prior to aligning the text).
-nmap ,gq :%s/\s\+/ /g<CR>gq1G
-vmap ,gq :s/\s\+/ /g<CR>gvgq
-
-
-" User defined command:
-"
-" The following is an ex command that works as a shortcut to the Justify
-" function.  Arguments to Justify() can  be  added  after  the  command.
-com! -range -nargs=* Justify <line1>,<line2>call Justify(<f-args>)
-"
-" The following commands are all equivalent:
-"
-" 1. Simplest use of Justify():
-"       :call Justify()
-"       :Justify
-"
-" 2. The _j mapping above via the ex command:
-"       :%Justify tw 4
-"
-" 3.  Justify  visualised  text  at  72nd  column  while  indenting  all
-" previously indented text two shiftwidths
-"       :'<,'>call Justify(72,'','2sw')
-"       :'<,'>Justify 72 -1 2sw
-"
-" This documentation has been justified  using  the  following  command:
-":se et|kz|1;/^" function Justify(/+,'z-g/^" /s/^" //|call Justify(70,3)|s/^/" /
-
-" Revisions:
-" 001103: If 'joinspaces' was set, calculations could be wrong.
-"	  Tabs at start of line could also lead to errors.
-"	  Use setline() instead of "exec 's/foo/bar/' - safer.
-"	  Cleaned up the code a bit.
-"
-" Todo:	  Convert maps to the new script specific form
-
-" Error function
-function! Justify_error(message)
-    echohl Error
-    echo "Justify([tw, [maxspaces [, indent]]]): " . a:message
-    echohl None
-endfunction
-
-
-" Now for the real thing
-function! Justify(...) range
-
-    if a:0 > 3
-    call Justify_error("Too many arguments (max 3)")
-    return 1
-    endif
-
-    " Set textwidth (accept 'tw' and '' as arguments)
-    if a:0 >= 1
-	if a:1 =~ '^\(tw\)\=$'
-	    let tw = &tw
-	elseif a:1 =~ '^\d\+$'
-	    let tw = a:1
-	else
-	    call Justify_error("tw must be a number (>0), '' or 'tw'")
-	    return 2
-	endif
-    else
-	let tw = &tw
-    endif
-    if tw == 0
-	let tw = 80
-    endif
-
-    " Set maximum number of spaces between WORDs
-    if a:0 >= 2
-	if a:2 == ''
-	    let maxspaces = tw
-	elseif a:2 =~ '^-\d\+$'
-	    let maxspaces = tw
-	elseif a:2 =~ '^\d\+$'
-	    let maxspaces = a:2
-	else
-	    call Justify_error("maxspaces must be a number or ''")
-	    return 3
-	endif
-    else
-	let maxspaces = tw
-    endif
-    if maxspaces <= 1
-	call Justify_error("maxspaces should be larger than 1")
-	return 4
-    endif
-
-    " Set the indentation style (accept sw and ts units)
-    let indent_fix = ''
-    if a:0 >= 3
-	if (a:3 == '') || a:3 =~ '^-[1-9]\d*\(shiftwidth\|sw\|tabstop\|ts\)\=$'
-	    let indent = -1
-	elseif a:3 =~ '^-\=0\(shiftwidth\|sw\|tabstop\|ts\)\=$'
-	    let indent = 0
-	elseif a:3 =~ '^\d\+\(shiftwidth\|sw\|tabstop\|ts\)\=$'
-	    let indent = substitute(a:3, '\D', '', 'g')
-	elseif a:3 =~ '^\(shiftwidth\|sw\|tabstop\|ts\)$'
-	    let indent = 1
-	else
-	    call Justify_error("indent: a number with 'sw'/'ts' unit")
-	    return 5
-	endif
-	if indent >= 0
-	    while indent > 0
-		let indent_fix = indent_fix . ' '
-		let indent = indent - 1
-	    endwhile
-	    let indent_sw = 0
-	    if a:3 =~ '\(shiftwidth\|sw\)'
-		let indent_sw = &sw
-	    elseif a:3 =~ '\(tabstop\|ts\)'
-		let indent_sw = &ts
-	    endif
-	    let indent_fix2 = ''
-	    while indent_sw > 0
-		let indent_fix2 = indent_fix2 . indent_fix
-		let indent_sw = indent_sw - 1
-	    endwhile
-	    let indent_fix = indent_fix2
-	endif
-    else
-	let indent = -1
-    endif
-
-    " Avoid substitution reports
-    let save_report = &report
-    set report=1000000
-
-    " Check 'joinspaces' and 'cpo'
-    if &js == 1
-	if &cpo =~ 'j'
-	    let join_str = '\(\. \)'
-	else
-	    let join_str = '\([.!?!] \)'
-	endif
-    endif
-
-    let cur = a:firstline
-    while cur <= a:lastline
-
-	let str_orig = getline(cur)
-	let save_et = &et
-	set et
-	exec cur . "retab"
-	let &et = save_et
-	let str = getline(cur)
-
-	let indent_str = indent_fix
-	let indent_n = strlen(indent_str)
-	" Shall we remember the current indentation
-	if indent < 0
-	    let indent_orig = matchstr(str_orig, '^\s*')
-	    if strlen(indent_orig) > 0
-		let indent_str = indent_orig
-		let indent_n = strlen(matchstr(str, '^\s*'))
-	    endif
-	endif
-
-	" Trim trailing, leading and running whitespace
-	let str = substitute(str, '\s\+$', '', '')
-	let str = substitute(str, '^\s\+', '', '')
-	let str = substitute(str, '\s\+', ' ', 'g')
-	let str_n = strdisplaywidth(str)
-
-	" Possible addition of space after punctuation
-	if exists("join_str")
-	    let str = substitute(str, join_str, '\1 ', 'g')
-	endif
-	let join_n = strdisplaywidth(str) - str_n
-
-	" Can extraspaces be added?
-	" Note that str_n may be less than strlen(str) [joinspaces above]
-	if strdisplaywidth(str) <= tw - indent_n && str_n > 0
-	    " How many spaces should be added
-	    let s_add = tw - str_n - indent_n - join_n
-	    let s_nr  = strlen(substitute(str, '\S', '', 'g') ) - join_n
-	    let s_dup = s_add / s_nr
-	    let s_mod = s_add % s_nr
-
-	    " Test if the changed line fits with tw
-	    if 0 <= (str_n + (maxspaces - 1)*s_nr + indent_n) - tw
-
-		" Duplicate spaces
-		while s_dup > 0
-		    let str = substitute(str, '\( \+\)', ' \1', 'g')
-		    let s_dup = s_dup - 1
-		endwhile
-
-		" Add extra spaces from the end
-		while s_mod > 0
-		    let str = substitute(str, '\(\(\s\+\S\+\)\{' . s_mod .  '}\)$', ' \1', '')
-		    let s_mod = s_mod - 1
-		endwhile
-
-		" Indent the line
-		if indent_n > 0
-		    let str = substitute(str, '^', indent_str, '' )
-		endif
-
-		" Replace the line
-		call setline(cur, str)
-
-		" Convert to whitespace
-		if &et == 0
-		    exec cur . 'retab!'
-		endif
-
-	    endif   " Change of line
-	endif	" Possible change
-
-	let cur = cur + 1
-    endwhile
-
-    norm ^
-
-    let &report = save_report
-
-endfunction
-
-" EOF	vim: tw=78 ts=8 sw=4 sts=4 noet ai
+" Load the justify package.
+" For those users who were loading the justify plugin from here.
+packadd justify
diff --git a/runtime/macros/shellmenu.vim b/runtime/macros/shellmenu.vim
index 6175d1d9a6..4eb72a556a 100644
--- a/runtime/macros/shellmenu.vim
+++ b/runtime/macros/shellmenu.vim
@@ -1,94 +1,3 @@
-" When you're writing shell scripts and you are in doubt which test to use,
-" which shell environment variables are defined, what the syntax of the case
-" statement is, and you need to invoke 'man sh'?
-"
-" Your problems are over now!
-"
-" Attached is a Vim script file for turning gvim into a shell script editor.
-" It may also be used as an example how to use menus in Vim.
-"
-" Written by: Lennart Schultz <les@dmi.min.dk>
-
-imenu Stmts.for	for  in 
do

doneki	kk0elli
-imenu Stmts.case	case  in
) ;;
esacbki	k0elli
-imenu Stmts.if	if   
then

fiki	kk0elli
-imenu Stmts.if-else	if   
then

else

fiki	kki	kk0elli
-imenu Stmts.elif	elif   
then

ki	kk0elli
-imenu Stmts.while	while   
do

doneki	kk0elli
-imenu Stmts.break	break 
-imenu Stmts.continue	continue 
-imenu Stmts.function	() {

}ki	k0i
-imenu Stmts.return	return 
-imenu Stmts.return-true	return 0
-imenu Stmts.return-false	return 1
-imenu Stmts.exit	exit 
-imenu Stmts.shift	shift 
-imenu Stmts.trap	trap 
-imenu Test.existence	[ -e  ]hi
-imenu Test.existence - file		[ -f  ]hi
-imenu Test.existence - file (not empty)	[ -s  ]hi
-imenu Test.existence - directory	[ -d  ]hi
-imenu Test.existence - executable	[ -x  ]hi
-imenu Test.existence - readable	[ -r  ]hi
-imenu Test.existence - writable	[ -w  ]hi
-imenu Test.String is empty [ x = "x$" ]hhi
-imenu Test.String is not empty [ x != "x$" ]hhi
-imenu Test.Strings is equal [ "" = "" ]hhhhhhhi
-imenu Test.Strings is not equal [ "" != "" ]hhhhhhhhi
-imenu Test.Values is greater than [  -gt  ]hhhhhhi
-imenu Test.Values is greater equal [  -ge  ]hhhhhhi
-imenu Test.Values is equal [  -eq  ]hhhhhhi
-imenu Test.Values is not equal [  -ne  ]hhhhhhi
-imenu Test.Values is less than [  -lt  ]hhhhhhi
-imenu Test.Values is less equal [  -le  ]hhhhhhi
-imenu ParmSub.Substitute word if parm not set ${:-}hhi
-imenu ParmSub.Set parm to word if not set ${:=}hhi
-imenu ParmSub.Substitute word if parm set else nothing ${:+}hhi
-imenu ParmSub.If parm not set print word and exit ${:?}hhi
-imenu SpShVars.Number of positional parameters ${#}
-imenu SpShVars.All positional parameters (quoted spaces) ${*}
-imenu SpShVars.All positional parameters (unquoted spaces) ${@}
-imenu SpShVars.Flags set ${-}
-imenu SpShVars.Return code of last command ${?}
-imenu SpShVars.Process number of this shell ${$}
-imenu SpShVars.Process number of last background command ${!}
-imenu Environ.HOME ${HOME}
-imenu Environ.PATH ${PATH}
-imenu Environ.CDPATH ${CDPATH}
-imenu Environ.MAIL ${MAIL}
-imenu Environ.MAILCHECK ${MAILCHECK}
-imenu Environ.PS1 ${PS1}
-imenu Environ.PS2 ${PS2}
-imenu Environ.IFS ${IFS}
-imenu Environ.SHACCT ${SHACCT}
-imenu Environ.SHELL ${SHELL}
-imenu Environ.LC_CTYPE ${LC_CTYPE}
-imenu Environ.LC_MESSAGES ${LC_MESSAGES}
-imenu Builtins.cd cd
-imenu Builtins.echo echo
-imenu Builtins.eval eval
-imenu Builtins.exec exec
-imenu Builtins.export export
-imenu Builtins.getopts getopts
-imenu Builtins.hash hash
-imenu Builtins.newgrp newgrp
-imenu Builtins.pwd pwd
-imenu Builtins.read read
-imenu Builtins.readonly readonly
-imenu Builtins.return return
-imenu Builtins.times times
-imenu Builtins.type type
-imenu Builtins.umask umask
-imenu Builtins.wait wait
-imenu Set.set set
-imenu Set.unset unset
-imenu Set.mark modified or modified variables set -a
-imenu Set.exit when command returns non-zero exit code set -e
-imenu Set.Disable file name generation set -f
-imenu Set.remember function commands set -h
-imenu Set.All keyword arguments are placed in the environment set -k
-imenu Set.Read commands but do not execute them set -n
-imenu Set.Exit after reading and executing one command set -t
-imenu Set.Treat unset variables as an error when substituting set -u
-imenu Set.Print shell input lines as they are read set -v
-imenu Set.Print commands and their arguments as they are executed set -x
+" Load the shellmenu package.
+" For those users who were loading the shellmenu plugin from here.
+packadd shellmenu
diff --git a/runtime/macros/swapmous.vim b/runtime/macros/swapmous.vim
index 8b85be050b..5884d83473 100644
--- a/runtime/macros/swapmous.vim
+++ b/runtime/macros/swapmous.vim
@@ -1,22 +1,3 @@
-" These macros swap the left and right mouse buttons (for left handed)
-" Don't forget to do ":set mouse=a" or the mouse won't work at all
-noremap	 <LeftMouse>	<RightMouse>
-noremap	 <2-LeftMouse>	<2-RightMouse>
-noremap	 <3-LeftMouse>	<3-RightMouse>
-noremap	 <4-LeftMouse>	<4-RightMouse>
-noremap	 <LeftDrag>	<RightDrag>
-noremap	 <LeftRelease>	<RightRelease>
-noremap	 <RightMouse>	<LeftMouse>
-noremap	 <2-RightMouse>	<2-LeftMouse>
-noremap	 <3-RightMouse>	<3-LeftMouse>
-noremap	 <4-RightMouse>	<4-LeftMouse>
-noremap	 <RightDrag>	<LeftDrag>
-noremap	 <RightRelease>	<LeftRelease>
-noremap	 g<LeftMouse>	<C-RightMouse>
-noremap	 g<RightMouse>	<C-LeftMouse>
-noremap! <LeftMouse>	<RightMouse>
-noremap! <LeftDrag>	<RightDrag>
-noremap! <LeftRelease>	<RightRelease>
-noremap! <RightMouse>	<LeftMouse>
-noremap! <RightDrag>	<LeftDrag>
-noremap! <RightRelease>	<LeftRelease>
+" Load the swapmouse package.
+" For those users who were loading the swapmous plugin from here.
+packadd swapmouse
diff --git a/runtime/nvim.desktop b/runtime/nvim.desktop
new file mode 100644
index 0000000000..be6a2eda82
--- /dev/null
+++ b/runtime/nvim.desktop
@@ -0,0 +1,81 @@
+[Desktop Entry]
+Name=Neovim
+GenericName=Text Editor
+GenericName[de]=Texteditor
+Comment=Edit text files
+Comment[af]=Redigeer tekslêers
+Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
+Comment[ar]=حرّر ملفات نصية
+Comment[az]=Mətn fayllarını redaktə edin
+Comment[be]=Рэдагаваньне тэкставых файлаў
+Comment[bg]=Редактиране на текстови файлове
+Comment[bn]=টেক্স্ট ফাইল এডিট করুন
+Comment[bs]=Izmijeni tekstualne datoteke
+Comment[ca]=Edita fitxers de text
+Comment[cs]=Úprava textových souborů
+Comment[cy]=Golygu ffeiliau testun
+Comment[da]=Redigér tekstfiler
+Comment[de]=Textdateien bearbeiten
+Comment[el]=Επεξεργασία αρχείων κειμένου
+Comment[en_CA]=Edit text files
+Comment[en_GB]=Edit text files
+Comment[es]=Edita archivos de texto
+Comment[et]=Redigeeri tekstifaile
+Comment[eu]=Editatu testu-fitxategiak
+Comment[fa]=ویرایش پرونده‌های متنی
+Comment[fi]=Muokkaa tekstitiedostoja
+Comment[fr]=Édite des fichiers texte
+Comment[ga]=Eagar comhad Téacs
+Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
+Comment[he]=ערוך קבצי טקסט
+Comment[hi]=पाठ फ़ाइलें संपादित करें
+Comment[hr]=Uređivanje tekstualne datoteke
+Comment[hu]=Szövegfájlok szerkesztése
+Comment[id]=Edit file teks
+Comment[it]=Modifica file di testo
+Comment[ja]=テキストファイルを編集します
+Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
+Comment[ko]=텍스트 파일을 편집합니다
+Comment[lt]=Redaguoti tekstines bylas
+Comment[lv]=Rediģēt teksta failus
+Comment[mk]=Уреди текстуални фајлови
+Comment[ml]=വാചക രചനകള് തിരുത്തുക
+Comment[mn]=Текст файл боловсруулах
+Comment[mr]=गद्य फाइल संपादित करा
+Comment[ms]=Edit fail teks
+Comment[nb]=Rediger tekstfiler
+Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्
+Comment[nl]=Tekstbestanden bewerken
+Comment[nn]=Rediger tekstfiler
+Comment[no]=Rediger tekstfiler
+Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
+Comment[pl]=Edytor plików tekstowych
+Comment[pt]=Editar ficheiros de texto
+Comment[pt_BR]=Edite arquivos de texto
+Comment[ro]=Editare fişiere text
+Comment[ru]=Редактор текстовых файлов
+Comment[sk]=Úprava textových súborov
+Comment[sl]=Urejanje datotek z besedili
+Comment[sq]=Përpuno files teksti
+Comment[sr]=Измени текстуалне датотеке
+Comment[sr@Latn]=Izmeni tekstualne datoteke
+Comment[sv]=Redigera textfiler
+Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
+Comment[th]=แก้ไขแฟ้มข้อความ
+Comment[tk]=Metin faýllary editle
+Comment[tr]=Metin dosyalarını düzenle
+Comment[uk]=Редактор текстових файлів
+Comment[vi]=Soạn thảo tập tin văn bản
+Comment[wa]=Asspougnî des fitchîs tecses
+Comment[zh_CN]=编辑文本文件
+Comment[zh_TW]=編輯文字檔
+TryExec=nvim
+Exec=nvim %F
+Terminal=true
+Type=Application
+Keywords=Text;editor;
+Icon=nvim
+Categories=Utility;TextEditor;
+StartupNotify=false
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
diff --git a/runtime/nvim.png b/runtime/nvim.png
new file mode 100644
index 0000000000..dbc65ef363
--- /dev/null
+++ b/runtime/nvim.png
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 68444dde01..a7b94d73d4 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2015 Jul 22
+" Last Change:	2016 Aug 12
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -228,6 +228,8 @@ else
 endif
 call append("$", "runtimepath\tlist of directories used for runtime files and plugins")
 call <SID>OptionG("rtp", &rtp)
+call append("$", "packpath\tlist of directories used for plugin packages")
+call <SID>OptionG("pp", &pp)
 call append("$", "helpfile\tname of the main help file")
 call <SID>OptionG("hf", &hf)
 
@@ -708,6 +710,10 @@ call <SID>Header("editing text")
 call append("$", "undolevels\tmaximum number of changes that can be undone")
 call append("$", "\t(global or local to buffer)")
 call append("$", " \tset ul=" . &ul)
+call append("$", "undofile\tautomatically save and restore undo history")
+call <SID>BinOptionG("udf", &udf)
+call append("$", "undodir\tlist of directories for undo files")
+call <SID>OptionG("udir", &udir)
 call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload")
 call append("$", " \tset ur=" . &ur)
 call append("$", "modified\tchanges have been made and not written to a file")
@@ -1030,10 +1036,6 @@ if has("vertsplit")
   call append("$", "cmdwinheight\theight of the command-line window")
   call <SID>OptionG("cwh", &cwh)
 endif
-call append("$", "undofile\tautomatically save and restore undo history")
-call <SID>BinOptionG("udf", &udf)
-call append("$", "undodir\tlist of directories for undo files")
-call <SID>OptionG("udir", &udir)
 
 
 call <SID>Header("executing external commands")
@@ -1193,6 +1195,8 @@ if has("multi_byte")
   endif
   call append("$", "ambiwidth\twidth of ambiguous width characters")
   call <SID>OptionG("ambw", &ambw)
+  call append("$", "emoji\temoji characters are full width")
+  call <SID>BinOptionG("emo", &emo)
 endif
 
 
@@ -1246,6 +1250,9 @@ call append("$", "\t(local to buffer)")
 call <SID>BinOptionL("bl")
 call append("$", "debug\tset to \"msg\" to see all error messages")
 call append("$", " \tset debug=" . &debug)
+call append("$", "signcolumn\twhether to show the signcolumn")
+call append("$", "\t(local to window)")
+call <SID>OptionL("scl")
 
 set cpo&vim
 
diff --git a/runtime/pack/dist/opt/justify/plugin/justify.vim b/runtime/pack/dist/opt/justify/plugin/justify.vim
new file mode 100644
index 0000000000..4ef3bf95fa
--- /dev/null
+++ b/runtime/pack/dist/opt/justify/plugin/justify.vim
@@ -0,0 +1,316 @@
+" Function to left and right align text.
+"
+" Written by:	Preben "Peppe" Guldberg <c928400@student.dtu.dk>
+" Created:	980806 14:13 (or around that time anyway)
+" Revised:	001103 00:36 (See "Revisions" below)
+
+
+" function Justify( [ textwidth [, maxspaces [, indent] ] ] )
+"
+" Justify()  will  left  and  right  align  a  line  by  filling  in  an
+" appropriate amount of spaces.  Extra  spaces  are  added  to  existing
+" spaces starting from the right side of the line.  As an  example,  the
+" following documentation has been justified.
+"
+" The function takes the following arguments:
+
+" textwidth argument
+" ------------------
+" If not specified, the value of the 'textwidth'  option  is  used.   If
+" 'textwidth' is zero a value of 80 is used.
+"
+" Additionally the arguments 'tw' and '' are  accepted.   The  value  of
+" 'textwidth' will be used. These are handy, if you just want to specify
+" the maxspaces argument.
+
+" maxspaces argument
+" ------------------
+" If specified, alignment will only be done, if the  longest  space  run
+" after alignment is no longer than maxspaces.
+"
+" An argument of '' is accepted, should the user  like  to  specify  all
+" arguments.
+"
+" To aid user defined commands, negative  values  are  accepted  aswell.
+" Using a negative value specifies the default behaviour: any length  of
+" space runs will be used to justify the text.
+
+" indent argument
+" ---------------
+" This argument specifies how a line should be indented. The default  is
+" to keep the current indentation.
+"
+" Negative  values:  Keep  current   amount   of   leading   whitespace.
+" Positive values: Indent all lines with leading whitespace  using  this
+" amount of whitespace.
+"
+" Note that the value 0, needs to be quoted as  a  string.   This  value
+" leads to a left flushed text.
+"
+" Additionally units of  'shiftwidth'/'sw'  and  'tabstop'/'ts'  may  be
+" added. In this case, if the value of indent is positive, the amount of
+" whitespace to be  added  will  be  multiplied  by  the  value  of  the
+" 'shiftwidth' and 'tabstop' settings.  If these  units  are  used,  the
+"  argument must  be  given  as  a  string,  eg.   Justify('','','2sw').
+"
+" If the values of 'sw' or 'tw' are negative, they  are  treated  as  if
+" they were 0, which means that the text is flushed left.  There  is  no
+" check if a negative number prefix is used to  change  the  sign  of  a
+" negative 'sw' or 'ts' value.
+"
+" As with the other arguments,  ''  may  be  used  to  get  the  default
+" behaviour.
+
+
+" Notes:
+"
+" If the line, adjusted for space runs and leading/trailing  whitespace,
+" is wider than the used textwidth, the line will be left untouched  (no
+" whitespace removed).  This should be equivalent to  the  behaviour  of
+" :left, :right and :center.
+"
+" If the resulting line is shorter than the used textwidth  it  is  left
+" untouched.
+"
+" All space runs in the line  are  truncated  before  the  alignment  is
+" carried out.
+"
+" If you have set 'noexpandtab', :retab!  is used to replace space  runs
+"  with whitespace  using  the  value  of  'tabstop'.   This  should  be
+" conformant with :left, :right and :center.
+"
+" If joinspaces is set, an extra space is added after '.', '?' and  '!'.
+" If 'cpooptions' include 'j', extra space  is  only  added  after  '.'.
+" (This may on occasion conflict with maxspaces.)
+
+
+" Related mappings:
+"
+" Mappings that will align text using the current text width,  using  at
+" most four spaces in a  space  run  and  keeping  current  indentation.
+nmap _j :%call Justify('tw',4)<CR>
+vmap _j :call Justify('tw',4)<CR>
+"
+" Mappings that will remove space runs and format lines (might be useful
+" prior to aligning the text).
+nmap ,gq :%s/\s\+/ /g<CR>gq1G
+vmap ,gq :s/\s\+/ /g<CR>gvgq
+
+
+" User defined command:
+"
+" The following is an ex command that works as a shortcut to the Justify
+" function.  Arguments to Justify() can  be  added  after  the  command.
+com! -range -nargs=* Justify <line1>,<line2>call Justify(<f-args>)
+"
+" The following commands are all equivalent:
+"
+" 1. Simplest use of Justify():
+"       :call Justify()
+"       :Justify
+"
+" 2. The _j mapping above via the ex command:
+"       :%Justify tw 4
+"
+" 3.  Justify  visualised  text  at  72nd  column  while  indenting  all
+" previously indented text two shiftwidths
+"       :'<,'>call Justify(72,'','2sw')
+"       :'<,'>Justify 72 -1 2sw
+"
+" This documentation has been justified  using  the  following  command:
+":se et|kz|1;/^" function Justify(/+,'z-g/^" /s/^" //|call Justify(70,3)|s/^/" /
+
+" Revisions:
+" 001103: If 'joinspaces' was set, calculations could be wrong.
+"	  Tabs at start of line could also lead to errors.
+"	  Use setline() instead of "exec 's/foo/bar/' - safer.
+"	  Cleaned up the code a bit.
+"
+" Todo:	  Convert maps to the new script specific form
+
+" Error function
+function! Justify_error(message)
+    echohl Error
+    echo "Justify([tw, [maxspaces [, indent]]]): " . a:message
+    echohl None
+endfunction
+
+
+" Now for the real thing
+function! Justify(...) range
+
+    if a:0 > 3
+    call Justify_error("Too many arguments (max 3)")
+    return 1
+    endif
+
+    " Set textwidth (accept 'tw' and '' as arguments)
+    if a:0 >= 1
+	if a:1 =~ '^\(tw\)\=$'
+	    let tw = &tw
+	elseif a:1 =~ '^\d\+$'
+	    let tw = a:1
+	else
+	    call Justify_error("tw must be a number (>0), '' or 'tw'")
+	    return 2
+	endif
+    else
+	let tw = &tw
+    endif
+    if tw == 0
+	let tw = 80
+    endif
+
+    " Set maximum number of spaces between WORDs
+    if a:0 >= 2
+	if a:2 == ''
+	    let maxspaces = tw
+	elseif a:2 =~ '^-\d\+$'
+	    let maxspaces = tw
+	elseif a:2 =~ '^\d\+$'
+	    let maxspaces = a:2
+	else
+	    call Justify_error("maxspaces must be a number or ''")
+	    return 3
+	endif
+    else
+	let maxspaces = tw
+    endif
+    if maxspaces <= 1
+	call Justify_error("maxspaces should be larger than 1")
+	return 4
+    endif
+
+    " Set the indentation style (accept sw and ts units)
+    let indent_fix = ''
+    if a:0 >= 3
+	if (a:3 == '') || a:3 =~ '^-[1-9]\d*\(shiftwidth\|sw\|tabstop\|ts\)\=$'
+	    let indent = -1
+	elseif a:3 =~ '^-\=0\(shiftwidth\|sw\|tabstop\|ts\)\=$'
+	    let indent = 0
+	elseif a:3 =~ '^\d\+\(shiftwidth\|sw\|tabstop\|ts\)\=$'
+	    let indent = substitute(a:3, '\D', '', 'g')
+	elseif a:3 =~ '^\(shiftwidth\|sw\|tabstop\|ts\)$'
+	    let indent = 1
+	else
+	    call Justify_error("indent: a number with 'sw'/'ts' unit")
+	    return 5
+	endif
+	if indent >= 0
+	    while indent > 0
+		let indent_fix = indent_fix . ' '
+		let indent = indent - 1
+	    endwhile
+	    let indent_sw = 0
+	    if a:3 =~ '\(shiftwidth\|sw\)'
+		let indent_sw = &sw
+	    elseif a:3 =~ '\(tabstop\|ts\)'
+		let indent_sw = &ts
+	    endif
+	    let indent_fix2 = ''
+	    while indent_sw > 0
+		let indent_fix2 = indent_fix2 . indent_fix
+		let indent_sw = indent_sw - 1
+	    endwhile
+	    let indent_fix = indent_fix2
+	endif
+    else
+	let indent = -1
+    endif
+
+    " Avoid substitution reports
+    let save_report = &report
+    set report=1000000
+
+    " Check 'joinspaces' and 'cpo'
+    if &js == 1
+	if &cpo =~ 'j'
+	    let join_str = '\(\. \)'
+	else
+	    let join_str = '\([.!?!] \)'
+	endif
+    endif
+
+    let cur = a:firstline
+    while cur <= a:lastline
+
+	let str_orig = getline(cur)
+	let save_et = &et
+	set et
+	exec cur . "retab"
+	let &et = save_et
+	let str = getline(cur)
+
+	let indent_str = indent_fix
+	let indent_n = strlen(indent_str)
+	" Shall we remember the current indentation
+	if indent < 0
+	    let indent_orig = matchstr(str_orig, '^\s*')
+	    if strlen(indent_orig) > 0
+		let indent_str = indent_orig
+		let indent_n = strlen(matchstr(str, '^\s*'))
+	    endif
+	endif
+
+	" Trim trailing, leading and running whitespace
+	let str = substitute(str, '\s\+$', '', '')
+	let str = substitute(str, '^\s\+', '', '')
+	let str = substitute(str, '\s\+', ' ', 'g')
+	let str_n = strdisplaywidth(str)
+
+	" Possible addition of space after punctuation
+	if exists("join_str")
+	    let str = substitute(str, join_str, '\1 ', 'g')
+	endif
+	let join_n = strdisplaywidth(str) - str_n
+
+	" Can extraspaces be added?
+	" Note that str_n may be less than strlen(str) [joinspaces above]
+	if strdisplaywidth(str) <= tw - indent_n && str_n > 0
+	    " How many spaces should be added
+	    let s_add = tw - str_n - indent_n - join_n
+	    let s_nr  = strlen(substitute(str, '\S', '', 'g') ) - join_n
+	    let s_dup = s_add / s_nr
+	    let s_mod = s_add % s_nr
+
+	    " Test if the changed line fits with tw
+	    if 0 <= (str_n + (maxspaces - 1)*s_nr + indent_n) - tw
+
+		" Duplicate spaces
+		while s_dup > 0
+		    let str = substitute(str, '\( \+\)', ' \1', 'g')
+		    let s_dup = s_dup - 1
+		endwhile
+
+		" Add extra spaces from the end
+		while s_mod > 0
+		    let str = substitute(str, '\(\(\s\+\S\+\)\{' . s_mod .  '}\)$', ' \1', '')
+		    let s_mod = s_mod - 1
+		endwhile
+
+		" Indent the line
+		if indent_n > 0
+		    let str = substitute(str, '^', indent_str, '' )
+		endif
+
+		" Replace the line
+		call setline(cur, str)
+
+		" Convert to whitespace
+		if &et == 0
+		    exec cur . 'retab!'
+		endif
+
+	    endif   " Change of line
+	endif	" Possible change
+
+	let cur = cur + 1
+    endwhile
+
+    norm ^
+
+    let &report = save_report
+
+endfunction
+
+" EOF	vim: tw=78 ts=8 sw=4 sts=4 noet ai
diff --git a/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim b/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
new file mode 100644
index 0000000000..6175d1d9a6
--- /dev/null
+++ b/runtime/pack/dist/opt/shellmenu/plugin/shellmenu.vim
@@ -0,0 +1,94 @@
+" When you're writing shell scripts and you are in doubt which test to use,
+" which shell environment variables are defined, what the syntax of the case
+" statement is, and you need to invoke 'man sh'?
+"
+" Your problems are over now!
+"
+" Attached is a Vim script file for turning gvim into a shell script editor.
+" It may also be used as an example how to use menus in Vim.
+"
+" Written by: Lennart Schultz <les@dmi.min.dk>
+
+imenu Stmts.for	for  in 
do

doneki	kk0elli
+imenu Stmts.case	case  in
) ;;
esacbki	k0elli
+imenu Stmts.if	if   
then

fiki	kk0elli
+imenu Stmts.if-else	if   
then

else

fiki	kki	kk0elli
+imenu Stmts.elif	elif   
then

ki	kk0elli
+imenu Stmts.while	while   
do

doneki	kk0elli
+imenu Stmts.break	break 
+imenu Stmts.continue	continue 
+imenu Stmts.function	() {

}ki	k0i
+imenu Stmts.return	return 
+imenu Stmts.return-true	return 0
+imenu Stmts.return-false	return 1
+imenu Stmts.exit	exit 
+imenu Stmts.shift	shift 
+imenu Stmts.trap	trap 
+imenu Test.existence	[ -e  ]hi
+imenu Test.existence - file		[ -f  ]hi
+imenu Test.existence - file (not empty)	[ -s  ]hi
+imenu Test.existence - directory	[ -d  ]hi
+imenu Test.existence - executable	[ -x  ]hi
+imenu Test.existence - readable	[ -r  ]hi
+imenu Test.existence - writable	[ -w  ]hi
+imenu Test.String is empty [ x = "x$" ]hhi
+imenu Test.String is not empty [ x != "x$" ]hhi
+imenu Test.Strings is equal [ "" = "" ]hhhhhhhi
+imenu Test.Strings is not equal [ "" != "" ]hhhhhhhhi
+imenu Test.Values is greater than [  -gt  ]hhhhhhi
+imenu Test.Values is greater equal [  -ge  ]hhhhhhi
+imenu Test.Values is equal [  -eq  ]hhhhhhi
+imenu Test.Values is not equal [  -ne  ]hhhhhhi
+imenu Test.Values is less than [  -lt  ]hhhhhhi
+imenu Test.Values is less equal [  -le  ]hhhhhhi
+imenu ParmSub.Substitute word if parm not set ${:-}hhi
+imenu ParmSub.Set parm to word if not set ${:=}hhi
+imenu ParmSub.Substitute word if parm set else nothing ${:+}hhi
+imenu ParmSub.If parm not set print word and exit ${:?}hhi
+imenu SpShVars.Number of positional parameters ${#}
+imenu SpShVars.All positional parameters (quoted spaces) ${*}
+imenu SpShVars.All positional parameters (unquoted spaces) ${@}
+imenu SpShVars.Flags set ${-}
+imenu SpShVars.Return code of last command ${?}
+imenu SpShVars.Process number of this shell ${$}
+imenu SpShVars.Process number of last background command ${!}
+imenu Environ.HOME ${HOME}
+imenu Environ.PATH ${PATH}
+imenu Environ.CDPATH ${CDPATH}
+imenu Environ.MAIL ${MAIL}
+imenu Environ.MAILCHECK ${MAILCHECK}
+imenu Environ.PS1 ${PS1}
+imenu Environ.PS2 ${PS2}
+imenu Environ.IFS ${IFS}
+imenu Environ.SHACCT ${SHACCT}
+imenu Environ.SHELL ${SHELL}
+imenu Environ.LC_CTYPE ${LC_CTYPE}
+imenu Environ.LC_MESSAGES ${LC_MESSAGES}
+imenu Builtins.cd cd
+imenu Builtins.echo echo
+imenu Builtins.eval eval
+imenu Builtins.exec exec
+imenu Builtins.export export
+imenu Builtins.getopts getopts
+imenu Builtins.hash hash
+imenu Builtins.newgrp newgrp
+imenu Builtins.pwd pwd
+imenu Builtins.read read
+imenu Builtins.readonly readonly
+imenu Builtins.return return
+imenu Builtins.times times
+imenu Builtins.type type
+imenu Builtins.umask umask
+imenu Builtins.wait wait
+imenu Set.set set
+imenu Set.unset unset
+imenu Set.mark modified or modified variables set -a
+imenu Set.exit when command returns non-zero exit code set -e
+imenu Set.Disable file name generation set -f
+imenu Set.remember function commands set -h
+imenu Set.All keyword arguments are placed in the environment set -k
+imenu Set.Read commands but do not execute them set -n
+imenu Set.Exit after reading and executing one command set -t
+imenu Set.Treat unset variables as an error when substituting set -u
+imenu Set.Print shell input lines as they are read set -v
+imenu Set.Print commands and their arguments as they are executed set -x
diff --git a/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
new file mode 100644
index 0000000000..8b85be050b
--- /dev/null
+++ b/runtime/pack/dist/opt/swapmouse/plugin/swapmouse.vim
@@ -0,0 +1,22 @@
+" These macros swap the left and right mouse buttons (for left handed)
+" Don't forget to do ":set mouse=a" or the mouse won't work at all
+noremap	 <LeftMouse>	<RightMouse>
+noremap	 <2-LeftMouse>	<2-RightMouse>
+noremap	 <3-LeftMouse>	<3-RightMouse>
+noremap	 <4-LeftMouse>	<4-RightMouse>
+noremap	 <LeftDrag>	<RightDrag>
+noremap	 <LeftRelease>	<RightRelease>
+noremap	 <RightMouse>	<LeftMouse>
+noremap	 <2-RightMouse>	<2-LeftMouse>
+noremap	 <3-RightMouse>	<3-LeftMouse>
+noremap	 <4-RightMouse>	<4-LeftMouse>
+noremap	 <RightDrag>	<LeftDrag>
+noremap	 <RightRelease>	<LeftRelease>
+noremap	 g<LeftMouse>	<C-RightMouse>
+noremap	 g<RightMouse>	<C-LeftMouse>
+noremap! <LeftMouse>	<RightMouse>
+noremap! <LeftDrag>	<RightDrag>
+noremap! <LeftRelease>	<RightRelease>
+noremap! <RightMouse>	<LeftMouse>
+noremap! <RightDrag>	<LeftDrag>
+noremap! <RightRelease>	<LeftRelease>
diff --git a/runtime/autoload/vimball.vim b/runtime/pack/dist/opt/vimball/autoload/vimball.vim
index 9a5a73c3c1..1af6b19c88 100644
--- a/runtime/autoload/vimball.vim
+++ b/runtime/pack/dist/opt/vimball/autoload/vimball.vim
@@ -1,9 +1,9 @@
 " vimball.vim : construct a file containing both paths and files
-" Author:	Charles E. Campbell, Jr.
-" Date:		Jan 17, 2012
-" Version:	35
+" Author:	Charles E. Campbell
+" Date:		Apr 11, 2016
+" Version:	37
 " GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
-" Copyright: (c) 2004-2011 by Charles E. Campbell, Jr.
+" Copyright: (c) 2004-2011 by Charles E. Campbell
 "            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
 "            (see |copyright|) except use "Vimball" instead of "Vim".
 "            No warranty, express or implied.
@@ -14,7 +14,7 @@
 if &cp || exists("g:loaded_vimball")
  finish
 endif
-let g:loaded_vimball = "v35"
+let g:loaded_vimball = "v37"
 if v:version < 702
  echohl WarningMsg
  echo "***warning*** this version of vimball needs vim 7.2"
@@ -142,7 +142,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
  
    let lastline= line("$") + 1
    if lastline == 2 && getline("$") == ""
-	call setline(1,'" Vimball Archiver by Charles E. Campbell, Jr., Ph.D.')
+	call setline(1,'" Vimball Archiver by Charles E. Campbell')
 	call setline(2,'UseVimball')
 	call setline(3,'finish')
 	let lastline= line("$") + 1
@@ -179,7 +179,7 @@ fun! vimball#MkVimball(line1,line2,writelevel,...) range
   " remove the evidence
   setlocal nomod bh=wipe
   exe "tabn ".curtabnr
-  exe "tabc ".vbtabnr
+  exe "tabc! ".vbtabnr
 
   " restore options
   call vimball#RestoreSettings()
@@ -280,7 +280,7 @@ fun! vimball#Vimball(really,...)
    " when AsNeeded/filename is filereadable or was present in VimballRecord
    if fname =~ '\<plugin/'
    	let anfname= substitute(fname,'\<plugin/','AsNeeded/','')
-	if filereadable(anfname) || (exists("s:VBRstring") && s:VBRstring =~ anfname)
+	if filereadable(anfname) || (exists("s:VBRstring") && s:VBRstring =~# anfname)
 "	 call Decho("using anfname<".anfname."> instead of <".fname.">")
 	 let fname= anfname
 	endif
@@ -379,10 +379,10 @@ fun! vimball#Vimball(really,...)
   call s:RecordInFile(home)
 
   " restore events, delete tab and buffer
-  exe "tabn ".vbtabnr
+  exe "sil! tabn ".vbtabnr
   setlocal nomod bh=wipe
-  exe "tabn ".curtabnr
-  exe "tabc ".vbtabnr
+  exe "sil! tabn ".curtabnr
+  exe "sil! tabc! ".vbtabnr
   call vimball#RestoreSettings()
   call s:ChgDir(curdir)
 
@@ -555,7 +555,7 @@ fun! vimball#ShowMesg(level,msg)
   set noruler noshowcmd
   redraw!
 
-  if &fo =~ '[ta]'
+  if &fo =~# '[ta]'
    echomsg "***vimball*** ".a:msg
   else
    if a:level == s:WARNING || a:level == s:USAGE
@@ -715,7 +715,7 @@ fun! vimball#SaveSettings()
 "  call Dfunc("SaveSettings()")
   let s:makeep  = getpos("'a")
   let s:regakeep= @a
-  if exists("&acd")
+  if exists("+acd")
    let s:acdkeep = &acd
   endif
   let s:eikeep  = &ei
@@ -728,7 +728,7 @@ fun! vimball#SaveSettings()
   let s:vekeep  = &ve
   let s:ffkeep  = &l:ff
   let s:swfkeep = &l:swf
-  if exists("&acd")
+  if exists("+acd")
    setlocal ei=all ve=all noacd nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
   else
    setlocal ei=all ve=all       nofen noic report=999 nohid bt= ma lz pm= ff=unix noswf
@@ -743,7 +743,7 @@ endfun
 fun! vimball#RestoreSettings()
 "  call Dfunc("RestoreSettings()")
   let @a      = s:regakeep
-  if exists("&acd")
+  if exists("+acd")
    let &acd   = s:acdkeep
   endif
   let &l:fen  = s:fenkeep
@@ -760,7 +760,7 @@ fun! vimball#RestoreSettings()
 "   call Decho("restore mark-a: makeep=".string(makeep))
    call setpos("'a",s:makeep)
   endif
-  if exists("&acd")
+  if exists("+acd")
    unlet s:acdkeep
   endif
   unlet s:regakeep s:eikeep s:fenkeep s:hidkeep s:ickeep s:repkeep s:vekeep s:makeep s:lzkeep s:pmkeep s:ffkeep
diff --git a/runtime/doc/pi_vimball.txt b/runtime/pack/dist/opt/vimball/doc/vimball.txt
index bbc74988ca..9965a216e4 100644
--- a/runtime/doc/pi_vimball.txt
+++ b/runtime/pack/dist/opt/vimball/doc/vimball.txt
@@ -1,4 +1,4 @@
-*pi_vimball.txt*	For Vim version 7.4.  Last change: 2012 Jan 17
+*vimball.txt*	For Vim version 7.4.  Last change: 2012 Jan 17
 
 			       ----------------
 			       Vimball Archiver
diff --git a/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim b/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
new file mode 100644
index 0000000000..d7473a0296
--- /dev/null
+++ b/runtime/pack/dist/opt/vimball/plugin/vimballPlugin.vim
@@ -0,0 +1,43 @@
+" vimballPlugin : construct a file containing both paths and files
+" Author: Charles E. Campbell
+" Copyright: (c) 2004-2014 by Charles E. Campbell
+"            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
+"            (see |copyright|) except use "Vimball" instead of "Vim".
+"            No warranty, express or implied.
+"  *** ***   Use At-Your-Own-Risk!   *** ***
+"
+" (Rom 2:1 WEB) Therefore you are without excuse, O man, whoever you are who
+"      judge. For in that which you judge another, you condemn yourself. For
+"      you who judge practice the same things.
+" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
+
+" ---------------------------------------------------------------------
+"  Load Once: {{{1
+if &cp || exists("g:loaded_vimballPlugin")
+ finish
+endif
+let g:loaded_vimballPlugin = "v37"
+let s:keepcpo              = &cpo
+set cpo&vim
+
+" ------------------------------------------------------------------------------
+" Public Interface: {{{1
+com! -range   -complete=file -nargs=+ -bang MkVimball		call vimball#MkVimball(<line1>,<line2>,<bang>0,<f-args>)
+com! -nargs=? -complete=dir  UseVimball						call vimball#Vimball(1,<f-args>)
+com! -nargs=0                VimballList					call vimball#Vimball(0)
+com! -nargs=* -complete=dir  RmVimball						call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
+augroup Vimball
+ au!
+ au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif
+ au SourceCmd *.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz			let s:origfile=expand("%")|if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if s:origfile!=expand("<afile>")|close|endif
+ au SourceCmd *.vba											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
+ au BufEnter  *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif
+ au SourceCmd *.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz			let s:origfile=expand("%")|if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if s:origfile!=expand("<afile>")|close|endif
+ au SourceCmd *.vmb											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
+augroup END
+
+" =====================================================================
+" Restoration And Modelines: {{{1
+" vim: fdm=marker
+let &cpo= s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/plugin/health.vim b/runtime/plugin/health.vim
new file mode 100644
index 0000000000..e3482cb0fe
--- /dev/null
+++ b/runtime/plugin/health.vim
@@ -0,0 +1,8 @@
+function! s:complete(lead, _line, _pos) abort
+  return sort(filter(map(globpath(&runtimepath, 'autoload/health/*', 1, 1),
+        \ 'fnamemodify(v:val, ":t:r")'),
+        \ 'empty(a:lead) || v:val[:strlen(a:lead)-1] ==# a:lead'))
+endfunction
+
+command! -nargs=* -complete=customlist,s:complete CheckHealth
+      \ call health#check([<f-args>])
diff --git a/runtime/plugin/man.vim b/runtime/plugin/man.vim
index 8e5062a209..63faa15213 100644
--- a/runtime/plugin/man.vim
+++ b/runtime/plugin/man.vim
@@ -1,6 +1,13 @@
-if get(g:, 'loaded_man', 0)
+" Maintainer: Anmol Sethi <anmol@aubble.com>
+
+if exists('g:loaded_man')
   finish
 endif
 let g:loaded_man = 1
 
-command! -count=0 -nargs=+ Man call man#get_page(<count>, <f-args>)
+command! -range=0 -complete=customlist,man#complete -nargs=* Man call man#open_page(v:count, v:count1, <q-mods>, <f-args>)
+
+augroup man
+  autocmd!
+  autocmd BufReadCmd man://* call man#read_page(matchstr(expand('<amatch>'), 'man://\zs.*'))
+augroup END
diff --git a/runtime/plugin/matchit.vim b/runtime/plugin/matchit.vim
index 70867b1f93..c0f1f08027 100644
--- a/runtime/plugin/matchit.vim
+++ b/runtime/plugin/matchit.vim
@@ -1,7 +1,8 @@
 "  matchit.vim: (global plugin) Extended "%" matching
-"  Last Change: Fri Jan 25 10:00 AM 2008 EST
+"  Last Change: Fri Jul 29 01:20 AM 2016 EST
 "  Maintainer:  Benji Fisher PhD   <benji@member.AMS.org>
 "  Version:     1.13.2, for Vim 6.3+
+"		Fix from Tommy Allen included.
 "  URL:		http://www.vim.org/script.php?script_id=39
 
 " Documentation:
@@ -122,7 +123,6 @@ function! s:Match_wrapper(word, forward, mode) range
 " Thanks to Preben "Peppe" Guldberg and Bram Moolenaar for this suggestion!
   if (match_words != s:last_words) || (&mps != s:last_mps) ||
     \ exists("b:match_debug")
-    let s:last_words = match_words
     let s:last_mps = &mps
     " The next several lines were here before
     " BF started messing with this script.
@@ -134,6 +134,7 @@ function! s:Match_wrapper(word, forward, mode) range
       \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
     " s:all = pattern with all the keywords
     let match_words = match_words . (strlen(match_words) ? "," : "") . default
+    let s:last_words = match_words
     if match_words !~ s:notslash . '\\\d'
       let s:do_BR = 0
       let s:pat = match_words
@@ -254,12 +255,7 @@ function! s:Match_wrapper(word, forward, mode) range
 
   " Fifth step:  actually start moving the cursor and call searchpair().
   " Later, :execute restore_cursor to get to the original screen.
-  let restore_cursor = virtcol(".") . "|"
-  normal! g0
-  let restore_cursor = line(".") . "G" .  virtcol(".") . "|zs" . restore_cursor
-  normal! H
-  let restore_cursor = "normal!" . line(".") . "Gzt" . restore_cursor
-  execute restore_cursor
+  let view = winsaveview()
   call cursor(0, curcol + 1)
   " normal! 0
   " if curcol
@@ -273,7 +269,7 @@ function! s:Match_wrapper(word, forward, mode) range
   let sp_return = searchpair(ini, mid, fin, flag, skip)
   let final_position = "call cursor(" . line(".") . "," . col(".") . ")"
   " Restore cursor position and original screen.
-  execute restore_cursor
+  call winrestview(view)
   normal! m'
   if sp_return > 0
     execute final_position
@@ -634,7 +630,7 @@ endfun
 " idea to give it its own matching patterns.
 fun! s:MultiMatch(spflag, mode)
   if !exists("b:match_words") || b:match_words == ""
-    return ""
+    return {}
   end
   let restore_options = (&ic ? "" : "no") . "ignorecase"
   if exists("b:match_ignorecase")
@@ -694,15 +690,7 @@ fun! s:MultiMatch(spflag, mode)
     let skip = 's:comment\|string'
   endif
   let skip = s:ParseSkip(skip)
-  " let restore_cursor = line(".") . "G" . virtcol(".") . "|"
-  " normal! H
-  " let restore_cursor = "normal!" . line(".") . "Gzt" . restore_cursor
-  let restore_cursor = virtcol(".") . "|"
-  normal! g0
-  let restore_cursor = line(".") . "G" .  virtcol(".") . "|zs" . restore_cursor
-  normal! H
-  let restore_cursor = "normal!" . line(".") . "Gzt" . restore_cursor
-  execute restore_cursor
+  let view = winsaveview()
 
   " Third step: call searchpair().
   " Replace '\('--but not '\\('--with '\%(' and ',' with '\|'.
@@ -720,14 +708,14 @@ fun! s:MultiMatch(spflag, mode)
   while level
     if searchpair(openpat, '', closepat, a:spflag, skip) < 1
       call s:CleanUp(restore_options, a:mode, startline, startcol)
-      return ""
+      return {}
     endif
     let level = level - 1
   endwhile
 
-  " Restore options and return a string to restore the original position.
+  " Restore options and return view dict to restore the original position.
   call s:CleanUp(restore_options, a:mode, startline, startcol)
-  return restore_cursor
+  return view
 endfun
 
 " Search backwards for "if" or "while" or "<tag>" or ...
diff --git a/runtime/plugin/matchparen.vim b/runtime/plugin/matchparen.vim
index 873302efee..5db1f64c78 100644
--- a/runtime/plugin/matchparen.vim
+++ b/runtime/plugin/matchparen.vim
@@ -1,6 +1,6 @@
 " Vim plugin for showing matching parens
 " Maintainer:  Bram Moolenaar <Bram@vim.org>
-" Last Change: 2015 Dec 31
+" Last Change: 2016 Feb 16
 
 " Exit quickly when:
 " - this plugin was already loaded (or disabled)
diff --git a/runtime/plugin/netrwPlugin.vim b/runtime/plugin/netrwPlugin.vim
index 3776ac30f8..28e1c3ecf8 100644
--- a/runtime/plugin/netrwPlugin.vim
+++ b/runtime/plugin/netrwPlugin.vim
@@ -1,6 +1,6 @@
 " netrwPlugin.vim: Handles file transfer and remote directory listing across a network
 "            PLUGIN SECTION
-" Date:		Nov 07, 2014
+" Date:		Feb 08, 2016
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
 " Copyright:    Copyright (C) 1999-2013 Charles E. Campbell {{{1
@@ -20,7 +20,7 @@
 if &cp || exists("g:loaded_netrwPlugin")
  finish
 endif
-let g:loaded_netrwPlugin = "v154"
+let g:loaded_netrwPlugin = "v156"
 let s:keepcpo = &cpo
 set cpo&vim
 "DechoRemOn
@@ -55,10 +55,10 @@ augroup Network
 augroup END
 
 " Commands: :Nread, :Nwrite, :NetUserPass {{{2
-com! -count=1 -nargs=*	Nread		call netrw#SavePosn()<bar>call netrw#NetRead(<count>,<f-args>)<bar>call netrw#RestorePosn()
-com! -range=% -nargs=*	Nwrite		call netrw#SavePosn()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call netrw#RestorePosn()
+com! -count=1 -nargs=*	Nread		let s:svpos= winsaveview()<bar>call netrw#NetRead(<count>,<f-args>)<bar>call winrestview(s:svpos)
+com! -range=% -nargs=*	Nwrite		let s:svpos= winsaveview()<bar><line1>,<line2>call netrw#NetWrite(<f-args>)<bar>call winrestview(s:svpos)
 com! -nargs=*		NetUserPass	call NetUserPass(<f-args>)
-com! -nargs=*	        Nsource		call netrw#SavePosn()<bar>call netrw#NetSource(<f-args>)<bar>call netrw#RestorePosn()
+com! -nargs=*	        Nsource		let s:svpos= winsaveview()<bar>call netrw#NetSource(<f-args>)<bar>call winrestview(s:svpos)
 com! -nargs=?		Ntree		call netrw#SetTreetop(<q-args>)
 
 " Commands: :Explore, :Sexplore, Hexplore, Vexplore, Lexplore {{{2
diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim
deleted file mode 100644
index 59279774ca..0000000000
--- a/runtime/plugin/vimballPlugin.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-" vimballPlugin : construct a file containing both paths and files
-" Author: Charles E. Campbell, Jr.
-" Copyright: (c) 2004-2010 by Charles E. Campbell, Jr.
-"            The VIM LICENSE applies to Vimball.vim, and Vimball.txt
-"            (see |copyright|) except use "Vimball" instead of "Vim".
-"            No warranty, express or implied.
-"  *** ***   Use At-Your-Own-Risk!   *** ***
-"
-" (Rom 2:1 WEB) Therefore you are without excuse, O man, whoever you are who
-"      judge. For in that which you judge another, you condemn yourself. For
-"      you who judge practice the same things.
-" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
-
-" ---------------------------------------------------------------------
-"  Load Once: {{{1
-if &cp || exists("g:loaded_vimballPlugin")
- finish
-endif
-let g:loaded_vimballPlugin = "v35"
-let s:keepcpo              = &cpo
-set cpo&vim
-
-" ------------------------------------------------------------------------------
-" Public Interface: {{{1
-com! -ra   -complete=file -na=+ -bang MkVimball				call vimball#MkVimball(<line1>,<line2>,<bang>0,<f-args>)
-com! -na=? -complete=dir  UseVimball						call vimball#Vimball(1,<f-args>)
-com! -na=0                VimballList						call vimball#Vimball(0)
-com! -na=* -complete=dir  RmVimball							call vimball#SaveSettings()|call vimball#RmVimball(<f-args>)|call vimball#RestoreSettings()
-au BufEnter  *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
-au SourceCmd *.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz			if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if expand("%")!=expand("<afile>")|close|endif
-au SourceCmd *.vba											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
-au BufEnter  *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz	setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")
-au SourceCmd *.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz			if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|endif|call vimball#Decompress(expand("<amatch>"))|so %|if expand("%")!=expand("<afile>")|close|endif
-au SourceCmd *.vmb											if expand("%")!=expand("<afile>") | exe "1sp" fnameescape(expand("<afile>"))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif
-
-" =====================================================================
-" Restoration And Modelines: {{{1
-" vim: fdm=marker
-let &cpo= s:keepcpo
-unlet s:keepcpo
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index b62b0a5db8..c2f6d5cff1 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types in scripts
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last change:	2014 Aug 24
+" Last change:	2016 May 21
 
 " This file is called by an autocommand for every file that has just been
 " loaded into a buffer.  It checks if the type of file can be recognized by
@@ -240,7 +240,8 @@ else
     set ft=xhtml
 
     " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
-  elseif s:line1 =~? '\<DOCTYPE\s\+html\>'
+    " Avoid "doctype html", used by slim.
+  elseif s:line1 =~? '<!DOCTYPE\s\+html\>'
     set ft=html
 
     " PDF
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 76f60131f2..01dad3c7f2 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -61,6 +61,7 @@ an 50.10.320 &Syntax.AB.Ascii\ Doc :cal SetSyn("asciidoc")<CR>
 an 50.10.330 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
 an 50.10.340 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
 an 50.10.350 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
+an 50.10.355 &Syntax.AB.Assembly.AVR :cal SetSyn("avra")<CR>
 an 50.10.360 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
 an 50.10.370 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
 an 50.10.380 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim
index 0607ca10f5..7a31b2d15e 100644
--- a/runtime/syntax/aptconf.vim
+++ b/runtime/syntax/aptconf.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	APT config file
 " Maintainer:	Yann Amar <quidame@poivron.org>
-" Last Change:	2013 Apr 12
+" Last Change:	2015 Dec 22
 
 " For version 5.x: Clear all syntax items
 " For version 6.x and 7.x: Quit when a syntax file was already loaded
@@ -38,22 +38,22 @@ setlocal iskeyword+=/,-,.,_,+
 
 " Incomplete keywords will be treated differently than completely bad strings:
 syn keyword	aptconfGroupIncomplete
-	\ a[cquire] a[ptitude] d[ebtags] d[ebug] d[ir] d[pkg] d[select]
-	\ o[rderlist] p[ackagemanager] p[kgcachegen] q[uiet] r[pm]
-	\ u[nattended-upgrade]
+	\ a[cquire] a[dequate] a[ptitude] a[ptlistbugs] d[ebtags] d[ebug]
+	\ d[ir] d[pkg] d[select] o[rderlist] p[ackagemanager] p[kgcachegen]
+	\ q[uiet] r[pm] s[ynaptic] u[nattended-upgrade] w[hatmaps]
 
 " Only the following keywords can be used at toplevel (to begin an option):
 syn keyword	aptconfGroup
-	\ acquire apt aptitude debtags debug dir dpkg dselect
-	\ orderlist packagemanager pkgcachegen quiet rpm
-	\ unattended-upgrade
+	\ acquire adequate apt aptitude aptlistbugs debtags debug
+	\ dir dpkg dselect orderlist packagemanager pkgcachegen
+	\ quiet rpm synaptic unattended-upgrade whatmaps
 
 " Possible options for each group:
 " Acquire: {{{
 syn keyword	aptconfAcquire contained
-	\ cdrom Check-Valid-Until CompressionTypes ForceHash ftp gpgv
-	\ GzipIndexes http https Languages Max-ValidTime Min-ValidTime PDiffs
-	\ Queue-Mode Retries Source-Symlinks
+	\ cdrom Check-Valid-Until CompressionTypes ForceHash ForceIPv4
+	\ ForceIPv6 ftp gpgv GzipIndexes http https Languages Max-ValidTime
+	\ Min-ValidTime PDiffs Queue-Mode Retries Source-Symlinks
 
 syn keyword	aptconfAcquireCDROM contained
 	\ AutoDetect CdromOnly Mount UMount
@@ -62,14 +62,15 @@ syn keyword	aptconfAcquireCompressionTypes contained
 	\ bz2 lzma gz Order
 
 syn keyword	aptconfAcquireFTP contained
-	\ Passive Proxy ProxyLogin Timeout
+	\ ForceExtended Passive Proxy ProxyLogin Timeout
 
 syn keyword	aptconfAcquireHTTP contained
 	\ AllowRedirect Dl-Limit Max-Age No-Cache No-Store Pipeline-Depth
-	\ Proxy Timeout User-Agent
+	\ Proxy ProxyAutoDetect Proxy-Auto-Detect Timeout User-Agent
 
 syn keyword	aptconfAcquireHTTPS contained
-	\ CaInfo CaPath CrlFile IssuerCert SslCert SslForceVersion SslKey
+	\ AllowRedirect CaInfo CaPath CrlFile Dl-Limit IssuerCert Max-Age
+	\ No-Cache No-Store Proxy SslCert SslForceVersion SslKey Timeout
 	\ Verify-Host Verify-Peer
 
 syn keyword	aptconfAcquireMaxValidTime contained
@@ -83,14 +84,21 @@ syn cluster	aptconfAcquire_ contains=aptconfAcquire,
 	\ aptconfAcquireHTTP,aptconfAcquireHTTPS,aptconfAcquireMaxValidTime,
 	\ aptconfAcquirePDiffs
 " }}}
+" Adequate: {{{
+syn keyword	aptconfAdequate contained
+	\ Enabled
+
+syn cluster	aptconfAdequate_ contains=aptconfAdequate
+" }}}
 " Apt: {{{
 syn keyword	aptconfApt contained
 	\ Architecture Architectures Archive Authentication AutoRemove
-	\ Build-Essential Cache Cache-Grow Cache-Limit Cache-Start CDROM
-	\ Changelogs Clean-Installed Compressor Default-Release
-	\ Force-LoopBreak Get Ignore-Hold Immediate-Configure
+	\ Build-Essential Build-Profiles Cache Cache-Grow Cache-Limit
+	\ Cache-Start CDROM Changelogs Clean-Installed Compressor
+	\ Default-Release Force-LoopBreak Get Ignore-Hold Immediate-Configure
 	\ Install-Recommends Install-Suggests Keep-Fds List-Cleanup
-	\ NeverAutoRemove Never-MarkAuto-Sections Periodic Status-Fd Update
+	\ Move-Autobit-Sections NeverAutoRemove Never-MarkAuto-Sections
+	\ Periodic Status-Fd Update VersionedKernelPackages
 
 syn keyword	aptconfAptAuthentication contained
 	\ TrustCDROM
@@ -124,11 +132,12 @@ syn keyword	aptconfAptGet contained
 
 syn keyword	aptconfAptPeriodic contained
 	\ AutocleanInterval BackupArchiveInterval BackupLevel
-	\ Download-Upgradeable-Packages MaxAge MaxSize MinAge
-	\ Unattended-Upgrade Update-Package-Lists Verbose
+	\ Download-Upgradeable-Packages Download-Upgradeable-Packages-Debdelta
+	\ Enable MaxAge MaxSize MinAge Unattended-Upgrade Update-Package-Lists
+	\ Verbose
 
 syn keyword	aptconfAptUpdate contained
-	\ Pre-Invoke Post-Invoke Post-Invoke-Success
+	\ List-Refresh Pre-Invoke Post-Invoke Post-Invoke-Success
 
 syn cluster	aptconfApt_ contains=aptconfApt,
 	\ aptconfAptAuthentication,aptconfAptAutoRemove,aptconfAptCache,
@@ -240,6 +249,12 @@ syn cluster	aptconfAptitude_ contains=aptconfAptitude,
 	\ aptconfAptitudeUIKeyBindings,aptconfAptitudeUIStyles,
 	\ aptconfAptitudeUIStylesElements
 " }}}
+" AptListbugs: {{{
+syn keyword	aptconfAptListbugs contained
+	\ IgnoreRegexp Severities
+
+syn cluster	aptconfAptListbugs_ contains=aptconfAptListbugs
+" }}}
 " DebTags: {{{
 syn keyword	aptconfDebTags contained
 	\ Vocabulary
@@ -251,7 +266,8 @@ syn keyword	aptconfDebug contained
 	\ Acquire aptcdrom BuildDeps Hashes IdentCdrom Nolocking
 	\ pkgAcquire pkgAutoRemove pkgCacheGen pkgDepCache pkgDPkgPM
 	\ pkgDPkgProgressReporting pkgInitialize pkgOrderList
-	\ pkgPackageManager pkgPolicy pkgProblemResolver sourceList
+	\ pkgPackageManager pkgPolicy pkgProblemResolver RunScripts
+	\ sourceList
 
 syn keyword	aptconfDebugAcquire contained
 	\ cdrom Ftp gpgv Http Https netrc
@@ -295,7 +311,7 @@ syn keyword	aptconfDirMedia contained
 	\ MountPath
 
 syn keyword	aptconfDirState contained
-	\ cdroms extended_states Lists mirrors status
+	\ cdroms extended_states Lists mirrors preferences status
 
 syn cluster	aptconfDir_ contains=aptconfDir,
 	\ aptconfDirAptitude,aptconfDirBin,aptconfDirCache,aptconfDirEtc,
@@ -303,15 +319,16 @@ syn cluster	aptconfDir_ contains=aptconfDir,
 " }}}
 " DPkg: {{{
 syn keyword	aptconfDPkg contained
-	\ Build-Options Chroot-Directory ConfigurePending FlushSTDIN MaxArgs
-	\ MaxBytes NoTriggers options Pre-Install-Pkgs Pre-Invoke Post-Invoke
+	\ Build-Options Chroot-Directory ConfigurePending FlushSTDIN
+	\ MaxArgBytes MaxArgs MaxBytes NoTriggers options
+	\ Pre-Install-Pkgs Pre-Invoke Post-Invoke
 	\ Run-Directory StopOnError Tools TriggersPending
 
 syn keyword	aptconfDPkgTools contained
-	\ Options Version
+	\ adequate InfoFD Options Version
 
 syn cluster	aptconfDPkg_ contains=aptconfDPkg,
-	\ aptconfDPkgOrderList,aptconfDPkgOrderListScore,aptconfDPkgTools
+	\ aptconfDPkgTools
 " }}}
 " DSelect: {{{
 syn keyword	aptconfDSelect contained
@@ -353,23 +370,59 @@ syn keyword	aptconfRpm contained
 
 syn cluster	aptconfRpm_ contains=aptconfRpm
 " }}}
-" Unattened Upgrade: {{{
+" Synaptic: {{{
+syn keyword	aptconfSynaptic contained
+	\ AskQuitOnProceed AskRelated AutoCleanCache CleanCache DefaultDistro
+	\ delAction delHistory Download-Only ftpProxy ftpProxyPort httpProxy
+	\ httpProxyPort Install-Recommends LastSearchType Maximized noProxy
+	\ OneClickOnStatusActions ShowAllPkgInfoInMain showWelcomeDialog
+	\ ToolbarState undoStackSize update upgradeType useProxy UseStatusColors
+	\ UseTerminal useUserFont useUserTerminalFont ViewMode
+	\ availVerColumnPos availVerColumnVisible componentColumnPos
+	\ componentColumnVisible descrColumnPos descrColumnVisible
+	\ downloadSizeColumnPos downloadSizeColumnVisible hpanedPos
+	\ instVerColumnPos instVerColumnVisible instSizeColumnPos
+	\ instSizeColumnVisible nameColumnPos nameColumnVisible
+	\ sectionColumnPos sectionColumnVisible statusColumnPos
+	\ statusColumnVisible supportedColumnPos supportedColumnVisible
+	\ vpanedPos windowWidth windowHeight windowX windowY closeZvt
+	\ color-available color-available-locked color-broken color-downgrade
+	\ color-install color-installed-locked color-installed-outdated
+	\ color-installed-updated color-new color-purge color-reinstall
+	\ color-remove color-upgrade
+
+syn keyword	aptconfSynapticUpdate contained
+	\ last type
+
+syn cluster	aptconfSynaptic_ contains=aptconfSynaptic,
+	\ aptconfSynapticUpdate
+" }}}
+" Unattended Upgrade: {{{
 syn keyword	aptconfUnattendedUpgrade contained
-	\ AutoFixInterruptedDpkg Automatic-Reboot InstallOnShutdown Mail
-	\ MailOnlyOnError MinimalSteps Origins-Pattern Package-Blacklist
+	\ AutoFixInterruptedDpkg Automatic-Reboot Automatic-Reboot-Time
+	\ Automatic-Reboot-WithUsers InstallOnShutdown Mail MailOnlyOnError
+	\ MinimalSteps Origins-Pattern Package-Blacklist
 	\ Remove-Unused-Dependencies
 
 syn cluster	aptconfUnattendedUpgrade_ contains=aptconfUnattendedUpgrade
 " }}}
+" Whatmaps: {{{
+syn keyword	aptconfWhatmaps contained
+	\ Enable-Restart Security-Update-Origins
+
+syn cluster	aptconfWhatmaps_ contains=aptconfWhatmaps
+" }}}
 
 syn case	match
 
 " Now put all the keywords (and 'valid' options) in a single cluster:
 syn cluster	aptconfOptions contains=aptconfRegexpOpt,
-	\ @aptconfAcquire_,@aptconfApt_,@aptconfAptitude_,@aptconfDebTags_,
-	\ @aptconfDebug_,@aptconfDir_,@aptconfDPkg_,@aptconfDSelect_,
-	\ @aptconfOrderList_,@aptconfPackageManager_,@aptconfPkgCacheGen_,
-	\ @aptconfQuiet_,@aptconfRpm_,@aptconfUnattendedUpgrade_
+	\ @aptconfAcquire_,@aptconfAdequate_,@aptconfApt_,@aptconfAptitude_,
+	\ @aptconfAptListbugs_,@aptconfDebTags_,@aptconfDebug_,@aptconfDir_,
+	\ @aptconfDPkg_,@aptconfDSelect_,@aptconfOrderList_,
+	\ @aptconfPackageManager_,@aptconfPkgCacheGen_,@aptconfQuiet_,
+	\ @aptconfRpm_,@aptconfSynaptic_,@aptconfUnattendedUpgrade_,
+	\ @aptconfWhatmaps_
 
 " Syntax:
 syn match	aptconfSemiColon	';'
@@ -382,8 +435,11 @@ syn region	aptconfInclude		matchgroup=aptconfOperator start='::' end='::\|\s'me=
 
 " Basic Syntax Errors: XXX avoid to generate false positives !!!
 "
-" * Invalid comment format (seems to not cause errors, but...):
-syn match	aptconfAsError		display '^#.*'
+" * Undocumented inline comment. Since it is currently largely used, and does
+" not seem to cause trouble ('apt-config dump' never complains when # is used
+" the same way than //) it has been moved to aptconfComment group. But it
+" still needs to be defined here (i.e. before #clear and #include directives)
+syn match	aptconfComment		'#.*' contains=@aptconfCommentSpecial
 "
 " * When a semicolon is missing after a double-quoted string:
 " There are some cases (for example in the Dir group of options, but not only)
@@ -445,6 +501,8 @@ hi def link aptconfAcquireHTTPS			aptconfOption
 hi def link aptconfAcquireMaxValidTime		aptconfOption
 hi def link aptconfAcquirePDiffs		aptconfOption
 
+hi def link aptconfAdequate			aptconfOption
+
 hi def link aptconfApt				aptconfOption
 hi def link aptconfAptAuthentication		aptconfOption
 hi def link aptconfAptAutoRemove		aptconfOption
@@ -471,6 +529,8 @@ hi def link aptconfAptitudeUIKeyBindings	aptconfOption
 hi def link aptconfAptitudeUIStyles		aptconfOption
 hi def link aptconfAptitudeUIStylesElements	aptconfOption
 
+hi def link aptconfAptListbugs			aptconfOption
+
 hi def link aptconfDebTags			aptconfOption
 
 hi def link aptconfDebug			aptconfOption
@@ -504,8 +564,13 @@ hi def link aptconfQuiet			aptconfOption
 
 hi def link aptconfRpm				aptconfOption
 
+hi def link aptconfSynaptic			aptconfOption
+hi def link aptconfSynapticUpdate		aptconfOption
+
 hi def link aptconfUnattendedUpgrade		aptconfOption
 
+hi def link aptconfWhatmaps			aptconfOption
+
 let b:current_syntax = "aptconf"
 
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/avra.vim b/runtime/syntax/avra.vim
new file mode 100644
index 0000000000..ebf0aaff11
--- /dev/null
+++ b/runtime/syntax/avra.vim
@@ -0,0 +1,73 @@
+" Vim syntax file
+" Language:     AVR Assembler (AVRA)
+" AVRA Home:    http://avra.sourceforge.net/index.html
+" AVRA Version: 1.3.0
+" Maintainer:	  Marius Ghita <mhitza@gmail.com>
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword=a-z,A-Z,48-57,.,_
+" 'isident' is a global option, better not set it
+" setlocal isident=a-z,A-Z,48-57,.,_
+syn case ignore
+
+syn keyword avraRegister r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14
+syn keyword avraRegister r15 r16 r17 r18 r19 r20 r21 r22 r23 r24 r25 r26 r27
+syn keyword avraRegister r28 r29 r30 r31
+
+syn keyword avraInstr add adc adiw sub subi sbc sbci sbiw and andi or ori eor
+syn keyword avraInstr com neg sbr cbr inc dec tst clr ser mul muls mulsu fmul
+syn keyword avraInstr fmuls fmulsu des rjmp ijmp eijmp jmp rcall icall eicall
+syn keyword avraInstr call ret reti cpse cp cpc cpi sbrc sbrs sbic sbis brbs
+syn keyword avraInstr brbc breq brne brcs brcc brsh brlo brmi brpl brge brlt
+syn keyword avraInstr brhs brhc brts brtc brvs brvc brie brid mov movw ldi lds
+syn keyword avraInstr ld ldd sts st std lpm elpm spm in out push pop xch las
+syn keyword avraInstr lac lat lsl lsr rol ror asr swap bset bclr sbi cbi bst bld
+syn keyword avraInstr sec clc sen cln sez clz sei cli ses cls sev clv set clt
+syn keyword avraInstr seh clh break nop sleep wdr
+
+syn keyword avraDirective .byte .cseg .db .def .device .dseg .dw .endmacro .equ
+syn keyword avraDirective .eseg .exit .include .list .listmac .macro .nolist
+syn keyword avraDirective .org .set .define .undef .ifdef .ifndef .if .else
+syn keyword avraDirective .elif .elseif .warning
+
+syn keyword avraOperator low high byte2 byte3 byte4 lwrd hwrd page exp2 log2
+
+syn match avraNumericOperator "[-*/+]"
+syn match avraUnaryOperator   "!"
+syn match avraBinaryOperator  "<<\|>>\|<\|<=\|>\|>=\|==\|!="
+syn match avraBitwiseOperator "[~&^|]\|&&\|||"
+
+syn match avraBinaryNumber    "\<0[bB][0-1]*\>"
+syn match avraHexNumber       "\<0[xX][0-9a-fA-F]\+\>"
+syn match avraDecNumber       "\<\(0\|[1-9]\d*\)\>"
+
+syn region avraComment start=";" end="$"
+syn region avraString  start="\"" end="\"\|$"
+
+syn match avraLabel "^\s*[^; \t]\+:"
+
+hi def link avraBinaryNumber    avraNumber
+hi def link avraHexNumber       avraNumber
+hi def link avraDecNumber       avraNumber
+
+hi def link avraNumericOperator avraOperator
+hi def link avraUnaryOperator   avraOperator
+hi def link avraBinaryOperator  avraOperator
+hi def link avraBitwiseOperator avraOperator
+
+
+hi def link avraOperator  operator
+hi def link avraComment   comment
+hi def link avraDirective preproc
+hi def link avraRegister  type
+hi def link avraNumber    constant
+hi def link avraString    String
+hi def link avraInstr     keyword
+hi def link avraLabel     label
+
+let b:current_syntax = "avra"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/runtime/syntax/awk.vim b/runtime/syntax/awk.vim
index 40491eea1a..ae0f217580 100644
--- a/runtime/syntax/awk.vim
+++ b/runtime/syntax/awk.vim
@@ -1,15 +1,15 @@
 " Vim syntax file
 " Language:	awk, nawk, gawk, mawk
 " Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2014 Oct 21
+" Last Change:	2016 Jul 15
 
-" AWK  ref.  is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
+" AWK  ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
 " The AWK Programming Language, Addison-Wesley, 1988
 
 " GAWK ref. is: Arnold D. Robbins
 " Effective AWK Programming, Third Edition, O'Reilly, 2001
 " Effective AWK Programming, Fourth Edition, O'Reilly, 2015
-" (also available with the gawk source distribution)
+" (also available and updated with the gawk source distribution)
 
 " MAWK is a "new awk" meaning it implements AWK ref.
 " mawk conforms to the Posix 1003.2 (draft 11.3)
@@ -19,11 +19,8 @@
 " TODO:
 " Dig into the commented out syntax expressions below.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -35,13 +32,13 @@ set cpo&vim
 syn keyword awkStatement	break continue delete exit
 syn keyword awkStatement	function getline next
 syn keyword awkStatement	print printf return
-" GAWK ref. Chapter 7
-syn keyword awkStatement	nextfile
+" GAWK ref. Chapter 7-9
+syn keyword awkStatement	switch nextfile
+syn keyword awkStatement	func
 "
 " GAWK ref. Chapter 9, Functions
-"
 " Numeric Functions
-syn keyword awkFunction	atan2 cos div exp int log rand sin sqrt srand
+syn keyword awkFunction	atan2 cos exp int intdiv log rand sin sqrt srand
 " String Manipulation Functions
 syn keyword awkFunction	asort asort1 gensub gsub index length match 
 syn keyword awkFunction	patsplit split sprintf strtonum sub substr
@@ -52,17 +49,17 @@ syn keyword awkFunction	close fflush system
 syn keyword awkFunction	mktime strftime systime
 " Bit Manipulation Functions
 syn keyword awkFunction	and compl lshift or rshift xor
-" Getting Type Function
-syn keyword awkFunction	isarray
+" Getting Type Functions
+syn keyword awkFunction	isarray typeof
 " String-Translation Functions
 syn keyword awkFunction	bindtextdomain dcgettext dcngetext
 
 syn keyword awkConditional	if else
-syn keyword awkRepeat	while for
+syn keyword awkRepeat	while for do
 
-syn keyword awkTodo		contained TODO
+syn keyword awkTodo	contained TODO
 
-syn keyword awkPatterns	BEGIN END
+syn keyword awkPatterns	BEGIN END BEGINFILE ENDFILE
 
 " GAWK ref. Chapter 7
 " Built-in Variables That Control awk
@@ -74,20 +71,18 @@ syn keyword awkVariables	ARGC ARGV ARGIND ENVIRON ERRNO FILENAME
 syn keyword awkVariables	FNR NF FUNCTAB NR PROCINFO RLENGTH RSTART 
 syn keyword awkVariables	RT SYMTAB
 
-syn keyword awkRepeat	do
 
 " Octal format character.
 syn match   awkSpecialCharacter display contained "\\[0-7]\{1,3\}"
-syn keyword awkStatement	func nextfile
 " Hex   format character.
 syn match   awkSpecialCharacter display contained "\\x[0-9A-Fa-f]\+"
 
 syn match   awkFieldVars	"\$\d\+"
 
-"catch errors caused by wrong parenthesis
-syn region	awkParen	transparent start="(" end=")" contains=ALLBUT,awkParenError,awkSpecialCharacter,awkArrayElement,awkArrayArray,awkTodo,awkRegExp,awkBrktRegExp,awkBrackets,awkCharClass
+" catch errors caused by wrong parenthesis
+syn region	awkParen	transparent start="(" end=")" contains=ALLBUT,awkParenError,awkSpecialCharacter,awkArrayElement,awkArrayArray,awkTodo,awkRegExp,awkBrktRegExp,awkBrackets,awkCharClass,awkComment
 syn match	awkParenError	display ")"
-syn match	awkInParen	display contained "[{}]"
+"syn match	awkInParen	display contained "[{}]"
 
 " 64 lines for complex &&'s, and ||'s in a big "if"
 syn sync ccomment awkParen maxlines=64
@@ -141,7 +136,7 @@ syn match   awkExpression	"?\|:"
 syn keyword awkExpression	in
 
 " Boolean Logic (OR, AND, NOT)
-"syn match  awkBoolLogic	"||\|&&\|\!"
+syn match  awkBoolLogic	"||\|&&\|\!"
 
 " This is overridden by less-than & greater-than.
 " Put this above those to override them.
@@ -171,63 +166,42 @@ syn region awkArray		transparent start="\[" end="\]" contains=awkArray,awkArrayE
 " (for the few instances where it would be more than "oneline")
 syn sync ccomment awkArray maxlines=10
 
-" define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_awk_syn_inits")
-  if version < 508
-    let did_awk_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink awkConditional		Conditional
-  HiLink awkFunction		Function
-  HiLink awkRepeat		Repeat
-  HiLink awkStatement		Statement
-
-  HiLink awkString		String
-  HiLink awkSpecialPrintf	Special
-  HiLink awkSpecialCharacter	Special
-
-  HiLink awkSearch		String
-  HiLink awkBrackets		awkRegExp
-  HiLink awkBrktRegExp		awkNestRegExp
-  HiLink awkCharClass		awkNestRegExp
-  HiLink awkNestRegExp		Keyword
-  HiLink awkRegExp		Special
-
-  HiLink awkNumber		Number
-  HiLink awkFloat		Float
-
-  HiLink awkFileIO		Special
-  HiLink awkOperator		Special
-  HiLink awkExpression		Special
-  HiLink awkBoolLogic		Special
-
-  HiLink awkPatterns		Special
-  HiLink awkVariables		Special
-  HiLink awkFieldVars		Special
-
-  HiLink awkLineSkip		Special
-  HiLink awkSemicolon		Special
-  HiLink awkComma		Special
-  "HiLink awkIdentifier		Identifier
-
-  HiLink awkComment		Comment
-  HiLink awkTodo		Todo
-
-  " Change this if you want nested array names to be highlighted.
-  HiLink awkArrayArray		awkArray
-  HiLink awkArrayElement	Special
-
-  HiLink awkParenError		awkError
-  HiLink awkInParen		awkError
-  HiLink awkError		Error
-
-  delcommand HiLink
-endif
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link awkConditional	Conditional
+hi def link awkFunction		Function
+hi def link awkRepeat		Repeat
+hi def link awkStatement	Statement
+hi def link awkString		String
+hi def link awkSpecialPrintf	Special
+hi def link awkSpecialCharacter	Special
+hi def link awkSearch		String
+hi def link awkBrackets		awkRegExp
+hi def link awkBrktRegExp	awkNestRegExp
+hi def link awkCharClass	awkNestRegExp
+hi def link awkNestRegExp	Keyword
+hi def link awkRegExp		Special
+hi def link awkNumber		Number
+hi def link awkFloat		Float
+hi def link awkFileIO		Special
+hi def link awkOperator		Special
+hi def link awkExpression	Special
+hi def link awkBoolLogic	Special
+hi def link awkPatterns		Special
+hi def link awkVariables	Special
+hi def link awkFieldVars	Special
+hi def link awkLineSkip		Special
+hi def link awkSemicolon	Special
+hi def link awkComma		Special
+hi def link awkIdentifier	Identifier
+hi def link awkComment		Comment
+hi def link awkTodo		Todo
+" Change this if you want nested array names to be highlighted.
+hi def link awkArrayArray	awkArray
+hi def link awkArrayElement	Special
+hi def link awkParenError	awkError
+hi def link awkInParen		awkError
+hi def link awkError		Error
 
 let b:current_syntax = "awk"
 
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
index f84d5ca95a..8bd0528e1e 100644
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -2,7 +2,7 @@
 " Language:	BibTeX (bibliographic database format for (La)TeX)
 " Maintainer:	Bernd Feige <Bernd.Feige@gmx.net>
 " Filenames:	*.bib
-" Last Change:	2014 Mar 26
+" Last Change:	2016 May 31
 
 " Thanks to those who pointed out problems with this file or supplied fixes!
 
@@ -35,8 +35,40 @@ syn keyword bibEntryKw contained	crossref edition editor howpublished
 syn keyword bibEntryKw contained	institution journal key month note
 syn keyword bibEntryKw contained	number organization pages publisher
 syn keyword bibEntryKw contained	school series title type volume year
+
+" biblatex keywords, cf. http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
+syn keyword bibType contained	mvbook bookinbook suppbook collection mvcollection suppcollection
+syn keyword bibType contained	online patent periodical suppperiodical mvproceedings reference
+syn keyword bibType contained	mvreference inreference report set thesis xdata customa customb
+syn keyword bibType contained	customc customd custome customf electronic www artwork audio bibnote
+syn keyword bibType contained	commentary image jurisdiction legislation legal letter movie music
+syn keyword bibType contained	performance review software standard video
+
+syn keyword bibEntryKw contained	abstract isbn issn keywords url
+syn keyword bibEntryKw contained	addendum afterwordannotation annotation annotator authortype
+syn keyword bibEntryKw contained	bookauthor bookpagination booksubtitle booktitleaddon
+syn keyword bibEntryKw contained	commentator date doi editora editorb editorc editortype
+syn keyword bibEntryKw contained	editoratype editorbtype editorctype eid entrysubtype
+syn keyword bibEntryKw contained	eprint eprintclass eprinttype eventdate eventtitle
+syn keyword bibEntryKw contained	eventtitleaddon file foreword holder indextitle
+syn keyword bibEntryKw contained	introduction isan ismn isrn issue issuesubtitle
+syn keyword bibEntryKw contained	issuetitle iswc journalsubtitle journaltitle label
+syn keyword bibEntryKw contained	language library location mainsubtitle maintitle
+syn keyword bibEntryKw contained	maintitleaddon nameaddon origdate origlanguage
+syn keyword bibEntryKw contained	origlocation origpublisher origtitle pagetotal
+syn keyword bibEntryKw contained	pagination part pubstate reprinttitle shortauthor
+syn keyword bibEntryKw contained	shorteditor shorthand shorthandintro shortjournal
+syn keyword bibEntryKw contained	shortseries shorttitle subtitle titleaddon translator
+syn keyword bibEntryKw contained	urldate venue version volumes entryset execute gender
+syn keyword bibEntryKw contained	langid langidopts ids indexsorttitle options presort
+syn keyword bibEntryKw contained	related relatedoptions relatedtype relatedstring
+syn keyword bibEntryKw contained	sortkey sortname sortshorthand sorttitle sortyear xdata
+syn keyword bibEntryKw contained	xref namea nameb namec nameatype namebtype namectype
+syn keyword bibEntryKw contained	lista listb listc listd liste listf usera userb userc
+syn keyword bibEntryKw contained	userd usere userf verba verbb verbc archiveprefix pdf
+syn keyword bibEntryKw contained	primaryclass
+
 " Non-standard:
-syn keyword bibNSEntryKw contained	abstract isbn issn keywords url
 " AMS mref http://www.ams.org/mref
 syn keyword bibNSEntryKw contained	mrclass mrnumber mrreviewer fjournal coden
 
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index ac4909edba..57d99ab1e9 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2015 Mar 05
+" Last Change:	2016 Jul 07
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -248,6 +248,10 @@ if !exists("c_no_c99") " ISO C99
   syn keyword	cType		_Bool bool _Complex complex _Imaginary imaginary
   syn keyword	cType		int8_t int16_t int32_t int64_t
   syn keyword	cType		uint8_t uint16_t uint32_t uint64_t
+  if !exists("c_no_bsd")
+    " These are BSD specific.
+    syn keyword	cType		u_int8_t u_int16_t u_int32_t u_int64_t
+  endif
   syn keyword	cType		int_least8_t int_least16_t int_least32_t int_least64_t
   syn keyword	cType		uint_least8_t uint_least16_t uint_least32_t uint_least64_t
   syn keyword	cType		int_fast8_t int_fast16_t int_fast32_t int_fast64_t
@@ -264,7 +268,7 @@ syn keyword	cStorageClass	static register auto volatile extern const
 if exists("c_gnu")
   syn keyword	cStorageClass	inline __attribute__
 endif
-if !exists("c_no_c99")
+if !exists("c_no_c99") && s:ft !=# 'cpp'
   syn keyword	cStorageClass	inline restrict
 endif
 if !exists("c_no_c11")
@@ -291,7 +295,7 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   syn keyword cConstant SCHAR_MIN SINT_MIN SLONG_MIN SSHRT_MIN
   syn keyword cConstant SCHAR_MAX SINT_MAX SLONG_MAX SSHRT_MAX
   if !exists("c_no_c99")
-    syn keyword cConstant __func__
+    syn keyword cConstant __func__ __VA_ARGS__
     syn keyword cConstant LLONG_MIN LLONG_MAX ULLONG_MAX
     syn keyword cConstant INT8_MIN INT16_MIN INT32_MIN INT64_MIN
     syn keyword cConstant INT8_MAX INT16_MAX INT32_MAX INT64_MAX
diff --git a/runtime/syntax/clojure.vim b/runtime/syntax/clojure.vim
index 4dc1cde05c..2b48146b5a 100644
--- a/runtime/syntax/clojure.vim
+++ b/runtime/syntax/clojure.vim
@@ -1,37 +1,68 @@
 " Vim syntax file
-" Language:	Clojure
-" Authors:	Toralf Wittner <toralf.wittner@gmail.com>
-"		modified by Meikel Brandmeyer <mb@kotka.de>
-" URL:		http://kotka.de/projects/clojure/vimclojure.html
+" Language:     Clojure
+" Authors:      Toralf Wittner <toralf.wittner@gmail.com>
+"               modified by Meikel Brandmeyer <mb@kotka.de>
+" URL:          http://kotka.de/projects/clojure/vimclojure.html
 "
-" Contributors:	Joel Holdbrooks <cjholdbrooks@gmail.com> (Regexp support, bug fixes)
+" Contributors: Joel Holdbrooks <cjholdbrooks@gmail.com> (Regexp support, bug fixes)
 "
-" Maintainer:	Sung Pae <self@sungpae.com>
-" URL:		https://github.com/guns/vim-clojure-static
-" License:	Same as Vim
-" Last Change:	27 March 2014
+" Maintainer:   Sung Pae <self@sungpae.com>
+" URL:          https://github.com/guns/vim-clojure-static
+" License:      Same as Vim
+" Last Change:  18 July 2016
 
 if exists("b:current_syntax")
 	finish
 endif
 
+let s:cpo_sav = &cpo
+set cpo&vim
+
 if has("folding") && exists("g:clojure_fold") && g:clojure_fold > 0
 	setlocal foldmethod=syntax
 endif
 
 " -*- KEYWORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.6.0
-syntax keyword clojureConstant nil
-syntax keyword clojureBoolean false true
-syntax keyword clojureSpecial . catch clojure.core/fn clojure.core/let clojure.core/loop def do finally fn if let loop monitor-enter monitor-exit new quote recur set! throw try var
-syntax keyword clojureException catch finally throw try
-syntax keyword clojureCond case clojure.core/case clojure.core/cond clojure.core/cond-> clojure.core/cond->> clojure.core/condp clojure.core/if-let clojure.core/if-not clojure.core/if-some clojure.core/when clojure.core/when-first clojure.core/when-let clojure.core/when-not clojure.core/when-some cond cond-> cond->> condp if-let if-not if-some when when-first when-let when-not when-some
-syntax keyword clojureRepeat clojure.core/doseq clojure.core/dotimes clojure.core/while doseq dotimes while
-syntax keyword clojureDefine clojure.core/definline clojure.core/definterface clojure.core/defmacro clojure.core/defmethod clojure.core/defmulti clojure.core/defn clojure.core/defn- clojure.core/defonce clojure.core/defprotocol clojure.core/defrecord clojure.core/defstruct clojure.core/deftype definline definterface defmacro defmethod defmulti defn defn- defonce defprotocol defrecord defstruct deftype
-syntax keyword clojureMacro -> ->> .. amap and areduce as-> assert binding bound-fn clojure.core/-> clojure.core/->> clojure.core/.. clojure.core/amap clojure.core/and clojure.core/areduce clojure.core/as-> clojure.core/assert clojure.core/binding clojure.core/bound-fn clojure.core/comment clojure.core/declare clojure.core/delay clojure.core/dosync clojure.core/doto clojure.core/extend-protocol clojure.core/extend-type clojure.core/for clojure.core/future clojure.core/gen-class clojure.core/gen-interface clojure.core/import clojure.core/io! clojure.core/lazy-cat clojure.core/lazy-seq clojure.core/letfn clojure.core/locking clojure.core/memfn clojure.core/ns clojure.core/or clojure.core/proxy clojure.core/proxy-super clojure.core/pvalues clojure.core/refer-clojure clojure.core/reify clojure.core/some-> clojure.core/some->> clojure.core/sync clojure.core/time clojure.core/with-bindings clojure.core/with-in-str clojure.core/with-loading-context clojure.core/with-local-vars clojure.core/with-open clojure.core/with-out-str clojure.core/with-precision clojure.core/with-redefs comment declare delay dosync doto extend-protocol extend-type for future gen-class gen-interface import io! lazy-cat lazy-seq letfn locking memfn ns or proxy proxy-super pvalues refer-clojure reify some-> some->> sync time with-bindings with-in-str with-loading-context with-local-vars with-open with-out-str with-precision with-redefs
-syntax keyword clojureFunc * *' + +' - -' ->ArrayChunk ->Vec ->VecNode ->VecSeq -cache-protocol-fn -reset-methods / < <= = == > >= accessor aclone add-classpath add-watch agent agent-error agent-errors aget alength alias all-ns alter alter-meta! alter-var-root ancestors apply array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint biginteger bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn* bound? butlast byte byte-array bytes cast char char-array char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version clojure.core/* clojure.core/*' clojure.core/+ clojure.core/+' clojure.core/- clojure.core/-' clojure.core/->ArrayChunk clojure.core/->Vec clojure.core/->VecNode clojure.core/->VecSeq clojure.core/-cache-protocol-fn clojure.core/-reset-methods clojure.core// clojure.core/< clojure.core/<= clojure.core/= clojure.core/== clojure.core/> clojure.core/>= clojure.core/accessor clojure.core/aclone clojure.core/add-classpath clojure.core/add-watch clojure.core/agent clojure.core/agent-error clojure.core/agent-errors clojure.core/aget clojure.core/alength clojure.core/alias clojure.core/all-ns clojure.core/alter clojure.core/alter-meta! clojure.core/alter-var-root clojure.core/ancestors clojure.core/apply clojure.core/array-map clojure.core/aset clojure.core/aset-boolean clojure.core/aset-byte clojure.core/aset-char clojure.core/aset-double clojure.core/aset-float clojure.core/aset-int clojure.core/aset-long clojure.core/aset-short clojure.core/assoc clojure.core/assoc! clojure.core/assoc-in clojure.core/associative? clojure.core/atom clojure.core/await clojure.core/await-for clojure.core/await1 clojure.core/bases clojure.core/bean clojure.core/bigdec clojure.core/bigint clojure.core/biginteger clojure.core/bit-and clojure.core/bit-and-not clojure.core/bit-clear clojure.core/bit-flip clojure.core/bit-not clojure.core/bit-or clojure.core/bit-set clojure.core/bit-shift-left clojure.core/bit-shift-right clojure.core/bit-test clojure.core/bit-xor clojure.core/boolean clojure.core/boolean-array clojure.core/booleans clojure.core/bound-fn* clojure.core/bound? clojure.core/butlast clojure.core/byte clojure.core/byte-array clojure.core/bytes clojure.core/cast clojure.core/char clojure.core/char-array clojure.core/char? clojure.core/chars clojure.core/chunk clojure.core/chunk-append clojure.core/chunk-buffer clojure.core/chunk-cons clojure.core/chunk-first clojure.core/chunk-next clojure.core/chunk-rest clojure.core/chunked-seq? clojure.core/class clojure.core/class? clojure.core/clear-agent-errors clojure.core/clojure-version clojure.core/coll? clojure.core/commute clojure.core/comp clojure.core/comparator clojure.core/compare clojure.core/compare-and-set! clojure.core/compile clojure.core/complement clojure.core/concat clojure.core/conj clojure.core/conj! clojure.core/cons clojure.core/constantly clojure.core/construct-proxy clojure.core/contains? clojure.core/count clojure.core/counted? clojure.core/create-ns clojure.core/create-struct clojure.core/cycle clojure.core/dec clojure.core/dec' clojure.core/decimal? clojure.core/delay? clojure.core/deliver clojure.core/denominator clojure.core/deref clojure.core/derive clojure.core/descendants clojure.core/destructure clojure.core/disj clojure.core/disj! clojure.core/dissoc clojure.core/dissoc! clojure.core/distinct clojure.core/distinct? clojure.core/doall clojure.core/dorun clojure.core/double clojure.core/double-array clojure.core/doubles clojure.core/drop clojure.core/drop-last clojure.core/drop-while clojure.core/empty clojure.core/empty? clojure.core/ensure clojure.core/enumeration-seq clojure.core/error-handler clojure.core/error-mode clojure.core/eval clojure.core/even? clojure.core/every-pred clojure.core/every? clojure.core/ex-data clojure.core/ex-info clojure.core/extend clojure.core/extenders clojure.core/extends? clojure.core/false? clojure.core/ffirst clojure.core/file-seq clojure.core/filter clojure.core/filterv clojure.core/find clojure.core/find-keyword clojure.core/find-ns clojure.core/find-protocol-impl clojure.core/find-protocol-method clojure.core/find-var clojure.core/first clojure.core/flatten clojure.core/float clojure.core/float-array clojure.core/float? clojure.core/floats clojure.core/flush clojure.core/fn? clojure.core/fnext clojure.core/fnil clojure.core/force clojure.core/format clojure.core/frequencies clojure.core/future-call clojure.core/future-cancel clojure.core/future-cancelled? clojure.core/future-done? clojure.core/future? clojure.core/gensym clojure.core/get clojure.core/get-in clojure.core/get-method clojure.core/get-proxy-class clojure.core/get-thread-bindings clojure.core/get-validator clojure.core/group-by clojure.core/hash clojure.core/hash-combine clojure.core/hash-map clojure.core/hash-ordered-coll clojure.core/hash-set clojure.core/hash-unordered-coll clojure.core/identical? clojure.core/identity clojure.core/ifn? clojure.core/in-ns clojure.core/inc clojure.core/inc' clojure.core/init-proxy clojure.core/instance? clojure.core/int clojure.core/int-array clojure.core/integer? clojure.core/interleave clojure.core/intern clojure.core/interpose clojure.core/into clojure.core/into-array clojure.core/ints clojure.core/isa? clojure.core/iterate clojure.core/iterator-seq clojure.core/juxt clojure.core/keep clojure.core/keep-indexed clojure.core/key clojure.core/keys clojure.core/keyword clojure.core/keyword? clojure.core/last clojure.core/line-seq clojure.core/list clojure.core/list* clojure.core/list? clojure.core/load clojure.core/load-file clojure.core/load-reader clojure.core/load-string clojure.core/loaded-libs clojure.core/long clojure.core/long-array clojure.core/longs clojure.core/macroexpand clojure.core/macroexpand-1 clojure.core/make-array clojure.core/make-hierarchy clojure.core/map clojure.core/map-indexed clojure.core/map? clojure.core/mapcat clojure.core/mapv clojure.core/max clojure.core/max-key clojure.core/memoize clojure.core/merge clojure.core/merge-with clojure.core/meta clojure.core/method-sig clojure.core/methods clojure.core/min clojure.core/min-key clojure.core/mix-collection-hash clojure.core/mod clojure.core/munge clojure.core/name clojure.core/namespace clojure.core/namespace-munge clojure.core/neg? clojure.core/newline clojure.core/next clojure.core/nfirst clojure.core/nil? clojure.core/nnext clojure.core/not clojure.core/not-any? clojure.core/not-empty clojure.core/not-every? clojure.core/not= clojure.core/ns-aliases clojure.core/ns-imports clojure.core/ns-interns clojure.core/ns-map clojure.core/ns-name clojure.core/ns-publics clojure.core/ns-refers clojure.core/ns-resolve clojure.core/ns-unalias clojure.core/ns-unmap clojure.core/nth clojure.core/nthnext clojure.core/nthrest clojure.core/num clojure.core/number? clojure.core/numerator clojure.core/object-array clojure.core/odd? clojure.core/parents clojure.core/partial clojure.core/partition clojure.core/partition-all clojure.core/partition-by clojure.core/pcalls clojure.core/peek clojure.core/persistent! clojure.core/pmap clojure.core/pop clojure.core/pop! clojure.core/pop-thread-bindings clojure.core/pos? clojure.core/pr clojure.core/pr-str clojure.core/prefer-method clojure.core/prefers clojure.core/print clojure.core/print-ctor clojure.core/print-dup clojure.core/print-method clojure.core/print-simple clojure.core/print-str clojure.core/printf clojure.core/println clojure.core/println-str clojure.core/prn clojure.core/prn-str clojure.core/promise clojure.core/proxy-call-with-super clojure.core/proxy-mappings clojure.core/proxy-name clojure.core/push-thread-bindings clojure.core/quot clojure.core/rand clojure.core/rand-int clojure.core/rand-nth clojure.core/range clojure.core/ratio? clojure.core/rational? clojure.core/rationalize clojure.core/re-find clojure.core/re-groups clojure.core/re-matcher clojure.core/re-matches clojure.core/re-pattern clojure.core/re-seq clojure.core/read clojure.core/read-line clojure.core/read-string clojure.core/realized? clojure.core/record? clojure.core/reduce clojure.core/reduce-kv clojure.core/reduced clojure.core/reduced? clojure.core/reductions clojure.core/ref clojure.core/ref-history-count clojure.core/ref-max-history clojure.core/ref-min-history clojure.core/ref-set clojure.core/refer clojure.core/release-pending-sends clojure.core/rem clojure.core/remove clojure.core/remove-all-methods clojure.core/remove-method clojure.core/remove-ns clojure.core/remove-watch clojure.core/repeat clojure.core/repeatedly clojure.core/replace clojure.core/replicate clojure.core/require clojure.core/reset! clojure.core/reset-meta! clojure.core/resolve clojure.core/rest clojure.core/restart-agent clojure.core/resultset-seq clojure.core/reverse clojure.core/reversible? clojure.core/rseq clojure.core/rsubseq clojure.core/satisfies? clojure.core/second clojure.core/select-keys clojure.core/send clojure.core/send-off clojure.core/send-via clojure.core/seq clojure.core/seq? clojure.core/seque clojure.core/sequence clojure.core/sequential? clojure.core/set clojure.core/set-agent-send-executor! clojure.core/set-agent-send-off-executor! clojure.core/set-error-handler! clojure.core/set-error-mode! clojure.core/set-validator! clojure.core/set? clojure.core/short clojure.core/short-array clojure.core/shorts clojure.core/shuffle clojure.core/shutdown-agents clojure.core/slurp clojure.core/some clojure.core/some-fn clojure.core/some? clojure.core/sort clojure.core/sort-by clojure.core/sorted-map clojure.core/sorted-map-by clojure.core/sorted-set clojure.core/sorted-set-by clojure.core/sorted? clojure.core/special-symbol? clojure.core/spit clojure.core/split-at clojure.core/split-with clojure.core/str clojure.core/string? clojure.core/struct clojure.core/struct-map clojure.core/subs clojure.core/subseq clojure.core/subvec clojure.core/supers clojure.core/swap! clojure.core/symbol clojure.core/symbol? clojure.core/take clojure.core/take-last clojure.core/take-nth clojure.core/take-while clojure.core/test clojure.core/the-ns clojure.core/thread-bound? clojure.core/to-array clojure.core/to-array-2d clojure.core/trampoline clojure.core/transient clojure.core/tree-seq clojure.core/true? clojure.core/type clojure.core/unchecked-add clojure.core/unchecked-add-int clojure.core/unchecked-byte clojure.core/unchecked-char clojure.core/unchecked-dec clojure.core/unchecked-dec-int clojure.core/unchecked-divide-int clojure.core/unchecked-double clojure.core/unchecked-float clojure.core/unchecked-inc clojure.core/unchecked-inc-int clojure.core/unchecked-int clojure.core/unchecked-long clojure.core/unchecked-multiply clojure.core/unchecked-multiply-int clojure.core/unchecked-negate clojure.core/unchecked-negate-int clojure.core/unchecked-remainder-int clojure.core/unchecked-short clojure.core/unchecked-subtract clojure.core/unchecked-subtract-int clojure.core/underive clojure.core/unsigned-bit-shift-right clojure.core/update-in clojure.core/update-proxy clojure.core/use clojure.core/val clojure.core/vals clojure.core/var-get clojure.core/var-set clojure.core/var? clojure.core/vary-meta clojure.core/vec clojure.core/vector clojure.core/vector-of clojure.core/vector? clojure.core/with-bindings* clojure.core/with-meta clojure.core/with-redefs-fn clojure.core/xml-seq clojure.core/zero? clojure.core/zipmap coll? commute comp comparator compare compare-and-set! compile complement concat conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec dec' decimal? delay? deliver denominator deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall dorun double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq error-handler error-mode eval even? every-pred every? ex-data ex-info extend extenders extends? false? ffirst file-seq filter filterv find find-keyword find-ns find-protocol-impl find-protocol-method find-var first flatten float float-array float? floats flush fn? fnext fnil force format frequencies future-call future-cancel future-cancelled? future-done? future? gensym get get-in get-method get-proxy-class get-thread-bindings get-validator group-by hash hash-combine hash-map hash-ordered-coll hash-set hash-unordered-coll identical? identity ifn? in-ns inc inc' init-proxy instance? int int-array integer? interleave intern interpose into into-array ints isa? iterate iterator-seq juxt keep keep-indexed key keys keyword keyword? last line-seq list list* list? load load-file load-reader load-string loaded-libs long long-array longs macroexpand macroexpand-1 make-array make-hierarchy map map-indexed map? mapcat mapv max max-key memoize merge merge-with meta method-sig methods min min-key mix-collection-hash mod munge name namespace namespace-munge neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext nthrest num number? numerator object-array odd? parents partial partition partition-all partition-by pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers print print-ctor print-dup print-method print-simple print-str printf println println-str prn prn-str promise proxy-call-with-super proxy-mappings proxy-name push-thread-bindings quot rand rand-int rand-nth range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string realized? record? reduce reduce-kv reduced reduced? reductions ref ref-history-count ref-max-history ref-min-history ref-set refer release-pending-sends rem remove remove-all-methods remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest restart-agent resultset-seq reverse reversible? rseq rsubseq satisfies? second select-keys send send-off send-via seq seq? seque sequence sequential? set set-agent-send-executor! set-agent-send-off-executor! set-error-handler! set-error-mode! set-validator! set? short short-array shorts shuffle shutdown-agents slurp some some-fn some? sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-symbol? spit split-at split-with str string? struct struct-map subs subseq subvec supers swap! symbol symbol? take take-last take-nth take-while test the-ns thread-bound? to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-add-int unchecked-byte unchecked-char unchecked-dec unchecked-dec-int unchecked-divide-int unchecked-double unchecked-float unchecked-inc unchecked-inc-int unchecked-int unchecked-long unchecked-multiply unchecked-multiply-int unchecked-negate unchecked-negate-int unchecked-remainder-int unchecked-short unchecked-subtract unchecked-subtract-int underive unsigned-bit-shift-right update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector-of vector? with-bindings* with-meta with-redefs-fn xml-seq zero? zipmap
-syntax keyword clojureVariable *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *compiler-options* *data-readers* *default-data-reader-fn* *e *err* *file* *flush-on-newline* *fn-loader* *in* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *unchecked-math* *use-context-classloader* *verbose-defrecords* *warn-on-reflection* EMPTY-NODE char-escape-string char-name-string clojure.core/*1 clojure.core/*2 clojure.core/*3 clojure.core/*agent* clojure.core/*allow-unresolved-vars* clojure.core/*assert* clojure.core/*clojure-version* clojure.core/*command-line-args* clojure.core/*compile-files* clojure.core/*compile-path* clojure.core/*compiler-options* clojure.core/*data-readers* clojure.core/*default-data-reader-fn* clojure.core/*e clojure.core/*err* clojure.core/*file* clojure.core/*flush-on-newline* clojure.core/*fn-loader* clojure.core/*in* clojure.core/*math-context* clojure.core/*ns* clojure.core/*out* clojure.core/*print-dup* clojure.core/*print-length* clojure.core/*print-level* clojure.core/*print-meta* clojure.core/*print-readably* clojure.core/*read-eval* clojure.core/*source-path* clojure.core/*unchecked-math* clojure.core/*use-context-classloader* clojure.core/*verbose-defrecords* clojure.core/*warn-on-reflection* clojure.core/EMPTY-NODE clojure.core/char-escape-string clojure.core/char-name-string clojure.core/default-data-readers clojure.core/primitives-classnames clojure.core/unquote clojure.core/unquote-splicing default-data-readers primitives-classnames unquote unquote-splicing
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-011/clj/src/vim_clojure_static/generate.clj
+" Clojure version 1.8.0
+let s:clojure_syntax_keywords = {
+    \   'clojureBoolean': ["false","true"]
+    \ , 'clojureCond': ["case","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"]
+    \ , 'clojureConstant': ["nil"]
+    \ , 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype"]
+    \ , 'clojureException': ["catch","finally","throw","try"]
+    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn*","bound?","butlast","byte","byte-array","bytes","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-data","clojure.core/ex-info","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/init-proxy","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/use","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","ifn?","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","use","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
+    \ , 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/letfn","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","letfn","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"]
+    \ , 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/while","doseq","dotimes","while"]
+    \ , 'clojureSpecial': [".","clojure.core/fn","clojure.core/let","clojure.core/loop","def","do","fn","if","let","loop","monitor-enter","monitor-exit","new","quote","recur","set!","var"]
+    \ , 'clojureVariable': ["*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","EMPTY-NODE","char-escape-string","char-name-string","clojure.core/*1","clojure.core/*2","clojure.core/*3","clojure.core/*agent*","clojure.core/*allow-unresolved-vars*","clojure.core/*assert*","clojure.core/*clojure-version*","clojure.core/*command-line-args*","clojure.core/*compile-files*","clojure.core/*compile-path*","clojure.core/*compiler-options*","clojure.core/*data-readers*","clojure.core/*default-data-reader-fn*","clojure.core/*e","clojure.core/*err*","clojure.core/*file*","clojure.core/*flush-on-newline*","clojure.core/*fn-loader*","clojure.core/*in*","clojure.core/*math-context*","clojure.core/*ns*","clojure.core/*out*","clojure.core/*print-dup*","clojure.core/*print-length*","clojure.core/*print-level*","clojure.core/*print-meta*","clojure.core/*print-readably*","clojure.core/*read-eval*","clojure.core/*source-path*","clojure.core/*suppress-read*","clojure.core/*unchecked-math*","clojure.core/*use-context-classloader*","clojure.core/*verbose-defrecords*","clojure.core/*warn-on-reflection*","clojure.core/EMPTY-NODE","clojure.core/char-escape-string","clojure.core/char-name-string","clojure.core/default-data-readers","clojure.core/primitives-classnames","clojure.core/unquote","clojure.core/unquote-splicing","default-data-readers","primitives-classnames","unquote","unquote-splicing"]
+    \ }
+
+function! s:syntax_keyword(dict)
+	for key in keys(a:dict)
+		execute 'syntax keyword' key join(a:dict[key], ' ')
+	endfor
+endfunction
+
+if exists('b:clojure_syntax_without_core_keywords') && b:clojure_syntax_without_core_keywords
+	" Only match language specials and primitives
+	for s:key in ['clojureBoolean', 'clojureConstant', 'clojureException', 'clojureSpecial']
+		execute 'syntax keyword' s:key join(s:clojure_syntax_keywords[s:key], ' ')
+	endfor
+else
+	call s:syntax_keyword(s:clojure_syntax_keywords)
+endif
+
+if exists('g:clojure_syntax_keywords')
+	call s:syntax_keyword(g:clojure_syntax_keywords)
+endif
+
+if exists('b:clojure_syntax_keywords')
+	call s:syntax_keyword(b:clojure_syntax_keywords)
+endif
+
+unlet! s:key
+delfunction s:syntax_keyword
 
 " Keywords are symbols:
 "   static Pattern symbolPat = Pattern.compile("[:]?([\\D&&[^/]].*/)?([\\D&&[^/]][^/]*)");
@@ -43,7 +74,7 @@ syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\
 
 syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained
 
-syntax region clojureString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
+syntax region clojureString matchgroup=clojureStringDelimiter start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
 
 syntax match clojureCharacter "\\."
 syntax match clojureCharacter "\\o\%([0-3]\o\{2\}\|\o\{1,2\}\)"
@@ -77,7 +108,7 @@ syntax match clojureMeta "\^"
 syntax match clojureDeref "@"
 syntax match clojureDispatch "\v#[\^'=<_]?"
 
-" Clojure permits no more than 20 params.
+" Clojure permits no more than 20 anonymous params.
 syntax match clojureAnonArg "%\(20\|1\d\|[1-9]\|&\)\?"
 
 syntax match  clojureRegexpEscape "\v\\%([\\tnrfae.()\[\]{}^$*?+]|c\u|0[0-3]?\o{1,2}|x%(\x{2}|\{\x{1,6}\})|u\x{4})" contained display
@@ -85,27 +116,27 @@ syntax region clojureRegexpQuoted start=/\\Q/ms=e+1 skip=/\\\\\|\\"/ end=/\\E/me
 syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/       end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
 
 " -*- CHARACTER PROPERTY CLASSES -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj
-" Java version 1.7.0_51
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-011/clj/src/vim_clojure_static/generate.clj
+" Java version 1.8.0_92
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
-syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|titlecase|blank|digit|control)\}" contained display
+syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|join%(control|_control)|titlecase|blank|digit|control)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP][NSCMZPL]" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category\=)?%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display
-syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(l%(epc%(ha)?|y%([dc]i%(an)?)|a%(t%(n|in)|na|oo?)|i%(n%(b|ear_b)|mbu?|su))|vaii?|d%(srt|e%(seret|va%(nagari)?))|g%(lag%(olitic)?|eor%(gian)?|oth%(ic)?|re%(k|ek)|u%(j%(arati|r)|r%(u|mukhi)))|u%(gar%(itic)?|nknown)|a%(r%(ab%(ic)?|m%([ni]|enian))|v%(st|estan))|e%(thi%(opic)?|gyp%(tian_hieroglyphs)?)|z%(inh|yyy|zzz)|r%(un%(ic|r)|ejang|jng)|m%(a%(nd%(aic)?|layalam)|lym|y%(anmar|mr)|tei|ong%(olian)?|eetei_mayek)|c%(a%(n%(adian_aboriginal|s)|ri%(an)?)|y%(priot|r%(l|illic))|prt|uneiform|o%(pt%(ic)?|mmon)|h%(er%(okee)?|am))|i%(n%(scriptional_pa%(rthian|hlavi)|herited)|mperial_aramaic|tal)|b%(eng%(ali)?|a%(t%(ak|k)|li%(nese)?|mum?)|ra%(i%(lle)?|h%(mi)?)|opo%(mofo)?|u%(gi%(nese)?|h%(d|id)))|o%(g%(am|ham)|r%(iya|kh|ya)|sma%(nya)?|l%(d_%(south_arabian|persian|italic|turkic)|ck|_chiki))|p%(rti|h%(oenician|li|ag%(s_pa)?|nx))|k%(h%(m%(r|er)|ar%(oshthi)?)|nda|a%(li|n%(a|nada)|takana|yah_li|ithi)|thi)|yi%(ii)?|t%(elu%(gu)?|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|a%(i_%(le|tham|viet)|g%(alog|b%(anwa)?)|vt|l[ue]|m%(il|l))|fng|glg)|x%(peo|sux)|n%(ew_tai_lue|koo?)|h%(ira%(gana)?|an%([io]|unoo|g%(ul)?)?|ebr%(ew)?)|java%(nese)?|s%(inh%(ala)?|ha%(vian|w)|a%(ur%(ashtra)?|m%(r|aritan)|rb)|y%(r%(c|iac)|lo%(ti_nagri)?)|und%(anese)?))\}" contained display
-syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(javanese|h%(a%(lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms)|n%(unoo|gul%(compatibilityjamo|syllables|jamo%(extended\-[ab])?|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)| %(syllables|compatibility jamo|jamo%( extended\-[ab])?))))|i%(ragana|gh%( %(private use surrogates|surrogates)|_%(private_use_surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew)|i%(pa%([ _]extensions|extensions)|deographic%( description characters|_description_characters|descriptioncharacters)|nscriptional%(%([ _]pa%(rthian|hlavi))|pa%(rthian|hlavi))|mperial%(aramaic|[_ ]aramaic))|l%(e%(tterlike%([_ ]symbols|symbols)|pcha)|ow%([_ ]surrogates|surrogates)|i%(mbu|near%(_b_%(ideograms|syllabary)|b%(ideograms|syllabary)| b %(ideograms|syllabary))|su)|a%(tin%(extended%(additional|\-[dacb])| extended%( additional|\-[dacb])|\-1%(supplement| supplement)|_%(extended_%([dcb]|a%(dditional)?)|1_supplement))|o)|y[cd]ian)|b%(u%(ginese|hid)|ra%(hmi|ille%(patterns|[_ ]patterns))|o%(x%([ _]drawing|drawing)|pomofo%([ _]extended|extended)?)|lock%([ _]elements|elements)|yzantine%( musical symbols|musicalsymbols|_musical_symbols)|engali|a%(linese|mum%(supplement|[ _]supplement)?|tak|sic%([ _]latin|latin)))|e%(gyptian%([ _]hieroglyphs|hieroglyphs)|moticons|nclosed%( %(cjk letters and months|ideographic supplement|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|thiopic%(supplement|_%(supplement|extended%(_a)?)| %(supplement|extended%(\-a)?)|extended%(\-a)?)?)|k%(h%(aroshthi|mer%([_ ]symbols|symbols)?)|a%(takana%(_phonetic_extensions|phoneticextensions| phonetic extensions)?|n%(gxi%([_ ]radicals|radicals)|a%(supplement|[ _]supplement)|bun|nada)|ithi|yah%([ _]li|li)))|r%(u%(nic|mi%(numeralsymbols| numeral symbols|_numeral_symbols))|ejang)|n%(umber%(forms|[ _]forms)|ko|ew%(_tai_lue|tailue| tai lue))|m%(iscellaneous%(technical|symbols%(and%(pictographs|arrows))?|mathematicalsymbols\-[ab]| %(technical|mathematical symbols\-[ab]|symbols%( and %(pictographs|arrows))?)|_%(technical|symbols%(_and_%(pictographs|arrows))?|mathematical_symbols_[ab]))|usical%([_ ]symbols|symbols)|eetei%(mayek|[_ ]mayek)|a%(ndaic|hjong%([ _]tiles|tiles)|layalam|thematical%(alphanumericsymbols| %(alphanumeric symbols|operators)|_%(alphanumeric_symbols|operators)|operators))|yanmar%(extended\-a|_extended_a| extended\-a)?|o%(difier%(_tone_letters| tone letters|toneletters)|ngolian))|d%(e%(seret|vanagari%([ _]extended|extended)?)|ingbats|omino%([ _]tiles|tiles))|yi%(syllables|%([_ ]%(syllables|radicals))|radicals|jing%(hexagramsymbols| hexagram symbols|_hexagram_symbols))|s%(havian|mall%( form variants|formvariants|_form_variants)|p%(acing%(_modifier_letters| modifier letters|modifierletters)|ecials)|a%(maritan|urashtra)|u%(p%(erscripts%(_and_subscripts|andsubscripts| and subscripts)|plementa%(ry%(_private_use_area_[ab]|privateusearea\-[ab]| private use area\-[ab])|l%(_%(arrows_[ab]|mathematical_operators|punctuation)| %(mathematical operators|punctuation|arrows\-[ab])|mathematicaloperators|punctuation|arrows\-[ab])))|rrogates_area|ndanese)|inhala|y%(riac|loti%([_ ]nagri|nagri)))|p%(h%(o%(enician|netic%( extensions%( supplement)?|extensions%(supplement)?|_extensions%(_supplement)?))|a%(istos%([ _]disc|disc)|gs[_\-]pa))|laying%(cards|[_ ]cards)|rivate%(usearea| use area|_use_area))|o%(smanya|l%([ _]chiki|d%( %(south arabian|persian|italic|turkic)|southarabian|_%(south_arabian|persian|italic|turkic)|persian|italic|turkic)|chiki)|riya|ptical%( character recognition|_character_recognition|characterrecognition)|gham)|g%(u%(jarati|rmukhi)|othic|lagolitic|e%(o%(rgian%(supplement|[ _]supplement)?|metric%(shapes|[ _]shapes))|neral%([_ ]punctuation|punctuation))|reek%( %(and coptic|extended)|andcoptic|_extended|extended)?)|c%(o%(ntrol%(pictures|[ _]pictures)|m%(bining%(diacriticalmarks%(supplement|forsymbols)?|halfmarks| %(diacritical marks%( %(supplement|for symbols))?|half marks|marks for symbols)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%(_indic_number_forms|indicnumberforms| indic number forms))|ptic|unting%( rod numerals|_rod_numerals|rodnumerals))|y%(rillic%(extended\-[ab]|_%(extended_[ab]|supplementary)|supplement%(ary)?| %(extended\-[ab]|supplement%(ary)?))?|priot%(syllabary|[ _]syllabary))|u%(rrency%([_ ]symbols|symbols)|neiform%(_numbers_and_punctuation|numbersandpunctuation| numbers and punctuation)?)|arian|h%(erokee|am)|jk%(s%(ymbolsandpunctuation|trokes)|compatibility%(forms|ideographs%(supplement)?)?|radicalssupplement| %(compatibility%( %(ideographs%( supplement)?|forms))?|radicals supplement|unified ideographs%( extension [dacb])?|s%(ymbols and punctuation|trokes))|_%(s%(trokes|ymbols_and_punctuation)|radicals_supplement|compatibility%(_%(forms|ideographs%(_supplement)?))?|unified_ideographs%(_extension_[dacb])?)|unifiedideographs%(extension[dacb])?))|t%(i%(betan|finagh)|elugu|a%(mil|i%(xuanjingsymbols|_%(le|xuan_jing_symbols|tham|viet)|le| %(xuan jing symbols|le|tham|viet)|tham|viet)|g%(alog|s|banwa))|ransport%( and map symbols|_and_map_symbols|andmapsymbols)|ha%(i|ana))|a%(l%(chemical%([_ ]symbols|symbols)|phabetic%( presentation forms|_presentation_forms|presentationforms))|ncient%(_%(greek_%(musical_notation|numbers)|symbols)|greek%(numbers|musicalnotation)| %(greek %(numbers|musical notation)|symbols)|symbols)|egean%(numbers|[ _]numbers)|vestan|r%(abic%( %(supplement|presentation forms\-[ab])|supplement|_%(presentation_forms_[ab]|supplement)|presentationforms\-[ab])?|menian|rows))|u%(garitic|nified%(canadianaboriginalsyllabics%(extended)?|_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?))|v%(a%(i|riation%( selectors%( supplement)?|selectors%(supplement)?|_selectors%(_supplement)?))|e%(rtical%(forms|[ _]forms)|dic%([ _]extensions|extensions))))\}" contained display
-
-syntax match   clojureRegexpPredefinedCharClass	"\v%(\\[dDsSwW]|\.)" contained display
-syntax cluster clojureRegexpCharPropertyClasses	contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
-syntax cluster clojureRegexpCharClasses		contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
-syntax region  clojureRegexpCharClass		start="\[" skip=/\\\\\|\\]/ end="]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
-syntax match   clojureRegexpBoundary		"\\[bBAGZz]" contained display
-syntax match   clojureRegexpBoundary		"[$^]" contained display
-syntax match   clojureRegexpQuantifier		"[?*+][?+]\=" contained display
-syntax match   clojureRegexpQuantifier		"\v\{\d+%(,|,\d+)?}\??" contained display
-syntax match   clojureRegexpOr			"|" contained display
-syntax match   clojureRegexpBackRef		"\v\\%([1-9]\d*|k\<[a-zA-z]+\>)" contained display
+syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(l%(epc%(ha)?|y%([dc]i%(an)?)|a%(t%(n|in)|na|oo?)|i%(n%(b|ear_b)|mbu?|su))|p%(rti|lrd|h%(oenician|li|ag%(s_pa)?|nx))|vaii?|d%(srt|e%(seret|va%(nagari)?))|g%(lag%(olitic)?|eor%(gian)?|oth%(ic)?|re%(k|ek)|u%(j%(arati|r)|r%(u|mukhi)))|u%(gar%(itic)?|nknown)|a%(r%(ab%(ic)?|m%([ni]|enian))|v%(st|estan))|e%(thi%(opic)?|gyp%(tian_hieroglyphs)?)|z%(inh|yyy|zzz)|r%(un%(ic|r)|ejang|jng)|s%(inh%(ala)?|h%(rd|a%(vian|rada|w))|a%(ur%(ashtra)?|m%(r|aritan)|rb)|y%(r%(c|iac)|lo%(ti_nagri)?)|und%(anese)?|ora%(_sompeng)?)|i%(n%(scriptional_pa%(rthian|hlavi)|herited)|mperial_aramaic|tal)|b%(eng%(ali)?|a%(t%(ak|k)|li%(nese)?|mum?)|ra%(i%(lle)?|h%(mi)?)|opo%(mofo)?|u%(gi%(nese)?|h%(d|id)))|o%(g%(am|ham)|r%(iya|kh|ya)|sma%(nya)?|l%(d_%(south_arabian|persian|italic|turkic)|ck|_chiki))|k%(h%(m%(r|er)|ar%(oshthi)?)|nda|a%(li|n%(a|nada)|takana|yah_li|ithi)|thi)|m%(a%(nd%(aic)?|layalam)|lym|y%(anmar|mr)|tei|e%(r%(c|o%(itic_%(hieroglyphs|cursive))?)|etei_mayek)|ong%(olian)?|iao)|yi%(ii)?|x%(peo|sux)|n%(ew_tai_lue|koo?)|h%(ira%(gana)?|an%([io]|unoo|g%(ul)?)?|ebr%(ew)?)|c%(y%(priot|r%(l|illic))|a%(km|n%(adian_aboriginal|s)|ri%(an)?)|prt|h%(er%(okee)?|a%(m|kma))|uneiform|o%(pt%(ic)?|mmon))|t%(elu%(gu)?|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|a%(i_%(le|tham|viet)|g%(alog|b%(anwa)?)|vt|kri?|l[ue]|m%(il|l))|fng|glg)|java%(nese)?)\}" contained display
+syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(javanese|h%(a%(lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms)|n%(unoo|gul%(compatibilityjamo|syllables|jamo%(extended\-[ab])?|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)| %(syllables|compatibility jamo|jamo%( extended\-[ab])?))))|i%(ragana|gh%( %(private use surrogates|surrogates)|_%(private_use_surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew)|i%(pa%([ _]extensions|extensions)|deographic%( description characters|_description_characters|descriptioncharacters)|nscriptional%(%([ _]pa%(rthian|hlavi))|pa%(rthian|hlavi))|mperial%(aramaic|[_ ]aramaic))|l%(e%(tterlike%([_ ]symbols|symbols)|pcha)|ow%([_ ]surrogates|surrogates)|i%(mbu|near%(_b_%(ideograms|syllabary)|b%(ideograms|syllabary)| b %(ideograms|syllabary))|su)|a%(tin%(extended%(additional|\-[dacb])| extended%( additional|\-[dacb])|\-1%(supplement| supplement)|_%(extended_%([dcb]|a%(dditional)?)|1_supplement))|o)|y[cd]ian)|b%(u%(ginese|hid)|ra%(hmi|ille%(patterns|[_ ]patterns))|o%(x%([ _]drawing|drawing)|pomofo%([ _]extended|extended)?)|lock%([ _]elements|elements)|yzantine%( musical symbols|musicalsymbols|_musical_symbols)|engali|a%(linese|mum%(supplement|[ _]supplement)?|tak|sic%([ _]latin|latin)))|e%(gyptian%([ _]hieroglyphs|hieroglyphs)|moticons|nclosed%( %(cjk letters and months|ideographic supplement|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|thiopic%(supplement|_%(supplement|extended%(_a)?)| %(supplement|extended%(\-a)?)|extended%(\-a)?)?)|k%(h%(aroshthi|mer%([_ ]symbols|symbols)?)|a%(takana%(_phonetic_extensions|phoneticextensions| phonetic extensions)?|n%(gxi%([_ ]radicals|radicals)|a%(supplement|[ _]supplement)|bun|nada)|ithi|yah%([ _]li|li)))|m%(i%(ao|scellaneous%(technical|symbols%(and%(pictographs|arrows))?|mathematicalsymbols\-[ab]| %(technical|mathematical symbols\-[ab]|symbols%( and %(pictographs|arrows))?)|_%(technical|symbols%(_and_%(pictographs|arrows))?|mathematical_symbols_[ab])))|usical%([_ ]symbols|symbols)|e%(etei%(mayek%(extensions)?|_mayek%(_extensions)?| mayek%( extensions)?)|roitic%(hieroglyphs|%([_ ]%(hieroglyphs|cursive))|cursive))|a%(ndaic|hjong%([ _]tiles|tiles)|layalam|thematical%(alphanumericsymbols| %(alphanumeric symbols|operators)|_%(alphanumeric_symbols|operators)|operators))|yanmar%(extended\-a|_extended_a| extended\-a)?|o%(difier%(_tone_letters| tone letters|toneletters)|ngolian))|r%(u%(nic|mi%(numeralsymbols| numeral symbols|_numeral_symbols))|ejang)|n%(umber%(forms|[ _]forms)|ko|ew%(_tai_lue|tailue| tai lue))|c%(o%(ntrol%(pictures|[ _]pictures)|m%(bining%(diacriticalmarks%(supplement|forsymbols)?|halfmarks| %(diacritical marks%( %(supplement|for symbols))?|half marks|marks for symbols)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%(_indic_number_forms|indicnumberforms| indic number forms))|ptic|unting%( rod numerals|_rod_numerals|rodnumerals))|y%(rillic%(extended\-[ab]|_%(extended_[ab]|supplementary)|supplement%(ary)?| %(extended\-[ab]|supplement%(ary)?))?|priot%(syllabary|[ _]syllabary))|u%(rrency%([_ ]symbols|symbols)|neiform%(_numbers_and_punctuation|numbersandpunctuation| numbers and punctuation)?)|h%(a%(m|kma)|erokee)|arian|jk%(s%(ymbolsandpunctuation|trokes)|compatibility%(forms|ideographs%(supplement)?)?|radicalssupplement| %(compatibility%( %(ideographs%( supplement)?|forms))?|radicals supplement|unified ideographs%( extension [dacb])?|s%(ymbols and punctuation|trokes))|_%(s%(trokes|ymbols_and_punctuation)|radicals_supplement|compatibility%(_%(forms|ideographs%(_supplement)?))?|unified_ideographs%(_extension_[dacb])?)|unifiedideographs%(extension[dacb])?))|d%(e%(seret|vanagari%([ _]extended|extended)?)|ingbats|omino%([ _]tiles|tiles))|yi%(syllables|%([_ ]%(syllables|radicals))|radicals|jing%(hexagramsymbols| hexagram symbols|_hexagram_symbols))|s%(mall%( form variants|formvariants|_form_variants)|p%(acing%(_modifier_letters| modifier letters|modifierletters)|ecials)|ora%(sompeng|[ _]sompeng)|ha%(vian|rada)|a%(maritan|urashtra)|inhala|y%(riac|loti%([_ ]nagri|nagri))|u%(ndanese%(supplement|[ _]supplement)?|p%(erscripts%(_and_subscripts|andsubscripts| and subscripts)|plementa%(ry%(_private_use_area_[ab]|privateusearea\-[ab]| private use area\-[ab])|l%(_%(arrows_[ab]|mathematical_operators|punctuation)| %(mathematical operators|punctuation|arrows\-[ab])|mathematicaloperators|punctuation|arrows\-[ab])))|rrogates_area))|p%(h%(o%(enician|netic%( extensions%( supplement)?|extensions%(supplement)?|_extensions%(_supplement)?))|a%(istos%([ _]disc|disc)|gs[_\-]pa))|laying%(cards|[_ ]cards)|rivate%(usearea| use area|_use_area))|o%(smanya|l%([ _]chiki|d%( %(south arabian|persian|italic|turkic)|southarabian|_%(south_arabian|persian|italic|turkic)|persian|italic|turkic)|chiki)|riya|ptical%( character recognition|_character_recognition|characterrecognition)|gham)|g%(u%(jarati|rmukhi)|othic|lagolitic|e%(o%(rgian%(supplement|[ _]supplement)?|metric%(shapes|[ _]shapes))|neral%([_ ]punctuation|punctuation))|reek%( %(and coptic|extended)|andcoptic|_extended|extended)?)|t%(i%(betan|finagh)|elugu|ransport%( and map symbols|_and_map_symbols|andmapsymbols)|a%(mil|kri|i%(xuanjingsymbols|_%(le|xuan_jing_symbols|tham|viet)|le| %(xuan jing symbols|le|tham|viet)|tham|viet)|g%(alog|s|banwa))|ha%(i|ana))|a%(l%(chemical%([_ ]symbols|symbols)|phabetic%( presentation forms|_presentation_forms|presentationforms))|r%(menian|abic%(extended\-a|mathematicalalphabeticsymbols|supplement|_%(presentation_forms_[ab]|supplement|extended_a|mathematical_alphabetic_symbols)| %(extended\-a|mathematical alphabetic symbols|supplement|presentation forms\-[ab])|presentationforms\-[ab])?|rows)|ncient%(_%(greek_%(musical_notation|numbers)|symbols)|greek%(numbers|musicalnotation)| %(greek %(numbers|musical notation)|symbols)|symbols)|egean%(numbers|[ _]numbers)|vestan)|u%(garitic|nified%(canadianaboriginalsyllabics%(extended)?|_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?))|v%(a%(i|riation%( selectors%( supplement)?|selectors%(supplement)?|_selectors%(_supplement)?))|e%(rtical%(forms|[ _]forms)|dic%([ _]extensions|extensions))))\}" contained display
+
+syntax match   clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display
+syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
+syntax cluster clojureRegexpCharClasses         contains=clojureRegexpPredefinedCharClass,clojureRegexpCharClass,@clojureRegexpCharPropertyClasses
+syntax region  clojureRegexpCharClass           start="\[" skip=/\\\\\|\\]/ end="]" contained contains=clojureRegexpPredefinedCharClass,@clojureRegexpCharPropertyClasses
+syntax match   clojureRegexpBoundary            "\\[bBAGZz]" contained display
+syntax match   clojureRegexpBoundary            "[$^]" contained display
+syntax match   clojureRegexpQuantifier          "[?*+][?+]\=" contained display
+syntax match   clojureRegexpQuantifier          "\v\{\d+%(,|,\d+)?}\??" contained display
+syntax match   clojureRegexpOr                  "|" contained display
+syntax match   clojureRegexpBackRef             "\v\\%([1-9]\d*|k\<[a-zA-z]+\>)" contained display
 
 " Mode modifiers, mode-modified spans, lookaround, regular and atomic
 " grouping, and named-capturing.
@@ -123,66 +154,70 @@ syntax match clojureComment ";.*$" contains=clojureCommentTodo,@Spell
 syntax match clojureComment "#!.*$"
 
 " -*- TOP CLUSTER -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-010/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/guns/vim-clojure-static/blob/vim-release-011/clj/src/vim_clojure_static/generate.clj
 syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector
 
-syntax region clojureSexp   matchgroup=clojureParen start="("  matchgroup=clojureParen end=")" contains=@clojureTop fold
-syntax region clojureVector matchgroup=clojureParen start="\[" matchgroup=clojureParen end="]" contains=@clojureTop fold
-syntax region clojureMap    matchgroup=clojureParen start="{"  matchgroup=clojureParen end="}" contains=@clojureTop fold
+syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
+syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
+syntax region clojureMap    matchgroup=clojureParen start="{"  end="}" contains=@clojureTop fold
 
 " Highlight superfluous closing parens, brackets and braces.
 syntax match clojureError "]\|}\|)"
 
 syntax sync fromstart
 
-highlight default link clojureConstant			Constant
-highlight default link clojureBoolean			Boolean
-highlight default link clojureCharacter			Character
-highlight default link clojureKeyword			Keyword
-highlight default link clojureNumber			Number
-highlight default link clojureString			String
-highlight default link clojureStringEscape		Character
-
-highlight default link clojureRegexp			Constant
-highlight default link clojureRegexpEscape		Character
-highlight default link clojureRegexpCharClass		SpecialChar
-highlight default link clojureRegexpPosixCharClass	clojureRegexpCharClass
-highlight default link clojureRegexpJavaCharClass	clojureRegexpCharClass
-highlight default link clojureRegexpUnicodeCharClass	clojureRegexpCharClass
-highlight default link clojureRegexpPredefinedCharClass	clojureRegexpCharClass
-highlight default link clojureRegexpBoundary		SpecialChar
-highlight default link clojureRegexpQuantifier		SpecialChar
-highlight default link clojureRegexpMod			SpecialChar
-highlight default link clojureRegexpOr			SpecialChar
-highlight default link clojureRegexpBackRef		SpecialChar
-highlight default link clojureRegexpGroup		clojureRegexp
-highlight default link clojureRegexpQuoted		clojureString
-highlight default link clojureRegexpQuote		clojureRegexpBoundary
-
-highlight default link clojureVariable			Identifier
-highlight default link clojureCond			Conditional
-highlight default link clojureDefine			Define
-highlight default link clojureException			Exception
-highlight default link clojureFunc			Function
-highlight default link clojureMacro			Macro
-highlight default link clojureRepeat			Repeat
-
-highlight default link clojureSpecial			Special
-highlight default link clojureVarArg			Special
-highlight default link clojureQuote			SpecialChar
-highlight default link clojureUnquote			SpecialChar
-highlight default link clojureMeta			SpecialChar
-highlight default link clojureDeref			SpecialChar
-highlight default link clojureAnonArg			SpecialChar
-highlight default link clojureDispatch			SpecialChar
-
-highlight default link clojureComment			Comment
-highlight default link clojureCommentTodo		Todo
-
-highlight default link clojureError			Error
-
-highlight default link clojureParen			Delimiter
+highlight default link clojureConstant                  Constant
+highlight default link clojureBoolean                   Boolean
+highlight default link clojureCharacter                 Character
+highlight default link clojureKeyword                   Keyword
+highlight default link clojureNumber                    Number
+highlight default link clojureString                    String
+highlight default link clojureStringDelimiter           String
+highlight default link clojureStringEscape              Character
+
+highlight default link clojureRegexp                    Constant
+highlight default link clojureRegexpEscape              Character
+highlight default link clojureRegexpCharClass           SpecialChar
+highlight default link clojureRegexpPosixCharClass      clojureRegexpCharClass
+highlight default link clojureRegexpJavaCharClass       clojureRegexpCharClass
+highlight default link clojureRegexpUnicodeCharClass    clojureRegexpCharClass
+highlight default link clojureRegexpPredefinedCharClass clojureRegexpCharClass
+highlight default link clojureRegexpBoundary            SpecialChar
+highlight default link clojureRegexpQuantifier          SpecialChar
+highlight default link clojureRegexpMod                 SpecialChar
+highlight default link clojureRegexpOr                  SpecialChar
+highlight default link clojureRegexpBackRef             SpecialChar
+highlight default link clojureRegexpGroup               clojureRegexp
+highlight default link clojureRegexpQuoted              clojureString
+highlight default link clojureRegexpQuote               clojureRegexpBoundary
+
+highlight default link clojureVariable                  Identifier
+highlight default link clojureCond                      Conditional
+highlight default link clojureDefine                    Define
+highlight default link clojureException                 Exception
+highlight default link clojureFunc                      Function
+highlight default link clojureMacro                     Macro
+highlight default link clojureRepeat                    Repeat
+
+highlight default link clojureSpecial                   Special
+highlight default link clojureVarArg                    Special
+highlight default link clojureQuote                     SpecialChar
+highlight default link clojureUnquote                   SpecialChar
+highlight default link clojureMeta                      SpecialChar
+highlight default link clojureDeref                     SpecialChar
+highlight default link clojureAnonArg                   SpecialChar
+highlight default link clojureDispatch                  SpecialChar
+
+highlight default link clojureComment                   Comment
+highlight default link clojureCommentTodo               Todo
+
+highlight default link clojureError                     Error
+
+highlight default link clojureParen                     Delimiter
 
 let b:current_syntax = "clojure"
 
-" vim:sts=8:sw=8:ts=8:noet:smc=0
+let &cpo = s:cpo_sav
+unlet! s:cpo_sav
+
+" vim:sts=8:sw=8:ts=8:noet
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index c7a68388be..fefd0ff7b0 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -2,7 +2,7 @@
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2015 Nov 10
+" Last Change:	2016 Jul 07
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -80,6 +80,7 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppConstant		Constant
   HiLink cppRawStringDelimiter	Delimiter
   HiLink cppRawString		String
+  HiLink cppNumber		Number
   delcommand HiLink
 endif
 
diff --git a/runtime/syntax/d.vim b/runtime/syntax/d.vim
index 07a299fa55..8be9b9ff28 100644
--- a/runtime/syntax/d.vim
+++ b/runtime/syntax/d.vim
@@ -1,9 +1,9 @@
-" Vim syntax file for the D programming language (version 1.076 and 2.063).
+" Vim syntax file for the D programming language (version 1.076 and 2.069).
 "
 " Language:     D
 " Maintainer:   Jesse Phillips <Jesse.K.Phillips+D@gmail.com>
-" Last Change:  2013 October 5
-" Version:      0.26
+" Last Change:  2016 Feb 2
+" Version:      0.28
 "
 " Contributors:
 "   - Jason Mills: original Maintainer
@@ -15,6 +15,7 @@
 "   - Steven N. Oliver
 "   - Sohgo Takeuchi
 "   - Robert Clipsham
+"   - Petar Kirov
 "
 " Please submit bugs/comments/suggestions to the github repo: 
 " https://github.com/JesseKPhillips/d.vim
@@ -114,17 +115,19 @@ syn keyword dTraitsIdentifier      contained isIntegral isScalar isStaticArray
 syn keyword dTraitsIdentifier      contained isUnsigned isVirtualFunction
 syn keyword dTraitsIdentifier      contained isVirtualMethod isAbstractFunction
 syn keyword dTraitsIdentifier      contained isFinalFunction isStaticFunction
+syn keyword dTraitsIdentifier      contained isOverrideFunction isTemplate
 syn keyword dTraitsIdentifier      contained isRef isOut isLazy hasMember
-syn keyword dTraitsIdentifier      contained identifier getAttributes getMember
-syn keyword dTraitsIdentifier      contained getOverloads getProtection
-syn keyword dTraitsIdentifier      contained getVirtualFunctions
-syn keyword dTraitsIdentifier      contained getVirtualMethods parent
-syn keyword dTraitsIdentifier      contained classInstanceSize allMembers
+syn keyword dTraitsIdentifier      contained identifier getAliasThis
+syn keyword dTraitsIdentifier      contained getAttributes getFunctionAttributes getMember
+syn keyword dTraitsIdentifier      contained getOverloads getPointerBitmap getProtection
+syn keyword dTraitsIdentifier      contained getVirtualFunctions getVirtualIndex
+syn keyword dTraitsIdentifier      contained getVirtualMethods getUnitTests
+syn keyword dTraitsIdentifier      contained parent classInstanceSize allMembers
 syn keyword dTraitsIdentifier      contained derivedMembers isSame compiles
-syn keyword dPragmaIdentifier      contained lib msg startaddress GNU_asm
-syn keyword dExternIdentifier      contained Windows Pascal Java System D
+syn keyword dPragmaIdentifier      contained inline lib mangle msg startaddress GNU_asm
+syn keyword dExternIdentifier      contained C C++ D Windows Pascal System Objective-C
 syn keyword dAttribute             contained safe trusted system
-syn keyword dAttribute             contained property disable
+syn keyword dAttribute             contained property disable nogc
 syn keyword dVersionIdentifier     contained DigitalMars GNU LDC SDC D_NET
 syn keyword dVersionIdentifier     contained X86 X86_64 ARM PPC PPC64 IA64 MIPS MIPS64 Alpha
 syn keyword dVersionIdentifier     contained SPARC SPARC64 S390 S390X HPPA HPPA64 SH SH64
@@ -134,7 +137,7 @@ syn keyword dVersionIdentifier     contained Cygwin MinGW
 syn keyword dVersionIdentifier     contained LittleEndian BigEndian
 syn keyword dVersionIdentifier     contained D_InlineAsm_X86 D_InlineAsm_X86_64
 syn keyword dVersionIdentifier     contained D_Version2 D_Coverage D_Ddoc D_LP64 D_PIC
-syn keyword dVersionIdentifier     contained unittest none all
+syn keyword dVersionIdentifier     contained unittest assert none all
 
 syn cluster dComment contains=dNestedComment,dBlockComment,dLineComment
 
@@ -168,10 +171,10 @@ syn match dExternal     "\<extern\>"
 syn match dExtern       "\<extern\s*([_a-zA-Z][_a-zA-Z0-9\+]*\>"he=s+6 contains=dExternIdentifier
 
 " Make import a region to prevent highlighting keywords
-syn region dImport start="import\_s" end=";" contains=dExternal,@dComment
+syn region dImport start="\<import\_s" end=";" contains=dExternal,@dComment
 
 " Make module a region to prevent highlighting keywords
-syn region dImport start="module\_s" end=";" contains=dExternal,@dComment
+syn region dImport start="\<module\_s" end=";" contains=dExternal,@dComment
 
 " dTokens is used by the token string highlighting
 syn cluster dTokens contains=dExternal,dConditional,dBranch,dRepeat,dBoolean
@@ -246,13 +249,17 @@ syn match dUnicode "\\u\d\{4\}"
 
 " String.
 "
-syn region dString	start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dEscSequence,@Spell
+syn match	dFormat		display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
+syn match	dFormat		display "%%" contained
+
+syn region dString	start=+"+ end=+"[cwd]\=+ skip=+\\\\\|\\"+ contains=dFormat,dEscSequence,@Spell
 syn region dRawString	start=+`+ end=+`[cwd]\=+ contains=@Spell
 syn region dRawString	start=+r"+ end=+"[cwd]\=+ contains=@Spell
 syn region dHexString	start=+x"+ end=+"[cwd]\=+ contains=@Spell
 syn region dDelimString	start=+q"\z(.\)+ end=+\z1"+ contains=@Spell
 syn region dHereString	start=+q"\z(\I\i*\)\n+ end=+^\z1"+ contains=@Spell
 
+
 " Nesting delimited string contents
 "
 syn region dNestParenString start=+(+ end=+)+ contained transparent contains=dNestParenString,@Spell
@@ -276,8 +283,8 @@ syn cluster dTokens add=dString,dRawString,dHexString,dDelimString,dNestString
 
 " Token strings
 "
-syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens
-syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens
+syn region dNestTokenString start=+{+ end=+}+ contained contains=dNestTokenString,@dTokens,dFormat
+syn region dTokenString matchgroup=dTokenStringBrack transparent start=+q{+ end=+}+ contains=dNestTokenString,@dTokens,dFormat
 
 syn cluster dTokens add=dTokenString
 
@@ -357,6 +364,7 @@ hi def link dString              String
 hi def link dHexString           String
 hi def link dCharacter           Character
 hi def link dEscSequence         SpecialChar
+hi def link dFormat              SpecialChar
 hi def link dSpecialCharError    Error
 hi def link dOctalError          Error
 hi def link dOperator            Operator
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
index 37bf38fe11..73bf577e3e 100644
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	DCL (Digital Command Language - vms)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	7
+" Last Change:	May 02, 2016
+" Version:	9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
 
 " For version 5.x: Clear all syntax items
@@ -13,10 +13,10 @@ elseif exists("b:current_syntax")
   finish
 endif
 
-if version < 600
-  set iskeyword=$,@,48-57,_
-else
+if !has("patch-7.4.1142")
   setlocal iskeyword=$,@,48-57,_
+else
+ syn iskeyword $,@,48-57,_
 endif
 
 syn case ignore
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 4f1d6d4b11..d0c658c75e 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2015 Oct 24
+" Last Change: 2016 Apr 24
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -23,7 +23,7 @@ let binNMU='binary-only=yes'
 syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
 exe 'syn match debchangelogFirstKV	contained "; \('.urgency.'\|'.binNMU.'\)"'
 exe 'syn match debchangelogOtherKV	contained ", \('.urgency.'\|'.binNMU.'\)"'
-syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
 syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index e0c5f4075f..d35e24729d 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2015 Oct 24
+" Last Change: 2016 Apr 24
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -27,7 +27,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'vivid', 'wily', 'xenial', 'devel'
+      \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -36,7 +36,7 @@ let s:unsupported = [
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
-      \ 'utopic'
+      \ 'utopic', 'vivid'
       \ ]
 let &cpo=s:cpo
 
diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index 5b71e51192..27dac5c8ee 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -3,7 +3,8 @@
 "		according to freedesktop.org specification 0.9.4
 " http://pdx.freedesktop.org/Standards/desktop-entry-spec/desktop-entry-spec-0.9.4.html
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2004 May 16
+" Last Change:	2016 Apr 02
+" 		(added "Keywords")
 " Version Info: desktop.vim 0.9.4-1.2
 
 " For version 5.x: Clear all syntax items
@@ -53,8 +54,8 @@ syn keyword dtBooleanKey StartupNotify ReadOnly Terminal Hidden NoDisplay nextgr
 syn keyword dtBooleanValue true false containedin=dtBoolean contained
 
 " String
-syn match   dtString /^\s*\<\(Encoding\|Icon\|Path\|Actions\|FSType\|MountPoint\|UnmountIcon\|URL\|Categories\|OnlyShowIn\|NotShowIn\|StartupWMClass\|FilePattern\|MimeType\)\>.*/ contains=dtStringKey,dtDelim transparent
-syn keyword dtStringKey Type Encoding TryExec Exec Path Actions FSType MountPoint URL Categories OnlyShowIn NotShowIn StartupWMClass FilePattern MimeType nextgroup=dtDelim containedin=dtString contained
+syn match   dtString /^\s*\<\(Encoding\|Icon\|Path\|Actions\|FSType\|MountPoint\|UnmountIcon\|URL\|Keywords\|Categories\|OnlyShowIn\|NotShowIn\|StartupWMClass\|FilePattern\|MimeType\)\>.*/ contains=dtStringKey,dtDelim transparent
+syn keyword dtStringKey Type Encoding TryExec Exec Path Actions FSType MountPoint URL Keywords Categories OnlyShowIn NotShowIn StartupWMClass FilePattern MimeType nextgroup=dtDelim containedin=dtString contained
 
 " Exec
 syn match   dtExec /^\s*\<\(Exec\|TryExec\|SwallowExec\)\>.*/ contains=dtExecKey,dtDelim,dtExecParam transparent
diff --git a/runtime/syntax/diff.vim b/runtime/syntax/diff.vim
index 885feaebdd..b656cd97a6 100644
--- a/runtime/syntax/diff.vim
+++ b/runtime/syntax/diff.vim
@@ -2,7 +2,7 @@
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2015 Feb 03
+" Last Change:	2016 Apr 02
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -342,7 +342,7 @@ syn match diffLine	"^\<\d\+\>.*"
 syn match diffLine	"^\*\*\*\*.*"
 syn match diffLine	"^---$"
 
-"Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
+" Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
 syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
 
 syn match diffFile	"^diff\>.*"
@@ -352,12 +352,16 @@ syn match diffFile	"^==== .*"
 syn match diffOldFile	"^\*\*\* .*"
 syn match diffNewFile	"^--- .*"
 
+" Used by git
+syn match diffIndexLine	"^index \x\x\x\x.*"
+
 syn match diffComment	"^#.*"
 
 " Define the default highlighting.
 " Only used when an item doesn't have highlighting yet
 hi def link diffOldFile		diffFile
 hi def link diffNewFile		diffFile
+hi def link diffIndexLine	PreProc
 hi def link diffFile		Type
 hi def link diffOnly		Constant
 hi def link diffIdentical	Constant
diff --git a/runtime/syntax/dockerfile.vim b/runtime/syntax/dockerfile.vim
index d1693cba41..15b66925e5 100644
--- a/runtime/syntax/dockerfile.vim
+++ b/runtime/syntax/dockerfile.vim
@@ -1,7 +1,7 @@
 " dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <http://honza.ca>
-" Version:      0.5
-" Last Change:  2014 Aug 29
+" Maintainer:   Honza Pokorny <https://honza.ca>
+" Version:      0.6
+" Last Change:  2016 Aug 9
 " License:      BSD
 
 
@@ -13,7 +13,7 @@ let b:current_syntax = "dockerfile"
 
 syntax case ignore
 
-syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|CMD|ENTRYPOINT|ENV|EXPOSE|FROM|MAINTAINER|RUN|USER|VOLUME|WORKDIR|COPY)\s/
+syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s/
 
 syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
 
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 26d063524e..b470e56f60 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,15 +1,16 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.96
-" Last Change:	2015 Nov. 30
+" Version:	0.97
+" Last Change:	2016 Feb. 26
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
-"  Version 0.1 was based on the fortran 77 syntax file by Mario Eusebio and
-"  Preben Guldberg. Useful suggestions and contributions were made by: Andrej Panjkov,
-"  Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
+"  Version 0.1 (April 2000) was based on the fortran 77 syntax file by Mario Eusebio and
+"  Preben Guldberg. Since then, useful suggestions and contributions have been made,
+"  in chronological order, by:
+"  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
 "  Walter Dieudonn�, Alexander Wagner, Roman Bertle, Charles Rendleman,
-"  Andrew Griffiths, Joe Krahn, Hendrik Merx, and Matt Thompson.
+"  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, and Jan Hermann.
 
 if exists("b:current_syntax")
   finish
@@ -407,7 +408,7 @@ if exists("fortran_fold")
     else
       syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\s*[!#].*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
-      syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(.\+)\s*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(\(.\|&\s*\n\)\+)\(\s\|&\s*\n\)*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortranCase transparent fold keepend extend start="\<select\s*case\>" skip="^\s*[!#].*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
     endif
   endif
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 42fcf4abac..dc39677724 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -2,9 +2,9 @@
 " Language:	Groovy
 " Original Author:	Alessio Pace <billy.corgan@tiscali.it>
 " Maintainer:	Tobias Rapp <yahuxo@gmx.de>
-" Version: 	0.1.14
+" Version: 	0.1.16
 " URL:	  http://www.vim.org/scripts/script.php?script_id=945
-" Last Change:	2015 Apr 21
+" Last Change:	2016 May 23
 
 " THE ORIGINAL AUTHOR'S NOTES:
 "
@@ -255,8 +255,11 @@ syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpeci
 syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell
 syn region  groovyString          start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
 syn region  groovyString          start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell
-" regex string
-syn region groovyString           start='/[^/]'  end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr
+if exists("groovy_regex_strings")
+  " regex strings interfere with the division operator and thus are disabled
+  " by default
+  syn region groovyString         start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr
+endif
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
 syn match groovyELExpr /\${.\{-}}/ contained
 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index d133c6a804..41bb0b1938 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2014 Feb 12
+" Last Change:	2016 Apr 01
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -41,6 +41,7 @@ syn match helpVim		"NVIM REFERENCE.*"
 syn match helpOption		"'[a-z]\{2,\}'"
 syn match helpOption		"'t_..'"
 syn match helpCommand		"`[^` \t]\+`"hs=s+1,he=e-1 contains=helpBacktick
+syn match helpCommand		"\(^\|[^a-z"[]\)\zs`[^`]\+`\ze\([^a-z\t."']\|$\)"hs=s+1,he=e-1 contains=helpBacktick
 syn match helpHeader		"\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
 syn match helpGraphic		".* \ze`$" nextgroup=helpIgnore
 if has("conceal")
@@ -58,7 +59,7 @@ syn match helpSpecial		"\[N]"
 syn match helpSpecial		"N  N"he=s+1
 syn match helpSpecial		"Nth"me=e-2
 syn match helpSpecial		"N-1"me=e-2
-syn match helpSpecial		"{[-a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}"
+syn match helpSpecial		"{[-_a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}"
 syn match helpSpecial		"\s\[[-a-z^A-Z0-9_]\{2,}]"ms=s+1
 syn match helpSpecial		"<[-a-zA-Z0-9_]\+>"
 syn match helpSpecial		"<[SCM]-.>"
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index 2528f4f9b1..a402452389 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:    Lisp
 " Maintainer:  Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Oct 06, 2014
-" Version:     23
+" Last Change: May 02, 2016
+" Version:     25
 " URL:	       http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@@ -16,8 +16,10 @@ endif
 
 if exists("g:lisp_isk")
  exe "setl isk=".g:lisp_isk
-else
+elseif !has("patch-7.4.1142")
  setl isk=38,42,43,45,47-58,60-62,64-90,97-122,_
+else
+ syn iskeyword 38,42,43,45,47-58,60-62,64-90,97-122,_
 endif
 
 if exists("g:lispsyntax_ignorecase") || exists("g:lispsyntax_clisp")
diff --git a/runtime/syntax/man.vim b/runtime/syntax/man.vim
index fbc1847e6e..819b2adc31 100644
--- a/runtime/syntax/man.vim
+++ b/runtime/syntax/man.vim
@@ -1,67 +1,40 @@
-" Vim syntax file
-" Language:	Man page
-" Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
-" Version Info:
-" Last Change:	2015 Nov 24
+" Maintainer:          Anmol Sethi <anmol@aubble.com>
+" Previous Maintainer: SungHyun Nam <goweol@gmail.com>
 
-" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
-"	* manSubHeading
-"	* manSynopsis (only for sections 2 and 3)
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists('b:current_syntax')
   finish
 endif
 
-" Get the CTRL-H syntax to handle backspaced text
-if version >= 600
-  runtime! syntax/ctrlh.vim
-else
-  source <sfile>:p:h/ctrlh.vim
-endif
-
-syn case ignore
-syn match  manReference       "\f\+([1-9][a-z]\=)"
-syn match  manTitle	      "^\f\+([0-9]\+[a-z]\=).*"
-syn match  manSectionHeading  "^[a-z][a-z -]*[a-z]$"
-syn match  manSubHeading      "^\s\{3\}[a-z][a-z -]*[a-z]$"
-syn match  manOptionDesc      "^\s*[+-][a-z0-9]\S*"
-syn match  manLongOptionDesc  "^\s*--[a-z0-9-]\S*"
-" syn match  manHistory		"^[a-z].*last change.*$"
-
-if getline(1) =~ '^[a-zA-Z_]\+([23])'
-  syntax include @cCode <sfile>:p:h/c.vim
-  syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
-  syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
+syntax case  ignore
+syntax match manReference      display '[^()[:space:]]\+([0-9nx][a-z]*)'
+syntax match manSectionHeading display '^\S.*$'
+syntax match manTitle          display '^\%1l.*$'
+syntax match manSubHeading     display '^ \{3\}\S.*$'
+syntax match manOptionDesc     display '^\s\+\%(+\|-\)\S\+'
+
+highlight default link manTitle          Title
+highlight default link manSectionHeading Statement
+highlight default link manOptionDesc     Constant
+highlight default link manReference      PreProc
+highlight default link manSubHeading     Function
+
+if !exists('b:man_sect')
+  call man#init_pager()
 endif
-
-
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_man_syn_inits")
-  if version < 508
-    let did_man_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink manTitle	    Title
-  HiLink manSectionHeading  Statement
-  HiLink manOptionDesc	    Constant
-  HiLink manLongOptionDesc  Constant
-  HiLink manReference	    PreProc
-  HiLink manSubHeading      Function
-  HiLink manCFuncDefinition Function
-
-  delcommand HiLink
+if b:man_sect =~# '^[23]'
+  syntax include @c $VIMRUNTIME/syntax/c.vim
+  syntax match manCFuncDefinition display '\<\h\w*\>\ze\(\s\|\n\)*(' contained
+  syntax region manSynopsis start='^\%(
+        \SYNOPSIS\|
+        \SYNTAX\|
+        \SINTASSI\|
+        \SKŁADNIA\|
+        \СИНТАКСИС\|
+        \書式\)$' end='^\%(\S.*\)\=\S$' keepend contains=manSectionHeading,@c,manCFuncDefinition
+  highlight default link manCFuncDefinition Function
 endif
 
-let b:current_syntax = "man"
+" Prevent everything else from matching the last line
+execute 'syntax match manFooter display "^\%'.line('$').'l.*$"'
 
-" vim:ts=8 sts=2 sw=2:
+let b:current_syntax = 'man'
diff --git a/runtime/syntax/maple.vim b/runtime/syntax/maple.vim
index 9c94643836..77b1507b36 100644
--- a/runtime/syntax/maple.vim
+++ b/runtime/syntax/maple.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Maple V (based on release 4)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	11
+" Last Change:	May 02, 2016
+" Version:	13
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
 "
 " Package Function Selection: {{{1
@@ -30,10 +30,10 @@ elseif exists("b:current_syntax")
 endif
 
 " Iskeyword Effects: {{{1
-if version < 600
-  set iskeyword=$,48-57,_,a-z,@-Z
+if !has("patch-7.4.1142")
+ setl isk=$,48-57,_,a-z,@-Z
 else
-  setlocal iskeyword=$,48-57,_,a-z,@-Z
+ syn iskeyword $,48-57,_,a-z,@-Z
 endif
 
 " Package Selection: {{{1
diff --git a/runtime/syntax/messages.vim b/runtime/syntax/messages.vim
index 4648e94c13..c22e4e8d0c 100644
--- a/runtime/syntax/messages.vim
+++ b/runtime/syntax/messages.vim
@@ -3,6 +3,7 @@
 " Maintainer:       Yakov Lerner <iler.ml@gmail.com>
 " Latest Revision:  2008-06-29
 " Changes:          2008-06-29 support for RFC3339 tuimestamps James Vega
+" 		    2016 Jan 19: messagesDate changed by Bram
 
 if exists("b:current_syntax")
   finish
@@ -13,7 +14,7 @@ set cpo&vim
 
 syn match   messagesBegin       display '^' nextgroup=messagesDate,messagesDateRFC3339
 
-syn match   messagesDate        contained display '\a\a\a [ 0-9]\d *'
+syn match   messagesDate        contained display '[[:lower:][:upper:]][[:lower:][:upper:]][[:lower:][:upper:]] [ 0-9]\d *'
                                 \ nextgroup=messagesHour
 
 syn match   messagesHour        contained display '\d\d:\d\d:\d\d\s*'
diff --git a/runtime/syntax/mysql.vim b/runtime/syntax/mysql.vim
index c01ecc192b..d7cf74710d 100644
--- a/runtime/syntax/mysql.vim
+++ b/runtime/syntax/mysql.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:     mysql
 " Maintainer:   Kenneth J. Pronovici <pronovic@ieee.org>
-" Last Change:  $LastChangedDate: 2010-04-22 09:48:02 -0500 (Thu, 22 Apr 2010) $
+" Last Change:  $LastChangedDate: 2016-04-11 10:31:04 -0500 (Mon, 11 Apr 2016) $
 " Filenames:    *.mysql
 " URL:          ftp://cedar-solutions.com/software/mysql.vim
 " Note:         The definitions below are taken from the mysql user manual as of April 2002, for version 3.23
@@ -18,7 +18,7 @@ endif
 syn case ignore
 
 " General keywords which don't fall into other categories
-syn keyword mysqlKeyword         action add after aggregate all alter as asc auto_increment avg avg_row_length
+syn keyword mysqlKeyword         action add after aggregate all alter as asc auto_increment avg_row_length
 syn keyword mysqlKeyword         both by
 syn keyword mysqlKeyword         cascade change character check checksum column columns comment constraint create cross
 syn keyword mysqlKeyword         current_date current_time current_timestamp
@@ -30,7 +30,7 @@ syn keyword mysqlKeyword         global grant grants group
 syn keyword mysqlKeyword         having heap high_priority hosts hour hour_minute hour_second
 syn keyword mysqlKeyword         identified ignore index infile inner insert insert_id into isam
 syn keyword mysqlKeyword         join
-syn keyword mysqlKeyword         key keys kill last_insert_id leading left limit lines load local lock logs long 
+syn keyword mysqlKeyword         key keys kill last_insert_id leading left limit lines load local lock logs long
 syn keyword mysqlKeyword         low_priority
 syn keyword mysqlKeyword         match max_rows middleint min_rows minute minute_second modify month myisam
 syn keyword mysqlKeyword         natural no
@@ -64,6 +64,9 @@ syn match mysqlNumber            "\<0x[abcdefABCDEF0-9]*\>"
 " User variables
 syn match mysqlVariable          "@\a*[A-Za-z0-9]*\([._]*[A-Za-z0-9]\)*"
 
+" Escaped column names
+syn match mysqlEscaped           "`[^`]*`"
+
 " Comments (c-style, mysql-style and modified sql-style)
 syn region mysqlComment          start="/\*"  end="\*/"
 syn match mysqlComment           "#.*"
@@ -84,14 +87,14 @@ syn sync ccomment mysqlComment
 " The second problem is that some of these keywords are included in
 " function names.  For instance, year() is part of the name of the
 " dayofyear() function, and the dec keyword (no parenthesis) is part of
-" the name of the decode() function. 
+" the name of the decode() function.
 
-syn keyword mysqlType            tinyint smallint mediumint int integer bigint 
-syn keyword mysqlType            date datetime time bit bool 
+syn keyword mysqlType            tinyint smallint mediumint int integer bigint
+syn keyword mysqlType            date datetime time bit bool
 syn keyword mysqlType            tinytext mediumtext longtext text
 syn keyword mysqlType            tinyblob mediumblob longblob blob
-syn region mysqlType             start="float\W" end="."me=s-1 
-syn region mysqlType             start="float$" end="."me=s-1 
+syn region mysqlType             start="float\W" end="."me=s-1
+syn region mysqlType             start="float$" end="."me=s-1
 syn region mysqlType             start="float(" end=")" contains=mysqlNumber,mysqlVariable
 syn region mysqlType             start="double\W" end="."me=s-1
 syn region mysqlType             start="double$" end="."me=s-1
@@ -139,12 +142,12 @@ syn region mysqlFlow             start="if("       end=")"  contains=ALL
 "
 " I'm leery of just defining keywords for functions, since according to the MySQL manual:
 "
-"     Function names do not clash with table or column names. For example, ABS is a 
-"     valid column name. The only restriction is that for a function call, no spaces 
-"     are allowed between the function name and the `(' that follows it. 
+"     Function names do not clash with table or column names. For example, ABS is a
+"     valid column name. The only restriction is that for a function call, no spaces
+"     are allowed between the function name and the `(' that follows it.
 "
-" This means that if I want to highlight function names properly, I have to use a 
-" region to define them, not just a keyword.  This will probably cause the syntax file 
+" This means that if I want to highlight function names properly, I have to use a
+" region to define them, not just a keyword.  This will probably cause the syntax file
 " to load more slowly, but at least it will be 'correct'.
 
 syn region mysqlFunction         start="abs(" end=")" contains=ALL
@@ -154,6 +157,7 @@ syn region mysqlFunction         start="ascii(" end=")" contains=ALL
 syn region mysqlFunction         start="asin(" end=")" contains=ALL
 syn region mysqlFunction         start="atan(" end=")" contains=ALL
 syn region mysqlFunction         start="atan2(" end=")" contains=ALL
+syn region mysqlFunction         start="avg(" end=")" contains=ALL
 syn region mysqlFunction         start="benchmark(" end=")" contains=ALL
 syn region mysqlFunction         start="bin(" end=")" contains=ALL
 syn region mysqlFunction         start="bit_and(" end=")" contains=ALL
diff --git a/runtime/syntax/pf.vim b/runtime/syntax/pf.vim
index 1a8f34bbba..81add10e7e 100644
--- a/runtime/syntax/pf.vim
+++ b/runtime/syntax/pf.vim
@@ -2,30 +2,22 @@
 " Language:        OpenBSD packet filter configuration (pf.conf)
 " Original Author: Camiel Dobbelaar <cd@sentia.nl>
 " Maintainer:      Lauri Tirkkonen <lotheac@iki.fi>
-" Last Change:     2013 Apr 02
+" Last Change:     2016 Jul 06
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
 setlocal foldmethod=syntax
+syn iskeyword @,48-57,_,-,+
 syn sync fromstart
 
 syn cluster	pfNotLS		contains=pfTodo,pfVarAssign
-syn keyword	pfCmd		altq anchor antispoof binat nat pass
-syn keyword	pfCmd		queue rdr scrub table set
-syn keyword	pfService	auth bgp domain finger ftp http https ident
-syn keyword	pfService	imap irc isakmp kerberos mail nameserver nfs
-syn keyword	pfService	nntp ntp pop3 portmap pptp rpcbind rsync smtp
-syn keyword	pfService	snmp snmptrap socks ssh sunrpc syslog telnet
-syn keyword	pfService	tftp www
+syn keyword	pfCmd		anchor antispoof block include match pass queue
+syn keyword	pfCmd		queue set table
+syn match	pfCmd		/^\s*load\sanchor\>/
 syn keyword	pfTodo		TODO XXX contained
 syn keyword	pfWildAddr	all any
-syn match	pfCmd		/block\s/
 syn match	pfComment	/#.*$/ contains=pfTodo
 syn match	pfCont		/\\$/
 syn match	pfErrClose	/}/
@@ -34,43 +26,81 @@ syn match	pfIPv6		/[a-fA-F0-9:]*::[a-fA-F0-9:.]*/
 syn match	pfIPv6		/[a-fA-F0-9:]\+:[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+/
 syn match	pfNetmask	/\/\d\+/
 syn match	pfNum		/[a-zA-Z0-9_:.]\@<!\d\+[a-zA-Z0-9_:.]\@!/
-syn match	pfTable		/<\s*[a-zA-Z][a-zA-Z0-9_]*\s*>/
+syn match	pfTable		/<\s*[a-zA-Z0-9_:][a-zA-Z0-9_:.-]*\s*>/
 syn match	pfVar		/$[a-zA-Z][a-zA-Z0-9_]*/
 syn match	pfVarAssign	/^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1
 syn region	pfFold1		start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 transparent fold
 syn region	pfFold2		start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 transparent fold
 syn region	pfFold3		start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent fold
 syn region	pfList		start=/{/ end=/}/ transparent contains=ALLBUT,pfErrClose,@pfNotLS
-syn region	pfString	start=/"/ end=/"/ transparent contains=ALLBUT,pfString,@pfNotLS
-syn region	pfString	start=/'/ end=/'/ transparent contains=ALLBUT,pfString,@pfNotLS
+syn region	pfString	start=/"/ skip=/\\"/ end=/"/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
+syn region	pfString	start=/'/ skip=/\\'/ end=/'/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_c_syn_inits")
-  if version < 508
-    let did_c_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+syn keyword	pfService	802-11-iapp Microsoft-SQL-Monitor
+syn keyword	pfService	Microsoft-SQL-Server NeXTStep NextStep
+syn keyword	pfService	afpovertcp afs3-bos afs3-callback afs3-errors
+syn keyword	pfService	afs3-fileserver afs3-kaserver afs3-prserver
+syn keyword	pfService	afs3-rmtsys afs3-update afs3-vlserver
+syn keyword	pfService	afs3-volser amt-redir-tcp amt-redir-tls
+syn keyword	pfService	amt-soap-http amt-soap-https asf-rmcp at-echo
+syn keyword	pfService	at-nbp at-rtmp at-zis auth authentication
+syn keyword	pfService	bfd-control bfd-echo bftp bgp bgpd biff bootpc
+syn keyword	pfService	bootps canna cddb cddbp chargen chat cmd
+syn keyword	pfService	cmip-agent cmip-man comsat conference
+syn keyword	pfService	conserver courier csnet-ns cso-ns cvspserver
+syn keyword	pfService	daap datametrics daytime dhcpd-sync
+syn keyword	pfService	dhcpv6-client dhcpv6-server discard domain
+syn keyword	pfService	echo efs eklogin ekshell ekshell2 epmap eppc
+syn keyword	pfService	exec finger ftp ftp-data git gopher hostname
+syn keyword	pfService	hostnames hprop http https hunt hylafax iapp
+syn keyword	pfService	icb ident imap imap2 imap3 imaps ingreslock
+syn keyword	pfService	ipp iprop ipsec-msft ipsec-nat-t ipx irc
+syn keyword	pfService	isakmp iscsi isisd iso-tsap kauth kdc kerberos
+syn keyword	pfService	kerberos-adm kerberos-iv kerberos-sec
+syn keyword	pfService	kerberos_master kf kip klogin kpasswd kpop
+syn keyword	pfService	krb524 krb_prop krbupdate krcmd kreg kshell kx
+syn keyword	pfService	l2tp ldap ldaps ldp link login mail mdns
+syn keyword	pfService	mdnsresponder microsoft-ds ms-sql-m ms-sql-s
+syn keyword	pfService	msa msp mtp mysql name nameserver netbios-dgm
+syn keyword	pfService	netbios-ns netbios-ssn netnews netplan netrjs
+syn keyword	pfService	netstat netwall newdate nextstep nfs nfsd
+syn keyword	pfService	nicname nnsp nntp ntalk ntp null openwebnet
+syn keyword	pfService	ospf6d ospfapi ospfd photuris pop2 pop3 pop3pw
+syn keyword	pfService	pop3s poppassd portmap postgresql postoffice
+syn keyword	pfService	pptp presence printer prospero prospero-np
+syn keyword	pfService	puppet pwdgen qotd quote radacct radius
+syn keyword	pfService	radius-acct rdp readnews remotefs resource rfb
+syn keyword	pfService	rfe rfs rfs_server ripd ripng rje rkinit rlp
+syn keyword	pfService	routed router rpc rpcbind rsync rtelnet rtsp
+syn keyword	pfService	sa-msg-port sane-port sftp shell sieve silc
+syn keyword	pfService	sink sip smtp smtps smux snmp snmp-trap
+syn keyword	pfService	snmptrap snpp socks source spamd spamd-cfg
+syn keyword	pfService	spamd-sync spooler spop3 ssdp ssh submission
+syn keyword	pfService	sunrpc supdup supfiledbg supfilesrv support
+syn keyword	pfService	svn svrloc swat syslog syslog-tls systat
+syn keyword	pfService	tacacs tacas+ talk tap tcpmux telnet tempo
+syn keyword	pfService	tftp time timed timeserver timserver tsap
+syn keyword	pfService	ttylink ttytst ub-dns-control ulistserv untp
+syn keyword	pfService	usenet users uucp uucp-path uucpd vnc vxlan
+syn keyword	pfService	wais webster who whod whois www x400 x400-snd
+syn keyword	pfService	xcept xdmcp xmpp-bosh xmpp-client xmpp-server
+syn keyword	pfService	z3950 zabbix-agent zabbix-trapper zebra
+syn keyword	pfService	zebrasrv
 
-  HiLink pfCmd		Statement
-  HiLink pfComment	Comment
-  HiLink pfCont		Statement
-  HiLink pfErrClose	Error
-  HiLink pfIPv4		Type
-  HiLink pfIPv6		Type
-  HiLink pfNetmask	Constant
-  HiLink pfNum		Constant
-  HiLink pfService	Constant
-  HiLink pfTable	Identifier
-  HiLink pfTodo		Todo
-  HiLink pfVar		Identifier
-  HiLink pfVarAssign	Identifier
-  HiLink pfWildAddr	Type
-
-  delcommand HiLink
-endif
+hi def link pfCmd	Statement
+hi def link pfComment	Comment
+hi def link pfCont	Statement
+hi def link pfErrClose	Error
+hi def link pfIPv4	Type
+hi def link pfIPv6	Type
+hi def link pfNetmask	Constant
+hi def link pfNum	Constant
+hi def link pfService	Constant
+hi def link pfString	String
+hi def link pfTable	Identifier
+hi def link pfTodo	Todo
+hi def link pfVar	Identifier
+hi def link pfVarAssign	Identifier
+hi def link pfWildAddr	Type
 
 let b:current_syntax = "pf"
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index 4e1a84651c..fc257418d0 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Dec 26, 2015
+" Last Change: Apr 18, 2016
 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -136,7 +136,7 @@ syn keyword phpConstant  __LINE__ __FILE__ __FUNCTION__ __METHOD__ __CLASS__ __D
 
 " Function and Methods ripped from php_manual_de.tar.gz Jan 2003
 syn keyword phpFunctions  apache_child_terminate apache_get_modules apache_get_version apache_getenv apache_lookup_uri apache_note apache_request_headers apache_response_headers apache_setenv ascii2ebcdic ebcdic2ascii getallheaders virtual contained
-syn keyword phpFunctions  array_change_key_case array_chunk array_combine array_count_values array_diff_assoc array_diff_uassoc array_diff array_fill array_filter array_flip array_intersect_assoc array_intersect array_key_exists array_keys array_map array_merge_recursive array_merge array_multisort array_pad array_pop array_push array_rand array_reduce array_reverse array_search array_shift array_slice array_splice array_sum array_udiff_assoc array_udiff_uassoc array_udiff array_unique array_unshift array_values array_walk array arsort asort compact count current each end extract in_array key krsort ksort list natcasesort natsort next pos prev range reset rsort shuffle sizeof sort uasort uksort usort contained
+syn keyword phpFunctions  array_change_key_case array_chunk array_column array_combine array_count_values array_diff_assoc array_diff_key array_diff_uassoc array_diff_ukey array_diff array_fill_keys array_fill array_filter array_flip array_intersect_assoc array_intersect_key array_intersect_uassoc array_intersect_ukey array_intersect array_key_exists array_keys array_map array_merge_recursive array_merge array_multisort array_pad array_pop array_product array_push array_rand array_reduce array_replace_recursive array_replace array_reverse array_search array_shift array_slice array_splice array_sum array_udiff_assoc array_udiff_uassoc array_udiff array_uintersect_assoc array_uintersect_uassoc array_uintersect array_unique array_unshift array_values array_walk_recursive array_walk arsort asort count current each end in_array key_exists key krsort ksort natcasesort natsort next pos prev range reset rsort shuffle sizeof sort uasort uksort usort contained
 syn keyword phpFunctions  aspell_check aspell_new aspell_suggest  contained
 syn keyword phpFunctions  bcadd bccomp bcdiv bcmod bcmul bcpow bcpowmod bcscale bcsqrt bcsub  contained
 syn keyword phpFunctions  bzclose bzcompress bzdecompress bzerrno bzerror bzerrstr bzflush bzopen bzread bzwrite  contained
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 78d35e4c15..fa42b3e2d2 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2015 Sep 15
+" Last Change:	2016 Jul 21
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -72,7 +72,7 @@ set cpo&vim
 "   built-in below (use 'from __future__ import print_function' in 2)
 " - async and await were added in Python 3.5 and are soft keywords.
 "
-syn keyword pythonStatement	False, None, True
+syn keyword pythonStatement	False None True
 syn keyword pythonStatement	as assert break continue del exec global
 syn keyword pythonStatement	lambda nonlocal pass print return with yield
 syn keyword pythonStatement	class def nextgroup=pythonFunction skipwhite
@@ -199,6 +199,8 @@ if !exists("python_no_builtin_highlight")
   syn keyword pythonBuiltin	ascii bytes exec
   " non-essential built-in functions; Python 2 only
   syn keyword pythonBuiltin	apply buffer coerce intern
+  " avoid highlighting attributes as builtins
+  syn match   pythonAttribute	/\.\h\w*/hs=s+1 contains=ALLBUT,pythonBuiltin transparent
 endif
 
 " From the 'Python Library Reference' class hierarchy at the bottom.
diff --git a/runtime/syntax/r.vim b/runtime/syntax/r.vim
index e48b6686cb..d96bf96acb 100644
--- a/runtime/syntax/r.vim
+++ b/runtime/syntax/r.vim
@@ -5,17 +5,21 @@
 " 		      Tom Payne <tom@tompayne.org>
 " Contributor:        Johannes Ranke <jranke@uni-bremen.de>
 " Homepage:           https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	      Wed Oct 21, 2015  06:33AM
+" Last Change:	      Thu Mar 10, 2016  12:26PM
 " Filenames:	      *.R *.r *.Rhistory *.Rt
 "
 " NOTE: The highlighting of R functions is defined in
 " runtime files created by a filetype plugin, if installed.
 "
 " CONFIGURATION:
-"   syntax folding can be turned on by
+"   Syntax folding can be turned on by
 "
 "      let r_syntax_folding = 1
 "
+"   ROxygen highlighting can be turned off by
+"
+"      let r_hl_roxygen = 0
+"
 " Some lines of code were borrowed from Zhuojun Chen.
 
 if exists("b:current_syntax")
@@ -24,9 +28,12 @@ endif
 
 setlocal iskeyword=@,48-57,_,.
 
-if exists("g:r_syntax_folding")
+if exists("g:r_syntax_folding") && g:r_syntax_folding
   setlocal foldmethod=syntax
 endif
+if !exists("g:r_hl_roxygen")
+  let g:r_hl_roxygen = 1
+endif
 
 syn case match
 
@@ -35,18 +42,20 @@ syn match rCommentTodo contained "\(BUG\|FIXME\|NOTE\|TODO\):"
 syn match rComment contains=@Spell,rCommentTodo,rOBlock "#.*"
 
 " Roxygen
-syn region rOBlock start="^\s*\n#\{1,2}' " start="\%^#\{1,2}' " end="^\(#\{1,2}'\)\@!" contains=rOTitle,rOKeyword,rOExamples,@Spell keepend
-syn region rOTitle start="^\s*\n#\{1,2}' " start="\%^#\{1,2}' " end="^\(#\{1,2}'\s*$\)\@=" contained contains=rOCommentKey
-syn match rOCommentKey "#\{1,2}'" containedin=rOTitle contained
-
-syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOKeyword
-
-syn match rOKeyword contained "@\(param\|return\|name\|rdname\|examples\|example\|include\|docType\)"
-syn match rOKeyword contained "@\(S3method\|TODO\|aliases\|alias\|assignee\|author\|callGraphDepth\|callGraph\)"
-syn match rOKeyword contained "@\(callGraphPrimitives\|concept\|exportClass\|exportMethod\|exportPattern\|export\|formals\)"
-syn match rOKeyword contained "@\(format\|importClassesFrom\|importFrom\|importMethodsFrom\|import\|keywords\|useDynLib\)"
-syn match rOKeyword contained "@\(method\|noRd\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)"
-syn match rOKeyword contained "@\(family\|template\|templateVar\|description\|details\|inheritParams\|field\)"
+if g:r_hl_roxygen
+  syn region rOBlock start="^\s*\n#\{1,2}' " start="\%^#\{1,2}' " end="^\(#\{1,2}'\)\@!" contains=rOTitle,rOKeyword,rOExamples,@Spell keepend
+  syn region rOTitle start="^\s*\n#\{1,2}' " start="\%^#\{1,2}' " end="^\(#\{1,2}'\s*$\)\@=" contained contains=rOCommentKey
+  syn match rOCommentKey "#\{1,2}'" containedin=rOTitle contained
+
+  syn region rOExamples start="^#\{1,2}' @examples.*"rs=e+1,hs=e+1 end="^\(#\{1,2}' @.*\)\@=" end="^\(#\{1,2}'\)\@!" contained contains=rOKeyword
+
+  syn match rOKeyword contained "@\(param\|return\|name\|rdname\|examples\|example\|include\|docType\)"
+  syn match rOKeyword contained "@\(S3method\|TODO\|aliases\|alias\|assignee\|author\|callGraphDepth\|callGraph\)"
+  syn match rOKeyword contained "@\(callGraphPrimitives\|concept\|exportClass\|exportMethod\|exportPattern\|export\|formals\)"
+  syn match rOKeyword contained "@\(format\|importClassesFrom\|importFrom\|importMethodsFrom\|import\|keywords\|useDynLib\)"
+  syn match rOKeyword contained "@\(method\|noRd\|note\|references\|seealso\|setClass\|slot\|source\|title\|usage\)"
+  syn match rOKeyword contained "@\(family\|template\|templateVar\|description\|details\|inheritParams\|field\)"
+endif
 
 
 if &filetype == "rhelp"
@@ -159,12 +168,13 @@ syn match rBraceError "[)}]" contained
 syn match rCurlyError "[)\]]" contained
 syn match rParenError "[\]}]" contained
 
-" Source list of R functions produced by a filetype plugin (if installed)
-if has("nvim")
-  " Nvim-R
+if !exists("g:R_hi_fun")
+  let g:R_hi_fun = 1
+endif
+if g:R_hi_fun
+  " Nvim-R:
   runtime R/functions.vim
-else
-  " Vim-R-plugin
+  " Vim-R-plugin:
   runtime r-plugin/functions.vim
 endif
 
@@ -235,11 +245,13 @@ hi def link rStatement   Statement
 hi def link rString      String
 hi def link rStrError    Error
 hi def link rType        Type
-hi def link rOKeyword    Title
-hi def link rOBlock      Comment
-hi def link rOTitle      Title
-hi def link rOCommentKey Comment
-hi def link rOExamples   SpecialComment
+if g:r_hl_roxygen
+  hi def link rOKeyword    Title
+  hi def link rOBlock      Comment
+  hi def link rOTitle      Title
+  hi def link rOCommentKey Comment
+  hi def link rOExamples   SpecialComment
+endif
 
 
 let b:current_syntax="r"
diff --git a/runtime/syntax/rhelp.vim b/runtime/syntax/rhelp.vim
index 32c91add48..47c764e296 100644
--- a/runtime/syntax/rhelp.vim
+++ b/runtime/syntax/rhelp.vim
@@ -2,25 +2,21 @@
 " Language:    R Help File
 " Maintainer: Jakson Aquino <jalvesaq@gmail.com>
 " Former Maintainer: Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: Wed Jul 09, 2014  10:28PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Sat Feb 06, 2016  11:34AM
 " Remarks:     - Includes R syntax highlighting in the appropriate
 "                sections if an r.vim file is in the same directory or in the
 "                default debian location.
 "              - There is no Latex markup in equations
 "              - Thanks to Will Gray for finding and fixing a bug
-"              - No support for \if, \ifelse and \out as I don't understand
-"                them and have no examples at hand (help welcome).
-"              - No support for \var tag within quoted string (dito)
+"              - No support for \var tag within quoted string
 
 " Version Clears: {{{1
-" For version 5.x: Clear all syntax items
-" For version 6.x and 7.x: Quit when a syntax file was already loaded
-if version < 600 
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif 
 
+scriptencoding utf-8
 setlocal iskeyword=@,48-57,_,.
 
 syn case match
@@ -29,9 +25,11 @@ syn case match
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\name{" end="}" 
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\alias{" end="}" 
 syn region rhelpIdentifier matchgroup=rhelpSection	start="\\pkg{" end="}" contains=rhelpLink
+syn region rhelpIdentifier matchgroup=rhelpSection	start="\\CRANpkg{" end="}" contains=rhelpLink
 syn region rhelpIdentifier matchgroup=rhelpSection start="\\method{" end="}" contained
 syn region rhelpIdentifier matchgroup=rhelpSection start="\\Rdversion{" end="}"
 
+
 " Highlighting of R code using an existing r.vim syntax file if available {{{1
 syn include @R syntax/r.vim
 
@@ -69,76 +67,115 @@ syn match rhelpDelimiter		"\\cr"
 syn match rhelpDelimiter		"\\tab "
 
 " Keywords {{{1
-syn match rhelpKeyword	"\\R"
-syn match rhelpKeyword	"\\ldots"
+syn match rhelpKeyword	"\\R\>"
+syn match rhelpKeyword	"\\ldots\>"
+syn match rhelpKeyword	"\\sspace\>"
 syn match rhelpKeyword  "--"
 syn match rhelpKeyword  "---"
-syn match rhelpKeyword  "<"
-syn match rhelpKeyword  ">"
-syn match rhelpKeyword	"\\ge"
-syn match rhelpKeyword	"\\le"
-syn match rhelpKeyword	"\\alpha"
-syn match rhelpKeyword	"\\beta"
-syn match rhelpKeyword	"\\gamma"
-syn match rhelpKeyword	"\\delta"
-syn match rhelpKeyword	"\\epsilon"
-syn match rhelpKeyword	"\\zeta"
-syn match rhelpKeyword	"\\eta"
-syn match rhelpKeyword	"\\theta"
-syn match rhelpKeyword	"\\iota"
-syn match rhelpKeyword	"\\kappa"
-syn match rhelpKeyword	"\\lambda"
-syn match rhelpKeyword	"\\mu"
-syn match rhelpKeyword	"\\nu"
-syn match rhelpKeyword	"\\xi"
-syn match rhelpKeyword	"\\omicron"
-syn match rhelpKeyword	"\\pi"
-syn match rhelpKeyword	"\\rho"
-syn match rhelpKeyword	"\\sigma"
-syn match rhelpKeyword	"\\tau"
-syn match rhelpKeyword	"\\upsilon"
-syn match rhelpKeyword	"\\phi"
-syn match rhelpKeyword	"\\chi"
-syn match rhelpKeyword	"\\psi"
-syn match rhelpKeyword	"\\omega"
-syn match rhelpKeyword	"\\Alpha"
-syn match rhelpKeyword	"\\Beta"
-syn match rhelpKeyword	"\\Gamma"
-syn match rhelpKeyword	"\\Delta"
-syn match rhelpKeyword	"\\Epsilon"
-syn match rhelpKeyword	"\\Zeta"
-syn match rhelpKeyword	"\\Eta"
-syn match rhelpKeyword	"\\Theta"
-syn match rhelpKeyword	"\\Iota"
-syn match rhelpKeyword	"\\Kappa"
-syn match rhelpKeyword	"\\Lambda"
-syn match rhelpKeyword	"\\Mu"
-syn match rhelpKeyword	"\\Nu"
-syn match rhelpKeyword	"\\Xi"
-syn match rhelpKeyword	"\\Omicron"
-syn match rhelpKeyword	"\\Pi"
-syn match rhelpKeyword	"\\Rho"
-syn match rhelpKeyword	"\\Sigma"
-syn match rhelpKeyword	"\\Tau"
-syn match rhelpKeyword	"\\Upsilon"
-syn match rhelpKeyword	"\\Phi"
-syn match rhelpKeyword	"\\Chi"
-syn match rhelpKeyword	"\\Psi"
-syn match rhelpKeyword	"\\Omega"
 
-" Links {{{1
-syn region rhelpLink matchgroup=rhelpSection start="\\link{" end="}" contained keepend extend
-syn region rhelpLink matchgroup=rhelpSection start="\\link\[.\{-}\]{" end="}" contained keepend extend
-syn region rhelpLink matchgroup=rhelpSection start="\\linkS4class{" end="}" contained keepend extend
+" Condition Keywords {{{2
+syn match rhelpKeyword	"\\if\>"
+syn match rhelpKeyword	"\\ifelse\>"
+syn match rhelpKeyword	"\\out\>"
+" Examples of usage:
+" \ifelse{latex}{\eqn{p = 5 + 6 - 7 \times 8}}{\eqn{p = 5 + 6 - 7 * 8}}
+" \ifelse{latex}{\out{$\alpha$}}{\ifelse{html}{\out{&alpha;}}{alpha}}
 
-" Verbatim like {{{1
-if v:version > 703
-  syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
-  syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
+" Keywords and operators valid only if in math mode {{{2
+syn match rhelpMathOp  "<" contained
+syn match rhelpMathOp  ">" contained
+syn match rhelpMathOp  "+" contained
+syn match rhelpMathOp  "-" contained
+syn match rhelpMathOp  "=" contained
+
+" Conceal function based on syntax/tex.vim {{{2
+if exists("g:tex_conceal")
+  let s:tex_conceal = g:tex_conceal
 else
-  syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
-  syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@<!{.\{-}\\\@<!}' end="}" contains=rhelpSpecialChar,rhelpComment
+  let s:tex_conceal = 'gm'
 endif
+function s:HideSymbol(pat, cchar, hide)
+  if a:hide
+    exe "syn match rhelpMathSymb '" . a:pat . "' contained conceal cchar=" . a:cchar
+  else
+    exe "syn match rhelpMathSymb '" . a:pat . "' contained"
+  endif
+endfunction
+
+" Math symbols {{{2
+if s:tex_conceal =~ 'm'
+  let s:hd = 1
+else
+  let s:hd = 0
+endif
+call s:HideSymbol('\\infty\>',  '∞', s:hd)
+call s:HideSymbol('\\ge\>',     '≥', s:hd)
+call s:HideSymbol('\\le\>',     '≤', s:hd)
+call s:HideSymbol('\\prod\>',   '∏', s:hd)
+call s:HideSymbol('\\sum\>',    '∑', s:hd)
+syn match rhelpMathSymb   	"\\sqrt\>" contained
+
+" Greek letters {{{2
+if s:tex_conceal =~ 'g'
+  let s:hd = 1
+else
+  let s:hd = 0
+endif
+call s:HideSymbol('\\alpha\>',    'α', s:hd)
+call s:HideSymbol('\\beta\>',     'β', s:hd)
+call s:HideSymbol('\\gamma\>',    'γ', s:hd)
+call s:HideSymbol('\\delta\>',    'δ', s:hd)
+call s:HideSymbol('\\epsilon\>',  'ϵ', s:hd)
+call s:HideSymbol('\\zeta\>',     'ζ', s:hd)
+call s:HideSymbol('\\eta\>',      'η', s:hd)
+call s:HideSymbol('\\theta\>',    'θ', s:hd)
+call s:HideSymbol('\\iota\>',     'ι', s:hd)
+call s:HideSymbol('\\kappa\>',    'κ', s:hd)
+call s:HideSymbol('\\lambda\>',   'λ', s:hd)
+call s:HideSymbol('\\mu\>',       'μ', s:hd)
+call s:HideSymbol('\\nu\>',       'ν', s:hd)
+call s:HideSymbol('\\xi\>',       'ξ', s:hd)
+call s:HideSymbol('\\pi\>',       'π', s:hd)
+call s:HideSymbol('\\rho\>',      'ρ', s:hd)
+call s:HideSymbol('\\sigma\>',    'σ', s:hd)
+call s:HideSymbol('\\tau\>',      'τ', s:hd)
+call s:HideSymbol('\\upsilon\>',  'υ', s:hd)
+call s:HideSymbol('\\phi\>',      'ϕ', s:hd)
+call s:HideSymbol('\\chi\>',      'χ', s:hd)
+call s:HideSymbol('\\psi\>',      'ψ', s:hd)
+call s:HideSymbol('\\omega\>',    'ω', s:hd)
+call s:HideSymbol('\\Gamma\>',    'Γ', s:hd)
+call s:HideSymbol('\\Delta\>',    'Δ', s:hd)
+call s:HideSymbol('\\Theta\>',    'Θ', s:hd)
+call s:HideSymbol('\\Lambda\>',   'Λ', s:hd)
+call s:HideSymbol('\\Xi\>',       'Ξ', s:hd)
+call s:HideSymbol('\\Pi\>',       'Π', s:hd)
+call s:HideSymbol('\\Sigma\>',    'Σ', s:hd)
+call s:HideSymbol('\\Upsilon\>',  'Υ', s:hd)
+call s:HideSymbol('\\Phi\>',      'Φ', s:hd)
+call s:HideSymbol('\\Psi\>',      'Ψ', s:hd)
+call s:HideSymbol('\\Omega\>',    'Ω', s:hd)
+delfunction s:HideSymbol
+" Note: The letters 'omicron', 'Alpha', 'Beta', 'Epsilon', 'Zeta', 'Eta',
+" 'Iota', 'Kappa', 'Mu', 'Nu', 'Omicron', 'Rho', 'Tau' and 'Chi' are listed
+" at src/library/tools/R/Rd2txt.R because they are valid in HTML, although
+" they do not make valid LaTeX code (e.g. &Alpha; versus \Alpha).
+
+" Links {{{1
+syn region rhelpLink matchgroup=rhelpType start="\\link{" end="}" contained keepend extend
+syn region rhelpLink matchgroup=rhelpType start="\\link\[.\{-}\]{" end="}" contained keepend extend
+syn region rhelpLink matchgroup=rhelpType start="\\linkS4class{" end="}" contained keepend extend
+syn region rhelpLink matchgroup=rhelpType start="\\url{" end="}" contained keepend extend
+syn region rhelpLink matchgroup=rhelpType start="\\href{" end="}" contained keepend extend
+syn region rhelpLink matchgroup=rhelpType start="\\figure{" end="}" contained keepend extend
+
+" Verbatim like {{{1
+syn region rhelpVerbatim matchgroup=rhelpType start="\\samp{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
+syn region rhelpVerbatim matchgroup=rhelpType start="\\verb{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpSpecialChar,rhelpComment
+
+" Equation {{{1
+syn region rhelpEquation matchgroup=rhelpType start="\\eqn{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpMathSymb,rhelpMathOp,rhelpRegion contained keepend extend
+syn region rhelpEquation matchgroup=rhelpType start="\\deqn{" skip='\\\@1<!{.\{-}\\\@1<!}' end="}" contains=rhelpMathSymb,rhelpMathOp,rhelpRegion contained keepend extend
 
 " Type Styles {{{1
 syn match rhelpType		"\\emph\>"
@@ -148,12 +185,9 @@ syn match rhelpType		"\\sQuote\>"
 syn match rhelpType		"\\dQuote\>"
 syn match rhelpType		"\\preformatted\>"
 syn match rhelpType		"\\kbd\>"
-syn match rhelpType		"\\eqn\>"
-syn match rhelpType		"\\deqn\>"
 syn match rhelpType		"\\file\>"
 syn match rhelpType		"\\email\>"
-syn match rhelpType		"\\url\>"
-syn match rhelpType		"\\href\>"
+syn match rhelpType		"\\enc\>"
 syn match rhelpType		"\\var\>"
 syn match rhelpType		"\\env\>"
 syn match rhelpType		"\\option\>"
@@ -163,6 +197,7 @@ syn match rhelpType		"\\renewcommand\>"
 syn match rhelpType		"\\dfn\>"
 syn match rhelpType		"\\cite\>"
 syn match rhelpType		"\\acronym\>"
+syn match rhelpType		"\\doi\>"
 
 " rhelp sections {{{1
 syn match rhelpSection		"\\encoding\>"
@@ -202,9 +237,9 @@ syn match rhelpDelimiter "{\|\[\|(\|)\|\]\|}"
 syn match rhelpComment /%.*$/
 
 " Error {{{1
-syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim
-syn region rhelpRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim
-syn region rhelpRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim
+syn region rhelpRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim,rhelpEquation
+syn region rhelpRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim,rhelpEquation
+syn region rhelpRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ contains=@Spell,rhelpCodeSpecial,rhelpComment,rhelpDelimiter,rhelpDots,rhelpFreesec,rhelpFreesubsec,rhelpIdentifier,rhelpKeyword,rhelpLink,rhelpPreProc,rhelpRComment,rhelpRcode,rhelpRegion,rhelpS4method,rhelpSection,rhelpSexpr,rhelpSpecialChar,rhelpString,rhelpType,rhelpVerbatim,rhelpEquation
 syn match rhelpError      /[)\]}]/
 syn match rhelpBraceError /[)}]/ contained
 syn match rhelpCurlyError /[)\]]/ contained
@@ -213,36 +248,27 @@ syn match rhelpParenError /[\]}]/ contained
 syntax sync match rhelpSyncRcode grouphere rhelpRcode "\\examples{"
 
 " Define the default highlighting {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rhelp_syntax_inits")
-  if version < 508
-    let did_rhelp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink rhelpVerbatim    String
-  HiLink rhelpDelimiter   Delimiter
-  HiLink rhelpIdentifier  Identifier
-  HiLink rhelpString      String
-  HiLink rhelpCodeSpecial Special
-  HiLink rhelpKeyword     Keyword
-  HiLink rhelpDots        Keyword
-  HiLink rhelpLink        Underlined
-  HiLink rhelpType        Type
-  HiLink rhelpSection     PreCondit
-  HiLink rhelpError       Error
-  HiLink rhelpBraceError  Error
-  HiLink rhelpCurlyError  Error
-  HiLink rhelpParenError  Error
-  HiLink rhelpPreProc     PreProc
-  HiLink rhelpDelimiter   Delimiter
-  HiLink rhelpComment     Comment
-  HiLink rhelpRComment    Comment
-  HiLink rhelpSpecialChar SpecialChar
-  delcommand HiLink
-endif 
+hi def link rhelpVerbatim    String
+hi def link rhelpDelimiter   Delimiter
+hi def link rhelpIdentifier  Identifier
+hi def link rhelpString      String
+hi def link rhelpCodeSpecial Special
+hi def link rhelpKeyword     Keyword
+hi def link rhelpDots        Keyword
+hi def link rhelpLink        Underlined
+hi def link rhelpType        Type
+hi def link rhelpSection     PreCondit
+hi def link rhelpError       Error
+hi def link rhelpBraceError  Error
+hi def link rhelpCurlyError  Error
+hi def link rhelpParenError  Error
+hi def link rhelpPreProc     PreProc
+hi def link rhelpDelimiter   Delimiter
+hi def link rhelpComment     Comment
+hi def link rhelpRComment    Comment
+hi def link rhelpSpecialChar SpecialChar
+hi def link rhelpMathSymb    Special
+hi def link rhelpMathOp      Operator
 
 let   b:current_syntax = "rhelp"
 
diff --git a/runtime/syntax/rmd.vim b/runtime/syntax/rmd.vim
index 6f1b847453..4cde7441d3 100644
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -1,15 +1,13 @@
 " markdown Text with R statements
 " Language: markdown with R code chunks
-" Last Change: Wed Jul 09, 2014  10:29PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Sat Feb 06, 2016  06:45AM
 "
 " CONFIGURATION:
 "   To highlight chunk headers as R code, put in your vimrc:
 "   let rmd_syn_hl_chunk = 1
 
-" for portability
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -58,6 +56,8 @@ if rmdIsPandoc == 0
   if exists("b:current_syntax")
     unlet b:current_syntax
   endif
+  " Extend cluster
+  syn cluster texMathZoneGroup add=rmdrInline
   " Inline
   syntax match rmdLaTeXInlDelim "\$"
   syntax match rmdLaTeXInlDelim "\\\$"
diff --git a/runtime/syntax/rnoweb.vim b/runtime/syntax/rnoweb.vim
index 7d42395b5c..665acc53e2 100644
--- a/runtime/syntax/rnoweb.vim
+++ b/runtime/syntax/rnoweb.vim
@@ -1,20 +1,14 @@
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2009 May 05
-" Version:     0.9
-" SVN:	       $Id: rnoweb.vim 84 2009-05-03 19:52:47Z ranke $
+" Last Change: Sat Feb 06, 2016  06:47AM
+" Version:     0.9.1
 " Remarks:     - This file is inspired by the proposal of 
-"				 Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
-"			     http://www.ime.usp.br/~feferraz/en/sweavevim.html
+"                Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
+"                http://www.ime.usp.br/~feferraz/en/sweavevim.html
 "
 
-" Version Clears: {{{1
-" For version 5.x: Clear all syntax items
-" For version 6.x and 7.x: Quit when a syntax file was already loaded
-if version < 600 
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif 
 
@@ -26,21 +20,22 @@ unlet b:current_syntax
 
 syn cluster texMatchGroup add=@rnoweb
 syn cluster texMathMatchGroup add=rnowebSexpr
+syn cluster texMathZoneGroup add=rnowebSexpr
 syn cluster texEnvGroup add=@rnoweb
 syn cluster texFoldGroup add=@rnoweb
-syn cluster texDocGroup		add=@rnoweb
-syn cluster texPartGroup		add=@rnoweb
-syn cluster texChapterGroup		add=@rnoweb
-syn cluster texSectionGroup		add=@rnoweb
-syn cluster texSubSectionGroup		add=@rnoweb
-syn cluster texSubSubSectionGroup	add=@rnoweb
-syn cluster texParaGroup		add=@rnoweb
+syn cluster texDocGroup add=@rnoweb
+syn cluster texPartGroup add=@rnoweb
+syn cluster texChapterGroup add=@rnoweb
+syn cluster texSectionGroup add=@rnoweb
+syn cluster texSubSectionGroup add=@rnoweb
+syn cluster texSubSubSectionGroup add=@rnoweb
+syn cluster texParaGroup add=@rnoweb
 
 " Highlighting of R code using an existing r.vim syntax file if available {{{1
 syn include @rnowebR syntax/r.vim
 syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
 syn match rnowebChunkReference "^<<.*>>$" contained
-syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
+syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR contained
 
 " Sweave options command {{{1
 syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
diff --git a/runtime/syntax/rrst.vim b/runtime/syntax/rrst.vim
index 4667b3a2c1..24d3844df0 100644
--- a/runtime/syntax/rrst.vim
+++ b/runtime/syntax/rrst.vim
@@ -1,16 +1,14 @@
 " reStructured Text with R statements
 " Language: reST with R code chunks
 " Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
-" Last Change: Wed Jul 09, 2014  10:29PM
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Sat Feb 06, 2016  06:45AM
 "
 " CONFIGURATION:
 "   To highlight chunk headers as R code, put in your vimrc:
 "   let rrst_syn_hl_chunk = 1
 
-" for portability
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index 8b17104be4..ef07b22676 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -2,7 +2,7 @@
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2015-09-07
+" Latest Revision: 2016-06-17
 
 if exists("b:current_syntax")
   finish
@@ -13,8 +13,6 @@ set cpo&vim
 
 syn case ignore
 
-syn match   rstSections "^\%(\([=`:.'"~^_*+#-]\)\1\+\n\)\=.\+\n\([=`:.'"~^_*+#-]\)\2\+$"
-
 syn match   rstTransition  /^[=`:.'"~^_*+#-]\{4,}\s*$/
 
 syn cluster rstCruft                contains=rstEmphasis,rstStrongEmphasis,
@@ -123,6 +121,8 @@ call s:DefineInlineMarkup('InlineLiteral', '``', "", '``')
 call s:DefineInlineMarkup('SubstitutionReference', '|', '|', '|_\{0,2}')
 call s:DefineInlineMarkup('InlineInternalTargets', '_`', '`', '`')
 
+syn match   rstSections "^\%(\([=`:.'"~^_*+#-]\)\1\+\n\)\=.\+\n\([=`:.'"~^_*+#-]\)\2\+$"
+
 " TODO: Can’t remember why these two can’t be defined like the ones above.
 execute 'syn match rstFootnoteReference contains=@NoSpell' .
       \ ' +\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]_+'
@@ -137,7 +137,7 @@ syn match   rstStandaloneHyperlink  contains=@NoSpell
       \ "\<\%(\%(\%(https\=\|file\|ftp\|gopher\)://\|\%(mailto\|news\):\)[^[:space:]'\"<>]\+\|www[[:alnum:]_-]*\.[[:alnum:]_-]\+\.[^[:space:]'\"<>]\+\)[[:alnum:]/]"
 
 syn region rstCodeBlock contained matchgroup=rstDirective
-      \ start=+\%(sourcecode\|code\%(-block\)\=\)::\_s*\n\ze\z(\s\+\)+
+      \ start=+\%(sourcecode\|code\%(-block\)\=\)::\s\+\w*\_s*\n\ze\z(\s\+\)+
       \ skip=+^$+
       \ end=+^\z1\@!+
       \ contains=@NoSpell
@@ -153,10 +153,11 @@ for code in g:rst_syntax_code_list
     " guard against setting 'isk' option which might cause problems (issue #108)
     let prior_isk = &l:iskeyword
     exe 'syn include @rst'.code.' syntax/'.code.'.vim'
-    exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold '
-                \.'start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)# '
-                \.'skip=#^$# '
-                \.'end=#^\z1\@!# contains=@NoSpell,@rst'.code
+    exe 'syn region rstDirective'.code.' matchgroup=rstDirective fold'
+                \.' start=#\%(sourcecode\|code\%(-block\)\=\)::\s\+'.code.'\_s*\n\ze\z(\s\+\)#'
+                \.' skip=#^$#'
+                \.' end=#^\z1\@!#'
+                \.' contains=@NoSpell,@rst'.code
     exe 'syn cluster rstDirectives add=rstDirective'.code
     " reset 'isk' setting, if it has been changed
     if &l:iskeyword !=# prior_isk
@@ -185,10 +186,11 @@ hi def link rstHyperlinkTarget              String
 hi def link rstExDirective                  String
 hi def link rstSubstitutionDefinition       rstDirective
 hi def link rstDelimiter                    Delimiter
-" TODO: I dunno...
-hi def      rstEmphasis                     term=italic cterm=italic gui=italic
+hi def link rstEmphasis                     Underlined
 hi def link rstStrongEmphasis               Special
-"term=bold cterm=bold gui=bold
+" TODO Append these atttributes somehow
+"hi def rstEmphasis term=italic cterm=italic gui=italic
+"hi def rstStrongEmphasis term=bold cterm=bold gui=bold
 hi def link rstInterpretedTextOrHyperlinkReference  Identifier
 hi def link rstInlineLiteral                String
 hi def link rstSubstitutionReference        PreProc
diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
index a210b0c720..c59e09cd17 100644
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -1,6 +1,6 @@
 " Vim syntax file
 " Language:	Scheme (R5RS + some R6RS extras)
-" Last Change:	2012 May 13
+" Last Change:	2016 May 23
 " Maintainer:	Sergey Khorev <sergey.khorev@gmail.com>
 " Original author:	Dirk van Deun <dirk@igwe.vub.ac.be>
 
@@ -245,6 +245,18 @@ if exists("b:is_mzscheme") || exists("is_mzscheme")
     syn region schemeUnquote matchgroup=Delimiter start="#,@\[" end="\]" contains=ALL
     syn region schemeQuoted matchgroup=Delimiter start="#['`]" end=![ \t()\[\]";]!me=e-1 contains=ALL
     syn region schemeQuoted matchgroup=Delimiter start="#['`](" matchgroup=Delimiter end=")" contains=ALL
+
+    " Identifiers are very liberal in MzScheme/Racket
+    syn match schemeOther ![^()[\]{}",'`;#|\\ ]\+!
+
+    " Language setting
+    syn match schemeLang "#lang [-+_/A-Za-z0-9]\+\>"
+
+    " Various number forms
+    syn match schemeNumber "[-+]\=[0-9]\+\(\.[0-9]*\)\=\(e[-+]\=[0-9]\+\)\=\>"
+    syn match schemeNumber "[-+]\=\.[0-9]\+\(e[-+]\=[0-9]\+\)\=\>"
+    syn match schemeNumber "[-+]\=[0-9]\+/[0-9]\+\>"
+    syn match schemeNumber "\([-+]\=\([0-9]\+\(\.[0-9]*\)\=\(e[-+]\=[0-9]\+\)\=\|\.[0-9]\+\(e[-+]\=[0-9]\+\)\=\|[0-9]\+/[0-9]\+\)\)\=[-+]\([0-9]\+\(\.[0-9]*\)\=\(e[-+]\=[0-9]\+\)\=\|\.[0-9]\+\(e[-+]\=[0-9]\+\)\=\|[0-9]\+/[0-9]\+\)\=i\>"
 endif
 
 
@@ -321,6 +333,9 @@ if version >= 508 || !exists("did_scheme_syntax_inits")
 
   HiLink schemeExtSyntax	Type
   HiLink schemeExtFunc		PreProc
+
+  HiLink schemeLang		PreProc
+
   delcommand HiLink
 endif
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index efe0bcb461..711971ea4a 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,15 +2,15 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Nov 09, 2015
-" Version:		142
+" Last Change:		Jun 10, 2016
+" Version:		152
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
 " For version 5.x: Clear all syntax items {{{1
 " For version 6.x: Quit when a syntax file was already loaded
-if version < 600
+if v:version < 600
   syntax clear
 elseif exists("b:current_syntax")
   finish
@@ -18,19 +18,25 @@ endif
 
 " trying to answer the question: which shell is /bin/sh, really?
 " If the user has not specified any of g:is_kornshell, g:is_bash, g:is_posix, g:is_sh, then guess.
-if !exists("g:is_kornshell") && !exists("g:is_bash") && !exists("g:is_posix") && !exists("g:is_sh")
+if getline(1) =~ '\<ksh$'
+ let b:is_kornshell = 1
+elseif getline(1) =~ '\<bash$'
+ let b:is_bash      = 1
+elseif getline(1) =~ '\<dash$'
+ let b:is_posix     = 1
+elseif !exists("g:is_kornshell") && !exists("g:is_bash") && !exists("g:is_posix") && !exists("g:is_sh")
  let s:shell = ""
  if executable("/bin/sh")
   let s:shell = resolve("/bin/sh")
  elseif executable("/usr/bin/sh")
   let s:shell = resolve("/usr/bin/sh")
  endif
- if     s:shell =~ 'bash$'
-  let g:is_bash= 1
- elseif s:shell =~ 'ksh$'
-  let g:is_kornshell = 1
+ if     s:shell =~ 'ksh$'
+  let b:is_kornshell= 1
+ elseif s:shell =~ 'bash$'
+  let b:is_bash = 1
  elseif s:shell =~ 'dash$'
-  let g:is_posix = 1
+  let b:is_posix = 1
  endif
  unlet s:shell
 endif
@@ -85,6 +91,15 @@ if g:sh_fold_enabled && &fdm == "manual"
  setl fdm=syntax
 endif
 
+" set up the syntax-highlighting iskeyword
+if has("patch-7.4.1142")
+ if exists("b:is_bash")
+  exe "syn iskeyword ".&iskeyword.",-,:"
+ else
+  exe "syn iskeyword ".&iskeyword.",-"
+ endif
+endif
+
 " Set up folding commands for shell {{{1
 " =================================
 if s:sh_fold_functions
@@ -119,7 +134,7 @@ syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSu
 syn cluster shCommandSubList	contains=shAlias,shArithmetic,shComment,shCmdParenRegion,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shOption,shPosnParm,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shCurlyList	contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
 syn cluster shDblQuoteList	contains=shCommandSub,shDeref,shDerefSimple,shEscape,shPosnParm,shCtrlSeq,shSpecial
-syn cluster shDerefList	contains=shDeref,shDerefSimple,shDerefVar,shDerefSpecial,shDerefWordError,shDerefPPS
+syn cluster shDerefList	contains=shDeref,shDerefSimple,shDerefVar,shDerefSpecial,shDerefWordError,shDerefPSR,shDerefPPS
 syn cluster shDerefVarList	contains=shDerefOp,shDerefVarArray,shDerefOpError
 syn cluster shEchoList	contains=shArithmetic,shCommandSub,shDeref,shDerefSimple,shEscape,shExpr,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq,shEchoQuote
 syn cluster shExprList1	contains=shCharClass,shNumber,shOperator,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shDblBrace,shDeref,shDerefSimple,shCtrlSeq
@@ -135,6 +150,7 @@ syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
 syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
+syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
 syn cluster shTestList	contains=shCharClass,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
 
@@ -157,7 +173,7 @@ if exists("b:is_kornshell") || exists("b:is_bash")
 
  " Touch: {{{1
  " =====
- syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shTouchList contains=shTouchCmd
+ syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shComment contains=shTouchCmd
  syn match shTouchCmd	'\<touch\>'		contained
 endif
 
@@ -180,7 +196,7 @@ endif
 
 " Options: {{{1
 " ====================
-syn match   shOption	"\s\zs[-+][-_a-zA-Z0-9#]\+"
+syn match   shOption	"\s\zs[-+][-_a-zA-Z#@]\+"
 syn match   shOption	"\s\zs--[^ \t$`'"|);]\+"
 
 " File Redirection Highlighted As Operators: {{{1
@@ -208,14 +224,15 @@ syn region shSubSh transparent matchgroup=shSubShRegion start="[^(]\zs(" end=")"
 syn region shExpr	matchgroup=shRange start="\[" skip=+\\\\\|\\$\|\[+ end="\]" contains=@shTestList,shSpecial
 syn region shTest	transparent matchgroup=shStatement start="\<test\s" skip=+\\\\\|\\$+ matchgroup=NONE end="[;&|]"me=e-1 end="$" contains=@shExprList1
 syn region shNoQuote	start='\S'	skip='\%(\\\\\)*\\.'	end='\ze\s'	contained
+syn match  shAstQuote	contained	'\*\ze"'	nextgroup=shString
 syn match  shTestOpr	contained	'[^-+/%]\zs=' skipwhite nextgroup=shTestDoubleQuote,shTestSingleQuote,shTestPattern
 syn match  shTestOpr	contained	"<=\|>=\|!=\|==\|=\~\|-.\>\|-\(nt\|ot\|ef\|eq\|ne\|lt\|le\|gt\|ge\)\>\|[!<>]"
 syn match  shTestPattern	contained	'\w\+'
-syn region shTestDoubleQuote	contained	start='\%(\%(\\\\\)*\\\)\@<!"' skip=+\\\\\|\\"+ end='"'
+syn region shTestDoubleQuote	contained	start='\%(\%(\\\\\)*\\\)\@<!"' skip=+\\\\\|\\"+ end='"'	contains=shDeref,shDerefSimple,shDerefSpecial
 syn match  shTestSingleQuote	contained	'\\.'
 syn match  shTestSingleQuote	contained	"'[^']*'"
 if exists("b:is_kornshell") || exists("b:is_bash")
- syn region  shDblBrace matchgroup=Delimiter start="\[\["	skip=+\%(\\\\\)*\\$+ end="\]\]"	contains=@shTestList,shNoQuote,shComment
+ syn region  shDblBrace matchgroup=Delimiter start="\[\["	skip=+\%(\\\\\)*\\$+ end="\]\]"	contains=@shTestList,shAstQuote,shNoQuote,shComment
  syn region  shDblParen matchgroup=Delimiter start="(("	skip=+\%(\\\\\)*\\$+ end="))"	contains=@shTestList,shComment
 endif
 
@@ -308,14 +325,18 @@ syn match   shSource	"^\.\s"
 syn match   shSource	"\s\.\s"
 "syn region  shColon	start="^\s*:" end="$" end="\s#"me=e-2 contains=@shColonList
 "syn region  shColon	start="^\s*\zs:" end="$" end="\s#"me=e-2
-syn match   shColon	'^\s*\zs:'
+if exists("b:is_kornshell")
+ syn match   shColon	'^\s*\zs:'
+endif
 
 " String And Character Constants: {{{1
 "================================
-syn match   shNumber	"-\=\<\d\+\>#\="
-syn match   shCtrlSeq	"\\\d\d\d\|\\[abcfnrtv0]"		contained
+syn match   shNumber	"\<\d\+\>#\="
+syn match   shNumber	"-\=\.\=\d\+\>#\="
+syn match   shCtrlSeq	"\\\d\d\d\|\\[abcfnrtv0]"			contained
 if exists("b:is_bash")
- syn match   shSpecial	"\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]"	contained
+ syn match   shSpecial	"[^\\]\(\\\\\)*\zs\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]"	contained
+ syn match   shSpecial	"^\(\\\\\)*\zs\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]"	contained
 endif
 if exists("b:is_bash")
  syn region  shExSingleQuote	matchgroup=shQuote start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial,shSpecial
@@ -326,11 +347,13 @@ elseif !exists("g:sh_no_error")
 endif
 syn region  shSingleQuote	matchgroup=shQuote start=+'+ end=+'+		contains=@Spell
 syn region  shDoubleQuote	matchgroup=shQuote start=+\%(\%(\\\\\)*\\\)\@<!"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,@Spell
-syn match   shStringSpecial	"[^[:print:] \t]"		contained
-syn match   shStringSpecial	"\%(\\\\\)*\\[\\"'`$()#]"
-syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
+syn match   shStringSpecial	"[^[:print:] \t]"			contained
+syn match   shStringSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
+syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shBkslshSnglQuote,shBkslshDblQuote
 syn match   shSpecial	"^\%(\\\\\)*\\[\\"'`$()#]"
-syn match   shMoreSpecial	"\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shMoreSpecial contained
+syn match   shMoreSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shMoreSpecial contained
+syn region  shBkslshSnglQuote	contained	matchgroup=shQuote start=+'+ end=+'+	contains=@Spell
+syn region  shBkslshDblQuote	contained	matchgroup=shQuote start=+"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,@Spell
 
 " Comments: {{{1
 "==========
@@ -343,31 +366,21 @@ syn match	shQuickComment	contained	"#.*$"
 
 " Here Documents: {{{1
 " =========================================
-if version < 600
- syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\**END[a-zA-Z_0-9]*\**" 	matchgroup=shHereDoc01 end="^END[a-zA-Z_0-9]*$"	contains=@shDblQuoteList
- syn region shHereDoc matchgroup=shHereDoc02 start="<<-\s*\**END[a-zA-Z_0-9]*\**"	matchgroup=shHereDoc02 end="^\s*END[a-zA-Z_0-9]*$"	contains=@shDblQuoteList
- syn region shHereDoc matchgroup=shHereDoc03 start="<<\s*\**EOF\**"		matchgroup=shHereDoc03 end="^EOF$"	contains=@shDblQuoteList
- syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*\**EOF\**"		matchgroup=shHereDoc04 end="^\s*EOF$"	contains=@shDblQuoteList
- syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*\**\.\**"		matchgroup=shHereDoc05 end="^\.$"	contains=@shDblQuoteList
- syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\**\.\**"		matchgroup=shHereDoc06 end="^\s*\.$"	contains=@shDblQuoteList
-
-else
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\=\z([^ \t|]\+\)"		matchgroup=shHereDoc07 end="^\z1\s*$"	contains=@shDblQuoteList
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\"\z([^ \t|]\+\)\""		matchgroup=shHereDoc08 end="^\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<-\s*\z([^ \t|]\+\)"		matchgroup=shHereDoc09 end="^\s*\z1\s*$"	contains=@shDblQuoteList
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*'\z([^ \t|]\+\)'"		matchgroup=shHereDoc10 end="^\s*\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<\s*'\z([^ \t|]\+\)'"		matchgroup=shHereDoc11 end="^\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\"\z([^ \t|]\+\)\""		matchgroup=shHereDoc12 end="^\s*\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<\s*\\\_$\_s*\z([^ \t|]\+\)"		matchgroup=shHereDoc13 end="^\z1\s*$"           contains=@shDblQuoteList
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\s*\\\_$\_s*'\z([^ \t|]\+\)'"	matchgroup=shHereDoc14 end="^\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<\s*\\\_$\_s*\"\z([^ \t|]\+\)\""	matchgroup=shHereDoc15 end="^\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc16 start="<<-\s*\\\_$\_s*\z([^ \t|]\+\)"	matchgroup=shHereDoc16 end="^\s*\z1\s*$"	
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc17 start="<<-\s*\\\_$\_s*\\\z([^ \t|]\+\)"	matchgroup=shHereDoc17 end="^\s*\z1\s*$"	
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc18 start="<<-\s*\\\_$\_s*'\z([^ \t|]\+\)'"	matchgroup=shHereDoc18 end="^\s*\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc19 start="<<-\s*\\\_$\_s*\"\z([^ \t|]\+\)\""	matchgroup=shHereDoc19 end="^\s*\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc20 start="<<\\\z([^ \t|]\+\)"		matchgroup=shHereDoc20 end="^\z1\s*$"
- ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc21 start="<<-\s*\\\z([^ \t|]\+\)"		matchgroup=shHereDoc21 end="^\s*\z1\s*$"
-endif
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc01 start="<<\s*\\\=\z([^ \t|]\+\)"		matchgroup=shHereDoc01 end="^\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc02 start="<<\s*\"\z([^ \t|]\+\)\""		matchgroup=shHereDoc02 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc03 start="<<-\s*\z([^ \t|]\+\)"		matchgroup=shHereDoc03 end="^\s*\z1\s*$"	contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc04 start="<<-\s*'\z([^ \t|]\+\)'"		matchgroup=shHereDoc04 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc05 start="<<\s*'\z([^ \t|]\+\)'"		matchgroup=shHereDoc05 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\"\z([^ \t|]\+\)\""		matchgroup=shHereDoc06 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t|]\+\)"		matchgroup=shHereDoc07 end="^\z1\s*$"           contains=@shDblQuoteList
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^ \t|]\+\)'"	matchgroup=shHereDoc08 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^ \t|]\+\)\""	matchgroup=shHereDoc09 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|]\+\)"		matchgroup=shHereDoc10 end="^\s*\z1\s*$"	
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|]\+\)"	matchgroup=shHereDoc11 end="^\s*\z1\s*$"	
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*'\z([^ \t|]\+\)'"	matchgroup=shHereDoc12 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<-\s*\\\_$\_s*\"\z([^ \t|]\+\)\""	matchgroup=shHereDoc13 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|]\+\)"		matchgroup=shHereDoc14 end="^\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \t|]\+\)"		matchgroup=shHereDoc15 end="^\s*\z1\s*$"
 
 " Here Strings: {{{1
 " =============
@@ -398,21 +411,21 @@ if !exists("g:is_posix")
 endif
 
 if exists("b:is_bash")
- ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*\h[-a-zA-Z_0-9]*\s*()\_s*{"		end="}"	contains=@shFunctionList			skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\<[^d][^o]\&\h[-a-zA-Z_0-9]*\s*\%(()\)\=\_s*{"	end="}"	contains=shFunctionKey,@shFunctionList contained	skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*\h[-a-zA-Z_0-9]*\s*()\_s*("		end=")"	contains=@shFunctionList			skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\<[^d][^o]\&\h[-a-zA-Z_0-9]*\s*\%(()\)\=\_s*)"	end=")"	contains=shFunctionKey,@shFunctionList contained	skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*[A-Za-z_0-9:][-a-zA-Z_0-9:]*\s*()\_s*{"		end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_0-9:][-a-zA-Z_0-9:]*\>\s*\%(()\)\=\_s*{"	end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*[A-Za-z_0-9:][-a-zA-Z_0-9:]*\s*()\_s*("		end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<[A-Za-z_0-9:][-a-zA-Z_0-9:]*\>\s*\%(()\)\=\_s*)"	end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
 else
- ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*{"		end="}"	contains=@shFunctionList	       skipwhite skipnl		nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\<[^d][^o]\&\h\w*\s*\%(()\)\=\_s*{"	end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl	nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*("		end=")"	contains=@shFunctionList	       skipwhite skipnl		nextgroup=shFunctionStart,shQuickComment
- ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\<[^d][^o]\&\h\w*\s*\%(()\)\=\_s*("	end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl	nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionOne	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*{"			end="}"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionTwo	matchgroup=shFunction start="\%(do\)\@!\&\<\h\w*\>\s*\%(()\)\=\_s*{"		end="}"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionThree	matchgroup=shFunction start="^\s*\h\w*\s*()\_s*("			end=")"	contains=@shFunctionList		 skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
+ ShFoldFunctions syn region shFunctionFour	matchgroup=shFunction start="\%(do\)\@!\&\<\h\w*\>\s*\%(()\)\=\_s*("		end=")"	contains=shFunctionKey,@shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart,shQuickComment
 endif
 
 " Parameter Dereferencing: {{{1
 " ========================
 if !exists("g:sh_no_error")
- syn match  shDerefWordError	"[^}$[]"	contained
+ syn match  shDerefWordError	"[^}$[~]"	contained
 endif
 syn match  shDerefSimple	"\$\%(\k\+\|\d\)"
 syn region shDeref	matchgroup=PreProc start="\${" end="}"	contains=@shDerefList,shDerefVarArray
@@ -492,7 +505,12 @@ if exists("b:is_bash")
  " bash : ${parameter//pattern}
  syn match  shDerefPPS	contained	'/\{1,2}'	nextgroup=shDerefPPSleft
  syn region shDerefPPSleft	contained	start='.'	skip=@\%(\\\\\)*\\/@ matchgroup=shDerefOp	end='/' end='\ze}' nextgroup=shDerefPPSright contains=@shCommandSubList
- syn region shDerefPPSright	contained	start='.'	skip=@\%(\\\\\)\+@		end='\ze}'	contains=@shCommandSubList
+ syn region shDerefPPSright	contained	start='.'	skip=@\%(\\\\\)\+@		end='\ze}'	contains=@shPPSRightList
+
+ " bash : ${parameter/#substring/replacement}
+ syn match  shDerefPSR	contained	'/#'	nextgroup=shDerefPSRleft
+ syn region shDerefPSRleft	contained	start='.'	skip=@\%(\\\\\)*\\/@ matchgroup=shDerefOp	end='/' end='\ze}' nextgroup=shDerefPSRright
+ syn region shDerefPSRright	contained	start='.'	skip=@\%(\\\\\)\+@		end='\ze}'
 endif
 
 " Arithmetic Parenthesized Expressions: {{{1
@@ -528,13 +546,20 @@ endif
 
 " Synchronization: {{{1
 " ================
-if !exists("sh_minlines")
-  let sh_minlines = 200
+if !exists("g:sh_minlines")
+ let s:sh_minlines = 200
+else
+ let s:sh_minlines= g:sh_minlines
 endif
-if !exists("sh_maxlines")
-  let sh_maxlines = 2 * sh_minlines
+if !exists("g:sh_maxlines")
+ let s:sh_maxlines = 2*s:sh_minlines
+ if s:sh_maxlines < 25
+  let s:sh_maxlines= 25
+ endif
+else
+ let s:sh_maxlines= g:sh_maxlines
 endif
-exec "syn sync minlines=" . sh_minlines . " maxlines=" . sh_maxlines
+exec "syn sync minlines=" . s:sh_minlines . " maxlines=" . s:sh_maxlines
 syn sync match shCaseEsacSync	grouphere	shCaseEsac	"\<case\>"
 syn sync match shCaseEsacSync	groupthere	shCaseEsac	"\<esac\>"
 syn sync match shDoSync	grouphere	shDo	"\<do\>"
@@ -549,6 +574,7 @@ syn sync match shWhileSync	grouphere	shRepeat	"\<while\>"
 " Default Highlighting: {{{1
 " =====================
 hi def link shArithRegion	shShellVariables
+hi def link shAstQuote	shDoubleQuote
 hi def link shAtExpr	shSetList
 hi def link shBeginHere	shRedir
 hi def link shCaseBar	shConditional
@@ -563,6 +589,7 @@ hi def link shColon	shComment
 hi def link shDerefOp	shOperator
 hi def link shDerefPOL	shDerefOp
 hi def link shDerefPPS	shDerefOp
+hi def link shDerefPSR	shDerefOp
 hi def link shDeref	shShellVariables
 hi def link shDerefDelim	shOperator
 hi def link shDerefSimple	shDeref
@@ -578,7 +605,6 @@ hi def link shEmbeddedEcho	shString
 hi def link shEscape	shCommandSub
 hi def link shExDoubleQuote	shDoubleQuote
 hi def link shExSingleQuote	shSingleQuote
-hi def link shFunction	Function
 hi def link shHereDoc	shString
 hi def link shHerePayload	shHereDoc
 hi def link shLoop	shStatement
@@ -609,21 +635,17 @@ if exists("b:is_bash")
   hi def link bashAdminStatement	shStatement
   hi def link bashSpecialVariables	shShellVariables
   hi def link bashStatement		shStatement
-  hi def link shFunctionParen		Delimiter
-  hi def link shFunctionDelim		Delimiter
   hi def link shCharClass		shSpecial
 endif
 if exists("b:is_kornshell")
   hi def link kshSpecialVariables	shShellVariables
   hi def link kshStatement		shStatement
-  hi def link shFunctionParen		Delimiter
 endif
 
 if !exists("g:sh_no_error")
  hi def link shCaseError		Error
  hi def link shCondError		Error
  hi def link shCurlyError		Error
- hi def link shDerefError		Error
  hi def link shDerefOpError		Error
  hi def link shDerefWordError		Error
  hi def link shDoError		Error
@@ -673,12 +695,6 @@ hi def link shHereDoc12		shRedir
 hi def link shHereDoc13		shRedir
 hi def link shHereDoc14		shRedir
 hi def link shHereDoc15		shRedir
-hi def link shHereDoc16		shRedir
-hi def link shHereDoc17		shRedir
-hi def link shHereDoc18		shRedir
-hi def link shHereDoc19		shRedir
-hi def link shHereDoc20		shRedir
-hi def link shHereDoc21		shRedir
 
 " Delete shell folding commands {{{1
 " =============================
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index 5d96b57a8a..9952bd2548 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -3,7 +3,7 @@
 " Language:    SPEC: Build/install scripts for Linux RPM packages
 " Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
 " Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
-" Last Change: Sun Mar 2 10:33 MSK 2014 Igor Gnatenko
+" Last Change: Sat Apr 9 15:30 2016 Filip Szymański
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -83,8 +83,8 @@ syn keyword specMacroNameLocal contained _arch _binary_payload _bindir _build _b
 
 "One line macros - valid in all ScriptAreas
 "tip: remember do include new items on specScriptArea's skip section
-syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier
-syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier
+syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|autosetup\|autopatch\|configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier
+syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier
 
 "%% Files Section %%
 "TODO %config valid parameters: missingok\|noreplace
@@ -105,7 +105,7 @@ syn case ignore
 "%% PreAmble Section %%
 "Copyright and Serial were deprecated by License and Epoch
 syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
 
 "%% Description Section %%
 syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgroup=specSection start='^%description' end=
 syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
 
 "%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
 
 "%% Changelog Section %%
 syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim
index 8afe2686bf..f9e24af98c 100644
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -4,7 +4,12 @@
 " Repository:   https://github.com/chrisbra/vim-sqloracle-syntax
 " License:      Vim
 " Previous Maintainer:	Paul Moore
-" Last Change:	2015 Nov 24
+" Last Change:	2016 Jul 22
+
+" Changes:
+" 02.04.2016: Support for when keyword
+" 03.04.2016: Support for join related keywords
+" 22.07.2016: Support Oracle Q-Quote-Syntax
 
 if exists("b:current_syntax")
   finish
@@ -24,10 +29,11 @@ syn keyword sqlKeyword	index initial initrans into is level link logging loop
 syn keyword sqlKeyword	maxextents maxtrans mode modify monitoring
 syn keyword sqlKeyword	nocache nocompress nologging noparallel nowait of offline on online start
 syn keyword sqlKeyword	parallel successful synonym table tablespace then to trigger uid
-syn keyword sqlKeyword	unique user validate values view whenever
+syn keyword sqlKeyword	unique user validate values view when whenever
 syn keyword sqlKeyword	where with option order pctfree pctused privileges procedure
 syn keyword sqlKeyword	public resource return row rowlabel rownum rows
 syn keyword sqlKeyword	session share size smallint type using
+syn keyword sqlKeyword	join cross inner outer left right
 
 syn keyword sqlOperator	not and or
 syn keyword sqlOperator	in any some all between exists
@@ -47,8 +53,13 @@ syn keyword sqlType	boolean char character date float integer long
 syn keyword sqlType	mlslabel number raw rowid varchar varchar2 varray
 
 " Strings:
-syn region sqlString	start=+"+  skip=+\\\\\|\\"+  end=+"+
-syn region sqlString	start=+'+  skip=+\\\\\|\\'+  end=+'+
+syn region sqlString	matchgroup=Quote start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region sqlString	matchgroup=Quote start=+'+  skip=+\\\\\|\\'+  end=+'+
+syn region sqlString	matchgroup=Quote start=+n\?q'\z([^[(<{]\)+    end=+\z1'+
+syn region sqlString	matchgroup=Quote start=+n\?q'<+   end=+>'+
+syn region sqlString	matchgroup=Quote start=+n\?q'{+   end=+}'+
+syn region sqlString	matchgroup=Quote start=+n\?q'(+   end=+)'+
+syn region sqlString	matchgroup=Quote start=+n\?q'\[+  end=+]'+
 
 " Numbers:
 syn match sqlNumber	"-\=\<\d*\.\=[0-9_]\>"
@@ -118,6 +129,7 @@ syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
 command -nargs=+ HiLink hi def link <args>
+HiLink Quote            Special
 HiLink sqlComment	Comment
 HiLink sqlFunction	Function
 HiLink sqlKeyword	sqlSpecial
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index 479277e17f..302d073f1e 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -2,9 +2,11 @@
 " Language:	OpenSSH client configuration file (ssh_config)
 " Author:	David Necas (Yeti)
 " Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
-" Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
-" Last Change:	2015 Dec 3 
-" SSH Version:	7.0
+" Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>
+" Contributor:  Karsten Hopp <karsten@redhat.com>
+" Contributor:  Dean, Adam Kenneth <adam.ken.dean@hpe.com>
+" Last Change:	2016 Aug 11
+" SSH Version:	7.3p1
 "
 
 " Setup
@@ -35,30 +37,61 @@ syn keyword sshconfigTodo TODO FIXME NOTE contained
 
 
 " Constants
-syn keyword sshconfigYesNo yes no ask
+syn keyword sshconfigYesNo yes no ask confirm
 syn keyword sshconfigYesNo any auto
 syn keyword sshconfigYesNo force autoask none
 
-syn keyword sshconfigCipher  3des blowfish
-syn keyword sshconfigCiphers aes128-cbc 3des-cbc blowfish blowfish-cbc cast128-cbc
-syn keyword sshconfigCiphers aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr
-syn keyword sshconfigCiphers arcfour arcfour128 arcfour256 cast128-cbc
+syn keyword sshconfigCipher 3des blowfish
 
-syn keyword sshconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
-syn keyword sshconfigMAC hmac-md5-96
-syn keyword sshconfigMAC hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512
-syn keyword sshconfigMAC hmac-sha2-512-96
+syn keyword sshconfigCiphers 3des-cbc
+syn keyword sshconfigCiphers blowfish-cbc
+syn keyword sshconfigCiphers cast128-cbc
+syn keyword sshconfigCiphers arcfour
+syn keyword sshconfigCiphers arcfour128
+syn keyword sshconfigCiphers arcfour256
+syn keyword sshconfigCiphers aes128-cbc
+syn keyword sshconfigCiphers aes192-cbc
+syn keyword sshconfigCiphers aes256-cbc
+syn match sshconfigCiphers "\<rijndael-cbc@lysator\.liu.se\>"
+syn keyword sshconfigCiphers aes128-ctr
+syn keyword sshconfigCiphers aes192-ctr
+syn keyword sshconfigCiphers aes256-ctr
+syn match sshconfigCiphers "\<aes128-gcm@openssh\.com\>"
+syn match sshconfigCiphers "\<aes256-gcm@openssh\.com\>"
+syn match sshconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
+
+syn keyword sshconfigMAC hmac-sha1
+syn keyword sshconfigMAC mac-sha1-96
+syn keyword sshconfigMAC mac-sha2-256
+syn keyword sshconfigMAC mac-sha2-512
+syn keyword sshconfigMAC mac-md5
+syn keyword sshconfigMAC mac-md5-96
+syn keyword sshconfigMAC mac-ripemd160
+syn match   sshconfigMAC "\<hmac-ripemd160@openssh\.com\>"
 syn match   sshconfigMAC "\<umac-64@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-128@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha1-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha1-96-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha2-256-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha2-512-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-md5-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-md5-96-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-ripemd160-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-64-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-128-etm@openssh\.com\>"
 
-syn keyword sshconfigHostKeyAlg ssh-rsa ssh-dss
-syn match   sshconfigHostKeyAlg "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ssh-rsa-cert-v01@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ssh-dss-cert-v01@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ssh-rsa-cert-v00@openssh\.com\>"
-syn match   sshconfigHostKeyAlg "\<ssh-dss-cert-v00@openssh\.com\>"
-syn keyword sshconfigHostKeyAlg ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521
+syn keyword sshconfigHostKeyAlgo ssh-ed25519
+syn match sshconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn keyword sshconfigHostKeyAlgo ssh-rsa
+syn keyword sshconfigHostKeyAlgo ssh-dss
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521
+syn match sshconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
 
 syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic
 syn keyword sshconfigPreferredAuth keyboard-interactive
@@ -69,19 +102,22 @@ syn keyword sshconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
 syn keyword sshconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
 syn keyword sshconfigAddressFamily  inet inet6
 
-syn match   sshconfigIPQoS	"af1[1234]"
-syn match   sshconfigIPQoS	"af2[23]"
+syn match   sshconfigIPQoS	"af1[123]"
+syn match   sshconfigIPQoS	"af2[123]"
 syn match   sshconfigIPQoS	"af3[123]"
 syn match   sshconfigIPQoS	"af4[123]"
 syn match   sshconfigIPQoS	"cs[0-7]"
 syn keyword sshconfigIPQoS	ef lowdelay throughput reliability
 syn keyword sshconfigKbdInteractive bsdauth pam skey
 
-syn keyword sshconfigKexAlgo	ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521
-syn keyword sshconfigKexAlgo	diffie-hellman-group-exchange-sha256
-syn keyword sshconfigKexAlgo	diffie-hellman-group-exchange-sha1
-syn keyword sshconfigKexAlgo	diffie-hellman-group14-sha1
-syn keyword sshconfigKexAlgo	diffie-hellman-group1-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group1-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group-exchange-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group-exchange-sha256
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp256
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp384
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp521
+syn match sshconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
 
 syn keyword sshconfigTunnel	point-to-point ethernet
 
@@ -104,8 +140,14 @@ syn keyword sshconfigHostSect Host
 syn keyword sshconfigMatch canonical exec host originalhost user localuser all
 
 syn keyword sshconfigKeyword AddressFamily
+syn keyword sshconfigKeyword AddKeysToAgent
 syn keyword sshconfigKeyword BatchMode
 syn keyword sshconfigKeyword BindAddress
+syn keyword sshconfigKeyword CanonicalDomains
+syn keyword sshconfigKeyword CanonicalizeFallbackLocal
+syn keyword sshconfigKeyword CanonicalizeHostname
+syn keyword sshconfigKeyword CanonicalizeMaxDots
+syn keyword sshconfigKeyword CertificateFile
 syn keyword sshconfigKeyword ChallengeResponseAuthentication
 syn keyword sshconfigKeyword CheckHostIP
 syn keyword sshconfigKeyword Cipher
@@ -145,6 +187,8 @@ syn keyword sshconfigKeyword HostbasedKeyTypes
 syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword IdentitiesOnly
 syn keyword sshconfigKeyword IdentityFile
+syn keyword sshconfigKeyword IgnoreUnknown
+syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword KbdInteractiveAuthentication
 syn keyword sshconfigKeyword KbdInteractiveDevices
 syn keyword sshconfigKeyword KexAlgorithms
@@ -162,6 +206,7 @@ syn keyword sshconfigKeyword Port
 syn keyword sshconfigKeyword PreferredAuthentications
 syn keyword sshconfigKeyword Protocol
 syn keyword sshconfigKeyword ProxyCommand
+syn keyword sshconfigKeyword ProxyJump
 syn keyword sshconfigKeyword ProxyUseFDPass
 syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes
 syn keyword sshconfigKeyword PubkeyAuthentication
@@ -182,6 +227,7 @@ syn keyword sshconfigKeyword UseBlacklistedKeys
 syn keyword sshconfigKeyword UsePrivilegedPort
 syn keyword sshconfigKeyword User
 syn keyword sshconfigKeyword UserKnownHostsFile
+syn keyword sshconfigKeyword UseRoaming
 syn keyword sshconfigKeyword VerifyHostKeyDNS
 syn keyword sshconfigKeyword VisualHostKey
 syn keyword sshconfigKeyword XAuthLocation
@@ -204,7 +250,7 @@ if version >= 508 || !exists("did_sshconfig_syntax_inits")
   HiLink sshconfigCipher         sshconfigEnum
   HiLink sshconfigCiphers	 sshconfigEnum
   HiLink sshconfigMAC            sshconfigEnum
-  HiLink sshconfigHostKeyAlg     sshconfigEnum
+  HiLink sshconfigHostKeyAlgo    sshconfigEnum
   HiLink sshconfigLogLevel       sshconfigEnum
   HiLink sshconfigSysLogFacility sshconfigEnum
   HiLink sshconfigAddressFamily  sshconfigEnum
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index ac90a80aa5..6b7b98d893 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -4,9 +4,10 @@
 " Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
 " Contributor:	Thilo Six
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
+" Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2015 Dec 3 
-" SSH Version:	7.0
+" Last Change:	2016 Mar 1
+" SSH Version:	7.2
 "
 
 " Setup
@@ -46,15 +47,55 @@ syn keyword sshdconfigTcpForwarding local remote
 
 syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
 
-syn keyword sshdconfigCipher aes128-cbc 3des-cbc blowfish-cbc cast128-cbc
-syn keyword sshdconfigCipher aes192-cbc aes256-cbc aes128-ctr aes192-ctr aes256-ctr
-syn keyword sshdconfigCipher arcfour arcfour128 arcfour256 cast128-cbc
-
-syn keyword sshdconfigMAC hmac-md5 hmac-sha1 hmac-ripemd160 hmac-sha1-96
-syn keyword sshdconfigMAC hmac-md5-96
-syn keyword sshdconfigMAC hmac-sha2-256 hmac-sha256-96 hmac-sha2-512
-syn keyword sshdconfigMAC hmac-sha2-512-96
+syn keyword sshdconfigCiphers 3des-cbc
+syn keyword sshdconfigCiphers blowfish-cbc
+syn keyword sshdconfigCiphers cast128-cbc
+syn keyword sshdconfigCiphers arcfour
+syn keyword sshdconfigCiphers arcfour128
+syn keyword sshdconfigCiphers arcfour256
+syn keyword sshdconfigCiphers aes128-cbc
+syn keyword sshdconfigCiphers aes192-cbc
+syn keyword sshdconfigCiphers aes256-cbc
+syn match sshdconfigCiphers "\<rijndael-cbc@lysator\.liu.se\>"
+syn keyword sshdconfigCiphers aes128-ctr
+syn keyword sshdconfigCiphers aes192-ctr
+syn keyword sshdconfigCiphers aes256-ctr
+syn match sshdconfigCiphers "\<aes128-gcm@openssh\.com\>"
+syn match sshdconfigCiphers "\<aes256-gcm@openssh\.com\>"
+syn match sshdconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
+
+syn keyword sshdconfigMAC hmac-sha1
+syn keyword sshdconfigMAC mac-sha1-96
+syn keyword sshdconfigMAC mac-sha2-256
+syn keyword sshdconfigMAC mac-sha2-512
+syn keyword sshdconfigMAC mac-md5
+syn keyword sshdconfigMAC mac-md5-96
+syn keyword sshdconfigMAC mac-ripemd160
+syn match   sshdconfigMAC "\<hmac-ripemd160@openssh\.com\>"
 syn match   sshdconfigMAC "\<umac-64@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-128@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha1-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha1-96-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha2-256-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha2-512-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-md5-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-md5-96-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-ripemd160-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-64-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-128-etm@openssh\.com\>"
+
+syn keyword sshdconfigHostKeyAlgo ssh-ed25519
+syn match sshdconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn keyword sshdconfigHostKeyAlgo ssh-rsa
+syn keyword sshdconfigHostKeyAlgo ssh-dss
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp256
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp384
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp521
+syn match sshdconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
 
 syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
 
@@ -65,18 +106,21 @@ syn keyword sshdconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
 
 syn keyword sshdconfigCompression    delayed
 
-syn match   sshdconfigIPQoS	"af1[1234]"
-syn match   sshdconfigIPQoS	"af2[23]"
+syn match   sshdconfigIPQoS	"af1[123]"
+syn match   sshdconfigIPQoS	"af2[123]"
 syn match   sshdconfigIPQoS	"af3[123]"
 syn match   sshdconfigIPQoS	"af4[123]"
 syn match   sshdconfigIPQoS	"cs[0-7]"
 syn keyword sshdconfigIPQoS	ef lowdelay throughput reliability
 
-syn keyword sshdconfigKexAlgo	ecdh-sha2-nistp256 ecdh-sha2-nistp384 ecdh-sha2-nistp521
-syn keyword sshdconfigKexAlgo	diffie-hellman-group-exchange-sha256
-syn keyword sshdconfigKexAlgo	diffie-hellman-group-exchange-sha1
-syn keyword sshdconfigKexAlgo	diffie-hellman-group14-sha1
-syn keyword sshdconfigKexAlgo	diffie-hellman-group1-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group1-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha256
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp256
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp384
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp521
+syn match sshdconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
 
 syn keyword sshdconfigTunnel	point-to-point ethernet
 
@@ -109,6 +153,7 @@ syn keyword sshdconfigKeyword AllowGroups
 syn keyword sshdconfigKeyword AllowStreamLocalForwarding
 syn keyword sshdconfigKeyword AllowTcpForwarding
 syn keyword sshdconfigKeyword AllowUsers
+syn keyword sshdconfigKeyword AuthenticationMethods
 syn keyword sshdconfigKeyword AuthorizedKeysFile
 syn keyword sshdconfigKeyword AuthorizedKeysCommand
 syn keyword sshdconfigKeyword AuthorizedKeysCommandUser
@@ -132,6 +177,7 @@ syn keyword sshdconfigKeyword GSSAPIStrictAcceptorCheck
 syn keyword sshdconfigKeyword GatewayPorts
 syn keyword sshdconfigKeyword HostCertificate
 syn keyword sshdconfigKeyword HostKey
+syn keyword sshdconfigKeyword HostKeyAgent
 syn keyword sshdconfigKeyword HostKeyAlgorithms
 syn keyword sshdconfigKeyword HostbasedAcceptedKeyTypes
 syn keyword sshdconfigKeyword HostbasedAuthentication
@@ -212,8 +258,9 @@ if version >= 508 || !exists("did_sshdconfig_syntax_inits")
   HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
   HiLink sshdconfigTcpForwarding        sshdconfigEnum
   HiLink sshdconfigRootLogin            sshdconfigEnum
-  HiLink sshdconfigCipher               sshdconfigEnum
+  HiLink sshdconfigCiphers              sshdconfigEnum
   HiLink sshdconfigMAC                  sshdconfigEnum
+  HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
   HiLink sshdconfigRootLogin            sshdconfigEnum
   HiLink sshdconfigLogLevel             sshdconfigEnum
   HiLink sshdconfigSysLogFacility       sshdconfigEnum
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index d31e14bed0..e560573e6e 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Oct 20, 2015
-" Version:	90
+" Last Change:	Jun 17, 2016
+" Version:	97
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -83,10 +83,14 @@ else
  let s:tex_conceal= g:tex_conceal
 endif
 if !exists("g:tex_superscripts")
- let g:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]"
+ let s:tex_superscripts= '[0-9a-zA-W.,:;+-<>/()=]'
+else
+ let s:tex_superscripts= g:tex_superscripts
 endif
 if !exists("g:tex_subscripts")
- let g:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]"
+ let s:tex_subscripts= '[0-9aehijklmnoprstuvx,+-/().]'
+else
+ let s:tex_subscripts= g:tex_subscripts
 endif
 
 " Determine whether or not to use "*.sty" mode {{{1
@@ -129,8 +133,10 @@ endif
 " g:tex_isk
 if exists("g:tex_isk")
  exe "setlocal isk=".g:tex_isk
+elseif !has("patch-7.4.1142")
+ setl isk=48-57,a-z,A-Z,192-255
 else
- setlocal isk=48-57,a-z,A-Z,192-255
+ syn iskeyword 48-57,a-z,A-Z,192-255
 endif
 if b:tex_stylish
   setlocal isk+=@-@
@@ -198,24 +204,24 @@ if !exists("g:tex_no_math")
 endif
 
 " Try to flag {} and () mismatches: {{{1
-if s:tex_fast =~ 'm'
+if s:tex_fast =~# 'm'
   if !s:tex_no_error
-   syn region texMatcher		matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"		transparent contains=@texMatchGroup,texError
-   syn region texMatcher		matchgroup=Delimiter start="\["				end="]"		transparent contains=@texMatchGroup,texError,@NoSpell
+   syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup,texError
+   syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup,texError,@NoSpell
   else
-   syn region texMatcher		matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"		transparent contains=@texMatchGroup
-   syn region texMatcher		matchgroup=Delimiter start="\["				end="]"		transparent contains=@texMatchGroup
+   syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup
+   syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup
   endif
   if !s:tex_nospell
-   syn region texParen		start="("						end=")"		transparent contains=@texMatchGroup,@Spell
+   syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup,@Spell
   else
-   syn region texParen		start="("						end=")"		transparent contains=@texMatchGroup
+   syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup
   endif
 endif
 if !s:tex_no_error
  syn match  texError		"[}\])]"
 endif
-if s:tex_fast =~ 'M'
+if s:tex_fast =~# 'M'
   if !exists("g:tex_no_math")
    if !s:tex_no_error
     syn match  texMathError	"}"	contained
@@ -258,14 +264,14 @@ syn match texLigature		"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)$"
 
 " \begin{}/\end{} section markers: {{{1
 syn match  texBeginEnd		"\\begin\>\|\\end\>" nextgroup=texBeginEndName
-if s:tex_fast =~ 'm'
+if s:tex_fast =~# 'm'
   syn region texBeginEndName		matchgroup=Delimiter	start="{"		end="}"	contained	nextgroup=texBeginEndModifier	contains=texComment
-  syn region texBeginEndModifier	matchgroup=Delimiter	start="\["		end="]"	contained	contains=texComment,@NoSpell
+  syn region texBeginEndModifier	matchgroup=Delimiter	start="\["		end="]"	contained	contains=texComment,@texMathZones,@NoSpell
 endif
 
 " \documentclass, \documentstyle, \usepackage: {{{1
 syn match  texDocType		"\\documentclass\>\|\\documentstyle\>\|\\usepackage\>"	nextgroup=texBeginEndName,texDocTypeArgs
-if s:tex_fast =~ 'm'
+if s:tex_fast =~# 'm'
   syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texBeginEndName	contains=texComment,@NoSpell
 endif
 
@@ -279,7 +285,7 @@ syn match texInput		"\\input\s\+[a-zA-Z/.0-9_^]\+"hs=s+7				contains=texStatemen
 syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texInputFile		"\\\(epsfig\|input\|usepackage\)\s*\(\[.*\]\)\={.\{-}}"		contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texInputCurlies	"[{}]"								contained
-if s:tex_fast =~ 'm'
+if s:tex_fast =~# 'm'
  syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained	contains=texComment
 endif
 
@@ -294,7 +300,7 @@ syn match texTypeStyle		"\\sc\>"
 syn match texTypeStyle		"\\tt\>"
 
 " Type Styles: attributes, commands, families, etc (LaTeX2E): {{{1
-if s:tex_conceal !~ 'b'
+if s:tex_conceal !~# 'b'
  syn match texTypeStyle		"\\textbf\>"
  syn match texTypeStyle		"\\textit\>"
 endif
@@ -347,7 +353,7 @@ syn match texSpaceCode		"\\\(math\|cat\|del\|lc\|sf\|uc\)code`"me=e-1 nextgroup=
 syn match texSpaceCodeChar    "`\\\=.\(\^.\)\==\(\d\|\"\x\{1,6}\|`.\)"	contained
 
 " Sections, subsections, etc: {{{1
-if s:tex_fast =~ 'p'
+if s:tex_fast =~# 'p'
  if !s:tex_nospell
   TexFold syn region texDocZone			matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}'											contains=@texFoldGroup,@texDocGroup,@Spell
   TexFold syn region texPartZone		matchgroup=texSection start='\\part\>'			 end='\ze\s*\\\%(part\>\|end\s*{\s*document\s*}\)'								contains=@texFoldGroup,@texPartGroup,@Spell
@@ -374,8 +380,8 @@ if s:tex_fast =~ 'p'
 endif
 
 " particular support for bold and italic {{{1
-if s:tex_fast =~ 'b'
-  if s:tex_conceal =~ 'b'
+if s:tex_fast =~# 'b'
+  if s:tex_conceal =~# 'b'
    if !exists("g:tex_nospell") || !g:tex_nospell
     syn region texBoldStyle	matchgroup=texTypeStyle start="\\textbf\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
     syn region texBoldItalStyle	matchgroup=texTypeStyle start="\\textit\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup,@Spell
@@ -412,7 +418,7 @@ if !exists("g:tex_no_math")
     let foldcmd= ""
    endif
    exe "syn cluster texMathZones add=".grpname
-   if s:tex_fast =~ 'M'
+   if s:tex_fast =~# 'M'
     exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
@@ -422,7 +428,7 @@ if !exists("g:tex_no_math")
     let grpname  = "texMathZone".a:sfx.'S'
     let syncname = "texSyncMathZone".a:sfx.'S'
     exe "syn cluster texMathZones add=".grpname
-    if s:tex_fast =~ 'M'
+    if s:tex_fast =~# 'M'
      exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\*\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\*\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
      exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
      exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
@@ -446,8 +452,8 @@ if !exists("g:tex_no_math")
  call TexNewMathZone("L","xxalignat",0)
 
  " Inline Math Zones: {{{2
- if s:tex_fast =~ 'M'
-  if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~ 'd'
+ if s:tex_fast =~# 'M'
+  if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~# 'd'
    syn region texMathZoneV	matchgroup=Delimiter start="\\("			matchgroup=Delimiter	end="\\)\|%stopzone\>"			keepend concealends contains=@texMathZoneGroup
    syn region texMathZoneW	matchgroup=Delimiter start="\\\["			matchgroup=Delimiter	end="\\]\|%stopzone\>"			keepend concealends contains=@texMathZoneGroup
    syn region texMathZoneX	matchgroup=Delimiter start="\$" skip="\\\\\|\\\$"	matchgroup=Delimiter	end="\$"	end="%stopzone\>"		concealends contains=@texMathZoneGroup
@@ -464,7 +470,7 @@ if !exists("g:tex_no_math")
  syn match texMathOper		"[_^=]" contained
 
  " Text Inside Math Zones: {{{2
- if s:tex_fast =~ 'M'
+ if s:tex_fast =~# 'M'
   if !exists("g:tex_nospell") || !g:tex_nospell
    syn region texMathText matchgroup=texStatement start='\\\(\(inter\)\=text\|mbox\)\s*{'	end='}'	contains=@texFoldGroup,@Spell
   else
@@ -474,7 +480,7 @@ if !exists("g:tex_no_math")
 
  " \left..something.. and \right..something.. support: {{{2
  syn match   texMathDelimBad	contained		"\S"
- if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~ 'm'
+ if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~# 'm'
   syn match   texMathDelim	contained		"\\left\\{\>"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar={
   syn match   texMathDelim	contained		"\\right\\}\>"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar=}
   let s:texMathDelimList=[
@@ -539,7 +545,7 @@ if !exists("g:tex_no_math")
  syn match texOnlyMath		"[_^]"
 endif
 syn match texSpecialChar	"\^\^[0-9a-f]\{2}\|\^\^\S"
-if s:tex_conceal !~ 'S'
+if s:tex_conceal !~# 'S'
  syn match texSpecialChar	'\\glq\>'	contained conceal cchar=‚
  syn match texSpecialChar	'\\grq\>'	contained conceal cchar=‘
  syn match texSpecialChar	'\\glqq\>'	contained conceal cchar=„
@@ -566,13 +572,13 @@ else
   " allows syntax-folding of 2 or more contiguous comment lines
   " single-line comments are not folded
   syn match  texComment	"%.*$"				contains=@texCommentGroup
-  if s:tex_fast =~ 'c'
+  if s:tex_fast =~# 'c'
    TexFold syn region texComment						start="^\zs\s*%.*\_s*%"	skip="^\s*%"	end='^\ze\s*[^%]'	contains=@texCommentGroup
    TexFold syn region texNoSpell	contained	matchgroup=texComment	start="%\s*nospell\s*{"	end="%\s*nospell\s*}"			contains=@texFoldGroup,@NoSpell
   endif
  else
   syn match texComment		"%.*$"			contains=@texCommentGroup
-  if s:tex_fast =~ 'c'
+  if s:tex_fast =~# 'c'
    syn region texNoSpell		contained	matchgroup=texComment start="%\s*nospell\s*{"	end="%\s*nospell\s*}"	contains=@texFoldGroup,@NoSpell
   endif
  endif
@@ -581,7 +587,7 @@ endif
 " Separate lines used for verb` and verb# so that the end conditions {{{1
 " will appropriately terminate.
 " If g:tex_verbspell exists, then verbatim texZones will permit spellchecking there.
-if s:tex_fast =~ 'v'
+if s:tex_fast =~# 'v'
   if exists("g:tex_verbspell") && g:tex_verbspell
    syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
    " listings package:
@@ -612,7 +618,7 @@ if s:tex_fast =~ 'v'
 endif
 
 " Tex Reference Zones: {{{1
-if s:tex_fast =~ 'r'
+if s:tex_fast =~# 'r'
   syn region texZone		matchgroup=texStatement start="@samp{"			end="}\|%stopzone\>"	contains=@texRefGroup
   syn region texRefZone		matchgroup=texStatement start="\\nocite{"		end="}\|%stopzone\>"	contains=@texRefGroup
   syn region texRefZone		matchgroup=texStatement start="\\bibliography{"		end="}\|%stopzone\>"	contains=@texRefGroup
@@ -626,13 +632,13 @@ syn match  texRefZone		'\\cite\%([tp]\*\=\)\=' nextgroup=texRefOption,texCite
 
 " Handle newcommand, newenvironment : {{{1
 syn match  texNewCmd				"\\newcommand\>"			nextgroup=texCmdName skipwhite skipnl
-if s:tex_fast =~ 'V'
+if s:tex_fast =~# 'V'
   syn region texCmdName contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texCmdArgs,texCmdBody skipwhite skipnl
   syn region texCmdArgs contained matchgroup=Delimiter start="\["rs=s+1 end="]"		nextgroup=texCmdBody skipwhite skipnl
   syn region texCmdBody contained matchgroup=Delimiter start="{"rs=s+1 skip="\\\\\|\\[{}]"	matchgroup=Delimiter end="}" contains=@texCmdGroup
 endif
 syn match  texNewEnv				"\\newenvironment\>"			nextgroup=texEnvName skipwhite skipnl
-if s:tex_fast =~ 'V'
+if s:tex_fast =~# 'V'
   syn region texEnvName contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texEnvBgn skipwhite skipnl
   syn region texEnvBgn  contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texEnvEnd skipwhite skipnl contains=@texEnvGroup
   syn region texEnvEnd  contained matchgroup=Delimiter start="{"rs=s+1  end="}"		skipwhite skipnl contains=@texEnvGroup
@@ -658,11 +664,11 @@ syn match texString		"\(``\|''\|,,\)"
 
 " makeatletter -- makeatother sections
 if !s:tex_no_error
- if s:tex_fast =~ 'S'
+ if s:tex_fast =~# 'S'
   syn region texStyle			matchgroup=texStatement start='\\makeatletter' end='\\makeatother'	contains=@texStyleGroup contained
  endif
  syn match  texStyleStatement		"\\[a-zA-Z@]\+"	contained
- if s:tex_fast =~ 'S'
+ if s:tex_fast =~# 'S'
   syn region texStyleMatcher		matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"		contains=@texStyleGroup,texError	contained
   syn region texStyleMatcher		matchgroup=Delimiter start="\["				end="]"		contains=@texStyleGroup,texError	contained
  endif
@@ -673,7 +679,7 @@ if has("conceal") && &enc == 'utf-8'
 
  " Math Symbols {{{2
  " (many of these symbols were contributed by Björn Winckler)
- if s:tex_conceal =~ 'm'
+ if s:tex_conceal =~# 'm'
   let s:texMathList=[
     \ ['|'		, '‖'],
     \ ['aleph'		, 'ℵ'],
@@ -954,7 +960,7 @@ if has("conceal") && &enc == 'utf-8'
 "    \ ['uminus'	, 'X']
 "    \ ['uplus'		, 'X']
   for texmath in s:texMathList
-   if texmath[0] =~ '\w$'
+   if texmath[0] =~# '\w$'
     exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
    else
     exe "syn match texMathSymbol '\\\\".texmath[0]."' contained conceal cchar=".texmath[1]
@@ -993,7 +999,7 @@ if has("conceal") && &enc == 'utf-8'
  endif
 
  " Greek {{{2
- if s:tex_conceal =~ 'g'
+ if s:tex_conceal =~# 'g'
   fun! s:Greek(group,pat,cchar)
     exe 'syn match '.a:group." '".a:pat."' contained conceal cchar=".a:cchar
   endfun
@@ -1040,14 +1046,14 @@ if has("conceal") && &enc == 'utf-8'
  endif
 
  " Superscripts/Subscripts {{{2
- if s:tex_conceal =~ 's'
-  if s:tex_fast =~ 's'
+ if s:tex_conceal =~# 's'
+  if s:tex_fast =~# 's'
    syn region texSuperscript	matchgroup=Delimiter start='\^{'	skip="\\\\\|\\[{}]" end='}'	contained concealends contains=texSpecialChar,texSuperscripts,texStatement,texSubscript,texSuperscript,texMathMatcher
    syn region texSubscript	matchgroup=Delimiter start='_{'		skip="\\\\\|\\[{}]" end='}'	contained concealends contains=texSpecialChar,texSubscripts,texStatement,texSubscript,texSuperscript,texMathMatcher
   endif
   " s:SuperSub:
   fun! s:SuperSub(group,leader,pat,cchar)
-    if a:pat =~ '^\\' || (a:leader == '\^' && a:pat =~ g:tex_superscripts) || (a:leader == '_' && a:pat =~ g:tex_subscripts)
+    if a:pat =~# '^\\' || (a:leader == '\^' && a:pat =~# s:tex_superscripts) || (a:leader == '_' && a:pat =~# s:tex_subscripts)
 "     call Decho("SuperSub: group<".a:group."> leader<".a:leader."> pat<".a:pat."> cchar<".a:cchar.">")
      exe 'syn match '.a:group." '".a:leader.a:pat."' contained conceal cchar=".a:cchar
      exe 'syn match '.a:group."s '".a:pat        ."' contained conceal cchar=".a:cchar.' nextgroup='.a:group.'s'
@@ -1130,9 +1136,21 @@ if has("conceal") && &enc == 'utf-8'
   call s:SuperSub('texSubscript','_','9','₉')
   call s:SuperSub('texSubscript','_','a','ₐ')
   call s:SuperSub('texSubscript','_','e','ₑ')
+  call s:SuperSub('texSubscript','_','h','ₕ')
   call s:SuperSub('texSubscript','_','i','ᵢ')
+  call s:SuperSub('texSubscript','_','j','ⱼ')
+  call s:SuperSub('texSubscript','_','k','ₖ')
+  call s:SuperSub('texSubscript','_','l','ₗ')
+  call s:SuperSub('texSubscript','_','m','ₘ')
+  call s:SuperSub('texSubscript','_','n','ₙ')
   call s:SuperSub('texSubscript','_','o','ₒ')
+  call s:SuperSub('texSubscript','_','p','ₚ')
+  call s:SuperSub('texSubscript','_','r','ᵣ')
+  call s:SuperSub('texSubscript','_','s','ₛ')
+  call s:SuperSub('texSubscript','_','t','ₜ')
   call s:SuperSub('texSubscript','_','u','ᵤ')
+  call s:SuperSub('texSubscript','_','v','ᵥ')
+  call s:SuperSub('texSubscript','_','x','ₓ')
   call s:SuperSub('texSubscript','_',',','︐')
   call s:SuperSub('texSubscript','_','+','₊')
   call s:SuperSub('texSubscript','_','-','₋')
@@ -1148,11 +1166,12 @@ if has("conceal") && &enc == 'utf-8'
   call s:SuperSub('texSubscript','_','\\phi\>'  ,'ᵩ')
   call s:SuperSub('texSubscript','_','\\gamma\>','ᵧ')
   call s:SuperSub('texSubscript','_','\\chi\>'  ,'ᵪ')
+
   delfun s:SuperSub
  endif
 
  " Accented characters: {{{2
- if s:tex_conceal =~ 'a'
+ if s:tex_conceal =~# 'a'
   if b:tex_stylish
    syn match texAccent		"\\[bcdvuH][^a-zA-Z@]"me=e-1
    syn match texLigature		"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)[^a-zA-Z@]"me=e-1
@@ -1167,7 +1186,7 @@ if has("conceal") && &enc == 'utf-8'
        let i= i + 1
        continue
       endif
-      if accent =~ '\a'
+      if accent =~# '\a'
        exe "syn match texAccent '".'\\'.accent.'\(\s*{'.a:chr.'}\|\s\+'.a:chr.'\)'."' conceal cchar=".a:{i}
       else
        exe "syn match texAccent '".'\\'.accent.'\s*\({'.a:chr.'}\|'.a:chr.'\)'."' conceal cchar=".a:{i}
diff --git a/runtime/syntax/tidy.vim b/runtime/syntax/tidy.vim
index c24796edd1..6371cb5a86 100644
--- a/runtime/syntax/tidy.vim
+++ b/runtime/syntax/tidy.vim
@@ -1,145 +1,135 @@
 " Vim syntax file
 " Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2013 June 01
+" Last Change:	2016 Apr 24
 
 if exists("b:current_syntax")
   finish
 endif
 
-setlocal iskeyword=@,48-57,-
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn iskeyword @,48-57,-,_
+
+syn case ignore
+syn keyword	tidyBoolean	contained t[rue] f[alse] y[es] n[o] 1 0
+syn keyword	tidyAutoBoolean	contained t[rue] f[alse] y[es] n[o] 1 0 auto
+syn case match
+syn keyword	tidyDoctype	contained html5 omit auto strict loose transitional user
+syn keyword	tidyEncoding	contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis
+syn keyword	tidyNewline	contained LF CRLF CR
+syn match	tidyNumber	contained "\<\d\+\>"
+syn keyword	tidyRepeat	contained keep-first keep-last
+syn keyword	tidySorter	contained alpha none
+syn region	tidyString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
+syn region	tidyString	contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
+syn match	tidyTags	contained "\<\w\+\(\s*,\s*\w\+\)*\>"
+
+syn keyword tidyBooleanOption add-xml-decl add-xml-pi add-xml-space
+	\ anchor-as-name ascii-chars assume-xml-procins bare break-before-br
+	\ clean coerce-endtags decorate-inferred-ul drop-empty-paras
+	\ drop-empty-elements drop-font-tags drop-proprietary-attributes
+	\ enclose-block-text enclose-text escape-cdata escape-scripts
+	\ fix-backslash fix-bad-comments fix-uri force-output gdoc gnu-emacs
+	\ hide-comments hide-endtags indent-attributes indent-cdata
+	\ indent-with-tabs input-xml join-classes join-styles keep-time
+	\ language literal-attributes logical-emphasis lower-literals markup
+	\ merge-emphasis ncr numeric-entities omit-optional-tags output-html
+	\ output-xhtml output-xml preserve-entities punctuation-wrap quiet
+	\ quote-ampersand quote-marks quote-nbsp raw replace-color show-info
+	\ show-warnings skip-nested split strict-tags-attributes tidy-mark
+	\ uppercase-attributes uppercase-tags word-2000 wrap-asp
+	\ wrap-attributes wrap-jste wrap-php wrap-script-literals
+	\ wrap-sections write-back
+	\ contained nextgroup=tidyBooleanDelimiter
+
+syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite
+
+syn keyword tidyAutoBooleanOption indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
+syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite
+
+syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter
+syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite
+
+syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter
+syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype contained skipwhite
+
+syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter
+syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite
+
+syn keyword tidyIntegerOption accessibility-check doctype-mode indent-spaces show-errors tab-size wrap contained nextgroup=tidyIntegerDelimiter
+syn match tidyIntegerDelimiter ":" nextgroup=tidyNumber contained skipwhite
+
+syn keyword tidyNameOption slide-style contained nextgroup=tidyNameDelimiter
+syn match tidyNameDelimiter ":" nextgroup=tidyName contained skipwhite
+
+syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter
+syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite
+
+syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter
+syn match tidyTagsDelimiter ":" nextgroup=tidyTags contained skipwhite
+
+syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter
+syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite
+
+syn keyword tidySorterOption sort-attributes contained nextgroup=tidySorterDelimiter
+syn match tidySorterDelimiter ":" nextgroup=tidySorter contained skipwhite
+
+syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter
+syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite
+
+syn cluster tidyOptions contains=tidy.*Option
+
+syn match tidyStart "^" nextgroup=@tidyOptions
 
 syn match	tidyComment	"^\s*//.*$" contains=tidyTodo
 syn match	tidyComment	"^\s*#.*$"  contains=tidyTodo
 syn keyword	tidyTodo	TODO NOTE FIXME XXX contained
 
-syn match	tidyAssignment	"^[a-z0-9-]\+:\s*.*$" contains=tidyOption,@tidyValue,tidyDelimiter
-syn match	tidyDelimiter	":" contained
+hi def link tidyAutoBooleanOption	Identifier
+hi def link tidyBooleanOption		Identifier
+hi def link tidyCSSSelectorOption	Identifier
+hi def link tidyDoctypeOption		Identifier
+hi def link tidyEncodingOption		Identifier
+hi def link tidyIntegerOption		Identifier
+hi def link tidyNameOption		Identifier
+hi def link tidyNewlineOption		Identifier
+hi def link tidyTagsOption		Identifier
+hi def link tidyRepeatOption		Identifier
+hi def link tidySorterOption		Identifier
+hi def link tidyStringOption		Identifier
 
-syn match	tidyNewTagAssignment	"^new-\l\+-tags:\s*.*$" contains=tidyNewTagOption,tidyNewTagDelimiter,tidyNewTagValue,tidyDelimiter
-syn match	tidyNewTagDelimiter	"," contained
-syn match	tidyNewTagValue		"\<\w\+\>" contained
+hi def link tidyAutoBooleanDelimiter	Special
+hi def link tidyBooleanDelimiter	Special
+hi def link tidyCSSSelectorDelimiter	Special
+hi def link tidyDoctypeDelimiter	Special
+hi def link tidyEncodingDelimiter	Special
+hi def link tidyIntegerDelimiter	Special
+hi def link tidyNameDelimiter		Special
+hi def link tidyNewlineDelimiter	Special
+hi def link tidyTagsDelimiter		Special
+hi def link tidyRepeatDelimiter		Special
+hi def link tidySorterDelimiter		Special
+hi def link tidyStringDelimiter		Special
 
-syn case ignore
-syn keyword	tidyBoolean t[rue] f[alse] y[es] n[o] contained
-syn case match
-syn match	tidyDoctype "\<\%(omit\|auto\|strict\|loose\|transitional\|user\)\>" contained
-" NOTE: use match rather than keyword here so that tidyEncoding 'raw' does not
-"       always have precedence over tidyOption 'raw'
-syn match	tidyEncoding	"\<\%(ascii\|latin0\|latin1\|raw\|utf8\|iso2022\|mac\|utf16le\|utf16be\|utf16\|win1252\|ibm858\|big5\|shiftjis\)\>" contained
-syn match	tidyNewline	"\<\%(LF\|CRLF\|CR\)\>"
-syn match	tidyNumber	"\<\d\+\>" contained
-syn match	tidyRepeat	"\<\%(keep-first\|keep-last\)\>" contained
-syn region	tidyString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
-syn region	tidyString	start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
-syn cluster	tidyValue	contains=tidyBoolean,tidyDoctype,tidyEncoding,tidyNewline,tidyNumber,tidyRepeat,tidyString
-
-syn match tidyOption "^accessibility-check"		contained
-syn match tidyOption "^add-xml-decl"			contained
-syn match tidyOption "^add-xml-pi"			contained
-syn match tidyOption "^add-xml-space"			contained
-syn match tidyOption "^alt-text"			contained
-syn match tidyOption "^anchor-as-name"			contained
-syn match tidyOption "^ascii-chars"			contained
-syn match tidyOption "^assume-xml-procins"		contained
-syn match tidyOption "^bare"				contained
-syn match tidyOption "^break-before-br"			contained
-syn match tidyOption "^char-encoding"			contained
-syn match tidyOption "^clean"				contained
-syn match tidyOption "^css-prefix"			contained
-syn match tidyOption "^decorate-inferred-ul"		contained
-syn match tidyOption "^doctype"				contained
-syn match tidyOption "^doctype-mode"			contained
-syn match tidyOption "^drop-empty-paras"		contained
-syn match tidyOption "^drop-font-tags"			contained
-syn match tidyOption "^drop-proprietary-attributes"	contained
-syn match tidyOption "^enclose-block-text"		contained
-syn match tidyOption "^enclose-text"			contained
-syn match tidyOption "^error-file"			contained
-syn match tidyOption "^escape-cdata"			contained
-syn match tidyOption "^fix-backslash"			contained
-syn match tidyOption "^fix-bad-comments"		contained
-syn match tidyOption "^fix-uri"				contained
-syn match tidyOption "^force-output"			contained
-syn match tidyOption "^gnu-emacs"			contained
-syn match tidyOption "^gnu-emacs-file"			contained
-syn match tidyOption "^hide-comments"			contained
-syn match tidyOption "^hide-endtags"			contained
-syn match tidyOption "^indent"				contained
-syn match tidyOption "^indent-attributes"		contained
-syn match tidyOption "^indent-cdata"			contained
-syn match tidyOption "^indent-spaces"			contained
-syn match tidyOption "^input-encoding"			contained
-syn match tidyOption "^input-xml"			contained
-syn match tidyOption "^join-classes"			contained
-syn match tidyOption "^join-styles"			contained
-syn match tidyOption "^keep-time"			contained
-syn match tidyOption "^language"			contained
-syn match tidyOption "^literal-attributes"		contained
-syn match tidyOption "^logical-emphasis"		contained
-syn match tidyOption "^lower-literals"			contained
-syn match tidyOption "^markup"				contained
-syn match tidyOption "^merge-divs"			contained
-syn match tidyOption "^merge-spans"			contained
-syn match tidyOption "^ncr"				contained
-syn match tidyOption "^newline"				contained
-syn match tidyOption "^numeric-entities"		contained
-syn match tidyOption "^output-bom"			contained
-syn match tidyOption "^output-encoding"			contained
-syn match tidyOption "^output-file"			contained
-syn match tidyOption "^output-html"			contained
-syn match tidyOption "^output-xhtml"			contained
-syn match tidyOption "^output-xml"			contained
-syn match tidyOption "^preserve-entities"		contained
-syn match tidyOption "^punctuation-wrap"		contained
-syn match tidyOption "^quiet"				contained
-syn match tidyOption "^quote-ampersand"			contained
-syn match tidyOption "^quote-marks"			contained
-syn match tidyOption "^quote-nbsp"			contained
-syn match tidyOption "^raw"				contained
-syn match tidyOption "^repeated-attributes"		contained
-syn match tidyOption "^replace-color"			contained
-syn match tidyOption "^show-body-only"			contained
-syn match tidyOption "^show-errors"			contained
-syn match tidyOption "^show-warnings"			contained
-syn match tidyOption "^slide-style"			contained
-syn match tidyOption "^sort-attributes"			contained
-syn match tidyOption "^split"				contained
-syn match tidyOption "^tab-size"			contained
-syn match tidyOption "^tidy-mark"			contained
-syn match tidyOption "^uppercase-attributes"		contained
-syn match tidyOption "^uppercase-tags"			contained
-syn match tidyOption "^word-2000"			contained
-syn match tidyOption "^wrap"				contained
-syn match tidyOption "^wrap-asp"			contained
-syn match tidyOption "^wrap-attributes"			contained
-syn match tidyOption "^wrap-jste"			contained
-syn match tidyOption "^wrap-php"			contained
-syn match tidyOption "^wrap-script-literals"		contained
-syn match tidyOption "^wrap-sections"			contained
-syn match tidyOption "^write-back"			contained
-syn match tidyOption "^vertical-space"			contained
-
-syn match tidyNewTagOption "^new-blocklevel-tags"	contained
-syn match tidyNewTagOption "^new-empty-tags"		contained
-syn match tidyNewTagOption "^new-inline-tags"		contained
-syn match tidyNewTagOption "^new-pre-tags"		contained
-
-hi def link tidyBoolean		Boolean
-hi def link tidyComment		Comment
-hi def link tidyDelimiter	Special
-hi def link tidyDoctype		Constant
-hi def link tidyEncoding	Constant
-hi def link tidyNewline		Constant
-hi def link tidyNewTagDelimiter	Special
-hi def link tidyNewTagOption	Identifier
-hi def link tidyNewTagValue	Constant
-hi def link tidyNumber		Number
-hi def link tidyOption		Identifier
-hi def link tidyRepeat		Constant
-hi def link tidyString		String
-hi def link tidyTodo		Todo
+hi def link tidyAutoBoolean		Boolean
+hi def link tidyBoolean			Boolean
+hi def link tidyDoctype			Constant
+hi def link tidyEncoding		Constant
+hi def link tidyNewline			Constant
+hi def link tidyTags			Constant
+hi def link tidyNumber			Number
+hi def link tidyRepeat			Constant
+hi def link tidySorter			Constant
+hi def link tidyString			String
+
+hi def link tidyComment			Comment
+hi def link tidyTodo			Todo
 
 let b:current_syntax = "tidy"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " vim: ts=8
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index 916bd9635d..32503823ee 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -1,14 +1,10 @@
 " Vim syntax file
-" Language:	VHDL
-" Maintainer:	Daniel Kho <daniel.kho@tauhop.com>
+" Language:		VHDL [VHSIC (Very High Speed Integrated Circuit) Hardware Description Language]
+" Maintainer:		Daniel Kho <daniel.kho@tauhop.com>
 " Previous Maintainer:	Czo <Olivier.Sirol@lip6.fr>
-" Credits:	Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
-" Last Changed:	2015 Dec 4 by Daniel Kho
+" Credits:		Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
+" Last Changed:		2016 Mar 05 by Daniel Kho
 
-" VHSIC (Very High Speed Integrated Circuit) Hardware Description Language
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
 if version < 600
   syntax clear
 elseif exists("b:current_syntax")
@@ -56,17 +52,40 @@ syn keyword 	vhdlStatement	note warning error failure
 syn match	vhdlStatement	"\<\(if\|else\)\>"
 syn match	vhdlError	"\<else\s\+if\>"
 
-" Predefined VHDL types
-syn keyword	vhdlType	bit bit_vector
-syn keyword	vhdlType	character boolean integer real time
-syn keyword	vhdlType	boolean_vector integer_vector real_vector time_vector
-syn keyword	vhdlType	string severity_level
-" Predefined standard ieee VHDL types
-syn keyword	vhdlType	positive natural signed unsigned
-syn keyword	vhdlType	unresolved_signed unresolved_unsigned u_signed u_unsigned
-syn keyword	vhdlType	line text
-syn keyword	vhdlType	std_logic std_logic_vector
-syn keyword	vhdlType	std_ulogic std_ulogic_vector
+" Types and type qualifiers
+" Predefined standard VHDL types
+syn match	vhdlType	"\<bit\>\'\="
+syn match	vhdlType	"\<boolean\>\'\="
+syn match	vhdlType	"\<natural\>\'\="
+syn match	vhdlType	"\<positive\>\'\="
+syn match	vhdlType	"\<integer\>\'\="
+syn match	vhdlType	"\<real\>\'\="
+syn match	vhdlType	"\<time\>\'\="
+
+syn match	vhdlType	"\<bit_vector\>\'\="
+syn match	vhdlType	"\<boolean_vector\>\'\="
+syn match	vhdlType	"\<integer_vector\>\'\="
+syn match	vhdlType	"\<real_vector\>\'\="
+syn match	vhdlType	"\<time_vector\>\'\="
+
+syn match	vhdlType	"\<character\>\'\="
+syn match	vhdlType	"\<string\>\'\="
+"syn keyword	vhdlType	severity_level
+syn keyword	vhdlType	line
+syn keyword	vhdlType	text
+
+" Predefined standard IEEE VHDL types
+syn match	vhdlType	"\<std_ulogic\>\'\="
+syn match	vhdlType	"\<std_logic\>\'\="
+syn match	vhdlType	"\<std_ulogic_vector\>\'\="
+syn match	vhdlType	"\<std_logic_vector\>\'\="
+syn match	vhdlType	"\<unresolved_signed\>\'\="
+syn match	vhdlType	"\<unresolved_unsigned\>\'\="
+syn match	vhdlType	"\<u_signed\>\'\="
+syn match	vhdlType	"\<u_unsigned\>\'\="
+syn match	vhdlType	"\<signed\>\'\="
+syn match	vhdlType	"\<unsigned\>\'\="
+
 
 " array attributes
 syn match	vhdlAttribute	"\'high"
@@ -191,15 +210,23 @@ syn case	ignore
 syn region	vhdlComment	start="/\*" end="\*/"	contains=vhdlTodo,vhdlFixme,@Spell
 syn match	vhdlComment	"\(^\|\s\)--.*"		contains=vhdlTodo,vhdlFixme,@Spell
 
+" Standard IEEE P1076.6 preprocessor directives (metacomments).
+syn match	vhdlPreProc	"/\*\s*rtl_synthesis\s\+\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*rtl_synthesis\s\+\(on\|off\)\s*"
+syn match	vhdlPreProc	"/\*\s*rtl_syn\s\+\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*rtl_syn\s\+\(on\|off\)\s*"
+
 " Industry-standard directives. These are not standard VHDL, but are commonly
 " used in the industry.
 syn match	vhdlPreProc	"/\*\s*synthesis\s\+translate_\(on\|off\)\s*\*/"
 "syn match	vhdlPreProc	"/\*\s*simulation\s\+translate_\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"/\*\s*pragma\s\+translate_\(on\|off\)\s*\*/"
 syn match	vhdlPreProc	"/\*\s*pragma\s\+synthesis_\(on\|off\)\s*\*/"
 syn match	vhdlPreProc	"/\*\s*synopsys\s\+translate_\(on\|off\)\s*\*/"
 
 syn match	vhdlPreProc	"\(^\|\s\)--\s*synthesis\s\+translate_\(on\|off\)\s*"
 "syn match	vhdlPreProc	"\(^\|\s\)--\s*simulation\s\+translate_\(on\|off\)\s*"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*pragma\s\+translate_\(on\|off\)\s*"
 syn match	vhdlPreProc	"\(^\|\s\)--\s*pragma\s\+synthesis_\(on\|off\)\s*"
 syn match	vhdlPreProc	"\(^\|\s\)--\s*synopsys\s\+translate_\(on\|off\)\s*"
 
@@ -216,24 +243,24 @@ if version >= 508 || !exists("did_vhdl_syntax_inits")
     else
 	command -nargs=+ HiLink hi def link <args>
     endif
-
-    HiLink  vhdlSpecial	    Special
-    HiLink  vhdlStatement   Statement
-    HiLink  vhdlCharacter   Character
-    HiLink  vhdlString	    String
-    HiLink  vhdlVector	    Number
-    HiLink  vhdlBoolean	    Number
-    HiLink  vhdlTodo	    Todo
-    HiLink  vhdlFixme	    Fixme
-    HiLink  vhdlComment	    Comment
-    HiLink  vhdlNumber	    Number
-    HiLink  vhdlTime	    Number
-    HiLink  vhdlType	    Type
-    HiLink  vhdlOperator    Operator
-    HiLink  vhdlError	    Error
-    HiLink  vhdlAttribute   Special
-    HiLink  vhdlPreProc	    PreProc
-
+    
+    HiLink	vhdlSpecial	Special
+    HiLink	vhdlStatement   Statement
+    HiLink	vhdlCharacter   Character
+    HiLink	vhdlString	String
+    HiLink	vhdlVector	Number
+    HiLink	vhdlBoolean	Number
+    HiLink	vhdlTodo	Todo
+    HiLink	vhdlFixme	Fixme
+    HiLink	vhdlComment	Comment
+    HiLink	vhdlNumber	Number
+    HiLink	vhdlTime	Number
+    HiLink	vhdlType	Type
+    HiLink	vhdlOperator    Operator
+    HiLink	vhdlError	Error
+    HiLink	vhdlAttribute   Special
+    HiLink	vhdlPreProc	PreProc
+    
     delcommand HiLink
 endif
 
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index cf51830b68..63618e902e 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,9 +1,12 @@
 " Vim syntax file
-" Language:	Vim 7.4 script
-" Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 02, 2015
-" Version:	7.4-33
-" Automatically generated keyword lists: {{{1
+
+" #############################################################################
+" #############################################################################
+" Note: Be careful when merging the upstream version of this file.
+"       Much of this is generated by scripts/genvimvim.lua (result is installed
+"       to: $VIMRUNTIME/syntax/vim/generated.vim)
+" #############################################################################
+" #############################################################################
 
 " Quit when a syntax file was already loaded {{{2
 if exists("b:current_syntax")
@@ -31,8 +34,8 @@ syn keyword vimOnlyOption contained	nobiosk nobioskey noconsk noconskey nocp noc
 " Invertible setting variants
 syn keyword vimOnlyOption contained	invbiosk invbioskey invconsk invconskey invcp invcompatible invguipty invmacatsui invsn invshortname invta invtextauto invtx invtextmode invtf invttyfast invtbi invttybuiltin invwiv invweirdinvert
 " termcap codes (which can also be set) {{{2
-syn keyword vimTermOption contained	t_AB t_al t_bc t_ce t_cl t_Co t_Cs t_CS t_CV t_da t_db t_dl t_DL t_EI t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xs t_ZH t_ZR
-syn keyword vimTermOption contained	t_AF t_AL t_cd t_Ce t_cm t_cs 
+syn keyword vimTermOption contained	t_8b t_AB t_al t_bc t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RB t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_SR t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xn t_xs t_ZH t_ZR
+syn keyword vimTermOption contained	t_8f t_AF t_AL t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EI
 syn match   vimTermOption contained	"t_%1"
 syn match   vimTermOption contained	"t_#2"
 syn match   vimTermOption contained	"t_#4"
@@ -53,11 +56,64 @@ syn keyword vimGroup contained	Comment Constant String Character Number Boolean
 syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu
 syn match vimHLGroup contained	"Conceal"
 syn keyword vimOnlyHLGroup contained	VisualNOS
-syn keyword nvimHLGroup contained	EndOfBuffer TermCursor TermCursorNC
+syn keyword nvimHLGroup contained	EndOfBuffer Substitute TermCursor TermCursorNC QuickFixLine
 "}}}2
 syn case match
 " Special Vim Highlighting (not automatic) {{{1
 
+" Set up folding commands
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[aflmpPrt]'
+ if g:vimsyn_folding =~# 'a' 
+  com! -nargs=* VimFolda <args> fold 
+ else 
+  com! -nargs=* VimFolda <args> 
+ endif
+ if g:vimsyn_folding =~# 'f' 
+  com! -nargs=* VimFoldf <args> fold 
+ else 
+  com! -nargs=* VimFoldf <args> 
+ endif
+ if g:vimsyn_folding =~# 'l' 
+  com! -nargs=* VimFoldl <args> fold 
+ else 
+  com! -nargs=* VimFoldl <args> 
+ endif
+ if g:vimsyn_folding =~# 'm' 
+  com! -nargs=* VimFoldm <args> fold 
+ else 
+  com! -nargs=* VimFoldm <args> 
+ endif
+ if g:vimsyn_folding =~# 'p' 
+  com! -nargs=* VimFoldp <args> fold 
+ else 
+  com! -nargs=* VimFoldp <args> 
+ endif
+ if g:vimsyn_folding =~# 'P' 
+  com! -nargs=* VimFoldP <args> fold 
+ else 
+  com! -nargs=* VimFoldP <args> 
+ endif
+ if g:vimsyn_folding =~# 'r' 
+  com! -nargs=* VimFoldr <args> fold 
+ else 
+  com! -nargs=* VimFoldr <args> 
+ endif
+ if g:vimsyn_folding =~# 't' 
+  com! -nargs=* VimFoldt <args> fold 
+ else 
+  com! -nargs=* VimFoldt <args> 
+ endif
+else
+ com! -nargs=*	VimFolda	<args>
+ com! -nargs=*	VimFoldf	<args>
+ com! -nargs=*	VimFoldl	<args>
+ com! -nargs=*	VimFoldm	<args>
+ com! -nargs=*	VimFoldp	<args>
+ com! -nargs=*	VimFoldP	<args>
+ com! -nargs=*	VimFoldr	<args>
+ com! -nargs=*	VimFoldt	<args>
+endif
+
 " commands not picked up by the generator (due to non-standard format)
 syn keyword vimCommand contained	py3
 
@@ -80,8 +136,8 @@ syn match vimNumber	"\<0[xX]\x\+"
 syn match vimNumber	"\%(^\|[^a-zA-Z]\)\zs#\x\{6}"
 
 " All vimCommands are contained by vimIsCommands. {{{2
-syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimCommand,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd,vimOnlyCommand
-syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand,vimOnlyCommand
+syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
+syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
 syn match vimVar        contained	"\<\h[a-zA-Z0-9#_]*\>"
 syn match vimVar		"\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
 syn match vimFBVar      contained   "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
@@ -113,10 +169,10 @@ syn keyword vimFTOption contained	detect indent off on plugin
 " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
 syn cluster vimAugroupList	contains=vimAugroup,vimIsCommand,vimCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'a'
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'a'
  syn region  vimAugroup	fold matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"	contains=vimAutoCmd,@vimAugroupList
 else
- syn region  vimAugroup	matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"	contains=vimAutoCmd,@vimAugroupList
+ syn region  vimAugroup	matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"		contains=vimAutoCmd,@vimAugroupList
 endif
 syn match   vimAugroup	"aug\%[roup]!"	contains=vimAugroupKey
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noaugrouperror")
@@ -130,7 +186,7 @@ syn cluster	vimOperGroup	contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperPa
 syn match	vimOper	"\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
 syn match	vimOper	"||\|&&\|[-+.]"	skipwhite nextgroup=vimString,vimSpecFile
 syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=@vimOperGroup
-syn region	vimOperParen	matchgroup=vimSep	start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
+syn region	vimOperParen	matchgroup=vimSep		start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
  syn match	vimOperError	")"
 endif
@@ -141,7 +197,7 @@ syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimF
 syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIf,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand,nvimUnmap,nvimMap
 syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
 
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'f'
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
  syn region	vimFuncBody  contained	fold start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
 else
  syn region	vimFuncBody  contained	start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
@@ -224,10 +280,11 @@ syn match	vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
 syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
 syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
 syn cluster	vimSubstList	add=vimCollection
-syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<\%(s\%[ubstitute]\|sm\%[agic]\|sno\%[magic]\)[:[:alpha:]]\@!" nextgroup=vimSubstPat
-syn match	vimSubst	"s\%[ubstitute][:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
-syn match	vimSubst	"/\zss\%[ubstitute]\ze/"	nextgroup=vimSubstPat
-syn match	vimSubst1       contained	"s\%[ubstitute]\>"	nextgroup=vimSubstPat
+syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<\%(\<s\%[ubstitute]\>\|\<sm\%[agic]\>\|\<sno\%[magic]\>\)[:#[:alpha:]]\@!" nextgroup=vimSubstPat
+syn match	vimSubst	"\%(^\|[^\\]\)\<s\%[ubstitute]\>[:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
+syn match	vimSubst	"/\zs\<s\%[ubstitute]\>\ze/"		nextgroup=vimSubstPat
+syn match	vimSubst	"\(:\+\s*\|^\s*\)s\ze#.\{-}#.\{-}#"		nextgroup=vimSubstPat
+syn match	vimSubst1       contained	"\<s\%[ubstitute]\>"	nextgroup=vimSubstPat
 syn region	vimSubstPat     contained	matchgroup=vimSubstDelim start="\z([^a-zA-Z( \t[\]&]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	 contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
 syn region	vimSubstRep4    contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>" contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
 syn region	vimCollection   contained transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
@@ -267,7 +324,7 @@ syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
 syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
 
 " Set command and associated set-options (vimOptions) with comment {{{2
-syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod,vimTermOption,vimOnlyOption
+syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
 syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1 contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
 syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+	contains=vimCtrlChar
 syn match	vimSetSep	contained	"[,:]" skipwhite nextgroup=vimCommand
@@ -341,8 +398,8 @@ syn case match
 " User Function Highlighting {{{2
 " (following Gautam Iyer's suggestion)
 " ==========================
-syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
-syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_.]\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
+syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_]\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
+syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%([a-zA-Z0-9_]\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
 syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<return\>\|\<while\>"
 
 " Errors And Warnings: {{{2
@@ -388,11 +445,16 @@ syn keyword	vimSynType	contained	clear	skipwhite nextgroup=vimGroupList
 
 " Syntax: cluster {{{2
 syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
-syn region	vimClusterName	contained	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
+syn region	vimClusterName	contained	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
 syn match	vimGroupAdd	contained	"add="	nextgroup=vimGroupList
 syn match	vimGroupRem	contained	"remove="	nextgroup=vimGroupList
 syn cluster vimFuncBodyList add=vimSynType,vimGroupAdd,vimGroupRem
 
+" Syntax: iskeyword {{{2
+syn keyword	vimSynType	contained	iskeyword	skipwhite nextgroup=vimIskList
+syn match	vimIskList	contained	'\S\+'	contains=vimIskSep
+syn match	vimIskSep	contained	','
+
 " Syntax: include {{{2
 syn keyword	vimSynType	contained	include	skipwhite nextgroup=vimGroupList
 syn cluster vimFuncBodyList add=vimSynType
@@ -400,14 +462,14 @@ syn cluster vimFuncBodyList add=vimSynType
 " Syntax: keyword {{{2
 syn cluster	vimSynKeyGroup	contains=vimSynNextgroup,vimSynKeyOpt,vimSynKeyContainedin
 syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
-syn region	vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
+syn region	vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
 syn match	vimSynKeyOpt	contained	"\<\(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
 syn cluster vimFuncBodyList add=vimSynType
 
 " Syntax: match {{{2
 syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
 syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
-syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\k\+" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
+syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
 syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
 if has("conceal")
  syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=vimSynMtchCchar
@@ -422,7 +484,7 @@ syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
 syn cluster	vimSynRegPatGroup	contains=vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
 syn cluster	vimSynRegGroup	contains=vimSynContains,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
 syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
-syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\k\+" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
+syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
 syn match	vimSynRegOpt	contained	"\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
 syn match	vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
 syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup,vimOnlyHLGroup,nvimHLGroup
@@ -448,9 +510,9 @@ syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynReg
 syn match	vimSyncLinebreak	contained	"\<linebreaks="	skipwhite	nextgroup=vimNumber
 syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
 syn match	vimSyncLines	contained	"\(min\|max\)\=lines="	nextgroup=vimNumber
-syn match	vimSyncGroupName	contained	"\k\+"	skipwhite	nextgroup=vimSyncKey
+syn match	vimSyncGroupName	contained	"\h\w*"	skipwhite	nextgroup=vimSyncKey
 syn match	vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=vimSyncGroup
-syn match	vimSyncGroup	contained	"\k\+"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
+syn match	vimSyncGroup	contained	"\h\w*"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
 syn keyword	vimSyncNone	contained	NONE
 
 " Additional IsCommand, here by reasons of precedence {{{2
@@ -531,9 +593,14 @@ syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' e
 " Allows users to specify the type of embedded script highlighting
 " they want:  (perl/python/ruby/tcl support)
 "   g:vimsyn_embed == 0   : don't embed any scripts
-"   g:vimsyn_embed ~= 'P' : embed python   (but only if vim supports it)
+"   g:vimsyn_embed =~# 'l' : embed lua
+"   g:vimsyn_embed =~# 'm' : embed mzscheme
+"   g:vimsyn_embed =~# 'p' : embed perl
+"   g:vimsyn_embed =~# 'P' : embed python
+"   g:vimsyn_embed =~# 'r' : embed ruby
+"   g:vimsyn_embed =~# 't' : embed tcl
 if !exists("g:vimsyn_embed")
- let g:vimsyn_embed= "P"
+ let g:vimsyn_embed= "lpPr"
 endif
 
 " [-- lua --] {{{3
@@ -546,9 +613,16 @@ if !filereadable(s:luapath)
   endif
  endfor
 endif
-
-syn region vimEmbedError start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+
-syn region vimEmbedError start=+lua\s*<<\s*$+ end=+\.$+
+if g:vimsyn_embed =~# 'l' && filereadable(s:luapath)
+ unlet! b:current_syntax
+ exe "syn include @vimLuaScript ".s:luapath
+ VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimLuaScript
+ VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*$+ end=+\.$+		contains=@vimLuaScript
+ syn cluster vimFuncBodyList	add=vimLuaRegion
+else
+ syn region vimEmbedError start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+lua\s*<<\s*$+ end=+\.$+
+endif
 unlet s:luapath
 
 " [-- perl --] {{{3
@@ -561,9 +635,18 @@ if !filereadable(s:perlpath)
   endif
  endfor
 endif
-
-syn region vimEmbedError start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-syn region vimEmbedError start=+pe\%[rl]\s*<<\s*$+ end=+\.$+
+if g:vimsyn_embed =~# 'p' && filereadable(s:perlpath)
+ unlet! b:current_syntax
+ let s:foldmethod = &l:foldmethod
+ exe "syn include @vimPerlScript ".s:perlpath
+ let &l:foldmethod = s:foldmethod
+ VimFoldp syn region vimPerlRegion  matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPerlScript
+ VimFoldp syn region vimPerlRegion	matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+	contains=@vimPerlScript
+ syn cluster vimFuncBodyList	add=vimPerlRegion
+else
+ syn region vimEmbedError start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+pe\%[rl]\s*<<\s*$+ end=+\.$+
+endif
 unlet s:perlpath
 
 " [-- ruby --] {{{3
@@ -576,9 +659,18 @@ if !filereadable(s:rubypath)
   endif
  endfor
 endif
-
-syn region vimEmbedError start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-syn region vimEmbedError start=+rub[y]\s*<<\s*$+ end=+\.$+
+if g:vimsyn_embed =~# 'r' && filereadable(s:rubypath)
+ unlet! b:current_syntax
+ let s:foldmethod = &l:foldmethod
+ exe "syn include @vimRubyScript ".s:rubypath
+ let &l:foldmethod = s:foldmethod
+ VimFoldr syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimRubyScript
+ syn region vimRubyRegion matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+		contains=@vimRubyScript
+ syn cluster vimFuncBodyList	add=vimRubyRegion
+else
+ syn region vimEmbedError start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+rub[y]\s*<<\s*$+ end=+\.$+
+endif
 unlet s:rubypath
 
 " [-- python --] {{{3
@@ -591,16 +683,13 @@ if !filereadable(s:pythonpath)
   endif
  endfor
 endif
-if g:vimsyn_embed =~ 'P' && filereadable(s:pythonpath)
+if g:vimsyn_embed =~# 'P' && filereadable(s:pythonpath)
  unlet! b:current_syntax
  exe "syn include @vimPythonScript ".s:pythonpath
- if exists("g:vimsyn_folding") && g:vimsyn_folding =~ 'P'
-  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPythonScript
-  syn region vimPythonRegion fold matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+		contains=@vimPythonScript
- else
-  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+		contains=@vimPythonScript
-  syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+		contains=@vimPythonScript
- endif
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+		contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(.*\)$+ end=+^\z1$+		contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+		contains=@vimPythonScript
  syn cluster vimFuncBodyList	add=vimPythonRegion
 else
  syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
@@ -625,11 +714,17 @@ if s:trytcl
    endif
   endfor
  endif
-
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
+ if g:vimsyn_embed =~# 't' && filereadable(s:tclpath)
+  unlet! b:current_syntax
+  exe "syn include @vimTclScript ".s:tclpath
+  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimTclScript
+  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+	contains=@vimTclScript
+  syn cluster vimFuncBodyList	add=vimTclScript
+ else
+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
+ endif
  unlet s:tclpath
-
 else
  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
@@ -646,9 +741,18 @@ if !filereadable(s:mzschemepath)
   endif
  endfor
 endif
-
-syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+
-syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+
+if g:vimsyn_embed =~# 'm' && filereadable(s:mzschemepath)
+ unlet! b:current_syntax
+ let iskKeep= &isk
+ exe "syn include @vimMzSchemeScript ".s:mzschemepath
+ let &isk= iskKeep
+ VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimMzSchemeScript
+ VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+		contains=@vimMzSchemeScript
+ syn cluster vimFuncBodyList	add=vimMzSchemeRegion
+else
+ syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+
+endif
 unlet s:mzschemepath
 
 " Synchronize (speed) {{{2
@@ -668,7 +772,6 @@ syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
 " Highlighting Settings {{{2
 " ====================
 
-
 if !exists("g:vimsyn_noerror")
  hi def link vimBehaveError	vimError
  hi def link vimCollClassErr	vimError
@@ -685,14 +788,11 @@ if !exists("g:vimsyn_noerror")
  hi def link vimSubstFlagErr	vimError
  hi def link vimSynCaseError	vimError
  hi def link vimBufnrWarn	vimWarn
- hi def link vimOnlyCommand	vimError
- hi def link vimTermOption	vimError
- hi def link vimOnlyOption	vimError
- hi def link vimOnlyHLGroup	vimError
 endif
 
 hi def link vimAbb	vimCommand
 hi def link vimAddress	vimMark
+hi def link vimAugroupError	vimError
 hi def link vimAugroupKey	vimCommand
 hi def link vimAuHighlight	vimHighlight
 hi def link vimAutoCmdOpt	vimOption
@@ -748,6 +848,7 @@ hi def link vimHLGroup	vimGroup
 hi def link nvimHLGroup	vimHLGroup
 hi def link vimHLMod	PreProc
 hi def link vimInsert	vimString
+hi def link vimIskSep	Delimiter
 hi def link vimKeyCode	vimSpecFile
 hi def link vimKeyword	Statement
 hi def link vimLet	vimCommand
@@ -830,6 +931,7 @@ hi def link vimUserAttrbCmpltFunc	Special
 hi def link vimUserAttrbCmplt	vimSpecial
 hi def link vimUserAttrbKey	vimOption
 hi def link vimUserAttrb	vimSpecial
+hi def link vimUserAttrbError	Error
 hi def link vimUserCmdError	Error
 hi def link vimUserCommand	vimCommand
 hi def link vimUserFunc	Normal
@@ -841,6 +943,14 @@ let b:current_syntax = "vim"
 
 " ---------------------------------------------------------------------
 " Cleanup: {{{1
+delc VimFolda
+delc VimFoldf
+delc VimFoldl
+delc VimFoldm
+delc VimFoldp
+delc VimFoldP
+delc VimFoldr
+delc VimFoldt
 let &cpo = s:keepcpo
 unlet s:keepcpo
 " vim:ts=18  fdm=marker
diff --git a/runtime/syntax/viminfo.vim b/runtime/syntax/viminfo.vim
index 7af3b89ae0..667e1bab2a 100644
--- a/runtime/syntax/viminfo.vim
+++ b/runtime/syntax/viminfo.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Vim .viminfo file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Feb 03
+" Last Change:	2016 Jun 05
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -30,11 +30,15 @@ syn match viminfoOptionName "\*\a*"ms=s+1 contained
 " Comments
 syn match viminfoComment "^#.*"
 
+" New style lines.  TODO: highlight numbers and strings.
+syn match viminfoNew "^|.*"
+
 " Define the default highlighting.
 " Only used when an item doesn't have highlighting yet
 hi def link viminfoComment	Comment
 hi def link viminfoError	Error
 hi def link viminfoStatement	Statement
+hi def link viminfoNew		String
 
 let b:current_syntax = "viminfo"
 
diff --git a/runtime/syntax/zsh.vim b/runtime/syntax/zsh.vim
index 162577669f..0d385a35d0 100644
--- a/runtime/syntax/zsh.vim
+++ b/runtime/syntax/zsh.vim
@@ -2,7 +2,7 @@
 " Language:             Zsh shell script
 " Maintainer:           Christian Brabandt <cb@256bit.org>
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2015-12-25
+" Latest Revision:      2016-02-15
 " License:              Vim (see :h license)
 " Repository:		https://github.com/chrisbra/vim-zsh
 
@@ -13,19 +13,29 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal iskeyword+=-
+if v:version > 704 || (v:version == 704 && has("patch1142"))
+    syn iskeyword @,48-57,_,192-255,#,-
+else
+    setlocal iskeyword+=-
+endif
+if get(g:, 'zsh_fold_enable', 0)
+    setlocal foldmethod=syntax
+endif
 
 syn keyword zshTodo             contained TODO FIXME XXX NOTE
 
 syn region  zshComment          oneline start='\%(^\|\s*\)#' end='$'
-                                \ contains=zshTodo,@Spell
+                                \ contains=zshTodo,@Spell fold
+
+syn region  zshComment          start='^\s*#' end='^\%(\s*#\)\@!'
+                                \ contains=zshTodo,@Spell fold
 
 syn match   zshPreProc          '^\%1l#\%(!\|compdef\|autoload\).*$'
 
 syn match   zshQuoted           '\\.'
 syn region  zshString           matchgroup=zshStringDelimiter start=+"+ end=+"+
-                                \ contains=zshQuoted,@zshDerefs,@zshSubst
-syn region  zshString           matchgroup=zshStringDelimiter start=+'+ end=+'+
+                                \ contains=zshQuoted,@zshDerefs,@zshSubst fold
+syn region  zshString           matchgroup=zshStringDelimiter start=+'+ end=+'+ fold
 " XXX: This should probably be more precise, but Zsh seems a bit confused about it itself
 syn region  zshPOSIXString      matchgroup=zshStringDelimiter start=+\$'+
                                 \ end=+'+ contains=zshQuoted
@@ -45,7 +55,7 @@ syn keyword zshException        always
 
 syn keyword zshKeyword          function nextgroup=zshKSHFunction skipwhite
 
-syn match   zshKSHFunction      contained '\k\+'
+syn match   zshKSHFunction      contained '\w\S\+'
 syn match   zshFunction         '^\s*\k\+\ze\s*()'
 
 syn match   zshOperator         '||\|&&\|;\|&!\='
@@ -307,19 +317,21 @@ syn match   zshNumber           '[+-]\=\d\+\.\d\+\>'
 " TODO: $[...] is the same as $((...)), so add that as well.
 syn cluster zshSubst            contains=zshSubst,zshOldSubst,zshMathSubst
 syn region  zshSubst            matchgroup=zshSubstDelim transparent
-                                \ start='\$(' skip='\\)' end=')' contains=TOP
-syn region  zshParentheses      transparent start='(' skip='\\)' end=')'
+                                \ start='\$(' skip='\\)' end=')' contains=TOP fold
+syn region  zshParentheses      transparent start='(' skip='\\)' end=')' fold
 syn region  zshMathSubst        matchgroup=zshSubstDelim transparent
                                 \ start='\$((' skip='\\)'
                                 \ matchgroup=zshSubstDelim end='))'
                                 \ contains=zshParentheses,@zshSubst,zshNumber,
-                                \ @zshDerefs,zshString keepend
+                                \ @zshDerefs,zshString keepend fold
 syn region  zshBrackets         contained transparent start='{' skip='\\}'
-                                \ end='}'
+                                \ end='}' fold
+syn region  zshBrackets         transparent start='{' skip='\\}'
+                                \ end='}' contains=TOP fold
 syn region  zshSubst            matchgroup=zshSubstDelim start='\${' skip='\\}'
-                                \ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString
+                                \ end='}' contains=@zshSubst,zshBrackets,zshQuoted,zshString fold
 syn region  zshOldSubst         matchgroup=zshSubstDelim start=+`+ skip=+\\`+
-                                \ end=+`+ contains=TOP,zshOldSubst
+                                \ end=+`+ contains=TOP,zshOldSubst fold
 
 syn sync    minlines=50 maxlines=90
 syn sync    match zshHereDocSync    grouphere   NONE '<<-\=\s*\%(\\\=\S\+\|\(["']\)\S\+\1\)'
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index c53dde8ceb..17cba123a8 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -19,6 +19,12 @@ inoremap <C-U> <C-G>u<C-U>
 " Switch syntax highlighting on
 syntax on
 
+" Also switch on highlighting the last used search pattern.
+set hlsearch
+
+" I like highlighting strings inside C comments.
+let c_comment_strings=1
+
 " Enable file type detection.
 " Use the default filetype settings, so that mail gets 'textwidth' set to 72,
 " 'cindent' is on in C files, etc.
diff --git a/scripts/download-unicode-files.sh b/scripts/download-unicode-files.sh
index cb15270cf8..54fc32550c 100755
--- a/scripts/download-unicode-files.sh
+++ b/scripts/download-unicode-files.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
 set -e
-
-files="UnicodeData.txt CaseFolding.txt EastAsianWidth.txt"
+data_files="UnicodeData.txt CaseFolding.txt EastAsianWidth.txt"
+emoji_files="emoji-data.txt"
 
 UNIDIR_DEFAULT=unicode
-DOWNLOAD_URL_BASE_DEFAULT='http://unicode.org/Public/UNIDATA'
+DOWNLOAD_URL_BASE_DEFAULT='http://unicode.org/Public'
 
 if test x$1 = 'x--help' ; then
   echo 'Usage:'
@@ -21,8 +21,16 @@ fi
 UNIDIR=${1:-$UNIDIR_DEFAULT}
 DOWNLOAD_URL_BASE=${2:-$DOWNLOAD_URL_BASE_DEFAULT}
 
-for filename in $files ; do
-  curl -o "$UNIDIR/$filename" "$DOWNLOAD_URL_BASE/$filename"
+for filename in $data_files ; do
+  curl -o "$UNIDIR/$filename" "$DOWNLOAD_URL_BASE/UNIDATA/$filename"
+  (
+    cd "$UNIDIR"
+    git add $filename
+  )
+done
+
+for filename in $emoji_files ; do
+  curl -o "$UNIDIR/$filename" "$DOWNLOAD_URL_BASE/emoji/3.0/$filename"
   (
     cd "$UNIDIR"
     git add $filename
diff --git a/scripts/gen_api_vimdoc.py b/scripts/gen_api_vimdoc.py
new file mode 100644
index 0000000000..d7165187f4
--- /dev/null
+++ b/scripts/gen_api_vimdoc.py
@@ -0,0 +1,514 @@
+#!/usr/bin/env python
+"""Parses Doxygen XML output to generate Neovim's API documentation.
+
+This would be easier using lxml and XSLT, but:
+
+  1. This should avoid needing Python dependencies, especially ones that are
+     C modules that have library dependencies (lxml requires libxml and
+     libxslt).
+  2. I wouldn't know how to deal with nested indentation in <para> tags using
+     XSLT.
+
+Each function documentation is formatted with the following rules:
+
+  - Maximum width of 78 characters (`text_width`).
+  - Spaces for indentation.
+  - Function signature and helptag are on the same line.
+    - Helptag is right aligned.
+    - Signature and helptag must have a minimum of 8 spaces between them.
+    - If the signature is too long, it is placed on the line after the
+      helptag.  The signature wraps at `text_width - 8` characters with
+      subsequent lines indented to the open parenthesis.
+  - Documentation body will be indented by 16 spaces.
+    - Subsection bodies are indented an additional 4 spaces.
+  - Documentation body consists of the function description, parameter details,
+    return description, and C declaration.
+  - Parameters are omitted for the `void` and `Error *` types, or if the
+    parameter is marked as [out].
+  - Each function documentation is separated by a single line.
+
+The C declaration is added to the end to show actual argument types.
+"""
+import os
+import re
+import sys
+import shutil
+import textwrap
+import subprocess
+
+from xml.dom import minidom
+
+# Text at the top of the doc file.
+preamble = '''
+Note: This documentation is generated from Neovim's API source code.
+'''
+
+doc_filename = 'api-funcs.txt'
+
+# Section name overrides.
+section_name = {
+    'vim.c': 'Global',
+}
+
+# Section ordering.
+section_order = (
+    'vim.c',
+    'buffer.c',
+    'window.c',
+    'tabpage.c',
+    'ui.c',
+)
+
+param_exclude = (
+    'channel_id',
+)
+
+text_width = 78
+script_path = os.path.abspath(__file__)
+base_dir = os.path.dirname(os.path.dirname(script_path))
+src_dir = os.path.join(base_dir, 'src/nvim/api')
+out_dir = os.path.join(base_dir, 'tmp/api_doc')
+filter_cmd = '%s %s' % (sys.executable, script_path)
+seen_funcs = set()
+
+# Tracks `xrefsect` titles.  As of this writing, used only for separating
+# deprecated functions.
+xrefs = set()
+
+
+# XML Parsing Utilities {{{
+def find_first(parent, name):
+    """Finds the first matching node within parent."""
+    sub = parent.getElementsByTagName(name)
+    if not sub:
+        return None
+    return sub[0]
+
+
+def get_children(parent, name):
+    """Yield matching child nodes within parent."""
+    for child in parent.childNodes:
+        if child.nodeType == child.ELEMENT_NODE and child.nodeName == name:
+            yield child
+
+
+def get_child(parent, name):
+    """Get the first matching child node."""
+    for child in get_children(parent, name):
+        return child
+    return None
+
+
+def clean_text(text):
+    """Cleans text.
+
+    Only cleans superfluous whitespace at the moment.
+    """
+    return ' '.join(text.split()).strip()
+
+
+def clean_lines(text):
+    """Removes superfluous lines.
+
+    The beginning and end of the string is trimmed.  Empty lines are collapsed.
+    """
+    return re.sub(r'\A\n\s*\n*|\n\s*\n*\Z', '', re.sub(r'(\n\s*\n+)+', '\n\n', text))
+
+
+def get_text(parent):
+    """Combine all text in a node."""
+    if parent.nodeType == parent.TEXT_NODE:
+        return parent.data
+
+    out = ''
+    for node in parent.childNodes:
+        if node.nodeType == node.TEXT_NODE:
+            out += clean_text(node.data)
+        elif node.nodeType == node.ELEMENT_NODE:
+            out += ' ' + get_text(node)
+    return out
+
+
+def doc_wrap(text, prefix='', width=70, func=False):
+    """Wraps text to `width`.
+
+    The first line is prefixed with `prefix`, and subsequent lines are aligned.
+    If `func` is True, only wrap at commas.
+    """
+    if not width:
+        return text
+
+    indent_space = ' ' * len(prefix)
+
+    if func:
+        lines = [prefix]
+        for part in text.split(', '):
+            if part[-1] not in ');':
+                part += ', '
+            if len(lines[-1]) + len(part) > width:
+                lines.append(indent_space)
+            lines[-1] += part
+        return '\n'.join(x.rstrip() for x in lines).rstrip()
+
+    return '\n'.join(textwrap.wrap(text.strip(), width=width,
+                                   initial_indent=prefix,
+                                   subsequent_indent=indent_space))
+
+
+def parse_params(parent, width=62):
+    """Parse Doxygen `parameterlist`."""
+    name_length = 0
+    items = []
+    for child in parent.childNodes:
+        if child.nodeType == child.TEXT_NODE:
+            continue
+
+        name_node = find_first(child, 'parametername')
+        if name_node.getAttribute('direction') == 'out':
+            continue
+
+        name = get_text(name_node)
+        if name in param_exclude:
+            continue
+
+        name = '{%s}' % name
+        name_length = max(name_length, len(name) + 2)
+
+        desc = ''
+        desc_node = get_child(child, 'parameterdescription')
+        if desc_node:
+            desc = parse_parblock(desc_node, width=None)
+        items.append((name.strip(), desc.strip()))
+
+    out = 'Parameters:~\n'
+    for name, desc in items:
+        name = '    %s' % name.ljust(name_length)
+        out += doc_wrap(desc, prefix=name, width=width) + '\n'
+    return out.strip()
+
+
+def parse_para(parent, width=62):
+    """Parse doxygen `para` tag.
+
+    I assume <para> is a paragraph block or "a block of text".  It can contain
+    text nodes, or other tags.
+    """
+    line = ''
+    lines = []
+    for child in parent.childNodes:
+        if child.nodeType == child.TEXT_NODE:
+            line += child.data
+        elif child.nodeName == 'computeroutput':
+            line += '`%s`' % get_text(child)
+        else:
+            if line:
+                lines.append(doc_wrap(line, width=width))
+                line = ''
+
+            if child.nodeName == 'parameterlist':
+                lines.append(parse_params(child, width=width))
+            elif child.nodeName == 'xrefsect':
+                title = get_text(get_child(child, 'xreftitle'))
+                xrefs.add(title)
+                xrefdesc = parse_para(get_child(child, 'xrefdescription'))
+                lines.append(doc_wrap(xrefdesc, prefix='%s: ' % title,
+                                      width=width) + '\n')
+            elif child.nodeName == 'simplesect':
+                kind = child.getAttribute('kind')
+                if kind == 'return':
+                    lines.append('%s:~' % kind.title())
+                    lines.append(doc_wrap(parse_para(child),
+                                          prefix='    ',
+                                          width=width))
+            else:
+                lines.append(get_text(child))
+
+    if line:
+        lines.append(doc_wrap(line, width=width))
+    return clean_lines('\n'.join(lines).strip())
+
+
+def parse_parblock(parent, width=62):
+    """Parses a nested block of `para` tags.
+
+    Named after the \parblock command, but not directly related.
+    """
+    paragraphs = []
+    for child in parent.childNodes:
+        if child.nodeType == child.TEXT_NODE:
+            paragraphs.append(doc_wrap(child.data, width=width))
+        elif child.nodeName == 'para':
+            paragraphs.append(parse_para(child, width=width))
+        else:
+            paragraphs.append(doc_wrap(get_text(child), width=width))
+        paragraphs.append('')
+    return clean_lines('\n'.join(paragraphs).strip())
+# }}}
+
+
+def parse_source_xml(filename):
+    """Collects API functions.
+
+    This returns two strings:
+      1. The API functions
+      2. The deprecated API functions
+
+    The caller decides what to do with the deprecated documentation.
+    """
+    global xrefs
+    xrefs = set()
+    functions = []
+    deprecated_functions = []
+
+    dom = minidom.parse(filename)
+    for member in dom.getElementsByTagName('memberdef'):
+        if member.getAttribute('static') == 'yes' or \
+                member.getAttribute('kind') != 'function':
+            continue
+
+        loc = find_first(member, 'location')
+        if 'private' in loc.getAttribute('file'):
+            continue
+
+        return_type = get_text(get_child(member, 'type'))
+        if return_type == '':
+            continue
+
+        if return_type.startswith(('ArrayOf', 'DictionaryOf')):
+            parts = return_type.strip('_').split('_')
+            return_type = '%s(%s)' % (parts[0], ', '.join(parts[1:]))
+
+        name = get_text(get_child(member, 'name'))
+
+        vimtag = '*%s()*' % name
+        args = []
+        type_length = 0
+
+        for param in get_children(member, 'param'):
+            arg_type = get_text(get_child(param, 'type')).strip()
+            arg_name = ''
+            declname = get_child(param, 'declname')
+            if declname:
+                arg_name = get_text(declname).strip()
+
+            if arg_name in param_exclude:
+                continue
+
+            if arg_type.endswith('*'):
+                arg_type = arg_type.strip('* ')
+                arg_name = '*' + arg_name
+            type_length = max(type_length, len(arg_type))
+            args.append((arg_type, arg_name))
+
+        c_args = []
+        for arg_type, arg_name in args:
+            c_args.append('    ' + (
+                '%s %s' % (arg_type.ljust(type_length), arg_name)).strip())
+
+        c_decl = textwrap.indent('%s %s(\n%s\n);' % (return_type, name,
+                                                     ',\n'.join(c_args)),
+                                 '    ')
+
+        prefix = '%s(' % name
+        suffix = '%s)' % ', '.join('{%s}' % a[1] for a in args
+                                   if a[0] not in ('void', 'Error'))
+
+        # Minimum 8 chars between signature and vimtag
+        lhs = (text_width - 8) - len(prefix)
+
+        if len(prefix) + len(suffix) > lhs:
+            signature = vimtag.rjust(text_width) + '\n'
+            signature += doc_wrap(suffix, width=text_width-8, prefix=prefix,
+                                  func=True)
+        else:
+            signature = prefix + suffix
+            signature += vimtag.rjust(text_width - len(signature))
+
+        doc = ''
+        desc = find_first(member, 'detaileddescription')
+        if desc:
+            doc = parse_parblock(desc)
+            if 'DEBUG' in os.environ:
+                print(textwrap.indent(
+                    re.sub(r'\n\s*\n+', '\n',
+                           desc.toprettyxml(indent='  ', newl='\n')), ' ' * 16))
+
+        if not doc:
+            doc = 'TODO: Documentation'
+
+        if 'INCLUDE_C_DECL' in os.environ:
+            doc += '\n\nC Declaration:~\n>\n'
+            doc += c_decl
+            doc += '\n<'
+
+        func_doc = signature + '\n'
+        func_doc += textwrap.indent(clean_lines(doc), ' ' * 16)
+        func_doc = re.sub(r'^\s+([<>])$', r'\1', func_doc, flags=re.M)
+
+        if 'Deprecated' in xrefs:
+            deprecated_functions.append(func_doc)
+        else:
+            functions.append(func_doc)
+
+        xrefs.clear()
+
+    return '\n\n'.join(functions), '\n\n'.join(deprecated_functions)
+
+
+def gen_docs(config):
+    """Generate documentation.
+
+    Doxygen is called and configured through stdin.
+    """
+    p = subprocess.Popen(['doxygen', '-'], stdin=subprocess.PIPE)
+    p.communicate(config.format(input=src_dir, output=out_dir,
+                                filter=filter_cmd).encode('utf8'))
+    if p.returncode:
+        sys.exit(p.returncode)
+
+    title_length = 0
+    sections = {}
+    sep = '=' * text_width
+
+    base = os.path.join(out_dir, 'xml')
+    dom = minidom.parse(os.path.join(base, 'index.xml'))
+    for compound in dom.getElementsByTagName('compound'):
+        if compound.getAttribute('kind') != 'file':
+            continue
+
+        filename = get_text(find_first(compound, 'name'))
+        if filename.endswith('.c'):
+            functions, deprecated = parse_source_xml(
+                os.path.join(base, '%s.xml' % compound.getAttribute('refid')))
+
+            if not functions and not deprecated:
+                continue
+
+            if functions or deprecated:
+                name = os.path.splitext(os.path.basename(filename))[0]
+                if name == 'ui':
+                    name = name.upper()
+                else:
+                    name = name.title()
+
+                doc = ''
+                if functions:
+                    doc += '\n\n' + functions
+
+                if 'INCLUDE_DEPRECATED' in os.environ and deprecated:
+                    doc += '\n\n\nDeprecated %s Functions:~\n\n' % name
+                    doc += deprecated
+
+                if doc:
+                    filename = os.path.basename(filename)
+                    name = section_name.get(filename, name)
+                    title = '%s Functions' % name
+                    helptag = '*api-%s*' % name.lower()
+                    title_length = max(title_length, len(title))
+                    sections[filename] = (title, helptag, doc)
+
+    if not sections:
+        return
+
+    title_left = '*%s*' % doc_filename
+    title_center = 'Neovim API Function Reference'
+    title_right = '{Nvim}'
+    margin = max(len(title_left), len(title_right))
+    head = (title_left.ljust(margin) +
+            title_center.center(text_width - margin * 2) +
+            title_right.rjust(margin)) + '\n'
+
+    head += '\n%s\n\n' % doc_wrap(preamble, width=text_width)
+    head += 'Contents:\n\n'
+
+    docs = ''
+
+    title_length += len(str(len(section_order))) + 2
+    i = 0
+    for filename in section_order:
+        if filename not in sections:
+            continue
+        title, helptag, section_doc = sections.pop(filename)
+
+        i += 1
+        docs += sep
+        title = '%d. %s' % (i, title)
+        head += (title.ljust(title_length) + '  ' +
+                 helptag.replace('*', '|') + '\n')
+        docs += '\n%s%s' % (title, helptag.rjust(text_width - len(title)))
+        docs += section_doc
+        docs += '\n\n\n'
+
+    if sections:
+        # In case new API sources are added without updating the order dict.
+        for title, helptag, section_doc in sections.values():
+            i += 1
+            docs += sep
+            title = '%d. %s' % (i, title)
+            head += (title.ljust(title_length) + '  ' +
+                     helptag.replace('*', '|') + '\n')
+            docs += '\n%s%s' % (title, helptag.rjust(text_width - len(title)))
+            docs += section_doc
+            docs += '\n\n\n'
+
+    docs = '%s\n%s' % (head, docs)
+    docs = docs.rstrip() + '\n\n'
+    docs += ' vim:tw=78:ts=8:ft=help:norl:'
+
+    doc_file = os.path.join(base_dir, 'runtime/doc', doc_filename)
+    with open(doc_file, 'wb') as fp:
+        fp.write(docs.encode('utf8'))
+
+    shutil.rmtree(out_dir)
+
+
+def filter_source(filename):
+    """Filters the source to fix macros that confuse Doxygen."""
+    with open(filename, 'rt') as fp:
+        print(re.sub(r'^(ArrayOf|DictionaryOf)(\(.*?\))',
+                     lambda m: m.group(1)+'_'.join(
+                         re.split(r'[^\w]+', m.group(2))),
+                     fp.read(), flags=re.M))
+
+
+# Doxygen Config {{{
+Doxyfile = '''
+OUTPUT_DIRECTORY       = {output}
+INPUT                  = {input}
+INPUT_ENCODING         = UTF-8
+FILE_PATTERNS          = *.h *.c
+RECURSIVE              = YES
+INPUT_FILTER           = "{filter}"
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       = */private/*
+EXCLUDE_SYMBOLS        =
+
+GENERATE_HTML          = NO
+GENERATE_DOCSET        = NO
+GENERATE_HTMLHELP      = NO
+GENERATE_QHP           = NO
+GENERATE_TREEVIEW      = NO
+GENERATE_LATEX         = NO
+GENERATE_RTF           = NO
+GENERATE_MAN           = NO
+GENERATE_DOCBOOK       = NO
+GENERATE_AUTOGEN_DEF   = NO
+
+GENERATE_XML           = YES
+XML_OUTPUT             = xml
+XML_PROGRAMLISTING     = NO
+
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = YES
+EXPAND_ONLY_PREDEF     = NO
+'''
+# }}}
+
+if __name__ == "__main__":
+    if len(sys.argv) > 1:
+        filter_source(sys.argv[1])
+    else:
+        gen_docs(Doxyfile)
+
+# vim: set ft=python ts=4 sw=4 tw=79 et fdm=marker :
diff --git a/scripts/gendeclarations.lua b/scripts/gendeclarations.lua
index 4e74e4e301..ff69b18ae4 100755
--- a/scripts/gendeclarations.lua
+++ b/scripts/gendeclarations.lua
@@ -143,7 +143,7 @@ local pattern = concat(
   lit(')'),
   any_amount(concat(       -- optional attributes
     spaces,
-    lit('FUNC_ATTR_'),
+    lit('FUNC_'),
     any_amount(aw),
     one_or_no(concat(      -- attribute argument
       spaces,
diff --git a/scripts/gendispatch.lua b/scripts/gendispatch.lua
new file mode 100644
index 0000000000..397ccc9aaf
--- /dev/null
+++ b/scripts/gendispatch.lua
@@ -0,0 +1,329 @@
+lpeg = require('lpeg')
+mpack = require('mpack')
+
+-- lpeg grammar for building api metadata from a set of header files. It
+-- ignores comments and preprocessor commands and parses a very small subset
+-- of C prototypes with a limited set of types
+P, R, S = lpeg.P, lpeg.R, lpeg.S
+C, Ct, Cc, Cg = lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.Cg
+
+any = P(1) -- (consume one character)
+letter = R('az', 'AZ') + S('_$')
+alpha = letter + R('09')
+nl = P('\r\n') + P('\n')
+not_nl = any - nl
+ws = S(' \t') + nl
+fill = ws ^ 0
+c_comment = P('//') * (not_nl ^ 0)
+c_preproc = P('#') * (not_nl ^ 0)
+typed_container =
+  (P('ArrayOf(') + P('DictionaryOf(')) * ((any - P(')')) ^ 1) * P(')')
+c_id = (
+  typed_container +
+  (letter * (alpha ^ 0))
+)
+c_void = P('void')
+c_param_type = (
+  ((P('Error') * fill * P('*') * fill) * Cc('error')) +
+  (C(c_id) * (ws ^ 1))
+  )
+c_type = (C(c_void) * (ws ^ 1)) + c_param_type
+c_param = Ct(c_param_type * C(c_id))
+c_param_list = c_param * (fill * (P(',') * fill * c_param) ^ 0)
+c_params = Ct(c_void + c_param_list)
+c_proto = Ct(
+  Cg(c_type, 'return_type') * Cg(c_id, 'name') *
+  fill * P('(') * fill * Cg(c_params, 'parameters') * fill * P(')') *
+  Cg(Cc(false), 'async') *
+  (fill * Cg((P('FUNC_API_ASYNC') * Cc(true)), 'async') ^ -1) *
+  (fill * Cg((P('FUNC_API_NOEXPORT') * Cc(true)), 'noexport') ^ -1) *
+  (fill * Cg((P('FUNC_API_NOEVAL') * Cc(true)), 'noeval') ^ -1) *
+  fill * P(';')
+  )
+grammar = Ct((c_proto + c_comment + c_preproc + ws) ^ 1)
+
+-- we need at least 4 arguments since the last two are output files
+assert(#arg >= 3)
+functions = {}
+
+local nvimsrcdir = arg[1]
+package.path = nvimsrcdir .. '/?.lua;' .. package.path
+
+-- names of all headers relative to the source root (for inclusion in the
+-- generated file)
+headers = {}
+-- output h file with generated dispatch functions
+dispatch_outputf = arg[#arg-2]
+-- output h file with packed metadata
+funcs_metadata_outputf = arg[#arg-1]
+-- output metadata mpack file, for use by other build scripts
+mpack_outputf = arg[#arg]
+
+-- set of function names, used to detect duplicates
+function_names = {}
+
+-- read each input file, parse and append to the api metadata
+for i = 2, #arg - 3 do
+  local full_path = arg[i]
+  local parts = {}
+  for part in string.gmatch(full_path, '[^/]+') do
+    parts[#parts + 1] = part
+  end
+  headers[#headers + 1] = parts[#parts - 1]..'/'..parts[#parts]
+
+  local input = io.open(full_path, 'rb')
+  local tmp = grammar:match(input:read('*all'))
+  for i = 1, #tmp do
+    local fn = tmp[i]
+    if not fn.noexport then
+      functions[#functions + 1] = tmp[i]
+      function_names[fn.name] = true
+      if #fn.parameters ~= 0 and fn.parameters[1][2] == 'channel_id' then
+        -- this function should receive the channel id
+        fn.receives_channel_id = true
+        -- remove the parameter since it won't be passed by the api client
+        table.remove(fn.parameters, 1)
+      end
+      if #fn.parameters ~= 0 and fn.parameters[#fn.parameters][1] == 'error' then
+        -- function can fail if the last parameter type is 'Error'
+        fn.can_fail = true
+        -- remove the error parameter, msgpack has it's own special field
+        -- for specifying errors
+        fn.parameters[#fn.parameters] = nil
+      end
+    end
+  end
+  input:close()
+end
+
+local function shallowcopy(orig)
+  local copy = {}
+  for orig_key, orig_value in pairs(orig) do
+    copy[orig_key] = orig_value
+  end
+  return copy
+end
+
+local function startswith(String,Start)
+  return string.sub(String,1,string.len(Start))==Start
+end
+
+-- Export functions under older deprecated names.
+-- These will be removed eventually.
+local deprecated_aliases = require("api.dispatch_deprecated")
+for i,f in ipairs(shallowcopy(functions)) do
+  local ismethod = false
+  if startswith(f.name, "nvim_") then
+    -- TODO(bfredl) after 0.1.6 allow method definitions
+    -- to specify the since and deprecated_since field
+    f.since = 1
+    if startswith(f.name, "nvim_buf_") then
+      ismethod = true
+    elseif startswith(f.name, "nvim_win_") then
+      ismethod = true
+    elseif startswith(f.name, "nvim_tabpage_") then
+      ismethod = true
+    end
+  else
+    f.noeval = true
+    f.since = 0
+    f.deprecated_since = 1
+  end
+  f.method = ismethod
+  local newname = deprecated_aliases[f.name]
+  if newname ~= nil then
+    if function_names[newname] then
+      -- duplicate
+      print("Function "..f.name.." has deprecated alias\n"
+            ..newname.." which has a separate implementation.\n"..
+            "Please remove it from src/nvim/api/dispatch_deprecated.lua")
+      os.exit(1)
+    end
+    local newf = shallowcopy(f)
+    newf.name = newname
+    if newname == "ui_try_resize" then
+      -- The return type was incorrectly set to Object in 0.1.5.
+      -- Keep it that way for clients that rely on this.
+      newf.return_type = "Object"
+    end
+    newf.impl_name = f.name
+    newf.noeval = true
+    newf.since = 0
+    newf.deprecated_since = 1
+    functions[#functions+1] = newf
+  end
+end
+
+-- don't expose internal attributes like "impl_name" in public metadata
+exported_attributes = {'name', 'parameters', 'return_type', 'method',
+                       'since', 'deprecated_since'}
+exported_functions = {}
+for _,f in ipairs(functions) do
+  local f_exported = {}
+  for _,attr in ipairs(exported_attributes) do
+    f_exported[attr] = f[attr]
+  end
+  exported_functions[#exported_functions+1] = f_exported
+end
+
+
+funcs_metadata_output = io.open(funcs_metadata_outputf, 'wb')
+funcs_metadata_output:write([[
+static const uint8_t funcs_metadata[] = {
+]])
+
+-- serialize the API metadata using msgpack and embed into the resulting
+-- binary for easy querying by clients
+packed_exported_functions = mpack.pack(exported_functions)
+for i = 1, #packed_exported_functions do
+  funcs_metadata_output:write(string.byte(packed_exported_functions, i)..', ')
+  if i % 10 == 0 then
+    funcs_metadata_output:write('\n  ')
+  end
+end
+funcs_metadata_output:write([[
+};
+]])
+funcs_metadata_output:close()
+
+-- start building the dispatch wrapper output
+output = io.open(dispatch_outputf, 'wb')
+
+local function real_type(type)
+  local rv = type
+  if typed_container:match(rv) then
+    if rv:match('Array') then
+      rv = 'Array'
+    else
+      rv = 'Dictionary'
+    end
+  end
+  return rv
+end
+
+-- start the handler functions. Visit each function metadata to build the
+-- handler function with code generated for validating arguments and calling to
+-- the real API.
+for i = 1, #functions do
+  local fn = functions[i]
+  if fn.impl_name == nil then
+    local args = {}
+
+    output:write('Object handle_'..fn.name..'(uint64_t channel_id, Array args, Error *error)')
+    output:write('\n{')
+    output:write('\n  Object ret = NIL;')
+    -- Declare/initialize variables that will hold converted arguments
+    for j = 1, #fn.parameters do
+      local param = fn.parameters[j]
+      local converted = 'arg_'..j
+      output:write('\n  '..param[1]..' '..converted..';')
+    end
+    output:write('\n')
+    output:write('\n  if (args.size != '..#fn.parameters..') {')
+    output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
+    output:write('\n    error->set = true;')
+    output:write('\n    goto cleanup;')
+    output:write('\n  }\n')
+
+    -- Validation/conversion for each argument
+    for j = 1, #fn.parameters do
+      local converted, convert_arg, param, arg
+      param = fn.parameters[j]
+      converted = 'arg_'..j
+      local rt = real_type(param[1])
+      if rt ~= 'Object' then
+        if rt:match('^Buffer$') or rt:match('^Window$') or rt:match('^Tabpage$') then
+          -- Buffer, Window, and Tabpage have a specific type, but are stored in integer
+          output:write('\n  if (args.items['..(j - 1)..'].type == kObjectType'..rt..' && args.items['..(j - 1)..'].data.integer >= 0) {')
+          output:write('\n    '..converted..' = (handle_T)args.items['..(j - 1)..'].data.integer;')
+        else
+          output:write('\n  if (args.items['..(j - 1)..'].type == kObjectType'..rt..') {')
+          output:write('\n    '..converted..' = args.items['..(j - 1)..'].data.'..rt:lower()..';')
+        end
+        if rt:match('^Buffer$') or rt:match('^Window$') or rt:match('^Tabpage$') or rt:match('^Boolean$') then
+          -- accept nonnegative integers for Booleans, Buffers, Windows and Tabpages
+          output:write('\n  } else if (args.items['..(j - 1)..'].type == kObjectTypeInteger && args.items['..(j - 1)..'].data.integer >= 0) {')
+          output:write('\n    '..converted..' = (handle_T)args.items['..(j - 1)..'].data.integer;')
+        end
+        output:write('\n  } else {')
+        output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong type for argument '..j..', expecting '..param[1]..'");')
+        output:write('\n    error->set = true;')
+        output:write('\n    goto cleanup;')
+        output:write('\n  }\n')
+      else
+        output:write('\n  '..converted..' = args.items['..(j - 1)..'];\n')
+      end
+
+      args[#args + 1] = converted
+    end
+
+    -- function call
+    local call_args = table.concat(args, ', ')
+    output:write('\n  ')
+    if fn.return_type ~= 'void' then
+      -- has a return value, prefix the call with a declaration
+      output:write(fn.return_type..' rv = ')
+    end
+
+    -- write the function name and the opening parenthesis
+    output:write(fn.name..'(')
+
+    if fn.receives_channel_id then
+      -- if the function receives the channel id, pass it as first argument
+      if #args > 0 or fn.can_fail then
+        output:write('channel_id, '..call_args)
+      else
+        output:write('channel_id')
+      end
+    else
+      output:write(call_args)
+    end
+
+    if fn.can_fail then
+      -- if the function can fail, also pass a pointer to the local error object
+      if #args > 0 then
+        output:write(', error);\n')
+      else
+        output:write('error);\n')
+      end
+      -- and check for the error
+      output:write('\n  if (error->set) {')
+      output:write('\n    goto cleanup;')
+      output:write('\n  }\n')
+    else
+      output:write(');\n')
+    end
+
+    if fn.return_type ~= 'void' then
+      output:write('\n  ret = '..string.upper(real_type(fn.return_type))..'_OBJ(rv);')
+    end
+    output:write('\n\ncleanup:');
+
+    output:write('\n  return ret;\n}\n\n');
+  end
+end
+
+-- Generate a function that initializes method names with handler functions
+output:write([[
+void msgpack_rpc_init_method_table(void)
+{
+  methods = map_new(String, MsgpackRpcRequestHandler)();
+
+]])
+
+for i = 1, #functions do
+  local fn = functions[i]
+  output:write('  msgpack_rpc_add_method_handler('..
+               '(String) {.data = "'..fn.name..'", '..
+               '.size = sizeof("'..fn.name..'") - 1}, '..
+               '(MsgpackRpcRequestHandler) {.fn = handle_'..  (fn.impl_name or fn.name)..
+               ', .async = '..tostring(fn.async)..'});\n')
+
+end
+
+output:write('\n}\n\n')
+output:close()
+
+mpack_output = io.open(mpack_outputf, 'wb')
+mpack_output:write(mpack.pack(functions))
+mpack_output:close()
diff --git a/scripts/geneval.lua b/scripts/geneval.lua
new file mode 100644
index 0000000000..b1ba76296c
--- /dev/null
+++ b/scripts/geneval.lua
@@ -0,0 +1,66 @@
+mpack = require('mpack')
+
+local nvimsrcdir = arg[1]
+local autodir = arg[2]
+local metadata_file = arg[3]
+local funcs_file = arg[4]
+
+if nvimsrcdir == '--help' then
+  print([[
+Usage:
+  lua geneval.lua src/nvim build/src/nvim/auto
+
+Will generate build/src/nvim/auto/funcs.generated.h with definition of functions 
+static const array.
+]])
+  os.exit(0)
+end
+
+package.path = nvimsrcdir .. '/?.lua;' .. package.path
+
+local funcsfname = autodir .. '/funcs.generated.h'
+
+local gperfpipe = io.open(funcsfname .. '.gperf', 'wb')
+
+local funcs = require('eval').funcs
+local metadata = mpack.unpack(io.open(arg[3], 'rb'):read("*all"))
+for i,fun in ipairs(metadata) do
+  if not fun.noeval then
+    funcs[fun.name] = {
+      args=#fun.parameters,
+      func='api_wrapper',
+      data='&handle_'..fun.name,
+    }
+  end
+end
+
+local funcsdata = io.open(funcs_file, 'w')
+funcsdata:write(mpack.pack(funcs))
+funcsdata:close()
+
+gperfpipe:write([[
+%language=ANSI-C
+%global-table
+%define initializer-suffix ,0,0,NULL,NULL
+%define word-array-name functions
+%define hash-function-name hash_internal_func_gperf
+%define lookup-function-name find_internal_func_gperf
+%omit-struct-type
+%struct-type
+VimLFuncDef;
+%%
+]])
+
+for name, def in pairs(funcs) do
+  args = def.args or 0
+  if type(args) == 'number' then
+    args = {args, args}
+  elseif #args == 1 then
+    args[2] = 'MAX_FUNC_ARGS'
+  end
+  func = def.func or ('f_' .. name)
+  data = def.data or "NULL"
+  gperfpipe:write(('%s,  %s, %s, &%s, (FunPtr)%s\n')
+                  :format(name, args[1], args[2], func, data))
+end
+gperfpipe:close()
diff --git a/scripts/genoptions.lua b/scripts/genoptions.lua
index da53d010bd..9d7f235a3b 100644
--- a/scripts/genoptions.lua
+++ b/scripts/genoptions.lua
@@ -31,6 +31,7 @@ local type_flags={
 local redraw_flags={
   statuslines='P_RSTAT',
   current_window='P_RWIN',
+  current_window_only='P_RWINONLY',
   current_buffer='P_RBUF',
   all_windows='P_RALL',
   everything='P_RCLR',
@@ -57,9 +58,14 @@ local get_flags = function(o)
       add_flag(redraw_flags[r_flag])
     end
   end
+  if o.expand then
+    add_flag('P_EXPAND')
+    if o.expand == 'nodefault' then
+      add_flag('P_NO_DEF_EXP')
+    end
+  end
   for _, flag_desc in ipairs({
     {'alloced'},
-    {'expand'},
     {'nodefault'},
     {'no_mkrc'},
     {'vi_def'},
diff --git a/scripts/genunicodetables.lua b/scripts/genunicodetables.lua
index 36339e2fc6..66430ba26e 100644
--- a/scripts/genunicodetables.lua
+++ b/scripts/genunicodetables.lua
@@ -12,19 +12,27 @@
 --    2 then interval applies only to first, third, fifth, … character in range. 
 --    Fourth value is number that should be added to the codepoint to yield 
 --    folded/lower/upper codepoint.
+-- 4. emoji_width and emoji_all tables: sorted lists of non-overlapping closed
+--    intervals of Emoji characters.  emoji_width contains all the characters
+--    which don't have ambiguous or double width, and emoji_all has all Emojis.
 if arg[1] == '--help' then
   print('Usage:')
-  print('  genunicodetables.lua UnicodeData.txt CaseFolding.txt ' ..
-        'EastAsianWidth.txt')
-  print('                       unicode_tables.generated.h')
+  print('  genunicodetables.lua unicode/ unicode_tables.generated.h')
   os.exit(0)
 end
 
-local unicodedata_fname = arg[1]
-local casefolding_fname = arg[2]
-local eastasianwidth_fname = arg[3]
+local basedir = arg[1]
+local pathsep = package.config:sub(1, 1)
+local get_path = function(fname)
+  return basedir .. pathsep .. fname
+end
+
+local unicodedata_fname = get_path('UnicodeData.txt')
+local casefolding_fname = get_path('CaseFolding.txt')
+local eastasianwidth_fname = get_path('EastAsianWidth.txt')
+local emoji_fname = get_path('emoji-data.txt')
 
-local utf_tables_fname = arg[4]
+local utf_tables_fname = arg[2]
 
 local split_on_semicolons = function(s)
   local ret = {}
@@ -79,6 +87,10 @@ local parse_width_props = function(eaw_fp)
   return fp_lines_to_lists(eaw_fp, 2, true)
 end
 
+local parse_emoji_props = function(emoji_fp)
+  return fp_lines_to_lists(emoji_fp, 2, true)
+end
+
 local make_range = function(start, end_, step, add)
   if step and add then
     return ('  {0x%x, 0x%x, %d, %d},\n'):format(
@@ -168,6 +180,7 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths,
   local start = -1
   local end_ = -1
   local dataidx = 1
+  local ret = {}
   for _, p in ipairs(widthprops) do
     if widths[p[2]:sub(1, 1)] then
       local rng_start, rng_end = p[1]:find('%.%.')
@@ -200,6 +213,7 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths,
         else
           if start >= 0 then
             ut_fp:write(make_range(start, end_))
+            table.insert(ret, {start, end_})
           end
           start = n
         end
@@ -209,6 +223,72 @@ local build_width_table = function(ut_fp, dataprops, widthprops, widths,
   end
   if start >= 0 then
     ut_fp:write(make_range(start, end_))
+    table.insert(ret, {start, end_})
+  end
+  ut_fp:write('};\n')
+  return ret
+end
+
+local build_emoji_table = function(ut_fp, emojiprops, doublewidth, ambiwidth)
+  local emojiwidth = {}
+  local emoji = {}
+  for _, p in ipairs(emojiprops) do
+    if p[2]:match('Emoji%s+#') then
+      local rng_start, rng_end = p[1]:find('%.%.')
+      if rng_start then
+        n = tonumber(p[1]:sub(1, rng_start - 1), 16)
+        n_last = tonumber(p[1]:sub(rng_end + 1), 16)
+      else
+        n = tonumber(p[1], 16)
+        n_last = n
+      end
+      if #emoji > 0 and n - 1 == emoji[#emoji][2] then
+        emoji[#emoji][2] = n_last
+      else
+        table.insert(emoji, { n, n_last })
+      end
+
+      -- Characters below 1F000 may be considered single width traditionally,
+      -- making them double width causes problems.
+      if n >= 0x1f000 then
+        -- exclude characters that are in the ambiguous/doublewidth table
+        for _, ambi in ipairs(ambiwidth) do
+          if n >= ambi[1] and n <= ambi[2] then
+            n = ambi[2] + 1
+          end
+          if n_last >= ambi[1] and n_last <= ambi[2] then
+            n_last = ambi[1] - 1
+          end
+        end
+        for _, double in ipairs(doublewidth) do
+          if n >= double[1] and n <= double[2] then
+            n = double[2] + 1
+          end
+          if n_last >= double[1] and n_last <= double[2] then
+            n_last = double[1] - 1
+          end
+        end
+
+        if n <= n_last then
+          if #emojiwidth > 0 and n - 1 == emojiwidth[#emojiwidth][2] then
+            emojiwidth[#emojiwidth][2] = n_last
+          else
+            table.insert(emojiwidth, { n, n_last })
+          end
+        end
+      end
+    end
+  end
+
+  ut_fp:write('static const struct interval emoji_all[] = {\n')
+  for _, p in ipairs(emoji) do
+    ut_fp:write(make_range(p[1], p[2]))
+  end
+  ut_fp:write('};\n')
+
+  ut_fp:write('static const struct interval emoji_width[] = {\n')
+  for _, p in ipairs(emojiwidth) do
+    ut_fp:write(make_range(p[1], p[2]))
   end
   ut_fp:write('};\n')
 end
@@ -233,7 +313,15 @@ local eaw_fp = io.open(eastasianwidth_fname, 'r')
 local widthprops = parse_width_props(eaw_fp)
 eaw_fp:close()
 
-build_width_table(ut_fp, dataprops, widthprops, {W=true, F=true}, 'doublewidth')
-build_width_table(ut_fp, dataprops, widthprops, {A=true}, 'ambiguous')
+local doublewidth = build_width_table(ut_fp, dataprops, widthprops,
+                                      {W=true, F=true}, 'doublewidth')
+local ambiwidth = build_width_table(ut_fp, dataprops, widthprops,
+                                    {A=true}, 'ambiguous')
+
+local emoji_fp = io.open(emoji_fname, 'r')
+local emojiprops = parse_emoji_props(emoji_fp)
+emoji_fp:close()
+
+build_emoji_table(ut_fp, emojiprops, doublewidth, ambiwidth)
 
 ut_fp:close()
diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua
index 9135c8e3ab..24c147b811 100644
--- a/scripts/genvimvim.lua
+++ b/scripts/genvimvim.lua
@@ -1,10 +1,13 @@
+mpack = require('mpack')
+
 if arg[1] == '--help' then
-  print('Usage: genoptions.lua src/nvim runtime/syntax/vim/generated.vim')
+  print('Usage: lua genvimvim.lua src/nvim runtime/syntax/vim/generated.vim')
   os.exit(0)
 end
 
 local nvimsrcdir = arg[1]
 local syntax_file = arg[2]
+local funcs_file = arg[3]
 
 package.path = nvimsrcdir .. '/?.lua;' .. package.path
 
@@ -111,28 +114,16 @@ end
 w('\n\nsyn case match')
 local vimfun_start = 'syn keyword vimFuncName contained '
 w('\n\n' .. vimfun_start)
-eval_fd = io.open(nvimsrcdir .. '/eval.c', 'r')
+funcs = mpack.unpack(io.open(funcs_file):read("*all"))
 local started = 0
-for line in eval_fd:lines() do
-  if line == '} functions[] =' then
-    started = 1
-  elseif started == 1 then
-    assert (line == '{')
-    started = 2
-  elseif started == 2 then
-    if line == '};' then
-      break
-    end
-    local func_name = line:match('^  {"(%w+)",')
-    if func_name then
-      if lld.line_length > 850 then
-        w('\n' .. vimfun_start)
-      end
-      w(' ' .. func_name)
+for name, def in pairs(funcs) do
+  if name then
+    if lld.line_length > 850 then
+      w('\n' .. vimfun_start)
     end
+    w(' ' .. name)
   end
 end
-eval_fd:close()
 
 w('\n')
 syn_fd:close()
diff --git a/scripts/git-log-pretty-since.sh b/scripts/git-log-pretty-since.sh
index d8e3282fb3..6281127542 100755
--- a/scripts/git-log-pretty-since.sh
+++ b/scripts/git-log-pretty-since.sh
@@ -19,7 +19,7 @@ is_merge_commit() {
   git log $1^2 >/dev/null 2>&1 && return 0 || return 1
 }
 
-for commit in $(git log --format='%H' --first-parent --since $__SINCE); do
+for commit in $(git log --format='%H' --first-parent "$__SINCE"..HEAD); do
   if is_merge_commit ${commit} ; then
       if [ -z "$__INVMATCH" ] || ! git log --oneline ${commit}^1..${commit}^2 \
            | grep -E "$__INVMATCH" >/dev/null 2>&1 ; then
diff --git a/scripts/msgpack-gen.lua b/scripts/msgpack-gen.lua
deleted file mode 100644
index c726db3920..0000000000
--- a/scripts/msgpack-gen.lua
+++ /dev/null
@@ -1,310 +0,0 @@
-lpeg = require('lpeg')
-mpack = require('mpack')
-
--- lpeg grammar for building api metadata from a set of header files. It
--- ignores comments and preprocessor commands and parses a very small subset
--- of C prototypes with a limited set of types
-P, R, S = lpeg.P, lpeg.R, lpeg.S
-C, Ct, Cc, Cg = lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.Cg
-
-any = P(1) -- (consume one character)
-letter = R('az', 'AZ') + S('_$')
-alpha = letter + R('09')
-nl = P('\r\n') + P('\n')
-not_nl = any - nl
-ws = S(' \t') + nl
-fill = ws ^ 0
-c_comment = P('//') * (not_nl ^ 0)
-c_preproc = P('#') * (not_nl ^ 0)
-typed_container =
-  (P('ArrayOf(') + P('DictionaryOf(')) * ((any - P(')')) ^ 1) * P(')')
-c_id = (
-  typed_container +
-  (letter * (alpha ^ 0))
-)
-c_void = P('void')
-c_param_type = (
-  ((P('Error') * fill * P('*') * fill) * Cc('error')) +
-  (C(c_id) * (ws ^ 1))
-  )
-c_type = (C(c_void) * (ws ^ 1)) + c_param_type
-c_param = Ct(c_param_type * C(c_id))
-c_param_list = c_param * (fill * (P(',') * fill * c_param) ^ 0)
-c_params = Ct(c_void + c_param_list)
-c_proto = Ct(
-  Cg(c_type, 'return_type') * Cg(c_id, 'name') *
-  fill * P('(') * fill * Cg(c_params, 'parameters') * fill * P(')') *
-  Cg(Cc(false), 'async') *
-  (fill * Cg((P('FUNC_ATTR_ASYNC') * Cc(true)), 'async') ^ -1) *
-  fill * P(';')
-  )
-grammar = Ct((c_proto + c_comment + c_preproc + ws) ^ 1)
-
--- we need at least 2 arguments since the last one is the output file
-assert(#arg >= 1)
-functions = {}
-
--- names of all headers relative to the source root(for inclusion in the
--- generated file)
-headers = {}
--- output file(dispatch function + metadata serialized with msgpack)
-outputf = arg[#arg]
-
--- read each input file, parse and append to the api metadata
-for i = 1, #arg - 1 do
-  local full_path = arg[i]
-  local parts = {}
-  for part in string.gmatch(full_path, '[^/]+') do
-    parts[#parts + 1] = part
-  end
-  headers[#headers + 1] = parts[#parts - 1]..'/'..parts[#parts]
-
-  local input = io.open(full_path, 'rb')
-  local tmp = grammar:match(input:read('*all'))
-  for i = 1, #tmp do
-    functions[#functions + 1] = tmp[i]
-    local fn = tmp[i]
-    if #fn.parameters ~= 0 and fn.parameters[1][2] == 'channel_id' then
-      -- this function should receive the channel id
-      fn.receives_channel_id = true
-      -- remove the parameter since it won't be passed by the api client
-      table.remove(fn.parameters, 1)
-    end
-    if #fn.parameters ~= 0 and fn.parameters[#fn.parameters][1] == 'error' then
-      -- function can fail if the last parameter type is 'Error'
-      fn.can_fail = true
-      -- remove the error parameter, msgpack has it's own special field
-      -- for specifying errors
-      fn.parameters[#fn.parameters] = nil
-    end
-  end
-  input:close()
-end
-
-
--- start building the output
-output = io.open(outputf, 'wb')
-
-output:write([[
-#include <inttypes.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <assert.h>
-#include <msgpack.h>
-
-#include "nvim/map.h"
-#include "nvim/log.h"
-#include "nvim/vim.h"
-#include "nvim/msgpack_rpc/helpers.h"
-#include "nvim/msgpack_rpc/defs.h"
-#include "nvim/api/private/helpers.h"
-#include "nvim/api/private/defs.h"
-]])
-
-for i = 1, #headers do
-  if headers[i]:sub(-12) ~= '.generated.h' then
-    output:write('\n#include "nvim/'..headers[i]..'"')
-  end
-end
-
-output:write([[
-
-
-static const uint8_t msgpack_metadata[] = {
-
-]])
--- serialize the API metadata using msgpack and embed into the resulting
--- binary for easy querying by clients
-packed = mpack.pack(functions)
-for i = 1, #packed do
-  output:write(string.byte(packed, i)..', ')
-  if i % 10 == 0 then
-    output:write('\n  ')
-  end
-end
-output:write([[
-};
-
-void msgpack_rpc_init_function_metadata(Dictionary *metadata)
-{
-  msgpack_unpacked unpacked;
-  msgpack_unpacked_init(&unpacked);
-  if (msgpack_unpack_next(&unpacked,
-                          (const char *)msgpack_metadata,
-                          sizeof(msgpack_metadata),
-                          NULL) != MSGPACK_UNPACK_SUCCESS) {
-    abort();
-  }
-  Object functions;
-  msgpack_rpc_to_object(&unpacked.data, &functions);
-  msgpack_unpacked_destroy(&unpacked);
-  PUT(*metadata, "functions", functions);
-}
-
-]])
-
-local function real_type(type)
-  local rv = type
-  if typed_container:match(rv) then
-    if rv:match('Array') then
-      rv = 'Array'
-    else
-      rv = 'Dictionary'
-    end
-  end
-  return rv
-end
-
--- start the handler functions. Visit each function metadata to build the
--- handler function with code generated for validating arguments and calling to
--- the real API.
-for i = 1, #functions do
-  local fn = functions[i]
-  local args = {}
-
-  output:write('static Object handle_'..fn.name..'(uint64_t channel_id, uint64_t request_id, Array args, Error *error)')
-  output:write('\n{')
-  output:write('\n  Object ret = NIL;')
-  -- Declare/initialize variables that will hold converted arguments
-  for j = 1, #fn.parameters do
-    local param = fn.parameters[j]
-    local converted = 'arg_'..j
-    output:write('\n  '..param[1]..' '..converted..' api_init_'..string.lower(real_type(param[1]))..';')
-  end
-  output:write('\n')
-  output:write('\n  if (args.size != '..#fn.parameters..') {')
-  output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
-  output:write('\n    error->set = true;')
-  output:write('\n    goto cleanup;')
-  output:write('\n  }\n')
-
-  -- Validation/conversion for each argument
-  for j = 1, #fn.parameters do
-    local converted, convert_arg, param, arg
-    param = fn.parameters[j]
-    converted = 'arg_'..j
-    local rt = real_type(param[1])
-    if rt ~= 'Object' then
-      output:write('\n  if (args.items['..(j - 1)..'].type == kObjectType'..rt..') {')
-      output:write('\n    '..converted..' = args.items['..(j - 1)..'].data.'..rt:lower()..';')
-      if rt:match('^Buffer$') or rt:match('^Window$') or rt:match('^Tabpage$') or rt:match('^Boolean$') then
-        -- accept positive integers for Buffers, Windows and Tabpages
-        output:write('\n  } else if (args.items['..(j - 1)..'].type == kObjectTypeInteger && args.items['..(j - 1)..'].data.integer > 0) {')
-        output:write('\n    '..converted..' = (unsigned)args.items['..(j - 1)..'].data.integer;')
-      end
-      output:write('\n  } else {')
-      output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong type for argument '..j..', expecting '..param[1]..'");')
-      output:write('\n    error->set = true;')
-      output:write('\n    goto cleanup;')
-      output:write('\n  }\n')
-    else
-      output:write('\n  '..converted..' = args.items['..(j - 1)..'];\n')
-    end
-
-    args[#args + 1] = converted
-  end
-
-  -- function call
-  local call_args = table.concat(args, ', ')
-  output:write('\n  ')
-  if fn.return_type ~= 'void' then
-    -- has a return value, prefix the call with a declaration
-    output:write(fn.return_type..' rv = ')
-  end
-
-  -- write the function name and the opening parenthesis
-  output:write(fn.name..'(')
-
-  if fn.receives_channel_id then
-    -- if the function receives the channel id, pass it as first argument
-    if #args > 0 then
-      output:write('channel_id, '..call_args)
-    else
-      output:write('channel_id')
-    end
-  else
-    output:write(call_args)
-  end
-
-  if fn.can_fail then
-    -- if the function can fail, also pass a pointer to the local error object
-    if #args > 0 then
-      output:write(', error);\n')
-    else
-      output:write('error);\n')
-    end
-    -- and check for the error
-    output:write('\n  if (error->set) {')
-    output:write('\n    goto cleanup;')
-    output:write('\n  }\n')
-  else
-    output:write(');\n')
-  end
-
-  if fn.return_type ~= 'void' then
-    output:write('\n  ret = '..string.upper(real_type(fn.return_type))..'_OBJ(rv);')
-  end
-  -- Now generate the cleanup label for freeing memory allocated for the
-  -- arguments
-  output:write('\n\ncleanup:');
-
-  for j = 1, #fn.parameters do
-    local param = fn.parameters[j]
-    output:write('\n  api_free_'..string.lower(real_type(param[1]))..'(arg_'..j..');')
-  end
-  output:write('\n  return ret;\n}\n\n');
-end
-
--- Generate a function that initializes method names with handler functions
-output:write([[
-static Map(String, MsgpackRpcRequestHandler) *methods = NULL;
-
-void msgpack_rpc_add_method_handler(String method, MsgpackRpcRequestHandler handler)
-{
-  map_put(String, MsgpackRpcRequestHandler)(methods, method, handler);
-}
-
-void msgpack_rpc_init_method_table(void)
-{
-  methods = map_new(String, MsgpackRpcRequestHandler)();
-
-]])
-
--- Keep track of the maximum method name length in order to avoid walking
--- strings longer than that when searching for a method handler
-local max_fname_len = 0
-for i = 1, #functions do
-  local fn = functions[i]
-  output:write('  msgpack_rpc_add_method_handler('..
-               '(String) {.data = "'..fn.name..'", '..
-               '.size = sizeof("'..fn.name..'") - 1}, '..
-               '(MsgpackRpcRequestHandler) {.fn = handle_'..  fn.name..
-               ', .async = '..tostring(fn.async)..'});\n')
-
-  if #fn.name > max_fname_len then
-    max_fname_len = #fn.name
-  end
-end
-
-output:write('\n}\n\n')
-
-output:write([[
-MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
-                                                     size_t name_len)
-{
-  String m = {
-    .data=(char *)name,
-    .size=MIN(name_len, ]]..max_fname_len..[[)
-  };
-  MsgpackRpcRequestHandler rv =
-    map_get(String, MsgpackRpcRequestHandler)(methods, m);
-
-  if (!rv.fn) {
-    rv.fn = msgpack_rpc_handle_missing_method;
-  }
-
-  return rv;
-}
-]])
-
-output:close()
diff --git a/scripts/release.sh b/scripts/release.sh
index 67738ccc96..93f9fa3d35 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Performs steps to tag a release.
 #
 # Steps:
 #   Create the "release" commit:
 #     - CMakeLists.txt: Unset NVIM_VERSION_PRERELEASE
+#     - CMakeLists.txt: Unset NVIM_API_PRERELEASE
 #     - Tag the commit.
 #   Create the "version bump" commit:
 #     - CMakeLists.txt: Set NVIM_VERSION_PRERELEASE to "-dev"
@@ -17,42 +18,48 @@ set -e
 set -u
 set -o pipefail
 
+__sed=$( [ "$(uname)" = Darwin ] && echo 'sed -E' || echo 'sed -r' )
+
 cd "$(git rev-parse --show-toplevel)"
 
 __LAST_TAG=$(git describe --abbrev=0)
 [ -z "$__LAST_TAG" ] && { echo 'ERROR: no tag found'; exit 1; }
 __VERSION_MAJOR=$(grep 'set(NVIM_VERSION_MAJOR' CMakeLists.txt\
-  |sed -r 's/.*NVIM_VERSION_MAJOR ([[:digit:]]).*/\1/')
+  |$__sed 's/.*NVIM_VERSION_MAJOR ([[:digit:]]).*/\1/')
 __VERSION_MINOR=$(grep 'set(NVIM_VERSION_MINOR' CMakeLists.txt\
-  |sed -r 's/.*NVIM_VERSION_MINOR ([[:digit:]]).*/\1/')
+  |$__sed 's/.*NVIM_VERSION_MINOR ([[:digit:]]).*/\1/')
 __VERSION_PATCH=$(grep 'set(NVIM_VERSION_PATCH' CMakeLists.txt\
-  |sed -r 's/.*NVIM_VERSION_PATCH ([[:digit:]]).*/\1/')
+  |$__sed 's/.*NVIM_VERSION_PATCH ([[:digit:]]).*/\1/')
 __VERSION="${__VERSION_MAJOR}.${__VERSION_MINOR}.${__VERSION_PATCH}"
 { [ -z "$__VERSION_MAJOR" ] || [ -z "$__VERSION_MINOR" ] || [ -z "$__VERSION_PATCH" ]; } \
   &&  { echo "ERROR: version parse failed: '${__VERSION}'"; exit 1; }
 __RELEASE_MSG="NVIM v${__VERSION}
 
-Features:
+FEATURES:
 
-Fixes:
+FIXES:
 
-Changes:
+CHANGES:
 
 "
 __BUMP_MSG="version bump"
 
 echo "Most recent tag: ${__LAST_TAG}"
 echo "Release version: ${__VERSION}"
-sed -i -r 's/(NVIM_VERSION_PRERELEASE) "-dev"/\1 ""/' CMakeLists.txt
+$__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) "-dev"/\1 ""/' CMakeLists.txt
+$__sed -i.bk 's/(NVIM_API_PRERELEASE) true/\1 false/' CMakeLists.txt
 echo "Building changelog since ${__LAST_TAG}..."
 __CHANGELOG="$(./scripts/git-log-pretty-since.sh "$__LAST_TAG" 'vim-patch:\S')"
 
 git add CMakeLists.txt
 git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}"
-git tag -a v"${__VERSION}" -m "NVIM v${__VERSION}"
+git tag --sign -a v"${__VERSION}" -m "NVIM v${__VERSION}"
+
+$__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
+$__sed -i.bk 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt
+nvim +'/NVIM_VERSION' +10new +'exe "norm! iUpdate version numbers!!!\<CR>"' \
+  +'norm! 10.' CMakeLists.txt
 
-sed -i -r 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
-nvim -c '/NVIM_VERSION' -c 'echo "Update version numbers"' CMakeLists.txt
 git add CMakeLists.txt
 git commit -m "$__BUMP_MSG"
 
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 7a0001769a..88fb3cae04 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -2,10 +2,11 @@
 
 set -e
 set -u
-set -o pipefail
+# Use privileged mode, which e.g. skips using CDPATH.
+set -p
 
-readonly NEOVIM_SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-readonly VIM_SOURCE_DIR_DEFAULT="${NEOVIM_SOURCE_DIR}/.vim-src"
+readonly NVIM_SOURCE_DIR="${NVIM_SOURCE_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
+readonly VIM_SOURCE_DIR_DEFAULT="${NVIM_SOURCE_DIR}/.vim-src"
 readonly VIM_SOURCE_DIR="${VIM_SOURCE_DIR:-${VIM_SOURCE_DIR_DEFAULT}}"
 readonly BASENAME="$(basename "${0}")"
 readonly BRANCH_PREFIX="vim-"
@@ -24,6 +25,9 @@ usage() {
   echo "    -p {vim-revision}  Download and apply the Vim patch vim-revision."
   echo "                       vim-revision can be a version number of the "
   echo "                       format '7.4.xxx' or a Git commit hash."
+  echo "    -g {vim-revision}  Download the Vim patch vim-revision."
+  echo "                       vim-revision can be a version number of the "
+  echo "                       format '7.4.xxx' or a Git commit hash."
   echo "    -s                 Submit a vim-patch pull request to Neovim."
   echo "    -r {pr-number}     Review a vim-patch pull request to Neovim."
   echo
@@ -57,10 +61,10 @@ clean_files() {
 
   read -p "Delete these files (Y/n)? " -n 1 -r reply
   echo
-  if [[ "${reply}" =~ ^[Yy]$ ]]; then
-    rm -- "${CREATED_FILES[@]}"
-  else
+  if [[ "${reply}" == n ]]; then
     echo "You can use 'git clean' to remove these files when you're done."
+  else
+    rm -- "${CREATED_FILES[@]}"
   fi
 }
 
@@ -92,7 +96,7 @@ commit_message() {
 
 find_git_remote() {
   git remote -v \
-    | awk '$2 ~ /github.com[:/]neovim\/neovim/ && $3 == "(fetch)" {print $1}'
+    | awk '$2 ~ /github.com[:\/]neovim\/neovim/ && $3 == "(fetch)" {print $1; exit}'
 }
 
 assign_commit_details() {
@@ -122,6 +126,36 @@ assign_commit_details() {
   patch_file="vim-${vim_version}.patch"
 }
 
+# Patch surgery
+preprocess_patch() {
+  local file="$1"
+  local nvim="nvim -u NORC -i NONE --headless"
+
+  # Remove *.proto, Make*, gui_*, some if_*
+  local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+
+  # Remove channel.txt, netbeans.txt, os_*.txt, todo.txt, version*.txt, tags
+  local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|todo\.txt\|version\d\.txt\|tags'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\%('${na_doc}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+
+  # Remove some testdir/Make_*.mak files
+  local na_src_testdir='Make_amiga.mak\|Make_dos.mak\|Make_ming.mak\|Make_vms.mms'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\%('${na_src_testdir}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+
+  # Remove some *.po files. #5622
+  local na_po='sjiscorr.c\|ja.sjis.po\|ko.po\|pl.cp1250.po\|pl.po\|ru.cp1251.po\|uk.cp1251.po\|zh_CN.cp936.po\|zh_CN.po\|zh_TW.po'
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/po/\%('${na_po}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+
+  # Rename src/ paths to src/nvim/
+  LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
+  # Rename path to matchit plugin.
+  LC_ALL=C sed -e 's@\( [ab]/runtime\)/pack/dist/opt/matchit/\(plugin/matchit.vim\)@\1/\2@g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+}
+
 get_vim_patch() {
   get_vim_sources
 
@@ -131,17 +165,25 @@ get_vim_patch() {
     >&2 echo "✘ Couldn't find Vim revision '${vim_commit}'."
     exit 3
   }
-  echo
   echo "✔ Found Vim revision '${vim_commit}'."
 
-  # Patch surgery: preprocess the patch.
-  #   - transform src/ paths to src/nvim/
-  local vim_full
-  vim_full="$(git show -1 --pretty=medium "${vim_commit}" \
-    | LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g')"
-  local neovim_branch="${BRANCH_PREFIX}${vim_version}"
+  local patch_content
+  patch_content="$(git --no-pager show --color=never -1 --pretty=medium "${vim_commit}")"
+
+  cd "${NVIM_SOURCE_DIR}"
+
+  printf "Creating patch...\n"
+  echo "$patch_content" > "${NVIM_SOURCE_DIR}/${patch_file}"
+
+  printf "Pre-processing patch...\n"
+  preprocess_patch "${NVIM_SOURCE_DIR}/${patch_file}"
+
+  printf "✔ Saved patch to '${NVIM_SOURCE_DIR}/${patch_file}'.\n"
+}
+
+stage_patch() {
+  get_vim_patch "$1"
 
-  cd "${NEOVIM_SOURCE_DIR}"
   local git_remote
   git_remote="$(find_git_remote)"
   local checked_out_branch
@@ -151,51 +193,40 @@ get_vim_patch() {
     echo "✔ Current branch '${checked_out_branch}' seems to be a vim-patch"
     echo "  branch; not creating a new branch."
   else
-    echo
-    echo "Fetching '${git_remote}/master'."
+    printf "\nFetching '${git_remote}/master'.\n"
     output="$(git fetch "${git_remote}" master 2>&1)" &&
       echo "✔ ${output}" ||
       (echo "✘ ${output}"; false)
 
+    local nvim_branch="${BRANCH_PREFIX}${vim_version}"
     echo
-    echo "Creating new branch '${neovim_branch}' based on '${git_remote}/master'."
-    cd "${NEOVIM_SOURCE_DIR}"
-    output="$(git checkout -b "${neovim_branch}" "${git_remote}/master" 2>&1)" &&
+    echo "Creating new branch '${nvim_branch}' based on '${git_remote}/master'."
+    cd "${NVIM_SOURCE_DIR}"
+    output="$(git checkout -b "${nvim_branch}" "${git_remote}/master" 2>&1)" &&
       echo "✔ ${output}" ||
       (echo "✘ ${output}"; false)
   fi
 
-  echo
-  echo "Creating empty commit with correct commit message."
+  printf "\nCreating empty commit with correct commit message.\n"
   output="$(commit_message | git commit --allow-empty --file 2>&1 -)" &&
     echo "✔ ${output}" ||
     (echo "✘ ${output}"; false)
 
-  echo
-  echo "Creating files."
-  echo "${vim_full}" > "${NEOVIM_SOURCE_DIR}/${patch_file}"
-  echo "✔ Saved full commit details to '${NEOVIM_SOURCE_DIR}/${patch_file}'."
+  printf "\nInstructions:
+  Proceed to port the patch. This may help:
+      patch -p1 < ${patch_file}
 
-  echo
-  echo "Instructions:"
-  echo
-  echo "  Proceed to port the patch."
-  echo "  You might want to try 'patch -p1 < ${patch_file}' first."
-  echo
-  echo "  If the patch contains a new test, consider porting it to Lua."
-  echo "  You might want to try 'scripts/legacy2luatest.pl'."
-  echo
-  echo "  Stage your changes ('git add ...') and use 'git commit --amend' to commit."
-  echo
-  echo "  To port additional patches related to ${vim_version} and add them to the current"
-  echo "  branch, call '${BASENAME} -p' again.  Please use this only if it wouldn't make"
-  echo "  sense to send in each patch individually, as it will increase the size of the"
-  echo "  pull request and make it harder to review."
-  echo
-  echo "  When you are finished, use '${BASENAME} -s' to submit a pull request."
-  echo
-  echo "  See https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-vim"
-  echo "  for more information."
+  Stage your changes ('git add ...') and use 'git commit --amend' to commit.
+
+  To port additional patches related to ${vim_version} and add them to the
+  current branch, call '${BASENAME} -p' again.
+    * Do this only for _related_ patches (otherwise it increases the
+      size of the pull request, making it harder to review)
+
+  When you're done, try '${BASENAME} -s' to create the pull request.
+
+  See the wiki for more information:
+    * https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-vim\n"
 }
 
 hub_pr() {
@@ -221,7 +252,7 @@ submit_pr() {
     exit 1
   fi
 
-  cd "${NEOVIM_SOURCE_DIR}"
+  cd "${NVIM_SOURCE_DIR}"
   local checked_out_branch
   checked_out_branch="$(git rev-parse --abbrev-ref HEAD)"
   if [[ "${checked_out_branch}" != ${BRANCH_PREFIX}* ]]; then
@@ -261,11 +292,11 @@ submit_pr() {
   local patch_file
   for patch_file in "${patches[@]}"; do
     patch_file="vim-${patch_file}.patch"
-    if [[ ! -f "${NEOVIM_SOURCE_DIR}/${patch_file}" ]]; then
+    if [[ ! -f "${NVIM_SOURCE_DIR}/${patch_file}" ]]; then
       continue
     fi
-    rm -- "${NEOVIM_SOURCE_DIR}/${patch_file}"
-    echo "✔ Removed '${NEOVIM_SOURCE_DIR}/${patch_file}'."
+    rm -- "${NVIM_SOURCE_DIR}/${patch_file}"
+    echo "✔ Removed '${NVIM_SOURCE_DIR}/${patch_file}'."
   done
 }
 
@@ -287,15 +318,15 @@ list_vim_patches() {
     if [[ -n "${vim_tag}" ]]; then
       local patch_number="${vim_tag:5}" # Remove prefix like "v7.4."
       # Tagged Vim patch, check version.c:
-      is_missing="$(sed -n '/static int included_patches/,/}/p' "${NEOVIM_SOURCE_DIR}/src/nvim/version.c" |
+      is_missing="$(sed -n '/static int included_patches/,/}/p' "${NVIM_SOURCE_DIR}/src/nvim/version.c" |
         grep -x -e "[[:space:]]*//[[:space:]]${patch_number} NA.*" -e "[[:space:]]*${patch_number}," >/dev/null && echo "false" || echo "true")"
       vim_commit="${vim_tag#v}"
-      if (cd "${VIM_SOURCE_DIR}" && git show --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then
+      if (cd "${VIM_SOURCE_DIR}" && git --no-pager  show --color=never --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then
         vim_commit="${vim_commit} (+runtime)"
       fi
     else
       # Untagged Vim patch (e.g. runtime updates), check the Neovim git log:
-      is_missing="$(cd "${NEOVIM_SOURCE_DIR}" &&
+      is_missing="$(cd "${NVIM_SOURCE_DIR}" &&
         git log -1 --no-merges --grep="vim\-patch:${vim_commit:0:7}" --pretty=format:false)"
     fi
 
@@ -319,14 +350,14 @@ list_vim_patches() {
 }
 
 review_commit() {
-  local neovim_commit_url="${1}"
-  local neovim_patch_url="${neovim_commit_url}.patch"
+  local nvim_commit_url="${1}"
+  local nvim_patch_url="${nvim_commit_url}.patch"
 
   local git_patch_prefix='Subject: \[PATCH\] '
-  local neovim_patch
-  neovim_patch="$(curl -Ssf "${neovim_patch_url}")"
+  local nvim_patch
+  nvim_patch="$(curl -Ssf "${nvim_patch_url}")"
   local vim_version
-  vim_version="$(head -n 4 <<< "${neovim_patch}" | sed -n "s/${git_patch_prefix}vim-patch:\([a-z0-9.]*\)$/\1/p")"
+  vim_version="$(head -n 4 <<< "${nvim_patch}" | sed -n "s/${git_patch_prefix}vim-patch:\([a-z0-9.]*\)$/\1/p")"
 
   echo
   if [[ -n "${vim_version}" ]]; then
@@ -335,6 +366,14 @@ review_commit() {
     echo "✘ Could not detect the Vim patch number."
     echo "  This script assumes that the PR contains only commits"
     echo "  with 'vim-patch:XXX' in their title."
+    echo
+    printf -- "$(head -n 4 <<< "${nvim_patch}")\n\n"
+    local reply
+    read -p "Continue reviewing (y/N)? " -n 1 -r reply
+    if [[ "${reply}" == y ]]; then
+      echo
+      return
+    fi
     exit 1
   fi
 
@@ -347,7 +386,7 @@ review_commit() {
   local message_length
   message_length="$(wc -l <<< "${expected_commit_message}")"
   local commit_message
-  commit_message="$(tail -n +4 <<< "${neovim_patch}" | head -n "${message_length}")"
+  commit_message="$(tail -n +4 <<< "${nvim_patch}" | head -n "${message_length}")"
   if [[ "${commit_message#${git_patch_prefix}}" == "${expected_commit_message}" ]]; then
     echo "✔ Found expected commit message."
   else
@@ -360,18 +399,18 @@ review_commit() {
 
   echo
   echo "Creating files."
-  echo "${neovim_patch}" > "${NEOVIM_SOURCE_DIR}/n${patch_file}"
-  echo "✔ Saved pull request diff to '${NEOVIM_SOURCE_DIR}/n${patch_file}'."
-  CREATED_FILES+=("${NEOVIM_SOURCE_DIR}/n${patch_file}")
+  echo "${nvim_patch}" > "${NVIM_SOURCE_DIR}/n${patch_file}"
+  echo "✔ Saved pull request diff to '${NVIM_SOURCE_DIR}/n${patch_file}'."
+  CREATED_FILES+=("${NVIM_SOURCE_DIR}/n${patch_file}")
 
-  curl -Ssfo "${NEOVIM_SOURCE_DIR}/${patch_file}" "${vim_patch_url}"
-  echo "✔ Saved Vim diff to '${NEOVIM_SOURCE_DIR}/${patch_file}'."
-  CREATED_FILES+=("${NEOVIM_SOURCE_DIR}/${patch_file}")
+  curl -Ssfo "${NVIM_SOURCE_DIR}/${patch_file}" "${vim_patch_url}"
+  echo "✔ Saved Vim diff to '${NVIM_SOURCE_DIR}/${patch_file}'."
+  CREATED_FILES+=("${NVIM_SOURCE_DIR}/${patch_file}")
 
   echo
   echo "Launching nvim."
-  nvim -c "cd ${NEOVIM_SOURCE_DIR}" \
-    -O "${NEOVIM_SOURCE_DIR}/${patch_file}" "${NEOVIM_SOURCE_DIR}/n${patch_file}"
+  nvim -c "cd ${NVIM_SOURCE_DIR}" \
+    -O "${NVIM_SOURCE_DIR}/${patch_file}" "${NVIM_SOURCE_DIR}/n${patch_file}"
 }
 
 review_pr() {
@@ -397,7 +436,7 @@ review_pr() {
     if [[ "${pr_commit_url}" != "${pr_commit_urls[-1]}" ]]; then
       read -p "Continue with next commit (Y/n)? " -n 1 -r reply
       echo
-      if [[ ! "${reply}" =~ ^[Yy]$ ]]; then
+      if [[ "${reply}" == n ]]; then
         break
       fi
     fi
@@ -406,7 +445,7 @@ review_pr() {
   clean_files
 }
 
-while getopts "hlp:r:s" opt; do
+while getopts "hlp:g:r:s" opt; do
   case ${opt} in
     h)
       usage
@@ -417,6 +456,10 @@ while getopts "hlp:r:s" opt; do
       exit 0
       ;;
     p)
+      stage_patch "${OPTARG}"
+      exit 0
+      ;;
+    g)
       get_vim_patch "${OPTARG}"
       exit 0
       ;;
diff --git a/src/.asan-blacklist b/src/.asan-blacklist
new file mode 100644
index 0000000000..7636f8fa82
--- /dev/null
+++ b/src/.asan-blacklist
@@ -0,0 +1,3 @@
+# multiqueue.h pointer arithmetic is not accepted by asan
+fun:multiqueue_node_data
+fun:dictwatcher_node_data
diff --git a/.valgrind.supp b/src/.valgrind.supp
index 8b630fcaaf..8b630fcaaf 100644
--- a/.valgrind.supp
+++ b/src/.valgrind.supp
diff --git a/Doxyfile b/src/Doxyfile
index de31c8355f..de31c8355f 100644
--- a/Doxyfile
+++ b/src/Doxyfile
diff --git a/clint.py b/src/clint.py
index c19ba4b7ae..ce31822ada 100755
--- a/clint.py
+++ b/src/clint.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# vim: set fileencoding=utf-8
 #
 # Copyright (c) 2009 Google Inc. All rights reserved.
 #
@@ -217,6 +218,8 @@ _ERROR_CATEGORIES = [
     'whitespace/semicolon',
     'whitespace/tab',
     'whitespace/todo',
+    'whitespace/line_continuation',
+    'whitespace/cast',
 ]
 
 # The default state of the category filter. This is overrided by the --filter=
@@ -2499,6 +2502,32 @@ def CheckSpacing(filename, clean_lines, linenum, nesting_state, error):
         error(filename, linenum, 'whitespace/braces', 5,
               'Missing space before }')
 
+    if Search(r'\S {2,}\\$', line):
+        error(filename, linenum, 'whitespace/line_continuation', 5,
+              'Too many spaces before \\, line continuation character must be '
+              'preceded by exactly one space. For “blank lines” '
+              'it is preferred to use the same amount of spaces as preceding '
+              'indent')
+
+    if Match(r'^ +#', line):
+        error(filename, linenum, 'whitespace/indent', 5,
+              'Must not indent preprocessor directives, use 1-space indent '
+              'after the hash')
+
+    cast_line = re.sub(r'^# *define +\w+\([^)]*\)', '', line)
+    match = Search(r'(?<!\bkvec_t)'
+                   r'(?<!\bkvec_withinit_t)'
+                   r'(?<!\bklist_t)'
+                   r'(?<!\bkliter_t)'
+                   r'(?<!\bkhash_t)'
+                   r'\((?:const )?(?:struct )?[a-zA-Z_]\w*(?: *\*(?:const)?)*\)'
+                   r' +'
+                   r'-?(?:\*+|&)?(?:\w+|\+\+|--|\()', cast_line)
+    if match and line[0] == ' ':
+        error(filename, linenum, 'whitespace/cast', 2,
+              'Should leave no spaces after a cast: {!r}'.format(
+                  match.group(0)))
+
 
 def GetPreviousNonBlankLine(clean_lines, linenum):
     """Return the most recent non-blank line and its line number.
@@ -2535,22 +2564,43 @@ def CheckBraces(filename, clean_lines, linenum, error):
 
     line = clean_lines.elided[linenum]        # get rid of comments and strings
 
-    if not (filename.endswith('.c') or filename.endswith('.h')):
-        if Match(r'\s*{\s*$', line):
-            # We allow an open brace to start a line in the case where someone
-            # is using braces in a block to explicitly create a new scope, which
-            # is commonly used to control the lifetime of stack-allocated
-            # variables.  Braces are also used for brace initializers inside
-            # function calls.  We don't detect this perfectly: we just don't
-            # complain if the last non-whitespace character on the previous
-            # non-blank line is ',', ';', ':', '(', '{', or '}', or if the
-            # previous line starts a preprocessor block.
-            prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
-            if (not Search(r'[,;:}{(]\s*$', prevline) and
-                    not Match(r'\s*#', prevline)):
-                error(filename, linenum, 'whitespace/braces', 4,
-                      '{ should almost always be at the end'
-                      ' of the previous line')
+    if Match(r'\s+{\s*$', line):
+        # We allow an open brace to start a line in the case where someone
+        # is using braces in a block to explicitly create a new scope, which
+        # is commonly used to control the lifetime of stack-allocated
+        # variables.  Braces are also used for brace initializers inside
+        # function calls.  We don't detect this perfectly: we just don't
+        # complain if the last non-whitespace character on the previous
+        # non-blank line is ',', ';', ':', '(', '{', or '}', or if the
+        # previous line starts a preprocessor block.
+        prevline = GetPreviousNonBlankLine(clean_lines, linenum)[0]
+        if (not Search(r'[,;:}{(]\s*$', prevline) and
+                not Match(r'\s*#', prevline)):
+            error(filename, linenum, 'whitespace/braces', 4,
+                    '{ should almost always be at the end'
+                    ' of the previous line')
+
+    # Brace must appear after function signature, but on the *next* line
+    if Match(r'^(?:\w+(?: ?\*+)? )+\w+\(', line):
+        pos = line.find('(')
+        (endline, end_linenum, endpos) = CloseExpression(
+            clean_lines, linenum, pos)
+        if endline.endswith('{'):
+            error(filename, end_linenum, 'readability/braces', 5,
+                  'Brace starting function body must be placed on its own line')
+        else:
+            func_start_linenum = end_linenum + 1
+            while not clean_lines.lines[func_start_linenum] == '{':
+                if not Match(r'^(?:\s*\b(?:FUNC_ATTR|REAL_FATTR)_\w+\b(?:\(\d+(, \d+)*\))?)+$',
+                             clean_lines.lines[func_start_linenum]):
+                    if clean_lines.lines[func_start_linenum].endswith('{'):
+                        error(filename, func_start_linenum,
+                              'readability/braces', 5,
+                              'Brace starting function body must be placed '
+                              'after the function signature')
+                    break
+                else:
+                    func_start_linenum += 1
 
     # An else clause should be on the same line as the preceding closing brace.
     # If there is no preceding closing brace, there should be one.
@@ -2976,9 +3026,10 @@ def CheckIncludeLine(filename, clean_lines, linenum, include_state, error):
         include = match.group(2)
         is_system = (match.group(1) == '<')
         if include in include_state:
-            error(filename, linenum, 'build/include', 4,
-                  '"%s" already included at %s:%s' %
-                  (include, filename, include_state[include]))
+            if is_system or not include.endswith('.c.h'):
+                error(filename, linenum, 'build/include', 4,
+                      '"%s" already included at %s:%s' %
+                      (include, filename, include_state[include]))
         else:
             include_state[include] = linenum
 
@@ -3115,11 +3166,20 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension,
     # Check if some verboten C functions are being used.
     if Search(r'\bsprintf\b', line):
         error(filename, linenum, 'runtime/printf', 5,
-              'Never use sprintf.  Use snprintf instead.')
-    match = Search(r'\b(strcpy|strcat)\b', line)
+              'Use snprintf instead of sprintf.')
+    match = Search(r'\b(strncpy|STRNCPY)\b', line)
+    if match:
+        error(filename, linenum, 'runtime/printf', 4,
+              'Use xstrlcpy or snprintf instead of %s (unless this is from Vim)'
+              % match.group(1))
+    match = Search(r'\b(strcpy)\b', line)
+    if match:
+        error(filename, linenum, 'runtime/printf', 4,
+              'Use xstrlcpy or snprintf instead of %s' % match.group(1))
+    match = Search(r'\b(STRNCAT|strncat|strcat|vim_strcat)\b', line)
     if match:
         error(filename, linenum, 'runtime/printf', 4,
-              'Almost always, snprintf is better than %s' % match.group(1))
+              'Use xstrlcat or snprintf instead of %s' % match.group(1))
 
     # Check for suspicious usage of "if" like
     # } if (a == b) {
@@ -3383,8 +3443,9 @@ def ProcessFile(filename, vlevel, extra_check_functions=[]):
     # When reading from stdin, the extension is unknown, so no cpplint tests
     # should rely on the extension.
     if filename != '-' and file_extension not in _valid_extensions:
-        sys.stderr.write('Ignoring %s; not a valid file name '
-                         '(%s)\n' % (filename, ', '.join(_valid_extensions)))
+        sys.stderr.write('Ignoring {}; only linting {} files\n'.format(
+                filename,
+                ', '.join('.{}'.format(ext) for ext in _valid_extensions)))
     else:
         ProcessFileData(filename, file_extension, lines, Error,
                         extra_check_functions)
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 172643091a..5a658691ce 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -1,6 +1,3 @@
-include(CheckLibraryExists)
-include(CheckCCompilerFlag)
-
 option(USE_GCOV "Enable gcov support" OFF)
 
 if(NOT CLANG_TSAN)
@@ -14,31 +11,37 @@ endif()
 endif()
 
 set(GENERATED_DIR ${PROJECT_BINARY_DIR}/src/nvim/auto)
-set(DISPATCH_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/msgpack-gen.lua)
+set(DISPATCH_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/gendispatch.lua)
 file(GLOB API_HEADERS api/*.h)
 file(GLOB MSGPACK_RPC_HEADERS msgpack_rpc/*.h)
-set(MSGPACK_DISPATCH ${GENERATED_DIR}/msgpack_dispatch.c)
+set(API_METADATA ${PROJECT_BINARY_DIR}/api_metadata.mpack)
+set(FUNCS_DATA ${PROJECT_BINARY_DIR}/funcs_data.mpack)
 set(HEADER_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/gendeclarations.lua)
 set(GENERATED_INCLUDES_DIR ${PROJECT_BINARY_DIR}/include)
+set(GENERATED_API_DISPATCH ${GENERATED_DIR}/api/private/dispatch_wrappers.generated.h)
+set(GENERATED_FUNCS_METADATA ${GENERATED_DIR}/api/private/funcs_metadata.generated.h)
 set(GENERATED_EX_CMDS_ENUM ${GENERATED_INCLUDES_DIR}/ex_cmds_enum.generated.h)
 set(GENERATED_EX_CMDS_DEFS ${GENERATED_DIR}/ex_cmds_defs.generated.h)
+set(GENERATED_FUNCS_HASH_INPUT ${GENERATED_DIR}/funcs.generated.h.gperf)
+set(GENERATED_FUNCS ${GENERATED_DIR}/funcs.generated.h)
 set(GENERATED_EVENTS_ENUM ${GENERATED_INCLUDES_DIR}/auevents_enum.generated.h)
 set(GENERATED_EVENTS_NAMES_MAP ${GENERATED_DIR}/auevents_name_map.generated.h)
 set(GENERATED_OPTIONS ${GENERATED_DIR}/options.generated.h)
 set(EX_CMDS_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genex_cmds.lua)
+set(FUNCS_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/geneval.lua)
 set(EVENTS_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/gen_events.lua)
 set(OPTIONS_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genoptions.lua)
 set(EVENTS_LIST_FILE ${PROJECT_SOURCE_DIR}/src/nvim/auevents.lua)
 set(EX_CMDS_DEFS_FILE ${PROJECT_SOURCE_DIR}/src/nvim/ex_cmds.lua)
+set(EVAL_DEFS_FILE ${PROJECT_SOURCE_DIR}/src/nvim/eval.lua)
 set(OPTIONS_LIST_FILE ${PROJECT_SOURCE_DIR}/src/nvim/options.lua)
 set(UNICODE_TABLES_GENERATOR ${PROJECT_SOURCE_DIR}/scripts/genunicodetables.lua)
 set(UNICODE_DIR ${PROJECT_SOURCE_DIR}/unicode)
-set(UNICODEDATA_FILE ${UNICODE_DIR}/UnicodeData.txt)
-set(CASEFOLDING_FILE ${UNICODE_DIR}/CaseFolding.txt)
-set(EASTASIANWIDTH_FILE ${UNICODE_DIR}/EastAsianWidth.txt)
+file(GLOB UNICODE_FILES ${UNICODE_DIR}/*.txt)
 set(GENERATED_UNICODE_TABLES ${GENERATED_DIR}/unicode_tables.generated.h)
 
 include_directories(${GENERATED_DIR})
+include_directories(${CACHED_GENERATED_DIR})
 include_directories(${GENERATED_INCLUDES_DIR})
 
 file(MAKE_DIRECTORY ${GENERATED_DIR})
@@ -55,6 +58,10 @@ foreach(subdir
         event
         eval
        )
+  if(${subdir} MATCHES "tui" AND NOT FEAT_TUI)
+    continue()
+  endif()
+
   file(MAKE_DIRECTORY ${GENERATED_DIR}/${subdir})
   file(MAKE_DIRECTORY ${GENERATED_INCLUDES_DIR}/${subdir})
   file(GLOB sources ${subdir}/*.c)
@@ -74,11 +81,14 @@ foreach(sfile ${NEOVIM_SOURCES})
   if(${f} MATCHES "^(regexp_nfa.c)$")
     list(APPEND to_remove ${sfile})
   endif()
+  if(WIN32 AND ${f} MATCHES "^(pty_process_unix.c)$")
+    list(APPEND to_remove ${sfile})
+  endif()
 endforeach()
 
 list(REMOVE_ITEM NEOVIM_SOURCES ${to_remove})
 
-# Handle legacy files that don't yet pass -Wconversion.
+# Legacy files that do not yet pass -Wconversion.
 set(CONV_SOURCES
   buffer.c
   diff.c
@@ -91,7 +101,6 @@ set(CONV_SOURCES
   mbyte.c
   memline.c
   message.c
-  ops.c
   regexp.c
   screen.c
   search.c
@@ -109,6 +118,15 @@ endforeach()
 if(NOT MSVC)
   set_source_files_properties(
     ${CONV_SOURCES} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion")
+  # gperf generates ANSI-C with incorrect linkage, ignore it.
+  check_c_compiler_flag(-Wno-static-in-inline HAS_WNO_STATIC_IN_INLINE_FLAG)
+  if(HAS_WNO_STATIC_IN_INLINE_FLAG)
+    set_source_files_properties(
+      eval.c PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-static-in-inline -Wno-conversion")
+  else()
+    set_source_files_properties(
+      eval.c PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-conversion")
+  endif()
 endif()
 
 if(DEFINED MIN_LOG_LEVEL)
@@ -135,9 +153,13 @@ separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${bu
 set(gen_cflags ${gen_cflags} ${C_FLAGS_${build_type}_ARRAY} ${C_FLAGS_ARRAY})
 
 foreach(sfile ${NEOVIM_SOURCES}
-              "${PROJECT_SOURCE_DIR}/src/nvim/regexp_nfa.c")
+              "${PROJECT_SOURCE_DIR}/src/nvim/regexp_nfa.c"
+              ${GENERATED_API_DISPATCH})
   get_filename_component(full_d ${sfile} PATH)
   file(RELATIVE_PATH d "${PROJECT_SOURCE_DIR}/src/nvim" "${full_d}")
+  if(${d} MATCHES "^([.][.]|auto/)")
+    file(RELATIVE_PATH d "${GENERATED_DIR}" "${full_d}")
+  endif()
   get_filename_component(f ${sfile} NAME)
   get_filename_component(r ${sfile} NAME_WE)
   if(NOT ${d} EQUAL ".")
@@ -169,28 +191,28 @@ endforeach()
 
 add_custom_command(OUTPUT ${GENERATED_UNICODE_TABLES}
   COMMAND ${LUA_PRG} ${UNICODE_TABLES_GENERATOR}
-                     ${UNICODEDATA_FILE}
-                     ${CASEFOLDING_FILE}
-                     ${EASTASIANWIDTH_FILE}
+                     ${UNICODE_DIR}
                      ${GENERATED_UNICODE_TABLES}
   DEPENDS
     ${UNICODE_TABLES_GENERATOR}
-    ${UNICODEDATA_FILE}
-    ${CASEFOLDING_FILE}
-    ${EASTASIANWIDTH_FILE}
+    ${UNICODE_FILES}
 )
 
-add_custom_command(OUTPUT ${MSGPACK_DISPATCH}
-  COMMAND ${LUA_PRG} ${DISPATCH_GENERATOR} ${API_HEADERS} ${MSGPACK_DISPATCH}
+add_custom_command(OUTPUT ${GENERATED_API_DISPATCH} ${GENERATED_FUNCS_METADATA}
+                          ${API_METADATA}
+  COMMAND ${LUA_PRG} ${DISPATCH_GENERATOR} ${CMAKE_CURRENT_LIST_DIR}
+                     ${API_HEADERS} ${GENERATED_API_DISPATCH}
+                     ${GENERATED_FUNCS_METADATA} ${API_METADATA}
   DEPENDS
     ${API_HEADERS}
     ${MSGPACK_RPC_HEADERS}
     ${DISPATCH_GENERATOR}
+    ${CMAKE_CURRENT_LIST_DIR}/api/dispatch_deprecated.lua
 )
 
 list(APPEND NEOVIM_GENERATED_SOURCES
   "${PROJECT_BINARY_DIR}/config/auto/pathdef.c"
-  "${MSGPACK_DISPATCH}"
+  "${GENERATED_API_DISPATCH}"
   "${GENERATED_EX_CMDS_ENUM}"
   "${GENERATED_EX_CMDS_DEFS}"
   "${GENERATED_EVENTS_ENUM}"
@@ -205,6 +227,19 @@ add_custom_command(OUTPUT ${GENERATED_EX_CMDS_ENUM} ${GENERATED_EX_CMDS_DEFS}
   DEPENDS ${EX_CMDS_GENERATOR} ${EX_CMDS_DEFS_FILE}
 )
 
+if(NOT GPERF_PRG)
+  message(FATAL_ERROR "gperf was not found.")
+endif()
+add_custom_command(OUTPUT ${GENERATED_FUNCS} ${FUNCS_DATA}
+  COMMAND ${LUA_PRG} ${FUNCS_GENERATOR}
+  ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_DIR} ${API_METADATA} ${FUNCS_DATA}
+  COMMAND ${GPERF_PRG}
+    ${GENERATED_FUNCS_HASH_INPUT} --output-file=${GENERATED_FUNCS}
+    DEPENDS ${FUNCS_GENERATOR} ${EVAL_DEFS_FILE} ${API_METADATA}
+)
+list(APPEND NEOVIM_GENERATED_SOURCES
+  "${GENERATED_FUNCS}")
+
 add_custom_command(OUTPUT ${GENERATED_EVENTS_ENUM} ${GENERATED_EVENTS_NAMES_MAP}
   COMMAND ${LUA_PRG} ${EVENTS_GENERATOR}
       ${PROJECT_SOURCE_DIR}/src/nvim ${GENERATED_EVENTS_ENUM} ${GENERATED_EVENTS_NAMES_MAP}
@@ -256,6 +291,43 @@ add_executable(nvim ${NEOVIM_GENERATED_SOURCES} ${NEOVIM_SOURCES}
 target_link_libraries(nvim ${NVIM_EXEC_LINK_LIBRARIES})
 install_helper(TARGETS nvim)
 
+if(WIN32)
+  # Copy DLLs and third-party tools to bin/ and install them along with nvim
+  add_custom_target(nvim_runtime_deps ALL
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps/
+      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+  install(DIRECTORY ${PROJECT_BINARY_DIR}/windows_runtime_deps/
+    DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+  foreach(BIN win32yank.exe)
+    unset(BIN_PATH CACHE)
+    find_program(BIN_PATH ${BIN})
+    if(NOT BIN_PATH)
+      message(FATAL_ERROR "Unable to find external dependency ${BIN}")
+    endif()
+
+    add_custom_target(external_${BIN}
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps
+      COMMAND ${CMAKE_COMMAND}
+        "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+        -DBINARY="${BIN_PATH}"
+        -DDST=${PROJECT_BINARY_DIR}/windows_runtime_deps
+        -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake
+      COMMAND ${CMAKE_COMMAND} -E copy ${BIN_PATH} ${PROJECT_BINARY_DIR}/windows_runtime_deps/
+      COMMENT "${BIN_PATH}")
+    add_dependencies(nvim_runtime_deps "external_${BIN}")
+  endforeach()
+
+  add_custom_target(nvim_dll_deps DEPENDS nvim
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/windows_runtime_deps
+    COMMAND ${CMAKE_COMMAND}
+      "-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}"
+      -DBINARY="${PROJECT_BINARY_DIR}/bin/nvim${CMAKE_EXECUTABLE_SUFFIX}"
+      -DDST=${PROJECT_BINARY_DIR}/windows_runtime_deps
+      -P ${PROJECT_SOURCE_DIR}/cmake/WindowsDllCopy.cmake)
+  add_dependencies(nvim_runtime_deps nvim_dll_deps)
+endif()
+
 if(CLANG_ASAN_UBSAN)
   message(STATUS "Enabling Clang address sanitizer and undefined behavior sanitizer for nvim.")
   check_c_compiler_flag(-fno-sanitize-recover=all SANITIZE_RECOVER_ALL)
@@ -265,7 +337,7 @@ if(CLANG_ASAN_UBSAN)
     set(SANITIZE_RECOVER -fno-sanitize-recover)         # Clang 3.5-
   endif()
   set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ")
-  set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/.asan-blacklist")
+  set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "${SANITIZE_RECOVER} -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address -fsanitize=undefined -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/src/.asan-blacklist")
   set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=address -fsanitize=undefined ")
 elseif(CLANG_MSAN)
   message(STATUS "Enabling Clang memory sanitizer for nvim.")
@@ -276,6 +348,7 @@ elseif(CLANG_TSAN)
   message(STATUS "Enabling Clang thread sanitizer for nvim.")
   set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-DEXITFREE ")
   set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-fsanitize=thread ")
+  set_property(TARGET nvim APPEND_STRING PROPERTY COMPILE_FLAGS "-fPIE ")
   set_property(TARGET nvim APPEND_STRING PROPERTY LINK_FLAGS "-fsanitize=thread ")
 endif()
 
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 55b535c78c..eaaae943d2 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -14,7 +14,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/mark.h"
 #include "nvim/fileio.h"
@@ -29,10 +28,10 @@
 
 /// Gets the buffer line count
 ///
-/// @param buffer The buffer handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The line count
-Integer buffer_line_count(Buffer buffer, Error *err)
+/// @param buffer   Buffer handle
+/// @param[out] err Error details, if any
+/// @return Line count
+Integer nvim_buf_line_count(Buffer buffer, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -45,22 +44,22 @@ Integer buffer_line_count(Buffer buffer, Error *err)
 
 /// Gets a buffer line
 ///
-/// @deprecated use buffer_get_lines instead.
+/// @deprecated use nvim_buf_get_lines instead.
 ///             for positive indices (including 0) use
-///                 "buffer_get_lines(buffer, index, index+1, true)"
+///                 "nvim_buf_get_lines(buffer, index, index+1, true)"
 ///             for negative indices use
-///                 "buffer_get_lines(buffer, index-1, index, true)"
+///                 "nvim_buf_get_lines(buffer, index-1, index, true)"
 ///
-/// @param buffer The buffer handle
-/// @param index The line index
-/// @param[out] err Details of an error that may have occurred
-/// @return The line string
+/// @param buffer   Buffer handle
+/// @param index    Line index
+/// @param[out] err Error details, if any
+/// @return Line string
 String buffer_get_line(Buffer buffer, Integer index, Error *err)
 {
   String rv = { .size = 0 };
 
   index = convert_index(index);
-  Array slice = buffer_get_lines(buffer, index, index+1, true, err);
+  Array slice = nvim_buf_get_lines(0, buffer, index, index+1, true, err);
 
   if (!err->set && slice.size) {
     rv = slice.items[0].data.string;
@@ -73,64 +72,64 @@ String buffer_get_line(Buffer buffer, Integer index, Error *err)
 
 /// Sets a buffer line
 ///
-/// @deprecated use buffer_set_lines instead.
+/// @deprecated use nvim_buf_set_lines instead.
 ///             for positive indices use
-///                 "buffer_set_lines(buffer, index, index+1, true, [line])"
+///                 "nvim_buf_set_lines(buffer, index, index+1, true, [line])"
 ///             for negative indices use
-///                 "buffer_set_lines(buffer, index-1, index, true, [line])"
+///                 "nvim_buf_set_lines(buffer, index-1, index, true, [line])"
 ///
-/// @param buffer The buffer handle
-/// @param index The line index
-/// @param line The new line.
-/// @param[out] err Details of an error that may have occurred
+/// @param buffer   Buffer handle
+/// @param index    Line index
+/// @param line     Contents of the new line
+/// @param[out] err Error details, if any
 void buffer_set_line(Buffer buffer, Integer index, String line, Error *err)
 {
   Object l = STRING_OBJ(line);
   Array array = { .items = &l, .size = 1 };
   index = convert_index(index);
-  buffer_set_lines(buffer, index, index+1, true,  array, err);
+  nvim_buf_set_lines(0, buffer, index, index+1, true,  array, err);
 }
 
 /// Deletes a buffer line
 ///
-/// @deprecated use buffer_set_lines instead.
+/// @deprecated use nvim_buf_set_lines instead.
 ///             for positive indices use
-///                 "buffer_set_lines(buffer, index, index+1, true, [])"
+///                 "nvim_buf_set_lines(buffer, index, index+1, true, [])"
 ///             for negative indices use
-///                 "buffer_set_lines(buffer, index-1, index, true, [])"
-/// @param buffer The buffer handle
-/// @param index The line index
-/// @param[out] err Details of an error that may have occurred
+///                 "nvim_buf_set_lines(buffer, index-1, index, true, [])"
+/// @param buffer   buffer handle
+/// @param index    line index
+/// @param[out] err Error details, if any
 void buffer_del_line(Buffer buffer, Integer index, Error *err)
 {
   Array array = ARRAY_DICT_INIT;
   index = convert_index(index);
-  buffer_set_lines(buffer, index, index+1, true, array, err);
+  nvim_buf_set_lines(0, buffer, index, index+1, true, array, err);
 }
 
 /// Retrieves a line range from the buffer
 ///
-/// @deprecated use buffer_get_lines(buffer, newstart, newend, false)
+/// @deprecated use nvim_buf_get_lines(buffer, newstart, newend, false)
 ///             where newstart = start + int(not include_start) - int(start < 0)
 ///                   newend = end + int(include_end) - int(end < 0)
 ///                   int(bool) = 1 if bool is true else 0
-/// @param buffer The buffer handle
-/// @param start The first line index
-/// @param end The last line index
-/// @param include_start True if the slice includes the `start` parameter
-/// @param include_end True if the slice includes the `end` parameter
-/// @param[out] err Details of an error that may have occurred
-/// @return An array of lines
+/// @param buffer         Buffer handle
+/// @param start          First line index
+/// @param end            Last line index
+/// @param include_start  True if the slice includes the `start` parameter
+/// @param include_end    True if the slice includes the `end` parameter
+/// @param[out] err       Error details, if any
+/// @return Array of lines
 ArrayOf(String) buffer_get_line_slice(Buffer buffer,
-                                 Integer start,
-                                 Integer end,
-                                 Boolean include_start,
-                                 Boolean include_end,
-                                 Error *err)
+                                      Integer start,
+                                      Integer end,
+                                      Boolean include_start,
+                                      Boolean include_end,
+                                      Error *err)
 {
   start = convert_index(start) + !include_start;
   end = convert_index(end) + include_end;
-  return buffer_get_lines(buffer, start , end, false, err);
+  return nvim_buf_get_lines(0, buffer, start , end, false, err);
 }
 
 
@@ -143,17 +142,18 @@ ArrayOf(String) buffer_get_line_slice(Buffer buffer,
 /// Out-of-bounds indices are clamped to the nearest valid value, unless
 /// `strict_indexing` is set.
 ///
-/// @param buffer The buffer handle
-/// @param start The first line index
-/// @param end The last line index (exclusive)
-/// @param strict_indexing whether out-of-bounds should be an error.
-/// @param[out] err Details of an error that may have occurred
-/// @return An array of lines
-ArrayOf(String) buffer_get_lines(Buffer buffer,
-                                 Integer start,
-                                 Integer end,
-                                 Boolean strict_indexing,
-                                 Error *err)
+/// @param buffer           Buffer handle
+/// @param start            First line index
+/// @param end              Last line index (exclusive)
+/// @param strict_indexing  Whether out-of-bounds should be an error.
+/// @param[out] err         Error details, if any
+/// @return Array of lines
+ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
+                                   Buffer buffer,
+                                   Integer start,
+                                   Integer end,
+                                   Boolean strict_indexing,
+                                   Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   buf_T *buf = find_buffer_by_handle(buffer, err);
@@ -191,7 +191,9 @@ ArrayOf(String) buffer_get_lines(Buffer buffer,
     Object str = STRING_OBJ(cstr_to_string(bufstr));
 
     // Vim represents NULs as NLs, but this may confuse clients.
-    strchrsub(str.data.string.data, '\n', '\0');
+    if (channel_id != INTERNAL_CALL) {
+      strchrsub(str.data.string.data, '\n', '\0');
+    }
 
     rv.items[i] = str;
   }
@@ -212,30 +214,30 @@ end:
 
 /// Replaces a line range on the buffer
 ///
-/// @deprecated use buffer_set_lines(buffer, newstart, newend, false, lines)
+/// @deprecated use nvim_buf_set_lines(buffer, newstart, newend, false, lines)
 ///             where newstart = start + int(not include_start) + int(start < 0)
 ///                   newend = end + int(include_end) + int(end < 0)
 ///                   int(bool) = 1 if bool is true else 0
 ///
-/// @param buffer The buffer handle
-/// @param start The first line index
-/// @param end The last line index
-/// @param include_start True if the slice includes the `start` parameter
-/// @param include_end True if the slice includes the `end` parameter
-/// @param replacement An array of lines to use as replacement(A 0-length
-//         array will simply delete the line range)
-/// @param[out] err Details of an error that may have occurred
+/// @param buffer         Buffer handle
+/// @param start          First line index
+/// @param end            Last line index
+/// @param include_start  True if the slice includes the `start` parameter
+/// @param include_end    True if the slice includes the `end` parameter
+/// @param replacement    Array of lines to use as replacement (0-length
+//                        array will delete the line range)
+/// @param[out] err       Error details, if any
 void buffer_set_line_slice(Buffer buffer,
-                      Integer start,
-                      Integer end,
-                      Boolean include_start,
-                      Boolean include_end,
-                      ArrayOf(String) replacement,
-                      Error *err)
+                           Integer start,
+                           Integer end,
+                           Boolean include_start,
+                           Boolean include_end,
+                           ArrayOf(String) replacement,  // NOLINT
+                           Error *err)
 {
   start = convert_index(start) + !include_start;
   end = convert_index(end) + include_end;
-  buffer_set_lines(buffer, start, end, false, replacement, err);
+  nvim_buf_set_lines(0, buffer, start, end, false, replacement, err);
 }
 
 
@@ -251,18 +253,19 @@ void buffer_set_line_slice(Buffer buffer,
 /// Out-of-bounds indices are clamped to the nearest valid value, unless
 /// `strict_indexing` is set.
 ///
-/// @param buffer The buffer handle
-/// @param start The first line index
-/// @param end The last line index (exclusive)
-/// @param strict_indexing whether out-of-bounds should be an error.
-/// @param replacement An array of lines to use as replacement
-/// @param[out] err Details of an error that may have occurred
-void buffer_set_lines(Buffer buffer,
-                      Integer start,
-                      Integer end,
-                      Boolean strict_indexing,
-                      ArrayOf(String) replacement,
-                      Error *err)
+/// @param buffer           Buffer handle
+/// @param start            First line index
+/// @param end              Last line index (exclusive)
+/// @param strict_indexing  Whether out-of-bounds should be an error.
+/// @param replacement      Array of lines to use as replacement
+/// @param[out] err         Error details, if any
+void nvim_buf_set_lines(uint64_t channel_id,
+                        Buffer buffer,
+                        Integer start,
+                        Integer end,
+                        Boolean strict_indexing,
+                        ArrayOf(String) replacement,  // NOLINT
+                        Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -309,7 +312,7 @@ void buffer_set_lines(Buffer buffer,
     // line and convert NULs to newlines to avoid truncation.
     lines[i] = xmallocz(l.size);
     for (size_t j = 0; j < l.size; j++) {
-      if (l.data[j] == '\n') {
+      if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
         api_set_error(err, Exception, _("string cannot contain newlines"));
         new_len = i + 1;
         goto end;
@@ -408,11 +411,11 @@ end:
 
 /// Gets a buffer-scoped (b:) variable.
 ///
-/// @param buffer The buffer handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The variable value
-Object buffer_get_var(Buffer buffer, String name, Error *err)
+/// @param buffer     Buffer handle
+/// @param name       Variable name
+/// @param[out] err   Error details, if any
+/// @return Variable value
+Object nvim_buf_get_var(Buffer buffer, String name, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -425,11 +428,46 @@ Object buffer_get_var(Buffer buffer, String name, Error *err)
 
 /// Sets a buffer-scoped (b:) variable
 ///
-/// @param buffer The buffer handle
-/// @param name The variable name
-/// @param value The variable value
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @param buffer     Buffer handle
+/// @param name       Variable name
+/// @param value      Variable value
+/// @param[out] err   Error details, if any
+void nvim_buf_set_var(Buffer buffer, String name, Object value, Error *err)
+{
+  buf_T *buf = find_buffer_by_handle(buffer, err);
+
+  if (!buf) {
+    return;
+  }
+
+  dict_set_value(buf->b_vars, name, value, false, false, err);
+}
+
+/// Removes a buffer-scoped (b:) variable
+///
+/// @param buffer     Buffer handle
+/// @param name       Variable name
+/// @param[out] err   Error details, if any
+void nvim_buf_del_var(Buffer buffer, String name, Error *err)
+{
+  buf_T *buf = find_buffer_by_handle(buffer, err);
+
+  if (!buf) {
+    return;
+  }
+
+  dict_set_value(buf->b_vars, name, NIL, true, false, err);
+}
+
+/// Sets a buffer-scoped (b:) variable
+///
+/// @deprecated
+///
+/// @param buffer     Buffer handle
+/// @param name       Variable name
+/// @param value      Variable value
+/// @param[out] err   Error details, if any
+/// @return Old value or nil if there was no previous value.
 ///
 ///         @warning It may return nil if there was no previous value
 ///                  or if previous value was `v:null`.
@@ -441,18 +479,17 @@ Object buffer_set_var(Buffer buffer, String name, Object value, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(buf->b_vars, name, value, false, err);
+  return dict_set_value(buf->b_vars, name, value, false, true, err);
 }
 
 /// Removes a buffer-scoped (b:) variable
 ///
-/// @param buffer The buffer handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @deprecated
 ///
-///         @warning It may return nil if there was no previous value
-///                  or if previous value was `v:null`.
+/// @param buffer     Buffer handle
+/// @param name       Variable name
+/// @param[out] err   Error details, if any
+/// @return Old value
 Object buffer_del_var(Buffer buffer, String name, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
@@ -461,16 +498,17 @@ Object buffer_del_var(Buffer buffer, String name, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(buf->b_vars, name, NIL, true, err);
+  return dict_set_value(buf->b_vars, name, NIL, true, true, err);
 }
 
+
 /// Gets a buffer option value
 ///
-/// @param buffer The buffer handle
-/// @param name The option name
-/// @param[out] err Details of an error that may have occurred
-/// @return The option value
-Object buffer_get_option(Buffer buffer, String name, Error *err)
+/// @param buffer     Buffer handle
+/// @param name       Option name
+/// @param[out] err   Error details, if any
+/// @return Option value
+Object nvim_buf_get_option(Buffer buffer, String name, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -481,14 +519,14 @@ Object buffer_get_option(Buffer buffer, String name, Error *err)
   return get_option_from(buf, SREQ_BUF, name, err);
 }
 
-/// Sets a buffer option value. Passing 'nil' as value deletes the option(only
+/// Sets a buffer option value. Passing 'nil' as value deletes the option (only
 /// works if there's a global fallback)
 ///
-/// @param buffer The buffer handle
-/// @param name The option name
-/// @param value The option value
-/// @param[out] err Details of an error that may have occurred
-void buffer_set_option(Buffer buffer, String name, Object value, Error *err)
+/// @param buffer     Buffer handle
+/// @param name       Option name
+/// @param value      Option value
+/// @param[out] err   Error details, if any
+void nvim_buf_set_option(Buffer buffer, String name, Object value, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -501,10 +539,10 @@ void buffer_set_option(Buffer buffer, String name, Object value, Error *err)
 
 /// Gets the buffer number
 ///
-/// @param buffer The buffer handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The buffer number
-Integer buffer_get_number(Buffer buffer, Error *err)
+/// @param buffer     Buffer handle
+/// @param[out] err   Error details, if any
+/// @return Buffer number
+Integer nvim_buf_get_number(Buffer buffer, Error *err)
 {
   Integer rv = 0;
   buf_T *buf = find_buffer_by_handle(buffer, err);
@@ -518,10 +556,10 @@ Integer buffer_get_number(Buffer buffer, Error *err)
 
 /// Gets the full file name for the buffer
 ///
-/// @param buffer The buffer handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The buffer name
-String buffer_get_name(Buffer buffer, Error *err)
+/// @param buffer     Buffer handle
+/// @param[out] err   Error details, if any
+/// @return Buffer name
+String nvim_buf_get_name(Buffer buffer, Error *err)
 {
   String rv = STRING_INIT;
   buf_T *buf = find_buffer_by_handle(buffer, err);
@@ -535,10 +573,10 @@ String buffer_get_name(Buffer buffer, Error *err)
 
 /// Sets the full file name for a buffer
 ///
-/// @param buffer The buffer handle
-/// @param name The buffer name
-/// @param[out] err Details of an error that may have occurred
-void buffer_set_name(Buffer buffer, String name, Error *err)
+/// @param buffer     Buffer handle
+/// @param name       Buffer name
+/// @param[out] err   Error details, if any
+void nvim_buf_set_name(Buffer buffer, String name, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -565,9 +603,9 @@ void buffer_set_name(Buffer buffer, String name, Error *err)
 
 /// Checks if a buffer is valid
 ///
-/// @param buffer The buffer handle
+/// @param buffer Buffer handle
 /// @return true if the buffer is valid, false otherwise
-Boolean buffer_is_valid(Buffer buffer)
+Boolean nvim_buf_is_valid(Buffer buffer)
 {
   Error stub = ERROR_INIT;
   return find_buffer_by_handle(buffer, &stub) != NULL;
@@ -575,13 +613,13 @@ Boolean buffer_is_valid(Buffer buffer)
 
 /// Inserts a sequence of lines to a buffer at a certain index
 ///
-/// @deprecated use buffer_set_lines(buffer, lnum, lnum, true, lines)
+/// @deprecated use nvim_buf_set_lines(buffer, lnum, lnum, true, lines)
 ///
-/// @param buffer The buffer handle
-/// @param lnum Insert the lines after `lnum`. If negative, it will append
-///        to the end of the buffer.
-/// @param lines An array of lines
-/// @param[out] err Details of an error that may have occurred
+/// @param buffer     Buffer handle
+/// @param lnum       Insert the lines after `lnum`. If negative, appends to
+///                   the end of the buffer.
+/// @param lines      Array of lines
+/// @param[out] err   Error details, if any
 void buffer_insert(Buffer buffer,
                    Integer lnum,
                    ArrayOf(String) lines,
@@ -589,16 +627,16 @@ void buffer_insert(Buffer buffer,
 {
   // "lnum" will be the index of the line after inserting,
   // no matter if it is negative or not
-  buffer_set_lines(buffer, lnum, lnum, true, lines, err);
+  nvim_buf_set_lines(0, buffer, lnum, lnum, true, lines, err);
 }
 
 /// Return a tuple (row,col) representing the position of the named mark
 ///
-/// @param buffer The buffer handle
-/// @param name The mark's name
-/// @param[out] err Details of an error that may have occurred
-/// @return The (row, col) tuple
-ArrayOf(Integer, 2) buffer_get_mark(Buffer buffer, String name, Error *err)
+/// @param buffer     Buffer handle
+/// @param name       Mark name
+/// @param[out] err   Error details, if any
+/// @return (row, col) tuple
+ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   buf_T *buf = find_buffer_by_handle(buffer, err);
@@ -648,7 +686,7 @@ ArrayOf(Integer, 2) buffer_get_mark(Buffer buffer, String name, Error *err)
 /// called with src_id = 0, an unique source id is generated and returned.
 /// Succesive calls can pass in it as "src_id" to add new highlights to the same
 /// source group. All highlights in the same group can then be cleared with
-/// buffer_clear_highlight. If the highlight never will be manually deleted
+/// nvim_buf_clear_highlight. If the highlight never will be manually deleted
 /// pass in -1 for "src_id".
 ///
 /// If "hl_group" is the empty string no highlight is added, but a new src_id
@@ -656,23 +694,23 @@ ArrayOf(Integer, 2) buffer_get_mark(Buffer buffer, String name, Error *err)
 /// request an unique src_id at initialization, and later asynchronously add and
 /// clear highlights in response to buffer changes.
 ///
-/// @param buffer The buffer handle
-/// @param src_id Source group to use or 0 to use a new group,
-///               or -1 for ungrouped highlight
-/// @param hl_group Name of the highlight group to use
-/// @param line The line to highlight
-/// @param col_start Start of range of columns to highlight
-/// @param col_end End of range of columns to highlight,
-///                or -1 to highlight to end of line
-/// @param[out] err Details of an error that may have occurred
+/// @param buffer     Buffer handle
+/// @param src_id     Source group to use or 0 to use a new group,
+///                   or -1 for ungrouped highlight
+/// @param hl_group   Name of the highlight group to use
+/// @param line       Line to highlight
+/// @param col_start  Start of range of columns to highlight
+/// @param col_end    End of range of columns to highlight,
+///                   or -1 to highlight to end of line
+/// @param[out] err   Error details, if any
 /// @return The src_id that was used
-Integer buffer_add_highlight(Buffer buffer,
-                             Integer src_id,
-                             String hl_group,
-                             Integer line,
-                             Integer col_start,
-                             Integer col_end,
-                             Error *err)
+Integer nvim_buf_add_highlight(Buffer buffer,
+                               Integer src_id,
+                               String hl_group,
+                               Integer line,
+                               Integer col_start,
+                               Integer col_end,
+                               Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
   if (!buf) {
@@ -691,7 +729,7 @@ Integer buffer_add_highlight(Buffer buffer,
     col_end = MAXCOL;
   }
 
-  int hlg_id = syn_name2id((char_u*)hl_group.data);
+  int hlg_id = syn_name2id((char_u *)(hl_group.data ? hl_group.data : ""));
   src_id = bufhl_add_hl(buf, (int)src_id, hlg_id, (linenr_T)line+1,
                         (colnr_T)col_start+1, (colnr_T)col_end);
   return src_id;
@@ -702,17 +740,17 @@ Integer buffer_add_highlight(Buffer buffer,
 /// To clear a source group in the entire buffer, pass in 1 and -1 to
 /// line_start and line_end respectively.
 ///
-/// @param buffer The buffer handle
-/// @param src_id Highlight source group to clear, or -1 to clear all groups.
+/// @param buffer     Buffer handle
+/// @param src_id     Highlight source group to clear, or -1 to clear all.
 /// @param line_start Start of range of lines to clear
-/// @param line_end End of range of lines to clear (exclusive)
-///                 or -1 to clear to end of file.
-/// @param[out] err Details of an error that may have occurred
-void buffer_clear_highlight(Buffer buffer,
-                            Integer src_id,
-                            Integer line_start,
-                            Integer line_end,
-                            Error *err)
+/// @param line_end   End of range of lines to clear (exclusive) or -1 to clear
+///                   to end of file.
+/// @param[out] err   Error details, if any
+void nvim_buf_clear_highlight(Buffer buffer,
+                              Integer src_id,
+                              Integer line_start,
+                              Integer line_end,
+                              Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
   if (!buf) {
diff --git a/src/nvim/api/dispatch_deprecated.lua b/src/nvim/api/dispatch_deprecated.lua
new file mode 100644
index 0000000000..5650a77ac0
--- /dev/null
+++ b/src/nvim/api/dispatch_deprecated.lua
@@ -0,0 +1,69 @@
+local deprecated_aliases = {
+  nvim_buf_add_highlight="buffer_add_highlight",
+  nvim_buf_clear_highlight="buffer_clear_highlight",
+  nvim_buf_get_lines="buffer_get_lines",
+  nvim_buf_get_mark="buffer_get_mark",
+  nvim_buf_get_name="buffer_get_name",
+  nvim_buf_get_number="buffer_get_number",
+  nvim_buf_get_option="buffer_get_option",
+  nvim_buf_get_var="buffer_get_var",
+  nvim_buf_is_valid="buffer_is_valid",
+  nvim_buf_line_count="buffer_line_count",
+  nvim_buf_set_lines="buffer_set_lines",
+  nvim_buf_set_name="buffer_set_name",
+  nvim_buf_set_option="buffer_set_option",
+  nvim_call_function="vim_call_function",
+  nvim_command="vim_command",
+  nvim_command_output="vim_command_output",
+  nvim_del_current_line="vim_del_current_line",
+  nvim_err_write="vim_err_write",
+  nvim_err_writeln="vim_report_error",
+  nvim_eval="vim_eval",
+  nvim_feedkeys="vim_feedkeys",
+  nvim_get_api_info="vim_get_api_info",
+  nvim_get_color_by_name="vim_name_to_color",
+  nvim_get_color_map="vim_get_color_map",
+  nvim_get_current_buf="vim_get_current_buffer",
+  nvim_get_current_line="vim_get_current_line",
+  nvim_get_current_tabpage="vim_get_current_tabpage",
+  nvim_get_current_win="vim_get_current_window",
+  nvim_get_option="vim_get_option",
+  nvim_get_var="vim_get_var",
+  nvim_get_vvar="vim_get_vvar",
+  nvim_input="vim_input",
+  nvim_list_bufs="vim_get_buffers",
+  nvim_list_runtime_paths="vim_list_runtime_paths",
+  nvim_list_tabpages="vim_get_tabpages",
+  nvim_list_wins="vim_get_windows",
+  nvim_out_write="vim_out_write",
+  nvim_replace_termcodes="vim_replace_termcodes",
+  nvim_set_current_buf="vim_set_current_buffer",
+  nvim_set_current_dir="vim_change_directory",
+  nvim_set_current_line="vim_set_current_line",
+  nvim_set_current_tabpage="vim_set_current_tabpage",
+  nvim_set_current_win="vim_set_current_window",
+  nvim_set_option="vim_set_option",
+  nvim_strwidth="vim_strwidth",
+  nvim_subscribe="vim_subscribe",
+  nvim_tabpage_get_var="tabpage_get_var",
+  nvim_tabpage_get_win="tabpage_get_window",
+  nvim_tabpage_is_valid="tabpage_is_valid",
+  nvim_tabpage_list_wins="tabpage_get_windows",
+  nvim_ui_detach="ui_detach",
+  nvim_ui_try_resize="ui_try_resize",
+  nvim_unsubscribe="vim_unsubscribe",
+  nvim_win_get_buf="window_get_buffer",
+  nvim_win_get_cursor="window_get_cursor",
+  nvim_win_get_height="window_get_height",
+  nvim_win_get_option="window_get_option",
+  nvim_win_get_position="window_get_position",
+  nvim_win_get_tabpage="window_get_tabpage",
+  nvim_win_get_var="window_get_var",
+  nvim_win_get_width="window_get_width",
+  nvim_win_is_valid="window_is_valid",
+  nvim_win_set_cursor="window_set_cursor",
+  nvim_win_set_height="window_set_height",
+  nvim_win_set_option="window_set_option",
+  nvim_win_set_width="window_set_width",
+}
+return deprecated_aliases
diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index fbfa87d5ae..223aab09dc 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -9,13 +9,15 @@
 #define STRING_INIT {.data = NULL, .size = 0}
 #define OBJECT_INIT { .type = kObjectTypeNil }
 #define ERROR_INIT { .set = false }
-#define REMOTE_TYPE(type) typedef uint64_t type
+#define REMOTE_TYPE(type) typedef handle_T type
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-  #define ArrayOf(...) Array
-  #define DictionaryOf(...) Dictionary
+# define ArrayOf(...) Array
+# define DictionaryOf(...) Dictionary
 #endif
 
+typedef int handle_T;
+
 // Basic types
 typedef enum {
   kErrorTypeException,
@@ -31,6 +33,9 @@ typedef enum {
 /// Used as the message ID of notifications.
 #define NO_RESPONSE UINT64_MAX
 
+/// Used as channel_id when the call is local.
+#define INTERNAL_CALL UINT64_MAX
+
 typedef struct {
   ErrorType type;
   char msg[1024];
@@ -41,6 +46,12 @@ typedef bool Boolean;
 typedef int64_t Integer;
 typedef double Float;
 
+/// Maximum value of an Integer
+#define API_INTEGER_MAX INT64_MAX
+
+/// Minimum value of an Integer
+#define API_INTEGER_MIN INT64_MIN
+
 typedef struct {
   char *data;
   size_t size;
@@ -80,9 +91,6 @@ typedef enum {
 struct object {
   ObjectType type;
   union {
-    Buffer buffer;
-    Window window;
-    Tabpage tabpage;
     Boolean boolean;
     Integer integer;
     Float floating;
diff --git a/src/nvim/api/private/dispatch.c b/src/nvim/api/private/dispatch.c
new file mode 100644
index 0000000000..9b3bcc380a
--- /dev/null
+++ b/src/nvim/api/private/dispatch.c
@@ -0,0 +1,45 @@
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <assert.h>
+#include <msgpack.h>
+
+#include "nvim/map.h"
+#include "nvim/log.h"
+#include "nvim/vim.h"
+#include "nvim/msgpack_rpc/helpers.h"
+#include "nvim/api/private/dispatch.h"
+#include "nvim/api/private/helpers.h"
+#include "nvim/api/private/defs.h"
+
+#include "nvim/api/buffer.h"
+#include "nvim/api/tabpage.h"
+#include "nvim/api/ui.h"
+#include "nvim/api/vim.h"
+#include "nvim/api/window.h"
+
+static Map(String, MsgpackRpcRequestHandler) *methods = NULL;
+
+static void msgpack_rpc_add_method_handler(String method,
+                                           MsgpackRpcRequestHandler handler)
+{
+  map_put(String, MsgpackRpcRequestHandler)(methods, method, handler);
+}
+
+MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
+                                                     size_t name_len)
+{
+  String m = { .data = (char *)name, .size = name_len };
+  MsgpackRpcRequestHandler rv =
+    map_get(String, MsgpackRpcRequestHandler)(methods, m);
+
+  if (!rv.fn) {
+    rv.fn = msgpack_rpc_handle_missing_method;
+  }
+
+  return rv;
+}
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+#include "api/private/dispatch_wrappers.generated.h"
+#endif
diff --git a/src/nvim/api/private/dispatch.h b/src/nvim/api/private/dispatch.h
new file mode 100644
index 0000000000..39aabd708a
--- /dev/null
+++ b/src/nvim/api/private/dispatch.h
@@ -0,0 +1,23 @@
+#ifndef NVIM_API_PRIVATE_DISPATCH_H
+#define NVIM_API_PRIVATE_DISPATCH_H
+
+#include "nvim/api/private/defs.h"
+
+typedef Object (*ApiDispatchWrapper)(uint64_t channel_id,
+                                     Array args,
+                                     Error *error);
+
+/// The rpc_method_handlers table, used in msgpack_rpc_dispatch(), stores
+/// functions of this type.
+typedef struct {
+  ApiDispatchWrapper fn;
+  bool async;  // function is always safe to run immediately instead of being
+               // put in a request queue for handling when nvim waits for input.
+} MsgpackRpcRequestHandler;
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "api/private/dispatch.h.generated.h"
+# include "api/private/dispatch_wrappers.h.generated.h"
+#endif
+
+#endif  // NVIM_API_PRIVATE_DISPATCH_H
diff --git a/src/nvim/api/private/handle.c b/src/nvim/api/private/handle.c
index abbda95073..acb0fb332a 100644
--- a/src/nvim/api/private/handle.c
+++ b/src/nvim/api/private/handle.c
@@ -5,30 +5,26 @@
 #include "nvim/map.h"
 #include "nvim/api/private/handle.h"
 
-#define HANDLE_INIT(name) name##_handles = pmap_new(uint64_t)()
+#define HANDLE_INIT(name) name##_handles = pmap_new(handle_T)()
 
-#define HANDLE_IMPL(type, name)                                               \
-  static PMap(uint64_t) *name##_handles = NULL;                               \
-                                                                              \
-  type *handle_get_##name(uint64_t handle)                                    \
-  {                                                                           \
-    return pmap_get(uint64_t)(name##_handles, handle);                        \
-  }                                                                           \
-                                                                              \
-  void handle_register_##name(type *name)                                     \
-  {                                                                           \
-    assert(!name->handle);                                                    \
-    name->handle = next_handle++;                                             \
-    pmap_put(uint64_t)(name##_handles, name->handle, name);                   \
-  }                                                                           \
-                                                                              \
-  void handle_unregister_##name(type *name)                                   \
-  {                                                                           \
-    pmap_del(uint64_t)(name##_handles, name->handle);                         \
+#define HANDLE_IMPL(type, name) \
+  static PMap(handle_T) *name##_handles = NULL; /* NOLINT */ \
+  \
+  type *handle_get_##name(handle_T handle) \
+  { \
+    return pmap_get(handle_T)(name##_handles, handle); \
+  } \
+  \
+  void handle_register_##name(type *name) \
+  { \
+    pmap_put(handle_T)(name##_handles, name->handle, name); \
+  } \
+  \
+  void handle_unregister_##name(type *name) \
+  { \
+    pmap_del(handle_T)(name##_handles, name->handle); \
   }
 
-static uint64_t next_handle = 1;
-
 HANDLE_IMPL(buf_T, buffer)
 HANDLE_IMPL(win_T, window)
 HANDLE_IMPL(tabpage_T, tabpage)
diff --git a/src/nvim/api/private/handle.h b/src/nvim/api/private/handle.h
index 1a196f6797..30bbfbee1b 100644
--- a/src/nvim/api/private/handle.h
+++ b/src/nvim/api/private/handle.h
@@ -3,10 +3,11 @@
 
 #include "nvim/vim.h"
 #include "nvim/buffer_defs.h"
+#include "nvim/api/private/defs.h"
 
-#define HANDLE_DECLS(type, name)                                              \
-  type *handle_get_##name(uint64_t handle);                                   \
-  void handle_register_##name(type *name);                                    \
+#define HANDLE_DECLS(type, name) \
+  type *handle_get_##name(handle_T handle); \
+  void handle_register_##name(type *name); \
   void handle_unregister_##name(type *name);
 
 HANDLE_DECLS(buf_T, buffer)
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index db3e499427..7daa4d7207 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -7,6 +7,7 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/handle.h"
+#include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
@@ -17,9 +18,17 @@
 #include "nvim/map.h"
 #include "nvim/option.h"
 #include "nvim/option_defs.h"
+#include "nvim/version.h"
+#include "nvim/lib/kvec.h"
+
+/// Helper structure for vim_to_object
+typedef struct {
+  kvec_t(Object) stack;  ///< Object stack.
+} EncodedData;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "api/private/helpers.c.generated.h"
+# include "api/private/funcs_metadata.generated.h"
 #endif
 
 /// Start block that may cause vimscript exceptions
@@ -97,10 +106,11 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
 /// @param value The new value
 /// @param del Delete key in place of setting it. Argument `value` is ignored in
 ///            this case.
+/// @param retval If true the old value will be converted and returned.
 /// @param[out] err Details of an error that may have occurred
-/// @return the old value, if any
+/// @return The old value if `retval` is true and the key was present, else NIL
 Object dict_set_value(dict_T *dict, String key, Object value, bool del,
-                      Error *err)
+                      bool retval, Error *err)
 {
   Object rv = OBJECT_INIT;
 
@@ -128,7 +138,9 @@ Object dict_set_value(dict_T *dict, String key, Object value, bool del,
       api_set_error(err, Validation, _("Key \"%s\" doesn't exist"), key.data);
     } else {
       // Return the old value
-      rv = vim_to_object(&di->di_tv);
+      if (retval) {
+        rv = vim_to_object(&di->di_tv);
+      }
       // Delete the entry
       hashitem_T *hi = hash_find(&dict->dv_hashtab, di->di_key);
       hash_remove(&dict->dv_hashtab, hi);
@@ -149,7 +161,9 @@ Object dict_set_value(dict_T *dict, String key, Object value, bool del,
       dict_add(dict, di);
     } else {
       // Return the old value
-      rv = vim_to_object(&di->di_tv);
+      if (retval) {
+        rv = vim_to_object(&di->di_tv);
+      }
       clear_tv(&di->di_tv);
     }
 
@@ -310,6 +324,201 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
   }
 }
 
+#define TYPVAL_ENCODE_ALLOW_SPECIALS false
+
+#define TYPVAL_ENCODE_CONV_NIL(tv) \
+    kv_push(edata->stack, NIL)
+
+#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
+    kv_push(edata->stack, BOOLEAN_OBJ((Boolean)(num)))
+
+#define TYPVAL_ENCODE_CONV_NUMBER(tv, num) \
+    kv_push(edata->stack, INTEGER_OBJ((Integer)(num)))
+
+#define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER TYPVAL_ENCODE_CONV_NUMBER
+
+#define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
+    kv_push(edata->stack, FLOATING_OBJ((Float)(flt)))
+
+#define TYPVAL_ENCODE_CONV_STRING(tv, str, len) \
+    do { \
+      const size_t len_ = (size_t)(len); \
+      const char *const str_ = (const char *)(str); \
+      assert(len_ == 0 || str_ != NULL); \
+      kv_push(edata->stack, STRING_OBJ(((String) { \
+        .data = xmemdupz((len_?str_:""), len_), \
+        .size = len_ \
+      }))); \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_STR_STRING TYPVAL_ENCODE_CONV_STRING
+
+#define TYPVAL_ENCODE_CONV_EXT_STRING(tv, str, len, type) \
+    TYPVAL_ENCODE_CONV_NIL(tv)
+
+#define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \
+    do { \
+      TYPVAL_ENCODE_CONV_NIL(tv); \
+      goto typval_encode_stop_converting_one_item; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv, len)
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, len)
+#define TYPVAL_ENCODE_CONV_FUNC_END(tv)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \
+    kv_push(edata->stack, ARRAY_OBJ(((Array) { .capacity = 0, .size = 0 })))
+
+#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
+    kv_push(edata->stack, \
+            DICTIONARY_OBJ(((Dictionary) { .capacity = 0, .size = 0 })))
+
+static inline void typval_encode_list_start(EncodedData *const edata,
+                                            const size_t len)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  kv_push(edata->stack, ARRAY_OBJ(((Array) {
+    .capacity = len,
+    .size = 0,
+    .items = xmalloc(len * sizeof(*((Object *)NULL)->data.array.items)),
+  })));
+}
+
+#define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \
+    typval_encode_list_start(edata, (size_t)(len))
+
+#define TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START(tv, mpsv)
+
+static inline void typval_encode_between_list_items(EncodedData *const edata)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  Object item = kv_pop(edata->stack);
+  Object *const list = &kv_last(edata->stack);
+  assert(list->type == kObjectTypeArray);
+  assert(list->data.array.size < list->data.array.capacity);
+  list->data.array.items[list->data.array.size++] = item;
+}
+
+#define TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(tv) \
+    typval_encode_between_list_items(edata)
+
+static inline void typval_encode_list_end(EncodedData *const edata)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  typval_encode_between_list_items(edata);
+#ifndef NDEBUG
+  const Object *const list = &kv_last(edata->stack);
+  assert(list->data.array.size == list->data.array.capacity);
+#endif
+}
+
+#define TYPVAL_ENCODE_CONV_LIST_END(tv) \
+    typval_encode_list_end(edata)
+
+static inline void typval_encode_dict_start(EncodedData *const edata,
+                                            const size_t len)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  kv_push(edata->stack, DICTIONARY_OBJ(((Dictionary) {
+    .capacity = len,
+    .size = 0,
+    .items = xmalloc(len * sizeof(*((Object *)NULL)->data.dictionary.items)),
+  })));
+}
+
+#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len) \
+    typval_encode_dict_start(edata, (size_t)(len))
+
+#define TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, dict, mpsv)
+
+#define TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(label, kv_pair)
+
+static inline void typval_encode_after_key(EncodedData *const edata)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  Object key = kv_pop(edata->stack);
+  Object *const dict = &kv_last(edata->stack);
+  assert(dict->type == kObjectTypeDictionary);
+  assert(dict->data.dictionary.size < dict->data.dictionary.capacity);
+  if (key.type == kObjectTypeString) {
+    dict->data.dictionary.items[dict->data.dictionary.size].key
+        = key.data.string;
+  } else {
+    api_free_object(key);
+    dict->data.dictionary.items[dict->data.dictionary.size].key
+        = STATIC_CSTR_TO_STRING("__INVALID_KEY__");
+  }
+}
+
+#define TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(tv, dict) \
+    typval_encode_after_key(edata)
+
+static inline void typval_encode_between_dict_items(EncodedData *const edata)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  Object val = kv_pop(edata->stack);
+  Object *const dict = &kv_last(edata->stack);
+  assert(dict->type == kObjectTypeDictionary);
+  assert(dict->data.dictionary.size < dict->data.dictionary.capacity);
+  dict->data.dictionary.items[dict->data.dictionary.size++].value = val;
+}
+
+#define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(tv, dict) \
+    typval_encode_between_dict_items(edata)
+
+static inline void typval_encode_dict_end(EncodedData *const edata)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  typval_encode_between_dict_items(edata);
+#ifndef NDEBUG
+  const Object *const dict = &kv_last(edata->stack);
+  assert(dict->data.dictionary.size == dict->data.dictionary.capacity);
+#endif
+}
+
+#define TYPVAL_ENCODE_CONV_DICT_END(tv, dict) \
+    typval_encode_dict_end(edata)
+
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \
+    TYPVAL_ENCODE_CONV_NIL()
+
+#define TYPVAL_ENCODE_SCOPE static
+#define TYPVAL_ENCODE_NAME object
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE EncodedData *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME edata
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
+
+#undef TYPVAL_ENCODE_CONV_STRING
+#undef TYPVAL_ENCODE_CONV_STR_STRING
+#undef TYPVAL_ENCODE_CONV_EXT_STRING
+#undef TYPVAL_ENCODE_CONV_NUMBER
+#undef TYPVAL_ENCODE_CONV_FLOAT
+#undef TYPVAL_ENCODE_CONV_FUNC_START
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF
+#undef TYPVAL_ENCODE_CONV_FUNC_END
+#undef TYPVAL_ENCODE_CONV_EMPTY_LIST
+#undef TYPVAL_ENCODE_CONV_LIST_START
+#undef TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START
+#undef TYPVAL_ENCODE_CONV_EMPTY_DICT
+#undef TYPVAL_ENCODE_CONV_NIL
+#undef TYPVAL_ENCODE_CONV_BOOL
+#undef TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+#undef TYPVAL_ENCODE_CONV_DICT_START
+#undef TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START
+#undef TYPVAL_ENCODE_CONV_DICT_END
+#undef TYPVAL_ENCODE_CONV_DICT_AFTER_KEY
+#undef TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+#undef TYPVAL_ENCODE_CONV_LIST_END
+#undef TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_CONV_RECURSE
+#undef TYPVAL_ENCODE_ALLOW_SPECIALS
+
 /// Convert a vim object to an `Object` instance, recursively expanding
 /// Arrays/Dictionaries.
 ///
@@ -317,17 +526,23 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 /// @return The converted value
 Object vim_to_object(typval_T *obj)
 {
-  Object rv;
-  // We use a lookup table to break out of cyclic references
-  PMap(ptr_t) *lookup = pmap_new(ptr_t)();
-  rv = vim_to_object_rec(obj, lookup);
-  // Free the table
-  pmap_free(ptr_t)(lookup);
-  return rv;
+  EncodedData edata = { .stack = KV_INITIAL_VALUE };
+  const int evo_ret = encode_vim_to_object(&edata, obj,
+                                           "vim_to_object argument");
+  (void)evo_ret;
+  assert(evo_ret == OK);
+  Object ret = kv_A(edata.stack, 0);
+  assert(kv_size(edata.stack) == 1);
+  kv_destroy(edata.stack);
+  return ret;
 }
 
 buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
 {
+  if (buffer == 0) {
+    return curbuf;
+  }
+
   buf_T *rv = handle_get_buffer(buffer);
 
   if (!rv) {
@@ -339,6 +554,10 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
 
 win_T * find_window_by_handle(Window window, Error *err)
 {
+  if (window == 0) {
+    return curwin;
+  }
+
   win_T *rv = handle_get_window(window);
 
   if (!rv) {
@@ -350,6 +569,10 @@ win_T * find_window_by_handle(Window window, Error *err)
 
 tabpage_T * find_tab_by_handle(Tabpage tabpage, Error *err)
 {
+  if (tabpage == 0) {
+    return curtab;
+  }
+
   tabpage_T *rv = handle_get_tabpage(tabpage);
 
   if (!rv) {
@@ -393,10 +616,16 @@ String cstr_as_string(char *str) FUNC_ATTR_PURE
   return (String) {.data = str, .size = strlen(str)};
 }
 
+/// Converts from type Object to a VimL value.
+///
+/// @param obj  Object to convert from.
+/// @param tv   Conversion result is placed here. On failure member v_type is
+///             set to VAR_UNKNOWN (no allocation was made for this variable).
+/// returns     true if conversion is successful, otherwise false.
 bool object_to_vim(Object obj, typval_T *tv, Error *err)
 {
   tv->v_type = VAR_UNKNOWN;
-  tv->v_lock = 0;
+  tv->v_lock = VAR_UNLOCKED;
 
   switch (obj.type) {
     case kObjectTypeNil:
@@ -413,13 +642,14 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
     case kObjectTypeWindow:
     case kObjectTypeTabpage:
     case kObjectTypeInteger:
-      if (obj.data.integer > INT_MAX || obj.data.integer < INT_MIN) {
+      if (obj.data.integer > VARNUMBER_MAX
+          || obj.data.integer < VARNUMBER_MIN) {
         api_set_error(err, Validation, _("Integer value outside range"));
         return false;
       }
 
       tv->v_type = VAR_NUMBER;
-      tv->vval.v_number = (int)obj.data.integer;
+      tv->vval.v_number = (varnumber_T)obj.data.integer;
       break;
 
     case kObjectTypeFloat:
@@ -437,9 +667,8 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
       }
       break;
 
-    case kObjectTypeArray:
-      tv->v_type = VAR_LIST;
-      tv->vval.v_list = list_alloc();
+    case kObjectTypeArray: {
+      list_T *list = list_alloc();
 
       for (uint32_t i = 0; i < obj.data.array.size; i++) {
         Object item = obj.data.array.items[i];
@@ -448,45 +677,51 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
         if (!object_to_vim(item, &li->li_tv, err)) {
           // cleanup
           listitem_free(li);
-          list_free(tv->vval.v_list, true);
+          list_free(list);
           return false;
         }
 
-        list_append(tv->vval.v_list, li);
+        list_append(list, li);
       }
-      tv->vval.v_list->lv_refcount++;
+      list->lv_refcount++;
+
+      tv->v_type = VAR_LIST;
+      tv->vval.v_list = list;
       break;
+    }
 
-    case kObjectTypeDictionary:
-      tv->v_type = VAR_DICT;
-      tv->vval.v_dict = dict_alloc();
+    case kObjectTypeDictionary: {
+      dict_T *dict = dict_alloc();
 
       for (uint32_t i = 0; i < obj.data.dictionary.size; i++) {
         KeyValuePair item = obj.data.dictionary.items[i];
         String key = item.key;
 
         if (key.size == 0) {
-          api_set_error(err,
-                        Validation,
+          api_set_error(err, Validation,
                         _("Empty dictionary keys aren't allowed"));
           // cleanup
-          dict_free(tv->vval.v_dict, true);
+          dict_free(dict);
           return false;
         }
 
-        dictitem_T *di = dictitem_alloc((uint8_t *) key.data);
+        dictitem_T *di = dictitem_alloc((uint8_t *)key.data);
 
         if (!object_to_vim(item.value, &di->di_tv, err)) {
           // cleanup
           dictitem_free(di);
-          dict_free(tv->vval.v_dict, true);
+          dict_free(dict);
           return false;
         }
 
-        dict_add(tv->vval.v_dict, di);
+        dict_add(dict, di);
       }
-      tv->vval.v_dict->dv_refcount++;
+      dict->dv_refcount++;
+
+      tv->v_type = VAR_DICT;
+      tv->vval.v_dict = dict;
       break;
+    }
     default:
       abort();
   }
@@ -556,7 +791,8 @@ Dictionary api_metadata(void)
   static Dictionary metadata = ARRAY_DICT_INIT;
 
   if (!metadata.size) {
-    msgpack_rpc_init_function_metadata(&metadata);
+    PUT(metadata, "version", DICTIONARY_OBJ(version_dict()));
+    init_function_metadata(&metadata);
     init_error_type_metadata(&metadata);
     init_type_metadata(&metadata);
   }
@@ -564,6 +800,22 @@ Dictionary api_metadata(void)
   return copy_object(DICTIONARY_OBJ(metadata)).data.dictionary;
 }
 
+static void init_function_metadata(Dictionary *metadata)
+{
+  msgpack_unpacked unpacked;
+  msgpack_unpacked_init(&unpacked);
+  if (msgpack_unpack_next(&unpacked,
+                          (const char *)funcs_metadata,
+                          sizeof(funcs_metadata),
+                          NULL) != MSGPACK_UNPACK_SUCCESS) {
+    abort();
+  }
+  Object functions;
+  msgpack_rpc_to_object(&unpacked.data, &functions);
+  msgpack_unpacked_destroy(&unpacked);
+  PUT(*metadata, "functions", functions);
+}
+
 static void init_error_type_metadata(Dictionary *metadata)
 {
   Dictionary types = ARRAY_DICT_INIT;
@@ -579,18 +831,22 @@ static void init_error_type_metadata(Dictionary *metadata)
 
   PUT(*metadata, "error_types", DICTIONARY_OBJ(types));
 }
+
 static void init_type_metadata(Dictionary *metadata)
 {
   Dictionary types = ARRAY_DICT_INIT;
 
   Dictionary buffer_metadata = ARRAY_DICT_INIT;
   PUT(buffer_metadata, "id", INTEGER_OBJ(kObjectTypeBuffer));
+  PUT(buffer_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_buf_")));
 
   Dictionary window_metadata = ARRAY_DICT_INIT;
   PUT(window_metadata, "id", INTEGER_OBJ(kObjectTypeWindow));
+  PUT(window_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_win_")));
 
   Dictionary tabpage_metadata = ARRAY_DICT_INIT;
   PUT(tabpage_metadata, "id", INTEGER_OBJ(kObjectTypeTabpage));
+  PUT(tabpage_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_tabpage_")));
 
   PUT(types, "Buffer", DICTIONARY_OBJ(buffer_metadata));
   PUT(types, "Window", DICTIONARY_OBJ(window_metadata));
@@ -633,131 +889,6 @@ Object copy_object(Object obj)
   }
 }
 
-/// Recursion helper for the `vim_to_object`. This uses a pointer table
-/// to avoid infinite recursion due to cyclic references
-///
-/// @param obj The source object
-/// @param lookup Lookup table containing pointers to all processed objects
-/// @return The converted value
-static Object vim_to_object_rec(typval_T *obj, PMap(ptr_t) *lookup)
-{
-  Object rv = OBJECT_INIT;
-
-  if (obj->v_type == VAR_LIST || obj->v_type == VAR_DICT) {
-    // Container object, add it to the lookup table
-    if (pmap_has(ptr_t)(lookup, obj)) {
-      // It's already present, meaning we alredy processed it so just return
-      // nil instead.
-      return rv;
-    }
-    pmap_put(ptr_t)(lookup, obj, NULL);
-  }
-
-  switch (obj->v_type) {
-    case VAR_SPECIAL:
-      switch (obj->vval.v_special) {
-        case kSpecialVarTrue:
-        case kSpecialVarFalse: {
-          rv.type = kObjectTypeBoolean;
-          rv.data.boolean = (obj->vval.v_special == kSpecialVarTrue);
-          break;
-        }
-        case kSpecialVarNull: {
-          rv.type = kObjectTypeNil;
-          break;
-        }
-      }
-      break;
-
-    case VAR_STRING:
-      rv.type = kObjectTypeString;
-      rv.data.string = cstr_to_string((char *) obj->vval.v_string);
-      break;
-
-    case VAR_NUMBER:
-      rv.type = kObjectTypeInteger;
-      rv.data.integer = obj->vval.v_number;
-      break;
-
-    case VAR_FLOAT:
-      rv.type = kObjectTypeFloat;
-      rv.data.floating = obj->vval.v_float;
-      break;
-
-    case VAR_LIST:
-      {
-        list_T *list = obj->vval.v_list;
-        listitem_T *item;
-
-        if (list != NULL) {
-          rv.type = kObjectTypeArray;
-          assert(list->lv_len >= 0);
-          rv.data.array.size = (size_t)list->lv_len;
-          rv.data.array.items = xmalloc(rv.data.array.size * sizeof(Object));
-
-          uint32_t i = 0;
-          for (item = list->lv_first; item != NULL; item = item->li_next) {
-            rv.data.array.items[i] = vim_to_object_rec(&item->li_tv, lookup);
-            i++;
-          }
-        }
-      }
-      break;
-
-    case VAR_DICT:
-      {
-        dict_T *dict = obj->vval.v_dict;
-        hashtab_T *ht;
-        uint64_t todo;
-        hashitem_T *hi;
-        dictitem_T *di;
-
-        if (dict != NULL) {
-          ht = &obj->vval.v_dict->dv_hashtab;
-          todo = ht->ht_used;
-          rv.type = kObjectTypeDictionary;
-
-          // Count items
-          rv.data.dictionary.size = 0;
-          for (hi = ht->ht_array; todo > 0; ++hi) {
-            if (!HASHITEM_EMPTY(hi)) {
-              todo--;
-              rv.data.dictionary.size++;
-            }
-          }
-
-          rv.data.dictionary.items =
-            xmalloc(rv.data.dictionary.size * sizeof(KeyValuePair));
-          todo = ht->ht_used;
-          uint32_t i = 0;
-
-          // Convert all
-          for (hi = ht->ht_array; todo > 0; ++hi) {
-            if (!HASHITEM_EMPTY(hi)) {
-              di = dict_lookup(hi);
-              // Convert key
-              rv.data.dictionary.items[i].key =
-                cstr_to_string((char *) hi->hi_key);
-              // Convert value
-              rv.data.dictionary.items[i].value =
-                vim_to_object_rec(&di->di_tv, lookup);
-              todo--;
-              i++;
-            }
-          }
-        }
-      }
-      break;
-
-    case VAR_UNKNOWN:
-    case VAR_FUNC:
-      break;
-  }
-
-  return rv;
-}
-
-
 static void set_option_value_for(char *key,
                                  int numval,
                                  char *stringval,
diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index a0f14ac7a4..9fe8c351cf 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -8,69 +8,70 @@
 #include "nvim/memory.h"
 #include "nvim/lib/kvec.h"
 
-#define api_set_error(err, errtype, ...)             \
-  do {                                               \
-    snprintf((err)->msg,                             \
-             sizeof((err)->msg),                     \
-             __VA_ARGS__);                           \
-    (err)->set = true;                               \
-    (err)->type = kErrorType##errtype;               \
+#define api_set_error(err, errtype, ...) \
+  do { \
+    snprintf((err)->msg, \
+             sizeof((err)->msg), \
+             __VA_ARGS__); \
+    (err)->set = true; \
+    (err)->type = kErrorType##errtype; \
   } while (0)
 
 #define OBJECT_OBJ(o) o
 
-#define BOOLEAN_OBJ(b) ((Object) {                                            \
-  .type = kObjectTypeBoolean,                                                 \
-  .data.boolean = b                                                           \
-  })
-
-#define INTEGER_OBJ(i) ((Object) {                                            \
-  .type = kObjectTypeInteger,                                                 \
-  .data.integer = i                                                           \
-  })
-
-#define STRING_OBJ(s) ((Object) {                                             \
-  .type = kObjectTypeString,                                                  \
-  .data.string = s                                                            \
-  })
-
-#define BUFFER_OBJ(s) ((Object) {                                             \
-  .type = kObjectTypeBuffer,                                                  \
-  .data.buffer = s                                                            \
-  })
-
-#define WINDOW_OBJ(s) ((Object) {                                             \
-  .type = kObjectTypeWindow,                                                  \
-  .data.window = s                                                            \
-  })
-
-#define TABPAGE_OBJ(s) ((Object) {                                            \
-  .type = kObjectTypeTabpage,                                                 \
-  .data.tabpage = s                                                           \
-  })
-
-#define ARRAY_OBJ(a) ((Object) {                                              \
-  .type = kObjectTypeArray,                                                   \
-  .data.array = a                                                             \
-  })
-
-#define DICTIONARY_OBJ(d) ((Object) {                                         \
-  .type = kObjectTypeDictionary,                                              \
-  .data.dictionary = d                                                        \
-  })
+#define BOOLEAN_OBJ(b) ((Object) { \
+    .type = kObjectTypeBoolean, \
+    .data.boolean = b })
+
+#define INTEGER_OBJ(i) ((Object) { \
+    .type = kObjectTypeInteger, \
+    .data.integer = i })
+
+#define FLOATING_OBJ(f) ((Object) { \
+    .type = kObjectTypeFloat, \
+    .data.floating = f })
+
+#define STRING_OBJ(s) ((Object) { \
+    .type = kObjectTypeString, \
+    .data.string = s })
+
+#define BUFFER_OBJ(s) ((Object) { \
+    .type = kObjectTypeBuffer, \
+    .data.integer = s })
+
+#define WINDOW_OBJ(s) ((Object) { \
+    .type = kObjectTypeWindow, \
+    .data.integer = s })
+
+#define TABPAGE_OBJ(s) ((Object) { \
+    .type = kObjectTypeTabpage, \
+    .data.integer = s })
+
+#define ARRAY_OBJ(a) ((Object) { \
+    .type = kObjectTypeArray, \
+    .data.array = a })
+
+#define DICTIONARY_OBJ(d) ((Object) { \
+    .type = kObjectTypeDictionary, \
+    .data.dictionary = d })
 
 #define NIL ((Object) {.type = kObjectTypeNil})
 
-#define PUT(dict, k, v)                                                       \
-  kv_push(KeyValuePair,                                                       \
-          dict,                                                               \
-          ((KeyValuePair) {.key = cstr_to_string(k), .value = v}))
+#define PUT(dict, k, v) \
+  kv_push(dict, ((KeyValuePair) { .key = cstr_to_string(k), .value = v }))
 
-#define ADD(array, item)                                                      \
-  kv_push(Object, array, item)
+#define ADD(array, item) \
+  kv_push(array, item)
 
 #define STATIC_CSTR_AS_STRING(s) ((String) {.data = s, .size = sizeof(s) - 1})
 
+/// Create a new String instance, putting data in allocated memory
+///
+/// @param[in]  s  String to work with. Must be a string literal.
+#define STATIC_CSTR_TO_STRING(s) ((String){ \
+    .data = xmemdupz(s, sizeof(s) - 1), \
+    .size = sizeof(s) - 1 })
+
 // Helpers used by the generated msgpack-rpc api wrappers
 #define api_init_boolean
 #define api_init_integer
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index c8311b0aa0..9e61ec1871 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -11,10 +11,10 @@
 
 /// Gets the windows in a tabpage
 ///
-/// @param tabpage The tabpage
-/// @param[out] err Details of an error that may have occurred
-/// @return The windows in `tabpage`
-ArrayOf(Window) tabpage_get_windows(Tabpage tabpage, Error *err)
+/// @param tabpage  Tabpage
+/// @param[out] err Error details, if any
+/// @return List of windows in `tabpage`
+ArrayOf(Window) nvim_tabpage_list_wins(Tabpage tabpage, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
@@ -39,11 +39,11 @@ ArrayOf(Window) tabpage_get_windows(Tabpage tabpage, Error *err)
 
 /// Gets a tab-scoped (t:) variable
 ///
-/// @param tabpage The tab page handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The variable value
-Object tabpage_get_var(Tabpage tabpage, String name, Error *err)
+/// @param tabpage  Tabpage handle
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return Variable value
+Object nvim_tabpage_get_var(Tabpage tabpage, String name, Error *err)
 {
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
 
@@ -56,11 +56,49 @@ Object tabpage_get_var(Tabpage tabpage, String name, Error *err)
 
 /// Sets a tab-scoped (t:) variable
 ///
-/// @param tabpage handle
-/// @param name The variable name
-/// @param value The variable value
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @param tabpage  Tabpage handle
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+void nvim_tabpage_set_var(Tabpage tabpage,
+                          String name,
+                          Object value,
+                          Error *err)
+{
+  tabpage_T *tab = find_tab_by_handle(tabpage, err);
+
+  if (!tab) {
+    return;
+  }
+
+  dict_set_value(tab->tp_vars, name, value, false, false, err);
+}
+
+/// Removes a tab-scoped (t:) variable
+///
+/// @param tabpage  Tabpage handle
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+void nvim_tabpage_del_var(Tabpage tabpage, String name, Error *err)
+{
+  tabpage_T *tab = find_tab_by_handle(tabpage, err);
+
+  if (!tab) {
+    return;
+  }
+
+  dict_set_value(tab->tp_vars, name, NIL, true, false, err);
+}
+
+/// Sets a tab-scoped (t:) variable
+///
+/// @deprecated
+///
+/// @param tabpage  Tabpage handle
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+/// @return Old value or nil if there was no previous value.
 ///
 ///         @warning It may return nil if there was no previous value
 ///                  or if previous value was `v:null`.
@@ -72,18 +110,17 @@ Object tabpage_set_var(Tabpage tabpage, String name, Object value, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(tab->tp_vars, name, value, false, err);
+  return dict_set_value(tab->tp_vars, name, value, false, true, err);
 }
 
 /// Removes a tab-scoped (t:) variable
 ///
-/// @param tabpage handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @deprecated
 ///
-///         @warning It may return nil if there was no previous value
-///                  or if previous value was `v:null`.
+/// @param tabpage  Tabpage handle
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return Old value
 Object tabpage_del_var(Tabpage tabpage, String name, Error *err)
 {
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
@@ -92,15 +129,15 @@ Object tabpage_del_var(Tabpage tabpage, String name, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(tab->tp_vars, name, NIL, true, err);
+  return dict_set_value(tab->tp_vars, name, NIL, true, true, err);
 }
 
-/// Gets the current window in a tab page
+/// Gets the current window in a tabpage
 ///
-/// @param tabpage The tab page handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The Window handle
-Window tabpage_get_window(Tabpage tabpage, Error *err)
+/// @param tabpage  Tabpage handle
+/// @param[out] err Error details, if any
+/// @return Window handle
+Window nvim_tabpage_get_win(Tabpage tabpage, Error *err)
 {
   Window rv = 0;
   tabpage_T *tab = find_tab_by_handle(tabpage, err);
@@ -110,7 +147,7 @@ Window tabpage_get_window(Tabpage tabpage, Error *err)
   }
 
   if (tab == curtab) {
-    return vim_get_current_window();
+    return nvim_get_current_win();
   } else {
     FOR_ALL_WINDOWS_IN_TAB(wp, tab) {
       if (wp == tab->tp_curwin) {
@@ -122,11 +159,28 @@ Window tabpage_get_window(Tabpage tabpage, Error *err)
   }
 }
 
-/// Checks if a tab page is valid
+/// Gets the tabpage number
+///
+/// @param tabpage  Tabpage handle
+/// @param[out] err Error details, if any
+/// @return Tabpage number
+Integer nvim_tabpage_get_number(Tabpage tabpage, Error *err)
+{
+  Integer rv = 0;
+  tabpage_T *tab = find_tab_by_handle(tabpage, err);
+
+  if (!tab) {
+    return rv;
+  }
+
+  return tabpage_index(tab);
+}
+
+/// Checks if a tabpage is valid
 ///
-/// @param tabpage The tab page handle
-/// @return true if the tab page is valid, false otherwise
-Boolean tabpage_is_valid(Tabpage tabpage)
+/// @param tabpage Tabpage handle
+/// @return true if the tabpage is valid, false otherwise
+Boolean nvim_tabpage_is_valid(Tabpage tabpage)
 {
   Error stub = ERROR_INIT;
   return find_tab_by_handle(tabpage, &stub) != NULL;
diff --git a/src/nvim/msgpack_rpc/remote_ui.c b/src/nvim/api/ui.c
index 6ffcffe2e1..9178538110 100644
--- a/src/nvim/msgpack_rpc/remote_ui.c
+++ b/src/nvim/api/ui.c
@@ -7,13 +7,14 @@
 #include "nvim/ui.h"
 #include "nvim/memory.h"
 #include "nvim/map.h"
-#include "nvim/msgpack_rpc/remote_ui.h"
 #include "nvim/msgpack_rpc/channel.h"
+#include "nvim/api/ui.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
+#include "nvim/popupmnu.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "msgpack_rpc/remote_ui.c.generated.h"
+# include "api/ui.c.generated.h"
 #endif
 
 typedef struct {
@@ -24,21 +25,13 @@ typedef struct {
 static PMap(uint64_t) *connected_uis = NULL;
 
 void remote_ui_init(void)
+    FUNC_API_NOEXPORT
 {
   connected_uis = pmap_new(uint64_t)();
-  // Add handler for "attach_ui"
-  String method = cstr_as_string("ui_attach");
-  MsgpackRpcRequestHandler handler = {.fn = remote_ui_attach, .async = false};
-  msgpack_rpc_add_method_handler(method, handler);
-  method = cstr_as_string("ui_detach");
-  handler.fn = remote_ui_detach;
-  msgpack_rpc_add_method_handler(method, handler);
-  method = cstr_as_string("ui_try_resize");
-  handler.fn = remote_ui_try_resize;
-  msgpack_rpc_add_method_handler(method, handler);
 }
 
 void remote_ui_disconnect(uint64_t channel_id)
+    FUNC_API_NOEXPORT
 {
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
   if (!ui) {
@@ -49,35 +42,29 @@ void remote_ui_disconnect(uint64_t channel_id)
   api_free_array(data->buffer);
   pmap_del(uint64_t)(connected_uis, channel_id);
   xfree(ui->data);
-  ui_detach(ui);
+  ui_detach_impl(ui);
   xfree(ui);
 }
 
-static Object remote_ui_attach(uint64_t channel_id, uint64_t request_id,
-                               Array args, Error *error)
+void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
+                    Dictionary options, Error *err)
+    FUNC_API_NOEVAL
 {
   if (pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI already attached for channel"));
-    return NIL;
+    api_set_error(err, Exception, _("UI already attached for channel"));
+    return;
   }
 
-  if (args.size != 3 || args.items[0].type != kObjectTypeInteger
-      || args.items[1].type != kObjectTypeInteger
-      || args.items[2].type != kObjectTypeBoolean
-      || args.items[0].data.integer <= 0 || args.items[1].data.integer <= 0) {
-    api_set_error(error, Validation,
-                  _("Invalid arguments. Expected: "
-                    "(uint width > 0, uint height > 0, bool enable_rgb)"));
-    return NIL;
+  if (width <= 0 || height <= 0) {
+    api_set_error(err, Validation,
+                  _("Expected width > 0 and height > 0"));
+    return;
   }
-  UIData *data = xmalloc(sizeof(UIData));
-  data->channel_id = channel_id;
-  data->buffer = (Array)ARRAY_DICT_INIT;
   UI *ui = xcalloc(1, sizeof(UI));
-  ui->width = (int)args.items[0].data.integer;
-  ui->height = (int)args.items[1].data.integer;
-  ui->rgb = args.items[2].data.boolean;
-  ui->data = data;
+  ui->width = (int)width;
+  ui->height = (int)height;
+  ui->rgb = true;
+  ui->pum_external = false;
   ui->resize = remote_ui_resize;
   ui->clear = remote_ui_clear;
   ui->eol_clear = remote_ui_eol_clear;
@@ -101,45 +88,101 @@ static Object remote_ui_attach(uint64_t channel_id, uint64_t request_id,
   ui->suspend = remote_ui_suspend;
   ui->set_title = remote_ui_set_title;
   ui->set_icon = remote_ui_set_icon;
+  ui->event = remote_ui_event;
+
+  for (size_t i = 0; i < options.size; i++) {
+    ui_set_option(ui, options.items[i].key, options.items[i].value, err);
+    if (err->set) {
+      xfree(ui);
+      return;
+    }
+  }
+
+  UIData *data = xmalloc(sizeof(UIData));
+  data->channel_id = channel_id;
+  data->buffer = (Array)ARRAY_DICT_INIT;
+  ui->data = data;
+
   pmap_put(uint64_t)(connected_uis, channel_id, ui);
-  ui_attach(ui);
-  return NIL;
+  ui_attach_impl(ui);
+}
+
+/// @deprecated
+void ui_attach(uint64_t channel_id, Integer width, Integer height,
+               Boolean enable_rgb, Error *err)
+{
+  Dictionary opts = ARRAY_DICT_INIT;
+  PUT(opts, "rgb", BOOLEAN_OBJ(enable_rgb));
+  nvim_ui_attach(channel_id, width, height, opts, err);
+  api_free_dictionary(opts);
 }
 
-static Object remote_ui_detach(uint64_t channel_id, uint64_t request_id,
-                               Array args, Error *error)
+void nvim_ui_detach(uint64_t channel_id, Error *err)
+    FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI is not attached for channel"));
+    api_set_error(err, Exception, _("UI is not attached for channel"));
+    return;
   }
   remote_ui_disconnect(channel_id);
-
-  return NIL;
 }
 
-static Object remote_ui_try_resize(uint64_t channel_id, uint64_t request_id,
-                                   Array args, Error *error)
+
+void nvim_ui_try_resize(uint64_t channel_id, Integer width,
+                        Integer height, Error *err)
+    FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI is not attached for channel"));
+    api_set_error(err, Exception, _("UI is not attached for channel"));
+    return;
   }
 
-  if (args.size != 2 || args.items[0].type != kObjectTypeInteger
-      || args.items[1].type != kObjectTypeInteger
-      || args.items[0].data.integer <= 0 || args.items[1].data.integer <= 0) {
-    api_set_error(error, Validation,
-                  _("Invalid arguments. Expected: "
-                    "(uint width > 0, uint height > 0)"));
-    return NIL;
+  if (width <= 0 || height <= 0) {
+    api_set_error(err, Validation,
+                  _("Expected width > 0 and height > 0"));
+    return;
   }
 
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
-  ui->width = (int)args.items[0].data.integer;
-  ui->height = (int)args.items[1].data.integer;
+  ui->width = (int)width;
+  ui->height = (int)height;
   ui_refresh();
-  return NIL;
 }
 
+void nvim_ui_set_option(uint64_t channel_id, String name,
+                        Object value, Error *error)
+    FUNC_API_NOEVAL
+{
+  if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
+    api_set_error(error, Exception, _("UI is not attached for channel"));
+    return;
+  }
+  UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
+
+  ui_set_option(ui, name, value, error);
+  if (!error->set) {
+    ui_refresh();
+  }
+}
+
+static void ui_set_option(UI *ui, String name, Object value, Error *error) {
+  if (strcmp(name.data, "rgb") == 0) {
+    if (value.type != kObjectTypeBoolean) {
+      api_set_error(error, Validation, _("rgb must be a Boolean"));
+      return;
+    }
+    ui->rgb = value.data.boolean;
+  } else if (strcmp(name.data, "popupmenu_external") == 0) {
+    if (value.type != kObjectTypeBoolean) {
+      api_set_error(error, Validation,
+                    _("popupmenu_external must be a Boolean"));
+      return;
+    }
+    ui->pum_external = value.data.boolean;
+  } else {
+    api_set_error(error, Validation, _("No such ui option"));
+  }
+}
 
 static void push_call(UI *ui, char *name, Array args)
 {
@@ -228,6 +271,8 @@ static void remote_ui_mode_change(UI *ui, int mode)
     ADD(args, STRING_OBJ(cstr_to_string("insert")));
   } else if (mode == REPLACE) {
     ADD(args, STRING_OBJ(cstr_to_string("replace")));
+  } else if (mode == CMDLINE) {
+    ADD(args, STRING_OBJ(cstr_to_string("cmdline")));
   } else {
     assert(mode == NORMAL);
     ADD(args, STRING_OBJ(cstr_to_string("normal")));
@@ -236,7 +281,7 @@ static void remote_ui_mode_change(UI *ui, int mode)
 }
 
 static void remote_ui_set_scroll_region(UI *ui, int top, int bot, int left,
-    int right)
+                                        int right)
 {
   Array args = ARRAY_DICT_INIT;
   ADD(args, INTEGER_OBJ(top));
@@ -297,7 +342,7 @@ static void remote_ui_highlight_set(UI *ui, HlAttrs attrs)
 static void remote_ui_put(UI *ui, uint8_t *data, size_t size)
 {
   Array args = ARRAY_DICT_INIT;
-  String str = {.data = xmemdupz(data, size), .size = size};
+  String str = { .data = xmemdupz(data, size), .size = size };
   ADD(args, STRING_OBJ(str));
   push_call(ui, "put", args);
 }
@@ -361,3 +406,19 @@ static void remote_ui_set_icon(UI *ui, char *icon)
   ADD(args, STRING_OBJ(cstr_to_string(icon)));
   push_call(ui, "set_icon", args);
 }
+
+static void remote_ui_event(UI *ui, char *name, Array args, bool *args_consumed)
+{
+  Array my_args = ARRAY_DICT_INIT;
+  // Objects are currently single-reference
+  // make a copy, but only if necessary
+  if (*args_consumed) {
+    for (size_t i = 0; i < args.size; i++) {
+      ADD(my_args, copy_object(args.items[i]));
+    }
+  } else {
+    my_args = args;
+    *args_consumed = true;
+  }
+  push_call(ui, name, my_args);
+}
diff --git a/src/nvim/api/ui.h b/src/nvim/api/ui.h
new file mode 100644
index 0000000000..b3af14f8a8
--- /dev/null
+++ b/src/nvim/api/ui.h
@@ -0,0 +1,11 @@
+#ifndef NVIM_API_UI_H
+#define NVIM_API_UI_H
+
+#include <stdint.h>
+
+#include "nvim/api/private/defs.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "api/ui.h.generated.h"
+#endif
+#endif  // NVIM_API_UI_H
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 46ac3c9022..1732ee0bae 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -14,6 +14,7 @@
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/vim.h"
 #include "nvim/buffer.h"
+#include "nvim/file_search.h"
 #include "nvim/window.h"
 #include "nvim/types.h"
 #include "nvim/ex_docmd.h"
@@ -21,7 +22,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/eval.h"
-#include "nvim/misc2.h"
+#include "nvim/option.h"
 #include "nvim/syntax.h"
 #include "nvim/getchar.h"
 #include "nvim/os/input.h"
@@ -32,35 +33,35 @@
 # include "api/vim.c.generated.h"
 #endif
 
-/// Executes an ex-mode command str
+/// Executes an ex-command.
+/// On VimL error: Returns the VimL error; v:errmsg is not updated.
 ///
-/// @param str The command str
-/// @param[out] err Details of an error that may have occurred
-void vim_command(String str, Error *err)
+/// @param command  Ex-command string
+/// @param[out] err Error details (including actual VimL error), if any
+void nvim_command(String command, Error *err)
 {
   // Run the command
   try_start();
-  do_cmdline_cmd(str.data);
+  do_cmdline_cmd(command.data);
   update_screen(VALID);
   try_end(err);
 }
 
-/// Passes input keys to Neovim
+/// Passes input keys to Nvim.
+/// On VimL error: Does not fail, but updates v:errmsg.
 ///
-/// @param keys to be typed
-/// @param mode specifies the mapping options
-/// @param escape_csi the string needs escaping for K_SPECIAL/CSI bytes
+/// @param keys         to be typed
+/// @param mode         mapping options
+/// @param escape_csi   If true, escape K_SPECIAL/CSI bytes in `keys`
 /// @see feedkeys()
 /// @see vim_strsave_escape_csi
-void vim_feedkeys(String keys, String mode, Boolean escape_csi)
+void nvim_feedkeys(String keys, String mode, Boolean escape_csi)
 {
   bool remap = true;
   bool insert = false;
   bool typed = false;
-
-  if (keys.size == 0) {
-    return;
-  }
+  bool execute = false;
+  bool dangerous = false;
 
   for (size_t i = 0; i < mode.size; ++i) {
     switch (mode.data[i]) {
@@ -68,9 +69,15 @@ void vim_feedkeys(String keys, String mode, Boolean escape_csi)
     case 'm': remap = true; break;
     case 't': typed = true; break;
     case 'i': insert = true; break;
+    case 'x': execute = true; break;
+    case '!': dangerous = true; break;
     }
   }
 
+  if (keys.size == 0 && !execute) {
+    return;
+  }
+
   char *keys_esc;
   if (escape_csi) {
       // Need to escape K_SPECIAL and CSI before putting the string in the
@@ -86,19 +93,36 @@ void vim_feedkeys(String keys, String mode, Boolean escape_csi)
       xfree(keys_esc);
   }
 
-  if (vgetc_busy)
+  if (vgetc_busy) {
     typebuf_was_filled = true;
+  }
+  if (execute) {
+    int save_msg_scroll = msg_scroll;
+
+    /* Avoid a 1 second delay when the keys start Insert mode. */
+    msg_scroll = false;
+    if (!dangerous) {
+      ex_normal_busy++;
+    }
+    exec_normal(true);
+    if (!dangerous) {
+      ex_normal_busy--;
+    }
+    msg_scroll |= save_msg_scroll;
+  }
 }
 
-/// Passes input keys to Neovim. Unlike `vim_feedkeys`, this will use a
-/// lower-level input buffer and the call is not deferred.
-/// This is the most reliable way to emulate real user input.
+/// Passes keys to Nvim as raw user-input.
+/// On VimL error: Does not fail, but updates v:errmsg.
+///
+/// Unlike `nvim_feedkeys`, this uses a lower-level input buffer and the call
+/// is not deferred. This is the most reliable way to emulate real user input.
 ///
 /// @param keys to be typed
-/// @return The number of bytes actually written, which can be lower than
-///         requested if the buffer becomes full.
-Integer vim_input(String keys)
-  FUNC_ATTR_ASYNC
+/// @return Number of bytes actually written (can be fewer than
+///         requested if the buffer becomes full).
+Integer nvim_input(String keys)
+    FUNC_API_ASYNC
 {
   return (Integer)input_enqueue(keys);
 }
@@ -107,7 +131,7 @@ Integer vim_input(String keys)
 ///
 /// @see replace_termcodes
 /// @see cpoptions
-String vim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
+String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
                               Boolean special)
 {
   if (str.size == 0) {
@@ -127,10 +151,10 @@ String vim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
   return cstr_as_string(ptr);
 }
 
-String vim_command_output(String str, Error *err)
+String nvim_command_output(String str, Error *err)
 {
   do_cmdline_cmd("redir => v:command_output");
-  vim_command(str, err);
+  nvim_command(str, err);
   do_cmdline_cmd("redir END");
 
   if (err->set) {
@@ -140,19 +164,19 @@ String vim_command_output(String str, Error *err)
   return cstr_to_string((char *)get_vim_var_str(VV_COMMAND_OUTPUT));
 }
 
-/// Evaluates the expression str using the Vim internal expression
-/// evaluator (see |expression|).
-/// Dictionaries and lists are recursively expanded.
+/// Evaluates a VimL expression (:help expression).
+/// Dictionaries and Lists are recursively expanded.
+/// On VimL error: Returns a generic error; v:errmsg is not updated.
 ///
-/// @param str The expression str
-/// @param[out] err Details of an error that may have occurred
-/// @return The expanded object
-Object vim_eval(String str, Error *err)
+/// @param expr     VimL expression string
+/// @param[out] err Error details, if any
+/// @return         Evaluation result or expanded object
+Object nvim_eval(String expr, Error *err)
 {
   Object rv = OBJECT_INIT;
   // Evaluate the expression
   try_start();
-  typval_T *expr_result = eval_expr((char_u *) str.data, NULL);
+  typval_T *expr_result = eval_expr((char_u *)expr.data, NULL);
 
   if (!expr_result) {
     api_set_error(err, Exception, _("Failed to evaluate expression"));
@@ -168,13 +192,14 @@ Object vim_eval(String str, Error *err)
   return rv;
 }
 
-/// Call the given function with the given arguments stored in an array.
+/// Calls a VimL function with the given arguments.
+/// On VimL error: Returns a generic error; v:errmsg is not updated.
 ///
-/// @param fname Function to call
-/// @param args Functions arguments packed in an Array
-/// @param[out] err Details of an error that may have occurred
+/// @param fname    Function to call
+/// @param args     Function arguments packed in an Array
+/// @param[out] err Error details, if any
 /// @return Result of the function call
-Object vim_call_function(String fname, Array args, Error *err)
+Object nvim_call_function(String fname, Array args, Error *err)
 {
   Object rv = OBJECT_INIT;
   if (args.size > MAX_FUNC_ARGS) {
@@ -200,7 +225,7 @@ Object vim_call_function(String fname, Array args, Error *err)
                     &rettv, (int) args.size, vim_args,
                     curwin->w_cursor.lnum, curwin->w_cursor.lnum, &dummy,
                     true,
-                    NULL);
+                    NULL, NULL);
   if (r == FAIL) {
     api_set_error(err, Exception, _("Error calling function."));
   }
@@ -217,13 +242,13 @@ free_vim_args:
   return rv;
 }
 
-/// Calculates the number of display cells `str` occupies, tab is counted as
-/// one cell.
+/// Calculates the number of display cells occupied by `text`.
+/// <Tab> counts as one cell.
 ///
-/// @param str Some text
-/// @param[out] err Details of an error that may have occurred
-/// @return The number of cells
-Integer vim_strwidth(String str, Error *err)
+/// @param text       Some text
+/// @param[out] err   Error details, if any
+/// @return Number of cells
+Integer nvim_strwidth(String str, Error *err)
 {
   if (str.size > INT_MAX) {
     api_set_error(err, Validation, _("String length is too high"));
@@ -233,10 +258,10 @@ Integer vim_strwidth(String str, Error *err)
   return (Integer) mb_string2cells((char_u *) str.data);
 }
 
-/// Gets a list of paths contained in 'runtimepath'
+/// Gets the paths contained in 'runtimepath'.
 ///
-/// @return The list of paths
-ArrayOf(String) vim_list_runtime_paths(void)
+/// @return List of paths
+ArrayOf(String) nvim_list_runtime_paths(void)
 {
   Array rv = ARRAY_DICT_INIT;
   uint8_t *rtp = p_rtp;
@@ -273,11 +298,11 @@ ArrayOf(String) vim_list_runtime_paths(void)
   return rv;
 }
 
-/// Changes Vim working directory
+/// Changes the global working directory.
 ///
-/// @param dir The new working directory
-/// @param[out] err Details of an error that may have occurred
-void vim_change_directory(String dir, Error *err)
+/// @param dir      Directory path
+/// @param[out] err Error details, if any
+void nvim_set_current_dir(String dir, Error *err)
 {
   if (dir.size >= MAXPATHL) {
     api_set_error(err, Validation, _("Directory string is too long"));
@@ -285,12 +310,12 @@ void vim_change_directory(String dir, Error *err)
   }
 
   char string[MAXPATHL];
-  strncpy(string, dir.data, dir.size);
+  memcpy(string, dir.data, dir.size);
   string[dir.size] = NUL;
 
   try_start();
 
-  if (vim_chdir((char_u *)string)) {
+  if (vim_chdir((char_u *)string, kCdScopeGlobal)) {
     if (!try_end(err)) {
       api_set_error(err, Exception, _("Failed to change directory"));
     }
@@ -303,127 +328,148 @@ void vim_change_directory(String dir, Error *err)
 
 /// Gets the current line
 ///
-/// @param[out] err Details of an error that may have occurred
-/// @return The current line string
-String vim_get_current_line(Error *err)
+/// @param[out] err Error details, if any
+/// @return Current line string
+String nvim_get_current_line(Error *err)
 {
   return buffer_get_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
 }
 
 /// Sets the current line
 ///
-/// @param line The line contents
-/// @param[out] err Details of an error that may have occurred
-void vim_set_current_line(String line, Error *err)
+/// @param line     Line contents
+/// @param[out] err Error details, if any
+void nvim_set_current_line(String line, Error *err)
 {
   buffer_set_line(curbuf->handle, curwin->w_cursor.lnum - 1, line, err);
 }
 
 /// Deletes the current line
 ///
-/// @param[out] err Details of an error that may have occurred
-void vim_del_current_line(Error *err)
+/// @param[out] err Error details, if any
+void nvim_del_current_line(Error *err)
 {
   buffer_del_line(curbuf->handle, curwin->w_cursor.lnum - 1, err);
 }
 
-/// Gets a global variable
+/// Gets a global (g:) variable
 ///
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The variable value
-Object vim_get_var(String name, Error *err)
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return Variable value
+Object nvim_get_var(String name, Error *err)
 {
   return dict_get_value(&globvardict, name, err);
 }
 
+/// Sets a global (g:) variable
+///
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+void nvim_set_var(String name, Object value, Error *err)
+{
+  dict_set_value(&globvardict, name, value, false, false, err);
+}
+
+/// Removes a global (g:) variable
+///
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+void nvim_del_var(String name, Error *err)
+{
+  dict_set_value(&globvardict, name, NIL, true, false, err);
+}
+
 /// Sets a global variable
 ///
-/// @param name The variable name
-/// @param value The variable value
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @deprecated
+///
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+/// @return Old value or nil if there was no previous value.
 ///
 ///         @warning It may return nil if there was no previous value
 ///                  or if previous value was `v:null`.
 Object vim_set_var(String name, Object value, Error *err)
 {
-  return dict_set_value(&globvardict, name, value, false, err);
+  return dict_set_value(&globvardict, name, value, false, true, err);
 }
 
 /// Removes a global variable
 ///
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @deprecated
 ///
-///         @warning It may return nil if there was no previous value
-///                  or if previous value was `v:null`.
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return Old value
 Object vim_del_var(String name, Error *err)
 {
-  return dict_set_value(&globvardict, name, NIL, true, err);
+  return dict_set_value(&globvardict, name, NIL, true, true, err);
 }
 
-/// Gets a vim variable
+/// Gets a v: variable
 ///
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The variable value
-Object vim_get_vvar(String name, Error *err)
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return         Variable value
+Object nvim_get_vvar(String name, Error *err)
 {
   return dict_get_value(&vimvardict, name, err);
 }
 
 /// Gets an option value string
 ///
-/// @param name The option name
-/// @param[out] err Details of an error that may have occurred
-/// @return The option value
-Object vim_get_option(String name, Error *err)
+/// @param name     Option name
+/// @param[out] err Error details, if any
+/// @return         Option value
+Object nvim_get_option(String name, Error *err)
 {
   return get_option_from(NULL, SREQ_GLOBAL, name, err);
 }
 
 /// Sets an option value
 ///
-/// @param name The option name
-/// @param value The new option value
-/// @param[out] err Details of an error that may have occurred
-void vim_set_option(String name, Object value, Error *err)
+/// @param name     Option name
+/// @param value    New option value
+/// @param[out] err Error details, if any
+void nvim_set_option(String name, Object value, Error *err)
 {
   set_option_to(NULL, SREQ_GLOBAL, name, value, err);
 }
 
 /// Writes a message to vim output buffer
 ///
-/// @param str The message
-void vim_out_write(String str)
+/// @param str Message
+void nvim_out_write(String str)
 {
   write_msg(str, false);
 }
 
 /// Writes a message to vim error buffer
 ///
-/// @param str The message
-void vim_err_write(String str)
+/// @param str Message
+void nvim_err_write(String str)
 {
   write_msg(str, true);
 }
 
-/// Higher level error reporting function that ensures all str contents
-/// are written by sending a trailing linefeed to `vim_err_write`
+/// Writes a message to vim error buffer. Appends a linefeed to ensure all
+/// contents are written.
 ///
-/// @param str The message
-void vim_report_error(String str)
+/// @param str Message
+/// @see nvim_err_write()
+void nvim_err_writeln(String str)
 {
-  vim_err_write(str);
-  vim_err_write((String) {.data = "\n", .size = 1});
+  nvim_err_write(str);
+  nvim_err_write((String) { .data = "\n", .size = 1 });
 }
 
 /// Gets the current list of buffer handles
 ///
-/// @return The number of buffers
-ArrayOf(Buffer) vim_get_buffers(void)
+/// @return List of buffer handles
+ArrayOf(Buffer) nvim_list_bufs(void)
 {
   Array rv = ARRAY_DICT_INIT;
 
@@ -443,17 +489,17 @@ ArrayOf(Buffer) vim_get_buffers(void)
 
 /// Gets the current buffer
 ///
-/// @reqturn The buffer handle
-Buffer vim_get_current_buffer(void)
+/// @return Buffer handle
+Buffer nvim_get_current_buf(void)
 {
   return curbuf->handle;
 }
 
 /// Sets the current buffer
 ///
-/// @param id The buffer handle
-/// @param[out] err Details of an error that may have occurred
-void vim_set_current_buffer(Buffer buffer, Error *err)
+/// @param id       Buffer handle
+/// @param[out] err Error details, if any
+void nvim_set_current_buf(Buffer buffer, Error *err)
 {
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
@@ -466,15 +512,15 @@ void vim_set_current_buffer(Buffer buffer, Error *err)
   if (!try_end(err) && result == FAIL) {
     api_set_error(err,
                   Exception,
-                  _("Failed to switch to buffer %" PRIu64),
+                  _("Failed to switch to buffer %d"),
                   buffer);
   }
 }
 
 /// Gets the current list of window handles
 ///
-/// @return The number of windows
-ArrayOf(Window) vim_get_windows(void)
+/// @return List of window handles
+ArrayOf(Window) nvim_list_wins(void)
 {
   Array rv = ARRAY_DICT_INIT;
 
@@ -494,16 +540,16 @@ ArrayOf(Window) vim_get_windows(void)
 
 /// Gets the current window
 ///
-/// @return The window handle
-Window vim_get_current_window(void)
+/// @return Window handle
+Window nvim_get_current_win(void)
 {
   return curwin->handle;
 }
 
 /// Sets the current window
 ///
-/// @param handle The window handle
-void vim_set_current_window(Window window, Error *err)
+/// @param handle Window handle
+void nvim_set_current_win(Window window, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -516,15 +562,15 @@ void vim_set_current_window(Window window, Error *err)
   if (!try_end(err) && win != curwin) {
     api_set_error(err,
                   Exception,
-                  _("Failed to switch to window %" PRIu64),
+                  _("Failed to switch to window %d"),
                   window);
   }
 }
 
 /// Gets the current list of tabpage handles
 ///
-/// @return The number of tab pages
-ArrayOf(Tabpage) vim_get_tabpages(void)
+/// @return List of tabpage handles
+ArrayOf(Tabpage) nvim_list_tabpages(void)
 {
   Array rv = ARRAY_DICT_INIT;
 
@@ -542,19 +588,19 @@ ArrayOf(Tabpage) vim_get_tabpages(void)
   return rv;
 }
 
-/// Gets the current tab page
+/// Gets the current tabpage
 ///
-/// @return The tab page handle
-Tabpage vim_get_current_tabpage(void)
+/// @return Tabpage handle
+Tabpage nvim_get_current_tabpage(void)
 {
   return curtab->handle;
 }
 
-/// Sets the current tab page
+/// Sets the current tabpage
 ///
-/// @param handle The tab page handle
-/// @param[out] err Details of an error that may have occurred
-void vim_set_current_tabpage(Tabpage tabpage, Error *err)
+/// @param handle   Tabpage handle
+/// @param[out] err Error details, if any
+void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
 {
   tabpage_T *tp = find_tab_by_handle(tabpage, err);
 
@@ -567,16 +613,17 @@ void vim_set_current_tabpage(Tabpage tabpage, Error *err)
   if (!try_end(err) && tp != curtab) {
     api_set_error(err,
                   Exception,
-                  _("Failed to switch to tabpage %" PRIu64),
+                  _("Failed to switch to tabpage %d"),
                   tabpage);
   }
 }
 
 /// Subscribes to event broadcasts
 ///
-/// @param channel_id The channel id (passed automatically by the dispatcher)
-/// @param event The event type string
-void vim_subscribe(uint64_t channel_id, String event)
+/// @param channel_id Channel id (passed automatically by the dispatcher)
+/// @param event      Event type string
+void nvim_subscribe(uint64_t channel_id, String event)
+    FUNC_API_NOEVAL
 {
   size_t length = (event.size < METHOD_MAXLEN ? event.size : METHOD_MAXLEN);
   char e[METHOD_MAXLEN + 1];
@@ -587,9 +634,10 @@ void vim_subscribe(uint64_t channel_id, String event)
 
 /// Unsubscribes to event broadcasts
 ///
-/// @param channel_id The channel id (passed automatically by the dispatcher)
-/// @param event The event type string
-void vim_unsubscribe(uint64_t channel_id, String event)
+/// @param channel_id Channel id (passed automatically by the dispatcher)
+/// @param event      Event type string
+void nvim_unsubscribe(uint64_t channel_id, String event)
+    FUNC_API_NOEVAL
 {
   size_t length = (event.size < METHOD_MAXLEN ?
                    event.size :
@@ -600,12 +648,12 @@ void vim_unsubscribe(uint64_t channel_id, String event)
   channel_unsubscribe(channel_id, e);
 }
 
-Integer vim_name_to_color(String name)
+Integer nvim_get_color_by_name(String name)
 {
   return name_to_color((uint8_t *)name.data);
 }
 
-Dictionary vim_get_color_map(void)
+Dictionary nvim_get_color_map(void)
 {
   Dictionary colors = ARRAY_DICT_INIT;
 
@@ -617,8 +665,8 @@ Dictionary vim_get_color_map(void)
 }
 
 
-Array vim_get_api_info(uint64_t channel_id)
-  FUNC_ATTR_ASYNC
+Array nvim_get_api_info(uint64_t channel_id)
+    FUNC_API_ASYNC FUNC_API_NOEVAL
 {
   Array rv = ARRAY_DICT_INIT;
 
@@ -629,26 +677,114 @@ Array vim_get_api_info(uint64_t channel_id)
   return rv;
 }
 
+/// Call many api methods atomically
+///
+/// This has two main usages: Firstly, to perform several requests from an
+/// async context atomically, i.e. without processing requests from other rpc
+/// clients or redrawing or allowing user interaction in between. Note that api
+/// methods that could fire autocommands or do event processing still might do
+/// so. For instance invoking the :sleep command might call timer callbacks.
+/// Secondly, it can be used to reduce rpc overhead (roundtrips) when doing
+/// many requests in sequence.
+///
+/// @param calls an array of calls, where each call is described by an array
+/// with two elements: the request name, and an array of arguments.
+/// @param[out] err Details of a validation error of the nvim_multi_request call
+/// itself, i e malformatted `calls` parameter. Errors from called methods will
+/// be indicated in the return value, see below.
+///
+/// @return an array with two elements. The first is an array of return
+/// values. The second is NIL if all calls succeeded. If a call resulted in
+/// an error, it is a three-element array with the zero-based index of the call
+/// which resulted in an error, the error type and the error message. If an
+/// error ocurred, the values from all preceding calls will still be returned.
+Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
+  FUNC_API_NOEVAL
+{
+  Array rv = ARRAY_DICT_INIT;
+  Array results = ARRAY_DICT_INIT;
+  Error nested_error = ERROR_INIT;
+
+  size_t i;  // also used for freeing the variables
+  for (i = 0; i < calls.size; i++) {
+    if (calls.items[i].type != kObjectTypeArray) {
+      api_set_error(err,
+                    Validation,
+                    _("All items in calls array must be arrays"));
+      goto validation_error;
+    }
+    Array call = calls.items[i].data.array;
+    if (call.size != 2) {
+      api_set_error(err,
+                    Validation,
+                    _("All items in calls array must be arrays of size 2"));
+      goto validation_error;
+    }
+
+    if (call.items[0].type != kObjectTypeString) {
+      api_set_error(err,
+                    Validation,
+                    _("name must be String"));
+      goto validation_error;
+    }
+    String name = call.items[0].data.string;
+
+    if (call.items[1].type != kObjectTypeArray) {
+      api_set_error(err,
+                    Validation,
+                    _("args must be Array"));
+      goto validation_error;
+    }
+    Array args = call.items[1].data.array;
+
+    MsgpackRpcRequestHandler handler = msgpack_rpc_get_handler_for(name.data,
+                                                                   name.size);
+    Object result = handler.fn(channel_id, args, &nested_error);
+    if (nested_error.set) {
+      // error handled after loop
+      break;
+    }
+
+    ADD(results, result);
+  }
+
+  ADD(rv, ARRAY_OBJ(results));
+  if (nested_error.set) {
+    Array errval = ARRAY_DICT_INIT;
+    ADD(errval, INTEGER_OBJ((Integer)i));
+    ADD(errval, INTEGER_OBJ(nested_error.type));
+    ADD(errval, STRING_OBJ(cstr_to_string(nested_error.msg)));
+    ADD(rv, ARRAY_OBJ(errval));
+  } else {
+    ADD(rv, NIL);
+  }
+  return rv;
+
+validation_error:
+  api_free_array(results);
+  return rv;
+}
+
+
 /// Writes a message to vim output or error buffer. The string is split
 /// and flushed after each newline. Incomplete lines are kept for writing
 /// later.
 ///
-/// @param message The message to write
-/// @param to_err true if it should be treated as an error message (use
-///        `emsg` instead of `msg` to print each line)
+/// @param message  Message to write
+/// @param to_err   true: message is an error (uses `emsg` instead of `msg`)
 static void write_msg(String message, bool to_err)
 {
   static size_t out_pos = 0, err_pos = 0;
   static char out_line_buf[LINE_BUFFER_SIZE], err_line_buf[LINE_BUFFER_SIZE];
 
-#define PUSH_CHAR(i, pos, line_buf, msg)                                      \
-  if (message.data[i] == NL || pos == LINE_BUFFER_SIZE - 1) {                 \
-    line_buf[pos] = NUL;                                                      \
-    msg((uint8_t *)line_buf);                                                 \
-    pos = 0;                                                                  \
-    continue;                                                                 \
-  }                                                                           \
-                                                                              \
+#define PUSH_CHAR(i, pos, line_buf, msg) \
+  if (message.data[i] == NL || pos == LINE_BUFFER_SIZE - 1) { \
+    line_buf[pos] = NUL; \
+    msg((uint8_t *)line_buf); \
+    pos = 0; \
+    continue; \
+  } \
+  \
   line_buf[pos++] = message.data[i];
 
   ++no_wait_return;
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index f644453358..1f555a6a05 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -11,15 +11,14 @@
 #include "nvim/window.h"
 #include "nvim/screen.h"
 #include "nvim/move.h"
-#include "nvim/misc2.h"
 
 
 /// Gets the current buffer in a window
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The buffer handle
-Buffer window_get_buffer(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return Buffer handle
+Buffer nvim_win_get_buf(Window window, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -32,10 +31,10 @@ Buffer window_get_buffer(Window window, Error *err)
 
 /// Gets the cursor position in the window
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return the (row, col) tuple
-ArrayOf(Integer, 2) window_get_cursor(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return (row, col) tuple
+ArrayOf(Integer, 2) nvim_win_get_cursor(Window window, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
@@ -50,10 +49,10 @@ ArrayOf(Integer, 2) window_get_cursor(Window window, Error *err)
 
 /// Sets the cursor position in the window
 ///
-/// @param window The window handle
-/// @param pos the (row, col) tuple representing the new position
-/// @param[out] err Details of an error that may have occurred
-void window_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
+/// @param window   Window handle
+/// @param pos      (row, col) tuple representing the new position
+/// @param[out] err Error details, if any
+void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -96,10 +95,10 @@ void window_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 
 /// Gets the window height
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return the height in rows
-Integer window_get_height(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return Height as a count of rows
+Integer nvim_win_get_height(Window window, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -113,10 +112,10 @@ Integer window_get_height(Window window, Error *err)
 /// Sets the window height. This will only succeed if the screen is split
 /// horizontally.
 ///
-/// @param window The window handle
-/// @param height the new height in rows
-/// @param[out] err Details of an error that may have occurred
-void window_set_height(Window window, Integer height, Error *err)
+/// @param window   Window handle
+/// @param height   Height as a count of rows
+/// @param[out] err Error details, if any
+void nvim_win_set_height(Window window, Integer height, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -139,10 +138,10 @@ void window_set_height(Window window, Integer height, Error *err)
 
 /// Gets the window width
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return the width in columns
-Integer window_get_width(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return Width as a count of columns
+Integer nvim_win_get_width(Window window, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -156,10 +155,10 @@ Integer window_get_width(Window window, Error *err)
 /// Sets the window width. This will only succeed if the screen is split
 /// vertically.
 ///
-/// @param window The window handle
-/// @param width the new width in columns
-/// @param[out] err Details of an error that may have occurred
-void window_set_width(Window window, Integer width, Error *err)
+/// @param window   Window handle
+/// @param width    Width as a count of columns
+/// @param[out] err Error details, if any
+void nvim_win_set_width(Window window, Integer width, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -182,11 +181,11 @@ void window_set_width(Window window, Integer width, Error *err)
 
 /// Gets a window-scoped (w:) variable
 ///
-/// @param window The window handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The variable value
-Object window_get_var(Window window, String name, Error *err)
+/// @param window   Window handle
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+/// @return Variable value
+Object nvim_win_get_var(Window window, String name, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -199,11 +198,46 @@ Object window_get_var(Window window, String name, Error *err)
 
 /// Sets a window-scoped (w:) variable
 ///
-/// @param window The window handle
-/// @param name The variable name
-/// @param value The variable value
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @param window   Window handle
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+void nvim_win_set_var(Window window, String name, Object value, Error *err)
+{
+  win_T *win = find_window_by_handle(window, err);
+
+  if (!win) {
+    return;
+  }
+
+  dict_set_value(win->w_vars, name, value, false, false, err);
+}
+
+/// Removes a window-scoped (w:) variable
+///
+/// @param window   Window handle
+/// @param name     Variable name
+/// @param[out] err Error details, if any
+void nvim_win_del_var(Window window, String name, Error *err)
+{
+  win_T *win = find_window_by_handle(window, err);
+
+  if (!win) {
+    return;
+  }
+
+  dict_set_value(win->w_vars, name, NIL, true, false, err);
+}
+
+/// Sets a window-scoped (w:) variable
+///
+/// @deprecated
+///
+/// @param window   Window handle
+/// @param name     Variable name
+/// @param value    Variable value
+/// @param[out] err Error details, if any
+/// @return Old value or nil if there was no previous value.
 ///
 ///         @warning It may return nil if there was no previous value
 ///                  or if previous value was `v:null`.
@@ -215,18 +249,17 @@ Object window_set_var(Window window, String name, Object value, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(win->w_vars, name, value, false, err);
+  return dict_set_value(win->w_vars, name, value, false, true, err);
 }
 
 /// Removes a window-scoped (w:) variable
 ///
-/// @param window The window handle
-/// @param name The variable name
-/// @param[out] err Details of an error that may have occurred
-/// @return The old value or nil if there was no previous value.
+/// @deprecated
 ///
-///         @warning It may return nil if there was no previous value
-///                  or if previous value was `v:null`.
+/// @param window   Window handle
+/// @param name     variable name
+/// @param[out] err Error details, if any
+/// @return Old value
 Object window_del_var(Window window, String name, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
@@ -235,16 +268,16 @@ Object window_del_var(Window window, String name, Error *err)
     return (Object) OBJECT_INIT;
   }
 
-  return dict_set_value(win->w_vars, name, NIL, true, err);
+  return dict_set_value(win->w_vars, name, NIL, true, true, err);
 }
 
 /// Gets a window option value
 ///
-/// @param window The window handle
-/// @param name The option name
-/// @param[out] err Details of an error that may have occurred
-/// @return The option value
-Object window_get_option(Window window, String name, Error *err)
+/// @param window   Window handle
+/// @param name     Option name
+/// @param[out] err Error details, if any
+/// @return Option value
+Object nvim_win_get_option(Window window, String name, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -258,11 +291,11 @@ Object window_get_option(Window window, String name, Error *err)
 /// Sets a window option value. Passing 'nil' as value deletes the option(only
 /// works if there's a global fallback)
 ///
-/// @param window The window handle
-/// @param name The option name
-/// @param value The option value
-/// @param[out] err Details of an error that may have occurred
-void window_set_option(Window window, String name, Object value, Error *err)
+/// @param window   Window handle
+/// @param name     Option name
+/// @param value    Option value
+/// @param[out] err Error details, if any
+void nvim_win_set_option(Window window, String name, Object value, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
@@ -275,10 +308,10 @@ void window_set_option(Window window, String name, Object value, Error *err)
 
 /// Gets the window position in display cells. First position is zero.
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The (row, col) tuple with the window position
-ArrayOf(Integer, 2) window_get_position(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return (row, col) tuple with the window position
+ArrayOf(Integer, 2) nvim_win_get_position(Window window, Error *err)
 {
   Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
@@ -291,12 +324,12 @@ ArrayOf(Integer, 2) window_get_position(Window window, Error *err)
   return rv;
 }
 
-/// Gets the window tab page
+/// Gets the window tabpage
 ///
-/// @param window The window handle
-/// @param[out] err Details of an error that may have occurred
-/// @return The tab page that contains the window
-Tabpage window_get_tabpage(Window window, Error *err)
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return Tabpage that contains the window
+Tabpage nvim_win_get_tabpage(Window window, Error *err)
 {
   Tabpage rv = 0;
   win_T *win = find_window_by_handle(window, err);
@@ -308,11 +341,31 @@ Tabpage window_get_tabpage(Window window, Error *err)
   return rv;
 }
 
+/// Gets the window number
+///
+/// @param window   Window handle
+/// @param[out] err Error details, if any
+/// @return Window number
+Integer nvim_win_get_number(Window window, Error *err)
+{
+  int rv = 0;
+  win_T *win = find_window_by_handle(window, err);
+
+  if (!win) {
+    return rv;
+  }
+
+  int tabnr;
+  win_get_tabwin(window, &tabnr, &rv);
+
+  return rv;
+}
+
 /// Checks if a window is valid
 ///
-/// @param window The window handle
+/// @param window Window handle
 /// @return true if the window is valid, false otherwise
-Boolean window_is_valid(Window window)
+Boolean nvim_win_is_valid(Window window)
 {
   Error stub = ERROR_INIT;
   return find_window_by_handle(window, &stub) != NULL;
diff --git a/src/nvim/auevents.lua b/src/nvim/auevents.lua
index 8d891effae..68a47c244f 100644
--- a/src/nvim/auevents.lua
+++ b/src/nvim/auevents.lua
@@ -28,6 +28,7 @@ return {
     'CursorHoldI',            -- idem, in Insert mode
     'CursorMoved',            -- cursor was moved
     'CursorMovedI',           -- cursor was moved in Insert mode
+    'DirChanged',             -- directory changed
     'EncodingChanged',        -- after changing the 'encoding' option
     'FileAppendCmd',          -- append to a file using command
     'FileAppendPost',         -- after appending to a file
@@ -89,6 +90,7 @@ return {
     'VimLeave',               -- before exiting Vim
     'VimLeavePre',            -- before exiting Vim and writing ShaDa file
     'VimResized',             -- after Vim window was resized
+    'WinNew',                 -- when entering a new window
     'WinEnter',               -- after entering a window
     'WinLeave',               -- before leaving a window
   },
@@ -101,6 +103,7 @@ return {
   -- List of neovim-specific events or aliases for the purpose of generating 
   -- syntax file
   neovim_specific = {
+    DirChanged=true,
     TabClosed=true,
     TabNew=true,
     TabNewEntered=true,
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 72716daf0e..26dbbe8bb5 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -36,6 +36,7 @@
 #include "nvim/ex_eval.h"
 #include "nvim/ex_getln.h"
 #include "nvim/fileio.h"
+#include "nvim/file_search.h"
 #include "nvim/fold.h"
 #include "nvim/getchar.h"
 #include "nvim/hashtab.h"
@@ -48,7 +49,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
@@ -189,14 +189,18 @@ open_buffer (
       curwin->w_cursor.lnum = 1;
       curwin->w_cursor.col = 0;
 
-      /* Set or reset 'modified' before executing autocommands, so that
-       * it can be changed there. */
-      if (!readonlymode && !bufempty())
+      // Set or reset 'modified' before executing autocommands, so that
+      // it can be changed there.
+      if (!readonlymode && !bufempty()) {
         changed();
-      else if (retval != FAIL)
-        unchanged(curbuf, FALSE);
-      apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE,
-          curbuf, &retval);
+      } else if (retval == OK) {
+        unchanged(curbuf, false);
+      }
+
+      if (retval == OK) {
+        apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, false,
+                              curbuf, &retval);
+      }
     }
   }
 
@@ -206,22 +210,21 @@ open_buffer (
     parse_cino(curbuf);
   }
 
-  /*
-   * Set/reset the Changed flag first, autocmds may change the buffer.
-   * Apply the automatic commands, before processing the modelines.
-   * So the modelines have priority over auto commands.
-   */
-  /* When reading stdin, the buffer contents always needs writing, so set
-   * the changed flag.  Unless in readonly mode: "ls | nvim -R -".
-   * When interrupted and 'cpoptions' contains 'i' set changed flag. */
+  // Set/reset the Changed flag first, autocmds may change the buffer.
+  // Apply the automatic commands, before processing the modelines.
+  // So the modelines have priority over auto commands.
+
+  // When reading stdin, the buffer contents always needs writing, so set
+  // the changed flag.  Unless in readonly mode: "ls | nvim -R -".
+  // When interrupted and 'cpoptions' contains 'i' set changed flag.
   if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
-      || modified_was_set               /* ":set modified" used in autocmd */
-      || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
-      )
+      || modified_was_set               // ":set modified" used in autocmd
+      || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)) {
     changed();
-  else if (retval != FAIL && !read_stdin)
-    unchanged(curbuf, FALSE);
-  save_file_ff(curbuf);                 /* keep this fileformat */
+  } else if (retval == OK && !read_stdin) {
+    unchanged(curbuf, false);
+  }
+  save_file_ff(curbuf);                 // keep this fileformat
 
   /* require "!" to overwrite the file, because it wasn't read completely */
   if (aborting())
@@ -268,6 +271,9 @@ open_buffer (
 bool buf_valid(buf_T *buf)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
+  if (buf == NULL) {
+    return false;
+  }
   FOR_ALL_BUFFERS(bp) {
     if (bp == buf) {
       return true;
@@ -276,30 +282,46 @@ bool buf_valid(buf_T *buf)
   return false;
 }
 
-/*
- * Close the link to a buffer.
- * "action" is used when there is no longer a window for the buffer.
- * It can be:
- * 0			buffer becomes hidden
- * DOBUF_UNLOAD		buffer is unloaded
- * DOBUF_DELETE		buffer is unloaded and removed from buffer list
- * DOBUF_WIPE		buffer is unloaded and really deleted
- * When doing all but the first one on the current buffer, the caller should
- * get a new buffer very soon!
- *
- * The 'bufhidden' option can force freeing and deleting.
- *
- * When "abort_if_last" is TRUE then do not close the buffer if autocommands
- * cause there to be only one window with this buffer.  e.g. when ":quit" is
- * supposed to close the window but autocommands close all other windows.
- */
-void 
-close_buffer (
-    win_T *win,               /* if not NULL, set b_last_cursor */
-    buf_T *buf,
-    int action,
-    int abort_if_last
-)
+// Map used to quickly lookup a buffer by its number.
+static PMap(handle_T) *buf_map = NULL;
+
+static void buf_hashtab_add(buf_T *buf)
+  FUNC_ATTR_NONNULL_ALL
+{
+  if (pmap_has(handle_T)(buf_map, buf->handle)) {
+    EMSG(_("E931: Buffer cannot be registered"));
+  } else {
+    pmap_put(handle_T)(buf_map, buf->handle, buf);
+  }
+}
+
+static void buf_hashtab_remove(buf_T *buf)
+  FUNC_ATTR_NONNULL_ALL
+{
+  if (pmap_has(handle_T)(buf_map, buf->handle)) {
+    pmap_del(handle_T)(buf_map, buf->handle);
+  }
+}
+
+/// Close the link to a buffer.
+///
+/// @param win    If not NULL, set b_last_cursor.
+/// @param buf
+/// @param action Used when there is no longer a window for the buffer.
+///               Possible values:
+///                 0            buffer becomes hidden
+///                 DOBUF_UNLOAD buffer is unloaded
+///                 DOBUF_DELETE buffer is unloaded and removed from buffer list
+///                 DOBUF_WIPE   buffer is unloaded and really deleted
+///               When doing all but the first one on the current buffer, the
+///               caller should get a new buffer very soon!
+///               The 'bufhidden' option can force freeing and deleting.
+/// @param abort_if_last
+///               If TRUE, do not close the buffer if autocommands cause
+///               there to be only one window with this buffer. e.g. when
+///               ":quit" is supposed to close the window but autocommands
+///               close all other windows.
+void close_buffer(win_T *win, buf_T *buf, int action, int abort_if_last)
 {
   bool unload_buf = (action != 0);
   bool del_buf = (action == DOBUF_DEL || action == DOBUF_WIPE);
@@ -328,13 +350,14 @@ close_buffer (
     wipe_buf = true;
   }
 
-  if (win_valid(win)) {
-    /* Set b_last_cursor when closing the last window for the buffer.
-     * Remember the last cursor position and window options of the buffer.
-     * This used to be only for the current window, but then options like
-     * 'foldmethod' may be lost with a ":only" command. */
-    if (buf->b_nwindows == 1)
+  if (win_valid_any_tab(win)) {
+    // Set b_last_cursor when closing the last window for the buffer.
+    // Remember the last cursor position and window options of the buffer.
+    // This used to be only for the current window, but then options like
+    // 'foldmethod' may be lost with a ":only" command.
+    if (buf->b_nwindows == 1) {
       set_last_cursor(win);
+    }
     buflist_setfpos(buf, win,
         win->w_cursor.lnum == 1 ? 0 : win->w_cursor.lnum,
         win->w_cursor.col, TRUE);
@@ -407,9 +430,6 @@ close_buffer (
   buf->b_nwindows = nwindows;
 
   buf_freeall(buf, (del_buf ? BFA_DEL : 0) + (wipe_buf ? BFA_WIPE : 0));
-  if (win_valid(win) && win->w_buffer == buf) {
-    win->w_buffer = NULL;  // make sure we don't use the buffer now
-  }
 
   /* Autocommands may have deleted the buffer. */
   if (!buf_valid(buf))
@@ -417,11 +437,6 @@ close_buffer (
   if (aborting())           /* autocmds may abort script processing */
     return;
 
-  /* Autocommands may have opened or closed windows for this buffer.
-   * Decrement the count for the close we do here. */
-  if (buf->b_nwindows > 0)
-    --buf->b_nwindows;
-
   /*
    * It's possible that autocommands change curbuf to the one being deleted.
    * This might cause the previous curbuf to be deleted unexpectedly.  But
@@ -432,6 +447,16 @@ close_buffer (
   if (buf == curbuf && !is_curbuf)
     return;
 
+  if (win_valid_any_tab(win) && win->w_buffer == buf) {
+    win->w_buffer = NULL;  // make sure we don't use the buffer now
+  }
+
+  // Autocommands may have opened or closed windows for this buffer.
+  // Decrement the count for the close we do here.
+  if (buf->b_nwindows > 0) {
+    buf->b_nwindows--;
+  }
+
   /* Change directories when the 'acd' option is set. */
   do_autochdir();
 
@@ -483,21 +508,39 @@ void buf_clear_file(buf_T *buf)
   buf->b_ml.ml_flags = ML_EMPTY;                /* empty buffer */
 }
 
-/*
- * buf_freeall() - free all things allocated for a buffer that are related to
- * the file.  flags:
- * BFA_DEL	  buffer is going to be deleted
- * BFA_WIPE	  buffer is going to be wiped out
- * BFA_KEEP_UNDO  do not free undo information
- */
+/// Clears the current buffer contents.
+void buf_clear(void)
+{
+  linenr_T line_count = curbuf->b_ml.ml_line_count;
+  while (!(curbuf->b_ml.ml_flags & ML_EMPTY)) {
+    ml_delete((linenr_T)1, false);
+  }
+  deleted_lines_mark(1, line_count);  // prepare for display
+  ml_close(curbuf, true);             // free memline_T
+  buf_clear_file(curbuf);
+}
+
+/// buf_freeall() - free all things allocated for a buffer that are related to
+/// the file.  Careful: get here with "curwin" NULL when exiting.
+///
+/// @param flags BFA_DEL buffer is going to be deleted
+///              BFA_WIPE buffer is going to be wiped out
+///              BFA_KEEP_UNDO  do not free undo information
 void buf_freeall(buf_T *buf, int flags)
 {
   bool is_curbuf = (buf == curbuf);
+  int is_curwin = (curwin != NULL && curwin->w_buffer == buf);
+  win_T *the_curwin = curwin;
+  tabpage_T *the_curtab = curtab;
 
+  // Make sure the buffer isn't closed by autocommands.
   buf->b_closing = true;
-  apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname, FALSE, buf);
-  if (!buf_valid(buf))              /* autocommands may delete the buffer */
-    return;
+  if (buf->b_ml.ml_mfp != NULL) {
+      apply_autocmds(EVENT_BUFUNLOAD, buf->b_fname, buf->b_fname, false, buf);
+      if (!buf_valid(buf)) {    // autocommands may delete the buffer
+          return;
+      }
+  }
   if ((flags & BFA_DEL) && buf->b_p_bl) {
     apply_autocmds(EVENT_BUFDELETE, buf->b_fname, buf->b_fname, FALSE, buf);
     if (!buf_valid(buf))            /* autocommands may delete the buffer */
@@ -510,8 +553,18 @@ void buf_freeall(buf_T *buf, int flags)
       return;
   }
   buf->b_closing = false;
-  if (aborting())           /* autocmds may abort script processing */
+
+  // If the buffer was in curwin and the window has changed, go back to that
+  // window, if it still exists.  This avoids that ":edit x" triggering a
+  // "tabnext" BufUnload autocmd leaves a window behind without a buffer.
+  if (is_curwin && curwin != the_curwin &&  win_valid_any_tab(the_curwin)) {
+    block_autocmds();
+    goto_tabpage_win(the_curtab, the_curwin);
+    unblock_autocmds();
+  }
+  if (aborting()) {  // autocmds may abort script processing
     return;
+  }
 
   /*
    * It's possible that autocommands change curbuf to the one being deleted.
@@ -553,6 +606,7 @@ static void free_buffer(buf_T *buf)
   free_buffer_stuff(buf, TRUE);
   unref_var_dict(buf->b_vars);
   aubuflocal_remove(buf);
+  buf_hashtab_remove(buf);
   dict_unref(buf->additional_data);
   clear_fmark(&buf->b_last_cursor);
   clear_fmark(&buf->b_last_insert);
@@ -662,14 +716,15 @@ void handle_swap_exists(buf_T *old_curbuf)
      * aborting() returns FALSE when closing a buffer. */
     enter_cleanup(&cs);
 
-    /* User selected Quit at ATTENTION prompt.  Go back to previous
-     * buffer.  If that buffer is gone or the same as the current one,
-     * open a new, empty buffer. */
-    swap_exists_action = SEA_NONE;      /* don't want it again */
-    swap_exists_did_quit = TRUE;
-    close_buffer(curwin, curbuf, DOBUF_UNLOAD, FALSE);
-    if (!buf_valid(old_curbuf) || old_curbuf == curbuf)
+    // User selected Quit at ATTENTION prompt.  Go back to previous
+    // buffer.  If that buffer is gone or the same as the current one,
+    // open a new, empty buffer.
+    swap_exists_action = SEA_NONE;      // don't want it again
+    swap_exists_did_quit = true;
+    close_buffer(curwin, curbuf, DOBUF_UNLOAD, false);
+    if (!buf_valid(old_curbuf) || old_curbuf == curbuf) {
       old_curbuf = buflist_new(NULL, NULL, 1L, BLN_CURBUF | BLN_LISTED);
+    }
     if (old_curbuf != NULL) {
       enter_buffer(old_curbuf);
       if (old_tw != curbuf->b_p_tw)
@@ -1249,6 +1304,10 @@ void enter_buffer(buf_T *buf)
   /* mark cursor position as being invalid */
   curwin->w_valid = 0;
 
+  if (buf->terminal) {
+    terminal_resize(buf->terminal, curwin->w_width, curwin->w_height);
+  }
+
   /* Make sure the buffer is loaded. */
   if (curbuf->b_ml.ml_mfp == NULL) {    /* need to load the file */
     /* If there is no filetype, allow for detecting one.  Esp. useful for
@@ -1306,32 +1365,36 @@ void do_autochdir(void)
   }
 }
 
-/*
- * functions for dealing with the buffer list
- */
+//
+// functions for dealing with the buffer list
+//
 
-/*
- * Add a file name to the buffer list.  Return a pointer to the buffer.
- * If the same file name already exists return a pointer to that buffer.
- * If it does not exist, or if fname == NULL, a new entry is created.
- * If (flags & BLN_CURBUF) is TRUE, may use current buffer.
- * If (flags & BLN_LISTED) is TRUE, add new buffer to buffer list.
- * If (flags & BLN_DUMMY) is TRUE, don't count it as a real buffer.
- * This is the ONLY way to create a new buffer.
- */
-static int top_file_num = 1;            /* highest file number */
-
-buf_T *
-buflist_new (
-    char_u *ffname,            /* full path of fname or relative */
-    char_u *sfname,            /* short fname or NULL */
-    linenr_T lnum,                  /* preferred cursor line */
-    int flags                      /* BLN_ defines */
-)
+static int top_file_num = 1;            ///< highest file number
+
+/// Add a file name to the buffer list.
+/// If the same file name already exists return a pointer to that buffer.
+/// If it does not exist, or if fname == NULL, a new entry is created.
+/// If (flags & BLN_CURBUF) is TRUE, may use current buffer.
+/// If (flags & BLN_LISTED) is TRUE, add new buffer to buffer list.
+/// If (flags & BLN_DUMMY) is TRUE, don't count it as a real buffer.
+/// If (flags & BLN_NEW) is TRUE, don't use an existing buffer.
+/// This is the ONLY way to create a new buffer.
+///
+/// @param ffname full path of fname or relative
+/// @param sfname short fname or NULL
+/// @param lnum   preferred cursor line
+/// @param flags  BLN_ defines
+/// @param bufnr
+///
+/// @return pointer to the buffer
+buf_T * buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags)
 {
   buf_T       *buf;
 
-  fname_expand(curbuf, &ffname, &sfname);       /* will allocate ffname */
+  if (top_file_num == 1) {
+    buf_map = pmap_new(handle_T)();
+  }
+  fname_expand(curbuf, &ffname, &sfname);       // will allocate ffname
 
   /*
    * If file name already exists in the list, update the entry.
@@ -1393,8 +1456,7 @@ buflist_new (
   }
   if (buf != curbuf || curbuf == NULL) {
     buf = xcalloc(1, sizeof(buf_T));
-    handle_register_buffer(buf);
-    /* init b: variables */
+    // init b: variables
     buf->b_vars = dict_alloc();
     init_var_dict(buf->b_vars, &buf->b_bufvar, VAR_SCOPE);
   }
@@ -1447,14 +1509,16 @@ buflist_new (
     lastbuf = buf;
 
     buf->b_fnum = top_file_num++;
-    if (top_file_num < 0) {             /* wrap around (may cause duplicates) */
+    handle_register_buffer(buf);
+    if (top_file_num < 0) {  // wrap around (may cause duplicates)
       EMSG(_("W14: Warning: List of file names overflow"));
       if (emsg_silent == 0) {
         ui_flush();
-        os_delay(3000L, true);          /* make sure it is noticed */
+        os_delay(3000L, true);  // make sure it is noticed
       }
       top_file_num = 1;
     }
+    buf_hashtab_add(buf);
 
     /*
      * Always copy the options from the current buffer.
@@ -1534,6 +1598,7 @@ void free_buf_options(buf_T *buf, int free_p_ff)
   clear_string_option(&buf->b_p_cms);
   clear_string_option(&buf->b_p_nf);
   clear_string_option(&buf->b_p_syn);
+  clear_string_option(&buf->b_s.b_syn_isk);
   clear_string_option(&buf->b_s.b_p_spc);
   clear_string_option(&buf->b_s.b_p_spf);
   vim_regfree(buf->b_s.b_cap_prog);
@@ -1963,19 +2028,15 @@ static char_u *fname_match(regmatch_T *rmp, char_u *name, bool ignore_case)
   return match;
 }
 
-/*
- * find file in buffer list by number
- */
+/// Find a file in the buffer list by buffer number.
 buf_T *buflist_findnr(int nr)
 {
   if (nr == 0) {
     nr = curwin->w_alt_fnum;
   }
 
-  FOR_ALL_BUFFERS(buf) {
-    if (buf->b_fnum == nr) {
-      return buf;
-    }
+  if (pmap_has(handle_T)(buf_map, (handle_T)nr)) {
+    return pmap_get(handle_T)(buf_map, (handle_T)nr);
   }
   return NULL;
 }
@@ -2360,10 +2421,11 @@ buf_T *setaltfname(char_u *ffname, char_u *sfname, linenr_T lnum)
 {
   buf_T       *buf;
 
-  /* Create a buffer.  'buflisted' is not set if it's a new buffer */
+  // Create a buffer.  'buflisted' is not set if it's a new buffer
   buf = buflist_new(ffname, sfname, lnum, 0);
-  if (buf != NULL && !cmdmod.keepalt)
+  if (buf != NULL && !cmdmod.keepalt) {
     curwin->w_alt_fnum = buf->b_fnum;
+  }
   return buf;
 }
 
@@ -2398,8 +2460,9 @@ int buflist_add(char_u *fname, int flags)
   buf_T       *buf;
 
   buf = buflist_new(fname, NULL, (linenr_T)0, flags);
-  if (buf != NULL)
+  if (buf != NULL) {
     return buf->b_fnum;
+  }
   return 0;
 }
 
@@ -2848,7 +2911,7 @@ typedef enum {
 /// is "curwin".
 ///
 /// Items are drawn interspersed with the text that surrounds it
-/// Specials: %-<wid>(xxx%) => group, %= => middle marker, %< => truncation
+/// Specials: %-<wid>(xxx%) => group, %= => separation marker, %< => truncation
 /// Item: %-<minwid>.<maxwid><itemch> All but <itemch> are optional
 ///
 /// If maxwidth is not zero, the string will be filled at any middle marker
@@ -2892,7 +2955,7 @@ int build_stl_str_hl(
       Normal,
       Empty,
       Group,
-      Middle,
+      Separate,
       Highlight,
       TabPage,
       ClickFunc,
@@ -2993,14 +3056,14 @@ int build_stl_str_hl(
       continue;
     }
 
-    // STL_MIDDLEMARK: Separation place between left and right aligned items.
-    if (*fmt_p == STL_MIDDLEMARK) {
+    // STL_SEPARATE: Separation place between left and right aligned items.
+    if (*fmt_p == STL_SEPARATE) {
       fmt_p++;
       // Ignored when we are inside of a grouping
       if (groupdepth > 0) {
         continue;
       }
-      item[curitem].type = Middle;
+      item[curitem].type = Separate;
       item[curitem++].start = out_p;
       continue;
     }
@@ -3404,7 +3467,7 @@ int build_stl_str_hl(
 
     case STL_KEYMAP:
       fillable = false;
-      if (get_keymap_str(wp, tmp, TMPLEN))
+      if (get_keymap_str(wp, (char_u *)"<%s>", tmp, TMPLEN))
         str = tmp;
       break;
     case STL_PAGENUM:
@@ -3839,27 +3902,53 @@ int build_stl_str_hl(
     width = maxwidth;
 
   // If there is room left in our statusline, and room left in our buffer,
-  // add characters at the middle marker (if there is one) to
+  // add characters at the separate marker (if there is one) to
   // fill up the available space.
   } else if (width < maxwidth
-               && STRLEN(out) + maxwidth - width + 1 < outlen) {
-    for (int item_idx = 0; item_idx < itemcnt; item_idx++) {
-      if (item[item_idx].type == Middle) {
-        // Move the statusline to make room for the middle characters
-        char_u *middle_end = item[item_idx].start + (maxwidth - width);
-        STRMOVE(middle_end, item[item_idx].start);
-
-        // Fill the middle section with our fill character
-        for (char_u *s = item[item_idx].start; s < middle_end; s++)
-          *s = fillchar;
+             && STRLEN(out) + maxwidth - width + 1 < outlen) {
+    // Find how many separators there are, which we will use when
+    // figuring out how many groups there are.
+    int num_separators = 0;
+    for (int i = 0; i < itemcnt; i++) {
+      if (item[i].type == Separate) {
+        num_separators++;
+      }
+    }
+
+    // If we have separated groups, then we deal with it now
+    if (num_separators) {
+      // Create an array of the start location for each
+      // separator mark.
+      int separator_locations[STL_MAX_ITEM];
+      int index = 0;
+      for (int i = 0; i < itemcnt; i++) {
+        if (item[i].type == Separate) {
+          separator_locations[index] = i;
+          index++;
+        }
+      }
 
-        // Adjust the offset of any items after the middle
-        for (item_idx++; item_idx < itemcnt; item_idx++)
-          item[item_idx].start += maxwidth - width;
+      int standard_spaces = (maxwidth - width) / num_separators;
+      int final_spaces = (maxwidth - width) -
+        standard_spaces * (num_separators - 1);
 
-        width = maxwidth;
-        break;
+      for (int i = 0; i < num_separators; i++) {
+        int dislocation = (i == (num_separators - 1)) ?
+          final_spaces : standard_spaces;
+        char_u *sep_loc = item[separator_locations[i]].start + dislocation;
+        STRMOVE(sep_loc, item[separator_locations[i]].start);
+        for (char_u *s = item[separator_locations[i]].start; s < sep_loc; s++) {
+          *s = fillchar;
+        }
+
+        for (int item_idx = separator_locations[i] + 1;
+             item_idx < itemcnt;
+             item_idx++) {
+          item[item_idx].start += dislocation;
+        }
       }
+
+      width = maxwidth;
     }
   }
 
@@ -3999,8 +4088,8 @@ void fname_expand(buf_T *buf, char_u **ffname, char_u **sfname)
   if (!buf->b_p_bin) {
     char_u  *rfname;
 
-    /* If the file name is a shortcut file, use the file it links to. */
-    rfname = mch_resolve_shortcut(*ffname);
+    // If the file name is a shortcut file, use the file it links to.
+    rfname = os_resolve_shortcut(*ffname);
     if (rfname != NULL) {
       xfree(*ffname);
       *ffname = rfname;
@@ -4090,12 +4179,10 @@ do_arg_all (
       wpnext = wp->w_next;
       buf = wp->w_buffer;
       if (buf->b_ffname == NULL
-          || (!keep_tabs && buf->b_nwindows > 1)
-          || wp->w_width != Columns
-          )
+          || (!keep_tabs && (buf->b_nwindows > 1 || wp->w_width != Columns))) {
         i = opened_len;
-      else {
-        /* check if the buffer in this window is in the arglist */
+      } else {
+        // check if the buffer in this window is in the arglist
         for (i = 0; i < opened_len; ++i) {
           if (i < alist->al_ga.ga_len
               && (AARGLIST(alist)[i].ae_fnum == buf->b_fnum
@@ -4483,7 +4570,7 @@ chk_modeline (
   char_u      *e;
   char_u      *linecopy;                /* local copy of any modeline found */
   int prev;
-  int vers;
+  intmax_t vers;
   int end;
   int retval = OK;
   char_u      *save_sourcing_name;
@@ -4502,7 +4589,10 @@ chk_modeline (
           e = s + 4;
         else
           e = s + 3;
-        vers = getdigits_int(&e);
+        if (getdigits_safe(&e, &vers) != OK) {
+          continue;
+        }
+
         if (*e == ':'
             && (s[0] != 'V'
                 || STRNCMP(skipwhite(e + 1), "set", 3) == 0)
@@ -4510,8 +4600,9 @@ chk_modeline (
                 || (VIM_VERSION_100 >= vers && isdigit(s[3]))
                 || (VIM_VERSION_100 < vers && s[3] == '<')
                 || (VIM_VERSION_100 > vers && s[3] == '>')
-                || (VIM_VERSION_100 == vers && s[3] == '=')))
+                || (VIM_VERSION_100 == vers && s[3] == '='))) {
           break;
+        }
       }
     }
     prev = *s;
@@ -4950,7 +5041,7 @@ int bufhl_add_hl(buf_T *buf,
   bufhl_vec_T* lineinfo = map_ref(linenr_T, bufhl_vec_T)(buf->b_bufhl_info,
                                                          lnum, true);
 
-  bufhl_hl_item_T *hlentry = kv_pushp(bufhl_hl_item_T, *lineinfo);
+  bufhl_hl_item_T *hlentry = kv_pushp(*lineinfo);
   hlentry->src_id = src_id;
   hlentry->hl_id = hl_id;
   hlentry->start = col_start;
@@ -5200,12 +5291,30 @@ wipe_buffer (
     int aucmd                   /* When TRUE trigger autocommands. */
 )
 {
-  if (buf->b_fnum == top_file_num - 1)
-    --top_file_num;
-
-  if (!aucmd)               /* Don't trigger BufDelete autocommands here. */
+  if (!aucmd) {
+    // Don't trigger BufDelete autocommands here.
     block_autocmds();
-  close_buffer(NULL, buf, DOBUF_WIPE, FALSE);
-  if (!aucmd)
+  }
+  close_buffer(NULL, buf, DOBUF_WIPE, false);
+  if (!aucmd) {
     unblock_autocmds();
+  }
+}
+
+/// Creates or switches to a scratch buffer. :h special-buffers
+/// Scratch buffer is:
+///   - buftype=nofile bufhidden=hide noswapfile
+///   - Always considered 'nomodified'
+///
+/// @param bufnr     Buffer to switch to, or 0 to create a new buffer.
+///
+/// @see curbufIsChanged()
+void buf_open_scratch(handle_T bufnr, char *bufname)
+{
+  (void)do_ecmd((int)bufnr, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
+  (void)setfname(curbuf, (char_u *)bufname, NULL, true);
+  set_option_value((char_u *)"bh", 0L, (char_u *)"hide", OPT_LOCAL);
+  set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
+  set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+  RESET_BINDING(curwin);
 }
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index d51a2f7dae..36cbec7e60 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -76,14 +76,14 @@ static inline void restore_win_for_buf(win_T *save_curwin,
   }
 }
 
-#define WITH_BUFFER(b, code)                                              \
-  do {                                                                    \
-    buf_T *save_curbuf = NULL;                                            \
-    win_T *save_curwin = NULL;                                            \
-    tabpage_T *save_curtab = NULL;                                        \
-    switch_to_win_for_buf(b, &save_curwin, &save_curtab, &save_curbuf);   \
-    code;                                                                 \
-    restore_win_for_buf(save_curwin, save_curtab, save_curbuf);           \
+#define WITH_BUFFER(b, code) \
+  do { \
+    buf_T *save_curbuf = NULL; \
+    win_T *save_curwin = NULL; \
+    tabpage_T *save_curtab = NULL; \
+    switch_to_win_for_buf(b, &save_curwin, &save_curtab, &save_curbuf); \
+    code; \
+    restore_win_for_buf(save_curwin, save_curtab, save_curbuf); \
   } while (0)
 
 
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 0324f6b88a..29f4dfe4fb 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -237,6 +237,8 @@ typedef struct {
 # define w_p_crb w_onebuf_opt.wo_crb    /* 'cursorbind' */
   int wo_crb_save;              /* 'cursorbind' state saved for diff mode*/
 # define w_p_crb_save w_onebuf_opt.wo_crb_save
+  char_u *wo_scl;
+# define w_p_scl w_onebuf_opt.wo_scl    // 'signcolumn'
 
   int wo_scriptID[WV_COUNT];            /* SIDs for window-local options */
 # define w_p_scriptID w_onebuf_opt.wo_scriptID
@@ -438,18 +440,23 @@ typedef struct {
   linenr_T b_sst_check_lnum;
   uint16_t b_sst_lasttick;      /* last display tick */
 
-  /* for spell checking */
-  garray_T b_langp;             /* list of pointers to slang_T, see spell.c */
-  bool b_spell_ismw[256];       /* flags: is midword char */
-  char_u      *b_spell_ismw_mb;   /* multi-byte midword chars */
-  char_u      *b_p_spc;         /* 'spellcapcheck' */
-  regprog_T   *b_cap_prog;      /* program for 'spellcapcheck' */
-  char_u      *b_p_spf;         /* 'spellfile' */
-  char_u      *b_p_spl;         /* 'spelllang' */
-  int b_cjk;                    /* all CJK letters as OK */
+  // for spell checking
+  garray_T b_langp;             // list of pointers to slang_T, see spell.c
+  bool b_spell_ismw[256];       // flags: is midword char
+  char_u      *b_spell_ismw_mb;  // multi-byte midword chars
+  char_u      *b_p_spc;         // 'spellcapcheck'
+  regprog_T   *b_cap_prog;      // program for 'spellcapcheck'
+  char_u      *b_p_spf;         // 'spellfile'
+  char_u      *b_p_spl;         // 'spelllang'
+  int b_cjk;                    // all CJK letters as OK
+  char_u b_syn_chartab[32];     // syntax iskeyword option
+  char_u *b_syn_isk;            // iskeyword option
 } synblock_T;
 
 
+#define BUF_HAS_QF_ENTRY 1
+#define BUF_HAS_LL_ENTRY 2
+
 /*
  * buffer: structure that holds information about one file
  *
@@ -459,9 +466,10 @@ typedef struct {
  */
 
 struct file_buffer {
-  uint64_t handle;              // unique identifier for the buffer
-  memline_T b_ml;               /* associated memline (also contains line
-                                   count) */
+  handle_T handle;              // unique id for the buffer (buffer number)
+#define b_fnum handle
+
+  memline_T b_ml;               // associated memline (also contains line count
 
   buf_T       *b_next;          /* links in list of buffers */
   buf_T       *b_prev;
@@ -485,11 +493,9 @@ struct file_buffer {
   bool file_id_valid;
   FileID file_id;
 
-  int b_fnum;                   /* buffer number for this file. */
-
-  bool b_changed;               /* 'modified': Set to true if something in the
-                                   file has been changed and not written out. */
-  int b_changedtick;            /* incremented for each change, also for undo */
+  int b_changed;                // 'modified': Set to true if something in the
+                                // file has been changed and not written out.
+  int b_changedtick;            // incremented for each change, also for undo
 
   bool b_saving;                /* Set to true if we are in the middle of
                                    saving the buffer. */
@@ -608,6 +614,7 @@ struct file_buffer {
   int b_p_bomb;                 ///< 'bomb'
   char_u *b_p_bh;               ///< 'bufhidden'
   char_u *b_p_bt;               ///< 'buftype'
+  int b_has_qf_entry;           ///< quickfix exists for buffer
   int b_p_bl;                   ///< 'buflisted'
   int b_p_cin;                  ///< 'cindent'
   char_u *b_p_cino;             ///< 'cinoptions'
@@ -654,7 +661,7 @@ struct file_buffer {
   long b_p_sts;                 ///< 'softtabstop'
   long b_p_sts_nopaste;         ///< b_p_sts saved for paste mode
   char_u *b_p_sua;              ///< 'suffixesadd'
-  bool b_p_swf;                 ///< 'swapfile'
+  int b_p_swf;                  ///< 'swapfile'
   long b_p_smc;                 ///< 'synmaxcol'
   char_u *b_p_syn;              ///< 'syntax'
   long b_p_ts;                  ///< 'tabstop'
@@ -770,7 +777,7 @@ struct file_buffer {
 /*
  * Stuff for diff mode.
  */
-# define DB_COUNT 4     /* up to four buffers can be diff'ed */
+# define DB_COUNT 8     // up to four buffers can be diff'ed
 
 /*
  * Each diffblock defines where a block of lines starts in each of the buffers
@@ -797,28 +804,27 @@ struct diffblock_S {
 # define SNAP_AUCMD_IDX 1
 # define SNAP_COUNT     2
 
-/*
- * Tab pages point to the top frame of each tab page.
- * Note: Most values are NOT valid for the current tab page!  Use "curwin",
- * "firstwin", etc. for that.  "tp_topframe" is always valid and can be
- * compared against "topframe" to find the current tab page.
- */
+/// Tab pages point to the top frame of each tab page.
+/// Note: Most values are NOT valid for the current tab page!  Use "curwin",
+/// "firstwin", etc. for that.  "tp_topframe" is always valid and can be
+/// compared against "topframe" to find the current tab page.
 typedef struct tabpage_S tabpage_T;
 struct tabpage_S {
-  uint64_t handle;
-  tabpage_T       *tp_next;         /* next tabpage or NULL */
-  frame_T         *tp_topframe;     /* topframe for the windows */
-  win_T           *tp_curwin;       /* current window in this Tab page */
-  win_T           *tp_prevwin;      /* previous window in this Tab page */
-  win_T           *tp_firstwin;     /* first window in this Tab page */
-  win_T           *tp_lastwin;      /* last window in this Tab page */
-  long tp_old_Rows;                 /* Rows when Tab page was left */
-  long tp_old_Columns;              /* Columns when Tab page was left */
-  long tp_ch_used;                  /* value of 'cmdheight' when frame size
-                                       was set */
+  handle_T handle;
+  tabpage_T       *tp_next;         ///< next tabpage or NULL
+  frame_T         *tp_topframe;     ///< topframe for the windows
+  win_T           *tp_curwin;       ///< current window in this Tab page
+  win_T           *tp_prevwin;      ///< previous window in this Tab page
+  win_T           *tp_firstwin;     ///< first window in this Tab page
+  win_T           *tp_lastwin;      ///< last window in this Tab page
+  long tp_old_Rows;                 ///< Rows when Tab page was left
+  long tp_old_Columns;              ///< Columns when Tab page was left
+  long tp_ch_used;                  ///< value of 'cmdheight' when frame size
+                                    ///< was set
+
   diff_T          *tp_first_diff;
   buf_T           *(tp_diffbuf[DB_COUNT]);
-  int tp_diff_invalid;              ///< list of diffs is outdated */
+  int tp_diff_invalid;              ///< list of diffs is outdated
   frame_T         *(tp_snapshot[SNAP_COUNT]);    ///< window layout snapshots
   dictitem_T tp_winvar;             ///< variable for "t:" Dictionary
   dict_T          *tp_vars;         ///< internal variables, local to tab page
@@ -877,16 +883,17 @@ struct frame_S {
  * match functions there is a different pattern for each window.
  */
 typedef struct {
-  regmmatch_T rm;       /* points to the regexp program; contains last found
-                           match (may continue in next line) */
-  buf_T       *buf;     /* the buffer to search for a match */
-  linenr_T lnum;        /* the line to search for a match */
-  int attr;             /* attributes to be used for a match */
-  int attr_cur;           /* attributes currently active in win_line() */
-  linenr_T first_lnum;          /* first lnum to search for multi-line pat */
-  colnr_T startcol;       /* in win_line() points to char where HL starts */
-  colnr_T endcol;        /* in win_line() points to char where HL ends */
-  proftime_T tm;        /* for a time limit */
+  regmmatch_T rm;       // points to the regexp program; contains last found
+                        // match (may continue in next line)
+  buf_T       *buf;     // the buffer to search for a match
+  linenr_T lnum;        // the line to search for a match
+  int attr;             // attributes to be used for a match
+  int attr_cur;         // attributes currently active in win_line()
+  linenr_T first_lnum;  // first lnum to search for multi-line pat
+  colnr_T startcol;     // in win_line() points to char where HL starts
+  colnr_T endcol;       // in win_line() points to char where HL ends
+  bool is_addpos;       // position specified directly by matchaddpos()
+  proftime_T tm;        // for a time limit
 } match_T;
 
 /// number of positions supported by matchaddpos()
@@ -934,9 +941,10 @@ struct matchitem {
  * All row numbers are relative to the start of the window, except w_winrow.
  */
 struct window_S {
-  uint64_t handle;
-  buf_T       *w_buffer;            /* buffer we are a window into (used
-                                       often, keep it the first item!) */
+  handle_T handle;                  ///< unique identifier for the window
+
+  buf_T       *w_buffer;            ///< buffer we are a window into (used
+                                    ///< often, keep it the first item!)
 
   synblock_T  *w_s;                 /* for :ownsyntax */
 
@@ -1034,11 +1042,11 @@ struct window_S {
    */
   int w_wrow, w_wcol;               /* cursor position in window */
 
-  linenr_T w_botline;               /* number of the line below the bottom of
-                                       the screen */
-  int w_empty_rows;                 /* number of ~ rows in window */
-  int w_filler_rows;                /* number of filler rows at the end of the
-                                       window */
+  linenr_T w_botline;               // number of the line below the bottom of
+                                    // the window
+  int w_empty_rows;                 // number of ~ rows in window
+  int w_filler_rows;                // number of filler rows at the end of the
+                                    // window
 
   /*
    * Info about the lines currently in the window is remembered to avoid
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index d0dc7b66fc..4d150c3230 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -19,10 +19,11 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
+#include "nvim/option.h"
 #include "nvim/os_unix.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/path.h"
 
@@ -43,20 +44,25 @@ static bool chartab_initialized = false;
 #define GET_CHARTAB(buf, c) \
     ((buf)->b_chartab[(unsigned)(c) >> 6] & (1ull << ((c) & 0x3f)))
 
-/// Fill chartab[].  Also fills curbuf->b_chartab[] with flags for keyword
+// Table used below, see init_chartab() for an explanation
+static char_u g_chartab[256];
+
+// Flags for g_chartab[].
+#define CT_CELL_MASK  0x07  ///< mask: nr of display cells (1, 2 or 4)
+#define CT_PRINT_CHAR 0x10  ///< flag: set for printable chars
+#define CT_ID_CHAR    0x20  ///< flag: set for ID chars
+#define CT_FNAME_CHAR 0x40  ///< flag: set for file name chars
+
+/// Fill g_chartab[].  Also fills curbuf->b_chartab[] with flags for keyword
 /// characters for current buffer.
 ///
 /// Depends on the option settings 'iskeyword', 'isident', 'isfname',
 /// 'isprint' and 'encoding'.
 ///
-/// The index in chartab[] depends on 'encoding':
-/// - For non-multi-byte index with the byte (same as the character).
-/// - For DBCS index with the first byte.
-/// - For UTF-8 index with the character (when first byte is up to 0x80 it is
-///   the same as the character, if the first byte is 0x80 and above it depends
-///   on further bytes).
+/// The index in g_chartab[] is the character when first byte is up to 0x80,
+/// if the first byte is 0x80 and above it depends on further bytes.
 ///
-/// The contents of chartab[]:
+/// The contents of g_chartab[]:
 /// - The lower two bits, masked by CT_CELL_MASK, give the number of display
 ///   cells the character occupies (1 or 2).  Not valid for UTF-8 above 0x80.
 /// - CT_PRINT_CHAR bit is set when the character is printable (no need to
@@ -94,41 +100,33 @@ int buf_init_chartab(buf_T *buf, int global)
     c = 0;
 
     while (c < ' ') {
-      chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2;
+      g_chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2;
     }
 
     while (c <= '~') {
-      chartab[c++] = 1 + CT_PRINT_CHAR;
+      g_chartab[c++] = 1 + CT_PRINT_CHAR;
     }
 
     if (p_altkeymap) {
       while (c < YE) {
-        chartab[c++] = 1 + CT_PRINT_CHAR;
+        g_chartab[c++] = 1 + CT_PRINT_CHAR;
       }
     }
 
     while (c < 256) {
-      if (enc_utf8 && (c >= 0xa0)) {
+      if (c >= 0xa0) {
         // UTF-8: bytes 0xa0 - 0xff are printable (latin1)
-        chartab[c++] = CT_PRINT_CHAR + 1;
-      } else if ((enc_dbcs == DBCS_JPNU) && (c == 0x8e)) {
-        // euc-jp characters starting with 0x8e are single width
-        chartab[c++] = CT_PRINT_CHAR + 1;
-      } else if ((enc_dbcs != 0) && (MB_BYTE2LEN(c) == 2)) {
-        // other double-byte chars can be printable AND double-width
-        chartab[c++] = CT_PRINT_CHAR + 2;
+        g_chartab[c++] = CT_PRINT_CHAR + 1;
       } else {
         // the rest is unprintable by default
-        chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2;
+        g_chartab[c++] = (dy_flags & DY_UHEX) ? 4 : 2;
       }
     }
 
     // Assume that every multi-byte char is a filename character.
-    for (c = 1; c < 256; ++c) {
-      if (((enc_dbcs != 0) && (MB_BYTE2LEN(c) > 1))
-          || ((enc_dbcs == DBCS_JPNU) && (c == 0x8e))
-          || (enc_utf8 && (c >= 0xa0))) {
-        chartab[c] |= CT_FNAME_CHAR;
+    for (c = 1; c < 256; c++) {
+      if (c >= 0xa0) {
+        g_chartab[c] |= CT_FNAME_CHAR;
       }
     }
   }
@@ -136,15 +134,6 @@ int buf_init_chartab(buf_T *buf, int global)
   // Init word char flags all to false
   memset(buf->b_chartab, 0, (size_t)32);
 
-  if (enc_dbcs != 0) {
-    for (c = 0; c < 256; ++c) {
-      // double-byte characters are probably word characters
-      if (MB_BYTE2LEN(c) == 2) {
-        SET_CHARTAB(buf, c);
-      }
-    }
-  }
-
   // In lisp mode the '-' character is included in keywords.
   if (buf->b_p_lisp) {
     SET_CHARTAB(buf, '-');
@@ -179,10 +168,8 @@ int buf_init_chartab(buf_T *buf, int global)
 
       if (ascii_isdigit(*p)) {
         c = getdigits_int(&p);
-      } else if (has_mbyte) {
-        c = mb_ptr2char_adv(&p);
       } else {
-        c = *p++;
+        c = mb_ptr2char_adv(&p);
       }
       c2 = -1;
 
@@ -191,10 +178,8 @@ int buf_init_chartab(buf_T *buf, int global)
 
         if (ascii_isdigit(*p)) {
           c2 = getdigits_int(&p);
-        } else if (has_mbyte) {
-          c2 = mb_ptr2char_adv(&p);
         } else {
-          c2 = *p++;
+          c2 = mb_ptr2char_adv(&p);
         }
       }
 
@@ -231,9 +216,9 @@ int buf_init_chartab(buf_T *buf, int global)
           if (i == 0) {
             // (re)set ID flag
             if (tilde) {
-              chartab[c] &= (uint8_t)~CT_ID_CHAR;
+              g_chartab[c] &= (uint8_t)~CT_ID_CHAR;
             } else {
-              chartab[c] |= CT_ID_CHAR;
+              g_chartab[c] |= CT_ID_CHAR;
             }
           } else if (i == 1) {
             // (re)set printable
@@ -241,23 +226,22 @@ int buf_init_chartab(buf_T *buf, int global)
             // that we can detect it from the first byte.
             if (((c < ' ')
                  || (c > '~')
-                 || (p_altkeymap && (F_isalpha(c) || F_isdigit(c))))
-                && !(enc_dbcs && (MB_BYTE2LEN(c) == 2))) {
+                 || (p_altkeymap && (F_isalpha(c) || F_isdigit(c))))) {
               if (tilde) {
-                chartab[c] = (uint8_t)((chartab[c] & ~CT_CELL_MASK)
-                                       + ((dy_flags & DY_UHEX) ? 4 : 2));
-                chartab[c] &= (uint8_t)~CT_PRINT_CHAR;
+                g_chartab[c] = (uint8_t)((g_chartab[c] & ~CT_CELL_MASK)
+                                         + ((dy_flags & DY_UHEX) ? 4 : 2));
+                g_chartab[c] &= (uint8_t)~CT_PRINT_CHAR;
               } else {
-                chartab[c] = (uint8_t)((chartab[c] & ~CT_CELL_MASK) + 1);
-                chartab[c] |= CT_PRINT_CHAR;
+                g_chartab[c] = (uint8_t)((g_chartab[c] & ~CT_CELL_MASK) + 1);
+                g_chartab[c] |= CT_PRINT_CHAR;
               }
             }
           } else if (i == 2) {
             // (re)set fname flag
             if (tilde) {
-              chartab[c] &= (uint8_t)~CT_FNAME_CHAR;
+              g_chartab[c] &= (uint8_t)~CT_FNAME_CHAR;
             } else {
-              chartab[c] |= CT_FNAME_CHAR;
+              g_chartab[c] |= CT_FNAME_CHAR;
             }
           } else {  // i == 3
             // (re)set keyword flag
@@ -303,7 +287,7 @@ void trans_characters(char_u *buf, int bufsize)
 
   while (*buf != 0) {
     // Assume a multi-byte character doesn't need translation.
-    if (has_mbyte && ((trs_len = (*mb_ptr2len)(buf)) > 1)) {
+    if ((trs_len = (*mb_ptr2len)(buf)) > 1) {
       len -= trs_len;
     } else {
       trs = transchar_byte(*buf);
@@ -337,44 +321,40 @@ char_u *transstr(char_u *s) FUNC_ATTR_NONNULL_RET
   size_t l;
   char_u hexbuf[11];
 
-  if (has_mbyte) {
-    // Compute the length of the result, taking account of unprintable
-    // multi-byte characters.
-    size_t len = 0;
-    p = s;
+  // Compute the length of the result, taking account of unprintable
+  // multi-byte characters.
+  size_t len = 0;
+  p = s;
 
-    while (*p != NUL) {
-      if ((l = (size_t)(*mb_ptr2len)(p)) > 1) {
-        c = (*mb_ptr2char)(p);
-        p += l;
+  while (*p != NUL) {
+    if ((l = (size_t)(*mb_ptr2len)(p)) > 1) {
+      c = (*mb_ptr2char)(p);
+      p += l;
 
-        if (vim_isprintc(c)) {
-          len += l;
-        } else {
-          transchar_hex(hexbuf, c);
-          len += STRLEN(hexbuf);
-        }
+      if (vim_isprintc(c)) {
+        len += l;
       } else {
-        l = (size_t)byte2cells(*p++);
+        transchar_hex(hexbuf, c);
+        len += STRLEN(hexbuf);
+      }
+    } else {
+      l = (size_t)byte2cells(*p++);
 
-        if (l > 0) {
-          len += l;
-        } else {
-          // illegal byte sequence
-          len += 4;
-        }
+      if (l > 0) {
+        len += l;
+      } else {
+        // illegal byte sequence
+        len += 4;
       }
     }
-    res = xmallocz(len);
-  } else {
-    res = xmallocz((size_t)vim_strsize(s));
   }
+  res = xmallocz(len);
 
   *res = NUL;
   p = s;
 
   while (*p != NUL) {
-    if (has_mbyte && ((l = (size_t)(*mb_ptr2len)(p)) > 1)) {
+    if ((l = (size_t)(*mb_ptr2len)(p)) > 1) {
       c = (*mb_ptr2char)(p);
 
       if (vim_isprintc(c)) {
@@ -433,68 +413,58 @@ char_u* str_foldcase(char_u *str, int orglen, char_u *buf, int buflen)
   // Make each character lower case.
   i = 0;
   while (STR_CHAR(i) != NUL) {
-    if (enc_utf8 || (has_mbyte && (MB_BYTE2LEN(STR_CHAR(i)) > 1))) {
-      if (enc_utf8) {
-        int c = utf_ptr2char(STR_PTR(i));
-        int olen = utf_ptr2len(STR_PTR(i));
-        int lc = utf_tolower(c);
-
-        // Only replace the character when it is not an invalid
-        // sequence (ASCII character or more than one byte) and
-        // utf_tolower() doesn't return the original character.
-        if (((c < 0x80) || (olen > 1)) && (c != lc)) {
-          int nlen = utf_char2len(lc);
-
-          // If the byte length changes need to shift the following
-          // characters forward or backward.
-          if (olen != nlen) {
-            if (nlen > olen) {
-              if (buf == NULL) {
-                ga_grow(&ga, nlen - olen + 1);
-              } else {
-                if (len + nlen - olen >= buflen) {
-                  // out of memory, keep old char
-                  lc = c;
-                  nlen = olen;
-                }
-              }
-            }
-
-            if (olen != nlen) {
-              if (buf == NULL) {
-                STRMOVE(GA_PTR(i) + nlen, GA_PTR(i) + olen);
-                ga.ga_len += nlen - olen;
-              } else {
-                STRMOVE(buf + i + nlen, buf + i + olen);
-                len += nlen - olen;
-              }
+    int c = utf_ptr2char(STR_PTR(i));
+    int olen = utf_ptr2len(STR_PTR(i));
+    int lc = utf_tolower(c);
+
+    // Only replace the character when it is not an invalid
+    // sequence (ASCII character or more than one byte) and
+    // utf_tolower() doesn't return the original character.
+    if (((c < 0x80) || (olen > 1)) && (c != lc)) {
+      int nlen = utf_char2len(lc);
+
+      // If the byte length changes need to shift the following
+      // characters forward or backward.
+      if (olen != nlen) {
+        if (nlen > olen) {
+          if (buf == NULL) {
+            ga_grow(&ga, nlen - olen + 1);
+          } else {
+            if (len + nlen - olen >= buflen) {
+              // out of memory, keep old char
+              lc = c;
+              nlen = olen;
             }
           }
-          (void)utf_char2bytes(lc, STR_PTR(i));
         }
-      }
 
-      // skip to next multi-byte char
-      i += (*mb_ptr2len)(STR_PTR(i));
-    } else {
-      if (buf == NULL) {
-        GA_CHAR(i) = (char_u)TOLOWER_LOC(GA_CHAR(i));
-      } else {
-        buf[i] = (char_u)TOLOWER_LOC(buf[i]);
+        if (olen != nlen) {
+          if (buf == NULL) {
+            STRMOVE(GA_PTR(i) + nlen, GA_PTR(i) + olen);
+            ga.ga_len += nlen - olen;
+          } else {
+            STRMOVE(buf + i + nlen, buf + i + olen);
+            len += nlen - olen;
+          }
+        }
       }
-      ++i;
+      (void)utf_char2bytes(lc, STR_PTR(i));
     }
+
+    // skip to next multi-byte char
+    i += (*mb_ptr2len)(STR_PTR(i));
   }
 
+
   if (buf == NULL) {
     return (char_u *)ga.ga_data;
   }
   return buf;
 }
 
-// Catch 22: chartab[] can't be initialized before the options are
+// Catch 22: g_chartab[] can't be initialized before the options are
 // initialized, and initializing options may cause transchar() to be called!
-// When chartab_initialized == false don't use chartab[].
+// When chartab_initialized == false don't use g_chartab[].
 // Does NOT work for multi-byte characters, c must be <= 255.
 // Also doesn't work for the first byte of a multi-byte, "c" must be a
 // character!
@@ -535,7 +505,7 @@ char_u* transchar(int c)
 /// @return pointer to translated character in transchar_buf.
 char_u* transchar_byte(int c)
 {
-  if (enc_utf8 && (c >= 0x80)) {
+  if (c >= 0x80) {
     transchar_nonprint(transchar_buf, c);
     return transchar_buf;
   }
@@ -568,7 +538,7 @@ void transchar_nonprint(char_u *buf, int c)
     buf[1] = (char_u)(c ^ 0x40);
 
     buf[2] = NUL;
-  } else if (enc_utf8 && (c >= 0x80)) {
+  } else if (c >= 0x80) {
     transchar_hex(buf, c);
   } else if ((c >= ' ' + 0x80) && (c <= '~' + 0x80)) {
     // 0xa0 - 0xfe
@@ -622,18 +592,18 @@ static unsigned nr2hex(unsigned c)
 /// Caller must make sure 0 <= b <= 255.
 /// For multi-byte mode "b" must be the first byte of a character.
 /// A TAB is counted as two cells: "^I".
-/// For UTF-8 mode this will return 0 for bytes >= 0x80, because the number of
-/// cells depends on further bytes.
+/// This will return 0 for bytes >= 0x80, because the number of
+/// cells depends on further bytes in UTF-8.
 ///
 /// @param b
 ///
 /// @reeturn Number of display cells.
 int byte2cells(int b)
 {
-  if (enc_utf8 && (b >= 0x80)) {
+  if (b >= 0x80) {
     return 0;
   }
-  return chartab[b] & CT_CELL_MASK;
+  return g_chartab[b] & CT_CELL_MASK;
 }
 
 /// Return number of display cells occupied by character "c".
@@ -652,20 +622,9 @@ int char2cells(int c)
 
   if (c >= 0x80) {
     // UTF-8: above 0x80 need to check the value
-    if (enc_utf8) {
-      return utf_char2cells(c);
-    }
-
-    // DBCS: double-byte means double-width, except for euc-jp with first
-    // byte 0x8e
-    if ((enc_dbcs != 0) && (c >= 0x100)) {
-      if ((enc_dbcs == DBCS_JPNU) && (((unsigned)c >> 8) == 0x8e)) {
-        return 1;
-      }
-      return 2;
-    }
+    return utf_char2cells(c);
   }
-  return chartab[c & 0xff] & CT_CELL_MASK;
+  return g_chartab[c & 0xff] & CT_CELL_MASK;
 }
 
 /// Return number of display cells occupied by character at "*p".
@@ -677,12 +636,12 @@ int char2cells(int c)
 int ptr2cells(char_u *p)
 {
   // For UTF-8 we need to look at more bytes if the first byte is >= 0x80.
-  if (enc_utf8 && (*p >= 0x80)) {
+  if (*p >= 0x80) {
     return utf_ptr2cells(p);
   }
 
   // For DBCS we can tell the cell count from the first byte.
-  return chartab[*p] & CT_CELL_MASK;
+  return g_chartab[*p] & CT_CELL_MASK;
 }
 
 /// Return the number of character cells string "s" will take on the screen,
@@ -712,14 +671,10 @@ int vim_strnsize(char_u *s, int len)
   assert(s != NULL);
   int size = 0;
   while (*s != NUL && --len >= 0) {
-    if (has_mbyte) {
-      int l = (*mb_ptr2len)(s);
-      size += ptr2cells(s);
-      s += l;
-      len -= l - 1;
-    } else {
-      size += byte2cells(*s++);
-    }
+    int l = (*mb_ptr2len)(s);
+    size += ptr2cells(s);
+    s += l;
+    len -= l - 1;
   }
   return size;
 }
@@ -806,7 +761,7 @@ unsigned int win_linetabsize(win_T *wp, char_u *line, colnr_T len)
 bool vim_isIDc(int c)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  return c > 0 && c < 0x100 && (chartab[c] & CT_ID_CHAR);
+  return c > 0 && c < 0x100 && (g_chartab[c] & CT_ID_CHAR);
 }
 
 /// Check that "c" is a keyword character:
@@ -830,13 +785,7 @@ bool vim_iswordc_buf(int c, buf_T *buf)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(2)
 {
   if (c >= 0x100) {
-    if (enc_dbcs != 0) {
-      return dbcs_class((unsigned)c >> 8, (unsigned)(c & 0xff)) >= 2;
-    }
-
-    if (enc_utf8) {
-      return utf_class(c) >= 2;
-    }
+    return utf_class(c) >= 2;
   }
   return c > 0 && c < 0x100 && GET_CHARTAB(buf, c) != 0;
 }
@@ -849,7 +798,7 @@ bool vim_iswordc_buf(int c, buf_T *buf)
 bool vim_iswordp(char_u *p)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
-  if (has_mbyte && (MB_BYTE2LEN(*p) > 1)) {
+  if (MB_BYTE2LEN(*p) > 1) {
     return mb_get_class(p) >= 2;
   }
   return GET_CHARTAB(curbuf, *p) != 0;
@@ -865,7 +814,7 @@ bool vim_iswordp(char_u *p)
 bool vim_iswordp_buf(char_u *p, buf_T *buf)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
-  if (has_mbyte && (MB_BYTE2LEN(*p) > 1)) {
+  if (MB_BYTE2LEN(*p) > 1) {
     return mb_get_class(p) >= 2;
   }
   return GET_CHARTAB(buf, *p) != 0;
@@ -878,7 +827,7 @@ bool vim_iswordp_buf(char_u *p, buf_T *buf)
 bool vim_isfilec(int c)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  return c >= 0x100 || (c > 0 && (chartab[c] & CT_FNAME_CHAR));
+  return c >= 0x100 || (c > 0 && (g_chartab[c] & CT_FNAME_CHAR));
 }
 
 /// Check that "c" is a valid file-name character or a wildcard character
@@ -903,10 +852,10 @@ bool vim_isfilec_or_wc(int c)
 bool vim_isprintc(int c)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  if (enc_utf8 && (c >= 0x100)) {
+  if (c >= 0x100) {
     return utf_printable(c);
   }
-  return c >= 0x100 || (c > 0 && (chartab[c] & CT_PRINT_CHAR));
+  return c >= 0x100 || (c > 0 && (g_chartab[c] & CT_PRINT_CHAR));
 }
 
 /// Strict version of vim_isprintc(c), don't return true if "c" is the head
@@ -918,14 +867,10 @@ bool vim_isprintc(int c)
 bool vim_isprintc_strict(int c)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  if ((enc_dbcs != 0) && (c < 0x100) && (MB_BYTE2LEN(c) > 1)) {
-    return false;
-  }
-
-  if (enc_utf8 && (c >= 0x100)) {
+  if (c >= 0x100) {
     return utf_printable(c);
   }
-  return c >= 0x100 || (c > 0 && (chartab[c] & CT_PRINT_CHAR));
+  return c > 0 && (g_chartab[c] & CT_PRINT_CHAR);
 }
 
 /// like chartabsize(), but also check for line breaks on the screen
@@ -1042,8 +987,7 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he
         break;
       }
     }
-  } else if (has_mbyte
-             && (size == 2)
+  } else if ((size == 2)
              && (MB_BYTE2LEN(*s) > 1)
              && wp->w_p_wrap
              && in_win_border(wp, col)) {
@@ -1241,27 +1185,23 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor,
       if (c == TAB) {
         incr = ts - (vcol % ts);
       } else {
-        if (has_mbyte) {
-          // For utf-8, if the byte is >= 0x80, need to look at
-          // further bytes to find the cell width.
-          if (enc_utf8 && (c >= 0x80)) {
-            incr = utf_ptr2cells(ptr);
-          } else {
-            incr = CHARSIZE(c);
-          }
-
-          // If a double-cell char doesn't fit at the end of a line
-          // it wraps to the next line, it's like this char is three
-          // cells wide.
-          if ((incr == 2)
-              && wp->w_p_wrap
-              && (MB_BYTE2LEN(*ptr) > 1)
-              && in_win_border(wp, vcol)) {
-            ++incr;
-            head = 1;
-          }
+        // For utf-8, if the byte is >= 0x80, need to look at
+        // further bytes to find the cell width.
+        if (c >= 0x80) {
+          incr = utf_ptr2cells(ptr);
         } else {
-          incr = CHARSIZE(c);
+          incr = g_chartab[c] & CT_CELL_MASK;
+        }
+
+        // If a double-cell char doesn't fit at the end of a line
+        // it wraps to the next line, it's like this char is three
+        // cells wide.
+        if ((incr == 2)
+            && wp->w_p_wrap
+            && (MB_BYTE2LEN(*ptr) > 1)
+            && in_win_border(wp, vcol)) {
+          incr++;
+          head = 1;
         }
       }
 
@@ -1547,64 +1487,19 @@ char_u* skiptohex(char_u *q)
 // islower()/toupper() etc. do not work properly: they crash when used with
 // invalid values or can't handle latin1 when the locale is C.
 // Speed is most important here.
-#define LATIN1LOWER 'l'
-#define LATIN1UPPER 'U'
-
-static char_u latin1flags[257] =
-    "                                                                "
-    " UUUUUUUUUUUUUUUUUUUUUUUUUU      llllllllllllllllllllllllll     "
-    "                                                                "
-    "UUUUUUUUUUUUUUUUUUUUUUU UUUUUUUllllllllllllllllllllllll llllllll";
-static char_u latin1upper[257] =
-    "                                 !\"#$%&'()*+,-./0123456789:;<=>"
-    "?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~"
-    "\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e"
-    "\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e"
-    "\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae"
-    "\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe"
-    "\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce"
-    "\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde"
-    "\xdf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce"
-    "\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xf7\xd8\xd9\xda\xdb\xdc\xdd\xde\xff";
-static char_u latin1lower[257] =
-    "                                 !\"#$%&'()*+,-./0123456789:;<=>"
-    "?@abcdefghijklmnopqrstuvwxyz[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
-    "\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e"
-    "\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e"
-    "\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae"
-    "\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe"
-    "\xbf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee"
-    "\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xd7\xf8\xf9\xfa\xfb\xfc\xfd\xfe"
-    "\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee"
-    "\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff";
 
 /// Check that the character is lower-case
 ///
 /// @param  c  character to check
 bool vim_islower(int c)
-  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
   if (c <= '@') {
     return false;
   }
 
   if (c >= 0x80) {
-    if (enc_utf8) {
-      return utf_islower(c);
-    }
-
-    if (c >= 0x100) {
-      if (has_mbyte) {
-        return iswlower((wint_t)c);
-      }
-
-      // islower() can't handle these chars and may crash
-      return false;
-    }
-
-    if (enc_latin1like) {
-      return (latin1flags[c] & LATIN1LOWER) == LATIN1LOWER;
-    }
+    return utf_islower(c);
   }
   return islower(c);
 }
@@ -1613,29 +1508,14 @@ bool vim_islower(int c)
 ///
 /// @param  c  character to check
 bool vim_isupper(int c)
-  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
   if (c <= '@') {
     return false;
   }
 
   if (c >= 0x80) {
-    if (enc_utf8) {
       return utf_isupper(c);
-    }
-
-    if (c >= 0x100) {
-      if (has_mbyte) {
-        return iswupper((wint_t)c);
-      }
-
-      // isupper() can't handle these chars and may crash
-      return false;
-    }
-
-    if (enc_latin1like) {
-      return (latin1flags[c] & LATIN1UPPER) == LATIN1UPPER;
-    }
   }
   return isupper(c);
 }
@@ -1647,22 +1527,7 @@ int vim_toupper(int c)
   }
 
   if (c >= 0x80) {
-    if (enc_utf8) {
-      return utf_toupper(c);
-    }
-
-    if (c >= 0x100) {
-      if (has_mbyte) {
-        return (int)towupper((wint_t)c);
-      }
-
-      // toupper() can't handle these chars and may crash
-      return c;
-    }
-
-    if (enc_latin1like) {
-      return latin1upper[c];
-    }
+    return utf_toupper(c);
   }
   return TOUPPER_LOC(c);
 }
@@ -1674,22 +1539,7 @@ int vim_tolower(int c)
   }
 
   if (c >= 0x80) {
-    if (enc_utf8) {
-      return utf_tolower(c);
-    }
-
-    if (c >= 0x100) {
-      if (has_mbyte) {
-        return (int)towlower((wint_t)c);
-      }
-
-      // tolower() can't handle these chars and may crash
-      return c;
-    }
-
-    if (enc_latin1like) {
-      return latin1lower[c];
-    }
+    return utf_tolower(c);
   }
   return TOLOWER_LOC(c);
 }
@@ -1722,6 +1572,26 @@ char_u* skiptowhite_esc(char_u *p) {
   return p;
 }
 
+/// Get a number from a string and skip over it, signalling overflows
+///
+/// @param[out]  pp  A pointer to a pointer to char_u.
+///                  It will be advanced past the read number.
+/// @param[out]  nr  Number read from the string.
+///
+/// @return OK on success, FAIL on error/overflow
+int getdigits_safe(char_u **pp, intmax_t *nr)
+{
+  errno = 0;
+  *nr = strtoimax((char *)(*pp), (char **)pp, 10);
+
+  if ((*nr == INTMAX_MIN || *nr == INTMAX_MAX)
+      && errno == ERANGE) {
+    return FAIL;
+  }
+
+  return OK;
+}
+
 /// Get a number from a string and skip over it.
 ///
 /// @param[out]  pp  A pointer to a pointer to char_u.
@@ -1730,14 +1600,16 @@ char_u* skiptowhite_esc(char_u *p) {
 /// @return Number read from the string.
 intmax_t getdigits(char_u **pp)
 {
-  intmax_t number = strtoimax((char *)*pp, (char **)pp, 10);
-  assert(errno != ERANGE);
+  intmax_t number;
+  int ret = getdigits_safe(pp, &number);
+
+  (void)ret;  // Avoid "unused variable" warning in Release build
+  assert(ret == OK);
+
   return number;
 }
 
-/// Get an int number from a string.
-///
-/// A getdigits wrapper restricted to int values.
+/// Get an int number from a string. Like getdigits(), but restricted to `int`.
 int getdigits_int(char_u **pp)
 {
   intmax_t number = getdigits(pp);
@@ -1747,9 +1619,7 @@ int getdigits_int(char_u **pp)
   return (int)number;
 }
 
-/// Get a long number from a string.
-///
-/// A getdigits wrapper restricted to long values.
+/// Get a long number from a string. Like getdigits(), but restricted to `long`.
 long getdigits_long(char_u **pp)
 {
   intmax_t number = getdigits(pp);
diff --git a/src/nvim/charset.h b/src/nvim/charset.h
index 995ad123ae..78d6f2a76c 100644
--- a/src/nvim/charset.h
+++ b/src/nvim/charset.h
@@ -1,14 +1,6 @@
 #ifndef NVIM_CHARSET_H
 #define NVIM_CHARSET_H
 
-/*
- * Flags for chartab[].
- */
-#define CT_CELL_MASK    0x07    /* mask: nr of display cells (1, 2 or 4) */
-#define CT_PRINT_CHAR   0x10    /* flag: set for printable chars */
-#define CT_ID_CHAR      0x20    /* flag: set for ID chars */
-#define CT_FNAME_CHAR   0x40    /* flag: set for file name chars */
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "charset.h.generated.h"
 #endif
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index afaa6022c9..3ba9da34f2 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -9,6 +9,7 @@
 #include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/screen.h"
+#include "nvim/state.h"
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 
diff --git a/src/nvim/cursor.h b/src/nvim/cursor.h
index 09cc5a813c..1cbe8a609e 100644
--- a/src/nvim/cursor.h
+++ b/src/nvim/cursor.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
-#include "nvim/misc2.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "cursor.h.generated.h"
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 87425ca567..b50462664c 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -3,7 +3,6 @@
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/cursor_shape.h"
-#include "nvim/misc2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/charset.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 4826e70727..f7b96ba3e1 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -21,7 +21,6 @@
 #include "nvim/memline.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
@@ -907,8 +906,7 @@ void ex_diffpatch(exarg_T *eap)
     eval_patch((char *) tmp_orig, (char *) eap->arg, (char *) tmp_new);
 #endif  // ifdef UNIX
   } else {
-    // Build the patch command and execute it. Ignore errors. Switch to
-    // cooked mode to allow the user to respond to prompts.
+    // Build the patch command and execute it. Ignore errors.
 #ifdef UNIX
     vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
                  tmp_new, tmp_orig, fullname != NULL ? fullname : eap->arg);
@@ -916,8 +914,7 @@ void ex_diffpatch(exarg_T *eap)
     vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
                  tmp_new, tmp_orig, eap->arg);
 #endif  // ifdef UNIX
-    // Avoid ShellCmdPost stuff
-    block_autocmds();
+    block_autocmds();  // Avoid ShellCmdPost stuff
     (void)call_shell(buf, kShellOptFilter, NULL);
     unblock_autocmds();
   }
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 9525024c1b..6ba6e659a6 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -17,7 +17,6 @@
 #include "nvim/getchar.h"
 #include "nvim/mbyte.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/garray.h"
 #include "nvim/normal.h"
@@ -1691,8 +1690,11 @@ static void printdigraph(digr_T *dp)
       msg_putchar('\n');
     }
 
-    if (msg_col) {
-      while (msg_col % list_width != 0) {
+
+    // Make msg_col a multiple of list_width by using spaces.
+    if (msg_col % list_width != 0) {
+      int spaces = (msg_col / list_width + 1) * list_width - msg_col;
+      while (spaces--) {
         msg_putchar(' ');
       }
     }
@@ -1757,12 +1759,12 @@ char_u* keymap_init(void)
     vim_snprintf(buf, buflen, "keymap/%s_%s.vim",
                  curbuf->b_p_keymap, p_enc);
 
-    if (source_runtime((char_u *)buf, FALSE) == FAIL) {
+    if (source_runtime((char_u *)buf, 0) == FAIL) {
       // try finding "keymap/'keymap'.vim" in 'runtimepath'
       vim_snprintf(buf, buflen, "keymap/%s.vim",
                    curbuf->b_p_keymap);
 
-      if (source_runtime((char_u *)buf, FALSE) == FAIL) {
+      if (source_runtime((char_u *)buf, 0) == FAIL) {
         xfree(buf);
         return (char_u *)N_("E544: Keymap file not found");
       }
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index e131da8fe0..95c33916f1 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -29,7 +29,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
@@ -463,6 +462,7 @@ static void insert_enter(InsertState *s)
     o_lnum = curwin->w_cursor.lnum;
   }
 
+  foldUpdateAfterInsert();
   if (s->cmdchar != 'r' && s->cmdchar != 'v') {
     apply_autocmds(EVENT_INSERTLEAVE, NULL, NULL, false, curbuf);
   }
@@ -474,7 +474,9 @@ static int insert_check(VimState *state)
   InsertState *s = (InsertState *)state;
 
   // If typed something may trigger CursorHoldI again.
-  if (s->c != K_EVENT) {
+  if (s->c != K_EVENT
+      // but not in CTRL-X mode, a script can't restore the state
+      && ctrl_x_mode == 0) {
     did_cursorhold = false;
   }
 
@@ -501,7 +503,7 @@ static int insert_check(VimState *state)
     Insstart_orig = Insstart;
   }
 
-  if (stop_insert_mode) {
+  if (stop_insert_mode && !pum_visible()) {
     // ":stopinsert" used or 'insertmode' reset
     s->count = 0;
     return 0;  // exit insert mode
@@ -664,11 +666,12 @@ static int insert_execute(VimState *state, int key)
 
       // Pressing CTRL-Y selects the current match.  When
       // compl_enter_selects is set the Enter key does the same.
-      if (s->c == Ctrl_Y
-          || (compl_enter_selects
-            && (s->c == CAR || s->c == K_KENTER || s->c == NL))) {
+      if ((s->c == Ctrl_Y
+           || (compl_enter_selects
+               && (s->c == CAR || s->c == K_KENTER || s->c == NL)))
+          && stop_arrow() == OK) {
         ins_compl_delete();
-        ins_compl_insert();
+        ins_compl_insert(false);
       }
     }
   }
@@ -961,7 +964,7 @@ static int insert_handle_key(InsertState *s)
     break;
 
   case K_EVENT:       // some event
-    queue_process_events(loop.events);
+    multiqueue_process_events(main_loop.events);
     break;
 
   case K_FOCUSGAINED:  // Neovim has been given focus
@@ -1285,10 +1288,9 @@ bool edit(int cmdchar, bool startln, long count)
 {
   if (curbuf->terminal) {
     if (ex_normal_busy) {
-      // don't enter terminal mode from `ex_normal`, which can result in all
-      // kinds of havoc(such as terminal mode recursiveness). Instead, set a
-      // flag that allow us to force-set the value of `restart_edit` before
-      // `ex_normal` returns
+      // Do not enter terminal mode from ex_normal(), which would cause havoc
+      // (such as terminal-mode recursiveness). Instead set a flag to force-set
+      // the value of `restart_edit` before `ex_normal` returns.
       restart_edit = 'i';
       force_restart_edit = true;
     } else {
@@ -2322,7 +2324,6 @@ static int ins_compl_make_cyclic(void)
   return count;
 }
 
-
 // Set variables that store noselect and noinsert behavior from the
 // 'completeopt' value.
 void completeopt_was_set(void)
@@ -2351,9 +2352,6 @@ void set_completion(colnr_T startcol, list_T *list)
   }
   ins_compl_clear();
 
-  if (stop_arrow() == FAIL)
-    return;
-
   compl_direction = FORWARD;
   if (startcol > curwin->w_cursor.col)
     startcol = curwin->w_cursor.col;
@@ -2385,6 +2383,7 @@ void set_completion(colnr_T startcol, list_T *list)
   } else {
     ins_complete(Ctrl_N, false);
   }
+  compl_enter_selects = compl_no_insert;
 
   // Lazily show the popup menu, unless we got interrupted.
   if (!compl_interrupted) {
@@ -2471,6 +2470,7 @@ void ins_compl_show_pum(void)
   int cur = -1;
   colnr_T col;
   int lead_len = 0;
+  bool array_changed = false;
 
   if (!pum_wanted() || !pum_enough_matches())
     return;
@@ -2482,7 +2482,8 @@ void ins_compl_show_pum(void)
   update_screen(0);
 
   if (compl_match_array == NULL) {
-    /* Need to build the popup menu list. */
+    array_changed = true;
+    // Need to build the popup menu list.
     compl_match_arraysize = 0;
     compl = compl_first_match;
     /*
@@ -2585,7 +2586,7 @@ void ins_compl_show_pum(void)
   // Use the cursor to get all wrapping and other settings right.
   col = curwin->w_cursor.col;
   curwin->w_cursor.col = compl_col;
-  pum_display(compl_match_array, compl_match_arraysize, cur);
+  pum_display(compl_match_array, compl_match_arraysize, cur, array_changed);
   curwin->w_cursor.col = col;
 }
 
@@ -2775,7 +2776,7 @@ static void ins_compl_files(int count, char_u **files, int thesaurus, int flags,
           break;
       }
       line_breakcheck();
-      ins_compl_check_keys(50);
+      ins_compl_check_keys(50, false);
     }
     fclose(fp);
   }
@@ -3261,14 +3262,19 @@ static bool ins_compl_prep(int c)
       } else {
         int prev_col = curwin->w_cursor.col;
 
-        /* put the cursor on the last char, for 'tw' formatting */
-        if (prev_col > 0)
+        // put the cursor on the last char, for 'tw' formatting
+        if (prev_col > 0) {
           dec_cursor();
-        if (stop_arrow() == OK)
+        }
+
+        if (!arrow_used && !ins_need_undo && c != Ctrl_E) {
           insertchar(NUL, 0, -1);
+        }
+
         if (prev_col > 0
-            && get_cursor_line_ptr()[curwin->w_cursor.col] != NUL)
+            && get_cursor_line_ptr()[curwin->w_cursor.col] != NUL) {
           inc_cursor();
+        }
       }
 
       // If the popup menu is displayed pressing CTRL-Y means accepting
@@ -3280,7 +3286,8 @@ static bool ins_compl_prep(int c)
         retval = true;
       }
 
-      /* CTRL-E means completion is Ended, go back to the typed text. */
+      // CTRL-E means completion is Ended, go back to the typed text.
+      // but only do this, if the Popup is still visible
       if (c == Ctrl_E) {
         ins_compl_delete();
         if (compl_leader != NULL) {
@@ -3529,21 +3536,15 @@ int ins_compl_add_tv(typval_T *tv, int dir)
   char_u      *(cptext[CPT_COUNT]);
 
   if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL) {
-    word = get_dict_string(tv->vval.v_dict, (char_u *)"word", FALSE);
-    cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict,
-        (char_u *)"abbr", FALSE);
-    cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict,
-        (char_u *)"menu", FALSE);
-    cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict,
-        (char_u *)"kind", FALSE);
-    cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict,
-        (char_u *)"info", FALSE);
-    if (get_dict_string(tv->vval.v_dict, (char_u *)"icase", FALSE) != NULL)
-      icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
-    if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
-      adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
-    if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL)
-      aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty");
+    word = get_dict_string(tv->vval.v_dict, "word", false);
+    cptext[CPT_ABBR] = get_dict_string(tv->vval.v_dict, "abbr", false);
+    cptext[CPT_MENU] = get_dict_string(tv->vval.v_dict, "menu", false);
+    cptext[CPT_KIND] = get_dict_string(tv->vval.v_dict, "kind", false);
+    cptext[CPT_INFO] = get_dict_string(tv->vval.v_dict, "info", false);
+
+    icase = get_dict_number(tv->vval.v_dict, "icase");
+    adup = get_dict_number(tv->vval.v_dict, "dup");
+    aempty = get_dict_number(tv->vval.v_dict, "empty");
   } else {
     word = get_tv_string_chk(tv);
     memset(cptext, 0, sizeof(cptext));
@@ -3846,13 +3847,11 @@ static int ins_compl_get_exp(pos_T *ini)
           if ((compl_cont_status & CONT_ADDING)
               && len == compl_length) {
             if (pos->lnum < ins_buf->b_ml.ml_line_count) {
-              /* Try next line, if any. the new word will be
-               * "join" as if the normal command "J" was used.
-               * IOSIZE is always greater than
-               * compl_length, so the next STRNCPY always
-               * works -- Acevedo */
+              // Try next line, if any. the new word will be "join" as if the
+              // normal command "J" was used. IOSIZE is always greater than
+              // compl_length, so the next STRNCPY always works -- Acevedo
               STRNCPY(IObuff, ptr, len);
-              ptr = ml_get_buf(ins_buf, pos->lnum + 1, FALSE);
+              ptr = ml_get_buf(ins_buf, pos->lnum + 1, false);
               tmp_ptr = ptr = skipwhite(ptr);
               /* Find start of next word. */
               tmp_ptr = find_word_start(tmp_ptr);
@@ -3908,7 +3907,7 @@ static int ins_compl_get_exp(pos_T *ini)
         break;
       /* Fill the popup menu as soon as possible. */
       if (type != -1)
-        ins_compl_check_keys(0);
+        ins_compl_check_keys(0, false);
 
       if ((l_ctrl_x_mode != 0 && !CTRL_X_MODE_LINE_OR_EVAL(l_ctrl_x_mode))
           || compl_interrupted) {
@@ -3951,23 +3950,28 @@ static int ins_compl_get_exp(pos_T *ini)
 /* Delete the old text being completed. */
 static void ins_compl_delete(void)
 {
-  int i;
+  int col;
 
-  /*
-   * In insert mode: Delete the typed part.
-   * In replace mode: Put the old characters back, if any.
-   */
-  i = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0);
-  backspace_until_column(i);
-  // TODO: is this sufficient for redrawing?  Redrawing everything causes
-  // flicker, thus we can't do that.
+  // In insert mode: Delete the typed part.
+  // In replace mode: Put the old characters back, if any.
+  col = compl_col + (compl_cont_status & CONT_ADDING ? compl_length : 0);
+  if ((int)curwin->w_cursor.col > col) {
+    if (stop_arrow() == FAIL) {
+      return;
+    }
+    backspace_until_column(col);
+  }
+
+  // TODO(vim): is this sufficient for redrawing?  Redrawing everything
+  // causes flicker, thus we can't do that.
   changed_cline_bef_curs();
   // clear v:completed_item
   set_vim_var_dict(VV_COMPLETED_ITEM, dict_alloc());
 }
 
-/* Insert the new text being completed. */
-static void ins_compl_insert(void)
+// Insert the new text being completed.
+// "in_compl_func" is TRUE when called from complete_check().
+static void ins_compl_insert(int in_compl_func)
 {
   ins_bytes(compl_shown_match->cp_str + ins_compl_len());
   if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
@@ -3989,6 +3993,9 @@ static void ins_compl_insert(void)
   dict_add_nr_str(dict, "info", 0L,
                   EMPTY_IF_NULL(compl_shown_match->cp_text[CPT_INFO]));
   set_vim_var_dict(VV_COMPLETED_ITEM, dict);
+  if (!in_compl_func) {
+    compl_curr_match = compl_shown_match;
+  }
 }
 
 /*
@@ -4010,9 +4017,10 @@ static void ins_compl_insert(void)
 static int
 ins_compl_next (
     int allow_get_expansion,
-    int count,                      /* repeat completion this many times; should
-                                   be at least 1 */
-    int insert_match               /* Insert the newly selected match */
+    int count,                // Repeat completion this many times; should
+                              // be at least 1
+    int insert_match,         // Insert the newly selected match
+    int in_compl_func         // Called from complete_check()
 )
 {
   int num_matches = -1;
@@ -4142,7 +4150,7 @@ ins_compl_next (
     compl_used_match = FALSE;
   } else if (insert_match) {
     if (!compl_get_longest || compl_used_match) {
-      ins_compl_insert();
+      ins_compl_insert(in_compl_func);
     } else {
       ins_bytes(compl_leader + ins_compl_len());
     }
@@ -4192,14 +4200,14 @@ ins_compl_next (
   return num_matches;
 }
 
-/*
- * Call this while finding completions, to check whether the user has hit a key
- * that should change the currently displayed completion, or exit completion
- * mode.  Also, when compl_pending is not zero, show a completion as soon as
- * possible. -- webb
- * "frequency" specifies out of how many calls we actually check.
- */
-void ins_compl_check_keys(int frequency)
+// Call this while finding completions, to check whether the user has hit a key
+// that should change the currently displayed completion, or exit completion
+// mode.  Also, when compl_pending is not zero, show a completion as soon as
+// possible. -- webb
+// "frequency" specifies out of how many calls we actually check.
+// "in_compl_func" is TRUE when called from complete_check(), don't set
+// compl_curr_match.
+void ins_compl_check_keys(int frequency, int in_compl_func)
 {
   static int count = 0;
 
@@ -4222,8 +4230,8 @@ void ins_compl_check_keys(int frequency)
     if (vim_is_ctrl_x_key(c) && c != Ctrl_X && c != Ctrl_R) {
       c = safe_vgetc();         /* Eat the character */
       compl_shows_dir = ins_compl_key2dir(c);
-      (void)ins_compl_next(FALSE, ins_compl_key2count(c),
-          c != K_UP && c != K_DOWN);
+      (void)ins_compl_next(false, ins_compl_key2count(c),
+          c != K_UP && c != K_DOWN, in_compl_func);
     } else {
       /* Need to get the character to have KeyTyped set.  We'll put it
        * back with vungetc() below.  But skip K_IGNORE. */
@@ -4242,7 +4250,7 @@ void ins_compl_check_keys(int frequency)
     int todo = compl_pending > 0 ? compl_pending : -compl_pending;
 
     compl_pending = 0;
-    (void)ins_compl_next(FALSE, todo, TRUE);
+    (void)ins_compl_next(false, todo, true, in_compl_func);
   }
 }
 
@@ -4321,8 +4329,11 @@ static int ins_complete(int c, bool enable_pum)
   colnr_T curs_col;                 /* cursor column */
   int n;
   int save_w_wrow;
+  int insert_match;
 
   compl_direction = ins_compl_key2dir(c);
+  insert_match = ins_compl_use_match(c);
+
   if (!compl_started) {
     /* First time we hit ^N or ^P (in a row, I mean) */
 
@@ -4504,14 +4515,15 @@ static int ins_complete(int c, bool enable_pum)
     } else if (ctrl_x_mode == CTRL_X_CMDLINE) {
       compl_pattern = vim_strnsave(line, curs_col);
       set_cmd_context(&compl_xp, compl_pattern,
-          (int)STRLEN(compl_pattern), curs_col);
+                      (int)STRLEN(compl_pattern), curs_col, false);
       if (compl_xp.xp_context == EXPAND_UNSUCCESSFUL
-          || compl_xp.xp_context == EXPAND_NOTHING)
-        /* No completion possible, use an empty pattern to get a
-         * "pattern not found" message. */
+          || compl_xp.xp_context == EXPAND_NOTHING) {
+        // No completion possible, use an empty pattern to get a
+        // "pattern not found" message.
         compl_col = curs_col;
-      else
+      } else {
         compl_col = (int)(compl_xp.xp_pattern - compl_pattern);
+      }
       compl_length = curs_col - compl_col;
     } else if (ctrl_x_mode == CTRL_X_FUNCTION || ctrl_x_mode ==
                CTRL_X_OMNI) {
@@ -4655,6 +4667,8 @@ static int ins_complete(int c, bool enable_pum)
     showmode();
     edit_submode_extra = NULL;
     ui_flush();
+  } else if (insert_match && stop_arrow() == FAIL) {
+    return FAIL;
   }
 
   compl_shown_match = compl_curr_match;
@@ -4664,7 +4678,7 @@ static int ins_complete(int c, bool enable_pum)
    * Find next match (and following matches).
    */
   save_w_wrow = curwin->w_wrow;
-  n = ins_compl_next(TRUE, ins_compl_key2count(c), ins_compl_use_match(c));
+  n = ins_compl_next(true, ins_compl_key2count(c), insert_match, false);
 
   /* may undisplay the popup menu */
   ins_compl_upd_pum();
@@ -5692,7 +5706,7 @@ comp_textwidth (
       textwidth -= 1;
     textwidth -= curwin->w_p_fdc;
 
-    if (curwin->w_buffer->b_signlist != NULL) {
+    if (signcolumn_on(curwin)) {
         textwidth -= 1;
     }
 
@@ -6952,8 +6966,8 @@ static void ins_reg(void)
       AppendCharToRedobuff(literally);
       AppendCharToRedobuff(regname);
 
-      do_put(regname, NULL, BACKWARD, 1L,
-          (literally == Ctrl_P ? PUT_FIXINDENT : 0) | PUT_CURSEND);
+      do_put(regname, NULL, BACKWARD, 1,
+             (literally == Ctrl_P ? PUT_FIXINDENT : 0) | PUT_CURSEND);
     } else if (insert_reg(regname, literally) == FAIL) {
       vim_beep(BO_REG);
       need_redraw = true;  // remove the '"'
@@ -7701,7 +7715,7 @@ static void ins_mouse(int c)
 
   undisplay_dollar();
   tpos = curwin->w_cursor;
-  if (do_mouse(NULL, c, BACKWARD, 1L, 0)) {
+  if (do_mouse(NULL, c, BACKWARD, 1, 0)) {
     win_T   *new_curwin = curwin;
 
     if (curwin != old_curwin && win_valid(old_curwin)) {
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 96c008b0e0..9c041ca790 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -44,7 +44,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/map.h"
 #include "nvim/file_search.h"
@@ -63,10 +62,12 @@
 #include "nvim/search.h"
 #include "nvim/sha256.h"
 #include "nvim/spell.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/tag.h"
 #include "nvim/ui.h"
+#include "nvim/main.h"
 #include "nvim/mouse.h"
 #include "nvim/terminal.h"
 #include "nvim/undo.h"
@@ -76,9 +77,10 @@
 #include "nvim/eval/decode.h"
 #include "nvim/os/os.h"
 #include "nvim/event/libuv_process.h"
-#include "nvim/event/pty_process.h"
+#include "nvim/os/pty_process.h"
 #include "nvim/event/rstream.h"
 #include "nvim/event/wstream.h"
+#include "nvim/event/time.h"
 #include "nvim/os/time.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/msgpack_rpc/server.h"
@@ -88,7 +90,10 @@
 #include "nvim/os/dl.h"
 #include "nvim/os/input.h"
 #include "nvim/event/loop.h"
+#include "nvim/lib/kvec.h"
+#include "nvim/lib/khash.h"
 #include "nvim/lib/queue.h"
+#include "nvim/eval/typval_encode.h"
 
 #define DICT_MAXNEST 100        /* maximum nesting of lists and dicts */
 
@@ -153,7 +158,7 @@ static char *e_listdictarg = N_(
 static char *e_emptykey = N_("E713: Cannot use empty key for Dictionary");
 static char *e_listreq = N_("E714: List required");
 static char *e_dictreq = N_("E715: Dictionary required");
-static char *e_strreq = N_("E114: String required");
+static char *e_stringreq = N_("E928: String required");
 static char *e_toomanyarg = N_("E118: Too many arguments for function: %s");
 static char *e_dictkey = N_("E716: Key not present in Dictionary: %s");
 static char *e_funcexts = N_(
@@ -212,9 +217,11 @@ static int echo_attr = 0;   /* attributes used for ":echo" */
 /* The names of packages that once were loaded are remembered. */
 static garray_T ga_loaded = {0, 0, sizeof(char_u *), 4, NULL};
 
-/* list heads for garbage collection */
-static dict_T           *first_dict = NULL;     /* list of all dicts */
-static list_T           *first_list = NULL;     /* list of all lists */
+// List heads for garbage collection. Although there can be a reference loop
+// from partial to dict to partial, we don't need to keep track of the partial,
+// since it will get freed when the dict is unused and gets freed.
+static dict_T           *first_dict = NULL;     // list of all dicts
+static list_T           *first_list = NULL;     // list of all lists
 
 #define FUNCARG(fp, j)  ((char_u **)(fp->uf_args.ga_data))[j]
 #define FUNCLINE(fp, j) ((char_u **)(fp->uf_lines.ga_data))[j]
@@ -287,8 +294,8 @@ typedef enum {
     .vv_di = { \
       .di_tv = { .v_type = type }, \
       .di_flags = 0, \
+      .di_key = { 0 }, \
     }, \
-    .vv_filler = { 0 }, \
     .vv_flags = flags, \
   }
 
@@ -298,8 +305,7 @@ typedef enum {
 // variables with the VV_ defines.
 static struct vimvar {
   char        *vv_name;  ///< Name of the variable, without v:.
-  dictitem_T vv_di;      ///< Value of the variable, with name.
-  char vv_filler[16];    ///< Space for longest name from below.
+  dictitem16_T vv_di;    ///< Value and name for key (max 16 chars)
   char vv_flags;         ///< Flags: #VV_COMPAT, #VV_RO, #VV_RO_SBX.
 } vimvars[] =
 {
@@ -350,6 +356,7 @@ static struct vimvar {
   VV(VV_FCS_CHOICE,     "fcs_choice",       VAR_STRING, 0),
   VV(VV_BEVAL_BUFNR,    "beval_bufnr",      VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_WINNR,    "beval_winnr",      VAR_NUMBER, VV_RO),
+  VV(VV_BEVAL_WINID,    "beval_winid",      VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_LNUM,     "beval_lnum",       VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_COL,      "beval_col",        VAR_NUMBER, VV_RO),
   VV(VV_BEVAL_TEXT,     "beval_text",       VAR_STRING, VV_RO),
@@ -359,6 +366,7 @@ static struct vimvar {
   VV(VV_SWAPCOMMAND,    "swapcommand",      VAR_STRING, VV_RO),
   VV(VV_CHAR,           "char",             VAR_STRING, 0),
   VV(VV_MOUSE_WIN,      "mouse_win",        VAR_NUMBER, 0),
+  VV(VV_MOUSE_WINID,    "mouse_winid",      VAR_NUMBER, 0),
   VV(VV_MOUSE_LNUM,     "mouse_lnum",       VAR_NUMBER, 0),
   VV(VV_MOUSE_COL,      "mouse_col",        VAR_NUMBER, 0),
   VV(VV_OP,             "operator",         VAR_STRING, VV_RO),
@@ -380,6 +388,15 @@ static struct vimvar {
   VV(VV_NULL,           "null",             VAR_SPECIAL, VV_RO),
   VV(VV__NULL_LIST,     "_null_list",       VAR_LIST, VV_RO),
   VV(VV__NULL_DICT,     "_null_dict",       VAR_DICT, VV_RO),
+  VV(VV_VIM_DID_ENTER,  "vim_did_enter",    VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_NUMBER,    "t_number",         VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_STRING,    "t_string",         VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_FUNC,      "t_func",           VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_LIST,      "t_list",           VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_DICT,      "t_dict",           VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_FLOAT,     "t_float",          VAR_NUMBER, VV_RO),
+  VV(VV_TYPE_BOOL,      "t_bool",           VAR_NUMBER, VV_RO),
+  VV(VV_EXITING,        "exiting",          VAR_NUMBER, VV_RO),
 };
 #undef VV
 
@@ -393,28 +410,43 @@ static struct vimvar {
 #define vv_dict         vv_di.di_tv.vval.v_dict
 #define vv_tv           vv_di.di_tv
 
-static dictitem_T vimvars_var;                  /* variable used for v: */
+static dictitem_T vimvars_var;                  // variable used for v:
 #define vimvarht  vimvardict.dv_hashtab
 
+typedef enum {
+  kCallbackNone,
+  kCallbackFuncref,
+  kCallbackPartial,
+} CallbackType;
+
+typedef struct {
+  union {
+    char_u *funcref;
+    partial_T *partial;
+  } data;
+  CallbackType type;
+} Callback;
+#define CALLBACK_NONE ((Callback){ .type = kCallbackNone })
+
 typedef struct {
   union {
     LibuvProcess uv;
     PtyProcess pty;
   } proc;
-  Stream in, out, err;
+  Stream in, out, err;  // Initialized in common_job_start().
   Terminal *term;
   bool stopped;
   bool exited;
+  bool rpc;
   int refcount;
-  ufunc_T *on_stdout, *on_stderr, *on_exit;
-  dict_T *self;
+  Callback on_stdout, on_stderr, on_exit;
   int *status_ptr;
   uint64_t id;
-  Queue *events;
+  MultiQueue *events;
 } TerminalJobData;
 
 typedef struct dict_watcher {
-  ufunc_T *callback;
+  Callback callback;
   char *key_pattern;
   QUEUE node;
   bool busy;  // prevent recursion if the dict is changed in the callback
@@ -422,12 +454,38 @@ typedef struct dict_watcher {
 
 typedef struct {
   TerminalJobData *data;
-  ufunc_T *callback;
+  Callback *callback;
   const char *type;
   list_T *received;
   int status;
 } JobEvent;
 
+typedef struct {
+  TimeWatcher tw;
+  int timer_id;
+  int repeat_count;
+  int refcount;
+  long timeout;
+  bool stopped;
+  Callback callback;
+} timer_T;
+
+typedef void (*FunPtr)(void);
+
+/// Prototype of C function that implements VimL function
+typedef void (*VimLFunc)(typval_T *args, typval_T *rvar, FunPtr data);
+
+/// Structure holding VimL function definition
+typedef struct fst {
+  char *name;        ///< Name of the function.
+  uint8_t min_argc;  ///< Minimal number of arguments.
+  uint8_t max_argc;  ///< Maximal number of arguments.
+  VimLFunc func;     ///< Function implementation.
+  FunPtr data;       ///< Userdata for function implementation.
+} VimLFuncDef;
+
+KHASH_MAP_INIT_STR(functions, VimLFuncDef)
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval.c.generated.h"
 #endif
@@ -435,8 +493,10 @@ typedef struct {
 #define FNE_INCL_BR     1       /* find_name_end(): include [] in name */
 #define FNE_CHECK_START 2       /* find_name_end(): check name starts with
                                    valid character */
-static uint64_t current_job_id = 1;
-static PMap(uint64_t) *jobs = NULL; 
+static PMap(uint64_t) *jobs = NULL;
+
+static uint64_t last_timer_id = 0;
+static PMap(uint64_t) *timers = NULL;
 
 static const char *const msgpack_type_names[] = {
   [kMPNil] = "nil",
@@ -469,6 +529,7 @@ void eval_init(void)
   vimvars[VV_VERSION].vv_nr = VIM_VERSION_100;
 
   jobs = pmap_new(uint64_t)();
+  timers = pmap_new(uint64_t)();
   struct vimvar   *p;
 
   init_var_dict(&globvardict, &globvars_var, VAR_DEF_SCOPE);
@@ -479,6 +540,7 @@ void eval_init(void)
 
   for (size_t i = 0; i < ARRAY_SIZE(vimvars); i++) {
     p = &vimvars[i];
+    assert(STRLEN(p->vv_name) <= 16);
     STRCPY(p->vv_di.di_key, p->vv_name);
     if (p->vv_flags & VV_RO)
       p->vv_di.di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
@@ -494,6 +556,7 @@ void eval_init(void)
       /* add to compat scope dict */
       hash_add(&compat_hashtab, p->vv_di.di_key);
   }
+  vimvars[VV_VERSION].vv_nr = VIM_VERSION_100;
 
   dict_T *const msgpack_types_dict = dict_alloc();
   for (size_t i = 0; i < ARRAY_SIZE(msgpack_type_names); i++) {
@@ -523,10 +586,19 @@ void eval_init(void)
   set_vim_var_list(VV_ERRORS, list_alloc());
   set_vim_var_nr(VV_SEARCHFORWARD, 1L);
   set_vim_var_nr(VV_HLSEARCH, 1L);
+  set_vim_var_nr(VV_COUNT1, 1);
+  set_vim_var_nr(VV_TYPE_NUMBER, VAR_TYPE_NUMBER);
+  set_vim_var_nr(VV_TYPE_STRING, VAR_TYPE_STRING);
+  set_vim_var_nr(VV_TYPE_FUNC,   VAR_TYPE_FUNC);
+  set_vim_var_nr(VV_TYPE_LIST,   VAR_TYPE_LIST);
+  set_vim_var_nr(VV_TYPE_DICT,   VAR_TYPE_DICT);
+  set_vim_var_nr(VV_TYPE_FLOAT,  VAR_TYPE_FLOAT);
+  set_vim_var_nr(VV_TYPE_BOOL,   VAR_TYPE_BOOL);
 
   set_vim_var_special(VV_FALSE, kSpecialVarFalse);
   set_vim_var_special(VV_TRUE, kSpecialVarTrue);
   set_vim_var_special(VV_NULL, kSpecialVarNull);
+  set_vim_var_special(VV_EXITING, kSpecialVarNull);
 
   set_reg_var(0);  // default for v:register is not 0 but '"'
 }
@@ -1152,7 +1224,7 @@ int call_vim_function(
   rettv->v_type = VAR_UNKNOWN;                  /* clear_tv() uses this */
   ret = call_func(func, (int)STRLEN(func), rettv, argc, argvars,
                   curwin->w_cursor.lnum, curwin->w_cursor.lnum,
-                  &doesrange, true, NULL);
+                  &doesrange, true, NULL, NULL);
   if (safe) {
     --sandbox;
     restore_funccal(save_funccalp);
@@ -1876,7 +1948,7 @@ ex_let_one (
         }
       }
       if (p != NULL) {
-        write_reg_contents(*arg == '@' ? '"' : *arg, p, -1, FALSE);
+        write_reg_contents(*arg == '@' ? '"' : *arg, p, STRLEN(p), false);
         arg_end = arg + 1;
       }
       xfree(ptofree);
@@ -2106,11 +2178,9 @@ get_lval (
 
     if (lp->ll_tv->v_type == VAR_DICT) {
       if (len == -1) {
-        /* "[key]": get key from "var1" */
-        key = get_tv_string(&var1);             /* is number or string */
-        if (*key == NUL) {
-          if (!quiet)
-            EMSG(_(e_emptykey));
+        // "[key]": get key from "var1"
+        key = get_tv_string_chk(&var1);  // is number or string
+        if (key == NULL) {
           clear_tv(&var1);
           return NULL;
         }
@@ -2401,6 +2471,7 @@ static int tv_op(typval_T *tv1, typval_T *tv2, char_u *op)
     switch (tv1->v_type) {
     case VAR_DICT:
     case VAR_FUNC:
+    case VAR_PARTIAL:
     case VAR_SPECIAL:
       break;
 
@@ -2550,9 +2621,12 @@ void *eval_for_line(char_u *arg, int *errp, char_u **nextcmdp, int skip)
     *errp = FALSE;
     if (!skip) {
       l = tv.vval.v_list;
-      if (tv.v_type != VAR_LIST || l == NULL) {
+      if (tv.v_type != VAR_LIST) {
         EMSG(_(e_listreq));
         clear_tv(&tv);
+      } else if (l == NULL) {
+        // a null list is like an empty list: do nothing
+        clear_tv(&tv);
       } else {
         /* No need to increment the refcount, it's already set for the
          * list being used in "tv". */
@@ -2648,6 +2722,10 @@ void set_context_for_expression(expand_T *xp, char_u *arg, cmdidx_T cmdidx)
     } else if (c == '=') {
       got_eq = TRUE;
       xp->xp_context = EXPAND_EXPRESSION;
+    } else if (c == '#'
+               && xp->xp_context == EXPAND_EXPRESSION) {
+      // Autoload function/variable contains '#'
+      break;
     } else if ((c == '<' || c == '#')
                && xp->xp_context == EXPAND_FUNCTIONS
                && vim_strchr(xp->xp_pattern, '(') == NULL) {
@@ -2698,8 +2776,9 @@ void ex_call(exarg_T *eap)
   typval_T rettv;
   linenr_T lnum;
   int doesrange;
-  int failed = FALSE;
+  bool failed = false;
   funcdict_T fudi;
+  partial_T *partial = NULL;
 
   if (eap->skip) {
     /* trans_function_name() doesn't work well when skipping, use eval0()
@@ -2712,7 +2791,7 @@ void ex_call(exarg_T *eap)
     return;
   }
 
-  tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
+  tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi, &partial);
   if (fudi.fd_newkey != NULL) {
     /* Still need to give an error message for missing key. */
     EMSG2(_(e_dictkey), fudi.fd_newkey);
@@ -2726,9 +2805,12 @@ void ex_call(exarg_T *eap)
   if (fudi.fd_dict != NULL)
     ++fudi.fd_dict->dv_refcount;
 
-  /* If it is the name of a variable of type VAR_FUNC use its contents. */
+  // If it is the name of a variable of type VAR_FUNC or VAR_PARTIAL use its
+  // contents. For VAR_PARTIAL get its partial, unless we already have one
+  // from trans_function_name().
   len = (int)STRLEN(tofree);
-  name = deref_func_name(tofree, &len, FALSE);
+  name = deref_func_name(tofree, &len,
+                         partial != NULL ? NULL : &partial, false);
 
   /* Skip white space to allow ":call func ()".  Not good, but required for
    * backward compatibility. */
@@ -2759,9 +2841,9 @@ void ex_call(exarg_T *eap)
     }
     arg = startarg;
     if (get_func_tv(name, (int)STRLEN(name), &rettv, &arg,
-            eap->line1, eap->line2, &doesrange,
-            !eap->skip, fudi.fd_dict) == FAIL) {
-      failed = TRUE;
+                    eap->line1, eap->line2, &doesrange,
+                    !eap->skip, partial, fudi.fd_dict) == FAIL) {
+      failed = true;
       break;
     }
 
@@ -2964,11 +3046,16 @@ int do_unlet(char_u *name, int forceit)
     } else if (current_funccal != NULL
                && ht == &current_funccal->l_vars.dv_hashtab) {
       d = &current_funccal->l_vars;
+    } else if (ht == &compat_hashtab) {
+        d = &vimvardict;
     } else {
       di = find_var_in_ht(ht, *name, (char_u *)"", false);
       d = di->di_tv.vval.v_dict;
     }
-
+    if (d == NULL) {
+      EMSG2(_(e_intern2), "do_unlet()");
+      return FAIL;
+    }
     hi = hash_find(ht, varname);
     if (!HASHITEM_EMPTY(hi)) {
       di = HI2DI(hi);
@@ -2977,6 +3064,11 @@ int do_unlet(char_u *name, int forceit)
           || tv_check_lock(d->dv_lock, name, false)) {
         return FAIL;
       }
+
+      if (d == NULL || tv_check_lock(d->dv_lock, name, false)) {
+        return FAIL;
+      }
+
       typval_T oldtv;
       bool watched = is_watched(dict);
 
@@ -3114,6 +3206,7 @@ static void item_lock(typval_T *tv, int deep, int lock)
   case VAR_FLOAT:
   case VAR_STRING:
   case VAR_FUNC:
+  case VAR_PARTIAL:
   case VAR_SPECIAL:
     break;
   case VAR_UNKNOWN:
@@ -3270,6 +3363,26 @@ char_u *get_user_var_name(expand_T *xp, int idx)
 }
 
 
+/// Return TRUE if "pat" matches "text".
+/// Does not use 'cpo' and always uses 'magic'.
+static int pattern_match(char_u *pat, char_u *text, int ic)
+{
+  int matches = 0;
+  regmatch_T regmatch;
+
+  // avoid 'l' flag in 'cpoptions'
+  char_u *save_cpo = p_cpo;
+  p_cpo = (char_u *)"";
+  regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
+  if (regmatch.regprog != NULL) {
+    regmatch.rm_ic = ic;
+    matches = vim_regexec_nl(&regmatch, text, (colnr_T)0);
+    vim_regfree(regmatch.regprog);
+  }
+  p_cpo = save_cpo;
+  return matches;
+}
+
 /*
  * types for expressions.
  */
@@ -3545,9 +3658,7 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate)
   long n1, n2;
   char_u      *s1, *s2;
   char_u buf1[NUMBUFLEN], buf2[NUMBUFLEN];
-  regmatch_T regmatch;
   int ic;
-  char_u      *save_cpo;
 
   /*
    * Get the first variable.
@@ -3668,26 +3779,37 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate)
           if (type == TYPE_NEQUAL)
             n1 = !n1;
         }
-      } else if (rettv->v_type == VAR_FUNC || var2.v_type == VAR_FUNC) {
-        if (rettv->v_type != var2.v_type
-            || (type != TYPE_EQUAL && type != TYPE_NEQUAL)) {
-          if (rettv->v_type != var2.v_type)
-            EMSG(_("E693: Can only compare Funcref with Funcref"));
-          else
-            EMSG(_("E694: Invalid operation for Funcrefs"));
+      } else if (rettv->v_type == VAR_FUNC || var2.v_type == VAR_FUNC
+                 || rettv->v_type == VAR_PARTIAL
+                 || var2.v_type == VAR_PARTIAL) {
+        if (type != TYPE_EQUAL && type != TYPE_NEQUAL) {
+          EMSG(_("E694: Invalid operation for Funcrefs"));
           clear_tv(rettv);
           clear_tv(&var2);
           return FAIL;
+        }
+        if ((rettv->v_type == VAR_PARTIAL
+             && rettv->vval.v_partial == NULL)
+            || (var2.v_type == VAR_PARTIAL
+                && var2.vval.v_partial == NULL)) {
+            // when a partial is NULL assume not equal
+            n1 = false;
+        } else if (type_is) {
+          if (rettv->v_type == VAR_FUNC && var2.v_type == VAR_FUNC) {
+            // strings are considered the same if their value is
+            // the same
+            n1 = tv_equal(rettv, &var2, ic, false);
+          } else if (rettv->v_type == VAR_PARTIAL
+                     && var2.v_type == VAR_PARTIAL) {
+            n1 = (rettv->vval.v_partial == var2.vval.v_partial);
+          } else {
+            n1 = false;
+          }
         } else {
-          /* Compare two Funcrefs for being equal or unequal. */
-          if (rettv->vval.v_string == NULL
-              || var2.vval.v_string == NULL)
-            n1 = FALSE;
-          else
-            n1 = STRCMP(rettv->vval.v_string,
-                var2.vval.v_string) == 0;
-          if (type == TYPE_NEQUAL)
-            n1 = !n1;
+          n1 = tv_equal(rettv, &var2, ic, false);
+        }
+        if (type == TYPE_NEQUAL) {
+          n1 = !n1;
         }
       }
       /*
@@ -3756,19 +3878,10 @@ static int eval4(char_u **arg, typval_T *rettv, int evaluate)
 
         case TYPE_MATCH:
         case TYPE_NOMATCH:
-          /* avoid 'l' flag in 'cpoptions' */
-          save_cpo = p_cpo;
-          p_cpo = (char_u *)"";
-          regmatch.regprog = vim_regcomp(s2,
-              RE_MAGIC + RE_STRING);
-          regmatch.rm_ic = ic;
-          if (regmatch.regprog != NULL) {
-            n1 = vim_regexec_nl(&regmatch, s1, (colnr_T)0);
-            vim_regfree(regmatch.regprog);
-            if (type == TYPE_NOMATCH)
-              n1 = !n1;
+          n1 = pattern_match(s2, s1, ic);
+          if (type == TYPE_NOMATCH) {
+            n1 = !n1;
           }
-          p_cpo = save_cpo;
           break;
 
         case TYPE_UNKNOWN:  break;              /* avoid gcc warning */
@@ -4231,14 +4344,15 @@ static int eval7(
       ret = FAIL;
     } else {
       if (**arg == '(') {               // recursive!
+        partial_T *partial;
         // If "s" is the name of a variable of type VAR_FUNC
         // use its contents.
-        s = deref_func_name(s, &len, !evaluate);
+        s = deref_func_name(s, &len, &partial, !evaluate);
 
         // Invoke the function.
         ret = get_func_tv(s, len, rettv, arg,
-            curwin->w_cursor.lnum, curwin->w_cursor.lnum,
-            &len, evaluate, NULL);
+                          curwin->w_cursor.lnum, curwin->w_cursor.lnum,
+                          &len, evaluate, partial, NULL);
 
         // If evaluate is false rettv->v_type was not set in
         // get_func_tv, but it's needed in handle_subscript() to parse
@@ -4341,7 +4455,8 @@ eval_index (
   char_u      *key = NULL;
 
   switch (rettv->v_type) {
-    case VAR_FUNC: {
+    case VAR_FUNC:
+    case VAR_PARTIAL: {
       if (verbose) {
         EMSG(_("E695: Cannot index a Funcref"));
       }
@@ -4538,10 +4653,8 @@ eval_index (
         dictitem_T  *item;
 
         if (len == -1) {
-          key = get_tv_string(&var1);
-          if (*key == NUL) {
-            if (verbose)
-              EMSG(_(e_emptykey));
+          key = get_tv_string_chk(&var1);
+          if (key == NULL) {
             clear_tv(&var1);
             return FAIL;
           }
@@ -4563,6 +4676,7 @@ eval_index (
       break;
     case VAR_SPECIAL:
     case VAR_FUNC:
+    case VAR_PARTIAL:
     case VAR_FLOAT:
     case VAR_UNKNOWN:
       break;  // Not evaluating, skipping over subscript
@@ -4816,10 +4930,29 @@ static int get_lit_string_tv(char_u **arg, typval_T *rettv, int evaluate)
   return OK;
 }
 
-/*
- * Allocate a variable for a List and fill it from "*arg".
- * Return OK or FAIL.
- */
+static void partial_free(partial_T *pt)
+{
+  for (int i = 0; i < pt->pt_argc; i++) {
+    clear_tv(&pt->pt_argv[i]);
+  }
+  xfree(pt->pt_argv);
+  dict_unref(pt->pt_dict);
+  func_unref(pt->pt_name);
+  xfree(pt->pt_name);
+  xfree(pt);
+}
+
+/// Unreference a closure: decrement the reference count and free it when it
+/// becomes zero.
+void partial_unref(partial_T *pt)
+{
+  if (pt != NULL && --pt->pt_refcount <= 0) {
+    partial_free(pt);
+  }
+}
+
+/// Allocate a variable for a List and fill it from "*arg".
+/// Return OK or FAIL.
 static int get_list_tv(char_u **arg, typval_T *rettv, int evaluate)
 {
   list_T      *l = NULL;
@@ -4853,8 +4986,9 @@ static int get_list_tv(char_u **arg, typval_T *rettv, int evaluate)
   if (**arg != ']') {
     EMSG2(_("E697: Missing end of List ']': %s"), *arg);
 failret:
-    if (evaluate)
-      list_free(l, TRUE);
+    if (evaluate) {
+      list_free(l);
+    }
     return FAIL;
   }
 
@@ -4893,51 +5027,53 @@ static list_T *rettv_list_alloc(typval_T *rettv)
   list_T *l = list_alloc();
   rettv->vval.v_list = l;
   rettv->v_type = VAR_LIST;
-  ++l->lv_refcount;
+  rettv->v_lock = VAR_UNLOCKED;
+  l->lv_refcount++;
   return l;
 }
 
-/*
- * Unreference a list: decrement the reference count and free it when it
- * becomes zero.
- */
-void list_unref(list_T *l)
-{
-  if (l != NULL && --l->lv_refcount <= 0)
-    list_free(l, TRUE);
+/// Unreference a list: decrement the reference count and free it when it
+/// becomes zero.
+void list_unref(list_T *l) {
+  if (l != NULL && --l->lv_refcount <= 0) {
+    list_free(l);
+  }
 }
 
-/*
- * Free a list, including all items it points to.
- * Ignores the reference count.
- */
-void 
-list_free (
-    list_T *l,
-    int recurse            /* Free Lists and Dictionaries recursively. */
-)
-{
+/// Free a list, including all items it points to.
+/// Ignores the reference count.
+static void list_free_contents(list_T *l) {
   listitem_T *item;
 
-  /* Remove the list from the list of lists for garbage collection. */
-  if (l->lv_used_prev == NULL)
-    first_list = l->lv_used_next;
-  else
-    l->lv_used_prev->lv_used_next = l->lv_used_next;
-  if (l->lv_used_next != NULL)
-    l->lv_used_next->lv_used_prev = l->lv_used_prev;
-
   for (item = l->lv_first; item != NULL; item = l->lv_first) {
-    /* Remove the item before deleting it. */
+    // Remove the item before deleting it.
     l->lv_first = item->li_next;
-    if (recurse || (item->li_tv.v_type != VAR_LIST
-                    && item->li_tv.v_type != VAR_DICT))
-      clear_tv(&item->li_tv);
+    clear_tv(&item->li_tv);
     xfree(item);
   }
+}
+
+static void list_free_list(list_T *l) {
+  // Remove the list from the list of lists for garbage collection.
+  if (l->lv_used_prev == NULL) {
+    first_list = l->lv_used_next;
+  } else {
+    l->lv_used_prev->lv_used_next = l->lv_used_next;
+  }
+  if (l->lv_used_next != NULL) {
+    l->lv_used_next->lv_used_prev = l->lv_used_prev;
+  }
+
   xfree(l);
 }
 
+void list_free(list_T *l) {
+  if (!in_free_unref_items) {
+    list_free_contents(l);
+    list_free_list(l);
+  }
+}
+
 /*
  * Allocate a list item.
  * It is not initialized, don't forget to set v_lock.
@@ -5026,12 +5162,18 @@ dict_equal (
   dictitem_T  *item2;
   int todo;
 
-  if (d1 == NULL || d2 == NULL)
-    return FALSE;
-  if (d1 == d2)
-    return TRUE;
-  if (dict_len(d1) != dict_len(d2))
-    return FALSE;
+  if (d1 == NULL && d2 == NULL) {
+    return true;
+  }
+  if (d1 == NULL || d2 == NULL) {
+    return false;
+  }
+  if (d1 == d2) {
+    return true;
+  }
+  if (dict_len(d1) != dict_len(d2)) {
+    return false;
+  }
 
   todo = (int)d1->dv_hashtab.ht_used;
   for (hi = d1->dv_hashtab.ht_array; todo > 0; ++hi) {
@@ -5049,6 +5191,60 @@ dict_equal (
 
 static int tv_equal_recurse_limit;
 
+static bool func_equal(
+    typval_T *tv1,
+    typval_T *tv2,
+    bool ic         // ignore case
+) {
+  char_u *s1, *s2;
+  dict_T *d1, *d2;
+  int a1, a2;
+
+  // empty and NULL function name considered the same
+  s1 = tv1->v_type == VAR_FUNC ? tv1->vval.v_string
+                     : tv1->vval.v_partial->pt_name;
+  if (s1 != NULL && *s1 == NUL) {
+    s1 = NULL;
+  }
+  s2 = tv2->v_type == VAR_FUNC ? tv2->vval.v_string
+                     : tv2->vval.v_partial->pt_name;
+  if (s2 != NULL && *s2 == NUL) {
+    s2 = NULL;
+  }
+  if (s1 == NULL || s2 == NULL) {
+    if (s1 != s2) {
+      return false;
+    }
+  } else if (STRCMP(s1, s2) != 0) {
+    return false;
+  }
+
+  // empty dict and NULL dict is different
+  d1 = tv1->v_type == VAR_FUNC ? NULL : tv1->vval.v_partial->pt_dict;
+  d2 = tv2->v_type == VAR_FUNC ? NULL : tv2->vval.v_partial->pt_dict;
+  if (d1 == NULL || d2 == NULL) {
+    if (d1 != d2) {
+      return false;
+    }
+  } else if (!dict_equal(d1, d2, ic, true)) {
+    return false;
+  }
+
+  // empty list and no list considered the same
+  a1 = tv1->v_type == VAR_FUNC ? 0 : tv1->vval.v_partial->pt_argc;
+  a2 = tv2->v_type == VAR_FUNC ? 0 : tv2->vval.v_partial->pt_argc;
+  if (a1 != a2) {
+    return false;
+  }
+  for (int i = 0; i < a1; i++) {
+    if (!tv_equal(tv1->vval.v_partial->pt_argv + i,
+                  tv2->vval.v_partial->pt_argv + i, ic, true)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /*
  * Return TRUE if "tv1" and "tv2" have the same value.
  * Compares the items just like "==" would compare them, but strings and
@@ -5067,9 +5263,6 @@ tv_equal (
   static int recursive_cnt = 0;             /* catch recursive loops */
   int r;
 
-  if (tv1->v_type != tv2->v_type)
-    return FALSE;
-
   /* Catch lists and dicts that have an endless loop by limiting
    * recursiveness to a limit.  We guess they are equal then.
    * A fixed limit has the problem of still taking an awful long time.
@@ -5083,6 +5276,20 @@ tv_equal (
     return TRUE;
   }
 
+  // For VAR_FUNC and VAR_PARTIAL only compare the function name.
+  if ((tv1->v_type == VAR_FUNC
+       || (tv1->v_type == VAR_PARTIAL && tv1->vval.v_partial != NULL))
+      && (tv2->v_type == VAR_FUNC
+          || (tv2->v_type == VAR_PARTIAL && tv2->vval.v_partial != NULL))) {
+    recursive_cnt++;
+    r = func_equal(tv1, tv2, ic);
+    recursive_cnt--;
+    return r;
+  }
+  if (tv1->v_type != tv2->v_type) {
+    return false;
+  }
+
   switch (tv1->v_type) {
   case VAR_LIST:
     ++recursive_cnt;
@@ -5096,11 +5303,6 @@ tv_equal (
     --recursive_cnt;
     return r;
 
-  case VAR_FUNC:
-    return tv1->vval.v_string != NULL
-           && tv2->vval.v_string != NULL
-           && STRCMP(tv1->vval.v_string, tv2->vval.v_string) == 0;
-
   case VAR_NUMBER:
     return tv1->vval.v_number == tv2->vval.v_number;
 
@@ -5115,6 +5317,8 @@ tv_equal (
   case VAR_SPECIAL:
     return tv1->vval.v_special == tv2->vval.v_special;
 
+  case VAR_FUNC:
+  case VAR_PARTIAL:
   case VAR_UNKNOWN:
     // VAR_UNKNOWN can be the result of an invalid expression, let’s say it does
     // not equal anything, not even self.
@@ -5728,7 +5932,17 @@ bool garbage_collect(void)
   {
     TerminalJobData *data;
     map_foreach_value(jobs, data, {
-      ABORTING(set_ref_dict)(data->self, copyID);
+      set_ref_in_callback(&data->on_stdout, copyID, NULL, NULL);
+      set_ref_in_callback(&data->on_stderr, copyID, NULL, NULL);
+      set_ref_in_callback(&data->on_exit, copyID, NULL, NULL);
+    })
+  }
+
+  // Timers
+  {
+    timer_T *timer;
+    map_foreach_value(timers, timer, {
+      set_ref_in_callback(&timer->callback, copyID, NULL, NULL);
     })
   }
 
@@ -5804,42 +6018,63 @@ bool garbage_collect(void)
 /// @return true, if something was freed.
 static int free_unref_items(int copyID)
 {
+  dict_T *dd, *dd_next;
+  list_T *ll, *ll_next;
   bool did_free = false;
 
+  // Let all "free" functions know that we are here. This means no
+  // dictionaries, lists, or jobs are to be freed, because we will
+  // do that here.
+  in_free_unref_items = true;
+
+  // PASS 1: free the contents of the items. We don't free the items
+  // themselves yet, so that it is possible to decrement refcount counters.
+
   // Go through the list of dicts and free items without the copyID.
   // Don't free dicts that are referenced internally.
-  for (dict_T *dd = first_dict; dd != NULL; ) {
+  for (dict_T *dd = first_dict; dd != NULL; dd = dd->dv_used_next) {
     if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)) {
       // Free the Dictionary and ordinary items it contains, but don't
       // recurse into Lists and Dictionaries, they will be in the list
-      // of dicts or list of lists. */
-      dict_T *dd_next = dd->dv_used_next;
-      dict_free(dd, FALSE);
+      // of dicts or list of lists.
+      dict_free_contents(dd);
       did_free = true;
-      dd = dd_next;
-    } else {
-      dd = dd->dv_used_next;
     }
   }
 
   // Go through the list of lists and free items without the copyID.
   // But don't free a list that has a watcher (used in a for loop), these
   // are not referenced anywhere.
-  for (list_T *ll = first_list; ll != NULL;) {
+  for (list_T *ll = first_list; ll != NULL; ll = ll->lv_used_next) {
     if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
         && ll->lv_watch == NULL) {
       // Free the List and ordinary items it contains, but don't recurse
       // into Lists and Dictionaries, they will be in the list of dicts
       // or list of lists.
-      list_T* ll_next = ll->lv_used_next;
-      list_free(ll, FALSE);
+      list_free_contents(ll);
       did_free = true;
-      ll = ll_next;
-    } else {
-      ll = ll->lv_used_next;
     }
   }
 
+  // PASS 2: free the items themselves.
+  for (dd = first_dict; dd != NULL; dd = dd_next) {
+    dd_next = dd->dv_used_next;
+    if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)) {
+      dict_free_dict(dd);
+    }
+  }
+
+  for (ll = first_list; ll != NULL; ll = ll_next) {
+    ll_next = ll->lv_used_next;
+    if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
+        && ll->lv_watch == NULL) {
+      // Free the List and ordinary items it contains, but don't recurse
+      // into Lists and Dictionaries, they will be in the list of dicts
+      // or list of lists.
+      list_free_list(ll);
+    }
+  }
+  in_free_unref_items = false;
   return did_free;
 }
 
@@ -5957,6 +6192,24 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
             *ht_stack = newitem;
           }
         }
+
+        QUEUE *w = NULL;
+        DictWatcher *watcher = NULL;
+        QUEUE_FOREACH(w, &dd->watchers) {
+          watcher = dictwatcher_node_data(w);
+          set_ref_in_callback(&watcher->callback, copyID, ht_stack, list_stack);
+        }
+      }
+      if (tv->v_type == VAR_PARTIAL) {
+        partial_T *pt = tv->vval.v_partial;
+        int i;
+
+        if (pt != NULL) {
+          for (i = 0; i < pt->pt_argc; i++) {
+            abort = abort || set_ref_in_item(&pt->pt_argv[i], copyID,
+                                             ht_stack, list_stack);
+          }
+        }
       }
       break;
     }
@@ -5982,6 +6235,26 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
       break;
     }
 
+    case VAR_PARTIAL: {
+      partial_T *pt = tv->vval.v_partial;
+
+      // A partial does not have a copyID, because it cannot contain itself.
+      if (pt != NULL) {
+        if (pt->pt_dict != NULL) {
+          typval_T dtv;
+
+          dtv.v_type = VAR_DICT;
+          dtv.vval.v_dict = pt->pt_dict;
+          abort = abort || set_ref_in_item(&dtv, copyID, ht_stack, list_stack);
+        }
+
+        for (int i = 0; i < pt->pt_argc; i++) {
+          abort = abort || set_ref_in_item(&pt->pt_argv[i], copyID,
+                                           ht_stack, list_stack);
+        }
+      }
+      break;
+    }
     case VAR_FUNC:
     case VAR_UNKNOWN:
     case VAR_SPECIAL:
@@ -6073,7 +6346,8 @@ static void rettv_dict_alloc(typval_T *rettv)
 
   rettv->vval.v_dict = d;
   rettv->v_type = VAR_DICT;
-  ++d->dv_refcount;
+  rettv->v_lock = VAR_UNLOCKED;
+  d->dv_refcount++;
 }
 
 /// Clear all the keys of a Dictionary. "d" remains a valid empty Dictionary.
@@ -6104,31 +6378,18 @@ void dict_clear(dict_T *d)
  */
 void dict_unref(dict_T *d)
 {
-  if (d != NULL && --d->dv_refcount <= 0)
-    dict_free(d, TRUE);
+  if (d != NULL && --d->dv_refcount <= 0) {
+    dict_free(d);
+  }
 }
 
-/*
- * Free a Dictionary, including all items it contains.
- * Ignores the reference count.
- */
-void 
-dict_free (
-    dict_T *d,
-    int recurse            /* Free Lists and Dictionaries recursively. */
-)
-{
+/// Free a Dictionary, including all items it contains.
+/// Ignores the reference count.
+static void dict_free_contents(dict_T *d) {
   int todo;
   hashitem_T  *hi;
   dictitem_T  *di;
 
-  /* Remove the dict from the list of dicts for garbage collection. */
-  if (d->dv_used_prev == NULL)
-    first_dict = d->dv_used_next;
-  else
-    d->dv_used_prev->dv_used_next = d->dv_used_next;
-  if (d->dv_used_next != NULL)
-    d->dv_used_next->dv_used_prev = d->dv_used_prev;
 
   /* Lock the hashtab, we don't want it to resize while freeing items. */
   hash_lock(&d->dv_hashtab);
@@ -6140,9 +6401,7 @@ dict_free (
        * something recursive causing trouble. */
       di = HI2DI(hi);
       hash_remove(&d->dv_hashtab, hi);
-      if (recurse || (di->di_tv.v_type != VAR_LIST
-                      && di->di_tv.v_type != VAR_DICT))
-        clear_tv(&di->di_tv);
+      clear_tv(&di->di_tv);
       xfree(di);
       --todo;
     }
@@ -6151,14 +6410,34 @@ dict_free (
   while (!QUEUE_EMPTY(&d->watchers)) {
     QUEUE *w = QUEUE_HEAD(&d->watchers);
     DictWatcher *watcher = dictwatcher_node_data(w);
-    dictwatcher_free(watcher);
     QUEUE_REMOVE(w);
+    dictwatcher_free(watcher);
   }
 
   hash_clear(&d->dv_hashtab);
+}
+
+static void dict_free_dict(dict_T *d) {
+  // Remove the dict from the list of dicts for garbage collection.
+  if (d->dv_used_prev == NULL) {
+    first_dict = d->dv_used_next;
+  } else {
+    d->dv_used_prev->dv_used_next = d->dv_used_next;
+  }
+  if (d->dv_used_next != NULL) {
+    d->dv_used_next->dv_used_prev = d->dv_used_prev;
+  }
+
   xfree(d);
 }
 
+void dict_free(dict_T *d) {
+  if (!in_free_unref_items) {
+    dict_free_contents(d);
+    dict_free_dict(d);
+  }
+}
+
 /*
  * Allocate a Dictionary item.
  * The "key" is copied to the new item.
@@ -6166,7 +6445,7 @@ dict_free (
  */
 dictitem_T *dictitem_alloc(char_u *key) FUNC_ATTR_NONNULL_RET
 {
-  dictitem_T *di = xmalloc(sizeof(dictitem_T) + STRLEN(key));
+  dictitem_T *di = xmalloc(offsetof(dictitem_T, di_key) + STRLEN(key) + 1);
 #ifndef __clang_analyzer__
   STRCPY(di->di_key, key);
 #endif
@@ -6338,6 +6617,23 @@ int dict_add_list(dict_T *d, char *key, list_T *list)
   return OK;
 }
 
+/// Add a dict entry to dictionary "d".
+/// Returns FAIL when out of memory and when key already exists.
+int dict_add_dict(dict_T *d, char *key, dict_T *dict)
+{
+  dictitem_T *item = dictitem_alloc((char_u *)key);
+
+  item->di_tv.v_lock = 0;
+  item->di_tv.v_type = VAR_DICT;
+  item->di_tv.vval.v_dict = dict;
+  if (dict_add(d, item) == FAIL) {
+    dictitem_free(item);
+    return FAIL;
+  }
+  dict->dv_refcount++;
+  return OK;
+}
+
 /// Set all existing keys in "dict" as read-only.
 ///
 /// This does not protect against adding new keys to the Dictionary.
@@ -6379,9 +6675,12 @@ dictitem_T *dict_find(dict_T *d, char_u *key, int len)
   char_u      *tofree = NULL;
   hashitem_T  *hi;
 
-  if (len < 0)
+  if (d == NULL) {
+    return NULL;
+  }
+  if (len < 0) {
     akey = key;
-  else if (len >= AKEYLEN) {
+  } else if (len >= AKEYLEN) {
     tofree = akey = vim_strnsave(key, len);
   } else {
     /* Avoid a malloc/free by using buf[]. */
@@ -6400,64 +6699,45 @@ dictitem_T *dict_find(dict_T *d, char_u *key, int len)
 /// @param[out] result The address where a pointer to the wanted callback
 ///                    will be left.
 /// @return true/false on success/failure.
-static bool get_dict_callback(dict_T *d, char *key, ufunc_T **result)
+static bool get_dict_callback(dict_T *d, char *key, Callback *result)
 {
   dictitem_T *di = dict_find(d, (uint8_t *)key, -1);
 
   if (di == NULL) {
-    *result = NULL;
+    result->type = kCallbackNone;
     return true;
   }
-  
-  if (di->di_tv.v_type != VAR_FUNC && di->di_tv.v_type != VAR_STRING) {
-    EMSG(_("Argument is not a function or function name"));
-    *result = NULL;
-    return false;
-  }
 
-  if ((*result = find_ufunc(di->di_tv.vval.v_string)) == NULL) {
+  if (di->di_tv.v_type != VAR_FUNC && di->di_tv.v_type != VAR_STRING
+      && di->di_tv.v_type != VAR_PARTIAL) {
+    EMSG(_("Argument is not a function or function name"));
+    result->type = kCallbackNone;
     return false;
   }
 
-  (*result)->uf_refcount++;
-  return true;
-}
-
-static ufunc_T *find_ufunc(uint8_t *name)
-{
-  uint8_t *n = name;
-  ufunc_T *rv = NULL;
-  if (*n > '9' || *n < '0') {
-    if ((n = trans_function_name(&n, false, TFN_INT|TFN_QUIET, NULL))) {
-      rv = find_func(n);
-      xfree(n);
-    }
-  } else {
-    // dict function, name is already translated
-    rv = find_func(n);
-  }
-
-  if (!rv) {
-    EMSG2(_("Function %s doesn't exist"), name);
-    return NULL;
-  }
-
-  return rv;
+  typval_T tv;
+  copy_tv(&di->di_tv, &tv);
+  set_selfdict(&tv, d);
+  bool res = callback_from_typval(result, &tv);
+  clear_tv(&tv);
+  return res;
 }
 
-/*
- * Get a string item from a dictionary.
- * When "save" is TRUE allocate memory for it.
- * Returns NULL if the entry doesn't exist.
- */
-char_u *get_dict_string(dict_T *d, char_u *key, int save)
+/// Get a string item from a dictionary.
+///
+/// @param save whether memory should be allocated for the return value
+///             when false a shared buffer is used, can only be used once!
+///
+/// @return the entry or NULL if the entry doesn't exist.
+char_u *get_dict_string(dict_T *d, char *key, bool save)
 {
   dictitem_T  *di;
   char_u      *s;
 
-  di = dict_find(d, key, -1);
-  if (di == NULL)
+  di = dict_find(d, (char_u *)key, -1);
+  if (di == NULL) {
     return NULL;
+  }
   s = get_tv_string(&di->di_tv);
   if (save) {
     s = vim_strsave(s);
@@ -6465,15 +6745,15 @@ char_u *get_dict_string(dict_T *d, char_u *key, int save)
   return s;
 }
 
-/*
- * Get a number item from a dictionary.
- * Returns 0 if the entry doesn't exist.
- */
-long get_dict_number(dict_T *d, char_u *key)
+/// Get a number item from a dictionary.
+///
+/// @return the entry or 0 if the entry doesn't exist.
+long get_dict_number(dict_T *d, char *key)
 {
-  dictitem_T *di = dict_find(d, key, -1);
-  if (di == NULL)
+  dictitem_T *di = dict_find(d, (char_u *)key, -1);
+  if (di == NULL) {
     return 0;
+  }
   return get_tv_number(&di->di_tv);
 }
 
@@ -6522,10 +6802,8 @@ static int get_dict_tv(char_u **arg, typval_T *rettv, int evaluate)
     }
     if (evaluate) {
       key = get_tv_string_buf_chk(&tvkey, buf);
-      if (key == NULL || *key == NUL) {
-        /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
-        if (key != NULL)
-          EMSG(_(e_emptykey));
+      if (key == NULL) {
+        // "key" is NULL when get_tv_string_buf_chk() gave an errmsg
         clear_tv(&tvkey);
         goto failret;
       }
@@ -6566,8 +6844,9 @@ static int get_dict_tv(char_u **arg, typval_T *rettv, int evaluate)
   if (**arg != '}') {
     EMSG2(_("E723: Missing end of Dictionary '}': %s"), *arg);
 failret:
-    if (evaluate)
-      dict_free(d, TRUE);
+    if (evaluate) {
+      dict_free(d);
+    }
     return FAIL;
   }
 
@@ -6643,319 +6922,9 @@ static int get_env_tv(char_u **arg, typval_T *rettv, int evaluate)
   return OK;
 }
 
-/*
- * Array with names and number of arguments of all internal functions
- * MUST BE KEPT SORTED IN strcmp() ORDER FOR BINARY SEARCH!
- */
-static struct fst {
-  char        *f_name;          /* function name */
-  char f_min_argc;              /* minimal number of arguments */
-  char f_max_argc;              /* maximal number of arguments */
-  void        (*f_func)(typval_T *args, typval_T *rvar);
-  /* implementation of function */
-} functions[] =
-{
-  { "abs",               1, 1, f_abs },
-  { "acos",              1, 1, f_acos },  // WJMc
-  { "add",               2, 2, f_add },
-  { "and",               2, 2, f_and },
-  { "append",            2, 2, f_append },
-  { "argc",              0, 0, f_argc },
-  { "argidx",            0, 0, f_argidx },
-  { "arglistid",         0, 2, f_arglistid },
-  { "argv",              0, 1, f_argv },
-  { "asin",              1, 1, f_asin },    // WJMc
-  { "assert_equal",      2, 3, f_assert_equal },
-  { "assert_exception",  1, 2, f_assert_exception },
-  { "assert_false",      1, 2, f_assert_false },
-  { "assert_true",       1, 2, f_assert_true },
-  { "atan",              1, 1, f_atan },
-  { "atan2",             2, 2, f_atan2 },
-  { "browse",            4, 4, f_browse },
-  { "browsedir",         2, 2, f_browsedir },
-  { "bufexists",         1, 1, f_bufexists },
-  { "buffer_exists",     1, 1, f_bufexists },  // obsolete
-  { "buffer_name",       1, 1, f_bufname },    // obsolete
-  { "buffer_number",     1, 1, f_bufnr },      // obsolete
-  { "buflisted",         1, 1, f_buflisted },
-  { "bufloaded",         1, 1, f_bufloaded },
-  { "bufname",           1, 1, f_bufname },
-  { "bufnr",             1, 2, f_bufnr },
-  { "bufwinnr",          1, 1, f_bufwinnr },
-  { "byte2line",         1, 1, f_byte2line },
-  { "byteidx",           2, 2, f_byteidx },
-  { "byteidxcomp",       2, 2, f_byteidxcomp },
-  { "call",              2, 3, f_call },
-  { "ceil",              1, 1, f_ceil },
-  { "changenr",          0, 0, f_changenr },
-  { "char2nr",           1, 2, f_char2nr },
-  { "cindent",           1, 1, f_cindent },
-  { "clearmatches",      0, 0, f_clearmatches },
-  { "col",               1, 1, f_col },
-  { "complete",          2, 2, f_complete },
-  { "complete_add",      1, 1, f_complete_add },
-  { "complete_check",    0, 0, f_complete_check },
-  { "confirm",           1, 4, f_confirm },
-  { "copy",              1, 1, f_copy },
-  { "cos",               1, 1, f_cos },
-  { "cosh",              1, 1, f_cosh },
-  { "count",             2, 4, f_count },
-  { "cscope_connection", 0, 3, f_cscope_connection },
-  { "cursor",            1, 3, f_cursor },
-  { "deepcopy",          1, 2, f_deepcopy },
-  { "delete",            1, 2, f_delete },
-  { "dictwatcheradd",    3, 3, f_dictwatcheradd },
-  { "dictwatcherdel",    3, 3, f_dictwatcherdel },
-  { "did_filetype",      0, 0, f_did_filetype },
-  { "diff_filler",       1, 1, f_diff_filler },
-  { "diff_hlID",         2, 2, f_diff_hlID },
-  { "empty",             1, 1, f_empty },
-  { "escape",            2, 2, f_escape },
-  { "eval",              1, 1, f_eval },
-  { "eventhandler",      0, 0, f_eventhandler },
-  { "executable",        1, 1, f_executable },
-  { "exepath",           1, 1, f_exepath },
-  { "exists",            1, 1, f_exists },
-  { "exp",               1, 1, f_exp },
-  { "expand",            1, 3, f_expand },
-  { "extend",            2, 3, f_extend },
-  { "feedkeys",          1, 2, f_feedkeys },
-  { "file_readable",     1, 1, f_filereadable },  // obsolete
-  { "filereadable",      1, 1, f_filereadable },
-  { "filewritable",      1, 1, f_filewritable },
-  { "filter",            2, 2, f_filter },
-  { "finddir",           1, 3, f_finddir },
-  { "findfile",          1, 3, f_findfile },
-  { "float2nr",          1, 1, f_float2nr },
-  { "floor",             1, 1, f_floor },
-  { "fmod",              2, 2, f_fmod },
-  { "fnameescape",       1, 1, f_fnameescape },
-  { "fnamemodify",       2, 2, f_fnamemodify },
-  { "foldclosed",        1, 1, f_foldclosed },
-  { "foldclosedend",     1, 1, f_foldclosedend },
-  { "foldlevel",         1, 1, f_foldlevel },
-  { "foldtext",          0, 0, f_foldtext },
-  { "foldtextresult",    1, 1, f_foldtextresult },
-  { "foreground",        0, 0, f_foreground },
-  { "function",          1, 1, f_function },
-  { "garbagecollect",    0, 1, f_garbagecollect },
-  { "get",               2, 3, f_get },
-  { "getbufline",        2, 3, f_getbufline },
-  { "getbufvar",         2, 3, f_getbufvar },
-  { "getchar",           0, 1, f_getchar },
-  { "getcharmod",        0, 0, f_getcharmod },
-  { "getcharsearch",     0, 0, f_getcharsearch },
-  { "getcmdline",        0, 0, f_getcmdline },
-  { "getcmdpos",         0, 0, f_getcmdpos },
-  { "getcmdtype",        0, 0, f_getcmdtype },
-  { "getcmdwintype",     0, 0, f_getcmdwintype },
-  { "getcurpos",         0, 0, f_getcurpos },
-  { "getcwd",            0, 2, f_getcwd },
-  { "getfontname",       0, 1, f_getfontname },
-  { "getfperm",          1, 1, f_getfperm },
-  { "getfsize",          1, 1, f_getfsize },
-  { "getftime",          1, 1, f_getftime },
-  { "getftype",          1, 1, f_getftype },
-  { "getline",           1, 2, f_getline },
-  { "getloclist",        1, 1, f_getqflist },
-  { "getmatches",        0, 0, f_getmatches },
-  { "getpid",            0, 0, f_getpid },
-  { "getpos",            1, 1, f_getpos },
-  { "getqflist",         0, 0, f_getqflist },
-  { "getreg",            0, 3, f_getreg },
-  { "getregtype",        0, 1, f_getregtype },
-  { "gettabvar",         2, 3, f_gettabvar },
-  { "gettabwinvar",      3, 4, f_gettabwinvar },
-  { "getwinposx",        0, 0, f_getwinposx },
-  { "getwinposy",        0, 0, f_getwinposy },
-  { "getwinvar",         2, 3, f_getwinvar },
-  { "glob",              1, 4, f_glob },
-  { "glob2regpat",       1, 1, f_glob2regpat },
-  { "globpath",          2, 5, f_globpath },
-  { "has",               1, 1, f_has },
-  { "has_key",           2, 2, f_has_key },
-  { "haslocaldir",       0, 2, f_haslocaldir },
-  { "hasmapto",          1, 3, f_hasmapto },
-  { "highlightID",       1, 1, f_hlID },            // obsolete
-  { "highlight_exists",  1, 1, f_hlexists },        // obsolete
-  { "histadd",           2, 2, f_histadd },
-  { "histdel",           1, 2, f_histdel },
-  { "histget",           1, 2, f_histget },
-  { "histnr",            1, 1, f_histnr },
-  { "hlID",              1, 1, f_hlID },
-  { "hlexists",          1, 1, f_hlexists },
-  { "hostname",          0, 0, f_hostname },
-  { "iconv",             3, 3, f_iconv },
-  { "indent",            1, 1, f_indent },
-  { "index",             2, 4, f_index },
-  { "input",             1, 3, f_input },
-  { "inputdialog",       1, 3, f_inputdialog },
-  { "inputlist",         1, 1, f_inputlist },
-  { "inputrestore",      0, 0, f_inputrestore },
-  { "inputsave",         0, 0, f_inputsave },
-  { "inputsecret",       1, 2, f_inputsecret },
-  { "insert",            2, 3, f_insert },
-  { "invert",            1, 1, f_invert },
-  { "isdirectory",       1, 1, f_isdirectory },
-  { "islocked",          1, 1, f_islocked },
-  { "items",             1, 1, f_items },
-  { "jobclose",          1, 2, f_jobclose },
-  { "jobpid",            1, 1, f_jobpid },
-  { "jobresize",         3, 3, f_jobresize },
-  { "jobsend",           2, 2, f_jobsend },
-  { "jobstart",          1, 2, f_jobstart },
-  { "jobstop",           1, 1, f_jobstop },
-  { "jobwait",           1, 2, f_jobwait },
-  { "join",              1, 2, f_join },
-  { "json_decode",        1, 1, f_json_decode },
-  { "json_encode",        1, 1, f_json_encode },
-  { "keys",              1, 1, f_keys },
-  { "last_buffer_nr",    0, 0, f_last_buffer_nr },  // obsolete
-  { "len",               1, 1, f_len },
-  { "libcall",           3, 3, f_libcall },
-  { "libcallnr",         3, 3, f_libcallnr },
-  { "line",              1, 1, f_line },
-  { "line2byte",         1, 1, f_line2byte },
-  { "lispindent",        1, 1, f_lispindent },
-  { "localtime",         0, 0, f_localtime },
-  { "log",               1, 1, f_log },
-  { "log10",             1, 1, f_log10 },
-  { "map",               2, 2, f_map },
-  { "maparg",            1, 4, f_maparg },
-  { "mapcheck",          1, 3, f_mapcheck },
-  { "match",             2, 4, f_match },
-  { "matchadd",          2, 5, f_matchadd },
-  { "matchaddpos",       2, 5, f_matchaddpos },
-  { "matcharg",          1, 1, f_matcharg },
-  { "matchdelete",       1, 1, f_matchdelete },
-  { "matchend",          2, 4, f_matchend },
-  { "matchlist",         2, 4, f_matchlist },
-  { "matchstr",          2, 4, f_matchstr },
-  { "max",               1, 1, f_max },
-  { "min",               1, 1, f_min },
-  { "mkdir",             1, 3, f_mkdir },
-  { "mode",              0, 1, f_mode },
-  { "msgpackdump",       1, 1, f_msgpackdump },
-  { "msgpackparse",      1, 1, f_msgpackparse },
-  { "nextnonblank",      1, 1, f_nextnonblank },
-  { "nr2char",           1, 2, f_nr2char },
-  { "or",                2, 2, f_or },
-  { "pathshorten",       1, 1, f_pathshorten },
-  { "pow",               2, 2, f_pow },
-  { "prevnonblank",      1, 1, f_prevnonblank },
-  { "printf",            2, MAX_FUNC_ARGS, f_printf },
-  { "pumvisible",        0, 0, f_pumvisible },
-  { "py3eval",           1, 1, f_py3eval },
-  { "pyeval",            1, 1, f_pyeval },
-  { "range",             1, 3, f_range },
-  { "readfile",          1, 3, f_readfile },
-  { "reltime",           0, 2, f_reltime },
-  { "reltimefloat",      1, 1, f_reltimefloat },
-  { "reltimestr",        1, 1, f_reltimestr },
-  { "remove",            2, 3, f_remove },
-  { "rename",            2, 2, f_rename },
-  { "repeat",            2, 2, f_repeat },
-  { "resolve",           1, 1, f_resolve },
-  { "reverse",           1, 1, f_reverse },
-  { "round",             1, 1, f_round },
-  { "rpcnotify",         2, MAX_FUNC_ARGS, f_rpcnotify },
-  { "rpcrequest",        2, MAX_FUNC_ARGS, f_rpcrequest },
-  { "rpcstart",          1, 2, f_rpcstart },
-  { "rpcstop",           1, 1, f_rpcstop },
-  { "screenattr",        2, 2, f_screenattr },
-  { "screenchar",        2, 2, f_screenchar },
-  { "screencol",         0, 0, f_screencol },
-  { "screenrow",         0, 0, f_screenrow },
-  { "search",            1, 4, f_search },
-  { "searchdecl",        1, 3, f_searchdecl },
-  { "searchpair",        3, 7, f_searchpair },
-  { "searchpairpos",     3, 7, f_searchpairpos },
-  { "searchpos",         1, 4, f_searchpos },
-  { "serverlist",        0, 0, f_serverlist },
-  { "serverstart",       0, 1, f_serverstart },
-  { "serverstop",        1, 1, f_serverstop },
-  { "setbufvar",         3, 3, f_setbufvar },
-  { "setcharsearch",     1, 1, f_setcharsearch },
-  { "setcmdpos",         1, 1, f_setcmdpos },
-  { "setfperm",          2, 2, f_setfperm },
-  { "setline",           2, 2, f_setline },
-  { "setloclist",        2, 4, f_setloclist },
-  { "setmatches",        1, 1, f_setmatches },
-  { "setpos",            2, 2, f_setpos },
-  { "setqflist",         1, 3, f_setqflist },
-  { "setreg",            2, 3, f_setreg },
-  { "settabvar",         3, 3, f_settabvar },
-  { "settabwinvar",      4, 4, f_settabwinvar },
-  { "setwinvar",         3, 3, f_setwinvar },
-  { "sha256",            1, 1, f_sha256 },
-  { "shellescape",       1, 2, f_shellescape },
-  { "shiftwidth",        0, 0, f_shiftwidth },
-  { "simplify",          1, 1, f_simplify },
-  { "sin",               1, 1, f_sin },
-  { "sinh",              1, 1, f_sinh },
-  { "sort",              1, 3, f_sort },
-  { "soundfold",         1, 1, f_soundfold },
-  { "spellbadword",      0, 1, f_spellbadword },
-  { "spellsuggest",      1, 3, f_spellsuggest },
-  { "split",             1, 3, f_split },
-  { "sqrt",              1, 1, f_sqrt },
-  { "str2float",         1, 1, f_str2float },
-  { "str2nr",            1, 2, f_str2nr },
-  { "strchars",          1, 2, f_strchars },
-  { "strdisplaywidth",   1, 2, f_strdisplaywidth },
-  { "strftime",          1, 2, f_strftime },
-  { "stridx",            2, 3, f_stridx },
-  { "string",            1, 1, f_string },
-  { "strlen",            1, 1, f_strlen },
-  { "strpart",           2, 3, f_strpart },
-  { "strridx",           2, 3, f_strridx },
-  { "strtrans",          1, 1, f_strtrans },
-  { "strwidth",          1, 1, f_strwidth },
-  { "submatch",          1, 2, f_submatch },
-  { "substitute",        4, 4, f_substitute },
-  { "synID",             3, 3, f_synID },
-  { "synIDattr",         2, 3, f_synIDattr },
-  { "synIDtrans",        1, 1, f_synIDtrans },
-  { "synconcealed",      2, 2, f_synconcealed },
-  { "synstack",          2, 2, f_synstack },
-  { "system",            1, 2, f_system },
-  { "systemlist",        1, 3, f_systemlist },
-  { "tabpagebuflist",    0, 1, f_tabpagebuflist },
-  { "tabpagenr",         0, 1, f_tabpagenr },
-  { "tabpagewinnr",      1, 2, f_tabpagewinnr },
-  { "tagfiles",          0, 0, f_tagfiles },
-  { "taglist",           1, 1, f_taglist },
-  { "tan",               1, 1, f_tan },
-  { "tanh",              1, 1, f_tanh },
-  { "tempname",          0, 0, f_tempname },
-  { "termopen",          1, 2, f_termopen },
-  { "test",              1, 1, f_test },
-  { "tolower",           1, 1, f_tolower },
-  { "toupper",           1, 1, f_toupper },
-  { "tr",                3, 3, f_tr },
-  { "trunc",             1, 1, f_trunc },
-  { "type",              1, 1, f_type },
-  { "undofile",          1, 1, f_undofile },
-  { "undotree",          0, 0, f_undotree },
-  { "uniq",              1, 3, f_uniq },
-  { "values",            1, 1, f_values },
-  { "virtcol",           1, 1, f_virtcol },
-  { "visualmode",        0, 1, f_visualmode },
-  { "wildmenumode",      0, 0, f_wildmenumode },
-  { "winbufnr",          1, 1, f_winbufnr },
-  { "wincol",            0, 0, f_wincol },
-  { "winheight",         1, 1, f_winheight },
-  { "winline",           0, 0, f_winline },
-  { "winnr",             0, 1, f_winnr },
-  { "winrestcmd",        0, 0, f_winrestcmd },
-  { "winrestview",       1, 1, f_winrestview },
-  { "winsaveview",       0, 0, f_winsaveview },
-  { "winwidth",          1, 1, f_winwidth },
-  { "wordcount",         0, 0, f_wordcount },
-  { "writefile",         2, 3, f_writefile },
-  { "xor",               2, 2, f_xor },
-};
-
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "funcs.generated.h"
+#endif
 
 /*
  * Function given to ExpandGeneric() to obtain the list of internal
@@ -6973,15 +6942,25 @@ char_u *get_function_name(expand_T *xp, int idx)
     if (name != NULL)
       return name;
   }
-  if (++intidx < (int)ARRAY_SIZE(functions)) {
-    STRCPY(IObuff, functions[intidx].f_name);
-    STRCAT(IObuff, "(");
-    if (functions[intidx].f_max_argc == 0)
-      STRCAT(IObuff, ")");
-    return IObuff;
+  while ( (size_t)++intidx < ARRAY_SIZE(functions)
+         && functions[intidx].name[0] == '\0') {
   }
 
-  return NULL;
+  if ((size_t)intidx >= ARRAY_SIZE(functions)) {
+    return NULL;
+  }
+
+  const char *const key = functions[intidx].name;
+  const size_t key_len = strlen(key);
+  memcpy(IObuff, key, key_len);
+  IObuff[key_len] = '(';
+  if (functions[intidx].max_argc == 0) {
+    IObuff[key_len + 1] = ')';
+    IObuff[key_len + 2] = NUL;
+  } else {
+    IObuff[key_len + 1] = NUL;
+  }
+  return IObuff;
 }
 
 /*
@@ -7006,42 +6985,32 @@ char_u *get_expr_name(expand_T *xp, int idx)
 
 
 
-/*
- * Find internal function in table above.
- * Return index, or -1 if not found
- */
-static int 
-find_internal_func (
-    char_u *name              /* name of the function */
-)
+/// Find internal function in hash functions
+///
+/// @param[in]  name  Name of the function.
+///
+/// Returns pointer to the function definition or NULL if not found.
+static VimLFuncDef *find_internal_func(const char *const name)
+  FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE FUNC_ATTR_NONNULL_ALL
 {
-  int first = 0;
-  int last = (int)ARRAY_SIZE(functions) - 1;
-
-  /*
-   * Find the function name in the table. Binary search.
-   */
-  while (first <= last) {
-    int x = first + ((unsigned)(last - first)) / 2;
-    int cmp = STRCMP(name, functions[x].f_name);
-    if (cmp < 0)
-      last = x - 1;
-    else if (cmp > 0)
-      first = x + 1;
-    else
-      return x;
-  }
-  return -1;
+  size_t len = strlen(name);
+  return find_internal_func_gperf(name, len);
 }
 
-/*
- * Check if "name" is a variable of type VAR_FUNC.  If so, return the function
- * name it contains, otherwise return "name".
- */
-static char_u *deref_func_name(char_u *name, int *lenp, int no_autoload)
+/// Check if "name" is a variable of type VAR_FUNC.  If so, return the function
+/// name it contains, otherwise return "name".
+/// If "partialp" is not NULL, and "name" is of type VAR_PARTIAL also set
+/// "partialp".
+static char_u *deref_func_name(
+    char_u *name, int *lenp,
+    partial_T **partialp, bool no_autoload
+)
 {
   dictitem_T  *v;
   int cc;
+  if (partialp != NULL) {
+    *partialp = NULL;
+  }
 
   cc = name[*lenp];
   name[*lenp] = NUL;
@@ -7056,6 +7025,20 @@ static char_u *deref_func_name(char_u *name, int *lenp, int no_autoload)
     return v->di_tv.vval.v_string;
   }
 
+  if (v != NULL && v->di_tv.v_type == VAR_PARTIAL) {
+    partial_T *pt = v->di_tv.vval.v_partial;
+
+    if (pt == NULL) {
+      *lenp = 0;
+      return (char_u *)"";  // just in case
+    }
+    if (partialp != NULL) {
+      *partialp = pt;
+    }
+    *lenp = (int)STRLEN(pt->pt_name);
+    return pt->pt_name;
+  }
+
   return name;
 }
 
@@ -7073,7 +7056,8 @@ get_func_tv (
     linenr_T lastline,              /* last line of range */
     int *doesrange,         /* return: function handled range */
     int evaluate,
-    dict_T *selfdict          /* Dictionary for "self" */
+    partial_T *partial,     // for extra arguments
+    dict_T *selfdict        // Dictionary for "self"
 )
 {
   char_u      *argp;
@@ -7085,10 +7069,11 @@ get_func_tv (
    * Get the arguments.
    */
   argp = *arg;
-  while (argcount < MAX_FUNC_ARGS) {
-    argp = skipwhite(argp + 1);             /* skip the '(' or ',' */
-    if (*argp == ')' || *argp == ',' || *argp == NUL)
+  while (argcount < MAX_FUNC_ARGS - (partial == NULL ? 0 : partial->pt_argc)) {
+    argp = skipwhite(argp + 1);             // skip the '(' or ','
+    if (*argp == ')' || *argp == ',' || *argp == NUL) {
       break;
+    }
     if (eval1(&argp, &argvars[argcount], evaluate) == FAIL) {
       ret = FAIL;
       break;
@@ -7102,14 +7087,16 @@ get_func_tv (
   else
     ret = FAIL;
 
-  if (ret == OK)
+  if (ret == OK) {
     ret = call_func(name, len, rettv, argcount, argvars,
-        firstline, lastline, doesrange, evaluate, selfdict);
-  else if (!aborting()) {
-    if (argcount == MAX_FUNC_ARGS)
+                    firstline, lastline, doesrange, evaluate,
+                    partial, selfdict);
+  } else if (!aborting()) {
+    if (argcount == MAX_FUNC_ARGS) {
       emsg_funcname(N_("E740: Too many arguments for function %s"), name);
-    else
+    } else {
       emsg_funcname(N_("E116: Invalid arguments for function %s"), name);
+    }
   }
 
   while (--argcount >= 0)
@@ -7119,28 +7106,6 @@ get_func_tv (
   return ret;
 }
 
-
-/*
- * Call a function with its resolved parameters
- * Return FAIL when the function can't be called,  OK otherwise.
- * Also returns OK when an error was encountered while executing the function.
- */
-int
-call_func (
-    char_u *funcname,          /* name of the function */
-    int len,                        /* length of "name" */
-    typval_T *rettv,             /* return value goes here */
-    int argcount,                   /* number of "argvars" */
-    typval_T *argvars,           /* vars for arguments, must have "argcount"
-                                   PLUS ONE elements! */
-    linenr_T firstline,             /* first line of range */
-    linenr_T lastline,              /* last line of range */
-    int *doesrange,         /* return: function handled range */
-    int evaluate,
-    dict_T *selfdict          /* Dictionary for "self" */
-)
-{
-  int ret = FAIL;
 #define ERROR_UNKNOWN   0
 #define ERROR_TOOMANY   1
 #define ERROR_TOOFEW    2
@@ -7148,35 +7113,31 @@ call_func (
 #define ERROR_DICT      4
 #define ERROR_NONE      5
 #define ERROR_OTHER     6
-  int error = ERROR_NONE;
-  int i;
-  int llen;
-  ufunc_T     *fp;
+#define ERROR_BOTH      7
 #define FLEN_FIXED 40
-  char_u fname_buf[FLEN_FIXED + 1];
-  char_u      *fname;
-  char_u      *name;
 
-  /* Make a copy of the name, if it comes from a funcref variable it could
-   * be changed or deleted in the called function. */
-  name = vim_strnsave(funcname, len);
+/// In a script change <SID>name() and s:name() to K_SNR 123_name().
+/// Change <SNR>123_name() to K_SNR 123_name().
+/// Use "fname_buf[FLEN_FIXED + 1]" when it fits, otherwise allocate memory
+/// (slow).
+static char_u *
+fname_trans_sid(char_u *name, char_u *fname_buf, char_u **tofree, int *error) {
+  int llen;
+  char_u *fname;
+  int i;
 
-  /*
-   * In a script change <SID>name() and s:name() to K_SNR 123_name().
-   * Change <SNR>123_name() to K_SNR 123_name().
-   * Use fname_buf[] when it fits, otherwise allocate memory (slow).
-   */
   llen = eval_fname_script(name);
   if (llen > 0) {
     fname_buf[0] = K_SPECIAL;
     fname_buf[1] = KS_EXTRA;
     fname_buf[2] = (int)KE_SNR;
     i = 3;
-    if (eval_fname_sid(name)) {         /* "<SID>" or "s:" */
-      if (current_SID <= 0)
-        error = ERROR_SCRIPT;
-      else {
-        sprintf((char *)fname_buf + 3, "%" PRId64 "_", (int64_t)current_SID);
+    if (eval_fname_sid(name)) {  // "<SID>" or "s:"
+      if (current_SID <= 0) {
+        *error = ERROR_SCRIPT;
+      } else {
+        snprintf((char *)fname_buf + 3, FLEN_FIXED + 1, "%" PRId64 "_",
+                 (int64_t)current_SID);
         i = (int)STRLEN(fname_buf);
       }
     }
@@ -7185,13 +7146,83 @@ call_func (
       fname = fname_buf;
     } else {
       fname = xmalloc(i + STRLEN(name + llen) + 1);
-      memmove(fname, fname_buf, (size_t)i);
-      STRCPY(fname + i, name + llen);
+      if (fname == NULL) {
+        *error = ERROR_OTHER;
+      } else {
+        *tofree = fname;
+        memmove(fname, fname_buf, (size_t)i);
+        STRCPY(fname + i, name + llen);
+      }
     }
-  } else
+  } else {
     fname = name;
+  }
 
-  *doesrange = FALSE;
+  return fname;
+}
+
+/// Call a function with its resolved parameters
+/// Return FAIL when the function can't be called,  OK otherwise.
+/// Also returns OK when an error was encountered while executing the function.
+int
+call_func(
+    char_u *funcname,               // name of the function
+    int len,                        // length of "name"
+    typval_T *rettv,                // return value goes here
+    int argcount_in,                // number of "argvars"
+    typval_T *argvars_in,           // vars for arguments, must have "argcount"
+                                    // PLUS ONE elements!
+    linenr_T firstline,             // first line of range
+    linenr_T lastline,              // last line of range
+    int *doesrange,                 // return: function handled range
+    bool evaluate,
+    partial_T *partial,             // optional, can be NULL
+    dict_T *selfdict_in             // Dictionary for "self"
+)
+{
+  int ret = FAIL;
+  int error = ERROR_NONE;
+  ufunc_T *fp;
+  char_u fname_buf[FLEN_FIXED + 1];
+  char_u *tofree = NULL;
+  char_u *fname;
+  char_u *name;
+  int argcount = argcount_in;
+  typval_T *argvars = argvars_in;
+  dict_T *selfdict = selfdict_in;
+  typval_T argv[MAX_FUNC_ARGS + 1];  // used when "partial" is not NULL
+  int argv_clear = 0;
+
+  // Make a copy of the name, if it comes from a funcref variable it could
+  // be changed or deleted in the called function.
+  name = vim_strnsave(funcname, len);
+  if (name == NULL) {
+    return ret;
+  }
+
+  fname = fname_trans_sid(name, fname_buf, &tofree, &error);
+
+  *doesrange = false;
+
+  if (partial != NULL) {
+    // When the function has a partial with a dict and there is a dict
+    // argument, use the dict argument. That is backwards compatible.
+    // When the dict was bound explicitly use the one from the partial.
+    if (partial->pt_dict != NULL
+        && (selfdict_in == NULL || !partial->pt_auto)) {
+      selfdict = partial->pt_dict;
+    }
+    if (error == ERROR_NONE && partial->pt_argc > 0) {
+      for (argv_clear = 0; argv_clear < partial->pt_argc; argv_clear++) {
+        copy_tv(&partial->pt_argv[argv_clear], &argv[argv_clear]);
+      }
+      for (int i = 0; i < argcount_in; i++) {
+        argv[i + argv_clear] = argvars_in[i];
+      }
+      argvars = argv;
+      argcount = partial->pt_argc + argcount_in;
+    }
+  }
 
 
   /* execute the function if no errors detected and executing */
@@ -7243,18 +7274,16 @@ call_func (
         }
       }
     } else {
-      /*
-       * Find the function name in the table, call its implementation.
-       */
-      i = find_internal_func(fname);
-      if (i >= 0) {
-        if (argcount < functions[i].f_min_argc)
+      // Find the function name in the table, call its implementation.
+      VimLFuncDef *const fdef = find_internal_func((char *)fname);
+      if (fdef != NULL) {
+        if (argcount < fdef->min_argc) {
           error = ERROR_TOOFEW;
-        else if (argcount > functions[i].f_max_argc)
+        } else if (argcount > fdef->max_argc) {
           error = ERROR_TOOMANY;
-        else {
+        } else {
           argvars[argcount].v_type = VAR_UNKNOWN;
-          functions[i].f_func(argvars, rettv);
+          fdef->func(argvars, rettv, fdef->data);
           error = ERROR_NONE;
         }
       }
@@ -7301,8 +7330,10 @@ call_func (
     }
   }
 
-  if (fname != name && fname != fname_buf)
-    xfree(fname);
+  while (argv_clear > 0) {
+    clear_tv(&argv[--argv_clear]);
+  }
+  xfree(tofree);
   xfree(name);
 
   return ret;
@@ -7365,13 +7396,10 @@ static inline int get_float_arg(typval_T *argvars, float_T *f)
 // Some versions of glibc on i386 have an optimization that makes it harder to
 // call math functions indirectly from inside an inlined function, causing
 // compile-time errors. Avoid `inline` in that case. #3072
-#ifndef ARCH_32
-inline
-#endif
-static void float_op_wrapper(typval_T *argvars, typval_T *rettv,
-                             float_T (*function)(float_T))
+static void float_op_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   float_T f;
+  float_T (*function)(float_T) = (float_T (*)(float_T))fptr;
 
   rettv->v_type = VAR_FLOAT;
   if (get_float_arg(argvars, &f) == OK) {
@@ -7381,13 +7409,40 @@ static void float_op_wrapper(typval_T *argvars, typval_T *rettv,
   }
 }
 
+static void api_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  ApiDispatchWrapper fn = (ApiDispatchWrapper)fptr;
+
+  Array args = ARRAY_DICT_INIT;
+
+  for (typval_T *tv = argvars; tv->v_type != VAR_UNKNOWN; tv++) {
+    ADD(args, vim_to_object(tv));
+  }
+
+  Error err = ERROR_INIT;
+  Object result = fn(INTERNAL_CALL, args, &err);
+
+  if (err.set) {
+    nvim_err_writeln(cstr_as_string(err.msg));
+    goto end;
+  }
+
+  if (!object_to_vim(result, rettv, &err)) {
+    EMSG2(_("Error converting the call result: %s"), err.msg);
+  }
+
+end:
+  api_free_array(args);
+  api_free_object(result);
+}
+
 /*
  * "abs(expr)" function
  */
-static void f_abs(typval_T *argvars, typval_T *rettv)
+static void f_abs(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (argvars[0].v_type == VAR_FLOAT) {
-    float_op_wrapper(argvars, rettv, &fabs);
+    float_op_wrapper(argvars, rettv, (FunPtr)&fabs);
   } else {
     varnumber_T n;
     int error = FALSE;
@@ -7403,17 +7458,9 @@ static void f_abs(typval_T *argvars, typval_T *rettv)
 }
 
 /*
- * "acos()" function
- */
-static void f_acos(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &acos);
-}
-
-/*
  * "add(list, item)" function
  */
-static void f_add(typval_T *argvars, typval_T *rettv)
+static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T      *l;
 
@@ -7432,16 +7479,25 @@ static void f_add(typval_T *argvars, typval_T *rettv)
 /*
  * "and(expr, expr)" function
  */
-static void f_and(typval_T *argvars, typval_T *rettv)
+static void f_and(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = get_tv_number_chk(&argvars[0], NULL)
                          & get_tv_number_chk(&argvars[1], NULL);
 }
 
+
+/// "api_info()" function
+static void f_api_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  Dictionary metadata = api_metadata();
+  (void)object_to_vim(DICTIONARY_OBJ(metadata), rettv, NULL);
+  api_free_dictionary(metadata);
+}
+
 /*
  * "append(lnum, string/list)" function
  */
-static void f_append(typval_T *argvars, typval_T *rettv)
+static void f_append(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long lnum;
   char_u      *line;
@@ -7496,7 +7552,7 @@ static void f_append(typval_T *argvars, typval_T *rettv)
 /*
  * "argc()" function
  */
-static void f_argc(typval_T *argvars, typval_T *rettv)
+static void f_argc(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = ARGCOUNT;
 }
@@ -7504,41 +7560,25 @@ static void f_argc(typval_T *argvars, typval_T *rettv)
 /*
  * "argidx()" function
  */
-static void f_argidx(typval_T *argvars, typval_T *rettv)
+static void f_argidx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = curwin->w_arg_idx;
 }
 
 /// "arglistid" function
-static void f_arglistid(typval_T *argvars, typval_T *rettv)
+static void f_arglistid(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = -1;
-  if (argvars[0].v_type != VAR_UNKNOWN) {
-    tabpage_T *tp = NULL;
-    if (argvars[1].v_type != VAR_UNKNOWN) {
-      long n = get_tv_number(&argvars[1]);
-      if (n >= 0) {
-        tp = find_tabpage(n);
-      }
-    } else {
-      tp = curtab;
-    }
-
-    if (tp != NULL) {
-      win_T *wp = find_win_by_nr(&argvars[0], tp);
-      if (wp != NULL) {
-        rettv->vval.v_number = wp->w_alist->id;
-      }
-    }
-  } else {
-    rettv->vval.v_number = curwin->w_alist->id;
+  win_T *wp = find_tabwin(&argvars[0], &argvars[1]);
+  if (wp != NULL) {
+    rettv->vval.v_number = wp->w_alist->id;
   }
 }
 
 /*
  * "argv(nr)" function
  */
-static void f_argv(typval_T *argvars, typval_T *rettv)
+static void f_argv(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int idx;
 
@@ -7581,7 +7621,7 @@ static void prepare_assert_error(garray_T *gap)
 // Fill "gap" with information about an assert error.
 static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
                               char_u *exp_str, typval_T *exp_tv,
-                              typval_T *got_tv)
+                              typval_T *got_tv, assert_type_T atype)
 {
   char_u *tofree;
 
@@ -7590,7 +7630,11 @@ static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
     ga_concat(gap, tofree);
     xfree(tofree);
   } else {
-    ga_concat(gap, (char_u *)"Expected ");
+    if (atype == ASSERT_MATCH || atype == ASSERT_NOTMATCH) {
+      ga_concat(gap, (char_u *)"Pattern ");
+    } else {
+      ga_concat(gap, (char_u *)"Expected ");
+    }
     if (exp_str == NULL) {
       tofree = (char_u *) encode_tv2string(exp_tv, NULL);
       ga_concat(gap, tofree);
@@ -7598,8 +7642,16 @@ static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
     } else {
       ga_concat(gap, exp_str);
     }
-    tofree = (char_u *) encode_tv2string(got_tv, NULL);
-    ga_concat(gap, (char_u *)" but got ");
+    tofree = (char_u *)encode_tv2string(got_tv, NULL);
+    if (atype == ASSERT_MATCH) {
+      ga_concat(gap, (char_u *)" does not match ");
+    } else if (atype == ASSERT_NOTMATCH) {
+      ga_concat(gap, (char_u *)" does match ");
+    } else if (atype == ASSERT_NOTEQUAL) {
+      ga_concat(gap, (char_u *)" differs from ");
+    } else {
+      ga_concat(gap, (char_u *)" but got ");
+    }
     ga_concat(gap, tofree);
     xfree(tofree);
   }
@@ -7618,22 +7670,34 @@ static void assert_error(garray_T *gap)
                      gap->ga_data, gap->ga_len);
 }
 
-// "assert_equal(expected, actual[, msg])" function
-static void f_assert_equal(typval_T *argvars, typval_T *rettv)
+static void assert_equal_common(typval_T *argvars, assert_type_T atype)
 {
   garray_T ga;
 
-  if (!tv_equal(&argvars[0], &argvars[1], false, false)) {
+  if (tv_equal(&argvars[0], &argvars[1], false, false)
+      != (atype == ASSERT_EQUAL)) {
     prepare_assert_error(&ga);
     fill_assert_error(&ga, &argvars[2], NULL,
-                      &argvars[0], &argvars[1]);
+                      &argvars[0], &argvars[1], atype);
     assert_error(&ga);
     ga_clear(&ga);
   }
 }
 
+// "assert_equal(expected, actual[, msg])" function
+static void f_assert_equal(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  assert_equal_common(argvars, ASSERT_EQUAL);
+}
+
+// "assert_notequal(expected, actual[, msg])" function
+static void f_assert_notequal(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  assert_equal_common(argvars, ASSERT_NOTEQUAL);
+}
+
 /// "assert_exception(string[, msg])" function
-static void f_assert_exception(typval_T *argvars, typval_T *rettv)
+static void f_assert_exception(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   garray_T ga;
 
@@ -7643,15 +7707,53 @@ static void f_assert_exception(typval_T *argvars, typval_T *rettv)
     ga_concat(&ga, (char_u *)"v:exception is not set");
     assert_error(&ga);
     ga_clear(&ga);
-  } else if (strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL) {
+  } else if (error != NULL
+             && strstr((char *)vimvars[VV_EXCEPTION].vv_str, error) == NULL) {
     prepare_assert_error(&ga);
     fill_assert_error(&ga, &argvars[1], NULL, &argvars[0],
-                      &vimvars[VV_EXCEPTION].vv_tv);
+                      &vimvars[VV_EXCEPTION].vv_tv, ASSERT_OTHER);
     assert_error(&ga);
     ga_clear(&ga);
   }
 }
 
+/// "assert_fails(cmd [, error])" function
+static void f_assert_fails(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  char_u *cmd = get_tv_string_chk(&argvars[0]);
+  garray_T    ga;
+
+  called_emsg = false;
+  suppress_errthrow = true;
+  emsg_silent = true;
+  do_cmdline_cmd((char *)cmd);
+  if (!called_emsg) {
+    prepare_assert_error(&ga);
+    ga_concat(&ga, (char_u *)"command did not fail: ");
+    ga_concat(&ga, cmd);
+    assert_error(&ga);
+    ga_clear(&ga);
+  } else if (argvars[1].v_type != VAR_UNKNOWN) {
+    char_u buf[NUMBUFLEN];
+    char *error = (char *)get_tv_string_buf_chk(&argvars[1], buf);
+
+    if (error == NULL
+        || strstr((char *)vimvars[VV_ERRMSG].vv_str, error) == NULL) {
+      prepare_assert_error(&ga);
+      fill_assert_error(&ga, &argvars[2], NULL, &argvars[1],
+                        &vimvars[VV_ERRMSG].vv_tv, ASSERT_OTHER);
+      assert_error(&ga);
+      ga_clear(&ga);
+    }
+  }
+
+  called_emsg = false;
+  suppress_errthrow = false;
+  emsg_silent = false;
+  emsg_on_display = false;
+  set_vim_var_string(VV_ERRMSG, NULL, 0);
+}
+
 // Common for assert_true() and assert_false().
 static void assert_bool(typval_T *argvars, bool is_true)
 {
@@ -7669,44 +7771,58 @@ static void assert_bool(typval_T *argvars, bool is_true)
     prepare_assert_error(&ga);
     fill_assert_error(&ga, &argvars[1],
                       (char_u *)(is_true ? "True" : "False"),
-                      NULL, &argvars[0]);
+                      NULL, &argvars[0], ASSERT_OTHER);
     assert_error(&ga);
     ga_clear(&ga);
   }
 }
 
 // "assert_false(actual[, msg])" function
-static void f_assert_false(typval_T *argvars, typval_T *rettv)
+static void f_assert_false(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   assert_bool(argvars, false);
 }
 
-// "assert_true(actual[, msg])" function
-static void f_assert_true(typval_T *argvars, typval_T *rettv)
+static void assert_match_common(typval_T *argvars, assert_type_T atype)
 {
-  assert_bool(argvars, true);
+  char_u buf1[NUMBUFLEN];
+  char_u buf2[NUMBUFLEN];
+  char_u *pat = get_tv_string_buf_chk(&argvars[0], buf1);
+  char_u *text = get_tv_string_buf_chk(&argvars[1], buf2);
+
+  if (pat == NULL || text == NULL) {
+    EMSG(_(e_invarg));
+  } else if (pattern_match(pat, text, false) != (atype == ASSERT_MATCH)) {
+    garray_T ga;
+    prepare_assert_error(&ga);
+    fill_assert_error(&ga, &argvars[2], NULL, &argvars[0], &argvars[1], atype);
+    assert_error(&ga);
+    ga_clear(&ga);
+  }
 }
 
-/*
- * "asin()" function
- */
-static void f_asin(typval_T *argvars, typval_T *rettv)
+/// "assert_match(pattern, actual[, msg])" function
+static void f_assert_match(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  float_op_wrapper(argvars, rettv, &asin);
+  assert_match_common(argvars, ASSERT_MATCH);
 }
 
-/*
- * "atan()" function
- */
-static void f_atan(typval_T *argvars, typval_T *rettv)
+/// "assert_notmatch(pattern, actual[, msg])" function
+static void f_assert_notmatch(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  assert_match_common(argvars, ASSERT_NOTMATCH);
+}
+
+// "assert_true(actual[, msg])" function
+static void f_assert_true(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  float_op_wrapper(argvars, rettv, &atan);
+  assert_bool(argvars, true);
 }
 
 /*
  * "atan2()" function
  */
-static void f_atan2(typval_T *argvars, typval_T *rettv)
+static void f_atan2(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   float_T fx, fy;
 
@@ -7721,7 +7837,7 @@ static void f_atan2(typval_T *argvars, typval_T *rettv)
 /*
  * "browse(save, title, initdir, default)" function
  */
-static void f_browse(typval_T *argvars, typval_T *rettv)
+static void f_browse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_string = NULL;
   rettv->v_type = VAR_STRING;
@@ -7730,9 +7846,9 @@ static void f_browse(typval_T *argvars, typval_T *rettv)
 /*
  * "browsedir(title, initdir)" function
  */
-static void f_browsedir(typval_T *argvars, typval_T *rettv)
+static void f_browsedir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  f_browse(argvars, rettv);
+  f_browse(argvars, rettv, NULL);
 }
 
 
@@ -7768,7 +7884,7 @@ static buf_T *find_buffer(typval_T *avar)
 /*
  * "bufexists(expr)" function
  */
-static void f_bufexists(typval_T *argvars, typval_T *rettv)
+static void f_bufexists(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = (find_buffer(&argvars[0]) != NULL);
 }
@@ -7776,7 +7892,7 @@ static void f_bufexists(typval_T *argvars, typval_T *rettv)
 /*
  * "buflisted(expr)" function
  */
-static void f_buflisted(typval_T *argvars, typval_T *rettv)
+static void f_buflisted(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
 
@@ -7787,7 +7903,7 @@ static void f_buflisted(typval_T *argvars, typval_T *rettv)
 /*
  * "bufloaded(expr)" function
  */
-static void f_bufloaded(typval_T *argvars, typval_T *rettv)
+static void f_bufloaded(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
 
@@ -7837,7 +7953,7 @@ static buf_T *get_buf_tv(typval_T *tv, int curtab_only)
 /*
  * "bufname(expr)" function
  */
-static void f_bufname(typval_T *argvars, typval_T *rettv)
+static void f_bufname(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
 
@@ -7855,7 +7971,7 @@ static void f_bufname(typval_T *argvars, typval_T *rettv)
 /*
  * "bufnr(expr)" function
  */
-static void f_bufnr(typval_T *argvars, typval_T *rettv)
+static void f_bufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
   int error = FALSE;
@@ -7882,32 +7998,53 @@ static void f_bufnr(typval_T *argvars, typval_T *rettv)
     rettv->vval.v_number = -1;
 }
 
-/*
- * "bufwinnr(nr)" function
- */
-static void f_bufwinnr(typval_T *argvars, typval_T *rettv)
+static void buf_win_common(typval_T *argvars, typval_T *rettv, bool get_nr)
 {
-  (void)get_tv_number(&argvars[0]);         /* issue errmsg if type error */
-  ++emsg_off;
+  int error = false;
+  (void)get_tv_number_chk(&argvars[0], &error);  // issue errmsg if type error
+  if (error) {  // the argument has an invalid type
+    rettv->vval.v_number = -1;
+    return;
+  }
+
+  emsg_off++;
+  buf_T *buf = get_buf_tv(&argvars[0], true);
+  if (buf == NULL) {  // no need to search if buffer was not found
+    rettv->vval.v_number = -1;
+    goto end;
+  }
 
-  buf_T *buf = get_buf_tv(&argvars[0], TRUE);
   int winnr = 0;
+  int winid;
   bool found_buf = false;
   FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-    ++winnr;
+    winnr++;
     if (wp->w_buffer == buf) {
       found_buf = true;
+      winid = wp->handle;
       break;
     }
   }
-  rettv->vval.v_number = (found_buf ? winnr : -1);
-  --emsg_off;
+  rettv->vval.v_number = (found_buf ? (get_nr ? winnr : winid) : -1);
+end:
+  emsg_off--;
+}
+
+/// "bufwinid(nr)" function
+static void f_bufwinid(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
+  buf_win_common(argvars, rettv, false);
+}
+
+/// "bufwinnr(nr)" function
+static void f_bufwinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  buf_win_common(argvars, rettv, true);
 }
 
 /*
  * "byte2line(byte)" function
  */
-static void f_byte2line(typval_T *argvars, typval_T *rettv)
+static void f_byte2line(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long boff = 0;
 
@@ -7946,7 +8083,7 @@ static void byteidx(typval_T *argvars, typval_T *rettv, int comp)
 /*
  * "byteidx()" function
  */
-static void f_byteidx(typval_T *argvars, typval_T *rettv)
+static void f_byteidx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   byteidx(argvars, rettv, FALSE);
 }
@@ -7954,12 +8091,13 @@ static void f_byteidx(typval_T *argvars, typval_T *rettv)
 /*
  * "byteidxcomp()" function
  */
-static void f_byteidxcomp(typval_T *argvars, typval_T *rettv)
+static void f_byteidxcomp(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   byteidx(argvars, rettv, TRUE);
 }
 
-int func_call(char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv)
+int func_call(char_u *name, typval_T *args, partial_T *partial,
+              dict_T *selfdict, typval_T *rettv)
 {
   listitem_T  *item;
   typval_T argv[MAX_FUNC_ARGS + 1];
@@ -7969,7 +8107,7 @@ int func_call(char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv)
 
   for (item = args->vval.v_list->lv_first; item != NULL;
        item = item->li_next) {
-    if (argc == MAX_FUNC_ARGS) {
+    if (argc == MAX_FUNC_ARGS - (partial == NULL ? 0 : partial->pt_argc)) {
       EMSG(_("E699: Too many arguments"));
       break;
     }
@@ -7979,10 +8117,11 @@ int func_call(char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv)
     copy_tv(&item->li_tv, &argv[argc++]);
   }
 
-  if (item == NULL)
+  if (item == NULL) {
     r = call_func(name, (int)STRLEN(name), rettv, argc, argv,
-        curwin->w_cursor.lnum, curwin->w_cursor.lnum,
-        &dummy, TRUE, selfdict);
+                  curwin->w_cursor.lnum, curwin->w_cursor.lnum,
+                  &dummy, true, partial, selfdict);
+  }
 
   /* Free the arguments. */
   while (argc > 0)
@@ -7991,12 +8130,11 @@ int func_call(char_u *name, typval_T *args, dict_T *selfdict, typval_T *rettv)
   return r;
 }
 
-/*
- * "call(func, arglist)" function
- */
-static void f_call(typval_T *argvars, typval_T *rettv)
+/// "call(func, arglist [, dict])" function
+static void f_call(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *func;
+  partial_T   *partial = NULL;
   dict_T      *selfdict = NULL;
 
   if (argvars[1].v_type != VAR_LIST) {
@@ -8006,12 +8144,17 @@ static void f_call(typval_T *argvars, typval_T *rettv)
   if (argvars[1].vval.v_list == NULL)
     return;
 
-  if (argvars[0].v_type == VAR_FUNC)
+  if (argvars[0].v_type == VAR_FUNC) {
     func = argvars[0].vval.v_string;
-  else
+  } else if (argvars[0].v_type == VAR_PARTIAL) {
+    partial = argvars[0].vval.v_partial;
+    func = partial->pt_name;
+  } else {
     func = get_tv_string(&argvars[0]);
-  if (*func == NUL)
-    return;             /* type error or empty name */
+  }
+  if (*func == NUL) {
+    return;             // type error or empty name
+  }
 
   if (argvars[2].v_type != VAR_UNKNOWN) {
     if (argvars[2].v_type != VAR_DICT) {
@@ -8021,21 +8164,13 @@ static void f_call(typval_T *argvars, typval_T *rettv)
     selfdict = argvars[2].vval.v_dict;
   }
 
-  (void)func_call(func, &argvars[1], selfdict, rettv);
-}
-
-/*
- * "ceil({float})" function
- */
-static void f_ceil(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &ceil);
+  func_call(func, &argvars[1], partial, selfdict, rettv);
 }
 
 /*
  * "changenr()" function
  */
-static void f_changenr(typval_T *argvars, typval_T *rettv)
+static void f_changenr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = curbuf->b_u_seq_cur;
 }
@@ -8043,7 +8178,7 @@ static void f_changenr(typval_T *argvars, typval_T *rettv)
 /*
  * "char2nr(string)" function
  */
-static void f_char2nr(typval_T *argvars, typval_T *rettv)
+static void f_char2nr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (has_mbyte) {
     int utf8 = 0;
@@ -8062,7 +8197,7 @@ static void f_char2nr(typval_T *argvars, typval_T *rettv)
 /*
  * "cindent(lnum)" function
  */
-static void f_cindent(typval_T *argvars, typval_T *rettv)
+static void f_cindent(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   pos_T pos;
   linenr_T lnum;
@@ -8080,7 +8215,7 @@ static void f_cindent(typval_T *argvars, typval_T *rettv)
 /*
  * "clearmatches()" function
  */
-static void f_clearmatches(typval_T *argvars, typval_T *rettv)
+static void f_clearmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   clear_matches(curwin);
 }
@@ -8088,7 +8223,7 @@ static void f_clearmatches(typval_T *argvars, typval_T *rettv)
 /*
  * "col(string)" function
  */
-static void f_col(typval_T *argvars, typval_T *rettv)
+static void f_col(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   colnr_T col = 0;
   pos_T       *fp;
@@ -8125,7 +8260,7 @@ static void f_col(typval_T *argvars, typval_T *rettv)
 /*
  * "complete()" function
  */
-static void f_complete(typval_T *argvars, typval_T *rettv)
+static void f_complete(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int startcol;
 
@@ -8154,7 +8289,7 @@ static void f_complete(typval_T *argvars, typval_T *rettv)
 /*
  * "complete_add()" function
  */
-static void f_complete_add(typval_T *argvars, typval_T *rettv)
+static void f_complete_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = ins_compl_add_tv(&argvars[0], 0);
 }
@@ -8162,12 +8297,12 @@ static void f_complete_add(typval_T *argvars, typval_T *rettv)
 /*
  * "complete_check()" function
  */
-static void f_complete_check(typval_T *argvars, typval_T *rettv)
+static void f_complete_check(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int saved = RedrawingDisabled;
 
   RedrawingDisabled = 0;
-  ins_compl_check_keys(0);
+  ins_compl_check_keys(0, true);
   rettv->vval.v_number = compl_interrupted;
   RedrawingDisabled = saved;
 }
@@ -8175,7 +8310,7 @@ static void f_complete_check(typval_T *argvars, typval_T *rettv)
 /*
  * "confirm(message, buttons[, default [, type]])" function
  */
-static void f_confirm(typval_T *argvars, typval_T *rettv)
+static void f_confirm(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *message;
   char_u      *buttons = NULL;
@@ -8223,31 +8358,15 @@ static void f_confirm(typval_T *argvars, typval_T *rettv)
 /*
  * "copy()" function
  */
-static void f_copy(typval_T *argvars, typval_T *rettv)
+static void f_copy(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   var_item_copy(NULL, &argvars[0], rettv, false, 0);
 }
 
 /*
- * "cos()" function
- */
-static void f_cos(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &cos);
-}
-
-/*
- * "cosh()" function
- */
-static void f_cosh(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &cosh);
-}
-
-/*
  * "count()" function
  */
-static void f_count(typval_T *argvars, typval_T *rettv)
+static void f_count(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long n = 0;
   int ic = FALSE;
@@ -8312,7 +8431,7 @@ static void f_count(typval_T *argvars, typval_T *rettv)
  *
  * Checks the existence of a cscope connection.
  */
-static void f_cscope_connection(typval_T *argvars, typval_T *rettv)
+static void f_cscope_connection(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int num = 0;
   char_u      *dbpath = NULL;
@@ -8336,7 +8455,7 @@ static void f_cscope_connection(typval_T *argvars, typval_T *rettv)
 /// Moves the cursor to the specified line and column.
 ///
 /// @returns 0 when the position could be set, -1 otherwise.
-static void f_cursor(typval_T *argvars, typval_T *rettv)
+static void f_cursor(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long line, col;
   long coladd = 0;
@@ -8392,7 +8511,7 @@ static void f_cursor(typval_T *argvars, typval_T *rettv)
 /*
  * "deepcopy()" function
  */
-static void f_deepcopy(typval_T *argvars, typval_T *rettv)
+static void f_deepcopy(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int noref = 0;
 
@@ -8408,7 +8527,7 @@ static void f_deepcopy(typval_T *argvars, typval_T *rettv)
 }
 
 // "delete()" function
-static void f_delete(typval_T *argvars, typval_T *rettv)
+static void f_delete(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u nbuf[NUMBUFLEN];
   char_u *name;
@@ -8446,7 +8565,7 @@ static void f_delete(typval_T *argvars, typval_T *rettv)
 }
 
 // dictwatcheradd(dict, key, funcref) function
-static void f_dictwatcheradd(typval_T *argvars, typval_T *rettv)
+static void f_dictwatcheradd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (check_restricted() || check_secure()) {
     return;
@@ -8476,22 +8595,20 @@ static void f_dictwatcheradd(typval_T *argvars, typval_T *rettv)
     return;
   }
 
-  ufunc_T *func = find_ufunc(argvars[2].vval.v_string);
-  if (!func) {
-    // Invalid function name. Error already reported by `find_ufunc`.
+  Callback callback;
+  if (!callback_from_typval(&callback, &argvars[2])) {
     return;
   }
 
-  func->uf_refcount++;
   DictWatcher *watcher = xmalloc(sizeof(DictWatcher));
   watcher->key_pattern = xmemdupz(key_pattern, key_len);
-  watcher->callback = func;
+  watcher->callback = callback;
   watcher->busy = false;
   QUEUE_INSERT_TAIL(&argvars[0].vval.v_dict->watchers, &watcher->node);
 }
 
 // dictwatcherdel(dict, key, funcref) function
-static void f_dictwatcherdel(typval_T *argvars, typval_T *rettv)
+static void f_dictwatcherdel(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (check_restricted() || check_secure()) {
     return;
@@ -8521,9 +8638,8 @@ static void f_dictwatcherdel(typval_T *argvars, typval_T *rettv)
     return;
   }
 
-  ufunc_T *func = find_ufunc(argvars[2].vval.v_string);
-  if (!func) {
-    // Invalid function name. Error already reported by `find_ufunc`.
+  Callback callback;
+  if (!callback_from_typval(&callback, &argvars[2])) {
     return;
   }
 
@@ -8533,13 +8649,15 @@ static void f_dictwatcherdel(typval_T *argvars, typval_T *rettv)
   bool matched = false;
   QUEUE_FOREACH(w, &dict->watchers) {
     watcher = dictwatcher_node_data(w);
-    if (func == watcher->callback
+    if (callback_equal(&watcher->callback, &callback)
         && !strcmp(watcher->key_pattern, key_pattern)) {
       matched = true;
       break;
     }
   }
 
+  callback_free(&callback);
+
   if (!matched) {
     EMSG("Couldn't find a watcher matching key and callback");
     return;
@@ -8552,7 +8670,7 @@ static void f_dictwatcherdel(typval_T *argvars, typval_T *rettv)
 /*
  * "did_filetype()" function
  */
-static void f_did_filetype(typval_T *argvars, typval_T *rettv)
+static void f_did_filetype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = did_filetype;
 }
@@ -8560,7 +8678,7 @@ static void f_did_filetype(typval_T *argvars, typval_T *rettv)
 /*
  * "diff_filler()" function
  */
-static void f_diff_filler(typval_T *argvars, typval_T *rettv)
+static void f_diff_filler(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = diff_check_fill(curwin, get_tv_lnum(argvars));
 }
@@ -8568,7 +8686,7 @@ static void f_diff_filler(typval_T *argvars, typval_T *rettv)
 /*
  * "diff_hlID()" function
  */
-static void f_diff_hlID(typval_T *argvars, typval_T *rettv)
+static void f_diff_hlID(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum = get_tv_lnum(argvars);
   static linenr_T prev_lnum = 0;
@@ -8617,7 +8735,7 @@ static void f_diff_hlID(typval_T *argvars, typval_T *rettv)
 /*
  * "empty({expr})" function
  */
-static void f_empty(typval_T *argvars, typval_T *rettv)
+static void f_empty(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   bool n = true;
 
@@ -8627,6 +8745,9 @@ static void f_empty(typval_T *argvars, typval_T *rettv)
     n = argvars[0].vval.v_string == NULL
         || *argvars[0].vval.v_string == NUL;
     break;
+  case VAR_PARTIAL:
+    n = false;
+    break;
   case VAR_NUMBER:
     n = argvars[0].vval.v_number == 0;
     break;
@@ -8655,7 +8776,7 @@ static void f_empty(typval_T *argvars, typval_T *rettv)
 /*
  * "escape({string}, {chars})" function
  */
-static void f_escape(typval_T *argvars, typval_T *rettv)
+static void f_escape(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
 
@@ -8667,7 +8788,7 @@ static void f_escape(typval_T *argvars, typval_T *rettv)
 /*
  * "eval()" function
  */
-static void f_eval(typval_T *argvars, typval_T *rettv)
+static void f_eval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s;
 
@@ -8691,7 +8812,7 @@ static void f_eval(typval_T *argvars, typval_T *rettv)
 /*
  * "eventhandler()" function
  */
-static void f_eventhandler(typval_T *argvars, typval_T *rettv)
+static void f_eventhandler(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = vgetc_busy;
 }
@@ -8699,7 +8820,7 @@ static void f_eventhandler(typval_T *argvars, typval_T *rettv)
 /*
  * "executable()" function
  */
-static void f_executable(typval_T *argvars, typval_T *rettv)
+static void f_executable(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *name = get_tv_string(&argvars[0]);
 
@@ -8708,8 +8829,79 @@ static void f_executable(typval_T *argvars, typval_T *rettv)
            || (gettail_dir(name) != name && os_can_exe(name, NULL, false));
 }
 
+static char_u * get_list_line(int c, void *cookie, int indent)
+{
+  listitem_T **p = (listitem_T **)cookie;
+  listitem_T *item = *p;
+  char_u buf[NUMBUFLEN];
+  char_u *s;
+
+  if (item == NULL) {
+    return NULL;
+  }
+  s = get_tv_string_buf_chk(&item->li_tv, buf);
+  *p = item->li_next;
+  return s == NULL ? NULL : vim_strsave(s);
+}
+
+// "execute(command)" function
+static void f_execute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+    int save_msg_silent = msg_silent;
+    int save_emsg_silent = emsg_silent;
+    bool save_emsg_noredir = emsg_noredir;
+    garray_T *save_capture_ga = capture_ga;
+
+    if (check_secure()) {
+      return;
+    }
+
+    if (argvars[1].v_type != VAR_UNKNOWN) {
+      char_u buf[NUMBUFLEN];
+      char_u *s = get_tv_string_buf_chk(&argvars[1], buf);
+
+      if (s == NULL) {
+        return;
+      }
+      if (STRNCMP(s, "silent", 6) == 0) {
+        msg_silent++;
+      }
+      if (STRCMP(s, "silent!") == 0) {
+        emsg_silent = true;
+        emsg_noredir = true;
+      }
+    } else {
+      msg_silent++;
+    }
+
+    garray_T capture_local;
+    ga_init(&capture_local, (int)sizeof(char), 80);
+    capture_ga = &capture_local;
+
+    if (argvars[0].v_type != VAR_LIST) {
+      do_cmdline_cmd((char *)get_tv_string(&argvars[0]));
+    } else if (argvars[0].vval.v_list != NULL) {
+      list_T *list = argvars[0].vval.v_list;
+      list->lv_refcount++;
+      listitem_T *item = list->lv_first;
+      do_cmdline(NULL, get_list_line, (void *)&item,
+                 DOCMD_NOWAIT|DOCMD_VERBOSE|DOCMD_REPEAT|DOCMD_KEYTYPED);
+      list->lv_refcount--;
+    }
+    msg_silent = save_msg_silent;
+    emsg_silent = save_emsg_silent;
+    emsg_noredir = save_emsg_noredir;
+
+    ga_append(capture_ga, NUL);
+    rettv->v_type = VAR_STRING;
+    rettv->vval.v_string = vim_strsave(capture_ga->ga_data);
+    ga_clear(capture_ga);
+
+    capture_ga = save_capture_ga;
+}
+
 /// "exepath()" function
-static void f_exepath(typval_T *argvars, typval_T *rettv)
+static void f_exepath(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *arg = get_tv_string(&argvars[0]);
   char_u *path = NULL;
@@ -8723,7 +8915,7 @@ static void f_exepath(typval_T *argvars, typval_T *rettv)
 /*
  * "exists()" function
  */
-static void f_exists(typval_T *argvars, typval_T *rettv)
+static void f_exists(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p;
   char_u      *name;
@@ -8784,17 +8976,9 @@ static void f_exists(typval_T *argvars, typval_T *rettv)
 }
 
 /*
- * "exp()" function
- */
-static void f_exp(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &exp);
-}
-
-/*
  * "expand()" function
  */
-static void f_expand(typval_T *argvars, typval_T *rettv)
+static void f_expand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s;
   size_t len;
@@ -8923,7 +9107,7 @@ void dict_extend(dict_T *d1, dict_T *d2, char_u *action)
  * "extend(list, list [, idx])" function
  * "extend(dict, dict [, action])" function
  */
-static void f_extend(typval_T *argvars, typval_T *rettv)
+static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *arg_errmsg = (char_u *)N_("extend() argument");
 
@@ -8995,7 +9179,7 @@ static void f_extend(typval_T *argvars, typval_T *rettv)
 /*
  * "feedkeys()" function
  */
-static void f_feedkeys(typval_T *argvars, typval_T *rettv)
+static void f_feedkeys(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *keys, *flags = NULL;
   char_u nbuf[NUMBUFLEN];
@@ -9007,18 +9191,17 @@ static void f_feedkeys(typval_T *argvars, typval_T *rettv)
     return;
 
   keys = get_tv_string(&argvars[0]);
-  if (*keys != NUL) {
-    if (argvars[1].v_type != VAR_UNKNOWN) {
-      flags = get_tv_string_buf(&argvars[1], nbuf);
-    }
 
-    vim_feedkeys(cstr_as_string((char *)keys),
-		    cstr_as_string((char *)flags), true);
+  if (argvars[1].v_type != VAR_UNKNOWN) {
+    flags = get_tv_string_buf(&argvars[1], nbuf);
   }
+
+  nvim_feedkeys(cstr_as_string((char *)keys),
+                cstr_as_string((char *)flags), true);
 }
 
 /// "filereadable()" function
-static void f_filereadable(typval_T *argvars, typval_T *rettv)
+static void f_filereadable(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *p = get_tv_string(&argvars[0]);
   rettv->vval.v_number =
@@ -9029,7 +9212,7 @@ static void f_filereadable(typval_T *argvars, typval_T *rettv)
  * Return 0 for not writable, 1 for writable file, 2 for a dir which we have
  * rights to write into.
  */
-static void f_filewritable(typval_T *argvars, typval_T *rettv)
+static void f_filewritable(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char *filename = (char *)get_tv_string(&argvars[0]);
   rettv->vval.v_number = os_file_is_writable(filename);
@@ -9108,7 +9291,7 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
   dict_T      *d = NULL;
   typval_T save_val;
   typval_T save_key;
-  int rem;
+  int rem = false;
   int todo;
   char_u      *ermsg = (char_u *)(map ? "map()" : "filter()");
   char_u      *arg_errmsg = (char_u *)(map ? N_("map() argument")
@@ -9244,7 +9427,7 @@ theend:
 /*
  * "filter()" function
  */
-static void f_filter(typval_T *argvars, typval_T *rettv)
+static void f_filter(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   filter_map(argvars, rettv, FALSE);
 }
@@ -9252,7 +9435,7 @@ static void f_filter(typval_T *argvars, typval_T *rettv)
 /*
  * "finddir({fname}[, {path}[, {count}]])" function
  */
-static void f_finddir(typval_T *argvars, typval_T *rettv)
+static void f_finddir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   findfilendir(argvars, rettv, FINDFILE_DIR);
 }
@@ -9260,7 +9443,7 @@ static void f_finddir(typval_T *argvars, typval_T *rettv)
 /*
  * "findfile({fname}[, {path}[, {count}]])" function
  */
-static void f_findfile(typval_T *argvars, typval_T *rettv)
+static void f_findfile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   findfilendir(argvars, rettv, FINDFILE_FILE);
 }
@@ -9268,7 +9451,7 @@ static void f_findfile(typval_T *argvars, typval_T *rettv)
 /*
  * "float2nr({float})" function
  */
-static void f_float2nr(typval_T *argvars, typval_T *rettv)
+static void f_float2nr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   float_T f;
 
@@ -9283,17 +9466,9 @@ static void f_float2nr(typval_T *argvars, typval_T *rettv)
 }
 
 /*
- * "floor({float})" function
- */
-static void f_floor(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &floor);
-}
-
-/*
  * "fmod()" function
  */
-static void f_fmod(typval_T *argvars, typval_T *rettv)
+static void f_fmod(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   float_T fx, fy;
 
@@ -9308,7 +9483,7 @@ static void f_fmod(typval_T *argvars, typval_T *rettv)
 /*
  * "fnameescape({string})" function
  */
-static void f_fnameescape(typval_T *argvars, typval_T *rettv)
+static void f_fnameescape(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_string = vim_strsave_fnameescape(
       get_tv_string(&argvars[0]), FALSE);
@@ -9318,7 +9493,7 @@ static void f_fnameescape(typval_T *argvars, typval_T *rettv)
 /*
  * "fnamemodify({fname}, {mods})" function
  */
-static void f_fnamemodify(typval_T *argvars, typval_T *rettv)
+static void f_fnamemodify(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *fname;
   char_u      *mods;
@@ -9369,7 +9544,7 @@ static void foldclosed_both(typval_T *argvars, typval_T *rettv, int end)
 /*
  * "foldclosed()" function
  */
-static void f_foldclosed(typval_T *argvars, typval_T *rettv)
+static void f_foldclosed(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   foldclosed_both(argvars, rettv, FALSE);
 }
@@ -9377,7 +9552,7 @@ static void f_foldclosed(typval_T *argvars, typval_T *rettv)
 /*
  * "foldclosedend()" function
  */
-static void f_foldclosedend(typval_T *argvars, typval_T *rettv)
+static void f_foldclosedend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   foldclosed_both(argvars, rettv, TRUE);
 }
@@ -9385,7 +9560,7 @@ static void f_foldclosedend(typval_T *argvars, typval_T *rettv)
 /*
  * "foldlevel()" function
  */
-static void f_foldlevel(typval_T *argvars, typval_T *rettv)
+static void f_foldlevel(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
 
@@ -9397,26 +9572,31 @@ static void f_foldlevel(typval_T *argvars, typval_T *rettv)
 /*
  * "foldtext()" function
  */
-static void f_foldtext(typval_T *argvars, typval_T *rettv)
+static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  linenr_T lnum;
+  linenr_T    foldstart;
+  linenr_T    foldend;
+  char_u      *dashes;
+  linenr_T    lnum;
   char_u      *s;
   char_u      *r;
-  int len;
+  int         len;
   char        *txt;
+  long        count;
 
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
-  if ((linenr_T)vimvars[VV_FOLDSTART].vv_nr > 0
-      && (linenr_T)vimvars[VV_FOLDEND].vv_nr
-      <= curbuf->b_ml.ml_line_count
-      && vimvars[VV_FOLDDASHES].vv_str != NULL) {
+
+  foldstart = (linenr_T)get_vim_var_nr(VV_FOLDSTART);
+  foldend = (linenr_T)get_vim_var_nr(VV_FOLDEND);
+  dashes = get_vim_var_str(VV_FOLDDASHES);
+  if (foldstart > 0 && foldend <= curbuf->b_ml.ml_line_count
+      && dashes != NULL) {
     /* Find first non-empty line in the fold. */
-    lnum = (linenr_T)vimvars[VV_FOLDSTART].vv_nr;
-    while (lnum < (linenr_T)vimvars[VV_FOLDEND].vv_nr) {
-      if (!linewhite(lnum))
+    for (lnum = foldstart; lnum < foldend; ++lnum) {
+      if (!linewhite(lnum)) {
         break;
-      ++lnum;
+      }
     }
 
     /* Find interesting text in this line. */
@@ -9424,21 +9604,19 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv)
     /* skip C comment-start */
     if (s[0] == '/' && (s[1] == '*' || s[1] == '/')) {
       s = skipwhite(s + 2);
-      if (*skipwhite(s) == NUL
-          && lnum + 1 < (linenr_T)vimvars[VV_FOLDEND].vv_nr) {
+      if (*skipwhite(s) == NUL && lnum + 1 < foldend) {
         s = skipwhite(ml_get(lnum + 1));
         if (*s == '*')
           s = skipwhite(s + 1);
       }
     }
+    count = (long)(foldend - foldstart + 1);
     txt = _("+-%s%3ld lines: ");
     r = xmalloc(STRLEN(txt)
-                + STRLEN(vimvars[VV_FOLDDASHES].vv_str) // for %s
-                + 20                                    // for %3ld
-                + STRLEN(s));                           // concatenated
-    sprintf((char *)r, txt, vimvars[VV_FOLDDASHES].vv_str,
-        (long)((linenr_T)vimvars[VV_FOLDEND].vv_nr
-               - (linenr_T)vimvars[VV_FOLDSTART].vv_nr + 1));
+                + STRLEN(dashes) // for %s
+                + 20             // for %3ld
+                + STRLEN(s));    // concatenated
+    sprintf((char *)r, txt, dashes, count);
     len = (int)STRLEN(r);
     STRCAT(r, s);
     /* remove 'foldmarker' and 'commentstring' */
@@ -9450,7 +9628,7 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv)
 /*
  * "foldtextresult(lnum)" function
  */
-static void f_foldtextresult(typval_T *argvars, typval_T *rettv)
+static void f_foldtextresult(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
   char_u      *text;
@@ -9477,46 +9655,160 @@ static void f_foldtextresult(typval_T *argvars, typval_T *rettv)
 /*
  * "foreground()" function
  */
-static void f_foreground(typval_T *argvars, typval_T *rettv)
+static void f_foreground(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
 }
 
 /*
  * "function()" function
  */
-static void f_function(typval_T *argvars, typval_T *rettv)
+static void f_function(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s;
+  char_u      *name;
+  bool use_string = false;
+  partial_T *arg_pt = NULL;
+
+  if (argvars[0].v_type == VAR_FUNC) {
+    // function(MyFunc, [arg], dict)
+    s = argvars[0].vval.v_string;
+  } else if (argvars[0].v_type == VAR_PARTIAL
+             && argvars[0].vval.v_partial != NULL) {
+    // function(dict.MyFunc, [arg])
+    arg_pt = argvars[0].vval.v_partial;
+    s = arg_pt->pt_name;
+  } else {
+    // function('MyFunc', [arg], dict)
+    s = get_tv_string(&argvars[0]);
+    use_string = true;
+  }
 
-  s = get_tv_string(&argvars[0]);
-  if (s == NULL || *s == NUL || ascii_isdigit(*s))
+  if (s == NULL || *s == NUL || (use_string && ascii_isdigit(*s))) {
     EMSG2(_(e_invarg2), s);
-  /* Don't check an autoload name for existence here. */
-  else if (vim_strchr(s, AUTOLOAD_CHAR) == NULL && !function_exists(s))
+  } else if (use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL
+             && !function_exists(s)) {
+    // Don't check an autoload name for existence here.
     EMSG2(_("E700: Unknown function: %s"), s);
-  else {
+  } else {
+    int dict_idx = 0;
+    int arg_idx = 0;
+    list_T *list = NULL;
     if (STRNCMP(s, "s:", 2) == 0 || STRNCMP(s, "<SID>", 5) == 0) {
       char sid_buf[25];
       int off = *s == 's' ? 2 : 5;
 
-      /* Expand s: and <SID> into <SNR>nr_, so that the function can
-       * also be called from another script. Using trans_function_name()
-       * would also work, but some plugins depend on the name being
-       * printable text. */
-      sprintf(sid_buf, "<SNR>%" PRId64 "_", (int64_t)current_SID);
-      rettv->vval.v_string = xmalloc(STRLEN(sid_buf) + STRLEN(s + off) + 1);
-      STRCPY(rettv->vval.v_string, sid_buf);
-      STRCAT(rettv->vval.v_string, s + off);
-    } else
-      rettv->vval.v_string = vim_strsave(s);
-    rettv->v_type = VAR_FUNC;
+      // Expand s: and <SID> into <SNR>nr_, so that the function can
+      // also be called from another script. Using trans_function_name()
+      // would also work, but some plugins depend on the name being
+      // printable text.
+      snprintf(sid_buf, sizeof(sid_buf), "<SNR>%" PRId64 "_",
+               (int64_t)current_SID);
+      name = xmalloc(STRLEN(sid_buf) + STRLEN(s + off) + 1);
+      if (name != NULL) {
+        STRCPY(name, sid_buf);
+        STRCAT(name, s + off);
+      }
+    } else {
+      name = vim_strsave(s);
+    }
+
+    if (argvars[1].v_type != VAR_UNKNOWN) {
+      if (argvars[2].v_type != VAR_UNKNOWN) {
+        // function(name, [args], dict)
+        arg_idx = 1;
+        dict_idx = 2;
+      } else if (argvars[1].v_type == VAR_DICT) {
+        // function(name, dict)
+        dict_idx = 1;
+      } else {
+        // function(name, [args])
+        arg_idx = 1;
+      }
+      if (dict_idx > 0) {
+        if (argvars[dict_idx].v_type != VAR_DICT) {
+          EMSG(_("E922: expected a dict"));
+          xfree(name);
+          return;
+        }
+        if (argvars[dict_idx].vval.v_dict == NULL) {
+          dict_idx = 0;
+        }
+      }
+      if (arg_idx > 0) {
+        if (argvars[arg_idx].v_type != VAR_LIST) {
+          EMSG(_("E923: Second argument of function() must be "
+                 "a list or a dict"));
+          xfree(name);
+          return;
+        }
+        list = argvars[arg_idx].vval.v_list;
+        if (list == NULL || list->lv_len == 0) {
+          arg_idx = 0;
+        }
+      }
+    }
+    if (dict_idx > 0 || arg_idx > 0 || arg_pt != NULL) {
+      partial_T *const pt = xcalloc(1, sizeof(*pt));
+
+      // result is a VAR_PARTIAL
+      if (arg_idx > 0 || (arg_pt != NULL && arg_pt->pt_argc > 0)) {
+        const int arg_len = (arg_pt == NULL ? 0 : arg_pt->pt_argc);
+        const int lv_len = (list == NULL ? 0 : list->lv_len);
+
+        pt->pt_argc = arg_len + lv_len;
+        pt->pt_argv = xmalloc(sizeof(pt->pt_argv[0]) * pt->pt_argc);
+        if (pt->pt_argv == NULL) {
+          xfree(pt);
+          xfree(name);
+          return;
+        } else {
+          int i = 0;
+          for (; i < arg_len; i++) {
+            copy_tv(&arg_pt->pt_argv[i], &pt->pt_argv[i]);
+          }
+          if (lv_len > 0) {
+            for (listitem_T *li = list->lv_first;
+                 li != NULL;
+                 li = li->li_next) {
+              copy_tv(&li->li_tv, &pt->pt_argv[i++]);
+            }
+          }
+        }
+      }
+
+      // For "function(dict.func, [], dict)" and "func" is a partial
+      // use "dict". That is backwards compatible.
+      if (dict_idx > 0) {
+        // The dict is bound explicitly, pt_auto is false
+        pt->pt_dict = argvars[dict_idx].vval.v_dict;
+        (pt->pt_dict->dv_refcount)++;
+      } else if (arg_pt != NULL) {
+        // If the dict was bound automatically the result is also
+        // bound automatically.
+        pt->pt_dict = arg_pt->pt_dict;
+        pt->pt_auto = arg_pt->pt_auto;
+        if (pt->pt_dict != NULL) {
+          (pt->pt_dict->dv_refcount)++;
+        }
+      }
+
+      pt->pt_refcount = 1;
+      pt->pt_name = name;
+      func_ref(pt->pt_name);
+
+      rettv->v_type = VAR_PARTIAL;
+      rettv->vval.v_partial = pt;
+    } else {
+      // result is a VAR_FUNC
+      rettv->v_type = VAR_FUNC;
+      rettv->vval.v_string = name;
+      func_ref(name);
+    }
   }
 }
 
-/*
- * "garbagecollect()" function
- */
-static void f_garbagecollect(typval_T *argvars, typval_T *rettv)
+/// "garbagecollect()" function
+static void f_garbagecollect(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   /* This is postponed until we are back at the toplevel, because we may be
   * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
@@ -9529,7 +9821,7 @@ static void f_garbagecollect(typval_T *argvars, typval_T *rettv)
 /*
  * "get()" function
  */
-static void f_get(typval_T *argvars, typval_T *rettv)
+static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   listitem_T  *li;
   list_T      *l;
@@ -9551,8 +9843,50 @@ static void f_get(typval_T *argvars, typval_T *rettv)
       if (di != NULL)
         tv = &di->di_tv;
     }
-  } else
+  } else if (argvars[0].v_type == VAR_PARTIAL
+             || argvars[0].v_type == VAR_FUNC) {
+    partial_T *pt;
+    partial_T fref_pt;
+
+    if (argvars[0].v_type == VAR_PARTIAL) {
+      pt = argvars[0].vval.v_partial;
+    } else {
+      memset(&fref_pt, 0, sizeof(fref_pt));
+      fref_pt.pt_name = argvars[0].vval.v_string;
+      pt = &fref_pt;
+    }
+
+    if (pt != NULL) {
+      char_u *what = get_tv_string(&argvars[1]);
+
+      if (STRCMP(what, "func") == 0 || STRCMP(what, "name") == 0) {
+        rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING);
+        if (pt->pt_name != NULL) {
+          rettv->vval.v_string = vim_strsave(pt->pt_name);
+        }
+      } else if (STRCMP(what, "dict") == 0) {
+        rettv->v_type = VAR_DICT;
+        rettv->vval.v_dict = pt->pt_dict;
+        if (pt->pt_dict != NULL) {
+          (pt->pt_dict->dv_refcount)++;
+        }
+      } else if (STRCMP(what, "args") == 0) {
+        rettv->v_type = VAR_LIST;
+        if (rettv_list_alloc(rettv) != NULL) {
+          int i;
+
+          for (i = 0; i < pt->pt_argc; i++) {
+            list_append_tv(rettv->vval.v_list, &pt->pt_argv[i]);
+          }
+        }
+      } else {
+        EMSG2(_(e_invarg2), what);
+      }
+      return;
+    }
+  } else {
     EMSG2(_(e_listdictarg), "get()");
+  }
 
   if (tv == NULL) {
     if (argvars[2].v_type != VAR_UNKNOWN)
@@ -9561,6 +9895,118 @@ static void f_get(typval_T *argvars, typval_T *rettv)
     copy_tv(tv, rettv);
 }
 
+/// Returns information about signs placed in a buffer as list of dicts.
+static void get_buffer_signs(buf_T *buf, list_T *l)
+{
+  for (signlist_T *sign = buf->b_signlist; sign; sign = sign->next) {
+    dict_T *d = dict_alloc();
+
+    dict_add_nr_str(d, "id", sign->id, NULL);
+    dict_add_nr_str(d, "lnum", sign->lnum, NULL);
+    dict_add_nr_str(d, "name", 0L, sign_typenr2name(sign->typenr));
+
+    list_append_dict(l, d);
+  }
+}
+
+/// Returns buffer options, variables and other attributes in a dictionary.
+static dict_T *get_buffer_info(buf_T *buf)
+{
+  dict_T *dict = dict_alloc();
+
+  dict_add_nr_str(dict, "bufnr", buf->b_fnum, NULL);
+  dict_add_nr_str(dict, "name", 0L,
+                  buf->b_ffname != NULL ? buf->b_ffname : (char_u *)"");
+  dict_add_nr_str(dict, "lnum", buflist_findlnum(buf), NULL);
+  dict_add_nr_str(dict, "loaded", buf->b_ml.ml_mfp != NULL, NULL);
+  dict_add_nr_str(dict, "listed", buf->b_p_bl, NULL);
+  dict_add_nr_str(dict, "changed", bufIsChanged(buf), NULL);
+  dict_add_nr_str(dict, "changedtick", buf->b_changedtick, NULL);
+  dict_add_nr_str(dict, "hidden",
+                  buf->b_ml.ml_mfp != NULL && buf->b_nwindows == 0,
+                  NULL);
+
+  // Get a reference to buffer variables
+  dict_add_dict(dict, "variables", buf->b_vars);
+
+  // List of windows displaying this buffer
+  list_T *windows = list_alloc();
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp->w_buffer == buf) {
+      list_append_number(windows, (varnumber_T)wp->handle);
+    }
+  }
+  dict_add_list(dict, "windows", windows);
+
+  if (buf->b_signlist != NULL) {
+    // List of signs placed in this buffer
+    list_T *signs = list_alloc();
+    get_buffer_signs(buf, signs);
+    dict_add_list(dict, "signs", signs);
+  }
+
+  return dict;
+}
+
+/// "getbufinfo()" function
+static void f_getbufinfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  buf_T *argbuf = NULL;
+  bool filtered = false;
+  bool sel_buflisted = false;
+  bool sel_bufloaded = false;
+
+  rettv_list_alloc(rettv);
+
+  // List of all the buffers or selected buffers
+  if (argvars[0].v_type == VAR_DICT) {
+    dict_T *sel_d = argvars[0].vval.v_dict;
+
+    if (sel_d != NULL) {
+      dictitem_T *di;
+
+      filtered = true;
+
+      di = dict_find(sel_d, (char_u *)"buflisted", -1);
+      if (di != NULL && get_tv_number(&di->di_tv)) {
+        sel_buflisted = true;
+      }
+
+      di = dict_find(sel_d, (char_u *)"bufloaded", -1);
+      if (di != NULL && get_tv_number(&di->di_tv)) {
+        sel_bufloaded = true;
+      }
+    }
+  } else if (argvars[0].v_type != VAR_UNKNOWN) {
+    // Information about one buffer.  Argument specifies the buffer
+    (void)get_tv_number(&argvars[0]);   // issue errmsg if type error
+    emsg_off++;
+    argbuf = get_buf_tv(&argvars[0], false);
+    emsg_off--;
+    if (argbuf == NULL) {
+      return;
+    }
+  }
+
+  // Return information about all the buffers or a specified buffer
+  FOR_ALL_BUFFERS(buf) {
+    if (argbuf != NULL && argbuf != buf) {
+      continue;
+    }
+    if (filtered && ((sel_bufloaded && buf->b_ml.ml_mfp == NULL)
+                     || (sel_buflisted && !buf->b_p_bl))) {
+      continue;
+    }
+
+    dict_T *d = get_buffer_info(buf);
+    if (d != NULL) {
+      list_append_dict(rettv->vval.v_list, d);
+    }
+    if (argbuf != NULL) {
+      return;
+    }
+  }
+}
 
 /*
  * Get line or list of lines from buffer "buf" into "rettv".
@@ -9605,7 +10051,7 @@ static void get_buffer_lines(buf_T *buf, linenr_T start, linenr_T end, int retli
 /*
  * "getbufline()" function
  */
-static void f_getbufline(typval_T *argvars, typval_T *rettv)
+static void f_getbufline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
   linenr_T end;
@@ -9628,7 +10074,7 @@ static void f_getbufline(typval_T *argvars, typval_T *rettv)
 /*
  * "getbufvar()" function
  */
-static void f_getbufvar(typval_T *argvars, typval_T *rettv)
+static void f_getbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
   buf_T       *save_curbuf;
@@ -9649,13 +10095,25 @@ static void f_getbufvar(typval_T *argvars, typval_T *rettv)
     save_curbuf = curbuf;
     curbuf = buf;
 
-    if (*varname == '&') {      /* buffer-local-option */
-      if (get_option_tv(&varname, rettv, TRUE) == OK)
-        done = TRUE;
+    if (*varname == '&') {      // buffer-local-option
+      if (varname[1] == NUL) {
+        // get all buffer-local options in a dict
+        dict_T *opts = get_winbuf_options(true);
+
+        if (opts != NULL) {
+          rettv->v_type = VAR_DICT;
+          rettv->vval.v_dict = opts;
+          opts->dv_refcount++;
+          done = true;
+        }
+      } else if (get_option_tv(&varname, rettv, true) == OK) {
+        // buffer-local-option
+        done = true;
+      }
     } else if (STRCMP(varname, "changedtick") == 0) {
       rettv->v_type = VAR_NUMBER;
       rettv->vval.v_number = curbuf->b_changedtick;
-      done = TRUE;
+      done = true;
     } else {
       /* Look up the variable. */
       /* Let getbufvar({nr}, "") return the "b:" dictionary. */
@@ -9681,29 +10139,40 @@ static void f_getbufvar(typval_T *argvars, typval_T *rettv)
 /*
  * "getchar()" function
  */
-static void f_getchar(typval_T *argvars, typval_T *rettv)
+static void f_getchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   varnumber_T n;
   int error = FALSE;
 
-  /* Position the cursor.  Needed after a message that ends in a space. */
-  ui_cursor_goto(msg_row, msg_col);
-
   ++no_mapping;
   ++allow_keys;
   for (;; ) {
-    if (argvars[0].v_type == VAR_UNKNOWN)
-      /* getchar(): blocking wait. */
+    // Position the cursor.  Needed after a message that ends in a space,
+    // or if event processing caused a redraw.
+    ui_cursor_goto(msg_row, msg_col);
+
+    if (argvars[0].v_type == VAR_UNKNOWN) {
+      // getchar(): blocking wait.
+      if (!(char_avail() || using_script() || input_available())) {
+        input_enable_events();
+        (void)os_inchar(NULL, 0, -1, 0);
+        input_disable_events();
+        if (!multiqueue_empty(main_loop.events)) {
+          multiqueue_process_events(main_loop.events);
+          continue;
+        }
+      }
       n = safe_vgetc();
-    else if (get_tv_number_chk(&argvars[0], &error) == 1)
-      /* getchar(1): only check if char avail */
+    } else if (get_tv_number_chk(&argvars[0], &error) == 1) {
+      // getchar(1): only check if char avail
       n = vpeekc_any();
-    else if (error || vpeekc_any() == NUL)
-      /* illegal argument or getchar(0) and no char avail: return zero */
+    } else if (error || vpeekc_any() == NUL) {
+      // illegal argument or getchar(0) and no char avail: return zero
       n = 0;
-    else
-      /* getchar(0) and char avail: return char */
+    } else {
+      // getchar(0) and char avail: return char
       n = safe_vgetc();
+    }
 
     if (n == K_IGNORE)
       continue;
@@ -9713,6 +10182,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv)
   --allow_keys;
 
   vimvars[VV_MOUSE_WIN].vv_nr = 0;
+  vimvars[VV_MOUSE_WINID].vv_nr = 0;
   vimvars[VV_MOUSE_LNUM].vv_nr = 0;
   vimvars[VV_MOUSE_COL].vv_nr = 0;
 
@@ -9755,6 +10225,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv)
         for (wp = firstwin; wp != win; wp = wp->w_next)
           ++winnr;
         vimvars[VV_MOUSE_WIN].vv_nr = winnr;
+        vimvars[VV_MOUSE_WINID].vv_nr = wp->handle;
         vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
         vimvars[VV_MOUSE_COL].vv_nr = col + 1;
       }
@@ -9765,7 +10236,7 @@ static void f_getchar(typval_T *argvars, typval_T *rettv)
 /*
  * "getcharmod()" function
  */
-static void f_getcharmod(typval_T *argvars, typval_T *rettv)
+static void f_getcharmod(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = mod_mask;
 }
@@ -9773,7 +10244,7 @@ static void f_getcharmod(typval_T *argvars, typval_T *rettv)
 /*
  * "getcharsearch()" function
  */
-static void f_getcharsearch(typval_T *argvars, typval_T *rettv)
+static void f_getcharsearch(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv_dict_alloc(rettv);
 
@@ -9787,7 +10258,7 @@ static void f_getcharsearch(typval_T *argvars, typval_T *rettv)
 /*
  * "getcmdline()" function
  */
-static void f_getcmdline(typval_T *argvars, typval_T *rettv)
+static void f_getcmdline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = get_cmdline_str();
@@ -9796,7 +10267,7 @@ static void f_getcmdline(typval_T *argvars, typval_T *rettv)
 /*
  * "getcmdpos()" function
  */
-static void f_getcmdpos(typval_T *argvars, typval_T *rettv)
+static void f_getcmdpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = get_cmdline_pos() + 1;
 }
@@ -9804,7 +10275,7 @@ static void f_getcmdpos(typval_T *argvars, typval_T *rettv)
 /*
  * "getcmdtype()" function
  */
-static void f_getcmdtype(typval_T *argvars, typval_T *rettv)
+static void f_getcmdtype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = xmallocz(1);
@@ -9814,7 +10285,7 @@ static void f_getcmdtype(typval_T *argvars, typval_T *rettv)
 /*
  * "getcmdwintype()" function
  */
-static void f_getcmdwintype(typval_T *argvars, typval_T *rettv)
+static void f_getcmdwintype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
@@ -9822,6 +10293,69 @@ static void f_getcmdwintype(typval_T *argvars, typval_T *rettv)
   rettv->vval.v_string[0] = cmdwin_type;
 }
 
+// "getcompletion()" function
+static void f_getcompletion(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  char_u        *pat;
+  expand_T      xpc;
+  bool          filtered = false;
+  int           options = WILD_SILENT | WILD_USE_NL | WILD_ADD_SLASH
+          | WILD_NO_BEEP;
+
+  if (argvars[2].v_type != VAR_UNKNOWN) {
+    filtered = get_tv_number_chk(&argvars[2], NULL);
+  }
+
+  if (p_wic) {
+    options |= WILD_ICASE;
+  }
+
+  // For filtered results, 'wildignore' is used
+  if (!filtered) {
+    options |= WILD_KEEP_ALL;
+  }
+
+  ExpandInit(&xpc);
+  xpc.xp_pattern = get_tv_string(&argvars[0]);
+  xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  xpc.xp_context = cmdcomplete_str_to_type(get_tv_string(&argvars[1]));
+  if (xpc.xp_context == EXPAND_NOTHING) {
+    if (argvars[1].v_type == VAR_STRING) {
+      EMSG2(_(e_invarg2), argvars[1].vval.v_string);
+    } else {
+      EMSG(_(e_invarg));
+    }
+    return;
+  }
+
+  if (xpc.xp_context == EXPAND_MENUS) {
+    set_context_in_menu_cmd(&xpc, (char_u *)"menu", xpc.xp_pattern, false);
+    xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  }
+
+  if (xpc.xp_context == EXPAND_CSCOPE) {
+    set_context_in_cscope_cmd(&xpc, xpc.xp_pattern, CMD_cscope);
+    xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  }
+
+  if (xpc.xp_context == EXPAND_SIGN) {
+    set_context_in_sign_cmd(&xpc, xpc.xp_pattern);
+    xpc.xp_pattern_len = STRLEN(xpc.xp_pattern);
+  }
+
+  pat = addstar(xpc.xp_pattern, xpc.xp_pattern_len, xpc.xp_context);
+  rettv_list_alloc(rettv);
+  if (pat != NULL) {
+    ExpandOne(&xpc, pat, NULL, options, WILD_ALL_KEEP);
+
+    for (int i = 0; i < xpc.xp_numfiles; i++) {
+      list_append_string(rettv->vval.v_list, xpc.xp_files[i], -1);
+    }
+  }
+  xfree(pat);
+  ExpandCleanup(&xpc);
+}
+
 /// `getcwd([{win}[, {tab}]])` function
 ///
 /// Every scope not specified implies the currently selected scope object.
@@ -9831,10 +10365,10 @@ static void f_getcmdwintype(typval_T *argvars, typval_T *rettv)
 /// @pre  An argument may not be -1 if preceding arguments are not all -1.
 ///
 /// @post  The return value will be a string.
-static void f_getcwd(typval_T *argvars, typval_T *rettv)
+static void f_getcwd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   // Possible scope of working directory to return.
-  CdScope scope = MIN_CD_SCOPE;
+  CdScope scope = kCdScopeInvalid;
 
   // Numbers of the scope objects (window, tab) we want the working directory
   // of. A `-1` means to skip this scope, a `0` means the current object.
@@ -9863,26 +10397,27 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv)
       return;
     }
     scope_number[i] = argvars[i].vval.v_number;
-    // The scope is the current iteration step.
-    scope = i;
     // It is an error for the scope number to be less than `-1`.
     if (scope_number[i] < -1) {
       EMSG(_(e_invarg));
       return;
     }
+    // Use the narrowest scope the user requested
+    if (scope_number[i] >= 0 && scope == kCdScopeInvalid) {
+      // The scope is the current iteration step.
+      scope = i;
+    } else if (scope_number[i] < 0) {
+      scope = i + 1;
+    }
   }
 
-  // Normalize scope, the number of the new scope will be 0.
-  if (scope_number[scope] < 0) {
-    // Arguments to `getcwd` always end at second-highest scope, so scope will
-    // always be <= `MAX_CD_SCOPE`.
-    scope++;
+  // If the user didn't specify anything, default to window scope
+  if (scope == kCdScopeInvalid) {
+    scope = MIN_CD_SCOPE;
   }
 
   // Find the tabpage by number
-  if (scope_number[kCdScopeTab] == -1) {
-    tp = NULL;
-  } else if (scope_number[kCdScopeTab] > 0) {
+  if (scope_number[kCdScopeTab] > 0) {
     tp = find_tabpage(scope_number[kCdScopeTab]);
     if (!tp) {
       EMSG(_("E5000: Cannot find tab number."));
@@ -9891,16 +10426,14 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv)
   }
 
   // Find the window in `tp` by number, `NULL` if none.
-  if (scope_number[kCdScopeWindow] == -1) {
-    win = NULL;
-  } else if (scope_number[kCdScopeWindow] >= 0) {
-    if (!tp) {
+  if (scope_number[kCdScopeWindow] >= 0) {
+    if (scope_number[kCdScopeTab] < 0) {
       EMSG(_("E5001: Higher scope cannot be -1 if lower scope is >= 0."));
       return;
     }
 
     if (scope_number[kCdScopeWindow] > 0) {
-      win = find_win_by_nr(&argvars[0], curtab);
+      win = find_win_by_nr(&argvars[0], tp);
       if (!win) {
         EMSG(_("E5002: Cannot find window number."));
         return;
@@ -9917,24 +10450,21 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv)
       if (from) {
         break;
       }
-    case kCdScopeTab:  // FALLTHROUGH
+    case kCdScopeTab:         // FALLTHROUGH
       assert(tp);
       from = tp->localdir;
       if (from) {
         break;
       }
-    case kCdScopeGlobal:  // FALLTHROUGH
-      // The `globaldir` variable is not always set.
-      if (globaldir) {
+    case kCdScopeGlobal:      // FALLTHROUGH
+      if (globaldir) {        // `globaldir` is not always set.
         from = globaldir;
-      } else {
-        // We have to copy the OS path directly into output string.
-        if (os_dirname(cwd, MAXPATHL) == FAIL) {
-          EMSG(_("E41: Could not display path."));
-          goto end;
-        }
+      } else if (os_dirname(cwd, MAXPATHL) == FAIL) {  // Get the OS CWD.
+        from = (char_u *)"";  // Return empty string on failure.
       }
       break;
+    case kCdScopeInvalid:     // We should never get here
+      assert(false);
   }
 
   if (from) {
@@ -9945,14 +10475,14 @@ static void f_getcwd(typval_T *argvars, typval_T *rettv)
 #ifdef BACKSLASH_IN_FILENAME
   slash_adjust(rettv->vval.v_string);
 #endif
-end:
+
   xfree(cwd);
 }
 
 /*
  * "getfontname()" function
  */
-static void f_getfontname(typval_T *argvars, typval_T *rettv)
+static void f_getfontname(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
@@ -9961,7 +10491,7 @@ static void f_getfontname(typval_T *argvars, typval_T *rettv)
 /*
  * "getfperm({fname})" function
  */
-static void f_getfperm(typval_T *argvars, typval_T *rettv)
+static void f_getfperm(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *perm = NULL;
   char_u flags[] = "rwx";
@@ -9982,7 +10512,7 @@ static void f_getfperm(typval_T *argvars, typval_T *rettv)
 /*
  * "getfsize({fname})" function
  */
-static void f_getfsize(typval_T *argvars, typval_T *rettv)
+static void f_getfsize(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char *fname = (char *)get_tv_string(&argvars[0]);
 
@@ -10009,7 +10539,7 @@ static void f_getfsize(typval_T *argvars, typval_T *rettv)
 /*
  * "getftime({fname})" function
  */
-static void f_getftime(typval_T *argvars, typval_T *rettv)
+static void f_getftime(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char *fname = (char *)get_tv_string(&argvars[0]);
 
@@ -10024,7 +10554,7 @@ static void f_getftime(typval_T *argvars, typval_T *rettv)
 /*
  * "getftype({fname})" function
  */
-static void f_getftype(typval_T *argvars, typval_T *rettv)
+static void f_getftype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *fname;
   char_u      *type = NULL;
@@ -10100,7 +10630,7 @@ static void f_getftype(typval_T *argvars, typval_T *rettv)
 /*
  * "getline(lnum, [end])" function
  */
-static void f_getline(typval_T *argvars, typval_T *rettv)
+static void f_getline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
   linenr_T end;
@@ -10121,7 +10651,7 @@ static void f_getline(typval_T *argvars, typval_T *rettv)
 /*
  * "getmatches()" function
  */
-static void f_getmatches(typval_T *argvars, typval_T *rettv)
+static void f_getmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   matchitem_T *cur = curwin->w_match_head;
   int i;
@@ -10170,7 +10700,7 @@ static void f_getmatches(typval_T *argvars, typval_T *rettv)
 /*
  * "getpid()" function
  */
-static void f_getpid(typval_T *argvars, typval_T *rettv)
+static void f_getpid(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = os_get_pid();
 }
@@ -10206,7 +10736,7 @@ static void getpos_both(typval_T *argvars, typval_T *rettv, bool getcurpos)
 /*
  * "getcurpos(string)" function
  */
-static void f_getcurpos(typval_T *argvars, typval_T *rettv)
+static void f_getcurpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   getpos_both(argvars, rettv, true);
 }
@@ -10214,7 +10744,7 @@ static void f_getcurpos(typval_T *argvars, typval_T *rettv)
 /*
  * "getpos(string)" function
  */
-static void f_getpos(typval_T *argvars, typval_T *rettv)
+static void f_getpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   getpos_both(argvars, rettv, false);
 }
@@ -10222,7 +10752,7 @@ static void f_getpos(typval_T *argvars, typval_T *rettv)
 /*
  * "getqflist()" and "getloclist()" functions
  */
-static void f_getqflist(typval_T *argvars, typval_T *rettv)
+static void f_getqflist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv_list_alloc(rettv);
   win_T *wp = NULL;
@@ -10236,7 +10766,7 @@ static void f_getqflist(typval_T *argvars, typval_T *rettv)
 }
 
 /// "getreg()" function
-static void f_getreg(typval_T *argvars, typval_T *rettv)
+static void f_getreg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *strregname;
   int regname;
@@ -10282,7 +10812,7 @@ static void f_getreg(typval_T *argvars, typval_T *rettv)
 /*
  * "getregtype()" function
  */
-static void f_getregtype(typval_T *argvars, typval_T *rettv)
+static void f_getregtype(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *strregname;
   int regname;
@@ -10311,10 +10841,62 @@ static void f_getregtype(typval_T *argvars, typval_T *rettv)
   rettv->vval.v_string = (char_u *)xstrdup(buf);
 }
 
+/// Returns information (variables, options, etc.) about a tab page
+/// as a dictionary.
+static dict_T *get_tabpage_info(tabpage_T *tp, int tp_idx)
+{
+  dict_T *dict = dict_alloc();
+
+  dict_add_nr_str(dict, "tabnr", tp_idx, NULL);
+
+  list_T *l = list_alloc();
+  FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+    list_append_number(l, (varnumber_T)wp->handle);
+  }
+  dict_add_list(dict, "windows", l);
+
+  // Make a reference to tabpage variables
+  dict_add_dict(dict, "variables", tp->tp_vars);
+
+  return dict;
+}
+
+/// "gettabinfo()" function
+static void f_gettabinfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  tabpage_T *tparg = NULL;
+
+  rettv_list_alloc(rettv);
+
+  if (argvars[0].v_type != VAR_UNKNOWN) {
+    // Information about one tab page
+    tparg = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
+    if (tparg == NULL) {
+      return;
+    }
+  }
+
+  // Get information about a specific tab page or all tab pages
+  int tpnr = 0;
+  FOR_ALL_TABS(tp) {
+    tpnr++;
+    if (tparg != NULL && tp != tparg) {
+      continue;
+    }
+    dict_T *d = get_tabpage_info(tp, tpnr);
+    if (d != NULL) {
+      list_append_dict(rettv->vval.v_list, d);
+    }
+    if (tparg != NULL) {
+      return;
+    }
+  }
+}
+
 /*
  * "gettabvar()" function
  */
-static void f_gettabvar(typval_T *argvars, typval_T *rettv)
+static void f_gettabvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   win_T *oldcurwin;
   tabpage_T *tp, *oldtabpage;
@@ -10353,15 +10935,75 @@ static void f_gettabvar(typval_T *argvars, typval_T *rettv)
 /*
  * "gettabwinvar()" function
  */
-static void f_gettabwinvar(typval_T *argvars, typval_T *rettv)
+static void f_gettabwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   getwinvar(argvars, rettv, 1);
 }
 
+/// Returns information about a window as a dictionary.
+static dict_T *get_win_info(win_T *wp, int16_t tpnr, int16_t winnr)
+{
+  dict_T *dict = dict_alloc();
+
+  dict_add_nr_str(dict, "tabnr", tpnr, NULL);
+  dict_add_nr_str(dict, "winnr", winnr, NULL);
+  dict_add_nr_str(dict, "winid", wp->handle, NULL);
+  dict_add_nr_str(dict, "height", wp->w_height, NULL);
+  dict_add_nr_str(dict, "width", wp->w_width, NULL);
+  dict_add_nr_str(dict, "bufnr", wp->w_buffer->b_fnum, NULL);
+
+  dict_add_nr_str(dict, "quickfix", bt_quickfix(wp->w_buffer), NULL);
+  dict_add_nr_str(dict, "loclist",
+                  (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL),
+                  NULL);
+
+  // Add a reference to window variables
+  dict_add_dict(dict, "variables", wp->w_vars);
+
+  return dict;
+}
+
+/// "getwininfo()" function
+static void f_getwininfo(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  win_T *wparg = NULL;
+
+  rettv_list_alloc(rettv);
+
+  if (argvars[0].v_type != VAR_UNKNOWN) {
+    wparg = win_id2wp(argvars);
+    if (wparg == NULL) {
+      return;
+    }
+  }
+
+  // Collect information about either all the windows across all the tab
+  // pages or one particular window.
+  int16_t tabnr = 0;
+  FOR_ALL_TABS(tp) {
+    tabnr++;
+    int16_t winnr = 0;
+    FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+      if (wparg != NULL && wp != wparg) {
+        continue;
+      }
+      winnr++;
+      dict_T *d = get_win_info(wp, tabnr, winnr);
+      if (d != NULL) {
+        list_append_dict(rettv->vval.v_list, d);
+      }
+      if (wparg != NULL) {
+        // found information about a specific window
+        return;
+      }
+    }
+  }
+}
+
 /*
  * "getwinposx()" function
  */
-static void f_getwinposx(typval_T *argvars, typval_T *rettv)
+static void f_getwinposx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = -1;
 }
@@ -10369,7 +11011,7 @@ static void f_getwinposx(typval_T *argvars, typval_T *rettv)
 /*
  * "getwinposy()" function
  */
-static void f_getwinposy(typval_T *argvars, typval_T *rettv)
+static void f_getwinposy(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = -1;
 }
@@ -10399,17 +11041,45 @@ find_win_by_nr (
   }
 
   FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
-    if (--nr <= 0) {
+    if (nr >= LOWEST_WIN_ID) {
+      if (wp->handle == nr) {
+        return wp;
+      }
+    } else if (--nr <= 0) {
       return wp;
     }
   }
   return NULL;
 }
 
-/*
- * "getwinvar()" function
- */
-static void f_getwinvar(typval_T *argvars, typval_T *rettv)
+/// Find window specified by "wvp" in tabpage "tvp".
+static win_T *find_tabwin(typval_T *wvp, typval_T *tvp)
+{
+  win_T *wp = NULL;
+  tabpage_T *tp = NULL;
+
+  if (wvp->v_type != VAR_UNKNOWN) {
+    if (tvp->v_type != VAR_UNKNOWN) {
+      long n = get_tv_number(tvp);
+      if (n >= 0) {
+        tp = find_tabpage(n);
+      }
+    } else {
+      tp = curtab;
+    }
+
+    if (tp != NULL) {
+      wp = find_win_by_nr(wvp, tp);
+    }
+  } else {
+    wp = curwin;
+  }
+
+  return wp;
+}
+
+/// "getwinvar()" function
+static void f_getwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   getwinvar(argvars, rettv, 0);
 }
@@ -10449,8 +11119,19 @@ getwinvar (
     bool need_switch_win = tp != curtab || win != curwin;
     if (!need_switch_win
         || switch_win(&oldcurwin, &oldtabpage, win, tp, true) == OK) {
-      if (*varname == '&') {  // window-local-option
-        if (get_option_tv(&varname, rettv, 1) == OK) {
+      if (*varname == '&') {
+        if (varname[1] == NUL) {
+          // get all window-local options in a dict
+          dict_T *opts = get_winbuf_options(false);
+
+          if (opts != NULL) {
+            rettv->v_type = VAR_DICT;
+            rettv->vval.v_dict = opts;
+            opts->dv_refcount++;
+            done = true;
+          }
+        } else if (get_option_tv(&varname, rettv, 1) == OK) {
+          // window-local-option
           done = true;
         }
       } else {
@@ -10480,7 +11161,7 @@ getwinvar (
 /*
  * "glob()" function
  */
-static void f_glob(typval_T *argvars, typval_T *rettv)
+static void f_glob(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int options = WILD_SILENT|WILD_USE_NL;
   expand_T xpc;
@@ -10524,7 +11205,7 @@ static void f_glob(typval_T *argvars, typval_T *rettv)
 }
 
 /// "globpath()" function
-static void f_globpath(typval_T *argvars, typval_T *rettv)
+static void f_globpath(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int flags = 0;  // Flags for globpath.
   int error = false;
@@ -10575,7 +11256,7 @@ static void f_globpath(typval_T *argvars, typval_T *rettv)
 }
 
 // "glob2regpat()" function
-static void f_glob2regpat(typval_T *argvars, typval_T *rettv)
+static void f_glob2regpat(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *pat = get_tv_string_chk(&argvars[0]);  // NULL on type error
 
@@ -10585,16 +11266,10 @@ static void f_glob2regpat(typval_T *argvars, typval_T *rettv)
     : file_pat_to_reg_pat(pat, NULL, NULL, false);
 }
 
-/*
- * "has()" function
- */
-static void f_has(typval_T *argvars, typval_T *rettv)
+/// "has()" function
+static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  int i;
-  char_u      *name;
-  int n = FALSE;
-  static char *(has_list[]) =
-  {
+  static char *(has_list[]) = {
 #ifdef UNIX
     "unix",
 #endif
@@ -10661,6 +11336,7 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     "mouse",
     "multi_byte",
     "multi_lang",
+    "packages",
     "path_extra",
     "persistent_undo",
     "postscript",
@@ -10688,6 +11364,7 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     "termguicolors",
     "termresponse",
     "textobjects",
+    "timers",
     "title",
     "user-commands",        /* was accidentally included in 5.4 */
     "user_commands",
@@ -10705,36 +11382,42 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     NULL
   };
 
-  name = get_tv_string(&argvars[0]);
-  for (i = 0; has_list[i] != NULL; ++i)
+  bool n = false;
+  char *name = (char *)get_tv_string(&argvars[0]);
+
+  for (int i = 0; has_list[i] != NULL; i++) {
     if (STRICMP(name, has_list[i]) == 0) {
-      n = TRUE;
+      n = true;
       break;
     }
+  }
 
-  if (n == FALSE) {
+  if (!n) {
     if (STRNICMP(name, "patch", 5) == 0) {
       if (name[5] == '-'
-          && STRLEN(name) > 11
+          && strlen(name) >= 11
           && ascii_isdigit(name[6])
           && ascii_isdigit(name[8])
           && ascii_isdigit(name[10])) {
-        int major = atoi((char *)name + 6);
-        int minor = atoi((char *)name + 8);
+        int major = atoi(name + 6);
+        int minor = atoi(name + 8);
 
         // Expect "patch-9.9.01234".
         n = (major < VIM_VERSION_MAJOR
              || (major == VIM_VERSION_MAJOR
                  && (minor < VIM_VERSION_MINOR
                      || (minor == VIM_VERSION_MINOR
-                         && has_patch(atoi((char *)name + 10))))));
+                         && has_vim_patch(atoi(name + 10))))));
       } else {
-        n = has_patch(atoi((char *)name + 5));
+        n = has_vim_patch(atoi(name + 5));
       }
+    } else if (STRNICMP(name, "nvim-", 5) == 0) {
+      // Expect "nvim-x.y.z"
+      n = has_nvim_version(name + 5);
     } else if (STRICMP(name, "vim_starting") == 0) {
       n = (starting != 0);
     } else if (STRICMP(name, "multi_byte_encoding") == 0) {
-      n = has_mbyte;
+      n = has_mbyte != 0;
 #if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
     } else if (STRICMP(name, "iconv") == 0) {
       n = iconv_enabled(false);
@@ -10744,8 +11427,8 @@ static void f_has(typval_T *argvars, typval_T *rettv)
     }
   }
 
-  if (n == FALSE && eval_has_provider((char *)name)) {
-    n = TRUE;
+  if (!n && eval_has_provider(name)) {
+    n = true;
   }
 
   rettv->vval.v_number = n;
@@ -10754,7 +11437,7 @@ static void f_has(typval_T *argvars, typval_T *rettv)
 /*
  * "has_key()" function
  */
-static void f_has_key(typval_T *argvars, typval_T *rettv)
+static void f_has_key(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (argvars[0].v_type != VAR_DICT) {
     EMSG(_(e_dictreq));
@@ -10778,10 +11461,10 @@ static void f_has_key(typval_T *argvars, typval_T *rettv)
 /// @pre  An argument may not be -1 if preceding arguments are not all -1.
 ///
 /// @post  The return value will be either the number `1` or `0`.
-static void f_haslocaldir(typval_T *argvars, typval_T *rettv)
+static void f_haslocaldir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   // Possible scope of working directory to return.
-  CdScope scope = MIN_CD_SCOPE;
+  CdScope scope = kCdScopeInvalid;
 
   // Numbers of the scope objects (window, tab) we want the working directory
   // of. A `-1` means to skip this scope, a `0` means the current object.
@@ -10806,43 +11489,42 @@ static void f_haslocaldir(typval_T *argvars, typval_T *rettv)
       return;
     }
     scope_number[i] = argvars[i].vval.v_number;
-    // The scope is the current iteration step.
-    scope = i;
     if (scope_number[i] < -1) {
       EMSG(_(e_invarg));
       return;
     }
+    // Use the narrowest scope the user requested
+    if (scope_number[i] >= 0 && scope == kCdScopeInvalid) {
+      // The scope is the current iteration step.
+      scope = i;
+    } else if (scope_number[i] < 0) {
+      scope = i + 1;
+    }
   }
 
-  // Normalize scope, the number of the new scope will be 0.
-  if (scope_number[scope] < 0) {
-    // Arguments to `haslocaldir` always end at second-highest scope, so scope
-    // will always be <= `MAX_CD_SCOPE`.
-    scope++;
+  // If the user didn't specify anything, default to window scope
+  if (scope == kCdScopeInvalid) {
+    scope = MIN_CD_SCOPE;
   }
 
   // Find the tabpage by number
-  if (scope_number[kCdScopeTab] == -1) {
-    tp = NULL;
-  } else if (scope_number[kCdScopeTab] > 0) {
+  if (scope_number[kCdScopeTab] > 0) {
     tp = find_tabpage(scope_number[kCdScopeTab]);
     if (!tp) {
-      EMSG(_("5000: Cannot find tab number."));
+      EMSG(_("E5000: Cannot find tab number."));
       return;
     }
   }
 
   // Find the window in `tp` by number, `NULL` if none.
-  if (scope_number[kCdScopeWindow] == -1) {
-    win = NULL;
-  } else if (scope_number[kCdScopeWindow] >= 0) {
-    if (!tp) {
+  if (scope_number[kCdScopeWindow] >= 0) {
+    if (scope_number[kCdScopeTab] < 0) {
       EMSG(_("E5001: Higher scope cannot be -1 if lower scope is >= 0."));
       return;
     }
 
     if (scope_number[kCdScopeWindow] > 0) {
-      win = find_win_by_nr(&argvars[0], curtab);
+      win = find_win_by_nr(&argvars[0], tp);
       if (!win) {
         EMSG(_("E5002: Cannot find window number."));
         return;
@@ -10863,13 +11545,16 @@ static void f_haslocaldir(typval_T *argvars, typval_T *rettv)
       // The global scope never has a local directory
       rettv->vval.v_number = 0;
       break;
+    case kCdScopeInvalid:
+      // We should never get here
+      assert(false);
   }
 }
 
 /*
  * "hasmapto()" function
  */
-static void f_hasmapto(typval_T *argvars, typval_T *rettv)
+static void f_hasmapto(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *name;
   char_u      *mode;
@@ -10894,7 +11579,7 @@ static void f_hasmapto(typval_T *argvars, typval_T *rettv)
 /*
  * "histadd()" function
  */
-static void f_histadd(typval_T *argvars, typval_T *rettv)
+static void f_histadd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   HistoryType histype;
   char_u      *str;
@@ -10920,7 +11605,7 @@ static void f_histadd(typval_T *argvars, typval_T *rettv)
 /*
  * "histdel()" function
  */
-static void f_histdel(typval_T *argvars, typval_T *rettv)
+static void f_histdel(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int n;
   char_u buf[NUMBUFLEN];
@@ -10947,7 +11632,7 @@ static void f_histdel(typval_T *argvars, typval_T *rettv)
 /*
  * "histget()" function
  */
-static void f_histget(typval_T *argvars, typval_T *rettv)
+static void f_histget(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   HistoryType type;
   int idx;
@@ -10972,7 +11657,7 @@ static void f_histget(typval_T *argvars, typval_T *rettv)
 /*
  * "histnr()" function
  */
-static void f_histnr(typval_T *argvars, typval_T *rettv)
+static void f_histnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int i;
 
@@ -10991,7 +11676,7 @@ static void f_histnr(typval_T *argvars, typval_T *rettv)
 /*
  * "highlightID(name)" function
  */
-static void f_hlID(typval_T *argvars, typval_T *rettv)
+static void f_hlID(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = syn_name2id(get_tv_string(&argvars[0]));
 }
@@ -10999,7 +11684,7 @@ static void f_hlID(typval_T *argvars, typval_T *rettv)
 /*
  * "highlight_exists()" function
  */
-static void f_hlexists(typval_T *argvars, typval_T *rettv)
+static void f_hlexists(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = highlight_exists(get_tv_string(&argvars[0]));
 }
@@ -11007,7 +11692,7 @@ static void f_hlexists(typval_T *argvars, typval_T *rettv)
 /*
  * "hostname()" function
  */
-static void f_hostname(typval_T *argvars, typval_T *rettv)
+static void f_hostname(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char hostname[256];
 
@@ -11019,7 +11704,7 @@ static void f_hostname(typval_T *argvars, typval_T *rettv)
 /*
  * iconv() function
  */
-static void f_iconv(typval_T *argvars, typval_T *rettv)
+static void f_iconv(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf1[NUMBUFLEN];
   char_u buf2[NUMBUFLEN];
@@ -11049,7 +11734,7 @@ static void f_iconv(typval_T *argvars, typval_T *rettv)
 /*
  * "indent()" function
  */
-static void f_indent(typval_T *argvars, typval_T *rettv)
+static void f_indent(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
 
@@ -11063,7 +11748,7 @@ static void f_indent(typval_T *argvars, typval_T *rettv)
 /*
  * "index()" function
  */
-static void f_index(typval_T *argvars, typval_T *rettv)
+static void f_index(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T      *l;
   listitem_T  *item;
@@ -11194,7 +11879,7 @@ static void get_user_input(typval_T *argvars, typval_T *rettv, int inputdialog)
  * "input()" function
  *     Also handles inputsecret() when inputsecret is set.
  */
-static void f_input(typval_T *argvars, typval_T *rettv)
+static void f_input(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_user_input(argvars, rettv, FALSE);
 }
@@ -11202,7 +11887,7 @@ static void f_input(typval_T *argvars, typval_T *rettv)
 /*
  * "inputdialog()" function
  */
-static void f_inputdialog(typval_T *argvars, typval_T *rettv)
+static void f_inputdialog(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_user_input(argvars, rettv, TRUE);
 }
@@ -11210,7 +11895,7 @@ static void f_inputdialog(typval_T *argvars, typval_T *rettv)
 /*
  * "inputlist()" function
  */
-static void f_inputlist(typval_T *argvars, typval_T *rettv)
+static void f_inputlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   listitem_T  *li;
   int selected;
@@ -11246,7 +11931,7 @@ static garray_T ga_userinput = {0, 0, sizeof(tasave_T), 4, NULL};
 /*
  * "inputrestore()" function
  */
-static void f_inputrestore(typval_T *argvars, typval_T *rettv)
+static void f_inputrestore(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (!GA_EMPTY(&ga_userinput)) {
     --ga_userinput.ga_len;
@@ -11262,7 +11947,7 @@ static void f_inputrestore(typval_T *argvars, typval_T *rettv)
 /*
  * "inputsave()" function
  */
-static void f_inputsave(typval_T *argvars, typval_T *rettv)
+static void f_inputsave(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   // Add an entry to the stack of typeahead storage.
   tasave_T *p = GA_APPEND_VIA_PTR(tasave_T, &ga_userinput);
@@ -11272,19 +11957,19 @@ static void f_inputsave(typval_T *argvars, typval_T *rettv)
 /*
  * "inputsecret()" function
  */
-static void f_inputsecret(typval_T *argvars, typval_T *rettv)
+static void f_inputsecret(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  ++cmdline_star;
-  ++inputsecret_flag;
-  f_input(argvars, rettv);
-  --cmdline_star;
-  --inputsecret_flag;
+  cmdline_star++;
+  inputsecret_flag++;
+  f_input(argvars, rettv, NULL);
+  cmdline_star--;
+  inputsecret_flag--;
 }
 
 /*
  * "insert()" function
  */
-static void f_insert(typval_T *argvars, typval_T *rettv)
+static void f_insert(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long before = 0;
   listitem_T  *item;
@@ -11323,7 +12008,7 @@ static void f_insert(typval_T *argvars, typval_T *rettv)
 /*
  * "invert(expr)" function
  */
-static void f_invert(typval_T *argvars, typval_T *rettv)
+static void f_invert(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = ~get_tv_number_chk(&argvars[0], NULL);
 }
@@ -11331,7 +12016,7 @@ static void f_invert(typval_T *argvars, typval_T *rettv)
 /*
  * "isdirectory()" function
  */
-static void f_isdirectory(typval_T *argvars, typval_T *rettv)
+static void f_isdirectory(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = os_isdir(get_tv_string(&argvars[0]));
 }
@@ -11339,7 +12024,7 @@ static void f_isdirectory(typval_T *argvars, typval_T *rettv)
 /*
  * "islocked()" function
  */
-static void f_islocked(typval_T *argvars, typval_T *rettv)
+static void f_islocked(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   lval_T lv;
   char_u      *end;
@@ -11451,13 +12136,13 @@ static void dict_list(typval_T *argvars, typval_T *rettv, int what)
 /*
  * "items(dict)" function
  */
-static void f_items(typval_T *argvars, typval_T *rettv)
+static void f_items(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_list(argvars, rettv, 2);
 }
 
 // "jobclose(id[, stream])" function
-static void f_jobclose(typval_T *argvars, typval_T *rettv)
+static void f_jobclose(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11483,21 +12168,43 @@ static void f_jobclose(typval_T *argvars, typval_T *rettv)
   if (argvars[1].v_type == VAR_STRING) {
     char *stream = (char *)argvars[1].vval.v_string;
     if (!strcmp(stream, "stdin")) {
-      process_close_in(proc);
+      if (data->rpc) {
+        EMSG(_("Invalid stream on rpc job, use jobclose(id, 'rpc')"));
+      } else {
+        process_close_in(proc);
+      }
     } else if (!strcmp(stream, "stdout")) {
-      process_close_out(proc);
+      if (data->rpc) {
+        EMSG(_("Invalid stream on rpc job, use jobclose(id, 'rpc')"));
+      } else {
+        process_close_out(proc);
+      }
     } else if (!strcmp(stream, "stderr")) {
       process_close_err(proc);
+    } else if (!strcmp(stream, "rpc")) {
+      if (data->rpc) {
+        channel_close(data->id);
+      } else {
+        EMSG(_("Invalid job stream: Not an rpc job"));
+      }
     } else {
       EMSG2(_("Invalid job stream \"%s\""), stream);
     }
   } else {
-    process_close_streams(proc);
+    if (data->rpc) {
+      channel_close(data->id);
+      process_close_err(proc);
+    } else {
+      process_close_streams(proc);
+      if (proc->type == kProcessTypePty) {
+        pty_process_close_master(&data->proc.pty);
+      }
+    }
   }
 }
 
 // "jobpid(id)" function
-static void f_jobpid(typval_T *argvars, typval_T *rettv)
+static void f_jobpid(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11522,7 +12229,7 @@ static void f_jobpid(typval_T *argvars, typval_T *rettv)
 }
 
 // "jobsend()" function
-static void f_jobsend(typval_T *argvars, typval_T *rettv)
+static void f_jobsend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11549,6 +12256,11 @@ static void f_jobsend(typval_T *argvars, typval_T *rettv)
     return;
   }
 
+  if (data->rpc) {
+    EMSG(_("Can't send raw data to rpc channel"));
+    return;
+  }
+
   ssize_t input_len;
   char *input = (char *) save_tv_as_string(&argvars[1], &input_len, false);
   if (!input) {
@@ -11562,7 +12274,7 @@ static void f_jobsend(typval_T *argvars, typval_T *rettv)
 }
 
 // "jobresize(job, width, height)" function
-static void f_jobresize(typval_T *argvars, typval_T *rettv)
+static void f_jobresize(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11595,7 +12307,7 @@ static void f_jobresize(typval_T *argvars, typval_T *rettv)
   rettv->vval.v_number = 1;
 }
 
-static char **tv_to_argv(typval_T *cmd_tv, char **cmd)
+static char **tv_to_argv(typval_T *cmd_tv, char **cmd, bool *executable)
 {
   if (cmd_tv->v_type == VAR_STRING) {
     char *cmd_str = (char *)get_tv_string(cmd_tv);
@@ -11613,7 +12325,7 @@ static char **tv_to_argv(typval_T *cmd_tv, char **cmd)
   list_T *argl = cmd_tv->vval.v_list;
   int argc = argl->lv_len;
   if (!argc) {
-    EMSG(_("Argument vector must have at least one item"));
+    EMSG(_(e_invarg));  // List must have at least one item.
     return NULL;
   }
 
@@ -11621,9 +12333,8 @@ static char **tv_to_argv(typval_T *cmd_tv, char **cmd)
 
   const char_u *exe = get_tv_string_chk(&argl->lv_first->li_tv);
   if (!exe || !os_can_exe(exe, NULL, true)) {
-    // String is not executable
-    if (exe) {
-      EMSG2(e_jobexe, exe);
+    if (exe && executable) {
+      *executable = false;
     }
     return NULL;
   }
@@ -11631,7 +12342,7 @@ static char **tv_to_argv(typval_T *cmd_tv, char **cmd)
   if (cmd) {
     *cmd = (char *)exe;
   }
-  
+
   // Build the argument vector
   int i = 0;
   char **argv = xcalloc(argc + 1, sizeof(char *));
@@ -11649,7 +12360,7 @@ static char **tv_to_argv(typval_T *cmd_tv, char **cmd)
 }
 
 // "jobstart()" function
-static void f_jobstart(typval_T *argvars, typval_T *rettv)
+static void f_jobstart(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11658,8 +12369,10 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv)
     return;
   }
 
-  char **argv = tv_to_argv(&argvars[0], NULL);
+  bool executable = true;
+  char **argv = tv_to_argv(&argvars[0], NULL, &executable);
   if (!argv) {
+    rettv->vval.v_number = executable ? 0 : -1;
     return;  // Did error message in tv_to_argv.
   }
 
@@ -11670,48 +12383,71 @@ static void f_jobstart(typval_T *argvars, typval_T *rettv)
     return;
   }
 
+
   dict_T *job_opts = NULL;
-  ufunc_T *on_stdout = NULL, *on_stderr = NULL, *on_exit = NULL;
+  bool detach = false, rpc = false, pty = false;
+  Callback on_stdout = CALLBACK_NONE, on_stderr = CALLBACK_NONE,
+           on_exit = CALLBACK_NONE;
+  char *cwd = NULL;
   if (argvars[1].v_type == VAR_DICT) {
     job_opts = argvars[1].vval.v_dict;
+
+    detach = get_dict_number(job_opts, "detach") != 0;
+    rpc = get_dict_number(job_opts, "rpc") != 0;
+    pty = get_dict_number(job_opts, "pty") != 0;
+    if (pty && rpc) {
+      EMSG2(_(e_invarg2), "job cannot have both 'pty' and 'rpc' options set");
+      shell_free_argv(argv);
+      return;
+    }
+
+    char *new_cwd = (char *)get_dict_string(job_opts, "cwd", false);
+    if (new_cwd && strlen(new_cwd) > 0) {
+      cwd = new_cwd;
+      // The new cwd must be a directory.
+      if (!os_isdir((char_u *)cwd)) {
+        EMSG2(_(e_invarg2), "expected valid directory");
+        shell_free_argv(argv);
+        return;
+      }
+    }
+
     if (!common_job_callbacks(job_opts, &on_stdout, &on_stderr, &on_exit)) {
       shell_free_argv(argv);
       return;
     }
   }
 
-  bool pty = job_opts && get_dict_number(job_opts, (uint8_t *)"pty") != 0;
-  bool detach = job_opts && get_dict_number(job_opts, (uint8_t *)"detach") != 0;
   TerminalJobData *data = common_job_init(argv, on_stdout, on_stderr, on_exit,
-                                          job_opts, pty, detach);
+                                          pty, rpc, detach, cwd);
   Process *proc = (Process *)&data->proc;
 
   if (pty) {
-    uint16_t width = get_dict_number(job_opts, (uint8_t *)"width");
+    uint16_t width = get_dict_number(job_opts, "width");
     if (width > 0) {
       data->proc.pty.width = width;
     }
-    uint16_t height = get_dict_number(job_opts, (uint8_t *)"height");
+    uint16_t height = get_dict_number(job_opts, "height");
     if (height > 0) {
       data->proc.pty.height = height;
     }
-    char *term = (char *)get_dict_string(job_opts, (uint8_t *)"TERM", true);
+    char *term = (char *)get_dict_string(job_opts, "TERM", true);
     if (term) {
       data->proc.pty.term_name = term;
     }
   }
 
-  if (!on_stdout) {
+  if (!rpc && on_stdout.type == kCallbackNone) {
     proc->out = NULL;
   }
-  if (!on_stderr) {
+  if (on_stderr.type == kCallbackNone) {
     proc->err = NULL;
   }
   common_job_start(data, rettv);
 }
 
 // "jobstop()" function
-static void f_jobstop(typval_T *argvars, typval_T *rettv)
+static void f_jobstop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11739,7 +12475,7 @@ static void f_jobstop(typval_T *argvars, typval_T *rettv)
 }
 
 // "jobwait(ids[, timeout])" function
-static void f_jobwait(typval_T *argvars, typval_T *rettv)
+static void f_jobwait(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -11758,7 +12494,7 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
   list_T *rv = list_alloc();
 
   ui_busy_start();
-  Queue *waiting_jobs = queue_new_parent(loop_on_put, &loop);
+  MultiQueue *waiting_jobs = multiqueue_new_parent(loop_on_put, &main_loop);
   // For each item in the input list append an integer to the output list. -3
   // is used to represent an invalid job id, -2 is for a interrupted job and
   // -1 for jobs that were skipped or timed out.
@@ -11774,8 +12510,8 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
       data->status_ptr = &rv->lv_last->li_tv.vval.v_number;
       // Process any pending events for the job because we'll temporarily
       // replace the parent queue
-      queue_process_events(data->events);
-      queue_replace_parent(data->events, waiting_jobs);
+      multiqueue_process_events(data->events);
+      multiqueue_replace_parent(data->events, waiting_jobs);
     }
   }
 
@@ -11835,11 +12571,11 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
       continue;
     }
     // restore the parent queue for the job
-    queue_process_events(data->events);
-    queue_replace_parent(data->events, loop.events);
+    multiqueue_process_events(data->events);
+    multiqueue_replace_parent(data->events, main_loop.events);
   }
 
-  queue_free(waiting_jobs);
+  multiqueue_free(waiting_jobs);
   ui_busy_stop();
   rv->lv_refcount++;
   rettv->v_type = VAR_LIST;
@@ -11849,7 +12585,7 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
 /*
  * "join()" function
  */
-static void f_join(typval_T *argvars, typval_T *rettv)
+static void f_join(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   garray_T ga;
   char_u      *sep;
@@ -11877,7 +12613,7 @@ static void f_join(typval_T *argvars, typval_T *rettv)
 }
 
 /// json_decode() function
-static void f_json_decode(typval_T *argvars, typval_T *rettv)
+static void f_json_decode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char numbuf[NUMBUFLEN];
   char *s = NULL;
@@ -11911,7 +12647,7 @@ static void f_json_decode(typval_T *argvars, typval_T *rettv)
 }
 
 /// json_encode() function
-static void f_json_encode(typval_T *argvars, typval_T *rettv)
+static void f_json_encode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = (char_u *) encode_tv2json(&argvars[0], NULL);
@@ -11920,7 +12656,7 @@ static void f_json_encode(typval_T *argvars, typval_T *rettv)
 /*
  * "keys()" function
  */
-static void f_keys(typval_T *argvars, typval_T *rettv)
+static void f_keys(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_list(argvars, rettv, 0);
 }
@@ -11928,7 +12664,7 @@ static void f_keys(typval_T *argvars, typval_T *rettv)
 /*
  * "last_buffer_nr()" function.
  */
-static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv)
+static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int n = 0;
 
@@ -11944,7 +12680,7 @@ static void f_last_buffer_nr(typval_T *argvars, typval_T *rettv)
 /*
  * "len()" function
  */
-static void f_len(typval_T *argvars, typval_T *rettv)
+static void f_len(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   switch (argvars[0].v_type) {
   case VAR_STRING:
@@ -11962,6 +12698,7 @@ static void f_len(typval_T *argvars, typval_T *rettv)
   case VAR_SPECIAL:
   case VAR_FLOAT:
   case VAR_FUNC:
+  case VAR_PARTIAL:
     EMSG(_("E701: Invalid type for len()"));
     break;
   }
@@ -12015,7 +12752,7 @@ static void libcall_common(typval_T *argvars, typval_T *rettv, int out_type)
 /*
  * "libcall()" function
  */
-static void f_libcall(typval_T *argvars, typval_T *rettv)
+static void f_libcall(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   libcall_common(argvars, rettv, VAR_STRING);
 }
@@ -12023,7 +12760,7 @@ static void f_libcall(typval_T *argvars, typval_T *rettv)
 /*
  * "libcallnr()" function
  */
-static void f_libcallnr(typval_T *argvars, typval_T *rettv)
+static void f_libcallnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   libcall_common(argvars, rettv, VAR_NUMBER);
 }
@@ -12031,7 +12768,7 @@ static void f_libcallnr(typval_T *argvars, typval_T *rettv)
 /*
  * "line(string)" function
  */
-static void f_line(typval_T *argvars, typval_T *rettv)
+static void f_line(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum = 0;
   pos_T       *fp;
@@ -12046,7 +12783,7 @@ static void f_line(typval_T *argvars, typval_T *rettv)
 /*
  * "line2byte(lnum)" function
  */
-static void f_line2byte(typval_T *argvars, typval_T *rettv)
+static void f_line2byte(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
 
@@ -12062,7 +12799,7 @@ static void f_line2byte(typval_T *argvars, typval_T *rettv)
 /*
  * "lispindent(lnum)" function
  */
-static void f_lispindent(typval_T *argvars, typval_T *rettv)
+static void f_lispindent(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   pos_T pos;
   linenr_T lnum;
@@ -12080,7 +12817,7 @@ static void f_lispindent(typval_T *argvars, typval_T *rettv)
 /*
  * "localtime()" function
  */
-static void f_localtime(typval_T *argvars, typval_T *rettv)
+static void f_localtime(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = (varnumber_T)time(NULL);
 }
@@ -12156,26 +12893,9 @@ static void get_maparg(typval_T *argvars, typval_T *rettv, int exact)
 }
 
 /*
- * "log()" function
- */
-static void f_log(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &log);
-}
-
-/*
- * "log10()" function
- */
-static void f_log10(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &log10);
-}
-
-
-/*
  * "map()" function
  */
-static void f_map(typval_T *argvars, typval_T *rettv)
+static void f_map(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   filter_map(argvars, rettv, TRUE);
 }
@@ -12183,7 +12903,7 @@ static void f_map(typval_T *argvars, typval_T *rettv)
 /*
  * "maparg()" function
  */
-static void f_maparg(typval_T *argvars, typval_T *rettv)
+static void f_maparg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_maparg(argvars, rettv, TRUE);
 }
@@ -12191,7 +12911,7 @@ static void f_maparg(typval_T *argvars, typval_T *rettv)
 /*
  * "mapcheck()" function
  */
-static void f_mapcheck(typval_T *argvars, typval_T *rettv)
+static void f_mapcheck(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_maparg(argvars, rettv, FALSE);
 }
@@ -12220,9 +12940,16 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type)
   p_cpo = (char_u *)"";
 
   rettv->vval.v_number = -1;
-  if (type == 3) {
-    /* return empty list when there are no matches */
+  if (type == 3 || type == 4) {
+    // type 3: return empty list when there are no matches.
+    // type 4: return ["", -1, -1, -1]
     rettv_list_alloc(rettv);
+    if (type == 4) {
+      list_append_string(rettv->vval.v_list, (char_u *)"", 0);
+      list_append_number(rettv->vval.v_list, (varnumber_T)-1);
+      list_append_number(rettv->vval.v_list, (varnumber_T)-1);
+      list_append_number(rettv->vval.v_list, (varnumber_T)-1);
+    }
   } else if (type == 2) {
     rettv->v_type = VAR_STRING;
     rettv->vval.v_string = NULL;
@@ -12285,7 +13012,7 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type)
           break;
         }
         xfree(tofree);
-        tofree = str = (char_u *) encode_tv2echo(&li->li_tv, NULL);
+        tofree = expr = str = (char_u *)encode_tv2echo(&li->li_tv, NULL);
         if (str == NULL) {
           break;
         }
@@ -12313,7 +13040,21 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type)
     }
 
     if (match) {
-      if (type == 3) {
+      if (type == 4) {
+        listitem_T *li1 = rettv->vval.v_list->lv_first;
+        listitem_T *li2 = li1->li_next;
+        listitem_T *li3 = li2->li_next;
+        listitem_T *li4 = li3->li_next;
+        xfree(li1->li_tv.vval.v_string);
+
+        int rd = (int)(regmatch.endp[0] - regmatch.startp[0]);
+        li1->li_tv.vval.v_string = vim_strnsave(regmatch.startp[0], rd);
+        li3->li_tv.vval.v_number = (varnumber_T)(regmatch.startp[0] - expr);
+        li4->li_tv.vval.v_number = (varnumber_T)(regmatch.endp[0] - expr);
+        if (l != NULL) {
+          li2->li_tv.vval.v_number = (varnumber_T)idx;
+        }
+      } else if (type == 3) {
         int i;
 
         /* return list with matched string and submatches */
@@ -12348,6 +13089,11 @@ static void find_some_match(typval_T *argvars, typval_T *rettv, int type)
     vim_regfree(regmatch.regprog);
   }
 
+  if (type == 4 && l == NULL) {
+    // matchstrpos() without a list: drop the second item
+    listitem_remove(rettv->vval.v_list, rettv->vval.v_list->lv_first->li_next);
+  }
+
 theend:
   xfree(tofree);
   p_cpo = save_cpo;
@@ -12356,7 +13102,7 @@ theend:
 /*
  * "match()" function
  */
-static void f_match(typval_T *argvars, typval_T *rettv)
+static void f_match(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   find_some_match(argvars, rettv, 1);
 }
@@ -12364,7 +13110,7 @@ static void f_match(typval_T *argvars, typval_T *rettv)
 /*
  * "matchadd()" function
  */
-static void f_matchadd(typval_T *argvars, typval_T *rettv)
+static void f_matchadd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
   char_u      *grp = get_tv_string_buf_chk(&argvars[0], buf);   /* group */
@@ -12390,7 +13136,7 @@ static void f_matchadd(typval_T *argvars, typval_T *rettv)
         if (dict_find(argvars[4].vval.v_dict,
                       (char_u *)"conceal", -1) != NULL) {
           conceal_char = get_dict_string(argvars[4].vval.v_dict,
-                                         (char_u *)"conceal", false);
+                                         "conceal", false);
         }
       }
     }
@@ -12407,7 +13153,7 @@ static void f_matchadd(typval_T *argvars, typval_T *rettv)
                                    conceal_char);
 }
 
-static void f_matchaddpos(typval_T *argvars, typval_T *rettv) FUNC_ATTR_NONNULL_ALL
+static void f_matchaddpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
     rettv->vval.v_number = -1;
     
@@ -12446,7 +13192,7 @@ static void f_matchaddpos(typval_T *argvars, typval_T *rettv) FUNC_ATTR_NONNULL_
           if (dict_find(argvars[4].vval.v_dict,
                         (char_u *)"conceal", -1) != NULL) {
             conceal_char = get_dict_string(argvars[4].vval.v_dict,
-                                           (char_u *)"conceal", false);
+                                           "conceal", false);
           }
         }
       }
@@ -12468,7 +13214,7 @@ static void f_matchaddpos(typval_T *argvars, typval_T *rettv) FUNC_ATTR_NONNULL_
 /*
  * "matcharg()" function
  */
-static void f_matcharg(typval_T *argvars, typval_T *rettv)
+static void f_matcharg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv_list_alloc(rettv);
 
@@ -12490,7 +13236,7 @@ static void f_matcharg(typval_T *argvars, typval_T *rettv)
 /*
  * "matchdelete()" function
  */
-static void f_matchdelete(typval_T *argvars, typval_T *rettv)
+static void f_matchdelete(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = match_delete(curwin,
       (int)get_tv_number(&argvars[0]), TRUE);
@@ -12499,7 +13245,7 @@ static void f_matchdelete(typval_T *argvars, typval_T *rettv)
 /*
  * "matchend()" function
  */
-static void f_matchend(typval_T *argvars, typval_T *rettv)
+static void f_matchend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   find_some_match(argvars, rettv, 0);
 }
@@ -12507,7 +13253,7 @@ static void f_matchend(typval_T *argvars, typval_T *rettv)
 /*
  * "matchlist()" function
  */
-static void f_matchlist(typval_T *argvars, typval_T *rettv)
+static void f_matchlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   find_some_match(argvars, rettv, 3);
 }
@@ -12515,11 +13261,16 @@ static void f_matchlist(typval_T *argvars, typval_T *rettv)
 /*
  * "matchstr()" function
  */
-static void f_matchstr(typval_T *argvars, typval_T *rettv)
+static void f_matchstr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   find_some_match(argvars, rettv, 2);
 }
 
+/// "matchstrpos()" function
+static void f_matchstrpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  find_some_match(argvars, rettv, 4);
+}
 
 static void max_min(typval_T *argvars, typval_T *rettv, int domax)
 {
@@ -12575,7 +13326,7 @@ static void max_min(typval_T *argvars, typval_T *rettv, int domax)
 /*
  * "max()" function
  */
-static void f_max(typval_T *argvars, typval_T *rettv)
+static void f_max(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   max_min(argvars, rettv, TRUE);
 }
@@ -12583,7 +13334,7 @@ static void f_max(typval_T *argvars, typval_T *rettv)
 /*
  * "min()" function
  */
-static void f_min(typval_T *argvars, typval_T *rettv)
+static void f_min(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   max_min(argvars, rettv, FALSE);
 }
@@ -12591,7 +13342,7 @@ static void f_min(typval_T *argvars, typval_T *rettv)
 /*
  * "mkdir()" function
  */
-static void f_mkdir(typval_T *argvars, typval_T *rettv)
+static void f_mkdir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *dir;
   char_u buf[NUMBUFLEN];
@@ -12633,7 +13384,7 @@ static void f_mkdir(typval_T *argvars, typval_T *rettv)
 /*
  * "mode()" function
  */
-static void f_mode(typval_T *argvars, typval_T *rettv)
+static void f_mode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[3];
 
@@ -12687,7 +13438,7 @@ static void f_mode(typval_T *argvars, typval_T *rettv)
 }
 
 /// "msgpackdump()" function
-static void f_msgpackdump(typval_T *argvars, typval_T *rettv)
+static void f_msgpackdump(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   FUNC_ATTR_NONNULL_ALL
 {
   if (argvars[0].v_type != VAR_LIST) {
@@ -12715,7 +13466,7 @@ static void f_msgpackdump(typval_T *argvars, typval_T *rettv)
 }
 
 /// "msgpackparse" function
-static void f_msgpackparse(typval_T *argvars, typval_T *rettv)
+static void f_msgpackparse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   FUNC_ATTR_NONNULL_ALL
 {
   if (argvars[0].v_type != VAR_LIST) {
@@ -12796,7 +13547,7 @@ f_msgpackparse_exit:
 /*
  * "nextnonblank()" function
  */
-static void f_nextnonblank(typval_T *argvars, typval_T *rettv)
+static void f_nextnonblank(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
 
@@ -12814,7 +13565,7 @@ static void f_nextnonblank(typval_T *argvars, typval_T *rettv)
 /*
  * "nr2char()" function
  */
-static void f_nr2char(typval_T *argvars, typval_T *rettv)
+static void f_nr2char(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
 
@@ -12838,7 +13589,7 @@ static void f_nr2char(typval_T *argvars, typval_T *rettv)
 /*
  * "or(expr, expr)" function
  */
-static void f_or(typval_T *argvars, typval_T *rettv)
+static void f_or(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = get_tv_number_chk(&argvars[0], NULL)
                          | get_tv_number_chk(&argvars[1], NULL);
@@ -12847,7 +13598,7 @@ static void f_or(typval_T *argvars, typval_T *rettv)
 /*
  * "pathshorten()" function
  */
-static void f_pathshorten(typval_T *argvars, typval_T *rettv)
+static void f_pathshorten(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = get_tv_string_chk(&argvars[0]);
@@ -12860,7 +13611,7 @@ static void f_pathshorten(typval_T *argvars, typval_T *rettv)
 /*
  * "pow()" function
  */
-static void f_pow(typval_T *argvars, typval_T *rettv)
+static void f_pow(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   float_T fx, fy;
 
@@ -12875,7 +13626,7 @@ static void f_pow(typval_T *argvars, typval_T *rettv)
 /*
  * "prevnonblank()" function
  */
-static void f_prevnonblank(typval_T *argvars, typval_T *rettv)
+static void f_prevnonblank(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
 
@@ -12897,7 +13648,7 @@ static va_list ap;
 /*
  * "printf()" function
  */
-static void f_printf(typval_T *argvars, typval_T *rettv)
+static void f_printf(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
@@ -12923,7 +13674,7 @@ static void f_printf(typval_T *argvars, typval_T *rettv)
 /*
  * "pumvisible()" function
  */
-static void f_pumvisible(typval_T *argvars, typval_T *rettv)
+static void f_pumvisible(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (pum_visible())
     rettv->vval.v_number = 1;
@@ -12932,7 +13683,7 @@ static void f_pumvisible(typval_T *argvars, typval_T *rettv)
 /*
  * "pyeval()" function
  */
-static void f_pyeval(typval_T *argvars, typval_T *rettv)
+static void f_pyeval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   script_host_eval("python", argvars, rettv);
 }
@@ -12940,7 +13691,7 @@ static void f_pyeval(typval_T *argvars, typval_T *rettv)
 /*
  * "py3eval()" function
  */
-static void f_py3eval(typval_T *argvars, typval_T *rettv)
+static void f_py3eval(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   script_host_eval("python3", argvars, rettv);
 }
@@ -12948,7 +13699,7 @@ static void f_py3eval(typval_T *argvars, typval_T *rettv)
 /*
  * "range()" function
  */
-static void f_range(typval_T *argvars, typval_T *rettv)
+static void f_range(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long start;
   long end;
@@ -12983,7 +13734,7 @@ static void f_range(typval_T *argvars, typval_T *rettv)
 /*
  * "readfile()" function
  */
-static void f_readfile(typval_T *argvars, typval_T *rettv)
+static void f_readfile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int binary = FALSE;
   char_u      *fname;
@@ -13182,7 +13933,7 @@ static int list2proftime(typval_T *arg, proftime_T *tm) FUNC_ATTR_NONNULL_ALL
 ///             one argument it returns the time passed since the argument.
 ///             With two arguments it returns the time passed between
 ///             the two arguments.
-static void f_reltime(typval_T *argvars, typval_T *rettv) FUNC_ATTR_NONNULL_ALL
+static void f_reltime(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   proftime_T res;
   proftime_T start;
@@ -13228,7 +13979,7 @@ static void f_reltime(typval_T *argvars, typval_T *rettv) FUNC_ATTR_NONNULL_ALL
 /// @return The string representation of the argument, the format is the
 ///         number of seconds followed by a dot, followed by the number
 ///         of microseconds.
-static void f_reltimestr(typval_T *argvars, typval_T *rettv)
+static void f_reltimestr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   FUNC_ATTR_NONNULL_ALL
 {
   proftime_T tm;
@@ -13243,7 +13994,7 @@ static void f_reltimestr(typval_T *argvars, typval_T *rettv)
 /*
  * "remove()" function
  */
-static void f_remove(typval_T *argvars, typval_T *rettv)
+static void f_remove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T      *l;
   listitem_T  *item, *item2;
@@ -13328,7 +14079,7 @@ static void f_remove(typval_T *argvars, typval_T *rettv)
 /*
  * "rename({from}, {to})" function
  */
-static void f_rename(typval_T *argvars, typval_T *rettv)
+static void f_rename(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
 
@@ -13342,7 +14093,7 @@ static void f_rename(typval_T *argvars, typval_T *rettv)
 /*
  * "repeat()" function
  */
-static void f_repeat(typval_T *argvars, typval_T *rettv)
+static void f_repeat(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p;
   int n;
@@ -13376,7 +14127,7 @@ static void f_repeat(typval_T *argvars, typval_T *rettv)
 /*
  * "resolve()" function
  */
-static void f_resolve(typval_T *argvars, typval_T *rettv)
+static void f_resolve(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p;
 #ifdef HAVE_READLINK
@@ -13388,11 +14139,12 @@ static void f_resolve(typval_T *argvars, typval_T *rettv)
   {
     char_u  *v = NULL;
 
-    v = mch_resolve_shortcut(p);
-    if (v != NULL)
+    v = os_resolve_shortcut(p);
+    if (v != NULL) {
       rettv->vval.v_string = v;
-    else
+    } else {
       rettv->vval.v_string = vim_strsave(p);
+    }
   }
 #else
 # ifdef HAVE_READLINK
@@ -13549,7 +14301,7 @@ fail:
 /*
  * "reverse({list})" function
  */
-static void f_reverse(typval_T *argvars, typval_T *rettv)
+static void f_reverse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T      *l;
   listitem_T  *li, *ni;
@@ -13720,16 +14472,8 @@ theend:
   return retval;
 }
 
-/*
- * "round({float})" function
- */
-static void f_round(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &round);
-}
-
 // "rpcnotify()" function
-static void f_rpcnotify(typval_T *argvars, typval_T *rettv)
+static void f_rpcnotify(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -13765,7 +14509,7 @@ static void f_rpcnotify(typval_T *argvars, typval_T *rettv)
 }
 
 // "rpcrequest()" function
-static void f_rpcrequest(typval_T *argvars, typval_T *rettv)
+static void f_rpcrequest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -13838,7 +14582,7 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv)
   }
 
   if (err.set) {
-    vim_report_error(cstr_as_string(err.msg));
+    nvim_err_writeln(cstr_as_string(err.msg));
     goto end;
   }
 
@@ -13850,8 +14594,8 @@ end:
   api_free_object(result);
 }
 
-// "rpcstart()" function
-static void f_rpcstart(typval_T *argvars, typval_T *rettv)
+// "rpcstart()" function (DEPRECATED)
+static void f_rpcstart(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -13903,17 +14647,15 @@ static void f_rpcstart(typval_T *argvars, typval_T *rettv)
 
   // The last item of argv must be NULL
   argv[i] = NULL;
-  uint64_t channel_id = channel_from_process(argv);
-
-  if (!channel_id) {
-    EMSG(_(e_api_spawn_failed));
-  }
 
-  rettv->vval.v_number = (varnumber_T)channel_id;
+  TerminalJobData *data = common_job_init(argv, CALLBACK_NONE, CALLBACK_NONE,
+                                          CALLBACK_NONE, false, true, false,
+                                          NULL);
+  common_job_start(data, rettv);
 }
 
 // "rpcstop()" function
-static void f_rpcstop(typval_T *argvars, typval_T *rettv)
+static void f_rpcstop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_NUMBER;
   rettv->vval.v_number = 0;
@@ -13928,13 +14670,18 @@ static void f_rpcstop(typval_T *argvars, typval_T *rettv)
     return;
   }
 
-  rettv->vval.v_number = channel_close(argvars[0].vval.v_number);
+  // if called with a job, stop it, else closes the channel
+  if (pmap_get(uint64_t)(jobs, argvars[0].vval.v_number)) {
+    f_jobstop(argvars, rettv, NULL);
+  } else {
+    rettv->vval.v_number = channel_close(argvars[0].vval.v_number);
+  }
 }
 
 /*
  * "screenattr()" function
  */
-static void f_screenattr(typval_T *argvars, typval_T *rettv)
+static void f_screenattr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int row;
   int col;
@@ -13953,7 +14700,7 @@ static void f_screenattr(typval_T *argvars, typval_T *rettv)
 /*
  * "screenchar()" function
  */
-static void f_screenchar(typval_T *argvars, typval_T *rettv)
+static void f_screenchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int row;
   int col;
@@ -13980,7 +14727,7 @@ static void f_screenchar(typval_T *argvars, typval_T *rettv)
  *
  * First column is 1 to be consistent with virtcol().
  */
-static void f_screencol(typval_T *argvars, typval_T *rettv)
+static void f_screencol(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = ui_current_col() + 1;
 }
@@ -13988,7 +14735,7 @@ static void f_screencol(typval_T *argvars, typval_T *rettv)
 /*
  * "screenrow()" function
  */
-static void f_screenrow(typval_T *argvars, typval_T *rettv)
+static void f_screenrow(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = ui_current_row() + 1;
 }
@@ -13996,7 +14743,7 @@ static void f_screenrow(typval_T *argvars, typval_T *rettv)
 /*
  * "search()" function
  */
-static void f_search(typval_T *argvars, typval_T *rettv)
+static void f_search(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int flags = 0;
 
@@ -14006,7 +14753,7 @@ static void f_search(typval_T *argvars, typval_T *rettv)
 /*
  * "searchdecl()" function
  */
-static void f_searchdecl(typval_T *argvars, typval_T *rettv)
+static void f_searchdecl(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int locally = 1;
   int thisblock = 0;
@@ -14099,7 +14846,7 @@ theend:
 /*
  * "searchpair()" function
  */
-static void f_searchpair(typval_T *argvars, typval_T *rettv)
+static void f_searchpair(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = searchpair_cmn(argvars, NULL);
 }
@@ -14107,7 +14854,7 @@ static void f_searchpair(typval_T *argvars, typval_T *rettv)
 /*
  * "searchpairpos()" function
  */
-static void f_searchpairpos(typval_T *argvars, typval_T *rettv)
+static void f_searchpairpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   pos_T match_pos;
   int lnum = 0;
@@ -14272,7 +15019,7 @@ do_searchpair (
 /*
  * "searchpos()" function
  */
-static void f_searchpos(typval_T *argvars, typval_T *rettv)
+static void f_searchpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   pos_T match_pos;
   int lnum = 0;
@@ -14295,7 +15042,7 @@ static void f_searchpos(typval_T *argvars, typval_T *rettv)
 }
 
 /// "serverlist()" function
-static void f_serverlist(typval_T *argvars, typval_T *rettv)
+static void f_serverlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   size_t n;
   char **addrs = server_address_list(&n);
@@ -14313,7 +15060,7 @@ static void f_serverlist(typval_T *argvars, typval_T *rettv)
 }
 
 /// "serverstart()" function
-static void f_serverstart(typval_T *argvars, typval_T *rettv)
+static void f_serverstart(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;  // Address of the new server
@@ -14341,7 +15088,7 @@ static void f_serverstart(typval_T *argvars, typval_T *rettv)
 }
 
 /// "serverstop()" function
-static void f_serverstop(typval_T *argvars, typval_T *rettv)
+static void f_serverstop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (check_restricted() || check_secure()) {
     return;
@@ -14360,10 +15107,9 @@ static void f_serverstop(typval_T *argvars, typval_T *rettv)
 /*
  * "setbufvar()" function
  */
-static void f_setbufvar(typval_T *argvars, typval_T *rettv)
+static void f_setbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   buf_T       *buf;
-  aco_save_T aco;
   char_u      *varname, *bufvarname;
   typval_T    *varp;
   char_u nbuf[NUMBUFLEN];
@@ -14376,33 +15122,38 @@ static void f_setbufvar(typval_T *argvars, typval_T *rettv)
   varp = &argvars[2];
 
   if (buf != NULL && varname != NULL && varp != NULL) {
-    /* set curbuf to be our buf, temporarily */
-    aucmd_prepbuf(&aco, buf);
-
     if (*varname == '&') {
       long numval;
       char_u      *strval;
-      int error = FALSE;
+      int error = false;
+      aco_save_T  aco;
+
+      // set curbuf to be our buf, temporarily
+      aucmd_prepbuf(&aco, buf);
 
       ++varname;
       numval = get_tv_number_chk(varp, &error);
       strval = get_tv_string_buf_chk(varp, nbuf);
       if (!error && strval != NULL)
         set_option_value(varname, numval, strval, OPT_LOCAL);
+
+      // reset notion of buffer
+      aucmd_restbuf(&aco);
     } else {
+      buf_T *save_curbuf = curbuf;
+
       bufvarname = xmalloc(STRLEN(varname) + 3);
+      curbuf = buf;
       STRCPY(bufvarname, "b:");
       STRCPY(bufvarname + 2, varname);
       set_var(bufvarname, varp, TRUE);
       xfree(bufvarname);
+      curbuf = save_curbuf;
     }
-
-    /* reset notion of buffer */
-    aucmd_restbuf(&aco);
   }
 }
 
-static void f_setcharsearch(typval_T *argvars, typval_T *rettv)
+static void f_setcharsearch(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_T        *d;
   dictitem_T        *di;
@@ -14414,7 +15165,7 @@ static void f_setcharsearch(typval_T *argvars, typval_T *rettv)
   }
 
   if ((d = argvars[0].vval.v_dict) != NULL) {
-    csearch = get_dict_string(d, (char_u *)"char", FALSE);
+    csearch = get_dict_string(d, "char", false);
     if (csearch != NULL) {
       if (enc_utf8) {
         int pcc[MAX_MCO];
@@ -14439,7 +15190,7 @@ static void f_setcharsearch(typval_T *argvars, typval_T *rettv)
 /*
  * "setcmdpos()" function
  */
-static void f_setcmdpos(typval_T *argvars, typval_T *rettv)
+static void f_setcmdpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int pos = (int)get_tv_number(&argvars[0]) - 1;
 
@@ -14449,7 +15200,7 @@ static void f_setcmdpos(typval_T *argvars, typval_T *rettv)
 
 
 /// "setfperm({fname}, {mode})" function
-static void f_setfperm(typval_T *argvars, typval_T *rettv)
+static void f_setfperm(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = 0;
 
@@ -14482,7 +15233,7 @@ static void f_setfperm(typval_T *argvars, typval_T *rettv)
 /*
  * "setline()" function
  */
-static void f_setline(typval_T *argvars, typval_T *rettv)
+static void f_setline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   linenr_T lnum;
   char_u      *line = NULL;
@@ -14559,6 +15310,7 @@ static void f_setline(typval_T *argvars, typval_T *rettv)
 static void set_qf_ll_list(win_T *wp, typval_T *args, typval_T *rettv)
   FUNC_ATTR_NONNULL_ARG(2, 3)
 {
+  static char *e_invact = N_("E927: Invalid action: '%s'");
   char_u *title = NULL;
   int action = ' ';
   rettv->vval.v_number = -1;
@@ -14574,12 +15326,15 @@ static void set_qf_ll_list(win_T *wp, typval_T *args, typval_T *rettv)
     // Option argument was not given.
     goto skip_args;
   } else if (action_arg->v_type != VAR_STRING) {
-    EMSG(_(e_strreq));
+    EMSG(_(e_stringreq));
     return;
   }
   char_u *act = get_tv_string_chk(action_arg);
-  if (*act == 'a' || *act == 'r') {
+  if ((*act == 'a' || *act == 'r' || *act == ' ') && act[1] == NUL) {
     action = *act;
+  } else {
+    EMSG2(_(e_invact), act);
+    return;
   }
 
   typval_T *title_arg = &args[2];
@@ -14607,7 +15362,7 @@ skip_args:
 /*
  * "setloclist()" function
  */
-static void f_setloclist(typval_T *argvars, typval_T *rettv)
+static void f_setloclist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   win_T       *win;
 
@@ -14622,7 +15377,7 @@ static void f_setloclist(typval_T *argvars, typval_T *rettv)
 /*
  * "setmatches()" function
  */
-static void f_setmatches(typval_T *argvars, typval_T *rettv)
+static void f_setmatches(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T      *l;
   listitem_T  *li;
@@ -14688,22 +15443,23 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
         }
       }
 
-      char_u *group = get_dict_string(d, (char_u *)"group", false);
-      int priority = get_dict_number(d, (char_u *)"priority");
-      int id = get_dict_number(d, (char_u *)"id");
+      char_u *group = get_dict_string(d, "group", true);
+      int priority = get_dict_number(d, "priority");
+      int id = get_dict_number(d, "id");
       char_u *conceal = dict_find(d, (char_u *)"conceal", -1) != NULL
-                                  ? get_dict_string(d, (char_u *)"conceal",
-                                                    false)
+                                  ? get_dict_string(d, "conceal", true)
                                   : NULL;
       if (i == 0) {
         match_add(curwin, group,
-                  get_dict_string(d, (char_u *)"pattern", false),
+                  get_dict_string(d, "pattern", false),
                   priority, id, NULL, conceal);
       } else {
         match_add(curwin, group, NULL, priority, id, s, conceal);
         list_unref(s);
         s = NULL;
       }
+      xfree(group);
+      xfree(conceal);
       li = li->li_next;
     }
     rettv->vval.v_number = 0;
@@ -14713,7 +15469,7 @@ static void f_setmatches(typval_T *argvars, typval_T *rettv)
 /*
  * "setpos()" function
  */
-static void f_setpos(typval_T *argvars, typval_T *rettv)
+static void f_setpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   pos_T pos;
   int fnum;
@@ -14755,7 +15511,7 @@ static void f_setpos(typval_T *argvars, typval_T *rettv)
 /*
  * "setqflist()" function
  */
-static void f_setqflist(typval_T *argvars, typval_T *rettv)
+static void f_setqflist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   set_qf_ll_list(NULL, argvars, rettv);
 }
@@ -14763,7 +15519,7 @@ static void f_setqflist(typval_T *argvars, typval_T *rettv)
 /*
  * "setreg()" function
  */
-static void f_setreg(typval_T *argvars, typval_T *rettv)
+static void f_setreg(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int regname;
   char_u      *strregname;
@@ -14811,7 +15567,10 @@ static void f_setreg(typval_T *argvars, typval_T *rettv)
   }
 
   if (argvars[1].v_type == VAR_LIST) {
-    int len = argvars[1].vval.v_list->lv_len;
+    list_T *ll = argvars[1].vval.v_list;
+    // If the list is NULL handle like an empty list.
+    int len = ll == NULL ? 0 : ll->lv_len;
+
     // First half: use for pointers to result lines; second half: use for
     // pointers to allocated copies.
     char_u **lstval = xmalloc(sizeof(char_u *) * ((len + 1) * 2));
@@ -14820,7 +15579,7 @@ static void f_setreg(typval_T *argvars, typval_T *rettv)
     char_u **curallocval = allocval;
 
     char_u buf[NUMBUFLEN];
-    for (listitem_T *li = argvars[1].vval.v_list->lv_first;
+    for (listitem_T *li = ll == NULL ? NULL : ll->lv_first;
          li != NULL;
          li = li->li_next) {
       char_u *strval = get_tv_string_buf_chk(&li->li_tv, buf);
@@ -14837,7 +15596,8 @@ static void f_setreg(typval_T *argvars, typval_T *rettv)
     }
     *curval++ = NULL;
 
-    write_reg_contents_lst(regname, lstval, -1, append, yank_type, block_len);
+    write_reg_contents_lst(regname, lstval, STRLEN(lstval),
+                           append, yank_type, block_len);
 
 free_lstval:
     while (curallocval > allocval)
@@ -14848,7 +15608,8 @@ free_lstval:
     if (strval == NULL) {
       return;
     }
-    write_reg_contents_ex(regname, strval, -1, append, yank_type, block_len);
+    write_reg_contents_ex(regname, strval, STRLEN(strval),
+                          append, yank_type, block_len);
   }
   rettv->vval.v_number = 0;
 }
@@ -14856,7 +15617,7 @@ free_lstval:
 /*
  * "settabvar()" function
  */
-static void f_settabvar(typval_T *argvars, typval_T *rettv)
+static void f_settabvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   tabpage_T   *save_curtab;
   tabpage_T   *tp;
@@ -14893,7 +15654,7 @@ static void f_settabvar(typval_T *argvars, typval_T *rettv)
 /*
  * "settabwinvar()" function
  */
-static void f_settabwinvar(typval_T *argvars, typval_T *rettv)
+static void f_settabwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   setwinvar(argvars, rettv, 1);
 }
@@ -14901,7 +15662,7 @@ static void f_settabwinvar(typval_T *argvars, typval_T *rettv)
 /*
  * "setwinvar()" function
  */
-static void f_setwinvar(typval_T *argvars, typval_T *rettv)
+static void f_setwinvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   setwinvar(argvars, rettv, 0);
 }
@@ -14961,7 +15722,7 @@ static void setwinvar(typval_T *argvars, typval_T *rettv, int off)
 }
 
 /// f_sha256 - sha256({string}) function
-static void f_sha256(typval_T *argvars, typval_T *rettv)
+static void f_sha256(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *p = get_tv_string(&argvars[0]);
   const char_u *hash = sha256_bytes(p, (int) STRLEN(p) , NULL, 0);
@@ -14974,7 +15735,7 @@ static void f_sha256(typval_T *argvars, typval_T *rettv)
 /*
  * "shellescape({string})" function
  */
-static void f_shellescape(typval_T *argvars, typval_T *rettv)
+static void f_shellescape(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_string = vim_strsave_shellescape(
     get_tv_string(&argvars[0]), non_zero_arg(&argvars[1]), true);
@@ -14984,7 +15745,7 @@ static void f_shellescape(typval_T *argvars, typval_T *rettv)
 /*
  * shiftwidth() function
  */
-static void f_shiftwidth(typval_T *argvars, typval_T *rettv)
+static void f_shiftwidth(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = get_sw_value(curbuf);
 }
@@ -14992,7 +15753,7 @@ static void f_shiftwidth(typval_T *argvars, typval_T *rettv)
 /*
  * "simplify()" function
  */
-static void f_simplify(typval_T *argvars, typval_T *rettv)
+static void f_simplify(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p;
 
@@ -15002,35 +15763,25 @@ static void f_simplify(typval_T *argvars, typval_T *rettv)
   rettv->v_type = VAR_STRING;
 }
 
-/*
- * "sin()" function
- */
-static void f_sin(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &sin);
-}
-
-/*
- * "sinh()" function
- */
-static void f_sinh(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &sinh);
-}
-
 /// struct used in the array that's given to qsort()
 typedef struct {
   listitem_T *item;
   int idx;
 } sortItem_T;
 
-static int item_compare_ic;
-static bool item_compare_numeric;
-static bool item_compare_numbers;
-static bool item_compare_float;
-static char_u   *item_compare_func;
-static dict_T   *item_compare_selfdict;
-static int item_compare_func_err;
+/// struct storing information about current sort
+typedef struct {
+  int item_compare_ic;
+  bool item_compare_numeric;
+  bool item_compare_numbers;
+  bool item_compare_float;
+  char_u *item_compare_func;
+  partial_T *item_compare_partial;
+  dict_T *item_compare_selfdict;
+  int item_compare_func_err;
+} sortinfo_T;
+static sortinfo_T *sortinfo = NULL;
+
 #define ITEM_COMPARE_FAIL 999
 
 /*
@@ -15050,14 +15801,14 @@ static int item_compare(const void *s1, const void *s2, bool keep_zero)
   typval_T *tv1 = &si1->item->li_tv;
   typval_T *tv2 = &si2->item->li_tv;
 
-  if (item_compare_numbers) {
+  if (sortinfo->item_compare_numbers) {
     long v1 = get_tv_number(tv1);
     long v2 = get_tv_number(tv2);
 
     return v1 == v2 ? 0 : v1 > v2 ? 1 : -1;
   }
 
-  if (item_compare_float) {
+  if (sortinfo->item_compare_float) {
     float_T v1 = get_tv_float(tv1);
     float_T v2 = get_tv_float(tv2);
 
@@ -15068,7 +15819,7 @@ static int item_compare(const void *s1, const void *s2, bool keep_zero)
   // do that for string variables. Use a single quote when comparing with
   // a non-string to do what the docs promise.
   if (tv1->v_type == VAR_STRING) {
-    if (tv2->v_type != VAR_STRING || item_compare_numeric) {
+    if (tv2->v_type != VAR_STRING || sortinfo->item_compare_numeric) {
       p1 = (char_u *)"'";
     } else {
       p1 = tv1->vval.v_string;
@@ -15077,7 +15828,7 @@ static int item_compare(const void *s1, const void *s2, bool keep_zero)
     tofree1 = p1 = (char_u *) encode_tv2string(tv1, NULL);
   }
   if (tv2->v_type == VAR_STRING) {
-    if (tv1->v_type != VAR_STRING || item_compare_numeric) {
+    if (tv1->v_type != VAR_STRING || sortinfo->item_compare_numeric) {
       p2 = (char_u *)"'";
     } else {
       p2 = tv2->vval.v_string;
@@ -15085,12 +15836,14 @@ static int item_compare(const void *s1, const void *s2, bool keep_zero)
   } else {
     tofree2 = p2 = (char_u *) encode_tv2string(tv2, NULL);
   }
-  if (p1 == NULL)
+  if (p1 == NULL) {
     p1 = (char_u *)"";
-  if (p2 == NULL)
+  }
+  if (p2 == NULL) {
     p2 = (char_u *)"";
-  if (!item_compare_numeric) {
-    if (item_compare_ic) {
+  }
+  if (!sortinfo->item_compare_numeric) {
+    if (sortinfo->item_compare_ic) {
       res = STRICMP(p1, p2);
     } else {
       res = STRCMP(p1, p2);
@@ -15130,32 +15883,43 @@ static int item_compare2(const void *s1, const void *s2, bool keep_zero)
   typval_T rettv;
   typval_T argv[3];
   int dummy;
+  char_u *func_name;
+  partial_T *partial = sortinfo->item_compare_partial;
 
-  /* shortcut after failure in previous call; compare all items equal */
-  if (item_compare_func_err)
+  // shortcut after failure in previous call; compare all items equal
+  if (sortinfo->item_compare_func_err) {
     return 0;
+  }
 
   si1 = (sortItem_T *)s1;
   si2 = (sortItem_T *)s2;
 
+  if (partial == NULL) {
+    func_name = sortinfo->item_compare_func;
+  } else {
+    func_name = partial->pt_name;
+  }
   // Copy the values.  This is needed to be able to set v_lock to VAR_FIXED
   // in the copy without changing the original list items.
   copy_tv(&si1->item->li_tv, &argv[0]);
   copy_tv(&si2->item->li_tv, &argv[1]);
 
-  rettv.v_type = VAR_UNKNOWN;           /* clear_tv() uses this */
-  res = call_func(item_compare_func, (int)STRLEN(item_compare_func),
-      &rettv, 2, argv, 0L, 0L, &dummy, TRUE,
-      item_compare_selfdict);
+  rettv.v_type = VAR_UNKNOWN;  // clear_tv() uses this
+  res = call_func(func_name,
+                  (int)STRLEN(func_name),
+                  &rettv, 2, argv, 0L, 0L, &dummy, true,
+                  partial, sortinfo->item_compare_selfdict);
   clear_tv(&argv[0]);
   clear_tv(&argv[1]);
 
-  if (res == FAIL)
+  if (res == FAIL) {
     res = ITEM_COMPARE_FAIL;
-  else
-    res = get_tv_number_chk(&rettv, &item_compare_func_err);
-  if (item_compare_func_err)
-    res = ITEM_COMPARE_FAIL;      /* return value has wrong type */
+  } else {
+    res = get_tv_number_chk(&rettv, &sortinfo->item_compare_func_err);
+  }
+  if (sortinfo->item_compare_func_err) {
+    res = ITEM_COMPARE_FAIL;  // return value has wrong type
+  }
   clear_tv(&rettv);
 
   // When the result would be zero, compare the pointers themselves.  Makes
@@ -15188,6 +15952,12 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
   long len;
   long i;
 
+  // Pointer to current info struct used in compare function. Save and restore
+  // the current one for nested calls.
+  sortinfo_T info;
+  sortinfo_T *old_sortinfo = sortinfo;
+  sortinfo = &info;
+
   if (argvars[0].v_type != VAR_LIST) {
     EMSG2(_(e_listarg), sort ? "sort()" : "uniq()");
   } else {
@@ -15198,61 +15968,73 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
                                     ? N_("sort() argument")
                                     : N_("uniq() argument")),
                          true)) {
-      return;
+        goto theend;
     }
     rettv->vval.v_list = l;
     rettv->v_type = VAR_LIST;
     ++l->lv_refcount;
 
     len = list_len(l);
-    if (len <= 1)
-      return;           /* short list sorts pretty quickly */
+    if (len <= 1) {
+      goto theend;  // short list sorts pretty quickly
+    }
 
-    item_compare_ic = FALSE;
-    item_compare_numeric = false;
-    item_compare_numbers = false;
-    item_compare_float = false;
-    item_compare_func = NULL;
-    item_compare_selfdict = NULL;
+    info.item_compare_ic = false;
+    info.item_compare_numeric = false;
+    info.item_compare_numbers = false;
+    info.item_compare_float = false;
+    info.item_compare_func = NULL;
+    info.item_compare_partial = NULL;
+    info.item_compare_selfdict = NULL;
 
     if (argvars[1].v_type != VAR_UNKNOWN) {
       /* optional second argument: {func} */
       if (argvars[1].v_type == VAR_FUNC) {
-        item_compare_func = argvars[1].vval.v_string;
+        info.item_compare_func = argvars[1].vval.v_string;
+      } else if (argvars[1].v_type == VAR_PARTIAL) {
+        info.item_compare_partial = argvars[1].vval.v_partial;
       } else {
         int error = FALSE;
 
         i = get_tv_number_chk(&argvars[1], &error);
-        if (error)
-          return;                       /* type error; errmsg already given */
-        if (i == 1)
-          item_compare_ic = TRUE;
-        else
-          item_compare_func = get_tv_string(&argvars[1]);
-        if (item_compare_func != NULL) {
-          if (STRCMP(item_compare_func, "n") == 0) {
-            item_compare_func = NULL;
-            item_compare_numeric = true;
-          } else if (STRCMP(item_compare_func, "N") == 0) {
-            item_compare_func = NULL;
-            item_compare_numbers = true;
-          } else if (STRCMP(item_compare_func, "f") == 0) {
-            item_compare_func = NULL;
-            item_compare_float = true;
-          } else if (STRCMP(item_compare_func, "i") == 0) {
-            item_compare_func = NULL;
-            item_compare_ic = TRUE;
+        if (error) {
+          goto theend;  // type error; errmsg already given
+        }
+        if (i == 1) {
+          info.item_compare_ic = true;
+        } else if (argvars[1].v_type != VAR_NUMBER) {
+          info.item_compare_func = get_tv_string(&argvars[1]);
+        } else if (i != 0) {
+          EMSG(_(e_invarg));
+          goto theend;
+        }
+        if (info.item_compare_func != NULL) {
+          if (*info.item_compare_func == NUL) {
+            // empty string means default sort
+            info.item_compare_func = NULL;
+          } else if (STRCMP(info.item_compare_func, "n") == 0) {
+            info.item_compare_func = NULL;
+            info.item_compare_numeric = true;
+          } else if (STRCMP(info.item_compare_func, "N") == 0) {
+            info.item_compare_func = NULL;
+            info.item_compare_numbers = true;
+          } else if (STRCMP(info.item_compare_func, "f") == 0) {
+            info.item_compare_func = NULL;
+            info.item_compare_float = true;
+          } else if (STRCMP(info.item_compare_func, "i") == 0) {
+            info.item_compare_func = NULL;
+            info.item_compare_ic = true;
           }
         }
       }
 
       if (argvars[2].v_type != VAR_UNKNOWN) {
-        /* optional third argument: {dict} */
+        // optional third argument: {dict}
         if (argvars[2].v_type != VAR_DICT) {
           EMSG(_(e_dictreq));
-          return;
+          goto theend;
         }
-        item_compare_selfdict = argvars[2].vval.v_dict;
+        info.item_compare_selfdict = argvars[2].vval.v_dict;
       }
     }
 
@@ -15268,19 +16050,22 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
         i++;
       }
 
-      item_compare_func_err = FALSE;
+      info.item_compare_func_err = false;
       // Test the compare function.
-      if (item_compare_func != NULL
+      if ((info.item_compare_func != NULL
+           || info.item_compare_partial != NULL)
           && item_compare2_not_keeping_zero(&ptrs[0], &ptrs[1])
              == ITEM_COMPARE_FAIL) {
         EMSG(_("E702: Sort compare function failed"));
       } else {
         // Sort the array with item pointers.
         qsort(ptrs, (size_t)len, sizeof (sortItem_T),
-              item_compare_func == NULL ? item_compare_not_keeping_zero :
-                                          item_compare2_not_keeping_zero);
+              (info.item_compare_func == NULL
+               && info.item_compare_partial == NULL ?
+               item_compare_not_keeping_zero :
+               item_compare2_not_keeping_zero));
 
-        if (!item_compare_func_err) {
+        if (!info.item_compare_func_err) {
           // Clear the list and append the items in the sorted order.
           l->lv_first    = NULL;
           l->lv_last     = NULL;
@@ -15296,21 +16081,25 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
       int (*item_compare_func_ptr)(const void *, const void *);
 
       // f_uniq(): ptrs will be a stack of items to remove.
-      item_compare_func_err = FALSE;
-      item_compare_func_ptr = item_compare_func ? item_compare2_keeping_zero :
-                                                  item_compare_keeping_zero;
+      info.item_compare_func_err = false;
+      if (info.item_compare_func != NULL
+          || info.item_compare_partial != NULL) {
+          item_compare_func_ptr = item_compare2_keeping_zero;
+      } else {
+          item_compare_func_ptr = item_compare_keeping_zero;
+      }
 
       for (li = l->lv_first; li != NULL && li->li_next != NULL; li = li->li_next) {
         if (item_compare_func_ptr(&li, &li->li_next) == 0) {
           ptrs[i++].item = li;
         }
-        if (item_compare_func_err) {
+        if (info.item_compare_func_err) {
           EMSG(_("E882: Uniq compare function failed"));
           break;
         }
       }
 
-      if (!item_compare_func_err) {
+      if (!info.item_compare_func_err) {
         while (--i >= 0) {
           assert(ptrs[i].item->li_next);
           li = ptrs[i].item->li_next;
@@ -15329,16 +16118,19 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
 
     xfree(ptrs);
   }
+
+theend:
+  sortinfo = old_sortinfo;
 }
 
 /// "sort"({list})" function
-static void f_sort(typval_T *argvars, typval_T *rettv)
+static void f_sort(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   do_sort_uniq(argvars, rettv, true);
 }
 
 /// "uniq({list})" function
-static void f_uniq(typval_T *argvars, typval_T *rettv)
+static void f_uniq(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   do_sort_uniq(argvars, rettv, false);
 }
@@ -15346,7 +16138,7 @@ static void f_uniq(typval_T *argvars, typval_T *rettv)
 //
 // "reltimefloat()" function
 //
-static void f_reltimefloat(typval_T *argvars , typval_T *rettv)
+static void f_reltimefloat(typval_T *argvars , typval_T *rettv, FunPtr fptr)
   FUNC_ATTR_NONNULL_ALL
 {
   proftime_T tm;
@@ -15361,7 +16153,7 @@ static void f_reltimefloat(typval_T *argvars , typval_T *rettv)
 /*
  * "soundfold({word})" function
  */
-static void f_soundfold(typval_T *argvars, typval_T *rettv)
+static void f_soundfold(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s;
 
@@ -15373,7 +16165,7 @@ static void f_soundfold(typval_T *argvars, typval_T *rettv)
 /*
  * "spellbadword()" function
  */
-static void f_spellbadword(typval_T *argvars, typval_T *rettv)
+static void f_spellbadword(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *word = (char_u *)"";
   hlf_T attr = HLF_COUNT;
@@ -15417,7 +16209,7 @@ static void f_spellbadword(typval_T *argvars, typval_T *rettv)
 /*
  * "spellsuggest()" function
  */
-static void f_spellsuggest(typval_T *argvars, typval_T *rettv)
+static void f_spellsuggest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *str;
   int typeerr = FALSE;
@@ -15457,7 +16249,7 @@ static void f_spellsuggest(typval_T *argvars, typval_T *rettv)
   }
 }
 
-static void f_split(typval_T *argvars, typval_T *rettv)
+static void f_split(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *str;
   char_u      *end;
@@ -15526,17 +16318,9 @@ static void f_split(typval_T *argvars, typval_T *rettv)
 }
 
 /*
- * "sqrt()" function
- */
-static void f_sqrt(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &sqrt);
-}
-
-/*
  * "str2float()" function
  */
-static void f_str2float(typval_T *argvars, typval_T *rettv)
+static void f_str2float(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *p = skipwhite(get_tv_string(&argvars[0]));
 
@@ -15547,7 +16331,7 @@ static void f_str2float(typval_T *argvars, typval_T *rettv)
 }
 
 // "str2nr()" function
-static void f_str2nr(typval_T *argvars, typval_T *rettv)
+static void f_str2nr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int base = 10;
   char_u      *p;
@@ -15586,7 +16370,7 @@ static void f_str2nr(typval_T *argvars, typval_T *rettv)
 /*
  * "strftime({format}[, {time}])" function
  */
-static void f_strftime(typval_T *argvars, typval_T *rettv)
+static void f_strftime(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u result_buf[256];
   time_t seconds;
@@ -15634,10 +16418,43 @@ static void f_strftime(typval_T *argvars, typval_T *rettv)
   }
 }
 
+// "strgetchar()" function
+static void f_strgetchar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  char_u *str;
+  int len;
+  int error = false;
+  int charidx;
+
+  rettv->vval.v_number = -1;
+  str = get_tv_string_chk(&argvars[0]);
+  if (str == NULL) {
+    return;
+  }
+  len = (int)STRLEN(str);
+  charidx = get_tv_number_chk(&argvars[1], &error);
+  if (error) {
+    return;
+  }
+
+  {
+    int byteidx = 0;
+
+    while (charidx >= 0 && byteidx < len) {
+      if (charidx == 0) {
+        rettv->vval.v_number = mb_ptr2char(str + byteidx);
+        break;
+      }
+      charidx--;
+      byteidx += mb_cptr2len(str + byteidx);
+    }
+  }
+}
+
 /*
  * "stridx()" function
  */
-static void f_stridx(typval_T *argvars, typval_T *rettv)
+static void f_stridx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
   char_u      *needle;
@@ -15670,7 +16487,7 @@ static void f_stridx(typval_T *argvars, typval_T *rettv)
 /*
  * "string()" function
  */
-static void f_string(typval_T *argvars, typval_T *rettv)
+static void f_string(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = (char_u *) encode_tv2string(&argvars[0], NULL);
@@ -15679,7 +16496,7 @@ static void f_string(typval_T *argvars, typval_T *rettv)
 /*
  * "strlen()" function
  */
-static void f_strlen(typval_T *argvars, typval_T *rettv)
+static void f_strlen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = (varnumber_T)(STRLEN(
                                            get_tv_string(&argvars[0])));
@@ -15688,7 +16505,7 @@ static void f_strlen(typval_T *argvars, typval_T *rettv)
 /*
  * "strchars()" function
  */
-static void f_strchars(typval_T *argvars, typval_T *rettv)
+static void f_strchars(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u              *s = get_tv_string(&argvars[0]);
   int skipcc = 0;
@@ -15713,7 +16530,7 @@ static void f_strchars(typval_T *argvars, typval_T *rettv)
 /*
  * "strdisplaywidth()" function
  */
-static void f_strdisplaywidth(typval_T *argvars, typval_T *rettv)
+static void f_strdisplaywidth(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s = get_tv_string(&argvars[0]);
   int col = 0;
@@ -15727,17 +16544,75 @@ static void f_strdisplaywidth(typval_T *argvars, typval_T *rettv)
 /*
  * "strwidth()" function
  */
-static void f_strwidth(typval_T *argvars, typval_T *rettv)
+static void f_strwidth(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *s = get_tv_string(&argvars[0]);
 
   rettv->vval.v_number = (varnumber_T) mb_string2cells(s);
 }
 
+// "strcharpart()" function
+static void f_strcharpart(typval_T *argvars, typval_T *rettv, FunPtr fptr) {
+  char_u *p;
+  int nchar;
+  int nbyte = 0;
+  int charlen;
+  int len = 0;
+  int slen;
+  int error = false;
+
+  p = get_tv_string(&argvars[0]);
+  slen = (int)STRLEN(p);
+
+  nchar = get_tv_number_chk(&argvars[1], &error);
+  if (!error) {
+    if (nchar > 0) {
+      while (nchar > 0 && nbyte < slen) {
+        nbyte += mb_cptr2len(p + nbyte);
+        nchar--;
+      }
+    } else {
+      nbyte = nchar;
+    }
+  }
+  if (argvars[2].v_type != VAR_UNKNOWN) {
+    charlen = get_tv_number(&argvars[2]);
+    while (charlen > 0 && nbyte + len < slen) {
+      int off = nbyte + len;
+
+      if (off < 0) {
+        len += 1;
+      } else {
+        len += mb_cptr2len(p + off);
+      }
+      charlen--;
+    }
+  } else {
+    len = slen - nbyte;    // default: all bytes that are available.
+  }
+
+  // Only return the overlap between the specified part and the actual
+  // string.
+  if (nbyte < 0) {
+    len += nbyte;
+    nbyte = 0;
+  } else if (nbyte > slen) {
+    nbyte = slen;
+  }
+  if (len < 0) {
+    len = 0;
+  } else if (nbyte + len > slen) {
+    len = slen - nbyte;
+  }
+
+  rettv->v_type = VAR_STRING;
+  rettv->vval.v_string = vim_strnsave(p + nbyte, len);
+}
+
 /*
  * "strpart()" function
  */
-static void f_strpart(typval_T *argvars, typval_T *rettv)
+static void f_strpart(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p;
   int n;
@@ -15777,7 +16652,7 @@ static void f_strpart(typval_T *argvars, typval_T *rettv)
 /*
  * "strridx()" function
  */
-static void f_strridx(typval_T *argvars, typval_T *rettv)
+static void f_strridx(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u buf[NUMBUFLEN];
   char_u      *needle;
@@ -15823,7 +16698,7 @@ static void f_strridx(typval_T *argvars, typval_T *rettv)
 /*
  * "strtrans()" function
  */
-static void f_strtrans(typval_T *argvars, typval_T *rettv)
+static void f_strtrans(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = transstr(get_tv_string(&argvars[0]));
@@ -15832,7 +16707,7 @@ static void f_strtrans(typval_T *argvars, typval_T *rettv)
 /*
  * "submatch()" function
  */
-static void f_submatch(typval_T *argvars, typval_T *rettv)
+static void f_submatch(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int error = FALSE;
   int no = (int)get_tv_number_chk(&argvars[0], &error);
@@ -15861,7 +16736,7 @@ static void f_submatch(typval_T *argvars, typval_T *rettv)
 /*
  * "substitute()" function
  */
-static void f_substitute(typval_T *argvars, typval_T *rettv)
+static void f_substitute(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u patbuf[NUMBUFLEN];
   char_u subbuf[NUMBUFLEN];
@@ -15882,7 +16757,7 @@ static void f_substitute(typval_T *argvars, typval_T *rettv)
 /*
  * "synID(lnum, col, trans)" function
  */
-static void f_synID(typval_T *argvars, typval_T *rettv)
+static void f_synID(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int id = 0;
   long lnum;
@@ -15904,7 +16779,7 @@ static void f_synID(typval_T *argvars, typval_T *rettv)
 /*
  * "synIDattr(id, what [, mode])" function
  */
-static void f_synIDattr(typval_T *argvars, typval_T *rettv)
+static void f_synIDattr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *p = NULL;
   int id;
@@ -15980,7 +16855,7 @@ static void f_synIDattr(typval_T *argvars, typval_T *rettv)
 /*
  * "synIDtrans(id)" function
  */
-static void f_synIDtrans(typval_T *argvars, typval_T *rettv)
+static void f_synIDtrans(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int id;
 
@@ -15997,7 +16872,7 @@ static void f_synIDtrans(typval_T *argvars, typval_T *rettv)
 /*
  * "synconcealed(lnum, col)" function
  */
-static void f_synconcealed(typval_T *argvars, typval_T *rettv)
+static void f_synconcealed(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long lnum;
   long col;
@@ -16044,7 +16919,7 @@ static void f_synconcealed(typval_T *argvars, typval_T *rettv)
 /*
  * "synstack(lnum, col)" function
  */
-static void f_synstack(typval_T *argvars, typval_T *rettv)
+static void f_synstack(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   long lnum;
   long col;
@@ -16118,8 +16993,12 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
   }
 
   // get shell command to execute
-  char **argv = tv_to_argv(&argvars[0], NULL);
+  bool executable = true;
+  char **argv = tv_to_argv(&argvars[0], NULL, &executable);
   if (!argv) {
+    if (!executable) {
+      set_vim_var_nr(VV_SHELL_ERROR, (long)-1);
+    }
     xfree(input);
     return;  // Already did emsg.
   }
@@ -16175,12 +17054,12 @@ static void get_system_output_as_rettv(typval_T *argvars, typval_T *rettv,
 }
 
 /// f_system - the VimL system() function
-static void f_system(typval_T *argvars, typval_T *rettv)
+static void f_system(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_system_output_as_rettv(argvars, rettv, false);
 }
 
-static void f_systemlist(typval_T *argvars, typval_T *rettv)
+static void f_systemlist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   get_system_output_as_rettv(argvars, rettv, true);
 }
@@ -16189,7 +17068,7 @@ static void f_systemlist(typval_T *argvars, typval_T *rettv)
 /*
  * "tabpagebuflist()" function
  */
-static void f_tabpagebuflist(typval_T *argvars, typval_T *rettv)
+static void f_tabpagebuflist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   tabpage_T   *tp;
   win_T       *wp = NULL;
@@ -16214,7 +17093,7 @@ static void f_tabpagebuflist(typval_T *argvars, typval_T *rettv)
 /*
  * "tabpagenr()" function
  */
-static void f_tabpagenr(typval_T *argvars, typval_T *rettv)
+static void f_tabpagenr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int nr = 1;
   char_u      *arg;
@@ -16278,7 +17157,7 @@ static int get_winnr(tabpage_T *tp, typval_T *argvar)
 /*
  * "tabpagewinnr()" function
  */
-static void f_tabpagewinnr(typval_T *argvars, typval_T *rettv)
+static void f_tabpagewinnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int nr = 1;
   tabpage_T   *tp;
@@ -16295,7 +17174,7 @@ static void f_tabpagewinnr(typval_T *argvars, typval_T *rettv)
 /*
  * "tagfiles()" function
  */
-static void f_tagfiles(typval_T *argvars, typval_T *rettv)
+static void f_tagfiles(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *fname;
   tagname_T tn;
@@ -16316,7 +17195,7 @@ static void f_tagfiles(typval_T *argvars, typval_T *rettv)
 /*
  * "taglist()" function
  */
-static void f_taglist(typval_T *argvars, typval_T *rettv)
+static void f_taglist(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u  *tag_pattern;
 
@@ -16332,14 +17211,14 @@ static void f_taglist(typval_T *argvars, typval_T *rettv)
 /*
  * "tempname()" function
  */
-static void f_tempname(typval_T *argvars, typval_T *rettv)
+static void f_tempname(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = vim_tempname();
 }
 
 // "termopen(cmd[, cwd])" function
-static void f_termopen(typval_T *argvars, typval_T *rettv)
+static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (check_restricted() || check_secure()) {
     return;
@@ -16351,8 +17230,10 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
   }
 
   char *cmd;
-  char **argv = tv_to_argv(&argvars[0], &cmd);
+  bool executable = true;
+  char **argv = tv_to_argv(&argvars[0], &cmd, &executable);
   if (!argv) {
+    rettv->vval.v_number = executable ? 0 : -1;
     return;  // Did error message in tv_to_argv.
   }
 
@@ -16363,10 +17244,24 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
     return;
   }
 
-  ufunc_T *on_stdout = NULL, *on_stderr = NULL, *on_exit = NULL;
+  Callback on_stdout = CALLBACK_NONE, on_stderr = CALLBACK_NONE,
+           on_exit = CALLBACK_NONE;
   dict_T *job_opts = NULL;
+  char *cwd = ".";
   if (argvars[1].v_type == VAR_DICT) {
     job_opts = argvars[1].vval.v_dict;
+
+    char *new_cwd = (char *)get_dict_string(job_opts, "cwd", false);
+    if (new_cwd && strlen(new_cwd) > 0) {
+      cwd = new_cwd;
+      // The new cwd must be a directory.
+      if (!os_isdir((char_u *)cwd)) {
+        EMSG2(_(e_invarg2), "expected valid directory");
+        shell_free_argv(argv);
+        return;
+      }
+    }
+
     if (!common_job_callbacks(job_opts, &on_stdout, &on_stderr, &on_exit)) {
       shell_free_argv(argv);
       return;
@@ -16374,7 +17269,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
   }
 
   TerminalJobData *data = common_job_init(argv, on_stdout, on_stderr, on_exit,
-                                          job_opts, true, false);
+                                          true, false, false, cwd);
   data->proc.pty.width = curwin->w_width;
   data->proc.pty.height = curwin->w_height;
   data->proc.pty.term_name = xstrdup("xterm-256color");
@@ -16389,11 +17284,6 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
   topts.resize_cb = term_resize;
   topts.close_cb = term_close;
 
-  char *cwd = ".";
-  if (argvars[1].v_type == VAR_STRING
-      && os_isdir(argvars[1].vval.v_string)) {
-    cwd = (char *)argvars[1].vval.v_string;
-  }
   int pid = data->proc.pty.process.pid;
 
   char buf[1024];
@@ -16406,9 +17296,9 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
   // Save the job id and pid in b:terminal_job_{id,pid}
   Error err;
   dict_set_value(curbuf->b_vars, cstr_as_string("terminal_job_id"),
-                 INTEGER_OBJ(rettv->vval.v_number), false, &err);
+                 INTEGER_OBJ(rettv->vval.v_number), false, false, &err);
   dict_set_value(curbuf->b_vars, cstr_as_string("terminal_job_pid"),
-                 INTEGER_OBJ(pid), false, &err);
+                 INTEGER_OBJ(pid), false, false, &err);
 
   Terminal *term = terminal_open(topts);
   data->term = term;
@@ -16417,34 +17307,264 @@ static void f_termopen(typval_T *argvars, typval_T *rettv)
   return;
 }
 
-/*
- * "test(list)" function: Just checking the walls...
- */
-static void f_test(typval_T *argvars, typval_T *rettv)
+static bool callback_from_typval(Callback *callback, typval_T *arg)
 {
-  /* Used for unit testing.  Change the code below to your liking. */
+  if (arg->v_type == VAR_PARTIAL && arg->vval.v_partial != NULL) {
+    callback->data.partial = arg->vval.v_partial;
+    callback->data.partial->pt_refcount++;
+    callback->type = kCallbackPartial;
+  } else if (arg->v_type == VAR_FUNC || arg->v_type == VAR_STRING) {
+    char_u *name = arg->vval.v_string;
+    func_ref(name);
+    callback->data.funcref = vim_strsave(name);
+    callback->type = kCallbackFuncref;
+  } else if (arg->v_type == VAR_NUMBER && arg->vval.v_number == 0) {
+    callback->type = kCallbackNone;
+  } else {
+    EMSG(_("E921: Invalid callback argument"));
+    return false;
+  }
+  return true;
 }
 
-/*
- * "tan()" function
- */
-static void f_tan(typval_T *argvars, typval_T *rettv)
+
+/// Unref/free callback
+static void callback_free(Callback *callback)
 {
-  float_op_wrapper(argvars, rettv, &tan);
+  switch (callback->type) {
+    case kCallbackFuncref:
+      func_unref(callback->data.funcref);
+      xfree(callback->data.funcref);
+      break;
+
+    case kCallbackPartial:
+      partial_unref(callback->data.partial);
+      break;
+
+    case kCallbackNone:
+      break;
+
+    default:
+      abort();
+  }
+  callback->type = kCallbackNone;
 }
 
-/*
- * "tanh()" function
- */
-static void f_tanh(typval_T *argvars, typval_T *rettv)
+static bool callback_equal(Callback *cb1, Callback *cb2)
+{
+  if (cb1->type != cb2->type) {
+    return false;
+  }
+  switch (cb1->type) {
+    case kCallbackFuncref:
+      return STRCMP(cb1->data.funcref, cb2->data.funcref) == 0;
+
+    case kCallbackPartial:
+      // FIXME: this is inconsistent with tv_equal but is needed for precision
+      // maybe change dictwatcheradd to return a watcher id instead?
+      return cb1->data.partial == cb2->data.partial;
+
+    case kCallbackNone:
+      return true;
+
+    default:
+      abort();
+  }
+}
+
+static bool callback_call(Callback *callback, int argcount_in,
+                          typval_T *argvars_in, typval_T *rettv)
+{
+  partial_T *partial;
+  char_u *name;
+  switch (callback->type) {
+    case kCallbackFuncref:
+      name = callback->data.funcref;
+      partial = NULL;
+      break;
+
+    case kCallbackPartial:
+      partial = callback->data.partial;
+      name = partial->pt_name;
+      break;
+
+    case kCallbackNone:
+      return false;
+      break;
+
+    default:
+      abort();
+  }
+
+  int dummy;
+  return call_func(name, (int)STRLEN(name), rettv, argcount_in, argvars_in,
+                   curwin->w_cursor.lnum, curwin->w_cursor.lnum, &dummy,
+                   true, partial, NULL);
+}
+
+static bool set_ref_in_callback(Callback *callback, int copyID,
+                                ht_stack_T **ht_stack,
+                                list_stack_T **list_stack)
+{
+  typval_T tv;
+  switch (callback->type) {
+    case kCallbackFuncref:
+    case kCallbackNone:
+      break;
+
+    case kCallbackPartial:
+      tv.v_type = VAR_PARTIAL;
+      tv.vval.v_partial = callback->data.partial;
+      return set_ref_in_item(&tv, copyID, ht_stack, list_stack);
+      break;
+
+
+    default:
+      abort();
+  }
+  return false;
+}
+
+
+/// "timer_start(timeout, callback, opts)" function
+static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  float_op_wrapper(argvars, rettv, &tanh);
+  long timeout = get_tv_number(&argvars[0]);
+  timer_T *timer;
+  int repeat = 1;
+  dict_T *dict;
+
+  rettv->vval.v_number = -1;
+
+  if (argvars[2].v_type != VAR_UNKNOWN) {
+    if (argvars[2].v_type != VAR_DICT
+        || (dict = argvars[2].vval.v_dict) == NULL) {
+      EMSG2(_(e_invarg2), get_tv_string(&argvars[2]));
+      return;
+    }
+    if (dict_find(dict, (char_u *)"repeat", -1) != NULL) {
+      repeat = get_dict_number(dict, "repeat");
+      if (repeat == 0) {
+        repeat = 1;
+      }
+    }
+  }
+
+  Callback callback;
+  if (!callback_from_typval(&callback, &argvars[1])) {
+    return;
+  }
+
+  timer = xmalloc(sizeof *timer);
+  timer->refcount = 1;
+  timer->stopped = false;
+  timer->repeat_count = repeat;
+  timer->timeout = timeout;
+  timer->timer_id = last_timer_id++;
+  timer->callback = callback;
+
+  time_watcher_init(&main_loop, &timer->tw, timer);
+  timer->tw.events = multiqueue_new_child(main_loop.events);
+  // if main loop is blocked, don't queue up multiple events
+  timer->tw.blockable = true;
+  time_watcher_start(&timer->tw, timer_due_cb, timeout,
+                     timeout * (repeat != 1));
+
+  pmap_put(uint64_t)(timers, timer->timer_id, timer);
+  rettv->vval.v_number = timer->timer_id;
+}
+
+
+// "timer_stop(timerid)" function
+static void f_timer_stop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+    if (argvars[0].v_type != VAR_NUMBER) {
+        EMSG(_(e_number_exp));
+        return;
+    }
+
+    timer_T *timer = pmap_get(uint64_t)(timers, get_tv_number(&argvars[0]));
+
+    if (timer == NULL) {
+      return;
+    }
+
+    timer_stop(timer);
+}
+
+// invoked on the main loop
+static void timer_due_cb(TimeWatcher *tw, void *data)
+{
+  timer_T *timer = (timer_T *)data;
+  if (timer->stopped) {
+    return;
+  }
+  timer->refcount++;
+  // if repeat was negative repeat forever
+  if (timer->repeat_count >= 0 && --timer->repeat_count == 0) {
+    timer_stop(timer);
+  }
+
+  typval_T argv[2];
+  init_tv(argv);
+  argv[0].v_type = VAR_NUMBER;
+  argv[0].vval.v_number = timer->timer_id;
+  typval_T rettv;
+
+  init_tv(&rettv);
+  callback_call(&timer->callback, 1, argv, &rettv);
+  clear_tv(&rettv);
+
+  if (!timer->stopped && timer->timeout == 0) {
+    // special case: timeout=0 means the callback will be
+    // invoked again on the next event loop tick.
+    // we don't use uv_idle_t to not spin the event loop
+    // when the main loop is blocked.
+    time_watcher_start(&timer->tw, timer_due_cb, 0, 0);
+  }
+  timer_decref(timer);
+}
+
+static void timer_stop(timer_T *timer)
+{
+  if (timer->stopped) {
+    // avoid double free
+    return;
+  }
+  timer->stopped = true;
+  time_watcher_stop(&timer->tw);
+  time_watcher_close(&timer->tw, timer_close_cb);
+}
+
+// invoked on next event loop tick, so queue is empty
+static void timer_close_cb(TimeWatcher *tw, void *data)
+{
+  timer_T *timer = (timer_T *)data;
+  multiqueue_free(timer->tw.events);
+  callback_free(&timer->callback);
+  pmap_del(uint64_t)(timers, timer->timer_id);
+  timer_decref(timer);
+}
+
+static void timer_decref(timer_T *timer)
+{
+  if (--timer->refcount == 0) {
+    xfree(timer);
+  }
+}
+
+void timer_teardown(void)
+{
+  timer_T *timer;
+  map_foreach_value(timers, timer, {
+    timer_stop(timer);
+  })
 }
 
 /*
  * "tolower(string)" function
  */
-static void f_tolower(typval_T *argvars, typval_T *rettv)
+static void f_tolower(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *p = vim_strsave(get_tv_string(&argvars[0]));
   rettv->v_type = VAR_STRING;
@@ -16475,7 +17595,7 @@ static void f_tolower(typval_T *argvars, typval_T *rettv)
 /*
  * "toupper(string)" function
  */
-static void f_toupper(typval_T *argvars, typval_T *rettv)
+static void f_toupper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = strup_save(get_tv_string(&argvars[0]));
@@ -16484,7 +17604,7 @@ static void f_toupper(typval_T *argvars, typval_T *rettv)
 /*
  * "tr(string, fromstr, tostr)" function
  */
-static void f_tr(typval_T *argvars, typval_T *rettv)
+static void f_tr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *in_str;
   char_u      *fromstr;
@@ -16582,32 +17702,25 @@ error:
 }
 
 /*
- * "trunc({float})" function
- */
-static void f_trunc(typval_T *argvars, typval_T *rettv)
-{
-  float_op_wrapper(argvars, rettv, &trunc);
-}
-
-/*
  * "type(expr)" function
  */
-static void f_type(typval_T *argvars, typval_T *rettv)
+static void f_type(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int n = -1;
 
   switch (argvars[0].v_type) {
-    case VAR_NUMBER: n = 0; break;
-    case VAR_STRING: n = 1; break;
-    case VAR_FUNC:   n = 2; break;
-    case VAR_LIST:   n = 3; break;
-    case VAR_DICT:   n = 4; break;
-    case VAR_FLOAT:  n = 5; break;
+    case VAR_NUMBER: n = VAR_TYPE_NUMBER; break;
+    case VAR_STRING: n = VAR_TYPE_STRING; break;
+    case VAR_PARTIAL:
+    case VAR_FUNC:   n = VAR_TYPE_FUNC; break;
+    case VAR_LIST:   n = VAR_TYPE_LIST; break;
+    case VAR_DICT:   n = VAR_TYPE_DICT; break;
+    case VAR_FLOAT:  n = VAR_TYPE_FLOAT; break;
     case VAR_SPECIAL: {
       switch (argvars[0].vval.v_special) {
         case kSpecialVarTrue:
         case kSpecialVarFalse: {
-          n = 6;
+          n = VAR_TYPE_BOOL;
           break;
         }
         case kSpecialVarNull: {
@@ -16628,7 +17741,7 @@ static void f_type(typval_T *argvars, typval_T *rettv)
 /*
  * "undofile(name)" function
  */
-static void f_undofile(typval_T *argvars, typval_T *rettv)
+static void f_undofile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->v_type = VAR_STRING;
   {
@@ -16651,7 +17764,7 @@ static void f_undofile(typval_T *argvars, typval_T *rettv)
 /*
  * "undotree()" function
  */
-static void f_undotree(typval_T *argvars, typval_T *rettv)
+static void f_undotree(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv_dict_alloc(rettv);
 
@@ -16674,7 +17787,7 @@ static void f_undotree(typval_T *argvars, typval_T *rettv)
 /*
  * "values(dict)" function
  */
-static void f_values(typval_T *argvars, typval_T *rettv)
+static void f_values(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_list(argvars, rettv, 1);
 }
@@ -16682,7 +17795,7 @@ static void f_values(typval_T *argvars, typval_T *rettv)
 /*
  * "virtcol(string)" function
  */
-static void f_virtcol(typval_T *argvars, typval_T *rettv)
+static void f_virtcol(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   colnr_T vcol = 0;
   pos_T       *fp;
@@ -16701,7 +17814,7 @@ static void f_virtcol(typval_T *argvars, typval_T *rettv)
 /*
  * "visualmode()" function
  */
-static void f_visualmode(typval_T *argvars, typval_T *rettv)
+static void f_visualmode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u str[2];
 
@@ -16718,16 +17831,48 @@ static void f_visualmode(typval_T *argvars, typval_T *rettv)
 /*
  * "wildmenumode()" function
  */
-static void f_wildmenumode(typval_T *argvars, typval_T *rettv)
+static void f_wildmenumode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   if (wild_menu_showing)
     rettv->vval.v_number = 1;
 }
 
+/// "win_findbuf()" function
+static void f_win_findbuf(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv_list_alloc(rettv);
+  win_findbuf(argvars, rettv->vval.v_list);
+}
+
+/// "win_getid()" function
+static void f_win_getid(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv->vval.v_number = win_getid(argvars);
+}
+
+/// "win_gotoid()" function
+static void f_win_gotoid(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv->vval.v_number = win_gotoid(argvars);
+}
+
+/// "win_id2tabwin()" function
+static void f_win_id2tabwin(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv_list_alloc(rettv);
+  win_id2tabwin(argvars, rettv->vval.v_list);
+}
+
+/// "win_id2win()" function
+static void f_win_id2win(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv->vval.v_number = win_id2win(argvars);
+}
+
 /*
  * "winbufnr(nr)" function
  */
-static void f_winbufnr(typval_T *argvars, typval_T *rettv)
+static void f_winbufnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   win_T       *wp;
 
@@ -16741,7 +17886,7 @@ static void f_winbufnr(typval_T *argvars, typval_T *rettv)
 /*
  * "wincol()" function
  */
-static void f_wincol(typval_T *argvars, typval_T *rettv)
+static void f_wincol(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   validate_cursor();
   rettv->vval.v_number = curwin->w_wcol + 1;
@@ -16750,7 +17895,7 @@ static void f_wincol(typval_T *argvars, typval_T *rettv)
 /*
  * "winheight(nr)" function
  */
-static void f_winheight(typval_T *argvars, typval_T *rettv)
+static void f_winheight(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   win_T       *wp;
 
@@ -16764,7 +17909,7 @@ static void f_winheight(typval_T *argvars, typval_T *rettv)
 /*
  * "winline()" function
  */
-static void f_winline(typval_T *argvars, typval_T *rettv)
+static void f_winline(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   validate_cursor();
   rettv->vval.v_number = curwin->w_wrow + 1;
@@ -16773,7 +17918,7 @@ static void f_winline(typval_T *argvars, typval_T *rettv)
 /*
  * "winnr()" function
  */
-static void f_winnr(typval_T *argvars, typval_T *rettv)
+static void f_winnr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int nr = 1;
 
@@ -16784,7 +17929,7 @@ static void f_winnr(typval_T *argvars, typval_T *rettv)
 /*
  * "winrestcmd()" function
  */
-static void f_winrestcmd(typval_T *argvars, typval_T *rettv)
+static void f_winrestcmd(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   int winnr = 1;
   garray_T ga;
@@ -16807,7 +17952,7 @@ static void f_winrestcmd(typval_T *argvars, typval_T *rettv)
 /*
  * "winrestview()" function
  */
-static void f_winrestview(typval_T *argvars, typval_T *rettv)
+static void f_winrestview(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_T      *dict;
 
@@ -16816,29 +17961,29 @@ static void f_winrestview(typval_T *argvars, typval_T *rettv)
     EMSG(_(e_invarg));
   else {
     if (dict_find(dict, (char_u *)"lnum", -1) != NULL) {
-      curwin->w_cursor.lnum = get_dict_number(dict, (char_u *)"lnum");
+      curwin->w_cursor.lnum = get_dict_number(dict, "lnum");
     }
     if (dict_find(dict, (char_u *)"col", -1) != NULL) {
-      curwin->w_cursor.col = get_dict_number(dict, (char_u *)"col");
+      curwin->w_cursor.col = get_dict_number(dict, "col");
     }
     if (dict_find(dict, (char_u *)"coladd", -1) != NULL) {
-      curwin->w_cursor.coladd = get_dict_number(dict, (char_u *)"coladd");
+      curwin->w_cursor.coladd = get_dict_number(dict, "coladd");
     }
     if (dict_find(dict, (char_u *)"curswant", -1) != NULL) {
-      curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
-      curwin->w_set_curswant = FALSE;
+      curwin->w_curswant = get_dict_number(dict, "curswant");
+      curwin->w_set_curswant = false;
     }
     if (dict_find(dict, (char_u *)"topline", -1) != NULL) {
-      set_topline(curwin, get_dict_number(dict, (char_u *)"topline"));
+      set_topline(curwin, get_dict_number(dict, "topline"));
     }
     if (dict_find(dict, (char_u *)"topfill", -1) != NULL) {
-      curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
+      curwin->w_topfill = get_dict_number(dict, "topfill");
     }
     if (dict_find(dict, (char_u *)"leftcol", -1) != NULL) {
-      curwin->w_leftcol = get_dict_number(dict, (char_u *)"leftcol");
+      curwin->w_leftcol = get_dict_number(dict, "leftcol");
     }
     if (dict_find(dict, (char_u *)"skipcol", -1) != NULL) {
-      curwin->w_skipcol = get_dict_number(dict, (char_u *)"skipcol");
+      curwin->w_skipcol = get_dict_number(dict, "skipcol");
     }
 
     check_cursor();
@@ -16857,7 +18002,7 @@ static void f_winrestview(typval_T *argvars, typval_T *rettv)
 /*
  * "winsaveview()" function
  */
-static void f_winsaveview(typval_T *argvars, typval_T *rettv)
+static void f_winsaveview(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   dict_T      *dict;
 
@@ -16961,7 +18106,7 @@ static char_u *save_tv_as_string(typval_T *tv, ssize_t *len, bool endnl)
 /*
  * "winwidth(nr)" function
  */
-static void f_winwidth(typval_T *argvars, typval_T *rettv)
+static void f_winwidth(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   win_T       *wp;
 
@@ -16973,14 +18118,14 @@ static void f_winwidth(typval_T *argvars, typval_T *rettv)
 }
 
 /// "wordcount()" function
-static void f_wordcount(typval_T *argvars, typval_T *rettv)
+static void f_wordcount(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv_dict_alloc(rettv);
   cursor_pos_info(rettv->vval.v_dict);
 }
 
 /// "writefile()" function
-static void f_writefile(typval_T *argvars, typval_T *rettv)
+static void f_writefile(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = 0;  // Assuming success.
 
@@ -17025,7 +18170,7 @@ static void f_writefile(typval_T *argvars, typval_T *rettv)
 /*
  * "xor(expr, expr)" function
  */
-static void f_xor(typval_T *argvars, typval_T *rettv)
+static void f_xor(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   rettv->vval.v_number = get_tv_number_chk(&argvars[0], NULL)
                          ^ get_tv_number_chk(&argvars[1], NULL);
@@ -17519,6 +18664,8 @@ void set_vcount(long count, long count1, int set_prevcount)
 /// @param[in]  val  Value to set to.
 void set_vim_var_nr(const VimVarIndex idx, const varnumber_T val)
 {
+  clear_tv(&vimvars[idx].vv_tv);
+  vimvars[idx].vv_type = VAR_NUMBER;
   vimvars[idx].vv_nr = val;
 }
 
@@ -17528,6 +18675,8 @@ void set_vim_var_nr(const VimVarIndex idx, const varnumber_T val)
 /// @param[in]  val  Value to set to.
 void set_vim_var_special(const VimVarIndex idx, const SpecialVarValue val)
 {
+  clear_tv(&vimvars[idx].vv_tv);
+  vimvars[idx].vv_type = VAR_SPECIAL;
   vimvars[idx].vv_special = val;
 }
 
@@ -17540,7 +18689,8 @@ void set_vim_var_special(const VimVarIndex idx, const SpecialVarValue val)
 void set_vim_var_string(const VimVarIndex idx, const char *const val,
                         const ptrdiff_t len)
 {
-  xfree(vimvars[idx].vv_str);
+  clear_tv(&vimvars[idx].vv_di.di_tv);
+  vimvars[idx].vv_type = VAR_STRING;
   if (val == NULL) {
     vimvars[idx].vv_str = NULL;
   } else if (len == -1) {
@@ -17556,7 +18706,8 @@ void set_vim_var_string(const VimVarIndex idx, const char *const val,
 /// @param[in,out]  val  Value to set to. Reference count will be incremented.
 void set_vim_var_list(const VimVarIndex idx, list_T *const val)
 {
-  list_unref(vimvars[idx].vv_list);
+  clear_tv(&vimvars[idx].vv_di.di_tv);
+  vimvars[idx].vv_type = VAR_LIST;
   vimvars[idx].vv_list = val;
   if (val != NULL) {
     val->lv_refcount++;
@@ -17570,7 +18721,8 @@ void set_vim_var_list(const VimVarIndex idx, list_T *const val)
 ///                      Also keys of the dictionary will be made read-only.
 void set_vim_var_dict(const VimVarIndex idx, dict_T *const val)
 {
-  dict_unref(vimvars[idx].vv_dict);
+  clear_tv(&vimvars[idx].vv_di.di_tv);
+  vimvars[idx].vv_type = VAR_DICT;
   vimvars[idx].vv_dict = val;
 
   if (val != NULL) {
@@ -17769,21 +18921,29 @@ handle_subscript (
   while (ret == OK
          && (**arg == '['
              || (**arg == '.' && rettv->v_type == VAR_DICT)
-             || (**arg == '(' && (!evaluate || rettv->v_type == VAR_FUNC)))
+             || (**arg == '(' && (!evaluate || rettv->v_type == VAR_FUNC
+                                  || rettv->v_type == VAR_PARTIAL)))
          && !ascii_iswhite(*(*arg - 1))) {
     if (**arg == '(') {
-      /* need to copy the funcref so that we can clear rettv */
+      partial_T *pt = NULL;
+      // need to copy the funcref so that we can clear rettv
       if (evaluate) {
         functv = *rettv;
         rettv->v_type = VAR_UNKNOWN;
 
-        /* Invoke the function.  Recursive! */
-        s = functv.vval.v_string;
-      } else
+        // Invoke the function.  Recursive!
+        if (functv.v_type == VAR_PARTIAL) {
+          pt = functv.vval.v_partial;
+          s = pt->pt_name;
+        } else {
+          s = functv.vval.v_string;
+        }
+      } else {
         s = (char_u *)"";
+      }
       ret = get_func_tv(s, (int)STRLEN(s), rettv, arg,
-          curwin->w_cursor.lnum, curwin->w_cursor.lnum,
-          &len, evaluate, selfdict);
+                        curwin->w_cursor.lnum, curwin->w_cursor.lnum,
+                        &len, evaluate, pt, selfdict);
 
       /* Clear the funcref afterwards, so that deleting it while
        * evaluating the arguments is possible (see test55). */
@@ -17814,10 +18974,82 @@ handle_subscript (
       }
     }
   }
+
+  // Turn "dict.Func" into a partial for "Func" bound to "dict".
+  if (selfdict != NULL
+      && (rettv->v_type == VAR_FUNC
+          || rettv->v_type == VAR_PARTIAL)) {
+    set_selfdict(rettv, selfdict);
+  }
+
   dict_unref(selfdict);
   return ret;
 }
 
+static void set_selfdict(typval_T *rettv, dict_T *selfdict)
+{
+  // Don't do this when "dict.Func" is already a partial that was bound
+  // explicitly (pt_auto is false).
+  if (rettv->v_type == VAR_PARTIAL && !rettv->vval.v_partial->pt_auto
+      && rettv->vval.v_partial->pt_dict != NULL) {
+    return;
+  }
+  char_u *fname = rettv->v_type == VAR_FUNC || rettv->v_type == VAR_STRING
+                  ? rettv->vval.v_string
+                  : rettv->vval.v_partial->pt_name;
+  char_u *tofree = NULL;
+  ufunc_T *fp;
+  char_u fname_buf[FLEN_FIXED + 1];
+  int error;
+
+  // Translate "s:func" to the stored function name.
+  fname = fname_trans_sid(fname, fname_buf, &tofree, &error);
+
+  fp = find_func(fname);
+  xfree(tofree);
+
+  // Turn "dict.Func" into a partial for "Func" with "dict".
+  if (fp != NULL && (fp->uf_flags & FC_DICT)) {
+    partial_T *pt = (partial_T *)xcalloc(1, sizeof(partial_T));
+
+    if (pt != NULL) {
+      pt->pt_refcount = 1;
+      pt->pt_dict = selfdict;
+      (selfdict->dv_refcount)++;
+      pt->pt_auto = true;
+      if (rettv->v_type == VAR_FUNC || rettv->v_type == VAR_STRING) {
+        // Just a function: Take over the function name and use selfdict.
+        pt->pt_name = rettv->vval.v_string;
+      } else {
+        partial_T *ret_pt = rettv->vval.v_partial;
+        int i;
+
+        // Partial: copy the function name, use selfdict and copy
+        // args. Can't take over name or args, the partial might
+        // be referenced elsewhere.
+        pt->pt_name = vim_strsave(ret_pt->pt_name);
+        func_ref(pt->pt_name);
+        if (ret_pt->pt_argc > 0) {
+          size_t arg_size = sizeof(typval_T) * ret_pt->pt_argc;
+          pt->pt_argv = (typval_T *)xmalloc(arg_size);
+          if (pt->pt_argv == NULL) {
+            // out of memory: drop the arguments
+            pt->pt_argc = 0;
+          } else {
+            pt->pt_argc = ret_pt->pt_argc;
+            for (i = 0; i < pt->pt_argc; i++) {
+              copy_tv(&ret_pt->pt_argv[i], &pt->pt_argv[i]);
+            }
+          }
+        }
+        partial_unref(ret_pt);
+      }
+      rettv->v_type = VAR_PARTIAL;
+      rettv->vval.v_partial = pt;
+    }
+  }
+}
+
 /*
  * Free the memory for a variable type-value.
  */
@@ -17831,6 +19063,9 @@ void free_tv(typval_T *varp)
       case VAR_STRING:
         xfree(varp->vval.v_string);
         break;
+      case VAR_PARTIAL:
+        partial_unref(varp->vval.v_partial);
+        break;
       case VAR_LIST:
         list_unref(varp->vval.v_list);
         break;
@@ -17847,45 +19082,244 @@ void free_tv(typval_T *varp)
   }
 }
 
-/*
- * Free the memory for a variable value and set the value to NULL or 0.
- */
-void clear_tv(typval_T *varp)
+#define TYPVAL_ENCODE_ALLOW_SPECIALS false
+
+#define TYPVAL_ENCODE_CONV_NIL(tv) \
+    do { \
+      tv->vval.v_special = kSpecialVarFalse; \
+      tv->v_lock = VAR_UNLOCKED; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
+    TYPVAL_ENCODE_CONV_NIL(tv)
+
+#define TYPVAL_ENCODE_CONV_NUMBER(tv, num) \
+    do { \
+      (void)num; \
+      tv->vval.v_number = 0; \
+      tv->v_lock = VAR_UNLOCKED; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER(tv, num)
+
+#define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
+    do { \
+      tv->vval.v_float = 0; \
+      tv->v_lock = VAR_UNLOCKED; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_STRING(tv, buf, len) \
+    do { \
+      xfree(buf); \
+      tv->vval.v_string = NULL; \
+      tv->v_lock = VAR_UNLOCKED; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_STR_STRING(tv, buf, len)
+
+#define TYPVAL_ENCODE_CONV_EXT_STRING(tv, buf, len, type)
+
+static inline int _nothing_conv_func_start(typval_T *const tv,
+                                           char_u *const fun)
+  FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ARG(1)
 {
-  if (varp != NULL) {
-    switch (varp->v_type) {
-    case VAR_FUNC:
-      func_unref(varp->vval.v_string);
-      if (varp->vval.v_string != empty_string) {
-        xfree(varp->vval.v_string);
-      }
-      varp->vval.v_string = NULL;
-      break;
-    case VAR_STRING:
-      xfree(varp->vval.v_string);
-      varp->vval.v_string = NULL;
-      break;
-    case VAR_LIST:
-      list_unref(varp->vval.v_list);
-      varp->vval.v_list = NULL;
-      break;
-    case VAR_DICT:
-      dict_unref(varp->vval.v_dict);
-      varp->vval.v_dict = NULL;
-      break;
-    case VAR_NUMBER:
-      varp->vval.v_number = 0;
-      break;
-    case VAR_FLOAT:
-      varp->vval.v_float = 0.0;
-      break;
-    case VAR_SPECIAL:
-      varp->vval.v_special = kSpecialVarFalse;
-      break;
-    case VAR_UNKNOWN:
-      break;
+  tv->v_lock = VAR_UNLOCKED;
+  if (tv->v_type == VAR_PARTIAL) {
+    partial_T *const pt_ = tv->vval.v_partial;
+    if (pt_ != NULL && pt_->pt_refcount > 1) {
+      pt_->pt_refcount--;
+      tv->vval.v_partial = NULL;
+      return OK;
+    }
+  } else {
+    func_unref(fun);
+    if (fun != empty_string) {
+      xfree(fun);
     }
-    varp->v_lock = 0;
+    tv->vval.v_string = NULL;
+  }
+  return NOTDONE;
+}
+#define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \
+    do { \
+      if (_nothing_conv_func_start(tv, fun) != NOTDONE) { \
+        return OK; \
+      } \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv, len)
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, len)
+
+static inline void _nothing_conv_func_end(typval_T *const tv, const int copyID)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_NONNULL_ALL
+{
+  if (tv->v_type == VAR_PARTIAL) {
+    partial_T *const pt = tv->vval.v_partial;
+    if (pt == NULL) {
+      return;
+    }
+    // Dictionary should already be freed by the time.
+    // If it was not freed then it is a part of the reference cycle.
+    assert(pt->pt_dict == NULL || pt->pt_dict->dv_copyID == copyID);
+    pt->pt_dict = NULL;
+    // As well as all arguments.
+    pt->pt_argc = 0;
+    assert(pt->pt_refcount <= 1);
+    partial_unref(pt);
+    tv->vval.v_partial = NULL;
+    assert(tv->v_lock == VAR_UNLOCKED);
+  }
+}
+#define TYPVAL_ENCODE_CONV_FUNC_END(tv) _nothing_conv_func_end(tv, copyID)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \
+    do { \
+      list_unref(tv->vval.v_list); \
+      tv->vval.v_list = NULL; \
+      tv->v_lock = VAR_UNLOCKED; \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
+    do { \
+      assert((void *)&dict != (void *)&TYPVAL_ENCODE_NODICT_VAR); \
+      dict_unref((dict_T *)dict); \
+      *((dict_T **)&dict) = NULL; \
+      if (tv != NULL) { \
+        ((typval_T *)tv)->v_lock = VAR_UNLOCKED; \
+      } \
+    } while (0)
+
+static inline int _nothing_conv_real_list_after_start(
+    typval_T *const tv, MPConvStackVal *const mpsv)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  assert(tv != NULL);
+  tv->v_lock = VAR_UNLOCKED;
+  if (tv->vval.v_list->lv_refcount > 1) {
+    tv->vval.v_list->lv_refcount--;
+    tv->vval.v_list = NULL;
+    mpsv->data.l.li = NULL;
+    return OK;
+  }
+  return NOTDONE;
+}
+#define TYPVAL_ENCODE_CONV_LIST_START(tv, len)
+
+#define TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START(tv, mpsv) \
+    do { \
+      if (_nothing_conv_real_list_after_start(tv, &mpsv) != NOTDONE) { \
+        goto typval_encode_stop_converting_one_item; \
+      } \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(tv)
+
+static inline void _nothing_conv_list_end(typval_T *const tv)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  if (tv == NULL) {
+    return;
+  }
+  assert(tv->v_type == VAR_LIST);
+  list_T *const list = tv->vval.v_list;
+  list_unref(list);
+  tv->vval.v_list = NULL;
+}
+#define TYPVAL_ENCODE_CONV_LIST_END(tv) _nothing_conv_list_end(tv)
+
+static inline int _nothing_conv_real_dict_after_start(
+    typval_T *const tv, dict_T **const dictp, const void *const nodictvar,
+    MPConvStackVal *const mpsv)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  if (tv != NULL) {
+    tv->v_lock = VAR_UNLOCKED;
+  }
+  if ((const void *)dictp != nodictvar && (*dictp)->dv_refcount > 1) {
+    (*dictp)->dv_refcount--;
+    *dictp = NULL;
+    mpsv->data.d.todo = 0;
+    return OK;
+  }
+  return NOTDONE;
+}
+#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len)
+
+#define TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, dict, mpsv) \
+    do { \
+      if (_nothing_conv_real_dict_after_start( \
+          tv, (dict_T **)&dict, (void *)&TYPVAL_ENCODE_NODICT_VAR, \
+          &mpsv) != NOTDONE) { \
+        goto typval_encode_stop_converting_one_item; \
+      } \
+    } while (0)
+
+#define TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(tv, dict)
+#define TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(tv, dict)
+#define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(tv, dict)
+
+static inline void _nothing_conv_dict_end(typval_T *const tv,
+                                          dict_T **const dictp,
+                                          const void *const nodictvar)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  if ((const void *)dictp != nodictvar) {
+    dict_unref(*dictp);
+    *dictp = NULL;
+  }
+}
+#define TYPVAL_ENCODE_CONV_DICT_END(tv, dict) \
+    _nothing_conv_dict_end(tv, (dict_T **)&dict, \
+                           (void *)&TYPVAL_ENCODE_NODICT_VAR)
+
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type)
+
+#define TYPVAL_ENCODE_SCOPE static
+#define TYPVAL_ENCODE_NAME nothing
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE const void *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME ignored
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
+
+#undef TYPVAL_ENCODE_ALLOW_SPECIALS
+#undef TYPVAL_ENCODE_CONV_NIL
+#undef TYPVAL_ENCODE_CONV_BOOL
+#undef TYPVAL_ENCODE_CONV_NUMBER
+#undef TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+#undef TYPVAL_ENCODE_CONV_FLOAT
+#undef TYPVAL_ENCODE_CONV_STRING
+#undef TYPVAL_ENCODE_CONV_STR_STRING
+#undef TYPVAL_ENCODE_CONV_EXT_STRING
+#undef TYPVAL_ENCODE_CONV_FUNC_START
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF
+#undef TYPVAL_ENCODE_CONV_FUNC_END
+#undef TYPVAL_ENCODE_CONV_EMPTY_LIST
+#undef TYPVAL_ENCODE_CONV_EMPTY_DICT
+#undef TYPVAL_ENCODE_CONV_LIST_START
+#undef TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START
+#undef TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_CONV_LIST_END
+#undef TYPVAL_ENCODE_CONV_DICT_START
+#undef TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START
+#undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+#undef TYPVAL_ENCODE_CONV_DICT_AFTER_KEY
+#undef TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_CONV_DICT_END
+#undef TYPVAL_ENCODE_CONV_RECURSE
+
+/// Free memory for a variable value and set the value to NULL or 0
+///
+/// @param[in,out]  varp  Value to free.
+void clear_tv(typval_T *varp)
+{
+  if (varp != NULL && varp->v_type != VAR_UNKNOWN) {
+    const int evn_ret = encode_vim_to_nothing(varp, varp, "clear_tv argument");
+    (void)evn_ret;
+    assert(evn_ret == OK);
   }
 }
 
@@ -17906,7 +19340,7 @@ static void init_tv(typval_T *varp)
  * caller of incompatible types: it sets *denote to TRUE if "denote"
  * is not NULL or returns -1 otherwise.
  */
-static long get_tv_number(typval_T *varp)
+long get_tv_number(typval_T *varp)
 {
   int error = FALSE;
 
@@ -17924,6 +19358,7 @@ long get_tv_number_chk(typval_T *varp, int *denote)
     EMSG(_("E805: Using a Float as a Number"));
     break;
   case VAR_FUNC:
+  case VAR_PARTIAL:
     EMSG(_("E703: Using a Funcref as a Number"));
     break;
   case VAR_STRING:
@@ -17971,6 +19406,7 @@ static float_T get_tv_float(typval_T *varp)
       return varp->vval.v_float;
       break;
     case VAR_FUNC:
+    case VAR_PARTIAL:
       EMSG(_("E891: Using a Funcref as a Float"));
       break;
     case VAR_STRING:
@@ -18002,7 +19438,7 @@ static linenr_T get_tv_lnum(typval_T *argvars)
   lnum = get_tv_number_chk(&argvars[0], NULL);
   if (lnum == 0) {  /* no valid number, try using line() */
     rettv.v_type = VAR_NUMBER;
-    f_line(argvars, &rettv);
+    f_line(argvars, &rettv, NULL);
     lnum = rettv.vval.v_number;
     clear_tv(&rettv);
   }
@@ -18067,6 +19503,7 @@ static char_u *get_tv_string_buf_chk(const typval_T *varp, char_u *buf)
     sprintf((char *)buf, "%" PRId64, (int64_t)varp->vval.v_number);
     return buf;
   case VAR_FUNC:
+  case VAR_PARTIAL:
     EMSG(_("E729: using Funcref as a String"));
     break;
   case VAR_LIST:
@@ -18112,11 +19549,10 @@ static dictitem_T *find_var(char_u *name, hashtab_T **htp, int no_autoload)
   return find_var_in_ht(ht, *name, varname, no_autoload || htp != NULL);
 }
 
-/*
- * Find variable "varname" in hashtab "ht" with name "htname".
- * Returns NULL if not found.
- */
-static dictitem_T *find_var_in_ht(hashtab_T *ht, int htname, char_u *varname, int no_autoload)
+/// Find variable "varname" in hashtab "ht" with name "htname".
+/// Returns NULL if not found.
+static dictitem_T *find_var_in_ht(hashtab_T *ht, int htname,
+                                  char_u *varname, bool no_autoload)
 {
   hashitem_T  *hi;
 
@@ -18402,11 +19838,11 @@ list_one_var_a (
     msg_puts(name);
   msg_putchar(' ');
   msg_advance(22);
-  if (type == VAR_NUMBER)
+  if (type == VAR_NUMBER) {
     msg_putchar('#');
-  else if (type == VAR_FUNC)
+  } else if (type == VAR_FUNC || type == VAR_PARTIAL) {
     msg_putchar('*');
-  else if (type == VAR_LIST) {
+  } else if (type == VAR_LIST) {
     msg_putchar('[');
     if (*string == '[')
       ++string;
@@ -18419,8 +19855,9 @@ list_one_var_a (
 
   msg_outtrans(string);
 
-  if (type == VAR_FUNC)
+  if (type == VAR_FUNC || type == VAR_PARTIAL) {
     msg_puts((char_u *)"()");
+  }
   if (*first) {
     msg_clr_eos();
     *first = FALSE;
@@ -18458,8 +19895,10 @@ set_var (
   }
   v = find_var_in_ht(ht, 0, varname, TRUE);
 
-  if (tv->v_type == VAR_FUNC && var_check_func_name(name, v == NULL))
+  if ((tv->v_type == VAR_FUNC || tv->v_type == VAR_PARTIAL)
+      && var_check_func_name(name, v == NULL)) {
     return;
+  }
 
   if (v != NULL) {
     // existing variable, need to clear the value
@@ -18467,19 +19906,6 @@ set_var (
         || tv_check_lock(v->di_tv.v_lock, name, false)) {
       return;
     }
-    if (v->di_tv.v_type != tv->v_type
-        && !((v->di_tv.v_type == VAR_STRING
-              || v->di_tv.v_type == VAR_NUMBER)
-             && (tv->v_type == VAR_STRING
-                 || tv->v_type == VAR_NUMBER))
-        && !((v->di_tv.v_type == VAR_NUMBER
-              || v->di_tv.v_type == VAR_FLOAT)
-             && (tv->v_type == VAR_NUMBER
-                 || tv->v_type == VAR_FLOAT))
-        ) {
-      EMSG2(_("E706: Variable type mismatch for: %s"), name);
-      return;
-    }
 
     // Handle setting internal v: variables separately where needed to
     // prevent changing the type.
@@ -18489,7 +19915,7 @@ set_var (
         if (copy || tv->v_type != VAR_STRING)
           v->di_tv.vval.v_string = vim_strsave(get_tv_string(tv));
         else {
-          /* Take over the string to avoid an extra alloc/free. */
+          // Take over the string to avoid an extra alloc/free.
           v->di_tv.vval.v_string = tv->vval.v_string;
           tv->vval.v_string = NULL;
         }
@@ -18672,6 +20098,14 @@ void copy_tv(typval_T *from, typval_T *to)
         }
       }
       break;
+    case VAR_PARTIAL:
+      if (from->vval.v_partial == NULL) {
+        to->vval.v_partial = NULL;
+      } else {
+        to->vval.v_partial = from->vval.v_partial;
+        (to->vval.v_partial->pt_refcount)++;
+      }
+      break;
     case VAR_LIST:
       if (from->vval.v_list != NULL) {
         to->vval.v_list->lv_refcount++;
@@ -18724,6 +20158,7 @@ int var_item_copy(const vimconv_T *const conv,
   case VAR_NUMBER:
   case VAR_FLOAT:
   case VAR_FUNC:
+  case VAR_PARTIAL:
   case VAR_SPECIAL:
     copy_tv(from, to);
     break;
@@ -19083,7 +20518,7 @@ void ex_function(exarg_T *eap)
   // s:func      script-local function name
   // g:func      global function name, same as "func"
   p = eap->arg;
-  name = trans_function_name(&p, eap->skip, 0, &fudi);
+  name = trans_function_name(&p, eap->skip, 0, &fudi, NULL);
   paren = (vim_strchr(p, '(') != NULL);
   if (name == NULL && (fudi.fd_dict == NULL || !paren) && !eap->skip) {
     /*
@@ -19169,7 +20604,8 @@ void ex_function(exarg_T *eap)
     else
       arg = fudi.fd_newkey;
     if (arg != NULL && (fudi.fd_di == NULL
-                        || fudi.fd_di->di_tv.v_type != VAR_FUNC)) {
+                        || (fudi.fd_di->di_tv.v_type != VAR_FUNC
+                            && fudi.fd_di->di_tv.v_type != VAR_PARTIAL))) {
       int j = (*arg == K_SPECIAL) ? 3 : 0;
       while (arg[j] != NUL && (j == 0 ? eval_isnamec1(arg[j])
                                : eval_isnamec(arg[j])))
@@ -19350,7 +20786,7 @@ void ex_function(exarg_T *eap)
           p = skipwhite(p + 1);
         }
         p += eval_fname_script(p);
-        xfree(trans_function_name(&p, TRUE, 0, NULL));
+        xfree(trans_function_name(&p, true, 0, NULL, NULL));
         if (*skipwhite(p) == '(') {
           nesting++;
           indent += 2;
@@ -19568,7 +21004,8 @@ trans_function_name (
     char_u **pp,
     int skip,                       /* only find the end, don't evaluate */
     int flags,
-    funcdict_T *fdp               /* return: info about dictionary used */
+    funcdict_T *fdp,               // return: info about dictionary used
+    partial_T **partial            // return: partial of a FuncRef
 )
 {
   char_u      *name = NULL;
@@ -19630,6 +21067,13 @@ trans_function_name (
     if (lv.ll_tv->v_type == VAR_FUNC && lv.ll_tv->vval.v_string != NULL) {
       name = vim_strsave(lv.ll_tv->vval.v_string);
       *pp = end;
+    } else if (lv.ll_tv->v_type == VAR_PARTIAL
+               && lv.ll_tv->vval.v_partial != NULL) {
+      name = vim_strsave(lv.ll_tv->vval.v_partial->pt_name);
+      *pp = end;
+      if (partial != NULL) {
+        *partial = lv.ll_tv->vval.v_partial;
+      }
     } else {
       if (!skip && !(flags & TFN_QUIET) && (fdp == NULL
                                             || lv.ll_dict == NULL
@@ -19652,14 +21096,17 @@ trans_function_name (
   /* Check if the name is a Funcref.  If so, use the value. */
   if (lv.ll_exp_name != NULL) {
     len = (int)STRLEN(lv.ll_exp_name);
-    name = deref_func_name(lv.ll_exp_name, &len, flags & TFN_NO_AUTOLOAD);
-    if (name == lv.ll_exp_name)
+    name = deref_func_name(lv.ll_exp_name, &len, partial,
+                           flags & TFN_NO_AUTOLOAD);
+    if (name == lv.ll_exp_name) {
       name = NULL;
+    }
   } else {
     len = (int)(end - *pp);
-    name = deref_func_name(*pp, &len, flags & TFN_NO_AUTOLOAD);
-    if (name == *pp)
+    name = deref_func_name(*pp, &len, partial, flags & TFN_NO_AUTOLOAD);
+    if (name == *pp) {
       name = NULL;
+    }
   }
   if (name != NULL) {
     name = vim_strsave(name);
@@ -19750,11 +21197,15 @@ theend:
  */
 static int eval_fname_script(char_u *p)
 {
-  if (p[0] == '<' && (STRNICMP(p + 1, "SID>", 4) == 0
-                      || STRNICMP(p + 1, "SNR>", 4) == 0))
+  // Use mb_stricmp() because in Turkish comparing the "I" may not work with
+  // the standard library function.
+  if (p[0] == '<' && (mb_strnicmp(p + 1, (char_u *)"SID>", 4) == 0
+                      || mb_strnicmp(p + 1, (char_u *)"SNR>", 4) == 0)) {
     return 5;
-  if (p[0] == 's' && p[1] == ':')
+  }
+  if (p[0] == 's' && p[1] == ':') {
     return 2;
+  }
   return 0;
 }
 
@@ -19839,7 +21290,7 @@ void free_all_functions(void)
 int translated_function_exists(char_u *name)
 {
   if (builtin_function(name, -1)) {
-    return find_internal_func(name) >= 0;
+    return find_internal_func((char *)name) != NULL;
   }
   return find_func(name) != NULL;
 }
@@ -19853,8 +21304,8 @@ static int function_exists(char_u *name)
   char_u  *p;
   int n = FALSE;
 
-  p = trans_function_name(&nm, FALSE, TFN_INT|TFN_QUIET|TFN_NO_AUTOLOAD,
-      NULL);
+  p = trans_function_name(&nm, false, TFN_INT|TFN_QUIET|TFN_NO_AUTOLOAD,
+                          NULL, NULL);
   nm = skipwhite(nm);
 
   /* Only accept "funcname", "funcname ", "funcname (..." and
@@ -20079,9 +21530,10 @@ script_autoload (
       tofree = NULL;
     }
 
-    /* Try loading the package from $VIMRUNTIME/autoload/<name>.vim */
-    if (source_runtime(scriptname, FALSE) == OK)
-      ret = TRUE;
+    // Try loading the package from $VIMRUNTIME/autoload/<name>.vim
+    if (source_runtime(scriptname, 0) == OK) {
+      ret = true;
+    }
   }
 
   xfree(tofree);
@@ -20173,7 +21625,7 @@ void ex_delfunction(exarg_T *eap)
   funcdict_T fudi;
 
   p = eap->arg;
-  name = trans_function_name(&p, eap->skip, 0, &fudi);
+  name = trans_function_name(&p, eap->skip, 0, &fudi, NULL);
   xfree(fudi.fd_newkey);
   if (name == NULL) {
     if (fudi.fd_dict != NULL && !eap->skip)
@@ -20254,7 +21706,13 @@ void func_unref(char_u *name)
   if (name != NULL && isdigit(*name)) {
     fp = find_func(name);
     if (fp == NULL) {
+#ifdef EXITFREE
+      if (!entered_free_all_mem) {
+        EMSG2(_(e_intern2), "func_unref()");
+      }
+#else
       EMSG2(_(e_intern2), "func_unref()");
+#endif
     } else {
       user_func_unref(fp);
     }
@@ -20856,7 +22314,7 @@ char_u *get_return_cmd(void *rettv)
   }
 
   STRCPY(IObuff, ":return ");
-  STRNCPY(IObuff + 8, s, IOSIZE - 8);
+  STRLCPY(IObuff + 8, s, IOSIZE - 8);
   if (STRLEN(s) + 8 >= IOSIZE)
     STRCPY(IObuff + IOSIZE - 4, "...");
   xfree(tofree);
@@ -21158,8 +22616,8 @@ void ex_oldfiles(exarg_T *eap)
     /* Assume "got_int" was set to truncate the listing. */
     got_int = FALSE;
 
-    // File selection prompt on ":oldfiles!"
-    if (eap->forceit) {
+    // File selection prompt on ":browse oldfiles"
+    if (cmdmod.browse) {
       quit_more = false;
       nr = prompt_for_number(false);
       msg_starthere();
@@ -21532,24 +22990,25 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags)
 }
 
 static inline TerminalJobData *common_job_init(char **argv,
-                                               ufunc_T *on_stdout,
-                                               ufunc_T *on_stderr,
-                                               ufunc_T *on_exit,
-                                               dict_T *self,
+                                               Callback on_stdout,
+                                               Callback on_stderr,
+                                               Callback on_exit,
                                                bool pty,
-                                               bool detach)
+                                               bool rpc,
+                                               bool detach,
+                                               char *cwd)
 {
   TerminalJobData *data = xcalloc(1, sizeof(TerminalJobData));
   data->stopped = false;
   data->on_stdout = on_stdout;
   data->on_stderr = on_stderr;
   data->on_exit = on_exit;
-  data->self = self;
-  data->events = queue_new_child(loop.events);
+  data->events = multiqueue_new_child(main_loop.events);
+  data->rpc = rpc;
   if (pty) {
-    data->proc.pty = pty_process_init(&loop, data);
+    data->proc.pty = pty_process_init(&main_loop, data);
   } else {
-    data->proc.uv = libuv_process_init(&loop, data);
+    data->proc.uv = libuv_process_init(&main_loop, data);
   }
   Process *proc = (Process *)&data->proc;
   proc->argv = argv;
@@ -21558,15 +23017,18 @@ static inline TerminalJobData *common_job_init(char **argv,
   if (!pty) {
     proc->err = &data->err;
   }
-  proc->cb = on_process_exit;
+  proc->cb = eval_job_process_exit_cb;
   proc->events = data->events;
   proc->detach = detach;
+  proc->cwd = cwd;
   return data;
 }
 
-/// Return true/false on success/failure.
-static inline bool common_job_callbacks(dict_T *vopts, ufunc_T **on_stdout,
-                                        ufunc_T **on_stderr, ufunc_T **on_exit)
+/// common code for getting job callbacks for jobstart, termopen and rpcstart
+///
+/// @return true/false on success/failure.
+static inline bool common_job_callbacks(dict_T *vopts, Callback *on_stdout,
+                                        Callback *on_stderr, Callback *on_exit)
 {
   if (get_dict_callback(vopts, "on_stdout", on_stdout)
       && get_dict_callback(vopts, "on_stderr", on_stderr)
@@ -21574,15 +23036,10 @@ static inline bool common_job_callbacks(dict_T *vopts, ufunc_T **on_stdout,
     vopts->dv_refcount++;
     return true;
   }
-  if (*on_stdout) {
-    user_func_unref(*on_stdout);
-  }
-  if (*on_stderr) {
-    user_func_unref(*on_stderr);
-  }
-  if (*on_exit) {
-    user_func_unref(*on_exit);
-  }
+
+  callback_free(on_stdout);
+  callback_free(on_stderr);
+  callback_free(on_exit);
   return false;
 }
 
@@ -21591,9 +23048,15 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
   Process *proc = (Process *)&data->proc;
   if (proc->type == kProcessTypePty && proc->detach) {
     EMSG2(_(e_invarg2), "terminal/pty job cannot be detached");
+    xfree(data->proc.pty.term_name);
+    shell_free_argv(proc->argv);
+    free_term_job_data_event((void **)&data);
     return false;
   }
 
+  data->id = next_chan_id++;
+  pmap_put(uint64_t)(jobs, data->id, data);
+
   data->refcount++;
   char *cmd = xstrdup(proc->argv[0]);
   if (!process_spawn(proc)) {
@@ -21608,17 +23071,22 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
   }
   xfree(cmd);
 
-  data->id = current_job_id++;
-  wstream_init(proc->in, 0);
-  if (proc->out) {
-    rstream_init(proc->out, 0);
-    rstream_start(proc->out, on_job_stdout);
+
+  if (data->rpc) {
+    // the rpc channel takes over the in and out streams
+    channel_from_process(proc, data->id);
+  } else {
+    wstream_init(proc->in, 0);
+    if (proc->out) {
+      rstream_init(proc->out, 0);
+      rstream_start(proc->out, on_job_stdout, data);
+    }
   }
+
   if (proc->err) {
     rstream_init(proc->err, 0);
-    rstream_start(proc->err, on_job_stderr);
+    rstream_start(proc->err, on_job_stderr, data);
   }
-  pmap_put(uint64_t)(jobs, data->id, data);
   rettv->vval.v_number = data->id;
   return true;
 }
@@ -21626,20 +23094,12 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
 static inline void free_term_job_data_event(void **argv)
 {
   TerminalJobData *data = argv[0];
-  if (data->on_stdout) {
-    user_func_unref(data->on_stdout);
-  }
-  if (data->on_stderr) {
-    user_func_unref(data->on_stderr);
-  }
-  if (data->on_exit) {
-    user_func_unref(data->on_exit);
-  }
+  callback_free(&data->on_stdout);
+  callback_free(&data->on_stderr);
+  callback_free(&data->on_exit);
 
-  if (data->self) {
-    dict_unref(data->self);
-  }
-  queue_free(data->events);
+  multiqueue_free(data->events);
+  pmap_del(uint64_t)(jobs, data->id);
   xfree(data);
 }
 
@@ -21647,12 +23107,13 @@ static inline void free_term_job_data(TerminalJobData *data)
 {
   // data->queue may still be used after this function returns(process_wait), so
   // only free in the next event loop iteration
-  queue_put(loop.fast_events, free_term_job_data_event, 1, data);
+  multiqueue_put(main_loop.fast_events, free_term_job_data_event, 1, data);
 }
 
 // vimscript job callbacks must be executed on Nvim main loop
-static inline void process_job_event(TerminalJobData *data, ufunc_T *callback,
-    const char *type, char *buf, size_t count, int status)
+static inline void process_job_event(TerminalJobData *data, Callback *callback,
+                                     const char *type, char *buf, size_t count,
+                                     int status)
 {
   JobEvent event_data;
   event_data.received = NULL;
@@ -21692,18 +23153,19 @@ static void on_job_stdout(Stream *stream, RBuffer *buf, size_t count,
     void *job, bool eof)
 {
   TerminalJobData *data = job;
-  on_job_output(stream, job, buf, count, eof, data->on_stdout, "stdout");
+  on_job_output(stream, job, buf, count, eof, &data->on_stdout, "stdout");
 }
 
 static void on_job_stderr(Stream *stream, RBuffer *buf, size_t count,
     void *job, bool eof)
 {
   TerminalJobData *data = job;
-  on_job_output(stream, job, buf, count, eof, data->on_stderr, "stderr");
+  on_job_output(stream, job, buf, count, eof, &data->on_stderr, "stderr");
 }
 
 static void on_job_output(Stream *stream, TerminalJobData *data, RBuffer *buf,
-    size_t count, bool eof, ufunc_T *callback, const char *type)
+                          size_t count, bool eof, Callback *callback,
+                          const char *type)
 {
   if (eof) {
     return;
@@ -21720,14 +23182,13 @@ static void on_job_output(Stream *stream, TerminalJobData *data, RBuffer *buf,
     terminal_receive(data->term, ptr, count);
   }
 
-  if (callback) {
+  rbuffer_consumed(buf, count);
+  if (callback->type != kCallbackNone) {
     process_job_event(data, callback, type, ptr, count, 0);
   }
-
-  rbuffer_consumed(buf, count);
 }
 
-static void on_process_exit(Process *proc, int status, void *d)
+static void eval_job_process_exit_cb(Process *proc, int status, void *d)
 {
   TerminalJobData *data = d;
   if (data->term && !data->exited) {
@@ -21736,19 +23197,30 @@ static void on_process_exit(Process *proc, int status, void *d)
     snprintf(msg, sizeof msg, "\r\n[Process exited %d]", proc->status);
     terminal_close(data->term, msg);
   }
+  if (data->rpc) {
+    channel_process_exit(data->id, status);
+  }
 
   if (data->status_ptr) {
     *data->status_ptr = status;
   }
 
-  process_job_event(data, data->on_exit, "exit", NULL, 0, status);
+  process_job_event(data, &data->on_exit, "exit", NULL, 0, status);
+
+  term_job_data_decref(data);
 }
 
 static void term_write(char *buf, size_t size, void *d)
 {
-  TerminalJobData *data = d;
+  TerminalJobData *job = d;
+  if (job->in.closed) {
+    // If the backing stream was closed abruptly, there may be write events
+    // ahead of the terminal close event. Just ignore the writes.
+    ILOG("write failed: stream is closed");
+    return;
+  }
   WBuffer *wbuf = wstream_new_buffer(xmemdup(buf, size), size, 1, xfree);
-  wstream_write(&data->in, wbuf);
+  wstream_write(&job->in, wbuf);
 }
 
 static void term_resize(uint16_t width, uint16_t height, void *d)
@@ -21761,7 +23233,7 @@ static inline void term_delayed_free(void **argv)
 {
   TerminalJobData *j = argv[0];
   if (j->in.pending_reqs || j->out.pending_reqs || j->err.pending_reqs) {
-    queue_put(j->events, term_delayed_free, 1, j);
+    multiqueue_put(j->events, term_delayed_free, 1, j);
     return;
   }
 
@@ -21776,7 +23248,7 @@ static void term_close(void *d)
     data->exited = true;
     process_stop((Process *)&data->proc);
   }
-  queue_put(data->events, term_delayed_free, 1, data);
+  multiqueue_put(data->events, term_delayed_free, 1, data);
 }
 
 static void term_job_data_decref(TerminalJobData *data)
@@ -21789,49 +23261,34 @@ static void term_job_data_decref(TerminalJobData *data)
 static void on_job_event(JobEvent *ev)
 {
   if (!ev->callback) {
-    goto end;
+    return;
   }
 
-  typval_T argv[3];
-  int argc = ev->callback->uf_args.ga_len;
+  typval_T argv[4];
 
-  if (argc > 0) {
-    argv[0].v_type = VAR_NUMBER;
-    argv[0].v_lock = 0;
-    argv[0].vval.v_number = ev->data->id;
-  }
+  argv[0].v_type = VAR_NUMBER;
+  argv[0].v_lock = 0;
+  argv[0].vval.v_number = ev->data->id;
 
-  if (argc > 1) {
-    if (ev->received) {
-      argv[1].v_type = VAR_LIST;
-      argv[1].v_lock = 0;
-      argv[1].vval.v_list = ev->received;
-      argv[1].vval.v_list->lv_refcount++;
-    } else {
-      argv[1].v_type = VAR_NUMBER;
-      argv[1].v_lock = 0;
-      argv[1].vval.v_number = ev->status;
-    }
+  if (ev->received) {
+    argv[1].v_type = VAR_LIST;
+    argv[1].v_lock = 0;
+    argv[1].vval.v_list = ev->received;
+    argv[1].vval.v_list->lv_refcount++;
+  } else {
+    argv[1].v_type = VAR_NUMBER;
+    argv[1].v_lock = 0;
+    argv[1].vval.v_number = ev->status;
   }
 
-  if (argc > 2) {
-    argv[2].v_type = VAR_STRING;
-    argv[2].v_lock = 0;
-    argv[2].vval.v_string = (uint8_t *)ev->type;
-  }
+  argv[2].v_type = VAR_STRING;
+  argv[2].v_lock = 0;
+  argv[2].vval.v_string = (uint8_t *)ev->type;
 
   typval_T rettv;
   init_tv(&rettv);
-  call_user_func(ev->callback, argc, argv, &rettv, curwin->w_cursor.lnum,
-      curwin->w_cursor.lnum, ev->data->self);
+  callback_call(ev->callback, 3, argv, &rettv);
   clear_tv(&rettv);
-
-end:
-  if (!ev->received) {
-    // exit event, safe to free job data now
-    pmap_del(uint64_t)(jobs, ev->data->id);
-    term_job_data_decref(ev->data);
-  }
 }
 
 static TerminalJobData *find_job(uint64_t id)
@@ -21851,6 +23308,7 @@ static void script_host_eval(char *name, typval_T *argvars, typval_T *rettv)
 
   if (argvars[0].v_type != VAR_STRING) {
     EMSG(_(e_invarg));
+    return;
   }
 
   list_T *args = list_alloc();
@@ -21895,6 +23353,7 @@ typval_T eval_call_provider(char *provider, char *method, list_T *arguments)
                   curwin->w_cursor.lnum,
                   &dummy,
                   true,
+                  NULL,
                   NULL);
 
   list_unref(arguments);
@@ -21908,17 +23367,19 @@ typval_T eval_call_provider(char *provider, char *method, list_T *arguments)
 
 bool eval_has_provider(char *name)
 {
-
-#define check_provider(name)                                              \
-  if (has_##name == -1) {                                                 \
-    has_##name = !!find_func((uint8_t *)"provider#" #name "#Call");       \
-    if (!has_##name) {                                                    \
-      script_autoload((uint8_t *)"provider#" #name "#Call", false);       \
-      has_##name = !!find_func((uint8_t *)"provider#" #name "#Call");     \
-    }                                                                     \
+#define check_provider(name) \
+  if (has_##name == -1) { \
+    has_##name = !!find_func((uint8_t *)"provider#" #name "#Call"); \
+    if (!has_##name) { \
+      script_autoload((uint8_t *)"provider#" #name "#Call", false); \
+      has_##name = !!find_func((uint8_t *)"provider#" #name "#Call"); \
+    } \
   }
 
-  static int has_clipboard = -1, has_python = -1, has_python3 = -1;
+  static int has_clipboard = -1;
+  static int has_python = -1;
+  static int has_python3 = -1;
+  static int has_ruby = -1;
 
   if (!strcmp(name, "clipboard")) {
     check_provider(clipboard);
@@ -21929,14 +23390,16 @@ bool eval_has_provider(char *name)
   } else if (!strcmp(name, "python")) {
     check_provider(python);
     return has_python;
+  } else if (!strcmp(name, "ruby")) {
+    check_provider(ruby);
+    return has_ruby;
   }
 
   return false;
 }
 
-// Compute the `DictWatcher` address from a QUEUE node. This only exists because
-// ASAN doesn't handle `QUEUE_DATA` pointer arithmetic, and we blacklist this
-// function on .asan-blacklist.
+// Compute the `DictWatcher` address from a QUEUE node. This only exists for
+// .asan-blacklist (ASAN doesn't handle QUEUE_DATA pointer arithmetic).
 static DictWatcher *dictwatcher_node_data(QUEUE *q)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
 {
@@ -21948,7 +23411,7 @@ static void dictwatcher_notify(dict_T *dict, const char *key, typval_T *newtv,
     typval_T *oldtv)
   FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
 {
-  typval_T argv[3];
+  typval_T argv[4];
   for (size_t i = 0; i < ARRAY_SIZE(argv); i++) {
     init_tv(argv + i);
   }
@@ -21981,8 +23444,7 @@ static void dictwatcher_notify(dict_T *dict, const char *key, typval_T *newtv,
     if (!watcher->busy && dictwatcher_matches(watcher, key)) {
       init_tv(&rettv);
       watcher->busy = true;
-      call_user_func(watcher->callback, ARRAY_SIZE(argv), argv, &rettv,
-          curwin->w_cursor.lnum, curwin->w_cursor.lnum, NULL);
+      callback_call(&watcher->callback, 3, argv, &rettv);
       watcher->busy = false;
       clear_tv(&rettv);
     }
@@ -22013,7 +23475,7 @@ static bool dictwatcher_matches(DictWatcher *watcher, const char *key)
 static void dictwatcher_free(DictWatcher *watcher)
   FUNC_ATTR_NONNULL_ALL
 {
-  user_func_unref(watcher->callback);
+  callback_free(&watcher->callback);
   xfree(watcher->key_pattern);
   xfree(watcher);
 }
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index d6800afd52..630e309442 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -94,6 +94,7 @@ typedef enum {
     VV_FCS_CHOICE,
     VV_BEVAL_BUFNR,
     VV_BEVAL_WINNR,
+    VV_BEVAL_WINID,
     VV_BEVAL_LNUM,
     VV_BEVAL_COL,
     VV_BEVAL_TEXT,
@@ -103,6 +104,7 @@ typedef enum {
     VV_SWAPCOMMAND,
     VV_CHAR,
     VV_MOUSE_WIN,
+    VV_MOUSE_WINID,
     VV_MOUSE_LNUM,
     VV_MOUSE_COL,
     VV_OP,
@@ -124,6 +126,15 @@ typedef enum {
     VV_NULL,
     VV__NULL_LIST,  // List with NULL value. For test purposes only.
     VV__NULL_DICT,  // Dictionary with NULL value. For test purposes only.
+    VV_VIM_DID_ENTER,
+    VV_TYPE_NUMBER,
+    VV_TYPE_STRING,
+    VV_TYPE_FUNC,
+    VV_TYPE_LIST,
+    VV_TYPE_DICT,
+    VV_TYPE_FLOAT,
+    VV_TYPE_BOOL,
+    VV_EXITING,
 } VimVarIndex;
 
 /// All recognized msgpack types
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
new file mode 100644
index 0000000000..e0b72feb19
--- /dev/null
+++ b/src/nvim/eval.lua
@@ -0,0 +1,337 @@
+-- File containing table with all functions.
+--
+-- Keys:
+--
+-- args  Number of arguments, list with maximum and minimum number of arguments 
+--       or list with a minimum number of arguments only. Defaults to zero 
+--       arguments.
+-- func  Name of the C function which implements the VimL function. Defaults to 
+--       `f_{funcname}`.
+
+local varargs = function(nr)
+  return {nr}
+end
+
+return {
+  funcs={
+    abs={args=1},
+    acos={args=1, func="float_op_wrapper", data="&acos"},  -- WJMc
+    add={args=2},
+    ['and']={args=2},
+    api_info={},
+    append={args=2},
+    argc={},
+    argidx={},
+    arglistid={args={0, 2}},
+    argv={args={0, 1}},
+    asin={args=1, func="float_op_wrapper", data="&asin"},  -- WJMc
+    assert_equal={args={2, 3}},
+    assert_exception={args={1, 2}},
+    assert_fails={args={1, 2}},
+    assert_false={args={1, 2}},
+    assert_match={args={2, 3}},
+    assert_notequal={args={2, 3}},
+    assert_notmatch={args={2, 3}},
+    assert_true={args={1, 2}},
+    atan={args=1, func="float_op_wrapper", data="&atan"},
+    atan2={args=2},
+    browse={args=4},
+    browsedir={args=2},
+    bufexists={args=1},
+    buffer_exists={args=1, func='f_bufexists'},  -- obsolete
+    buffer_name={args=1, func='f_bufname'},  -- obsolete
+    buffer_number={args=1, func='f_bufnr'},  -- obsolete
+    buflisted={args=1},
+    bufloaded={args=1},
+    bufname={args=1},
+    bufnr={args={1, 2}},
+    bufwinid={args=1},
+    bufwinnr={args=1},
+    byte2line={args=1},
+    byteidx={args=2},
+    byteidxcomp={args=2},
+    call={args={2, 3}},
+    ceil={args=1, func="float_op_wrapper", data="&ceil"},
+    changenr={},
+    char2nr={args={1, 2}},
+    cindent={args=1},
+    clearmatches={},
+    col={args=1},
+    complete={args=2},
+    complete_add={args=1},
+    complete_check={},
+    confirm={args={1, 4}},
+    copy={args=1},
+    cos={args=1, func="float_op_wrapper", data="&cos"},
+    cosh={args=1, func="float_op_wrapper", data="&cosh"},
+    count={args={2, 4}},
+    cscope_connection={args={0, 3}},
+    cursor={args={1, 3}},
+    deepcopy={args={1, 2}},
+    delete={args={1,2}},
+    dictwatcheradd={args=3},
+    dictwatcherdel={args=3},
+    did_filetype={},
+    diff_filler={args=1},
+    diff_hlID={args=2},
+    empty={args=1},
+    escape={args=2},
+    eval={args=1},
+    eventhandler={},
+    executable={args=1},
+    execute={args={1, 2}},
+    exepath={args=1},
+    exists={args=1},
+    exp={args=1, func="float_op_wrapper", data="&exp"},
+    expand={args={1, 3}},
+    extend={args={2, 3}},
+    feedkeys={args={1, 2}},
+    file_readable={args=1, func='f_filereadable'},  -- obsolete
+    filereadable={args=1},
+    filewritable={args=1},
+    filter={args=2},
+    finddir={args={1, 3}},
+    findfile={args={1, 3}},
+    float2nr={args=1},
+    floor={args=1, func="float_op_wrapper", data="&floor"},
+    fmod={args=2},
+    fnameescape={args=1},
+    fnamemodify={args=2},
+    foldclosed={args=1},
+    foldclosedend={args=1},
+    foldlevel={args=1},
+    foldtext={},
+    foldtextresult={args=1},
+    foreground={},
+    ['function']={args={1, 3}},
+    garbagecollect={args={0, 1}},
+    get={args={2, 3}},
+    getbufinfo={args={0, 1}},
+    getbufline={args={2, 3}},
+    getbufvar={args={2, 3}},
+    getchar={args={0, 1}},
+    getcharmod={},
+    getcharsearch={},
+    getcmdline={},
+    getcmdpos={},
+    getcmdtype={},
+    getcmdwintype={},
+    getcompletion={args={2, 3}},
+    getcurpos={},
+    getcwd={args={0,2}},
+    getfontname={args={0, 1}},
+    getfperm={args=1},
+    getfsize={args=1},
+    getftime={args=1},
+    getftype={args=1},
+    getline={args={1, 2}},
+    getloclist={args=1, func='f_getqflist'},
+    getmatches={},
+    getpid={},
+    getpos={args=1},
+    getqflist={},
+    getreg={args={0, 3}},
+    getregtype={args={0, 1}},
+    gettabinfo={args={0, 1}},
+    gettabvar={args={2, 3}},
+    gettabwinvar={args={3, 4}},
+    getwininfo={args={0, 1}},
+    getwinposx={},
+    getwinposy={},
+    getwinvar={args={2, 3}},
+    glob={args={1, 4}},
+    glob2regpat={args=1},
+    globpath={args={2, 5}},
+    has={args=1},
+    has_key={args=2},
+    haslocaldir={args={0,2}},
+    hasmapto={args={1, 3}},
+    highlightID={args=1, func='f_hlID'},  -- obsolete
+    highlight_exists={args=1, func='f_hlexists'},  -- obsolete
+    histadd={args=2},
+    histdel={args={1, 2}},
+    histget={args={1, 2}},
+    histnr={args=1},
+    hlID={args=1},
+    hlexists={args=1},
+    hostname={},
+    iconv={args=3},
+    indent={args=1},
+    index={args={2, 4}},
+    input={args={1, 3}},
+    inputdialog={args={1, 3}},
+    inputlist={args=1},
+    inputrestore={},
+    inputsave={},
+    inputsecret={args={1, 2}},
+    insert={args={2, 3}},
+    invert={args=1},
+    isdirectory={args=1},
+    islocked={args=1},
+    items={args=1},
+    jobclose={args={1, 2}},
+    jobpid={args=1},
+    jobresize={args=3},
+    jobsend={args=2},
+    jobstart={args={1, 2}},
+    jobstop={args=1},
+    jobwait={args={1, 2}},
+    join={args={1, 2}},
+    json_decode={args=1},
+    json_encode={args=1},
+    keys={args=1},
+    last_buffer_nr={},  -- obsolete
+    len={args=1},
+    libcall={args=3},
+    libcallnr={args=3},
+    line={args=1},
+    line2byte={args=1},
+    lispindent={args=1},
+    localtime={},
+    log={args=1, func="float_op_wrapper", data="&log"},
+    log10={args=1, func="float_op_wrapper", data="&log10"},
+    map={args=2},
+    maparg={args={1, 4}},
+    mapcheck={args={1, 3}},
+    match={args={2, 4}},
+    matchadd={args={2, 5}},
+    matchaddpos={args={2, 5}},
+    matcharg={args=1},
+    matchdelete={args=1},
+    matchend={args={2, 4}},
+    matchlist={args={2, 4}},
+    matchstr={args={2, 4}},
+    matchstrpos={args={2,4}},
+    max={args=1},
+    min={args=1},
+    mkdir={args={1, 3}},
+    mode={args={0, 1}},
+    msgpackdump={args=1},
+    msgpackparse={args=1},
+    nextnonblank={args=1},
+    nr2char={args={1, 2}},
+    ['or']={args=2},
+    pathshorten={args=1},
+    pow={args=2},
+    prevnonblank={args=1},
+    printf={args=varargs(2)},
+    pumvisible={},
+    py3eval={args=1},
+    pyeval={args=1},
+    range={args={1, 3}},
+    readfile={args={1, 3}},
+    reltime={args={0, 2}},
+    reltimefloat={args=1},
+    reltimestr={args=1},
+    remove={args={2, 3}},
+    rename={args=2},
+    ['repeat']={args=2},
+    resolve={args=1},
+    reverse={args=1},
+    round={args=1, func="float_op_wrapper", data="&round"},
+    rpcnotify={args=varargs(2)},
+    rpcrequest={args=varargs(2)},
+    rpcstart={args={1, 2}},
+    rpcstop={args=1},
+    screenattr={args=2},
+    screenchar={args=2},
+    screencol={},
+    screenrow={},
+    search={args={1, 4}},
+    searchdecl={args={1, 3}},
+    searchpair={args={3, 7}},
+    searchpairpos={args={3, 7}},
+    searchpos={args={1, 4}},
+    serverlist={},
+    serverstart={args={0, 1}},
+    serverstop={args=1},
+    setbufvar={args=3},
+    setcharsearch={args=1},
+    setcmdpos={args=1},
+    setfperm={args=2},
+    setline={args=2},
+    setloclist={args={2, 4}},
+    setmatches={args=1},
+    setpos={args=2},
+    setqflist={args={1, 3}},
+    setreg={args={2, 3}},
+    settabvar={args=3},
+    settabwinvar={args=4},
+    setwinvar={args=3},
+    sha256={args=1},
+    shellescape={args={1, 2}},
+    shiftwidth={},
+    simplify={args=1},
+    sin={args=1, func="float_op_wrapper", data="&sin"},
+    sinh={args=1, func="float_op_wrapper", data="&sinh"},
+    sort={args={1, 3}},
+    soundfold={args=1},
+    spellbadword={args={0, 1}},
+    spellsuggest={args={1, 3}},
+    split={args={1, 3}},
+    sqrt={args=1, func="float_op_wrapper", data="&sqrt"},
+    str2float={args=1},
+    str2nr={args={1, 2}},
+    strcharpart={args={2, 3}},
+    strchars={args={1,2}},
+    strdisplaywidth={args={1, 2}},
+    strftime={args={1, 2}},
+    strgetchar={args={2, 2}},
+    stridx={args={2, 3}},
+    string={args=1},
+    strlen={args=1},
+    strpart={args={2, 3}},
+    strridx={args={2, 3}},
+    strtrans={args=1},
+    strwidth={args=1},
+    submatch={args={1, 2}},
+    substitute={args=4},
+    synID={args=3},
+    synIDattr={args={2, 3}},
+    synIDtrans={args=1},
+    synconcealed={args=2},
+    synstack={args=2},
+    system={args={1, 2}},
+    systemlist={args={1, 3}},
+    tabpagebuflist={args={0, 1}},
+    tabpagenr={args={0, 1}},
+    tabpagewinnr={args={1, 2}},
+    tagfiles={},
+    taglist={args=1},
+    tan={args=1, func="float_op_wrapper", data="&tan"},
+    tanh={args=1, func="float_op_wrapper", data="&tanh"},
+    tempname={},
+    termopen={args={1, 2}},
+    timer_start={args={2,3}},
+    timer_stop={args=1},
+    tolower={args=1},
+    toupper={args=1},
+    tr={args=3},
+    trunc={args=1, func="float_op_wrapper", data="&trunc"},
+    type={args=1},
+    undofile={args=1},
+    undotree={},
+    uniq={args={1, 3}},
+    values={args=1},
+    virtcol={args=1},
+    visualmode={args={0, 1}},
+    wildmenumode={},
+    win_findbuf={args=1},
+    win_getid={args={0,2}},
+    win_gotoid={args=1},
+    win_id2tabwin={args=1},
+    win_id2win={args=1},
+    winbufnr={args=1},
+    wincol={},
+    winheight={args=1},
+    winline={},
+    winnr={args={0, 1}},
+    winrestcmd={},
+    winrestview={args=1},
+    winsaveview={},
+    winwidth={args=1},
+    wordcount={},
+    writefile={args={2, 3}},
+    xor={args=2},
+  },
+}
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 0774ef515f..43e9f76c0f 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -101,7 +101,7 @@ static inline int json_decoder_pop(ValuesStackItem obj,
   FUNC_ATTR_NONNULL_ALL
 {
   if (kv_size(*container_stack) == 0) {
-    kv_push(ValuesStackItem, *stack, obj);
+    kv_push(*stack, obj);
     return OK;
   }
   ContainerStackItem last_container = kv_last(*container_stack);
@@ -190,7 +190,7 @@ static inline int json_decoder_pop(ValuesStackItem obj,
       *next_map_special = true;
       return OK;
     }
-    kv_push(ValuesStackItem, *stack, obj);
+    kv_push(*stack, obj);
   }
   return OK;
 }
@@ -628,10 +628,8 @@ int json_decode_string(const char *const buf, const size_t buf_len,
   convert_setup(&conv, (char_u *) "utf-8", p_enc);
   conv.vc_fail = true;
   int ret = OK;
-  ValuesStack stack;
-  kv_init(stack);
-  ContainerStack container_stack;
-  kv_init(container_stack);
+  ValuesStack stack = KV_INITIAL_VALUE;
+  ContainerStack container_stack = KV_INITIAL_VALUE;
   rettv->v_type = VAR_UNKNOWN;
   bool didcomma = false;
   bool didcolon = false;
@@ -815,13 +813,13 @@ json_decode_string_cycle_start:
           .v_lock = VAR_UNLOCKED,
           .vval = { .v_list = list },
         };
-        kv_push(ContainerStackItem, container_stack, ((ContainerStackItem) {
+        kv_push(container_stack, ((ContainerStackItem) {
           .stack_index = kv_size(stack),
           .s = p,
           .container = tv,
           .special_val = NULL,
         }));
-        kv_push(ValuesStackItem, stack, OBJ(tv, false, didcomma, didcolon));
+        kv_push(stack, OBJ(tv, false, didcomma, didcolon));
         break;
       }
       case '{': {
@@ -845,13 +843,13 @@ json_decode_string_cycle_start:
             .vval = { .v_dict = dict },
           };
         }
-        kv_push(ContainerStackItem, container_stack, ((ContainerStackItem) {
+        kv_push(container_stack, ((ContainerStackItem) {
           .stack_index = kv_size(stack),
           .s = p,
           .container = tv,
           .special_val = val_list,
         }));
-        kv_push(ValuesStackItem, stack, OBJ(tv, false, didcomma, didcolon));
+        kv_push(stack, OBJ(tv, false, didcomma, didcolon));
         break;
       }
       default: {
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index c651a50be9..ee66b7cf09 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -6,6 +6,7 @@
 
 #include <msgpack.h>
 #include <inttypes.h>
+#include <stddef.h>
 #include <assert.h>
 #include <math.h>
 
@@ -22,6 +23,7 @@
 #include "nvim/ascii.h"
 #include "nvim/vim.h"  // For _()
 #include "nvim/lib/kvec.h"
+#include "nvim/eval/typval_encode.h"
 
 #define ga_concat(a, b) ga_concat(a, (char_u *)b)
 #define utf_ptr2char(b) utf_ptr2char((char_u *)b)
@@ -32,29 +34,6 @@
 #define convert_setup(vcp, from, to) \
     (convert_setup(vcp, (char_u *)from, (char_u *)to))
 
-/// Structure representing current VimL to messagepack conversion state
-typedef struct {
-  enum {
-    kMPConvDict,   ///< Convert dict_T *dictionary.
-    kMPConvList,   ///< Convert list_T *list.
-    kMPConvPairs,  ///< Convert mapping represented as a list_T* of pairs.
-  } type;
-  union {
-    struct {
-      dict_T *dict;    ///< Currently converted dictionary.
-      hashitem_T *hi;  ///< Currently converted dictionary item.
-      size_t todo;     ///< Amount of items left to process.
-    } d;  ///< State of dictionary conversion.
-    struct {
-      list_T *list;    ///< Currently converted list.
-      listitem_T *li;  ///< Currently converted list item.
-    } l;  ///< State of list or generic mapping conversion.
-  } data;  ///< Data to convert.
-} MPConvStackVal;
-
-/// Stack used to convert VimL values to messagepack.
-typedef kvec_t(MPConvStackVal) MPConvStack;
-
 const char *const encode_special_var_names[] = {
   [kSpecialVarNull] = "null",
   [kSpecialVarTrue] = "true",
@@ -129,9 +108,12 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack,
 {
   garray_T msg_ga;
   ga_init(&msg_ga, (int)sizeof(char), 80);
-  char *const key_msg = _("key %s");
-  char *const key_pair_msg = _("key %s at index %i from special map");
-  char *const idx_msg = _("index %i");
+  const char *const key_msg = _("key %s");
+  const char *const key_pair_msg = _("key %s at index %i from special map");
+  const char *const idx_msg = _("index %i");
+  const char *const partial_arg_msg = _("partial");
+  const char *const partial_arg_i_msg = _("argument %i");
+  const char *const partial_self_msg = _("partial self dictionary");
   for (size_t i = 0; i < kv_size(*mpstack); i++) {
     if (i != 0) {
       ga_concat(&msg_ga, ", ");
@@ -175,6 +157,29 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack,
         }
         break;
       }
+      case kMPConvPartial: {
+        switch (v.data.p.stage) {
+          case kMPConvPartialArgs: {
+            assert(false);
+            break;
+          }
+          case kMPConvPartialSelf: {
+            ga_concat(&msg_ga, partial_arg_msg);
+            break;
+          }
+          case kMPConvPartialEnd: {
+            ga_concat(&msg_ga, partial_self_msg);
+            break;
+          }
+        }
+        break;
+      }
+      case kMPConvPartialList: {
+        const int idx = (int)(v.data.a.arg - v.data.a.argv) - 1;
+        vim_snprintf((char *)IObuff, IOSIZE, partial_arg_i_msg, idx);
+        ga_concat(&msg_ga, IObuff);
+        break;
+      }
     }
   }
   EMSG3(msg, objname, (kv_size(*mpstack) == 0
@@ -275,368 +280,7 @@ int encode_read_from_list(ListReaderState *const state, char *const buf,
           : OK);
 }
 
-/// Code for checking whether container references itself
-///
-/// @param[in,out]  val  Container to check.
-/// @param  copyID_attr  Name of the container attribute that holds copyID.
-///                      After checking whether value of this attribute is
-///                      copyID (variable) it is set to copyID.
-#define CHECK_SELF_REFERENCE(val, copyID_attr, conv_type) \
-    do { \
-      if ((val)->copyID_attr == copyID) { \
-        CONV_RECURSE((val), conv_type); \
-      } \
-      (val)->copyID_attr = copyID; \
-    } while (0)
-
-#define TV_STRLEN(tv) \
-    (tv->vval.v_string == NULL ? 0 : STRLEN(tv->vval.v_string))
-
-/// Define functions which convert VimL value to something else
-///
-/// Creates function `vim_to_{name}(firstargtype firstargname, typval_T *const
-/// tv)` which returns OK or FAIL and helper functions.
-///
-/// @param  firstargtype  Type of the first argument. It will be used to return
-///                       the results.
-/// @param  firstargname  Name of the first argument.
-/// @param  name  Name of the target converter.
-#define DEFINE_VIML_CONV_FUNCTIONS(scope, name, firstargtype, firstargname) \
-static int name##_convert_one_value(firstargtype firstargname, \
-                                    MPConvStack *const mpstack, \
-                                    typval_T *const tv, \
-                                    const int copyID, \
-                                    const char *const objname) \
-  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT \
-{ \
-  switch (tv->v_type) { \
-    case VAR_STRING: { \
-      CONV_STRING(tv->vval.v_string, TV_STRLEN(tv)); \
-      break; \
-    } \
-    case VAR_NUMBER: { \
-      CONV_NUMBER(tv->vval.v_number); \
-      break; \
-    } \
-    case VAR_FLOAT: { \
-      CONV_FLOAT(tv->vval.v_float); \
-      break; \
-    } \
-    case VAR_FUNC: { \
-      CONV_FUNC(tv->vval.v_string); \
-      break; \
-    } \
-    case VAR_LIST: { \
-      if (tv->vval.v_list == NULL || tv->vval.v_list->lv_len == 0) { \
-        CONV_EMPTY_LIST(); \
-        break; \
-      } \
-      CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, kMPConvList); \
-      CONV_LIST_START(tv->vval.v_list); \
-      kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-        .type = kMPConvList, \
-        .data = { \
-          .l = { \
-            .list = tv->vval.v_list, \
-            .li = tv->vval.v_list->lv_first, \
-          }, \
-        }, \
-      })); \
-      break; \
-    } \
-    case VAR_SPECIAL: { \
-      switch (tv->vval.v_special) { \
-        case kSpecialVarNull: { \
-          CONV_NIL(); \
-          break; \
-        } \
-        case kSpecialVarTrue: \
-        case kSpecialVarFalse: { \
-          CONV_BOOL(tv->vval.v_special == kSpecialVarTrue); \
-          break; \
-        } \
-      } \
-      break; \
-    } \
-    case VAR_DICT: { \
-      if (tv->vval.v_dict == NULL \
-          || tv->vval.v_dict->dv_hashtab.ht_used == 0) { \
-        CONV_EMPTY_DICT(); \
-        break; \
-      } \
-      const dictitem_T *type_di; \
-      const dictitem_T *val_di; \
-      if (CONV_ALLOW_SPECIAL \
-          && tv->vval.v_dict->dv_hashtab.ht_used == 2 \
-          && (type_di = dict_find((dict_T *) tv->vval.v_dict, \
-                                  (char_u *) "_TYPE", -1)) != NULL \
-          && type_di->di_tv.v_type == VAR_LIST \
-          && (val_di = dict_find((dict_T *) tv->vval.v_dict, \
-                                 (char_u *) "_VAL", -1)) != NULL) { \
-        size_t i; \
-        for (i = 0; i < ARRAY_SIZE(eval_msgpack_type_lists); i++) { \
-          if (type_di->di_tv.vval.v_list == eval_msgpack_type_lists[i]) { \
-            break; \
-          } \
-        } \
-        if (i == ARRAY_SIZE(eval_msgpack_type_lists)) { \
-          goto name##_convert_one_value_regular_dict; \
-        } \
-        switch ((MessagePackType) i) { \
-          case kMPNil: { \
-            CONV_NIL(); \
-            break; \
-          } \
-          case kMPBoolean: { \
-            if (val_di->di_tv.v_type != VAR_NUMBER) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            CONV_BOOL(val_di->di_tv.vval.v_number); \
-            break; \
-          } \
-          case kMPInteger: { \
-            const list_T *val_list; \
-            varnumber_T sign; \
-            varnumber_T highest_bits; \
-            varnumber_T high_bits; \
-            varnumber_T low_bits; \
-            /* List of 4 integers; first is signed (should be 1 or -1, but */ \
-            /* this is not checked), second is unsigned and have at most */ \
-            /* one (sign is -1) or two (sign is 1) non-zero bits (number of */ \
-            /* bits is not checked), other unsigned and have at most 31 */ \
-            /* non-zero bits (number of bits is not checked).*/ \
-            if (val_di->di_tv.v_type != VAR_LIST \
-                || (val_list = val_di->di_tv.vval.v_list) == NULL \
-                || val_list->lv_len != 4 \
-                || val_list->lv_first->li_tv.v_type != VAR_NUMBER \
-                || (sign = val_list->lv_first->li_tv.vval.v_number) == 0 \
-                || val_list->lv_first->li_next->li_tv.v_type != VAR_NUMBER \
-                || (highest_bits = \
-                    val_list->lv_first->li_next->li_tv.vval.v_number) < 0 \
-                || val_list->lv_last->li_prev->li_tv.v_type != VAR_NUMBER \
-                || (high_bits = \
-                    val_list->lv_last->li_prev->li_tv.vval.v_number) < 0 \
-                || val_list->lv_last->li_tv.v_type != VAR_NUMBER \
-                || (low_bits = val_list->lv_last->li_tv.vval.v_number) < 0) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            uint64_t number = ((uint64_t) (((uint64_t) highest_bits) << 62) \
-                               | (uint64_t) (((uint64_t) high_bits) << 31) \
-                               | (uint64_t) low_bits); \
-            if (sign > 0) { \
-              CONV_UNSIGNED_NUMBER(number); \
-            } else { \
-              CONV_NUMBER(-number); \
-            } \
-            break; \
-          } \
-          case kMPFloat: { \
-            if (val_di->di_tv.v_type != VAR_FLOAT) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            CONV_FLOAT(val_di->di_tv.vval.v_float); \
-            break; \
-          } \
-          case kMPString: \
-          case kMPBinary: { \
-            const bool is_string = ((MessagePackType) i == kMPString); \
-            if (val_di->di_tv.v_type != VAR_LIST) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            size_t len; \
-            char *buf; \
-            if (!encode_vim_list_to_buf(val_di->di_tv.vval.v_list, &len, \
-                                        &buf)) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            if (is_string) { \
-              CONV_STR_STRING(buf, len); \
-            } else { \
-              CONV_STRING(buf, len); \
-            } \
-            xfree(buf); \
-            break; \
-          } \
-          case kMPArray: { \
-            if (val_di->di_tv.v_type != VAR_LIST) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            CHECK_SELF_REFERENCE(val_di->di_tv.vval.v_list, lv_copyID, \
-                                 kMPConvList); \
-            CONV_LIST_START(val_di->di_tv.vval.v_list); \
-            kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-              .type = kMPConvList, \
-              .data = { \
-                .l = { \
-                  .list = val_di->di_tv.vval.v_list, \
-                  .li = val_di->di_tv.vval.v_list->lv_first, \
-                }, \
-              }, \
-            })); \
-            break; \
-          } \
-          case kMPMap: { \
-            if (val_di->di_tv.v_type != VAR_LIST) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            list_T *const val_list = val_di->di_tv.vval.v_list; \
-            if (val_list == NULL || val_list->lv_len == 0) { \
-              CONV_EMPTY_DICT(); \
-              break; \
-            } \
-            for (const listitem_T *li = val_list->lv_first; li != NULL; \
-                 li = li->li_next) { \
-              if (li->li_tv.v_type != VAR_LIST \
-                  || li->li_tv.vval.v_list->lv_len != 2) { \
-                goto name##_convert_one_value_regular_dict; \
-              } \
-            } \
-            CHECK_SELF_REFERENCE(val_list, lv_copyID, kMPConvPairs); \
-            CONV_DICT_START(val_list->lv_len); \
-            kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-              .type = kMPConvPairs, \
-              .data = { \
-                .l = { \
-                  .list = val_list, \
-                  .li = val_list->lv_first, \
-                }, \
-              }, \
-            })); \
-            break; \
-          } \
-          case kMPExt: { \
-            const list_T *val_list; \
-            varnumber_T type; \
-            if (val_di->di_tv.v_type != VAR_LIST \
-                || (val_list = val_di->di_tv.vval.v_list) == NULL \
-                || val_list->lv_len != 2 \
-                || (val_list->lv_first->li_tv.v_type != VAR_NUMBER) \
-                || (type = val_list->lv_first->li_tv.vval.v_number) > INT8_MAX \
-                || type < INT8_MIN \
-                || (val_list->lv_last->li_tv.v_type != VAR_LIST)) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            size_t len; \
-            char *buf; \
-            if (!encode_vim_list_to_buf(val_list->lv_last->li_tv.vval.v_list, \
-                                        &len, &buf)) { \
-              goto name##_convert_one_value_regular_dict; \
-            } \
-            CONV_EXT_STRING(buf, len, type); \
-            xfree(buf); \
-            break; \
-          } \
-        } \
-        break; \
-      } \
-name##_convert_one_value_regular_dict: \
-      CHECK_SELF_REFERENCE(tv->vval.v_dict, dv_copyID, kMPConvDict); \
-      CONV_DICT_START(tv->vval.v_dict->dv_hashtab.ht_used); \
-      kv_push(MPConvStackVal, *mpstack, ((MPConvStackVal) { \
-        .type = kMPConvDict, \
-        .data = { \
-          .d = { \
-            .dict = tv->vval.v_dict, \
-            .hi = tv->vval.v_dict->dv_hashtab.ht_array, \
-            .todo = tv->vval.v_dict->dv_hashtab.ht_used, \
-          }, \
-        }, \
-      })); \
-      break; \
-    } \
-    case VAR_UNKNOWN: { \
-      EMSG2(_(e_intern2), #name "_convert_one_value()"); \
-      return FAIL; \
-    } \
-  } \
-  return OK; \
-} \
-\
-scope int encode_vim_to_##name(firstargtype firstargname, typval_T *const tv, \
-                               const char *const objname) \
-  FUNC_ATTR_WARN_UNUSED_RESULT \
-{ \
-  const int copyID = get_copyID(); \
-  MPConvStack mpstack; \
-  kv_init(mpstack); \
-  if (name##_convert_one_value(firstargname, &mpstack, tv, copyID, objname) \
-      == FAIL) { \
-    goto encode_vim_to_##name##_error_ret; \
-  } \
-  while (kv_size(mpstack)) { \
-    MPConvStackVal *cur_mpsv = &kv_A(mpstack, kv_size(mpstack) - 1); \
-    typval_T *cur_tv = NULL; \
-    switch (cur_mpsv->type) { \
-      case kMPConvDict: { \
-        if (!cur_mpsv->data.d.todo) { \
-          (void) kv_pop(mpstack); \
-          cur_mpsv->data.d.dict->dv_copyID = copyID - 1; \
-          CONV_DICT_END(); \
-          continue; \
-        } else if (cur_mpsv->data.d.todo \
-                   != cur_mpsv->data.d.dict->dv_hashtab.ht_used) { \
-          CONV_DICT_BETWEEN_ITEMS(); \
-        } \
-        while (HASHITEM_EMPTY(cur_mpsv->data.d.hi)) { \
-          cur_mpsv->data.d.hi++; \
-        } \
-        dictitem_T *const di = HI2DI(cur_mpsv->data.d.hi); \
-        cur_mpsv->data.d.todo--; \
-        cur_mpsv->data.d.hi++; \
-        CONV_STR_STRING(&di->di_key[0], STRLEN(&di->di_key[0])); \
-        CONV_DICT_AFTER_KEY(); \
-        cur_tv = &di->di_tv; \
-        break; \
-      } \
-      case kMPConvList: { \
-        if (cur_mpsv->data.l.li == NULL) { \
-          (void) kv_pop(mpstack); \
-          cur_mpsv->data.l.list->lv_copyID = copyID - 1; \
-          CONV_LIST_END(cur_mpsv->data.l.list); \
-          continue; \
-        } else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) { \
-          CONV_LIST_BETWEEN_ITEMS(); \
-        } \
-        cur_tv = &cur_mpsv->data.l.li->li_tv; \
-        cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next; \
-        break; \
-      } \
-      case kMPConvPairs: { \
-        if (cur_mpsv->data.l.li == NULL) { \
-          (void) kv_pop(mpstack); \
-          cur_mpsv->data.l.list->lv_copyID = copyID - 1; \
-          CONV_DICT_END(); \
-          continue; \
-        } else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) { \
-          CONV_DICT_BETWEEN_ITEMS(); \
-        } \
-        const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list; \
-        CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair); \
-        if (name##_convert_one_value(firstargname, &mpstack, \
-                                     &kv_pair->lv_first->li_tv, copyID, \
-                                     objname) == FAIL) { \
-          goto encode_vim_to_##name##_error_ret; \
-        } \
-        CONV_DICT_AFTER_KEY(); \
-        cur_tv = &kv_pair->lv_last->li_tv; \
-        cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next; \
-        break; \
-      } \
-    } \
-    assert(cur_tv != NULL); \
-    if (name##_convert_one_value(firstargname, &mpstack, cur_tv, copyID, \
-                                 objname) == FAIL) { \
-      goto encode_vim_to_##name##_error_ret; \
-    } \
-  } \
-  kv_destroy(mpstack); \
-  return OK; \
-encode_vim_to_##name##_error_ret: \
-  kv_destroy(mpstack); \
-  return FAIL; \
-}
-
-#define CONV_STRING(buf, len) \
+#define TYPVAL_ENCODE_CONV_STRING(tv, buf, len) \
     do { \
       const char *const buf_ = (const char *) buf; \
       if (buf == NULL) { \
@@ -655,19 +299,19 @@ encode_vim_to_##name##_error_ret: \
       } \
     } while (0)
 
-#define CONV_STR_STRING(buf, len) \
-    CONV_STRING(buf, len)
+#define TYPVAL_ENCODE_CONV_STR_STRING(tv, buf, len) \
+    TYPVAL_ENCODE_CONV_STRING(tv, buf, len)
 
-#define CONV_EXT_STRING(buf, len, type)
+#define TYPVAL_ENCODE_CONV_EXT_STRING(tv, buf, len, type)
 
-#define CONV_NUMBER(num) \
+#define TYPVAL_ENCODE_CONV_NUMBER(tv, num) \
     do { \
       char numbuf[NUMBUFLEN]; \
       vim_snprintf(numbuf, ARRAY_SIZE(numbuf), "%" PRId64, (int64_t) (num)); \
       ga_concat(gap, numbuf); \
     } while (0)
 
-#define CONV_FLOAT(flt) \
+#define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
     do { \
       const float_T flt_ = (flt); \
       switch (fpclassify(flt_)) { \
@@ -690,51 +334,77 @@ encode_vim_to_##name##_error_ret: \
       } \
     } while (0)
 
-#define CONV_FUNC(fun) \
+#define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \
     do { \
-      ga_concat(gap, "function("); \
-      CONV_STRING(fun, STRLEN(fun)); \
-      ga_append(gap, ')'); \
+      const char *const fun_ = (const char *)(fun); \
+      if (fun_ == NULL) { \
+        EMSG2(_(e_intern2), "string(): NULL function name"); \
+        ga_concat(gap, "function(NULL"); \
+      } else { \
+        ga_concat(gap, "function("); \
+        TYPVAL_ENCODE_CONV_STRING(tv, fun_, strlen(fun_)); \
+      }\
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv, len) \
+    do { \
+      if (len != 0) { \
+        ga_concat(gap, ", "); \
+      } \
     } while (0)
 
-#define CONV_EMPTY_LIST() \
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, len) \
+    do { \
+      if ((ptrdiff_t)len != -1) { \
+        ga_concat(gap, ", "); \
+      } \
+    } while (0)
+
+#define TYPVAL_ENCODE_CONV_FUNC_END(tv) \
+    ga_append(gap, ')')
+
+#define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \
     ga_concat(gap, "[]")
 
-#define CONV_LIST_START(lst) \
+#define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \
     ga_append(gap, '[')
 
-#define CONV_EMPTY_DICT() \
+#define TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START(tv, mpsv)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
     ga_concat(gap, "{}")
 
-#define CONV_NIL() \
+#define TYPVAL_ENCODE_CONV_NIL(tv) \
     ga_concat(gap, "v:null")
 
-#define CONV_BOOL(num) \
+#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
     ga_concat(gap, ((num)? "v:true": "v:false"))
 
-#define CONV_UNSIGNED_NUMBER(num)
+#define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER(tv, num)
 
-#define CONV_DICT_START(len) \
+#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len) \
     ga_append(gap, '{')
 
-#define CONV_DICT_END() \
+#define TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, dict, mpsv)
+
+#define TYPVAL_ENCODE_CONV_DICT_END(tv, dict) \
     ga_append(gap, '}')
 
-#define CONV_DICT_AFTER_KEY() \
+#define TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(tv, dict) \
     ga_concat(gap, ": ")
 
-#define CONV_DICT_BETWEEN_ITEMS() \
+#define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(tv, dict) \
     ga_concat(gap, ", ")
 
-#define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair)
+#define TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(label, key)
 
-#define CONV_LIST_END(lst) \
+#define TYPVAL_ENCODE_CONV_LIST_END(tv) \
     ga_append(gap, ']')
 
-#define CONV_LIST_BETWEEN_ITEMS() \
-    CONV_DICT_BETWEEN_ITEMS()
+#define TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(tv) \
+    TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(tv, NULL)
 
-#define CONV_RECURSE(val, conv_type) \
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \
     do { \
       if (!did_echo_string_emsg) { \
         /* Only give this message once for a recursive call to avoid */ \
@@ -761,15 +431,22 @@ encode_vim_to_##name##_error_ret: \
       } \
       vim_snprintf(ebuf, ARRAY_SIZE(ebuf), "{E724@%zu}", backref); \
       ga_concat(gap, &ebuf[0]); \
-      return OK; \
     } while (0)
 
-#define CONV_ALLOW_SPECIAL false
+#define TYPVAL_ENCODE_ALLOW_SPECIALS false
 
-DEFINE_VIML_CONV_FUNCTIONS(static, string, garray_T *const, gap)
+#define TYPVAL_ENCODE_SCOPE static
+#define TYPVAL_ENCODE_NAME string
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE garray_T *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME gap
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
 
-#undef CONV_RECURSE
-#define CONV_RECURSE(val, conv_type) \
+#undef TYPVAL_ENCODE_CONV_RECURSE
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \
     do { \
       char ebuf[NUMBUFLEN + 7]; \
       size_t backref = 0; \
@@ -796,10 +473,18 @@ DEFINE_VIML_CONV_FUNCTIONS(static, string, garray_T *const, gap)
       return OK; \
     } while (0)
 
-DEFINE_VIML_CONV_FUNCTIONS(, echo, garray_T *const, gap)
-
-#undef CONV_RECURSE
-#define CONV_RECURSE(val, conv_type) \
+#define TYPVAL_ENCODE_SCOPE
+#define TYPVAL_ENCODE_NAME echo
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE garray_T *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME gap
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
+
+#undef TYPVAL_ENCODE_CONV_RECURSE
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \
     do { \
       if (!did_echo_string_emsg) { \
         /* Only give this message once for a recursive call to avoid */ \
@@ -808,30 +493,29 @@ DEFINE_VIML_CONV_FUNCTIONS(, echo, garray_T *const, gap)
         EMSG(_("E724: unable to correctly dump variable " \
                "with self-referencing container")); \
       } \
-      return OK; \
     } while (0)
 
-#undef CONV_ALLOW_SPECIAL
-#define CONV_ALLOW_SPECIAL true
+#undef TYPVAL_ENCODE_ALLOW_SPECIALS
+#define TYPVAL_ENCODE_ALLOW_SPECIALS true
 
-#undef CONV_NIL
-#define CONV_NIL() \
+#undef TYPVAL_ENCODE_CONV_NIL
+#define TYPVAL_ENCODE_CONV_NIL(tv) \
       ga_concat(gap, "null")
 
-#undef CONV_BOOL
-#define CONV_BOOL(num) \
+#undef TYPVAL_ENCODE_CONV_BOOL
+#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
       ga_concat(gap, ((num)? "true": "false"))
 
-#undef CONV_UNSIGNED_NUMBER
-#define CONV_UNSIGNED_NUMBER(num) \
+#undef TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+#define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER(tv, num) \
       do { \
         char numbuf[NUMBUFLEN]; \
         vim_snprintf(numbuf, ARRAY_SIZE(numbuf), "%" PRIu64, (num)); \
         ga_concat(gap, numbuf); \
       } while (0)
 
-#undef CONV_FLOAT
-#define CONV_FLOAT(flt) \
+#undef TYPVAL_ENCODE_CONV_FLOAT
+#define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
     do { \
       const float_T flt_ = (flt); \
       switch (fpclassify(flt_)) { \
@@ -1019,24 +703,24 @@ static inline int convert_to_json_string(garray_T *const gap,
   return OK;
 }
 
-#undef CONV_STRING
-#define CONV_STRING(buf, len) \
+#undef TYPVAL_ENCODE_CONV_STRING
+#define TYPVAL_ENCODE_CONV_STRING(tv, buf, len) \
     do { \
       if (convert_to_json_string(gap, (const char *) (buf), (len)) != OK) { \
         return FAIL; \
       } \
     } while (0)
 
-#undef CONV_EXT_STRING
-#define CONV_EXT_STRING(buf, len, type) \
+#undef TYPVAL_ENCODE_CONV_EXT_STRING
+#define TYPVAL_ENCODE_CONV_EXT_STRING(tv, buf, len, type) \
     do { \
       xfree(buf); \
       EMSG(_("E474: Unable to convert EXT string to JSON")); \
       return FAIL; \
     } while (0)
 
-#undef CONV_FUNC
-#define CONV_FUNC(fun) \
+#undef TYPVAL_ENCODE_CONV_FUNC_START
+#define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \
     return conv_error(_("E474: Error while dumping %s, %s: " \
                         "attempt to dump function reference"), \
                       mpstack, objname)
@@ -1044,9 +728,8 @@ static inline int convert_to_json_string(garray_T *const gap,
 /// Check whether given key can be used in json_encode()
 ///
 /// @param[in]  tv  Key to check.
-static inline bool check_json_key(const typval_T *const tv)
+bool encode_check_json_key(const typval_T *const tv)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
-  FUNC_ATTR_ALWAYS_INLINE
 {
   if (tv->v_type == VAR_STRING) {
     return true;
@@ -1080,38 +763,51 @@ static inline bool check_json_key(const typval_T *const tv)
   return true;
 }
 
-#undef CONV_SPECIAL_DICT_KEY_CHECK
-#define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair) \
+#undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+#define TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(label, key) \
     do { \
-      if (!check_json_key(&kv_pair->lv_first->li_tv)) { \
+      if (!encode_check_json_key(&key)) { \
         EMSG(_("E474: Invalid key in special dictionary")); \
-        goto encode_vim_to_##name##_error_ret; \
+        goto label; \
       } \
     } while (0)
 
-DEFINE_VIML_CONV_FUNCTIONS(static, json, garray_T *const, gap)
-
-#undef CONV_STRING
-#undef CONV_STR_STRING
-#undef CONV_EXT_STRING
-#undef CONV_NUMBER
-#undef CONV_FLOAT
-#undef CONV_FUNC
-#undef CONV_EMPTY_LIST
-#undef CONV_LIST_START
-#undef CONV_EMPTY_DICT
-#undef CONV_NIL
-#undef CONV_BOOL
-#undef CONV_UNSIGNED_NUMBER
-#undef CONV_DICT_START
-#undef CONV_DICT_END
-#undef CONV_DICT_AFTER_KEY
-#undef CONV_DICT_BETWEEN_ITEMS
-#undef CONV_SPECIAL_DICT_KEY_CHECK
-#undef CONV_LIST_END
-#undef CONV_LIST_BETWEEN_ITEMS
-#undef CONV_RECURSE
-#undef CONV_ALLOW_SPECIAL
+#define TYPVAL_ENCODE_SCOPE static
+#define TYPVAL_ENCODE_NAME json
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE garray_T *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME gap
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
+
+#undef TYPVAL_ENCODE_CONV_STRING
+#undef TYPVAL_ENCODE_CONV_STR_STRING
+#undef TYPVAL_ENCODE_CONV_EXT_STRING
+#undef TYPVAL_ENCODE_CONV_NUMBER
+#undef TYPVAL_ENCODE_CONV_FLOAT
+#undef TYPVAL_ENCODE_CONV_FUNC_START
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF
+#undef TYPVAL_ENCODE_CONV_FUNC_END
+#undef TYPVAL_ENCODE_CONV_EMPTY_LIST
+#undef TYPVAL_ENCODE_CONV_LIST_START
+#undef TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START
+#undef TYPVAL_ENCODE_CONV_EMPTY_DICT
+#undef TYPVAL_ENCODE_CONV_NIL
+#undef TYPVAL_ENCODE_CONV_BOOL
+#undef TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+#undef TYPVAL_ENCODE_CONV_DICT_START
+#undef TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START
+#undef TYPVAL_ENCODE_CONV_DICT_END
+#undef TYPVAL_ENCODE_CONV_DICT_AFTER_KEY
+#undef TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+#undef TYPVAL_ENCODE_CONV_LIST_END
+#undef TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_CONV_RECURSE
+#undef TYPVAL_ENCODE_ALLOW_SPECIALS
 
 /// Return a string with the string representation of a variable.
 /// Puts quotes around strings, so that they can be parsed back by eval().
@@ -1125,7 +821,10 @@ char *encode_tv2string(typval_T *tv, size_t *len)
 {
   garray_T ga;
   ga_init(&ga, (int)sizeof(char), 80);
-  encode_vim_to_string(&ga, tv, "encode_tv2string() argument");
+  const int evs_ret = encode_vim_to_string(&ga, tv,
+                                           "encode_tv2string() argument");
+  (void)evs_ret;
+  assert(evs_ret == OK);
   did_echo_string_emsg = false;
   if (len != NULL) {
     *len = (size_t) ga.ga_len;
@@ -1151,7 +850,9 @@ char *encode_tv2echo(typval_T *tv, size_t *len)
       ga_concat(&ga, tv->vval.v_string);
     }
   } else {
-    encode_vim_to_echo(&ga, tv, ":echo argument");
+    const int eve_ret = encode_vim_to_echo(&ga, tv, ":echo argument");
+    (void)eve_ret;
+    assert(eve_ret == OK);
   }
   if (len != NULL) {
     *len = (size_t) ga.ga_len;
@@ -1172,16 +873,19 @@ char *encode_tv2json(typval_T *tv, size_t *len)
 {
   garray_T ga;
   ga_init(&ga, (int)sizeof(char), 80);
-  encode_vim_to_json(&ga, tv, "encode_tv2json() argument");
+  const int evj_ret = encode_vim_to_json(&ga, tv, "encode_tv2json() argument");
+  if (!evj_ret) {
+    ga_clear(&ga);
+  }
   did_echo_string_emsg = false;
   if (len != NULL) {
-    *len = (size_t) ga.ga_len;
+    *len = (size_t)ga.ga_len;
   }
   ga_append(&ga, '\0');
-  return (char *) ga.ga_data;
+  return (char *)ga.ga_data;
 }
 
-#define CONV_STRING(buf, len) \
+#define TYPVAL_ENCODE_CONV_STRING(tv, buf, len) \
     do { \
       if (buf == NULL) { \
         msgpack_pack_bin(packer, 0); \
@@ -1192,7 +896,7 @@ char *encode_tv2json(typval_T *tv, size_t *len)
       } \
     } while (0)
 
-#define CONV_STR_STRING(buf, len) \
+#define TYPVAL_ENCODE_CONV_STR_STRING(tv, buf, len) \
     do { \
       if (buf == NULL) { \
         msgpack_pack_str(packer, 0); \
@@ -1203,7 +907,7 @@ char *encode_tv2json(typval_T *tv, size_t *len)
       } \
     } while (0)
 
-#define CONV_EXT_STRING(buf, len, type) \
+#define TYPVAL_ENCODE_CONV_EXT_STRING(tv, buf, len, type) \
     do { \
       if (buf == NULL) { \
         msgpack_pack_ext(packer, 0, (int8_t) type); \
@@ -1214,30 +918,36 @@ char *encode_tv2json(typval_T *tv, size_t *len)
       } \
     } while (0)
 
-#define CONV_NUMBER(num) \
-    msgpack_pack_int64(packer, (int64_t) (num))
+#define TYPVAL_ENCODE_CONV_NUMBER(tv, num) \
+    msgpack_pack_int64(packer, (int64_t)(num))
 
-#define CONV_FLOAT(flt) \
-    msgpack_pack_double(packer, (double) (flt))
+#define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
+    msgpack_pack_double(packer, (double)(flt))
 
-#define CONV_FUNC(fun) \
-    return conv_error(_("E951: Error while dumping %s, %s: " \
+#define TYPVAL_ENCODE_CONV_FUNC_START(tv, fun) \
+    return conv_error(_("E5004: Error while dumping %s, %s: " \
                         "attempt to dump function reference"), \
                       mpstack, objname)
 
-#define CONV_EMPTY_LIST() \
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv, len)
+#define TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, len)
+#define TYPVAL_ENCODE_CONV_FUNC_END(tv)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_LIST(tv) \
     msgpack_pack_array(packer, 0)
 
-#define CONV_LIST_START(lst) \
-    msgpack_pack_array(packer, (size_t) (lst)->lv_len)
+#define TYPVAL_ENCODE_CONV_LIST_START(tv, len) \
+    msgpack_pack_array(packer, (size_t)(len))
 
-#define CONV_EMPTY_DICT() \
+#define TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START(tv, mpsv)
+
+#define TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, dict) \
     msgpack_pack_map(packer, 0)
 
-#define CONV_NIL() \
+#define TYPVAL_ENCODE_CONV_NIL(tv) \
     msgpack_pack_nil(packer)
 
-#define CONV_BOOL(num) \
+#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
     do { \
       if ((num)) { \
         msgpack_pack_true(packer); \
@@ -1246,51 +956,66 @@ char *encode_tv2json(typval_T *tv, size_t *len)
       } \
     } while (0)
 
-#define CONV_UNSIGNED_NUMBER(num) \
+#define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER(tv, num) \
     msgpack_pack_uint64(packer, (num))
 
-#define CONV_DICT_START(len) \
-    msgpack_pack_map(packer, (size_t) (len))
+#define TYPVAL_ENCODE_CONV_DICT_START(tv, dict, len) \
+    msgpack_pack_map(packer, (size_t)(len))
+
+#define TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, dict, mpsv)
 
-#define CONV_DICT_END()
+#define TYPVAL_ENCODE_CONV_DICT_END(tv, dict)
 
-#define CONV_DICT_AFTER_KEY()
+#define TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(tv, dict)
 
-#define CONV_DICT_BETWEEN_ITEMS()
+#define TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(tv, dict)
 
-#define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair)
+#define TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(label, key)
 
-#define CONV_LIST_END(lst)
+#define TYPVAL_ENCODE_CONV_LIST_END(tv)
 
-#define CONV_LIST_BETWEEN_ITEMS()
+#define TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(tv)
 
-#define CONV_RECURSE(val, conv_type) \
-    return conv_error(_("E952: Unable to dump %s: " \
+#define TYPVAL_ENCODE_CONV_RECURSE(val, conv_type) \
+    return conv_error(_("E5005: Unable to dump %s: " \
                         "container references itself in %s"), \
                       mpstack, objname)
 
-#define CONV_ALLOW_SPECIAL true
-
-DEFINE_VIML_CONV_FUNCTIONS(, msgpack, msgpack_packer *const, packer)
-
-#undef CONV_STRING
-#undef CONV_STR_STRING
-#undef CONV_EXT_STRING
-#undef CONV_NUMBER
-#undef CONV_FLOAT
-#undef CONV_FUNC
-#undef CONV_EMPTY_LIST
-#undef CONV_LIST_START
-#undef CONV_EMPTY_DICT
-#undef CONV_NIL
-#undef CONV_BOOL
-#undef CONV_UNSIGNED_NUMBER
-#undef CONV_DICT_START
-#undef CONV_DICT_END
-#undef CONV_DICT_AFTER_KEY
-#undef CONV_DICT_BETWEEN_ITEMS
-#undef CONV_SPECIAL_DICT_KEY_CHECK
-#undef CONV_LIST_END
-#undef CONV_LIST_BETWEEN_ITEMS
-#undef CONV_RECURSE
-#undef CONV_ALLOW_SPECIAL
+#define TYPVAL_ENCODE_ALLOW_SPECIALS true
+
+#define TYPVAL_ENCODE_SCOPE
+#define TYPVAL_ENCODE_NAME msgpack
+#define TYPVAL_ENCODE_FIRST_ARG_TYPE msgpack_packer *const
+#define TYPVAL_ENCODE_FIRST_ARG_NAME packer
+#include "nvim/eval/typval_encode.c.h"
+#undef TYPVAL_ENCODE_SCOPE
+#undef TYPVAL_ENCODE_NAME
+#undef TYPVAL_ENCODE_FIRST_ARG_TYPE
+#undef TYPVAL_ENCODE_FIRST_ARG_NAME
+
+#undef TYPVAL_ENCODE_CONV_STRING
+#undef TYPVAL_ENCODE_CONV_STR_STRING
+#undef TYPVAL_ENCODE_CONV_EXT_STRING
+#undef TYPVAL_ENCODE_CONV_NUMBER
+#undef TYPVAL_ENCODE_CONV_FLOAT
+#undef TYPVAL_ENCODE_CONV_FUNC_START
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS
+#undef TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF
+#undef TYPVAL_ENCODE_CONV_FUNC_END
+#undef TYPVAL_ENCODE_CONV_EMPTY_LIST
+#undef TYPVAL_ENCODE_CONV_LIST_START
+#undef TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START
+#undef TYPVAL_ENCODE_CONV_EMPTY_DICT
+#undef TYPVAL_ENCODE_CONV_NIL
+#undef TYPVAL_ENCODE_CONV_BOOL
+#undef TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+#undef TYPVAL_ENCODE_CONV_DICT_START
+#undef TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START
+#undef TYPVAL_ENCODE_CONV_DICT_END
+#undef TYPVAL_ENCODE_CONV_DICT_AFTER_KEY
+#undef TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+#undef TYPVAL_ENCODE_CONV_LIST_END
+#undef TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS
+#undef TYPVAL_ENCODE_CONV_RECURSE
+#undef TYPVAL_ENCODE_ALLOW_SPECIALS
diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h
new file mode 100644
index 0000000000..365eb2dd77
--- /dev/null
+++ b/src/nvim/eval/typval_encode.c.h
@@ -0,0 +1,802 @@
+/// @file eval/typval_encode.c.h
+///
+/// Contains set of macros used to convert (possibly recursive) typval_T into
+/// something else. For these macros to work the following macros must be
+/// defined:
+
+/// @def TYPVAL_ENCODE_CONV_NIL
+/// @brief Macros used to convert NIL value
+///
+/// Is called both for special dictionary (unless #TYPVAL_ENCODE_ALLOW_SPECIALS
+/// is false) and `v:null`.
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. May
+///             point to special dictionary.
+
+/// @def TYPVAL_ENCODE_CONV_BOOL
+/// @brief Macros used to convert boolean value
+///
+/// Is called both for special dictionary (unless #TYPVAL_ENCODE_ALLOW_SPECIALS
+/// is false) and `v:true`/`v:false`.
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. May
+///             point to a special dictionary.
+/// @param  num  Boolean value to convert. Value is an expression which
+///              evaluates to some integer.
+
+/// @def TYPVAL_ENCODE_CONV_NUMBER
+/// @brief Macros used to convert integer
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. May
+///             point to a special dictionary.
+/// @param  num  Integer to convert, must accept both varnumber_T and int64_t.
+
+/// @def TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER
+/// @brief Macros used to convert unsigned integer
+///
+/// Not used if #TYPVAL_ENCODE_ALLOW_SPECIALS is false, but still must be
+/// defined.
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. Points
+///             to a special dictionary.
+/// @param  num  Integer to convert, must accept uint64_t.
+
+/// @def TYPVAL_ENCODE_CONV_FLOAT
+/// @brief Macros used to convert floating-point number
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. May
+///             point to a special dictionary.
+/// @param  flt  Number to convert, must accept float_T.
+
+/// @def TYPVAL_ENCODE_CONV_STRING
+/// @brief Macros used to convert plain string
+///
+/// Is used to convert VAR_STRING objects as well as BIN strings represented as
+/// special dictionary.
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. May
+///             point to a special dictionary.
+/// @param  buf  String to convert. Is a char[] buffer, not NUL-terminated.
+/// @param  len  String length.
+
+/// @def TYPVAL_ENCODE_CONV_STR_STRING
+/// @brief Like #TYPVAL_ENCODE_CONV_STRING, but for STR strings
+///
+/// Is used to convert dictionary keys and STR strings represented as special
+/// dictionaries.
+///
+/// @param  tv  Pointer to typval where value is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  buf  String to convert. Is a char[] buffer, not NUL-terminated.
+/// @param  len  String length.
+
+/// @def TYPVAL_ENCODE_CONV_EXT_STRING
+/// @brief Macros used to convert EXT string
+///
+/// Is used to convert EXT strings represented as special dictionaries. Never
+/// actually used if #TYPVAL_ENCODE_ALLOW_SPECIALS is false, but still must be
+/// defined.
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL. Points
+///             to a special dictionary.
+/// @param  buf  String to convert. Is a char[] buffer, not NUL-terminated.
+/// @param  len  String length.
+/// @param  type  EXT type.
+
+/// @def TYPVAL_ENCODE_CONV_FUNC_START
+/// @brief Macros used when starting to convert a funcref or a partial
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL.
+/// @param  fun  Function name. May be NULL.
+
+/// @def TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS
+/// @brief Macros used before starting to convert partial arguments
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL.
+/// @param  len  Number of arguments. Zero for absent arguments or when
+///              converting a funcref.
+
+/// @def TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF
+/// @brief Macros used before starting to convert self dictionary
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL.
+/// @param  len  Number of arguments. May be zero for empty dictionary or -1 for
+///              missing self dictionary, also when converting function
+///              reference.
+
+/// @def TYPVAL_ENCODE_CONV_FUNC_END
+/// @brief Macros used after converting a funcref or a partial
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL.
+
+/// @def TYPVAL_ENCODE_CONV_EMPTY_LIST
+/// @brief Macros used to convert an empty list
+///
+/// @param  tv  Pointer to typval where value is stored. May not be NULL.
+
+/// @def TYPVAL_ENCODE_CONV_EMPTY_DICT
+/// @brief Macros used to convert an empty dictionary
+///
+/// @param  tv  Pointer to typval where value is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
+///               (for dictionaries represented as special lists).
+
+/// @def TYPVAL_ENCODE_CONV_LIST_START
+/// @brief Macros used before starting to convert non-empty list
+///
+/// @param  tv  Pointer to typval where value is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  len  List length. Is an expression which evaluates to an integer.
+
+/// @def TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START
+/// @brief Macros used after pushing list onto the stack
+///
+/// Only used for real list_T* lists, not for special dictionaries or partial
+/// arguments.
+///
+/// @param  tv  Pointer to typval where value is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  mpsv  Pushed MPConvStackVal value.
+
+/// @def TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS
+/// @brief Macros used after finishing converting non-last list item
+///
+/// @param  tv  Pointer to typval where list is stored. May be NULL.
+
+/// @def TYPVAL_ENCODE_CONV_LIST_END
+/// @brief Macros used after converting non-empty list
+///
+/// @param  tv  Pointer to typval where list is stored. May be NULL.
+
+/// @def TYPVAL_ENCODE_CONV_DICT_START
+/// @brief Macros used before starting to convert non-empty dictionary
+///
+/// Only used for real dict_T* dictionaries, not for special dictionaries. Also
+/// used for partial self dictionary.
+///
+/// @param  tv  Pointer to typval where dictionary is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
+///               (for dictionaries represented as special lists).
+/// @param  len  Dictionary length. Is an expression which evaluates to an
+///              integer.
+
+/// @def TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START
+/// @brief Macros used after pushing dictionary onto the stack
+///
+/// @param  tv  Pointer to typval where dictionary is stored. May be NULL.
+///             May not point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue.
+/// @param  mpsv  Pushed MPConvStackVal value.
+
+/// @def TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK
+/// @brief Macros used to check special dictionary key
+///
+/// @param  label  Label for goto in case check was not successfull.
+/// @param  key  typval_T key to check.
+
+/// @def TYPVAL_ENCODE_CONV_DICT_AFTER_KEY
+/// @brief Macros used after finishing converting dictionary key
+///
+/// @param  tv  Pointer to typval where dictionary is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
+///               (for dictionaries represented as special lists).
+
+/// @def TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS
+/// @brief Macros used after finishing converting non-last dictionary value
+///
+/// @param  tv  Pointer to typval where dictionary is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
+///               (for dictionaries represented as special lists).
+
+/// @def TYPVAL_ENCODE_CONV_DICT_END
+/// @brief Macros used after converting non-empty dictionary
+///
+/// @param  tv  Pointer to typval where dictionary is stored. May be NULL. May
+///             point to a special dictionary.
+/// @param  dict  Converted dictionary, lvalue or #TYPVAL_ENCODE_NODICT_VAR
+///               (for dictionaries represented as special lists).
+
+/// @def TYPVAL_ENCODE_CONV_RECURSE
+/// @brief Macros used when self-containing container is detected
+///
+/// @param  val  Container for which this situation was detected.
+/// @param  conv_type  Type of the stack entry, @see MPConvStackValType.
+
+/// @def TYPVAL_ENCODE_ALLOW_SPECIALS
+/// @brief Macros that specifies whether special dictionaries are special
+///
+/// Must be something that evaluates to boolean, most likely `true` or `false`.
+/// If it is false then special dictionaries are not treated specially.
+
+/// @def TYPVAL_ENCODE_SCOPE
+/// @brief Scope of the main function: either nothing or `static`
+
+/// @def TYPVAL_ENCODE_NAME
+/// @brief Name of the target converter
+///
+/// After including this file it will define function
+/// `encode_vim_to_{TYPVAL_ENCODE_NAME}` with scope #TYPVAL_ENCODE_SCOPE and
+/// static functions `_typval_encode_{TYPVAL_ENCODE_NAME}_convert_one_value` and
+/// `_typval_encode_{TYPVAL_ENCODE_NAME}_check_self_reference`.
+
+/// @def TYPVAL_ENCODE_FIRST_ARG_TYPE
+/// @brief Type of the first argument, which will be used to return the results
+///
+/// Is expected to be a pointer type.
+
+/// @def TYPVAL_ENCODE_FIRST_ARG_NAME
+/// @brief Name of the first argument
+///
+/// This name will only be used by one of the above macros which are defined by
+/// the caller. Functions defined here do not use first argument directly.
+#ifndef NVIM_EVAL_TYPVAL_ENCODE_C_H
+#define NVIM_EVAL_TYPVAL_ENCODE_C_H
+#undef NVIM_EVAL_TYPVAL_ENCODE_C_H
+
+#include <stddef.h>
+#include <inttypes.h>
+#include <assert.h>
+
+#include "nvim/lib/kvec.h"
+#include "nvim/eval_defs.h"
+#include "nvim/eval/encode.h"
+#include "nvim/func_attr.h"
+#include "nvim/eval/typval_encode.h"
+
+/// Dummy variable used because some macros need lvalue
+///
+/// Must not be written to, if needed one must check that address of the
+/// macros argument is (not) equal to `&TYPVAL_ENCODE_NODICT_VAR`.
+const dict_T *const TYPVAL_ENCODE_NODICT_VAR = NULL;
+
+static inline int _TYPVAL_ENCODE_CHECK_SELF_REFERENCE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    void *const val, int *const val_copyID,
+    const MPConvStack *const mpstack, const int copyID,
+    const MPConvStackValType conv_type,
+    const char *const objname)
+  REAL_FATTR_NONNULL_ARG(2, 3, 4, 7) REAL_FATTR_WARN_UNUSED_RESULT
+  REAL_FATTR_ALWAYS_INLINE;
+
+/// Function for checking whether container references itself
+///
+/// @param  TYPVAL_ENCODE_FIRST_ARG_NAME  First argument.
+/// @param[in,out]  val  Container to check.
+/// @param  val_copyID  Pointer to the container attribute that holds copyID.
+///                     After checking whether value of this attribute is
+///                     copyID (variable) it is set to copyID.
+/// @param[in]  mpstack  Stack with values to convert. Read-only, used for error
+///                      reporting.
+/// @param[in]  copyID  CopyID used by the caller.
+/// @param[in]  conv_type  Type of the conversion, @see MPConvStackValType.
+/// @param[in]  objname  Object name, used for error reporting.
+///
+/// @return NOTDONE in case of success, what to return in case of failure.
+static inline int _TYPVAL_ENCODE_CHECK_SELF_REFERENCE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    void *const val, int *const val_copyID,
+    const MPConvStack *const mpstack, const int copyID,
+    const MPConvStackValType conv_type,
+    const char *const objname)
+{
+  if (*val_copyID == copyID) {
+    TYPVAL_ENCODE_CONV_RECURSE(val, conv_type);
+    return OK;
+  }
+  *val_copyID = copyID;
+  return NOTDONE;
+}
+
+static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    MPConvStack *const mpstack, MPConvStackVal *const cur_mpsv,
+    typval_T *const tv, const int copyID,
+    const char *const objname)
+  REAL_FATTR_NONNULL_ARG(2, 4, 6) REAL_FATTR_WARN_UNUSED_RESULT;
+
+/// Convert single value
+///
+/// Only scalar values are converted immediately, everything else is pushed onto
+/// the stack.
+///
+/// @param  TYPVAL_ENCODE_FIRST_ARG_NAME  First argument, defined by the
+///                                       includer. Only meaningful to macros
+///                                       defined by the includer.
+/// @param  mpstack  Stack with values to convert. Values which are not
+///                  converted completely by this function (i.e.
+///                  non-scalars) are pushed here.
+/// @param  cur_mpsv  Currently converted value from stack.
+/// @param  tv  Converted value.
+/// @param[in]  copyID  CopyID.
+/// @param[in]  objname  Object name, used for error reporting.
+///
+/// @return OK in case of success, FAIL in case of failure.
+static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    MPConvStack *const mpstack, MPConvStackVal *const cur_mpsv,
+    typval_T *const tv, const int copyID,
+    const char *const objname)
+{
+  switch (tv->v_type) {
+    case VAR_STRING: {
+      TYPVAL_ENCODE_CONV_STRING(tv, tv->vval.v_string, tv_strlen(tv));
+      break;
+    }
+    case VAR_NUMBER: {
+      TYPVAL_ENCODE_CONV_NUMBER(tv, tv->vval.v_number);
+      break;
+    }
+    case VAR_FLOAT: {
+      TYPVAL_ENCODE_CONV_FLOAT(tv, tv->vval.v_float);
+      break;
+    }
+    case VAR_FUNC: {
+      TYPVAL_ENCODE_CONV_FUNC_START(tv, tv->vval.v_string);
+      TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv, 0);
+      TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, -1);
+      TYPVAL_ENCODE_CONV_FUNC_END(tv);
+      break;
+    }
+    case VAR_PARTIAL: {
+      partial_T *const pt = tv->vval.v_partial;
+      (void)pt;
+      TYPVAL_ENCODE_CONV_FUNC_START(tv, (pt == NULL ? NULL : pt->pt_name));
+      _mp_push(*mpstack, ((MPConvStackVal) {
+        .type = kMPConvPartial,
+        .tv = tv,
+        .data = {
+          .p = {
+            .stage = kMPConvPartialArgs,
+            .pt = tv->vval.v_partial,
+          },
+        },
+      }));
+      break;
+    }
+    case VAR_LIST: {
+      if (tv->vval.v_list == NULL || tv->vval.v_list->lv_len == 0) {
+        TYPVAL_ENCODE_CONV_EMPTY_LIST(tv);
+        break;
+      }
+      _TYPVAL_ENCODE_DO_CHECK_SELF_REFERENCE(tv->vval.v_list, lv_copyID, copyID,
+                                             kMPConvList);
+      TYPVAL_ENCODE_CONV_LIST_START(tv, tv->vval.v_list->lv_len);
+      _mp_push(*mpstack, ((MPConvStackVal) {
+        .type = kMPConvList,
+        .tv = tv,
+        .data = {
+          .l = {
+            .list = tv->vval.v_list,
+            .li = tv->vval.v_list->lv_first,
+          },
+        },
+      }));
+      TYPVAL_ENCODE_CONV_REAL_LIST_AFTER_START(tv, _mp_last(*mpstack));
+      break;
+    }
+    case VAR_SPECIAL: {
+      switch (tv->vval.v_special) {
+        case kSpecialVarNull: {
+          TYPVAL_ENCODE_CONV_NIL(tv);
+          break;
+        }
+        case kSpecialVarTrue:
+        case kSpecialVarFalse: {
+          TYPVAL_ENCODE_CONV_BOOL(tv, tv->vval.v_special == kSpecialVarTrue);
+          break;
+        }
+      }
+      break;
+    }
+    case VAR_DICT: {
+      if (tv->vval.v_dict == NULL
+          || tv->vval.v_dict->dv_hashtab.ht_used == 0) {
+        TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, tv->vval.v_dict);
+        break;
+      }
+      const dictitem_T *type_di;
+      const dictitem_T *val_di;
+      if (TYPVAL_ENCODE_ALLOW_SPECIALS
+          && tv->vval.v_dict->dv_hashtab.ht_used == 2
+          && (type_di = dict_find((dict_T *)tv->vval.v_dict,
+                                  (char_u *)"_TYPE", -1)) != NULL
+          && type_di->di_tv.v_type == VAR_LIST
+          && (val_di = dict_find((dict_T *)tv->vval.v_dict,
+                                 (char_u *)"_VAL", -1)) != NULL) {
+        size_t i;
+        for (i = 0; i < ARRAY_SIZE(eval_msgpack_type_lists); i++) {
+          if (type_di->di_tv.vval.v_list == eval_msgpack_type_lists[i]) {
+            break;
+          }
+        }
+        if (i == ARRAY_SIZE(eval_msgpack_type_lists)) {
+          goto _convert_one_value_regular_dict;
+        }
+        switch ((MessagePackType)i) {
+          case kMPNil: {
+            TYPVAL_ENCODE_CONV_NIL(tv);
+            break;
+          }
+          case kMPBoolean: {
+            if (val_di->di_tv.v_type != VAR_NUMBER) {
+              goto _convert_one_value_regular_dict;
+            }
+            TYPVAL_ENCODE_CONV_BOOL(tv, val_di->di_tv.vval.v_number);
+            break;
+          }
+          case kMPInteger: {
+            const list_T *val_list;
+            varnumber_T sign;
+            varnumber_T highest_bits;
+            varnumber_T high_bits;
+            varnumber_T low_bits;
+            // List of 4 integers; first is signed (should be 1 or -1, but
+            // this is not checked), second is unsigned and have at most
+            // one (sign is -1) or two (sign is 1) non-zero bits (number of
+            // bits is not checked), other unsigned and have at most 31
+            // non-zero bits (number of bits is not checked).
+            if (val_di->di_tv.v_type != VAR_LIST
+                || (val_list = val_di->di_tv.vval.v_list) == NULL
+                || val_list->lv_len != 4
+                || val_list->lv_first->li_tv.v_type != VAR_NUMBER
+                || (sign = val_list->lv_first->li_tv.vval.v_number) == 0
+                || val_list->lv_first->li_next->li_tv.v_type != VAR_NUMBER
+                || (highest_bits =
+                    val_list->lv_first->li_next->li_tv.vval.v_number) < 0
+                || val_list->lv_last->li_prev->li_tv.v_type != VAR_NUMBER
+                || (high_bits =
+                    val_list->lv_last->li_prev->li_tv.vval.v_number) < 0
+                || val_list->lv_last->li_tv.v_type != VAR_NUMBER
+                || (low_bits = val_list->lv_last->li_tv.vval.v_number) < 0) {
+              goto _convert_one_value_regular_dict;
+            }
+            uint64_t number = ((uint64_t)(((uint64_t)highest_bits) << 62)
+                               | (uint64_t)(((uint64_t)high_bits) << 31)
+                               | (uint64_t)low_bits);
+            if (sign > 0) {
+              TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER(tv, number);
+            } else {
+              TYPVAL_ENCODE_CONV_NUMBER(tv, -number);
+            }
+            break;
+          }
+          case kMPFloat: {
+            if (val_di->di_tv.v_type != VAR_FLOAT) {
+              goto _convert_one_value_regular_dict;
+            }
+            TYPVAL_ENCODE_CONV_FLOAT(tv, val_di->di_tv.vval.v_float);
+            break;
+          }
+          case kMPString:
+          case kMPBinary: {
+            const bool is_string = ((MessagePackType)i == kMPString);
+            if (val_di->di_tv.v_type != VAR_LIST) {
+              goto _convert_one_value_regular_dict;
+            }
+            size_t len;
+            char *buf;
+            if (!encode_vim_list_to_buf(val_di->di_tv.vval.v_list, &len,
+                                        &buf)) {
+              goto _convert_one_value_regular_dict;
+            }
+            if (is_string) {
+              TYPVAL_ENCODE_CONV_STR_STRING(tv, buf, len);
+            } else {
+              TYPVAL_ENCODE_CONV_STRING(tv, buf, len);
+            }
+            xfree(buf);
+            break;
+          }
+          case kMPArray: {
+            if (val_di->di_tv.v_type != VAR_LIST) {
+              goto _convert_one_value_regular_dict;
+            }
+            _TYPVAL_ENCODE_DO_CHECK_SELF_REFERENCE(val_di->di_tv.vval.v_list,
+                                                   lv_copyID, copyID,
+                                                   kMPConvList);
+            TYPVAL_ENCODE_CONV_LIST_START(tv,
+                                          val_di->di_tv.vval.v_list->lv_len);
+            _mp_push(*mpstack, ((MPConvStackVal) {
+              .tv = tv,
+              .type = kMPConvList,
+              .data = {
+                .l = {
+                  .list = val_di->di_tv.vval.v_list,
+                  .li = val_di->di_tv.vval.v_list->lv_first,
+                },
+              },
+            }));
+            break;
+          }
+          case kMPMap: {
+            if (val_di->di_tv.v_type != VAR_LIST) {
+              goto _convert_one_value_regular_dict;
+            }
+            list_T *const val_list = val_di->di_tv.vval.v_list;
+            if (val_list == NULL || val_list->lv_len == 0) {
+              TYPVAL_ENCODE_CONV_EMPTY_DICT(tv, TYPVAL_ENCODE_NODICT_VAR);
+              break;
+            }
+            for (const listitem_T *li = val_list->lv_first; li != NULL;
+                 li = li->li_next) {
+              if (li->li_tv.v_type != VAR_LIST
+                  || li->li_tv.vval.v_list->lv_len != 2) {
+                goto _convert_one_value_regular_dict;
+              }
+            }
+            _TYPVAL_ENCODE_DO_CHECK_SELF_REFERENCE(val_list, lv_copyID, copyID,
+                                                   kMPConvPairs);
+            TYPVAL_ENCODE_CONV_DICT_START(tv, TYPVAL_ENCODE_NODICT_VAR,
+                                          val_list->lv_len);
+            _mp_push(*mpstack, ((MPConvStackVal) {
+              .tv = tv,
+              .type = kMPConvPairs,
+              .data = {
+                .l = {
+                  .list = val_list,
+                  .li = val_list->lv_first,
+                },
+              },
+            }));
+            break;
+          }
+          case kMPExt: {
+            const list_T *val_list;
+            varnumber_T type;
+            if (val_di->di_tv.v_type != VAR_LIST
+                || (val_list = val_di->di_tv.vval.v_list) == NULL
+                || val_list->lv_len != 2
+                || (val_list->lv_first->li_tv.v_type != VAR_NUMBER)
+                || (type = val_list->lv_first->li_tv.vval.v_number) > INT8_MAX
+                || type < INT8_MIN
+                || (val_list->lv_last->li_tv.v_type != VAR_LIST)) {
+              goto _convert_one_value_regular_dict;
+            }
+            size_t len;
+            char *buf;
+            if (!encode_vim_list_to_buf(val_list->lv_last->li_tv.vval.v_list,
+                                        &len, &buf)) {
+              goto _convert_one_value_regular_dict;
+            }
+            TYPVAL_ENCODE_CONV_EXT_STRING(tv, buf, len, type);
+            xfree(buf);
+            break;
+          }
+        }
+        break;
+      }
+_convert_one_value_regular_dict:
+      _TYPVAL_ENCODE_DO_CHECK_SELF_REFERENCE(tv->vval.v_dict, dv_copyID, copyID,
+                                             kMPConvDict);
+      TYPVAL_ENCODE_CONV_DICT_START(tv, tv->vval.v_dict,
+                                    tv->vval.v_dict->dv_hashtab.ht_used);
+      _mp_push(*mpstack, ((MPConvStackVal) {
+        .tv = tv,
+        .type = kMPConvDict,
+        .data = {
+          .d = {
+            .dict = tv->vval.v_dict,
+            .dictp = &tv->vval.v_dict,
+            .hi = tv->vval.v_dict->dv_hashtab.ht_array,
+            .todo = tv->vval.v_dict->dv_hashtab.ht_used,
+          },
+        },
+      }));
+      TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(tv, tv->vval.v_dict,
+                                               _mp_last(*mpstack));
+      break;
+    }
+    case VAR_UNKNOWN: {
+      EMSG2(_(e_intern2), STR(_TYPVAL_ENCODE_CONVERT_ONE_VALUE) "()");
+      return FAIL;
+    }
+  }
+typval_encode_stop_converting_one_item:
+  return OK;
+  // Prevent “unused label” warnings.
+  goto typval_encode_stop_converting_one_item;
+}
+
+TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    typval_T *const tv, const char *const objname)
+  REAL_FATTR_NONNULL_ARG(2, 3) REAL_FATTR_WARN_UNUSED_RESULT;
+
+/// Convert the whole typval
+///
+/// @param  TYPVAL_ENCODE_FIRST_ARG_NAME  First argument, defined by the
+///                                       includer. Only meaningful to macros
+///                                       defined by the includer.
+/// @param  top_tv  Converted value.
+/// @param[in]  objname  Object name, used for error reporting.
+///
+/// @return OK in case of success, FAIL in case of failure.
+TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
+    TYPVAL_ENCODE_FIRST_ARG_TYPE TYPVAL_ENCODE_FIRST_ARG_NAME,
+    typval_T *const top_tv, const char *const objname)
+{
+  const int copyID = get_copyID();
+  MPConvStack mpstack;
+  _mp_init(mpstack);
+  if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack,
+                                       NULL,
+                                       top_tv, copyID, objname)
+      == FAIL) {
+    goto encode_vim_to__error_ret;
+  }
+/// Label common for this and convert_one_value functions, used for escaping
+/// from macros like TYPVAL_ENCODE_CONV_DICT_START.
+typval_encode_stop_converting_one_item:
+  while (_mp_size(mpstack)) {
+    MPConvStackVal *cur_mpsv = &_mp_last(mpstack);
+    typval_T *tv = NULL;
+    switch (cur_mpsv->type) {
+      case kMPConvDict: {
+        if (!cur_mpsv->data.d.todo) {
+          (void)_mp_pop(mpstack);
+          cur_mpsv->data.d.dict->dv_copyID = copyID - 1;
+          TYPVAL_ENCODE_CONV_DICT_END(cur_mpsv->tv, *cur_mpsv->data.d.dictp);
+          continue;
+        } else if (cur_mpsv->data.d.todo
+                   != cur_mpsv->data.d.dict->dv_hashtab.ht_used) {
+          TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(cur_mpsv->tv,
+                                                *cur_mpsv->data.d.dictp);
+        }
+        while (HASHITEM_EMPTY(cur_mpsv->data.d.hi)) {
+          cur_mpsv->data.d.hi++;
+        }
+        dictitem_T *const di = HI2DI(cur_mpsv->data.d.hi);
+        cur_mpsv->data.d.todo--;
+        cur_mpsv->data.d.hi++;
+        TYPVAL_ENCODE_CONV_STR_STRING(NULL, &di->di_key[0],
+                                      strlen((char *)&di->di_key[0]));
+        TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(cur_mpsv->tv,
+                                          *cur_mpsv->data.d.dictp);
+        tv = &di->di_tv;
+        break;
+      }
+      case kMPConvList: {
+        if (cur_mpsv->data.l.li == NULL) {
+          (void)_mp_pop(mpstack);
+          cur_mpsv->data.l.list->lv_copyID = copyID - 1;
+          TYPVAL_ENCODE_CONV_LIST_END(cur_mpsv->tv);
+          continue;
+        } else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) {
+          TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(cur_mpsv->tv);
+        }
+        tv = &cur_mpsv->data.l.li->li_tv;
+        cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next;
+        break;
+      }
+      case kMPConvPairs: {
+        if (cur_mpsv->data.l.li == NULL) {
+          (void)_mp_pop(mpstack);
+          cur_mpsv->data.l.list->lv_copyID = copyID - 1;
+          TYPVAL_ENCODE_CONV_DICT_END(cur_mpsv->tv, TYPVAL_ENCODE_NODICT_VAR);
+          continue;
+        } else if (cur_mpsv->data.l.li != cur_mpsv->data.l.list->lv_first) {
+          TYPVAL_ENCODE_CONV_DICT_BETWEEN_ITEMS(
+              cur_mpsv->tv, TYPVAL_ENCODE_NODICT_VAR);
+        }
+        const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list;
+        TYPVAL_ENCODE_SPECIAL_DICT_KEY_CHECK(
+            encode_vim_to__error_ret, kv_pair->lv_first->li_tv);
+        if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME,
+                                             &mpstack, cur_mpsv,
+                                             &kv_pair->lv_first->li_tv,
+                                             copyID,
+                                             objname) == FAIL) {
+          goto encode_vim_to__error_ret;
+        }
+        TYPVAL_ENCODE_CONV_DICT_AFTER_KEY(cur_mpsv->tv,
+                                          TYPVAL_ENCODE_NODICT_VAR);
+        tv = &kv_pair->lv_last->li_tv;
+        cur_mpsv->data.l.li = cur_mpsv->data.l.li->li_next;
+        break;
+      }
+      case kMPConvPartial: {
+        partial_T *const pt = cur_mpsv->data.p.pt;
+        tv = cur_mpsv->tv;
+        switch (cur_mpsv->data.p.stage) {
+          case kMPConvPartialArgs: {
+            TYPVAL_ENCODE_CONV_FUNC_BEFORE_ARGS(tv,
+                                                pt == NULL ? 0 : pt->pt_argc);
+            cur_mpsv->data.p.stage = kMPConvPartialSelf;
+            if (pt != NULL && pt->pt_argc > 0) {
+              TYPVAL_ENCODE_CONV_LIST_START(NULL, pt->pt_argc);
+              _mp_push(mpstack, ((MPConvStackVal) {
+                .type = kMPConvPartialList,
+                .tv = NULL,
+                .data = {
+                  .a = {
+                    .arg = pt->pt_argv,
+                    .argv = pt->pt_argv,
+                    .todo = (size_t)pt->pt_argc,
+                  },
+                },
+              }));
+            }
+            break;
+          }
+          case kMPConvPartialSelf: {
+            cur_mpsv->data.p.stage = kMPConvPartialEnd;
+            dict_T *const dict = pt == NULL ? NULL : pt->pt_dict;
+            if (dict != NULL) {
+              TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, dict->dv_hashtab.ht_used);
+              if (dict->dv_hashtab.ht_used == 0) {
+                TYPVAL_ENCODE_CONV_EMPTY_DICT(NULL, pt->pt_dict);
+                continue;
+              }
+              const int te_csr_ret = _TYPVAL_ENCODE_CHECK_SELF_REFERENCE(
+                  TYPVAL_ENCODE_FIRST_ARG_NAME,
+                  dict, &dict->dv_copyID, &mpstack, copyID, kMPConvDict,
+                  objname);
+              if (te_csr_ret != NOTDONE) {
+                if (te_csr_ret == FAIL) {
+                  goto encode_vim_to__error_ret;
+                } else {
+                  continue;
+                }
+              }
+              TYPVAL_ENCODE_CONV_DICT_START(NULL, pt->pt_dict,
+                                            dict->dv_hashtab.ht_used);
+              _mp_push(mpstack, ((MPConvStackVal) {
+                .type = kMPConvDict,
+                .tv = NULL,
+                .data = {
+                  .d = {
+                    .dict = dict,
+                    .dictp = &pt->pt_dict,
+                    .hi = dict->dv_hashtab.ht_array,
+                    .todo = dict->dv_hashtab.ht_used,
+                  },
+                },
+              }));
+              TYPVAL_ENCODE_CONV_REAL_DICT_AFTER_START(NULL, pt->pt_dict,
+                                                       _mp_last(mpstack));
+            } else {
+              TYPVAL_ENCODE_CONV_FUNC_BEFORE_SELF(tv, -1);
+            }
+            break;
+          }
+          case kMPConvPartialEnd: {
+            TYPVAL_ENCODE_CONV_FUNC_END(tv);
+            (void)_mp_pop(mpstack);
+            break;
+          }
+        }
+        continue;
+      }
+      case kMPConvPartialList: {
+        if (!cur_mpsv->data.a.todo) {
+          (void)_mp_pop(mpstack);
+          TYPVAL_ENCODE_CONV_LIST_END(NULL);
+          continue;
+        } else if (cur_mpsv->data.a.argv != cur_mpsv->data.a.arg) {
+          TYPVAL_ENCODE_CONV_LIST_BETWEEN_ITEMS(NULL);
+        }
+        tv = cur_mpsv->data.a.arg++;
+        cur_mpsv->data.a.todo--;
+        break;
+      }
+    }
+    assert(tv != NULL);
+    if (_TYPVAL_ENCODE_CONVERT_ONE_VALUE(TYPVAL_ENCODE_FIRST_ARG_NAME, &mpstack,
+                                         cur_mpsv, tv, copyID, objname)
+        == FAIL) {
+      goto encode_vim_to__error_ret;
+    }
+  }
+  _mp_destroy(mpstack);
+  return OK;
+encode_vim_to__error_ret:
+  _mp_destroy(mpstack);
+  return FAIL;
+  // Prevent “unused label” warnings.
+  goto typval_encode_stop_converting_one_item;
+}
+#endif  // NVIM_EVAL_TYPVAL_ENCODE_C_H
diff --git a/src/nvim/eval/typval_encode.h b/src/nvim/eval/typval_encode.h
new file mode 100644
index 0000000000..ba325b8f55
--- /dev/null
+++ b/src/nvim/eval/typval_encode.h
@@ -0,0 +1,145 @@
+/// @file eval/typval_encode.h
+///
+/// Contains common definitions for eval/typval_encode.c.h. Most of time should
+/// not be included directly.
+#ifndef NVIM_EVAL_TYPVAL_ENCODE_H
+#define NVIM_EVAL_TYPVAL_ENCODE_H
+
+#include <stddef.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+
+#include "nvim/lib/kvec.h"
+#include "nvim/eval_defs.h"
+#include "nvim/func_attr.h"
+
+/// Type of the stack entry
+typedef enum {
+  kMPConvDict,  ///< Convert dict_T *dictionary.
+  kMPConvList,  ///< Convert list_T *list.
+  kMPConvPairs,  ///< Convert mapping represented as a list_T* of pairs.
+  kMPConvPartial,  ///< Convert partial_T* partial.
+  kMPConvPartialList,  ///< Convert argc/argv pair coming from a partial.
+} MPConvStackValType;
+
+/// Stage at which partial is being converted
+typedef enum {
+  kMPConvPartialArgs,  ///< About to convert arguments.
+  kMPConvPartialSelf,  ///< About to convert self dictionary.
+  kMPConvPartialEnd,  ///< Already converted everything.
+} MPConvPartialStage;
+
+/// Structure representing current VimL to messagepack conversion state
+typedef struct {
+  MPConvStackValType type;  ///< Type of the stack entry.
+  typval_T *tv;  ///< Currently converted typval_T.
+  union {
+    struct {
+      dict_T *dict;    ///< Currently converted dictionary.
+      dict_T **dictp;  ///< Location where that dictionary is stored.
+                       ///< Normally it is &.tv->vval.v_dict, but not when
+                       ///< converting partials.
+      hashitem_T *hi;  ///< Currently converted dictionary item.
+      size_t todo;     ///< Amount of items left to process.
+    } d;  ///< State of dictionary conversion.
+    struct {
+      list_T *list;    ///< Currently converted list.
+      listitem_T *li;  ///< Currently converted list item.
+    } l;  ///< State of list or generic mapping conversion.
+    struct {
+      MPConvPartialStage stage;  ///< Stage at which partial is being converted.
+      partial_T *pt;  ///< Currently converted partial.
+    } p;  ///< State of partial conversion.
+    struct {
+      typval_T *arg;    ///< Currently converted argument.
+      typval_T *argv;    ///< Start of the argument list.
+      size_t todo;  ///< Number of items left to process.
+    } a;  ///< State of list or generic mapping conversion.
+  } data;  ///< Data to convert.
+} MPConvStackVal;
+
+/// Stack used to convert VimL values to messagepack.
+typedef kvec_withinit_t(MPConvStackVal, 8) MPConvStack;
+
+// Defines for MPConvStack
+#define _mp_size kv_size
+#define _mp_init kvi_init
+#define _mp_destroy kvi_destroy
+#define _mp_push kvi_push
+#define _mp_pop kv_pop
+#define _mp_last kv_last
+
+static inline size_t tv_strlen(const typval_T *const tv)
+  REAL_FATTR_ALWAYS_INLINE REAL_FATTR_PURE REAL_FATTR_WARN_UNUSED_RESULT
+  REAL_FATTR_NONNULL_ALL;
+
+/// Length of the string stored in typval_T
+///
+/// @param[in]  tv  String for which to compute length for. Must be typval_T
+///                 with VAR_STRING.
+///
+/// @return Length of the string stored in typval_T, including 0 for NULL
+///         string.
+static inline size_t tv_strlen(const typval_T *const tv)
+{
+  assert(tv->v_type == VAR_STRING);
+  return (tv->vval.v_string == NULL
+          ? 0
+          : strlen((char *) tv->vval.v_string));
+}
+
+/// Code for checking whether container references itself
+///
+/// @param[in,out]  val  Container to check.
+/// @param  copyID_attr  Name of the container attribute that holds copyID.
+///                      After checking whether value of this attribute is
+///                      copyID (variable) it is set to copyID.
+/// @param[in]  copyID  CopyID used by the caller.
+/// @param  conv_type  Type of the conversion, @see MPConvStackValType.
+#define _TYPVAL_ENCODE_DO_CHECK_SELF_REFERENCE(val, copyID_attr, copyID, \
+                                               conv_type) \
+    do { \
+      const int te_csr_ret = _TYPVAL_ENCODE_CHECK_SELF_REFERENCE( \
+          TYPVAL_ENCODE_FIRST_ARG_NAME, \
+          (val), &(val)->copyID_attr, mpstack, copyID, conv_type, objname); \
+      if (te_csr_ret != NOTDONE) { \
+        return te_csr_ret; \
+      } \
+    } while (0)
+
+#define _TYPVAL_ENCODE_FUNC_NAME_INNER_2(pref, name, suf) \
+    pref##name##suf
+#define _TYPVAL_ENCODE_FUNC_NAME_INNER(pref, name, suf) \
+    _TYPVAL_ENCODE_FUNC_NAME_INNER_2(pref, name, suf)
+
+/// Construct function name, possibly using macros
+///
+/// Is used to expand macros that may appear in arguments.
+///
+/// @note Expands all arguments, even if only one is needed.
+///
+/// @param[in]  pref  Prefix.
+/// @param[in]  suf  Suffix.
+///
+/// @return Concat: pref + #TYPVAL_ENCODE_NAME + suf.
+#define _TYPVAL_ENCODE_FUNC_NAME(pref, suf) \
+    _TYPVAL_ENCODE_FUNC_NAME_INNER(pref, TYPVAL_ENCODE_NAME, suf)
+
+/// Self reference checker function name
+#define _TYPVAL_ENCODE_CHECK_SELF_REFERENCE \
+    _TYPVAL_ENCODE_FUNC_NAME(_typval_encode_, _check_self_reference)
+
+/// Entry point function name
+#define _TYPVAL_ENCODE_ENCODE \
+    _TYPVAL_ENCODE_FUNC_NAME(encode_vim_to_, )
+
+/// Name of the …convert_one_value function
+#define _TYPVAL_ENCODE_CONVERT_ONE_VALUE \
+    _TYPVAL_ENCODE_FUNC_NAME(_typval_encode_, _convert_one_value)
+
+/// Name of the dummy const dict_T *const variable
+#define TYPVAL_ENCODE_NODICT_VAR \
+    _TYPVAL_ENCODE_FUNC_NAME(_typval_encode_, _nodict_var)
+
+#endif  // NVIM_EVAL_TYPVAL_ENCODE_H
diff --git a/src/nvim/eval_defs.h b/src/nvim/eval_defs.h
index 8ffc0c98ce..f478d19ca1 100644
--- a/src/nvim/eval_defs.h
+++ b/src/nvim/eval_defs.h
@@ -15,6 +15,7 @@ typedef double float_T;
 
 typedef struct listvar_S list_T;
 typedef struct dictvar_S dict_T;
+typedef struct partial_S partial_T;
 
 /// Special variable values
 typedef enum {
@@ -35,12 +36,13 @@ typedef enum {
   VAR_UNKNOWN = 0,  ///< Unknown (unspecified) value.
   VAR_NUMBER,       ///< Number, .v_number is used.
   VAR_STRING,       ///< String, .v_string is used.
-  VAR_FUNC,         ///< Function referene, .v_string is used for function name.
+  VAR_FUNC,         ///< Function reference, .v_string is used as function name.
   VAR_LIST,         ///< List, .v_list is used.
   VAR_DICT,         ///< Dictionary, .v_dict is used.
   VAR_FLOAT,        ///< Floating-point value, .v_float is used.
   VAR_SPECIAL,      ///< Special value (true, false, null), .v_special
                     ///< is used.
+  VAR_PARTIAL,      ///< Partial, .v_partial is used.
 } VarType;
 
 /// Structure that holds an internal variable value
@@ -54,6 +56,7 @@ typedef struct {
     char_u *v_string;  ///< String, for VAR_STRING and VAR_FUNC, can be NULL.
     list_T *v_list;  ///< List for VAR_LIST, can be NULL.
     dict_T *v_dict;  ///< Dictionary for VAR_DICT, can be NULL.
+    partial_T *v_partial;  ///< Closure: function with args.
   }           vval;  ///< Actual value.
 } typval_T;
 
@@ -114,6 +117,16 @@ struct dictitem_S {
 
 typedef struct dictitem_S dictitem_T;
 
+/// A dictitem with a 16 character key (plus NUL)
+struct dictitem16_S {
+  typval_T di_tv;     ///< type and value of the variable
+  char_u di_flags;    ///< flags (only used for variable)
+  char_u di_key[17];  ///< key
+};
+
+typedef struct dictitem16_S dictitem16_T;
+
+
 #define DI_FLAGS_RO     1   // "di_flags" value: read-only variable
 #define DI_FLAGS_RO_SBX 2   // "di_flags" value: read-only in the sandbox
 #define DI_FLAGS_FIX    4   // "di_flags" value: fixed: no :unlet or remove()
@@ -134,6 +147,16 @@ struct dictvar_S {
   QUEUE watchers;         ///< Dictionary key watchers set by user code.
 };
 
+struct partial_S {
+  int pt_refcount;        ///< Reference count.
+  char_u *pt_name;        ///< Function name.
+  bool pt_auto;           ///< when true the partial was created for using
+                          ///< dict.member in handle_subscript().
+  int pt_argc;            ///< Number of arguments.
+  typval_T *pt_argv;      ///< Arguments in allocated array.
+  dict_T *pt_dict;        ///< Dict for "self".
+};
+
 // structure used for explicit stack while garbage collecting hash tables
 typedef struct ht_stack_S {
   hashtab_T *ht;
@@ -155,7 +178,21 @@ typedef struct list_stack_S {
 /// Convert a hashitem key pointer to a dictitem pointer
 #define HIKEY2DI(p)  ((dictitem_T *)(p - offsetof(dictitem_T, di_key)))
 
+/// Convert a hashitem value pointer to a dictitem pointer
+#define HIVAL2DI(p) \
+    ((dictitem_T *)(((char *)p) - offsetof(dictitem_T, di_tv)))
+
 /// Convert a hashitem pointer to a dictitem pointer
 #define HI2DI(hi)     HIKEY2DI((hi)->hi_key)
 
+/// Type of assert_* check being performed
+typedef enum
+{
+  ASSERT_EQUAL,
+  ASSERT_NOTEQUAL,
+  ASSERT_MATCH,
+  ASSERT_NOTMATCH,
+  ASSERT_OTHER,
+} assert_type_T;
+
 #endif  // NVIM_EVAL_DEFS_H
diff --git a/src/nvim/event/defs.h b/src/nvim/event/defs.h
index b802866a3d..e5335d9f25 100644
--- a/src/nvim/event/defs.h
+++ b/src/nvim/event/defs.h
@@ -14,19 +14,19 @@ typedef struct message {
 } Event;
 typedef void(*event_scheduler)(Event event, void *data);
 
-#define VA_EVENT_INIT(event, p, h, a)                   \
-  do {                                                  \
-    assert(a <= EVENT_HANDLER_MAX_ARGC);                \
-    (event)->priority = p;                              \
-    (event)->handler = h;                               \
-    if (a) {                                            \
-      va_list args;                                     \
-      va_start(args, a);                                \
-      for (int i = 0; i < a; i++) {                     \
-        (event)->argv[i] = va_arg(args, void *);        \
-      }                                                 \
-      va_end(args);                                     \
-    }                                                   \
+#define VA_EVENT_INIT(event, p, h, a) \
+  do { \
+    assert(a <= EVENT_HANDLER_MAX_ARGC); \
+    (event)->priority = p; \
+    (event)->handler = h; \
+    if (a) { \
+      va_list args; \
+      va_start(args, a); \
+      for (int i = 0; i < a; i++) { \
+        (event)->argv[i] = va_arg(args, void *); \
+      } \
+      va_end(args); \
+    } \
   } while (0)
 
 static inline Event event_create(int priority, argv_callback cb, int argc, ...)
diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c
index 9ef3468284..907187aa17 100644
--- a/src/nvim/event/libuv_process.c
+++ b/src/nvim/event/libuv_process.c
@@ -19,13 +19,12 @@ bool libuv_process_spawn(LibuvProcess *uvproc)
   Process *proc = (Process *)uvproc;
   uvproc->uvopts.file = proc->argv[0];
   uvproc->uvopts.args = proc->argv;
-  uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE
-                  | UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS;
+  uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE;
   if (proc->detach) {
       uvproc->uvopts.flags |= UV_PROCESS_DETACHED;
   }
   uvproc->uvopts.exit_cb = exit_cb;
-  uvproc->uvopts.cwd = NULL;
+  uvproc->uvopts.cwd = proc->cwd;
   uvproc->uvopts.env = NULL;
   uvproc->uvopts.stdio = uvproc->uvstdio;
   uvproc->uvopts.stdio_count = 3;
diff --git a/src/nvim/event/loop.c b/src/nvim/event/loop.c
index 6f3e6b9253..0e1775d01b 100644
--- a/src/nvim/event/loop.c
+++ b/src/nvim/event/loop.c
@@ -18,9 +18,9 @@ void loop_init(Loop *loop, void *data)
   loop->uv.data = loop;
   loop->children = kl_init(WatcherPtr);
   loop->children_stop_requests = 0;
-  loop->events = queue_new_parent(loop_on_put, loop);
-  loop->fast_events = queue_new_child(loop->events);
-  loop->thread_events = queue_new_parent(NULL, NULL);
+  loop->events = multiqueue_new_parent(loop_on_put, loop);
+  loop->fast_events = multiqueue_new_child(loop->events);
+  loop->thread_events = multiqueue_new_parent(NULL, NULL);
   uv_mutex_init(&loop->mutex);
   uv_async_init(&loop->uv, &loop->async, async_cb);
   uv_signal_init(&loop->uv, &loop->children_watcher);
@@ -53,19 +53,19 @@ void loop_poll_events(Loop *loop, int ms)
   }
 
   loop->recursive--;  // Can re-enter uv_run now
-  queue_process_events(loop->fast_events);
+  multiqueue_process_events(loop->fast_events);
 }
 
 // Schedule an event from another thread
 void loop_schedule(Loop *loop, Event event)
 {
   uv_mutex_lock(&loop->mutex);
-  queue_put_event(loop->thread_events, event);
+  multiqueue_put_event(loop->thread_events, event);
   uv_async_send(&loop->async);
   uv_mutex_unlock(&loop->mutex);
 }
 
-void loop_on_put(Queue *queue, void *data)
+void loop_on_put(MultiQueue *queue, void *data)
 {
   Loop *loop = data;
   // Sometimes libuv will run pending callbacks(timer for example) before
@@ -76,7 +76,7 @@ void loop_on_put(Queue *queue, void *data)
   uv_stop(&loop->uv);
 }
 
-void loop_close(Loop *loop)
+void loop_close(Loop *loop, bool wait)
 {
   uv_mutex_destroy(&loop->mutex);
   uv_close((uv_handle_t *)&loop->children_watcher, NULL);
@@ -84,21 +84,37 @@ void loop_close(Loop *loop)
   uv_close((uv_handle_t *)&loop->poll_timer, NULL);
   uv_close((uv_handle_t *)&loop->async, NULL);
   do {
-    uv_run(&loop->uv, UV_RUN_DEFAULT);
-  } while (uv_loop_close(&loop->uv));
-  queue_free(loop->fast_events);
-  queue_free(loop->thread_events);
-  queue_free(loop->events);
+    uv_run(&loop->uv, wait ? UV_RUN_DEFAULT : UV_RUN_NOWAIT);
+  } while (uv_loop_close(&loop->uv) && wait);
+  multiqueue_free(loop->fast_events);
+  multiqueue_free(loop->thread_events);
+  multiqueue_free(loop->events);
   kl_destroy(WatcherPtr, loop->children);
 }
 
+void loop_purge(Loop *loop)
+{
+  uv_mutex_lock(&loop->mutex);
+  multiqueue_purge_events(loop->thread_events);
+  multiqueue_purge_events(loop->fast_events);
+  uv_mutex_unlock(&loop->mutex);
+}
+
+size_t loop_size(Loop *loop)
+{
+  uv_mutex_lock(&loop->mutex);
+  size_t rv = multiqueue_size(loop->thread_events);
+  uv_mutex_unlock(&loop->mutex);
+  return rv;
+}
+
 static void async_cb(uv_async_t *handle)
 {
   Loop *l = handle->loop->data;
   uv_mutex_lock(&l->mutex);
-  while (!queue_empty(l->thread_events)) {
-    Event ev = queue_get(l->thread_events);
-    queue_put_event(l->fast_events, ev);
+  while (!multiqueue_empty(l->thread_events)) {
+    Event ev = multiqueue_get(l->thread_events);
+    multiqueue_put_event(l->fast_events, ev);
   }
   uv_mutex_unlock(&l->mutex);
 }
diff --git a/src/nvim/event/loop.h b/src/nvim/event/loop.h
index 0c1fcb5ed9..e7d7bdd483 100644
--- a/src/nvim/event/loop.h
+++ b/src/nvim/event/loop.h
@@ -7,7 +7,7 @@
 
 #include "nvim/lib/klist.h"
 #include "nvim/os/time.h"
-#include "nvim/event/queue.h"
+#include "nvim/event/multiqueue.h"
 
 typedef void * WatcherPtr;
 
@@ -16,7 +16,7 @@ KLIST_INIT(WatcherPtr, WatcherPtr, _noop)
 
 typedef struct loop {
   uv_loop_t uv;
-  Queue *events, *fast_events, *thread_events;
+  MultiQueue *events, *fast_events, *thread_events;
   klist_t(WatcherPtr) *children;
   uv_signal_t children_watcher;
   uv_timer_t children_kill_timer, poll_timer;
@@ -26,43 +26,43 @@ typedef struct loop {
   int recursive;
 } Loop;
 
-#define CREATE_EVENT(queue, handler, argc, ...)                  \
-  do {                                                           \
-    if (queue) {                                                 \
-      queue_put((queue), (handler), argc, __VA_ARGS__);          \
-    } else {                                                     \
-      void *argv[argc] = {__VA_ARGS__};                          \
-      (handler)(argv);                                           \
-    }                                                            \
+#define CREATE_EVENT(multiqueue, handler, argc, ...) \
+  do { \
+    if (multiqueue) { \
+      multiqueue_put((multiqueue), (handler), argc, __VA_ARGS__); \
+    } else { \
+      void *argv[argc] = { __VA_ARGS__ }; \
+      (handler)(argv); \
+    } \
   } while (0)
 
 // Poll for events until a condition or timeout
-#define LOOP_PROCESS_EVENTS_UNTIL(loop, queue, timeout, condition)           \
-  do {                                                                       \
-    int remaining = timeout;                                                 \
-    uint64_t before = (remaining > 0) ? os_hrtime() : 0;                     \
-    while (!(condition)) {                                                   \
-      LOOP_PROCESS_EVENTS(loop, queue, remaining);                           \
-      if (remaining == 0) {                                                  \
-        break;                                                               \
-      } else if (remaining > 0) {                                            \
-        uint64_t now = os_hrtime();                                          \
-        remaining -= (int) ((now - before) / 1000000);                       \
-        before = now;                                                        \
-        if (remaining <= 0) {                                                \
-          break;                                                             \
-        }                                                                    \
-      }                                                                      \
-    }                                                                        \
+#define LOOP_PROCESS_EVENTS_UNTIL(loop, multiqueue, timeout, condition) \
+  do { \
+    int remaining = timeout; \
+    uint64_t before = (remaining > 0) ? os_hrtime() : 0; \
+    while (!(condition)) { \
+      LOOP_PROCESS_EVENTS(loop, multiqueue, remaining); \
+      if (remaining == 0) { \
+        break; \
+      } else if (remaining > 0) { \
+        uint64_t now = os_hrtime(); \
+        remaining -= (int) ((now - before) / 1000000); \
+        before = now; \
+        if (remaining <= 0) { \
+          break; \
+        } \
+      } \
+    } \
   } while (0)
 
-#define LOOP_PROCESS_EVENTS(loop, queue, timeout)                            \
-  do {                                                                       \
-    if (queue && !queue_empty(queue)) {                                      \
-      queue_process_events(queue);                                           \
-    } else {                                                                 \
-      loop_poll_events(loop, timeout);                                       \
-    }                                                                        \
+#define LOOP_PROCESS_EVENTS(loop, multiqueue, timeout) \
+  do { \
+    if (multiqueue && !multiqueue_empty(multiqueue)) { \
+      multiqueue_process_events(multiqueue); \
+    } else { \
+      loop_poll_events(loop, timeout); \
+    } \
   } while (0)
 
 
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
new file mode 100644
index 0000000000..79b4dd9458
--- /dev/null
+++ b/src/nvim/event/multiqueue.c
@@ -0,0 +1,230 @@
+// Multi-level queue for selective async event processing.
+// Not threadsafe; access must be synchronized externally.
+//
+// Multiqueue supports a parent-child relationship with these properties:
+// - pushing a node to a child queue will push a corresponding link node to the
+//   parent queue
+// - removing a link node from a parent queue will remove the next node
+//   in the linked child queue
+// - removing a node from a child queue will remove the corresponding link node
+//   in the parent queue
+//
+// These properties allow Nvim to organize and process events from different
+// sources with a certain degree of control. How the multiqueue is used:
+//
+//                         +----------------+
+//                         |   Main loop    |
+//                         +----------------+
+//
+//                         +----------------+
+//         +-------------->|   Event loop   |<------------+
+//         |               +--+-------------+             |
+//         |                  ^           ^               |
+//         |                  |           |               |
+//    +-----------+   +-----------+    +---------+    +---------+
+//    | Channel 1 |   | Channel 2 |    |  Job 1  |    |  Job 2  |
+//    +-----------+   +-----------+    +---------+    +---------+
+//
+//
+// The lower boxes represent event emitters, each with its own private queue
+// having the event loop queue as the parent.
+//
+// When idle, the main loop spins the event loop which queues events from many
+// sources (channels, jobs, user...). Each event emitter pushes events to its
+// private queue which is propagated to the event loop queue. When the main loop
+// consumes an event, the corresponding event is removed from the emitter's
+// queue.
+//
+// The main reason for this queue hierarchy is to allow focusing on a single
+// event emitter while blocking the main loop. For example, if the `jobwait`
+// VimL function is called on job1, the main loop will temporarily stop polling
+// the event loop queue and poll job1 queue instead. Same with channels, when
+// calling `rpcrequest` we want to temporarily stop processing events from
+// other sources and focus on a specific channel.
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+
+#include <uv.h>
+
+#include "nvim/event/multiqueue.h"
+#include "nvim/memory.h"
+#include "nvim/os/time.h"
+
+typedef struct multiqueue_item MultiQueueItem;
+struct multiqueue_item {
+  union {
+    MultiQueue *queue;
+    struct {
+      Event event;
+      MultiQueueItem *parent_item;
+    } item;
+  } data;
+  bool link;  // true: current item is just a link to a node in a child queue
+  QUEUE node;
+};
+
+struct multiqueue {
+  MultiQueue *parent;
+  QUEUE headtail;  // circularly-linked
+  put_callback put_cb;
+  void *data;
+  size_t size;
+};
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "event/multiqueue.c.generated.h"
+#endif
+
+static Event NILEVENT = { .handler = NULL, .argv = {NULL} };
+
+MultiQueue *multiqueue_new_parent(put_callback put_cb, void *data)
+{
+  return multiqueue_new(NULL, put_cb, data);
+}
+
+MultiQueue *multiqueue_new_child(MultiQueue *parent)
+  FUNC_ATTR_NONNULL_ALL
+{
+  assert(!parent->parent);  // parent cannot have a parent, more like a "root"
+  parent->size++;
+  return multiqueue_new(parent, NULL, NULL);
+}
+
+static MultiQueue *multiqueue_new(MultiQueue *parent, put_callback put_cb,
+                                  void *data)
+{
+  MultiQueue *rv = xmalloc(sizeof(MultiQueue));
+  QUEUE_INIT(&rv->headtail);
+  rv->size = 0;
+  rv->parent = parent;
+  rv->put_cb = put_cb;
+  rv->data = data;
+  return rv;
+}
+
+void multiqueue_free(MultiQueue *this)
+{
+  assert(this);
+  while (!QUEUE_EMPTY(&this->headtail)) {
+    QUEUE *q = QUEUE_HEAD(&this->headtail);
+    MultiQueueItem *item = multiqueue_node_data(q);
+    if (this->parent) {
+      QUEUE_REMOVE(&item->data.item.parent_item->node);
+      xfree(item->data.item.parent_item);
+    }
+    QUEUE_REMOVE(q);
+    xfree(item);
+  }
+
+  xfree(this);
+}
+
+Event multiqueue_get(MultiQueue *this)
+{
+  return multiqueue_empty(this) ? NILEVENT : multiqueue_remove(this);
+}
+
+void multiqueue_put_event(MultiQueue *this, Event event)
+{
+  assert(this);
+  multiqueue_push(this, event);
+  if (this->parent && this->parent->put_cb) {
+    this->parent->put_cb(this->parent, this->parent->data);
+  }
+}
+
+void multiqueue_process_events(MultiQueue *this)
+{
+  assert(this);
+  while (!multiqueue_empty(this)) {
+    Event event = multiqueue_get(this);
+    if (event.handler) {
+      event.handler(event.argv);
+    }
+  }
+}
+
+/// Removes all events without processing them.
+void multiqueue_purge_events(MultiQueue *this)
+{
+  assert(this);
+  while (!multiqueue_empty(this)) {
+    (void)multiqueue_remove(this);
+  }
+}
+
+bool multiqueue_empty(MultiQueue *this)
+{
+  assert(this);
+  return QUEUE_EMPTY(&this->headtail);
+}
+
+void multiqueue_replace_parent(MultiQueue *this, MultiQueue *new_parent)
+{
+  assert(multiqueue_empty(this));
+  this->parent = new_parent;
+}
+
+/// Gets the count of all events currently in the queue.
+size_t multiqueue_size(MultiQueue *this)
+{
+  return this->size;
+}
+
+static Event multiqueue_remove(MultiQueue *this)
+{
+  assert(!multiqueue_empty(this));
+  QUEUE *h = QUEUE_HEAD(&this->headtail);
+  QUEUE_REMOVE(h);
+  MultiQueueItem *item = multiqueue_node_data(h);
+  Event rv;
+
+  if (item->link) {
+    assert(!this->parent);
+    // remove the next node in the linked queue
+    MultiQueue *linked = item->data.queue;
+    assert(!multiqueue_empty(linked));
+    MultiQueueItem *child =
+      multiqueue_node_data(QUEUE_HEAD(&linked->headtail));
+    QUEUE_REMOVE(&child->node);
+    rv = child->data.item.event;
+    xfree(child);
+  } else {
+    if (this->parent) {
+      // remove the corresponding link node in the parent queue
+      QUEUE_REMOVE(&item->data.item.parent_item->node);
+      xfree(item->data.item.parent_item);
+    }
+    rv = item->data.item.event;
+  }
+
+  this->size--;
+  xfree(item);
+  return rv;
+}
+
+static void multiqueue_push(MultiQueue *this, Event event)
+{
+  MultiQueueItem *item = xmalloc(sizeof(MultiQueueItem));
+  item->link = false;
+  item->data.item.event = event;
+  QUEUE_INSERT_TAIL(&this->headtail, &item->node);
+  if (this->parent) {
+    // push link node to the parent queue
+    item->data.item.parent_item = xmalloc(sizeof(MultiQueueItem));
+    item->data.item.parent_item->link = true;
+    item->data.item.parent_item->data.queue = this;
+    QUEUE_INSERT_TAIL(&this->parent->headtail,
+                      &item->data.item.parent_item->node);
+  }
+  this->size++;
+}
+
+static MultiQueueItem *multiqueue_node_data(QUEUE *q)
+{
+  return QUEUE_DATA(q, MultiQueueItem, node);
+}
diff --git a/src/nvim/event/multiqueue.h b/src/nvim/event/multiqueue.h
new file mode 100644
index 0000000000..def6b95a10
--- /dev/null
+++ b/src/nvim/event/multiqueue.h
@@ -0,0 +1,19 @@
+#ifndef NVIM_EVENT_MULTIQUEUE_H
+#define NVIM_EVENT_MULTIQUEUE_H
+
+#include <uv.h>
+
+#include "nvim/event/defs.h"
+#include "nvim/lib/queue.h"
+
+typedef struct multiqueue MultiQueue;
+typedef void (*put_callback)(MultiQueue *multiq, void *data);
+
+#define multiqueue_put(q, h, ...) \
+  multiqueue_put_event(q, event_create(1, h, __VA_ARGS__));
+
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "event/multiqueue.h.generated.h"
+#endif
+#endif  // NVIM_EVENT_MULTIQUEUE_H
diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c
index 9bb62891c7..dc7886469b 100644
--- a/src/nvim/event/process.c
+++ b/src/nvim/event/process.c
@@ -9,7 +9,7 @@
 #include "nvim/event/wstream.h"
 #include "nvim/event/process.h"
 #include "nvim/event/libuv_process.h"
-#include "nvim/event/pty_process.h"
+#include "nvim/os/pty_process.h"
 #include "nvim/globals.h"
 #include "nvim/log.h"
 
@@ -17,16 +17,15 @@
 # include "event/process.c.generated.h"
 #endif
 
-// {SIGNAL}_TIMEOUT is the time (in nanoseconds) that a process has to cleanly
-// exit before we send SIGNAL to it
+// Time (ns) for a process to exit cleanly before we send TERM/KILL.
 #define TERM_TIMEOUT 1000000000
 #define KILL_TIMEOUT (TERM_TIMEOUT * 2)
 
-#define CLOSE_PROC_STREAM(proc, stream)                             \
-  do {                                                              \
-    if (proc->stream && !proc->stream->closed) {                    \
-      stream_close(proc->stream, NULL);                             \
-    }                                                               \
+#define CLOSE_PROC_STREAM(proc, stream) \
+  do { \
+    if (proc->stream && !proc->stream->closed) { \
+      stream_close(proc->stream, NULL, NULL); \
+    } \
   } while (0)
 
 static bool process_is_tearing_down = false;
@@ -78,10 +77,8 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
     return false;
   }
 
-  void *data = proc->data;
-
   if (proc->in) {
-    stream_init(NULL, proc->in, -1, (uv_stream_t *)&proc->in->uv.pipe, data);
+    stream_init(NULL, proc->in, -1, (uv_stream_t *)&proc->in->uv.pipe);
     proc->in->events = proc->events;
     proc->in->internal_data = proc;
     proc->in->internal_close_cb = on_process_stream_close;
@@ -89,7 +86,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
   }
 
   if (proc->out) {
-    stream_init(NULL, proc->out, -1, (uv_stream_t *)&proc->out->uv.pipe, data);
+    stream_init(NULL, proc->out, -1, (uv_stream_t *)&proc->out->uv.pipe);
     proc->out->events = proc->events;
     proc->out->internal_data = proc;
     proc->out->internal_close_cb = on_process_stream_close;
@@ -97,7 +94,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL
   }
 
   if (proc->err) {
-    stream_init(NULL, proc->err, -1, (uv_stream_t *)&proc->err->uv.pipe, data);
+    stream_init(NULL, proc->err, -1, (uv_stream_t *)&proc->err->uv.pipe);
     proc->err->events = proc->events;
     proc->err->internal_data = proc;
     proc->err->internal_close_cb = on_process_stream_close;
@@ -116,23 +113,20 @@ void process_teardown(Loop *loop) FUNC_ATTR_NONNULL_ALL
   process_is_tearing_down = true;
   kl_iter(WatcherPtr, loop->children, current) {
     Process *proc = (*current)->data;
-    if (proc->detach) {
+    if (proc->detach || proc->type == kProcessTypePty) {
       // Close handles to process without killing it.
       CREATE_EVENT(loop->events, process_close_handles, 1, proc);
     } else {
-      if (proc->type == kProcessTypeUv) {
-        uv_kill(proc->pid, SIGTERM);
-        proc->term_sent = true;
-        process_stop(proc);
-      } else {  // kProcessTypePty
-        process_close_streams(proc);
-        pty_process_close_master((PtyProcess *)proc);
-      }
+      uv_kill(proc->pid, SIGTERM);
+      proc->term_sent = true;
+      process_stop(proc);
     }
   }
 
-  // Wait until all children exit
-  LOOP_PROCESS_EVENTS_UNTIL(loop, loop->events, -1, kl_empty(loop->children));
+  // Wait until all children exit and all close events are processed.
+  LOOP_PROCESS_EVENTS_UNTIL(
+      loop, loop->events, -1,
+      kl_empty(loop->children) && multiqueue_empty(loop->events));
   pty_process_teardown(loop);
 }
 
@@ -169,14 +163,16 @@ void process_close_err(Process *proc) FUNC_ATTR_NONNULL_ALL
 ///         indistinguishable from the process returning -1 by itself. Which
 ///         is possible on some OS. Returns -2 if an user has interruped the
 ///         wait.
-int process_wait(Process *proc, int ms, Queue *events) FUNC_ATTR_NONNULL_ARG(1)
+int process_wait(Process *proc, int ms, MultiQueue *events)
+  FUNC_ATTR_NONNULL_ARG(1)
 {
   // The default status is -1, which represents a timeout
   int status = -1;
   bool interrupted = false;
   if (!proc->refcount) {
+    status = proc->status;
     LOOP_PROCESS_EVENTS(proc->loop, proc->events, 0);
-    return proc->status;
+    return status;
   }
 
   if (!events) {
@@ -214,7 +210,7 @@ int process_wait(Process *proc, int ms, Queue *events) FUNC_ATTR_NONNULL_ARG(1)
     decref(proc);
     if (events) {
       // the decref call created an exit event, process it now
-      queue_process_events(events);
+      multiqueue_process_events(events);
     }
   } else {
     proc->refcount--;
@@ -315,8 +311,10 @@ static void decref(Process *proc)
 static void process_close(Process *proc)
   FUNC_ATTR_NONNULL_ARG(1)
 {
-  if (process_is_tearing_down && proc->detach && proc->closed) {
-    // If a detached process dies while tearing down it might get closed twice.
+  if (process_is_tearing_down && (proc->detach || proc->type == kProcessTypePty)
+      && proc->closed) {
+    // If a detached/pty process dies while tearing down it might get closed
+    // twice.
     return;
   }
   assert(!proc->closed);
@@ -333,9 +331,61 @@ static void process_close(Process *proc)
   }
 }
 
+/// Flush output stream.
+///
+/// @param proc     Process, for which an output stream should be flushed.
+/// @param stream   Stream to flush.
+static void flush_stream(Process *proc, Stream *stream)
+  FUNC_ATTR_NONNULL_ARG(1)
+{
+  if (!stream || stream->closed) {
+    return;
+  }
+
+  // Maximal remaining data size of terminated process is system
+  // buffer size.
+  // Also helps with a child process that keeps the output streams open. If it
+  // keeps sending data, we only accept as much data as the system buffer size.
+  // Otherwise this would block cleanup/teardown.
+  int system_buffer_size = 0;
+  int err = uv_recv_buffer_size((uv_handle_t *)&stream->uv.pipe,
+                                &system_buffer_size);
+  if (err) {
+    system_buffer_size = (int)rbuffer_capacity(stream->buffer);
+  }
+
+  size_t max_bytes = stream->num_bytes + (size_t)system_buffer_size;
+
+  // Read remaining data.
+  while (!stream->closed && stream->num_bytes < max_bytes) {
+    // Remember number of bytes before polling
+    size_t num_bytes = stream->num_bytes;
+
+    // Poll for data and process the generated events.
+    loop_poll_events(proc->loop, 0);
+    if (proc->events) {
+        multiqueue_process_events(proc->events);
+    }
+
+    // Stream can be closed if it is empty.
+    if (num_bytes == stream->num_bytes) {
+      if (stream->read_cb) {
+        // Stream callback could miss EOF handling if a child keeps the stream
+        // open.
+        stream->read_cb(stream, stream->buffer, 0, stream->cb_data, true);
+      }
+      break;
+    }
+  }
+}
+
 static void process_close_handles(void **argv)
 {
   Process *proc = argv[0];
+
+  flush_stream(proc, proc->out);
+  flush_stream(proc, proc->err);
+
   process_close_streams(proc);
   process_close(proc);
 }
@@ -350,11 +400,12 @@ static void on_process_exit(Process *proc)
     uv_timer_stop(&loop->children_kill_timer);
   }
 
-  // Process handles are closed in the next event loop tick. This is done to
-  // give libuv more time to read data from the OS after the process exits(If
-  // process_close_streams is called with data still in the OS buffer, we lose
-  // it)
-  CREATE_EVENT(proc->events, process_close_handles, 1, proc);
+  // Process has terminated, but there could still be data to be read from the
+  // OS. We are still in the libuv loop, so we cannot call code that polls for
+  // more data directly. Instead delay the reading after the libuv loop by
+  // queueing process_close_handles() as an event.
+  MultiQueue *queue = proc->events ? proc->events : loop->events;
+  CREATE_EVENT(queue, process_close_handles, 1, proc);
 }
 
 static void on_process_stream_close(Stream *stream, void *data)
diff --git a/src/nvim/event/process.h b/src/nvim/event/process.h
index e23c8ea60f..5cbf7f9ce7 100644
--- a/src/nvim/event/process.h
+++ b/src/nvim/event/process.h
@@ -21,12 +21,13 @@ struct process {
   int pid, status, refcount;
   // set to the hrtime of when process_stop was called for the process.
   uint64_t stopped_time;
+  char *cwd;
   char **argv;
   Stream *in, *out, *err;
   process_exit_cb cb;
   internal_process_cb internal_exit_cb, internal_close_cb;
   bool closed, term_sent, detach;
-  Queue *events;
+  MultiQueue *events;
 };
 
 static inline Process process_init(Loop *loop, ProcessType type, void *data)
@@ -40,6 +41,7 @@ static inline Process process_init(Loop *loop, ProcessType type, void *data)
     .status = 0,
     .refcount = 0,
     .stopped_time = 0,
+    .cwd = NULL,
     .argv = NULL,
     .in = NULL,
     .out = NULL,
diff --git a/src/nvim/event/queue.c b/src/nvim/event/queue.c
deleted file mode 100644
index c5ef22d426..0000000000
--- a/src/nvim/event/queue.c
+++ /dev/null
@@ -1,208 +0,0 @@
-// Queue for selective async event processing. Instances of this queue support a
-// parent/child relationship with the following properties:
-//
-// - pushing a node to a child queue will push a corresponding link node to the
-//   parent queue
-// - removing a link node from a parent queue will remove the next node
-//   in the linked child queue
-// - removing a node from a child queue will remove the corresponding link node
-//   in the parent queue
-//
-// These properties allow neovim to organize and process events from different
-// sources with a certain degree of control. Here's how the queue is used:
-//
-//                         +----------------+
-//                         |   Main loop    |
-//                         +----------------+
-//                                  ^
-//                                  |
-//                         +----------------+
-//         +-------------->|   Event loop   |<------------+
-//         |               +--+-------------+             |
-//         |                  ^           ^               |
-//         |                  |           |               |
-//    +-----------+   +-----------+    +---------+    +---------+
-//    | Channel 1 |   | Channel 2 |    |  Job 1  |    |  Job 2  |
-//    +-----------+   +-----------+    +---------+    +---------+
-//
-//
-// In the above diagram, the lower boxes represents event emitters, each with
-// it's own private queue that have the event loop queue as the parent.
-//
-// When idle, the main loop spins the event loop which queues events from many
-// sources(channels, jobs, user...). Each event emitter pushes events to its own
-// private queue which is propagated to the event loop queue. When the main loop
-// consumes an event, the corresponding event is removed from the emitter's
-// queue.
-//
-// The main reason for this queue hierarchy is to allow focusing on a single
-// event emitter while blocking the main loop. For example, if the `jobwait`
-// vimscript function is called on job1, the main loop will temporarily stop
-// polling the event loop queue and poll job1 queue instead. Same with channels,
-// when calling `rpcrequest`, we want to temporarily stop processing events from
-// other sources and focus on a specific channel.
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-
-#include <uv.h>
-
-#include "nvim/event/queue.h"
-#include "nvim/memory.h"
-#include "nvim/os/time.h"
-
-typedef struct queue_item QueueItem;
-struct queue_item {
-  union {
-    Queue *queue;
-    struct {
-      Event event;
-      QueueItem *parent;
-    } item;
-  } data;
-  bool link;  // this is just a link to a node in a child queue
-  QUEUE node;
-};
-
-struct queue {
-  Queue *parent;
-  QUEUE headtail;
-  put_callback put_cb;
-  void *data;
-};
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/queue.c.generated.h"
-#endif
-
-static Event NILEVENT = {.handler = NULL, .argv = {NULL}};
-
-Queue *queue_new_parent(put_callback put_cb, void *data)
-{
-  return queue_new(NULL, put_cb, data);
-}
-
-Queue *queue_new_child(Queue *parent)
-  FUNC_ATTR_NONNULL_ALL
-{
-  assert(!parent->parent);
-  return queue_new(parent, NULL, NULL);
-}
-
-static Queue *queue_new(Queue *parent, put_callback put_cb, void *data)
-{
-  Queue *rv = xmalloc(sizeof(Queue));
-  QUEUE_INIT(&rv->headtail);
-  rv->parent = parent;
-  rv->put_cb = put_cb;
-  rv->data = data;
-  return rv;
-}
-
-void queue_free(Queue *queue)
-{
-  assert(queue);
-  while (!QUEUE_EMPTY(&queue->headtail)) {
-    QUEUE *q = QUEUE_HEAD(&queue->headtail);
-    QueueItem *item = queue_node_data(q);
-    if (queue->parent) {
-      QUEUE_REMOVE(&item->data.item.parent->node);
-      xfree(item->data.item.parent);
-    }
-    QUEUE_REMOVE(q);
-    xfree(item);
-  }
-
-  xfree(queue);
-}
-
-Event queue_get(Queue *queue)
-{
-  return queue_empty(queue) ? NILEVENT : queue_remove(queue);
-}
-
-void queue_put_event(Queue *queue, Event event)
-{
-  assert(queue);
-  queue_push(queue, event);
-  if (queue->parent && queue->parent->put_cb) {
-    queue->parent->put_cb(queue->parent, queue->parent->data);
-  }
-}
-
-void queue_process_events(Queue *queue)
-{
-  assert(queue);
-  while (!queue_empty(queue)) {
-    Event event = queue_get(queue);
-    if (event.handler) {
-      event.handler(event.argv);
-    }
-  }
-}
-
-bool queue_empty(Queue *queue)
-{
-  assert(queue);
-  return QUEUE_EMPTY(&queue->headtail);
-}
-
-void queue_replace_parent(Queue *queue, Queue *new_parent)
-{
-  assert(queue_empty(queue));
-  queue->parent = new_parent;
-}
-
-static Event queue_remove(Queue *queue)
-{
-  assert(!queue_empty(queue));
-  QUEUE *h = QUEUE_HEAD(&queue->headtail);
-  QUEUE_REMOVE(h);
-  QueueItem *item = queue_node_data(h);
-  Event rv;
-
-  if (item->link) {
-    assert(!queue->parent);
-    // remove the next node in the linked queue
-    Queue *linked = item->data.queue;
-    assert(!queue_empty(linked));
-    QueueItem *child =
-      queue_node_data(QUEUE_HEAD(&linked->headtail));
-    QUEUE_REMOVE(&child->node);
-    rv = child->data.item.event;
-    xfree(child);
-  } else {
-    if (queue->parent) {
-      // remove the corresponding link node in the parent queue
-      QUEUE_REMOVE(&item->data.item.parent->node);
-      xfree(item->data.item.parent);
-    }
-    rv = item->data.item.event;
-  }
-
-  xfree(item);
-  return rv;
-}
-
-static void queue_push(Queue *queue, Event event)
-{
-  QueueItem *item = xmalloc(sizeof(QueueItem));
-  item->link = false;
-  item->data.item.event = event;
-  QUEUE_INSERT_TAIL(&queue->headtail, &item->node);
-  if (queue->parent) {
-    // push link node to the parent queue
-    item->data.item.parent = xmalloc(sizeof(QueueItem));
-    item->data.item.parent->link = true;
-    item->data.item.parent->data.queue = queue;
-    QUEUE_INSERT_TAIL(&queue->parent->headtail, &item->data.item.parent->node);
-  }
-}
-
-static QueueItem *queue_node_data(QUEUE *q)
-{
-  return QUEUE_DATA(q, QueueItem, node);
-}
diff --git a/src/nvim/event/queue.h b/src/nvim/event/queue.h
deleted file mode 100644
index 85fc59f8b2..0000000000
--- a/src/nvim/event/queue.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef NVIM_EVENT_QUEUE_H
-#define NVIM_EVENT_QUEUE_H
-
-#include <uv.h>
-
-#include "nvim/event/defs.h"
-#include "nvim/lib/queue.h"
-
-typedef struct queue Queue;
-typedef void (*put_callback)(Queue *queue, void *data);
-
-#define queue_put(q, h, ...) \
-  queue_put_event(q, event_create(1, h, __VA_ARGS__));
-
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/queue.h.generated.h"
-#endif
-#endif  // NVIM_EVENT_QUEUE_H
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c
index 9f3fbc25ff..92efc9fa2e 100644
--- a/src/nvim/event/rstream.c
+++ b/src/nvim/event/rstream.c
@@ -17,21 +17,19 @@
 # include "event/rstream.c.generated.h"
 #endif
 
-void rstream_init_fd(Loop *loop, Stream *stream, int fd, size_t bufsize,
-    void *data)
+void rstream_init_fd(Loop *loop, Stream *stream, int fd, size_t bufsize)
   FUNC_ATTR_NONNULL_ARG(1)
   FUNC_ATTR_NONNULL_ARG(2)
 {
-  stream_init(loop, stream, fd, NULL, data);
+  stream_init(loop, stream, fd, NULL);
   rstream_init(stream, bufsize);
 }
 
-void rstream_init_stream(Stream *stream, uv_stream_t *uvstream, size_t bufsize,
-    void *data)
+void rstream_init_stream(Stream *stream, uv_stream_t *uvstream, size_t bufsize)
   FUNC_ATTR_NONNULL_ARG(1)
   FUNC_ATTR_NONNULL_ARG(2)
 {
-  stream_init(NULL, stream, -1, uvstream, data);
+  stream_init(NULL, stream, -1, uvstream);
   rstream_init(stream, bufsize);
 }
 
@@ -48,10 +46,11 @@ void rstream_init(Stream *stream, size_t bufsize)
 /// Starts watching for events from a `Stream` instance.
 ///
 /// @param stream The `Stream` instance
-void rstream_start(Stream *stream, stream_read_cb cb)
+void rstream_start(Stream *stream, stream_read_cb cb, void *data)
   FUNC_ATTR_NONNULL_ARG(1)
 {
   stream->read_cb = cb;
+  stream->cb_data = data;
   if (stream->uvstream) {
     uv_read_start(stream->uvstream, alloc_cb, read_cb);
   } else {
@@ -81,7 +80,7 @@ static void on_rbuffer_nonfull(RBuffer *buf, void *data)
 {
   Stream *stream = data;
   assert(stream->read_cb);
-  rstream_start(stream, stream->read_cb);
+  rstream_start(stream, stream->read_cb, stream->cb_data);
 }
 
 // Callbacks used by libuv
@@ -100,6 +99,10 @@ static void read_cb(uv_stream_t *uvstream, ssize_t cnt, const uv_buf_t *buf)
 {
   Stream *stream = uvstream->data;
 
+  if (cnt > 0) {
+    stream->num_bytes += (size_t)cnt;
+  }
+
   if (cnt <= 0) {
     if (cnt != UV_ENOBUFS
         // cnt == 0 means libuv asked for a buffer and decided it wasn't needed:
@@ -109,8 +112,8 @@ static void read_cb(uv_stream_t *uvstream, ssize_t cnt, const uv_buf_t *buf)
         // to `alloc_cb` will return the same unused pointer(`rbuffer_produced`
         // won't be called)
         && cnt != 0) {
-      DLOG("Closing Stream(%p) because of %s(%zd)", stream,
-           uv_strerror((int)cnt), cnt);
+      DLOG("Closing Stream (%p): %s (%s)", stream,
+           uv_err_name((int)cnt), os_strerror((int)cnt));
       // Read error or EOF, either way stop the stream and invoke the callback
       // with eof == true
       uv_read_stop(uvstream);
@@ -175,7 +178,7 @@ static void read_event(void **argv)
   if (stream->read_cb) {
     size_t count = (uintptr_t)argv[1];
     bool eof = (uintptr_t)argv[2];
-    stream->read_cb(stream, stream->buffer, count, stream->data, eof);
+    stream->read_cb(stream, stream->buffer, count, stream->cb_data, eof);
   }
   stream->pending_reqs--;
   if (stream->closed && !stream->pending_reqs) {
@@ -185,10 +188,6 @@ static void read_event(void **argv)
 
 static void invoke_read_cb(Stream *stream, size_t count, bool eof)
 {
-  if (stream->closed) {
-    return;
-  }
-
   // Don't let the stream be closed before the event is processed.
   stream->pending_reqs++;
 
diff --git a/src/nvim/event/signal.h b/src/nvim/event/signal.h
index e32608acc0..7fe352edef 100644
--- a/src/nvim/event/signal.h
+++ b/src/nvim/event/signal.h
@@ -14,7 +14,7 @@ struct signal_watcher {
   void *data;
   signal_cb cb;
   signal_close_cb close_cb;
-  Queue *events;
+  MultiQueue *events;
 };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index 93cc592683..8f9327f3d4 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -103,7 +103,7 @@ int socket_watcher_start(SocketWatcher *watcher, int backlog, socket_cb cb)
       // Libuv converts ENOENT to EACCES for Windows compatibility, but if
       // the parent directory does not exist, ENOENT would be more accurate.
       *path_tail((char_u *)watcher->addr) = NUL;
-      if (!os_file_exists((char_u *)watcher->addr)) {
+      if (!os_path_exists((char_u *)watcher->addr)) {
         result = -ENOENT;
       }
     }
@@ -113,7 +113,7 @@ int socket_watcher_start(SocketWatcher *watcher, int backlog, socket_cb cb)
   return 0;
 }
 
-int socket_watcher_accept(SocketWatcher *watcher, Stream *stream, void *data)
+int socket_watcher_accept(SocketWatcher *watcher, Stream *stream)
   FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
 {
   uv_stream_t *client;
@@ -133,7 +133,7 @@ int socket_watcher_accept(SocketWatcher *watcher, Stream *stream, void *data)
     return result;
   }
 
-  stream_init(NULL, stream, -1, client, data);
+  stream_init(NULL, stream, -1, client);
   return 0;
 }
 
diff --git a/src/nvim/event/socket.h b/src/nvim/event/socket.h
index ad59fdbe3a..eb0823c76d 100644
--- a/src/nvim/event/socket.h
+++ b/src/nvim/event/socket.h
@@ -30,7 +30,7 @@ struct socket_watcher {
   void *data;
   socket_cb cb;
   socket_close_cb close_cb;
-  Queue *events;
+  MultiQueue *events;
 };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c
index 71582ab357..26083c20f4 100644
--- a/src/nvim/event/stream.c
+++ b/src/nvim/event/stream.c
@@ -30,8 +30,7 @@ int stream_set_blocking(int fd, bool blocking)
   return retval;
 }
 
-void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream,
-    void *data)
+void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream)
   FUNC_ATTR_NONNULL_ARG(2)
 {
   stream->uvstream = uvstream;
@@ -58,7 +57,6 @@ void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream,
     stream->uvstream->data = stream;
   }
 
-  stream->data = data;
   stream->internal_data = NULL;
   stream->fpos = 0;
   stream->curmem = 0;
@@ -71,14 +69,16 @@ void stream_init(Loop *loop, Stream *stream, int fd, uv_stream_t *uvstream,
   stream->closed = false;
   stream->buffer = NULL;
   stream->events = NULL;
+  stream->num_bytes = 0;
 }
 
-void stream_close(Stream *stream, stream_close_cb on_stream_close)
+void stream_close(Stream *stream, stream_close_cb on_stream_close, void *data)
   FUNC_ATTR_NONNULL_ARG(1)
 {
   assert(!stream->closed);
   stream->closed = true;
   stream->close_cb = on_stream_close;
+  stream->close_cb_data = data;
 
   if (!stream->pending_reqs) {
     stream_close_handle(stream);
@@ -102,7 +102,7 @@ static void close_cb(uv_handle_t *handle)
     rbuffer_free(stream->buffer);
   }
   if (stream->close_cb) {
-    stream->close_cb(stream, stream->data);
+    stream->close_cb(stream, stream->close_cb_data);
   }
   if (stream->internal_close_cb) {
     stream->internal_close_cb(stream, stream->internal_data);
diff --git a/src/nvim/event/stream.h b/src/nvim/event/stream.h
index c6baac0db7..d27497e4a4 100644
--- a/src/nvim/event/stream.h
+++ b/src/nvim/event/stream.h
@@ -44,14 +44,16 @@ struct stream {
   uv_file fd;
   stream_read_cb read_cb;
   stream_write_cb write_cb;
+  void *cb_data;
   stream_close_cb close_cb, internal_close_cb;
+  void *close_cb_data, *internal_data;
   size_t fpos;
   size_t curmem;
   size_t maxmem;
   size_t pending_reqs;
-  void *data, *internal_data;
+  size_t num_bytes;
   bool closed;
-  Queue *events;
+  MultiQueue *events;
 };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/event/time.c b/src/nvim/event/time.c
index 7bf333bcea..77260546db 100644
--- a/src/nvim/event/time.c
+++ b/src/nvim/event/time.c
@@ -17,6 +17,7 @@ void time_watcher_init(Loop *loop, TimeWatcher *watcher, void *data)
   watcher->uv.data = watcher;
   watcher->data = data;
   watcher->events = loop->fast_events;
+  watcher->blockable = false;
 }
 
 void time_watcher_start(TimeWatcher *watcher, time_cb cb, uint64_t timeout,
@@ -50,6 +51,10 @@ static void time_watcher_cb(uv_timer_t *handle)
   FUNC_ATTR_NONNULL_ALL
 {
   TimeWatcher *watcher = handle->data;
+  if (watcher->blockable && !multiqueue_empty(watcher->events)) {
+    // the timer blocked and there already is an unprocessed event waiting
+    return;
+  }
   CREATE_EVENT(watcher->events, time_event, 1, watcher);
 }
 
diff --git a/src/nvim/event/time.h b/src/nvim/event/time.h
index 7882b2b627..a6de89ad6e 100644
--- a/src/nvim/event/time.h
+++ b/src/nvim/event/time.h
@@ -12,7 +12,8 @@ struct time_watcher {
   uv_timer_t uv;
   void *data;
   time_cb cb, close_cb;
-  Queue *events;
+  MultiQueue *events;
+  bool blockable;
 };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/event/wstream.c b/src/nvim/event/wstream.c
index 8028e35e6b..fc7aad8eb9 100644
--- a/src/nvim/event/wstream.c
+++ b/src/nvim/event/wstream.c
@@ -22,19 +22,17 @@ typedef struct {
 # include "event/wstream.c.generated.h"
 #endif
 
-void wstream_init_fd(Loop *loop, Stream *stream, int fd, size_t maxmem,
-    void *data)
+void wstream_init_fd(Loop *loop, Stream *stream, int fd, size_t maxmem)
   FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
 {
-  stream_init(loop, stream, fd, NULL, data);
+  stream_init(loop, stream, fd, NULL);
   wstream_init(stream, maxmem);
 }
 
-void wstream_init_stream(Stream *stream, uv_stream_t *uvstream, size_t maxmem,
-    void *data)
+void wstream_init_stream(Stream *stream, uv_stream_t *uvstream, size_t maxmem)
   FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_ARG(2)
 {
-  stream_init(NULL, stream, -1, uvstream, data);
+  stream_init(NULL, stream, -1, uvstream);
   wstream_init(stream, maxmem);
 }
 
@@ -54,10 +52,11 @@ void wstream_init(Stream *stream, size_t maxmem)
 ///
 /// @param stream The `Stream` instance
 /// @param cb The callback
-void wstream_set_write_cb(Stream *stream, stream_write_cb cb)
-  FUNC_ATTR_NONNULL_ALL
+void wstream_set_write_cb(Stream *stream, stream_write_cb cb, void *data)
+  FUNC_ATTR_NONNULL_ARG(1, 2)
 {
   stream->write_cb = cb;
+  stream->cb_data = data;
 }
 
 /// Queues data for writing to the backing file descriptor of a `Stream`
@@ -138,7 +137,7 @@ static void write_cb(uv_write_t *req, int status)
   wstream_release_wbuffer(data->buffer);
 
   if (data->stream->write_cb) {
-    data->stream->write_cb(data->stream, data->stream->data, status);
+    data->stream->write_cb(data->stream, data->stream->cb_data, status);
   }
 
   data->stream->pending_reqs--;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 86f1a16216..e6e85a3f6c 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -8,7 +8,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
+#include <math.h>
 
+#include "nvim/api/private/defs.h"
+#include "nvim/api/buffer.h"
+#include "nvim/log.h"
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/ex_cmds.h"
@@ -64,6 +68,33 @@
  */
 typedef struct sign sign_T;
 
+/// Case matching style to use for :substitute
+typedef enum {
+  kSubHonorOptions = 0,  ///< Honor the user's 'ignorecase'/'smartcase' options
+  kSubIgnoreCase,        ///< Ignore case of the search
+  kSubMatchCase,         ///< Match case of the search
+} SubIgnoreType;
+
+/// Flags kept between calls to :substitute.
+typedef struct {
+  bool do_all;          ///< do multiple substitutions per line
+  bool do_ask;          ///< ask for confirmation
+  bool do_count;        ///< count only
+  bool do_error;        ///< if false, ignore errors
+  bool do_print;        ///< print last line with subs
+  bool do_list;         ///< list last line with subs
+  bool do_number;       ///< list last line with line nr
+  SubIgnoreType do_ic;  ///< ignore case flag
+} subflags_T;
+
+/// Lines matched during :substitute.
+typedef struct {
+  linenr_T lnum;
+  long nmatch;
+  char_u *line;
+  kvec_t(colnr_T) cols;  ///< columns of in-line matches
+} MatchedLine;
+typedef kvec_t(MatchedLine) MatchedLineVec;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_cmds.c.generated.h"
@@ -326,12 +357,12 @@ static int sort_compare(const void *s1, const void *s2)
     // We need to copy one line into "sortbuf1", because there is no
     // guarantee that the first pointer becomes invalid when obtaining the
     // second one.
-    STRNCPY(sortbuf1, ml_get(l1.lnum) + l1.st_u.line.start_col_nr,
-            l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr + 1);
-    sortbuf1[l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr] = 0;
-    STRNCPY(sortbuf2, ml_get(l2.lnum) + l2.st_u.line.start_col_nr,
-            l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr + 1);
-    sortbuf2[l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr] = 0;
+    memcpy(sortbuf1, ml_get(l1.lnum) + l1.st_u.line.start_col_nr,
+           l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr + 1);
+    sortbuf1[l1.st_u.line.end_col_nr - l1.st_u.line.start_col_nr] = NUL;
+    memcpy(sortbuf2, ml_get(l2.lnum) + l2.st_u.line.start_col_nr,
+           l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr + 1);
+    sortbuf2[l2.st_u.line.end_col_nr - l2.st_u.line.start_col_nr] = NUL;
 
     result = sort_ic ? STRICMP(sortbuf1, sortbuf2)
              : STRCMP(sortbuf1, sortbuf2);
@@ -1136,15 +1167,11 @@ static void do_filter(
   }
   read_linecount = curbuf->b_ml.ml_line_count;
 
-  /*
-   * When call_shell() fails wait_return() is called to give the user a
-   * chance to read the error messages. Otherwise errors are ignored, so you
-   * can see the error messages from the command that appear on stdout; use
-   * 'u' to fix the text
-   * Switch to cooked mode when not redirecting stdin, avoids that something
-   * like ":r !cat" hangs.
-   * Pass on the kShellDoOut flag when the output is being redirected.
-   */
+  // When call_shell() fails wait_return() is called to give the user a chance
+  // to read the error messages. Otherwise errors are ignored, so you can see
+  // the error messages from the command that appear on stdout; use 'u' to fix
+  // the text.
+  // Pass on the kShellDoOut flag when the output is being redirected.
   if (call_shell(
         cmd_buf,
         kShellOptFilter | shell_flags,
@@ -1166,8 +1193,8 @@ static void do_filter(
 
   if (do_out) {
     if (otmp != NULL) {
-      if (readfile(otmp, NULL, line2, (linenr_T)0, (linenr_T)MAXLNUM,
-              eap, READ_FILTER) == FAIL) {
+      if (readfile(otmp, NULL, line2, (linenr_T)0, (linenr_T)MAXLNUM, eap,
+                   READ_FILTER) != OK) {
         if (!aborting()) {
           msg_putchar('\n');
           EMSG2(_(e_notread), otmp);
@@ -1377,36 +1404,34 @@ char_u *make_filter_cmd(char_u *cmd, char_u *itmp, char_u *otmp)
                               :       "(%s)";
     vim_snprintf(buf, len, fmt, (char *)cmd);
   } else {
-    strncpy(buf, (char *) cmd, len);
+    xstrlcpy(buf, (char *)cmd, len);
   }
 
   if (itmp != NULL) {
-    strncat(buf, " < ", len);
-    strncat(buf, (char *) itmp, len);
+    xstrlcat(buf, " < ", len - 1);
+    xstrlcat(buf, (const char *)itmp, len - 1);
   }
 #else
   // For shells that don't understand braces around commands, at least allow
   // the use of commands in a pipe.
-  strncpy(buf, cmd, len);
+  xstrlcpy(buf, cmd, len);
   if (itmp != NULL) {
-    char_u  *p;
-
     // If there is a pipe, we have to put the '<' in front of it.
     // Don't do this when 'shellquote' is not empty, otherwise the
     // redirection would be inside the quotes.
     if (*p_shq == NUL) {
-      p = strchr(buf, '|');
+      char *const p = strchr(buf, '|');
       if (p != NULL) {
         *p = NUL;
       }
     }
-    strncat(buf, " < ", len);
-    strncat(buf, (char *) itmp, len);
+    xstrlcat(buf, " < ", len);
+    xstrlcat(buf, (const char *)itmp, len);
     if (*p_shq == NUL) {
-      p = strchr(cmd, '|');
+      const char *const p = strchr((const char *)cmd, '|');
       if (p != NULL) {
-        strncat(buf, " ", len);  // Insert a space before the '|' for DOS
-        strncat(buf, p, len);
+        xstrlcat(buf, " ", len - 1);  // Insert a space before the '|' for DOS
+        xstrlcat(buf, p, len - 1);
       }
     }
   }
@@ -1510,8 +1535,9 @@ int rename_buffer(char_u *new_fname)
   curbuf->b_flags |= BF_NOTEDITED;
   if (xfname != NULL && *xfname != NUL) {
     buf = buflist_new(fname, xfname, curwin->w_cursor.lnum, 0);
-    if (buf != NULL && !cmdmod.keepalt)
+    if (buf != NULL && !cmdmod.keepalt) {
       curwin->w_alt_fnum = buf->b_fnum;
+    }
   }
   xfree(fname);
   xfree(sfname);
@@ -1583,6 +1609,7 @@ int do_write(exarg_T *eap)
   int retval = FAIL;
   char_u      *free_fname = NULL;
   buf_T       *alt_buf = NULL;
+  int          name_was_missing;
 
   if (not_writing())            /* check 'write' option */
     return FAIL;
@@ -1693,11 +1720,11 @@ int do_write(exarg_T *eap)
         goto theend;
       }
 
-      /* If 'filetype' was empty try detecting it now. */
+      // If 'filetype' was empty try detecting it now.
       if (*curbuf->b_p_ft == NUL) {
-        if (au_has_group((char_u *)"filetypedetect"))
-          (void)do_doautocmd((char_u *)"filetypedetect BufRead",
-              TRUE);
+        if (au_has_group((char_u *)"filetypedetect")) {
+          (void)do_doautocmd((char_u *)"filetypedetect BufRead", true, NULL);
+        }
         do_modelines(0);
       }
 
@@ -1706,6 +1733,7 @@ int do_write(exarg_T *eap)
       fname = curbuf->b_sfname;
     }
 
+    name_was_missing = curbuf->b_ffname == NULL;
     retval = buf_write(curbuf, ffname, fname, eap->line1, eap->line2,
         eap, eap->append, eap->forceit, TRUE, FALSE);
 
@@ -1715,7 +1743,11 @@ int do_write(exarg_T *eap)
         curbuf->b_p_ro = FALSE;
         redraw_tabline = TRUE;
       }
-      /* Change directories when the 'acd' option is set. */
+    }
+
+    // Change directories when the 'acd' option is set and the file name
+    // got changed or set.
+    if (eap->cmdidx == CMD_saveas || name_was_missing) {
       do_autochdir();
     }
   }
@@ -1745,14 +1777,14 @@ check_overwrite (
    * write to other file or b_flags set or not writing the whole file:
    * overwriting only allowed with '!'
    */
-  if (       (other
-              || (buf->b_flags & BF_NOTEDITED)
-              || ((buf->b_flags & BF_NEW)
-                  && vim_strchr(p_cpo, CPO_OVERNEW) == NULL)
-              || (buf->b_flags & BF_READERR))
-             && !p_wa
-             && !bt_nofile(buf)
-             && os_file_exists(ffname)) {
+  if ((other
+       || (buf->b_flags & BF_NOTEDITED)
+       || ((buf->b_flags & BF_NEW)
+           && vim_strchr(p_cpo, CPO_OVERNEW) == NULL)
+       || (buf->b_flags & BF_READERR))
+      && !p_wa
+      && !bt_nofile(buf)
+      && os_path_exists(ffname)) {
     if (!eap->forceit && !eap->append) {
 #ifdef UNIX
       // It is possible to open a directory on Unix.
@@ -1795,7 +1827,7 @@ check_overwrite (
       }
       swapname = makeswapname(fname, ffname, curbuf, dir);
       xfree(dir);
-      if (os_file_exists(swapname)) {
+      if (os_path_exists(swapname)) {
         if (p_confirm || cmdmod.confirm) {
           char_u buff[DIALOG_MSG_SIZE];
 
@@ -1909,7 +1941,7 @@ static int check_readonly(int *forceit, buf_T *buf)
   /* Handle a file being readonly when the 'readonly' option is set or when
    * the file exists and permissions are read-only. */
   if (!*forceit && (buf->b_p_ro
-                    || (os_file_exists(buf->b_ffname)
+                    || (os_path_exists(buf->b_ffname)
                         && !os_file_is_writable((char *)buf->b_ffname)))) {
     if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL) {
       char_u buff[DIALOG_MSG_SIZE];
@@ -2005,37 +2037,34 @@ theend:
   return retval;
 }
 
-/*
- * start editing a new file
- *
- *     fnum: file number; if zero use ffname/sfname
- *   ffname: the file name
- *		- full path if sfname used,
- *		- any file name if sfname is NULL
- *		- empty string to re-edit with the same file name (but may be
- *		    in a different directory)
- *		- NULL to start an empty buffer
- *   sfname: the short file name (or NULL)
- *	eap: contains the command to be executed after loading the file and
- *	     forced 'ff' and 'fenc'
- *  newlnum: if > 0: put cursor on this line number (if possible)
- *	     if ECMD_LASTL: use last position in loaded file
- *	     if ECMD_LAST: use last position in all files
- *	     if ECMD_ONE: use first line
- *    flags:
- *	   ECMD_HIDE: if TRUE don't free the current buffer
- *     ECMD_SET_HELP: set b_help flag of (new) buffer before opening file
- *	 ECMD_OLDBUF: use existing buffer if it exists
- *	ECMD_FORCEIT: ! used for Ex command
- *	 ECMD_ADDBUF: don't edit, just add to buffer list
- *   oldwin: Should be "curwin" when editing a new buffer in the current
- *	     window, NULL when splitting the window first.  When not NULL info
- *	     of the previous buffer for "oldwin" is stored.
- *
- * return FAIL for failure, OK otherwise
- */
-int 
-do_ecmd (
+/// start editing a new file
+///
+/// @param fnum     file number; if zero use ffname/sfname
+/// @param ffname   the file name
+///                 - full path if sfname used,
+///                 - any file name if sfname is NULL
+///                 - empty string to re-edit with the same file name (but may
+///                   be in a different directory)
+///                 - NULL to start an empty buffer
+/// @param sfname   the short file name (or NULL)
+/// @param eap      contains the command to be executed after loading the file
+///                 and forced 'ff' and 'fenc'
+/// @param newlnum  if > 0: put cursor on this line number (if possible)
+///                 ECMD_LASTL: use last position in loaded file
+///                 ECMD_LAST: use last position in all files
+///                 ECMD_ONE: use first line
+/// @param flags    ECMD_HIDE: if TRUE don't free the current buffer
+///                 ECMD_SET_HELP: set b_help flag of (new) buffer before
+///                 opening file
+///                 ECMD_OLDBUF: use existing buffer if it exists
+///                 ECMD_FORCEIT: ! used for Ex command
+///                 ECMD_ADDBUF: don't edit, just add to buffer list
+/// @param oldwin   Should be "curwin" when editing a new buffer in the current
+///                 window, NULL when splitting the window first.  When not NULL
+///                 info of the previous buffer for "oldwin" is stored.
+///
+/// @return FAIL for failure, OK otherwise
+int do_ecmd(
     int fnum,
     char_u *ffname,
     char_u *sfname,
@@ -2064,6 +2093,7 @@ do_ecmd (
   char_u      *command = NULL;
   int did_get_winopts = FALSE;
   int readfile_flags = 0;
+  bool did_inc_redrawing_disabled = false;
 
   if (eap != NULL)
     command = eap->do_ecmd_cmd;
@@ -2101,6 +2131,14 @@ do_ecmd (
     }
   }
 
+  // Re-editing a terminal buffer: skip most buffer re-initialization.
+  if (!other_file && curbuf->terminal) {
+    check_arg_idx(curwin);  // Needed when called from do_argfile().
+    maketitle();            // Title may show the arg index, e.g. "(2 of 5)".
+    retval = OK;
+    goto theend;
+  }
+
   /*
    * if the file was changed we may not be allowed to abandon it
    * - if we are going to re-edit the same file
@@ -2151,9 +2189,9 @@ do_ecmd (
         buflist_altfpos(oldwin);
     }
 
-    if (fnum)
+    if (fnum) {
       buf = buflist_findnr(fnum);
-    else {
+    } else {
       if (flags & ECMD_ADDBUF) {
         linenr_T tlnum = 1L;
 
@@ -2166,7 +2204,7 @@ do_ecmd (
         goto theend;
       }
       buf = buflist_new(ffname, sfname, 0L,
-          BLN_CURBUF | ((flags & ECMD_SET_HELP) ? 0 : BLN_LISTED));
+                        BLN_CURBUF | (flags & ECMD_SET_HELP ? 0 : BLN_LISTED));
       // Autocmds may change curwin and curbuf.
       if (oldwin != NULL) {
         oldwin = curwin;
@@ -2227,28 +2265,28 @@ do_ecmd (
         xfree(new_name);
         goto theend;
       }
-      if (buf == curbuf)                /* already in new buffer */
-        auto_buf = TRUE;
-      else {
-        if (curbuf == old_curbuf)
+      if (buf == curbuf) {  // already in new buffer
+        auto_buf = true;
+      } else {
+        win_T *the_curwin = curwin;
+
+        // Set the w_closing flag to avoid that autocommands close the window.
+        the_curwin->w_closing = true;
+        if (curbuf == old_curbuf) {
           buf_copy_options(buf, BCO_ENTER);
+        }
 
-        /* close the link to the current buffer */
-        u_sync(FALSE);
+        // Close the link to the current buffer. This will set
+        // curwin->w_buffer to NULL.
+        u_sync(false);
         close_buffer(oldwin, curbuf,
-            (flags & ECMD_HIDE) || curbuf->terminal ? 0 : DOBUF_UNLOAD, FALSE);
-
-        /* Autocommands may open a new window and leave oldwin open
-         * which leads to crashes since the above call sets
-         * oldwin->w_buffer to NULL. */
-        if (curwin != oldwin && oldwin != aucmd_win && win_valid(oldwin)) {
-          assert(oldwin);
-          if (oldwin->w_buffer == NULL) {
-            win_close(oldwin, FALSE);
-          }
-        }
+                     (flags & ECMD_HIDE) || curbuf->terminal ? 0 : DOBUF_UNLOAD,
+                     false);
+
+        the_curwin->w_closing = false;
 
-        if (aborting()) {           /* autocmds may abort script processing */
+        // autocmds may abort script processing
+        if (aborting() && curwin->w_buffer != NULL) {
           xfree(new_name);
           goto theend;
         }
@@ -2300,6 +2338,11 @@ do_ecmd (
     oldbuf = (flags & ECMD_OLDBUF);
   }
 
+  // Don't redraw until the cursor is in the right line, otherwise
+  // autocommands may cause ml_get errors.
+  RedrawingDisabled++;
+  did_inc_redrawing_disabled = true;
+
   buf = curbuf;
   if ((flags & ECMD_SET_HELP) || keep_help_flag) {
     prepare_help_buffer();
@@ -2342,10 +2385,12 @@ do_ecmd (
     if (p_ur < 0 || curbuf->b_ml.ml_line_count <= p_ur) {
       /* Save all the text, so that the reload can be undone.
        * Sync first so that this is a separate undo-able action. */
-      u_sync(FALSE);
-      if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, TRUE)
-          == FAIL)
+      u_sync(false);
+      if (u_savecommon(0, curbuf->b_ml.ml_line_count + 1, 0, true)
+          == FAIL) {
+        xfree(new_name);
         goto theend;
+      }
       u_unchanged(curbuf);
       buf_freeall(curbuf, BFA_KEEP_UNDO);
 
@@ -2376,8 +2421,6 @@ do_ecmd (
   /*
    * If we get here we are sure to start editing
    */
-  /* don't redraw until the cursor is in the right line */
-  ++RedrawingDisabled;
 
   /* Assume success now */
   retval = OK;
@@ -2529,7 +2572,8 @@ do_ecmd (
   if (curbuf->b_kmap_state & KEYMAP_INIT)
     (void)keymap_init();
 
-  --RedrawingDisabled;
+  RedrawingDisabled--;
+  did_inc_redrawing_disabled = false;
   if (!skip_redraw) {
     n = p_so;
     if (topline == 0 && command == NULL)
@@ -2548,8 +2592,12 @@ do_ecmd (
 
 
 theend:
-  if (did_set_swapcommand)
+  if (did_inc_redrawing_disabled) {
+    RedrawingDisabled--;
+  }
+  if (did_set_swapcommand) {
     set_vim_var_string(VV_SWAPCOMMAND, NULL, -1);
+  }
   xfree(free_fname);
   return retval;
 }
@@ -2588,7 +2636,7 @@ void ex_append(exarg_T *eap)
   if (eap->cmdidx != CMD_append)
     --lnum;
 
-  /* when the buffer is empty append to line 0 and delete the dummy line */
+  // when the buffer is empty need to delete the dummy line
   if (empty && lnum == 1)
     lnum = 0;
 
@@ -2660,7 +2708,7 @@ void ex_append(exarg_T *eap)
 
     did_undo = TRUE;
     ml_append(lnum, theline, (colnr_T)0, FALSE);
-    appended_lines_mark(lnum, 1L);
+    appended_lines_mark(lnum + (empty ? 1 : 0), 1L);
 
     xfree(theline);
     ++lnum;
@@ -2901,52 +2949,204 @@ void sub_set_replacement(SubReplacementString sub)
   old_sub = sub;
 }
 
-/* do_sub()
- *
- * Perform a substitution from line eap->line1 to line eap->line2 using the
- * command pointed to by eap->arg which should be of the form:
- *
- * /pattern/substitution/{flags}
- *
- * The usual escapes are supported as described in the regexp docs.
- */
-void do_sub(exarg_T *eap)
+/// Recognize ":%s/\n//" and turn it into a join command, which is much
+/// more efficient.
+///
+/// @param[in]  eap  Ex arguments
+/// @param[in]  pat  Search pattern
+/// @param[in]  sub  Replacement string
+/// @param[in]  cmd  Command from :s_flags
+/// @param[in]  save Save pattern to options, history
+///
+/// @returns true if :substitute can be replaced with a join command
+static bool sub_joining_lines(exarg_T *eap, char_u *pat, char_u *sub,
+                              char_u *cmd, bool save)
+  FUNC_ATTR_NONNULL_ARG(1, 3, 4)
+{
+  // TODO(vim): find a generic solution to make line-joining operations more
+  // efficient, avoid allocating a string that grows in size.
+  if (pat != NULL
+      && strcmp((const char *)pat, "\\n") == 0
+      && *sub == NUL
+      && (*cmd == NUL || (cmd[1] == NUL
+                          && (*cmd == 'g'
+                              || *cmd == 'l'
+                              || *cmd == 'p'
+                              || *cmd == '#')))) {
+    curwin->w_cursor.lnum = eap->line1;
+    if (*cmd == 'l') {
+      eap->flags = EXFLAG_LIST;
+    } else if (*cmd == '#') {
+      eap->flags = EXFLAG_NR;
+    } else if (*cmd == 'p') {
+      eap->flags = EXFLAG_PRINT;
+    }
+
+    // The number of lines joined is the number of lines in the range
+    linenr_T joined_lines_count = eap->line2 - eap->line1 + 1
+      // plus one extra line if not at the end of file.
+      + (eap->line2 < curbuf->b_ml.ml_line_count ? 1 : 0);
+    if (joined_lines_count > 1) {
+      do_join(joined_lines_count, FALSE, TRUE, FALSE, true);
+      sub_nsubs = joined_lines_count - 1;
+      sub_nlines = 1;
+      do_sub_msg(false);
+      ex_may_print(eap);
+    }
+
+    if (save) {
+      if (!cmdmod.keeppatterns) {
+        save_re_pat(RE_SUBST, pat, p_magic);
+      }
+      add_to_history(HIST_SEARCH, pat, true, NUL);
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+/// Allocate memory to store the replacement text for :substitute.
+///
+/// Slightly more memory that is strictly necessary is allocated to reduce the
+/// frequency of memory (re)allocation.
+///
+/// @param[in,out]  new_start   pointer to the memory for the replacement text
+/// @param[in]      needed_len  amount of memory needed
+///
+/// @returns pointer to the end of the allocated memory
+static char_u *sub_grow_buf(char_u **new_start, int needed_len)
+  FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_NONNULL_RET
+{
+  int new_start_len = 0;
+  char_u *new_end;
+  if (*new_start == NULL) {
+    // Get some space for a temporary buffer to do the
+    // substitution into (and some extra space to avoid
+    // too many calls to xmalloc()/free()).
+    new_start_len = needed_len + 50;
+    *new_start = xmalloc(new_start_len);
+    **new_start = NUL;
+    new_end = *new_start;
+  } else {
+    // Check if the temporary buffer is long enough to do the
+    // substitution into.  If not, make it larger (with a bit
+    // extra to avoid too many calls to xmalloc()/free()).
+    size_t len = STRLEN(*new_start);
+    needed_len += len;
+    if (needed_len > new_start_len) {
+      new_start_len = needed_len + 50;
+      *new_start = xrealloc(*new_start, new_start_len);
+    }
+    new_end = *new_start + len;
+  }
+
+  return new_end;
+}
+
+/// Parse cmd string for :substitute's {flags} and update subflags accordingly
+///
+/// @param[in]      cmd  command string
+/// @param[in,out]  subflags  current flags defined for the :substitute command
+/// @param[in,out]  which_pat  pattern type from which to get default search
+///
+/// @returns pointer to the end of the flags, which may be the end of the string
+static char_u *sub_parse_flags(char_u *cmd, subflags_T *subflags,
+                               int *which_pat)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
+{
+  // Find trailing options.  When '&' is used, keep old options.
+  if (*cmd == '&') {
+    cmd++;
+  } else {
+    subflags->do_all = p_gd;
+    subflags->do_ask = false;
+    subflags->do_error = true;
+    subflags->do_print = false;
+    subflags->do_count = false;
+    subflags->do_number = false;
+    subflags->do_ic = kSubHonorOptions;
+  }
+  while (*cmd) {
+    // Note that 'g' and 'c' are always inverted.
+    // 'r' is never inverted.
+    if (*cmd == 'g') {
+      subflags->do_all = !subflags->do_all;
+    } else if (*cmd == 'c') {
+      subflags->do_ask = !subflags->do_ask;
+    } else if (*cmd == 'n') {
+      subflags->do_count = true;
+    } else if (*cmd == 'e') {
+      subflags->do_error = !subflags->do_error;
+    } else if (*cmd == 'r') {  // use last used regexp
+      *which_pat = RE_LAST;
+    } else if (*cmd == 'p') {
+      subflags->do_print = true;
+    } else if (*cmd == '#') {
+      subflags->do_print = true;
+      subflags->do_number = true;
+    } else if (*cmd == 'l') {
+      subflags->do_print = true;
+      subflags->do_list = true;
+    } else if (*cmd == 'i') {  // ignore case
+      subflags->do_ic = kSubIgnoreCase;
+    } else if (*cmd == 'I') {  // don't ignore case
+      subflags->do_ic = kSubMatchCase;
+    } else {
+      break;
+    }
+    cmd++;
+  }
+  if (subflags->do_count) {
+    subflags->do_ask = false;
+  }
+
+  return cmd;
+}
+
+/// Perform a substitution from line eap->line1 to line eap->line2 using the
+/// command pointed to by eap->arg which should be of the form:
+///
+/// /pattern/substitution/{flags}
+///
+/// The usual escapes are supported as described in the regexp docs.
+///
+/// @return buffer used for 'inccommand' preview
+static buf_T *do_sub(exarg_T *eap, proftime_T timeout)
 {
-  linenr_T lnum;
   long i = 0;
   regmmatch_T regmatch;
-  static int do_all = FALSE;            /* do multiple substitutions per line */
-  static int do_ask = FALSE;            /* ask for confirmation */
-  static bool do_count = false;         /* count only */
-  static int do_error = TRUE;           /* if false, ignore errors */
-  static int do_print = FALSE;          /* print last line with subs. */
-  static int do_list = FALSE;           /* list last line with subs. */
-  static int do_number = FALSE;         /* list last line with line nr*/
-  static int do_ic = 0;                 /* ignore case flag */
-  int save_do_all;                      // remember user specified 'g' flag
-  int save_do_ask;                      // remember user specified 'c' flag
-  char_u      *pat = NULL, *sub = NULL;         /* init for GCC */
+  static subflags_T subflags = {
+    .do_all = false,
+    .do_ask = false,
+    .do_count = false,
+    .do_error = true,
+    .do_print = false,
+    .do_list = false,
+    .do_number = false,
+    .do_ic = kSubHonorOptions
+  };
+  char_u *pat = NULL, *sub = NULL;  // init for GCC
   int delimiter;
+  bool has_second_delim = false;
   int sublen;
-  int got_quit = FALSE;
-  int got_match = FALSE;
-  int temp;
+  int got_quit = false;
+  int got_match = false;
   int which_pat;
-  char_u      *cmd;
-  int save_State;
-  linenr_T first_line = 0;              /* first changed line */
-  linenr_T last_line= 0;                /* below last changed line AFTER the
-                                         * change */
+  char_u *cmd = eap->arg;
+  linenr_T first_line = 0;  // first changed line
+  linenr_T last_line= 0;    // below last changed line AFTER the change
   linenr_T old_line_count = curbuf->b_ml.ml_line_count;
-  linenr_T line2;
-  long nmatch;                          /* number of lines in match */
-  char_u      *sub_firstline;           /* allocated copy of first sub line */
-  int endcolumn = FALSE;                /* cursor in last column when done */
+  char_u *sub_firstline;    // allocated copy of first sub line
+  bool endcolumn = false;   // cursor in last column when done
+  MatchedLineVec matched_lines = KV_INITIAL_VALUE;
   pos_T old_cursor = curwin->w_cursor;
   int start_nsubs;
   int save_ma = 0;
+  int save_b_changed = curbuf->b_changed;
+  bool preview = (State & CMDPREVIEW);
 
-  cmd = eap->arg;
   if (!global_busy) {
     sub_nsubs = 0;
     sub_nlines = 0;
@@ -2964,7 +3164,7 @@ void do_sub(exarg_T *eap)
     /* don't accept alphanumeric for separator */
     if (isalpha(*cmd)) {
       EMSG(_("E146: Regular expressions can't be delimited by letters"));
-      return;
+      return NULL;
     }
     /*
      * undocumented vi feature:
@@ -2975,21 +3175,26 @@ void do_sub(exarg_T *eap)
       ++cmd;
       if (vim_strchr((char_u *)"/?&", *cmd) == NULL) {
         EMSG(_(e_backslash));
-        return;
+        return NULL;
       }
-      if (*cmd != '&')
-        which_pat = RE_SEARCH;              /* use last '/' pattern */
-      pat = (char_u *)"";                   /* empty search pattern */
-      delimiter = *cmd++;                   /* remember delimiter character */
-    } else {          /* find the end of the regexp */
-      if (p_altkeymap && curwin->w_p_rl)
+      if (*cmd != '&') {
+        which_pat = RE_SEARCH;              // use last '/' pattern
+      }
+      pat = (char_u *)"";                   // empty search pattern
+      delimiter = *cmd++;                   // remember delimiter character
+      has_second_delim = true;
+    } else {          // find the end of the regexp
+      if (p_altkeymap && curwin->w_p_rl) {
         lrF_sub(cmd);
-      which_pat = RE_LAST;                  /* use last used regexp */
-      delimiter = *cmd++;                   /* remember delimiter character */
-      pat = cmd;                            /* remember start of search pat */
+      }
+      which_pat = RE_LAST;                  // use last used regexp
+      delimiter = *cmd++;                   // remember delimiter character
+      pat = cmd;                            // remember start of search pat
       cmd = skip_regexp(cmd, delimiter, p_magic, &eap->arg);
-      if (cmd[0] == delimiter)              /* end delimiter found */
-        *cmd++ = NUL;                       /* replace it with a NUL */
+      if (cmd[0] == delimiter) {            // end delimiter found
+        *cmd++ = NUL;                       // replace it with a NUL
+        has_second_delim = true;
+      }
     }
 
     /*
@@ -3008,7 +3213,7 @@ void do_sub(exarg_T *eap)
       mb_ptr_adv(cmd);
     }
 
-    if (!eap->skip) {
+    if (!eap->skip && !preview) {
       sub_set_replacement((SubReplacementString) {
         .sub = xstrdup((char *) sub),
         .timestamp = os_time(),
@@ -3018,7 +3223,7 @@ void do_sub(exarg_T *eap)
   } else if (!eap->skip) {    /* use previous pattern and substitution */
     if (old_sub.sub == NULL) {      /* there is no previous command */
       EMSG(_(e_nopresub));
-      return;
+      return NULL;
     }
     pat = NULL;                 /* search_regcomp() will use previous pattern */
     sub = (char_u *) old_sub.sub;
@@ -3028,106 +3233,22 @@ void do_sub(exarg_T *eap)
     endcolumn = (curwin->w_curswant == MAXCOL);
   }
 
-  // Recognize ":%s/\n//" and turn it into a join command, which is much
-  // more efficient.
-  // TODO: find a generic solution to make line-joining operations more
-  // efficient, avoid allocating a string that grows in size.
-  if (pat != NULL
-      && strcmp((const char *)pat, "\\n") == 0
-      && *sub == NUL
-      && (*cmd == NUL || (cmd[1] == NUL
-                          && (*cmd == 'g'
-                              || *cmd == 'l'
-                              || *cmd == 'p'
-                              || *cmd == '#')))) {
-    curwin->w_cursor.lnum = eap->line1;
-    if (*cmd == 'l') {
-      eap->flags = EXFLAG_LIST;
-    } else if (*cmd == '#') {
-      eap->flags = EXFLAG_NR;
-    } else if (*cmd == 'p') {
-      eap->flags = EXFLAG_PRINT;
-    }
-
-    // The number of lines joined is the number of lines in the range
-    linenr_T joined_lines_count = eap->line2 - eap->line1 + 1
-      // plus one extra line if not at the end of file.
-      + (eap->line2 < curbuf->b_ml.ml_line_count ? 1 : 0);
-    if (joined_lines_count > 1) {
-      do_join(joined_lines_count, FALSE, TRUE, FALSE, true);
-      sub_nsubs = joined_lines_count - 1;
-      sub_nlines = 1;
-      do_sub_msg(false);
-      ex_may_print(eap);
-    }
-
-    if (!cmdmod.keeppatterns) {
-      save_re_pat(RE_SUBST, pat, p_magic);
-    }
-    add_to_history(HIST_SEARCH, pat, TRUE, NUL);
-
-    return;
+  if (sub_joining_lines(eap, pat, sub, cmd, !preview)) {
+    return NULL;
   }
 
-  /*
-   * Find trailing options.  When '&' is used, keep old options.
-   */
-  if (*cmd == '&') {
-    ++cmd;
-  } else {
-    // default is global on
-    do_all = p_gd ? TRUE : FALSE;
-
-    do_ask = FALSE;
-    do_error = TRUE;
-    do_print = FALSE;
-    do_count = false;
-    do_number = FALSE;
-    do_ic = 0;
-  }
-  while (*cmd) {
-    // Note that 'g' and 'c' are always inverted.
-    // 'r' is never inverted.
-    if (*cmd == 'g')
-      do_all = !do_all;
-    else if (*cmd == 'c')
-      do_ask = !do_ask;
-    else if (*cmd == 'n')
-      do_count = true;
-    else if (*cmd == 'e')
-      do_error = !do_error;
-    else if (*cmd == 'r')           /* use last used regexp */
-      which_pat = RE_LAST;
-    else if (*cmd == 'p')
-      do_print = TRUE;
-    else if (*cmd == '#') {
-      do_print = TRUE;
-      do_number = TRUE;
-    } else if (*cmd == 'l') {
-      do_print = TRUE;
-      do_list = TRUE;
-    } else if (*cmd == 'i')         /* ignore case */
-      do_ic = 'i';
-    else if (*cmd == 'I')           /* don't ignore case */
-      do_ic = 'I';
-    else
-      break;
-    ++cmd;
-  }
-  if (do_count) {
-    do_ask = FALSE;
-  }
+  cmd = sub_parse_flags(cmd, &subflags, &which_pat);
 
-  save_do_all = do_all;
-  save_do_ask = do_ask;
+  bool save_do_all = subflags.do_all;  // remember user specified 'g' flag
+  bool save_do_ask = subflags.do_ask;  // remember user specified 'c' flag
 
   // check for a trailing count
   cmd = skipwhite(cmd);
   if (ascii_isdigit(*cmd)) {
     i = getdigits_long(&cmd);
-    if (i <= 0 && !eap->skip && do_error) {
+    if (i <= 0 && !eap->skip && subflags.do_error) {
       EMSG(_(e_zerocount));
-      return;
+      return NULL;
     }
     eap->line1 = eap->line2;
     eap->line2 += i - 1;
@@ -3143,31 +3264,34 @@ void do_sub(exarg_T *eap)
     eap->nextcmd = check_nextcmd(cmd);
     if (eap->nextcmd == NULL) {
       EMSG(_(e_trailing));
-      return;
+      return NULL;
     }
   }
 
-  if (eap->skip)            /* not executing commands, only parsing */
-    return;
+  if (eap->skip) {          // not executing commands, only parsing
+    return NULL;
+  }
 
-  if (!do_count && !MODIFIABLE(curbuf)) {
-    /* Substitution is not allowed in non-'modifiable' buffer */
+  if (!subflags.do_count && !MODIFIABLE(curbuf)) {
+    // Substitution is not allowed in non-'modifiable' buffer
     EMSG(_(e_modifiable));
-    return;
+    return NULL;
   }
 
-  if (search_regcomp(pat, RE_SUBST, which_pat, SEARCH_HIS,
-          &regmatch) == FAIL) {
-    if (do_error)
+  if (search_regcomp(pat, RE_SUBST, which_pat, (preview ? 0 : SEARCH_HIS),
+                     &regmatch) == FAIL) {
+    if (subflags.do_error) {
       EMSG(_(e_invcmd));
-    return;
+    }
+    return NULL;
   }
 
-  /* the 'i' or 'I' flag overrules 'ignorecase' and 'smartcase' */
-  if (do_ic == 'i')
-    regmatch.rmm_ic = TRUE;
-  else if (do_ic == 'I')
-    regmatch.rmm_ic = FALSE;
+  // the 'i' or 'I' flag overrules 'ignorecase' and 'smartcase'
+  if (subflags.do_ic == kSubIgnoreCase) {
+    regmatch.rmm_ic = true;
+  } else if (subflags.do_ic == kSubMatchCase) {
+    regmatch.rmm_ic = false;
+  }
 
   sub_firstline = NULL;
 
@@ -3179,29 +3303,25 @@ void do_sub(exarg_T *eap)
   if (!(sub[0] == '\\' && sub[1] == '='))
     sub = regtilde(sub, p_magic);
 
-  /*
-   * Check for a match on each line.
-   */
-  line2 = eap->line2;
-  for (lnum = eap->line1; lnum <= line2 && !(got_quit
-                                             || aborting()
-                                             ); ++lnum) {
-    nmatch = vim_regexec_multi(&regmatch, curwin, curbuf, lnum,
-        (colnr_T)0, NULL);
+  // Check for a match on each line.
+  linenr_T line2 = eap->line2;
+  for (linenr_T lnum = eap->line1;
+       lnum <= line2 && !(got_quit || aborting());
+       lnum++) {
+    long nmatch = vim_regexec_multi(&regmatch, curwin, curbuf, lnum,
+                                    (colnr_T)0, NULL);
     if (nmatch) {
       colnr_T copycol;
       colnr_T matchcol;
       colnr_T prev_matchcol = MAXCOL;
       char_u      *new_end, *new_start = NULL;
-      unsigned new_start_len = 0;
       char_u      *p1;
       int did_sub = FALSE;
       int lastone;
-      int len, copy_len, needed_len;
-      long nmatch_tl = 0;               /* nr of lines matched below lnum */
-      int do_again;                     /* do it again after joining lines */
-      int skip_match = FALSE;
-      linenr_T sub_firstlnum;           /* nr of first sub line */
+      long nmatch_tl = 0;               // nr of lines matched below lnum
+      int do_again;                     // do it again after joining lines
+      int skip_match = false;
+      linenr_T sub_firstlnum;           // nr of first sub line
 
       /*
        * The new text is build up step by step, to avoid too much
@@ -3241,8 +3361,7 @@ void do_sub(exarg_T *eap)
        *   accordingly.
        *
        * The new text is built up in new_start[].  It has some extra
-       * room to avoid using xmalloc()/free() too often.  new_start_len is
-       * the length of the allocated memory at new_start.
+       * room to avoid using xmalloc()/free() too often.
        *
        * Make a copy of the old line, so it won't be taken away when
        * updating the screen or handling a multi-line match.  The "old_"
@@ -3251,6 +3370,8 @@ void do_sub(exarg_T *eap)
       sub_firstlnum = lnum;
       copycol = 0;
       matchcol = 0;
+      // the current match
+      MatchedLine matched_line = { 0, 0, NULL, KV_INITIAL_VALUE };
 
       /* At first match, remember current cursor position. */
       if (!got_match) {
@@ -3261,9 +3382,9 @@ void do_sub(exarg_T *eap)
       /*
        * Loop until nothing more to replace in this line.
        * 1. Handle match with empty string.
-       * 2. If do_ask is set, ask for confirmation.
+       * 2. If subflags.do_ask is set, ask for confirmation.
        * 3. substitute the string.
-       * 4. if do_all is set, find next match
+       * 4. if subflags.do_all is set, find next match
        * 5. break if there isn't another match in this line
        */
       for (;; ) {
@@ -3287,6 +3408,12 @@ void do_sub(exarg_T *eap)
         curwin->w_cursor.lnum = lnum;
         do_again = FALSE;
 
+        if (preview) {
+          // Increment the in-line match count and store the column.
+          matched_line.nmatch++;
+          kv_push(matched_line.cols, regmatch.startpos[0].col);
+        }
+
         /*
          * 1. Match empty string does not count, except for first
          * match.  This reproduces the strange vi behaviour.
@@ -3314,15 +3441,13 @@ void do_sub(exarg_T *eap)
         matchcol = regmatch.endpos[0].col;
         prev_matchcol = matchcol;
 
-        /*
-         * 2. If do_count is set only increase the counter.
-         *    If do_ask is set, ask for confirmation.
-         */
-        if (do_count) {
-          /* For a multi-line match, put matchcol at the NUL at
-           * the end of the line and set nmatch to one, so that
-           * we continue looking for a match on the next line.
-           * Avoids that ":s/\nB\@=//gc" get stuck. */
+        // 2. If subflags.do_count is set only increase the counter.
+        //    If do_ask is set, ask for confirmation.
+        if (subflags.do_count) {
+          // For a multi-line match, put matchcol at the NUL at
+          // the end of the line and set nmatch to one, so that
+          // we continue looking for a match on the next line.
+          // Avoids that ":s/\nB\@=//gc" get stuck.
           if (nmatch > 1) {
             matchcol = (colnr_T)STRLEN(sub_firstline);
             nmatch = 1;
@@ -3336,12 +3461,12 @@ void do_sub(exarg_T *eap)
             goto skip;
         }
 
-        if (do_ask) {
+        if (subflags.do_ask && !preview) {
           int typed = 0;
 
           /* change State to CONFIRM, so that the mouse works
            * properly */
-          save_State = State;
+          int save_State = State;
           State = CONFIRM;
           setmouse();                   /* disable mouse in xterm */
           curwin->w_cursor.col = regmatch.startpos[0].col;
@@ -3354,17 +3479,17 @@ void do_sub(exarg_T *eap)
           /*
            * Loop until 'y', 'n', 'q', CTRL-E or CTRL-Y typed.
            */
-          while (do_ask) {
+          while (subflags.do_ask) {
             if (exmode_active) {
               char_u      *resp;
               colnr_T sc, ec;
 
-              print_line_no_prefix(lnum, do_number, do_list);
+              print_line_no_prefix(lnum, subflags.do_number, subflags.do_list);
 
               getvcol(curwin, &curwin->w_cursor, &sc, NULL, NULL);
               curwin->w_cursor.col = regmatch.endpos[0].col - 1;
               getvcol(curwin, &curwin->w_cursor, NULL, NULL, &ec);
-              if (do_number || curwin->w_p_nu) {
+              if (subflags.do_number || curwin->w_p_nu) {
                 int numw = number_width(curwin) + 1;
                 sc += numw;
                 ec += numw;
@@ -3388,7 +3513,7 @@ void do_sub(exarg_T *eap)
               curwin->w_p_fen = FALSE;
               /* Invert the matched string.
                * Remove the inversion afterwards. */
-              temp = RedrawingDisabled;
+              int temp = RedrawingDisabled;
               RedrawingDisabled = 0;
 
               if (new_start != NULL) {
@@ -3460,7 +3585,7 @@ void do_sub(exarg_T *eap)
                 || typed == intr_char
 #endif
                 ) {
-              got_quit = TRUE;
+              got_quit = true;
               break;
             }
             if (typed == 'n')
@@ -3468,13 +3593,13 @@ void do_sub(exarg_T *eap)
             if (typed == 'y')
               break;
             if (typed == 'l') {
-              /* last: replace and then stop */
-              do_all = FALSE;
+              // last: replace and then stop
+              subflags.do_all = false;
               line2 = lnum;
               break;
             }
             if (typed == 'a') {
-              do_ask = FALSE;
+              subflags.do_ask = false;
               break;
             }
             if (typed == Ctrl_E)
@@ -3507,156 +3632,137 @@ void do_sub(exarg_T *eap)
          * use "\=col("."). */
         curwin->w_cursor.col = regmatch.startpos[0].col;
 
-        /*
-         * 3. substitute the string.
-         */
-        if (do_count) {
-          /* prevent accidentally changing the buffer by a function */
-          save_ma = curbuf->b_p_ma;
-          curbuf->b_p_ma = FALSE;
-          sandbox++;
-        }
-        /* get length of substitution part */
-        sublen = vim_regsub_multi(&regmatch,
-            sub_firstlnum - regmatch.startpos[0].lnum,
-            sub, sub_firstline, FALSE, p_magic, TRUE);
-        if (do_count) {
-          curbuf->b_p_ma = save_ma;
-          sandbox--;
-          goto skip;
-        }
+        // 3. Substitute the string. During 'inccommand' preview only do this if
+        //    there is a replace pattern.
+        if (!preview || has_second_delim) {
+          if (subflags.do_count) {
+            // prevent accidentally changing the buffer by a function
+            save_ma = curbuf->b_p_ma;
+            curbuf->b_p_ma = false;
+            sandbox++;
+          }
+          // Save flags for recursion.  They can change for e.g.
+          // :s/^/\=execute("s#^##gn")
+          subflags_T subflags_save = subflags;
+          // get length of substitution part
+          sublen = vim_regsub_multi(&regmatch,
+                                    sub_firstlnum - regmatch.startpos[0].lnum,
+                                    sub, sub_firstline, false, p_magic, true);
+          // Don't keep flags set by a recursive call
+          subflags = subflags_save;
+          if (subflags.do_count) {
+            curbuf->b_p_ma = save_ma;
+            if (sandbox > 0) {
+              sandbox--;
+            }
+            goto skip;
+          }
 
-        /* When the match included the "$" of the last line it may
-         * go beyond the last line of the buffer. */
-        if (nmatch > curbuf->b_ml.ml_line_count - sub_firstlnum + 1) {
-          nmatch = curbuf->b_ml.ml_line_count - sub_firstlnum + 1;
-          skip_match = TRUE;
-        }
+          // When the match included the "$" of the last line it may
+          // go beyond the last line of the buffer.
+          if (nmatch > curbuf->b_ml.ml_line_count - sub_firstlnum + 1) {
+            nmatch = curbuf->b_ml.ml_line_count - sub_firstlnum + 1;
+            skip_match = true;
+          }
 
-        /* Need room for:
-         * - result so far in new_start (not for first sub in line)
-         * - original text up to match
-         * - length of substituted part
-         * - original text after match
-         */
-        if (nmatch == 1)
-          p1 = sub_firstline;
-        else {
-          p1 = ml_get(sub_firstlnum + nmatch - 1);
-          nmatch_tl += nmatch - 1;
-        }
-        copy_len = regmatch.startpos[0].col - copycol;
-        needed_len = copy_len + ((unsigned)STRLEN(p1)
-                                 - regmatch.endpos[0].col) + sublen + 1;
-        if (new_start == NULL) {
-          /*
-           * Get some space for a temporary buffer to do the
-           * substitution into (and some extra space to avoid
-           * too many calls to xmalloc()/free()).
-           */
-          new_start_len = needed_len + 50;
-          new_start = xmalloc(new_start_len);
-          *new_start = NUL;
-          new_end = new_start;
-        } else {
-          /*
-           * Check if the temporary buffer is long enough to do the
-           * substitution into.  If not, make it larger (with a bit
-           * extra to avoid too many calls to xmalloc()/free()).
-           */
-          len = (unsigned)STRLEN(new_start);
-          needed_len += len;
-          if (needed_len > (int)new_start_len) {
-            new_start_len = needed_len + 50;
-            new_start = xrealloc(new_start, new_start_len);
+          // Need room for:
+          // - result so far in new_start (not for first sub in line)
+          // - original text up to match
+          // - length of substituted part
+          // - original text after match
+          if (nmatch == 1) {
+            p1 = sub_firstline;
+          } else {
+            p1 = ml_get(sub_firstlnum + nmatch - 1);
+            nmatch_tl += nmatch - 1;
           }
-          new_end = new_start + len;
-        }
+          size_t copy_len = regmatch.startpos[0].col - copycol;
+          new_end = sub_grow_buf(&new_start,
+                                 (STRLEN(p1) - regmatch.endpos[0].col)
+                                 + copy_len + sublen + 1);
+
+          // copy the text up to the part that matched
+          memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
+          new_end += copy_len;
+
+          (void)vim_regsub_multi(&regmatch,
+                                 sub_firstlnum - regmatch.startpos[0].lnum,
+                                 sub, new_end, true, p_magic, true);
+          sub_nsubs++;
+          did_sub = true;
 
-        /*
-         * copy the text up to the part that matched
-         */
-        memmove(new_end, sub_firstline + copycol, (size_t)copy_len);
-        new_end += copy_len;
-
-        (void)vim_regsub_multi(&regmatch,
-            sub_firstlnum - regmatch.startpos[0].lnum,
-            sub, new_end, TRUE, p_magic, TRUE);
-        sub_nsubs++;
-        did_sub = TRUE;
-
-        /* Move the cursor to the start of the line, to avoid that it
-         * is beyond the end of the line after the substitution. */
-        curwin->w_cursor.col = 0;
-
-        /* For a multi-line match, make a copy of the last matched
-         * line and continue in that one. */
-        if (nmatch > 1) {
-          sub_firstlnum += nmatch - 1;
-          xfree(sub_firstline);
-          sub_firstline = vim_strsave(ml_get(sub_firstlnum));
-          /* When going beyond the last line, stop substituting. */
-          if (sub_firstlnum <= line2)
-            do_again = TRUE;
-          else
-            do_all = FALSE;
-        }
+          // Move the cursor to the start of the line, to avoid that it
+          // is beyond the end of the line after the substitution.
+          curwin->w_cursor.col = 0;
 
-        /* Remember next character to be copied. */
-        copycol = regmatch.endpos[0].col;
+          // For a multi-line match, make a copy of the last matched
+          // line and continue in that one.
+          if (nmatch > 1) {
+            sub_firstlnum += nmatch - 1;
+            xfree(sub_firstline);
+            sub_firstline = vim_strsave(ml_get(sub_firstlnum));
+            // When going beyond the last line, stop substituting.
+            if (sub_firstlnum <= line2) {
+              do_again = true;
+            } else {
+              subflags.do_all = false;
+            }
+          }
 
-        if (skip_match) {
-          /* Already hit end of the buffer, sub_firstlnum is one
-           * less than what it ought to be. */
-          xfree(sub_firstline);
-          sub_firstline = vim_strsave((char_u *)"");
-          copycol = 0;
-        }
+          // Remember next character to be copied.
+          copycol = regmatch.endpos[0].col;
 
-        /*
-         * Now the trick is to replace CTRL-M chars with a real line
-         * break.  This would make it impossible to insert a CTRL-M in
-         * the text.  The line break can be avoided by preceding the
-         * CTRL-M with a backslash.  To be able to insert a backslash,
-         * they must be doubled in the string and are halved here.
-         * That is Vi compatible.
-         */
-        for (p1 = new_end; *p1; ++p1) {
-          if (p1[0] == '\\' && p1[1] != NUL)            /* remove backslash */
-            STRMOVE(p1, p1 + 1);
-          else if (*p1 == CAR) {
-            if (u_inssub(lnum) == OK) {             /* prepare for undo */
-              *p1 = NUL;                            /* truncate up to the CR */
-              ml_append(lnum - 1, new_start,
-                  (colnr_T)(p1 - new_start + 1), FALSE);
-              mark_adjust(lnum + 1, (linenr_T)MAXLNUM, 1L, 0L);
-              if (do_ask)
-                appended_lines(lnum - 1, 1L);
-              else {
-                if (first_line == 0)
-                  first_line = lnum;
-                last_line = lnum + 1;
+          if (skip_match) {
+            // Already hit end of the buffer, sub_firstlnum is one
+            // less than what it ought to be.
+            xfree(sub_firstline);
+            sub_firstline = vim_strsave((char_u *)"");
+            copycol = 0;
+          }
+
+          // Now the trick is to replace CTRL-M chars with a real line
+          // break.  This would make it impossible to insert a CTRL-M in
+          // the text.  The line break can be avoided by preceding the
+          // CTRL-M with a backslash.  To be able to insert a backslash,
+          // they must be doubled in the string and are halved here.
+          // That is Vi compatible.
+          for (p1 = new_end; *p1; p1++) {
+            if (p1[0] == '\\' && p1[1] != NUL) {            // remove backslash
+              STRMOVE(p1, p1 + 1);
+            } else if (*p1 == CAR) {
+              if (u_inssub(lnum) == OK) {             // prepare for undo
+                *p1 = NUL;                            // truncate up to the CR
+                ml_append(lnum - 1, new_start,
+                          (colnr_T)(p1 - new_start + 1), false);
+                mark_adjust(lnum + 1, (linenr_T)MAXLNUM, 1L, 0L);
+                if (subflags.do_ask) {
+                  appended_lines(lnum - 1, 1L);
+                } else {
+                  if (first_line == 0) {
+                    first_line = lnum;
+                  }
+                  last_line = lnum + 1;
+                }
+                // All line numbers increase.
+                sub_firstlnum++;
+                lnum++;
+                line2++;
+                // move the cursor to the new line, like Vi
+                curwin->w_cursor.lnum++;
+                // copy the rest
+                STRMOVE(new_start, p1 + 1);
+                p1 = new_start - 1;
               }
-              /* All line numbers increase. */
-              ++sub_firstlnum;
-              ++lnum;
-              ++line2;
-              /* move the cursor to the new line, like Vi */
-              ++curwin->w_cursor.lnum;
-              /* copy the rest */
-              STRMOVE(new_start, p1 + 1);
-              p1 = new_start - 1;
+            } else if (has_mbyte) {
+              p1 += (*mb_ptr2len)(p1) - 1;
             }
-          } else if (has_mbyte)
-            p1 += (*mb_ptr2len)(p1) - 1;
+          }
         }
 
-        /*
-         * 4. If do_all is set, find next match.
-         * Prevent endless loop with patterns that match empty
-         * strings, e.g. :s/$/pat/g or :s/[a-z]* /(&)/g.
-         * But ":s/\n/#/" is OK.
-         */
+        // 4. If subflags.do_all is set, find next match.
+        // Prevent endless loop with patterns that match empty
+        // strings, e.g. :s/$/pat/g or :s/[a-z]* /(&)/g.
+        // But ":s/\n/#/" is OK.
 skip:
         /* We already know that we did the last subst when we are at
          * the end of the line, except that a pattern like
@@ -3667,7 +3773,7 @@ skip:
                    || got_int
                    || got_quit
                    || lnum > line2
-                   || !(do_all || do_again)
+                   || !(subflags.do_all || do_again)
                    || (sub_firstline[matchcol] == NUL && nmatch <= 1
                        && !re_multiline(regmatch.regprog)));
         nmatch = -1;
@@ -3717,21 +3823,23 @@ skip:
               for (i = 0; i < nmatch_tl; ++i)
                 ml_delete(lnum, (int)FALSE);
               mark_adjust(lnum, lnum + nmatch_tl - 1,
-                  (long)MAXLNUM, -nmatch_tl);
-              if (do_ask)
+                          (long)MAXLNUM, -nmatch_tl);
+              if (subflags.do_ask) {
                 deleted_lines(lnum, nmatch_tl);
-              --lnum;
-              line2 -= nmatch_tl;               /* nr of lines decreases */
+              }
+              lnum--;
+              line2 -= nmatch_tl;  // nr of lines decreases
               nmatch_tl = 0;
             }
 
             /* When asking, undo is saved each time, must also set
              * changed flag each time. */
-            if (do_ask)
+            if (subflags.do_ask) {
               changed_bytes(lnum, 0);
-            else {
-              if (first_line == 0)
+            } else {
+              if (first_line == 0) {
                 first_line = lnum;
+              }
               last_line = lnum + 1;
             }
 
@@ -3769,9 +3877,19 @@ skip:
       xfree(new_start);              /* for when substitute was cancelled */
       xfree(sub_firstline);          /* free the copy of the original line */
       sub_firstline = NULL;
+
+      if (preview) {
+        matched_line.lnum = lnum;
+        matched_line.line = vim_strsave(ml_get(lnum));
+        kv_push(matched_lines, matched_line);
+      }
     }
 
     line_breakcheck();
+
+    if (profile_passed_limit(timeout)) {
+      got_quit = true;
+    }
   }
 
   if (first_line != 0) {
@@ -3784,9 +3902,10 @@ skip:
 
   xfree(sub_firstline);   /* may have to free allocated copy of the line */
 
-  /* ":s/pat//n" doesn't move the cursor */
-  if (do_count)
+  // ":s/pat//n" doesn't move the cursor
+  if (subflags.do_count) {
     curwin->w_cursor = old_cursor;
+  }
 
   if (sub_nsubs > start_nsubs) {
     /* Set the '[ and '] marks. */
@@ -3795,28 +3914,37 @@ skip:
     curbuf->b_op_start.col = curbuf->b_op_end.col = 0;
 
     if (!global_busy) {
-      if (!do_ask) {      /* when interactive leave cursor on the match */
-        if (endcolumn)
+      // when interactive leave cursor on the match
+      if (!subflags.do_ask) {
+        if (endcolumn) {
           coladvance((colnr_T)MAXCOL);
-        else
+        } else {
           beginline(BL_WHITE | BL_FIX);
+        }
       }
-      if (!do_sub_msg(do_count) && do_ask)
+      if (!preview && !do_sub_msg(subflags.do_count) && subflags.do_ask) {
         MSG("");
-    } else
-      global_need_beginline = TRUE;
-    if (do_print)
-      print_line(curwin->w_cursor.lnum, do_number, do_list);
+      }
+    } else {
+      global_need_beginline = true;
+    }
+    if (subflags.do_print) {
+      print_line(curwin->w_cursor.lnum, subflags.do_number, subflags.do_list);
+    }
   } else if (!global_busy) {
-    if (got_int)                /* interrupted */
+    if (got_int) {
+      // interrupted
       EMSG(_(e_interr));
-    else if (got_match)         /* did find something but nothing substituted */
+    } else if (got_match) {
+      // did find something but nothing substituted
       MSG("");
-    else if (do_error)          /* nothing found */
+    } else if (subflags.do_error) {
+      // nothing found
       EMSG2(_(e_patnotf2), get_search_pat());
+    }
   }
 
-  if (do_ask && hasAnyFolding(curwin)) {
+  if (subflags.do_ask && hasAnyFolding(curwin)) {
     // Cursor position may require updating
     changed_window_setting();
   }
@@ -3824,9 +3952,30 @@ skip:
   vim_regfree(regmatch.regprog);
 
   // Restore the flag values, they can be used for ":&&".
-  do_all = save_do_all;
-  do_ask = save_do_ask;
-}
+  subflags.do_all = save_do_all;
+  subflags.do_ask = save_do_ask;
+
+  // Show 'inccommand' preview if there are matched lines.
+  buf_T *preview_buf = NULL;
+  if (preview && !aborting()) {
+    if (got_quit) {  // Substitution is too slow, disable 'inccommand'.
+      set_string_option_direct((char_u *)"icm", -1, (char_u *)"", OPT_FREE,
+                               SID_NONE);
+    } else if (*p_icm != NUL && matched_lines.size != 0 && pat != NULL) {
+      curbuf->b_changed = save_b_changed;  // preserve 'modified' during preview
+      preview_buf = show_sub(eap, old_cursor, pat, sub, &matched_lines);
+    }
+  }
+
+  for (MatchedLine m; kv_size(matched_lines);) {
+    m = kv_pop(matched_lines);
+    xfree(m.line);
+    kv_destroy(m.cols);
+  }
+  kv_destroy(matched_lines);
+
+  return preview_buf;
+}  // NOLINT(readability/fn_size)
 
 /*
  * Give message for number of substitutions.
@@ -3982,69 +4131,72 @@ void ex_global(exarg_T *eap)
       smsg(_("Pattern not found: %s"), pat);
     }
   } else {
-    start_global_changes();
     global_exe(cmd);
-    end_global_changes();
   }
   ml_clearmarked();        /* clear rest of the marks */
   vim_regfree(regmatch.regprog);
 }
 
-/*
- * Execute "cmd" on lines marked with ml_setmarked().
- */
+/// Execute `cmd` on lines marked with ml_setmarked().
 void global_exe(char_u *cmd)
 {
-  linenr_T old_lcount;          /* b_ml.ml_line_count before the command */
-  buf_T    *old_buf = curbuf;   /* remember what buffer we started in */
-  linenr_T lnum;                /* line number according to old situation */
-
-  /*
-   * Set current position only once for a global command.
-   * If global_busy is set, setpcmark() will not do anything.
-   * If there is an error, global_busy will be incremented.
-   */
+  linenr_T old_lcount;      // b_ml.ml_line_count before the command
+  buf_T *old_buf = curbuf;  // remember what buffer we started in
+  linenr_T lnum;            // line number according to old situation
+  int save_mapped_ctrl_c = mapped_ctrl_c;
+
+  // Set current position only once for a global command.
+  // If global_busy is set, setpcmark() will not do anything.
+  // If there is an error, global_busy will be incremented.
   setpcmark();
 
-  /* When the command writes a message, don't overwrite the command. */
-  msg_didout = TRUE;
+  // When the command writes a message, don't overwrite the command.
+  msg_didout = true;
+  // Disable CTRL-C mapping, let it interrupt (potentially long output).
+  mapped_ctrl_c = 0;
 
   sub_nsubs = 0;
   sub_nlines = 0;
-  global_need_beginline = FALSE;
+  global_need_beginline = false;
   global_busy = 1;
   old_lcount = curbuf->b_ml.ml_line_count;
+
   while (!got_int && (lnum = ml_firstmarked()) != 0 && global_busy == 1) {
     curwin->w_cursor.lnum = lnum;
     curwin->w_cursor.col = 0;
-    if (*cmd == NUL || *cmd == '\n')
+    if (*cmd == NUL || *cmd == '\n') {
       do_cmdline((char_u *)"p", NULL, NULL, DOCMD_NOWAIT);
-    else
+    } else {
       do_cmdline(cmd, NULL, NULL, DOCMD_NOWAIT);
+    }
     os_breakcheck();
   }
 
+  mapped_ctrl_c = save_mapped_ctrl_c;
   global_busy = 0;
-  if (global_need_beginline)
+  if (global_need_beginline) {
     beginline(BL_WHITE | BL_FIX);
-  else
-    check_cursor();     /* cursor may be beyond the end of the line */
+  } else {
+    check_cursor();  // cursor may be beyond the end of the line
+  }
 
-  /* the cursor may not have moved in the text but a change in a previous
-   * line may move it on the screen */
+  // the cursor may not have moved in the text but a change in a previous
+  // line may move it on the screen
   changed_line_abv_curs();
 
-  /* If it looks like no message was written, allow overwriting the
-   * command with the report for number of changes. */
-  if (msg_col == 0 && msg_scrolled == 0)
-    msg_didout = FALSE;
+  // If it looks like no message was written, allow overwriting the
+  // command with the report for number of changes.
+  if (msg_col == 0 && msg_scrolled == 0) {
+    msg_didout = false;
+  }
 
-  /* If substitutes done, report number of substitutes, otherwise report
-   * number of extra or deleted lines.
-   * Don't report extra or deleted lines in the edge case where the buffer
-   * we are in after execution is different from the buffer we started in. */
-  if (!do_sub_msg(false) && curbuf == old_buf)
+  // If substitutes done, report number of substitutes, otherwise report
+  // number of extra or deleted lines.
+  // Don't report extra or deleted lines in the edge case where the buffer
+  // we are in after execution is different from the buffer we started in.
+  if (!do_sub_msg(false) && curbuf == old_buf) {
     msgmore(curbuf->b_ml.ml_line_count - old_lcount);
+  }
 }
 
 #if defined(EXITFREE)
@@ -4494,12 +4646,15 @@ int find_help_tags(char_u *arg, int *num_matches, char_u ***matches, int keep_la
           break;
         }
 
-        /*
-         * If tag starts with ', toss everything after a second '. Fixes
-         * CTRL-] on 'option'. (would include the trailing '.').
-         */
-        if (*s == '\'' && s > arg && *arg == '\'')
+        // If tag starts with ', toss everything after a second '. Fixes
+        // CTRL-] on 'option'. (would include the trailing '.').
+        if (*s == '\'' && s > arg && *arg == '\'') {
+          break;
+        }
+        // Also '{' and '}'. Fixes CTRL-] on '{address}'.
+        if (*s == '}' && s > arg && *arg == '{') {
           break;
+        }
       }
       *d = NUL;
 
@@ -4657,9 +4812,13 @@ void fix_help_buffer(void)
           vimconv_T vc;
           char_u      *cp;
 
-          /* Find all "doc/ *.txt" files in this directory. */
-          add_pathsep((char *)NameBuff);
-          STRCAT(NameBuff, "doc/*.??[tx]");
+          // Find all "doc/ *.txt" files in this directory.
+          if (!add_pathsep((char *)NameBuff)
+              || STRLCAT(NameBuff, "doc/*.??[tx]",
+                         sizeof(NameBuff)) >= MAXPATHL) {
+            EMSG(_(e_fnametoolong));
+            continue;
+          }
 
           // Note: We cannot just do `&NameBuff` because it is a statically sized array
           //       so `NameBuff == &NameBuff` according to C semantics.
@@ -4796,122 +4955,15 @@ void ex_viusage(exarg_T *eap)
 }
 
 
-/*
- * ":helptags"
- */
-void ex_helptags(exarg_T *eap)
-{
-  garray_T ga;
-  int len;
-  char_u lang[2];
-  expand_T xpc;
-  char_u      *dirname;
-  char_u ext[5];
-  char_u fname[8];
-  int filecount;
-  char_u      **files;
-  int add_help_tags = FALSE;
-
-  /* Check for ":helptags ++t {dir}". */
-  if (STRNCMP(eap->arg, "++t", 3) == 0 && ascii_iswhite(eap->arg[3])) {
-    add_help_tags = TRUE;
-    eap->arg = skipwhite(eap->arg + 3);
-  }
-
-  ExpandInit(&xpc);
-  xpc.xp_context = EXPAND_DIRECTORIES;
-  dirname = ExpandOne(&xpc, eap->arg, NULL,
-      WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE);
-  if (dirname == NULL || !os_isdir(dirname)) {
-    EMSG2(_("E150: Not a directory: %s"), eap->arg);
-    xfree(dirname);
-    return;
-  }
-
-  /* Get a list of all files in the help directory and in subdirectories. */
-  STRCPY(NameBuff, dirname);
-  add_pathsep((char *)NameBuff);
-  STRCAT(NameBuff, "**");
-
-  // Note: We cannot just do `&NameBuff` because it is a statically sized array
-  //       so `NameBuff == &NameBuff` according to C semantics.
-  char_u *buff_list[1] = {NameBuff};
-  if (gen_expand_wildcards(1, buff_list, &filecount, &files,
-          EW_FILE|EW_SILENT) == FAIL
-      || filecount == 0) {
-    EMSG2("E151: No match: %s", NameBuff);
-    xfree(dirname);
-    return;
-  }
-
-  /* Go over all files in the directory to find out what languages are
-   * present. */
-  ga_init(&ga, 1, 10);
-  for (int i = 0; i < filecount; ++i) {
-    len = (int)STRLEN(files[i]);
-    if (len <= 4) {
-      continue;
-    }
-    if (STRICMP(files[i] + len - 4, ".txt") == 0) {
-      /* ".txt" -> language "en" */
-      lang[0] = 'e';
-      lang[1] = 'n';
-    } else if (files[i][len - 4] == '.'
-               && ASCII_ISALPHA(files[i][len - 3])
-               && ASCII_ISALPHA(files[i][len - 2])
-               && TOLOWER_ASC(files[i][len - 1]) == 'x') {
-      /* ".abx" -> language "ab" */
-      lang[0] = TOLOWER_ASC(files[i][len - 3]);
-      lang[1] = TOLOWER_ASC(files[i][len - 2]);
-    } else
-      continue;
-
-    int j;
-    /* Did we find this language already? */
-    for (j = 0; j < ga.ga_len; j += 2)
-      if (STRNCMP(lang, ((char_u *)ga.ga_data) + j, 2) == 0)
-        break;
-    if (j == ga.ga_len) {
-      /* New language, add it. */
-      ga_grow(&ga, 2);
-      ((char_u *)ga.ga_data)[ga.ga_len++] = lang[0];
-      ((char_u *)ga.ga_data)[ga.ga_len++] = lang[1];
-    }
-  }
-
-  /*
-   * Loop over the found languages to generate a tags file for each one.
-   */
-  for (int j = 0; j < ga.ga_len; j += 2) {
-    STRCPY(fname, "tags-xx");
-    fname[5] = ((char_u *)ga.ga_data)[j];
-    fname[6] = ((char_u *)ga.ga_data)[j + 1];
-    if (fname[5] == 'e' && fname[6] == 'n') {
-      /* English is an exception: use ".txt" and "tags". */
-      fname[4] = NUL;
-      STRCPY(ext, ".txt");
-    } else {
-      /* Language "ab" uses ".abx" and "tags-ab". */
-      STRCPY(ext, ".xxx");
-      ext[1] = fname[5];
-      ext[2] = fname[6];
-    }
-    helptags_one(dirname, ext, fname, add_help_tags);
-  }
-
-  ga_clear(&ga);
-  FreeWild(filecount, files);
-
-  xfree(dirname);
-}
-
-static void 
-helptags_one (
-    char_u *dir,               /* doc directory */
-    char_u *ext,               /* suffix, ".txt", ".itx", ".frx", etc. */
-    char_u *tagfname,          /* "tags" for English, "tags-fr" for French. */
-    int add_help_tags              /* add "help-tags" tag */
-)
+/// Generate tags in one help directory
+///
+/// @param dir  Path to the doc directory
+/// @param ext  Suffix of the help files (".txt", ".itx", ".frx", etc.)
+/// @param tagname  Name of the tags file ("tags" for English, "tags-fr" for
+///                 French)
+/// @param add_help_tags  Whether to add the "help-tags" tag
+static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname,
+                         bool add_help_tags)
 {
   FILE        *fd_tags;
   FILE        *fd;
@@ -4928,10 +4980,13 @@ helptags_one (
   int mix = FALSE;              /* detected mixed encodings */
 
   // Find all *.txt files.
-  size_t dirlen = STRLEN(dir);
-  STRCPY(NameBuff, dir);
-  STRCAT(NameBuff, "/**/*");
-  STRCAT(NameBuff, ext);
+  size_t dirlen = STRLCPY(NameBuff, dir, sizeof(NameBuff));
+  if (dirlen >= MAXPATHL
+      || STRLCAT(NameBuff, "/**/*", sizeof(NameBuff)) >= MAXPATHL  // NOLINT
+      || STRLCAT(NameBuff, ext, sizeof(NameBuff)) >= MAXPATHL) {
+    EMSG(_(e_fnametoolong));
+    return;
+  }
 
   // Note: We cannot just do `&NameBuff` because it is a statically sized array
   //       so `NameBuff == &NameBuff` according to C semantics.
@@ -4944,13 +4999,16 @@ helptags_one (
     return;
   }
 
-  /*
-   * Open the tags file for writing.
-   * Do this before scanning through all the files.
-   */
-  STRCPY(NameBuff, dir);
-  add_pathsep((char *)NameBuff);
-  STRNCAT(NameBuff, tagfname, sizeof(NameBuff) - dirlen - 2);
+  //
+  // Open the tags file for writing.
+  // Do this before scanning through all the files.
+  //
+  memcpy(NameBuff, dir, dirlen + 1);
+  if (!add_pathsep((char *)NameBuff)
+      || STRLCAT(NameBuff, tagfname, sizeof(NameBuff)) >= MAXPATHL) {
+    EMSG(_(e_fnametoolong));
+    return;
+  }
   fd_tags = mch_fopen((char *)NameBuff, "w");
   if (fd_tags == NULL) {
     EMSG2(_("E152: Cannot open %s for writing"), NameBuff);
@@ -5111,6 +5169,136 @@ helptags_one (
   fclose(fd_tags);          /* there is no check for an error... */
 }
 
+/// Generate tags in one help directory, taking care of translations.
+static void do_helptags(char_u *dirname, bool add_help_tags)
+{
+  int len;
+  garray_T ga;
+  char_u lang[2];
+  char_u ext[5];
+  char_u fname[8];
+  int filecount;
+  char_u **files;
+
+  // Get a list of all files in the help directory and in subdirectories.
+  STRLCPY(NameBuff, dirname, sizeof(NameBuff));
+  if (!add_pathsep((char *)NameBuff)
+      || STRLCAT(NameBuff, "**", sizeof(NameBuff)) >= MAXPATHL) {
+    EMSG(_(e_fnametoolong));
+    xfree(dirname);
+    return;
+  }
+
+  // Note: We cannot just do `&NameBuff` because it is a statically sized array
+  //       so `NameBuff == &NameBuff` according to C semantics.
+  char_u *buff_list[1] = {NameBuff};
+  if (gen_expand_wildcards(1, buff_list, &filecount, &files,
+                           EW_FILE|EW_SILENT) == FAIL
+      || filecount == 0) {
+    EMSG2("E151: No match: %s", NameBuff);
+    xfree(dirname);
+    return;
+  }
+
+  /* Go over all files in the directory to find out what languages are
+   * present. */
+  int j;
+  ga_init(&ga, 1, 10);
+  for (int i = 0; i < filecount; i++) {
+    len = (int)STRLEN(files[i]);
+    if (len <= 4) {
+      continue;
+    }
+    if (STRICMP(files[i] + len - 4, ".txt") == 0) {
+      /* ".txt" -> language "en" */
+      lang[0] = 'e';
+      lang[1] = 'n';
+    } else if (files[i][len - 4] == '.'
+               && ASCII_ISALPHA(files[i][len - 3])
+               && ASCII_ISALPHA(files[i][len - 2])
+               && TOLOWER_ASC(files[i][len - 1]) == 'x') {
+      /* ".abx" -> language "ab" */
+      lang[0] = TOLOWER_ASC(files[i][len - 3]);
+      lang[1] = TOLOWER_ASC(files[i][len - 2]);
+    } else
+      continue;
+
+    // Did we find this language already?
+    for (j = 0; j < ga.ga_len; j += 2) {
+      if (STRNCMP(lang, ((char_u *)ga.ga_data) + j, 2) == 0) {
+        break;
+      }
+    }
+    if (j == ga.ga_len) {
+      // New language, add it.
+      ga_grow(&ga, 2);
+      ((char_u *)ga.ga_data)[ga.ga_len++] = lang[0];
+      ((char_u *)ga.ga_data)[ga.ga_len++] = lang[1];
+    }
+  }
+
+  /*
+   * Loop over the found languages to generate a tags file for each one.
+   */
+  for (j = 0; j < ga.ga_len; j += 2) {
+    STRCPY(fname, "tags-xx");
+    fname[5] = ((char_u *)ga.ga_data)[j];
+    fname[6] = ((char_u *)ga.ga_data)[j + 1];
+    if (fname[5] == 'e' && fname[6] == 'n') {
+      /* English is an exception: use ".txt" and "tags". */
+      fname[4] = NUL;
+      STRCPY(ext, ".txt");
+    } else {
+      /* Language "ab" uses ".abx" and "tags-ab". */
+      STRCPY(ext, ".xxx");
+      ext[1] = fname[5];
+      ext[2] = fname[6];
+    }
+    helptags_one(dirname, ext, fname, add_help_tags);
+  }
+
+  ga_clear(&ga);
+  FreeWild(filecount, files);
+}
+
+    static void
+helptags_cb(char_u *fname, void *cookie)
+{
+    do_helptags(fname, *(bool *)cookie);
+}
+
+/*
+ * ":helptags"
+ */
+void ex_helptags(exarg_T *eap)
+{
+  expand_T xpc;
+  char_u *dirname;
+  bool add_help_tags = false;
+
+  /* Check for ":helptags ++t {dir}". */
+  if (STRNCMP(eap->arg, "++t", 3) == 0 && ascii_iswhite(eap->arg[3])) {
+    add_help_tags = true;
+    eap->arg = skipwhite(eap->arg + 3);
+  }
+
+  if (STRCMP(eap->arg, "ALL") == 0) {
+    do_in_path(p_rtp, (char_u *)"doc", DIP_ALL + DIP_DIR,
+               helptags_cb, &add_help_tags);
+  } else {
+    ExpandInit(&xpc);
+    xpc.xp_context = EXPAND_DIRECTORIES;
+    dirname = ExpandOne(&xpc, eap->arg, NULL,
+                        WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE);
+    if (dirname == NULL || !os_isdir(dirname)) {
+      EMSG2(_("E150: Not a directory: %s"), eap->arg);
+    } else {
+      do_helptags(dirname, add_help_tags);
+    }
+    xfree(dirname);
+  }
+}
+
 struct sign
 {
     sign_T      *sn_next;       /* next sign in list */
@@ -5182,385 +5370,330 @@ static int sign_cmd_idx(
  */
 void ex_sign(exarg_T *eap)
 {
-    char_u	*arg = eap->arg;
-    char_u	*p;
-    int		idx;
-    sign_T	*sp;
-    sign_T	*sp_prev;
-
-    /* Parse the subcommand. */
-    p = skiptowhite(arg);
-    idx = sign_cmd_idx(arg, p);
-    if (idx == SIGNCMD_LAST)
-    {
-	EMSG2(_("E160: Unknown sign command: %s"), arg);
-	return;
+  char_u *arg = eap->arg;
+  char_u *p;
+  int idx;
+  sign_T *sp;
+  sign_T *sp_prev;
+
+  // Parse the subcommand.
+  p = skiptowhite(arg);
+  idx = sign_cmd_idx(arg, p);
+  if (idx == SIGNCMD_LAST) {
+    EMSG2(_("E160: Unknown sign command: %s"), arg);
+    return;
+  }
+  arg = skipwhite(p);
+
+  if (idx <= SIGNCMD_LIST) {
+    // Define, undefine or list signs.
+    if (idx == SIGNCMD_LIST && *arg == NUL) {
+      // ":sign list": list all defined signs
+      for (sp = first_sign; sp != NULL && !got_int; sp = sp->sn_next) {
+        sign_list_defined(sp);
+      }
+    } else if (*arg == NUL) {
+      EMSG(_("E156: Missing sign name"));
+    } else {
+      // Isolate the sign name.  If it's a number skip leading zeroes,
+      // so that "099" and "99" are the same sign.  But keep "0".
+      p = skiptowhite(arg);
+      if (*p != NUL) {
+        *p++ = NUL;
+      }
+      while (arg[0] == '0' && arg[1] != NUL) {
+        arg++;
+      }
+
+      sp_prev = NULL;
+      for (sp = first_sign; sp != NULL; sp = sp->sn_next) {
+        if (STRCMP(sp->sn_name, arg) == 0) {
+          break;
+        }
+        sp_prev = sp;
+      }
+      if (idx == SIGNCMD_DEFINE) {
+        // ":sign define {name} ...": define a sign
+        if (sp == NULL) {
+          sign_T *lp;
+          int start = next_sign_typenr;
+
+          // Allocate a new sign.
+          sp = xcalloc(1, sizeof(sign_T));
+
+          // Check that next_sign_typenr is not already being used.
+          // This only happens after wrapping around.  Hopefully
+          // another one got deleted and we can use its number.
+          for (lp = first_sign; lp != NULL; ) {
+            if (lp->sn_typenr == next_sign_typenr) {
+              next_sign_typenr++;
+              if (next_sign_typenr == MAX_TYPENR) {
+                next_sign_typenr = 1;
+              }
+              if (next_sign_typenr == start) {
+                xfree(sp);
+                EMSG(_("E612: Too many signs defined"));
+                return;
+              }
+              lp = first_sign;  // start all over
+              continue;
+            }
+            lp = lp->sn_next;
+          }
+
+          sp->sn_typenr = next_sign_typenr;
+          if (++next_sign_typenr == MAX_TYPENR) {
+            next_sign_typenr = 1;  // wrap around
+          }
+
+          sp->sn_name = vim_strsave(arg);
+
+          // add the new sign to the list of signs
+          if (sp_prev == NULL) {
+            first_sign = sp;
+          } else {
+            sp_prev->sn_next = sp;
+          }
+        }
+
+        // set values for a defined sign.
+        for (;;) {
+          arg = skipwhite(p);
+          if (*arg == NUL) {
+            break;
+          }
+          p = skiptowhite_esc(arg);
+          if (STRNCMP(arg, "icon=", 5) == 0) {
+            arg += 5;
+            xfree(sp->sn_icon);
+            sp->sn_icon = vim_strnsave(arg, (int)(p - arg));
+            backslash_halve(sp->sn_icon);
+          } else if (STRNCMP(arg, "text=", 5) == 0) {
+            char_u *s;
+            int cells;
+            int len;
+
+            arg += 5;
+
+            // Count cells and check for non-printable chars
+            cells = 0;
+            for (s = arg; s < p; s += (*mb_ptr2len)(s)) {
+              if (!vim_isprintc((*mb_ptr2char)(s))) {
+                break;
+              }
+              cells += (*mb_ptr2cells)(s);
+            }
+            // Currently must be one or two display cells
+            if (s != p || cells < 1 || cells > 2) {
+              *p = NUL;
+              EMSG2(_("E239: Invalid sign text: %s"), arg);
+              return;
+            }
+
+            xfree(sp->sn_text);
+            // Allocate one byte more if we need to pad up
+            // with a space.
+            len = (int)(p - arg + ((cells == 1) ? 1 : 0));
+            sp->sn_text = vim_strnsave(arg, len);
+
+            if (cells == 1) {
+              STRCPY(sp->sn_text + len - 1, " ");
+            }
+          } else if (STRNCMP(arg, "linehl=", 7) == 0) {
+            arg += 7;
+            sp->sn_line_hl = syn_check_group(arg, (int)(p - arg));
+          } else if (STRNCMP(arg, "texthl=", 7) == 0) {
+            arg += 7;
+            sp->sn_text_hl = syn_check_group(arg, (int)(p - arg));
+          } else {
+            EMSG2(_(e_invarg2), arg);
+            return;
+          }
+        }
+      } else if (sp == NULL) {
+        EMSG2(_("E155: Unknown sign: %s"), arg);
+      } else if (idx == SIGNCMD_LIST) {
+        // ":sign list {name}"
+        sign_list_defined(sp);
+      } else {
+        // ":sign undefine {name}"
+        sign_undefine(sp, sp_prev);
+      }
+    }
+  } else {
+    int id = -1;
+    linenr_T lnum = -1;
+    char_u *sign_name = NULL;
+    char_u *arg1;
+
+    if (*arg == NUL) {
+      if (idx == SIGNCMD_PLACE) {
+        // ":sign place": list placed signs in all buffers
+        sign_list_placed(NULL);
+      } else if (idx == SIGNCMD_UNPLACE) {
+        // ":sign unplace": remove placed sign at cursor
+        id = buf_findsign_id(curwin->w_buffer, curwin->w_cursor.lnum);
+        if (id > 0) {
+          buf_delsign(curwin->w_buffer, id);
+          update_debug_sign(curwin->w_buffer, curwin->w_cursor.lnum);
+        } else {
+          EMSG(_("E159: Missing sign number"));
+        }
+      } else {
+        EMSG(_(e_argreq));
+      }
+      return;
     }
-    arg = skipwhite(p);
 
-    if (idx <= SIGNCMD_LIST)
-    {
-	/*
-	 * Define, undefine or list signs.
-	 */
-	if (idx == SIGNCMD_LIST && *arg == NUL)
-	{
-	    /* ":sign list": list all defined signs */
-	    for (sp = first_sign; sp != NULL && !got_int; sp = sp->sn_next)
-		sign_list_defined(sp);
-	}
-	else if (*arg == NUL)
-	    EMSG(_("E156: Missing sign name"));
-	else
-	{
-	    /* Isolate the sign name.  If it's a number skip leading zeroes,
-	     * so that "099" and "99" are the same sign.  But keep "0". */
-	    p = skiptowhite(arg);
-	    if (*p != NUL)
-		*p++ = NUL;
-	    while (arg[0] == '0' && arg[1] != NUL)
-		++arg;
-
-	    sp_prev = NULL;
-	    for (sp = first_sign; sp != NULL; sp = sp->sn_next)
-	    {
-		if (STRCMP(sp->sn_name, arg) == 0)
-		    break;
-		sp_prev = sp;
-	    }
-	    if (idx == SIGNCMD_DEFINE)
-	    {
-		/* ":sign define {name} ...": define a sign */
-		if (sp == NULL)
-		{
-		    sign_T	*lp;
-		    int		start = next_sign_typenr;
-
-		    /* Allocate a new sign. */
-		    sp = xcalloc(1, sizeof(sign_T));
-
-		    /* Check that next_sign_typenr is not already being used.
-		     * This only happens after wrapping around.  Hopefully
-		     * another one got deleted and we can use its number. */
-		    for (lp = first_sign; lp != NULL; )
-		    {
-			if (lp->sn_typenr == next_sign_typenr)
-			{
-			    ++next_sign_typenr;
-			    if (next_sign_typenr == MAX_TYPENR)
-				next_sign_typenr = 1;
-			    if (next_sign_typenr == start)
-			    {
-				xfree(sp);
-				EMSG(_("E612: Too many signs defined"));
-				return;
-			    }
-			    lp = first_sign;  /* start all over */
-			    continue;
-			}
-			lp = lp->sn_next;
-		    }
-
-		    sp->sn_typenr = next_sign_typenr;
-		    if (++next_sign_typenr == MAX_TYPENR)
-			next_sign_typenr = 1; /* wrap around */
-
-		    sp->sn_name = vim_strsave(arg);
-
-		    /* add the new sign to the list of signs */
-		    if (sp_prev == NULL)
-			first_sign = sp;
-		    else
-			sp_prev->sn_next = sp;
-		}
-
-		/* set values for a defined sign. */
-		for (;;)
-		{
-		    arg = skipwhite(p);
-		    if (*arg == NUL)
-			break;
-		    p = skiptowhite_esc(arg);
-		    if (STRNCMP(arg, "icon=", 5) == 0)
-		    {
-			arg += 5;
-			xfree(sp->sn_icon);
-			sp->sn_icon = vim_strnsave(arg, (int)(p - arg));
-			backslash_halve(sp->sn_icon);
-		    }
-		    else if (STRNCMP(arg, "text=", 5) == 0)
-		    {
-			char_u	*s;
-			int	cells;
-			int	len;
-
-			arg += 5;
-
-			/* Count cells and check for non-printable chars */
-			if (has_mbyte)
-			{
-			    cells = 0;
-			    for (s = arg; s < p; s += (*mb_ptr2len)(s))
-			    {
-				if (!vim_isprintc((*mb_ptr2char)(s)))
-				    break;
-				cells += (*mb_ptr2cells)(s);
-			    }
-			}
-			else
-
-			{
-			    for (s = arg; s < p; ++s)
-				if (!vim_isprintc(*s))
-				    break;
-			    cells = (int)(s - arg);
-			}
-			/* Currently must be one or two display cells */
-			if (s != p || cells < 1 || cells > 2)
-			{
-			    *p = NUL;
-			    EMSG2(_("E239: Invalid sign text: %s"), arg);
-			    return;
-			}
-
-			xfree(sp->sn_text);
-			/* Allocate one byte more if we need to pad up
-			 * with a space. */
-			len = (int)(p - arg + ((cells == 1) ? 1 : 0));
-			sp->sn_text = vim_strnsave(arg, len);
-
-			if (cells == 1)
-			    STRCPY(sp->sn_text + len - 1, " ");
-		    }
-		    else if (STRNCMP(arg, "linehl=", 7) == 0)
-		    {
-			arg += 7;
-			sp->sn_line_hl = syn_check_group(arg, (int)(p - arg));
-		    }
-		    else if (STRNCMP(arg, "texthl=", 7) == 0)
-		    {
-			arg += 7;
-			sp->sn_text_hl = syn_check_group(arg, (int)(p - arg));
-		    }
-		    else
-		    {
-			EMSG2(_(e_invarg2), arg);
-			return;
-		    }
-		}
-	    }
-	    else if (sp == NULL)
-		EMSG2(_("E155: Unknown sign: %s"), arg);
-	    else if (idx == SIGNCMD_LIST)
-		/* ":sign list {name}" */
-		sign_list_defined(sp);
-	    else
-		/* ":sign undefine {name}" */
-		sign_undefine(sp, sp_prev);
-	}
+    if (idx == SIGNCMD_UNPLACE && arg[0] == '*' && arg[1] == NUL) {
+      // ":sign unplace *": remove all placed signs
+      buf_delete_all_signs();
+      return;
     }
-    else
-    {
-	int		id = -1;
-	linenr_T	lnum = -1;
-	char_u		*sign_name = NULL;
-	char_u		*arg1;
-
-	if (*arg == NUL)
-	{
-	    if (idx == SIGNCMD_PLACE)
-	    {
-		/* ":sign place": list placed signs in all buffers */
-		sign_list_placed(NULL);
-	    }
-	    else if (idx == SIGNCMD_UNPLACE)
-	    {
-		/* ":sign unplace": remove placed sign at cursor */
-		id = buf_findsign_id(curwin->w_buffer, curwin->w_cursor.lnum);
-		if (id > 0)
-		{
-		    buf_delsign(curwin->w_buffer, id);
-		    update_debug_sign(curwin->w_buffer, curwin->w_cursor.lnum);
-		}
-		else
-		    EMSG(_("E159: Missing sign number"));
-	    }
-	    else
-		EMSG(_(e_argreq));
-	    return;
-	}
-
-	if (idx == SIGNCMD_UNPLACE && arg[0] == '*' && arg[1] == NUL)
-	{
-	    /* ":sign unplace *": remove all placed signs */
-	    buf_delete_all_signs();
-	    return;
-	}
-
-	/* first arg could be placed sign id */
-	arg1 = arg;
-	if (ascii_isdigit(*arg))
-	{
-	    id = getdigits_int(&arg);
-	    if (!ascii_iswhite(*arg) && *arg != NUL)
-	    {
-		id = -1;
-		arg = arg1;
-	    }
-	    else
-	    {
-		arg = skipwhite(arg);
-		if (idx == SIGNCMD_UNPLACE && *arg == NUL)
-		{
-		  // ":sign unplace {id}": remove placed sign by number
-		  FOR_ALL_BUFFERS(buf) {
-		    if ((lnum = buf_delsign(buf, id)) != 0) {
-		      update_debug_sign(buf, lnum);
-                    }
-		  }
-		  return;
-		}
-	    }
-	}
-
-	/*
-	 * Check for line={lnum} name={name} and file={fname} or buffer={nr}.
-	 * Leave "arg" pointing to {fname}.
-	 */
-
-        buf_T *buf = NULL;
-	for (;;)
-	{
-	    if (STRNCMP(arg, "line=", 5) == 0)
-	    {
-		arg += 5;
-		lnum = atoi((char *)arg);
-		arg = skiptowhite(arg);
-	    }
-	    else if (STRNCMP(arg, "*", 1) == 0 && idx == SIGNCMD_UNPLACE)
-	    {
-		if (id != -1)
-		{
-		    EMSG(_(e_invarg));
-		    return;
-		}
-		id = -2;
-		arg = skiptowhite(arg + 1);
-	    }
-	    else if (STRNCMP(arg, "name=", 5) == 0)
-	    {
-		arg += 5;
-		sign_name = arg;
-		arg = skiptowhite(arg);
-		if (*arg != NUL)
-		    *arg++ = NUL;
-		while (sign_name[0] == '0' && sign_name[1] != NUL)
-		    ++sign_name;
-	    }
-	    else if (STRNCMP(arg, "file=", 5) == 0)
-	    {
-		arg += 5;
-		buf = buflist_findname(arg);
-		break;
-	    }
-	    else if (STRNCMP(arg, "buffer=", 7) == 0)
-	    {
-		arg += 7;
-		buf = buflist_findnr(getdigits_int(&arg));
-		if (*skipwhite(arg) != NUL)
-		    EMSG(_(e_trailing));
-		break;
-	    }
-	    else
-	    {
-		EMSG(_(e_invarg));
-		return;
-	    }
-	    arg = skipwhite(arg);
-	}
-
-	if (buf == NULL)
-	{
-	    EMSG2(_("E158: Invalid buffer name: %s"), arg);
-	}
-	else if (id <= 0 && !(idx == SIGNCMD_UNPLACE && id == -2))
-	{
-	    if (lnum >= 0 || sign_name != NULL)
-		EMSG(_(e_invarg));
-	    else
-		/* ":sign place file={fname}": list placed signs in one file */
-		sign_list_placed(buf);
-	}
-	else if (idx == SIGNCMD_JUMP)
-	{
-	    /* ":sign jump {id} file={fname}" */
-	    if (lnum >= 0 || sign_name != NULL)
-		EMSG(_(e_invarg));
-	    else if ((lnum = buf_findsign(buf, id)) > 0)
-	    {				/* goto a sign ... */
-		if (buf_jump_open_win(buf) != NULL)
-		{			/* ... in a current window */
-		    curwin->w_cursor.lnum = lnum;
-		    check_cursor_lnum();
-		    beginline(BL_WHITE);
-		}
-		else
-		{   // ... not currently in a window
-		    char *cmd = xmalloc(STRLEN(buf->b_fname) + 25);
-		    sprintf(cmd, "e +%" PRId64 " %s",
-                    (int64_t)lnum, buf->b_fname);
-		    do_cmdline_cmd(cmd);
-		    xfree(cmd);
-		}
-
-		foldOpenCursor();
-	    }
-	    else
-		EMSGN(_("E157: Invalid sign ID: %" PRId64), id);
-	}
-	else if (idx == SIGNCMD_UNPLACE)
-	{
-	    if (lnum >= 0 || sign_name != NULL)
-		EMSG(_(e_invarg));
-	    else if (id == -2)
-	    {
-		/* ":sign unplace * file={fname}" */
-		redraw_buf_later(buf, NOT_VALID);
-		buf_delete_signs(buf);
-	    }
-	    else
-	    {
-		/* ":sign unplace {id} file={fname}" */
-		lnum = buf_delsign(buf, id);
-		update_debug_sign(buf, lnum);
-	    }
-	}
-	    /* idx == SIGNCMD_PLACE */
-	else if (sign_name != NULL)
-	{
-	    for (sp = first_sign; sp != NULL; sp = sp->sn_next)
-		if (STRCMP(sp->sn_name, sign_name) == 0)
-		    break;
-	    if (sp == NULL)
-	    {
-		EMSG2(_("E155: Unknown sign: %s"), sign_name);
-		return;
-	    }
-	    if (lnum > 0)
-		/* ":sign place {id} line={lnum} name={name} file={fname}":
-		 * place a sign */
-		buf_addsign(buf, id, lnum, sp->sn_typenr);
-	    else
-		/* ":sign place {id} file={fname}": change sign type */
-		lnum = buf_change_sign_type(buf, id, sp->sn_typenr);
-            if (lnum > 0)
-                update_debug_sign(buf, lnum);
-            else
-                EMSG2(_("E885: Not possible to change sign %s"), sign_name);
-	}
-	else
-	    EMSG(_(e_invarg));
+
+    // first arg could be placed sign id
+    arg1 = arg;
+    if (ascii_isdigit(*arg)) {
+      id = getdigits_int(&arg);
+      if (!ascii_iswhite(*arg) && *arg != NUL) {
+        id = -1;
+        arg = arg1;
+      } else {
+        arg = skipwhite(arg);
+        if (idx == SIGNCMD_UNPLACE && *arg == NUL) {
+          // ":sign unplace {id}": remove placed sign by number
+          FOR_ALL_BUFFERS(buf) {
+            if ((lnum = buf_delsign(buf, id)) != 0) {
+              update_debug_sign(buf, lnum);
+            }
+          }
+          return;
+        }
+      }
+    }
+
+    // Check for line={lnum} name={name} and file={fname} or buffer={nr}.
+    // Leave "arg" pointing to {fname}.
+
+    buf_T *buf = NULL;
+    for (;;) {
+      if (STRNCMP(arg, "line=", 5) == 0) {
+        arg += 5;
+        lnum = atoi((char *)arg);
+        arg = skiptowhite(arg);
+      } else if (STRNCMP(arg, "*", 1) == 0 && idx == SIGNCMD_UNPLACE) {
+        if (id != -1) {
+          EMSG(_(e_invarg));
+          return;
+        }
+        id = -2;
+        arg = skiptowhite(arg + 1);
+      } else if (STRNCMP(arg, "name=", 5) == 0) {
+        arg += 5;
+        sign_name = arg;
+        arg = skiptowhite(arg);
+        if (*arg != NUL) {
+          *arg++ = NUL;
+        }
+        while (sign_name[0] == '0' && sign_name[1] != NUL) {
+          sign_name++;
+        }
+      } else if (STRNCMP(arg, "file=", 5) == 0) {
+        arg += 5;
+        buf = buflist_findname(arg);
+        break;
+      } else if (STRNCMP(arg, "buffer=", 7) == 0) {
+        arg += 7;
+        buf = buflist_findnr(getdigits_int(&arg));
+        if (*skipwhite(arg) != NUL) {
+          EMSG(_(e_trailing));
+        }
+        break;
+      } else {
+        EMSG(_(e_invarg));
+        return;
+      }
+      arg = skipwhite(arg);
+    }
+
+    if (buf == NULL) {
+      EMSG2(_("E158: Invalid buffer name: %s"), arg);
+    } else if (id <= 0 && !(idx == SIGNCMD_UNPLACE && id == -2)) {
+      if (lnum >= 0 || sign_name != NULL) {
+        EMSG(_(e_invarg));
+      } else {
+        // ":sign place file={fname}": list placed signs in one file
+        sign_list_placed(buf);
+      }
+    } else if (idx == SIGNCMD_JUMP) {
+      // ":sign jump {id} file={fname}"
+      if (lnum >= 0 || sign_name != NULL) {
+        EMSG(_(e_invarg));
+      } else if ((lnum = buf_findsign(buf, id)) > 0) {
+        // goto a sign ...
+        if (buf_jump_open_win(buf) != NULL) {
+          // ... in a current window
+          curwin->w_cursor.lnum = lnum;
+          check_cursor_lnum();
+          beginline(BL_WHITE);
+        } else {
+          // ... not currently in a window
+          if (buf->b_fname == NULL) {
+            EMSG(_("E934: Cannot jump to a buffer that does not have a name"));
+            return;
+          }
+          size_t cmdlen = STRLEN(buf->b_fname) + 24;
+          char *cmd = xmallocz(cmdlen);
+          snprintf(cmd, cmdlen, "e +%" PRId64 " %s",
+                   (int64_t)lnum, buf->b_fname);
+          do_cmdline_cmd(cmd);
+          xfree(cmd);
+        }
+
+        foldOpenCursor();
+      } else {
+        EMSGN(_("E157: Invalid sign ID: %" PRId64), id);
+      }
+    } else if (idx == SIGNCMD_UNPLACE) {
+      if (lnum >= 0 || sign_name != NULL) {
+        EMSG(_(e_invarg));
+      } else if (id == -2) {
+        // ":sign unplace * file={fname}"
+        redraw_buf_later(buf, NOT_VALID);
+        buf_delete_signs(buf);
+      } else {
+        // ":sign unplace {id} file={fname}"
+        lnum = buf_delsign(buf, id);
+        update_debug_sign(buf, lnum);
+      }
+    } else if (sign_name != NULL) {
+      // idx == SIGNCMD_PLACE
+      for (sp = first_sign; sp != NULL; sp = sp->sn_next) {
+        if (STRCMP(sp->sn_name, sign_name) == 0) {
+          break;
+        }
+      }
+      if (sp == NULL) {
+        EMSG2(_("E155: Unknown sign: %s"), sign_name);
+        return;
+      }
+      if (lnum > 0) {
+        // ":sign place {id} line={lnum} name={name} file={fname}":
+        // place a sign
+        buf_addsign(buf, id, lnum, sp->sn_typenr);
+      } else {
+        // ":sign place {id} file={fname}": change sign type
+        lnum = buf_change_sign_type(buf, id, sp->sn_typenr);
+      }
+      if (lnum > 0) {
+        update_debug_sign(buf, lnum);
+      } else {
+        EMSG2(_("E885: Not possible to change sign %s"), sign_name);
+      }
+    } else {
+      EMSG(_(e_invarg));
     }
+  }
 }
 
 /*
@@ -5683,50 +5816,39 @@ static enum
     EXP_SIGN_NAMES	/* expand with name of placed signs */
 } expand_what;
 
-/*
- * Function given to ExpandGeneric() to obtain the sign command
- * expansion.
- */
+/// Function given to ExpandGeneric() to obtain the sign command
+/// expansion.
 char_u * get_sign_name(expand_T *xp, int idx)
 {
-    sign_T	*sp;
-    int		current_idx;
-
-    switch (expand_what)
-    {
+  switch (expand_what)
+  {
     case EXP_SUBCMD:
-	return (char_u *)cmds[idx];
-    case EXP_DEFINE:
-	{
-	    char *define_arg[] =
-	    {
-		"icon=", "linehl=", "text=", "texthl=", NULL
-	    };
-	    return (char_u *)define_arg[idx];
-	}
-    case EXP_PLACE:
-	{
-	    char *place_arg[] =
-	    {
-		"line=", "name=", "file=", "buffer=", NULL
-	    };
-	    return (char_u *)place_arg[idx];
-	}
-    case EXP_UNPLACE:
-	{
-	    char *unplace_arg[] = { "file=", "buffer=", NULL };
-	    return (char_u *)unplace_arg[idx];
-	}
-    case EXP_SIGN_NAMES:
-	/* Complete with name of signs already defined */
-	current_idx = 0;
-	for (sp = first_sign; sp != NULL; sp = sp->sn_next)
-	    if (current_idx++ == idx)
-		return sp->sn_name;
-	return NULL;
+      return (char_u *)cmds[idx];
+    case EXP_DEFINE: {
+        char *define_arg[] = { "icon=", "linehl=", "text=", "texthl=", NULL };
+        return (char_u *)define_arg[idx];
+      }
+    case EXP_PLACE: {
+        char *place_arg[] = { "line=", "name=", "file=", "buffer=", NULL };
+        return (char_u *)place_arg[idx];
+      }
+    case EXP_UNPLACE: {
+        char *unplace_arg[] = { "file=", "buffer=", NULL };
+        return (char_u *)unplace_arg[idx];
+      }
+    case EXP_SIGN_NAMES: {
+        // Complete with name of signs already defined
+        int current_idx = 0;
+        for (sign_T *sp = first_sign; sp != NULL; sp = sp->sn_next) {
+          if (current_idx++ == idx) {
+            return sp->sn_name;
+          }
+        }
+      }
+      return NULL;
     default:
-	return NULL;
-    }
+      return NULL;
+  }
 }
 
 /*
@@ -5846,3 +5968,169 @@ void set_context_in_sign_cmd(expand_T *xp, char_u *arg)
     }
   }
 }
+
+/// Shows the effects of the :substitute command being typed ('inccommand').
+/// If inccommand=split, shows a preview window and later restores the layout.
+static buf_T *show_sub(exarg_T *eap, pos_T old_cusr, char_u *pat, char_u *sub,
+                       MatchedLineVec *matched_lines)
+  FUNC_ATTR_NONNULL_ALL
+{
+  static handle_T bufnr = 0;  // special buffer, re-used on each visit
+
+  win_T *save_curwin = curwin;
+  cmdmod_T save_cmdmod = cmdmod;
+  char_u *save_shm_p = vim_strsave(p_shm);
+  size_t sub_size = mb_string2cells(sub);
+  size_t pat_size = mb_string2cells(pat);
+
+  // We keep a special-purpose buffer around, but don't assume it exists.
+  buf_T *preview_buf = bufnr ? buflist_findnr(bufnr) : 0;
+  cmdmod.tab = 0;                 // disable :tab modifier
+  cmdmod.noswapfile = true;       // disable swap for preview buffer
+  // disable file info message
+  set_string_option_direct((char_u *)"shm", -1, (char_u *)"F", OPT_FREE,
+                           SID_NONE);
+
+  bool outside_curline = (eap->line1 != old_cusr.lnum
+                          || eap->line2 != old_cusr.lnum);
+  bool split = outside_curline && (*p_icm != 'n') && (sub_size || pat_size);
+  if (preview_buf == curbuf) {  // Preview buffer cannot preview itself!
+    split = false;
+    preview_buf = NULL;
+  }
+
+  // Place cursor on nearest matching line, to undo do_sub() cursor placement.
+  for (size_t i = 0; i < matched_lines->size; i++) {
+    MatchedLine curmatch = matched_lines->items[i];
+    if (curmatch.lnum >= old_cusr.lnum) {
+      curwin->w_cursor.lnum = curmatch.lnum;
+      curwin->w_cursor.col = curmatch.cols.items[0];
+      break;
+    }  // Else: All matches are above, do_sub() already placed cursor.
+  }
+
+  if (split && win_split((int)p_cwh, WSP_BOT) != FAIL) {
+    buf_open_scratch(preview_buf ? bufnr : 0, "[Preview]");
+    buf_clear();
+    preview_buf = curbuf;
+    bufnr = preview_buf->handle;
+    curbuf->b_p_bl = false;
+    curbuf->b_p_ma = true;
+    curbuf->b_p_ul = -1;
+    curbuf->b_p_tw = 0;         // Reset 'textwidth' (was set by ftplugin)
+    curwin->w_p_cul = false;
+    curwin->w_p_cuc = false;
+    curwin->w_p_spell = false;
+    curwin->w_p_fen = false;
+
+    // Width of the "| lnum|..." column which displays the line numbers.
+    linenr_T highest_num_line = kv_last(*matched_lines).lnum;
+    int col_width = log10(highest_num_line) + 1 + 3;
+
+    char *str = NULL;
+    size_t old_line_size = 0;
+    size_t line_size;
+    int src_id_highlight = 0;
+    int hl_id = syn_check_group((char_u *)"Substitute", 13);
+
+    // Dump the lines into the preview buffer.
+    for (size_t line = 0; line < matched_lines->size; line++) {
+      MatchedLine mat = matched_lines->items[line];
+      line_size = mb_string2cells(mat.line) + col_width + 1;
+
+      // Reallocate if str not long enough
+      if (line_size > old_line_size) {
+        str = xrealloc(str, line_size * sizeof(char));
+        old_line_size = line_size;
+      }
+
+      // Put "|lnum| line" into `str` and append it to the preview buffer.
+      snprintf(str, line_size, "|%*ld| %s", col_width - 3, mat.lnum, mat.line);
+      ml_append(line, (char_u *)str, (colnr_T)line_size, false);
+
+      // highlight the replaced part
+      if (sub_size > 0) {
+        for (size_t i = 0; i < mat.cols.size; i++) {
+          colnr_T col_start = mat.cols.items[i] + col_width
+            + i * (sub_size - pat_size) + 1;
+          colnr_T col_end = col_start - 1 + sub_size;
+          src_id_highlight = bufhl_add_hl(curbuf, src_id_highlight, hl_id,
+                                          line + 1, col_start, col_end);
+        }
+      }
+    }
+    xfree(str);
+  }
+
+  redraw_later(SOME_VALID);
+  win_enter(save_curwin, false);  // Return to original window
+  update_topline();
+
+  // Update screen now. Must do this _before_ close_windows().
+  int save_rd = RedrawingDisabled;
+  RedrawingDisabled = 0;
+  update_screen(SOME_VALID);
+  RedrawingDisabled = save_rd;
+
+  set_string_option_direct((char_u *)"shm", -1, save_shm_p, OPT_FREE, SID_NONE);
+  xfree(save_shm_p);
+
+  cmdmod = save_cmdmod;
+
+  return preview_buf;
+}
+
+/// :substitute command
+///
+/// If 'inccommand' is empty: calls do_sub().
+/// If 'inccommand' is set: shows a "live" preview then removes the changes.
+/// from undo history.
+void ex_substitute(exarg_T *eap)
+{
+  bool preview = (State & CMDPREVIEW);
+  if (*p_icm == NUL || !preview) {  // 'inccommand' is disabled
+    (void)do_sub(eap, profile_zero());
+    return;
+  }
+
+  block_autocmds();           // Disable events during command preview.
+
+  char_u *save_eap = eap->arg;
+  garray_T save_view;
+  win_size_save(&save_view);  // Save current window sizes.
+  save_search_patterns();
+  int save_changedtick = curbuf->b_changedtick;
+  time_t save_b_u_time_cur = curbuf->b_u_time_cur;
+  u_header_T *save_b_u_newhead = curbuf->b_u_newhead;
+  long save_b_p_ul = curbuf->b_p_ul;
+  int save_w_p_cul = curwin->w_p_cul;
+  int save_w_p_cuc = curwin->w_p_cuc;
+
+  curbuf->b_p_ul = LONG_MAX;  // make sure we can undo all changes
+  curwin->w_p_cul = false;    // Disable 'cursorline'
+  curwin->w_p_cuc = false;    // Disable 'cursorcolumn'
+
+  buf_T *preview_buf = do_sub(eap, profile_setlimit(p_rdt));
+
+  if (save_changedtick != curbuf->b_changedtick) {
+    // Undo invisibly. This also moves the cursor!
+    if (!u_undo_and_forget(1)) { abort(); }
+    // Restore newhead. It is meaningless when curhead is valid, but we must
+    // restore it so that undotree() is identical before/after the preview.
+    curbuf->b_u_newhead = save_b_u_newhead;
+    curbuf->b_u_time_cur = save_b_u_time_cur;
+    curbuf->b_changedtick = save_changedtick;
+  }
+  if (buf_valid(preview_buf)) {
+    // XXX: Must do this *after* u_undo_and_forget(), why?
+    close_windows(preview_buf, false);
+  }
+  curbuf->b_p_ul = save_b_p_ul;
+  curwin->w_p_cul = save_w_p_cul;   // Restore 'cursorline'
+  curwin->w_p_cuc = save_w_p_cuc;   // Restore 'cursorcolumn'
+  eap->arg = save_eap;
+  restore_search_patterns();
+  win_size_restore(&save_view);
+  ga_clear(&save_view);
+  unblock_autocmds();
+}
diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h
index 721145efd8..243b11255e 100644
--- a/src/nvim/ex_cmds.h
+++ b/src/nvim/ex_cmds.h
@@ -5,14 +5,16 @@
 
 #include "nvim/os/time.h"
 #include "nvim/eval_defs.h"
+#include "nvim/pos.h"
+
+// flags for do_ecmd()
+#define ECMD_HIDE            0x01    // don't free the current buffer
+#define ECMD_SET_HELP        0x02    // set b_help flag of (new) buffer before
+                                     // opening file
+#define ECMD_OLDBUF          0x04    // use existing buffer if it exists
+#define ECMD_FORCEIT         0x08    // ! used in Ex command
+#define ECMD_ADDBUF          0x10    // don't edit, just add to buffer list
 
-/* flags for do_ecmd() */
-#define ECMD_HIDE       0x01    /* don't free the current buffer */
-#define ECMD_SET_HELP   0x02    /* set b_help flag of (new) buffer before
-                                   opening file */
-#define ECMD_OLDBUF     0x04    /* use existing buffer if it exists */
-#define ECMD_FORCEIT    0x08    /* ! used in Ex command */
-#define ECMD_ADDBUF     0x10    /* don't edit, just add to buffer list */
 
 /* for lnum argument in do_ecmd() */
 #define ECMD_LASTL      (linenr_T)0     /* use last position in loaded file */
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 04fd88cc8d..5f81306fc1 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -35,6 +35,7 @@ local ADDR_LOADED_BUFFERS   =  3
 local ADDR_BUFFERS          =  4
 local ADDR_TABS             =  5
 local ADDR_QUICKFIX         =  6
+local ADDR_OTHER            =  99
 
 -- The following table is described in ex_cmds_defs.h file.
 return {
@@ -88,7 +89,7 @@ return {
   },
   {
     command='argadd',
-    flags=bit.bor(BANG, NEEDARG, RANGE, NOTADR, ZEROR, FILES, TRLBAR),
+    flags=bit.bor(BANG, RANGE, NOTADR, ZEROR, FILES, TRLBAR),
     addr_type=ADDR_ARGUMENTS,
     func='ex_argadd',
   },
@@ -357,6 +358,12 @@ return {
     func='ex_cbuffer',
   },
   {
+    command='cbottom',
+    flags=bit.bor(TRLBAR),
+    addr_type=ADDR_LINES,
+    func='ex_cbottom',
+  },
+  {
     command='cc',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
     addr_type=ADDR_LINES,
@@ -455,6 +462,12 @@ return {
     func='ex_checktime',
   },
   {
+    command='chistory',
+    flags=bit.bor(TRLBAR),
+    addr_type=ADDR_LINES,
+    func='qf_history',
+  },
+  {
     command='clist',
     flags=bit.bor(BANG, EXTRA, TRLBAR, CMDWIN),
     addr_type=ADDR_LINES,
@@ -473,6 +486,12 @@ return {
     func='ex_close',
   },
   {
+    command='clearjumps',
+    flags=bit.bor(TRLBAR, CMDWIN),
+    addr_type=ADDR_LINES,
+    func='ex_clearjumps',
+  },
+  {
     command='cmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
     addr_type=ADDR_LINES,
@@ -1271,6 +1290,12 @@ return {
     func='ex_cbuffer',
   },
   {
+    command='lbottom',
+    flags=bit.bor(TRLBAR),
+    addr_type=ADDR_LINES,
+    func='ex_cbottom',
+  },
+  {
     command='lcd',
     flags=bit.bor(BANG, FILE1, TRLBAR, CMDWIN),
     addr_type=ADDR_LINES,
@@ -1381,6 +1406,12 @@ return {
     func='ex_helpgrep',
   },
   {
+    command='lhistory',
+    flags=bit.bor(TRLBAR),
+    addr_type=ADDR_LINES,
+    func='qf_history',
+  },
+  {
     command='ll',
     flags=bit.bor(RANGE, NOTADR, COUNT, TRLBAR, BANG),
     addr_type=ADDR_LINES,
@@ -1604,8 +1635,8 @@ return {
   },
   {
     command='messages',
-    flags=bit.bor(TRLBAR, CMDWIN),
-    addr_type=ADDR_LINES,
+    flags=bit.bor(EXTRA, TRLBAR, RANGE, CMDWIN),
+    addr_type=ADDR_OTHER,
     func='ex_messages',
   },
   {
@@ -1849,6 +1880,18 @@ return {
     func='ex_print',
   },
   {
+    command='packadd',
+    flags=bit.bor(BANG, FILE1, NEEDARG, TRLBAR, SBOXOK, CMDWIN),
+    addr_type=ADDR_LINES,
+    func='ex_packadd',
+  },
+  {
+    command='packloadall',
+    flags=bit.bor(BANG, TRLBAR, SBOXOK, CMDWIN),
+    addr_type=ADDR_LINES,
+    func='ex_packloadall',
+  },
+  {
     command='pclose',
     flags=bit.bor(BANG, TRLBAR),
     addr_type=ADDR_LINES,
@@ -2158,19 +2201,19 @@ return {
     command='ruby',
     flags=bit.bor(RANGE, EXTRA, NEEDARG, CMDWIN),
     addr_type=ADDR_LINES,
-    func='ex_script_ni',
+    func='ex_ruby',
   },
   {
     command='rubydo',
     flags=bit.bor(RANGE, DFLALL, EXTRA, NEEDARG, CMDWIN),
     addr_type=ADDR_LINES,
-    func='ex_ni',
+    func='ex_rubydo',
   },
   {
     command='rubyfile',
     flags=bit.bor(RANGE, FILE1, NEEDARG, CMDWIN),
     addr_type=ADDR_LINES,
-    func='ex_ni',
+    func='ex_rubyfile',
   },
   {
     command='rviminfo',
@@ -2182,7 +2225,7 @@ return {
     command='substitute',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN),
     addr_type=ADDR_LINES,
-    func='do_sub',
+    func='ex_substitute',
   },
   {
     command='sNext',
@@ -3169,7 +3212,7 @@ return {
     enum='CMD_and',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
     addr_type=ADDR_LINES,
-    func='do_sub',
+    func='ex_substitute',
   },
   {
     command='<',
@@ -3210,6 +3253,6 @@ return {
     enum='CMD_tilde',
     flags=bit.bor(RANGE, WHOLEFOLD, EXTRA, CMDWIN, MODIFY),
     addr_type=ADDR_LINES,
-    func='do_sub',
+    func='ex_substitute',
   },
 }
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index 5fe6209a0a..3b92b3734a 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1,6 +1,6 @@
-/*
- * ex_cmds2.c: some more functions for command line commands
- */
+/// @file ex_cmds2.c
+///
+/// Some more functions for command line commands
 
 #include <assert.h>
 #include <inttypes.h>
@@ -27,7 +27,6 @@
 #include "nvim/mbyte.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
@@ -50,15 +49,15 @@
 #include "nvim/api/private/defs.h"
 
 
-/* Growarray to store info about already sourced scripts.
- * Also store the dev/ino, so that we don't have to stat() each
- * script when going through the list. */
+/// Growarray to store info about already sourced scripts.
+/// Also store the dev/ino, so that we don't have to stat() each
+/// script when going through the list.
 typedef struct scriptitem_S {
   char_u      *sn_name;
   bool file_id_valid;
   FileID file_id;
   bool sn_prof_on;              ///< true when script is/was profiled
-  int sn_pr_force;              ///< forceit: profile functions in this script
+  bool sn_pr_force;             ///< forceit: profile functions in this script
   proftime_T sn_pr_child;       ///< time set when going into first child
   int sn_pr_nest;               ///< nesting for sn_pr_child
   // profiling the script as a whole
@@ -76,29 +75,27 @@ typedef struct scriptitem_S {
   int sn_prl_execed;            ///< line being timed was executed
 } scriptitem_T;
 
-static garray_T script_items = {0, 0, sizeof(scriptitem_T), 4, NULL};
+static garray_T script_items = { 0, 0, sizeof(scriptitem_T), 4, NULL };
 #define SCRIPT_ITEM(id) (((scriptitem_T *)script_items.ga_data)[(id) - 1])
 
-/* Struct used in sn_prl_ga for every line of a script. */
+// Struct used in sn_prl_ga for every line of a script.
 typedef struct sn_prl_S {
   int snp_count;                ///< nr of times line was executed
   proftime_T sn_prl_total;      ///< time spent in a line + children
   proftime_T sn_prl_self;       ///< time spent in a line itself
 } sn_prl_T;
 
-/*
- * Structure used to store info for each sourced file.
- * It is shared between do_source() and getsourceline().
- * This is required, because it needs to be handed to do_cmdline() and
- * sourcing can be done recursively.
- */
+/// Structure used to store info for each sourced file.
+/// It is shared between do_source() and getsourceline().
+/// This is required, because it needs to be handed to do_cmdline() and
+/// sourcing can be done recursively.
 struct source_cookie {
   FILE *fp;                     ///< opened file for sourcing
   char_u *nextline;             ///< if not NULL: line that was read ahead
   int finished;                 ///< ":finish" used
 #if defined(USE_CRNL)
   int fileformat;               ///< EOL_UNKNOWN, EOL_UNIX or EOL_DOS
-  int error;                    ///< TRUE if LF found after CR-LF
+  bool error;                    ///< true if LF found after CR-LF
 #endif
   linenr_T breakpoint;          ///< next line with breakpoint or zero
   char_u *fname;                ///< name of sourced file
@@ -113,13 +110,11 @@ struct source_cookie {
 # include "ex_cmds2.c.generated.h"
 #endif
 
-static int debug_greedy = FALSE;        /* batch mode debugging: don't save
-                                           and restore typeahead. */
+/// batch mode debugging: don't save and restore typeahead.
+static bool debug_greedy = false;
 
-/*
- * do_debug(): Debug mode.
- * Repeatedly get Ex commands, until told to continue normal execution.
- */
+/// Debug mode. Repeatedly get Ex commands, until told to continue normal
+/// execution.
 void do_debug(char_u *cmd)
 {
   int save_msg_scroll = msg_scroll;
@@ -130,7 +125,7 @@ void do_debug(char_u *cmd)
   int save_emsg_silent = emsg_silent;
   int save_redir_off = redir_off;
   tasave_T typeaheadbuf;
-  int typeahead_saved = FALSE;
+  bool typeahead_saved = false;
   int save_ignore_script = 0;
   int save_ex_normal_busy;
   int n;
@@ -150,43 +145,44 @@ void do_debug(char_u *cmd)
 #define CMD_DOWN        10
 
 
-  ++RedrawingDisabled;          /* don't redisplay the window */
-  ++no_wait_return;             /* don't wait for return */
-  did_emsg = FALSE;             /* don't use error from debugged stuff */
-  cmd_silent = FALSE;           /* display commands */
-  msg_silent = FALSE;           /* display messages */
-  emsg_silent = FALSE;          /* display error messages */
-  redir_off = TRUE;             /* don't redirect debug commands */
+  RedrawingDisabled++;          // don't redisplay the window
+  no_wait_return++;             // don't wait for return
+  did_emsg = false;             // don't use error from debugged stuff
+  cmd_silent = false;           // display commands
+  msg_silent = false;           // display messages
+  emsg_silent = false;          // display error messages
+  redir_off = true;             // don't redirect debug commands
 
   State = NORMAL;
 
-  if (!debug_did_msg)
+  if (!debug_did_msg) {
     MSG(_("Entering Debug mode.  Type \"cont\" to continue."));
-  if (sourcing_name != NULL)
+  }
+  if (sourcing_name != NULL) {
     msg(sourcing_name);
-  if (sourcing_lnum != 0)
+  }
+  if (sourcing_lnum != 0) {
     smsg(_("line %" PRId64 ": %s"), (int64_t)sourcing_lnum, cmd);
-  else
+  } else {
     smsg(_("cmd: %s"), cmd);
+  }
 
-  /*
-   * Repeat getting a command and executing it.
-   */
+  // Repeat getting a command and executing it.
   for (;; ) {
-    msg_scroll = TRUE;
-    need_wait_return = FALSE;
-    /* Save the current typeahead buffer and replace it with an empty one.
-     * This makes sure we get input from the user here and don't interfere
-     * with the commands being executed.  Reset "ex_normal_busy" to avoid
-     * the side effects of using ":normal". Save the stuff buffer and make
-     * it empty. Set ignore_script to avoid reading from script input. */
+    msg_scroll = true;
+    need_wait_return = false;
+    // Save the current typeahead buffer and replace it with an empty one.
+    // This makes sure we get input from the user here and don't interfere
+    // with the commands being executed.  Reset "ex_normal_busy" to avoid
+    // the side effects of using ":normal". Save the stuff buffer and make
+    // it empty. Set ignore_script to avoid reading from script input.
     save_ex_normal_busy = ex_normal_busy;
     ex_normal_busy = 0;
     if (!debug_greedy) {
       save_typeahead(&typeaheadbuf);
-      typeahead_saved = TRUE;
+      typeahead_saved = true;
       save_ignore_script = ignore_script;
-      ignore_script = TRUE;
+      ignore_script = true;
     }
 
     xfree(cmdline);
@@ -201,9 +197,9 @@ void do_debug(char_u *cmd)
     cmdline_row = msg_row;
     msg_starthere();
     if (cmdline != NULL) {
-      /* If this is a debug command, set "last_cmd".
-       * If not, reset "last_cmd".
-       * For a blank line use previous command. */
+      // If this is a debug command, set "last_cmd".
+      // If not, reset "last_cmd".
+      // For a blank line use previous command.
       p = skipwhite(cmdline);
       if (*p != NUL) {
         switch (*p) {
@@ -255,11 +251,11 @@ void do_debug(char_u *cmd)
         default: last_cmd = 0;
         }
         if (last_cmd != 0) {
-          /* Check that the tail matches. */
-          ++p;
+          // Check that the tail matches.
+          p++;
           while (*p != NUL && *p == *tail) {
-            ++p;
-            ++tail;
+            p++;
+            tail++;
           }
           if (ASCII_ISALPHA(*p) && last_cmd != CMD_FRAME) {
             last_cmd = 0;
@@ -268,8 +264,7 @@ void do_debug(char_u *cmd)
       }
 
       if (last_cmd != 0) {
-        /* Execute debug command: decided where to break next and
-         * return. */
+        // Execute debug command: decided where to break next and return.
         switch (last_cmd) {
         case CMD_CONT:
           debug_break_level = -1;
@@ -284,13 +279,13 @@ void do_debug(char_u *cmd)
           debug_break_level = ex_nesting_level - 1;
           break;
         case CMD_QUIT:
-          got_int = TRUE;
+          got_int = true;
           debug_break_level = -1;
           break;
         case CMD_INTERRUPT:
-          got_int = TRUE;
+          got_int = true;
           debug_break_level = 9999;
-          /* Do not repeat ">interrupt" cmd, continue stepping. */
+          // Do not repeat ">interrupt" cmd, continue stepping.
           last_cmd = CMD_STEP;
           break;
         case CMD_BACKTRACE:
@@ -318,21 +313,21 @@ void do_debug(char_u *cmd)
         break;
       }
 
-      /* don't debug this command */
+      // don't debug this command
       n = debug_break_level;
       debug_break_level = -1;
       (void)do_cmdline(cmdline, getexline, NULL,
-          DOCMD_VERBOSE|DOCMD_EXCRESET);
+                       DOCMD_VERBOSE|DOCMD_EXCRESET);
       debug_break_level = n;
     }
     lines_left = (int)(Rows - 1);
   }
   xfree(cmdline);
 
-  --RedrawingDisabled;
-  --no_wait_return;
+  RedrawingDisabled--;
+  no_wait_return--;
   redraw_all_later(NOT_VALID);
-  need_wait_return = FALSE;
+  need_wait_return = false;
   msg_scroll = save_msg_scroll;
   lines_left = (int)(Rows - 1);
   State = save_State;
@@ -342,9 +337,8 @@ void do_debug(char_u *cmd)
   emsg_silent = save_emsg_silent;
   redir_off = save_redir_off;
 
-  /* Only print the message again when typing a command before coming back
-   * here. */
-  debug_did_msg = TRUE;
+  // Only print the message again when typing a command before coming back here.
+  debug_did_msg = true;
 }
 
 static int get_maxbacktrace_level(void)
@@ -419,9 +413,8 @@ static void do_showbacktrace(char_u *cmd)
   }
 }
 
-/*
- * ":debug".
- */
+
+/// ":debug".
 void ex_debug(exarg_T *eap)
 {
   int debug_break_level_save = debug_break_level;
@@ -434,88 +427,81 @@ void ex_debug(exarg_T *eap)
 static char_u   *debug_breakpoint_name = NULL;
 static linenr_T debug_breakpoint_lnum;
 
-/*
- * When debugging or a breakpoint is set on a skipped command, no debug prompt
- * is shown by do_one_cmd().  This situation is indicated by debug_skipped, and
- * debug_skipped_name is then set to the source name in the breakpoint case.  If
- * a skipped command decides itself that a debug prompt should be displayed, it
- * can do so by calling dbg_check_skipped().
- */
+/// When debugging or a breakpoint is set on a skipped command, no debug prompt
+/// is shown by do_one_cmd().  This situation is indicated by debug_skipped, and
+/// debug_skipped_name is then set to the source name in the breakpoint case. If
+/// a skipped command decides itself that a debug prompt should be displayed, it
+/// can do so by calling dbg_check_skipped().
 static int debug_skipped;
 static char_u   *debug_skipped_name;
 
-/*
- * Go to debug mode when a breakpoint was encountered or "ex_nesting_level" is
- * at or below the break level.  But only when the line is actually
- * executed.  Return TRUE and set breakpoint_name for skipped commands that
- * decide to execute something themselves.
- * Called from do_one_cmd() before executing a command.
- */
+/// Go to debug mode when a breakpoint was encountered or "ex_nesting_level" is
+/// at or below the break level.  But only when the line is actually
+/// executed.  Return true and set breakpoint_name for skipped commands that
+/// decide to execute something themselves.
+/// Called from do_one_cmd() before executing a command.
 void dbg_check_breakpoint(exarg_T *eap)
 {
   char_u      *p;
 
-  debug_skipped = FALSE;
+  debug_skipped = false;
   if (debug_breakpoint_name != NULL) {
     if (!eap->skip) {
-      /* replace K_SNR with "<SNR>" */
+      // replace K_SNR with "<SNR>"
       if (debug_breakpoint_name[0] == K_SPECIAL
           && debug_breakpoint_name[1] == KS_EXTRA
-          && debug_breakpoint_name[2] == (int)KE_SNR)
+          && debug_breakpoint_name[2] == (int)KE_SNR) {
         p = (char_u *)"<SNR>";
-      else
+      } else {
         p = (char_u *)"";
+      }
       smsg(_("Breakpoint in \"%s%s\" line %" PRId64),
-          p,
-          debug_breakpoint_name + (*p == NUL ? 0 : 3),
-          (int64_t)debug_breakpoint_lnum);
+           p,
+           debug_breakpoint_name + (*p == NUL ? 0 : 3),
+           (int64_t)debug_breakpoint_lnum);
       debug_breakpoint_name = NULL;
       do_debug(eap->cmd);
     } else {
-      debug_skipped = TRUE;
+      debug_skipped = true;
       debug_skipped_name = debug_breakpoint_name;
       debug_breakpoint_name = NULL;
     }
   } else if (ex_nesting_level <= debug_break_level) {
-    if (!eap->skip)
+    if (!eap->skip) {
       do_debug(eap->cmd);
-    else {
-      debug_skipped = TRUE;
+    } else {
+      debug_skipped = true;
       debug_skipped_name = NULL;
     }
   }
 }
 
-/*
- * Go to debug mode if skipped by dbg_check_breakpoint() because eap->skip was
- * set.  Return TRUE when the debug mode is entered this time.
- */
-int dbg_check_skipped(exarg_T *eap)
+/// Go to debug mode if skipped by dbg_check_breakpoint() because eap->skip was
+/// set.
+///
+/// @return true when the debug mode is entered this time.
+bool dbg_check_skipped(exarg_T *eap)
 {
   int prev_got_int;
 
   if (debug_skipped) {
-    /*
-     * Save the value of got_int and reset it.  We don't want a previous
-     * interruption cause flushing the input buffer.
-     */
+    // Save the value of got_int and reset it.  We don't want a previous
+    // interruption cause flushing the input buffer.
     prev_got_int = got_int;
-    got_int = FALSE;
+    got_int = false;
     debug_breakpoint_name = debug_skipped_name;
-    /* eap->skip is TRUE */
-    eap->skip = FALSE;
+    // eap->skip is true
+    eap->skip = false;
     dbg_check_breakpoint(eap);
-    eap->skip = TRUE;
+    eap->skip = true;
     got_int |= prev_got_int;
-    return TRUE;
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
-/*
- * The list of breakpoints: dbg_breakp.
- * This is a grow-array of structs.
- */
+/// The list of breakpoints: dbg_breakp.
+/// This is a grow-array of structs.
 struct debuggy {
   int dbg_nr;                   ///< breakpoint number
   int dbg_type;                 ///< DBG_FUNC or DBG_FILE
@@ -525,33 +511,30 @@ struct debuggy {
   int dbg_forceit;              ///< ! used
 };
 
-static garray_T dbg_breakp = {0, 0, sizeof(struct debuggy), 4, NULL};
+static garray_T dbg_breakp = { 0, 0, sizeof(struct debuggy), 4, NULL };
 #define BREAKP(idx)             (((struct debuggy *)dbg_breakp.ga_data)[idx])
 #define DEBUGGY(gap, idx)       (((struct debuggy *)gap->ga_data)[idx])
-static int last_breakp = 0;     /* nr of last defined breakpoint */
+static int last_breakp = 0;     // nr of last defined breakpoint
 
-/* Profiling uses file and func names similar to breakpoints. */
-static garray_T prof_ga = {0, 0, sizeof(struct debuggy), 4, NULL};
+// Profiling uses file and func names similar to breakpoints.
+static garray_T prof_ga = { 0, 0, sizeof(struct debuggy), 4, NULL };
 #define DBG_FUNC        1
 #define DBG_FILE        2
 
 
-/*
- * Parse the arguments of ":profile", ":breakadd" or ":breakdel" and put them
- * in the entry just after the last one in dbg_breakp.  Note that "dbg_name"
- * is allocated.
- * Returns FAIL for failure.
- */
-static int 
-dbg_parsearg (
-    char_u *arg,
-    garray_T *gap           /* either &dbg_breakp or &prof_ga */
-)
+/// Parse the arguments of ":profile", ":breakadd" or ":breakdel" and put them
+/// in the entry just after the last one in dbg_breakp.  Note that "dbg_name"
+/// is allocated.
+/// Returns FAIL for failure.
+///
+/// @param arg
+/// @param gap  either &dbg_breakp or &prof_ga
+static int dbg_parsearg(char_u *arg, garray_T *gap)
 {
   char_u      *p = arg;
   char_u      *q;
   struct debuggy *bp;
-  int here = FALSE;
+  bool here = false;
 
   ga_grow(gap, 1);
 
@@ -568,7 +551,7 @@ dbg_parsearg (
       return FAIL;
     }
     bp->dbg_type = DBG_FILE;
-    here = TRUE;
+    here = true;
   } else {
     EMSG2(_(e_invarg2), p);
     return FAIL;
@@ -585,7 +568,7 @@ dbg_parsearg (
     bp->dbg_lnum = 0;
   }
 
-  /* Find the function or file name.  Don't accept a function name with (). */
+  // Find the function or file name.  Don't accept a function name with ().
   if ((!here && *p == NUL)
       || (here && *p != NUL)
       || (bp->dbg_type == DBG_FUNC && strstr((char *)p, "()") != NULL)) {
@@ -593,36 +576,38 @@ dbg_parsearg (
     return FAIL;
   }
 
-  if (bp->dbg_type == DBG_FUNC)
+  if (bp->dbg_type == DBG_FUNC) {
     bp->dbg_name = vim_strsave(p);
-  else if (here)
+  } else if (here) {
     bp->dbg_name = vim_strsave(curbuf->b_ffname);
-  else {
-    /* Expand the file name in the same way as do_source().  This means
-     * doing it twice, so that $DIR/file gets expanded when $DIR is
-     * "~/dir". */
+  } else {
+    // Expand the file name in the same way as do_source().  This means
+    // doing it twice, so that $DIR/file gets expanded when $DIR is
+    // "~/dir".
     q = expand_env_save(p);
-    if (q == NULL)
+    if (q == NULL) {
       return FAIL;
+    }
     p = expand_env_save(q);
     xfree(q);
-    if (p == NULL)
+    if (p == NULL) {
       return FAIL;
+    }
     if (*p != '*') {
       bp->dbg_name = (char_u *)fix_fname((char *)p);
       xfree(p);
-    } else
+    } else {
       bp->dbg_name = p;
+    }
   }
 
-  if (bp->dbg_name == NULL)
+  if (bp->dbg_name == NULL) {
     return FAIL;
+  }
   return OK;
 }
 
-/*
- * ":breakadd".
- */
+/// ":breakadd".
 void ex_breakadd(exarg_T *eap)
 {
   struct debuggy *bp;
@@ -630,52 +615,51 @@ void ex_breakadd(exarg_T *eap)
   garray_T    *gap;
 
   gap = &dbg_breakp;
-  if (eap->cmdidx == CMD_profile)
+  if (eap->cmdidx == CMD_profile) {
     gap = &prof_ga;
+  }
 
   if (dbg_parsearg(eap->arg, gap) == OK) {
     bp = &DEBUGGY(gap, gap->ga_len);
     bp->dbg_forceit = eap->forceit;
 
-    pat = file_pat_to_reg_pat(bp->dbg_name, NULL, NULL, FALSE);
+    pat = file_pat_to_reg_pat(bp->dbg_name, NULL, NULL, false);
     if (pat != NULL) {
       bp->dbg_prog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
       xfree(pat);
     }
-    if (pat == NULL || bp->dbg_prog == NULL)
+    if (pat == NULL || bp->dbg_prog == NULL) {
       xfree(bp->dbg_name);
-    else {
-      if (bp->dbg_lnum == 0)            /* default line number is 1 */
+    } else {
+      if (bp->dbg_lnum == 0) {           // default line number is 1
         bp->dbg_lnum = 1;
+      }
       if (eap->cmdidx != CMD_profile) {
         DEBUGGY(gap, gap->ga_len).dbg_nr = ++last_breakp;
-        ++debug_tick;
+        debug_tick++;
       }
-      ++gap->ga_len;
+      gap->ga_len++;
     }
   }
 }
 
-/*
- * ":debuggreedy".
- */
+/// ":debuggreedy".
 void ex_debuggreedy(exarg_T *eap)
 {
-  if (eap->addr_count == 0 || eap->line2 != 0)
-    debug_greedy = TRUE;
-  else
-    debug_greedy = FALSE;
+  if (eap->addr_count == 0 || eap->line2 != 0) {
+    debug_greedy = true;
+  } else {
+    debug_greedy = false;
+  }
 }
 
-/*
- * ":breakdel" and ":profdel".
- */
+/// ":breakdel" and ":profdel".
 void ex_breakdel(exarg_T *eap)
 {
   struct debuggy *bp, *bpi;
   int nr;
   int todel = -1;
-  int del_all = FALSE;
+  bool del_all = false;
   linenr_T best_lnum = 0;
   garray_T    *gap;
 
@@ -687,7 +671,7 @@ void ex_breakdel(exarg_T *eap)
   if (ascii_isdigit(*eap->arg)) {
     // ":breakdel {nr}"
     nr = atoi((char *)eap->arg);
-    for (int i = 0; i < gap->ga_len; ++i) {
+    for (int i = 0; i < gap->ga_len; i++) {
       if (DEBUGGY(gap, i).dbg_nr == nr) {
         todel = i;
         break;
@@ -695,13 +679,14 @@ void ex_breakdel(exarg_T *eap)
     }
   } else if (*eap->arg == '*') {
     todel = 0;
-    del_all = TRUE;
+    del_all = true;
   } else {
-    /* ":breakdel {func|file} [lnum] {name}" */
-    if (dbg_parsearg(eap->arg, gap) == FAIL)
+    // ":breakdel {func|file} [lnum] {name}"
+    if (dbg_parsearg(eap->arg, gap) == FAIL) {
       return;
+    }
     bp = &DEBUGGY(gap, gap->ga_len);
-    for (int i = 0; i < gap->ga_len; ++i) {
+    for (int i = 0; i < gap->ga_len; i++) {
       bpi = &DEBUGGY(gap, i);
       if (bp->dbg_type == bpi->dbg_type
           && STRCMP(bp->dbg_name, bpi->dbg_name) == 0
@@ -716,90 +701,85 @@ void ex_breakdel(exarg_T *eap)
     xfree(bp->dbg_name);
   }
 
-  if (todel < 0)
+  if (todel < 0) {
     EMSG2(_("E161: Breakpoint not found: %s"), eap->arg);
-  else {
+  } else {
     while (!GA_EMPTY(gap)) {
       xfree(DEBUGGY(gap, todel).dbg_name);
       vim_regfree(DEBUGGY(gap, todel).dbg_prog);
-      --gap->ga_len;
-      if (todel < gap->ga_len)
+      gap->ga_len--;
+      if (todel < gap->ga_len) {
         memmove(&DEBUGGY(gap, todel), &DEBUGGY(gap, todel + 1),
                 (size_t)(gap->ga_len - todel) * sizeof(struct debuggy));
+      }
       if (eap->cmdidx == CMD_breakdel) {
-        ++debug_tick;
+        debug_tick++;
       }
       if (!del_all) {
         break;
       }
     }
 
-    /* If all breakpoints were removed clear the array. */
-    if (GA_EMPTY(gap))
+    // If all breakpoints were removed clear the array.
+    if (GA_EMPTY(gap)) {
       ga_clear(gap);
+    }
   }
 }
 
-/*
- * ":breaklist".
- */
+/// ":breaklist".
 void ex_breaklist(exarg_T *eap)
 {
   struct debuggy *bp;
 
-  if (GA_EMPTY(&dbg_breakp))
+  if (GA_EMPTY(&dbg_breakp)) {
     MSG(_("No breakpoints defined"));
-  else
-    for (int i = 0; i < dbg_breakp.ga_len; ++i) {
+  } else {
+    for (int i = 0; i < dbg_breakp.ga_len; i++) {
       bp = &BREAKP(i);
-      if (bp->dbg_type == DBG_FILE)
-        home_replace(NULL, bp->dbg_name, NameBuff, MAXPATHL, TRUE);
+      if (bp->dbg_type == DBG_FILE) {
+        home_replace(NULL, bp->dbg_name, NameBuff, MAXPATHL, true);
+      }
       smsg(_("%3d  %s %s  line %" PRId64),
-          bp->dbg_nr,
-          bp->dbg_type == DBG_FUNC ? "func" : "file",
-          bp->dbg_type == DBG_FUNC ? bp->dbg_name : NameBuff,
-          (int64_t)bp->dbg_lnum);
-    }
-}
-
-/*
- * Find a breakpoint for a function or sourced file.
- * Returns line number at which to break; zero when no matching breakpoint.
- */
-linenr_T 
-dbg_find_breakpoint (
-    int file,                   /* TRUE for a file, FALSE for a function */
-    char_u *fname,         /* file or function name */
-    linenr_T after             /* after this line number */
+           bp->dbg_nr,
+           bp->dbg_type == DBG_FUNC ? "func" : "file",
+           bp->dbg_type == DBG_FUNC ? bp->dbg_name : NameBuff,
+           (int64_t)bp->dbg_lnum);
+    }
+  }
+}
+
+/// Find a breakpoint for a function or sourced file.
+/// Returns line number at which to break; zero when no matching breakpoint.
+linenr_T
+dbg_find_breakpoint(
+    bool file,             // true for a file, false for a function
+    char_u *fname,         // file or function name
+    linenr_T after         // after this line number
 )
 {
   return debuggy_find(file, fname, after, &dbg_breakp, NULL);
 }
 
-/*
- * Return TRUE if profiling is on for a function or sourced file.
- */
-int 
-has_profiling (
-    int file,                   /* TRUE for a file, FALSE for a function */
-    char_u *fname,         /* file or function name */
-    int *fp            /* return: forceit */
-)
+/// @param file     true for a file, false for a function
+/// @param fname    file or function name
+/// @param fp[out]  forceit
+///
+/// @returns true if profiling is on for a function or sourced file.
+bool has_profiling(bool file, char_u *fname, bool *fp)
 {
   return debuggy_find(file, fname, (linenr_T)0, &prof_ga, fp)
          != (linenr_T)0;
 }
 
-/*
- * Common code for dbg_find_breakpoint() and has_profiling().
- */
-static linenr_T 
-debuggy_find (
-    int file,                   /* TRUE for a file, FALSE for a function */
-    char_u *fname,         /* file or function name */
-    linenr_T after,             /* after this line number */
-    garray_T *gap,           /* either &dbg_breakp or &prof_ga */
-    int *fp            /* if not NULL: return forceit */
+/// Common code for dbg_find_breakpoint() and has_profiling().
+static linenr_T
+debuggy_find(
+    bool file,            // true for a file, false for a function
+    char_u *fname,        // file or function name
+    linenr_T after,       // after this line number
+    garray_T *gap,        // either &dbg_breakp or &prof_ga
+    bool *fp              // if not NULL: return forceit
 )
 {
   struct debuggy *bp;
@@ -807,59 +787,57 @@ debuggy_find (
   char_u      *name = fname;
   int prev_got_int;
 
-  /* Return quickly when there are no breakpoints. */
-  if (GA_EMPTY(gap))
+  // Return quickly when there are no breakpoints.
+  if (GA_EMPTY(gap)) {
     return (linenr_T)0;
+  }
 
-  /* Replace K_SNR in function name with "<SNR>". */
+  // Replace K_SNR in function name with "<SNR>".
   if (!file && fname[0] == K_SPECIAL) {
     name = xmalloc(STRLEN(fname) + 3);
     STRCPY(name, "<SNR>");
     STRCPY(name + 5, fname + 3);
   }
 
-  for (int i = 0; i < gap->ga_len; ++i) {
-    /* Skip entries that are not useful or are for a line that is beyond
-     * an already found breakpoint. */
+  for (int i = 0; i < gap->ga_len; i++) {
+    // Skip entries that are not useful or are for a line that is beyond
+    // an already found breakpoint.
     bp = &DEBUGGY(gap, i);
-    if (((bp->dbg_type == DBG_FILE) == file
-         && (gap == &prof_ga
-             || (bp->dbg_lnum > after
-                 && (lnum == 0 || bp->dbg_lnum < lnum))))) {
+    if ((bp->dbg_type == DBG_FILE) == file
+        && (gap == &prof_ga
+            || (bp->dbg_lnum > after && (lnum == 0 || bp->dbg_lnum < lnum)))) {
       // Save the value of got_int and reset it.  We don't want a
       // previous interruption cancel matching, only hitting CTRL-C
       // while matching should abort it.
       prev_got_int = got_int;
-      got_int = FALSE;
+      got_int = false;
       if (vim_regexec_prog(&bp->dbg_prog, false, name, (colnr_T)0)) {
         lnum = bp->dbg_lnum;
-        if (fp != NULL)
+        if (fp != NULL) {
           *fp = bp->dbg_forceit;
+        }
       }
       got_int |= prev_got_int;
     }
   }
-  if (name != fname)
+  if (name != fname) {
     xfree(name);
+  }
 
   return lnum;
 }
 
-/*
- * Called when a breakpoint was encountered.
- */
+/// Called when a breakpoint was encountered.
 void dbg_breakpoint(char_u *name, linenr_T lnum)
 {
-  /* We need to check if this line is actually executed in do_one_cmd() */
+  // We need to check if this line is actually executed in do_one_cmd()
   debug_breakpoint_name = name;
   debug_breakpoint_lnum = lnum;
 }
 
 static char_u   *profile_fname = NULL;
 
-/*
- * ":profile cmd args"
- */
+/// ":profile cmd args"
 void ex_profile(exarg_T *eap)
 {
   static proftime_T pause_time;
@@ -885,8 +863,9 @@ void ex_profile(exarg_T *eap)
     set_vim_var_nr(VV_PROFILING, 0L);
     profile_reset();
   } else if (STRCMP(eap->arg, "pause") == 0) {
-    if (do_profiling == PROF_YES)
+    if (do_profiling == PROF_YES) {
       pause_time = profile_start();
+    }
     do_profiling = PROF_PAUSED;
   } else if (STRCMP(eap->arg, "continue") == 0) {
     if (do_profiling == PROF_PAUSED) {
@@ -897,7 +876,7 @@ void ex_profile(exarg_T *eap)
   } else if (STRCMP(eap->arg, "dump") == 0) {
     profile_dump();
   } else {
-    /* The rest is similar to ":breakadd". */
+    // The rest is similar to ":breakadd".
     ex_breakadd(eap);
   }
 }
@@ -917,6 +896,21 @@ void ex_pydo(exarg_T *eap)
   script_host_do_range("python", eap);
 }
 
+void ex_ruby(exarg_T *eap)
+{
+  script_host_execute("ruby", eap);
+}
+
+void ex_rubyfile(exarg_T *eap)
+{
+  script_host_execute_file("ruby", eap);
+}
+
+void ex_rubydo(exarg_T *eap)
+{
+  script_host_do_range("ruby", eap);
+}
+
 void ex_python3(exarg_T *eap)
 {
   script_host_execute("python3", eap);
@@ -932,7 +926,7 @@ void ex_pydo3(exarg_T *eap)
   script_host_do_range("python3", eap);
 }
 
-/* Command line expansion for :profile. */
+// Command line expansion for :profile.
 static enum {
   PEXP_SUBCMD,          ///< expand :profile sub-commands
   PEXP_FUNC             ///< expand :profile func {funcname}
@@ -949,36 +943,33 @@ static char *pexpand_cmds[] = {
   NULL
 };
 
-/*
- * Function given to ExpandGeneric() to obtain the profile command
- * specific expansion.
- */
+/// Function given to ExpandGeneric() to obtain the profile command
+/// specific expansion.
 char_u *get_profile_name(expand_T *xp, int idx)
 {
   switch (pexpand_what) {
   case PEXP_SUBCMD:
     return (char_u *)pexpand_cmds[idx];
-  /* case PEXP_FUNC: TODO */
+  // case PEXP_FUNC: TODO
   default:
     return NULL;
   }
 }
 
-/*
- * Handle command line completion for :profile command.
- */
+/// Handle command line completion for :profile command.
 void set_context_in_profile_cmd(expand_T *xp, char_u *arg)
 {
   char_u      *end_subcmd;
 
-  /* Default: expand subcommands. */
+  // Default: expand subcommands.
   xp->xp_context = EXPAND_PROFILE;
   pexpand_what = PEXP_SUBCMD;
   xp->xp_pattern = arg;
 
   end_subcmd = skiptowhite(arg);
-  if (*end_subcmd == NUL)
+  if (*end_subcmd == NUL) {
     return;
+  }
 
   if (end_subcmd - arg == 5 && STRNCMP(arg, "start", 5) == 0) {
     xp->xp_context = EXPAND_FILES;
@@ -986,22 +977,20 @@ void set_context_in_profile_cmd(expand_T *xp, char_u *arg)
     return;
   }
 
-  /* TODO: expand function names after "func" */
+  // TODO(tarruda): expand function names after "func"
   xp->xp_context = EXPAND_NOTHING;
 }
 
-/*
- * Dump the profiling info.
- */
+/// Dump the profiling info.
 void profile_dump(void)
 {
   FILE        *fd;
 
   if (profile_fname != NULL) {
     fd = mch_fopen((char *)profile_fname, "w");
-    if (fd == NULL)
+    if (fd == NULL) {
       EMSG2(_(e_notopen), profile_fname);
-    else {
+    } else {
       script_dump_profile(fd);
       func_dump_profile(fd);
       fclose(fd);
@@ -1017,7 +1006,7 @@ static void profile_reset(void)
     scriptitem_T *si = &SCRIPT_ITEM(id);
     if (si->sn_prof_on) {
       si->sn_prof_on      = false;
-      si->sn_pr_force     = 0;
+      si->sn_pr_force     = false;
       si->sn_pr_child     = profile_zero();
       si->sn_pr_nest      = 0;
       si->sn_pr_count     = 0;
@@ -1077,26 +1066,23 @@ static void profile_init(scriptitem_T *si)
   si->sn_pr_nest = 0;
 }
 
-/*
- * save time when starting to invoke another script or function.
- */
+/// save time when starting to invoke another script or function.
 void script_prof_save(
-    proftime_T  *tm             /* place to store wait time */
-    )
+    proftime_T  *tm             // place to store wait time
+)
 {
   scriptitem_T    *si;
 
   if (current_SID > 0 && current_SID <= script_items.ga_len) {
     si = &SCRIPT_ITEM(current_SID);
-    if (si->sn_prof_on && si->sn_pr_nest++ == 0)
+    if (si->sn_prof_on && si->sn_pr_nest++ == 0) {
       si->sn_pr_child = profile_start();
+    }
   }
   *tm = profile_get_wait();
 }
 
-/*
- * Count time spent in children after invoking another script or function.
- */
+/// Count time spent in children after invoking another script or function.
 void script_prof_restore(proftime_T *tm)
 {
   scriptitem_T    *si;
@@ -1115,62 +1101,60 @@ void script_prof_restore(proftime_T *tm)
 
 static proftime_T inchar_time;
 
-/*
- * Called when starting to wait for the user to type a character.
- */
+/// Called when starting to wait for the user to type a character.
 void prof_inchar_enter(void)
 {
   inchar_time = profile_start();
 }
 
-/*
- * Called when finished waiting for the user to type a character.
- */
+/// Called when finished waiting for the user to type a character.
 void prof_inchar_exit(void)
 {
   inchar_time = profile_end(inchar_time);
   profile_set_wait(profile_add(profile_get_wait(), inchar_time));
 }
 
-/*
- * Dump the profiling results for all scripts in file "fd".
- */
+/// Dump the profiling results for all scripts in file "fd".
 static void script_dump_profile(FILE *fd)
 {
   scriptitem_T    *si;
   FILE            *sfd;
   sn_prl_T        *pp;
 
-  for (int id = 1; id <= script_items.ga_len; ++id) {
+  for (int id = 1; id <= script_items.ga_len; id++) {
     si = &SCRIPT_ITEM(id);
     if (si->sn_prof_on) {
       fprintf(fd, "SCRIPT  %s\n", si->sn_name);
-      if (si->sn_pr_count == 1)
+      if (si->sn_pr_count == 1) {
         fprintf(fd, "Sourced 1 time\n");
-      else
+      } else {
         fprintf(fd, "Sourced %d times\n", si->sn_pr_count);
+      }
       fprintf(fd, "Total time: %s\n", profile_msg(si->sn_pr_total));
       fprintf(fd, " Self time: %s\n", profile_msg(si->sn_pr_self));
       fprintf(fd, "\n");
       fprintf(fd, "count  total (s)   self (s)\n");
 
       sfd = mch_fopen((char *)si->sn_name, "r");
-      if (sfd == NULL)
+      if (sfd == NULL) {
         fprintf(fd, "Cannot open file!\n");
-      else {
-        for (int i = 0; i < si->sn_prl_ga.ga_len; ++i) {
-          if (vim_fgets(IObuff, IOSIZE, sfd))
+      } else {
+        for (int i = 0; i < si->sn_prl_ga.ga_len; i++) {
+          if (vim_fgets(IObuff, IOSIZE, sfd)) {
             break;
+          }
           pp = &PRL_ITEM(si, i);
           if (pp->snp_count > 0) {
             fprintf(fd, "%5d ", pp->snp_count);
-            if (profile_equal(pp->sn_prl_total, pp->sn_prl_self))
+            if (profile_equal(pp->sn_prl_total, pp->sn_prl_self)) {
               fprintf(fd, "           ");
-            else
+            } else {
               fprintf(fd, "%s ", profile_msg(pp->sn_prl_total));
+            }
             fprintf(fd, "%s ", profile_msg(pp->sn_prl_self));
-          } else
+          } else {
             fprintf(fd, "                            ");
+          }
           fprintf(fd, "%s", IObuff);
         }
         fclose(sfd);
@@ -1180,44 +1164,41 @@ static void script_dump_profile(FILE *fd)
   }
 }
 
-/*
- * Return TRUE when a function defined in the current script should be
- * profiled.
- */
-int prof_def_func(void)
+/// Return true when a function defined in the current script should be
+/// profiled.
+bool prof_def_func(void)
 {
-  if (current_SID > 0)
+  if (current_SID > 0) {
     return SCRIPT_ITEM(current_SID).sn_pr_force;
-  return FALSE;
+  }
+  return false;
 }
 
-/*
- * If 'autowrite' option set, try to write the file.
- * Careful: autocommands may make "buf" invalid!
- *
- * return FAIL for failure, OK otherwise
- */
+/// If 'autowrite' option set, try to write the file.
+/// Careful: autocommands may make "buf" invalid!
+///
+/// @return FAIL for failure, OK otherwise
 int autowrite(buf_T *buf, int forceit)
 {
   int r;
 
   if (!(p_aw || p_awa) || !p_write
-      /* never autowrite a "nofile" or "nowrite" buffer */
+      // never autowrite a "nofile" or "nowrite" buffer
       || bt_dontwrite(buf)
-      || (!forceit && buf->b_p_ro) || buf->b_ffname == NULL)
+      || (!forceit && buf->b_p_ro) || buf->b_ffname == NULL) {
     return FAIL;
+  }
   r = buf_write_all(buf, forceit);
 
-  /* Writing may succeed but the buffer still changed, e.g., when there is a
-   * conversion error.  We do want to return FAIL then. */
-  if (buf_valid(buf) && bufIsChanged(buf))
+  // Writing may succeed but the buffer still changed, e.g., when there is a
+  // conversion error.  We do want to return FAIL then.
+  if (buf_valid(buf) && bufIsChanged(buf)) {
     r = FAIL;
+  }
   return r;
 }
 
-/*
- * flush all buffers, except the ones that are readonly
- */
+/// flush all buffers, except the ones that are readonly
 void autowrite_all(void)
 {
   if (!(p_aw || p_awa) || !p_write) {
@@ -1226,123 +1207,125 @@ void autowrite_all(void)
 
   FOR_ALL_BUFFERS(buf) {
     if (bufIsChanged(buf) && !buf->b_p_ro) {
-      (void)buf_write_all(buf, FALSE);
-      /* an autocommand may have deleted the buffer */
-      if (!buf_valid(buf))
+      (void)buf_write_all(buf, false);
+      // an autocommand may have deleted the buffer
+      if (!buf_valid(buf)) {
         buf = firstbuf;
+      }
     }
   }
 }
 
-/*
- * Return TRUE if buffer was changed and cannot be abandoned.
- * For flags use the CCGD_ values.
- */
-int check_changed(buf_T *buf, int flags)
+/// Return true if buffer was changed and cannot be abandoned.
+/// For flags use the CCGD_ values.
+bool check_changed(buf_T *buf, int flags)
 {
   int forceit = (flags & CCGD_FORCEIT);
 
-  if (       !forceit
-             && bufIsChanged(buf)
-             && ((flags & CCGD_MULTWIN) || buf->b_nwindows <= 1)
-             && (!(flags & CCGD_AW) || autowrite(buf, forceit) == FAIL)) {
+  if (!forceit
+      && bufIsChanged(buf)
+      && ((flags & CCGD_MULTWIN) || buf->b_nwindows <= 1)
+      && (!(flags & CCGD_AW) || autowrite(buf, forceit) == FAIL)) {
     if ((p_confirm || cmdmod.confirm) && p_write) {
       int count = 0;
 
-      if (flags & CCGD_ALLBUF)
+      if (flags & CCGD_ALLBUF) {
         FOR_ALL_BUFFERS(buf2) {
           if (bufIsChanged(buf2) && (buf2->b_ffname != NULL)) {
-            ++count;
+            count++;
           }
         }
-      if (!buf_valid(buf))
-        /* Autocommand deleted buffer, oops!  It's not changed now. */
-        return FALSE;
+      }
+      if (!buf_valid(buf)) {
+        // Autocommand deleted buffer, oops!  It's not changed now.
+        return false;
+      }
       dialog_changed(buf, count > 1);
-      if (!buf_valid(buf))
-        /* Autocommand deleted buffer, oops!  It's not changed now. */
-        return FALSE;
+      if (!buf_valid(buf)) {
+        // Autocommand deleted buffer, oops!  It's not changed now.
+        return false;
+      }
       return bufIsChanged(buf);
     }
-    if (flags & CCGD_EXCMD)
+    if (flags & CCGD_EXCMD) {
       EMSG(_(e_nowrtmsg));
-    else
+    } else {
       EMSG(_(e_nowrtmsg_nobang));
-    return TRUE;
+    }
+    return true;
   }
-  return FALSE;
+  return false;
 }
 
 
 
-/*
- * Ask the user what to do when abandoning a changed buffer.
- * Must check 'write' option first!
- */
-void 
-dialog_changed (
-    buf_T *buf,
-    int checkall                   /* may abandon all changed buffers */
-)
+/// Ask the user what to do when abandoning a changed buffer.
+/// Must check 'write' option first!
+///
+/// @param buf
+/// @param checkall may abandon all changed buffers
+void dialog_changed(buf_T *buf, int checkall)
 {
   char_u buff[DIALOG_MSG_SIZE];
   int ret;
   exarg_T ea;
 
   dialog_msg(buff, _("Save changes to \"%s\"?"),
-      (buf->b_fname != NULL) ?
-      buf->b_fname : (char_u *)_("Untitled"));
-  if (checkall)
+             (buf->b_fname != NULL) ?
+             buf->b_fname : (char_u *)_("Untitled"));
+  if (checkall) {
     ret = vim_dialog_yesnoallcancel(VIM_QUESTION, NULL, buff, 1);
-  else
+  } else {
     ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1);
+  }
 
-  /* Init ea pseudo-structure, this is needed for the check_overwrite()
-   * function. */
-  ea.append = ea.forceit = FALSE;
+  // Init ea pseudo-structure, this is needed for the check_overwrite()
+  // function.
+  ea.append = ea.forceit = false;
 
   if (ret == VIM_YES) {
-    if (buf->b_fname != NULL && check_overwrite(&ea, buf,
-            buf->b_fname, buf->b_ffname, FALSE) == OK)
-      /* didn't hit Cancel */
-      (void)buf_write_all(buf, FALSE);
+    if (buf->b_fname != NULL
+        && check_overwrite(&ea,
+                           buf,
+                           buf->b_fname,
+                           buf->b_ffname,
+                           false) == OK) {
+      // didn't hit Cancel
+      (void)buf_write_all(buf, false);
+    }
   } else if (ret == VIM_NO) {
-    unchanged(buf, TRUE);
+    unchanged(buf, true);
   } else if (ret == VIM_ALL) {
-    /*
-     * Write all modified files that can be written.
-     * Skip readonly buffers, these need to be confirmed
-     * individually.
-     */
+    // Write all modified files that can be written.
+    // Skip readonly buffers, these need to be confirmed
+    // individually.
     FOR_ALL_BUFFERS(buf2) {
       if (bufIsChanged(buf2)
-          && (buf2->b_ffname != NULL
-              )
+          && (buf2->b_ffname != NULL)
           && !buf2->b_p_ro) {
-        if (buf2->b_fname != NULL && check_overwrite(&ea, buf2,
-                buf2->b_fname, buf2->b_ffname, FALSE) == OK)
-          /* didn't hit Cancel */
-          (void)buf_write_all(buf2, FALSE);
-        /* an autocommand may have deleted the buffer */
-        if (!buf_valid(buf2))
+        if (buf2->b_fname != NULL
+            && check_overwrite(&ea, buf2, buf2->b_fname,
+                               buf2->b_ffname, false) == OK) {
+          // didn't hit Cancel
+          (void)buf_write_all(buf2, false);
+        }
+        // an autocommand may have deleted the buffer
+        if (!buf_valid(buf2)) {
           buf2 = firstbuf;
+        }
       }
     }
   } else if (ret == VIM_DISCARDALL) {
-    /*
-     * mark all buffers as unchanged
-     */
+    // mark all buffers as unchanged
     FOR_ALL_BUFFERS(buf2) {
-      unchanged(buf2, TRUE);
+      unchanged(buf2, true);
     }
   }
 }
 
-/*
- * Return TRUE if the buffer "buf" can be abandoned, either by making it
- * hidden, autowriting it or unloading it.
- */
-int can_abandon(buf_T *buf, int forceit)
+/// Return true if the buffer "buf" can be abandoned, either by making it
+/// hidden, autowriting it or unloading it.
+bool can_abandon(buf_T *buf, int forceit)
 {
   return P_HID(buf)
          || !bufIsChanged(buf)
@@ -1352,16 +1335,16 @@ int can_abandon(buf_T *buf, int forceit)
 }
 
 
-/*
- * Add a buffer number to "bufnrs", unless it's already there.
- */
+/// Add a buffer number to "bufnrs", unless it's already there.
 static void add_bufnum(int *bufnrs, int *bufnump, int nr)
 {
   int i;
 
-  for (i = 0; i < *bufnump; ++i)
-    if (bufnrs[i] == nr)
+  for (i = 0; i < *bufnump; i++) {
+    if (bufnrs[i] == nr) {
       return;
+    }
+  }
   bufnrs[*bufnump] = nr;
   *bufnump = *bufnump + 1;
 }
@@ -1375,7 +1358,7 @@ static void add_bufnum(int *bufnrs, int *bufnump, int nr)
 /// @param[in] unload specifies whether to unload, instead of hide, the buffer.
 ///
 /// @returns          true if any buffer is changed and cannot be abandoned
-int check_changed_any(bool hidden, bool unload)
+bool check_changed_any(bool hidden, bool unload)
 {
   bool ret = false;
   int save;
@@ -1385,7 +1368,7 @@ int check_changed_any(bool hidden, bool unload)
   int         *bufnrs;
 
   FOR_ALL_BUFFERS(buf) {
-    ++bufcount;
+    bufcount++;
   }
 
   if (bufcount == 0) {
@@ -1394,16 +1377,16 @@ int check_changed_any(bool hidden, bool unload)
 
   bufnrs = xmalloc(sizeof(*bufnrs) * bufcount);
 
-  /* curbuf */
+  // curbuf
   bufnrs[bufnum++] = curbuf->b_fnum;
-  /* buf in curtab */
+  // buf in curtab
   FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
     if (wp->w_buffer != curbuf) {
       add_bufnum(bufnrs, &bufnum, wp->w_buffer->b_fnum);
     }
   }
 
-  /* buf in other tab */
+  // buf in other tab
   FOR_ALL_TABS(tp) {
     if (tp != curtab) {
       FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
@@ -1412,59 +1395,60 @@ int check_changed_any(bool hidden, bool unload)
     }
   }
 
-  /* any other buf */
+  // any other buf
   FOR_ALL_BUFFERS(buf) {
     add_bufnum(bufnrs, &bufnum, buf->b_fnum);
   }
 
   buf_T *buf = NULL;
-  for (i = 0; i < bufnum; ++i) {
+  for (i = 0; i < bufnum; i++) {
     buf = buflist_findnr(bufnrs[i]);
-    if (buf == NULL)
+    if (buf == NULL) {
       continue;
+    }
     if ((!hidden || buf->b_nwindows == 0) && bufIsChanged(buf)) {
-      /* Try auto-writing the buffer.  If this fails but the buffer no
-       * longer exists it's not changed, that's OK. */
+      // Try auto-writing the buffer.  If this fails but the buffer no
+      // longer exists it's not changed, that's OK.
       if (check_changed(buf, (p_awa ? CCGD_AW : 0)
-              | CCGD_MULTWIN
-              | CCGD_ALLBUF) && buf_valid(buf))
-        break;              /* didn't save - still changes */
+                        | CCGD_MULTWIN
+                        | CCGD_ALLBUF) && buf_valid(buf)) {
+        break;    // didn't save - still changes
+      }
     }
   }
 
-  if (i >= bufnum)
+  if (i >= bufnum) {
     goto theend;
+  }
 
-  ret = TRUE;
-  exiting = FALSE;
-  /*
-   * When ":confirm" used, don't give an error message.
-   */
+  ret = true;
+  exiting = false;
+  // When ":confirm" used, don't give an error message.
   if (!(p_confirm || cmdmod.confirm)) {
-    /* There must be a wait_return for this message, do_buffer()
-     * may cause a redraw.  But wait_return() is a no-op when vgetc()
-     * is busy (Quit used from window menu), then make sure we don't
-     * cause a scroll up. */
+    // There must be a wait_return for this message, do_buffer()
+    // may cause a redraw.  But wait_return() is a no-op when vgetc()
+    // is busy (Quit used from window menu), then make sure we don't
+    // cause a scroll up.
     if (vgetc_busy > 0) {
       msg_row = cmdline_row;
       msg_col = 0;
-      msg_didout = FALSE;
+      msg_didout = false;
     }
     if (EMSG2(_("E162: No write since last change for buffer \"%s\""),
-            buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname)) {
+              buf_spname(buf) != NULL ? buf_spname(buf) : buf->b_fname)) {
       save = no_wait_return;
-      no_wait_return = FALSE;
-      wait_return(FALSE);
+      no_wait_return = false;
+      wait_return(false);
       no_wait_return = save;
     }
   }
 
-  /* Try to find a window that contains the buffer. */
+  // Try to find a window that contains the buffer.
   if (buf != curbuf) {
     FOR_ALL_TAB_WINDOWS(tp, wp) {
       if (wp->w_buffer == buf) {
         goto_tabpage_win(tp, wp);
-        /* Paranoia: did autocms wipe out the buffer with changes? */
+        // Paranoia: did autocmds wipe out the buffer with changes?
         if (!buf_valid(buf)) {
           goto theend;
         }
@@ -1484,10 +1468,8 @@ theend:
   return ret;
 }
 
-/*
- * return FAIL if there is no file name, OK if there is one
- * give error message for FAIL
- */
+/// Return FAIL if there is no file name, OK if there is one.
+/// Give error message for FAIL.
 int check_fname(void)
 {
   if (curbuf->b_ffname == NULL) {
@@ -1497,19 +1479,17 @@ int check_fname(void)
   return OK;
 }
 
-/*
- * flush the contents of a buffer, unless it has no file name
- *
- * return FAIL for failure, OK otherwise
- */
+/// Flush the contents of a buffer, unless it has no file name.
+///
+/// @return FAIL for failure, OK otherwise
 int buf_write_all(buf_T *buf, int forceit)
 {
   int retval;
   buf_T       *old_curbuf = curbuf;
 
   retval = (buf_write(buf, buf->b_ffname, buf->b_fname,
-                (linenr_T)1, buf->b_ml.ml_line_count, NULL,
-                FALSE, forceit, TRUE, FALSE));
+                      (linenr_T)1, buf->b_ml.ml_line_count, NULL,
+                      false, forceit, true, false));
   if (curbuf != old_curbuf) {
     msg_source(hl_attr(HLF_W));
     MSG(_("Warning: Entered other buffer unexpectedly (check autocommands)"));
@@ -1517,37 +1497,35 @@ int buf_write_all(buf_T *buf, int forceit)
   return retval;
 }
 
-/*
- * Code to handle the argument list.
- */
+/// Code to handle the argument list.
 
 #define AL_SET  1
 #define AL_ADD  2
 #define AL_DEL  3
 
-/*
- * Isolate one argument, taking backticks.
- * Changes the argument in-place, puts a NUL after it.  Backticks remain.
- * Return a pointer to the start of the next argument.
- */
+/// Isolate one argument, taking backticks.
+/// Changes the argument in-place, puts a NUL after it.  Backticks remain.
+/// Return a pointer to the start of the next argument.
 static char_u *do_one_arg(char_u *str)
 {
   char_u      *p;
-  int inbacktick;
+  bool inbacktick;
 
-  inbacktick = FALSE;
-  for (p = str; *str; ++str) {
-    /* When the backslash is used for escaping the special meaning of a
-     * character we need to keep it until wildcard expansion. */
+  inbacktick = false;
+  for (p = str; *str; str++) {
+    // When the backslash is used for escaping the special meaning of a
+    // character we need to keep it until wildcard expansion.
     if (rem_backslash(str)) {
       *p++ = *str++;
       *p++ = *str;
     } else {
-      /* An item ends at a space not in backticks */
-      if (!inbacktick && ascii_isspace(*str))
+      // An item ends at a space not in backticks
+      if (!inbacktick && ascii_isspace(*str)) {
         break;
-      if (*str == '`')
-        inbacktick ^= TRUE;
+      }
+      if (*str == '`') {
+        inbacktick ^= true;
+      }
       *p++ = *str;
     }
   }
@@ -1557,26 +1535,23 @@ static char_u *do_one_arg(char_u *str)
   return str;
 }
 
-/*
- * Separate the arguments in "str" and return a list of pointers in the
- * growarray "gap".
- */
+/// Separate the arguments in "str" and return a list of pointers in the
+/// growarray "gap".
 void get_arglist(garray_T *gap, char_u *str)
 {
   ga_init(gap, (int)sizeof(char_u *), 20);
   while (*str != NUL) {
     GA_APPEND(char_u *, gap, str);
 
-    /* Isolate one argument, change it in-place, put a NUL after it. */
+    // Isolate one argument, change it in-place, put a NUL after it.
     str = do_one_arg(str);
   }
 }
 
-/*
- * Parse a list of arguments (file names), expand them and return in
- * "fnames[fcountp]".  When "wig" is true, removes files matching 'wildignore'.
- * Return FAIL or OK.
- */
+/// Parse a list of arguments (file names), expand them and return in
+/// "fnames[fcountp]".  When "wig" is true, removes files matching 'wildignore'.
+///
+/// @return FAIL or OK.
 int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, bool wig)
 {
   garray_T ga;
@@ -1584,31 +1559,29 @@ int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, bool wig)
 
   get_arglist(&ga, str);
 
-  if (wig)
+  if (wig) {
     i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
-        fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
-  else
+                         fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
+  } else {
     i = gen_expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
-        fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
+                             fcountp, fnamesp, EW_FILE|EW_NOTFOUND);
+  }
 
   ga_clear(&ga);
   return i;
 }
 
 
-/*
- * "what" == AL_SET: Redefine the argument list to 'str'.
- * "what" == AL_ADD: add files in 'str' to the argument list after "after".
- * "what" == AL_DEL: remove files in 'str' from the argument list.
- *
- * Return FAIL for failure, OK otherwise.
- */
-static int 
-do_arglist (
-    char_u *str,
-    int what,
-    int after                       /* 0 means before first one */
-)
+/// @param str
+/// @param what
+///         AL_SET: Redefine the argument list to 'str'.
+///         AL_ADD: add files in 'str' to the argument list after "after".
+///         AL_DEL: remove files in 'str' from the argument list.
+/// @param after
+///         0 means before first one
+///
+/// @return FAIL for failure, OK otherwise.
+static int do_arglist(char_u *str, int what, int after)
 {
   garray_T new_ga;
   int exp_count;
@@ -1616,54 +1589,63 @@ do_arglist (
   char_u      *p;
   int match;
 
-  /*
-   * Collect all file name arguments in "new_ga".
-   */
+  // Set default argument for ":argadd" command.
+  if (what == AL_ADD && *str == NUL) {
+    if (curbuf->b_ffname == NULL) {
+      return FAIL;
+    }
+    str = curbuf->b_fname;
+  }
+
+  // Collect all file name arguments in "new_ga".
   get_arglist(&new_ga, str);
 
   if (what == AL_DEL) {
     regmatch_T regmatch;
-    int didone;
-
-    /*
-     * Delete the items: use each item as a regexp and find a match in the
-     * argument list.
-     */
-    regmatch.rm_ic = p_fic;     /* ignore case when 'fileignorecase' is set */
-    for (int i = 0; i < new_ga.ga_len && !got_int; ++i) {
+    bool didone;
+
+    // Delete the items: use each item as a regexp and find a match in the
+    // argument list.
+    regmatch.rm_ic = p_fic;     // ignore case when 'fileignorecase' is set
+    for (int i = 0; i < new_ga.ga_len && !got_int; i++) {
       p = ((char_u **)new_ga.ga_data)[i];
-      p = file_pat_to_reg_pat(p, NULL, NULL, FALSE);
-      if (p == NULL)
+      p = file_pat_to_reg_pat(p, NULL, NULL, false);
+      if (p == NULL) {
         break;
+      }
       regmatch.regprog = vim_regcomp(p, p_magic ? RE_MAGIC : 0);
       if (regmatch.regprog == NULL) {
         xfree(p);
         break;
       }
 
-      didone = FALSE;
-      for (match = 0; match < ARGCOUNT; ++match)
+      didone = false;
+      for (match = 0; match < ARGCOUNT; match++) {
         if (vim_regexec(&regmatch, alist_name(&ARGLIST[match]),
-                (colnr_T)0)) {
-          didone = TRUE;
+                        (colnr_T)0)) {
+          didone = true;
           xfree(ARGLIST[match].ae_fname);
           memmove(ARGLIST + match, ARGLIST + match + 1,
                   (size_t)(ARGCOUNT - match - 1) * sizeof(aentry_T));
-          --ALIST(curwin)->al_ga.ga_len;
-          if (curwin->w_arg_idx > match)
-            --curwin->w_arg_idx;
-          --match;
+          ALIST(curwin)->al_ga.ga_len--;
+          if (curwin->w_arg_idx > match) {
+            curwin->w_arg_idx--;
+          }
+          match--;
         }
+      }
 
       vim_regfree(regmatch.regprog);
       xfree(p);
-      if (!didone)
+      if (!didone) {
         EMSG2(_(e_nomatch2), ((char_u **)new_ga.ga_data)[i]);
+      }
     }
     ga_clear(&new_ga);
   } else {
     int i = expand_wildcards(new_ga.ga_len, (char_u **)new_ga.ga_data,
-        &exp_count, &exp_files, EW_DIR|EW_FILE|EW_ADDSLASH|EW_NOTFOUND);
+                             &exp_count, &exp_files,
+                             EW_DIR|EW_FILE|EW_ADDSLASH|EW_NOTFOUND);
     ga_clear(&new_ga);
     if (i == FAIL || exp_count == 0) {
       EMSG(_(e_nomatch));
@@ -1673,8 +1655,9 @@ do_arglist (
     if (what == AL_ADD) {
       (void)alist_add_list(exp_count, exp_files, after);
       xfree(exp_files);
-    } else   /* what == AL_SET */
-      alist_set(ALIST(curwin), exp_count, exp_files, FALSE, NULL, 0);
+    } else {  // what == AL_SET
+      alist_set(ALIST(curwin), exp_count, exp_files, false, NULL, 0);
+    }
   }
 
   alist_check_arg_idx();
@@ -1682,9 +1665,7 @@ do_arglist (
   return OK;
 }
 
-/*
- * Check the validity of the arg_idx for each other window.
- */
+/// Check the validity of the arg_idx for each other window.
 static void alist_check_arg_idx(void)
 {
   FOR_ALL_TAB_WINDOWS(tp, win) {
@@ -1694,136 +1675,123 @@ static void alist_check_arg_idx(void)
   }
 }
 
-/*
- * Return TRUE if window "win" is editing the file at the current argument
- * index.
- */
-static int editing_arg_idx(win_T *win)
+/// Return true if window "win" is editing the file at the current argument
+/// index.
+static bool editing_arg_idx(win_T *win)
 {
   return !(win->w_arg_idx >= WARGCOUNT(win)
            || (win->w_buffer->b_fnum
                != WARGLIST(win)[win->w_arg_idx].ae_fnum
                && (win->w_buffer->b_ffname == NULL
                    || !(path_full_compare(
-                            alist_name(&WARGLIST(win)[win->w_arg_idx]),
-                            win->w_buffer->b_ffname, TRUE) & kEqualFiles))));
+                       alist_name(&WARGLIST(win)[win->w_arg_idx]),
+                       win->w_buffer->b_ffname, true) & kEqualFiles))));
 }
 
-/*
- * Check if window "win" is editing the w_arg_idx file in its argument list.
- */
+/// Check if window "win" is editing the w_arg_idx file in its argument list.
 void check_arg_idx(win_T *win)
 {
   if (WARGCOUNT(win) > 1 && !editing_arg_idx(win)) {
-    /* We are not editing the current entry in the argument list.
-     * Set "arg_had_last" if we are editing the last one. */
-    win->w_arg_idx_invalid = TRUE;
+    // We are not editing the current entry in the argument list.
+    // Set "arg_had_last" if we are editing the last one.
+    win->w_arg_idx_invalid = true;
     if (win->w_arg_idx != WARGCOUNT(win) - 1
-        && arg_had_last == FALSE
+        && arg_had_last == false
         && ALIST(win) == &global_alist
         && GARGCOUNT > 0
         && win->w_arg_idx < GARGCOUNT
         && (win->w_buffer->b_fnum == GARGLIST[GARGCOUNT - 1].ae_fnum
             || (win->w_buffer->b_ffname != NULL
                 && (path_full_compare(alist_name(&GARGLIST[GARGCOUNT - 1]),
-                        win->w_buffer->b_ffname, TRUE) & kEqualFiles))))
-      arg_had_last = TRUE;
+                                      win->w_buffer->b_ffname, true)
+                    & kEqualFiles)))) {
+      arg_had_last = true;
+    }
   } else {
-    /* We are editing the current entry in the argument list.
-     * Set "arg_had_last" if it's also the last one */
-    win->w_arg_idx_invalid = FALSE;
+    // We are editing the current entry in the argument list.
+    // Set "arg_had_last" if it's also the last one
+    win->w_arg_idx_invalid = false;
     if (win->w_arg_idx == WARGCOUNT(win) - 1
-        && win->w_alist == &global_alist
-        )
-      arg_had_last = TRUE;
+        && win->w_alist == &global_alist) {
+      arg_had_last = true;
+    }
   }
 }
 
-/*
- * ":args", ":argslocal" and ":argsglobal".
- */
+/// ":args", ":argslocal" and ":argsglobal".
 void ex_args(exarg_T *eap)
 {
   if (eap->cmdidx != CMD_args) {
     alist_unlink(ALIST(curwin));
-    if (eap->cmdidx == CMD_argglobal)
+    if (eap->cmdidx == CMD_argglobal) {
       ALIST(curwin) = &global_alist;
-    else     /* eap->cmdidx == CMD_arglocal */
+    } else {     // eap->cmdidx == CMD_arglocal
       alist_new();
+    }
   }
 
   if (!ends_excmd(*eap->arg)) {
-    /*
-     * ":args file ..": define new argument list, handle like ":next"
-     * Also for ":argslocal file .." and ":argsglobal file ..".
-     */
+    // ":args file ..": define new argument list, handle like ":next"
+    // Also for ":argslocal file .." and ":argsglobal file ..".
     ex_next(eap);
-  } else if (eap->cmdidx == CMD_args)  {
-    /*
-     * ":args": list arguments.
-     */
+  } else if (eap->cmdidx == CMD_args) {
+    // ":args": list arguments.
     if (ARGCOUNT > 0) {
-      /* Overwrite the command, for a short list there is no scrolling
-       * required and no wait_return(). */
-      gotocmdline(TRUE);
-      for (int i = 0; i < ARGCOUNT; ++i) {
-        if (i == curwin->w_arg_idx)
+      // Overwrite the command, for a short list there is no scrolling
+      // required and no wait_return().
+      gotocmdline(true);
+      for (int i = 0; i < ARGCOUNT; i++) {
+        if (i == curwin->w_arg_idx) {
           msg_putchar('[');
+        }
         msg_outtrans(alist_name(&ARGLIST[i]));
-        if (i == curwin->w_arg_idx)
+        if (i == curwin->w_arg_idx) {
           msg_putchar(']');
+        }
         msg_putchar(' ');
       }
     }
   } else if (eap->cmdidx == CMD_arglocal) {
     garray_T        *gap = &curwin->w_alist->al_ga;
 
-    /*
-     * ":argslocal": make a local copy of the global argument list.
-     */
+    // ":argslocal": make a local copy of the global argument list.
     ga_grow(gap, GARGCOUNT);
-    for (int i = 0; i < GARGCOUNT; ++i)
+    for (int i = 0; i < GARGCOUNT; i++) {
       if (GARGLIST[i].ae_fname != NULL) {
         AARGLIST(curwin->w_alist)[gap->ga_len].ae_fname =
           vim_strsave(GARGLIST[i].ae_fname);
         AARGLIST(curwin->w_alist)[gap->ga_len].ae_fnum =
           GARGLIST[i].ae_fnum;
-        ++gap->ga_len;
+        gap->ga_len++;
       }
+    }
   }
 }
 
-/*
- * ":previous", ":sprevious", ":Next" and ":sNext".
- */
+/// ":previous", ":sprevious", ":Next" and ":sNext".
 void ex_previous(exarg_T *eap)
 {
-  /* If past the last one already, go to the last one. */
-  if (curwin->w_arg_idx - (int)eap->line2 >= ARGCOUNT)
+  // If past the last one already, go to the last one.
+  if (curwin->w_arg_idx - (int)eap->line2 >= ARGCOUNT) {
     do_argfile(eap, ARGCOUNT - 1);
-  else
+  } else {
     do_argfile(eap, curwin->w_arg_idx - (int)eap->line2);
+  }
 }
 
-/*
- * ":rewind", ":first", ":sfirst" and ":srewind".
- */
+/// ":rewind", ":first", ":sfirst" and ":srewind".
 void ex_rewind(exarg_T *eap)
 {
   do_argfile(eap, 0);
 }
 
-/*
- * ":last" and ":slast".
- */
+/// ":last" and ":slast".
 void ex_last(exarg_T *eap)
 {
   do_argfile(eap, ARGCOUNT - 1);
 }
 
-/*
- * ":argument" and ":sargument".
- */
+/// ":argument" and ":sargument".
 void ex_argument(exarg_T *eap)
 {
   int i;
@@ -1836,9 +1804,7 @@ void ex_argument(exarg_T *eap)
   do_argfile(eap, i);
 }
 
-/*
- * Edit file "argn" of the argument lists.
- */
+/// Edit file "argn" of the argument lists.
 void do_argfile(exarg_T *eap, int argn)
 {
   int other;
@@ -1846,26 +1812,26 @@ void do_argfile(exarg_T *eap, int argn)
   int old_arg_idx = curwin->w_arg_idx;
 
   if (argn < 0 || argn >= ARGCOUNT) {
-    if (ARGCOUNT <= 1)
+    if (ARGCOUNT <= 1) {
       EMSG(_("E163: There is only one file to edit"));
-    else if (argn < 0)
+    } else if (argn < 0) {
       EMSG(_("E164: Cannot go before first file"));
-    else
+    } else {
       EMSG(_("E165: Cannot go beyond last file"));
+    }
   } else {
     setpcmark();
 
-    /* split window or create new tab page first */
+    // split window or create new tab page first
     if (*eap->cmd == 's' || cmdmod.tab != 0) {
-      if (win_split(0, 0) == FAIL)
+      if (win_split(0, 0) == FAIL) {
         return;
+      }
       RESET_BINDING(curwin);
     } else {
-      /*
-       * if 'hidden' set, only check for changed file when re-editing
-       * the same buffer
-       */
-      other = TRUE;
+      // if 'hidden' set, only check for changed file when re-editing
+      // the same buffer
+      other = true;
       if (P_HID(curbuf)) {
         p = (char_u *)fix_fname((char *)alist_name(&ARGLIST[argn]));
         other = otherfile(p);
@@ -1873,101 +1839,97 @@ void do_argfile(exarg_T *eap, int argn)
       }
       if ((!P_HID(curbuf) || !other)
           && check_changed(curbuf, CCGD_AW
-              | (other ? 0 : CCGD_MULTWIN)
-              | (eap->forceit ? CCGD_FORCEIT : 0)
-              | CCGD_EXCMD))
+                           | (other ? 0 : CCGD_MULTWIN)
+                           | (eap->forceit ? CCGD_FORCEIT : 0)
+                           | CCGD_EXCMD)) {
         return;
+      }
     }
 
     curwin->w_arg_idx = argn;
     if (argn == ARGCOUNT - 1
-        && curwin->w_alist == &global_alist
-        )
-      arg_had_last = TRUE;
+        && curwin->w_alist == &global_alist) {
+      arg_had_last = true;
+    }
 
-    /* Edit the file; always use the last known line number.
-     * When it fails (e.g. Abort for already edited file) restore the
-     * argument index. */
+    // Edit the file; always use the last known line number.
+    // When it fails (e.g. Abort for already edited file) restore the
+    // argument index.
     if (do_ecmd(0, alist_name(&ARGLIST[curwin->w_arg_idx]), NULL,
-            eap, ECMD_LAST,
-            (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0)
-            + (eap->forceit ? ECMD_FORCEIT : 0), curwin) == FAIL)
+                eap, ECMD_LAST,
+                (P_HID(curwin->w_buffer) ? ECMD_HIDE : 0)
+                + (eap->forceit ? ECMD_FORCEIT : 0), curwin) == FAIL) {
       curwin->w_arg_idx = old_arg_idx;
-    /* like Vi: set the mark where the cursor is in the file. */
-    else if (eap->cmdidx != CMD_argdo)
+    } else if (eap->cmdidx != CMD_argdo) {
+      // like Vi: set the mark where the cursor is in the file.
       setmark('\'');
+    }
   }
 }
 
-/*
- * ":next", and commands that behave like it.
- */
+/// ":next", and commands that behave like it.
 void ex_next(exarg_T *eap)
 {
   int i;
 
-  /*
-   * check for changed buffer now, if this fails the argument list is not
-   * redefined.
-   */
-  if (       P_HID(curbuf)
-             || eap->cmdidx == CMD_snext
-             || !check_changed(curbuf, CCGD_AW
-                 | (eap->forceit ? CCGD_FORCEIT : 0)
-                 | CCGD_EXCMD)) {
-    if (*eap->arg != NUL) {                 /* redefine file list */
-      if (do_arglist(eap->arg, AL_SET, 0) == FAIL)
+  // check for changed buffer now, if this fails the argument list is not
+  // redefined.
+  if (P_HID(curbuf)
+      || eap->cmdidx == CMD_snext
+      || !check_changed(curbuf, CCGD_AW
+                        | (eap->forceit ? CCGD_FORCEIT : 0)
+                        | CCGD_EXCMD)) {
+    if (*eap->arg != NUL) {                 // redefine file list
+      if (do_arglist(eap->arg, AL_SET, 0) == FAIL) {
         return;
+      }
       i = 0;
-    } else
+    } else {
       i = curwin->w_arg_idx + (int)eap->line2;
+    }
     do_argfile(eap, i);
   }
 }
 
-/*
- * ":argedit"
- */
+/// ":argedit"
 void ex_argedit(exarg_T *eap)
 {
   int fnum;
   int i;
   char_u      *s;
 
-  /* Add the argument to the buffer list and get the buffer number. */
+  // Add the argument to the buffer list and get the buffer number.
   fnum = buflist_add(eap->arg, BLN_LISTED);
 
-  /* Check if this argument is already in the argument list. */
-  for (i = 0; i < ARGCOUNT; ++i)
-    if (ARGLIST[i].ae_fnum == fnum)
+  // Check if this argument is already in the argument list.
+  for (i = 0; i < ARGCOUNT; i++) {
+    if (ARGLIST[i].ae_fnum == fnum) {
       break;
+    }
+  }
   if (i == ARGCOUNT) {
-    /* Can't find it, add it to the argument list. */
+    // Can't find it, add it to the argument list.
     s = vim_strsave(eap->arg);
-    i = alist_add_list(1, &s,
-        eap->addr_count > 0 ? (int)eap->line2 : curwin->w_arg_idx + 1);
+    int after = eap->addr_count > 0 ? (int)eap->line2 : curwin->w_arg_idx + 1;
+    i = alist_add_list(1, &s, after);
     curwin->w_arg_idx = i;
   }
 
   alist_check_arg_idx();
 
-  /* Edit the argument. */
+  // Edit the argument.
   do_argfile(eap, i);
 }
 
-/*
- * ":argadd"
- */
+/// ":argadd"
 void ex_argadd(exarg_T *eap)
 {
   do_arglist(eap->arg, AL_ADD,
-      eap->addr_count > 0 ? (int)eap->line2 : curwin->w_arg_idx + 1);
+             eap->addr_count > 0 ? (int)eap->line2 : curwin->w_arg_idx + 1);
   maketitle();
 }
 
-/*
- * ":argdelete"
- */
+/// ":argdelete"
 void ex_argdelete(exarg_T *eap)
 {
   if (eap->addr_count > 0) {
@@ -1979,7 +1941,7 @@ void ex_argdelete(exarg_T *eap)
     if (*eap->arg != NUL || n <= 0) {
       EMSG(_(e_invarg));
     } else {
-      for (linenr_T i = eap->line1; i <= eap->line2; ++i) {
+      for (linenr_T i = eap->line1; i <= eap->line2; i++) {
         xfree(ARGLIST[i - 1].ae_fname);
       }
       memmove(ARGLIST + eap->line1 - 1, ARGLIST + eap->line2,
@@ -1990,17 +1952,21 @@ void ex_argdelete(exarg_T *eap)
       } else if (curwin->w_arg_idx > eap->line1) {
         curwin->w_arg_idx = (int)eap->line1;
       }
+      if (ARGCOUNT == 0) {
+          curwin->w_arg_idx = 0;
+      } else if (curwin->w_arg_idx >= ARGCOUNT) {
+          curwin->w_arg_idx = ARGCOUNT - 1;
+      }
     }
-  } else if (*eap->arg == NUL)
+  } else if (*eap->arg == NUL) {
     EMSG(_(e_argreq));
-  else
+  } else {
     do_arglist(eap->arg, AL_DEL, 0);
+  }
   maketitle();
 }
 
-/*
- * ":argdo", ":windo", ":bufdo", ":tabdo", ":cdo", ":ldo", ":cfdo" and ":lfdo"
- */
+/// ":argdo", ":windo", ":bufdo", ":tabdo", ":cdo", ":ldo", ":cfdo" and ":lfdo"
 void ex_listdo(exarg_T *eap)
 {
   int i;
@@ -2010,47 +1976,46 @@ void ex_listdo(exarg_T *eap)
   char_u      *save_ei = NULL;
   char_u      *p_shm_save;
 
-  if (eap->cmdidx != CMD_windo && eap->cmdidx != CMD_tabdo)
-    /* Don't do syntax HL autocommands.  Skipping the syntax file is a
-     * great speed improvement. */
+  if (eap->cmdidx != CMD_windo && eap->cmdidx != CMD_tabdo) {
+    // Don't do syntax HL autocommands.  Skipping the syntax file is a
+    // great speed improvement.
     save_ei = au_event_disable(",Syntax");
-
-  start_global_changes();
+  }
 
   if (eap->cmdidx == CMD_windo
       || eap->cmdidx == CMD_tabdo
       || P_HID(curbuf)
       || !check_changed(curbuf, CCGD_AW
-          | (eap->forceit ? CCGD_FORCEIT : 0)
-          | CCGD_EXCMD)) {
+                        | (eap->forceit ? CCGD_FORCEIT : 0)
+                        | CCGD_EXCMD)) {
     i = 0;
-    /* start at the eap->line1 argument/window/buffer */
+    // start at the eap->line1 argument/window/buffer
     wp = firstwin;
     tp = first_tabpage;
     switch (eap->cmdidx) {
-      case CMD_windo:
-        for (; wp != NULL && i + 1 < eap->line1; wp = wp->w_next) {
-          i++;
-        }
-        break;
-      case CMD_tabdo:
-        for (; tp != NULL && i + 1 < eap->line1; tp = tp->tp_next) {
-          i++;
-        }
-        break;
-      case CMD_argdo:
-        i = (int)eap->line1 - 1;
-        break;
-      default:
-        break;
+    case CMD_windo:
+      for (; wp != NULL && i + 1 < eap->line1; wp = wp->w_next) {
+        i++;
+      }
+      break;
+    case CMD_tabdo:
+      for (; tp != NULL && i + 1 < eap->line1; tp = tp->tp_next) {
+        i++;
+      }
+      break;
+    case CMD_argdo:
+      i = (int)eap->line1 - 1;
+      break;
+    default:
+      break;
     }
 
     buf_T *buf = curbuf;
     size_t qf_size = 0;
 
-    /* set pcmark now */
+    // set pcmark now
     if (eap->cmdidx == CMD_bufdo) {
-      /* Advance to the first listed buffer after "eap->line1". */
+      // Advance to the first listed buffer after "eap->line1".
       for (buf = firstbuf;
            buf != NULL && (buf->b_fnum < eap->line1 || !buf->b_p_bl);
            buf = buf->b_next) {
@@ -2082,64 +2047,71 @@ void ex_listdo(exarg_T *eap)
     } else {
       setpcmark();
     }
-    listcmd_busy = TRUE;            /* avoids setting pcmark below */
+    listcmd_busy = true;            // avoids setting pcmark below
 
     while (!got_int && buf != NULL) {
       if (eap->cmdidx == CMD_argdo) {
-        /* go to argument "i" */
-        if (i == ARGCOUNT)
+        // go to argument "i"
+        if (i == ARGCOUNT) {
           break;
-        /* Don't call do_argfile() when already there, it will try
-         * reloading the file. */
+        }
+        // Don't call do_argfile() when already there, it will try
+        // reloading the file.
         if (curwin->w_arg_idx != i || !editing_arg_idx(curwin)) {
-          /* Clear 'shm' to avoid that the file message overwrites
-           * any output from the command. */
+          // Clear 'shm' to avoid that the file message overwrites
+          // any output from the command.
           p_shm_save = vim_strsave(p_shm);
           set_option_value((char_u *)"shm", 0L, (char_u *)"", 0);
           do_argfile(eap, i);
           set_option_value((char_u *)"shm", 0L, p_shm_save, 0);
           xfree(p_shm_save);
         }
-        if (curwin->w_arg_idx != i)
+        if (curwin->w_arg_idx != i) {
           break;
+        }
       } else if (eap->cmdidx == CMD_windo) {
-        /* go to window "wp" */
-        if (!win_valid(wp))
+        // go to window "wp"
+        if (!win_valid(wp)) {
           break;
+        }
         assert(wp);
         win_goto(wp);
-        if (curwin != wp)
-          break;            /* something must be wrong */
+        if (curwin != wp) {
+          break;    // something must be wrong
+        }
         wp = curwin->w_next;
       } else if (eap->cmdidx == CMD_tabdo) {
-        /* go to window "tp" */
-        if (!valid_tabpage(tp))
+        // go to window "tp"
+        if (!valid_tabpage(tp)) {
           break;
+        }
         assert(tp);
-        goto_tabpage_tp(tp, TRUE, TRUE);
+        goto_tabpage_tp(tp, true, true);
         tp = tp->tp_next;
       } else if (eap->cmdidx == CMD_bufdo) {
-        /* Remember the number of the next listed buffer, in case
-         * ":bwipe" is used or autocommands do something strange. */
+        // Remember the number of the next listed buffer, in case
+        // ":bwipe" is used or autocommands do something strange.
         next_fnum = -1;
-        for (buf_T *buf = curbuf->b_next; buf != NULL; buf = buf->b_next)
+        for (buf_T *buf = curbuf->b_next; buf != NULL; buf = buf->b_next) {
           if (buf->b_p_bl) {
             next_fnum = buf->b_fnum;
             break;
           }
+        }
       }
 
-      ++i;
-      /* execute the command */
+      i++;
+      // execute the command
       do_cmdline(eap->arg, eap->getline, eap->cookie,
-          DOCMD_VERBOSE + DOCMD_NOWAIT);
+                 DOCMD_VERBOSE + DOCMD_NOWAIT);
 
       if (eap->cmdidx == CMD_bufdo) {
-        /* Done? */
-        if (next_fnum < 0 || next_fnum > eap->line2)
+        // Done?
+        if (next_fnum < 0 || next_fnum > eap->line2) {
           break;
+        }
 
-        /* Check if the buffer still exists. */
+        // Check if the buffer still exists.
         bool buf_still_exists = false;
         FOR_ALL_BUFFERS(bp) {
           if (bp->b_fnum == next_fnum) {
@@ -2151,8 +2123,8 @@ void ex_listdo(exarg_T *eap)
           break;
         }
 
-        /* Go to the next buffer.  Clear 'shm' to avoid that the file
-         * message overwrites any output from the command. */
+        // Go to the next buffer.  Clear 'shm' to avoid that the file
+        // message overwrites any output from the command.
         p_shm_save = vim_strsave(p_shm);
         set_option_value((char_u *)"shm", 0L, (char_u *)"", 0);
         goto_buffer(eap, DOBUF_FIRST, FORWARD, next_fnum);
@@ -2178,15 +2150,16 @@ void ex_listdo(exarg_T *eap)
 
         // If jumping to the next quickfix entry fails, quit here.
         if (qf_get_cur_idx(eap) == qf_idx) {
-            break;
+          break;
         }
       }
 
       if (eap->cmdidx == CMD_windo) {
-        validate_cursor();              /* cursor may have moved */
-        /* required when 'scrollbind' has been set */
-        if (curwin->w_p_scb)
-          do_check_scrollbind(TRUE);
+        validate_cursor();              // cursor may have moved
+        // required when 'scrollbind' has been set
+        if (curwin->w_p_scb) {
+          do_check_scrollbind(true);
+        }
       }
       if (eap->cmdidx == CMD_windo || eap->cmdidx == CMD_tabdo) {
         if (i + 1 > eap->line2) {
@@ -2197,54 +2170,52 @@ void ex_listdo(exarg_T *eap)
         break;
       }
     }
-    listcmd_busy = FALSE;
+    listcmd_busy = false;
   }
 
   if (save_ei != NULL) {
     au_event_restore(save_ei);
     apply_autocmds(EVENT_SYNTAX, curbuf->b_p_syn,
-        curbuf->b_fname, TRUE, curbuf);
-  }
-  end_global_changes();
-}
-
-/*
- * Add files[count] to the arglist of the current window after arg "after".
- * The file names in files[count] must have been allocated and are taken over.
- * Files[] itself is not taken over.
- * Returns index of first added argument.
- */
-static int 
-alist_add_list (
-    int count,
-    char_u **files,
-    int after                  /* where to add: 0 = before first one */
-)
+                   curbuf->b_fname, true, curbuf);
+  }
+}
+
+/// Add files[count] to the arglist of the current window after arg "after".
+/// The file names in files[count] must have been allocated and are taken over.
+/// Files[] itself is not taken over.
+///
+/// @param after: where to add: 0 = before first one
+///
+/// @return index of first added argument
+static int alist_add_list(int count, char_u **files, int after)
 {
+  int old_argcount = ARGCOUNT;
   ga_grow(&ALIST(curwin)->al_ga, count);
   {
-    if (after < 0)
+    if (after < 0) {
       after = 0;
-    if (after > ARGCOUNT)
+    }
+    if (after > ARGCOUNT) {
       after = ARGCOUNT;
-    if (after < ARGCOUNT)
+    }
+    if (after < ARGCOUNT) {
       memmove(&(ARGLIST[after + count]), &(ARGLIST[after]),
               (size_t)(ARGCOUNT - after) * sizeof(aentry_T));
-    for (int i = 0; i < count; ++i) {
+    }
+    for (int i = 0; i < count; i++) {
       ARGLIST[after + i].ae_fname = files[i];
       ARGLIST[after + i].ae_fnum = buflist_add(files[i], BLN_LISTED);
     }
     ALIST(curwin)->al_ga.ga_len += count;
-    if (curwin->w_arg_idx >= after)
-      ++curwin->w_arg_idx;
+    if (old_argcount > 0 && curwin->w_arg_idx >= after) {
+      curwin->w_arg_idx += count;
+    }
     return after;
   }
 }
 
 
-/*
- * ":compiler[!] {name}"
- */
+/// ":compiler[!] {name}"
 void ex_compiler(exarg_T *eap)
 {
   char_u      *buf;
@@ -2252,134 +2223,148 @@ void ex_compiler(exarg_T *eap)
   char_u      *p;
 
   if (*eap->arg == NUL) {
-    /* List all compiler scripts. */
-    do_cmdline_cmd("echo globpath(&rtp, 'compiler/*.vim')");
-    /* ) keep the indenter happy... */
+    // List all compiler scripts.
+    do_cmdline_cmd("echo globpath(&rtp, 'compiler/*.vim')");  // NOLINT
   } else {
-    buf = xmalloc(STRLEN(eap->arg) + 14);
+    size_t bufsize = STRLEN(eap->arg) + 14;
+    buf = xmalloc(bufsize);
     if (eap->forceit) {
-      /* ":compiler! {name}" sets global options */
+      // ":compiler! {name}" sets global options
       do_cmdline_cmd("command -nargs=* CompilerSet set <args>");
     } else {
-      /* ":compiler! {name}" sets local options.
-       * To remain backwards compatible "current_compiler" is always
-       * used.  A user's compiler plugin may set it, the distributed
-       * plugin will then skip the settings.  Afterwards set
-       * "b:current_compiler" and restore "current_compiler".
-       * Explicitly prepend "g:" to make it work in a function. */
+      // ":compiler! {name}" sets local options.
+      // To remain backwards compatible "current_compiler" is always
+      // used.  A user's compiler plugin may set it, the distributed
+      // plugin will then skip the settings.  Afterwards set
+      // "b:current_compiler" and restore "current_compiler".
+      // Explicitly prepend "g:" to make it work in a function.
       old_cur_comp = get_var_value((char_u *)"g:current_compiler");
-      if (old_cur_comp != NULL)
+      if (old_cur_comp != NULL) {
         old_cur_comp = vim_strsave(old_cur_comp);
+      }
       do_cmdline_cmd("command -nargs=* CompilerSet setlocal <args>");
     }
-    do_unlet((char_u *)"g:current_compiler", TRUE);
-    do_unlet((char_u *)"b:current_compiler", TRUE);
+    do_unlet((char_u *)"g:current_compiler", true);
+    do_unlet((char_u *)"b:current_compiler", true);
 
-    sprintf((char *)buf, "compiler/%s.vim", eap->arg);
-    if (source_runtime(buf, TRUE) == FAIL)
+    snprintf((char *)buf, bufsize, "compiler/%s.vim", eap->arg);
+    if (source_runtime(buf, DIP_ALL) == FAIL) {
       EMSG2(_("E666: compiler not supported: %s"), eap->arg);
+    }
     xfree(buf);
 
     do_cmdline_cmd(":delcommand CompilerSet");
 
-    /* Set "b:current_compiler" from "current_compiler". */
+    // Set "b:current_compiler" from "current_compiler".
     p = get_var_value((char_u *)"g:current_compiler");
-    if (p != NULL)
+    if (p != NULL) {
       set_internal_string_var((char_u *)"b:current_compiler", p);
+    }
 
-    /* Restore "current_compiler" for ":compiler {name}". */
+    // Restore "current_compiler" for ":compiler {name}".
     if (!eap->forceit) {
       if (old_cur_comp != NULL) {
         set_internal_string_var((char_u *)"g:current_compiler",
-            old_cur_comp);
+                                old_cur_comp);
         xfree(old_cur_comp);
-      } else
-        do_unlet((char_u *)"g:current_compiler", TRUE);
+      } else {
+        do_unlet((char_u *)"g:current_compiler", true);
+      }
     }
   }
 }
 
-/*
- * ":runtime {name}"
- */
+/// ":runtime [what] {name}"
 void ex_runtime(exarg_T *eap)
 {
-  source_runtime(eap->arg, eap->forceit);
+  char_u *arg = eap->arg;
+  char_u *p = skiptowhite(arg);
+  ptrdiff_t len = p - arg;
+  int flags = eap->forceit ? DIP_ALL : 0;
+
+  if (STRNCMP(arg, "START", len) == 0) {
+    flags += DIP_START + DIP_NORTP;
+    arg = skipwhite(arg + len);
+  } else if (STRNCMP(arg, "OPT", len) == 0) {
+    flags += DIP_OPT + DIP_NORTP;
+    arg = skipwhite(arg + len);
+  } else if (STRNCMP(arg, "PACK", len) == 0) {
+    flags += DIP_START + DIP_OPT + DIP_NORTP;
+    arg = skipwhite(arg + len);
+  } else if (STRNCMP(arg, "ALL", len) == 0) {
+    flags += DIP_START + DIP_OPT;
+    arg = skipwhite(arg + len);
+  }
+
+  source_runtime(arg, flags);
 }
 
 
 static void source_callback(char_u *fname, void *cookie)
 {
-  (void)do_source(fname, FALSE, DOSO_NONE);
+  (void)do_source(fname, false, DOSO_NONE);
 }
 
-/*
- * Source the file "name" from all directories in 'runtimepath'.
- * "name" can contain wildcards.
- * When "all" is TRUE, source all files, otherwise only the first one.
- * return FAIL when no file could be sourced, OK otherwise.
- */
-int source_runtime(char_u *name, int all)
+/// Source the file "name" from all directories in 'runtimepath'.
+/// "name" can contain wildcards.
+/// When "flags" has DIP_ALL: source all files, otherwise only the first one.
+///
+/// return FAIL when no file could be sourced, OK otherwise.
+int source_runtime(char_u *name, int flags)
 {
-  return do_in_runtimepath(name, all, source_callback, NULL);
+  return do_in_runtimepath(name, flags, source_callback, NULL);
 }
 
-/*
- * Find "name" in 'runtimepath'.  When found, invoke the callback function for
- * it: callback(fname, "cookie")
- * When "all" is TRUE repeat for all matches, otherwise only the first one is
- * used.
- * Returns OK when at least one match found, FAIL otherwise.
- *
- * If "name" is NULL calls callback for each entry in runtimepath. Cookie is
- * passed by reference in this case, setting it to NULL indicates that callback
- * has done its job.
- */
-int do_in_runtimepath(char_u *name, int all, DoInRuntimepathCB callback,
-                      void *cookie)
+/// Find the file "name" in all directories in "path" and invoke
+/// "callback(fname, cookie)".
+/// "name" can contain wildcards.
+/// When "flags" has DIP_ALL: source all files, otherwise only the first one.
+/// When "flags" has DIP_DIR: find directories instead of files.
+/// When "flags" has DIP_ERR: give an error message if there is no match.
+///
+/// return FAIL when no file could be sourced, OK otherwise.
+int do_in_path(char_u *path, char_u *name, int flags,
+               DoInRuntimepathCB callback, void *cookie)
 {
-  char_u      *rtp;
-  char_u      *np;
-  char_u      *buf;
-  char_u      *rtp_copy;
   char_u      *tail;
   int num_files;
   char_u      **files;
   int i;
-  int did_one = FALSE;
+  bool did_one = false;
 
-  /* Make a copy of 'runtimepath'.  Invoking the callback may change the
-   * value. */
-  rtp_copy = vim_strsave(p_rtp);
-  buf = xmallocz(MAXPATHL);
+  // Make a copy of 'runtimepath'.  Invoking the callback may change the
+  // value.
+  char_u *rtp_copy = vim_strsave(path);
+  char_u *buf = xmallocz(MAXPATHL);
   {
     if (p_verbose > 1 && name != NULL) {
       verbose_enter();
       smsg(_("Searching for \"%s\" in \"%s\""),
-          (char *)name, (char *)p_rtp);
+           (char *)name, (char *)path);
       verbose_leave();
     }
 
-    /* Loop over all entries in 'runtimepath'. */
-    rtp = rtp_copy;
-    while (*rtp != NUL && (all || !did_one)) {
-      /* Copy the path from 'runtimepath' to buf[]. */
+    // Loop over all entries in 'runtimepath'.
+    char_u *rtp = rtp_copy;
+    while (*rtp != NUL && ((flags & DIP_ALL) || !did_one)) {
+      // Copy the path from 'runtimepath' to buf[].
       copy_option_part(&rtp, buf, MAXPATHL, ",");
       if (name == NULL) {
-        (*callback)(buf, (void *) &cookie);
-        if (!did_one)
+        (*callback)(buf, (void *)&cookie);
+        if (!did_one) {
           did_one = (cookie == NULL);
+        }
       } else if (STRLEN(buf) + STRLEN(name) + 2 < MAXPATHL) {
         add_pathsep((char *)buf);
         tail = buf + STRLEN(buf);
 
-        /* Loop over all patterns in "name" */
-        np = name;
-        while (*np != NUL && (all || !did_one)) {
-          /* Append the pattern from "name" to buf[]. */
+        // Loop over all patterns in "name"
+        char_u *np = name;
+        while (*np != NUL && ((flags & DIP_ALL) || !did_one)) {
+          // Append the pattern from "name" to buf[].
           assert(MAXPATHL >= (tail - buf));
           copy_option_part(&np, tail, (size_t)(MAXPATHL - (tail - buf)),
-              "\t ");
+                           "\t ");
 
           if (p_verbose > 2) {
             verbose_enter();
@@ -2387,14 +2372,16 @@ int do_in_runtimepath(char_u *name, int all, DoInRuntimepathCB callback,
             verbose_leave();
           }
 
-          /* Expand wildcards, invoke the callback for each match. */
+          // Expand wildcards, invoke the callback for each match.
           if (gen_expand_wildcards(1, &buf, &num_files, &files,
-                  EW_FILE) == OK) {
-            for (i = 0; i < num_files; ++i) {
+                                   (flags & DIP_DIR) ? EW_DIR
+                                                     : EW_FILE) == OK) {
+            for (i = 0; i < num_files; i++) {
               (*callback)(files[i], cookie);
-              did_one = TRUE;
-              if (!all)
+              did_one = true;
+              if (!(flags & DIP_ALL)) {
                 break;
+              }
             }
             FreeWild(num_files, files);
           }
@@ -2404,27 +2391,235 @@ int do_in_runtimepath(char_u *name, int all, DoInRuntimepathCB callback,
   }
   xfree(buf);
   xfree(rtp_copy);
-  if (p_verbose > 0 && !did_one && name != NULL) {
-    verbose_enter();
-    smsg(_("not found in 'runtimepath': \"%s\""), name);
-    verbose_leave();
+  if (!did_one && name != NULL) {
+    char *basepath = path == p_rtp ? "runtimepath" : "packpath";
+
+    if (flags & DIP_ERR) {
+      EMSG3(_(e_dirnotf), basepath, name);
+    } else if (p_verbose > 0) {
+      verbose_enter();
+      smsg(_("not found in '%s': \"%s\""), basepath, name);
+      verbose_leave();
+    }
   }
 
 
   return did_one ? OK : FAIL;
 }
 
-/*
- * ":options"
- */
+/// Find "name" in 'runtimepath'.  When found, invoke the callback function for
+/// it: callback(fname, "cookie")
+/// When "flags" has DIP_ALL repeat for all matches, otherwise only the first
+/// one is used.
+/// Returns OK when at least one match found, FAIL otherwise.
+/// If "name" is NULL calls callback for each entry in runtimepath. Cookie is
+/// passed by reference in this case, setting it to NULL indicates that callback
+/// has done its job.
+int do_in_runtimepath(char_u *name, int flags, DoInRuntimepathCB callback,
+                      void *cookie)
+{
+  int done = FAIL;
+
+  if ((flags & DIP_NORTP) == 0) {
+    done = do_in_path(p_rtp, name, flags, callback, cookie);
+  }
+
+  if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_START)) {
+    char *start_dir = "pack/*/start/*/%s";  // NOLINT
+    size_t len = STRLEN(start_dir) + STRLEN(name);
+    char_u *s = xmallocz(len);
+
+    vim_snprintf((char *)s, len, start_dir, name);
+    done = do_in_path(p_pp, s, flags, callback, cookie);
+
+    xfree(s);
+  }
+
+  if ((done == FAIL || (flags & DIP_ALL)) && (flags & DIP_OPT)) {
+    char *opt_dir = "pack/*/opt/*/%s";  // NOLINT
+    size_t len = STRLEN(opt_dir) + STRLEN(name);
+    char_u *s = xmallocz(len);
+
+    vim_snprintf((char *)s, len, opt_dir, name);
+    done = do_in_path(p_pp, s, flags, callback, cookie);
+
+    xfree(s);
+  }
+
+  return done;
+}
+
+// Expand wildcards in "pat" and invoke do_source() for each match.
+static void source_all_matches(char_u *pat)
+{
+  int num_files;
+  char_u **files;
+
+  if (gen_expand_wildcards(1, &pat, &num_files, &files, EW_FILE) == OK) {
+    for (int i = 0; i < num_files; i++) {
+      (void)do_source(files[i], false, DOSO_NONE);
+    }
+    FreeWild(num_files, files);
+  }
+}
+
+// used for "cookie" of add_pack_plugin()
+static int APP_ADD_DIR;
+static int APP_LOAD;
+static int APP_BOTH;
+
+static void add_pack_plugin(char_u *fname, void *cookie)
+{
+  char_u *p4, *p3, *p2, *p1, *p;
+  char_u *new_rtp;
+  char_u *ffname = (char_u *)fix_fname((char *)fname);
+
+  if (ffname == NULL) {
+    return;
+  }
+
+  if (cookie != &APP_LOAD && strstr((char *)p_rtp, (char *)ffname) == NULL) {
+    // directory is not yet in 'runtimepath', add it
+    p4 = p3 = p2 = p1 = get_past_head(ffname);
+    for (p = p1; *p; mb_ptr_adv(p)) {
+      if (vim_ispathsep_nocolon(*p)) {
+        p4 = p3; p3 = p2; p2 = p1; p1 = p;
+      }
+    }
+
+    // now we have:
+    // rtp/pack/name/start/name
+    //    p4   p3   p2   p1
+    //
+    // find the part up to "pack" in 'runtimepath'
+    char_u c = *p4;
+    *p4 = NUL;
+
+    // Find "ffname" in "p_rtp", ignoring '/' vs '\' differences
+    size_t fname_len = STRLEN(ffname);
+    char_u *insp = p_rtp;
+    for (;;) {
+      if (vim_fnamencmp(insp, ffname, fname_len) == 0) {
+        break;
+      }
+      insp = vim_strchr(insp, ',');
+      if (insp == NULL) {
+        break;
+      }
+      insp++;
+    }
+
+    if (insp == NULL) {
+      // not found, append at the end
+      insp = p_rtp + STRLEN(p_rtp);
+    } else {
+      // append after the matching directory.
+      insp += STRLEN(ffname);
+      while (*insp != NUL && *insp != ',') {
+        insp++;
+      }
+    }
+    *p4 = c;
+
+    // check if rtp/pack/name/start/name/after exists
+    char *afterdir = concat_fnames((char *)ffname, "after", true);
+    size_t afterlen = 0;
+    if (os_isdir((char_u *)afterdir)) {
+      afterlen = STRLEN(afterdir) + 1;  // add one for comma
+    }
+
+    size_t oldlen = STRLEN(p_rtp);
+    size_t addlen = STRLEN(ffname) + 1;  // add one for comma
+    new_rtp = try_malloc(oldlen + addlen + afterlen + 1);  // add one for NUL
+    if (new_rtp == NULL) {
+      goto theend;
+    }
+    uintptr_t keep = (uintptr_t)(insp - p_rtp);
+    memmove(new_rtp, p_rtp, keep);
+    new_rtp[keep] = ',';
+    memmove(new_rtp + keep + 1, ffname, addlen);
+    if (p_rtp[keep] != NUL) {
+      memmove(new_rtp + keep + addlen, p_rtp + keep,
+              oldlen - keep + 1);
+    }
+    if (afterlen > 0) {
+      STRCAT(new_rtp, ",");
+      STRCAT(new_rtp, afterdir);
+    }
+    set_option_value((char_u *)"rtp", 0L, new_rtp, 0);
+    xfree(new_rtp);
+    xfree(afterdir);
+  }
+
+  if (cookie != &APP_ADD_DIR) {
+    static const char *plugpat = "%s/plugin/**/*.vim";  // NOLINT
+    static const char *ftpat = "%s/ftdetect/*.vim";  // NOLINT
+
+    size_t len = STRLEN(ffname) + STRLEN(ftpat);
+    char_u *pat = try_malloc(len + 1);
+    if (pat == NULL) {
+      goto theend;
+    }
+    vim_snprintf((char *)pat, len, plugpat, ffname);
+    source_all_matches(pat);
+
+    char_u *cmd = vim_strsave((char_u *)"g:did_load_filetypes");
+
+    // If runtime/filetype.vim wasn't loaded yet, the scripts will be
+    // found when it loads.
+    if (eval_to_number(cmd) > 0) {
+      do_cmdline_cmd("augroup filetypedetect");
+      vim_snprintf((char *)pat, len, ftpat, ffname);
+      source_all_matches(pat);
+      do_cmdline_cmd("augroup END");
+    }
+    xfree(cmd);
+    xfree(pat);
+  }
+
+theend:
+  xfree(ffname);
+}
+
+static bool did_source_packages = false;
+
+// ":packloadall"
+// Find plugins in the package directories and source them.
+void ex_packloadall(exarg_T *eap)
+{
+  if (!did_source_packages || (eap != NULL && eap->forceit)) {
+    did_source_packages = true;
+
+    // First do a round to add all directories to 'runtimepath', then load
+    // the plugins. This allows for plugins to use an autoload directory
+    // of another plugin.
+    do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR,  // NOLINT
+               add_pack_plugin, &APP_ADD_DIR);
+    do_in_path(p_pp, (char_u *)"pack/*/start/*", DIP_ALL + DIP_DIR,  // NOLINT
+               add_pack_plugin, &APP_LOAD);
+  }
+}
+
+/// ":packadd[!] {name}"
+void ex_packadd(exarg_T *eap)
+{
+  static const char *plugpat = "pack/*/opt/%s";  // NOLINT
+
+  size_t len = STRLEN(plugpat) + STRLEN(eap->arg);
+  char *pat = (char *)xmallocz(len);
+  vim_snprintf(pat, len, plugpat, eap->arg);
+  do_in_path(p_pp, (char_u *)pat, DIP_ALL + DIP_DIR + DIP_ERR, add_pack_plugin,
+             eap->forceit ? &APP_ADD_DIR : &APP_BOTH);
+  xfree(pat);
+}
+
+/// ":options"
 void ex_options(exarg_T *eap)
 {
   cmd_source((char_u *)SYS_OPTWIN_FILE, NULL);
 }
 
-/*
- * ":source {fname}"
- */
+/// ":source {fname}"
 void ex_source(exarg_T *eap)
 {
   cmd_source(eap->arg, eap);
@@ -2432,96 +2627,82 @@ void ex_source(exarg_T *eap)
 
 static void cmd_source(char_u *fname, exarg_T *eap)
 {
-  if (*fname == NUL)
+  if (*fname == NUL) {
     EMSG(_(e_argreq));
-
-  else if (eap != NULL && eap->forceit)
-    /* ":source!": read Normal mode commands
-     * Need to execute the commands directly.  This is required at least
-     * for:
-     * - ":g" command busy
-     * - after ":argdo", ":windo" or ":bufdo"
-     * - another command follows
-     * - inside a loop
-     */
+  } else if (eap != NULL && eap->forceit) {
+    // ":source!": read Normal mode commands
+    // Need to execute the commands directly.  This is required at least
+    // for:
+    // - ":g" command busy
+    // - after ":argdo", ":windo" or ":bufdo"
+    // - another command follows
+    // - inside a loop
     openscript(fname, global_busy || listcmd_busy || eap->nextcmd != NULL
-        || eap->cstack->cs_idx >= 0
-        );
+               || eap->cstack->cs_idx >= 0);
 
-  /* ":source" read ex commands */
-  else if (do_source(fname, FALSE, DOSO_NONE) == FAIL)
+    // ":source" read ex commands
+  } else if (do_source(fname, false, DOSO_NONE) == FAIL) {
     EMSG2(_(e_notopen), fname);
+  }
 }
 
-/*
- * ":source" and associated commands.
- */
-
-/*
- * Return the address holding the next breakpoint line for a source cookie.
- */
+/// ":source" and associated commands.
+///
+/// @return address holding the next breakpoint line for a source cookie
 linenr_T *source_breakpoint(void *cookie)
 {
   return &((struct source_cookie *)cookie)->breakpoint;
 }
 
-/*
- * Return the address holding the debug tick for a source cookie.
- */
+/// Return the address holding the debug tick for a source cookie.
 int *source_dbg_tick(void *cookie)
 {
   return &((struct source_cookie *)cookie)->dbg_tick;
 }
 
-/*
- * Return the nesting level for a source cookie.
- */
+/// Return the nesting level for a source cookie.
 int source_level(void *cookie)
 {
   return ((struct source_cookie *)cookie)->level;
 }
 
-
-#if (defined(WIN32) && defined(FEAT_CSCOPE)) || defined(HAVE_FD_CLOEXEC)
-# define USE_FOPEN_NOINH
-/*
- * Special function to open a file without handle inheritance.
- * When possible the handle is closed on exec().
- */
+/// Special function to open a file without handle inheritance.
+/// If possible the handle is closed on exec().
 static FILE *fopen_noinh_readbin(char *filename)
 {
+#ifdef WIN32
+  int fd_tmp = os_open(filename, O_RDONLY | O_BINARY | O_NOINHERIT, 0);
+#else
   int fd_tmp = os_open(filename, O_RDONLY, 0);
+#endif
 
-  if (fd_tmp < 0)
+  if (fd_tmp < 0) {
     return NULL;
+  }
 
-# ifdef HAVE_FD_CLOEXEC
+#ifdef HAVE_FD_CLOEXEC
   {
     int fdflags = fcntl(fd_tmp, F_GETFD);
     if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
       (void)fcntl(fd_tmp, F_SETFD, fdflags | FD_CLOEXEC);
     }
   }
-# endif
+#endif
 
   return fdopen(fd_tmp, READBIN);
 }
-#endif
 
 
-/*
- * do_source: Read the file "fname" and execute its lines as EX commands.
- *
- * This function may be called recursively!
- *
- * return FAIL if file could not be opened, OK otherwise
- */
-int 
-do_source (
-    char_u *fname,
-    int check_other,                    /* check for .vimrc and _vimrc */
-    int is_vimrc                       /* DOSO_ value */
-)
+/// Read the file "fname" and execute its lines as EX commands.
+///
+/// This function may be called recursively!
+///
+/// @param fname
+/// @param check_other  check for .vimrc and _vimrc
+/// @param is_vimrc     DOSO_ value
+///
+/// @return FAIL if file could not be opened, OK otherwise
+int do_source(char_u *fname, int check_other, int is_vimrc)
 {
   struct source_cookie cookie;
   char_u                  *save_sourcing_name;
@@ -2538,125 +2719,113 @@ do_source (
   proftime_T wait_start;
 
   p = expand_env_save(fname);
-  if (p == NULL)
+  if (p == NULL) {
     return retval;
+  }
   fname_exp = (char_u *)fix_fname((char *)p);
   xfree(p);
-  if (fname_exp == NULL)
+  if (fname_exp == NULL) {
     return retval;
+  }
   if (os_isdir(fname_exp)) {
     smsg(_("Cannot source a directory: \"%s\""), fname);
     goto theend;
   }
 
-  /* Apply SourceCmd autocommands, they should get the file and source it. */
+  // Apply SourceCmd autocommands, they should get the file and source it.
   if (has_autocmd(EVENT_SOURCECMD, fname_exp, NULL)
       && apply_autocmds(EVENT_SOURCECMD, fname_exp, fname_exp,
-          FALSE, curbuf)) {
+                        false, curbuf)) {
     retval = aborting() ? FAIL : OK;
     goto theend;
   }
 
-  /* Apply SourcePre autocommands, they may get the file. */
-  apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, FALSE, curbuf);
+  // Apply SourcePre autocommands, they may get the file.
+  apply_autocmds(EVENT_SOURCEPRE, fname_exp, fname_exp, false, curbuf);
 
-#ifdef USE_FOPEN_NOINH
   cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-#else
-  cookie.fp = mch_fopen((char *)fname_exp, READBIN);
-#endif
   if (cookie.fp == NULL && check_other) {
-    /*
-     * Try again, replacing file name ".vimrc" by "_vimrc" or vice versa,
-     * and ".exrc" by "_exrc" or vice versa.
-     */
+    // Try again, replacing file name ".vimrc" by "_vimrc" or vice versa,
+    // and ".exrc" by "_exrc" or vice versa.
     p = path_tail(fname_exp);
     if ((*p == '.' || *p == '_')
         && (STRICMP(p + 1, "nvimrc") == 0 || STRICMP(p + 1, "exrc") == 0)) {
-      if (*p == '_')
-        *p = '.';
-      else
-        *p = '_';
-#ifdef USE_FOPEN_NOINH
+      *p = (*p == '_') ? '.' : '_';
       cookie.fp = fopen_noinh_readbin((char *)fname_exp);
-#else
-      cookie.fp = mch_fopen((char *)fname_exp, READBIN);
-#endif
     }
   }
 
   if (cookie.fp == NULL) {
     if (p_verbose > 0) {
       verbose_enter();
-      if (sourcing_name == NULL)
+      if (sourcing_name == NULL) {
         smsg(_("could not source \"%s\""), fname);
-      else
+      } else {
         smsg(_("line %" PRId64 ": could not source \"%s\""),
-            (int64_t)sourcing_lnum, fname);
+             (int64_t)sourcing_lnum, fname);
+      }
       verbose_leave();
     }
     goto theend;
   }
 
-  /*
-   * The file exists.
-   * - In verbose mode, give a message.
-   * - For a vimrc file, may want to call vimrc_found().
-   */
+  // The file exists.
+  // - In verbose mode, give a message.
+  // - For a vimrc file, may want to call vimrc_found().
   if (p_verbose > 1) {
     verbose_enter();
-    if (sourcing_name == NULL)
+    if (sourcing_name == NULL) {
       smsg(_("sourcing \"%s\""), fname);
-    else
+    } else {
       smsg(_("line %" PRId64 ": sourcing \"%s\""),
-          (int64_t)sourcing_lnum, fname);
+           (int64_t)sourcing_lnum, fname);
+    }
     verbose_leave();
   }
-  if (is_vimrc == DOSO_VIMRC)
+  if (is_vimrc == DOSO_VIMRC) {
     vimrc_found(fname_exp, (char_u *)"MYVIMRC");
-  else if (is_vimrc == DOSO_GVIMRC)
+  } else if (is_vimrc == DOSO_GVIMRC) {
     vimrc_found(fname_exp, (char_u *)"MYGVIMRC");
+  }
 
 #ifdef USE_CRNL
-  /* If no automatic file format: Set default to CR-NL. */
-  if (*p_ffs == NUL)
+  // If no automatic file format: Set default to CR-NL.
+  if (*p_ffs == NUL) {
     cookie.fileformat = EOL_DOS;
-  else
+  } else {
     cookie.fileformat = EOL_UNKNOWN;
-  cookie.error = FALSE;
+  }
+  cookie.error = false;
 #endif
 
   cookie.nextline = NULL;
-  cookie.finished = FALSE;
+  cookie.finished = false;
 
-  /*
-   * Check if this script has a breakpoint.
-   */
-  cookie.breakpoint = dbg_find_breakpoint(TRUE, fname_exp, (linenr_T)0);
+  // Check if this script has a breakpoint.
+  cookie.breakpoint = dbg_find_breakpoint(true, fname_exp, (linenr_T)0);
   cookie.fname = fname_exp;
   cookie.dbg_tick = debug_tick;
 
   cookie.level = ex_nesting_level;
 
-  /*
-   * Keep the sourcing name/lnum, for recursive calls.
-   */
+  // Keep the sourcing name/lnum, for recursive calls.
   save_sourcing_name = sourcing_name;
   sourcing_name = fname_exp;
   save_sourcing_lnum = sourcing_lnum;
   sourcing_lnum = 0;
 
-  cookie.conv.vc_type = CONV_NONE;              /* no conversion */
+  cookie.conv.vc_type = CONV_NONE;              // no conversion
 
-  /* Read the first line so we can check for a UTF-8 BOM. */
+  // Read the first line so we can check for a UTF-8 BOM.
   firstline = getsourceline(0, (void *)&cookie, 0);
   if (firstline != NULL && STRLEN(firstline) >= 3 && firstline[0] == 0xef
       && firstline[1] == 0xbb && firstline[2] == 0xbf) {
-    /* Found BOM; setup conversion, skip over BOM and recode the line. */
+    // Found BOM; setup conversion, skip over BOM and recode the line.
     convert_setup(&cookie.conv, (char_u *)"utf-8", p_enc);
     p = string_convert(&cookie.conv, firstline + 3, NULL);
-    if (p == NULL)
+    if (p == NULL) {
       p = vim_strsave(firstline + 3);
+    }
     xfree(firstline);
     firstline = p;
   }
@@ -2671,22 +2840,21 @@ do_source (
   }
 
   const int l_do_profiling = do_profiling;
-  if (l_do_profiling == PROF_YES)
-    prof_child_enter(&wait_start);              /* entering a child now */
+  if (l_do_profiling == PROF_YES) {
+    prof_child_enter(&wait_start);    // entering a child now
+  }
 
-  /* Don't use local function variables, if called from a function.
-   * Also starts profiling timer for nested script. */
+  // Don't use local function variables, if called from a function.
+  // Also starts profiling timer for nested script.
   save_funccalp = save_funccal();
 
-  /*
-   * Check if this script was sourced before to finds its SID.
-   * If it's new, generate a new SID.
-   */
+  // Check if this script was sourced before to finds its SID.
+  // If it's new, generate a new SID.
   save_current_SID = current_SID;
   FileID file_id;
   bool file_id_ok = os_fileid((char *)fname_exp, &file_id);
   assert(script_items.ga_len >= 0);
-  for (current_SID = script_items.ga_len; current_SID > 0; --current_SID) {
+  for (current_SID = script_items.ga_len; current_SID > 0; current_SID--) {
     si = &SCRIPT_ITEM(current_SID);
     // Compare dev/ino when possible, it catches symbolic links.
     // Also compare file names, the inode may change when the file was edited.
@@ -2701,7 +2869,7 @@ do_source (
     current_SID = ++last_current_SID;
     ga_grow(&script_items, (int)(current_SID - script_items.ga_len));
     while (script_items.ga_len < current_SID) {
-      ++script_items.ga_len;
+      script_items.ga_len++;
       SCRIPT_ITEM(script_items.ga_len).sn_name = NULL;
       SCRIPT_ITEM(script_items.ga_len).sn_prof_on = false;
     }
@@ -2715,53 +2883,53 @@ do_source (
       si->file_id_valid = false;
     }
 
-    /* Allocate the local script variables to use for this script. */
+    // Allocate the local script variables to use for this script.
     new_script_vars(current_SID);
   }
 
   if (l_do_profiling == PROF_YES) {
-    int forceit;
+    bool forceit;
 
-    /* Check if we do profiling for this script. */
+    // Check if we do profiling for this script.
     if (!si->sn_prof_on && has_profiling(true, si->sn_name, &forceit)) {
       profile_init(si);
       si->sn_pr_force = forceit;
     }
     if (si->sn_prof_on) {
-      ++si->sn_pr_count;
+      si->sn_pr_count++;
       si->sn_pr_start = profile_start();
       si->sn_pr_children = profile_zero();
     }
   }
 
-  /*
-   * Call do_cmdline, which will call getsourceline() to get the lines.
-   */
+  // Call do_cmdline, which will call getsourceline() to get the lines.
   do_cmdline(firstline, getsourceline, (void *)&cookie,
-      DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
+             DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_REPEAT);
   retval = OK;
 
   if (l_do_profiling == PROF_YES) {
-    /* Get "si" again, "script_items" may have been reallocated. */
+    // Get "si" again, "script_items" may have been reallocated.
     si = &SCRIPT_ITEM(current_SID);
     if (si->sn_prof_on) {
       si->sn_pr_start = profile_end(si->sn_pr_start);
       si->sn_pr_start = profile_sub_wait(wait_start, si->sn_pr_start);
       si->sn_pr_total = profile_add(si->sn_pr_total, si->sn_pr_start);
       si->sn_pr_self = profile_self(si->sn_pr_self, si->sn_pr_start,
-          si->sn_pr_children);
+                                    si->sn_pr_children);
     }
   }
 
-  if (got_int)
+  if (got_int) {
     EMSG(_(e_interr));
+  }
   sourcing_name = save_sourcing_name;
   sourcing_lnum = save_sourcing_lnum;
   if (p_verbose > 1) {
     verbose_enter();
     smsg(_("finished sourcing %s"), fname);
-    if (sourcing_name != NULL)
+    if (sourcing_name != NULL) {
       smsg(_("continuing in %s"), sourcing_name);
+    }
     verbose_leave();
   }
 
@@ -2771,18 +2939,18 @@ do_source (
     time_pop(rel_time);
   }
 
-  /*
-   * After a "finish" in debug mode, need to break at first command of next
-   * sourced file.
-   */
+  // After a "finish" in debug mode, need to break at first command of next
+  // sourced file.
   if (save_debug_break_level > ex_nesting_level
-      && debug_break_level == ex_nesting_level)
-    ++debug_break_level;
+      && debug_break_level == ex_nesting_level) {
+    debug_break_level++;
+  }
 
   current_SID = save_current_SID;
   restore_funccal(save_funccalp);
-  if (l_do_profiling == PROF_YES)
-    prof_child_exit(&wait_start);               /* leaving a child now */
+  if (l_do_profiling == PROF_YES) {
+    prof_child_exit(&wait_start);    // leaving a child now
+  }
   fclose(cookie.fp);
   xfree(cookie.nextline);
   xfree(firstline);
@@ -2794,26 +2962,23 @@ theend:
 }
 
 
-/*
- * ":scriptnames"
- */
+/// ":scriptnames"
 void ex_scriptnames(exarg_T *eap)
 {
-  for (int i = 1; i <= script_items.ga_len && !got_int; ++i)
+  for (int i = 1; i <= script_items.ga_len && !got_int; i++) {
     if (SCRIPT_ITEM(i).sn_name != NULL) {
       home_replace(NULL, SCRIPT_ITEM(i).sn_name,
-          NameBuff, MAXPATHL, TRUE);
+                   NameBuff, MAXPATHL, true);
       smsg("%3d: %s", i, NameBuff);
     }
+  }
 }
 
 # if defined(BACKSLASH_IN_FILENAME)
-/*
- * Fix slashes in the list of script names for 'shellslash'.
- */
+/// Fix slashes in the list of script names for 'shellslash'.
 void scriptnames_slash_adjust(void)
 {
-  for (int i = 1; i <= script_items.ga_len; ++i) {
+  for (int i = 1; i <= script_items.ga_len; i++) {
     if (SCRIPT_ITEM(i).sn_name != NULL) {
       slash_adjust(SCRIPT_ITEM(i).sn_name);
     }
@@ -2822,21 +2987,24 @@ void scriptnames_slash_adjust(void)
 
 # endif
 
-/*
- * Get a pointer to a script name.  Used for ":verbose set".
- */
+/// Get a pointer to a script name.  Used for ":verbose set".
 char_u *get_scriptname(scid_T id)
 {
-  if (id == SID_MODELINE)
+  if (id == SID_MODELINE) {
     return (char_u *)_("modeline");
-  if (id == SID_CMDARG)
+  }
+  if (id == SID_CMDARG) {
     return (char_u *)_("--cmd argument");
-  if (id == SID_CARG)
+  }
+  if (id == SID_CARG) {
     return (char_u *)_("-c argument");
-  if (id == SID_ENV)
+  }
+  if (id == SID_ENV) {
     return (char_u *)_("environment variable");
-  if (id == SID_ERROR)
+  }
+  if (id == SID_ERROR) {
     return (char_u *)_("error handler");
+  }
   return SCRIPT_ITEM(id).sn_name;
 }
 
@@ -2849,51 +3017,49 @@ void free_scriptnames(void)
 # endif
 
 
-/*
- * Get one full line from a sourced file.
- * Called by do_cmdline() when it's called from do_source().
- *
- * Return a pointer to the line in allocated memory.
- * Return NULL for end-of-file or some error.
- */
+/// Get one full line from a sourced file.
+/// Called by do_cmdline() when it's called from do_source().
+///
+/// @return pointer to the line in allocated memory, or NULL for end-of-file or
+///         some error.
 char_u *getsourceline(int c, void *cookie, int indent)
 {
   struct source_cookie *sp = (struct source_cookie *)cookie;
-  char_u              *line;
-  char_u              *p;
+  char_u *line;
+  char_u *p;
 
-  /* If breakpoints have been added/deleted need to check for it. */
+  // If breakpoints have been added/deleted need to check for it.
   if (sp->dbg_tick < debug_tick) {
-    sp->breakpoint = dbg_find_breakpoint(TRUE, sp->fname, sourcing_lnum);
+    sp->breakpoint = dbg_find_breakpoint(true, sp->fname, sourcing_lnum);
     sp->dbg_tick = debug_tick;
   }
-  if (do_profiling == PROF_YES)
+  if (do_profiling == PROF_YES) {
     script_line_end();
-  /*
-   * Get current line.  If there is a read-ahead line, use it, otherwise get
-   * one now.
-   */
-  if (sp->finished)
+  }
+  // Get current line.  If there is a read-ahead line, use it, otherwise get
+  // one now.
+  if (sp->finished) {
     line = NULL;
-  else if (sp->nextline == NULL)
+  } else if (sp->nextline == NULL) {
     line = get_one_sourceline(sp);
-  else {
+  } else {
     line = sp->nextline;
     sp->nextline = NULL;
-    ++sourcing_lnum;
+    sourcing_lnum++;
   }
-  if (line != NULL && do_profiling == PROF_YES)
+  if (line != NULL && do_profiling == PROF_YES) {
     script_line_start();
+  }
 
-  /* Only concatenate lines starting with a \ when 'cpoptions' doesn't
-   * contain the 'C' flag. */
+  // Only concatenate lines starting with a \ when 'cpoptions' doesn't
+  // contain the 'C' flag.
   if (line != NULL && (vim_strchr(p_cpo, CPO_CONCAT) == NULL)) {
-    /* compensate for the one line read-ahead */
-    --sourcing_lnum;
+    // compensate for the one line read-ahead
+    sourcing_lnum--;
 
-    /* Get the next line and concatenate it when it starts with a
-     * backslash. We always need to read the next line, keep it in
-     * sp->nextline. */
+    // Get the next line and concatenate it when it starts with a
+    // backslash. We always need to read the next line, keep it in
+    // sp->nextline.
     sp->nextline = get_one_sourceline(sp);
     if (sp->nextline != NULL && *(p = skipwhite(sp->nextline)) == '\\') {
       garray_T ga;
@@ -2904,13 +3070,15 @@ char_u *getsourceline(int c, void *cookie, int indent)
       for (;; ) {
         xfree(sp->nextline);
         sp->nextline = get_one_sourceline(sp);
-        if (sp->nextline == NULL)
+        if (sp->nextline == NULL) {
           break;
+        }
         p = skipwhite(sp->nextline);
-        if (*p != '\\')
+        if (*p != '\\') {
           break;
-        /* Adjust the growsize to the current length to speed up
-         * concatenating many lines. */
+        }
+        // Adjust the growsize to the current length to speed up
+        // concatenating many lines.
         if (ga.ga_len > 400) {
           ga_set_growsize(&ga, (ga.ga_len > 8000) ? 8000 : ga.ga_len);
         }
@@ -2925,7 +3093,7 @@ char_u *getsourceline(int c, void *cookie, int indent)
   if (line != NULL && sp->conv.vc_type != CONV_NONE) {
     char_u  *s;
 
-    /* Convert the encoding of the script line. */
+    // Convert the encoding of the script line.
     s = string_convert(&sp->conv, line, NULL);
     if (s != NULL) {
       xfree(line);
@@ -2933,11 +3101,11 @@ char_u *getsourceline(int c, void *cookie, int indent)
     }
   }
 
-  /* Did we encounter a breakpoint? */
+  // Did we encounter a breakpoint?
   if (sp->breakpoint != 0 && sp->breakpoint <= sourcing_lnum) {
     dbg_breakpoint(sp->fname, sourcing_lnum);
-    /* Find next breakpoint. */
-    sp->breakpoint = dbg_find_breakpoint(TRUE, sp->fname, sourcing_lnum);
+    // Find next breakpoint.
+    sp->breakpoint = dbg_find_breakpoint(true, sp->fname, sourcing_lnum);
     sp->dbg_tick = debug_tick;
   }
 
@@ -2951,175 +3119,170 @@ static char_u *get_one_sourceline(struct source_cookie *sp)
   int c;
   char_u              *buf;
 #ifdef USE_CRNL
-  int has_cr;                           /* CR-LF found */
+  int has_cr;                           // CR-LF found
 #endif
-  int have_read = FALSE;
+  bool have_read = false;
 
-  /* use a growarray to store the sourced line */
+  // use a growarray to store the sourced line
   ga_init(&ga, 1, 250);
 
-  /*
-   * Loop until there is a finished line (or end-of-file).
-   */
+  // Loop until there is a finished line (or end-of-file).
   sourcing_lnum++;
   for (;; ) {
-    /* make room to read at least 120 (more) characters */
+    // make room to read at least 120 (more) characters
     ga_grow(&ga, 120);
     buf = (char_u *)ga.ga_data;
 
     if (fgets((char *)buf + ga.ga_len, ga.ga_maxlen - ga.ga_len,
-            sp->fp) == NULL)
+              sp->fp) == NULL) {
       break;
+    }
     len = ga.ga_len + (int)STRLEN(buf + ga.ga_len);
 #ifdef USE_CRNL
-    /* Ignore a trailing CTRL-Z, when in Dos mode.	Only recognize the
-     * CTRL-Z by its own, or after a NL. */
-    if (       (len == 1 || (len >= 2 && buf[len - 2] == '\n'))
-               && sp->fileformat == EOL_DOS
-               && buf[len - 1] == Ctrl_Z) {
+    // Ignore a trailing CTRL-Z, when in Dos mode. Only recognize the
+    // CTRL-Z by its own, or after a NL.
+    if ((len == 1 || (len >= 2 && buf[len - 2] == '\n'))
+        && sp->fileformat == EOL_DOS
+        && buf[len - 1] == Ctrl_Z) {
       buf[len - 1] = NUL;
       break;
     }
 #endif
 
-    have_read = TRUE;
+    have_read = true;
     ga.ga_len = len;
 
-    /* If the line was longer than the buffer, read more. */
-    if (ga.ga_maxlen - ga.ga_len == 1 && buf[len - 1] != '\n')
+    // If the line was longer than the buffer, read more.
+    if (ga.ga_maxlen - ga.ga_len == 1 && buf[len - 1] != '\n') {
       continue;
+    }
 
-    if (len >= 1 && buf[len - 1] == '\n') {     /* remove trailing NL */
+    if (len >= 1 && buf[len - 1] == '\n') {     // remove trailing NL
 #ifdef USE_CRNL
       has_cr = (len >= 2 && buf[len - 2] == '\r');
       if (sp->fileformat == EOL_UNKNOWN) {
-        if (has_cr)
+        if (has_cr) {
           sp->fileformat = EOL_DOS;
-        else
+        } else {
           sp->fileformat = EOL_UNIX;
+        }
       }
 
       if (sp->fileformat == EOL_DOS) {
-        if (has_cr) {               /* replace trailing CR */
+        if (has_cr) {               // replace trailing CR
           buf[len - 2] = '\n';
-          --len;
-          --ga.ga_len;
-        } else {          /* lines like ":map xx yy^M" will have failed */
+          len--;
+          ga.ga_len--;
+        } else {          // lines like ":map xx yy^M" will have failed
           if (!sp->error) {
             msg_source(hl_attr(HLF_W));
             EMSG(_("W15: Warning: Wrong line separator, ^M may be missing"));
           }
-          sp->error = TRUE;
+          sp->error = true;
           sp->fileformat = EOL_UNIX;
         }
       }
 #endif
-      /* The '\n' is escaped if there is an odd number of ^V's just
-       * before it, first set "c" just before the 'V's and then check
-       * len&c parities (is faster than ((len-c)%2 == 0)) -- Acevedo */
-      for (c = len - 2; c >= 0 && buf[c] == Ctrl_V; c--)
-        ;
-      if ((len & 1) != (c & 1)) {       /* escaped NL, read more */
+      // The '\n' is escaped if there is an odd number of ^V's just
+      // before it, first set "c" just before the 'V's and then check
+      // len&c parities (is faster than ((len-c)%2 == 0)) -- Acevedo
+      for (c = len - 2; c >= 0 && buf[c] == Ctrl_V; c--) {}
+      if ((len & 1) != (c & 1)) {       // escaped NL, read more
         sourcing_lnum++;
         continue;
       }
 
-      buf[len - 1] = NUL;               /* remove the NL */
+      buf[len - 1] = NUL;               // remove the NL
     }
 
-    /*
-     * Check for ^C here now and then, so recursive :so can be broken.
-     */
+    // Check for ^C here now and then, so recursive :so can be broken.
     line_breakcheck();
     break;
   }
 
-  if (have_read)
+  if (have_read) {
     return (char_u *)ga.ga_data;
+  }
 
   xfree(ga.ga_data);
   return NULL;
 }
 
-/*
- * Called when starting to read a script line.
- * "sourcing_lnum" must be correct!
- * When skipping lines it may not actually be executed, but we won't find out
- * until later and we need to store the time now.
- */
+/// Called when starting to read a script line.
+/// "sourcing_lnum" must be correct!
+/// When skipping lines it may not actually be executed, but we won't find out
+/// until later and we need to store the time now.
 void script_line_start(void)
 {
   scriptitem_T    *si;
   sn_prl_T        *pp;
 
-  if (current_SID <= 0 || current_SID > script_items.ga_len)
+  if (current_SID <= 0 || current_SID > script_items.ga_len) {
     return;
+  }
   si = &SCRIPT_ITEM(current_SID);
   if (si->sn_prof_on && sourcing_lnum >= 1) {
-    /* Grow the array before starting the timer, so that the time spent
-     * here isn't counted. */
+    // Grow the array before starting the timer, so that the time spent
+    // here isn't counted.
     ga_grow(&si->sn_prl_ga, (int)(sourcing_lnum - si->sn_prl_ga.ga_len));
     si->sn_prl_idx = sourcing_lnum - 1;
     while (si->sn_prl_ga.ga_len <= si->sn_prl_idx
            && si->sn_prl_ga.ga_len < si->sn_prl_ga.ga_maxlen) {
-      /* Zero counters for a line that was not used before. */
+      // Zero counters for a line that was not used before.
       pp = &PRL_ITEM(si, si->sn_prl_ga.ga_len);
       pp->snp_count = 0;
       pp->sn_prl_total = profile_zero();
       pp->sn_prl_self = profile_zero();
-      ++si->sn_prl_ga.ga_len;
+      si->sn_prl_ga.ga_len++;
     }
-    si->sn_prl_execed = FALSE;
+    si->sn_prl_execed = false;
     si->sn_prl_start = profile_start();
     si->sn_prl_children = profile_zero();
     si->sn_prl_wait = profile_get_wait();
   }
 }
 
-/*
- * Called when actually executing a function line.
- */
+/// Called when actually executing a function line.
 void script_line_exec(void)
 {
   scriptitem_T    *si;
 
-  if (current_SID <= 0 || current_SID > script_items.ga_len)
+  if (current_SID <= 0 || current_SID > script_items.ga_len) {
     return;
+  }
   si = &SCRIPT_ITEM(current_SID);
-  if (si->sn_prof_on && si->sn_prl_idx >= 0)
-    si->sn_prl_execed = TRUE;
+  if (si->sn_prof_on && si->sn_prl_idx >= 0) {
+    si->sn_prl_execed = true;
+  }
 }
 
-/*
- * Called when done with a function line.
- */
+/// Called when done with a function line.
 void script_line_end(void)
 {
   scriptitem_T    *si;
   sn_prl_T        *pp;
 
-  if (current_SID <= 0 || current_SID > script_items.ga_len)
+  if (current_SID <= 0 || current_SID > script_items.ga_len) {
     return;
+  }
   si = &SCRIPT_ITEM(current_SID);
   if (si->sn_prof_on && si->sn_prl_idx >= 0
       && si->sn_prl_idx < si->sn_prl_ga.ga_len) {
     if (si->sn_prl_execed) {
       pp = &PRL_ITEM(si, si->sn_prl_idx);
-      ++pp->snp_count;
+      pp->snp_count++;
       si->sn_prl_start = profile_end(si->sn_prl_start);
       si->sn_prl_start = profile_sub_wait(si->sn_prl_wait, si->sn_prl_start);
       pp->sn_prl_total = profile_add(pp->sn_prl_total, si->sn_prl_start);
       pp->sn_prl_self = profile_self(pp->sn_prl_self, si->sn_prl_start,
-          si->sn_prl_children);
+                                     si->sn_prl_children);
     }
     si->sn_prl_idx = -1;
   }
 }
 
-/*
- * ":scriptencoding": Set encoding conversion for a sourced script.
- * Without the multi-byte feature it's simply ignored.
- */
+/// ":scriptencoding": Set encoding conversion for a sourced script.
+/// Without the multi-byte feature it's simply ignored.
 void ex_scriptencoding(exarg_T *eap)
 {
   struct source_cookie        *sp;
@@ -3132,84 +3295,80 @@ void ex_scriptencoding(exarg_T *eap)
 
   if (*eap->arg != NUL) {
     name = enc_canonize(eap->arg);
-  } else
+  } else {
     name = eap->arg;
+  }
 
-  /* Setup for conversion from the specified encoding to 'encoding'. */
+  // Setup for conversion from the specified encoding to 'encoding'.
   sp = (struct source_cookie *)getline_cookie(eap->getline, eap->cookie);
   convert_setup(&sp->conv, name, p_enc);
 
-  if (name != eap->arg)
+  if (name != eap->arg) {
     xfree(name);
+  }
 }
 
-/*
- * ":finish": Mark a sourced file as finished.
- */
+/// ":finish": Mark a sourced file as finished.
 void ex_finish(exarg_T *eap)
 {
-  if (getline_equal(eap->getline, eap->cookie, getsourceline))
-    do_finish(eap, FALSE);
-  else
+  if (getline_equal(eap->getline, eap->cookie, getsourceline)) {
+    do_finish(eap, false);
+  } else {
     EMSG(_("E168: :finish used outside of a sourced file"));
+  }
 }
 
-/*
- * Mark a sourced file as finished.  Possibly makes the ":finish" pending.
- * Also called for a pending finish at the ":endtry" or after returning from
- * an extra do_cmdline().  "reanimate" is used in the latter case.
- */
+/// Mark a sourced file as finished.  Possibly makes the ":finish" pending.
+/// Also called for a pending finish at the ":endtry" or after returning from
+/// an extra do_cmdline().  "reanimate" is used in the latter case.
 void do_finish(exarg_T *eap, int reanimate)
 {
   int idx;
 
-  if (reanimate)
+  if (reanimate) {
     ((struct source_cookie *)getline_cookie(eap->getline,
-         eap->cookie))->finished = FALSE;
-
-  /*
-   * Cleanup (and inactivate) conditionals, but stop when a try conditional
-   * not in its finally clause (which then is to be executed next) is found.
-   * In this case, make the ":finish" pending for execution at the ":endtry".
-   * Otherwise, finish normally.
-   */
-  idx = cleanup_conditionals(eap->cstack, 0, TRUE);
+                                            eap->cookie))->finished = false;
+  }
+
+  // Cleanup (and inactivate) conditionals, but stop when a try conditional
+  // not in its finally clause (which then is to be executed next) is found.
+  // In this case, make the ":finish" pending for execution at the ":endtry".
+  // Otherwise, finish normally.
+  idx = cleanup_conditionals(eap->cstack, 0, true);
   if (idx >= 0) {
     eap->cstack->cs_pending[idx] = CSTP_FINISH;
     report_make_pending(CSTP_FINISH, NULL);
-  } else
+  } else {
     ((struct source_cookie *)getline_cookie(eap->getline,
-         eap->cookie))->finished = TRUE;
+                                            eap->cookie))->finished = true;
+  }
 }
 
 
-/*
- * Return TRUE when a sourced file had the ":finish" command: Don't give error
- * message for missing ":endif".
- * Return FALSE when not sourcing a file.
- */
-int source_finished(LineGetter fgetline, void *cookie)
+/// Return true when a sourced file had the ":finish" command: Don't give error
+/// message for missing ":endif".
+/// Return false when not sourcing a file.
+bool source_finished(LineGetter fgetline, void *cookie)
 {
   return getline_equal(fgetline, cookie, getsourceline)
          && ((struct source_cookie *)getline_cookie(
-                 fgetline, cookie))->finished;
+             fgetline, cookie))->finished;
 }
 
-/*
- * ":checktime [buffer]"
- */
+/// ":checktime [buffer]"
 void ex_checktime(exarg_T *eap)
 {
   buf_T       *buf;
   int save_no_check_timestamps = no_check_timestamps;
 
   no_check_timestamps = 0;
-  if (eap->addr_count == 0)     /* default is all buffers */
-    check_timestamps(FALSE);
-  else {
+  if (eap->addr_count == 0) {    // default is all buffers
+    check_timestamps(false);
+  } else {
     buf = buflist_findnr((int)eap->line2);
-    if (buf != NULL)            /* cannot happen? */
-      (void)buf_check_timestamp(buf, FALSE);
+    if (buf != NULL) {           // cannot happen?
+      (void)buf_check_timestamp(buf, false);
+    }
   }
   no_check_timestamps = save_no_check_timestamps;
 }
@@ -3228,10 +3387,8 @@ static char *get_locale_val(int what)
 
 
 
-/*
- * Obtain the current messages language.  Used to set the default for
- * 'helplang'.  May return NULL or an empty string.
- */
+/// Obtain the current messages language.  Used to set the default for
+/// 'helplang'.  May return NULL or an empty string.
 char *get_mess_lang(void)
 {
   char *p;
@@ -3240,10 +3397,10 @@ char *get_mess_lang(void)
 #  if defined(LC_MESSAGES)
   p = get_locale_val(LC_MESSAGES);
 #  else
-  /* This is necessary for Win32, where LC_MESSAGES is not defined and $LANG
-   * may be set to the LCID number.  LC_COLLATE is the best guess, LC_TIME
-   * and LC_MONETARY may be set differently for a Japanese working in the
-   * US. */
+  // This is necessary for Win32, where LC_MESSAGES is not defined and $LANG
+  // may be set to the LCID number.  LC_COLLATE is the best guess, LC_TIME
+  // and LC_MONETARY may be set differently for a Japanese working in the
+  // US.
   p = get_locale_val(LC_COLLATE);
 #  endif
 # else
@@ -3258,11 +3415,9 @@ char *get_mess_lang(void)
   return p;
 }
 
-/* Complicated #if; matches with where get_mess_env() is used below. */
+// Complicated #if; matches with where get_mess_env() is used below.
 #ifdef HAVE_WORKING_LIBINTL
-/*
- * Get the language used for messages from the environment.
- */
+/// Get the language used for messages from the environment.
 static char_u *get_mess_env(void)
 {
   char_u      *p;
@@ -3273,7 +3428,7 @@ static char_u *get_mess_env(void)
     if (p == NULL) {
       p = (char_u *)os_getenv("LANG");
       if (p != NULL && ascii_isdigit(*p)) {
-        p = NULL;                       /* ignore something like "1043" */
+        p = NULL;                       // ignore something like "1043"
       }
 # ifdef HAVE_GET_LOCALE_VAL
       if (p == NULL) {
@@ -3288,10 +3443,8 @@ static char_u *get_mess_env(void)
 #endif
 
 
-/*
- * Set the "v:lang" variable according to the current locale setting.
- * Also do "v:lc_time"and "v:ctype".
- */
+/// Set the "v:lang" variable according to the current locale setting.
+/// Also do "v:lc_time"and "v:ctype".
 void set_lang_var(void)
 {
   const char *loc;
@@ -3304,10 +3457,10 @@ void set_lang_var(void)
 # endif
   set_vim_var_string(VV_CTYPE, loc, -1);
 
-  /* When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall
-   * back to LC_CTYPE if it's empty. */
+  // When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall
+  // back to LC_CTYPE if it's empty.
 # ifdef HAVE_WORKING_LIBINTL
-  loc = (char *) get_mess_env();
+  loc = (char *)get_mess_env();
 # elif defined(LC_MESSAGES)
   loc = get_locale_val(LC_MESSAGES);
 # else
@@ -3323,9 +3476,11 @@ void set_lang_var(void)
 }
 
 #ifdef HAVE_WORKING_LIBINTL
-/*
- * ":language":  Set the language (locale).
- */
+///
+/// ":language":  Set the language (locale).
+///
+/// @param eap
+///
 void ex_language(exarg_T *eap)
 {
   char        *loc;
@@ -3341,9 +3496,9 @@ void ex_language(exarg_T *eap)
 
   name = eap->arg;
 
-  /* Check for "messages {name}", "ctype {name}" or "time {name}" argument.
-   * Allow abbreviation, but require at least 3 characters to avoid
-   * confusion with a two letter language name "me" or "ct". */
+  // Check for "messages {name}", "ctype {name}" or "time {name}" argument.
+  // Allow abbreviation, but require at least 3 characters to avoid
+  // confusion with a two letter language name "me" or "ct".
   p = skiptowhite(eap->arg);
   if ((*p == NUL || ascii_iswhite(*p)) && p - eap->arg >= 3) {
     if (STRNICMP(eap->arg, "messages", p - eap->arg) == 0) {
@@ -3363,47 +3518,52 @@ void ex_language(exarg_T *eap)
 
   if (*name == NUL) {
 #ifdef HAVE_WORKING_LIBINTL
-    if (what == VIM_LC_MESSAGES)
+    if (what == VIM_LC_MESSAGES) {
       p = get_mess_env();
-    else
+    } else {
+#endif
+      p = (char_u *)setlocale(what, NULL);
+#ifdef HAVE_WORKING_LIBINTL
+    }
 #endif
-    p = (char_u *)setlocale(what, NULL);
-    if (p == NULL || *p == NUL)
+    if (p == NULL || *p == NUL) {
       p = (char_u *)"Unknown";
+    }
     smsg(_("Current %slanguage: \"%s\""), whatstr, p);
   } else {
 #ifndef LC_MESSAGES
-    if (what == VIM_LC_MESSAGES)
+    if (what == VIM_LC_MESSAGES) {
       loc = "";
-    else
+    } else {
 #endif
-    {
       loc = setlocale(what, (char *)name);
 #ifdef LC_NUMERIC
-      /* Make sure strtod() uses a decimal point, not a comma. */
+      // Make sure strtod() uses a decimal point, not a comma.
       setlocale(LC_NUMERIC, "C");
 #endif
+#ifndef LC_MESSAGES
     }
-    if (loc == NULL)
+#endif
+    if (loc == NULL) {
       EMSG2(_("E197: Cannot set language to \"%s\""), name);
-    else {
+    } else {
 #ifdef HAVE_NL_MSG_CAT_CNTR
-      /* Need to do this for GNU gettext, otherwise cached translations
-       * will be used again. */
+      // Need to do this for GNU gettext, otherwise cached translations
+      // will be used again.
       extern int _nl_msg_cat_cntr;
 
-      ++_nl_msg_cat_cntr;
+      _nl_msg_cat_cntr++;
 #endif
-      /* Reset $LC_ALL, otherwise it would overrule everything. */
+      // Reset $LC_ALL, otherwise it would overrule everything.
       vim_setenv("LC_ALL", "");
 
       if (what != LC_TIME) {
-        /* Tell gettext() what to translate to.  It apparently doesn't
-         * use the currently effective locale. */
+        // Tell gettext() what to translate to.  It apparently doesn't
+        // use the currently effective locale.
         if (what == LC_ALL) {
           vim_setenv("LANG", (char *)name);
 
-          /* Clear $LANGUAGE because GNU gettext uses it. */
+          // Clear $LANGUAGE because GNU gettext uses it.
           vim_setenv("LANGUAGE", "");
         }
         if (what != LC_CTYPE) {
@@ -3412,7 +3572,7 @@ void ex_language(exarg_T *eap)
         }
       }
 
-      /* Set v:lang, v:lc_time and v:ctype to the final result. */
+      // Set v:lang, v:lc_time and v:ctype to the final result.
       set_lang_var();
       maketitle();
     }
@@ -3420,43 +3580,43 @@ void ex_language(exarg_T *eap)
 }
 
 
-static char_u   **locales = NULL;       /* Array of all available locales */
-static int did_init_locales = FALSE;
+static char_u **locales = NULL;       // Array of all available locales
+static bool did_init_locales = false;
 
-/*
- * Lazy initialization of all available locales.
- */
+/// Lazy initialization of all available locales.
 static void init_locales(void)
 {
   if (!did_init_locales) {
-    did_init_locales = TRUE;
+    did_init_locales = true;
     locales = find_locales();
   }
 }
 
-/* Return an array of strings for all available locales + NULL for the
- * last element.  Return NULL in case of error. */
+// Return an array of strings for all available locales + NULL for the
+/// last element.  Return NULL in case of error.
 static char_u **find_locales(void)
 {
   garray_T locales_ga;
   char_u      *loc;
+  char *saveptr = NULL;
 
-  /* Find all available locales by running command "locale -a".  If this
-   * doesn't work we won't have completion. */
+  // Find all available locales by running command "locale -a".  If this
+  // doesn't work we won't have completion.
   char_u *locale_a = get_cmd_output((char_u *)"locale -a", NULL,
                                     kShellOptSilent, NULL);
-  if (locale_a == NULL)
+  if (locale_a == NULL) {
     return NULL;
+  }
   ga_init(&locales_ga, sizeof(char_u *), 20);
 
-  /* Transform locale_a string where each locale is separated by "\n"
-   * into an array of locale strings. */
-  loc = (char_u *)strtok((char *)locale_a, "\n");
+  // Transform locale_a string where each locale is separated by "\n"
+  // into an array of locale strings.
+  loc = (char_u *)os_strtok((char *)locale_a, "\n", &saveptr);
 
   while (loc != NULL) {
     loc = vim_strsave(loc);
     GA_APPEND(char_u *, &locales_ga, loc);
-    loc = (char_u *)strtok(NULL, "\n");
+    loc = (char_u *)os_strtok(NULL, "\n", &saveptr);
   }
   xfree(locale_a);
   // Guarantee that .ga_data is NULL terminated
@@ -3470,8 +3630,9 @@ void free_locales(void)
 {
   int i;
   if (locales != NULL) {
-    for (i = 0; locales[i] != NULL; i++)
+    for (i = 0; locales[i] != NULL; i++) {
       xfree(locales[i]);
+    }
     xfree(locales);
     locales = NULL;
   }
@@ -3479,33 +3640,34 @@ void free_locales(void)
 
 #  endif
 
-/*
- * Function given to ExpandGeneric() to obtain the possible arguments of the
- * ":language" command.
- */
+/// Function given to ExpandGeneric() to obtain the possible arguments of the
+/// ":language" command.
 char_u *get_lang_arg(expand_T *xp, int idx)
 {
-  if (idx == 0)
+  if (idx == 0) {
     return (char_u *)"messages";
-  if (idx == 1)
+  }
+  if (idx == 1) {
     return (char_u *)"ctype";
-  if (idx == 2)
+  }
+  if (idx == 2) {
     return (char_u *)"time";
+  }
 
   init_locales();
-  if (locales == NULL)
+  if (locales == NULL) {
     return NULL;
+  }
   return locales[idx - 3];
 }
 
-/*
- * Function given to ExpandGeneric() to obtain the available locales.
- */
+/// Function given to ExpandGeneric() to obtain the available locales.
 char_u *get_locales(expand_T *xp, int idx)
 {
   init_locales();
-  if (locales == NULL)
+  if (locales == NULL) {
     return NULL;
+  }
   return locales[idx];
 }
 
@@ -3552,79 +3714,65 @@ static void script_host_do_range(char *name, exarg_T *eap)
   (void)eval_call_provider(name, "do_range", args);
 }
 
-/*
- * ":drop"
- * Opens the first argument in a window.  When there are two or more arguments
- * the argument list is redefined.
- */
+/// ":drop"
+/// Opens the first argument in a window.  When there are two or more arguments
+/// the argument list is redefined.
 void ex_drop(exarg_T   *eap)
 {
-    int                split = FALSE;
-    buf_T      *buf;
-
-    /*
-     * Check if the first argument is already being edited in a window.  If
-     * so, jump to that window.
-     * We would actually need to check all arguments, but that's complicated
-     * and mostly only one file is dropped.
-     * This also ignores wildcards, since it is very unlikely the user is
-     * editing a file name with a wildcard character.
-     */
-    do_arglist(eap->arg, AL_SET, 0);
-
-    /*
-     * Expanding wildcards may result in an empty argument list.  E.g. when
-     * editing "foo.pyc" and ".pyc" is in 'wildignore'.  Assume that we
-     * already did an error message for this.
-     */
-    if (ARGCOUNT == 0)
-       return;
-
-    if (cmdmod.tab)
-    {
-       /* ":tab drop file ...": open a tab for each argument that isn't
-        * edited in a window yet.  It's like ":tab all" but without closing
-        * windows or tabs. */
-       ex_all(eap);
-    }
-    else
-    {
-       /* ":drop file ...": Edit the first argument.  Jump to an existing
-        * window if possible, edit in current window if the current buffer
-        * can be abandoned, otherwise open a new window. */
-       buf = buflist_findnr(ARGLIST[0].ae_fnum);
-
-       FOR_ALL_TAB_WINDOWS(tp, wp)
-       {
-           if (wp->w_buffer == buf)
-           {
-               goto_tabpage_win(tp, wp);
-               curwin->w_arg_idx = 0;
-               return;
-           }
-       }
-
-       /*
-        * Check whether the current buffer is changed. If so, we will need
-        * to split the current window or data could be lost.
-        * Skip the check if the 'hidden' option is set, as in this case the
-        * buffer won't be lost.
-        */
-       if (!P_HID(curbuf))
-       {
-           ++emsg_off;
-           split = check_changed(curbuf, CCGD_AW | CCGD_EXCMD);
-           --emsg_off;
-       }
-
-       /* Fake a ":sfirst" or ":first" command edit the first argument. */
-       if (split)
-       {
-           eap->cmdidx = CMD_sfirst;
-           eap->cmd[0] = 's';
-       }
-       else
-           eap->cmdidx = CMD_first;
-       ex_rewind(eap);
+  bool split = false;
+  buf_T *buf;
+
+  // Check if the first argument is already being edited in a window.  If
+  // so, jump to that window.
+  // We would actually need to check all arguments, but that's complicated
+  // and mostly only one file is dropped.
+  // This also ignores wildcards, since it is very unlikely the user is
+  // editing a file name with a wildcard character.
+  do_arglist(eap->arg, AL_SET, 0);
+
+  // Expanding wildcards may result in an empty argument list.  E.g. when
+  // editing "foo.pyc" and ".pyc" is in 'wildignore'.  Assume that we
+  // already did an error message for this.
+  if (ARGCOUNT == 0) {
+    return;
+  }
+
+  if (cmdmod.tab) {
+    // ":tab drop file ...": open a tab for each argument that isn't
+    // edited in a window yet.  It's like ":tab all" but without closing
+    // windows or tabs.
+    ex_all(eap);
+  } else {
+    // ":drop file ...": Edit the first argument.  Jump to an existing
+    // window if possible, edit in current window if the current buffer
+    // can be abandoned, otherwise open a new window.
+    buf = buflist_findnr(ARGLIST[0].ae_fnum);
+
+    FOR_ALL_TAB_WINDOWS(tp, wp) {
+      if (wp->w_buffer == buf) {
+        goto_tabpage_win(tp, wp);
+        curwin->w_arg_idx = 0;
+        return;
+      }
     }
+
+    // Check whether the current buffer is changed. If so, we will need
+    // to split the current window or data could be lost.
+    // Skip the check if the 'hidden' option is set, as in this case the
+    // buffer won't be lost.
+    if (!P_HID(curbuf)) {
+      emsg_off++;
+      split = check_changed(curbuf, CCGD_AW | CCGD_EXCMD);
+      emsg_off--;
+    }
+
+    // Fake a ":sfirst" or ":first" command edit the first argument.
+    if (split) {
+      eap->cmdidx = CMD_sfirst;
+      eap->cmd[0] = 's';
+    } else {
+      eap->cmdidx = CMD_first;
+    }
+    ex_rewind(eap);
+  }
 }
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index f46d1e6d47..c6389a0c8b 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -73,6 +73,7 @@
 #define ADDR_BUFFERS            4
 #define ADDR_TABS               5
 #define ADDR_QUICKFIX           6
+#define ADDR_OTHER              99
 
 typedef struct exarg exarg_T;
 
@@ -126,57 +127,53 @@ struct exarg {
   struct condstack *cstack;     ///< condition stack for ":if" etc.
 };
 
-#define FORCE_BIN 1             /* ":edit ++bin file" */
-#define FORCE_NOBIN 2           /* ":edit ++nobin file" */
-
-/* Values for "flags" */
-#define EXFLAG_LIST     0x01    /* 'l': list */
-#define EXFLAG_NR       0x02    /* '#': number */
-#define EXFLAG_PRINT    0x04    /* 'p': print */
-
-/*
- * used for completion on the command line
- */
-typedef struct expand {
-  int xp_context;                       /* type of expansion */
-  char_u      *xp_pattern;              /* start of item to expand */
-  int xp_pattern_len;                   /* bytes in xp_pattern before cursor */
-  char_u      *xp_arg;                  /* completion function */
-  int xp_scriptID;                      /* SID for completion function */
-  int xp_backslash;                     /* one of the XP_BS_ values */
+#define FORCE_BIN 1             // ":edit ++bin file"
+#define FORCE_NOBIN 2           // ":edit ++nobin file"
+
+// Values for "flags"
+#define EXFLAG_LIST     0x01    // 'l': list
+#define EXFLAG_NR       0x02    // '#': number
+#define EXFLAG_PRINT    0x04    // 'p': print
+
+// used for completion on the command line
+struct expand {
+  int xp_context;               // type of expansion
+  char_u *xp_pattern;           // start of item to expand
+  int xp_pattern_len;           // bytes in xp_pattern before cursor
+  char_u *xp_arg;               // completion function
+  int xp_scriptID;              // SID for completion function
+  int xp_backslash;             // one of the XP_BS_ values
 #ifndef BACKSLASH_IN_FILENAME
-  int xp_shell;                         /* TRUE for a shell command, more
-                                           characters need to be escaped */
+  int xp_shell;                 // TRUE for a shell command, more
+                                // characters need to be escaped
 #endif
-  int xp_numfiles;                      /* number of files found by
-                                                    file name completion */
-  char_u      **xp_files;               /* list of files */
-  char_u      *xp_line;                 /* text being completed */
-  int xp_col;                           /* cursor position in line */
-} expand_T;
-
-/* values for xp_backslash */
-#define XP_BS_NONE      0       /* nothing special for backslashes */
-#define XP_BS_ONE       1       /* uses one backslash before a space */
-#define XP_BS_THREE     2       /* uses three backslashes before a space */
+  int xp_numfiles;              // number of files found by file name completion
+  char_u **xp_files;            // list of files
+  char_u *xp_line;              // text being completed
+  int xp_col;                   // cursor position in line
+};
 
-/*
- * Command modifiers ":vertical", ":browse", ":confirm" and ":hide" set a flag.
- * This needs to be saved for recursive commands, put them in a structure for
- * easy manipulation.
- */
+// values for xp_backslash
+#define XP_BS_NONE      0       // nothing special for backslashes
+#define XP_BS_ONE       1       // uses one backslash before a space
+#define XP_BS_THREE     2       // uses three backslashes before a space
+
+/// Command modifiers ":vertical", ":browse", ":confirm", ":hide", etc. set a
+/// flag.  This needs to be saved for recursive commands, put them in a
+/// structure for easy manipulation.
 typedef struct {
-  int hide;                             /* TRUE when ":hide" was used */
-  int split;                            /* flags for win_split() */
-  int tab;                              /* > 0 when ":tab" was used */
-  int confirm;                          /* TRUE to invoke yes/no dialog */
-  int keepalt;                          /* TRUE when ":keepalt" was used */
-  int keepmarks;                        /* TRUE when ":keepmarks" was used */
-  int keepjumps;                        /* TRUE when ":keepjumps" was used */
-  int lockmarks;                        /* TRUE when ":lockmarks" was used */
-  int keeppatterns;                     /* TRUE when ":keeppatterns" was used */
-  bool noswapfile;                      /* true when ":noswapfile" was used */
-  char_u      *save_ei;                 /* saved value of 'eventignore' */
+  int split;          ///< flags for win_split()
+  int tab;            ///< > 0 when ":tab" was used
+  bool browse;        ///< true to invoke file dialog
+  bool confirm;       ///< true to invoke yes/no dialog
+  bool hide;          ///< true when ":hide" was used
+  bool keepalt;       ///< true when ":keepalt" was used
+  bool keepjumps;     ///< true when ":keepjumps" was used
+  bool keepmarks;     ///< true when ":keepmarks" was used
+  bool keeppatterns;  ///< true when ":keeppatterns" was used
+  bool lockmarks;     ///< true when ":lockmarks" was used
+  bool noswapfile;    ///< true when ":noswapfile" was used
+  char_u *save_ei;    ///< saved value of 'eventignore'
 } cmdmod_T;
 
 #endif  // NVIM_EX_CMDS_DEFS_H
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 870284a0f7..4070e9fe5b 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -36,7 +36,6 @@
 #include "nvim/menu.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/file_search.h"
 #include "nvim/garray.h"
@@ -272,7 +271,7 @@ do_exmode (
 int do_cmdline_cmd(char *cmd)
 {
   return do_cmdline((char_u *)cmd, NULL, NULL,
-      DOCMD_VERBOSE|DOCMD_NOWAIT|DOCMD_KEYTYPED);
+                    DOCMD_NOWAIT|DOCMD_KEYTYPED);
 }
 
 /*
@@ -345,7 +344,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
     msg_list = saved_msg_list;
     return FAIL;
   }
-  ++call_depth;
+  call_depth++;
+  start_batch_changes();
 
   cstack.cs_idx = -1;
   cstack.cs_looplevel = 0;
@@ -597,11 +597,11 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
      *    do_one_cmd() will return NULL if there is no trailing '|'.
      *    "cmdline_copy" can change, e.g. for '%' and '#' expansion.
      */
-    ++recursive;
-    next_cmdline = do_one_cmd(&cmdline_copy, flags & DOCMD_VERBOSE,
-        &cstack,
-        cmd_getline, cmd_cookie);
-    --recursive;
+    recursive++;
+    next_cmdline = do_one_cmd(&cmdline_copy, flags,
+                              &cstack,
+                              cmd_getline, cmd_cookie);
+    recursive--;
 
     if (cmd_cookie == (void *)&cmd_loop_cookie)
       /* Use "current_line" from "cmd_loop_cookie", it may have been
@@ -952,7 +952,8 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline,
 
   did_endif = FALSE;    /* in case do_cmdline used recursively */
 
-  --call_depth;
+  call_depth--;
+  end_batch_changes();
   return retval;
 }
 
@@ -1224,7 +1225,7 @@ static void get_wincmd_addr_type(char_u *arg, exarg_T *eap)
  * This function may be called recursively!
  */
 static char_u * do_one_cmd(char_u **cmdlinep,
-                           int sourcing,
+                           int flags,
                            struct condstack *cstack,
                            LineGetter fgetline,
                            void *cookie /* argument for fgetline() */
@@ -1247,7 +1248,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
   memset(&ea, 0, sizeof(ea));
   ea.line1 = 1;
   ea.line2 = 1;
-  ++ex_nesting_level;
+  ex_nesting_level++;
 
   /* When the last file has not been edited :q has to be typed twice. */
   if (quitmore
@@ -1301,8 +1302,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
      * 2. Handle command modifiers.
      */
     p = ea.cmd;
-    if (ascii_isdigit(*ea.cmd))
-      p = skipwhite(skipdigits(ea.cmd));
+    p = skip_range(ea.cmd, NULL);
     switch (*p) {
     /* When adding an entry, also modify cmd_exists(). */
     case 'a':   if (!checkforcmd(&ea.cmd, "aboveleft", 3))
@@ -1313,8 +1313,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     case 'b':   if (checkforcmd(&ea.cmd, "belowright", 3)) {
         cmdmod.split |= WSP_BELOW;
         continue;
-    }
+      }
       if (checkforcmd(&ea.cmd, "browse", 3)) {
+        cmdmod.browse = true;
         continue;
       }
       if (!checkforcmd(&ea.cmd, "botright", 2))
@@ -1324,24 +1325,24 @@ static char_u * do_one_cmd(char_u **cmdlinep,
 
     case 'c':   if (!checkforcmd(&ea.cmd, "confirm", 4))
         break;
-      cmdmod.confirm = TRUE;
+      cmdmod.confirm = true;
       continue;
 
     case 'k':   if (checkforcmd(&ea.cmd, "keepmarks", 3)) {
-        cmdmod.keepmarks = TRUE;
+        cmdmod.keepmarks = true;
         continue;
     }
       if (checkforcmd(&ea.cmd, "keepalt", 5)) {
-        cmdmod.keepalt = TRUE;
+        cmdmod.keepalt = true;
         continue;
       }
       if (checkforcmd(&ea.cmd, "keeppatterns", 5)) {
-        cmdmod.keeppatterns = TRUE;
+        cmdmod.keeppatterns = true;
         continue;
       }
       if (!checkforcmd(&ea.cmd, "keepjumps", 5))
         break;
-      cmdmod.keepjumps = TRUE;
+      cmdmod.keepjumps = true;
       continue;
 
     /* ":hide" and ":hide | cmd" are not modifiers */
@@ -1349,11 +1350,11 @@ static char_u * do_one_cmd(char_u **cmdlinep,
                     || *p == NUL || ends_excmd(*p))
         break;
       ea.cmd = p;
-      cmdmod.hide = TRUE;
+      cmdmod.hide = true;
       continue;
 
     case 'l':   if (checkforcmd(&ea.cmd, "lockmarks", 3)) {
-        cmdmod.lockmarks = TRUE;
+        cmdmod.lockmarks = true;
         continue;
     }
 
@@ -1373,7 +1374,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
         }
         continue;
       }
-      if (!checkforcmd(&ea.cmd, "noswapfile", 6)) {
+      if (!checkforcmd(&ea.cmd, "noswapfile", 3)) {
         break;
       }
       cmdmod.noswapfile = true;
@@ -1404,12 +1405,18 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       continue;
 
     case 't':   if (checkforcmd(&p, "tab", 3)) {
-        if (ascii_isdigit(*ea.cmd))
-          cmdmod.tab = atoi((char *)ea.cmd) + 1;
-        else
-          cmdmod.tab = tabpage_index(curtab) + 1;
-        ea.cmd = p;
-        continue;
+      long tabnr = get_address(&ea, &ea.cmd, ADDR_TABS, ea.skip, false);
+      if (tabnr == MAXLNUM) {
+        cmdmod.tab = tabpage_index(curtab) + 1;
+      } else {
+        if (tabnr < 0 || tabnr > LAST_TAB_NR) {
+          errormsg = (char_u *)_(e_invrange);
+          goto doend;
+        }
+        cmdmod.tab = tabnr + 1;
+      }
+      ea.cmd = p;
+      continue;
     }
       if (!checkforcmd(&ea.cmd, "topleft", 2))
         break;
@@ -1535,9 +1542,11 @@ static char_u * do_one_cmd(char_u **cmdlinep,
         break;
     }
     ea.cmd = skipwhite(ea.cmd);
-    lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip, ea.addr_count == 0);
-    if (ea.cmd == NULL)                     /* error detected */
+    lnum = get_address(&ea, &ea.cmd, ea.addr_type, ea.skip,
+                       ea.addr_count == 0);
+    if (ea.cmd == NULL) {  // error detected
       goto doend;
+    }
     if (lnum == MAXLNUM) {
       if (*ea.cmd == '%') {                 /* '%' - all lines */
         ++ea.cmd;
@@ -1702,7 +1711,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     xfree(p);
     // If the autocommands did something and didn't cause an error, try
     // finding the command again.
-    p = (ret && !aborting()) ? find_command(&ea, NULL) : NULL;
+    p = (ret && !aborting()) ? find_command(&ea, NULL) : ea.cmd;
   }
 
   if (p == NULL) {
@@ -1718,8 +1727,9 @@ static char_u * do_one_cmd(char_u **cmdlinep,
   if (ea.cmdidx == CMD_SIZE) {
     if (!ea.skip) {
       STRCPY(IObuff, _("E492: Not an editor command"));
-      if (!sourcing)
+      if (!(flags & DOCMD_VERBOSE)) {
         append_command(*cmdlinep);
+      }
       errormsg = IObuff;
       did_emsg_syntax = TRUE;
     }
@@ -1763,11 +1773,8 @@ static char_u * do_one_cmd(char_u **cmdlinep,
 
     if (text_locked() && !(ea.argt & CMDWIN)
         && !IS_USER_CMDIDX(ea.cmdidx)) {
-      /* Command not allowed when editing the command line. */
-      if (cmdwin_type != 0)
-        errormsg = (char_u *)_(e_cmdwin);
-      else
-        errormsg = (char_u *)_(e_secure);
+      // Command not allowed when editing the command line.
+      errormsg = get_text_locked_msg();
       goto doend;
     }
     /* Disallow editing another buffer when "curbuf_lock" is set.
@@ -1804,7 +1811,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
      */
     if (!global_busy && ea.line1 > ea.line2) {
       if (msg_silent == 0) {
-        if (sourcing || exmode_active) {
+        if ((flags & DOCMD_VERBOSE) || exmode_active) {
           errormsg = (char_u *)_("E493: Backwards range given");
           goto doend;
         }
@@ -2216,7 +2223,7 @@ doend:
     curwin->w_cursor.lnum = 1;
 
   if (errormsg != NULL && *errormsg != NUL && !did_emsg) {
-    if (sourcing) {
+    if (flags & DOCMD_VERBOSE) {
       if (errormsg != IObuff) {
         STRCPY(IObuff, errormsg);
         errormsg = IObuff;
@@ -3315,6 +3322,11 @@ set_one_cmd_context (
     xp->xp_pattern = arg;
     break;
 
+  case CMD_packadd:
+    xp->xp_context = EXPAND_PACKADD;
+    xp->xp_pattern = arg;
+    break;
+
 #ifdef HAVE_WORKING_LIBINTL
   case CMD_language:
     p = skiptowhite(arg);
@@ -3842,7 +3854,7 @@ static char_u *replace_makeprg(exarg_T *eap, char_u *p, char_u **cmdlinep)
       ptr = new_cmdline;
       while ((pos = (char_u *)strstr((char *)program, "$*")) != NULL) {
         i = (int)(pos - program);
-        STRNCPY(ptr, program, i);
+        memcpy(ptr, program, i);
         STRCPY(ptr += i, p);
         ptr += len;
         program = pos + 2;
@@ -4355,12 +4367,15 @@ static void ex_autocmd(exarg_T *eap)
  */
 static void ex_doautocmd(exarg_T *eap)
 {
-  char_u      *arg = eap->arg;
+  char_u *arg = eap->arg;
   int call_do_modelines = check_nomodeline(&arg);
+  bool did_aucmd;
 
-  (void)do_doautocmd(arg, TRUE);
-  if (call_do_modelines)    /* Only when there is no <nomodeline>. */
+  (void)do_doautocmd(arg, true, &did_aucmd);
+  // Only when there is no <nomodeline>.
+  if (call_do_modelines && did_aucmd) {
     do_modelines(0);
+  }
 }
 
 /*
@@ -4640,14 +4655,14 @@ static struct {
   char *name;
 } addr_type_complete[] =
 {
-  {ADDR_ARGUMENTS, "arguments"},
-  {ADDR_LINES, "lines"},
-  {ADDR_LOADED_BUFFERS, "loaded_buffers"},
-  {ADDR_TABS, "tabs"},
-  {ADDR_BUFFERS, "buffers"},
-  {ADDR_WINDOWS, "windows"},
-  {ADDR_QUICKFIX, "quickfix"},
-  {-1, NULL}
+  { ADDR_ARGUMENTS, "arguments" },
+  { ADDR_LINES, "lines" },
+  { ADDR_LOADED_BUFFERS, "loaded_buffers" },
+  { ADDR_TABS, "tabs" },
+  { ADDR_BUFFERS, "buffers" },
+  { ADDR_WINDOWS, "windows" },
+  { ADDR_QUICKFIX, "quickfix" },
+  { -1, NULL }
 };
 
 /*
@@ -4659,41 +4674,42 @@ static struct {
   char    *name;
 } command_complete[] =
 {
-  {EXPAND_AUGROUP, "augroup"},
-  {EXPAND_BEHAVE, "behave"},
-  {EXPAND_BUFFERS, "buffer"},
-  {EXPAND_COLORS, "color"},
-  {EXPAND_COMMANDS, "command"},
-  {EXPAND_COMPILER, "compiler"},
-  {EXPAND_CSCOPE, "cscope"},
-  {EXPAND_USER_DEFINED, "custom"},
-  {EXPAND_USER_LIST, "customlist"},
-  {EXPAND_DIRECTORIES, "dir"},
-  {EXPAND_ENV_VARS, "environment"},
-  {EXPAND_EVENTS, "event"},
-  {EXPAND_EXPRESSION, "expression"},
-  {EXPAND_FILES, "file"},
-  {EXPAND_FILES_IN_PATH, "file_in_path"},
-  {EXPAND_FILETYPE, "filetype"},
-  {EXPAND_FUNCTIONS, "function"},
-  {EXPAND_HELP, "help"},
-  {EXPAND_HIGHLIGHT, "highlight"},
-  {EXPAND_HISTORY, "history"},
+  { EXPAND_AUGROUP, "augroup" },
+  { EXPAND_BEHAVE, "behave" },
+  { EXPAND_BUFFERS, "buffer" },
+  { EXPAND_COLORS, "color" },
+  { EXPAND_COMMANDS, "command" },
+  { EXPAND_COMPILER, "compiler" },
+  { EXPAND_CSCOPE, "cscope" },
+  { EXPAND_USER_DEFINED, "custom" },
+  { EXPAND_USER_LIST, "customlist" },
+  { EXPAND_DIRECTORIES, "dir" },
+  { EXPAND_ENV_VARS, "environment" },
+  { EXPAND_EVENTS, "event" },
+  { EXPAND_EXPRESSION, "expression" },
+  { EXPAND_FILES, "file" },
+  { EXPAND_FILES_IN_PATH, "file_in_path" },
+  { EXPAND_FILETYPE, "filetype" },
+  { EXPAND_FUNCTIONS, "function" },
+  { EXPAND_HELP, "help" },
+  { EXPAND_HIGHLIGHT, "highlight" },
+  { EXPAND_HISTORY, "history" },
 #ifdef HAVE_WORKING_LIBINTL
-  {EXPAND_LOCALES, "locale"},
+  { EXPAND_LOCALES, "locale" },
 #endif
-  {EXPAND_MAPPINGS, "mapping"},
-  {EXPAND_MENUS, "menu"},
-  {EXPAND_OWNSYNTAX, "syntax"},
-  {EXPAND_SYNTIME, "syntime"},
-  {EXPAND_SETTINGS, "option"},
-  {EXPAND_SHELLCMD, "shellcmd"},
-  {EXPAND_SIGN, "sign"},
-  {EXPAND_TAGS, "tag"},
-  {EXPAND_TAGS_LISTFILES, "tag_listfiles"},
-  {EXPAND_USER, "user"},
-  {EXPAND_USER_VARS, "var"},
-  {0, NULL}
+  { EXPAND_MAPPINGS, "mapping" },
+  { EXPAND_MENUS, "menu" },
+  { EXPAND_OWNSYNTAX, "syntax" },
+  { EXPAND_SYNTIME, "syntime" },
+  { EXPAND_SETTINGS, "option" },
+  { EXPAND_PACKADD, "packadd" },
+  { EXPAND_SHELLCMD, "shellcmd" },
+  { EXPAND_SIGN, "sign" },
+  { EXPAND_TAGS, "tag" },
+  { EXPAND_TAGS_LISTFILES, "tag_listfiles" },
+  { EXPAND_USER, "user" },
+  { EXPAND_USER_VARS, "var" },
+  { 0, NULL }
 };
 
 static void uc_list(char_u *name, size_t name_len)
@@ -5146,6 +5162,24 @@ static char_u *uc_split_args(char_u *arg, size_t *lenp)
   return buf;
 }
 
+static size_t add_cmd_modifier(char_u *buf, char *mod_str, bool *multi_mods)
+{
+  size_t result = STRLEN(mod_str);
+  if (*multi_mods) {
+    result++;
+  }
+
+  if (buf != NULL) {
+    if (*multi_mods) {
+      STRCAT(buf, " ");
+    }
+    STRCAT(buf, mod_str);
+  }
+
+  *multi_mods = true;
+  return result;
+}
+
 /*
  * Check for a <> code in a user command.
  * "code" points to the '<'.  "len" the length of the <> (inclusive).
@@ -5170,8 +5204,8 @@ uc_check_code (
   char_u      *p = code + 1;
   size_t l = len - 2;
   int quote = 0;
-  enum { ct_ARGS, ct_BANG, ct_COUNT, ct_LINE1, ct_LINE2, ct_REGISTER,
-         ct_LT, ct_NONE } type = ct_NONE;
+  enum { ct_ARGS, ct_BANG, ct_COUNT, ct_LINE1, ct_LINE2, ct_MODS,
+  ct_REGISTER, ct_LT, ct_NONE } type = ct_NONE;
 
   if ((vim_strchr((char_u *)"qQfF", *p) != NULL) && p[1] == '-') {
     quote = (*p == 'q' || *p == 'Q') ? 1 : 2;
@@ -5179,23 +5213,26 @@ uc_check_code (
     l -= 2;
   }
 
-  ++l;
-  if (l <= 1)
+  l++;
+  if (l <= 1) {
     type = ct_NONE;
-  else if (STRNICMP(p, "args>", l) == 0)
+  } else if (STRNICMP(p, "args>", l) == 0) {
     type = ct_ARGS;
-  else if (STRNICMP(p, "bang>", l) == 0)
+  } else if (STRNICMP(p, "bang>", l) == 0) {
     type = ct_BANG;
-  else if (STRNICMP(p, "count>", l) == 0)
+  } else if (STRNICMP(p, "count>", l) == 0) {
     type = ct_COUNT;
-  else if (STRNICMP(p, "line1>", l) == 0)
+  } else if (STRNICMP(p, "line1>", l) == 0) {
     type = ct_LINE1;
-  else if (STRNICMP(p, "line2>", l) == 0)
+  } else if (STRNICMP(p, "line2>", l) == 0) {
     type = ct_LINE2;
-  else if (STRNICMP(p, "lt>", l) == 0)
+  } else if (STRNICMP(p, "lt>", l) == 0) {
     type = ct_LT;
-  else if (STRNICMP(p, "reg>", l) == 0 || STRNICMP(p, "register>", l) == 0)
+  } else if (STRNICMP(p, "reg>", l) == 0 || STRNICMP(p, "register>", l) == 0) {
     type = ct_REGISTER;
+  } else if (STRNICMP(p, "mods>", l) == 0) {
+    type = ct_MODS;
+  }
 
   switch (type) {
   case ct_ARGS:
@@ -5303,6 +5340,87 @@ uc_check_code (
     break;
   }
 
+  case ct_MODS:
+  {
+    result = quote ? 2 : 0;
+    if (buf != NULL) {
+      if (quote) {
+        *buf++ = '"';
+      }
+      *buf = '\0';
+    }
+
+    bool multi_mods = false;
+
+    // :aboveleft and :leftabove
+    if (cmdmod.split & WSP_ABOVE) {
+      result += add_cmd_modifier(buf, "aboveleft", &multi_mods);
+    }
+    // :belowright and :rightbelow
+    if (cmdmod.split & WSP_BELOW) {
+      result += add_cmd_modifier(buf, "belowright", &multi_mods);
+    }
+    // :botright
+    if (cmdmod.split & WSP_BOT) {
+      result += add_cmd_modifier(buf, "botright", &multi_mods);
+    }
+
+    typedef struct {
+      bool *set;
+      char *name;
+    } mod_entry_T;
+    static mod_entry_T mod_entries[] = {
+      { &cmdmod.browse, "browse" },
+      { &cmdmod.confirm, "confirm" },
+      { &cmdmod.hide, "hide" },
+      { &cmdmod.keepalt, "keepalt" },
+      { &cmdmod.keepjumps, "keepjumps" },
+      { &cmdmod.keepmarks, "keepmarks" },
+      { &cmdmod.keeppatterns, "keeppatterns" },
+      { &cmdmod.lockmarks, "lockmarks" },
+      { &cmdmod.noswapfile, "noswapfile" }
+    };
+    // the modifiers that are simple flags
+    for (size_t i = 0; i < ARRAY_SIZE(mod_entries); i++) {
+      if (*mod_entries[i].set) {
+        result += add_cmd_modifier(buf, mod_entries[i].name, &multi_mods);
+      }
+    }
+
+    // TODO(vim): How to support :noautocmd?
+    // TODO(vim): How to support :sandbox?
+
+    // :silent
+    if (msg_silent > 0) {
+      result += add_cmd_modifier(buf, emsg_silent > 0 ? "silent!" : "silent",
+                                 &multi_mods);
+    }
+    // :tab
+    if (cmdmod.tab > 0) {
+      result += add_cmd_modifier(buf, "tab", &multi_mods);
+    }
+    // :topleft
+    if (cmdmod.split & WSP_TOP) {
+      result += add_cmd_modifier(buf, "topleft", &multi_mods);
+    }
+
+    // TODO(vim): How to support :unsilent?
+
+    // :verbose
+    if (p_verbose > 0) {
+      result += add_cmd_modifier(buf, "verbose", &multi_mods);
+    }
+    // :vertical
+    if (cmdmod.split & WSP_VERT) {
+      result += add_cmd_modifier(buf, "vertical", &multi_mods);
+    }
+    if (quote && buf != NULL) {
+      buf += result - 2;
+      *buf = '"';
+    }
+    break;
+  }
+
   case ct_REGISTER:
     result = eap->regname ? 1 : 0;
     if (quote)
@@ -5590,6 +5708,17 @@ int parse_compl_arg(char_u *value, int vallen, int *complp,
   return OK;
 }
 
+int cmdcomplete_str_to_type(char_u *complete_str)
+{
+    for (int i = 0; command_complete[i].expand != 0; i++) {
+      if (STRCMP(complete_str, command_complete[i].name) == 0) {
+        return command_complete[i].expand;
+      }
+    }
+
+    return EXPAND_NOTHING;
+}
+
 static void ex_colorscheme(exarg_T *eap)
 {
   if (*eap->arg == NUL) {
@@ -6601,11 +6730,6 @@ do_exedit (
         old_curwin == NULL ? curwin : NULL);
   } else if ((eap->cmdidx != CMD_split && eap->cmdidx != CMD_vsplit)
              || *eap->arg != NUL) {
-    // ":edit <blank>" is a no-op in terminal buffers. #2822
-    if (curbuf->terminal != NULL && eap->cmdidx == CMD_edit && *eap->arg == NUL) {
-      return;
-    }
-
     /* Can't edit another file when "curbuf_lock" is set.  Only ":edit"
      * can bring us here, others are stopped earlier. */
     if (*eap->arg != NUL && curbuf_locked())
@@ -6786,9 +6910,10 @@ static void ex_read(exarg_T *eap)
           eap->line2, (linenr_T)0, (linenr_T)MAXLNUM, eap, 0);
 
     }
-    if (i == FAIL) {
-      if (!aborting())
+    if (i != OK) {
+      if (!aborting()) {
         EMSG2(_(e_notopen), eap->arg);
+      }
     } else {
       if (empty && exmode_active) {
         /* Delete the empty line that remains.  Historically ex does
@@ -6865,13 +6990,14 @@ void post_chdir(CdScope scope)
       curwin->w_localdir = vim_strsave(NameBuff);
     }
     break;
+  case kCdScopeInvalid:
+    // We should never get here
+    assert(false);
   }
 
   shorten_fnames(TRUE);
 }
 
-
-
 /// `:cd`, `:tcd`, `:lcd`, `:chdir`, `:tchdir` and `:lchdir`.
 void ex_cd(exarg_T *eap)
 {
@@ -6913,30 +7039,31 @@ void ex_cd(exarg_T *eap)
       new_dir = NameBuff;
     }
 #endif
-    if (vim_chdir(new_dir)) {
-      EMSG(_(e_failed));
-    } else {
-      CdScope scope = kCdScopeGlobal;  // Depends on command invoked
+    CdScope scope = kCdScopeGlobal;  // Depends on command invoked
 
-      switch (eap->cmdidx) {
-      case CMD_tcd:
-      case CMD_tchdir:
-        scope = kCdScopeTab;
-        break;
-      case CMD_lcd:
-      case CMD_lchdir:
-        scope = kCdScopeWindow;
-        break;
-      default:
-        break;
-      }
+    switch (eap->cmdidx) {
+    case CMD_tcd:
+    case CMD_tchdir:
+      scope = kCdScopeTab;
+      break;
+    case CMD_lcd:
+    case CMD_lchdir:
+      scope = kCdScopeWindow;
+      break;
+    default:
+      break;
+    }
 
+    if (vim_chdir(new_dir, scope)) {
+      EMSG(_(e_failed));
+    } else {
       post_chdir(scope);
-
-      /* Echo the new current directory if the command was typed. */
-      if (KeyTyped || p_verbose >= 5)
+      // Echo the new current directory if the command was typed.
+      if (KeyTyped || p_verbose >= 5) {
         ex_pwd(eap);
+      }
     }
+
     xfree(tofree);
   }
 }
@@ -6989,10 +7116,10 @@ static void ex_sleep(exarg_T *eap)
  */
 void do_sleep(long msec)
 {
-  long done;
   ui_flush();  // flush before waiting
-  for (done = 0; !got_int && done < msec; done += 1000L) {
-    os_delay(msec - done > 1000L ? 1000L : msec - done, true);
+  for (long left = msec; !got_int && left > 0; left -= 1000L) {
+    int next = left > 1000l ? 1000 : (int)left;
+    LOOP_PROCESS_EVENTS_UNTIL(&main_loop, main_loop.events, (int)next, got_int);
     os_breakcheck();
   }
 }
@@ -7122,8 +7249,8 @@ static void ex_put(exarg_T *eap)
     eap->forceit = TRUE;
   }
   curwin->w_cursor.lnum = eap->line2;
-  do_put(eap->regname, NULL, eap->forceit ? BACKWARD : FORWARD, 1L,
-      PUT_LINE|PUT_CURSLINE);
+  do_put(eap->regname, NULL, eap->forceit ? BACKWARD : FORWARD, 1,
+         PUT_LINE|PUT_CURSLINE);
 }
 
 /*
@@ -7132,7 +7259,7 @@ static void ex_put(exarg_T *eap)
 static void ex_copymove(exarg_T *eap)
 {
   long n = get_address(eap, &eap->arg, eap->addr_type, false, false);
-  if (eap->arg == NULL) {           /* error detected */
+  if (eap->arg == NULL) {  // error detected
     eap->nextcmd = NULL;
     return;
   }
@@ -7168,15 +7295,13 @@ void ex_may_print(exarg_T *eap)
   }
 }
 
-/*
- * ":smagic" and ":snomagic".
- */
+/// ":smagic" and ":snomagic".
 static void ex_submagic(exarg_T *eap)
 {
   int magic_save = p_magic;
 
   p_magic = (eap->cmdidx == CMD_smagic);
-  do_sub(eap);
+  ex_substitute(eap);
   p_magic = magic_save;
 }
 
@@ -7351,10 +7476,11 @@ static void ex_redir(exarg_T *eap)
           /* Can use both "@a" and "@a>". */
           if (*arg == '>')
             arg++;
-          /* Make register empty when not using @A-@Z and the
-           * command is valid. */
-          if (*arg == NUL && !isupper(redir_reg))
-            write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
+          // Make register empty when not using @A-@Z and the
+          // command is valid.
+          if (*arg == NUL && !isupper(redir_reg)) {
+            write_reg_contents(redir_reg, (char_u *)"", 0, false);
+          }
         }
       }
       if (*arg != NUL) {
@@ -7645,7 +7771,7 @@ open_exfile (
     return NULL;
   }
 #endif
-  if (!forceit && *mode != 'a' && os_file_exists(fname)) {
+  if (!forceit && *mode != 'a' && os_path_exists(fname)) {
     EMSG2(_("E189: \"%s\" exists (add ! to override)"), fname);
     return NULL;
   }
@@ -7792,9 +7918,8 @@ static void ex_normal(exarg_T *eap)
   if (force_restart_edit) {
     force_restart_edit = false;
   } else {
-    // some function called was aware of ex_normal and decided to override the
-    // value of restart_edit anyway. So far only used in terminal mode(see
-    // terminal_enter() in edit.c)
+    // Some function (terminal_enter()) was aware of ex_normal and decided to
+    // override the value of restart_edit anyway.
     restart_edit = save_restart_edit;
   }
   p_im = save_insertmode;
@@ -7846,7 +7971,8 @@ static void ex_startinsert(exarg_T *eap)
 static void ex_stopinsert(exarg_T *eap)
 {
   restart_edit = 0;
-  stop_insert_mode = TRUE;
+  stop_insert_mode = true;
+  clearmode();
 }
 
 /*
@@ -7855,19 +7981,26 @@ static void ex_stopinsert(exarg_T *eap)
  */
 void exec_normal_cmd(char_u *cmd, int remap, bool silent)
 {
+  // Stuff the argument into the typeahead buffer.
+  ins_typebuf(cmd, remap, 0, true, silent);
+  exec_normal(false);
+}
+
+/// Execute normal_cmd() until there is no typeahead left.
+///
+/// @param was_typed whether or not something was typed
+void exec_normal(bool was_typed)
+{
   oparg_T oa;
 
-  /*
-   * Stuff the argument into the typeahead buffer.
-   * Execute normal_cmd() until there is no typeahead left.
-   */
   clear_oparg(&oa);
-  finish_op = FALSE;
-  ins_typebuf(cmd, remap, 0, TRUE, silent);
-  while ((!stuff_empty() || (!typebuf_typed() && typebuf.tb_len > 0))
+  finish_op = false;
+  while ((!stuff_empty()
+          || ((was_typed || !typebuf_typed())
+              && typebuf.tb_len > 0))
          && !got_int) {
     update_topline_cursor();
-    normal_cmd(&oa, TRUE);      /* execute a Normal mode cmd */
+    normal_cmd(&oa, true);      // execute a Normal mode cmd
   }
 }
 
@@ -8622,17 +8755,18 @@ makeopens (
     if (put_line(fd, "wincmd t") == FAIL)
       return FAIL;
 
-    /*
-     * If more than one window, see if sizes can be restored.
-     * First set 'winheight' and 'winwidth' to 1 to avoid the windows being
-     * resized when moving between windows.
-     * Do this before restoring the view, so that the topline and the
-     * cursor can be set.  This is done again below.
-     */
-    if (put_line(fd, "set winheight=1 winwidth=1") == FAIL)
+    // If more than one window, see if sizes can be restored.
+    // First set 'winheight' and 'winwidth' to 1 to avoid the windows being
+    // resized when moving between windows.
+    // Do this before restoring the view, so that the topline and the
+    // cursor can be set.  This is done again below.
+    if (put_line(fd, "set winminheight=1 winminwidth=1 winheight=1 winwidth=1")
+        == FAIL) {
       return FAIL;
-    if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
+    }
+    if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL) {
       return FAIL;
+    }
 
     /*
      * Restore the view of the window (options, file, cursor, etc.).
@@ -8696,11 +8830,18 @@ makeopens (
   if (put_line(fd, "unlet! s:wipebuf") == FAIL)
     return FAIL;
 
-  /* Re-apply 'winheight', 'winwidth' and 'shortmess'. */
-  if (fprintf(fd, "set winheight=%" PRId64 " winwidth=%" PRId64 " shortmess=%s",
-          (int64_t)p_wh, (int64_t)p_wiw, p_shm) < 0
-      || put_eol(fd) == FAIL)
+  // Re-apply options.
+  if (fprintf(fd, "set winheight=%" PRId64 " winwidth=%" PRId64
+                  " winminheight=%" PRId64 " winminwidth=%" PRId64
+                  " shortmess=%s",
+              (int64_t)p_wh,
+              (int64_t)p_wiw,
+              (int64_t)p_wmh,
+              (int64_t)p_wmw,
+              p_shm) < 0
+      || put_eol(fd) == FAIL) {
     return FAIL;
+  }
 
   /*
    * Lastly, execute the x.vim file if it exists.
@@ -9318,33 +9459,33 @@ static void ex_filetype(exarg_T *eap)
   }
   if (STRCMP(arg, "on") == 0 || STRCMP(arg, "detect") == 0) {
     if (*arg == 'o' || !filetype_detect) {
-      source_runtime((char_u *)FILETYPE_FILE, true);
+      source_runtime((char_u *)FILETYPE_FILE, DIP_ALL);
       filetype_detect = kTrue;
       if (plugin) {
-        source_runtime((char_u *)FTPLUGIN_FILE, true);
+        source_runtime((char_u *)FTPLUGIN_FILE, DIP_ALL);
         filetype_plugin = kTrue;
       }
       if (indent) {
-        source_runtime((char_u *)INDENT_FILE, true);
+        source_runtime((char_u *)INDENT_FILE, DIP_ALL);
         filetype_indent = kTrue;
       }
     }
     if (*arg == 'd') {
-      (void)do_doautocmd((char_u *)"filetypedetect BufRead", TRUE);
+      (void)do_doautocmd((char_u *)"filetypedetect BufRead", true, NULL);
       do_modelines(0);
     }
   } else if (STRCMP(arg, "off") == 0) {
     if (plugin || indent) {
       if (plugin) {
-        source_runtime((char_u *)FTPLUGOF_FILE, true);
+        source_runtime((char_u *)FTPLUGOF_FILE, DIP_ALL);
         filetype_plugin = kFalse;
       }
       if (indent) {
-        source_runtime((char_u *)INDOFF_FILE, true);
+        source_runtime((char_u *)INDOFF_FILE, DIP_ALL);
         filetype_indent = kFalse;
       }
     } else {
-      source_runtime((char_u *)FTOFF_FILE, true);
+      source_runtime((char_u *)FTOFF_FILE, DIP_ALL);
       filetype_detect = kFalse;
     }
   } else
@@ -9481,20 +9622,15 @@ static void ex_foldopen(exarg_T *eap)
 
 static void ex_folddo(exarg_T *eap)
 {
-  linenr_T lnum;
-
-  start_global_changes();
-
-  /* First set the marks for all lines closed/open. */
-  for (lnum = eap->line1; lnum <= eap->line2; ++lnum)
-    if (hasFolding(lnum, NULL, NULL) == (eap->cmdidx == CMD_folddoclosed))
+  // First set the marks for all lines closed/open.
+  for (linenr_T lnum = eap->line1; lnum <= eap->line2; ++lnum) {
+    if (hasFolding(lnum, NULL, NULL) == (eap->cmdidx == CMD_folddoclosed)) {
       ml_setmarked(lnum);
+    }
+  }
 
-  /* Execute the command on the marked lines. */
-  global_exe(eap->arg);
-  ml_clearmarked();        /* clear rest of the marks */
-
-  end_global_changes();
+  global_exe(eap->arg);  // Execute the command on the marked lines.
+  ml_clearmarked();      // clear rest of the marks
 }
 
 static void ex_terminal(exarg_T *eap)
@@ -9520,3 +9656,38 @@ static void ex_terminal(exarg_T *eap)
     xfree(name);
   }
 }
+
+/// Checks if `cmd` is "previewable" (i.e. supported by 'inccommand').
+///
+/// @param[in] cmd Commandline to check. May start with a range.
+///
+/// @return true if `cmd` is previewable
+bool cmd_can_preview(char_u *cmd)
+{
+  if (cmd == NULL) {
+    return false;
+  }
+
+  exarg_T ea;
+  // parse the command line
+  ea.cmd = skip_range(cmd, NULL);
+  if (*ea.cmd == '*') {
+    ea.cmd = skipwhite(ea.cmd + 1);
+  }
+  char_u *end = find_command(&ea, NULL);
+
+  switch (ea.cmdidx) {
+    case CMD_substitute:
+    case CMD_smagic:
+    case CMD_snomagic:
+      // Only preview once the pattern delimiter has been typed
+      if (*end && !ASCII_ISALNUM(*end)) {
+        return true;
+      }
+      break;
+    default:
+      break;
+  }
+
+  return false;
+}
diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h
index dbfc64e2f1..4def4cbbae 100644
--- a/src/nvim/ex_docmd.h
+++ b/src/nvim/ex_docmd.h
@@ -3,13 +3,13 @@
 
 #include "nvim/ex_cmds_defs.h"
 
-/* flags for do_cmdline() */
-#define DOCMD_VERBOSE   0x01    /* included command in error message */
-#define DOCMD_NOWAIT    0x02    /* don't call wait_return() and friends */
-#define DOCMD_REPEAT    0x04    /* repeat exec. until getline() returns NULL */
-#define DOCMD_KEYTYPED  0x08    /* don't reset KeyTyped */
-#define DOCMD_EXCRESET  0x10    /* reset exception environment (for debugging)*/
-#define DOCMD_KEEPLINE  0x20    /* keep typed line for repeating with "." */
+// flags for do_cmdline()
+#define DOCMD_VERBOSE   0x01      // included command in error message
+#define DOCMD_NOWAIT    0x02      // don't call wait_return() and friends
+#define DOCMD_REPEAT    0x04      // repeat exec. until getline() returns NULL
+#define DOCMD_KEYTYPED  0x08      // don't reset KeyTyped
+#define DOCMD_EXCRESET  0x10      // reset exception environment (for debugging
+#define DOCMD_KEEPLINE  0x20      // keep typed line for repeating with "."
 
 /* defines for eval_vars() */
 #define VALID_PATH              1
@@ -19,20 +19,6 @@
 #define EXMODE_NORMAL           1
 #define EXMODE_VIM              2
 
-/// The scope of a working-directory command like `:cd`.
-///
-/// Scopes are enumerated from lowest to highest. When adding a scope make sure
-/// to update all functions using scopes as well, such as the implementation of
-/// `getcwd()`. When using scopes as limits (e.g. in loops) don't use the scopes
-/// directly, use `MIN_CD_SCOPE` and `MAX_CD_SCOPE` instead.
-typedef enum {
-  kCdScopeWindow,  ///< Affects one window.
-  kCdScopeTab,     ///< Affects one tab page.
-  kCdScopeGlobal,  ///< Affects the entire instance of Neovim.
-} CdScope;
-#define MIN_CD_SCOPE  kCdScopeWindow
-#define MAX_CD_SCOPE  kCdScopeGlobal
-
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_docmd.h.generated.h"
 #endif
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 82d4c2b2d5..f518fa0d66 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -15,7 +15,6 @@
 #include "nvim/ex_cmds2.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/regexp.h"
 #include "nvim/strings.h"
diff --git a/src/nvim/ex_eval.h b/src/nvim/ex_eval.h
index 30871c7711..f61e01d25b 100644
--- a/src/nvim/ex_eval.h
+++ b/src/nvim/ex_eval.h
@@ -23,19 +23,19 @@ struct eslist_elem {
 #define CSTACK_LEN      50
 
 struct condstack {
-  short cs_flags[CSTACK_LEN];           /* CSF_ flags */
-  char cs_pending[CSTACK_LEN];          /* CSTP_: what's pending in ":finally"*/
+  int cs_flags[CSTACK_LEN];             // CSF_ flags
+  char cs_pending[CSTACK_LEN];          // CSTP_: what's pending in ":finally"
   union {
-    void    *csp_rv[CSTACK_LEN];        /* return typeval for pending return */
-    void    *csp_ex[CSTACK_LEN];        /* exception for pending throw */
+    void    *csp_rv[CSTACK_LEN];        // return typeval for pending return
+    void    *csp_ex[CSTACK_LEN];        // exception for pending throw
   }           cs_pend;
-  void        *cs_forinfo[CSTACK_LEN];   /* info used by ":for" */
-  int cs_line[CSTACK_LEN];              /* line nr of ":while"/":for" line */
-  int cs_idx;                           /* current entry, or -1 if none */
-  int cs_looplevel;                     /* nr of nested ":while"s and ":for"s */
-  int cs_trylevel;                      /* nr of nested ":try"s */
-  eslist_T    *cs_emsg_silent_list;     /* saved values of "emsg_silent" */
-  char cs_lflags;                       /* loop flags: CSL_ flags */
+  void        *cs_forinfo[CSTACK_LEN];  // info used by ":for"
+  int cs_line[CSTACK_LEN];              // line nr of ":while"/":for" line
+  int cs_idx;                           // current entry, or -1 if none
+  int cs_looplevel;                     // nr of nested ":while"s and ":for"s
+  int cs_trylevel;                      // nr of nested ":try"s
+  eslist_T    *cs_emsg_silent_list;     // saved values of "emsg_silent"
+  int cs_lflags;                        // loop flags: CSL_ flags
 };
 # define cs_rettv       cs_pend.csp_rv
 # define cs_exception   cs_pend.csp_ex
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index a4e5a4dcd7..dba7a73814 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -34,7 +34,6 @@
 #include "nvim/menu.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/cursor_shape.h"
 #include "nvim/keymap.h"
@@ -96,19 +95,20 @@ typedef struct command_line_state {
   char_u *lookfor;                      // string to match
   int hiscnt;                           // current history line in use
   int histype;                          // history type to be used
-  pos_T old_cursor;
-  colnr_T old_curswant;
-  colnr_T old_leftcol;
-  linenr_T old_topline;
-  int old_topfill;
-  linenr_T old_botline;
+  pos_T     old_cursor;
+  colnr_T   old_curswant;
+  colnr_T   old_leftcol;
+  linenr_T  old_topline;
+  int       old_topfill;
+  linenr_T  old_botline;
   int did_incsearch;
   int incsearch_postponed;
   int did_wild_list;                    // did wild_list() recently
   int wim_index;                        // index in wim_flags[]
   int res;
-  int save_msg_scroll;
-  int save_State;                       // remember State when called
+  int       save_msg_scroll;
+  int       save_State;                 // remember State when called
+  char_u   *save_p_icm;
   int some_key_typed;                   // one of the keys was typed
   // mouse drag and release events are ignored, unless they are
   // preceded with a mouse down event
@@ -160,6 +160,7 @@ static uint8_t *command_line_enter(int firstc, long count, int indent)
   s->indent = indent;
   s->save_msg_scroll = msg_scroll;
   s->save_State = State;
+  s->save_p_icm = vim_strsave(p_icm);
   s->ignore_drag_release = true;
 
   if (s->firstc == -1) {
@@ -324,9 +325,12 @@ static uint8_t *command_line_enter(int firstc, long count, int indent)
     need_wait_return = false;
   }
 
+  set_string_option_direct((char_u *)"icm", -1, s->save_p_icm, OPT_FREE,
+                           SID_NONE);
   State = s->save_State;
   setmouse();
   ui_cursor_shape();            // may show different cursor shape
+  xfree(s->save_p_icm);
 
   {
     char_u *p = ccline.cmdbuff;
@@ -358,7 +362,8 @@ static int command_line_execute(VimState *state, int key)
   s->c = key;
 
   if (s->c == K_EVENT) {
-    queue_process_events(loop.events);
+    multiqueue_process_events(main_loop.events);
+    redrawcmdline();
     return 1;
   }
 
@@ -981,7 +986,6 @@ static int command_line_handle_key(CommandLineState *s)
     status_redraw_curbuf();
     return command_line_not_changed(s);
 
-  // case '@':   only in very old vi
   case Ctrl_U:
     // delete all characters left of the cursor
     s->j = ccline.cmdpos;
@@ -996,7 +1000,6 @@ static int command_line_handle_key(CommandLineState *s)
     redrawcmd();
     return command_line_changed(s);
 
-
   case ESC:           // get here if p_wc != ESC or when ESC typed twice
   case Ctrl_C:
     // In exmode it doesn't make sense to return.  Except when
@@ -1489,11 +1492,11 @@ static int command_line_handle_key(CommandLineState *s)
 
 static int command_line_not_changed(CommandLineState *s)
 {
-  // This part implements incremental searches for "/" and "?" Jump to
-  // cmdline_not_changed when a character has been read but the command line
-  // did not change. Then we only search and redraw if something changed in
-  // the past.  Jump to cmdline_changed when the command line did change.
-  // (Sorry for the goto's, I know it is ugly).
+  // Incremental searches for "/" and "?":
+  // Enter command_line_not_changed() when a character has been read but the
+  // command line did not change. Then we only search and redraw if something
+  // changed in the past.
+  // Enter command_line_changed() when the command line did change.
   if (!s->incsearch_postponed) {
     return 1;
   }
@@ -1591,6 +1594,36 @@ static int command_line_changed(CommandLineState *s)
     msg_starthere();
     redrawcmdline();
     s->did_incsearch = true;
+  } else if (s->firstc == ':'
+             && current_SID == 0    // only if interactive
+             && *p_icm != NUL       // 'inccommand' is set
+             && curbuf->b_p_ma      // buffer is modifiable
+             && cmdline_star == 0   // not typing a password
+             && cmd_can_preview(ccline.cmdbuff)
+             && !vpeekc_any()) {
+    // Show 'inccommand' preview. It works like this:
+    //    1. Do the command.
+    //    2. Command implementation detects CMDPREVIEW state, then:
+    //       - Update the screen while the effects are in place.
+    //       - Immediately undo the effects.
+    State |= CMDPREVIEW;
+    emsg_silent++;  // Block error reporting as the command may be incomplete
+    do_cmdline(ccline.cmdbuff, NULL, NULL, DOCMD_KEEPLINE|DOCMD_NOWAIT);
+    emsg_silent--;  // Unblock error reporting
+
+    // Restore the window "view".
+    curwin->w_cursor   = s->old_cursor;
+    curwin->w_curswant = s->old_curswant;
+    curwin->w_leftcol  = s->old_leftcol;
+    curwin->w_topline  = s->old_topline;
+    curwin->w_topfill  = s->old_topfill;
+    curwin->w_botline  = s->old_botline;
+    update_topline();
+
+    redrawcmdline();
+  } else if (State & CMDPREVIEW) {
+    State = (State & ~CMDPREVIEW);
+    update_screen(SOME_VALID);  // Clear 'inccommand' preview.
   }
 
   if (cmdmsg_rl || (p_arshape && !p_tbidi && enc_utf8)) {
@@ -1688,10 +1721,15 @@ int text_locked(void) {
  */
 void text_locked_msg(void)
 {
-  if (cmdwin_type != 0)
-    EMSG(_(e_cmdwin));
-  else
-    EMSG(_(e_secure));
+  EMSG(_(get_text_locked_msg()));
+}
+
+char_u * get_text_locked_msg(void) {
+  if (cmdwin_type != 0) {
+    return e_cmdwin;
+  } else {
+    return e_secure;
+  }
 }
 
 /*
@@ -2548,10 +2586,9 @@ static void cmdline_del(int from)
   ccline.cmdpos = from;
 }
 
-/*
- * this function is called when the screen size changes and with incremental
- * search
- */
+// This function is called when the screen size changes and with incremental
+// search and in other situations where the command line may have been
+// overwritten.
 void redrawcmdline(void)
 {
   if (cmd_silent)
@@ -3439,6 +3476,7 @@ addstar (
         || context == EXPAND_COMPILER
         || context == EXPAND_OWNSYNTAX
         || context == EXPAND_FILETYPE
+        || context == EXPAND_PACKADD
         || (context == EXPAND_TAGS && fname[0] == '/'))
       retval = vim_strnsave(fname, len);
     else {
@@ -3577,15 +3615,16 @@ static void set_expand_context(expand_T *xp)
     xp->xp_context = EXPAND_NOTHING;
     return;
   }
-  set_cmd_context(xp, ccline.cmdbuff, ccline.cmdlen, ccline.cmdpos);
+  set_cmd_context(xp, ccline.cmdbuff, ccline.cmdlen, ccline.cmdpos, true);
 }
 
 void 
 set_cmd_context (
     expand_T *xp,
-    char_u *str,           /* start of command line */
-    int len,                    /* length of command line (excl. NUL) */
-    int col                    /* position of cursor */
+    char_u *str,           // start of command line
+    int len,               // length of command line (excl. NUL)
+    int col,               // position of cursor
+    int use_ccline         // use ccline for info
 )
 {
   int old_char = NUL;
@@ -3600,10 +3639,10 @@ set_cmd_context (
   str[col] = NUL;
   nextcomm = str;
 
-  if (ccline.cmdfirstc == '=') {
-    /* pass CMD_SIZE because there is no real command */
+  if (use_ccline && ccline.cmdfirstc == '=') {
+    // pass CMD_SIZE because there is no real command
     set_context_for_expression(xp, str, CMD_SIZE);
-  } else if (ccline.input_fn) {
+  } else if (use_ccline && ccline.input_fn) {
     xp->xp_context = ccline.xp_context;
     xp->xp_pattern = ccline.cmdbuff;
     xp->xp_arg = ccline.xp_arg;
@@ -3668,27 +3707,54 @@ expand_cmdline (
   return EXPAND_OK;
 }
 
-/*
- * Cleanup matches for help tags: remove "@en" if "en" is the only language.
- */
-
+// Cleanup matches for help tags:
+// Remove "@ab" if the top of 'helplang' is "ab" and the language of the first
+// tag matches it.  Otherwise remove "@en" if "en" is the only language.
 static void cleanup_help_tags(int num_file, char_u **file)
 {
-  int i, j;
-  int len;
+  char_u buf[4];
+  char_u *p = buf;
 
-  for (i = 0; i < num_file; ++i) {
-    len = (int)STRLEN(file[i]) - 3;
-    if (len > 0 && STRCMP(file[i] + len, "@en") == 0) {
-      /* Sorting on priority means the same item in another language may
-       * be anywhere.  Search all items for a match up to the "@en". */
-      for (j = 0; j < num_file; ++j)
+  if (p_hlg[0] != NUL && (p_hlg[0] != 'e' || p_hlg[1] != 'n')) {
+    *p++ = '@';
+    *p++ = p_hlg[0];
+    *p++ = p_hlg[1];
+  }
+  *p = NUL;
+
+  for (int i = 0; i < num_file; i++) {
+    int len = (int)STRLEN(file[i]) - 3;
+    if (len <= 0) {
+      continue;
+    }
+    if (STRCMP(file[i] + len, "@en") == 0) {
+      // Sorting on priority means the same item in another language may
+      // be anywhere.  Search all items for a match up to the "@en".
+      int j;
+      for (j = 0; j < num_file; j++) {
         if (j != i
             && (int)STRLEN(file[j]) == len + 3
-            && STRNCMP(file[i], file[j], len + 1) == 0)
+            && STRNCMP(file[i], file[j], len + 1) == 0) {
           break;
-      if (j == num_file)
+        }
+      }
+      if (j == num_file) {
+        // item only exists with @en, remove it
         file[i][len] = NUL;
+      }
+    }
+  }
+
+  if (*buf != NUL) {
+    for (int i = 0; i < num_file; i++) {
+      int len = (int)STRLEN(file[i]) - 3;
+      if (len <= 0) {
+        continue;
+      }
+      if (STRCMP(file[i] + len, buf) == 0) {
+        // remove the default language
+        file[i][len] = NUL;
+      }
     }
   }
 }
@@ -3793,23 +3859,27 @@ ExpandFromContext (
       || xp->xp_context == EXPAND_TAGS_LISTFILES)
     return expand_tags(xp->xp_context == EXPAND_TAGS, pat, num_file, file);
   if (xp->xp_context == EXPAND_COLORS) {
-    char *directories[] = {"colors", NULL};
-    return ExpandRTDir(pat, num_file, file, directories);
+    char *directories[] = { "colors", NULL };
+    return ExpandRTDir(pat, DIP_START + DIP_OPT, num_file, file, directories);
   }
   if (xp->xp_context == EXPAND_COMPILER) {
-    char *directories[] = {"compiler", NULL};
-    return ExpandRTDir(pat, num_file, file, directories);
+    char *directories[] = { "compiler", NULL };
+    return ExpandRTDir(pat, 0, num_file, file, directories);
   }
   if (xp->xp_context == EXPAND_OWNSYNTAX) {
-    char *directories[] = {"syntax", NULL};
-    return ExpandRTDir(pat, num_file, file, directories);
+    char *directories[] = { "syntax", NULL };
+    return ExpandRTDir(pat, 0, num_file, file, directories);
   }
   if (xp->xp_context == EXPAND_FILETYPE) {
-    char *directories[] = {"syntax", "indent", "ftplugin", NULL};
-    return ExpandRTDir(pat, num_file, file, directories);
+    char *directories[] = { "syntax", "indent", "ftplugin", NULL };
+    return ExpandRTDir(pat, 0, num_file, file, directories);
   }
-  if (xp->xp_context == EXPAND_USER_LIST)
+  if (xp->xp_context == EXPAND_USER_LIST) {
     return ExpandUserList(xp, num_file, file);
+  }
+  if (xp->xp_context == EXPAND_PACKADD) {
+    return ExpandPackAddDir(pat, num_file, file);
+  }
 
   regmatch.regprog = vim_regcomp(pat, p_magic ? RE_MAGIC : 0);
   if (regmatch.regprog == NULL)
@@ -4189,12 +4259,16 @@ static int ExpandUserList(expand_T *xp, int *num_file, char_u ***file)
   return OK;
 }
 
-/*
- * Expand color scheme, compiler or filetype names:
- * 'runtimepath'/{dirnames}/{pat}.vim
- * "dirnames" is an array with one or more directory names.
- */
-static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirnames[])
+/// Expand color scheme, compiler or filetype names.
+/// Search from 'runtimepath':
+///   'runtimepath'/{dirnames}/{pat}.vim
+/// When "flags" has DIP_START: search also from 'start' of 'packpath':
+///   'packpath'/pack/ * /start/ * /{dirnames}/{pat}.vim
+/// When "flags" has DIP_OPT: search also from 'opt' of 'packpath':
+///   'packpath'/pack/ * /opt/ * /{dirnames}/{pat}.vim
+/// "dirnames" is an array with one or more directory names.
+static int ExpandRTDir(char_u *pat, int flags, int *num_file, char_u ***file,
+                       char *dirnames[])
 {
   *num_file = 0;
   *file = NULL;
@@ -4211,6 +4285,26 @@ static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirname
     xfree(s);
   }
 
+  if (flags & DIP_START) {
+    for (int i = 0; dirnames[i] != NULL; i++) {
+      size_t size = STRLEN(dirnames[i]) + pat_len + 22;
+      char_u *s = xmalloc(size);
+      snprintf((char *)s, size, "pack/*/start/*/%s/%s*.vim", dirnames[i], pat);  // NOLINT
+      globpath(p_pp, s, &ga, 0);
+      xfree(s);
+    }
+  }
+
+  if (flags & DIP_OPT) {
+    for (int i = 0; dirnames[i] != NULL; i++) {
+      size_t size = STRLEN(dirnames[i]) + pat_len + 20;
+      char_u *s = xmalloc(size);
+      snprintf((char *)s, size, "pack/*/opt/*/%s/%s*.vim", dirnames[i], pat);  // NOLINT
+      globpath(p_pp, s, &ga, 0);
+      xfree(s);
+    }
+  }
+
   for (int i = 0; i < ga.ga_len; i++) {
     char_u *match = ((char_u **)ga.ga_data)[i];
     char_u *s = match;
@@ -4240,6 +4334,43 @@ static int ExpandRTDir(char_u *pat, int *num_file, char_u ***file, char *dirname
   return OK;
 }
 
+/// Expand loadplugin names:
+/// 'packpath'/pack/ * /opt/{pat}
+static int ExpandPackAddDir(char_u *pat, int *num_file, char_u ***file)
+{
+  garray_T ga;
+
+  *num_file = 0;
+  *file = NULL;
+  size_t pat_len = STRLEN(pat);
+  ga_init(&ga, (int)sizeof(char *), 10);
+
+  size_t buflen = pat_len + 26;
+  char_u *s = xmalloc(buflen);
+  snprintf((char *)s, buflen, "pack/*/opt/%s*", pat);  // NOLINT
+  globpath(p_pp, s, &ga, 0);
+  xfree(s);
+
+  for (int i = 0; i < ga.ga_len; i++) {
+    char_u *match = ((char_u **)ga.ga_data)[i];
+    s = path_tail(match);
+    char_u *e = s + STRLEN(s);
+    memmove(match, s, e - s + 1);
+  }
+
+  if (GA_EMPTY(&ga)) {
+    return FAIL;
+  }
+
+  // Sort and remove duplicates which can happen when specifying multiple
+  // directories in dirnames.
+  ga_remove_duplicate_strings(&ga);
+
+  *file = ga.ga_data;
+  *num_file = ga.ga_len;
+  return OK;
+}
+
 
 /// Expand `file` for all comma-separated directories in `path`.
 /// Adds matches to `ga`.
@@ -4304,6 +4435,7 @@ static HistoryType hist_char2type(const int c)
     case '>': {
       return HIST_DEBUG;
     }
+    case NUL:
     case '/':
     case '?': {
       return HIST_SEARCH;
@@ -5039,16 +5171,14 @@ static int ex_window(void)
   }
   cmdwin_type = get_cmdline_type();
 
-  /* Create the command-line buffer empty. */
-  (void)do_ecmd(0, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL);
-  (void)setfname(curbuf, (char_u *)"[Command Line]", NULL, TRUE);
-  set_option_value((char_u *)"bt", 0L, (char_u *)"nofile", OPT_LOCAL);
-  set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
-  curbuf->b_p_ma = TRUE;
-  curwin->w_p_fen = FALSE;
+  // Create empty command-line buffer.
+  buf_open_scratch(0, "[Command Line]");
+  // Command-line buffer has bufhidden=wipe, unlike a true "scratch" buffer.
+  set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
   curwin->w_p_rl = cmdmsg_rl;
-  cmdmsg_rl = FALSE;
-  RESET_BINDING(curwin);
+  cmdmsg_rl = false;
+  curbuf->b_p_ma = true;
+  curwin->w_p_fen = false;
 
   /* Do execute autocommands for setting the filetype (load syntax). */
   unblock_autocmds();
diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index 61e17128ea..eb22ad1428 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -15,7 +15,6 @@
 #include "nvim/memline.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index beefc4238e..d733ba311a 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -1,48 +1,44 @@
-/* TODO: make some #ifdef for this */
-/*--------[ file searching ]-------------------------------------------------*/
-/*
- * File searching functions for 'path', 'tags' and 'cdpath' options.
- * External visible functions:
- * vim_findfile_init()		creates/initialises the search context
- * vim_findfile_free_visited()	free list of visited files/dirs of search
- *				context
- * vim_findfile()		find a file in the search context
- * vim_findfile_cleanup()	cleanup/free search context created by
- *				vim_findfile_init()
- *
- * All static functions and variables start with 'ff_'
- *
- * In general it works like this:
- * First you create yourself a search context by calling vim_findfile_init().
- * It is possible to give a search context from a previous call to
- * vim_findfile_init(), so it can be reused. After this you call vim_findfile()
- * until you are satisfied with the result or it returns NULL. On every call it
- * returns the next file which matches the conditions given to
- * vim_findfile_init(). If it doesn't find a next file it returns NULL.
- *
- * It is possible to call vim_findfile_init() again to reinitialise your search
- * with some new parameters. Don't forget to pass your old search context to
- * it, so it can reuse it and especially reuse the list of already visited
- * directories. If you want to delete the list of already visited directories
- * simply call vim_findfile_free_visited().
- *
- * When you are done call vim_findfile_cleanup() to free the search context.
- *
- * The function vim_findfile_init() has a long comment, which describes the
- * needed parameters.
- *
- *
- *
- * ATTENTION:
- * ==========
- *	Also we use an allocated search context here, this functions are NOT
- *	thread-safe!!!!!
- *
- *	To minimize parameter passing (or because I'm to lazy), only the
- *	external visible functions get a search context as a parameter. This is
- *	then assigned to a static global, which is used throughout the local
- *	functions.
- */
+// File searching functions for 'path', 'tags' and 'cdpath' options.
+//
+// External visible functions:
+//   vim_findfile_init()          creates/initialises the search context
+//   vim_findfile_free_visited()  free list of visited files/dirs of search
+//                                context
+//   vim_findfile()               find a file in the search context
+//   vim_findfile_cleanup()       cleanup/free search context created by
+//                                vim_findfile_init()
+//
+// All static functions and variables start with 'ff_'
+//
+// In general it works like this:
+// First you create yourself a search context by calling vim_findfile_init().
+// It is possible to give a search context from a previous call to
+// vim_findfile_init(), so it can be reused. After this you call vim_findfile()
+// until you are satisfied with the result or it returns NULL. On every call it
+// returns the next file which matches the conditions given to
+// vim_findfile_init(). If it doesn't find a next file it returns NULL.
+//
+// It is possible to call vim_findfile_init() again to reinitialise your search
+// with some new parameters. Don't forget to pass your old search context to
+// it, so it can reuse it and especially reuse the list of already visited
+// directories. If you want to delete the list of already visited directories
+// simply call vim_findfile_free_visited().
+//
+// When you are done call vim_findfile_cleanup() to free the search context.
+//
+// The function vim_findfile_init() has a long comment, which describes the
+// needed parameters.
+//
+//
+//
+// ATTENTION:
+// ==========
+// We use an allocated search context, these functions are NOT thread-safe!!!!!
+//
+// To minimize parameter passing (or because I'm too lazy), only the
+// external visible functions get a search context as a parameter. This is
+// then assigned to a static global, which is used throughout the local
+// functions.
 
 #include <assert.h>
 #include <string.h>
@@ -52,6 +48,7 @@
 #include <limits.h>
 
 #include "nvim/vim.h"
+#include "nvim/eval.h"
 #include "nvim/ascii.h"
 #include "nvim/file_search.h"
 #include "nvim/charset.h"
@@ -59,7 +56,7 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
+#include "nvim/option.h"
 #include "nvim/os_unix.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
@@ -196,7 +193,6 @@ typedef struct ff_search_ctx_T {
 
 static char_u e_pathtoolong[] = N_("E854: path too long for completion");
 
-
 /*
  * Initialization routine for vim_findfile().
  *
@@ -791,7 +787,7 @@ char_u *vim_findfile(void *search_ctx_arg)
             for (;; ) {
               /* if file exists and we didn't already find it */
               if ((path_with_url((char *)file_path)
-                   || (os_file_exists(file_path)
+                   || (os_path_exists(file_path)
                        && (search_ctx->ffsc_find_what
                            == FINDFILE_BOTH
                            || ((search_ctx->ffsc_find_what
@@ -1153,7 +1149,7 @@ static ff_stack_T *ff_create_stack_element(char_u *fix_part, char_u *wc_part, in
   new->ffs_filearray_cur  = 0;
   new->ffs_stage         = 0;
   new->ffs_level         = level;
-  new->ffs_star_star_empty = star_star_empty;;
+  new->ffs_star_star_empty = star_star_empty;
 
   /* the following saves NULL pointer checks in vim_findfile */
   if (fix_part == NULL)
@@ -1374,11 +1370,16 @@ find_file_in_path_option (
   char_u              *buf = NULL;
   int rel_to_curdir;
 
+  if (rel_fname != NULL && path_with_url((const char *)rel_fname)) {
+    // Do not attempt to search "relative" to a URL. #6009
+    rel_fname = NULL;
+  }
+
   if (first == TRUE) {
     /* copy file name into NameBuff, expanding environment variables */
     save_char = ptr[len];
     ptr[len] = NUL;
-    expand_env(ptr, NameBuff, MAXPATHL);
+    expand_env_esc(ptr, NameBuff, MAXPATHL, false, true, NULL);
     ptr[len] = save_char;
 
     xfree(ff_file_to_find);
@@ -1442,12 +1443,12 @@ find_file_in_path_option (
         buf = suffixes;
         for (;; ) {
           if (
-            (os_file_exists(NameBuff)
-             && (find_what == FINDFILE_BOTH
-                 || ((find_what == FINDFILE_DIR)
-                     == os_isdir(NameBuff))))) {
-            file_name = vim_strsave(NameBuff);
-            goto theend;
+              (os_path_exists(NameBuff)
+               && (find_what == FINDFILE_BOTH
+                   || ((find_what == FINDFILE_DIR)
+                       == os_isdir(NameBuff))))) {
+              file_name = vim_strsave(NameBuff);
+              goto theend;
           }
           if (*buf == NUL)
             break;
@@ -1526,3 +1527,79 @@ theend:
   return file_name;
 }
 
+static void do_autocmd_dirchanged(char_u *new_dir, CdScope scope)
+{
+  static bool recursive = false;
+
+  if (recursive || !has_event(EVENT_DIRCHANGED)) {
+    // No autocommand was defined or we changed
+    // the directory from this autocommand.
+    return;
+  }
+
+  recursive = true;
+
+  dict_T *dict = get_vim_var_dict(VV_EVENT);
+  char buf[8];
+
+  switch (scope) {
+  case kCdScopeGlobal:
+    snprintf(buf, sizeof(buf), "global");
+    break;
+  case kCdScopeTab:
+    snprintf(buf, sizeof(buf), "tab");
+    break;
+  case kCdScopeWindow:
+    snprintf(buf, sizeof(buf), "window");
+    break;
+  case kCdScopeInvalid:
+    // Should never happen.
+    assert(false);
+  }
+
+  dict_add_nr_str(dict, "scope", 0L, (char_u *)buf);
+  dict_add_nr_str(dict, "cwd",   0L, new_dir);
+  dict_set_keys_readonly(dict);
+
+  apply_autocmds(EVENT_DIRCHANGED, (char_u *)buf, new_dir, false, NULL);
+
+  dict_clear(dict);
+
+  recursive = false;
+}
+
+/// Change to a file's directory.
+/// Caller must call shorten_fnames()!
+/// @return OK or FAIL
+int vim_chdirfile(char_u *fname)
+{
+  char_u dir[MAXPATHL];
+
+  STRLCPY(dir, fname, MAXPATHL);
+  *path_tail_with_sep(dir) = NUL;
+  if (os_chdir((char *)dir) != 0) {
+    return FAIL;
+  }
+  do_autocmd_dirchanged(dir, kCdScopeWindow);
+
+  return OK;
+}
+
+/// Change directory to "new_dir". Search 'cdpath' for relative directory names.
+int vim_chdir(char_u *new_dir, CdScope scope)
+{
+  char_u *dir_name = find_directory_in_path(new_dir, STRLEN(new_dir),
+                                            FNAME_MESS, curbuf->b_ffname);
+  if (dir_name == NULL) {
+    return -1;
+  }
+
+  int r = os_chdir((char *)dir_name);
+  if (r == 0) {
+    do_autocmd_dirchanged(dir_name, scope);
+  }
+
+  xfree(dir_name);
+  return r;
+}
+
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index db1469db97..d433afab3e 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -32,7 +32,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
@@ -44,6 +43,7 @@
 #include "nvim/screen.h"
 #include "nvim/search.h"
 #include "nvim/sha256.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 #include "nvim/types.h"
@@ -51,6 +51,7 @@
 #include "nvim/window.h"
 #include "nvim/shada.h"
 #include "nvim/os/os.h"
+#include "nvim/os/os_defs.h"
 #include "nvim/os/time.h"
 #include "nvim/os/input.h"
 
@@ -187,6 +188,14 @@ struct bw_info {
 static char *e_auchangedbuf = N_(
     "E812: Autocommands changed buffer or buffer name");
 
+// Set by the apply_autocmds_group function if the given event is equal to
+// EVENT_FILETYPE. Used by the readfile function in order to determine if
+// EVENT_BUFREADPOST triggered the EVENT_FILETYPE.
+//
+// Relying on this value requires one to reset it prior calling
+// apply_autocmds_group.
+static bool au_did_filetype INIT(= false);
+
 void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
 {
   int msg_scroll_save;
@@ -240,7 +249,7 @@ void filemess(buf_T *buf, char_u *name, char_u *s, int attr)
  * READ_DUMMY	read into a dummy buffer (to check if file contents changed)
  * READ_KEEP_UNDO  don't clear undo info or read it from a file
  *
- * return FAIL for failure, OK otherwise
+ * return FAIL for failure, NOTDONE for directory (failure), or OK
  */
 int 
 readfile (
@@ -249,7 +258,7 @@ readfile (
     linenr_T from,
     linenr_T lines_to_skip,
     linenr_T lines_to_read,
-    exarg_T *eap,                       /* can be NULL! */
+    exarg_T *eap,                       // can be NULL!
     int flags
 )
 {
@@ -272,7 +281,7 @@ readfile (
   int wasempty;                         /* buffer was empty before reading */
   colnr_T len;
   long size = 0;
-  char_u      *p;
+  char_u      *p = NULL;
   off_t filesize = 0;
   int skip_read = FALSE;
   context_sha256_T sha_ctx;
@@ -282,11 +291,9 @@ readfile (
   int error = FALSE;                    /* errors encountered */
   int ff_error = EOL_UNKNOWN;           /* file format with errors */
   long linerest = 0;                    /* remaining chars in line */
-#ifdef UNIX
   int perm = 0;
+#ifdef UNIX
   int swap_mode = -1;                   /* protection bits for swap file */
-#else
-  int perm;
 #endif
   int fileformat = 0;                   /* end-of-line format */
   int keep_fileformat = FALSE;
@@ -331,6 +338,8 @@ readfile (
   int using_b_ffname;
   int using_b_fname;
 
+  au_did_filetype = false;  // reset before triggering any autocommands
+
   curbuf->b_no_eol_lnum = 0;    /* in case it was set by the previous read */
 
   /*
@@ -418,32 +427,31 @@ readfile (
     }
   }
 
-  if (!read_stdin && !read_buffer) {
-#ifdef UNIX
-    /*
-     * On Unix it is possible to read a directory, so we have to
-     * check for it before os_open().
-     */
+  if (!read_buffer && !read_stdin) {
     perm = os_getperm(fname);
-    if (perm >= 0 && !S_ISREG(perm)                 /* not a regular file ... */
+#ifdef UNIX
+    // On Unix it is possible to read a directory, so we have to
+    // check for it before os_open().
+    if (perm >= 0 && !S_ISREG(perm)                 // not a regular file ...
 # ifdef S_ISFIFO
-        && !S_ISFIFO(perm)                          /* ... or fifo */
+        && !S_ISFIFO(perm)                          // ... or fifo
 # endif
 # ifdef S_ISSOCK
-        && !S_ISSOCK(perm)                          /* ... or socket */
+        && !S_ISSOCK(perm)                          // ... or socket
 # endif
 # ifdef OPEN_CHR_FILES
         && !(S_ISCHR(perm) && is_dev_fd_file(fname))
-        /* ... or a character special file named /dev/fd/<n> */
+        // ... or a character special file named /dev/fd/<n>
 # endif
         ) {
-      if (S_ISDIR(perm))
+      if (S_ISDIR(perm)) {
         filemess(curbuf, fname, (char_u *)_("is a directory"), 0);
-      else
+      } else {
         filemess(curbuf, fname, (char_u *)_("is not a file"), 0);
+      }
       msg_end();
       msg_scroll = msg_save;
-      return FAIL;
+      return S_ISDIR(perm) ? NOTDONE : FAIL;
     }
 #endif
   }
@@ -493,44 +501,31 @@ readfile (
     curbuf->b_flags &= ~(BF_NEW | BF_NEW_W);
   }
 
-  /*
-   * Check readonly by trying to open the file for writing.
-   * If this fails, we know that the file is readonly.
-   */
-  file_readonly = FALSE;
+  // Check readonly.
+  file_readonly = false;
   if (!read_buffer && !read_stdin) {
-    if (!newfile || readonlymode) {
-      file_readonly = TRUE;
-    } else if ((fd = os_open((char *)fname, O_RDWR, 0)) < 0) {
-      // opening in readwrite mode failed => file is readonly
-      file_readonly = TRUE;
-    }
-    if (file_readonly == TRUE) {
-      // try to open readonly
-      fd = os_open((char *)fname, O_RDONLY, 0);
+    if (!newfile || readonlymode || !(perm & 0222)
+        || !os_file_is_writable((char *)fname)) {
+      file_readonly = true;
     }
+    fd = os_open((char *)fname, O_RDONLY, 0);
   }
 
-  if (fd < 0) {                     /* cannot open at all */
+  if (fd < 0) {                     // cannot open at all
     msg_scroll = msg_save;
 #ifndef UNIX
-    /*
-     * On non-unix systems we can't open a directory, check here.
-     */
-    perm = os_getperm(fname);      /* check if the file exists */
+    // On non-unix systems we can't open a directory, check here.
     if (os_isdir(fname)) {
       filemess(curbuf, sfname, (char_u *)_("is a directory"), 0);
-      curbuf->b_p_ro = TRUE;            /* must use "w!" now */
-    } else
+      curbuf->b_p_ro = true;        // must use "w!" now
+    } else {
 #endif
     if (!newfile) {
       return FAIL;
     }
-    if (perm == UV_ENOENT) {
-      /*
-       * Set the 'new-file' flag, so that when the file has
-       * been created by someone else, a ":w" will complain.
-       */
+    if (perm == UV_ENOENT) {  // check if the file exists
+      // Set the 'new-file' flag, so that when the file has
+      // been created by someone else, a ":w" will complain.
       curbuf->b_flags |= BF_NEW;
 
       /* Create a swap file now, so that other Vims are warned
@@ -581,6 +576,9 @@ readfile (
 
     return FAIL;
   }
+#ifndef UNIX
+  }
+#endif
 
   /*
    * Only set the 'ro' flag for readonly files the first time they are
@@ -1749,8 +1747,9 @@ failed:
 #ifdef HAVE_FD_CLOEXEC
   else {
     int fdflags = fcntl(fd, F_GETFD);
-    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-      fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+    if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
+      (void)fcntl(fd, F_SETFD, fdflags | FD_CLOEXEC);
+    }
   }
 #endif
   xfree(buffer);
@@ -1883,17 +1882,22 @@ failed:
 
       xfree(keep_msg);
       keep_msg = NULL;
+      p = NULL;
       msg_scrolled_ign = TRUE;
-      p = msg_trunc_attr(IObuff, FALSE, 0);
+
+      if (!read_stdin && !read_buffer) {
+        p = msg_trunc_attr(IObuff, FALSE, 0);
+      }
+
       if (read_stdin || read_buffer || restart_edit != 0
-          || (msg_scrolled != 0 && !need_wait_return))
-        /* Need to repeat the message after redrawing when:
-         * - When reading from stdin (the screen will be cleared next).
-         * - When restart_edit is set (otherwise there will be a delay
-         *   before redrawing).
-         * - When the screen was scrolled but there is no wait-return
-         *   prompt. */
+          || (msg_scrolled != 0 && !need_wait_return)) {
+        // Need to repeat the message after redrawing when:
+        // - When reading from stdin (the screen will be cleared next).
+        // - When restart_edit is set (otherwise there will be a delay before
+        //   redrawing).
+        // - When the screen was scrolled but there is no wait-return prompt.
         set_keep_msg(p, 0);
+      }
       msg_scrolled_ign = FALSE;
     }
 
@@ -1970,20 +1974,29 @@ failed:
      * should not be overwritten: Set msg_scroll, restore its value if no
      * output was done.
      */
-    msg_scroll = TRUE;
-    if (filtering)
+    msg_scroll = true;
+    if (filtering) {
       apply_autocmds_exarg(EVENT_FILTERREADPOST, NULL, sfname,
-          FALSE, curbuf, eap);
-    else if (newfile)
+                           false, curbuf, eap);
+    } else if (newfile) {
       apply_autocmds_exarg(EVENT_BUFREADPOST, NULL, sfname,
-          FALSE, curbuf, eap);
-    else
+                           false, curbuf, eap);
+      if (!au_did_filetype && *curbuf->b_p_ft != NUL) {
+        // EVENT_FILETYPE was not triggered but the buffer already has a
+        // filetype.  Trigger EVENT_FILETYPE using the existing filetype.
+        apply_autocmds(EVENT_FILETYPE, curbuf->b_p_ft, curbuf->b_fname,
+                       true, curbuf);
+      }
+    } else {
       apply_autocmds_exarg(EVENT_FILEREADPOST, sfname, sfname,
-          FALSE, NULL, eap);
-    if (msg_scrolled == n)
+                           false, NULL, eap);
+    }
+    if (msg_scrolled == n) {
       msg_scroll = m;
-    if (aborting())         /* autocmds may abort script processing */
+    }
+    if (aborting()) {       // autocmds may abort script processing
       return FAIL;
+    }
   }
 
   if (recoverymode && error)
@@ -2989,14 +3002,15 @@ nobackup:
            * delete an existing one, try to use another name.
            * Change one character, just before the extension.
            */
-          if (!p_bk && os_file_exists(backup)) {
+          if (!p_bk && os_path_exists(backup)) {
             p = backup + STRLEN(backup) - 1 - STRLEN(backup_ext);
             if (p < backup)             /* empty file name ??? */
               p = backup;
             *p = 'z';
-            while (*p > 'a' && os_file_exists(backup))
-              --*p;
-            /* They all exist??? Must be something wrong! */
+            while (*p > 'a' && os_path_exists(backup)) {
+              (*p)--;
+            }
+            // They all exist??? Must be something wrong!
             if (*p == 'a') {
               xfree(backup);
               backup = NULL;
@@ -3223,12 +3237,12 @@ restore_backup:
            * This may not work if the vim_rename() fails.
            * In that case we leave the copy around.
            */
-          /* If file does not exist, put the copy in its place */
-          if (!os_file_exists(fname)) {
+          // If file does not exist, put the copy in its place
+          if (!os_path_exists(fname)) {
             vim_rename(backup, fname);
           }
-          /* if original file does exist throw away the copy */
-          if (os_file_exists(fname)) {
+          // if original file does exist throw away the copy
+          if (os_path_exists(fname)) {
             os_remove((char *)backup);
           }
         } else {
@@ -3237,8 +3251,8 @@ restore_backup:
         }
       }
 
-      /* if original file no longer exists give an extra warning */
-      if (!newfile && !os_file_exists(fname)) {
+      // if original file no longer exists give an extra warning
+      if (!newfile && !os_path_exists(fname)) {
         end = 0;
       }
     }
@@ -3596,9 +3610,9 @@ restore_backup:
        * If the original file does not exist yet
        * the current backup file becomes the original file
        */
-      if (org == NULL)
+      if (org == NULL) {
         EMSG(_("E205: Patchmode: can't save original file"));
-      else if (!os_file_exists((char_u *)org)) {
+      } else if (!os_path_exists((char_u *)org)) {
         vim_rename(backup, (char_u *)org);
         xfree(backup);                   /* don't delete the file */
         backup = NULL;
@@ -3785,8 +3799,9 @@ static int set_rw_fname(char_u *fname, char_u *sfname)
 
   /* Do filetype detection now if 'filetype' is empty. */
   if (*curbuf->b_p_ft == NUL) {
-    if (au_has_group((char_u *)"filetypedetect"))
-      (void)do_doautocmd((char_u *)"filetypedetect BufRead", FALSE);
+    if (au_has_group((char_u *)"filetypedetect")) {
+      (void)do_doautocmd((char_u *)"filetypedetect BufRead", false, NULL);
+    }
     do_modelines(0);
   }
 
@@ -4176,9 +4191,8 @@ static bool need_conversion(const char_u *fenc)
     same_encoding = (enc_flags != 0 && fenc_flags == enc_flags);
   }
   if (same_encoding) {
-    /* Specified encoding matches with 'encoding'.  This requires
-     * conversion when 'encoding' is Unicode but not UTF-8. */
-    return enc_unicode != 0;
+    // Specified file encoding matches UTF-8.
+    return false;
   }
 
   /* Encodings differ.  However, conversion is not needed when 'enc' is any
@@ -4458,11 +4472,95 @@ bool vim_fgets(char_u *buf, int size, FILE *fp) FUNC_ATTR_NONNULL_ALL
   return eof == NULL;
 }
 
-/*
- * os_rename() only works if both files are on the same file system, this
- * function will (attempts to?) copy the file across if rename fails -- webb
- * Return -1 for failure, 0 for success.
- */
+/// Read 2 bytes from "fd" and turn them into an int, MSB first.
+int get2c(FILE *fd)
+{
+  int n;
+
+  n = getc(fd);
+  n = (n << 8) + getc(fd);
+  return n;
+}
+
+/// Read 3 bytes from "fd" and turn them into an int, MSB first.
+int get3c(FILE *fd)
+{
+  int n;
+
+  n = getc(fd);
+  n = (n << 8) + getc(fd);
+  n = (n << 8) + getc(fd);
+  return n;
+}
+
+/// Read 4 bytes from "fd" and turn them into an int, MSB first.
+int get4c(FILE *fd)
+{
+  // Use unsigned rather than int otherwise result is undefined
+  // when left-shift sets the MSB.
+  unsigned n;
+
+  n = (unsigned)getc(fd);
+  n = (n << 8) + (unsigned)getc(fd);
+  n = (n << 8) + (unsigned)getc(fd);
+  n = (n << 8) + (unsigned)getc(fd);
+  return (int)n;
+}
+
+/// Read 8 bytes from `fd` and turn them into a time_t, MSB first.
+time_t get8ctime(FILE *fd)
+{
+  time_t n = 0;
+  int i;
+
+  for (i = 0; i < 8; i++) {
+    n = (n << 8) + getc(fd);
+  }
+  return n;
+}
+
+/// Reads a string of length "cnt" from "fd" into allocated memory.
+/// @return pointer to the string or NULL when unable to read that many bytes.
+char *read_string(FILE *fd, size_t cnt)
+{
+  char *str = xmallocz(cnt);
+  for (size_t i = 0; i < cnt; i++) {
+    int c = getc(fd);
+    if (c == EOF) {
+      xfree(str);
+      return NULL;
+    }
+    str[i] = (char)c;
+  }
+  return str;
+}
+
+/// Writes a number to file "fd", most significant bit first, in "len" bytes.
+/// @returns false in case of an error.
+bool put_bytes(FILE *fd, uintmax_t number, size_t len)
+{
+  assert(len > 0);
+  for (size_t i = len - 1; i < len; i--) {
+    if (putc((int)(number >> (i * 8)), fd) == EOF) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/// Writes time_t to file "fd" in 8 bytes.
+/// @returns FAIL when the write failed.
+int put_time(FILE *fd, time_t time_)
+{
+  uint8_t buf[8];
+  time_to_bytes(time_, buf);
+  return fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd) == 1 ? OK : FAIL;
+}
+
+/// os_rename() only works if both files are on the same file system, this
+/// function will (attempts to?) copy the file across if rename fails -- webb
+//
+/// @return -1 for failure, 0 for success
 int vim_rename(char_u *from, char_u *to)
 {
   int fd_in;
@@ -4513,9 +4611,11 @@ int vim_rename(char_u *from, char_u *to)
     if (STRLEN(from) >= MAXPATHL - 5)
       return -1;
     STRCPY(tempname, from);
-    for (n = 123; n < 99999; ++n) {
-      sprintf((char *)path_tail(tempname), "%d", n);
-      if (!os_file_exists(tempname)) {
+    for (n = 123; n < 99999; n++) {
+      char * tail = (char *)path_tail(tempname);
+      snprintf(tail, (MAXPATHL + 1) - (tail - (char *)tempname - 1), "%d", n);
+
+      if (!os_path_exists(tempname)) {
         if (os_rename(from, tempname) == OK) {
           if (os_rename(tempname, to) == OK)
             return 0;
@@ -4862,7 +4962,7 @@ buf_check_timestamp (
     }
 
   } else if ((buf->b_flags & BF_NEW) && !(buf->b_flags & BF_NEW_W)
-             && os_file_exists(buf->b_ffname)) {
+             && os_path_exists(buf->b_ffname)) {
     retval = 1;
     mesg = _("W13: Warning: File \"%s\" has been created after editing started");
     buf->b_flags |= BF_NEW_W;
@@ -4882,8 +4982,8 @@ buf_check_timestamp (
     set_vim_var_string(VV_WARNINGMSG, tbuf, -1);
     if (can_reload) {
       if (*mesg2 != NUL) {
-        strncat(tbuf, "\n", tbuf_len);
-        strncat(tbuf, mesg2, tbuf_len);
+        xstrlcat(tbuf, "\n", tbuf_len - 1);
+        xstrlcat(tbuf, mesg2, tbuf_len - 1);
       }
       if (do_dialog(VIM_WARNING, (char_u *) _("Warning"), (char_u *) tbuf,
                     (char_u *) _("&OK\n&Load File"), 1, NULL, true) == 2) {
@@ -4891,8 +4991,8 @@ buf_check_timestamp (
       }
     } else if (State > NORMAL_BUSY || (State & CMDLINE) || already_warned) {
       if (*mesg2 != NUL) {
-        strncat(tbuf, "; ", tbuf_len);
-        strncat(tbuf, mesg2, tbuf_len);
+        xstrlcat(tbuf, "; ", tbuf_len - 1);
+        xstrlcat(tbuf, mesg2, tbuf_len - 1);
       }
       EMSG(tbuf);
       retval = 2;
@@ -4988,10 +5088,10 @@ void buf_reload(buf_T *buf, int orig_mode)
    * the old contents.  Can't use memory only, the file might be
    * too big.  Use a hidden buffer to move the buffer contents to.
    */
-  if (bufempty() || saved == FAIL)
+  if (bufempty() || saved == FAIL) {
     savebuf = NULL;
-  else {
-    /* Allocate a buffer without putting it in the buffer list. */
+  } else {
+    // Allocate a buffer without putting it in the buffer list.
     savebuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY);
     if (savebuf != NULL && buf == curbuf) {
       /* Open the memline. */
@@ -5010,13 +5110,13 @@ void buf_reload(buf_T *buf, int orig_mode)
   }
 
   if (saved == OK) {
-    curbuf->b_flags |= BF_CHECK_RO;           /* check for RO again */
-    keep_filetype = TRUE;                     /* don't detect 'filetype' */
-    if (readfile(buf->b_ffname, buf->b_fname, (linenr_T)0,
-            (linenr_T)0,
-            (linenr_T)MAXLNUM, &ea, flags) == FAIL) {
-      if (!aborting())
+    curbuf->b_flags |= BF_CHECK_RO;           // check for RO again
+    keep_filetype = true;                     // don't detect 'filetype'
+    if (readfile(buf->b_ffname, buf->b_fname, (linenr_T)0, (linenr_T)0,
+                 (linenr_T)MAXLNUM, &ea, flags) != OK) {
+      if (!aborting()) {
         EMSG2(_("E321: Could not reload \"%s\""), buf->b_fname);
+      }
       if (savebuf != NULL && buf_valid(savebuf) && buf == curbuf) {
         /* Put the text back from the save buffer.  First
          * delete any lines that readfile() added. */
@@ -5131,6 +5231,10 @@ static void vim_maketempdir(void)
   // Try the entries in `TEMP_DIR_NAMES` to create the temp directory.
   char_u template[TEMP_FILE_PATH_MAXLEN];
   char_u path[TEMP_FILE_PATH_MAXLEN];
+
+  // Make sure the umask doesn't remove the executable bit.
+  // "repl" has been reported to use "0177".
+  mode_t umask_save = umask(0077);
   for (size_t i = 0; i < ARRAY_SIZE(temp_dirs); i++) {
     // Expand environment variables, leave room for "/nvimXXXXXX/999999999"
     expand_env((char_u *)temp_dirs[i], template, TEMP_FILE_PATH_MAXLEN - 22);
@@ -5154,6 +5258,7 @@ static void vim_maketempdir(void)
       os_rmdir((char *)path);
     }
   }
+  (void)umask(umask_save);
 }
 
 /// Delete "name" and everything in it, recursively.
@@ -5273,6 +5378,8 @@ static AutoPatCmd *active_apc_list = NULL; /* stack of active autocommands */
  */
 static garray_T augroups = {0, 0, sizeof(char_u *), 10, NULL};
 #define AUGROUP_NAME(i) (((char_u **)augroups.ga_data)[i])
+// use get_deleted_augroup() to get this
+static char_u *deleted_augroup = NULL;
 
 /*
  * The ID of the current group.  Group 0 is the default one.
@@ -5287,6 +5394,14 @@ static event_T last_event;
 static int last_group;
 static int autocmd_blocked = 0;         /* block all autocmds */
 
+static char_u *get_deleted_augroup(void)
+{
+    if (deleted_augroup == NULL) {
+      deleted_augroup = (char_u *)_("--Deleted--");
+    }
+    return deleted_augroup;
+}
+
 /*
  * Show the autocommands for one AutoPat.
  */
@@ -5306,10 +5421,11 @@ static void show_autocmd(AutoPat *ap, event_T event)
     return;
   if (event != last_event || ap->group != last_group) {
     if (ap->group != AUGROUP_DEFAULT) {
-      if (AUGROUP_NAME(ap->group) == NULL)
-        msg_puts_attr((char_u *)_("--Deleted--"), hl_attr(HLF_E));
-      else
+      if (AUGROUP_NAME(ap->group) == NULL) {
+        msg_puts_attr(get_deleted_augroup(), hl_attr(HLF_E));
+      } else {
         msg_puts_attr(AUGROUP_NAME(ap->group), hl_attr(HLF_T));
+      }
       msg_puts((char_u *)"  ");
     }
     msg_puts_attr(event_nr2name(event), hl_attr(HLF_T));
@@ -5475,11 +5591,33 @@ static void au_del_group(char_u *name)
   int i;
 
   i = au_find_group(name);
-  if (i == AUGROUP_ERROR)       /* the group doesn't exist */
+  if (i == AUGROUP_ERROR) {      // the group doesn't exist
     EMSG2(_("E367: No such group: \"%s\""), name);
-  else {
+  } else if (i == current_augroup) {
+    EMSG(_("E936: Cannot delete the current group"));
+  } else {
+    event_T event;
+    AutoPat *ap;
+    int in_use = false;
+
+    for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
+         event = (event_T)((int)event + 1)) {
+      for (ap = first_autopat[(int)event]; ap != NULL; ap = ap->next) {
+        if (ap->group == i && ap->pat != NULL) {
+          give_warning((char_u *)
+                       _("W19: Deleting augroup that is still in use"), true);
+          in_use = true;
+          event = NUM_EVENTS;
+          break;
+        }
+      }
+    }
     xfree(AUGROUP_NAME(i));
-    AUGROUP_NAME(i) = NULL;
+    if (in_use) {
+      AUGROUP_NAME(i) = get_deleted_augroup();
+    } else {
+      AUGROUP_NAME(i) = NULL;
+    }
   }
 }
 
@@ -5491,8 +5629,9 @@ static void au_del_group(char_u *name)
 static int au_find_group(const char_u *name)
   FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  for (int i = 0; i < augroups.ga_len; ++i) {
-    if (AUGROUP_NAME(i) != NULL && STRCMP(AUGROUP_NAME(i), name) == 0) {
+  for (int i = 0; i < augroups.ga_len; i++) {
+    if (AUGROUP_NAME(i) != NULL && AUGROUP_NAME(i) != get_deleted_augroup()
+        && STRCMP(AUGROUP_NAME(i), name) == 0) {
       return i;
     }
   }
@@ -5540,10 +5679,21 @@ void do_augroup(char_u *arg, int del_group)
 #if defined(EXITFREE)
 void free_all_autocmds(void)
 {
+  int i;
+  char_u *s;
+
   for (current_augroup = -1; current_augroup < augroups.ga_len;
-       ++current_augroup)
-    do_autocmd((char_u *)"", TRUE);
-  ga_clear_strings(&augroups);
+       current_augroup++) {
+    do_autocmd((char_u *)"", true);
+  }
+
+  for (i = 0; i < augroups.ga_len; i++) {
+      s = ((char_u **)(augroups.ga_data))[i];
+      if (s != get_deleted_augroup()) {
+          xfree(s);
+      }
+  }
+  ga_clear(&augroups);
 }
 
 #endif
@@ -5559,13 +5709,14 @@ static event_T event_name2nr(char_u *start, char_u **end)
   int i;
   int len;
 
-  /* the event name ends with end of line, a blank or a comma */
-  for (p = start; *p && !ascii_iswhite(*p) && *p != ','; ++p)
-    ;
-  for (i = 0; event_names[i].name != NULL; ++i) {
-    len = (int) event_names[i].len;
-    if (len == p - start && STRNICMP(event_names[i].name, start, len) == 0)
+  // the event name ends with end of line, '|', a blank or a comma */
+  for (p = start; *p && !ascii_iswhite(*p) && *p != ',' && *p != '|'; p++) {
+  }
+  for (i = 0; event_names[i].name != NULL; i++) {
+    len = (int)event_names[i].len;
+    if (len == p - start && STRNICMP(event_names[i].name, start, len) == 0) {
       break;
+    }
   }
   if (*p == ',')
     ++p;
@@ -5607,7 +5758,7 @@ find_end_event (
     }
     pat = arg + 1;
   } else {
-    for (pat = arg; *pat && !ascii_iswhite(*pat); pat = p) {
+    for (pat = arg; *pat && *pat != '|' && !ascii_iswhite(*pat); pat = p) {
       if ((int)event_name2nr(pat, &p) >= (int)NUM_EVENTS) {
         if (have_group)
           EMSG2(_("E216: No such event: %s"), pat);
@@ -5722,8 +5873,9 @@ void au_event_restore(char_u *old_ei)
  *
  * Mostly a {group} argument can optionally appear before <event>.
  */
-void do_autocmd(char_u *arg, int forceit)
+void do_autocmd(char_u *arg_in, int forceit)
 {
+  char_u      *arg = arg_in;
   char_u      *pat;
   char_u      *envpat = NULL;
   char_u      *cmd;
@@ -5732,10 +5884,13 @@ void do_autocmd(char_u *arg, int forceit)
   int nested = FALSE;
   int group;
 
-  /*
-   * Check for a legal group name.  If not, use AUGROUP_ALL.
-   */
-  group = au_get_grouparg(&arg);
+  if (*arg == '|') {
+    arg = (char_u *)"";
+    group = AUGROUP_ALL;  // no argument, use all groups
+  } else {
+    // Check for a legal group name.  If not, use AUGROUP_ALL.
+    group = au_get_grouparg(&arg);
+  }
 
   /*
    * Scan over the events.
@@ -5745,50 +5900,54 @@ void do_autocmd(char_u *arg, int forceit)
   if (pat == NULL)
     return;
 
-  /*
-   * Scan over the pattern.  Put a NUL at the end.
-   */
   pat = skipwhite(pat);
-  cmd = pat;
-  while (*cmd && (!ascii_iswhite(*cmd) || cmd[-1] == '\\'))
-    cmd++;
-  if (*cmd)
-    *cmd++ = NUL;
-
-  /* Expand environment variables in the pattern.  Set 'shellslash', we want
-   * forward slashes here. */
-  if (vim_strchr(pat, '$') != NULL || vim_strchr(pat, '~') != NULL) {
+  if (*pat == '|') {
+    pat = (char_u *)"";
+    cmd = (char_u *)"";
+  } else {
+    // Scan over the pattern.  Put a NUL at the end.
+    cmd = pat;
+    while (*cmd && (!ascii_iswhite(*cmd) || cmd[-1] == '\\')) {
+        cmd++;
+    }
+    if (*cmd) {
+      *cmd++ = NUL;
+    }
+
+    // Expand environment variables in the pattern.  Set 'shellslash', we want
+    // forward slashes here.
+    if (vim_strchr(pat, '$') != NULL || vim_strchr(pat, '~') != NULL) {
 #ifdef BACKSLASH_IN_FILENAME
-    int p_ssl_save = p_ssl;
+      int p_ssl_save = p_ssl;
 
-    p_ssl = TRUE;
+      p_ssl = true;
 #endif
-    envpat = expand_env_save(pat);
+      envpat = expand_env_save(pat);
 #ifdef BACKSLASH_IN_FILENAME
-    p_ssl = p_ssl_save;
+      p_ssl = p_ssl_save;
 #endif
-    if (envpat != NULL)
-      pat = envpat;
-  }
+      if (envpat != NULL) {
+        pat = envpat;
+      }
+    }
 
-  /*
-   * Check for "nested" flag.
-   */
-  cmd = skipwhite(cmd);
-  if (*cmd != NUL && STRNCMP(cmd, "nested", 6) == 0 && ascii_iswhite(cmd[6])) {
-    nested = TRUE;
-    cmd = skipwhite(cmd + 6);
-  }
+    // Check for "nested" flag.
+    cmd = skipwhite(cmd);
+    if (*cmd != NUL && STRNCMP(cmd, "nested", 6) == 0
+        && ascii_iswhite(cmd[6])) {
+      nested = true;
+      cmd = skipwhite(cmd + 6);
+    }
 
-  /*
-   * Find the start of the commands.
-   * Expand <sfile> in it.
-   */
-  if (*cmd != NUL) {
-    cmd = expand_sfile(cmd);
-    if (cmd == NULL)                /* some error */
-      return;
-    need_free = TRUE;
+    // Find the start of the commands.
+    // Expand <sfile> in it.
+    if (*cmd != NUL) {
+      cmd = expand_sfile(cmd);
+      if (cmd == NULL) {                // some error
+        return;
+      }
+      need_free = true;
+    }
   }
 
   /*
@@ -5802,16 +5961,17 @@ void do_autocmd(char_u *arg, int forceit)
   /*
    * Loop over the events.
    */
-  last_event = (event_T)-1;             /* for listing the event name */
-  last_group = AUGROUP_ERROR;           /* for listing the group name */
-  if (*arg == '*' || *arg == NUL) {
+  last_event = (event_T)-1;             // for listing the event name
+  last_group = AUGROUP_ERROR;           // for listing the group name
+  if (*arg == '*' || *arg == NUL || *arg == '|') {
     for (event = (event_T)0; (int)event < (int)NUM_EVENTS;
-         event = (event_T)((int)event + 1))
-      if (do_autocmd_event(event, pat,
-              nested, cmd, forceit, group) == FAIL)
+         event = (event_T)((int)event + 1)) {
+      if (do_autocmd_event(event, pat, nested, cmd, forceit, group) == FAIL) {
         break;
+      }
+    }
   } else {
-    while (*arg && !ascii_iswhite(*arg)) {
+    while (*arg && *arg != '|' && !ascii_iswhite(*arg)) {
       event_T event = event_name2nr(arg, &arg);
       assert(event < NUM_EVENTS);
       if (do_autocmd_event(event, pat, nested, cmd, forceit, group) == FAIL) {
@@ -5838,7 +5998,8 @@ static int au_get_grouparg(char_u **argp)
   char_u      *arg = *argp;
   int group = AUGROUP_ALL;
 
-  p = skiptowhite(arg);
+  for (p = arg; *p && !ascii_iswhite(*p) && *p != '|'; p++) {
+  }
   if (p > arg) {
     group_name = vim_strnsave(arg, (int)(p - arg));
     group = au_find_group(group_name);
@@ -6068,13 +6229,18 @@ static int do_autocmd_event(event_T event, char_u *pat, int nested, char_u *cmd,
 int 
 do_doautocmd (
     char_u *arg,
-    int do_msg                 /* give message for no matching autocmds? */
+    int do_msg,  // give message for no matching autocmds?
+    bool *did_something
 )
 {
   char_u      *fname;
   int nothing_done = TRUE;
   int group;
 
+  if (did_something != NULL) {
+    *did_something = false;
+  }
+
   /*
    * Check for a legal group name.  If not, use AUGROUP_ALL.
    */
@@ -6103,8 +6269,12 @@ do_doautocmd (
             fname, NULL, TRUE, group, curbuf, NULL))
       nothing_done = FALSE;
 
-  if (nothing_done && do_msg)
+  if (nothing_done && do_msg) {
     MSG(_("No matching autocommands"));
+  }
+  if (did_something != NULL) {
+    *did_something = !nothing_done;
+  }
 
   return aborting() ? FAIL : OK;
 }
@@ -6133,13 +6303,14 @@ void ex_doautoall(exarg_T *eap)
     /* find a window for this buffer and save some values */
     aucmd_prepbuf(&aco, buf);
 
-    /* execute the autocommands for this buffer */
-    retval = do_doautocmd(arg, FALSE);
+    bool did_aucmd;
+    // execute the autocommands for this buffer
+    retval = do_doautocmd(arg, false, &did_aucmd);
 
-    if (call_do_modelines) {
-      /* Execute the modeline settings, but don't set window-local
-       * options if we are using the current window for another
-       * buffer. */
+    if (call_do_modelines && did_aucmd) {
+      // Execute the modeline settings, but don't set window-local
+      // options if we are using the current window for another
+      // buffer.
       do_modelines(curwin == aucmd_win ? OPT_NOWIN : 0);
     }
 
@@ -6258,27 +6429,24 @@ aucmd_prepbuf (
   aco->new_curbuf = curbuf;
 }
 
-/*
- * Cleanup after executing autocommands for a (hidden) buffer.
- * Restore the window as it was (if possible).
- */
-void 
-aucmd_restbuf (
-    aco_save_T *aco               /* structure holding saved values */
-)
+/// Cleanup after executing autocommands for a (hidden) buffer.
+/// Restore the window as it was (if possible).
+///
+/// @param aco  structure holding saved values
+void aucmd_restbuf(aco_save_T *aco)
 {
   int dummy;
 
   if (aco->use_aucmd_win) {
-    --curbuf->b_nwindows;
-    /* Find "aucmd_win", it can't be closed, but it may be in another tab
-     * page. Do not trigger autocommands here. */
+    curbuf->b_nwindows--;
+    // Find "aucmd_win", it can't be closed, but it may be in another tab page.
+    // Do not trigger autocommands here.
     block_autocmds();
     if (curwin != aucmd_win) {
       FOR_ALL_TAB_WINDOWS(tp, wp) {
         if (wp == aucmd_win) {
           if (tp != curtab) {
-            goto_tabpage_tp(tp, TRUE, TRUE);
+            goto_tabpage_tp(tp, true, true);
           }
           win_goto(aucmd_win);
           goto win_found;
@@ -6287,49 +6455,50 @@ aucmd_restbuf (
     }
 win_found:
 
-    /* Remove the window and frame from the tree of frames. */
+    // Remove the window and frame from the tree of frames.
     (void)winframe_remove(curwin, &dummy, NULL);
     win_remove(curwin, NULL);
-    aucmd_win_used = FALSE;
-    last_status(FALSE);             /* may need to remove last status line */
-    restore_snapshot(SNAP_AUCMD_IDX, FALSE);
-    (void)win_comp_pos();       /* recompute window positions */
+    aucmd_win_used = false;
+    last_status(false);         // may need to remove last status line
+    restore_snapshot(SNAP_AUCMD_IDX, false);
+    (void)win_comp_pos();       // recompute window positions
     unblock_autocmds();
 
-    if (win_valid(aco->save_curwin))
+    if (win_valid(aco->save_curwin)) {
       curwin = aco->save_curwin;
-    else
-      /* Hmm, original window disappeared.  Just use the first one. */
+    } else {
+      // Hmm, original window disappeared.  Just use the first one.
       curwin = firstwin;
-    vars_clear(&aucmd_win->w_vars->dv_hashtab);      /* free all w: variables */
-    hash_init(&aucmd_win->w_vars->dv_hashtab);       /* re-use the hashtab */
+    }
+    vars_clear(&aucmd_win->w_vars->dv_hashtab);      // free all w: variables
+    hash_init(&aucmd_win->w_vars->dv_hashtab);       // re-use the hashtab
     curbuf = curwin->w_buffer;
 
     xfree(globaldir);
     globaldir = aco->globaldir;
 
-    /* the buffer contents may have changed */
+    // the buffer contents may have changed
     check_cursor();
     if (curwin->w_topline > curbuf->b_ml.ml_line_count) {
       curwin->w_topline = curbuf->b_ml.ml_line_count;
       curwin->w_topfill = 0;
     }
   } else {
-    /* restore curwin */
+    // restore curwin
     if (win_valid(aco->save_curwin)) {
-      /* Restore the buffer which was previously edited by curwin, if
-       * it was changed, we are still the same window and the buffer is
-       * valid. */
+      // Restore the buffer which was previously edited by curwin, if it was
+      // changed, we are still the same window and the buffer is valid.
       if (curwin == aco->new_curwin
           && curbuf != aco->new_curbuf
           && buf_valid(aco->new_curbuf)
           && aco->new_curbuf->b_ml.ml_mfp != NULL) {
-        if (curwin->w_s == &curbuf->b_s)
+        if (curwin->w_s == &curbuf->b_s) {
           curwin->w_s = &aco->new_curbuf->b_s;
-        --curbuf->b_nwindows;
+        }
+        curbuf->b_nwindows--;
         curbuf = aco->new_curbuf;
         curwin->w_buffer = curbuf;
-        ++curbuf->b_nwindows;
+        curbuf->b_nwindows++;
       }
 
       curwin = aco->save_curwin;
@@ -6597,8 +6766,9 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
     fname = vim_strsave(fname);         /* make a copy, so we can change it */
   } else {
     sfname = vim_strsave(fname);
-    // don't try expanding the following events
+    // Don't try expanding the following events.
     if (event == EVENT_COLORSCHEME
+        || event == EVENT_DIRCHANGED
         || event == EVENT_FILETYPE
         || event == EVENT_FUNCUNDEFINED
         || event == EVENT_OPTIONSET
@@ -6607,10 +6777,11 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io,
         || event == EVENT_REMOTEREPLY
         || event == EVENT_SPELLFILEMISSING
         || event == EVENT_SYNTAX
-        || event == EVENT_TABCLOSED)
+        || event == EVENT_TABCLOSED) {
       fname = vim_strsave(fname);
-    else
-      fname = (char_u *)FullName_save((char *)fname, FALSE);
+    } else {
+      fname = (char_u *)FullName_save((char *)fname, false);
+    }
   }
   if (fname == NULL) {      /* out of memory */
     xfree(sfname);
@@ -6783,6 +6954,10 @@ BYPASS_AU:
   if (event == EVENT_BUFWIPEOUT && buf != NULL)
     aubuflocal_remove(buf);
 
+  if (retval == OK && event == EVENT_FILETYPE) {
+    au_did_filetype = true;
+  }
+
   return retval;
 }
 
@@ -6982,9 +7157,11 @@ char_u *get_augroup_name(expand_T *xp, int idx)
     return (char_u *)"END";
   if (idx >= augroups.ga_len)           /* end of list */
     return NULL;
-  if (AUGROUP_NAME(idx) == NULL)        /* skip deleted entries */
+  if (AUGROUP_NAME(idx) == NULL || AUGROUP_NAME(idx) == get_deleted_augroup()) {
+    // skip deleted entries
     return (char_u *)"";
-  return AUGROUP_NAME(idx);             /* return a name */
+  }
+  return AUGROUP_NAME(idx);             // return a name
 }
 
 static int include_groups = FALSE;
@@ -7041,10 +7218,12 @@ set_context_in_autocmd (
  */
 char_u *get_event_name(expand_T *xp, int idx)
 {
-  if (idx < augroups.ga_len) {          /* First list group names, if wanted */
-    if (!include_groups || AUGROUP_NAME(idx) == NULL)
-      return (char_u *)"";              /* skip deleted entries */
-    return AUGROUP_NAME(idx);           /* return a name */
+  if (idx < augroups.ga_len) {          // First list group names, if wanted
+    if (!include_groups || AUGROUP_NAME(idx) == NULL
+        || AUGROUP_NAME(idx) == get_deleted_augroup()) {
+      return (char_u *)"";              // skip deleted entries
+    }
+    return AUGROUP_NAME(idx);           // return a name
   }
   return (char_u *)event_names[idx - augroups.ga_len].name;
 }
diff --git a/src/nvim/fileio.h b/src/nvim/fileio.h
index d93f3f3eb3..ceb101167d 100644
--- a/src/nvim/fileio.h
+++ b/src/nvim/fileio.h
@@ -12,6 +12,8 @@
 #define READ_DUMMY      0x10    /* reading into a dummy buffer */
 #define READ_KEEP_UNDO  0x20    /* keep undo info*/
 
+#define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))
+
 /*
  * Struct to save values in before executing autocommands for a buffer that is
  * not the current buffer.
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index ac3cf959c8..d964da371a 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -22,7 +22,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
@@ -166,7 +165,7 @@ bool hasFoldingWin(
   int use_level = FALSE;
   int maybe_small = FALSE;
   garray_T    *gap;
-  int low_level = 0;;
+  int low_level = 0;
 
   checkupdate(win);
   /*
@@ -762,16 +761,12 @@ void clearFolding(win_T *win)
  */
 void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
 {
-  if (compl_busy) {
-    return;
-  }
-
-  fold_T      *fp;
-  if (wp->w_buffer->terminal) {
+  if (compl_busy || State & INSERT) {
     return;
   }
 
   // Mark all folds from top to bot as maybe-small.
+  fold_T *fp;
   (void)foldFind(&wp->w_folds, top, &fp);
   while (fp < (fold_T *)wp->w_folds.ga_data + wp->w_folds.ga_len
          && fp->fd_top < bot) {
@@ -793,6 +788,19 @@ void foldUpdate(win_T *wp, linenr_T top, linenr_T bot)
   }
 }
 
+/// Updates folds when leaving insert-mode.
+void foldUpdateAfterInsert(void)
+{
+  if (foldmethodIsManual(curwin)  // foldmethod=manual: No need to update.
+      // These foldmethods are too slow, do not auto-update on insert-leave.
+      || foldmethodIsSyntax(curwin) || foldmethodIsExpr(curwin)) {
+    return;
+  }
+
+  foldUpdateAll(curwin);
+  foldOpenCursor();
+}
+
 /* foldUpdateAll() {{{2 */
 /*
  * Update all lines in a window for folding.
@@ -1600,7 +1608,7 @@ static void foldAddMarker(linenr_T lnum, char_u *marker, size_t markerlen)
       STRLCPY(newline + line_len, marker, markerlen + 1);
     else {
       STRCPY(newline + line_len, cms);
-      STRNCPY(newline + line_len + (p - cms), marker, markerlen);
+      memcpy(newline + line_len + (p - cms), marker, markerlen);
       STRCPY(newline + line_len + (p - cms) + markerlen, p + 2);
     }
 
@@ -1665,7 +1673,8 @@ static void foldDelMarker(linenr_T lnum, char_u *marker, size_t markerlen)
     if (u_save(lnum - 1, lnum + 1) == OK) {
       /* Make new line: text-before-marker + text-after-marker */
       newline = xmalloc(STRLEN(line) - len + 1);
-      STRNCPY(newline, line, p - line);
+      assert(p >= line);
+      memcpy(newline, line, (size_t)(p - line));
       STRCPY(newline + (p - line), p + len);
       ml_replace(lnum, newline, FALSE);
     }
diff --git a/src/nvim/func_attr.h b/src/nvim/func_attr.h
index c31d21ec6d..d98fe5b22b 100644
--- a/src/nvim/func_attr.h
+++ b/src/nvim/func_attr.h
@@ -41,168 +41,175 @@
 // $ gcc -E -dM - </dev/null
 // $ echo | clang -dM -E -
 
+#ifndef NVIM_FUNC_ATTR_H
+#define NVIM_FUNC_ATTR_H
+#undef NVIM_FUNC_ATTR_H
+
 #ifdef FUNC_ATTR_MALLOC
-  #undef FUNC_ATTR_MALLOC
+# undef FUNC_ATTR_MALLOC
 #endif
 
 #ifdef FUNC_ATTR_ALLOC_SIZE
-  #undef FUNC_ATTR_ALLOC_SIZE
+# undef FUNC_ATTR_ALLOC_SIZE
 #endif
 
 #ifdef FUNC_ATTR_ALLOC_SIZE_PROD
-  #undef FUNC_ATTR_ALLOC_SIZE_PROD
+# undef FUNC_ATTR_ALLOC_SIZE_PROD
 #endif
 
 #ifdef FUNC_ATTR_ALLOC_ALIGN
-  #undef FUNC_ATTR_ALLOC_ALIGN
+# undef FUNC_ATTR_ALLOC_ALIGN
 #endif
 
 #ifdef FUNC_ATTR_PURE
-  #undef FUNC_ATTR_PURE
+# undef FUNC_ATTR_PURE
 #endif
 
 #ifdef FUNC_ATTR_CONST
-  #undef FUNC_ATTR_CONST
+# undef FUNC_ATTR_CONST
 #endif
 
 #ifdef FUNC_ATTR_WARN_UNUSED_RESULT
-  #undef FUNC_ATTR_WARN_UNUSED_RESULT
+# undef FUNC_ATTR_WARN_UNUSED_RESULT
 #endif
 
 #ifdef FUNC_ATTR_ALWAYS_INLINE
-  #undef FUNC_ATTR_ALWAYS_INLINE
+# undef FUNC_ATTR_ALWAYS_INLINE
 #endif
 
 #ifdef FUNC_ATTR_UNUSED
-  #undef FUNC_ATTR_UNUSED
+# undef FUNC_ATTR_UNUSED
 #endif
 
 #ifdef FUNC_ATTR_NONNULL_ALL
-  #undef FUNC_ATTR_NONNULL_ALL
+# undef FUNC_ATTR_NONNULL_ALL
 #endif
 
 #ifdef FUNC_ATTR_NONNULL_ARG
-  #undef FUNC_ATTR_NONNULL_ARG
+# undef FUNC_ATTR_NONNULL_ARG
 #endif
 
 #ifdef FUNC_ATTR_NONNULL_RET
-  #undef FUNC_ATTR_NONNULL_RET
+# undef FUNC_ATTR_NONNULL_RET
 #endif
 
 #ifndef DID_REAL_ATTR
-  #define DID_REAL_ATTR
-  #ifdef __GNUC__
-    // place defines for all gnulikes here, for now that's gcc, clang and
-    // intel.
-
-    // place these after the argument list of the function declaration
-    // (not definition), like so:
-    // void myfunc(void) REAL_FATTR_ALWAYS_INLINE;
-    #define REAL_FATTR_MALLOC __attribute__((malloc))
-    #define REAL_FATTR_ALLOC_ALIGN(x) __attribute__((alloc_align(x)))
-    #define REAL_FATTR_PURE __attribute__ ((pure))
-    #define REAL_FATTR_CONST __attribute__((const))
-    #define REAL_FATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
-    #define REAL_FATTR_ALWAYS_INLINE __attribute__((always_inline))
-    #define REAL_FATTR_UNUSED __attribute__((unused))
-    #define REAL_FATTR_NONNULL_ALL __attribute__((nonnull))
-    #define REAL_FATTR_NONNULL_ARG(...) __attribute__((nonnull(__VA_ARGS__)))
-
-    #ifdef __clang__
-      // clang only
-    #elif defined(__INTEL_COMPILER)
-      // intel only
-    #else
-      #define GCC_VERSION \
+# define DID_REAL_ATTR
+# ifdef __GNUC__
+// place defines for all gnulikes here, for now that's gcc, clang and
+// intel.
+
+// place these after the argument list of the function declaration
+// (not definition), like so:
+// void myfunc(void) REAL_FATTR_ALWAYS_INLINE;
+#  define REAL_FATTR_MALLOC __attribute__((malloc))
+#  define REAL_FATTR_ALLOC_ALIGN(x) __attribute__((alloc_align(x)))
+#  define REAL_FATTR_PURE __attribute__ ((pure))
+#  define REAL_FATTR_CONST __attribute__((const))
+#  define REAL_FATTR_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#  define REAL_FATTR_ALWAYS_INLINE __attribute__((always_inline))
+#  define REAL_FATTR_UNUSED __attribute__((unused))
+#  define REAL_FATTR_NONNULL_ALL __attribute__((nonnull))
+#  define REAL_FATTR_NONNULL_ARG(...) __attribute__((nonnull(__VA_ARGS__)))
+
+#  ifdef __clang__
+// clang only
+#  elif defined(__INTEL_COMPILER)
+// intel only
+#  else
+#   define GCC_VERSION \
             (__GNUC__ * 10000 + \
-              __GNUC_MINOR__ * 100 + \
-              __GNUC_PATCHLEVEL__)
-      // gcc only
-      #define REAL_FATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
-      #define REAL_FATTR_ALLOC_SIZE_PROD(x,y) __attribute__((alloc_size(x,y)))
-      #if GCC_VERSION >= 40900
-        #define REAL_FATTR_NONNULL_RET __attribute__((returns_nonnull))
-      #endif
-    #endif
-  #endif
-
-  // define function attributes that haven't been defined for this specific
-  // compiler.
-
-  #ifndef REAL_FATTR_MALLOC
-    #define REAL_FATTR_MALLOC
-  #endif
-
-  #ifndef REAL_FATTR_ALLOC_SIZE
-    #define REAL_FATTR_ALLOC_SIZE(x)
-  #endif
-
-  #ifndef REAL_FATTR_ALLOC_SIZE_PROD
-    #define REAL_FATTR_ALLOC_SIZE_PROD(x,y)
-  #endif
-
-  #ifndef REAL_FATTR_ALLOC_ALIGN
-    #define REAL_FATTR_ALLOC_ALIGN(x)
-  #endif
-
-  #ifndef REAL_FATTR_PURE
-    #define REAL_FATTR_PURE
-  #endif
-
-  #ifndef REAL_FATTR_CONST
-    #define REAL_FATTR_CONST
-  #endif
-
-  #ifndef REAL_FATTR_WARN_UNUSED_RESULT
-    #define REAL_FATTR_WARN_UNUSED_RESULT
-  #endif
-
-  #ifndef REAL_FATTR_ALWAYS_INLINE
-    #define REAL_FATTR_ALWAYS_INLINE
-  #endif
-
-  #ifndef REAL_FATTR_UNUSED
-    #define REAL_FATTR_UNUSED
-  #endif
-
-  #ifndef REAL_FATTR_NONNULL_ALL
-    #define REAL_FATTR_NONNULL_ALL
-  #endif
-
-  #ifndef REAL_FATTR_NONNULL_ARG
-    #define REAL_FATTR_NONNULL_ARG(...)
-  #endif
-
-  #ifndef REAL_FATTR_NONNULL_RET
-    #define REAL_FATTR_NONNULL_RET
-  #endif
+             __GNUC_MINOR__ * 100 + \
+             __GNUC_PATCHLEVEL__)
+// gcc only
+#   define REAL_FATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+#   define REAL_FATTR_ALLOC_SIZE_PROD(x, y) __attribute__((alloc_size(x, y)))
+#   if GCC_VERSION >= 40900
+#    define REAL_FATTR_NONNULL_RET __attribute__((returns_nonnull))
+#   endif
+#  endif
+# endif
+
+// define function attributes that haven't been defined for this specific
+// compiler.
+
+# ifndef REAL_FATTR_MALLOC
+#  define REAL_FATTR_MALLOC
+# endif
+
+# ifndef REAL_FATTR_ALLOC_SIZE
+#  define REAL_FATTR_ALLOC_SIZE(x)
+# endif
+
+# ifndef REAL_FATTR_ALLOC_SIZE_PROD
+#  define REAL_FATTR_ALLOC_SIZE_PROD(x, y)
+# endif
+
+# ifndef REAL_FATTR_ALLOC_ALIGN
+#  define REAL_FATTR_ALLOC_ALIGN(x)
+# endif
+
+# ifndef REAL_FATTR_PURE
+#  define REAL_FATTR_PURE
+# endif
+
+# ifndef REAL_FATTR_CONST
+#  define REAL_FATTR_CONST
+# endif
+
+# ifndef REAL_FATTR_WARN_UNUSED_RESULT
+#  define REAL_FATTR_WARN_UNUSED_RESULT
+# endif
+
+# ifndef REAL_FATTR_ALWAYS_INLINE
+#  define REAL_FATTR_ALWAYS_INLINE
+# endif
+
+# ifndef REAL_FATTR_UNUSED
+#  define REAL_FATTR_UNUSED
+# endif
+
+# ifndef REAL_FATTR_NONNULL_ALL
+#  define REAL_FATTR_NONNULL_ALL
+# endif
+
+# ifndef REAL_FATTR_NONNULL_ARG
+#  define REAL_FATTR_NONNULL_ARG(...)
+# endif
+
+# ifndef REAL_FATTR_NONNULL_RET
+#  define REAL_FATTR_NONNULL_RET
+# endif
 #endif
 
 #ifdef DEFINE_FUNC_ATTRIBUTES
-  #define FUNC_ATTR_ASYNC
-  #define FUNC_ATTR_MALLOC REAL_FATTR_MALLOC
-  #define FUNC_ATTR_ALLOC_SIZE(x) REAL_FATTR_ALLOC_SIZE(x)
-  #define FUNC_ATTR_ALLOC_SIZE_PROD(x,y) REAL_FATTR_ALLOC_SIZE_PROD(x,y)
-  #define FUNC_ATTR_ALLOC_ALIGN(x) REAL_FATTR_ALLOC_ALIGN(x)
-  #define FUNC_ATTR_PURE REAL_FATTR_PURE
-  #define FUNC_ATTR_CONST REAL_FATTR_CONST
-  #define FUNC_ATTR_WARN_UNUSED_RESULT REAL_FATTR_WARN_UNUSED_RESULT
-  #define FUNC_ATTR_ALWAYS_INLINE REAL_FATTR_ALWAYS_INLINE
-  #define FUNC_ATTR_UNUSED REAL_FATTR_UNUSED
-  #define FUNC_ATTR_NONNULL_ALL REAL_FATTR_NONNULL_ALL
-  #define FUNC_ATTR_NONNULL_ARG(...) REAL_FATTR_NONNULL_ARG(__VA_ARGS__)
-  #define FUNC_ATTR_NONNULL_RET REAL_FATTR_NONNULL_RET
+# define FUNC_API_ASYNC
+# define FUNC_API_NOEXPORT
+# define FUNC_API_NOEVAL
+# define FUNC_ATTR_MALLOC REAL_FATTR_MALLOC
+# define FUNC_ATTR_ALLOC_SIZE(x) REAL_FATTR_ALLOC_SIZE(x)
+# define FUNC_ATTR_ALLOC_SIZE_PROD(x, y) REAL_FATTR_ALLOC_SIZE_PROD(x, y)
+# define FUNC_ATTR_ALLOC_ALIGN(x) REAL_FATTR_ALLOC_ALIGN(x)
+# define FUNC_ATTR_PURE REAL_FATTR_PURE
+# define FUNC_ATTR_CONST REAL_FATTR_CONST
+# define FUNC_ATTR_WARN_UNUSED_RESULT REAL_FATTR_WARN_UNUSED_RESULT
+# define FUNC_ATTR_ALWAYS_INLINE REAL_FATTR_ALWAYS_INLINE
+# define FUNC_ATTR_UNUSED REAL_FATTR_UNUSED
+# define FUNC_ATTR_NONNULL_ALL REAL_FATTR_NONNULL_ALL
+# define FUNC_ATTR_NONNULL_ARG(...) REAL_FATTR_NONNULL_ARG(__VA_ARGS__)
+# define FUNC_ATTR_NONNULL_RET REAL_FATTR_NONNULL_RET
 #elif !defined(DO_NOT_DEFINE_EMPTY_ATTRIBUTES)
-  #define FUNC_ATTR_MALLOC
-  #define FUNC_ATTR_ALLOC_SIZE(x)
-  #define FUNC_ATTR_ALLOC_SIZE_PROD(x,y)
-  #define FUNC_ATTR_ALLOC_ALIGN(x)
-  #define FUNC_ATTR_PURE
-  #define FUNC_ATTR_CONST
-  #define FUNC_ATTR_WARN_UNUSED_RESULT
-  #define FUNC_ATTR_ALWAYS_INLINE
-  #define FUNC_ATTR_UNUSED
-  #define FUNC_ATTR_NONNULL_ALL
-  #define FUNC_ATTR_NONNULL_ARG(...)
-  #define FUNC_ATTR_NONNULL_RET
+# define FUNC_ATTR_MALLOC
+# define FUNC_ATTR_ALLOC_SIZE(x)
+# define FUNC_ATTR_ALLOC_SIZE_PROD(x, y)
+# define FUNC_ATTR_ALLOC_ALIGN(x)
+# define FUNC_ATTR_PURE
+# define FUNC_ATTR_CONST
+# define FUNC_ATTR_WARN_UNUSED_RESULT
+# define FUNC_ATTR_ALWAYS_INLINE
+# define FUNC_ATTR_UNUSED
+# define FUNC_ATTR_NONNULL_ALL
+# define FUNC_ATTR_NONNULL_ARG(...)
+# define FUNC_ATTR_NONNULL_RET
 #endif
+#endif  // NVIM_FUNC_ATTR_H
diff --git a/src/nvim/garray.c b/src/nvim/garray.c
index 98cec69b54..9ed3b901ef 100644
--- a/src/nvim/garray.c
+++ b/src/nvim/garray.c
@@ -8,7 +8,6 @@
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/log.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/path.h"
 #include "nvim/garray.h"
diff --git a/src/nvim/garray.h b/src/nvim/garray.h
index 642eaf54f0..5d7806bbfa 100644
--- a/src/nvim/garray.h
+++ b/src/nvim/garray.h
@@ -21,10 +21,10 @@ typedef struct growarray {
 
 #define GA_EMPTY(ga_ptr) ((ga_ptr)->ga_len <= 0)
 
-#define GA_APPEND(item_type, gap, item)                                    \
-  do {                                                                     \
-    ga_grow(gap, 1);                                                       \
-    ((item_type *)(gap)->ga_data)[(gap)->ga_len++] = (item);               \
+#define GA_APPEND(item_type, gap, item) \
+  do { \
+    ga_grow(gap, 1); \
+    ((item_type *)(gap)->ga_data)[(gap)->ga_len++] = (item); \
   } while (0)
 
 #define GA_APPEND_VIA_PTR(item_type, gap) \
@@ -49,16 +49,16 @@ static inline void *ga_append_via_ptr(garray_T *gap, size_t item_size)
 /// @param gap the garray to be freed
 /// @param item_type type of the item in the garray
 /// @param free_item_fn free function that takes (*item_type) as parameter
-#define GA_DEEP_CLEAR(gap, item_type, free_item_fn)             \
-  do {                                                          \
-    garray_T *_gap = (gap);                                     \
-    if (_gap->ga_data != NULL) {                                \
-      for (int i = 0; i < _gap->ga_len; i++) {                  \
-        item_type *_item = &(((item_type *)_gap->ga_data)[i]);  \
-        free_item_fn(_item);                                    \
-      }                                                         \
-    }                                                           \
-    ga_clear(_gap);                                             \
+#define GA_DEEP_CLEAR(gap, item_type, free_item_fn) \
+  do { \
+    garray_T *_gap = (gap); \
+    if (_gap->ga_data != NULL) { \
+      for (int i = 0; i < _gap->ga_len; i++) { \
+        item_type *_item = &(((item_type *)_gap->ga_data)[i]); \
+        free_item_fn(_item); \
+      } \
+    } \
+    ga_clear(_gap); \
   } while (false)
 
 #define FREE_PTR_PTR(ptr) xfree(*(ptr))
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index dbf0322d78..fccbd69dbf 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -29,7 +29,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
@@ -38,6 +37,7 @@
 #include "nvim/option.h"
 #include "nvim/regexp.h"
 #include "nvim/screen.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 #include "nvim/undo.h"
@@ -113,7 +113,7 @@ static mapblock_T       *first_abbr = NULL; /* first entry in abbrlist */
 static int KeyNoremap = 0;                  /* remapping flags */
 
 /*
- * variables used by vgetorpeek() and flush_buffers()
+ * Variables used by vgetorpeek() and flush_buffers()
  *
  * typebuf.tb_buf[] contains all characters that are not consumed yet.
  * typebuf.tb_buf[typebuf.tb_off] is the first valid character.
@@ -1583,29 +1583,27 @@ vungetc ( /* unget one character (can only be done once!) */
   old_mouse_col = mouse_col;
 }
 
-/*
- * get a character:
- * 1. from the stuffbuffer
- *	This is used for abbreviated commands like "D" -> "d$".
- *	Also used to redo a command for ".".
- * 2. from the typeahead buffer
- *	Stores text obtained previously but not used yet.
- *	Also stores the result of mappings.
- *	Also used for the ":normal" command.
- * 3. from the user
- *	This may do a blocking wait if "advance" is TRUE.
- *
- * if "advance" is TRUE (vgetc()):
- *	really get the character.
- *	KeyTyped is set to TRUE in the case the user typed the key.
- *	KeyStuffed is TRUE if the character comes from the stuff buffer.
- * if "advance" is FALSE (vpeekc()):
- *	just look whether there is a character available.
- *
- * When "no_mapping" is zero, checks for mappings in the current mode.
- * Only returns one byte (of a multi-byte character).
- * K_SPECIAL and CSI may be escaped, need to get two more bytes then.
- */
+/// get a character:
+/// 1. from the stuffbuffer
+///    This is used for abbreviated commands like "D" -> "d$".
+///    Also used to redo a command for ".".
+/// 2. from the typeahead buffer
+///    Stores text obtained previously but not used yet.
+///    Also stores the result of mappings.
+///    Also used for the ":normal" command.
+/// 3. from the user
+///    This may do a blocking wait if "advance" is TRUE.
+///
+/// if "advance" is TRUE (vgetc()):
+///    really get the character.
+///    KeyTyped is set to TRUE in the case the user typed the key.
+///    KeyStuffed is TRUE if the character comes from the stuff buffer.
+/// if "advance" is FALSE (vpeekc()):
+///    just look whether there is a character available.
+///
+/// When "no_mapping" is zero, checks for mappings in the current mode.
+/// Only returns one byte (of a multi-byte character).
+/// K_SPECIAL and CSI may be escaped, need to get two more bytes then.
 static int vgetorpeek(int advance)
 {
   int c, c1;
@@ -1754,10 +1752,11 @@ static int vgetorpeek(int advance)
                    || ((compl_cont_status & CONT_LOCAL)
                        && (c1 == Ctrl_N || c1 == Ctrl_P)))
               ) {
-            if (c1 == K_SPECIAL)
+            if (c1 == K_SPECIAL) {
               nolmaplen = 2;
-            else {
-              LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0);
+            } else {
+              LANGMAP_ADJUST(c1, (State & (CMDLINE | INSERT)) == 0
+                             && get_real_state() != SELECTMODE);
               nolmaplen = 0;
             }
             /* First try buffer-local mappings. */
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index dafb75ca87..baa85c01f8 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -409,12 +409,8 @@ EXTERN struct caller_scope {
 } provider_caller_scope;
 EXTERN int provider_call_nesting INIT(= 0);
 
-/* Magic number used for hashitem "hi_key" value indicating a deleted item.
- * Only the address is used. */
-EXTERN char_u hash_removed;
 
-
-EXTERN int t_colors INIT(= 0);              /* int value of T_CCO */
+EXTERN int t_colors INIT(= 256);                // int value of T_CCO
 
 /*
  * When highlight_match is TRUE, highlight a match, starting at the cursor
@@ -442,59 +438,60 @@ EXTERN int no_check_timestamps INIT(= 0);       /* Don't check timestamps */
 typedef enum {
   HLF_8 = 0         /* Meta & special keys listed with ":map", text that is
                        displayed different from what it is */
-  , HLF_EOB         //< after the last line in the buffer
-  , HLF_TERM        //< terminal cursor focused
-  , HLF_TERMNC      //< terminal cursor unfocused
-  , HLF_AT          /* @ characters at end of screen, characters that
-                       don't really exist in the text */
-  , HLF_D           /* directories in CTRL-D listing */
-  , HLF_E           /* error messages */
-  , HLF_I           /* incremental search */
-  , HLF_L           /* last search string */
-  , HLF_M           /* "--More--" message */
-  , HLF_CM          /* Mode (e.g., "-- INSERT --") */
-  , HLF_N           /* line number for ":number" and ":#" commands */
-  , HLF_CLN         /* current line number */
-  , HLF_R           /* return to continue message and yes/no questions */
-  , HLF_S           /* status lines */
-  , HLF_SNC         /* status lines of not-current windows */
-  , HLF_C           /* column to separate vertically split windows */
-  , HLF_T           /* Titles for output from ":set all", ":autocmd" etc. */
-  , HLF_V           /* Visual mode */
-  , HLF_VNC         /* Visual mode, autoselecting and not clipboard owner */
-  , HLF_W           /* warning messages */
-  , HLF_WM          /* Wildmenu highlight */
-  , HLF_FL          /* Folded line */
-  , HLF_FC          /* Fold column */
-  , HLF_ADD         /* Added diff line */
-  , HLF_CHD         /* Changed diff line */
-  , HLF_DED         /* Deleted diff line */
-  , HLF_TXD         /* Text Changed in diff line */
-  , HLF_CONCEAL     /* Concealed text */
-  , HLF_SC          /* Sign column */
-  , HLF_SPB         /* SpellBad */
-  , HLF_SPC         /* SpellCap */
-  , HLF_SPR         /* SpellRare */
-  , HLF_SPL         /* SpellLocal */
-  , HLF_PNI         /* popup menu normal item */
-  , HLF_PSI         /* popup menu selected item */
-  , HLF_PSB         /* popup menu scrollbar */
-  , HLF_PST         /* popup menu scrollbar thumb */
-  , HLF_TP          /* tabpage line */
-  , HLF_TPS         /* tabpage line selected */
-  , HLF_TPF         /* tabpage line filler */
-  , HLF_CUC         /* 'cursurcolumn' */
-  , HLF_CUL         /* 'cursurline' */
-  , HLF_MC          /* 'colorcolumn' */
-  , HLF_COUNT       /* MUST be the last one */
+  , HLF_EOB         // after the last line in the buffer
+  , HLF_TERM        // terminal cursor focused
+  , HLF_TERMNC      // terminal cursor unfocused
+  , HLF_AT          // @ characters at end of screen, characters that
+                    // don't really exist in the text
+  , HLF_D           // directories in CTRL-D listing
+  , HLF_E           // error messages
+  , HLF_I           // incremental search
+  , HLF_L           // last search string
+  , HLF_M           // "--More--" message
+  , HLF_CM          // Mode (e.g., "-- INSERT --")
+  , HLF_N           // line number for ":number" and ":#" commands
+  , HLF_CLN         // current line number
+  , HLF_R           // return to continue message and yes/no questions
+  , HLF_S           // status lines
+  , HLF_SNC         // status lines of not-current windows
+  , HLF_C           // column to separate vertically split windows
+  , HLF_T           // Titles for output from ":set all", ":autocmd" etc.
+  , HLF_V           // Visual mode
+  , HLF_VNC         // Visual mode, autoselecting and not clipboard owner
+  , HLF_W           // warning messages
+  , HLF_WM          // Wildmenu highlight
+  , HLF_FL          // Folded line
+  , HLF_FC          // Fold column
+  , HLF_ADD         // Added diff line
+  , HLF_CHD         // Changed diff line
+  , HLF_DED         // Deleted diff line
+  , HLF_TXD         // Text Changed in diff line
+  , HLF_CONCEAL     // Concealed text
+  , HLF_SC          // Sign column
+  , HLF_SPB         // SpellBad
+  , HLF_SPC         // SpellCap
+  , HLF_SPR         // SpellRare
+  , HLF_SPL         // SpellLocal
+  , HLF_PNI         // popup menu normal item
+  , HLF_PSI         // popup menu selected item
+  , HLF_PSB         // popup menu scrollbar
+  , HLF_PST         // popup menu scrollbar thumb
+  , HLF_TP          // tabpage line
+  , HLF_TPS         // tabpage line selected
+  , HLF_TPF         // tabpage line filler
+  , HLF_CUC         // 'cursurcolumn'
+  , HLF_CUL         // 'cursurline'
+  , HLF_MC          // 'colorcolumn'
+  , HLF_QFL         // selected quickfix line
+  , HLF_COUNT       // MUST be the last one
 } hlf_T;
 
 /* The HL_FLAGS must be in the same order as the HLF_ enums!
  * When changing this also adjust the default for 'highlight'. */
-#define HL_FLAGS {'8', '~', 'z', 'Z', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', \
-                  'N', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', \
-                  'A', 'C', 'D', 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', \
-                  'x', 'X', '*', '#', '_', '!', '.', 'o'}
+#define HL_FLAGS { '8', '~', 'z', 'Z', '@', 'd', 'e', 'i', 'l', 'm', 'M', 'n', \
+                   'N', 'r', 's', 'S', 'c', 't', 'v', 'V', 'w', 'W', 'f', 'F', \
+                   'A', 'C', 'D', 'T', '-', '>', 'B', 'P', 'R', 'L', '+', '=', \
+                   'x', 'X', '*', '#', '_', '!', '.', 'o', 'q' }
 
 EXTERN int highlight_attr[HLF_COUNT];       /* Highl. attr for each context. */
 EXTERN int highlight_user[9];                   /* User[1-9] attributes */
@@ -569,6 +566,7 @@ EXTERN win_T    *prevwin INIT(= NULL);  /* previous window */
   FOR_ALL_TABS(tp) \
     FOR_ALL_WINDOWS_IN_TAB(wp, tp)
 
+# define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
 # define FOR_ALL_WINDOWS_IN_TAB(wp, tp) \
   for (win_T *wp = ((tp) == curtab) \
               ? firstwin : (tp)->tp_firstwin; wp != NULL; wp = wp->w_next)
@@ -599,9 +597,9 @@ EXTERN int redraw_tabline INIT(= FALSE);           /* need to redraw tabline */
  * All buffers are linked in a list. 'firstbuf' points to the first entry,
  * 'lastbuf' to the last entry and 'curbuf' to the currently active buffer.
  */
-EXTERN buf_T    *firstbuf INIT(= NULL); /* first buffer */
-EXTERN buf_T    *lastbuf INIT(= NULL);  /* last buffer */
-EXTERN buf_T    *curbuf INIT(= NULL);   /* currently active buffer */
+EXTERN buf_T    *firstbuf INIT(= NULL);  // first buffer
+EXTERN buf_T    *lastbuf INIT(= NULL);   // last buffer
+EXTERN buf_T    *curbuf INIT(= NULL);    // currently active buffer
 
 // Iterates over all buffers in the buffer list.
 # define FOR_ALL_BUFFERS(buf) for (buf_T *buf = firstbuf; buf != NULL; buf = buf->b_next)
@@ -634,10 +632,10 @@ EXTERN int exiting INIT(= FALSE);
 /* TRUE when planning to exit Vim.  Might
  * still keep on running if there is a changed
  * buffer. */
-/* volatile because it is used in signal handler deathtrap(). */
-EXTERN volatile int full_screen INIT(= FALSE);
-/* TRUE when doing full-screen output
- * otherwise only writing some messages */
+// volatile because it is used in signal handler deathtrap().
+EXTERN volatile int full_screen INIT(= false);
+// TRUE when doing full-screen output
+// otherwise only writing some messages
 
 EXTERN int restricted INIT(= FALSE);
 // TRUE when started in restricted mode (-Z)
@@ -777,44 +775,38 @@ EXTERN int vr_lines_changed INIT(= 0);      /* #Lines changed by "gR" so far */
 # define DBCS_2BYTE     1       /* 2byte- */
 # define DBCS_DEBUG     -1
 
-EXTERN int enc_dbcs INIT(= 0);                  /* One of DBCS_xxx values if
-                                                   DBCS encoding */
-EXTERN int enc_unicode INIT(= 0);       /* 2: UCS-2 or UTF-16, 4: UCS-4 */
-EXTERN bool enc_utf8 INIT(= false);             /* UTF-8 encoded Unicode */
-EXTERN int enc_latin1like INIT(= TRUE);         /* 'encoding' is latin1 comp. */
-EXTERN int has_mbyte INIT(= 0);                 /* any multi-byte encoding */
+// mbyte flags that used to depend on 'encoding'. These are now deprecated, as
+// 'encoding' is always "utf-8". Code that use them can be refactored to
+// remove dead code.
+#define enc_dbcs false
+#define enc_utf8 true
+#define has_mbyte true
 
 /// Encoding used when 'fencs' is set to "default"
 EXTERN char_u *fenc_default INIT(= NULL);
 
-/*
- * To speed up BYTELEN() we fill a table with the byte lengths whenever
- * enc_utf8 or enc_dbcs changes.
- */
-EXTERN char mb_bytelen_tab[256];
-
-/*
- * Function pointers, used to quickly get to the right function.  Each has
- * three possible values: latin_ (8-bit), utfc_ or utf_ (utf-8) and dbcs_
- * (DBCS).
- * The value is set in mb_init();
- */
-/* length of char in bytes, including following composing chars */
-EXTERN int (*mb_ptr2len)(const char_u *p) INIT(= latin_ptr2len);
-/* idem, with limit on string length */
-EXTERN int (*mb_ptr2len_len)(const char_u *p, int size) INIT(= latin_ptr2len_len);
-/* byte length of char */
-EXTERN int (*mb_char2len)(int c) INIT(= latin_char2len);
-/* convert char to bytes, return the length */
-EXTERN int (*mb_char2bytes)(int c, char_u *buf) INIT(= latin_char2bytes);
-EXTERN int (*mb_ptr2cells)(const char_u *p) INIT(= latin_ptr2cells);
-EXTERN int (*mb_ptr2cells_len)(const char_u *p, int size) INIT(
-      = latin_ptr2cells_len);
-EXTERN int (*mb_char2cells)(int c) INIT(= latin_char2cells);
-EXTERN int (*mb_off2cells)(unsigned off, unsigned max_off) INIT(
-      = latin_off2cells);
-EXTERN int (*mb_ptr2char)(const char_u *p) INIT(= latin_ptr2char);
-EXTERN int (*mb_head_off)(const char_u *base, const char_u *p) INIT(= latin_head_off);
+// To speed up BYTELEN(); keep a lookup table to quickly get the length in
+// bytes of a UTF-8 character from the first byte of a UTF-8 string.  Bytes
+// which are illegal when used as the first byte have a 1.  The NUL byte has
+// length 1.
+EXTERN char utf8len_tab[256] INIT(= {
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+  3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+  4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 1, 1,
+});
 
 # if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
 /* Pointers to functions and variables to be loaded at runtime */
@@ -836,8 +828,8 @@ EXTERN int* (*iconv_errno)(void);
 EXTERN int State INIT(= NORMAL);        /* This is the current state of the
                                          * command interpreter. */
 
-EXTERN int finish_op INIT(= FALSE);     /* TRUE while an operator is pending */
-EXTERN long opcount INIT(= 0);          /* count for pending operator */
+EXTERN bool finish_op INIT(= false);    // true while an operator is pending
+EXTERN long opcount INIT(= 0);          // count for pending operator
 
 /*
  * ex mode (Q) state
@@ -877,9 +869,10 @@ EXTERN int mapped_ctrl_c INIT(= 0);  // Modes where CTRL-C is mapped.
 
 EXTERN cmdmod_T cmdmod;                 /* Ex command modifiers */
 
-EXTERN int msg_silent INIT(= 0);        /* don't print messages */
-EXTERN int emsg_silent INIT(= 0);       /* don't print error messages */
-EXTERN int cmd_silent INIT(= FALSE);      /* don't echo the command line */
+EXTERN int msg_silent INIT(= 0);         // don't print messages
+EXTERN int emsg_silent INIT(= 0);        // don't print error messages
+EXTERN bool emsg_noredir INIT(= false);  // don't redirect error messages
+EXTERN int cmd_silent INIT(= false);     // don't echo the command line
 
 /* Values for swap_exists_action: what to do when swap file already exists */
 #define SEA_NONE        0       /* don't use dialog */
@@ -914,9 +907,6 @@ EXTERN int KeyTyped;                     // TRUE if user typed current char
 EXTERN int KeyStuffed;                   // TRUE if current char from stuffbuf
 EXTERN int maptick INIT(= 0);            // tick for each non-mapped char
 
-EXTERN uint8_t chartab[256];             // table used in charset.c; See
-                                         // init_chartab() for explanation
-
 EXTERN int must_redraw INIT(= 0);           /* type of redraw necessary */
 EXTERN int skip_redraw INIT(= FALSE);       /* skip redraw once */
 EXTERN int do_redraw INIT(= FALSE);         /* extra redraw once */
@@ -929,9 +919,9 @@ EXTERN FILE     *scriptin[NSCRIPT];         /* streams to read script from */
 EXTERN int curscript INIT(= 0);             /* index in scriptin[] */
 EXTERN FILE     *scriptout INIT(= NULL);    /* stream to write script to */
 
-/* volatile because it is used in signal handler catch_sigint(). */
-EXTERN volatile int got_int INIT(= FALSE);    /* set to TRUE when interrupt
-                                                 signal occurred */
+// volatile because it is used in a signal handler.
+EXTERN volatile int got_int INIT(= false);  // set to true when interrupt
+                                            // signal occurred
 EXTERN int bangredo INIT(= FALSE);          /* set to TRUE with ! command */
 EXTERN int searchcmdlen;                    /* length of previous search cmd */
 EXTERN int reg_do_extmatch INIT(= 0);       /* Used when compiling regexp:
@@ -985,10 +975,11 @@ EXTERN int keep_help_flag INIT(= FALSE);      /* doing :ta from help file */
  */
 EXTERN char_u   *empty_option INIT(= (char_u *)"");
 
-EXTERN int redir_off INIT(= FALSE);     /* no redirection for a moment */
-EXTERN FILE *redir_fd INIT(= NULL);     /* message redirection file */
-EXTERN int redir_reg INIT(= 0);         /* message redirection register */
-EXTERN int redir_vname INIT(= 0);       /* message redirection variable */
+EXTERN int redir_off INIT(= false);         // no redirection for a moment
+EXTERN FILE *redir_fd INIT(= NULL);         // message redirection file
+EXTERN int redir_reg INIT(= 0);             // message redirection register
+EXTERN int redir_vname INIT(= 0);           // message redirection variable
+EXTERN garray_T *capture_ga INIT(= NULL);   // captured output for execute()
 
 EXTERN char_u langmap_mapchar[256];     /* mapping for language keys */
 
@@ -1132,7 +1123,6 @@ EXTERN char_u e_invcmd[] INIT(= N_("E476: Invalid command"));
 EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory"));
 EXTERN char_u e_invjob[] INIT(= N_("E900: Invalid job id"));
 EXTERN char_u e_jobtblfull[] INIT(= N_("E901: Job table is full"));
-EXTERN char_u e_jobexe[] INIT(= N_("E902: \"%s\" is not an executable"));
 EXTERN char_u e_jobspawn[] INIT(= N_(
       "E903: Process for command \"%s\" could not be spawned"));
 EXTERN char_u e_jobnotpty[] INIT(= N_("E904: Job is not connected to a pty"));
@@ -1222,7 +1212,10 @@ EXTERN char_u e_invalpat[] INIT(= N_(
 EXTERN char_u e_bufloaded[] INIT(= N_("E139: File is loaded in another buffer"));
 EXTERN char_u e_notset[] INIT(= N_("E764: Option '%s' is not set"));
 EXTERN char_u e_invalidreg[] INIT(= N_("E850: Invalid register name"));
+EXTERN char_u e_dirnotf[] INIT(= N_(
+    "E919: Directory not found in '%s': \"%s\""));
 EXTERN char_u e_unsupportedoption[] INIT(= N_("E519: Option not supported"));
+EXTERN char_u e_fnametoolong[] INIT(= N_("E856: Filename too long"));
 
 
 EXTERN char top_bot_msg[] INIT(= N_("search hit TOP, continuing at BOTTOM"));
@@ -1241,9 +1234,13 @@ EXTERN FILE *time_fd INIT(= NULL);  /* where to write startup timing */
 EXTERN int ignored;
 EXTERN char *ignoredp;
 
+EXTERN bool in_free_unref_items INIT(= false);
+
 // If a msgpack-rpc channel should be started over stdin/stdout
 EXTERN bool embedded_mode INIT(= false);
-EXTERN Loop loop;
+
+/// next free id for a job or rpc channel
+EXTERN uint64_t next_chan_id INIT(= 1);
 
 /// Used to track the status of external functions.
 /// Currently only used for iconv().
@@ -1253,4 +1250,20 @@ typedef enum {
   kBroken
 } WorkingStatus;
 
+/// The scope of a working-directory command like `:cd`.
+///
+/// Scopes are enumerated from lowest to highest. When adding a scope make sure
+/// to update all functions using scopes as well, such as the implementation of
+/// `getcwd()`. When using scopes as limits (e.g. in loops) don't use the scopes
+/// directly, use `MIN_CD_SCOPE` and `MAX_CD_SCOPE` instead.
+typedef enum {
+  kCdScopeInvalid = -1,
+  kCdScopeWindow,  ///< Affects one window.
+  kCdScopeTab,     ///< Affects one tab page.
+  kCdScopeGlobal,  ///< Affects the entire instance of Neovim.
+} CdScope;
+
+#define MIN_CD_SCOPE  kCdScopeWindow
+#define MAX_CD_SCOPE  kCdScopeGlobal
+
 #endif /* NVIM_GLOBALS_H */
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 916d27a964..c2dc6231f1 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -23,7 +23,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/option.h"
 #include "nvim/path.h"
@@ -270,17 +269,25 @@ char_u *parse_printmbfont(void)
  * Returns an error message for an illegal option, NULL otherwise.
  * Only used for the printer at the moment...
  */
-static char_u *parse_list_options(char_u *option_str, option_table_T *table, int table_size)
+static char_u *parse_list_options(char_u *option_str, option_table_T *table,
+                                  size_t table_size)
 {
+  option_table_T *old_opts;
+  char_u      *ret = NULL;
   char_u      *stringp;
   char_u      *colonp;
   char_u      *commap;
   char_u      *p;
-  int idx = 0;                          /* init for GCC */
+  size_t idx = 0;                          // init for GCC
   int len;
 
-  for (idx = 0; idx < table_size; ++idx)
-    table[idx].present = FALSE;
+  // Save the old values, so that they can be restored in case of an error.
+  old_opts = (option_table_T *)xmalloc(sizeof(option_table_T) * table_size);
+
+  for (idx = 0; idx < table_size; idx++) {
+    old_opts[idx] = table[idx];
+    table[idx].present = false;
+  }
 
   /*
    * Repeat for all comma separated parts.
@@ -288,8 +295,10 @@ static char_u *parse_list_options(char_u *option_str, option_table_T *table, int
   stringp = option_str;
   while (*stringp) {
     colonp = vim_strchr(stringp, ':');
-    if (colonp == NULL)
-      return (char_u *)N_("E550: Missing colon");
+    if (colonp == NULL) {
+      ret = (char_u *)N_("E550: Missing colon");
+      break;
+    }
     commap = vim_strchr(stringp, ',');
     if (commap == NULL)
       commap = option_str + STRLEN(option_str);
@@ -300,15 +309,19 @@ static char_u *parse_list_options(char_u *option_str, option_table_T *table, int
       if (STRNICMP(stringp, table[idx].name, len) == 0)
         break;
 
-    if (idx == table_size)
-      return (char_u *)N_("E551: Illegal component");
+    if (idx == table_size) {
+      ret = (char_u *)N_("E551: Illegal component");
+      break;
+    }
 
     p = colonp + 1;
     table[idx].present = TRUE;
 
     if (table[idx].hasnum) {
-      if (!ascii_isdigit(*p))
-        return (char_u *)N_("E552: digit expected");
+      if (!ascii_isdigit(*p)) {
+        ret = (char_u *)N_("E552: digit expected");
+        break;
+      }
 
       table[idx].number = getdigits_int(&p);
     }
@@ -321,7 +334,15 @@ static char_u *parse_list_options(char_u *option_str, option_table_T *table, int
       ++stringp;
   }
 
-  return NULL;
+  if (ret != NULL) {
+    // Restore old options in case of error
+    for (idx = 0; idx < table_size; idx++) {
+      table[idx] = old_opts[idx];
+    }
+  }
+
+  xfree(old_opts);
+  return ret;
 }
 
 
@@ -1523,11 +1544,10 @@ static int prt_find_resource(char *name, struct prt_ps_resource_S *resource)
   /* Look for named resource file in runtimepath */
   STRCPY(buffer, "print");
   add_pathsep((char *)buffer);
-  vim_strcat(buffer, (char_u *)name, MAXPATHL);
-  vim_strcat(buffer, (char_u *)".ps", MAXPATHL);
+  xstrlcat((char *)buffer, name, MAXPATHL);
+  xstrlcat((char *)buffer, ".ps", MAXPATHL);
   resource->filename[0] = NUL;
-  retval = (do_in_runtimepath(buffer, FALSE, prt_resource_name,
-                resource->filename)
+  retval = (do_in_runtimepath(buffer, 0, prt_resource_name, resource->filename)
             && resource->filename[0] != NUL);
   xfree(buffer);
   return retval;
@@ -2107,7 +2127,7 @@ int mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
   props = enc_canon_props(p_encoding);
   if (!(props & ENC_8BIT) && ((*p_pmcs != NUL) || !(props & ENC_UNICODE))) {
     p_mbenc_first = NULL;
-    int effective_cmap;
+    int effective_cmap = 0;
     for (cmap = 0; cmap < (int)ARRAY_SIZE(prt_ps_mbfonts); cmap++)
       if (prt_match_encoding((char *)p_encoding, &prt_ps_mbfonts[cmap],
                              &p_mbenc)) {
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
index 2da937633e..376f33e23e 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -28,7 +28,6 @@
 #include "nvim/hashtab.h"
 #include "nvim/message.h"
 #include "nvim/memory.h"
-#include "nvim/misc2.h"
 
 // Magic value for algorithm that walks through the array.
 #define PERTURB_SHIFT 5
@@ -37,6 +36,8 @@
 # include "hashtab.c.generated.h"
 #endif
 
+char hash_removed;
+
 /// Initialize an empty hash table.
 void hash_init(hashtab_T *ht)
 {
@@ -369,8 +370,7 @@ hash_T hash_hash(char_u *key)
   hash_T hash = *key;
 
   if (hash == 0) {
-    // Empty keys are not allowed, but we don't want to crash if we get one.
-    return (hash_T) 0;
+    return (hash_T)0;
   }
 
   // A simplistic algorithm that appears to do very well.
@@ -382,3 +382,13 @@ hash_T hash_hash(char_u *key)
 
   return hash;
 }
+
+/// Function to get HI_KEY_REMOVED value
+///
+/// Used for testing because luajit ffi does not allow getting addresses of
+/// globals.
+const char_u *_hash_key_removed(void)
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  return HI_KEY_REMOVED;
+}
diff --git a/src/nvim/hashtab.h b/src/nvim/hashtab.h
index 7233d8c47c..0da2b13f2e 100644
--- a/src/nvim/hashtab.h
+++ b/src/nvim/hashtab.h
@@ -5,14 +5,19 @@
 
 #include "nvim/types.h"
 
+/// Magic number used for hashitem "hi_key" value indicating a deleted item
+///
+/// Only the address is used.
+extern char hash_removed;
+
 /// Type for hash number (hash calculation result).
 typedef size_t hash_T;
 
 /// The address of "hash_removed" is used as a magic number
 /// for hi_key to indicate a removed item.
-#define HI_KEY_REMOVED &hash_removed
+#define HI_KEY_REMOVED ((char_u *)&hash_removed)
 #define HASHITEM_EMPTY(hi) ((hi)->hi_key == NULL \
-                            || (hi)->hi_key == &hash_removed)
+                            || (hi)->hi_key == (char_u *)&hash_removed)
 
 /// A hastable item.
 ///
diff --git a/src/nvim/iconv.h b/src/nvim/iconv.h
index 4ac0d3fdd4..bf29b15247 100644
--- a/src/nvim/iconv.h
+++ b/src/nvim/iconv.h
@@ -24,10 +24,10 @@
 // defined, we provide a type shim (pull in errno.h and define iconv_t).
 // This enables us to still load and use iconv dynamically at runtime.
 #ifdef USE_ICONV
+#  include <errno.h>
 #  ifdef HAVE_ICONV_H
 #    include <iconv.h>
 #  else
-#    include <errno.h>
 typedef void *iconv_t;
 #  endif
 #endif
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index 2f9ec0b3ff..0b20647771 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -20,7 +20,6 @@
 #include "nvim/eval.h"
 #include "nvim/fileio.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/os/time.h"
 #include "nvim/path.h"
@@ -52,7 +51,7 @@ static cscmd_T cs_cmds[] =
   { "add",    cs_add,
     N_("Add a new database"),     "add file|dir [pre-path] [flags]", 0 },
   { "find",   cs_find,
-    N_("Query for a pattern"),    "find c|d|e|f|g|i|s|t name", 1 },
+    N_("Query for a pattern"),    "find a|c|d|e|f|g|i|s|t name", 1 },
   { "help",   cs_help,
     N_("Show this message"),      "help", 0 },
   { "kill",   cs_kill,
@@ -105,13 +104,13 @@ char_u *get_cscope_name(expand_T *xp, int idx)
   {
     const char *query_type[] =
     {
-      "c", "d", "e", "f", "g", "i", "s", "t", NULL
+      "a", "c", "d", "e", "f", "g", "i", "s", "t", NULL
     };
 
-    /* Complete with query type of ":cscope find {query_type}".
-     * {query_type} can be letters (c, d, ... t) or numbers (0, 1,
-     * ..., 8) but only complete with letters, since numbers are
-     * redundant. */
+    // Complete with query type of ":cscope find {query_type}".
+    // {query_type} can be letters (c, d, ... a) or numbers (0, 1,
+    // ..., 9) but only complete with letters, since numbers are
+    // redundant.
     return (char_u *)query_type[idx];
   }
   case EXP_CSCOPE_KILL:
@@ -480,8 +479,9 @@ staterr:
   if (arg2 != NULL) {
     ppath = xmalloc(MAXPATHL + 1);
     expand_env((char_u *)arg2, (char_u *)ppath, MAXPATHL);
-    if (!os_file_exists((char_u *)ppath))
+    if (!os_path_exists((char_u *)ppath)) {
       goto staterr;
+    }
   }
 
   int i;
@@ -673,6 +673,9 @@ static char *cs_create_cmd(char *csoption, char *pattern)
   case '8': case 'i':
     search = 8;
     break;
+  case '9': case 'a':
+    search = 9;
+    break;
   default:
     (void)EMSG(_("E561: unknown cscope search type"));
     cs_usage_msg(Find);
@@ -969,6 +972,9 @@ static int cs_find_common(char *opt, char *pat, int forceit, int verbose,
   case '8':
     cmdletter = 'i';
     break;
+  case '9':
+    cmdletter = 'a';
+    break;
   default:
     cmdletter = opt[0];
   }
@@ -1125,14 +1131,15 @@ static int cs_help(exarg_T *eap)
         cmdp->usage);
     if (strcmp(cmdp->name, "find") == 0)
       MSG_PUTS(_("\n"
-              "       c: Find functions calling this function\n"
-              "       d: Find functions called by this function\n"
-              "       e: Find this egrep pattern\n"
-              "       f: Find this file\n"
-              "       g: Find this definition\n"
-              "       i: Find files #including this file\n"
-              "       s: Find this C symbol\n"
-              "       t: Find this text string\n"));
+                 "       a: Find assignments to this symbol\n"
+                 "       c: Find functions calling this function\n"
+                 "       d: Find functions called by this function\n"
+                 "       e: Find this egrep pattern\n"
+                 "       f: Find this file\n"
+                 "       g: Find this definition\n"
+                 "       i: Find files #including this file\n"
+                 "       s: Find this C symbol\n"
+                 "       t: Find this text string\n"));
 
     cmdp++;
   }
@@ -1754,8 +1761,8 @@ static void cs_print_tags_priv(char **matches, char **cntxts,
  */
 static int cs_read_prompt(size_t i)
 {
-  char ch;
-  char        *buf = NULL;   /* buffer for possible error message from cscope */
+  int ch;
+  char        *buf = NULL;   // buffer for possible error message from cscope
   size_t bufpos = 0;
   char   *cs_emsg = _("E609: Cscope error: %s");
   size_t cs_emsg_len = strlen(cs_emsg);
@@ -1767,35 +1774,34 @@ static int cs_read_prompt(size_t i)
   size_t maxlen = IOSIZE - cs_emsg_len;
 
   for (;; ) {
-    while ((ch = (char)getc(csinfo[i].fr_fp)) != EOF && ch != CSCOPE_PROMPT[0])
-      /* if there is room and char is printable */
+    while ((ch = getc(csinfo[i].fr_fp)) != EOF && ch != CSCOPE_PROMPT[0]) {
+      // if there is room and char is printable
       if (bufpos < maxlen - 1 && vim_isprintc(ch)) {
         // lazy buffer allocation
         if (buf == NULL) {
           buf = xmalloc(maxlen);
         }
-        {
-          /* append character to the message */
-          buf[bufpos++] = ch;
-          buf[bufpos] = NUL;
-          if (bufpos >= epromptlen
-              && strcmp(&buf[bufpos - epromptlen], eprompt) == 0) {
-            /* remove eprompt from buf */
-            buf[bufpos - epromptlen] = NUL;
-
-            /* print message to user */
-            (void)EMSG2(cs_emsg, buf);
+        // append character to the message
+        buf[bufpos++] = (char)ch;
+        buf[bufpos] = NUL;
+        if (bufpos >= epromptlen
+            && strcmp(&buf[bufpos - epromptlen], eprompt) == 0) {
+          // remove eprompt from buf
+          buf[bufpos - epromptlen] = NUL;
+
+          // print message to user
+          (void)EMSG2(cs_emsg, buf);
 
-            /* send RETURN to cscope */
-            (void)putc('\n', csinfo[i].to_fp);
-            (void)fflush(csinfo[i].to_fp);
+          // send RETURN to cscope
+          (void)putc('\n', csinfo[i].to_fp);
+          (void)fflush(csinfo[i].to_fp);
 
-            /* clear buf */
-            bufpos = 0;
-            buf[bufpos] = NUL;
-          }
+          // clear buf
+          bufpos = 0;
+          buf[bufpos] = NUL;
         }
       }
+    }
 
     for (size_t n = 0; n < strlen(CSCOPE_PROMPT); ++n) {
       if (n > 0)
diff --git a/src/nvim/if_cscope_defs.h b/src/nvim/if_cscope_defs.h
index 8cd74c74e6..f9d06eaea3 100644
--- a/src/nvim/if_cscope_defs.h
+++ b/src/nvim/if_cscope_defs.h
@@ -25,18 +25,7 @@
 #define CSCOPE_DBFILE           "cscope.out"
 #define CSCOPE_PROMPT           ">> "
 
-/*
- * s 0name	Find this C symbol
- * g 1name	Find this definition
- * d 2name	Find functions called by this function
- * c 3name	Find functions calling this function
- * t 4string	find text string (cscope 12.9)
- * t 4name	Find assignments to (cscope 13.3)
- *   5pattern	change pattern -- NOT USED
- * e 6pattern	Find this egrep pattern
- * f 7name	Find this file
- * i 8name	Find files #including this file
- */
+// See ":help cscope-find" for the possible queries.
 
 typedef struct {
   char *  name;
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index f197669a97..7f31bb8c5c 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -10,7 +10,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/regexp.h"
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index efe8e73a3c..7b758b4dac 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -12,7 +12,6 @@
 #include "nvim/indent_c.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
-#include "nvim/misc2.h"
 #include "nvim/option.h"
 #include "nvim/search.h"
 #include "nvim/strings.h"
@@ -174,9 +173,8 @@ static char_u *skip_string(char_u *p)
         char_u *delim = p + 2;
         char_u *paren = vim_strchr(delim, '(');
 
-        if (paren != NULL)
-        {
-            long delim_len = paren - delim;
+        if (paren != NULL) {
+            ptrdiff_t delim_len = paren - delim;
 
             for (p += 3; *p; ++p)
                 if (p[0] == ')' && STRNCMP(p + 1, delim, delim_len) == 0
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 99e94fc60f..94bbaf4239 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -573,8 +573,10 @@ int find_special_key(const char_u **srcp, const size_t src_len, int *const modp,
         } else {
           l = 1;
         }
-        if (end - bp > l && bp[l + 1] == '>') {
-          bp += l;  // anything accepted, like <C-?>
+        if (end - bp > l && bp[l] != '"' && bp[l + 1] == '>') {
+          // Anything accepted, like <C-?>, except <C-">, because the "
+          // ends the string.
+          bp += l;
         }
       }
     }
diff --git a/src/nvim/lib/klist.h b/src/nvim/lib/klist.h
index 1280a927e8..7ee100ab8c 100644
--- a/src/nvim/lib/klist.h
+++ b/src/nvim/lib/klist.h
@@ -33,35 +33,37 @@
 #include "nvim/func_attr.h"
 
 
-#define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f)                       \
-    typedef struct {                                                    \
-        size_t cnt, n, max;                                             \
-        kmptype_t **buf;                                                \
-    } kmp_##name##_t;                                                   \
-    static inline kmp_##name##_t *kmp_init_##name(void) {               \
-        return xcalloc(1, sizeof(kmp_##name##_t));                      \
-    }                                                                   \
-    static inline void kmp_destroy_##name(kmp_##name##_t *mp)           \
-        REAL_FATTR_UNUSED;                                              \
-    static inline void kmp_destroy_##name(kmp_##name##_t *mp) {         \
-        size_t k;                                                       \
-        for (k = 0; k < mp->n; ++k) {                                   \
-            kmpfree_f(mp->buf[k]); xfree(mp->buf[k]);                   \
-        }                                                               \
-        xfree(mp->buf); xfree(mp);                                      \
-    }                                                                   \
-    static inline kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) {     \
-        ++mp->cnt;                                                      \
-        if (mp->n == 0) return xcalloc(1, sizeof(kmptype_t));           \
-        return mp->buf[--mp->n];                                        \
-    }                                                                   \
+#define KMEMPOOL_INIT(name, kmptype_t, kmpfree_f) \
+    typedef struct { \
+        size_t cnt, n, max; \
+        kmptype_t **buf; \
+    } kmp_##name##_t; \
+    static inline kmp_##name##_t *kmp_init_##name(void) { \
+        return xcalloc(1, sizeof(kmp_##name##_t)); \
+    } \
+    static inline void kmp_destroy_##name(kmp_##name##_t *mp) \
+        REAL_FATTR_UNUSED; \
+    static inline void kmp_destroy_##name(kmp_##name##_t *mp) { \
+        size_t k; \
+        for (k = 0; k < mp->n; k++) { \
+            kmpfree_f(mp->buf[k]); xfree(mp->buf[k]); \
+        } \
+        xfree(mp->buf); xfree(mp); \
+    } \
+    static inline kmptype_t *kmp_alloc_##name(kmp_##name##_t *mp) { \
+        mp->cnt++; \
+        if (mp->n == 0) { \
+          return xcalloc(1, sizeof(kmptype_t)); \
+        } \
+        return mp->buf[--mp->n]; \
+    } \
     static inline void kmp_free_##name(kmp_##name##_t *mp, kmptype_t *p) { \
-        --mp->cnt;                                                      \
-        if (mp->n == mp->max) {                                         \
-            mp->max = mp->max? mp->max<<1 : 16;                         \
+        mp->cnt--; \
+        if (mp->n == mp->max) { \
+            mp->max = mp->max ? (mp->max << 1) : 16; \
             mp->buf = xrealloc(mp->buf, sizeof(kmptype_t *) * mp->max); \
-        }                                                               \
-        mp->buf[mp->n++] = p;                                           \
+        } \
+        mp->buf[mp->n++] = p; \
     }
 
 #define kmempool_t(name) kmp_##name##_t
@@ -70,54 +72,56 @@
 #define kmp_alloc(name, mp) kmp_alloc_##name(mp)
 #define kmp_free(name, mp, p) kmp_free_##name(mp, p)
 
-#define KLIST_INIT(name, kltype_t, kmpfree_t)                           \
-    struct __kl1_##name {                                               \
-        kltype_t data;                                                  \
-        struct __kl1_##name *next;                                      \
-    };                                                                  \
-    typedef struct __kl1_##name kl1_##name;                             \
-    KMEMPOOL_INIT(name, kl1_##name, kmpfree_t)                          \
-    typedef struct {                                                    \
-        kl1_##name *head, *tail;                                        \
-        kmp_##name##_t *mp;                                             \
-        size_t size;                                                    \
-    } kl_##name##_t;                                                    \
-    static inline kl_##name##_t *kl_init_##name(void) {                 \
-        kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t));          \
-        kl->mp = kmp_init(name);                                        \
-        kl->head = kl->tail = kmp_alloc(name, kl->mp);                  \
-        kl->head->next = 0;                                             \
-        return kl;                                                      \
-    }                                                                   \
-    static inline void kl_destroy_##name(kl_##name##_t *kl)             \
-        REAL_FATTR_UNUSED;                                              \
-    static inline void kl_destroy_##name(kl_##name##_t *kl) {           \
-        kl1_##name *p;                                                  \
-        for (p = kl->head; p != kl->tail; p = p->next)                  \
-            kmp_free(name, kl->mp, p);                                  \
-        kmp_free(name, kl->mp, p);                                      \
-        kmp_destroy(name, kl->mp);                                      \
-        xfree(kl);                                                      \
-    }                                                                   \
-    static inline void kl_push_##name(kl_##name##_t *kl, kltype_t d) {  \
-        kl1_##name *q, *p = kmp_alloc(name, kl->mp);                    \
-        q = kl->tail; p->next = 0; kl->tail->next = p; kl->tail = p;    \
-        ++kl->size;                                                     \
-        q->data = d;                                                    \
-    }                                                                   \
-    static inline kltype_t kl_shift_at_##name(kl_##name##_t *kl,        \
-                                              kl1_##name **n) {         \
-        assert((*n)->next);                                             \
-        kl1_##name *p;                                                  \
-        --kl->size;                                                     \
-        p = *n;                                                         \
-        *n = (*n)->next;                                                \
-        if (p == kl->head) kl->head = *n;                               \
-        kltype_t d = p->data;                                           \
-        kmp_free(name, kl->mp, p);                                      \
-        return d;                                                       \
-    }                                                                   \
-    
+#define KLIST_INIT(name, kltype_t, kmpfree_t) \
+    struct __kl1_##name { \
+        kltype_t data; \
+        struct __kl1_##name *next; \
+    }; \
+    typedef struct __kl1_##name kl1_##name; \
+    KMEMPOOL_INIT(name, kl1_##name, kmpfree_t) \
+    typedef struct { \
+        kl1_##name *head, *tail; \
+        kmp_##name##_t *mp; \
+        size_t size; \
+    } kl_##name##_t; \
+    static inline kl_##name##_t *kl_init_##name(void) { \
+        kl_##name##_t *kl = xcalloc(1, sizeof(kl_##name##_t)); \
+        kl->mp = kmp_init(name); \
+        kl->head = kl->tail = kmp_alloc(name, kl->mp); \
+        kl->head->next = 0; \
+        return kl; \
+    } \
+    static inline void kl_destroy_##name(kl_##name##_t *kl) \
+        REAL_FATTR_UNUSED; \
+    static inline void kl_destroy_##name(kl_##name##_t *kl) { \
+        kl1_##name *p; \
+        for (p = kl->head; p != kl->tail; p = p->next) { \
+            kmp_free(name, kl->mp, p); \
+        } \
+        kmp_free(name, kl->mp, p); \
+        kmp_destroy(name, kl->mp); \
+        xfree(kl); \
+    } \
+    static inline void kl_push_##name(kl_##name##_t *kl, kltype_t d) { \
+        kl1_##name *q, *p = kmp_alloc(name, kl->mp); \
+        q = kl->tail; p->next = 0; kl->tail->next = p; kl->tail = p; \
+        kl->size++; \
+        q->data = d; \
+    } \
+    static inline kltype_t kl_shift_at_##name(kl_##name##_t *kl, \
+                                              kl1_##name **n) { \
+        assert((*n)->next); \
+        kl1_##name *p; \
+        kl->size--; \
+        p = *n; \
+        *n = (*n)->next; \
+        if (p == kl->head) { \
+          kl->head = *n; \
+        } \
+        kltype_t d = p->data; \
+        kmp_free(name, kl->mp, p); \
+        return d; \
+    }
 
 #define kliter_t(name) kl1_##name
 #define klist_t(name) kl_##name##_t
diff --git a/src/nvim/lib/kvec.h b/src/nvim/lib/kvec.h
index b41ef0cc9f..584282d773 100644
--- a/src/nvim/lib/kvec.h
+++ b/src/nvim/lib/kvec.h
@@ -1,59 +1,61 @@
-/* The MIT License
-
-   Copyright (c) 2008, by Attractive Chaos <attractor@live.co.uk>
-
-   Permission is hereby granted, free of charge, to any person obtaining
-   a copy of this software and associated documentation files (the
-   "Software"), to deal in the Software without restriction, including
-   without limitation the rights to use, copy, modify, merge, publish,
-   distribute, sublicense, and/or sell copies of the Software, and to
-   permit persons to whom the Software is furnished to do so, subject to
-   the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-   BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-   SOFTWARE.
-*/
-
-/*
-  An example:
-
-#include "kvec.h"
-int main() {
-	kvec_t(int) array;
-	kv_init(array);
-	kv_push(int, array, 10); // append
-	kv_a(int, array, 20) = 5; // dynamic
-	kv_A(array, 20) = 4; // static
-	kv_destroy(array);
-	return 0;
-}
-*/
-
-/*
-  2008-09-22 (0.1.0):
+// The MIT License
+//
+// Copyright (c) 2008, by Attractive Chaos <attractor@live.co.uk>
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+// An example:
+//
+//     #include "kvec.h"
+//     int main() {
+//       kvec_t(int) array = KV_INITIAL_VALUE;
+//       kv_push(array, 10); // append
+//       kv_a(array, 20) = 5; // dynamic
+//       kv_A(array, 20) = 4; // static
+//       kv_destroy(array);
+//       return 0;
+//     }
+
+#ifndef NVIM_LIB_KVEC_H
+#define NVIM_LIB_KVEC_H
 
-	* The initial version.
+#include <stdlib.h>
+#include <string.h>
 
-*/
+#include "nvim/memory.h"
 
-#ifndef AC_KVEC_H
-#define AC_KVEC_H
+#define kv_roundup32(x) \
+    ((--(x)), \
+     ((x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16), \
+     (++(x)))
 
-#include <stdlib.h>
-#include "nvim/memory.h"
+#define KV_INITIAL_VALUE { .size = 0, .capacity = 0, .items = NULL }
 
-#define kv_roundup32(x) (--(x), (x)|=(x)>>1, (x)|=(x)>>2, (x)|=(x)>>4, (x)|=(x)>>8, (x)|=(x)>>16, ++(x))
+#define kvec_t(type) \
+    struct { \
+      size_t size; \
+      size_t capacity; \
+      type *items; \
+    }
 
-#define kvec_t(type) struct { size_t size, capacity; type *items; }
 #define kv_init(v) ((v).size = (v).capacity = 0, (v).items = 0)
 #define kv_destroy(v) xfree((v).items)
 #define kv_A(v, i) ((v).items[(i)])
@@ -62,31 +64,133 @@ int main() {
 #define kv_max(v) ((v).capacity)
 #define kv_last(v) kv_A(v, kv_size(v) - 1)
 
-#define kv_resize(type, v, s)  ((v).capacity = (s), (v).items = (type*)xrealloc((v).items, sizeof(type) * (v).capacity))
-
-#define kv_copy(type, v1, v0) do {							\
-		if ((v1).capacity < (v0).size) kv_resize(type, v1, (v0).size);	\
-		(v1).size = (v0).size;									\
-		memcpy((v1).items, (v0).items, sizeof(type) * (v0).size);		\
-	} while (0)												\
-
-#define kv_push(type, v, x) do {									\
-		if ((v).size == (v).capacity) {										\
-			(v).capacity = (v).capacity? (v).capacity<<1 : 8;							\
-			(v).items = (type*)xrealloc((v).items, sizeof(type) * (v).capacity);	\
-		}															\
-		(v).items[(v).size++] = (x);										\
-	} while (0)
-
-#define kv_pushp(type, v) ((((v).size == (v).capacity)?							\
-						   ((v).capacity = ((v).capacity? (v).capacity<<1 : 8),				\
-							(v).items = (type*)xrealloc((v).items, sizeof(type) * (v).capacity), 0)	\
-						   : 0), ((v).items + ((v).size++)))
-
-#define kv_a(type, v, i) (((v).capacity <= (size_t)(i)? \
-						  ((v).capacity = (v).size = (i) + 1, kv_roundup32((v).capacity), \
-						   (v).items = (type*)xrealloc((v).items, sizeof(type) * (v).capacity), 0) \
-						  : (v).size <= (size_t)(i)? (v).size = (i) + 1 \
-						  : 0), (v).items[(i)])
-
-#endif
+#define kv_resize(v, s) \
+    ((v).capacity = (s), \
+     (v).items = xrealloc((v).items, sizeof((v).items[0]) * (v).capacity))
+
+#define kv_resize_full(v) \
+    kv_resize(v, (v).capacity ? (v).capacity << 1 : 8)
+
+#define kv_copy(v1, v0) \
+    do { \
+      if ((v1).capacity < (v0).size) { \
+        kv_resize(v1, (v0).size); \
+      } \
+      (v1).size = (v0).size; \
+      memcpy((v1).items, (v0).items, sizeof((v1).items[0]) * (v0).size); \
+    } while (0) \
+
+#define kv_pushp(v) \
+    ((((v).size == (v).capacity) ? (kv_resize_full(v), 0) : 0), \
+     ((v).items + ((v).size++)))
+
+#define kv_push(v, x) \
+    (*kv_pushp(v) = (x))
+
+#define kv_a(v, i) \
+    (((v).capacity <= (size_t) (i) \
+      ? ((v).capacity = (v).size = (i) + 1, \
+         kv_roundup32((v).capacity), \
+         kv_resize((v), (v).capacity), 0) \
+      : ((v).size <= (size_t) (i) \
+         ? (v).size = (i) + 1 \
+         : 0)), \
+     (v).items[(i)])
+
+/// Type of a vector with a few first members allocated on stack
+///
+/// Is compatible with #kv_A, #kv_pop, #kv_size, #kv_max, #kv_last.
+/// Is not compatible with #kv_resize, #kv_resize_full, #kv_copy, #kv_push,
+/// #kv_pushp, #kv_a, #kv_destroy.
+///
+/// @param[in]  type  Type of vector elements.
+/// @param[in]  init_size  Number of the elements in the initial array.
+#define kvec_withinit_t(type, INIT_SIZE) \
+    struct { \
+      size_t size; \
+      size_t capacity; \
+      type *items; \
+      type init_array[INIT_SIZE]; \
+    }
+
+/// Initialize vector with preallocated array
+///
+/// @param[out]  v  Vector to initialize.
+#define kvi_init(v) \
+    ((v).capacity = ARRAY_SIZE((v).init_array), \
+     (v).size = 0, \
+     (v).items = (v).init_array)
+
+/// Move data to a new destination and free source
+static inline void *_memcpy_free(void *const restrict dest,
+                                 void *const restrict src,
+                                 const size_t size)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET FUNC_ATTR_ALWAYS_INLINE
+{
+  memcpy(dest, src, size);
+  xfree(src);
+  return dest;
+}
+
+/// Resize vector with preallocated array
+///
+/// @note May not resize to an array smaller then init_array: if requested,
+///       init_array will be used.
+///
+/// @param[out]  v  Vector to resize.
+/// @param[in]  s  New size.
+#define kvi_resize(v, s) \
+    ((v).capacity = ((s) > ARRAY_SIZE((v).init_array) \
+                     ? (s) \
+                     : ARRAY_SIZE((v).init_array)), \
+     (v).items = ((v).capacity == ARRAY_SIZE((v).init_array) \
+                  ? ((v).items == (v).init_array \
+                     ? (v).items \
+                     : _memcpy_free((v).init_array, (v).items, \
+                                    (v).size * sizeof((v).items[0]))) \
+                  : ((v).items == (v).init_array \
+                     ? memcpy(xmalloc((v).capacity * sizeof((v).items[0])), \
+                              (v).items, \
+                              (v).size * sizeof((v).items[0])) \
+                     : xrealloc((v).items, \
+                                (v).capacity * sizeof((v).items[0])))))
+
+/// Resize vector with preallocated array when it is full
+///
+/// @param[out]  v  Vector to resize.
+#define kvi_resize_full(v) \
+    /* ARRAY_SIZE((v).init_array) is the minimal capacity of this vector. */ \
+    /* Thus when vector is full capacity may not be zero and it is safe */ \
+    /* not to bother with checking whether (v).capacity is 0. But now */ \
+    /* capacity is not guaranteed to have size that is a power of 2, it is */ \
+    /* hard to fix this here and is not very necessary if users will use */ \
+    /* 2^x initial array size. */ \
+    kvi_resize(v, (v).capacity << 1)
+
+/// Get location where to store new element to a vector with preallocated array
+///
+/// @param[in,out]  v  Vector to push to.
+///
+/// @return Pointer to the place where new value should be stored.
+#define kvi_pushp(v) \
+    ((((v).size == (v).capacity) ? (kvi_resize_full(v), 0) : 0), \
+     ((v).items + ((v).size++)))
+
+/// Push value to a vector with preallocated array
+///
+/// @param[out]  v  Vector to push to.
+/// @param[in]  x  Value to push.
+#define kvi_push(v, x) \
+    (*kvi_pushp(v) = (x))
+
+/// Free array of elements of a vector with preallocated array if needed
+///
+/// @param[out]  v  Vector to free.
+#define kvi_destroy(v) \
+    do { \
+      if ((v).items != (v).init_array) { \
+        xfree((v).items); \
+      } \
+    } while (0)
+
+#endif  // NVIM_LIB_KVEC_H
diff --git a/src/nvim/lib/queue.h b/src/nvim/lib/queue.h
index fe02b454ea..ab9270081e 100644
--- a/src/nvim/lib/queue.h
+++ b/src/nvim/lib/queue.h
@@ -1,92 +1,90 @@
-/* Copyright (c) 2013, Ben Noordhuis <info@bnoordhuis.nl>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+// Queue implemented by circularly-linked list.
+//
+// Adapted from libuv. Simpler and more efficient than klist.h for implementing
+// queues that support arbitrary insertion/removal.
+//
+// Copyright (c) 2013, Ben Noordhuis <info@bnoordhuis.nl>
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef QUEUE_H_
-#define QUEUE_H_
+#ifndef NVIM_LIB_QUEUE_H
+#define NVIM_LIB_QUEUE_H
 
-typedef void *QUEUE[2];
+#include <stddef.h>
 
-/* Private macros. */
-#define QUEUE_NEXT(q)       (*(QUEUE **) &((*(q))[0]))
-#define QUEUE_PREV(q)       (*(QUEUE **) &((*(q))[1]))
-#define QUEUE_PREV_NEXT(q)  (QUEUE_NEXT(QUEUE_PREV(q)))
-#define QUEUE_NEXT_PREV(q)  (QUEUE_PREV(QUEUE_NEXT(q)))
+#include "nvim/func_attr.h"
 
-/* Public macros. */
-#define QUEUE_DATA(ptr, type, field)                                          \
-  ((type *) ((char *) (ptr) - ((char *) &((type *) 0)->field)))
+typedef struct _queue {
+  struct _queue *next;
+  struct _queue *prev;
+} QUEUE;
 
-#define QUEUE_FOREACH(q, h)                                                   \
-  for ((q) = QUEUE_NEXT(h); (q) != (h); (q) = QUEUE_NEXT(q))
+// Public macros.
+#define QUEUE_DATA(ptr, type, field) \
+  ((type *)((char *)(ptr) - offsetof(type, field)))
 
-#define QUEUE_EMPTY(q)                                                        \
-  ((const QUEUE *) (q) == (const QUEUE *) QUEUE_NEXT(q))
+// Important note: mutating the list while QUEUE_FOREACH is
+// iterating over its elements results in undefined behavior.
+#define QUEUE_FOREACH(q, h) \
+  for (  /* NOLINT(readability/braces) */ \
+      (q) = (h)->next; (q) != (h); (q) = (q)->next)
 
-#define QUEUE_HEAD(q)                                                         \
-  (QUEUE_NEXT(q))
+// ffi.cdef is unable to swallow `bool` in place of `int` here.
+static inline int QUEUE_EMPTY(const QUEUE *const q)
+  FUNC_ATTR_ALWAYS_INLINE FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  return q == q->next;
+}
 
-#define QUEUE_INIT(q)                                                         \
-  do {                                                                        \
-    QUEUE_NEXT(q) = (q);                                                      \
-    QUEUE_PREV(q) = (q);                                                      \
-  }                                                                           \
-  while (0)
+#define QUEUE_HEAD(q) (q)->next
 
-#define QUEUE_ADD(h, n)                                                       \
-  do {                                                                        \
-    QUEUE_PREV_NEXT(h) = QUEUE_NEXT(n);                                       \
-    QUEUE_NEXT_PREV(n) = QUEUE_PREV(h);                                       \
-    QUEUE_PREV(h) = QUEUE_PREV(n);                                            \
-    QUEUE_PREV_NEXT(h) = (h);                                                 \
-  }                                                                           \
-  while (0)
+static inline void QUEUE_INIT(QUEUE *const q) FUNC_ATTR_ALWAYS_INLINE
+{
+  q->next = q;
+  q->prev = q;
+}
 
-#define QUEUE_SPLIT(h, q, n)                                                  \
-  do {                                                                        \
-    QUEUE_PREV(n) = QUEUE_PREV(h);                                            \
-    QUEUE_PREV_NEXT(n) = (n);                                                 \
-    QUEUE_NEXT(n) = (q);                                                      \
-    QUEUE_PREV(h) = QUEUE_PREV(q);                                            \
-    QUEUE_PREV_NEXT(h) = (h);                                                 \
-    QUEUE_PREV(q) = (n);                                                      \
-  }                                                                           \
-  while (0)
+static inline void QUEUE_ADD(QUEUE *const h, QUEUE *const n)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  h->prev->next = n->next;
+  n->next->prev = h->prev;
+  h->prev = n->prev;
+  h->prev->next = h;
+}
 
-#define QUEUE_INSERT_HEAD(h, q)                                               \
-  do {                                                                        \
-    QUEUE_NEXT(q) = QUEUE_NEXT(h);                                            \
-    QUEUE_PREV(q) = (h);                                                      \
-    QUEUE_NEXT_PREV(q) = (q);                                                 \
-    QUEUE_NEXT(h) = (q);                                                      \
-  }                                                                           \
-  while (0)
+static inline void QUEUE_INSERT_HEAD(QUEUE *const h, QUEUE *const q)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  q->next = h->next;
+  q->prev = h;
+  q->next->prev = q;
+  h->next = q;
+}
 
-#define QUEUE_INSERT_TAIL(h, q)                                               \
-  do {                                                                        \
-    QUEUE_NEXT(q) = (h);                                                      \
-    QUEUE_PREV(q) = QUEUE_PREV(h);                                            \
-    QUEUE_PREV_NEXT(q) = (q);                                                 \
-    QUEUE_PREV(h) = (q);                                                      \
-  }                                                                           \
-  while (0)
+static inline void QUEUE_INSERT_TAIL(QUEUE *const h, QUEUE *const q)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  q->next = h;
+  q->prev = h->prev;
+  q->prev->next = q;
+  h->prev = q;
+}
 
-#define QUEUE_REMOVE(q)                                                       \
-  do {                                                                        \
-    QUEUE_PREV_NEXT(q) = QUEUE_NEXT(q);                                       \
-    QUEUE_NEXT_PREV(q) = QUEUE_PREV(q);                                       \
-  }                                                                           \
-  while (0)
+static inline void QUEUE_REMOVE(QUEUE *const q) FUNC_ATTR_ALWAYS_INLINE
+{
+  q->prev->next = q->next;
+  q->next->prev = q->prev;
+}
 
-#endif /* QUEUE_H_ */
+#endif  // NVIM_LIB_QUEUE_H
diff --git a/src/nvim/lib/ringbuf.h b/src/nvim/lib/ringbuf.h
index cb71500bb7..12b75ec65a 100644
--- a/src/nvim/lib/ringbuf.h
+++ b/src/nvim/lib/ringbuf.h
@@ -65,12 +65,12 @@
 /// @param TypeName    Ring buffer type name. Actual type name will be
 ///                    `{TypeName}RingBuffer`.
 /// @param RBType      Type of the single ring buffer element.
-#define RINGBUF_TYPEDEF(TypeName, RBType)                                      \
-typedef struct {                                                               \
-  RBType *buf;                                                                 \
-  RBType *next;                                                                \
-  RBType *first;                                                               \
-  RBType *buf_end;                                                             \
+#define RINGBUF_TYPEDEF(TypeName, RBType) \
+typedef struct { \
+  RBType *buf; \
+  RBType *next; \
+  RBType *first; \
+  RBType *buf_end; \
 } TypeName##RingBuffer;
 
 /// Initialize a new ring buffer
@@ -84,198 +84,196 @@ typedef struct {                                                               \
 ///                    a macros like `#define RBFREE(item)` (to skip freeing).
 ///
 ///                    Intended function signature: `void *rbfree(RBType *)`;
-#define RINGBUF_INIT(TypeName, funcprefix, RBType, rbfree)                     \
-                                                                               \
-                                                                               \
-static inline TypeName##RingBuffer funcprefix##_rb_new(const size_t size)      \
-  REAL_FATTR_WARN_UNUSED_RESULT;                                               \
-static inline TypeName##RingBuffer funcprefix##_rb_new(const size_t size)      \
-{                                                                              \
-  assert(size != 0);                                                           \
-  RBType *buf = xmalloc(size * sizeof(RBType));                                \
-  return (TypeName##RingBuffer) {                                              \
-    .buf = buf,                                                                \
-    .next = buf,                                                               \
-    .first = NULL,                                                             \
-    .buf_end = buf + size - 1,                                                 \
-  };                                                                           \
-}                                                                              \
-                                                                               \
-static inline void funcprefix##_rb_free(TypeName##RingBuffer *const rb)        \
-  REAL_FATTR_UNUSED;                                                           \
-static inline void funcprefix##_rb_free(TypeName##RingBuffer *const rb)        \
-{                                                                              \
-  if (rb == NULL) {                                                            \
-    return;                                                                    \
-  }                                                                            \
-  RINGBUF_FORALL(rb, RBType, rbitem) {                                         \
-    rbfree(rbitem);                                                            \
-  }                                                                            \
-  xfree(rb->buf);                                                              \
-}                                                                              \
-                                                                               \
-static inline void funcprefix##_rb_dealloc(TypeName##RingBuffer *const rb)     \
-  REAL_FATTR_UNUSED;                                                           \
-static inline void funcprefix##_rb_dealloc(TypeName##RingBuffer *const rb)     \
-{                                                                              \
-  xfree(rb->buf);                                                              \
-}                                                                              \
-                                                                               \
-static inline void funcprefix##_rb_push(TypeName##RingBuffer *const rb,        \
-                                        RBType item)                           \
-  REAL_FATTR_NONNULL_ARG(1);                                                   \
-static inline void funcprefix##_rb_push(TypeName##RingBuffer *const rb,        \
-                                        RBType item)                           \
-{                                                                              \
-  if (rb->next == rb->first) {                                                 \
-    rbfree(rb->first);                                                         \
-    rb->first = _RINGBUF_NEXT(rb, rb->first);                                  \
-  } else if (rb->first == NULL) {                                              \
-    rb->first = rb->next;                                                      \
-  }                                                                            \
-  *rb->next = item;                                                            \
-  rb->next = _RINGBUF_NEXT(rb, rb->next);                                      \
-}                                                                              \
-                                                                               \
-static inline ptrdiff_t funcprefix##_rb_find_idx(                              \
-    const TypeName##RingBuffer *const rb, const RBType *const item_p)          \
-  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE REAL_FATTR_UNUSED;                    \
-static inline ptrdiff_t funcprefix##_rb_find_idx(                              \
-    const TypeName##RingBuffer *const rb, const RBType *const item_p)          \
-{                                                                              \
-  assert(rb->buf <= item_p);                                                   \
-  assert(rb->buf_end >= item_p);                                               \
-  if (rb->first == NULL) {                                                     \
-    return -1;                                                                 \
-  } else if (item_p >= rb->first) {                                            \
-    return item_p - rb->first;                                                 \
-  } else {                                                                     \
-    return item_p - rb->buf + rb->buf_end - rb->first + 1;                     \
-  }                                                                            \
-}                                                                              \
-                                                                               \
-static inline size_t funcprefix##_rb_size(                                     \
-    const TypeName##RingBuffer *const rb)                                      \
-  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE;                                      \
-static inline size_t funcprefix##_rb_size(                                     \
-    const TypeName##RingBuffer *const rb)                                      \
-{                                                                              \
-  return (size_t) (rb->buf_end - rb->buf) + 1;                                 \
-}                                                                              \
-                                                                               \
-static inline size_t funcprefix##_rb_length(                                   \
-    const TypeName##RingBuffer *const rb)                                      \
-  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE;                                      \
-static inline size_t funcprefix##_rb_length(                                   \
-    const TypeName##RingBuffer *const rb)                                      \
-{                                                                              \
-  return _RINGBUF_LENGTH(rb);                                                  \
-}                                                                              \
-                                                                               \
-static inline RBType *funcprefix##_rb_idx_p(                                   \
-    const TypeName##RingBuffer *const rb, const size_t idx)                    \
-  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE;                                      \
-static inline RBType *funcprefix##_rb_idx_p(                                   \
-    const TypeName##RingBuffer *const rb, const size_t idx)                    \
-{                                                                              \
-  assert(idx <= funcprefix##_rb_size(rb));                                     \
-  assert(idx <= funcprefix##_rb_length(rb));                                   \
-  if (rb->first + idx > rb->buf_end) {                                         \
-    return rb->buf + ((rb->first + idx) - (rb->buf_end + 1));                  \
-  } else {                                                                     \
-    return rb->first + idx;                                                    \
-  }                                                                            \
-}                                                                              \
-                                                                               \
+#define RINGBUF_INIT(TypeName, funcprefix, RBType, rbfree) \
+static inline TypeName##RingBuffer funcprefix##_rb_new(const size_t size) \
+  REAL_FATTR_WARN_UNUSED_RESULT; \
+static inline TypeName##RingBuffer funcprefix##_rb_new(const size_t size) \
+{ \
+  assert(size != 0); \
+  RBType *buf = xmalloc(size * sizeof(RBType)); \
+  return (TypeName##RingBuffer) { \
+    .buf = buf, \
+    .next = buf, \
+    .first = NULL, \
+    .buf_end = buf + size - 1, \
+  }; \
+} \
+\
+static inline void funcprefix##_rb_free(TypeName##RingBuffer *const rb) \
+  REAL_FATTR_UNUSED; \
+static inline void funcprefix##_rb_free(TypeName##RingBuffer *const rb) \
+{ \
+  if (rb == NULL) { \
+    return; \
+  } \
+  RINGBUF_FORALL(rb, RBType, rbitem) { \
+    rbfree(rbitem); \
+  } \
+  xfree(rb->buf); \
+} \
+\
+static inline void funcprefix##_rb_dealloc(TypeName##RingBuffer *const rb) \
+  REAL_FATTR_UNUSED; \
+static inline void funcprefix##_rb_dealloc(TypeName##RingBuffer *const rb) \
+{ \
+  xfree(rb->buf); \
+} \
+\
+static inline void funcprefix##_rb_push(TypeName##RingBuffer *const rb, \
+                                        RBType item) \
+  REAL_FATTR_NONNULL_ARG(1); \
+static inline void funcprefix##_rb_push(TypeName##RingBuffer *const rb, \
+                                        RBType item) \
+{ \
+  if (rb->next == rb->first) { \
+    rbfree(rb->first); \
+    rb->first = _RINGBUF_NEXT(rb, rb->first); \
+  } else if (rb->first == NULL) { \
+    rb->first = rb->next; \
+  } \
+  *rb->next = item; \
+  rb->next = _RINGBUF_NEXT(rb, rb->next); \
+} \
+\
+static inline ptrdiff_t funcprefix##_rb_find_idx( \
+    const TypeName##RingBuffer *const rb, const RBType *const item_p) \
+  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE REAL_FATTR_UNUSED; \
+static inline ptrdiff_t funcprefix##_rb_find_idx( \
+    const TypeName##RingBuffer *const rb, const RBType *const item_p) \
+{ \
+  assert(rb->buf <= item_p); \
+  assert(rb->buf_end >= item_p); \
+  if (rb->first == NULL) { \
+    return -1; \
+  } else if (item_p >= rb->first) { \
+    return item_p - rb->first; \
+  } else { \
+    return item_p - rb->buf + rb->buf_end - rb->first + 1; \
+  } \
+} \
+\
+static inline size_t funcprefix##_rb_size( \
+    const TypeName##RingBuffer *const rb) \
+  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE; \
+static inline size_t funcprefix##_rb_size( \
+    const TypeName##RingBuffer *const rb) \
+{ \
+  return (size_t) (rb->buf_end - rb->buf) + 1; \
+} \
+\
+static inline size_t funcprefix##_rb_length( \
+    const TypeName##RingBuffer *const rb) \
+  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE; \
+static inline size_t funcprefix##_rb_length( \
+    const TypeName##RingBuffer *const rb) \
+{ \
+  return _RINGBUF_LENGTH(rb); \
+} \
+\
+static inline RBType *funcprefix##_rb_idx_p( \
+    const TypeName##RingBuffer *const rb, const size_t idx) \
+  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE; \
+static inline RBType *funcprefix##_rb_idx_p( \
+    const TypeName##RingBuffer *const rb, const size_t idx) \
+{ \
+  assert(idx <= funcprefix##_rb_size(rb)); \
+  assert(idx <= funcprefix##_rb_length(rb)); \
+  if (rb->first + idx > rb->buf_end) { \
+    return rb->buf + ((rb->first + idx) - (rb->buf_end + 1)); \
+  } else { \
+    return rb->first + idx; \
+  } \
+} \
+\
 static inline RBType funcprefix##_rb_idx(const TypeName##RingBuffer *const rb, \
-                                         const size_t idx)                     \
-  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE REAL_FATTR_UNUSED;                    \
+                                         const size_t idx) \
+  REAL_FATTR_NONNULL_ALL REAL_FATTR_PURE REAL_FATTR_UNUSED; \
 static inline RBType funcprefix##_rb_idx(const TypeName##RingBuffer *const rb, \
-                                         const size_t idx)                     \
-{                                                                              \
-  return *funcprefix##_rb_idx_p(rb, idx);                                      \
-}                                                                              \
-                                                                               \
-static inline void funcprefix##_rb_insert(TypeName##RingBuffer *const rb,      \
-                                          const size_t idx,                    \
-                                          RBType item)                         \
-  REAL_FATTR_NONNULL_ARG(1) REAL_FATTR_UNUSED;                                 \
-static inline void funcprefix##_rb_insert(TypeName##RingBuffer *const rb,      \
-                                          const size_t idx,                    \
-                                          RBType item)                         \
-{                                                                              \
-  assert(idx <= funcprefix##_rb_size(rb));                                     \
-  assert(idx <= funcprefix##_rb_length(rb));                                   \
-  const size_t length = funcprefix##_rb_length(rb);                            \
-  if (idx == length) {                                                         \
-    funcprefix##_rb_push(rb, item);                                            \
-    return;                                                                    \
-  }                                                                            \
-  RBType *const insertpos = funcprefix##_rb_idx_p(rb, idx);                    \
-  if (insertpos == rb->next) {                                                 \
-    funcprefix##_rb_push(rb, item);                                            \
-    return;                                                                    \
-  }                                                                            \
-  if (length == funcprefix##_rb_size(rb)) {                                    \
-    rbfree(rb->first);                                                         \
-  }                                                                            \
-  if (insertpos < rb->next) {                                                  \
-    memmove(insertpos + 1, insertpos,                                          \
-            (size_t) ((uintptr_t) rb->next - (uintptr_t) insertpos));          \
-  } else {                                                                     \
-    assert(insertpos > rb->first);                                             \
-    assert(rb->next <= rb->first);                                             \
-    memmove(rb->buf + 1, rb->buf,                                              \
-            (size_t) ((uintptr_t) rb->next - (uintptr_t) rb->buf));            \
-    *rb->buf = *rb->buf_end;                                                   \
-    memmove(insertpos + 1, insertpos,                                          \
+                                         const size_t idx) \
+{ \
+  return *funcprefix##_rb_idx_p(rb, idx); \
+} \
+\
+static inline void funcprefix##_rb_insert(TypeName##RingBuffer *const rb, \
+                                          const size_t idx, \
+                                          RBType item) \
+  REAL_FATTR_NONNULL_ARG(1) REAL_FATTR_UNUSED; \
+static inline void funcprefix##_rb_insert(TypeName##RingBuffer *const rb, \
+                                          const size_t idx, \
+                                          RBType item) \
+{ \
+  assert(idx <= funcprefix##_rb_size(rb)); \
+  assert(idx <= funcprefix##_rb_length(rb)); \
+  const size_t length = funcprefix##_rb_length(rb); \
+  if (idx == length) { \
+    funcprefix##_rb_push(rb, item); \
+    return; \
+  } \
+  RBType *const insertpos = funcprefix##_rb_idx_p(rb, idx); \
+  if (insertpos == rb->next) { \
+    funcprefix##_rb_push(rb, item); \
+    return; \
+  } \
+  if (length == funcprefix##_rb_size(rb)) { \
+    rbfree(rb->first); \
+  } \
+  if (insertpos < rb->next) { \
+    memmove(insertpos + 1, insertpos, \
+            (size_t) ((uintptr_t) rb->next - (uintptr_t) insertpos)); \
+  } else { \
+    assert(insertpos > rb->first); \
+    assert(rb->next <= rb->first); \
+    memmove(rb->buf + 1, rb->buf, \
+            (size_t) ((uintptr_t) rb->next - (uintptr_t) rb->buf)); \
+    *rb->buf = *rb->buf_end; \
+    memmove(insertpos + 1, insertpos, \
             (size_t) ((uintptr_t) (rb->buf_end + 1) - (uintptr_t) insertpos)); \
-  }                                                                            \
-  *insertpos = item;                                                           \
-  if (length == funcprefix##_rb_size(rb)) {                                    \
-    rb->first = _RINGBUF_NEXT(rb, rb->first);                                  \
-  }                                                                            \
-  rb->next = _RINGBUF_NEXT(rb, rb->next);                                      \
-}                                                                              \
-                                                                               \
-static inline void funcprefix##_rb_remove(TypeName##RingBuffer *const rb,      \
-                                          const size_t idx)                    \
-  REAL_FATTR_NONNULL_ARG(1) REAL_FATTR_UNUSED;                                 \
-static inline void funcprefix##_rb_remove(TypeName##RingBuffer *const rb,      \
-                                          const size_t idx)                    \
-{                                                                              \
-  assert(idx < funcprefix##_rb_size(rb));                                      \
-  assert(idx < funcprefix##_rb_length(rb));                                    \
-  RBType *const rmpos = funcprefix##_rb_idx_p(rb, idx);                        \
-  rbfree(rmpos);                                                               \
-  if (rmpos == rb->next - 1) {                                                 \
-    rb->next--;                                                                \
-    if (rb->first == rb->next) {                                               \
-      rb->first = NULL;                                                        \
-      rb->next = rb->buf;                                                      \
-    }                                                                          \
-  } else if (rmpos == rb->first) {                                             \
-    rb->first = _RINGBUF_NEXT(rb, rb->first);                                  \
-    if (rb->first == rb->next) {                                               \
-      rb->first = NULL;                                                        \
-      rb->next = rb->buf;                                                      \
-    }                                                                          \
-  } else if (rb->first < rb->next || rb->next == rb->buf) {                    \
-    assert(rmpos > rb->first);                                                 \
-    assert(rmpos <= _RINGBUF_PREV(rb, rb->next));                              \
-    memmove(rb->first + 1, rb->first,                                          \
-            (size_t) ((uintptr_t) rmpos - (uintptr_t) rb->first));             \
-    rb->first = _RINGBUF_NEXT(rb, rb->first);                                  \
-  } else if (rmpos < rb->next) {                                               \
-    memmove(rmpos, rmpos + 1,                                                  \
-            (size_t) ((uintptr_t) rb->next - (uintptr_t) rmpos));              \
-    rb->next = _RINGBUF_PREV(rb, rb->next);                                    \
-  } else {                                                                     \
-    assert(rb->first < rb->buf_end);                                           \
-    memmove(rb->first + 1, rb->first,                                          \
-            (size_t) ((uintptr_t) rmpos - (uintptr_t) rb->first));             \
-    rb->first = _RINGBUF_NEXT(rb, rb->first);                                  \
-  }                                                                            \
+  } \
+  *insertpos = item; \
+  if (length == funcprefix##_rb_size(rb)) { \
+    rb->first = _RINGBUF_NEXT(rb, rb->first); \
+  } \
+  rb->next = _RINGBUF_NEXT(rb, rb->next); \
+} \
+\
+static inline void funcprefix##_rb_remove(TypeName##RingBuffer *const rb, \
+                                          const size_t idx) \
+  REAL_FATTR_NONNULL_ARG(1) REAL_FATTR_UNUSED; \
+static inline void funcprefix##_rb_remove(TypeName##RingBuffer *const rb, \
+                                          const size_t idx) \
+{ \
+  assert(idx < funcprefix##_rb_size(rb)); \
+  assert(idx < funcprefix##_rb_length(rb)); \
+  RBType *const rmpos = funcprefix##_rb_idx_p(rb, idx); \
+  rbfree(rmpos); \
+  if (rmpos == rb->next - 1) { \
+    rb->next--; \
+    if (rb->first == rb->next) { \
+      rb->first = NULL; \
+      rb->next = rb->buf; \
+    } \
+  } else if (rmpos == rb->first) { \
+    rb->first = _RINGBUF_NEXT(rb, rb->first); \
+    if (rb->first == rb->next) { \
+      rb->first = NULL; \
+      rb->next = rb->buf; \
+    } \
+  } else if (rb->first < rb->next || rb->next == rb->buf) { \
+    assert(rmpos > rb->first); \
+    assert(rmpos <= _RINGBUF_PREV(rb, rb->next)); \
+    memmove(rb->first + 1, rb->first, \
+            (size_t) ((uintptr_t) rmpos - (uintptr_t) rb->first)); \
+    rb->first = _RINGBUF_NEXT(rb, rb->first); \
+  } else if (rmpos < rb->next) { \
+    memmove(rmpos, rmpos + 1, \
+            (size_t) ((uintptr_t) rb->next - (uintptr_t) rmpos)); \
+    rb->next = _RINGBUF_PREV(rb, rb->next); \
+  } else { \
+    assert(rb->first < rb->buf_end); \
+    memmove(rb->first + 1, rb->first, \
+            (size_t) ((uintptr_t) rmpos - (uintptr_t) rb->first)); \
+    rb->first = _RINGBUF_NEXT(rb, rb->first); \
+  } \
 }
 
 #endif  // NVIM_LIB_RINGBUF_H
diff --git a/src/nvim/log.c b/src/nvim/log.c
index 773d497881..bbb4dfb944 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -10,7 +10,14 @@
 #include "nvim/os/os.h"
 #include "nvim/os/time.h"
 
-#define USR_LOG_FILE "$HOME" _PATHSEPSTR ".nvimlog"
+/// First location of the log file used by log_path_init()
+#define USR_LOG_FILE "$NVIM_LOG_FILE"
+
+/// Fall back location of the log file used by log_path_init()
+#define USR_LOG_FILE_2 "$HOME" _PATHSEPSTR ".nvimlog"
+
+/// Cached location of the log file set by log_path_init()
+static char expanded_log_file_path[MAXPATHL + 1] = { 0 };
 
 static uv_mutex_t mutex;
 
@@ -18,6 +25,35 @@ static uv_mutex_t mutex;
 # include "log.c.generated.h"
 #endif
 
+/// Initialize path to log file
+///
+/// Tries to use #USR_LOG_FILE, then falls back #USR_LOG_FILE_2. Path to log
+/// file is cached, so only the first call has effect, unless first call was not
+/// successful. To make initialization not succeed either a bug in expand_env()
+/// is needed or both `$NVIM_LOG_FILE` and `$HOME` environment variables
+/// undefined.
+///
+/// @return true if path was initialized, false otherwise.
+static bool log_path_init(void)
+{
+  if (expanded_log_file_path[0]) {
+    return true;
+  }
+  expand_env((char_u *)USR_LOG_FILE, (char_u *)expanded_log_file_path,
+             sizeof(expanded_log_file_path) - 1);
+  // if the log file path expansion failed then fall back to stderr
+  if (strcmp(USR_LOG_FILE, expanded_log_file_path) == 0) {
+    memset(expanded_log_file_path, 0, sizeof(expanded_log_file_path));
+    expand_env((char_u *)USR_LOG_FILE_2, (char_u *)expanded_log_file_path,
+               sizeof(expanded_log_file_path) - 1);
+    if (strcmp(USR_LOG_FILE_2, expanded_log_file_path) == 0) {
+      memset(expanded_log_file_path, 0, sizeof(expanded_log_file_path));
+      return false;
+    }
+  }
+  return true;
+}
+
 void log_init(void)
 {
   uv_mutex_init(&mutex);
@@ -73,30 +109,17 @@ FILE *open_log_file(void)
     return stderr;
   }
 
-  // expand USR_LOG_FILE and open the file
-  FILE *log_file;
+  // expand USR_LOG_FILE if needed and open the file
+  FILE *log_file = NULL;
   opening_log_file = true;
-  {
-    static char expanded_log_file_path[MAXPATHL + 1];
-
-    expand_env((char_u *)USR_LOG_FILE, (char_u *)expanded_log_file_path,
-               MAXPATHL);
-    // if the log file path expansion failed then fall back to stderr
-    if (strcmp(USR_LOG_FILE, expanded_log_file_path) == 0) {
-      goto open_log_file_error;
-    }
-
+  if (log_path_init()) {
     log_file = fopen(expanded_log_file_path, "a");
-    if (log_file == NULL) {
-      goto open_log_file_error;
-    }
   }
   opening_log_file = false;
 
-  return log_file;
-
-open_log_file_error:
-  opening_log_file = false;
+  if (log_file != NULL) {
+    return log_file;
+  }
 
   do_log_to_file(stderr, ERROR_LOG_LEVEL, __func__, __LINE__, true,
                  "Couldn't open USR_LOG_FILE, logging to stderr! This may be "
@@ -123,10 +146,10 @@ static bool v_do_log_to_file(FILE *log_file, int log_level,
                              const char* fmt, va_list args)
 {
   static const char *log_levels[] = {
-    [DEBUG_LOG_LEVEL] = "debug",
-    [INFO_LOG_LEVEL] = "info",
-    [WARNING_LOG_LEVEL] = "warning",
-    [ERROR_LOG_LEVEL] = "error"
+    [DEBUG_LOG_LEVEL]   = "DEBUG",
+    [INFO_LOG_LEVEL]    = "INFO ",
+    [WARNING_LOG_LEVEL] = "WARN ",
+    [ERROR_LOG_LEVEL]   = "ERROR"
   };
   assert(log_level >= DEBUG_LOG_LEVEL && log_level <= ERROR_LOG_LEVEL);
 
@@ -143,8 +166,8 @@ static bool v_do_log_to_file(FILE *log_file, int log_level,
 
   // print the log message prefixed by the current timestamp and pid
   int64_t pid = os_get_pid();
-  if (fprintf(log_file, "%s [%s @ %s:%d] %" PRId64 " - ", date_time,
-              log_levels[log_level], func_name, line_num, pid) < 0) {
+  if (fprintf(log_file, "%s %s %" PRId64 "/%s:%d: ", date_time,
+              log_levels[log_level], pid, func_name, line_num) < 0) {
     return false;
   }
   if (vfprintf(log_file, fmt, args) < 0) {
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 5f69fa2f6a..df2b431e92 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -73,11 +73,6 @@
 /* Returns empty string if it is NULL. */
 #define EMPTY_IF_NULL(x) ((x) ? (x) : (char_u *)"")
 
-/* macro version of chartab().
- * Only works with values 0-255!
- * Doesn't work for UTF-8 mode with chars >= 0x80. */
-#define CHARSIZE(c)     (chartab[c] & CT_CELL_MASK)
-
 /*
  * Adjust chars in a language according to 'langmap' option.
  * NOTE that there is no noticeable overhead if 'langmap' is not set.
@@ -127,32 +122,29 @@
 /* Whether to draw the vertical bar on the right side of the cell. */
 # define CURSOR_BAR_RIGHT (curwin->w_p_rl && (!(State & CMDLINE) || cmdmsg_rl))
 
-/*
- * mb_ptr_adv(): advance a pointer to the next character, taking care of
- * multi-byte characters if needed.
- * mb_ptr_back(): backup a pointer to the previous character, taking care of
- * multi-byte characters if needed.
- * MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers.
- * PTR2CHAR(): get character from pointer.
- */
-/* Get the length of the character p points to */
-# define MB_PTR2LEN(p)          (has_mbyte ? (*mb_ptr2len)(p) : 1)
-/* Advance multi-byte pointer, skip over composing chars. */
-# define mb_ptr_adv(p)      (p += has_mbyte ? (*mb_ptr2len)((char_u *)p) : 1)
-/* Advance multi-byte pointer, do not skip over composing chars. */
-# define mb_cptr_adv(p)     (p += \
-  enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1)
-/* Backup multi-byte pointer. Only use with "p" > "s" ! */
-# define mb_ptr_back(s, p)  (p -= has_mbyte ? ((*mb_head_off)((char_u *)s, (char_u *)p - 1) + 1) : 1)
-/* get length of multi-byte char, not including composing chars */
-# define mb_cptr2len(p)     (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
-
-# define MB_COPY_CHAR(f, t) \
-  if (has_mbyte) mb_copy_char((const char_u **)(&f), &t); \
-  else *t++ = *f++
-# define MB_CHARLEN(p)      (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
-# define MB_CHAR2LEN(c)     (has_mbyte ? mb_char2len(c) : 1)
-# define PTR2CHAR(p)        (has_mbyte ? mb_ptr2char(p) : (int)*(p))
+// mb_ptr_adv(): advance a pointer to the next character, taking care of
+// multi-byte characters if needed.
+// mb_ptr_back(): backup a pointer to the previous character, taking care of
+// multi-byte characters if needed.
+// MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers.
+// PTR2CHAR(): get character from pointer.
+
+// Get the length of the character p points to
+# define MB_PTR2LEN(p)          mb_ptr2len(p)
+// Advance multi-byte pointer, skip over composing chars.
+# define mb_ptr_adv(p)      (p += mb_ptr2len((char_u *)p))
+// Advance multi-byte pointer, do not skip over composing chars.
+# define mb_cptr_adv(p)     (p += utf_ptr2len(p))
+// Backup multi-byte pointer. Only use with "p" > "s" !
+# define mb_ptr_back(s, p)  (p -= mb_head_off((char_u *)s, (char_u *)p - 1) + 1)
+// get length of multi-byte char, not including composing chars
+# define mb_cptr2len(p)     utf_ptr2len(p)
+
+# define MB_COPY_CHAR(f, t) mb_copy_char((const char_u **)(&f), &t);
+
+# define MB_CHARLEN(p)      mb_charlen(p)
+# define MB_CHAR2LEN(c)     mb_char2len(c)
+# define PTR2CHAR(p)        mb_ptr2char(p)
 
 # define RESET_BINDING(wp)  (wp)->w_p_scb = FALSE; (wp)->w_p_crb = FALSE
 
@@ -166,4 +158,7 @@
 
 #define RGB(r, g, b) ((r << 16) | (g << 8) | b)
 
+#define STR_(x) #x
+#define STR(x) STR_(x)
+
 #endif  // NVIM_MACROS_H
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 71a972e8f6..c7a60d07c1 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -30,7 +30,6 @@
 #include "nvim/memline.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/log.h"
 #include "nvim/memory.h"
@@ -58,13 +57,13 @@
 #include "nvim/event/loop.h"
 #include "nvim/os/signal.h"
 #include "nvim/event/process.h"
-#include "nvim/msgpack_rpc/defs.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/msgpack_rpc/server.h"
 #include "nvim/msgpack_rpc/channel.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/handle.h"
+#include "nvim/api/private/dispatch.h"
 
 /* Maximum number of commands from + or -c arguments. */
 #define MAX_ARG_CMDS 10
@@ -120,6 +119,8 @@ typedef struct {
 # include "main.c.generated.h"
 #endif
 
+Loop main_loop;
+
 static char *argv0;
 
 // Error messages
@@ -133,7 +134,7 @@ static const char *err_extra_cmd =
 
 void event_init(void)
 {
-  loop_init(&loop, NULL);
+  loop_init(&main_loop, NULL);
   // early msgpack-rpc initialization
   msgpack_rpc_init_method_table();
   msgpack_rpc_helpers_init();
@@ -151,19 +152,20 @@ void event_init(void)
 
 void event_teardown(void)
 {
-  if (!loop.events) {
+  if (!main_loop.events) {
     return;
   }
 
-  queue_process_events(loop.events);
+  multiqueue_process_events(main_loop.events);
   input_stop();
   channel_teardown();
-  process_teardown(&loop);
+  process_teardown(&main_loop);
+  timer_teardown();
   server_teardown();
   signal_teardown();
   terminal_teardown();
 
-  loop_close(&loop);
+  loop_close(&main_loop, true);
 }
 
 /// Performs early initialization.
@@ -175,7 +177,6 @@ void early_init(void)
   fs_init();
   handle_init();
 
-  (void)mb_init();      // init mb_bytelen_tab[] to ones
   eval_init();          // init global variables
 
   // Init the table of Normal mode commands.
@@ -248,8 +249,9 @@ int main(int argc, char **argv)
    */
   command_line_scan(&params);
 
-  if (GARGCOUNT > 0)
-    fname = get_fname(&params);
+  if (GARGCOUNT > 0) {
+    fname = get_fname(&params, cwd);
+  }
 
   TIME_MSG("expanding arguments");
 
@@ -267,13 +269,7 @@ int main(int argc, char **argv)
 
   setbuf(stdout, NULL);
 
-  /* This message comes before term inits, but after setting "silent_mode"
-   * when the input is not a tty. */
-  if (GARGCOUNT > 1 && !silent_mode)
-    printf(_("%d files to edit\n"), GARGCOUNT);
-
   full_screen = true;
-  t_colors = 256;
   check_tty(&params);
 
   /*
@@ -318,14 +314,18 @@ int main(int argc, char **argv)
 
   // open terminals when opening files that start with term://
 #define PROTO "term://"
+  do_cmdline_cmd("augroup nvim_terminal");
+  do_cmdline_cmd("autocmd!");
   do_cmdline_cmd("autocmd BufReadCmd " PROTO "* nested "
-                 ":call termopen( "
+                 ":if !exists('b:term_title')|call termopen( "
                  // Capture the command string
                  "matchstr(expand(\"<amatch>\"), "
                  "'\\c\\m" PROTO "\\%(.\\{-}//\\%(\\d\\+:\\)\\?\\)\\?\\zs.*'), "
                  // capture the working directory
                  "{'cwd': get(matchlist(expand(\"<amatch>\"), "
-                 "'\\c\\m" PROTO "\\(.\\{-}\\)//'), 1, '')})");
+                 "'\\c\\m" PROTO "\\(.\\{-}\\)//'), 1, '')})"
+                 "|endif");
+  do_cmdline_cmd("augroup END");
 #undef PROTO
 
   /* Execute --cmd arguments. */
@@ -504,11 +504,15 @@ int main(int argc, char **argv)
   no_wait_return = FALSE;
   starting = 0;
 
+  // 'autochdir' has been postponed.
+  do_autochdir();
+
   /* start in insert mode */
   if (p_im)
     need_start_insertmode = TRUE;
 
-  apply_autocmds(EVENT_VIMENTER, NULL, NULL, FALSE, curbuf);
+  set_vim_var_nr(VV_VIM_DID_ENTER, 1L);
+  apply_autocmds(EVENT_VIMENTER, NULL, NULL, false, curbuf);
   TIME_MSG("VimEnter autocommands");
 
   /* When a startup script or session file setup for diff'ing and
@@ -530,7 +534,7 @@ int main(int argc, char **argv)
   }
 
   TIME_MSG("before starting main loop");
-  ILOG("Starting Neovim main loop.");
+  ILOG("starting main loop");
 
   /*
    * Call the main command loop.  This never returns.
@@ -553,6 +557,8 @@ void getout(int exitval)
   if (exmode_active)
     exitval += ex_exitval;
 
+  set_vim_var_nr(VV_EXITING, exitval);
+
   /* Position the cursor on the last screen line, below all the text */
   ui_cursor_goto((int)Rows - 1, 0);
 
@@ -665,8 +671,8 @@ static void init_locale(void)
   {
     char_u  *p;
 
-    /* expand_env() doesn't work yet, because chartab[] is not initialized
-     * yet, call vim_getenv() directly */
+    // expand_env() doesn't work yet, because g_chartab[] is not
+    // initialized yet, call vim_getenv() directly
     p = (char_u *)vim_getenv("VIMRUNTIME");
     if (p != NULL && *p != NUL) {
       vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
@@ -1191,7 +1197,7 @@ static void check_and_set_isatty(mparm_T *paramp)
 /*
  * Get filename from command line, given that there is one.
  */
-static char_u *get_fname(mparm_T *parmp)
+static char_u *get_fname(mparm_T *parmp, char_u *cwd)
 {
 #if !defined(UNIX)
   /*
@@ -1236,8 +1242,11 @@ static void set_window_layout(mparm_T *paramp)
 static void load_plugins(void)
 {
   if (p_lpl) {
-    source_runtime((char_u *)"plugin/**/*.vim", TRUE);
+    source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL);  // NOLINT
     TIME_MSG("loading plugins");
+
+    ex_packloadall(NULL);
+    TIME_MSG("loading packages");
   }
 }
 
@@ -1665,8 +1674,6 @@ static bool do_user_initialization(void)
 }
 
 /// Source startup scripts
-///
-/// @param[in]
 static void source_startup_scripts(const mparm_T *const parmp)
   FUNC_ATTR_NONNULL_ALL
 {
@@ -1756,7 +1763,7 @@ static int process_env(char *env, bool is_viminit)
     do_cmdline_cmd((char *)initstr);
     sourcing_name = save_sourcing_name;
     sourcing_lnum = save_sourcing_lnum;
-    current_SID = save_sid;;
+    current_SID = save_sid;
     return OK;
   }
   return FAIL;
diff --git a/src/nvim/main.h b/src/nvim/main.h
index 084e247b7e..86d25fe657 100644
--- a/src/nvim/main.h
+++ b/src/nvim/main.h
@@ -2,6 +2,9 @@
 #define NVIM_MAIN_H
 
 #include "nvim/normal.h"
+#include "nvim/event/loop.h"
+
+extern Loop main_loop;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "main.h.generated.h"
diff --git a/src/nvim/map.c b/src/nvim/map.c
index d4262ae9a8..73af487f90 100644
--- a/src/nvim/map.c
+++ b/src/nvim/map.c
@@ -6,7 +6,7 @@
 #include "nvim/map_defs.h"
 #include "nvim/vim.h"
 #include "nvim/memory.h"
-#include "nvim/msgpack_rpc/defs.h"
+#include "nvim/api/private/dispatch.h"
 
 #include "nvim/lib/khash.h"
 
@@ -20,6 +20,8 @@
 #define int_eq kh_int_hash_equal
 #define linenr_T_hash kh_int_hash_func
 #define linenr_T_eq kh_int_hash_equal
+#define handle_T_hash kh_int_hash_func
+#define handle_T_eq kh_int_hash_equal
 
 
 #if defined(ARCH_64)
@@ -34,88 +36,88 @@
 #define INITIALIZER_DECLARE(T, U, ...) const U INITIALIZER(T, U) = __VA_ARGS__
 #define DEFAULT_INITIALIZER {0}
 
-#define MAP_IMPL(T, U, ...)                                                   \
-  INITIALIZER_DECLARE(T, U, __VA_ARGS__);                                     \
-  __KHASH_IMPL(T##_##U##_map,, T, U, 1, T##_hash, T##_eq)                     \
-                                                                              \
-  Map(T, U) *map_##T##_##U##_new()                                            \
-  {                                                                           \
-    Map(T, U) *rv = xmalloc(sizeof(Map(T, U)));                               \
-    rv->table = kh_init(T##_##U##_map);                                       \
-    return rv;                                                                \
-  }                                                                           \
-                                                                              \
-  void map_##T##_##U##_free(Map(T, U) *map)                                   \
-  {                                                                           \
-    kh_destroy(T##_##U##_map, map->table);                                    \
-    xfree(map);                                                               \
-  }                                                                           \
-                                                                              \
-  U map_##T##_##U##_get(Map(T, U) *map, T key)                                \
-  {                                                                           \
-    khiter_t k;                                                               \
-                                                                              \
+#define MAP_IMPL(T, U, ...) \
+  INITIALIZER_DECLARE(T, U, __VA_ARGS__); \
+  __KHASH_IMPL(T##_##U##_map,, T, U, 1, T##_hash, T##_eq) \
+  \
+  Map(T, U) *map_##T##_##U##_new() \
+  { \
+    Map(T, U) *rv = xmalloc(sizeof(Map(T, U))); \
+    rv->table = kh_init(T##_##U##_map); \
+    return rv; \
+  } \
+  \
+  void map_##T##_##U##_free(Map(T, U) *map) \
+  { \
+    kh_destroy(T##_##U##_map, map->table); \
+    xfree(map); \
+  } \
+  \
+  U map_##T##_##U##_get(Map(T, U) *map, T key) \
+  { \
+    khiter_t k; \
+    \
     if ((k = kh_get(T##_##U##_map, map->table, key)) == kh_end(map->table)) { \
-      return INITIALIZER(T, U);                                               \
-    }                                                                         \
-                                                                              \
-    return kh_val(map->table, k);                                             \
-  }                                                                           \
-                                                                              \
-  bool map_##T##_##U##_has(Map(T, U) *map, T key)                             \
-  {                                                                           \
-    return kh_get(T##_##U##_map, map->table, key) != kh_end(map->table);      \
-  }                                                                           \
-                                                                              \
-  U map_##T##_##U##_put(Map(T, U) *map, T key, U value)                       \
-  {                                                                           \
-    int ret;                                                                  \
-    U rv = INITIALIZER(T, U);                                                 \
-    khiter_t k = kh_put(T##_##U##_map, map->table, key, &ret);                \
-                                                                              \
-    if (!ret) {                                                               \
-      rv = kh_val(map->table, k);                                             \
-    }                                                                         \
-                                                                              \
-    kh_val(map->table, k) = value;                                            \
-    return rv;                                                                \
-  }                                                                           \
-                                                                              \
-  U *map_##T##_##U##_ref(Map(T, U) *map, T key, bool put)                     \
-  {                                                                           \
-    int ret;                                                                  \
-    khiter_t k;                                                               \
-    if (put) {                                                                \
-      k = kh_put(T##_##U##_map, map->table, key, &ret);                       \
-      if (ret) {                                                              \
-        kh_val(map->table, k) = INITIALIZER(T, U);                            \
-      }                                                                       \
-    } else {                                                                  \
-      k = kh_get(T##_##U##_map, map->table, key);                             \
-      if (k == kh_end(map->table)) {                                          \
-        return NULL;                                                          \
-      }                                                                       \
-    }                                                                         \
-                                                                              \
-    return &kh_val(map->table, k);                                            \
-  }                                                                           \
-                                                                              \
-  U map_##T##_##U##_del(Map(T, U) *map, T key)                                \
-  {                                                                           \
-    U rv = INITIALIZER(T, U);                                                 \
-    khiter_t k;                                                               \
-                                                                              \
+      return INITIALIZER(T, U); \
+    } \
+    \
+    return kh_val(map->table, k); \
+  } \
+  \
+  bool map_##T##_##U##_has(Map(T, U) *map, T key) \
+  { \
+    return kh_get(T##_##U##_map, map->table, key) != kh_end(map->table); \
+  } \
+  \
+  U map_##T##_##U##_put(Map(T, U) *map, T key, U value) \
+  { \
+    int ret; \
+    U rv = INITIALIZER(T, U); \
+    khiter_t k = kh_put(T##_##U##_map, map->table, key, &ret); \
+    \
+    if (!ret) { \
+      rv = kh_val(map->table, k); \
+    } \
+    \
+    kh_val(map->table, k) = value; \
+    return rv; \
+  } \
+  \
+  U *map_##T##_##U##_ref(Map(T, U) *map, T key, bool put) \
+  { \
+    int ret; \
+    khiter_t k; \
+    if (put) { \
+      k = kh_put(T##_##U##_map, map->table, key, &ret); \
+      if (ret) { \
+        kh_val(map->table, k) = INITIALIZER(T, U); \
+      } \
+    } else { \
+      k = kh_get(T##_##U##_map, map->table, key); \
+      if (k == kh_end(map->table)) { \
+        return NULL; \
+      } \
+    } \
+    \
+    return &kh_val(map->table, k); \
+  } \
+  \
+  U map_##T##_##U##_del(Map(T, U) *map, T key) \
+  { \
+    U rv = INITIALIZER(T, U); \
+    khiter_t k; \
+    \
     if ((k = kh_get(T##_##U##_map, map->table, key)) != kh_end(map->table)) { \
-      rv = kh_val(map->table, k);                                             \
-      kh_del(T##_##U##_map, map->table, k);                                   \
-    }                                                                         \
-                                                                              \
-    return rv;                                                                \
-  }                                                                           \
-                                                                              \
-  void map_##T##_##U##_clear(Map(T, U) *map)                                  \
-  {                                                                           \
-    kh_clear(T##_##U##_map, map->table);                                      \
+      rv = kh_val(map->table, k); \
+      kh_del(T##_##U##_map, map->table, k); \
+    } \
+    \
+    return rv; \
+  } \
+  \
+  void map_##T##_##U##_clear(Map(T, U) *map) \
+  { \
+    kh_clear(T##_##U##_map, map->table); \
   }
 
 static inline khint_t String_hash(String s)
@@ -129,7 +131,10 @@ static inline khint_t String_hash(String s)
 
 static inline bool String_eq(String a, String b)
 {
-  return strncmp(a.data, b.data, MIN(a.size, b.size)) == 0;
+  if (a.size != b.size) {
+    return false;
+  }
+  return memcmp(a.data, b.data, a.size) == 0;
 }
 
 
@@ -138,7 +143,8 @@ MAP_IMPL(cstr_t, uint64_t, DEFAULT_INITIALIZER)
 MAP_IMPL(cstr_t, ptr_t, DEFAULT_INITIALIZER)
 MAP_IMPL(ptr_t, ptr_t, DEFAULT_INITIALIZER)
 MAP_IMPL(uint64_t, ptr_t, DEFAULT_INITIALIZER)
-#define MSGPACK_HANDLER_INITIALIZER {.fn = NULL, .async = false}
+MAP_IMPL(handle_T, ptr_t, DEFAULT_INITIALIZER)
+#define MSGPACK_HANDLER_INITIALIZER { .fn = NULL, .async = false }
 MAP_IMPL(String, MsgpackRpcRequestHandler, MSGPACK_HANDLER_INITIALIZER)
 #define KVEC_INITIALIZER { .size = 0, .capacity = 0, .items = NULL }
 MAP_IMPL(linenr_T, bufhl_vec_T, KVEC_INITIALIZER)
diff --git a/src/nvim/map.h b/src/nvim/map.h
index e90cc360ce..ba3e84cb31 100644
--- a/src/nvim/map.h
+++ b/src/nvim/map.h
@@ -5,23 +5,23 @@
 
 #include "nvim/map_defs.h"
 #include "nvim/api/private/defs.h"
-#include "nvim/msgpack_rpc/defs.h"
+#include "nvim/api/private/dispatch.h"
 #include "nvim/bufhl_defs.h"
 
-#define MAP_DECLS(T, U)                                                       \
-  KHASH_DECLARE(T##_##U##_map, T, U)                                          \
-                                                                              \
-  typedef struct {                                                            \
-    khash_t(T##_##U##_map) *table;                                            \
-  } Map(T, U);                                                                \
-                                                                              \
-  Map(T, U) *map_##T##_##U##_new(void);                                       \
-  void map_##T##_##U##_free(Map(T, U) *map);                                  \
-  U map_##T##_##U##_get(Map(T, U) *map, T key);                               \
-  bool map_##T##_##U##_has(Map(T, U) *map, T key);                            \
-  U map_##T##_##U##_put(Map(T, U) *map, T key, U value);                      \
-  U *map_##T##_##U##_ref(Map(T, U) *map, T key, bool put);                    \
-  U map_##T##_##U##_del(Map(T, U) *map, T key);                               \
+#define MAP_DECLS(T, U) \
+  KHASH_DECLARE(T##_##U##_map, T, U) \
+  \
+  typedef struct { \
+    khash_t(T##_##U##_map) *table; \
+  } Map(T, U); \
+  \
+  Map(T, U) *map_##T##_##U##_new(void); \
+  void map_##T##_##U##_free(Map(T, U) *map); \
+  U map_##T##_##U##_get(Map(T, U) *map, T key); \
+  bool map_##T##_##U##_has(Map(T, U) *map, T key); \
+  U map_##T##_##U##_put(Map(T, U) *map, T key, U value); \
+  U *map_##T##_##U##_ref(Map(T, U) *map, T key, bool put); \
+  U map_##T##_##U##_del(Map(T, U) *map, T key); \
   void map_##T##_##U##_clear(Map(T, U) *map);
 
 MAP_DECLS(int, int)
@@ -29,6 +29,7 @@ MAP_DECLS(cstr_t, uint64_t)
 MAP_DECLS(cstr_t, ptr_t)
 MAP_DECLS(ptr_t, ptr_t)
 MAP_DECLS(uint64_t, ptr_t)
+MAP_DECLS(handle_T, ptr_t)
 MAP_DECLS(String, MsgpackRpcRequestHandler)
 MAP_DECLS(linenr_T, bufhl_vec_T)
 
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index fe802e48ba..4e05845eb5 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -21,7 +21,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
 #include "nvim/path.h"
@@ -131,17 +130,23 @@ int setmark_pos(int c, pos_T *pos, int fnum)
     return OK;
   }
 
-  if (c > 'z')              /* some islower() and isupper() cannot handle
-                                characters above 127 */
+  buf_T *buf = buflist_findnr(fnum);
+  // Can't set a mark in a non-existant buffer.
+  if (buf == NULL) {
     return FAIL;
-  if (islower(c)) {
+  }
+
+  if (ASCII_ISLOWER(c)) {
     i = c - 'a';
-    RESET_FMARK(curbuf->b_namedm + i, *pos, curbuf->b_fnum);
+    RESET_FMARK(buf->b_namedm + i, *pos, fnum);
     return OK;
   }
-  if (isupper(c)) {
-    assert(c >= 'A' && c <= 'Z');
-    i = c - 'A';
+  if (ASCII_ISUPPER(c) || ascii_isdigit(c)) {
+    if (ascii_isdigit(c)) {
+      i = c - '0' + NMARKS;
+    } else {
+      i = c - 'A';
+    }
     RESET_XFMARK(namedfm + i, *pos, fnum, NULL);
     return OK;
   }
@@ -474,7 +479,7 @@ static void fname2fnum(xfmark_T *fm)
     os_dirname(IObuff, IOSIZE);
     p = path_shorten_fname(NameBuff, IObuff);
 
-    /* buflist_new() will call fmarks_check_names() */
+    // buflist_new() will call fmarks_check_names()
     (void)buflist_new(NameBuff, p, (linenr_T)1, 0);
   }
 }
@@ -799,6 +804,13 @@ void ex_jumps(exarg_T *eap)
     MSG_PUTS("\n>");
 }
 
+void ex_clearjumps(exarg_T *eap)
+{
+  free_jumplist(curwin);
+  curwin->w_jumplistlen = 0;
+  curwin->w_jumplistidx = 0;
+}
+
 /*
  * print the changelist
  */
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index 3495203c43..c855d68605 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1,68 +1,27 @@
-/*
- * mbyte.c: Code specifically for handling multi-byte characters.
- * Multibyte extensions partly by Sung-Hoon Baek
- *
- * The encoding used in the core is set with 'encoding'.  When 'encoding' is
- * changed, the following four variables are set (for speed).
- * Currently these types of character encodings are supported:
- *
- * "enc_dbcs"	    When non-zero it tells the type of double byte character
- *		    encoding (Chinese, Korean, Japanese, etc.).
- *		    The cell width on the display is equal to the number of
- *		    bytes.  (exception: DBCS_JPNU with first byte 0x8e)
- *		    Recognizing the first or second byte is difficult, it
- *		    requires checking a byte sequence from the start.
- * "enc_utf8"	    When TRUE use Unicode characters in UTF-8 encoding.
- *		    The cell width on the display needs to be determined from
- *		    the character value.
- *		    Recognizing bytes is easy: 0xxx.xxxx is a single-byte
- *		    char, 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading
- *		    byte of a multi-byte character.
- *		    To make things complicated, up to six composing characters
- *		    are allowed.  These are drawn on top of the first char.
- *		    For most editing the sequence of bytes with composing
- *		    characters included is considered to be one character.
- * "enc_unicode"    When 2 use 16-bit Unicode characters (or UTF-16).
- *		    When 4 use 32-but Unicode characters.
- *		    Internally characters are stored in UTF-8 encoding to
- *		    avoid NUL bytes.  Conversion happens when doing I/O.
- *		    "enc_utf8" will also be TRUE.
- *
- * "has_mbyte" is set when "enc_dbcs" or "enc_utf8" is non-zero.
- *
- * If none of these is TRUE, 8-bit bytes are used for a character.  The
- * encoding isn't currently specified (TODO).
- *
- * 'encoding' specifies the encoding used in the core.  This is in registers,
- * text manipulation, buffers, etc.  Conversion has to be done when characters
- * in another encoding are received or send:
- *
- *		       clipboard
- *			   ^
- *			   | (2)
- *			   V
- *		   +---------------+
- *	      (1)  |		   | (3)
- *  keyboard ----->|	 core	   |-----> display
- *		   |		   |
- *		   +---------------+
- *			   ^
- *			   | (4)
- *			   V
- *			 file
- *
- * (1) Typed characters arrive in the current locale.
- * (2) Text will be made available with the encoding specified with
- *     'encoding'.  If this is not sufficient, system-specific conversion
- *     might be required.
- * (3) For the GUI the correct font must be selected, no conversion done.
- * (4) The encoding of the file is specified with 'fileencoding'.  Conversion
- *     is to be done when it's different from 'encoding'.
- *
- * The ShaDa file is a special case: Only text is converted, not file names.
- * Vim scripts may contain an ":encoding" command.  This has an effect for
- * some commands, like ":menutrans"
- */
+/// mbyte.c: Code specifically for handling multi-byte characters.
+/// Multibyte extensions partly by Sung-Hoon Baek
+///
+/// The encoding used in nvim is always UTF-8. "enc_utf8" and "has_mbyte" is
+/// thus always true. "enc_dbcs" is always zero. The 'encoding' option is
+/// read-only and always reads "utf-8".
+///
+/// The cell width on the display needs to be determined from the character
+/// value. Recognizing UTF-8 bytes is easy: 0xxx.xxxx is a single-byte char,
+/// 10xx.xxxx is a trailing byte, 11xx.xxxx is a leading byte of a multi-byte
+/// character. To make things complicated, up to six composing characters
+/// are allowed. These are drawn on top of the first char. For most editing
+/// the sequence of bytes with composing characters included is considered to
+/// be one character.
+///
+/// UTF-8 is used everywhere in the core. This is in registers, text
+/// manipulation, buffers, etc. Nvim core communicates with external plugins
+/// and GUIs in this encoding.
+///
+/// The encoding of a file is specified with 'fileencoding'.  Conversion
+/// is to be done when it's different from "utf-8".
+///
+/// Vim scripts may contain an ":scriptencoding" command. This has an effect
+/// for some commands, like ":menutrans".
 
 #include <inttypes.h>
 #include <stdbool.h>
@@ -84,7 +43,6 @@
 #include "nvim/memline.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/option.h"
 #include "nvim/screen.h"
@@ -111,24 +69,6 @@ struct interval {
 #endif
 
 /*
- * Lookup table to quickly get the length in bytes of a UTF-8 character from
- * the first byte of a UTF-8 string.
- * Bytes which are illegal when used as the first byte have a 1.
- * The NUL byte has length 1.
- */
-static char utf8len_tab[256] =
-{
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
-  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1,
-};
-
-/*
  * Like utf8len_tab above, but using a zero for illegal lead bytes.
  */
 static uint8_t utf8len_tab_zero[256] =
@@ -386,207 +326,6 @@ int enc_canon_props(const char_u *name)
 }
 
 /*
- * Set up for using multi-byte characters.
- * Called in three cases:
- * - by main() to initialize (p_enc == NULL)
- * - by set_init_1() after 'encoding' was set to its default.
- * - by do_set() when 'encoding' has been set.
- * p_enc must have been passed through enc_canonize() already.
- * Sets the "enc_unicode", "enc_utf8", "enc_dbcs" and "has_mbyte" flags.
- * Fills mb_bytelen_tab[] and returns NULL when there are no problems.
- * When there is something wrong: Returns an error message and doesn't change
- * anything.
- */
-char_u * mb_init(void)
-{
-  int i;
-  int idx;
-  int n;
-  int enc_dbcs_new = 0;
-#if defined(USE_ICONV) && !defined(WIN3264) && !defined(WIN32UNIX) \
-  && !defined(MACOS)
-# define LEN_FROM_CONV
-  vimconv_T vimconv;
-  char_u      *p;
-#endif
-
-  if (p_enc == NULL) {
-    /* Just starting up: set the whole table to one's. */
-    for (i = 0; i < 256; ++i)
-      mb_bytelen_tab[i] = 1;
-    return NULL;
-  } else if (STRNCMP(p_enc, "8bit-", 5) == 0
-      || STRNCMP(p_enc, "iso-8859-", 9) == 0) {
-    /* Accept any "8bit-" or "iso-8859-" name. */
-    enc_unicode = 0;
-    enc_utf8 = false;
-  } else if (STRNCMP(p_enc, "2byte-", 6) == 0) {
-    /* Unix: accept any "2byte-" name, assume current locale. */
-    enc_dbcs_new = DBCS_2BYTE;
-  } else if ((idx = enc_canon_search(p_enc)) >= 0) {
-    i = enc_canon_table[idx].prop;
-    if (i & ENC_UNICODE) {
-      /* Unicode */
-      enc_utf8 = true;
-      if (i & (ENC_2BYTE | ENC_2WORD))
-        enc_unicode = 2;
-      else if (i & ENC_4BYTE)
-        enc_unicode = 4;
-      else
-        enc_unicode = 0;
-    } else if (i & ENC_DBCS) {
-      /* 2byte, handle below */
-      enc_dbcs_new = enc_canon_table[idx].codepage;
-    } else {
-      /* Must be 8-bit. */
-      enc_unicode = 0;
-      enc_utf8 = false;
-    }
-  } else    /* Don't know what encoding this is, reject it. */
-    return e_invarg;
-
-  if (enc_dbcs_new != 0) {
-    enc_unicode = 0;
-    enc_utf8 = false;
-  }
-  enc_dbcs = enc_dbcs_new;
-  has_mbyte = (enc_dbcs != 0 || enc_utf8);
-
-
-  /* Detect an encoding that uses latin1 characters. */
-  enc_latin1like = (enc_utf8 || STRCMP(p_enc, "latin1") == 0
-      || STRCMP(p_enc, "iso-8859-15") == 0);
-
-  /*
-   * Set the function pointers.
-   */
-  if (enc_utf8) {
-    mb_ptr2len = utfc_ptr2len;
-    mb_ptr2len_len = utfc_ptr2len_len;
-    mb_char2len = utf_char2len;
-    mb_char2bytes = utf_char2bytes;
-    mb_ptr2cells = utf_ptr2cells;
-    mb_ptr2cells_len = utf_ptr2cells_len;
-    mb_char2cells = utf_char2cells;
-    mb_off2cells = utf_off2cells;
-    mb_ptr2char = utf_ptr2char;
-    mb_head_off = utf_head_off;
-  } else if (enc_dbcs != 0) {
-    mb_ptr2len = dbcs_ptr2len;
-    mb_ptr2len_len = dbcs_ptr2len_len;
-    mb_char2len = dbcs_char2len;
-    mb_char2bytes = dbcs_char2bytes;
-    mb_ptr2cells = dbcs_ptr2cells;
-    mb_ptr2cells_len = dbcs_ptr2cells_len;
-    mb_char2cells = dbcs_char2cells;
-    mb_off2cells = dbcs_off2cells;
-    mb_ptr2char = dbcs_ptr2char;
-    mb_head_off = dbcs_head_off;
-  } else {
-    mb_ptr2len = latin_ptr2len;
-    mb_ptr2len_len = latin_ptr2len_len;
-    mb_char2len = latin_char2len;
-    mb_char2bytes = latin_char2bytes;
-    mb_ptr2cells = latin_ptr2cells;
-    mb_ptr2cells_len = latin_ptr2cells_len;
-    mb_char2cells = latin_char2cells;
-    mb_off2cells = latin_off2cells;
-    mb_ptr2char = latin_ptr2char;
-    mb_head_off = latin_head_off;
-  }
-
-  /*
-   * Fill the mb_bytelen_tab[] for MB_BYTE2LEN().
-   */
-#ifdef LEN_FROM_CONV
-  /* When 'encoding' is different from the current locale mblen() won't
-   * work.  Use conversion to "utf-8" instead. */
-  vimconv.vc_type = CONV_NONE;
-  if (enc_dbcs) {
-    p = enc_locale();
-    if (p == NULL || STRCMP(p, p_enc) != 0) {
-      convert_setup(&vimconv, p_enc, (char_u *)"utf-8");
-      vimconv.vc_fail = true;
-    }
-    xfree(p);
-  }
-#endif
-
-  for (i = 0; i < 256; ++i) {
-    /* Our own function to reliably check the length of UTF-8 characters,
-     * independent of mblen(). */
-    if (enc_utf8)
-      n = utf8len_tab[i];
-    else if (enc_dbcs == 0)
-      n = 1;
-    else {
-      char buf[MB_MAXBYTES + 1];
-      if (i == NUL)             /* just in case mblen() can't handle "" */
-        n = 1;
-      else {
-        buf[0] = i;
-        buf[1] = 0;
-#ifdef LEN_FROM_CONV
-        if (vimconv.vc_type != CONV_NONE) {
-          /*
-           * string_convert() should fail when converting the first
-           * byte of a double-byte character.
-           */
-          p = string_convert(&vimconv, (char_u *)buf, NULL);
-          if (p != NULL) {
-            xfree(p);
-            n = 1;
-          } else
-            n = 2;
-        } else
-#endif
-        {
-          /*
-           * mblen() should return -1 for invalid (means the leading
-           * multibyte) character.  However there are some platforms
-           * where mblen() returns 0 for invalid character.
-           * Therefore, following condition includes 0.
-           */
-          ignored = mblen(NULL, 0);             /* First reset the state. */
-          if (mblen(buf, (size_t)1) <= 0)
-            n = 2;
-          else
-            n = 1;
-        }
-      }
-    }
-    mb_bytelen_tab[i] = n;
-  }
-
-#ifdef LEN_FROM_CONV
-  convert_setup(&vimconv, NULL, NULL);
-#endif
-
-  /* The cell width depends on the type of multi-byte characters. */
-  (void)init_chartab();
-
-  /* When enc_utf8 is set or reset, (de)allocate ScreenLinesUC[] */
-  screenalloc(false);
-
-#ifdef HAVE_WORKING_LIBINTL
-  /* GNU gettext 0.10.37 supports this feature: set the codeset used for
-   * translated messages independently from the current locale. */
-  (void)bind_textdomain_codeset(PROJECT_NAME,
-                                enc_utf8 ? "utf-8" : (char *)p_enc);
-#endif
-
-
-  /* Fire an autocommand to let people do custom font setup. This must be
-   * after Vim has been setup for the new encoding. */
-  apply_autocmds(EVENT_ENCODINGCHANGED, NULL, (char_u *)"", FALSE, curbuf);
-
-  /* Need to reload spell dictionaries */
-  spell_reload();
-
-  return NULL;
-}
-
-/*
  * Return the size of the BOM for the current buffer:
  * 0 - no BOM
  * 2 - UCS-2 or UTF-16 BOM
@@ -598,20 +337,15 @@ int bomb_size(void)
   int n = 0;
 
   if (curbuf->b_p_bomb && !curbuf->b_p_bin) {
-    if (*curbuf->b_p_fenc == NUL) {
-      if (enc_utf8) {
-        if (enc_unicode != 0)
-          n = enc_unicode;
-        else
-          n = 3;
-      }
-    } else if (STRCMP(curbuf->b_p_fenc, "utf-8") == 0)
+    if (*curbuf->b_p_fenc == NUL
+        || STRCMP(curbuf->b_p_fenc, "utf-8") == 0) {
       n = 3;
-    else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0
-        || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0)
+    } else if (STRNCMP(curbuf->b_p_fenc, "ucs-2", 5) == 0
+               || STRNCMP(curbuf->b_p_fenc, "utf-16", 6) == 0) {
       n = 2;
-    else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0)
+    } else if (STRNCMP(curbuf->b_p_fenc, "ucs-4", 5) == 0) {
       n = 4;
+    }
   }
   return n;
 }
@@ -805,99 +539,6 @@ int dbcs_class(unsigned lead, unsigned trail)
 }
 
 /*
- * mb_char2len() function pointer.
- * Return length in bytes of character "c".
- * Returns 1 for a single-byte character.
- */
-int latin_char2len(int c)
-{
-  return 1;
-}
-
-static int dbcs_char2len(int c)
-{
-  if (c >= 0x100)
-    return 2;
-  return 1;
-}
-
-/*
- * mb_char2bytes() function pointer.
- * Convert a character to its bytes.
- * Returns the length in bytes.
- */
-int latin_char2bytes(int c, char_u *buf)
-{
-  buf[0] = c;
-  return 1;
-}
-
-static int dbcs_char2bytes(int c, char_u *buf)
-{
-  if (c >= 0x100) {
-    buf[0] = (unsigned)c >> 8;
-    buf[1] = c;
-    /* Never use a NUL byte, it causes lots of trouble.  It's an invalid
-     * character anyway. */
-    if (buf[1] == NUL)
-      buf[1] = '\n';
-    return 2;
-  }
-  buf[0] = c;
-  return 1;
-}
-
-/*
- * mb_ptr2len() function pointer.
- * Get byte length of character at "*p" but stop at a NUL.
- * For UTF-8 this includes following composing characters.
- * Returns 0 when *p is NUL.
- */
-int latin_ptr2len(const char_u *p)
-{
-  return MB_BYTE2LEN(*p);
-}
-
-static int dbcs_ptr2len(const char_u *p)
-{
-  int len;
-
-  /* Check if second byte is not missing. */
-  len = MB_BYTE2LEN(*p);
-  if (len == 2 && p[1] == NUL)
-    len = 1;
-  return len;
-}
-
-/*
- * mb_ptr2len_len() function pointer.
- * Like mb_ptr2len(), but limit to read "size" bytes.
- * Returns 0 for an empty string.
- * Returns 1 for an illegal char or an incomplete byte sequence.
- */
-int latin_ptr2len_len(const char_u *p, int size)
-{
-  if (size < 1 || *p == NUL)
-    return 0;
-  return 1;
-}
-
-static int dbcs_ptr2len_len(const char_u *p, int size)
-{
-  int len;
-
-  if (size < 1 || *p == NUL)
-    return 0;
-  if (size == 1)
-    return 1;
-  /* Check that second byte is not missing. */
-  len = MB_BYTE2LEN(*p);
-  if (len == 2 && p[1] == NUL)
-    len = 1;
-  return len;
-}
-
-/*
  * Return true if "c" is in "table".
  */
 static bool intable(const struct interval *table, size_t n_items, int c)
@@ -950,6 +591,9 @@ int utf_char2cells(int c)
     if (intable(doublewidth, ARRAY_SIZE(doublewidth), c))
       return 2;
 #endif
+    if (p_emoji && intable(emoji_width, ARRAY_SIZE(emoji_width), c)) {
+      return 2;
+    }
   }
   /* Characters below 0x100 are influenced by 'isprint' option */
   else if (c >= 0x80 && !vim_isprintc(c))
@@ -961,16 +605,8 @@ int utf_char2cells(int c)
   return 1;
 }
 
-/*
- * mb_ptr2cells() function pointer.
- * Return the number of display cells character at "*p" occupies.
- * This doesn't take care of unprintable characters, use ptr2cells() for that.
- */
-int latin_ptr2cells(const char_u *p)
-{
-  return 1;
-}
-
+/// Return the number of display cells character at "*p" occupies.
+/// This doesn't take care of unprintable characters, use ptr2cells() for that.
 int utf_ptr2cells(const char_u *p)
 {
   int c;
@@ -989,26 +625,9 @@ int utf_ptr2cells(const char_u *p)
   return 1;
 }
 
-int dbcs_ptr2cells(const char_u *p)
-{
-  /* Number of cells is equal to number of bytes, except for euc-jp when
-   * the first byte is 0x8e. */
-  if (enc_dbcs == DBCS_JPNU && *p == 0x8e)
-    return 1;
-  return MB_BYTE2LEN(*p);
-}
-
-/*
- * mb_ptr2cells_len() function pointer.
- * Like mb_ptr2cells(), but limit string length to "size".
- * For an empty string or truncated character returns 1.
- */
-int latin_ptr2cells_len(const char_u *p, int size)
-{
-  return 1;
-}
-
-static int utf_ptr2cells_len(const char_u *p, int size)
+/// Like utf_ptr2cells(), but limit string length to "size".
+/// For an empty string or truncated character returns 1.
+int utf_ptr2cells_len(const char_u *p, int size)
 {
   int c;
 
@@ -1028,35 +647,6 @@ static int utf_ptr2cells_len(const char_u *p, int size)
   return 1;
 }
 
-static int dbcs_ptr2cells_len(const char_u *p, int size)
-{
-  /* Number of cells is equal to number of bytes, except for euc-jp when
-   * the first byte is 0x8e. */
-  if (size <= 1 || (enc_dbcs == DBCS_JPNU && *p == 0x8e))
-    return 1;
-  return MB_BYTE2LEN(*p);
-}
-
-/*
- * mb_char2cells() function pointer.
- * Return the number of display cells character "c" occupies.
- * Only takes care of multi-byte chars, not "^C" and such.
- */
-int latin_char2cells(int c)
-{
-  return 1;
-}
-
-static int dbcs_char2cells(int c)
-{
-  /* Number of cells is equal to number of bytes, except for euc-jp when
-   * the first byte is 0x8e. */
-  if (enc_dbcs == DBCS_JPNU && ((unsigned)c >> 8) == 0x8e)
-    return 1;
-  /* use the first byte */
-  return MB_BYTE2LEN((unsigned)c >> 8);
-}
-
 /// Calculate the number of cells occupied by string `str`.
 ///
 /// @param str The source string, may not be NULL, must be a NUL-terminated
@@ -1073,51 +663,14 @@ size_t mb_string2cells(const char_u *str)
   return clen;
 }
 
-/*
- * mb_off2cells() function pointer.
- * Return number of display cells for char at ScreenLines[off].
- * We make sure that the offset used is less than "max_off".
- */
-int latin_off2cells(unsigned off, unsigned max_off)
-{
-  return 1;
-}
-
-int dbcs_off2cells(unsigned off, unsigned max_off)
-{
-  /* never check beyond end of the line */
-  if (off >= max_off)
-    return 1;
-
-  /* Number of cells is equal to number of bytes, except for euc-jp when
-   * the first byte is 0x8e. */
-  if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
-    return 1;
-  return MB_BYTE2LEN(ScreenLines[off]);
-}
-
+/// Return number of display cells for char at ScreenLines[off].
+/// We make sure that the offset used is less than "max_off".
 int utf_off2cells(unsigned off, unsigned max_off)
 {
   return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1;
 }
 
 /*
- * mb_ptr2char() function pointer.
- * Convert a byte sequence into a character.
- */
-int latin_ptr2char(const char_u *p)
-{
-  return *p;
-}
-
-static int dbcs_ptr2char(const char_u *p)
-{
-  if (MB_BYTE2LEN(*p) > 1 && p[1] != NUL)
-    return (p[0] << 8) + p[1];
-  return *p;
-}
-
-/*
  * Convert a UTF-8 byte sequence to a wide character.
  * If the sequence is illegal or truncated by a NUL the first byte is
  * returned.
@@ -1304,7 +857,7 @@ int utfc_ptr2char(const char_u *p, int *pcc)
  */
 int utfc_ptr2char_len(const char_u *p, int *pcc, int maxlen)
 {
-#define IS_COMPOSING(s1, s2, s3)                                               \
+#define IS_COMPOSING(s1, s2, s3) \
   (i == 0 ? UTF_COMPOSINGLIKE((s1), (s2)) : utf_iscomposing((s3)))
 
   assert(maxlen > 0);
@@ -1713,16 +1266,20 @@ int utf_class(int c)
       return (int)classes[mid].class;
   }
 
+  // emoji
+  if (intable(emoji_all, ARRAY_SIZE(emoji_all), c)) {
+    return 3;
+  }
+
   /* most other characters are "word" characters */
   return 2;
 }
 
-/*
- * Code for Unicode case-dependent operations.  Based on notes in
- * http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
- * This code uses simple case folding, not full case folding.
- * Last updated for Unicode 5.2.
- */
+bool utf_ambiguous_width(int c)
+{
+  return c >= 0x80 && (intable(ambiguous, ARRAY_SIZE(ambiguous), c)
+                       || intable(emoji_all, ARRAY_SIZE(emoji_all), c));
+}
 
 /*
  * Generic conversion function for case operations.
@@ -1758,6 +1315,10 @@ static int utf_convert(int a, const convertStruct *const table, size_t n_items)
  */
 int utf_fold(int a)
 {
+  if (a < 0x80) {
+    // be fast for ASCII
+    return a >= 0x41 && a <= 0x5a ? a + 32 : a;
+  }
   return utf_convert(a, foldCase, ARRAY_SIZE(foldCase));
 }
 
@@ -1885,6 +1446,92 @@ static int utf_strnicmp(char_u *s1, char_u *s2, size_t n1, size_t n2)
   return n1 == 0 ? -1 : 1;
 }
 
+#ifdef WIN32
+#ifndef CP_UTF8
+# define CP_UTF8 65001  /* magic number from winnls.h */
+#endif
+
+int utf8_to_utf16(const char *str, WCHAR **strw)
+  FUNC_ATTR_NONNULL_ALL
+{
+  ssize_t wchar_len = 0;
+
+  // Compute the length needed to store the converted widechar string.
+  wchar_len = MultiByteToWideChar(CP_UTF8,
+                                  0,     // dwFlags: must be 0 for utf8
+                                  str,   // lpMultiByteStr: string to convert
+                                  -1,    // -1 => process up to NUL
+                                  NULL,  // lpWideCharStr: converted string
+                                  0);    // 0  => return length, don't convert
+  if (wchar_len == 0) {
+    return GetLastError();
+  }
+
+  ssize_t buf_sz = wchar_len * sizeof(WCHAR);
+
+  if (buf_sz == 0) {
+    *strw = NULL;
+    return 0;
+  }
+
+  char *buf = xmalloc(buf_sz);
+  char *pos = buf;
+
+  int r = MultiByteToWideChar(CP_UTF8,
+                              0,
+                              str,
+                              -1,
+                              (WCHAR *)pos,
+                              wchar_len);
+  assert(r == wchar_len);
+  if (r != wchar_len) {
+    EMSG2("MultiByteToWideChar failed: %d", r);
+  }
+  *strw = (WCHAR *)pos;
+
+  return 0;
+}
+
+int utf16_to_utf8(const WCHAR *strw, char **str)
+  FUNC_ATTR_NONNULL_ALL
+{
+  // Compute the space required to store the string as UTF-8.
+  ssize_t utf8_len = WideCharToMultiByte(CP_UTF8,
+                                         0,
+                                         strw,
+                                         -1,
+                                         NULL,
+                                         0,
+                                         NULL,
+                                         NULL);
+  if (utf8_len == 0) {
+    return GetLastError();
+  }
+
+  ssize_t buf_sz = utf8_len * sizeof(char);
+  char *buf = xmalloc(buf_sz);
+  char *pos = buf;
+
+  // Convert string to UTF-8.
+  int r = WideCharToMultiByte(CP_UTF8,
+                              0,
+                              strw,
+                              -1,
+                              (LPSTR *)pos,
+                              utf8_len,
+                              NULL,
+                              NULL);
+  assert(r == utf8_len);
+  if (r != utf8_len) {
+    EMSG2("WideCharToMultiByte failed: %d", r);
+  }
+  *str = pos;
+
+  return 0;
+}
+
+#endif
+
 /*
  * Version of strnicmp() that handles multi-byte characters.
  * Needed for Big5, Shift-JIS and UTF-8 encoding.  Other DBCS encodings can
@@ -1979,68 +1626,9 @@ void show_utf8(void)
   msg(IObuff);
 }
 
-/*
- * mb_head_off() function pointer.
- * Return offset from "p" to the first byte of the character it points into.
- * If "p" points to the NUL at the end of the string return 0.
- * Returns 0 when already at the first byte of a character.
- */
-int latin_head_off(const char_u *base, const char_u *p)
-{
-  return 0;
-}
-
-int dbcs_head_off(const char_u *base, const char_u *p)
-{
-  /* It can't be a trailing byte when not using DBCS, at the start of the
-   * string or the previous byte can't start a double-byte. */
-  if (p <= base || MB_BYTE2LEN(p[-1]) == 1 || *p == NUL) {
-    return 0;
-  }
-
-  /* This is slow: need to start at the base and go forward until the
-   * byte we are looking for.  Return 1 when we went past it, 0 otherwise. */
-  const char_u *q = base;
-  while (q < p) {
-    q += dbcs_ptr2len(q);
-  }
-
-  return (q == p) ? 0 : 1;
-}
-
-/*
- * Special version of dbcs_head_off() that works for ScreenLines[], where
- * single-width DBCS_JPNU characters are stored separately.
- */
-int dbcs_screen_head_off(const char_u *base, const char_u *p)
-{
-  /* It can't be a trailing byte when not using DBCS, at the start of the
-   * string or the previous byte can't start a double-byte.
-   * For euc-jp an 0x8e byte in the previous cell always means we have a
-   * lead byte in the current cell. */
-  if (p <= base
-      || (enc_dbcs == DBCS_JPNU && p[-1] == 0x8e)
-      || MB_BYTE2LEN(p[-1]) == 1
-      || *p == NUL)
-    return 0;
-
-  /* This is slow: need to start at the base and go forward until the
-   * byte we are looking for.  Return 1 when we went past it, 0 otherwise.
-   * For DBCS_JPNU look out for 0x8e, which means the second byte is not
-   * stored as the next byte. */
-  const char_u *q = base;
-  while (q < p) {
-    if (enc_dbcs == DBCS_JPNU && *q == 0x8e) {
-      ++q;
-    }
-    else {
-      q += dbcs_ptr2len(q);
-    }
-  }
-
-  return (q == p) ? 0 : 1;
-}
-
+/// Return offset from "p" to the first byte of the character it points into.
+/// If "p" points to the NUL at the end of the string return 0.
+/// Returns 0 when already at the first byte of a character.
 int utf_head_off(const char_u *base, const char_u *p)
 {
   int c;
@@ -2146,26 +1734,20 @@ int mb_tail_off(char_u *base, char_u *p)
   if (*p == NUL)
     return 0;
 
-  if (enc_utf8) {
-    /* Find the last character that is 10xx.xxxx */
-    for (i = 0; (p[i + 1] & 0xc0) == 0x80; ++i)
-      ;
-    /* Check for illegal sequence. */
-    for (j = 0; p - j > base; ++j)
-      if ((p[-j] & 0xc0) != 0x80)
-        break;
-    if (utf8len_tab[p[-j]] != i + j + 1)
-      return 0;
-    return i;
+  // Find the last character that is 10xx.xxxx
+  for (i = 0; (p[i + 1] & 0xc0) == 0x80; i++) {}
+
+  // Check for illegal sequence.
+  for (j = 0; p - j > base; j++) {
+    if ((p[-j] & 0xc0) != 0x80) {
+      break;
+    }
   }
 
-  /* It can't be the first byte if a double-byte when not using DBCS, at the
-   * end of the string or the byte can't start a double-byte. */
-  if (enc_dbcs == 0 || p[1] == NUL || MB_BYTE2LEN(*p) == 1)
+  if (utf8len_tab[p[-j]] != i + j + 1) {
     return 0;
-
-  /* Return 1 when on the lead byte, 0 when on the tail byte. */
-  return 1 - dbcs_head_off(base, p);
+  }
+  return i;
 }
 
 /*
@@ -2380,13 +1962,10 @@ int mb_fix_col(int col, int row)
 {
   col = check_col(col);
   row = check_row(row);
-  if (has_mbyte && ScreenLines != NULL && col > 0
-      && ((enc_dbcs
-          && ScreenLines[LineOffset[row] + col] != NUL
-          && dbcs_screen_head_off(ScreenLines + LineOffset[row],
-            ScreenLines + LineOffset[row] + col))
-        || (enc_utf8 && ScreenLines[LineOffset[row] + col] == 0)))
+  if (ScreenLines != NULL && col > 0
+      && ScreenLines[LineOffset[row] + col] == 0) {
     return col - 1;
+  }
   return col;
 }
 
@@ -2536,13 +2115,14 @@ char_u * enc_locale(void)
     } else
       s = p + 1;
   }
-  for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i) {
-    if (s[i] == '_' || s[i] == '-')
+  for (i = 0; i < (int)sizeof(buf) - 1 && s[i] != NUL; i++) {
+    if (s[i] == '_' || s[i] == '-') {
       buf[i] = '-';
-    else if (isalnum((int)s[i]))
+    } else if (isalnum((int)s[i])) {
       buf[i] = TOLOWER_ASC(s[i]);
-    else
+    } else {
       break;
+    }
   }
   buf[i] = NUL;
 
diff --git a/src/nvim/mbyte.h b/src/nvim/mbyte.h
index 0cfe2c4bab..2c92a0fbb2 100644
--- a/src/nvim/mbyte.h
+++ b/src/nvim/mbyte.h
@@ -9,8 +9,8 @@
  * MB_BYTE2LEN_CHECK() can be used to count a special key as one byte.
  * Don't call MB_BYTE2LEN(b) with b < 0 or b > 255!
  */
-#define MB_BYTE2LEN(b)         mb_bytelen_tab[b]
-#define MB_BYTE2LEN_CHECK(b)   (((b) < 0 || (b) > 255) ? 1 : mb_bytelen_tab[b])
+#define MB_BYTE2LEN(b)         utf8len_tab[b]
+#define MB_BYTE2LEN_CHECK(b)   (((b) < 0 || (b) > 255) ? 1 : utf8len_tab[b])
 
 /* properties used in enc_canon_table[] (first three mutually exclusive) */
 #define ENC_8BIT       0x01
@@ -28,6 +28,18 @@
 #define ENC_LATIN9     0x400       /* Latin9 */
 #define ENC_MACROMAN   0x800       /* Mac Roman (not Macro Man! :-) */
 
+// TODO(bfredl): eventually we should keep only one of the namings
+#define mb_ptr2len utfc_ptr2len
+#define mb_ptr2len_len utfc_ptr2len_len
+#define mb_char2len utf_char2len
+#define mb_char2bytes utf_char2bytes
+#define mb_ptr2cells utf_ptr2cells
+#define mb_ptr2cells_len utf_ptr2cells_len
+#define mb_char2cells utf_char2cells
+#define mb_off2cells utf_off2cells
+#define mb_ptr2char utf_ptr2char
+#define mb_head_off utf_head_off
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "mbyte.h.generated.h"
 #endif
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index 6599db787f..43412e3916 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -48,7 +48,6 @@
 #include "nvim/fileio.h"
 #include "nvim/memline.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/os_unix.h"
 #include "nvim/path.h"
@@ -913,7 +912,7 @@ static bool mf_do_open(memfile_T *mfp, char_u *fname, int flags)
 #ifdef HAVE_FD_CLOEXEC
   int fdflags = fcntl(mfp->mf_fd, F_GETFD);
   if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
-    fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+    (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
   }
 #endif
 #ifdef HAVE_SELINUX
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 4e35dd481f..b8891f6560 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -55,7 +55,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/option.h"
 #include "nvim/os_unix.h"
 #include "nvim/path.h"
@@ -443,8 +442,9 @@ void ml_setname(buf_T *buf)
 #ifdef HAVE_FD_CLOEXEC
     {
       int fdflags = fcntl(mfp->mf_fd, F_GETFD);
-      if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0)
-        fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+      if (fdflags >= 0 && (fdflags & FD_CLOEXEC) == 0) {
+        (void)fcntl(mfp->mf_fd, F_SETFD, fdflags | FD_CLOEXEC);
+      }
     }
 #endif
   }
@@ -1063,11 +1063,12 @@ void ml_recover(void)
             if (!cannot_open) {
               line_count = pp->pb_pointer[idx].pe_line_count;
               if (readfile(curbuf->b_ffname, NULL, lnum,
-                      pp->pb_pointer[idx].pe_old_lnum - 1,
-                      line_count, NULL, 0) == FAIL)
-                cannot_open = TRUE;
-              else
+                           pp->pb_pointer[idx].pe_old_lnum - 1, line_count,
+                           NULL, 0) != OK) {
+                cannot_open = true;
+              } else {
                 lnum += line_count;
+              }
             }
             if (cannot_open) {
               ++error;
@@ -1358,7 +1359,7 @@ recover_names (
     if (*dirp == NUL && file_count + num_files == 0 && fname != NULL) {
       char_u *swapname = (char_u *)modname((char *)fname_res, ".swp", TRUE);
       if (swapname != NULL) {
-        if (os_file_exists(swapname)) {
+        if (os_path_exists(swapname)) {
           files = xmalloc(sizeof(char_u *));
           files[0] = swapname;
           swapname = NULL;
@@ -2340,14 +2341,13 @@ int ml_replace(linenr_T lnum, char_u *line, int copy)
   return OK;
 }
 
-/*
- * Delete line 'lnum' in the current buffer.
- *
- * Check: The caller of this function should probably also call
- * deleted_lines() after this.
- *
- * return FAIL for failure, OK otherwise
- */
+/// Delete line `lnum` in the current buffer.
+///
+/// @note The caller of this function should probably also call
+/// deleted_lines() after this.
+///
+/// @param message  Show "--No lines in buffer--" message.
+/// @return FAIL for failure, OK otherwise
 int ml_delete(linenr_T lnum, int message)
 {
   ml_flush_line(curbuf);
@@ -3164,9 +3164,10 @@ attention_message (
   }
   /* Some of these messages are long to allow translation to
    * other languages. */
-  MSG_PUTS(_(
-          "\n(1) Another program may be editing the same file.  If this is the case,\n    be careful not to end up with two different instances of the same\n    file when making changes."));
-  MSG_PUTS(_("  Quit, or continue with caution.\n"));
+  MSG_PUTS(_("\n(1) Another program may be editing the same file.  If this is"
+             " the case,\n    be careful not to end up with two different"
+             " instances of the same\n    file when making changes."
+             "  Quit, or continue with caution.\n"));
   MSG_PUTS(_("(2) An edit session for this file crashed.\n"));
   MSG_PUTS(_("    If this is the case, use \":recover\" or \"vim -r "));
   msg_outtrans(buf->b_fname);
@@ -3425,11 +3426,11 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
               break;
             }
 
-            /* If the file was deleted this fname can be used. */
-            if (!os_file_exists((char_u *) fname))
+            // If the file was deleted this fname can be used.
+            if (!os_path_exists((char_u *)fname)) {
               break;
-          } else
-          {
+            }
+          } else {
             MSG_PUTS("\n");
             if (msg_silent == 0)
               /* call wait_return() later */
@@ -3962,20 +3963,19 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp)
   return size;
 }
 
-/*
- * Goto byte in buffer with offset 'cnt'.
- */
+/// Goto byte in buffer with offset 'cnt'.
 void goto_byte(long cnt)
 {
   long boff = cnt;
   linenr_T lnum;
 
-  ml_flush_line(curbuf);        /* cached line may be dirty */
+  ml_flush_line(curbuf);  // cached line may be dirty
   setpcmark();
-  if (boff)
-    --boff;
+  if (boff) {
+    boff--;
+  }
   lnum = ml_find_line_or_offset(curbuf, (linenr_T)0, &boff);
-  if (lnum < 1) {       /* past the end */
+  if (lnum < 1) {         // past the end
     curwin->w_cursor.lnum = curbuf->b_ml.ml_line_count;
     curwin->w_curswant = MAXCOL;
     coladvance((colnr_T)MAXCOL);
@@ -3987,7 +3987,84 @@ void goto_byte(long cnt)
   }
   check_cursor();
 
-  /* Make sure the cursor is on the first byte of a multi-byte char. */
-  if (has_mbyte)
+  // Make sure the cursor is on the first byte of a multi-byte char.
+  if (has_mbyte) {
     mb_adjust_cursor();
+  }
+}
+
+/// Increment the line pointer "lp" crossing line boundaries as necessary.
+/// Return 1 when going to the next line.
+/// Return 2 when moving forward onto a NUL at the end of the line).
+/// Return -1 when at the end of file.
+/// Return 0 otherwise.
+int inc(pos_T *lp)
+{
+  char_u  *p = ml_get_pos(lp);
+
+  if (*p != NUL) {      // still within line, move to next char (may be NUL)
+    if (has_mbyte) {
+      int l = (*mb_ptr2len)(p);
+
+      lp->col += l;
+      return (p[l] != NUL) ? 0 : 2;
+    }
+    lp->col++;
+    lp->coladd = 0;
+    return (p[1] != NUL) ? 0 : 2;
+  }
+  if (lp->lnum != curbuf->b_ml.ml_line_count) {     // there is a next line
+    lp->col = 0;
+    lp->lnum++;
+    lp->coladd = 0;
+    return 1;
+  }
+  return -1;
+}
+
+/// Same as inc(), but skip NUL at the end of non-empty lines.
+int incl(pos_T *lp)
+{
+  int r;
+
+  if ((r = inc(lp)) >= 1 && lp->col) {
+    r = inc(lp);
+  }
+  return r;
+}
+
+int dec(pos_T *lp)
+{
+  char_u      *p;
+
+  lp->coladd = 0;
+  if (lp->col > 0) {            // still within line
+    lp->col--;
+    if (has_mbyte) {
+      p = ml_get(lp->lnum);
+      lp->col -= (*mb_head_off)(p, p + lp->col);
+    }
+    return 0;
+  }
+  if (lp->lnum > 1) {           // there is a prior line
+    lp->lnum--;
+    p = ml_get(lp->lnum);
+    lp->col = (colnr_T)STRLEN(p);
+    if (has_mbyte) {
+      lp->col -= (*mb_head_off)(p, p + lp->col);
+    }
+    return 1;
+  }
+  return -1;                    // at start of file
+}
+
+/// Same as dec(), but skip NUL at the end of non-empty lines.
+int decl(pos_T *lp)
+{
+  int r;
+
+  if ((r = dec(lp)) == 1 && lp->col) {
+    r = dec(lp);
+  }
+  return r;
 }
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 8db47b79c1..25fa2f150e 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -17,16 +17,41 @@
 // Force je_ prefix on jemalloc functions.
 # define JEMALLOC_NO_DEMANGLE
 # include <jemalloc/jemalloc.h>
-# define malloc(size) je_malloc(size)
-# define calloc(count, size) je_calloc(count, size)
-# define realloc(ptr, size) je_realloc(ptr, size)
-# define free(ptr) je_free(ptr)
+#endif
+
+#ifdef UNIT_TESTING
+# define malloc(size) mem_malloc(size)
+# define calloc(count, size) mem_calloc(count, size)
+# define realloc(ptr, size) mem_realloc(ptr, size)
+# define free(ptr) mem_free(ptr)
+# ifdef HAVE_JEMALLOC
+MemMalloc mem_malloc = &je_malloc;
+MemFree mem_free = &je_free;
+MemCalloc mem_calloc = &je_calloc;
+MemRealloc mem_realloc = &je_realloc;
+# else
+MemMalloc mem_malloc = &malloc;
+MemFree mem_free = &free;
+MemCalloc mem_calloc = &calloc;
+MemRealloc mem_realloc = &realloc;
+# endif
+#else
+# ifdef HAVE_JEMALLOC
+#  define malloc(size) je_malloc(size)
+#  define calloc(count, size) je_calloc(count, size)
+#  define realloc(ptr, size) je_realloc(ptr, size)
+#  define free(ptr) je_free(ptr)
+# endif
 #endif
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "memory.c.generated.h"
 #endif
 
+#ifdef EXITFREE
+bool entered_free_all_mem = false;
+#endif
+
 /// Try to free memory. Used when trying to recover from out of memory errors.
 /// @see {xmalloc}
 void try_to_free_memory(void)
@@ -283,18 +308,16 @@ size_t memcnt(const void *data, char c, size_t len)
   return cnt;
 }
 
-/// The xstpcpy() function shall copy the string pointed to by src (including
-/// the terminating NUL character) into the array pointed to by dst.
+/// Copies the string pointed to by src (including the terminating NUL
+/// character) into the array pointed to by dst.
 ///
-/// The xstpcpy() function shall return a pointer to the terminating NUL
-/// character copied into the dst buffer. This is the only difference with
-/// strcpy(), which returns dst.
+/// @returns pointer to the terminating NUL char copied into the dst buffer.
+///          This is the only difference with strcpy(), which returns dst.
 ///
-/// WARNING: If copying takes place between objects that overlap, the behavior is
-/// undefined.
+/// WARNING: If copying takes place between objects that overlap, the behavior
+/// is undefined.
 ///
-/// This is the Neovim version of stpcpy(3) as defined in POSIX 2008. We
-/// don't require that supported platforms implement POSIX 2008, so we
+/// Nvim version of POSIX 2008 stpcpy(3). We do not require POSIX 2008, so
 /// implement our own version.
 ///
 /// @param dst
@@ -306,16 +329,15 @@ char *xstpcpy(char *restrict dst, const char *restrict src)
   return (char *)memcpy(dst, src, len + 1) + len;
 }
 
-/// The xstpncpy() function shall copy not more than n bytes (bytes that follow
-/// a NUL character are not copied) from the array pointed to by src to the
-/// array pointed to by dst.
+/// Copies not more than n bytes (bytes that follow a NUL character are not
+/// copied) from the array pointed to by src to the array pointed to by dst.
 ///
-/// If a NUL character is written to the destination, the xstpncpy() function
-/// shall return the address of the first such NUL character. Otherwise, it
-/// shall return &dst[maxlen].
+/// If a NUL character is written to the destination, xstpncpy() returns the
+/// address of the first such NUL character. Otherwise, it shall return
+/// &dst[maxlen].
 ///
-/// WARNING: If copying takes place between objects that overlap, the behavior is
-/// undefined.
+/// WARNING: If copying takes place between objects that overlap, the behavior
+/// is undefined.
 ///
 /// WARNING: xstpncpy will ALWAYS write maxlen bytes. If src is shorter than
 /// maxlen, zeroes will be written to the remaining bytes.
@@ -342,29 +364,58 @@ char *xstpncpy(char *restrict dst, const char *restrict src, size_t maxlen)
     }
 }
 
-/// xstrlcpy - Copy a %NUL terminated string into a sized buffer
+/// xstrlcpy - Copy a NUL-terminated string into a sized buffer
 ///
-/// Compatible with *BSD strlcpy: the result is always a valid
-/// NUL-terminated string that fits in the buffer (unless,
-/// of course, the buffer size is zero). It does not pad
-/// out the result like strncpy() does.
+/// Compatible with *BSD strlcpy: the result is always a valid NUL-terminated
+/// string that fits in the buffer (unless, of course, the buffer size is
+/// zero). It does not pad out the result like strncpy() does.
 ///
-/// @param dst Where to copy the string to
-/// @param src Where to copy the string from
-/// @param size Size of destination buffer
-/// @return Length of the source string (i.e.: strlen(src))
-size_t xstrlcpy(char *restrict dst, const char *restrict src, size_t size)
+/// @param dst    Buffer to store the result
+/// @param src    String to be copied
+/// @param dsize  Size of `dst`
+/// @return       strlen(src). If retval >= dstsize, truncation occurs.
+size_t xstrlcpy(char *restrict dst, const char *restrict src, size_t dsize)
   FUNC_ATTR_NONNULL_ALL
 {
-    size_t ret = strlen(src);
+  size_t slen = strlen(src);
 
-    if (size) {
-        size_t len = (ret >= size) ? size - 1 : ret;
-        memcpy(dst, src, len);
-        dst[len] = '\0';
-    }
+  if (dsize) {
+    size_t len = MIN(slen, dsize - 1);
+    memcpy(dst, src, len);
+    dst[len] = '\0';
+  }
 
-    return ret;
+  return slen;  // Does not include NUL.
+}
+
+/// Appends `src` to string `dst` of size `dsize` (unlike strncat, dsize is the
+/// full size of `dst`, not space left).  At most dsize-1 characters
+/// will be copied.  Always NUL terminates. `src` and `dst` may overlap.
+///
+/// @see vim_strcat from Vim.
+/// @see strlcat from OpenBSD.
+///
+/// @param dst      Buffer to be appended-to. Must have a NUL byte.
+/// @param src      String to put at the end of `dst`
+/// @param dsize    Size of `dst` including NUL byte. Must be greater than 0.
+/// @return         strlen(src) + strlen(initial dst)
+///                 If retval >= dsize, truncation occurs.
+size_t xstrlcat(char *const dst, const char *const src, const size_t dsize)
+  FUNC_ATTR_NONNULL_ALL
+{
+  assert(dsize > 0);
+  const size_t dlen = strlen(dst);
+  assert(dlen < dsize);
+  const size_t slen = strlen(src);
+
+  if (slen > dsize - dlen - 1) {
+    memmove(dst + dlen, src, dsize - dlen - 1);
+    dst[dsize - 1] = '\0';
+  } else {
+    memmove(dst + dlen, src, slen + 1);
+  }
+
+  return slen + dlen;  // Does not include NUL.
 }
 
 /// strdup() wrapper
@@ -374,6 +425,7 @@ size_t xstrlcpy(char *restrict dst, const char *restrict src, size_t size)
 /// @return pointer to a copy of the string
 char *xstrdup(const char *str)
   FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET
+  FUNC_ATTR_NONNULL_ALL
 {
   return xmemdupz(str, strlen(str));
 }
@@ -404,6 +456,7 @@ void *xmemrchr(const void *src, uint8_t c, size_t len)
 /// @return pointer to a copy of the string
 char *xstrndup(const char *str, size_t len)
   FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET
+  FUNC_ATTR_NONNULL_ALL
 {
   char *p = memchr(str, '\0', len);
   return xmemdupz(str, p ? (size_t)(p - str) : len);
@@ -440,6 +493,16 @@ void do_outofmem_msg(size_t size)
   }
 }
 
+/// Writes time_t to "buf[8]".
+void time_to_bytes(time_t time_, uint8_t buf[8])
+{
+  // time_t can be up to 8 bytes in size, more than uintmax_t in 32 bits
+  // systems, thus we can't use put_bytes() here.
+  for (size_t i = 7, bufi = 0; bufi < 8; i--, bufi++) {
+    buf[bufi] = (uint8_t)((uint64_t)time_ >> (i * 8));
+  }
+}
+
 #if defined(EXITFREE)
 
 #include "nvim/file_search.h"
@@ -481,13 +544,13 @@ void do_outofmem_msg(size_t size)
 void free_all_mem(void)
 {
   buf_T       *buf, *nextbuf;
-  static bool entered = false;
 
-  /* When we cause a crash here it is caught and Vim tries to exit cleanly.
-   * Don't try freeing everything again. */
-  if (entered)
+  // When we cause a crash here it is caught and Vim tries to exit cleanly.
+  // Don't try freeing everything again.
+  if (entered_free_all_mem) {
     return;
-  entered = true;
+  }
+  entered_free_all_mem = true;
 
   // Don't want to trigger autocommands from here on.
   block_autocmds();
diff --git a/src/nvim/memory.h b/src/nvim/memory.h
index 7b477da2f5..250ac3e08f 100644
--- a/src/nvim/memory.h
+++ b/src/nvim/memory.h
@@ -1,8 +1,41 @@
 #ifndef NVIM_MEMORY_H
 #define NVIM_MEMORY_H
 
+#include <stdbool.h>  // for bool
 #include <stdint.h>  // for uint8_t
 #include <stddef.h>  // for size_t
+#include <time.h>  // for time_t
+
+/// `malloc()` function signature
+typedef void *(*MemMalloc)(size_t);
+
+/// `free()` function signature
+typedef void (*MemFree)(void *);
+
+/// `calloc()` function signature
+typedef void *(*MemCalloc)(size_t, size_t);
+
+/// `realloc()` function signature
+typedef void *(*MemRealloc)(void *, size_t);
+
+#ifdef UNIT_TESTING
+/// When unit testing: pointer to the `malloc()` function, may be altered
+extern MemMalloc mem_malloc;
+
+/// When unit testing: pointer to the `free()` function, may be altered
+extern MemFree mem_free;
+
+/// When unit testing: pointer to the `calloc()` function, may be altered
+extern MemCalloc mem_calloc;
+
+/// When unit testing: pointer to the `realloc()` function, may be altered
+extern MemRealloc mem_realloc;
+#endif
+
+#ifdef EXITFREE
+/// Indicates that free_all_mem function was or is running
+extern bool entered_free_all_mem;
+#endif
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "memory.h.generated.h"
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index 3c2394d579..7c0eee64dd 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -18,9 +18,9 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/garray.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
 
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 47f246fc76..6104adf2c7 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -19,10 +19,10 @@
 #include "nvim/fileio.h"
 #include "nvim/func_attr.h"
 #include "nvim/getchar.h"
+#include "nvim/main.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/garray.h"
 #include "nvim/ops.h"
@@ -297,8 +297,22 @@ void trunc_string(char_u *s, char_u *buf, int room, int buflen)
       len += n;
   }
 
-  /* Set the middle and copy the last part. */
-  if (e + 3 < buflen) {
+  if (i <= e + 3) {
+    // text fits without truncating
+    if (s != buf) {
+      len = STRLEN(s);
+      if (len >= buflen) {
+        len = buflen - 1;
+      }
+      len = len - e + 1;
+      if (len < 1) {
+        buf[e - 1] = NUL;
+      } else {
+        memmove(buf + e, s + e, len);
+      }
+    }
+  } else if (e + 3 < buflen) {
+    // set the middle and copy the last part
     memmove(buf + e, "...", (size_t)3);
     len = (int)STRLEN(s + i) + 1;
     if (len >= buflen - e - 3)
@@ -306,7 +320,8 @@ void trunc_string(char_u *s, char_u *buf, int room, int buflen)
     memmove(buf + e + 3, s + i, len);
     buf[e + 3 + len - 1] = NUL;
   } else {
-    buf[e - 1] = NUL;      /* make sure it is truncated */
+    // can't fit in the "...", just truncate it
+    buf[e - 1] = NUL;
   }
 }
 
@@ -366,20 +381,17 @@ static int other_sourcing_name(void)
   return FALSE;
 }
 
-/*
- * Get the message about the source, as used for an error message.
- * Returns an allocated string with room for one more character.
- * Returns NULL when no message is to be given.
- */
+/// Get the message about the source, as used for an error message.
+/// Returns an allocated string with room for one more character.
+/// Returns NULL when no message is to be given.
 static char_u *get_emsg_source(void)
 {
-  char_u      *Buf, *p;
-
   if (sourcing_name != NULL && other_sourcing_name()) {
-    p = (char_u *)_("Error detected while processing %s:");
-    Buf = xmalloc(STRLEN(sourcing_name) + STRLEN(p));
-    sprintf((char *)Buf, (char *)p, sourcing_name);
-    return Buf;
+    char_u *p = (char_u *)_("Error detected while processing %s:");
+    size_t len = STRLEN(sourcing_name) + STRLEN(p) + 1;
+    char_u *buf = xmalloc(len);
+    snprintf((char *)buf, len, (char *)p, sourcing_name);
+    return buf;
   }
   return NULL;
 }
@@ -493,10 +505,11 @@ int emsg(char_u *s)
      * when the message should be ignored completely (used for the
      * interrupt message).
      */
-    if (cause_errthrow(s, severe, &ignore) == TRUE) {
-      if (!ignore)
-        did_emsg = TRUE;
-      return TRUE;
+    if (cause_errthrow(s, severe, &ignore) == true) {
+      if (!ignore) {
+        did_emsg = true;
+      }
+      return true;
     }
 
     // set "v:errmsg", also when using ":silent! cmd"
@@ -507,45 +520,49 @@ int emsg(char_u *s)
      * But do write it to the redirection file.
      */
     if (emsg_silent != 0) {
-      msg_start();
-      p = get_emsg_source();
-      if (p != NULL) {
-        STRCAT(p, "\n");
-        redir_write(p, -1);
-        xfree(p);
-      }
-      p = get_emsg_lnum();
-      if (p != NULL) {
-        STRCAT(p, "\n");
-        redir_write(p, -1);
-        xfree(p);
+      if (!emsg_noredir) {
+        msg_start();
+        p = get_emsg_source();
+        if (p != NULL) {
+          STRCAT(p, "\n");
+          redir_write(p, STRLEN(p));
+          xfree(p);
+        }
+        p = get_emsg_lnum();
+        if (p != NULL) {
+          STRCAT(p, "\n");
+          redir_write(p, STRLEN(p));
+          xfree(p);
+        }
+        redir_write(s, STRLEN(s));
       }
-      redir_write(s, -1);
-      return TRUE;
+      return true;
     }
 
-    /* Reset msg_silent, an error causes messages to be switched back on. */
+    // Reset msg_silent, an error causes messages to be switched back on.
     msg_silent = 0;
     cmd_silent = FALSE;
 
-    if (global_busy)                    /* break :global command */
-      ++global_busy;
+    if (global_busy) {        // break :global command
+      global_busy++;
+    }
 
-    if (p_eb)
-      beep_flush();                     /* also includes flush_buffers() */
-    else
-      flush_buffers(FALSE);             /* flush internal buffers */
-    did_emsg = TRUE;                    /* flag for DoOneCmd() */
+    if (p_eb) {
+      beep_flush();           // also includes flush_buffers()
+    } else {
+      flush_buffers(false);   // flush internal buffers
+    }
+    did_emsg = true;          // flag for DoOneCmd()
   }
 
-  emsg_on_display = TRUE;       /* remember there is an error message */
-  ++msg_scroll;                 /* don't overwrite a previous message */
-  attr = hl_attr(HLF_E);        /* set highlight mode for error messages */
-  if (msg_scrolled != 0)
-    need_wait_return = TRUE;        /* needed in case emsg() is called after
-                                     * wait_return has reset need_wait_return
-                                     * and a redraw is expected because
-                                     * msg_scrolled is non-zero */
+  emsg_on_display = true;     // remember there is an error message
+  msg_scroll++;               // don't overwrite a previous message
+  attr = hl_attr(HLF_E);      // set highlight mode for error messages
+  if (msg_scrolled != 0) {
+    need_wait_return = true;  // needed in case emsg() is called after
+  }                           // wait_return has reset need_wait_return
+                              // and a redraw is expected because
+                              // msg_scrolled is non-zero
 
   /*
    * Display name and line number for the source of the error.
@@ -579,6 +596,24 @@ bool emsgf(const char *const fmt, ...)
   return emsg(IObuff);
 }
 
+static void msg_emsgf_event(void **argv)
+{
+  char *s = argv[0];
+  (void)emsg((char_u *)s);
+  xfree(s);
+}
+
+void msg_schedule_emsgf(const char *const fmt, ...)
+{
+  va_list ap;
+  va_start(ap, fmt);
+  vim_vsnprintf((char *)IObuff, IOSIZE, fmt, ap, NULL);
+  va_end(ap);
+
+  char *s = xstrdup((char *)IObuff);
+  loop_schedule(&main_loop, event_create(1, msg_emsgf_event, 1, s));
+}
+
 /*
  * Like msg(), but truncate to a single line if p_shm contains 't', or when
  * "force" is TRUE.  This truncates in another way as for normal messages.
@@ -699,21 +734,47 @@ int delete_first_msg(void)
 void ex_messages(exarg_T *eap)
 {
   struct msg_hist *p;
-  const char      *s;
+  int c = 0;
 
-  msg_hist_off = TRUE;
+  if (STRCMP(eap->arg, "clear") == 0) {
+    int keep = eap->addr_count == 0 ? 0 : eap->line2;
 
-  s = os_getenv("LANG");
-  if (s)
-    msg_attr((char_u *)
-        _("Messages maintainer: Bram Moolenaar <Bram@vim.org>"),
-        hl_attr(HLF_T));
+    while (msg_hist_len > keep) {
+      (void)delete_first_msg();
+    }
+    return;
+  }
+
+  if (*eap->arg != NUL) {
+    EMSG(_(e_invarg));
+    return;
+  }
+
+  msg_hist_off = true;
+
+  p = first_msg_hist;
+
+  if (eap->addr_count != 0) {
+    // Count total messages
+    for (; p != NULL && !got_int; p = p->next) {
+      c++;
+    }
+
+    c -= eap->line2;
+
+    // Skip without number of messages specified
+    for (p = first_msg_hist; p != NULL && !got_int && c > 0; p = p->next, c--) {
+    }
+  }
 
-  for (p = first_msg_hist; p != NULL && !got_int; p = p->next)
-    if (p->msg != NULL)
+  // Display what was not skipped.
+  for (; p != NULL && !got_int; p = p->next) {
+    if (p->msg != NULL) {
       msg_attr(p->msg, p->attr);
+    }
+  }
 
-  msg_hist_off = FALSE;
+  msg_hist_off = false;
 }
 
 /*
@@ -785,11 +846,13 @@ void wait_return(int redraw)
 
     State = HITRETURN;
     setmouse();
-    /* Avoid the sequence that the user types ":" at the hit-return prompt
-     * to start an Ex command, but the file-changed dialog gets in the
-     * way. */
-    if (need_check_timestamps)
-      check_timestamps(FALSE);
+    cmdline_row = msg_row;
+    // Avoid the sequence that the user types ":" at the hit-return prompt
+    // to start an Ex command, but the file-changed dialog gets in the
+    // way.
+    if (need_check_timestamps) {
+      check_timestamps(false);
+    }
 
     hit_return_msg();
 
@@ -1970,6 +2033,7 @@ static void msg_puts_printf(char *str, int maxlen)
  */
 static int do_more_prompt(int typed_char)
 {
+  static bool entered = false;
   int used_typed_char = typed_char;
   int oldState = State;
   int c;
@@ -1979,6 +2043,14 @@ static int do_more_prompt(int typed_char)
   msgchunk_T  *mp;
   int i;
 
+  // We get called recursively when a timer callback outputs a message. In
+  // that case don't show another prompt. Also when at the hit-Enter prompt
+  // and nothing was typed.
+  if (entered || (State == HITRETURN && typed_char == 0)) {
+    return false;
+  }
+  entered = true;
+
   if (typed_char == 'G') {
     /* "g<": Find first line on the last page. */
     mp_last = msg_sb_start(last_msgchunk);
@@ -2153,9 +2225,11 @@ static int do_more_prompt(int typed_char)
   if (quit_more) {
     msg_row = Rows - 1;
     msg_col = 0;
-  } else if (cmdmsg_rl)
+  } else if (cmdmsg_rl) {
     msg_col = Columns - 1;
+  }
 
+  entered = false;
   return retval;
 }
 
@@ -2377,6 +2451,10 @@ static void redir_write(char_u *str, int maxlen)
   char_u      *s = str;
   static int cur_col = 0;
 
+  if (maxlen == 0) {
+    return;
+  }
+
   /* Don't do anything for displaying prompts and the like. */
   if (redir_off)
     return;
@@ -2389,26 +2467,37 @@ static void redir_write(char_u *str, int maxlen)
     /* If the string doesn't start with CR or NL, go to msg_col */
     if (*s != '\n' && *s != '\r') {
       while (cur_col < msg_col) {
-        if (redir_reg)
-          write_reg_contents(redir_reg, (char_u *)" ", -1, TRUE);
-        else if (redir_vname)
+        if (capture_ga) {
+          ga_concat_len(capture_ga, " ", 1);
+        }
+        if (redir_reg) {
+          write_reg_contents(redir_reg, (char_u *)" ", 1, true);
+        } else if (redir_vname) {
           var_redir_str((char_u *)" ", -1);
-        else if (redir_fd != NULL)
+        } else if (redir_fd != NULL) {
           fputs(" ", redir_fd);
-        if (verbose_fd != NULL)
+        }
+        if (verbose_fd != NULL) {
           fputs(" ", verbose_fd);
-        ++cur_col;
+        }
+        cur_col++;
       }
     }
 
-    if (redir_reg)
-      write_reg_contents(redir_reg, s, maxlen, TRUE);
-    if (redir_vname)
+    size_t len = maxlen == -1 ? STRLEN(s) : (size_t)maxlen;
+    if (capture_ga) {
+      ga_concat_len(capture_ga, (const char *)str, len);
+    }
+    if (redir_reg) {
+      write_reg_contents(redir_reg, s, len, true);
+    }
+    if (redir_vname) {
       var_redir_str(s, maxlen);
+    }
 
     /* Write and adjust the current column. */
     while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen)) {
-      if (!redir_reg && !redir_vname)
+      if (!redir_reg && !redir_vname && !capture_ga)
         if (redir_fd != NULL)
           putc(*s, redir_fd);
       if (verbose_fd != NULL)
@@ -2430,8 +2519,7 @@ static void redir_write(char_u *str, int maxlen)
 int redirecting(void)
 {
   return redir_fd != NULL || *p_vfile != NUL
-         || redir_reg || redir_vname
-  ;
+         || redir_reg || redir_vname || capture_ga != NULL;
 }
 
 /*
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 48791384a6..ba26381e23 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -31,7 +31,6 @@
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
 #include "nvim/mouse.h"
@@ -41,6 +40,7 @@
 #include "nvim/regexp.h"
 #include "nvim/screen.h"
 #include "nvim/search.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/tag.h"
 #include "nvim/ui.h"
@@ -178,12 +178,11 @@ open_line (
   if (curbuf->b_p_ai
       || do_si
       ) {
-    /*
-     * count white space on current line
-     */
-    newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, FALSE);
-    if (newindent == 0 && !(flags & OPENLINE_COM_LIST))
-      newindent = second_line_indent;       /* for ^^D command in insert mode */
+    // count white space on current line
+    newindent = get_indent_str(saved_line, (int)curbuf->b_p_ts, false);
+    if (newindent == 0 && !(flags & OPENLINE_COM_LIST)) {
+      newindent = second_line_indent;  // for ^^D command in insert mode
+    }
 
     /*
      * Do smart indenting.
@@ -567,7 +566,7 @@ open_line (
             int i;
             int l;
 
-            for (i = 0; p[i] != NUL && i < lead_len; i += l) {
+            for (i = 0; i < lead_len && p[i] != NUL; i += l) {
               l = (*mb_ptr2len)(p + i);
               if (vim_strnsize(p, i + l) > repl_size)
                 break;
@@ -612,7 +611,7 @@ open_line (
         if (curbuf->b_p_ai
             || do_si
             )
-          newindent = get_indent_str(leader, (int)curbuf->b_p_ts, FALSE);
+          newindent = get_indent_str(leader, (int)curbuf->b_p_ts, false);
 
         /* Add the indent offset */
         if (newindent + off < 0) {
@@ -743,10 +742,14 @@ open_line (
     if (ml_append(curwin->w_cursor.lnum, p_extra, (colnr_T)0, FALSE)
         == FAIL)
       goto theend;
-    /* Postpone calling changed_lines(), because it would mess up folding
-     * with markers. */
-    mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L);
-    did_append = TRUE;
+    // Postpone calling changed_lines(), because it would mess up folding
+    // with markers.
+    // Skip mark_adjust when adding a line after the last one, there can't
+    // be marks there.
+    if (curwin->w_cursor.lnum + 1 < curbuf->b_ml.ml_line_count) {
+      mark_adjust(curwin->w_cursor.lnum + 1, (linenr_T)MAXLNUM, 1L, 0L);
+    }
+    did_append = true;
   } else {
     /*
      * In VREPLACE mode we are starting to replace the next line.
@@ -1743,18 +1746,6 @@ int gchar_pos(pos_T *pos)
 }
 
 /*
- * Skip to next part of an option argument: Skip space and comma.
- */
-char_u *skip_to_option_part(char_u *p)
-{
-  if (*p == ',')
-    ++p;
-  while (*p == ' ')
-    ++p;
-  return p;
-}
-
-/*
  * Call this function when something in the current buffer is changed.
  *
  * Most often called through changed_bytes() and changed_lines(), which also
@@ -1872,7 +1863,11 @@ void appended_lines(linenr_T lnum, long count)
  */
 void appended_lines_mark(linenr_T lnum, long count)
 {
-  mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L);
+  // Skip mark_adjust when adding a line after the last one, there can't
+  // be marks there.
+  if (lnum + count < curbuf->b_ml.ml_line_count) {
+    mark_adjust(lnum + 1, (linenr_T)MAXLNUM, count, 0L);
+  }
   changed_lines(lnum + 1, 0, lnum + 1, count);
 }
 
@@ -2512,8 +2507,9 @@ void msgmore(long n)
         vim_snprintf((char *)msg_buf, MSG_BUF_LEN,
             _("%" PRId64 " fewer lines"), (int64_t)pn);
     }
-    if (got_int)
-      vim_strcat(msg_buf, (char_u *)_(" (Interrupted)"), MSG_BUF_LEN);
+    if (got_int) {
+      xstrlcat((char *)msg_buf, _(" (Interrupted)"), MSG_BUF_LEN);
+    }
     if (msg(msg_buf)) {
       set_keep_msg(msg_buf, 0);
       keep_msg_more = TRUE;
@@ -2684,6 +2680,42 @@ void fast_breakcheck(void)
   }
 }
 
+// Call shell. Calls os_call_shell, with 'shellxquote' added.
+int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
+{
+  int retval;
+  proftime_T wait_time;
+
+  if (p_verbose > 3) {
+    verbose_enter();
+    smsg(_("Calling shell to execute: \"%s\""),
+         cmd == NULL ? p_sh : cmd);
+    ui_putc('\n');
+    verbose_leave();
+  }
+
+  if (do_profiling == PROF_YES) {
+    prof_child_enter(&wait_time);
+  }
+
+  if (*p_sh == NUL) {
+    EMSG(_(e_shellempty));
+    retval = -1;
+  } else {
+    // The external command may update a tags file, clear cached tags.
+    tag_freematch();
+
+    retval = os_call_shell(cmd, opts, extra_shell_arg);
+  }
+
+  set_vim_var_nr(VV_SHELL_ERROR, (varnumber_T)retval);
+  if (do_profiling == PROF_YES) {
+    prof_child_exit(&wait_time);
+  }
+
+  return retval;
+}
+
 /// Get the stdout of an external command.
 /// If "ret_len" is NULL replace NUL characters with NL. When "ret_len" is not
 /// NULL store the length there.
diff --git a/src/nvim/misc2.c b/src/nvim/misc2.c
deleted file mode 100644
index 368f83cfb5..0000000000
--- a/src/nvim/misc2.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * misc2.c: Various functions.
- */
-#include <assert.h>
-#include <inttypes.h>
-#include <string.h>
-
-#include "nvim/vim.h"
-#include "nvim/ascii.h"
-#include "nvim/misc2.h"
-#include "nvim/file_search.h"
-#include "nvim/buffer.h"
-#include "nvim/charset.h"
-#include "nvim/cursor.h"
-#include "nvim/diff.h"
-#include "nvim/edit.h"
-#include "nvim/eval.h"
-#include "nvim/ex_cmds.h"
-#include "nvim/ex_docmd.h"
-#include "nvim/ex_getln.h"
-#include "nvim/fileio.h"
-#include "nvim/fold.h"
-#include "nvim/getchar.h"
-#include "nvim/macros.h"
-#include "nvim/mark.h"
-#include "nvim/mbyte.h"
-#include "nvim/memfile.h"
-#include "nvim/memline.h"
-#include "nvim/memory.h"
-#include "nvim/message.h"
-#include "nvim/misc1.h"
-#include "nvim/move.h"
-#include "nvim/option.h"
-#include "nvim/ops.h"
-#include "nvim/os_unix.h"
-#include "nvim/path.h"
-#include "nvim/quickfix.h"
-#include "nvim/regexp.h"
-#include "nvim/screen.h"
-#include "nvim/search.h"
-#include "nvim/spell.h"
-#include "nvim/strings.h"
-#include "nvim/syntax.h"
-#include "nvim/tag.h"
-#include "nvim/ui.h"
-#include "nvim/window.h"
-#include "nvim/os/os.h"
-#include "nvim/os/shell.h"
-
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "misc2.c.generated.h"
-#endif
-/*
- * Return TRUE if in the current mode we need to use virtual.
- */
-int virtual_active(void)
-{
-  /* While an operator is being executed we return "virtual_op", because
-   * VIsual_active has already been reset, thus we can't check for "block"
-   * being used. */
-  if (virtual_op != MAYBE)
-    return virtual_op;
-  return ve_flags == VE_ALL
-         || ((ve_flags & VE_BLOCK) && VIsual_active && VIsual_mode == Ctrl_V)
-         || ((ve_flags & VE_INSERT) && (State & INSERT));
-}
-
-/*
- * Increment the line pointer "lp" crossing line boundaries as necessary.
- * Return 1 when going to the next line.
- * Return 2 when moving forward onto a NUL at the end of the line).
- * Return -1 when at the end of file.
- * Return 0 otherwise.
- */
-int inc(pos_T *lp)
-{
-  char_u  *p = ml_get_pos(lp);
-
-  if (*p != NUL) {      /* still within line, move to next char (may be NUL) */
-    if (has_mbyte) {
-      int l = (*mb_ptr2len)(p);
-
-      lp->col += l;
-      return (p[l] != NUL) ? 0 : 2;
-    }
-    lp->col++;
-    lp->coladd = 0;
-    return (p[1] != NUL) ? 0 : 2;
-  }
-  if (lp->lnum != curbuf->b_ml.ml_line_count) {     /* there is a next line */
-    lp->col = 0;
-    lp->lnum++;
-    lp->coladd = 0;
-    return 1;
-  }
-  return -1;
-}
-
-/*
- * incl(lp): same as inc(), but skip the NUL at the end of non-empty lines
- */
-int incl(pos_T *lp)
-{
-  int r;
-
-  if ((r = inc(lp)) >= 1 && lp->col)
-    r = inc(lp);
-  return r;
-}
-
-int dec(pos_T *lp)
-{
-  char_u      *p;
-
-  lp->coladd = 0;
-  if (lp->col > 0) {            /* still within line */
-    lp->col--;
-    if (has_mbyte) {
-      p = ml_get(lp->lnum);
-      lp->col -= (*mb_head_off)(p, p + lp->col);
-    }
-    return 0;
-  }
-  if (lp->lnum > 1) {           /* there is a prior line */
-    lp->lnum--;
-    p = ml_get(lp->lnum);
-    lp->col = (colnr_T)STRLEN(p);
-    if (has_mbyte)
-      lp->col -= (*mb_head_off)(p, p + lp->col);
-    return 1;
-  }
-  return -1;                    /* at start of file */
-}
-
-/*
- * decl(lp): same as dec(), but skip the NUL at the end of non-empty lines
- */
-int decl(pos_T *lp)
-{
-  int r;
-
-  if ((r = dec(lp)) == 1 && lp->col)
-    r = dec(lp);
-  return r;
-}
-
-/*
- * Return TRUE when 'shell' has "csh" in the tail.
- */
-int csh_like_shell(void)
-{
-  return strstr((char *)path_tail(p_sh), "csh") != NULL;
-}
-
-/*
- * Isolate one part of a string option where parts are separated with
- * "sep_chars".
- * The part is copied into "buf[maxlen]".
- * "*option" is advanced to the next part.
- * The length is returned.
- */
-size_t copy_option_part(char_u **option, char_u *buf, size_t maxlen, char *sep_chars)
-{
-  size_t len = 0;
-  char_u  *p = *option;
-
-  /* skip '.' at start of option part, for 'suffixes' */
-  if (*p == '.')
-    buf[len++] = *p++;
-  while (*p != NUL && vim_strchr((char_u *)sep_chars, *p) == NULL) {
-    /*
-     * Skip backslash before a separator character and space.
-     */
-    if (p[0] == '\\' && vim_strchr((char_u *)sep_chars, p[1]) != NULL)
-      ++p;
-    if (len < maxlen - 1)
-      buf[len++] = *p;
-    ++p;
-  }
-  buf[len] = NUL;
-
-  if (*p != NUL && *p != ',')   /* skip non-standard separator */
-    ++p;
-  p = skip_to_option_part(p);   /* p points to next file name */
-
-  *option = p;
-  return len;
-}
-
-/*
- * Return the current end-of-line type: EOL_DOS, EOL_UNIX or EOL_MAC.
- */
-int get_fileformat(buf_T *buf)
-{
-  int c = *buf->b_p_ff;
-
-  if (buf->b_p_bin || c == 'u')
-    return EOL_UNIX;
-  if (c == 'm')
-    return EOL_MAC;
-  return EOL_DOS;
-}
-
-/*
- * Like get_fileformat(), but override 'fileformat' with "p" for "++opt=val"
- * argument.
- */
-int 
-get_fileformat_force (
-    buf_T *buf,
-    exarg_T *eap           /* can be NULL! */
-)
-{
-  int c;
-
-  if (eap != NULL && eap->force_ff != 0)
-    c = eap->cmd[eap->force_ff];
-  else {
-    if ((eap != NULL && eap->force_bin != 0)
-        ? (eap->force_bin == FORCE_BIN) : buf->b_p_bin)
-      return EOL_UNIX;
-    c = *buf->b_p_ff;
-  }
-  if (c == 'u')
-    return EOL_UNIX;
-  if (c == 'm')
-    return EOL_MAC;
-  return EOL_DOS;
-}
-
-/// Set the current end-of-line type to EOL_UNIX, EOL_MAC, or EOL_DOS.
-///
-/// Sets 'fileformat'.
-///
-/// @param eol_style End-of-line style.
-/// @param opt_flags OPT_LOCAL and/or OPT_GLOBAL
-void set_fileformat(int eol_style, int opt_flags)
-{
-  char *p = NULL;
-
-  switch (eol_style) {
-      case EOL_UNIX:
-          p = FF_UNIX;
-          break;
-      case EOL_MAC:
-          p = FF_MAC;
-          break;
-      case EOL_DOS:
-          p = FF_DOS;
-          break;
-  }
-
-  // p is NULL if "eol_style" is EOL_UNKNOWN.
-  if (p != NULL) {
-    set_string_option_direct((char_u *)"ff",
-                             -1,
-                             (char_u *)p,
-                             OPT_FREE | opt_flags,
-                             0);
-  }
-
-  // This may cause the buffer to become (un)modified.
-  check_status(curbuf);
-  redraw_tabline = TRUE;
-  need_maketitle = TRUE;  // Set window title later.
-}
-
-/*
- * Return the default fileformat from 'fileformats'.
- */
-int default_fileformat(void)
-{
-  switch (*p_ffs) {
-  case 'm':   return EOL_MAC;
-  case 'd':   return EOL_DOS;
-  }
-  return EOL_UNIX;
-}
-
-// Call shell. Calls os_call_shell, with 'shellxquote' added.
-int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
-{
-  char_u      *ncmd;
-  int retval;
-  proftime_T wait_time;
-
-  if (p_verbose > 3) {
-    verbose_enter();
-    smsg(_("Calling shell to execute: \"%s\""),
-         cmd == NULL ? p_sh : cmd);
-    ui_putc('\n');
-    verbose_leave();
-  }
-
-  if (do_profiling == PROF_YES)
-    prof_child_enter(&wait_time);
-
-  if (*p_sh == NUL) {
-    EMSG(_(e_shellempty));
-    retval = -1;
-  } else {
-    /* The external command may update a tags file, clear cached tags. */
-    tag_freematch();
-
-    if (cmd == NULL || *p_sxq == NUL)
-      retval = os_call_shell(cmd, opts, extra_shell_arg);
-    else {
-      char_u *ecmd = cmd;
-
-      if (*p_sxe != NUL && STRCMP(p_sxq, "(") == 0) {
-        ecmd = vim_strsave_escaped_ext(cmd, p_sxe, '^', FALSE);
-      }
-      ncmd = xmalloc(STRLEN(ecmd) + STRLEN(p_sxq) * 2 + 1);
-      STRCPY(ncmd, p_sxq);
-      STRCAT(ncmd, ecmd);
-      /* When 'shellxquote' is ( append ).
-       * When 'shellxquote' is "( append )". */
-      STRCAT(ncmd, STRCMP(p_sxq, "(") == 0 ? (char_u *)")"
-          : STRCMP(p_sxq, "\"(") == 0 ? (char_u *)")\""
-          : p_sxq);
-      retval = os_call_shell(ncmd, opts, extra_shell_arg);
-      xfree(ncmd);
-
-      if (ecmd != cmd)
-        xfree(ecmd);
-    }
-  }
-
-  set_vim_var_nr(VV_SHELL_ERROR, (varnumber_T) retval);
-  if (do_profiling == PROF_YES) {
-    prof_child_exit(&wait_time);
-  }
-
-  return retval;
-}
-
-/*
- * VISUAL, SELECTMODE and OP_PENDING State are never set, they are equal to
- * NORMAL State with a condition.  This function returns the real State.
- */
-int get_real_state(void)
-{
-  if (State & NORMAL) {
-    if (VIsual_active) {
-      if (VIsual_select)
-        return SELECTMODE;
-      return VISUAL;
-    } else if (finish_op)
-      return OP_PENDING;
-  }
-  return State;
-}
-
-/*
- * Change to a file's directory.
- * Caller must call shorten_fnames()!
- * Return OK or FAIL.
- */
-int vim_chdirfile(char_u *fname)
-{
-  char_u dir[MAXPATHL];
-
-  STRLCPY(dir, fname, MAXPATHL);
-  *path_tail_with_sep(dir) = NUL;
-  return os_chdir((char *)dir) == 0 ? OK : FAIL;
-}
-
-/*
- * Change directory to "new_dir". Search 'cdpath' for relative directory names.
- */
-int vim_chdir(char_u *new_dir)
-{
-  char_u      *dir_name;
-  int r;
-
-  dir_name = find_directory_in_path(new_dir, STRLEN(new_dir),
-                                    FNAME_MESS, curbuf->b_ffname);
-  if (dir_name == NULL)
-    return -1;
-  r = os_chdir((char *)dir_name);
-  xfree(dir_name);
-  return r;
-}
-
-/*
- * Read 2 bytes from "fd" and turn them into an int, MSB first.
- */
-int get2c(FILE *fd)
-{
-  int n;
-
-  n = getc(fd);
-  n = (n << 8) + getc(fd);
-  return n;
-}
-
-/*
- * Read 3 bytes from "fd" and turn them into an int, MSB first.
- */
-int get3c(FILE *fd)
-{
-  int n;
-
-  n = getc(fd);
-  n = (n << 8) + getc(fd);
-  n = (n << 8) + getc(fd);
-  return n;
-}
-
-/*
- * Read 4 bytes from "fd" and turn them into an int, MSB first.
- */
-int get4c(FILE *fd)
-{
-  /* Use unsigned rather than int otherwise result is undefined
-   * when left-shift sets the MSB. */
-  unsigned n;
-
-  n = (unsigned)getc(fd);
-  n = (n << 8) + (unsigned)getc(fd);
-  n = (n << 8) + (unsigned)getc(fd);
-  n = (n << 8) + (unsigned)getc(fd);
-  return (int)n;
-}
-
-/*
- * Read 8 bytes from "fd" and turn them into a time_t, MSB first.
- */
-time_t get8ctime(FILE *fd)
-{
-  time_t n = 0;
-  int i;
-
-  for (i = 0; i < 8; ++i)
-    n = (n << 8) + getc(fd);
-  return n;
-}
-
-/// Reads a string of length "cnt" from "fd" into allocated memory.
-/// @return pointer to the string or NULL when unable to read that many bytes.
-char *read_string(FILE *fd, size_t cnt)
-{
-  uint8_t *str = xmallocz(cnt);
-  for (size_t i = 0; i < cnt; i++) {
-    int c = getc(fd);
-    if (c == EOF) {
-      xfree(str);
-      return NULL;
-    }
-    str[i] = (uint8_t)c;
-  }
-  return (char *)str;
-}
-
-/// Writes a number to file "fd", most significant bit first, in "len" bytes.
-/// @returns false in case of an error.
-bool put_bytes(FILE *fd, uintmax_t number, size_t len)
-{
-  assert(len > 0);
-  for (size_t i = len - 1; i < len; i--) {
-    if (putc((int)(number >> (i * 8)), fd) == EOF) {
-      return false;
-    }
-  }
-  return true;
-}
-
-/// Writes time_t to file "fd" in 8 bytes.
-/// @returns FAIL when the write failed.
-int put_time(FILE *fd, time_t time_)
-{
-  uint8_t buf[8];
-  time_to_bytes(time_, buf);
-  return fwrite(buf, sizeof(uint8_t), ARRAY_SIZE(buf), fd) == 1 ? OK : FAIL;
-}
-
-/// Writes time_t to "buf[8]".
-void time_to_bytes(time_t time_, uint8_t buf[8])
-{
-  // time_t can be up to 8 bytes in size, more than uintmax_t in 32 bits
-  // systems, thus we can't use put_bytes() here.
-  for (size_t i = 7, bufi = 0; bufi < 8; i--, bufi++) {
-    buf[bufi] = (uint8_t)((uint64_t)time_ >> (i * 8));
-  }
-}
diff --git a/src/nvim/misc2.h b/src/nvim/misc2.h
deleted file mode 100644
index 28b5b775d2..0000000000
--- a/src/nvim/misc2.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef NVIM_MISC2_H
-#define NVIM_MISC2_H
-
-#include "nvim/os/shell.h"
-
-#define READ_STRING(x, y) (char_u *)read_string((x), (size_t)(y))
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "misc2.h.generated.h"
-#endif
-
-#endif  // NVIM_MISC2_H
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 2f499e477c..2ebe199f47 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -4,8 +4,10 @@
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/window.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/screen.h"
+#include "nvim/syntax.h"
 #include "nvim/ui.h"
 #include "nvim/os_unix.h"
 #include "nvim/fold.h"
@@ -303,6 +305,10 @@ retnomove:
     mouse_past_bottom = true;
   }
 
+  if (!(flags & MOUSE_RELEASED) && which_button == MOUSE_LEFT) {
+    col = mouse_adjust_click(curwin, row, col);
+  }
+
   // Start Visual mode before coladvance(), for when 'sel' != "old"
   if ((flags & MOUSE_MAY_VIS) && !VIsual_active) {
     check_visual_highlight();
@@ -597,3 +603,74 @@ bool mouse_scroll_horiz(int dir)
 
   return leftcol_changed();
 }
+
+// Adjust the clicked column position if there are concealed characters
+// before the current column.  But only when it's absolutely necessary.
+static int mouse_adjust_click(win_T *wp, int row, int col)
+{
+  if (!(wp->w_p_cole > 0 && curbuf->b_p_smc > 0
+        && wp->w_leftcol < curbuf->b_p_smc && conceal_cursor_line(wp))) {
+    return col;
+  }
+
+  int end = (colnr_T)STRLEN(ml_get(wp->w_cursor.lnum));
+  int vend = getviscol2(end, 0);
+
+  if (col >= vend) {
+    return col;
+  }
+
+  int i = wp->w_leftcol;
+
+  if (row > 0) {
+    i += row * (wp->w_width - win_col_off(wp) - win_col_off2(wp)
+                - wp->w_leftcol) + wp->w_skipcol;
+  }
+
+  int start_col = i;
+  int matchid;
+  int last_matchid;
+  int bcol = end - (vend - col);
+
+  while (i < bcol) {
+    matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum, i);
+
+    if (matchid != 0) {
+      if (wp->w_p_cole == 3) {
+        bcol++;
+      } else {
+        if (row > 0 && i == start_col) {
+          // Check if the current concealed character is actually part of
+          // the previous wrapped row's conceal group.
+          last_matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum,
+                                              i - 1);
+          if (last_matchid == matchid) {
+            bcol++;
+          }
+        } else if (wp->w_p_cole == 1
+                   || (wp->w_p_cole == 2
+                       && (lcs_conceal != NUL
+                           || syn_get_sub_char() != NUL))) {
+          // At least one placeholder character will be displayed.
+          bcol--;
+        }
+
+        last_matchid = matchid;
+
+        // Adjust for concealed text that spans more than one character.
+        do {
+          i++;
+          bcol++;
+          matchid = syn_get_concealed_id(wp, wp->w_cursor.lnum, i);
+        } while (last_matchid == matchid);
+
+        continue;
+      }
+    }
+
+    i++;
+  }
+
+  return getviscol2(bcol, 0);
+}
+
diff --git a/src/nvim/move.c b/src/nvim/move.c
index b129c5cb7a..bb6c032db1 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -24,7 +24,7 @@
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
+#include "nvim/option.h"
 #include "nvim/popupmnu.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
@@ -670,8 +670,7 @@ int win_col_off(win_T *wp)
   return ((wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) + 1 : 0)
          + (cmdwin_type == 0 || wp != curwin ? 0 : 1)
          + (int)wp->w_p_fdc
-         + (wp->w_buffer->b_signlist != NULL ? 2 : 0)
-  ;
+         + (signcolumn_on(wp) ? 2 : 0);
 }
 
 int curwin_col_off(void)
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 34ff7c6374..98636263b9 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -7,8 +7,8 @@
 
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/vim.h"
+#include "nvim/api/ui.h"
 #include "nvim/msgpack_rpc/channel.h"
-#include "nvim/msgpack_rpc/remote_ui.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/libuv_process.h"
 #include "nvim/event/rstream.h"
@@ -16,8 +16,10 @@
 #include "nvim/event/socket.h"
 #include "nvim/msgpack_rpc/helpers.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 #include "nvim/ascii.h"
 #include "nvim/memory.h"
+#include "nvim/eval.h"
 #include "nvim/os_unix.h"
 #include "nvim/message.h"
 #include "nvim/map.h"
@@ -54,12 +56,7 @@ typedef struct {
   msgpack_unpacker *unpacker;
   union {
     Stream stream;
-    struct {
-      LibuvProcess uvproc;
-      Stream in;
-      Stream out;
-      Stream err;
-    } process;
+    Process *proc;
     struct {
       Stream in;
       Stream out;
@@ -68,7 +65,7 @@ typedef struct {
   uint64_t next_request_id;
   kvec_t(ChannelCallFrame *) call_stack;
   kvec_t(WBuffer *) delayed_notifications;
-  Queue *events;
+  MultiQueue *events;
 } Channel;
 
 typedef struct {
@@ -78,7 +75,6 @@ typedef struct {
   uint64_t request_id;
 } RequestEvent;
 
-static uint64_t next_id = 1;
 static PMap(uint64_t) *channels = NULL;
 static PMap(cstr_t) *event_strings = NULL;
 static msgpack_sbuffer out_buffer;
@@ -111,33 +107,20 @@ void channel_teardown(void)
 }
 
 /// Creates an API channel by starting a process and connecting to its
-/// stdin/stdout. stderr is forwarded to the editor error stream.
+/// stdin/stdout. stderr is handled by the job infrastructure.
 ///
 /// @param argv The argument vector for the process. [consumed]
 /// @return The channel id (> 0), on success.
 ///         0, on error.
-uint64_t channel_from_process(char **argv)
-{
-  Channel *channel = register_channel(kChannelTypeProc);
-  channel->data.process.uvproc = libuv_process_init(&loop, channel);
-  Process *proc = &channel->data.process.uvproc.process;
-  proc->argv = argv;
-  proc->in = &channel->data.process.in;
-  proc->out = &channel->data.process.out;
-  proc->err = &channel->data.process.err;
-  proc->cb = process_exit;
-  if (!process_spawn(proc)) {
-    loop_poll_events(&loop, 0);
-    decref(channel);
-    return 0;
-  }
-
+uint64_t channel_from_process(Process *proc, uint64_t id)
+{
+  Channel *channel = register_channel(kChannelTypeProc, id, proc->events);
   incref(channel);  // process channels are only closed by the exit_cb
+  channel->data.proc = proc;
+
   wstream_init(proc->in, 0);
   rstream_init(proc->out, 0);
-  rstream_start(proc->out, parse_msgpack);
-  rstream_init(proc->err, 0);
-  rstream_start(proc->err, forward_stderr);
+  rstream_start(proc->out, parse_msgpack, channel);
 
   return channel->id;
 }
@@ -147,14 +130,14 @@ uint64_t channel_from_process(char **argv)
 /// @param watcher The SocketWatcher ready to accept the connection
 void channel_from_connection(SocketWatcher *watcher)
 {
-  Channel *channel = register_channel(kChannelTypeSocket);
-  socket_watcher_accept(watcher, &channel->data.stream, channel);
+  Channel *channel = register_channel(kChannelTypeSocket, 0, NULL);
+  socket_watcher_accept(watcher, &channel->data.stream);
   incref(channel);  // close channel only after the stream is closed
   channel->data.stream.internal_close_cb = close_cb;
   channel->data.stream.internal_data = channel;
   wstream_init(&channel->data.stream, 0);
   rstream_init(&channel->data.stream, CHANNEL_BUFFER_SIZE);
-  rstream_start(&channel->data.stream, parse_msgpack);
+  rstream_start(&channel->data.stream, parse_msgpack, channel);
 }
 
 /// Sends event/arguments to channel
@@ -179,7 +162,7 @@ bool channel_send_event(uint64_t id, char *name, Array args)
       // Pending request, queue the notification for later sending.
       String method = cstr_as_string(name);
       WBuffer *buffer = serialize_request(id, 0, method, args, &out_buffer, 1);
-      kv_push(WBuffer *, channel->delayed_notifications, buffer);
+      kv_push(channel->delayed_notifications, buffer);
     } else {
       send_event(channel, name, args);
     }
@@ -217,10 +200,10 @@ Object channel_send_call(uint64_t id,
   send_request(channel, request_id, method_name, args);
 
   // Push the frame
-  ChannelCallFrame frame = {request_id, false, false, NIL};
-  kv_push(ChannelCallFrame *, channel->call_stack, &frame);
+  ChannelCallFrame frame = { request_id, false, false, NIL };
+  kv_push(channel->call_stack, &frame);
   channel->pending_requests++;
-  LOOP_PROCESS_EVENTS_UNTIL(&loop, channel->events, -1, frame.returned);
+  LOOP_PROCESS_EVENTS_UNTIL(&main_loop, channel->events, -1, frame.returned);
   (void)kv_pop(channel->call_stack);
   channel->pending_requests--;
 
@@ -313,30 +296,21 @@ bool channel_close(uint64_t id)
 /// Neovim
 void channel_from_stdio(void)
 {
-  Channel *channel = register_channel(kChannelTypeStdio);
+  Channel *channel = register_channel(kChannelTypeStdio, 0, NULL);
   incref(channel);  // stdio channels are only closed on exit
   // read stream
-  rstream_init_fd(&loop, &channel->data.std.in, 0, CHANNEL_BUFFER_SIZE,
-      channel);
-  rstream_start(&channel->data.std.in, parse_msgpack);
+  rstream_init_fd(&main_loop, &channel->data.std.in, 0, CHANNEL_BUFFER_SIZE);
+  rstream_start(&channel->data.std.in, parse_msgpack, channel);
   // write stream
-  wstream_init_fd(&loop, &channel->data.std.out, 1, 0, NULL);
+  wstream_init_fd(&main_loop, &channel->data.std.out, 1, 0);
 }
 
-static void forward_stderr(Stream *stream, RBuffer *rbuf, size_t count,
-    void *data, bool eof)
+void channel_process_exit(uint64_t id, int status)
 {
-  while (rbuffer_size(rbuf)) {
-    char buf[256];
-    size_t read = rbuffer_read(rbuf, buf, sizeof(buf) - 1);
-    buf[read] = NUL;
-    ELOG("Channel %" PRIu64 " stderr: %s", ((Channel *)data)->id, buf);
-  }
-}
+  Channel *channel = pmap_get(uint64_t)(channels, id);
 
-static void process_exit(Process *proc, int status, void *data)
-{
-  decref(data);
+  channel->closed = true;
+  decref(channel);
 }
 
 static void parse_msgpack(Stream *stream, RBuffer *rbuf, size_t c, void *data,
@@ -466,7 +440,7 @@ static void handle_request(Channel *channel, msgpack_object *request)
   if (handler.async) {
     on_request_event((void **)&event_data);
   } else {
-    queue_put(channel->events, on_request_event, 1, event_data);
+    multiqueue_put(channel->events, on_request_event, 1, event_data);
   }
 }
 
@@ -478,7 +452,7 @@ static void on_request_event(void **argv)
   Array args = e->args;
   uint64_t request_id = e->request_id;
   Error error = ERROR_INIT;
-  Object result = handler.fn(channel->id, request_id, args, &error);
+  Object result = handler.fn(channel->id, args, &error);
   if (request_id != NO_RESPONSE) {
     // send the response
     msgpack_packer response;
@@ -491,8 +465,7 @@ static void on_request_event(void **argv)
   } else {
     api_free_object(result);
   }
-  // All arguments were freed already, but we still need to free the array
-  xfree(args.items);
+  api_free_array(args);
   decref(channel);
   xfree(e);
 }
@@ -511,7 +484,7 @@ static bool channel_write(Channel *channel, WBuffer *buffer)
       success = wstream_write(&channel->data.stream, buffer);
       break;
     case kChannelTypeProc:
-      success = wstream_write(&channel->data.process.in, buffer);
+      success = wstream_write(channel->data.proc->in, buffer);
       break;
     case kChannelTypeStdio:
       success = wstream_write(&channel->data.std.out, buffer);
@@ -574,13 +547,12 @@ static void send_event(Channel *channel,
 
 static void broadcast_event(char *name, Array args)
 {
-  kvec_t(Channel *) subscribed;
-  kv_init(subscribed);
+  kvec_t(Channel *) subscribed = KV_INITIAL_VALUE;
   Channel *channel;
 
   map_foreach_value(channels, channel, {
     if (pmap_has(cstr_t)(channel->subscribed_events, name)) {
-      kv_push(Channel *, subscribed, channel);
+      kv_push(subscribed, channel);
     }
   });
 
@@ -600,7 +572,7 @@ static void broadcast_event(char *name, Array args)
   for (size_t i = 0; i < kv_size(subscribed); i++) {
     Channel *channel = kv_A(subscribed, i);
     if (channel->pending_requests) {
-      kv_push(WBuffer *, channel->delayed_notifications, buffer);
+      kv_push(channel->delayed_notifications, buffer);
     } else {
       channel_write(channel, buffer);
     }
@@ -637,17 +609,18 @@ static void close_channel(Channel *channel)
 
   switch (channel->type) {
     case kChannelTypeSocket:
-      stream_close(&channel->data.stream, NULL);
+      stream_close(&channel->data.stream, NULL, NULL);
       break;
     case kChannelTypeProc:
-      if (!channel->data.process.uvproc.process.closed) {
-        process_stop(&channel->data.process.uvproc.process);
-      }
+      // Only close the rpc channel part,
+      // there could be an error message on the stderr stream
+      process_close_in(channel->data.proc);
+      process_close_out(channel->data.proc);
       break;
     case kChannelTypeStdio:
-      stream_close(&channel->data.std.in, NULL);
-      stream_close(&channel->data.std.out, NULL);
-      queue_put(loop.fast_events, exit_event, 1, channel);
+      stream_close(&channel->data.std.in, NULL, NULL);
+      stream_close(&channel->data.std.out, NULL, NULL);
+      multiqueue_put(main_loop.fast_events, exit_event, 1, channel);
       return;
     default:
       abort();
@@ -680,7 +653,9 @@ static void free_channel(Channel *channel)
   pmap_free(cstr_t)(channel->subscribed_events);
   kv_destroy(channel->call_stack);
   kv_destroy(channel->delayed_notifications);
-  queue_free(channel->events);
+  if (channel->type != kChannelTypeProc) {
+    multiqueue_free(channel->events);
+  }
   xfree(channel);
 }
 
@@ -689,15 +664,16 @@ static void close_cb(Stream *stream, void *data)
   decref(data);
 }
 
-static Channel *register_channel(ChannelType type)
+static Channel *register_channel(ChannelType type, uint64_t id,
+                                 MultiQueue *events)
 {
   Channel *rv = xmalloc(sizeof(Channel));
-  rv->events = queue_new_child(loop.events);
+  rv->events = events ? events : multiqueue_new_child(main_loop.events);
   rv->type = type;
   rv->refcount = 1;
   rv->closed = false;
   rv->unpacker = msgpack_unpacker_new(MSGPACK_UNPACKER_INIT_BUFFER_SIZE);
-  rv->id = next_id++;
+  rv->id = id > 0 ? id : next_chan_id++;
   rv->pending_requests = 0;
   rv->subscribed_events = pmap_new(cstr_t)();
   rv->next_request_id = 1;
@@ -816,20 +792,55 @@ static void decref(Channel *channel)
 #define REQ "[request]      "
 #define RES "[response]     "
 #define NOT "[notification] "
+#define ERR "[error]        "
+
+// Cannot define array with negative offsets, so this one is needed to be added
+// to MSGPACK_UNPACK_\* values.
+#define MUR_OFF 2
+
+static const char *const msgpack_error_messages[] = {
+  [MSGPACK_UNPACK_EXTRA_BYTES + MUR_OFF] = "extra bytes found",
+  [MSGPACK_UNPACK_CONTINUE + MUR_OFF] = "incomplete string",
+  [MSGPACK_UNPACK_PARSE_ERROR + MUR_OFF] = "parse error",
+  [MSGPACK_UNPACK_NOMEM_ERROR + MUR_OFF] = "not enough memory",
+};
 
 static void log_server_msg(uint64_t channel_id,
                            msgpack_sbuffer *packed)
 {
   msgpack_unpacked unpacked;
   msgpack_unpacked_init(&unpacked);
-  msgpack_unpack_next(&unpacked, packed->data, packed->size, NULL);
-  uint64_t type = unpacked.data.via.array.ptr[0].via.u64;
   DLOGN("[msgpack-rpc] nvim -> client(%" PRIu64 ") ", channel_id);
-  log_lock();
-  FILE *f = open_log_file();
-  fprintf(f, type ? (type == 1 ? RES : NOT) : REQ);
-  log_msg_close(f, unpacked.data);
-  msgpack_unpacked_destroy(&unpacked);
+  const msgpack_unpack_return result =
+      msgpack_unpack_next(&unpacked, packed->data, packed->size, NULL);
+  switch (result) {
+    case MSGPACK_UNPACK_SUCCESS: {
+      uint64_t type = unpacked.data.via.array.ptr[0].via.u64;
+      log_lock();
+      FILE *f = open_log_file();
+      fprintf(f, type ? (type == 1 ? RES : NOT) : REQ);
+      log_msg_close(f, unpacked.data);
+      msgpack_unpacked_destroy(&unpacked);
+      break;
+    }
+    case MSGPACK_UNPACK_EXTRA_BYTES:
+    case MSGPACK_UNPACK_CONTINUE:
+    case MSGPACK_UNPACK_PARSE_ERROR:
+    case MSGPACK_UNPACK_NOMEM_ERROR: {
+      log_lock();
+      FILE *f = open_log_file();
+      fprintf(f, ERR);
+      log_msg_close(f, (msgpack_object) {
+          .type = MSGPACK_OBJECT_STR,
+          .via.str = {
+              .ptr = (char *)msgpack_error_messages[result + MUR_OFF],
+              .size = (uint32_t)strlen(
+                  msgpack_error_messages[result + MUR_OFF]),
+          },
+      });
+      break;
+    }
+  }
 }
 
 static void log_client_msg(uint64_t channel_id,
diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h
index 104547a7b8..0d92976d02 100644
--- a/src/nvim/msgpack_rpc/channel.h
+++ b/src/nvim/msgpack_rpc/channel.h
@@ -6,6 +6,7 @@
 
 #include "nvim/api/private/defs.h"
 #include "nvim/event/socket.h"
+#include "nvim/event/process.h"
 #include "nvim/vim.h"
 
 #define METHOD_MAXLEN 512
diff --git a/src/nvim/msgpack_rpc/defs.h b/src/nvim/msgpack_rpc/defs.h
deleted file mode 100644
index 5611636d4f..0000000000
--- a/src/nvim/msgpack_rpc/defs.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef NVIM_MSGPACK_RPC_DEFS_H
-#define NVIM_MSGPACK_RPC_DEFS_H
-
-
-/// The rpc_method_handlers table, used in msgpack_rpc_dispatch(), stores
-/// functions of this type.
-typedef struct {
-  Object (*fn)(uint64_t channel_id,
-               uint64_t request_id,
-               Array args,
-               Error *error);
-  bool async;  // function is always safe to run immediately instead of being
-               // put in a request queue for handling when nvim waits for input.
-} MsgpackRpcRequestHandler;
-
-/// Initializes the msgpack-rpc method table
-void msgpack_rpc_init_method_table(void);
-
-// Add a handler to the method table
-void msgpack_rpc_add_method_handler(String method,
-                                    MsgpackRpcRequestHandler handler);
-
-void msgpack_rpc_init_function_metadata(Dictionary *metadata);
-
-MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
-                                                     size_t name_len)
-  FUNC_ATTR_NONNULL_ARG(1);
-#endif  // NVIM_MSGPACK_RPC_DEFS_H
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 0049ae6b95..5137b375f0 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -4,12 +4,14 @@
 
 #include <msgpack.h>
 
+#include "nvim/api/private/dispatch.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/msgpack_rpc/helpers.h"
-#include "nvim/msgpack_rpc/defs.h"
+#include "nvim/lib/kvec.h"
 #include "nvim/vim.h"
 #include "nvim/log.h"
 #include "nvim/memory.h"
+#include "nvim/assert.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "msgpack_rpc/helpers.c.generated.h"
@@ -18,39 +20,40 @@
 static msgpack_zone zone;
 static msgpack_sbuffer sbuffer;
 
-#define HANDLE_TYPE_CONVERSION_IMPL(t, lt)                                  \
-  bool msgpack_rpc_to_##lt(msgpack_object *obj, t *arg)                     \
-    FUNC_ATTR_NONNULL_ALL                                                   \
-  {                                                                         \
-    if (obj->type != MSGPACK_OBJECT_EXT                                     \
-        || obj->via.ext.type != kObjectType##t) {                           \
-      return false;                                                         \
-    }                                                                       \
-                                                                            \
-    msgpack_object data;                                                    \
-    msgpack_unpack_return ret = msgpack_unpack(obj->via.ext.ptr,            \
-                                               obj->via.ext.size,           \
-                                               NULL,                        \
-                                               &zone,                       \
-                                               &data);                      \
-                                                                            \
-    if (ret != MSGPACK_UNPACK_SUCCESS) {                                    \
-      return false;                                                         \
-    }                                                                       \
-                                                                            \
-    *arg = data.via.u64;                                                    \
-    return true;                                                            \
-  }                                                                         \
-                                                                            \
-  void msgpack_rpc_from_##lt(t o, msgpack_packer *res)                      \
-    FUNC_ATTR_NONNULL_ARG(2)                                                \
-  {                                                                         \
-    msgpack_packer pac;                                                     \
-    msgpack_packer_init(&pac, &sbuffer, msgpack_sbuffer_write);             \
-    msgpack_pack_uint64(&pac, o);                                           \
-    msgpack_pack_ext(res, sbuffer.size, kObjectType##t);                    \
-    msgpack_pack_ext_body(res, sbuffer.data, sbuffer.size);                 \
-    msgpack_sbuffer_clear(&sbuffer);                                        \
+#define HANDLE_TYPE_CONVERSION_IMPL(t, lt) \
+  bool msgpack_rpc_to_##lt(const msgpack_object *const obj, \
+                           Integer *const arg) \
+    FUNC_ATTR_NONNULL_ALL \
+  { \
+    if (obj->type != MSGPACK_OBJECT_EXT \
+        || obj->via.ext.type != kObjectType##t) { \
+      return false; \
+    } \
+    \
+    msgpack_object data; \
+    msgpack_unpack_return ret = msgpack_unpack(obj->via.ext.ptr, \
+                                               obj->via.ext.size, \
+                                               NULL, \
+                                               &zone, \
+                                               &data); \
+    \
+    if (ret != MSGPACK_UNPACK_SUCCESS) { \
+      return false; \
+    } \
+    \
+    *arg = (handle_T)data.via.i64; \
+    return true; \
+  } \
+  \
+  void msgpack_rpc_from_##lt(Integer o, msgpack_packer *res) \
+    FUNC_ATTR_NONNULL_ARG(2) \
+  { \
+    msgpack_packer pac; \
+    msgpack_packer_init(&pac, &sbuffer, msgpack_sbuffer_write); \
+    msgpack_pack_int64(&pac, (handle_T)o); \
+    msgpack_pack_ext(res, sbuffer.size, kObjectType##t); \
+    msgpack_pack_ext_body(res, sbuffer.data, sbuffer.size); \
+    msgpack_sbuffer_clear(&sbuffer); \
   }
 
 void msgpack_rpc_helpers_init(void)
@@ -63,34 +66,182 @@ HANDLE_TYPE_CONVERSION_IMPL(Buffer, buffer)
 HANDLE_TYPE_CONVERSION_IMPL(Window, window)
 HANDLE_TYPE_CONVERSION_IMPL(Tabpage, tabpage)
 
-bool msgpack_rpc_to_boolean(msgpack_object *obj, Boolean *arg)
+typedef struct {
+  const msgpack_object *mobj;
+  Object *aobj;
+  bool container;
+  size_t idx;
+} MPToAPIObjectStackItem;
+
+/// Convert type used by msgpack parser to Neovim own API type
+///
+/// @param[in]  obj  Msgpack value to convert.
+/// @param[out]  arg  Location where result of conversion will be saved.
+///
+/// @return true in case of success, false otherwise.
+bool msgpack_rpc_to_object(const msgpack_object *const obj, Object *const arg)
   FUNC_ATTR_NONNULL_ALL
 {
-  *arg = obj->via.boolean;
-  return obj->type == MSGPACK_OBJECT_BOOLEAN;
-}
-
-bool msgpack_rpc_to_integer(msgpack_object *obj, Integer *arg)
-  FUNC_ATTR_NONNULL_ALL
-{
-  if (obj->type == MSGPACK_OBJECT_POSITIVE_INTEGER
-      && obj->via.u64 <= INT64_MAX) {
-    *arg = (int64_t)obj->via.u64;
-    return true;
+  bool ret = true;
+  kvec_t(MPToAPIObjectStackItem) stack = KV_INITIAL_VALUE;
+  kv_push(stack, ((MPToAPIObjectStackItem) { obj, arg, false, 0 }));
+  while (ret && kv_size(stack)) {
+    MPToAPIObjectStackItem cur = kv_last(stack);
+    if (!cur.container) {
+      *cur.aobj = NIL;
+    }
+    switch (cur.mobj->type) {
+      case MSGPACK_OBJECT_NIL: {
+        break;
+      }
+      case MSGPACK_OBJECT_BOOLEAN: {
+        *cur.aobj = BOOLEAN_OBJ(cur.mobj->via.boolean);
+        break;
+      }
+      case MSGPACK_OBJECT_NEGATIVE_INTEGER: {
+        STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.i64),
+                      "Msgpack integer size does not match API integer");
+        *cur.aobj = INTEGER_OBJ(cur.mobj->via.i64);
+        break;
+      }
+      case MSGPACK_OBJECT_POSITIVE_INTEGER: {
+        STATIC_ASSERT(sizeof(Integer) == sizeof(cur.mobj->via.u64),
+                      "Msgpack integer size does not match API integer");
+        if (cur.mobj->via.u64 > API_INTEGER_MAX) {
+          ret = false;
+        } else {
+          *cur.aobj = INTEGER_OBJ((Integer)cur.mobj->via.u64);
+        }
+        break;
+      }
+      case MSGPACK_OBJECT_FLOAT: {
+        STATIC_ASSERT(sizeof(Float) == sizeof(cur.mobj->via.f64),
+                      "Msgpack floating-point size does not match API integer");
+        *cur.aobj = FLOATING_OBJ(cur.mobj->via.f64);
+        break;
+      }
+#define STR_CASE(type, attr, obj, dest, conv) \
+      case type: { \
+        dest = conv(((String) { \
+          .size = obj->via.attr.size, \
+          .data = (obj->via.attr.ptr == NULL || obj->via.attr.size == 0 \
+                   ? xmemdupz("", 0) \
+                   : xmemdupz(obj->via.attr.ptr, obj->via.attr.size)), \
+        })); \
+        break; \
+      }
+      STR_CASE(MSGPACK_OBJECT_STR, str, cur.mobj, *cur.aobj, STRING_OBJ)
+      STR_CASE(MSGPACK_OBJECT_BIN, bin, cur.mobj, *cur.aobj, STRING_OBJ)
+      case MSGPACK_OBJECT_ARRAY: {
+        const size_t size = cur.mobj->via.array.size;
+        if (cur.container) {
+          if (cur.idx >= size) {
+            (void)kv_pop(stack);
+          } else {
+            const size_t idx = cur.idx;
+            cur.idx++;
+            kv_last(stack) = cur;
+            kv_push(stack, ((MPToAPIObjectStackItem) {
+              .mobj = &cur.mobj->via.array.ptr[idx],
+              .aobj = &cur.aobj->data.array.items[idx],
+              .container = false,
+            }));
+          }
+        } else {
+          *cur.aobj = ARRAY_OBJ(((Array) {
+            .size = size,
+            .capacity = size,
+            .items = (size > 0
+                      ? xcalloc(size, sizeof(*cur.aobj->data.array.items))
+                      : NULL),
+          }));
+          cur.container = true;
+          kv_last(stack) = cur;
+        }
+        break;
+      }
+      case MSGPACK_OBJECT_MAP: {
+        const size_t size = cur.mobj->via.map.size;
+        if (cur.container) {
+          if (cur.idx >= size) {
+            (void)kv_pop(stack);
+          } else {
+            const size_t idx = cur.idx;
+            cur.idx++;
+            kv_last(stack) = cur;
+            const msgpack_object *const key = &cur.mobj->via.map.ptr[idx].key;
+            switch (key->type) {
+#define ID(x) x
+              STR_CASE(MSGPACK_OBJECT_STR, str, key,
+                       cur.aobj->data.dictionary.items[idx].key, ID)
+              STR_CASE(MSGPACK_OBJECT_BIN, bin, key,
+                       cur.aobj->data.dictionary.items[idx].key, ID)
+#undef ID
+              case MSGPACK_OBJECT_NIL:
+              case MSGPACK_OBJECT_BOOLEAN:
+              case MSGPACK_OBJECT_POSITIVE_INTEGER:
+              case MSGPACK_OBJECT_NEGATIVE_INTEGER:
+              case MSGPACK_OBJECT_FLOAT:
+              case MSGPACK_OBJECT_EXT:
+              case MSGPACK_OBJECT_MAP:
+              case MSGPACK_OBJECT_ARRAY: {
+                ret = false;
+                break;
+              }
+            }
+            if (ret) {
+              kv_push(stack, ((MPToAPIObjectStackItem) {
+                .mobj = &cur.mobj->via.map.ptr[idx].val,
+                .aobj = &cur.aobj->data.dictionary.items[idx].value,
+                .container = false,
+              }));
+            }
+          }
+        } else {
+          *cur.aobj = DICTIONARY_OBJ(((Dictionary) {
+            .size = size,
+            .capacity = size,
+            .items = (size > 0
+                      ? xcalloc(size, sizeof(*cur.aobj->data.dictionary.items))
+                      : NULL),
+          }));
+          cur.container = true;
+          kv_last(stack) = cur;
+        }
+        break;
+      }
+      case MSGPACK_OBJECT_EXT: {
+        switch (cur.mobj->via.ext.type) {
+          case kObjectTypeBuffer: {
+            cur.aobj->type = kObjectTypeBuffer;
+            ret = msgpack_rpc_to_buffer(cur.mobj, &cur.aobj->data.integer);
+            break;
+          }
+          case kObjectTypeWindow: {
+            cur.aobj->type = kObjectTypeWindow;
+            ret = msgpack_rpc_to_window(cur.mobj, &cur.aobj->data.integer);
+            break;
+          }
+          case kObjectTypeTabpage: {
+            cur.aobj->type = kObjectTypeTabpage;
+            ret = msgpack_rpc_to_tabpage(cur.mobj, &cur.aobj->data.integer);
+            break;
+          }
+        }
+        break;
+      }
+#undef STR_CASE
+    }
+    if (!cur.container) {
+      (void)kv_pop(stack);
+    }
   }
-
-  *arg = obj->via.i64;
-  return obj->type == MSGPACK_OBJECT_NEGATIVE_INTEGER;
-}
-
-bool msgpack_rpc_to_float(msgpack_object *obj, Float *arg)
-  FUNC_ATTR_NONNULL_ALL
-{
-  *arg = obj->via.f64;
-  return obj->type == MSGPACK_OBJECT_FLOAT;
+  kv_destroy(stack);
+  return ret;
 }
 
-bool msgpack_rpc_to_string(msgpack_object *obj, String *arg)
+static bool msgpack_rpc_to_string(const msgpack_object *const obj,
+                                  String *const arg)
   FUNC_ATTR_NONNULL_ALL
 {
   if (obj->type == MSGPACK_OBJECT_BIN || obj->type == MSGPACK_OBJECT_STR) {
@@ -103,58 +254,7 @@ bool msgpack_rpc_to_string(msgpack_object *obj, String *arg)
   return false;
 }
 
-bool msgpack_rpc_to_object(msgpack_object *obj, Object *arg)
-  FUNC_ATTR_NONNULL_ALL
-{
-  switch (obj->type) {
-    case MSGPACK_OBJECT_NIL:
-      arg->type = kObjectTypeNil;
-      return true;
-
-    case MSGPACK_OBJECT_BOOLEAN:
-      arg->type = kObjectTypeBoolean;
-      return msgpack_rpc_to_boolean(obj, &arg->data.boolean);
-
-    case MSGPACK_OBJECT_POSITIVE_INTEGER:
-    case MSGPACK_OBJECT_NEGATIVE_INTEGER:
-      arg->type = kObjectTypeInteger;
-      return msgpack_rpc_to_integer(obj, &arg->data.integer);
-
-    case MSGPACK_OBJECT_FLOAT:
-      arg->type = kObjectTypeFloat;
-      return msgpack_rpc_to_float(obj, &arg->data.floating);
-
-    case MSGPACK_OBJECT_BIN:
-    case MSGPACK_OBJECT_STR:
-      arg->type = kObjectTypeString;
-      return msgpack_rpc_to_string(obj, &arg->data.string);
-
-    case MSGPACK_OBJECT_ARRAY:
-      arg->type = kObjectTypeArray;
-      return msgpack_rpc_to_array(obj, &arg->data.array);
-
-    case MSGPACK_OBJECT_MAP:
-      arg->type = kObjectTypeDictionary;
-      return msgpack_rpc_to_dictionary(obj, &arg->data.dictionary);
-
-    case MSGPACK_OBJECT_EXT:
-      switch (obj->via.ext.type) {
-        case kObjectTypeBuffer:
-          arg->type = kObjectTypeBuffer;
-          return msgpack_rpc_to_buffer(obj, &arg->data.buffer);
-        case kObjectTypeWindow:
-          arg->type = kObjectTypeWindow;
-          return msgpack_rpc_to_window(obj, &arg->data.window);
-        case kObjectTypeTabpage:
-          arg->type = kObjectTypeTabpage;
-          return msgpack_rpc_to_tabpage(obj, &arg->data.tabpage);
-      }
-    default:
-      return false;
-  }
-}
-
-bool msgpack_rpc_to_array(msgpack_object *obj, Array *arg)
+bool msgpack_rpc_to_array(const msgpack_object *const obj, Array *const arg)
   FUNC_ATTR_NONNULL_ALL
 {
   if (obj->type != MSGPACK_OBJECT_ARRAY) {
@@ -173,7 +273,8 @@ bool msgpack_rpc_to_array(msgpack_object *obj, Array *arg)
   return true;
 }
 
-bool msgpack_rpc_to_dictionary(msgpack_object *obj, Dictionary *arg)
+bool msgpack_rpc_to_dictionary(const msgpack_object *const obj,
+                               Dictionary *const arg)
   FUNC_ATTR_NONNULL_ALL
 {
   if (obj->type != MSGPACK_OBJECT_MAP) {
@@ -225,53 +326,113 @@ void msgpack_rpc_from_string(String result, msgpack_packer *res)
   FUNC_ATTR_NONNULL_ARG(2)
 {
   msgpack_pack_str(res, result.size);
-  msgpack_pack_str_body(res, result.data, result.size);
+  if (result.size > 0) {
+    msgpack_pack_str_body(res, result.data, result.size);
+  }
 }
 
-void msgpack_rpc_from_object(Object result, msgpack_packer *res)
+typedef struct {
+  const Object *aobj;
+  bool container;
+  size_t idx;
+} APIToMPObjectStackItem;
+
+/// Convert type used by Neovim API to msgpack
+///
+/// @param[in]  result  Object to convert.
+/// @param[out]  res  Structure that defines where conversion results are saved.
+///
+/// @return true in case of success, false otherwise.
+void msgpack_rpc_from_object(const Object result, msgpack_packer *const res)
   FUNC_ATTR_NONNULL_ARG(2)
 {
-  switch (result.type) {
-    case kObjectTypeNil:
-      msgpack_pack_nil(res);
-      break;
-
-    case kObjectTypeBoolean:
-      msgpack_rpc_from_boolean(result.data.boolean, res);
-      break;
-
-    case kObjectTypeInteger:
-      msgpack_rpc_from_integer(result.data.integer, res);
-      break;
-
-    case kObjectTypeFloat:
-      msgpack_rpc_from_float(result.data.floating, res);
-      break;
-
-    case kObjectTypeString:
-      msgpack_rpc_from_string(result.data.string, res);
-      break;
-
-    case kObjectTypeArray:
-      msgpack_rpc_from_array(result.data.array, res);
-      break;
-
-    case kObjectTypeBuffer:
-      msgpack_rpc_from_buffer(result.data.buffer, res);
-      break;
-
-    case kObjectTypeWindow:
-      msgpack_rpc_from_window(result.data.window, res);
-      break;
-
-    case kObjectTypeTabpage:
-      msgpack_rpc_from_tabpage(result.data.tabpage, res);
-      break;
-
-    case kObjectTypeDictionary:
-      msgpack_rpc_from_dictionary(result.data.dictionary, res);
-      break;
+  kvec_t(APIToMPObjectStackItem) stack = KV_INITIAL_VALUE;
+  kv_push(stack, ((APIToMPObjectStackItem) { &result, false, 0 }));
+  while (kv_size(stack)) {
+    APIToMPObjectStackItem cur = kv_last(stack);
+    switch (cur.aobj->type) {
+      case kObjectTypeNil: {
+        msgpack_pack_nil(res);
+        break;
+      }
+      case kObjectTypeBoolean: {
+        msgpack_rpc_from_boolean(cur.aobj->data.boolean, res);
+        break;
+      }
+      case kObjectTypeInteger: {
+        msgpack_rpc_from_integer(cur.aobj->data.integer, res);
+        break;
+      }
+      case kObjectTypeFloat: {
+        msgpack_rpc_from_float(cur.aobj->data.floating, res);
+        break;
+      }
+      case kObjectTypeString: {
+        msgpack_rpc_from_string(cur.aobj->data.string, res);
+        break;
+      }
+      case kObjectTypeBuffer: {
+        msgpack_rpc_from_buffer(cur.aobj->data.integer, res);
+        break;
+      }
+      case kObjectTypeWindow: {
+        msgpack_rpc_from_window(cur.aobj->data.integer, res);
+        break;
+      }
+      case kObjectTypeTabpage: {
+        msgpack_rpc_from_tabpage(cur.aobj->data.integer, res);
+        break;
+      }
+      case kObjectTypeArray: {
+        const size_t size = cur.aobj->data.array.size;
+        if (cur.container) {
+          if (cur.idx >= size) {
+            (void)kv_pop(stack);
+          } else {
+            const size_t idx = cur.idx;
+            cur.idx++;
+            kv_last(stack) = cur;
+            kv_push(stack, ((APIToMPObjectStackItem) {
+              .aobj = &cur.aobj->data.array.items[idx],
+              .container = false,
+            }));
+          }
+        } else {
+          msgpack_pack_array(res, size);
+          cur.container = true;
+          kv_last(stack) = cur;
+        }
+        break;
+      }
+      case kObjectTypeDictionary: {
+        const size_t size = cur.aobj->data.dictionary.size;
+        if (cur.container) {
+          if (cur.idx >= size) {
+            (void)kv_pop(stack);
+          } else {
+            const size_t idx = cur.idx;
+            cur.idx++;
+            kv_last(stack) = cur;
+            msgpack_rpc_from_string(cur.aobj->data.dictionary.items[idx].key,
+                                    res);
+            kv_push(stack, ((APIToMPObjectStackItem) {
+              .aobj = &cur.aobj->data.dictionary.items[idx].value,
+              .container = false,
+            }));
+          }
+        } else {
+          msgpack_pack_map(res, size);
+          cur.container = true;
+          kv_last(stack) = cur;
+        }
+        break;
+      }
+    }
+    if (!cur.container) {
+      (void)kv_pop(stack);
+    }
   }
+  kv_destroy(stack);
 }
 
 void msgpack_rpc_from_array(Array result, msgpack_packer *res)
@@ -297,7 +458,6 @@ void msgpack_rpc_from_dictionary(Dictionary result, msgpack_packer *res)
 
 /// Handler executed when an invalid method name is passed
 Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
-                                         uint64_t request_id,
                                          Array args,
                                          Error *error)
 {
@@ -308,7 +468,6 @@ Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
 
 /// Handler executed when malformated arguments are passed
 Object msgpack_rpc_handle_invalid_arguments(uint64_t channel_id,
-                                            uint64_t request_id,
                                             Array args,
                                             Error *error)
 {
diff --git a/src/nvim/msgpack_rpc/remote_ui.h b/src/nvim/msgpack_rpc/remote_ui.h
deleted file mode 100644
index 8af86dc1b8..0000000000
--- a/src/nvim/msgpack_rpc/remote_ui.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef NVIM_MSGPACK_RPC_REMOTE_UI_H
-#define NVIM_MSGPACK_RPC_REMOTE_UI_H
-
-#include "nvim/ui.h"
-
-#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "msgpack_rpc/remote_ui.h.generated.h"
-#endif
-#endif  // NVIM_MSGPACK_RPC_REMOTE_UI_H
diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c
index 6cc56ba3dd..d7c2926a0f 100644
--- a/src/nvim/msgpack_rpc/server.c
+++ b/src/nvim/msgpack_rpc/server.c
@@ -12,6 +12,7 @@
 #include "nvim/eval.h"
 #include "nvim/garray.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/log.h"
 #include "nvim/fileio.h"
@@ -39,6 +40,10 @@ bool server_init(void)
     listen_address = server_address_new();
   }
 
+  if (!listen_address) {
+    return false;
+  }
+
   bool ok = (server_start(listen_address) == 0);
   if (must_free) {
     xfree((char *) listen_address);
@@ -108,7 +113,7 @@ int server_start(const char *endpoint)
   }
 
   SocketWatcher *watcher = xmalloc(sizeof(SocketWatcher));
-  socket_watcher_init(&loop, watcher, endpoint, NULL);
+  socket_watcher_init(&main_loop, watcher, endpoint, NULL);
 
   // Check if a watcher for the endpoint already exists
   for (int i = 0; i < watchers.ga_len; i++) {
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 382c4943ff..b17b4c584e 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -36,7 +36,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/move.h"
 #include "nvim/mouse.h"
@@ -460,7 +459,7 @@ void normal_enter(bool cmdwin, bool noexmode)
   normal_state_init(&state);
   state.cmdwin = cmdwin;
   state.noexmode = noexmode;
-  state.toplevel = !cmdwin && !noexmode;
+  state.toplevel = (!cmdwin || cmdwin_result == 0) && !noexmode;
   state_enter(&state.state);
 }
 
@@ -974,7 +973,7 @@ static int normal_execute(VimState *state, int key)
   s->old_col = curwin->w_curswant;
   s->c = key;
 
-  LANGMAP_ADJUST(s->c, true);
+  LANGMAP_ADJUST(s->c, get_real_state() != SELECTMODE);
 
   // If a mapping was started in Visual or Select mode, remember the length
   // of the mapping.  This is used below to not return to Insert mode for as
@@ -1131,6 +1130,7 @@ static int normal_execute(VimState *state, int key)
       start_selection();
       unshift_special(&s->ca);
       s->idx = find_command(s->ca.cmdchar);
+      assert(s->idx >= 0);
     } else if ((nv_cmds[s->idx].cmd_flags & NV_SSS)
                && (mod_mask & MOD_MASK_SHIFT)) {
       start_selection();
@@ -1361,7 +1361,7 @@ static int normal_check(VimState *state)
   // Dict internally somewhere.
   // "may_garbage_collect" is reset in vgetc() which is invoked through
   // do_exmode() and normal_cmd().
-  may_garbage_collect = s->toplevel;
+  may_garbage_collect = !s->cmdwin && !s->noexmode;
 
   // Update w_curswant if w_set_curswant has been set.
   // Postponed until here to avoid computing w_virtcol too often.
@@ -1518,10 +1518,7 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
         coladvance(curwin->w_curswant);
       }
       cap->count0 = redo_VIsual_count;
-      if (redo_VIsual_count != 0)
-        cap->count1 = redo_VIsual_count;
-      else
-        cap->count1 = 1;
+      cap->count1 = (cap->count0 == 0 ? 1 : cap->count0);
     } else if (VIsual_active) {
       if (!gui_yank) {
         /* Save the current VIsual area for '< and '> marks, and "gv" */
@@ -1795,10 +1792,11 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank)
       if (oap->line_count < 2)
         oap->line_count = 2;
       if (curwin->w_cursor.lnum + oap->line_count - 1 >
-          curbuf->b_ml.ml_line_count)
+          curbuf->b_ml.ml_line_count) {
         beep_flush();
-      else {
-        do_join(oap->line_count, oap->op_type == OP_JOIN, true, true, true);
+      } else {
+        do_join((size_t)oap->line_count, oap->op_type == OP_JOIN,
+                true, true, true);
         auto_format(false, true);
       }
       break;
@@ -2109,6 +2107,20 @@ static void op_function(oparg_T *oap)
   }
 }
 
+// Move the current tab to tab in same column as mouse or to end of the
+// tabline if there is no tab there.
+static void move_tab_to_mouse(void)
+{
+  int tabnr = tab_page_click_defs[mouse_col].tabnr;
+  if (tabnr <= 0) {
+      tabpage_move(9999);
+  } else if (tabnr < tabpage_index(curtab)) {
+      tabpage_move(tabnr - 1);
+  } else {
+      tabpage_move(tabnr);
+  }
+}
+
 /*
  * Do the appropriate action for the current mouse click in the current mode.
  * Not used for Command-line mode.
@@ -2345,12 +2357,7 @@ do_mouse (
   if (mouse_row == 0 && firstwin->w_winrow > 0) {
     if (is_drag) {
       if (in_tab_line) {
-        if (tab_page_click_defs[mouse_col].type == kStlClickTabClose) {
-          tabpage_move(9999);
-        } else {
-          int tabnr = tab_page_click_defs[mouse_col].tabnr;
-          tabpage_move(tabnr < tabpage_index(curtab) ? tabnr - 1 : tabnr);
-        }
+        move_tab_to_mouse();
       }
       return false;
     }
@@ -2457,7 +2464,7 @@ do_mouse (
                            (int) strlen(tab_page_click_defs[mouse_col].func),
                            &rettv, ARRAY_SIZE(argv), argv,
                            curwin->w_cursor.lnum, curwin->w_cursor.lnum,
-                           &doesrange, true, NULL);
+                           &doesrange, true, NULL, NULL);
           clear_tv(&rettv);
           break;
         }
@@ -2465,10 +2472,7 @@ do_mouse (
     }
     return true;
   } else if (is_drag && in_tab_line) {
-    tabpage_move(tab_page_click_defs[mouse_col].type == kStlClickTabClose
-                 ? 9999
-                 : tab_page_click_defs[mouse_col].tabnr - 1);
-    in_tab_line = false;
+    move_tab_to_mouse();
     return false;
   }
 
@@ -3640,10 +3644,11 @@ nv_gd (
   size_t len;
   char_u *ptr;
   if ((len = find_ident_under_cursor(&ptr, FIND_IDENT)) == 0
-      || !find_decl(ptr, len, nchar == 'd', thisblock, 0))
+      || !find_decl(ptr, len, nchar == 'd', thisblock, SEARCH_START)) {
     clearopbeep(oap);
-  else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP)
+  } else if ((fdo_flags & FDO_SEARCH) && KeyTyped && oap->op_type == OP_NOP) {
     foldOpenCursor();
+  }
 }
 
 /*
@@ -3659,7 +3664,7 @@ find_decl (
     size_t len,
     bool locally,
     bool thisblock,
-    int searchflags                /* flags passed to searchit() */
+    int flags_arg                  // flags passed to searchit()
 )
 {
   char_u      *pat;
@@ -3671,6 +3676,7 @@ find_decl (
   bool save_p_scs;
   bool retval = true;
   bool incll;
+  int searchflags = flags_arg;
 
   pat = xmalloc(len + 7);
 
@@ -3744,10 +3750,12 @@ find_decl (
       break;
     }
 
-    /* For finding a local variable and the match is before the "{" search
-     * to find a later match.  For K&R style function declarations this
-     * skips the function header without types. */
+    // For finding a local variable and the match is before the "{" search
+    // to find a later match.  For K&R style function declarations this
+    // skips the function header without types.  Remove SEARCH_START from
+    // flags to avoid getting stuck at one position.
     found_pos = curwin->w_cursor;
+    searchflags &= ~SEARCH_START;
   }
 
   if (t == false) {
@@ -5918,6 +5926,8 @@ static void nv_replace(cmdarg_T *cap)
     curwin->w_set_curswant = true;
     set_last_insert(cap->nchar);
   }
+
+  foldUpdateAfterInsert();
 }
 
 /*
@@ -7666,7 +7676,7 @@ static void nv_join(cmdarg_T *cap)
 
     prep_redo(cap->oap->regname, cap->count0,
               NUL, cap->cmdchar, NUL, NUL, cap->nchar);
-    do_join(cap->count0, cap->nchar == NUL, true, true, true);
+    do_join((size_t)cap->count0, cap->nchar == NUL, true, true, true);
   }
 }
 
@@ -7715,16 +7725,22 @@ static void nv_put(cmdarg_T *cap)
         savereg = copy_register(regname);
       }
 
-      /* Now delete the selected text. */
-      cap->cmdchar = 'd';
-      cap->nchar = NUL;
-      cap->oap->regname = NUL;
-      nv_operator(cap);
-      do_pending_operator(cap, 0, false);
-      empty = (curbuf->b_ml.ml_flags & ML_EMPTY);
+      // To place the cursor correctly after a blockwise put, and to leave the
+      // text in the correct position when putting over a selection with
+      // 'virtualedit' and past the end of the line, we use the 'c' operator in
+      // do_put(), which requires the visual selection to still be active.
+      if (!VIsual_active || VIsual_mode == 'V' || regname != '.') {
+        // Now delete the selected text.
+        cap->cmdchar = 'd';
+        cap->nchar = NUL;
+        cap->oap->regname = NUL;
+        nv_operator(cap);
+        do_pending_operator(cap, 0, false);
+        empty = (curbuf->b_ml.ml_flags & ML_EMPTY);
 
-      /* delete PUT_LINE_BACKWARD; */
-      cap->oap->regname = regname;
+        // delete PUT_LINE_BACKWARD;
+        cap->oap->regname = regname;
+      }
 
       /* When deleted a linewise Visual area, put the register as
        * lines to avoid it joined with the next line.  When deletion was
@@ -7871,15 +7887,15 @@ static void nv_event(cmdarg_T *cap)
 {
   // Garbage collection should have been executed before blocking for events in
   // the `os_inchar` in `state_enter`, but we also disable it here in case the
-  // `os_inchar` branch was not executed(!queue_empty(loop.events), which could
-  // have `may_garbage_collect` set to true in `normal_check`).
+  // `os_inchar` branch was not executed (!multiqueue_empty(loop.events), which
+  // could have `may_garbage_collect` set to true in `normal_check`).
   //
   // That is because here we may run code that calls `os_inchar`
   // later(`f_confirm` or `get_keystroke` for example), but in these cases it is
   // not safe to perform garbage collection because there could be unreferenced
   // lists or dicts being used.
   may_garbage_collect = false;
-  queue_process_events(loop.events);
+  multiqueue_process_events(main_loop.events);
   cap->retval |= CA_COMMAND_BUSY;       // don't call edit() now
 }
 
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index adfd0424f0..9a01891483 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -1,6 +1,6 @@
 /*
  * ops.c: implementation of various operators: op_shift, op_delete, op_tilde,
- *	  op_change, op_yank, do_put, do_join
+ *        op_change, op_yank, do_put, do_join
  */
 
 #include <assert.h>
@@ -30,13 +30,13 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
 #include "nvim/path.h"
 #include "nvim/screen.h"
 #include "nvim/search.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/terminal.h"
 #include "nvim/ui.h"
@@ -51,10 +51,10 @@ static yankreg_T *y_previous = NULL; /* ptr to last written yankreg */
 
 static bool clipboard_didwarn_unnamed = false;
 
-// for behavior between start_global_changes() and end_global_changes())
+// for behavior between start_batch_changes() and end_batch_changes())
 static bool clipboard_delay_update = false;  // delay clipboard update
-static int global_change_count = 0;          // if set, inside global changes
-static bool clipboard_needs_update = false;  // the clipboard was updated
+static int batch_change_count = 0;           // inside a script
+static bool clipboard_needs_update = false;  // clipboard was updated
 
 /*
  * structure used by block_prep, op_delete and op_yank for blockwise operators
@@ -257,8 +257,7 @@ void op_shift(oparg_T *oap, int curs_top, int amount)
  * shift the current line one shiftwidth left (if left != 0) or right
  * leaves cursor on first blank in the line
  */
-void 
-shift_line (
+void shift_line(
     int left,
     int round,
     int amount,
@@ -340,10 +339,16 @@ static void shift_block(oparg_T *oap, int amount)
     total += bd.pre_whitesp;     /* all virtual WS up to & incl a split TAB */
     ws_vcol = bd.start_vcol - bd.pre_whitesp;
     if (bd.startspaces) {
-      if (has_mbyte)
-        bd.textstart += (*mb_ptr2len)(bd.textstart);
-      else
-        ++bd.textstart;
+      if (has_mbyte) {
+        if ((*mb_ptr2len)(bd.textstart) == 1) {
+          bd.textstart++;
+        } else {
+          ws_vcol = 0;
+          bd.startspaces = 0;
+        }
+      } else {
+        bd.textstart++;
+      }
     }
     for (; ascii_iswhite(*bd.textstart); ) {
       // TODO: is passing bd.textstart for start of the line OK?
@@ -369,18 +374,18 @@ static void shift_block(oparg_T *oap, int amount)
     memset(newp + bd.textcol + i, ' ', (size_t)j);
     /* the end */
     memmove(newp + bd.textcol + i + j, bd.textstart, (size_t)len);
-  } else { /* left */
-    colnr_T destination_col;            /* column to which text in block will
-                                           be shifted */
-    char_u      *verbatim_copy_end;     /* end of the part of the line which is
-                                           copied verbatim */
-    colnr_T verbatim_copy_width;        /* the (displayed) width of this part
-                                           of line */
-    unsigned fill;                      /* nr of spaces that replace a TAB */
-    unsigned new_line_len;              /* the length of the line after the
-                                           block shift */
-    size_t block_space_width;
-    size_t shift_amount;
+  } else {  // left
+    colnr_T destination_col;      // column to which text in block will
+                                  // be shifted
+    char_u *verbatim_copy_end;    // end of the part of the line which is
+                                  // copied verbatim
+    colnr_T verbatim_copy_width;  // the (displayed) width of this part
+                                  // of line
+    size_t fill;                  // nr of spaces that replace a TAB
+    size_t new_line_len;          // the length of the line after the
+                                  // block shift
+    colnr_T block_space_width;
+    colnr_T shift_amount;
     char_u      *non_white = bd.textstart;
     colnr_T non_white_col;
 
@@ -409,11 +414,10 @@ static void shift_block(oparg_T *oap, int amount)
     block_space_width = non_white_col - oap->start_vcol;
     /* We will shift by "total" or "block_space_width", whichever is less.
      */
-    shift_amount = (block_space_width < (size_t)total
-                    ? block_space_width : (size_t)total);
+    shift_amount = (block_space_width < total ? block_space_width : total);
 
-    /* The column to which we will shift the text.  */
-    destination_col = (colnr_T)(non_white_col - shift_amount);
+    // The column to which we will shift the text.
+    destination_col = non_white_col - shift_amount;
 
     /* Now let's find out how much of the beginning of the line we can
      * reuse without modification.  */
@@ -439,20 +443,21 @@ static void shift_block(oparg_T *oap, int amount)
     /* If "destination_col" is different from the width of the initial
     * part of the line that will be copied, it means we encountered a tab
     * character, which we will have to partly replace with spaces.  */
-    fill = destination_col - verbatim_copy_width;
-
-    /* The replacement line will consist of:
-     * - the beginning of the original line up to "verbatim_copy_end",
-     * - "fill" number of spaces,
-     * - the rest of the line, pointed to by non_white.  */
-    new_line_len = (unsigned)(verbatim_copy_end - oldp)
-                   + fill
-                   + (unsigned)STRLEN(non_white) + 1;
-
-    newp = (char_u *) xmalloc((size_t)(new_line_len));
-    memmove(newp, oldp, (size_t)(verbatim_copy_end - oldp));
-    memset(newp + (verbatim_copy_end - oldp), ' ', (size_t)fill);
-    STRMOVE(newp + (verbatim_copy_end - oldp) + fill, non_white);
+    assert(destination_col - verbatim_copy_width >= 0);
+    fill = (size_t)(destination_col - verbatim_copy_width);
+
+    assert(verbatim_copy_end - oldp >= 0);
+    size_t verbatim_diff = (size_t)(verbatim_copy_end - oldp);
+    // The replacement line will consist of:
+    // - the beginning of the original line up to "verbatim_copy_end",
+    // - "fill" number of spaces,
+    // - the rest of the line, pointed to by non_white.
+    new_line_len = verbatim_diff + fill + STRLEN(non_white) + 1;
+
+    newp = (char_u *) xmalloc(new_line_len);
+    memmove(newp, oldp, verbatim_diff);
+    memset(newp + verbatim_diff, ' ', fill);
+    STRMOVE(newp + verbatim_diff + fill, non_white);
   }
   /* replace the line */
   ml_replace(curwin->w_cursor.lnum, newp, FALSE);
@@ -469,21 +474,20 @@ static void shift_block(oparg_T *oap, int amount)
 static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def *bdp)
 {
   int p_ts;
-  int count = 0;                /* extra spaces to replace a cut TAB */
-  int spaces = 0;               /* non-zero if cutting a TAB */
-  colnr_T offset;               /* pointer along new line */
-  unsigned s_len;               /* STRLEN(s) */
-  char_u      *newp, *oldp;     /* new, old lines */
-  linenr_T lnum;                /* loop var */
+  int count = 0;                // extra spaces to replace a cut TAB
+  int spaces = 0;               // non-zero if cutting a TAB
+  colnr_T offset;               // pointer along new line
+  size_t s_len = STRLEN(s);
+  char_u      *newp, *oldp;     // new, old lines
+  linenr_T lnum;                // loop var
   int oldstate = State;
-
-  State = INSERT;               /* don't want REPLACE for State */
-  s_len = (unsigned)STRLEN(s);
+  State = INSERT;               // don't want REPLACE for State
 
   for (lnum = oap->start.lnum + 1; lnum <= oap->end.lnum; lnum++) {
-    block_prep(oap, bdp, lnum, TRUE);
-    if (bdp->is_short && b_insert)
-      continue;         /* OP_INSERT, line ends before block start */
+    block_prep(oap, bdp, lnum, true);
+    if (bdp->is_short && b_insert) {
+      continue;  // OP_INSERT, line ends before block start
+    }
 
     oldp = ml_get(lnum);
 
@@ -523,25 +527,26 @@ static void block_insert(oparg_T *oap, char_u *s, int b_insert, struct block_def
       count -= off;
     }
 
-    newp = (char_u *) xmalloc((size_t)(STRLEN(oldp) + s_len + count + 1));
+    assert(count >= 0);
+    newp = (char_u *)xmalloc(STRLEN(oldp) + s_len + (size_t)count + 1);
 
-    /* copy up to shifted part */
-    memmove(newp, oldp, (size_t)(offset));
+    // copy up to shifted part
+    memmove(newp, oldp, (size_t)offset);
     oldp += offset;
 
-    /* insert pre-padding */
+    // insert pre-padding
     memset(newp + offset, ' ', (size_t)spaces);
 
-    /* copy the new text */
-    memmove(newp + offset + spaces, s, (size_t)s_len);
-    offset += s_len;
+    // copy the new text
+    memmove(newp + offset + spaces, s, s_len);
+    offset += (int)s_len;
 
     if (spaces && !bdp->is_short) {
-      /* insert post-padding */
+      // insert post-padding
       memset(newp + offset + spaces, ' ', (size_t)(p_ts - spaces));
-      /* We're splitting a TAB, don't copy it. */
+      // We're splitting a TAB, don't copy it.
       oldp++;
-      /* We allowed for that TAB, remember this now */
+      // We allowed for that TAB, remember this now
       count++;
     }
 
@@ -804,7 +809,7 @@ yankreg_T *copy_register(int name)
     copy->y_array = NULL;
   } else {
     copy->y_array = xcalloc(copy->y_size, sizeof(char_u *));
-    for (linenr_T i = 0; i < copy->y_size; i++) {
+    for (size_t i = 0; i < copy->y_size; i++) {
       copy->y_array[i] = vim_strsave(reg->y_array[i]);
     }
   }
@@ -888,7 +893,7 @@ static void set_yreg_additional_data(yankreg_T *reg, dict_T *additional_data)
 
 /*
  * Stuff string "p" into yank register "regname" as a single line (append if
- * uppercase).	"p" must have been alloced.
+ * uppercase). "p" must have been alloced.
  *
  * return FAIL for failure, OK otherwise
  */
@@ -940,10 +945,8 @@ do_execreg (
     int silent                     /* set "silent" flag in typeahead buffer */
 )
 {
-  long i;
-  char_u      *p;
+  char_u *p;
   int retval = OK;
-  int remap;
 
   if (regname == '@') {                 /* repeat previous one */
     if (execreg_lastc == NUL) {
@@ -1001,21 +1004,20 @@ do_execreg (
     if (reg->y_array == NULL)
       return FAIL;
 
-    /* Disallow remaping for ":@r". */
-    remap = colon ? REMAP_NONE : REMAP_YES;
+    // Disallow remaping for ":@r".
+    int remap = colon ? REMAP_NONE : REMAP_YES;
 
     /*
      * Insert lines into typeahead buffer, from last one to first one.
      */
     put_reedit_in_typebuf(silent);
-    for (i = reg->y_size - 1; i >= 0; i--) {
-      char_u *escaped;
-
+    char_u *escaped;
+    for (size_t i = reg->y_size; i-- > 0;) {  // from y_size - 1 to 0 included
       // insert NL between lines and after last line if type is kMTLineWise
-      if (reg->y_type == kMTLineWise || i < reg->y_size - 1
-          || addcr) {
-        if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL)
+      if (reg->y_type == kMTLineWise || i < reg->y_size - 1 || addcr) {
+        if (ins_typebuf((char_u *)"\n", remap, 0, true, silent) == FAIL) {
           return FAIL;
+        }
       }
       escaped = vim_strsave_escape_csi(reg->y_array[i]);
       retval = ins_typebuf(escaped, remap, 0, TRUE, silent);
@@ -1045,7 +1047,7 @@ static void put_reedit_in_typebuf(int silent)
       buf[1] = 'R';
       buf[2] = NUL;
     } else {
-      buf[0] = restart_edit == 'I' ? 'i' : restart_edit;
+      buf[0] = (char_u)(restart_edit == 'I' ? 'i' : restart_edit);
       buf[1] = NUL;
     }
     if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK)
@@ -1059,8 +1061,7 @@ static void put_reedit_in_typebuf(int silent)
  * When "esc" is TRUE it is to be taken literally: Escape CSI characters and
  * no remapping.
  */
-static int 
-put_in_typebuf (
+static int put_in_typebuf(
     char_u *s,
     int esc,
     int colon,                  /* add ':' before the line */
@@ -1098,13 +1099,11 @@ put_in_typebuf (
  *
  * return FAIL for failure, OK otherwise
  */
-int 
-insert_reg (
+int insert_reg(
     int regname,
     int literally                  /* insert literally, not as if typed */
 )
 {
-  long i;
   int retval = OK;
   char_u      *arg;
   int allocated;
@@ -1132,10 +1131,10 @@ insert_reg (
       xfree(arg);
   } else {                            /* name or number register */
     yankreg_T *reg = get_yank_register(regname, YREG_PASTE);
-    if (reg->y_array == NULL)
+    if (reg->y_array == NULL) {
       retval = FAIL;
-    else {
-      for (i = 0; i < reg->y_size; i++) {
+    } else {
+      for (size_t i = 0; i < reg->y_size; i++) {
         stuffescaped(reg->y_array[i], literally);
         // Insert a newline between lines and after last line if
         // y_type is kMTLineWise.
@@ -1185,8 +1184,7 @@ static void stuffescaped(char_u *arg, int literally)
  * If "regname" is a special register, return TRUE and store a pointer to its
  * value in "argp".
  */
-int 
-get_spec_reg (
+int get_spec_reg(
     int regname,
     char_u **argp,
     int *allocated,         /* return: TRUE when value was allocated */
@@ -1273,13 +1271,11 @@ get_spec_reg (
 /// @returns FAIL for failure, OK otherwise
 bool cmdline_paste_reg(int regname, bool literally, bool remcr)
 {
-  long i;
-
   yankreg_T *reg = get_yank_register(regname, YREG_PASTE);
   if (reg->y_array == NULL)
     return FAIL;
 
-  for (i = 0; i < reg->y_size; i++) {
+  for (size_t i = 0; i < reg->y_size; i++) {
     cmdline_paste_str(reg->y_array[i], literally);
 
     // Insert ^M between lines and after last line if type is kMTLineWise.
@@ -1311,12 +1307,14 @@ int op_delete(oparg_T *oap)
   struct block_def bd;
   linenr_T old_lcount = curbuf->b_ml.ml_line_count;
 
-  if (curbuf->b_ml.ml_flags & ML_EMPTY)             /* nothing to do */
+  if (curbuf->b_ml.ml_flags & ML_EMPTY) {  // nothing to do
     return OK;
+  }
 
-  /* Nothing to delete, return here.	Do prepare undo, for op_change(). */
-  if (oap->empty)
+  // Nothing to delete, return here. Do prepare undo, for op_change().
+  if (oap->empty) {
     return u_save_cursor();
+  }
 
   if (!MODIFIABLE(curbuf)) {
     EMSG(_(e_modifiable));
@@ -1406,7 +1404,7 @@ int op_delete(oparg_T *oap)
 
     if (oap->regname == 0) {
       set_clipboard(0, reg);
-      yank_do_autocmd(oap, reg);
+      do_autocmd_textyankpost(oap, reg);
     }
 
   }
@@ -1431,23 +1429,21 @@ int op_delete(oparg_T *oap)
         curwin->w_cursor.coladd = 0;
       }
 
-      /* n == number of chars deleted
-       * If we delete a TAB, it may be replaced by several characters.
-       * Thus the number of characters may increase!
-       */
+      // n == number of chars deleted
+      // If we delete a TAB, it may be replaced by several characters.
+      // Thus the number of characters may increase!
       n = bd.textlen - bd.startspaces - bd.endspaces;
       oldp = ml_get(lnum);
-      newp = (char_u *) xmalloc((size_t)(STRLEN(oldp) + 1 - n));
-      /* copy up to deleted part */
+      newp = (char_u *)xmalloc(STRLEN(oldp) - (size_t)n + 1);
+      // copy up to deleted part
       memmove(newp, oldp, (size_t)bd.textcol);
-      /* insert spaces */
-      memset(newp + bd.textcol, ' ',
-          (size_t)(bd.startspaces + bd.endspaces));
-      /* copy the part after the deleted part */
+      // insert spaces
+      memset(newp + bd.textcol, ' ', (size_t)(bd.startspaces + bd.endspaces));
+      // copy the part after the deleted part
       oldp += bd.textcol + bd.textlen;
       STRMOVE(newp + bd.textcol + bd.startspaces + bd.endspaces, oldp);
-      /* replace the line */
-      ml_replace(lnum, newp, FALSE);
+      // replace the line
+      ml_replace(lnum, newp, false);
     }
 
     check_cursor_col();
@@ -1552,7 +1548,7 @@ int op_delete(oparg_T *oap)
           curwin->w_cursor.coladd = 0;
       }
 
-      (void)del_bytes((long)n, !virtual_op,
+      (void)del_bytes((colnr_T)n, !virtual_op,
                       oap->op_type == OP_DELETE && !oap->is_VIsual);
     } else {
       // delete characters between lines
@@ -1572,7 +1568,7 @@ int op_delete(oparg_T *oap)
       // delete from start of line until op_end
       n = (oap->end.col + 1 - !oap->inclusive);
       curwin->w_cursor.col = 0;
-      (void)del_bytes((long)n, !virtual_op,
+      (void)del_bytes((colnr_T)n, !virtual_op,
                       oap->op_type == OP_DELETE && !oap->is_VIsual);
       curwin->w_cursor = curpos;  // restore curwin->w_cursor
       (void)do_join(2, false, false, false, false);
@@ -1611,7 +1607,8 @@ static void mb_adjust_opend(oparg_T *oap)
  */
 static inline void pchar(pos_T lp, int c)
 {
-    *(ml_get_buf(curbuf, lp.lnum, TRUE) + lp.col) = c;;
+    assert(c <= UCHAR_MAX);
+    *(ml_get_buf(curbuf, lp.lnum, true) + lp.col) = (char_u)c;
 }
 
 /*
@@ -1622,7 +1619,7 @@ int op_replace(oparg_T *oap, int c)
   int n, numc;
   int num_chars;
   char_u              *newp, *oldp;
-  size_t oldlen;
+  colnr_T oldlen;
   struct block_def bd;
   char_u              *after_p = NULL;
   int had_ctrl_v_cr = (c == -1 || c == -2);
@@ -1690,42 +1687,56 @@ int op_replace(oparg_T *oap, int c)
       /* Compute bytes needed, move character count to num_chars. */
       num_chars = numc;
       numc *= (*mb_char2len)(c);
-      /* oldlen includes textlen, so don't double count */
-      n += numc - bd.textlen;
 
       oldp = get_cursor_line_ptr();
-      oldlen = STRLEN(oldp);
-      newp = (char_u *) xmalloc((size_t)(oldlen + 1 + n));
-      memset(newp, NUL, (size_t)(oldlen + 1 + n));
-      /* copy up to deleted part */
+      oldlen = (int)STRLEN(oldp);
+
+      size_t newp_size = (size_t)(bd.textcol + bd.startspaces);
+      if (had_ctrl_v_cr || (c != '\r' && c != '\n')) {
+        newp_size += (size_t)numc;
+        if (!bd.is_short) {
+          newp_size += (size_t)(bd.endspaces + oldlen
+                                - bd.textcol - bd.textlen);
+        }
+      }
+      newp = xmallocz(newp_size);
+      // copy up to deleted part
       memmove(newp, oldp, (size_t)bd.textcol);
       oldp += bd.textcol + bd.textlen;
-      /* insert pre-spaces */
+      // insert pre-spaces
       memset(newp + bd.textcol, ' ', (size_t)bd.startspaces);
-      /* insert replacement chars CHECK FOR ALLOCATED SPACE */
-      /* -1/-2 is used for entering CR literally. */
+      // insert replacement chars CHECK FOR ALLOCATED SPACE
+      // -1/-2 is used for entering CR literally.
+      size_t after_p_len = 0;
       if (had_ctrl_v_cr || (c != '\r' && c != '\n')) {
-        if (has_mbyte) {
-          n = (int)STRLEN(newp);
-          while (--num_chars >= 0)
-            n += (*mb_char2bytes)(c, newp + n);
-        } else
-          memset(newp + STRLEN(newp), c, (size_t)numc);
-        if (!bd.is_short) {
-          /* insert post-spaces */
-          memset(newp + STRLEN(newp), ' ', (size_t)bd.endspaces);
-          /* copy the part after the changed part */
-          STRMOVE(newp + STRLEN(newp), oldp);
+          // strlen(newp) at this point
+          int newp_len = bd.textcol + bd.startspaces;
+          if (has_mbyte) {
+            while (--num_chars >= 0) {
+              newp_len += (*mb_char2bytes)(c, newp + newp_len);
+            }
+          } else {
+            memset(newp + newp_len, c, (size_t)numc);
+            newp_len += numc;
+          }
+          if (!bd.is_short) {
+            // insert post-spaces
+            memset(newp + newp_len, ' ', (size_t)bd.endspaces);
+            newp_len += bd.endspaces;
+            // copy the part after the changed part
+            memmove(newp + newp_len, oldp,
+                    (size_t)(oldlen - bd.textcol - bd.textlen + 1));
         }
       } else {
-        /* Replacing with \r or \n means splitting the line. */
-        after_p = (char_u *) xmalloc((size_t)(oldlen + 1 + n - STRLEN(newp)));
-        STRMOVE(after_p, oldp);
+        // Replacing with \r or \n means splitting the line.
+        after_p_len = (size_t)(oldlen - bd.textcol - bd.textlen + 1);
+        after_p = (char_u *)xmalloc(after_p_len);
+        memmove(after_p, oldp, after_p_len);
       }
       /* replace the line */
       ml_replace(curwin->w_cursor.lnum, newp, FALSE);
       if (after_p != NULL) {
-        ml_append(curwin->w_cursor.lnum++, after_p, 0, FALSE);
+        ml_append(curwin->w_cursor.lnum++, after_p, (int)after_p_len, false);
         appended_lines_mark(curwin->w_cursor.lnum, 1L);
         oap->end.lnum++;
         xfree(after_p);
@@ -1925,8 +1936,7 @@ int swapchar(int op_type, pos_T *pos)
   if (c >= 0x80 && op_type == OP_ROT13)
     return FALSE;
 
-  if (op_type == OP_UPPER && c == 0xdf
-      && (enc_latin1like || STRCMP(p_enc, "iso-8859-2") == 0)) {
+  if (op_type == OP_UPPER && c == 0xdf) {
     pos_T sp = curwin->w_cursor;
 
     /* Special handling of German sharp s: change to "SS". */
@@ -1992,7 +2002,7 @@ void op_insert(oparg_T *oap, long count1)
     // already disabled, but still need it when calling
     // coladvance_force().
     if (curwin->w_cursor.coladd > 0) {
-      int old_ve_flags = ve_flags;
+      unsigned old_ve_flags = ve_flags;
 
       ve_flags = VE_ALL;
       if (u_save_cursor() == FAIL)
@@ -2066,8 +2076,8 @@ void op_insert(oparg_T *oap, long count1)
       if (oap->op_type == OP_INSERT
           && oap->start.col + oap->start.coladd
           != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) {
-        size_t t = getviscol2(curbuf->b_op_start_orig.col,
-                              curbuf->b_op_start_orig.coladd);
+        int t = getviscol2(curbuf->b_op_start_orig.col,
+                           curbuf->b_op_start_orig.coladd);
         oap->start.col = curbuf->b_op_start_orig.col;
         pre_textlen -= t - oap->start_vcol;
         oap->start_vcol = t;
@@ -2075,8 +2085,8 @@ void op_insert(oparg_T *oap, long count1)
                  && oap->end.col + oap->end.coladd
                  >= curbuf->b_op_start_orig.col
                  + curbuf->b_op_start_orig.coladd) {
-        size_t t = getviscol2(curbuf->b_op_start_orig.col,
-                              curbuf->b_op_start_orig.coladd);
+        int t = getviscol2(curbuf->b_op_start_orig.col,
+                           curbuf->b_op_start_orig.coladd);
         oap->start.col = curbuf->b_op_start_orig.col;
         /* reset pre_textlen to the value of OP_INSERT */
         pre_textlen += bd.textlen;
@@ -2109,14 +2119,13 @@ void op_insert(oparg_T *oap, long count1)
     firstline = ml_get(oap->start.lnum) + bd.textcol;
     if (oap->op_type == OP_APPEND)
       firstline += bd.textlen;
-    if (pre_textlen >= 0
-        && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) {
-      ins_text = vim_strnsave(firstline, (int)ins_len);
-      /* block handled here */
-      if (u_save(oap->start.lnum,
-              (linenr_T)(oap->end.lnum + 1)) == OK)
-        block_insert(oap, ins_text, (oap->op_type == OP_INSERT),
-            &bd);
+    ins_len = (long)STRLEN(firstline) - pre_textlen;
+    if (pre_textlen >= 0 && ins_len > 0) {
+      ins_text = vim_strnsave(firstline, (size_t)ins_len);
+      // block handled here
+      if (u_save(oap->start.lnum, (linenr_T)(oap->end.lnum + 1)) == OK) {
+        block_insert(oap, ins_text, (oap->op_type == OP_INSERT), &bd);
+      }
 
       curwin->w_cursor.col = oap->start.col;
       check_cursor();
@@ -2139,8 +2148,10 @@ int op_change(oparg_T *oap)
   long ins_len;
   long pre_textlen = 0;
   long pre_indent = 0;
-  char_u              *firstline;
-  char_u              *ins_text, *newp, *oldp;
+  char_u *newp;
+  char_u *firstline;
+  char_u *ins_text;
+  char_u *oldp;
   struct block_def bd;
 
   l = oap->start.col;
@@ -2198,14 +2209,14 @@ int op_change(oparg_T *oap)
       long new_indent = (long)(skipwhite(firstline) - firstline);
 
       pre_textlen += new_indent - pre_indent;
-      bd.textcol += new_indent - pre_indent;
+      bd.textcol += (colnr_T)(new_indent - pre_indent);
     }
 
     ins_len = (long)STRLEN(firstline) - pre_textlen;
     if (ins_len > 0) {
       /* Subsequent calls to ml_get() flush the firstline data - take a
        * copy of the inserted text.  */
-      ins_text = (char_u *) xmalloc((size_t)(ins_len + 1));
+      ins_text = (char_u *)xmalloc((size_t)(ins_len + 1));
       STRLCPY(ins_text, firstline + bd.textcol, ins_len + 1);
       for (linenr = oap->start.lnum + 1; linenr <= oap->end.lnum;
            linenr++) {
@@ -2218,11 +2229,13 @@ int op_change(oparg_T *oap)
           if (bd.is_short) {
             vpos.lnum = linenr;
             (void)getvpos(&vpos, oap->start_vcol);
-          } else
+          } else {
             vpos.coladd = 0;
+          }
           oldp = ml_get(linenr);
-          newp = (char_u *) xmalloc((size_t)(STRLEN(oldp) + vpos.coladd + ins_len + 1));
-          /* copy up to block start */
+          newp = xmalloc(STRLEN(oldp) + (size_t)vpos.coladd
+                         + (size_t)ins_len + 1);
+          // copy up to block start
           memmove(newp, oldp, (size_t)bd.textcol);
           offset = bd.textcol;
           memset(newp + offset, ' ', (size_t)vpos.coladd);
@@ -2272,9 +2285,7 @@ void free_register(yankreg_T *reg)
 {
   set_yreg_additional_data(reg, NULL);
   if (reg->y_array != NULL) {
-    long i;
-
-    for (i = reg->y_size - 1; i >= 0; i--) {
+    for (size_t i = reg->y_size; i-- > 0;) {  // from y_size - 1 to 0 included
       xfree(reg->y_array[i]);
     }
     xfree(reg->y_array);
@@ -2304,37 +2315,34 @@ bool op_yank(oparg_T *oap, bool message)
   yankreg_T *reg = get_yank_register(oap->regname, YREG_YANK);
   op_yank_reg(oap, message, reg, is_append_register(oap->regname));
   set_clipboard(oap->regname, reg);
-  yank_do_autocmd(oap, reg);
+  do_autocmd_textyankpost(oap, reg);
 
   return true;
 }
 
 static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
 {
-  long y_idx;                           /* index in y_array[] */
-  yankreg_T      *curr;            /* copy of current register */
-  yankreg_T newreg;                /* new yank register when appending */
-  char_u              **new_ptr;
-  linenr_T lnum;                        /* current line number */
-  long j;
+  yankreg_T newreg;  // new yank register when appending
+  char_u **new_ptr;
+  linenr_T lnum;     // current line number
+  size_t j;
   MotionType yank_type = oap->motion_type;
-  long yanklines = oap->line_count;
+  size_t yanklines = (size_t)oap->line_count;
   linenr_T yankendlnum = oap->end.lnum;
-  char_u              *p;
-  char_u              *pnew;
+  char_u *p;
+  char_u *pnew;
   struct block_def bd;
 
-  curr = reg;
-  /* append to existing contents */
-  if (append && reg->y_array != NULL)
+  yankreg_T *curr = reg;  // copy of current register
+  // append to existing contents
+  if (append && reg->y_array != NULL) {
     reg = &newreg;
-  else
-    free_register(reg);                /* free previously yanked lines */
+  } else {
+    free_register(reg);  // free previously yanked lines
+  }
 
-  /*
-   * If the cursor was in column 1 before and after the movement, and the
-   * operator is not inclusive, the yank is always linewise.
-   */
+  // If the cursor was in column 1 before and after the movement, and the
+  // operator is not inclusive, the yank is always linewise.
   if (oap->motion_type == kMTCharWise
       && oap->start.col == 0
       && !oap->inclusive
@@ -2353,7 +2361,7 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
   reg->additional_data = NULL;
   reg->timestamp = os_time();
 
-  y_idx = 0;
+  size_t y_idx = 0;  // index in y_array[]
   lnum = oap->start.lnum;
 
   if (yank_type == kMTBlockWise) {
@@ -2481,7 +2489,7 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
       yanklines = 0;
     }
     // Some versions of Vi use ">=" here, some don't...
-    if (yanklines > p_report) {
+    if (yanklines > (size_t)p_report) {
       // redisplay now, so message is not deleted
       update_topline_redraw();
       if (yanklines == 1) {
@@ -2512,10 +2520,10 @@ static void op_yank_reg(oparg_T *oap, bool message, yankreg_T *reg, bool append)
   return;
 }
 
-static void yank_copy_line(yankreg_T *reg, struct block_def *bd, long y_idx)
+static void yank_copy_line(yankreg_T *reg, struct block_def *bd, size_t y_idx)
 {
-  char_u *pnew = xmallocz(bd->startspaces + bd->endspaces + bd->textlen);
-
+  char_u *pnew = xmallocz((size_t)(bd->startspaces + bd->endspaces
+                                   + bd->textlen));
   reg->y_array[y_idx] = pnew;
   memset(pnew, ' ', (size_t)bd->startspaces);
   pnew += bd->startspaces;
@@ -2530,7 +2538,7 @@ static void yank_copy_line(yankreg_T *reg, struct block_def *bd, long y_idx)
 ///
 /// @param oap Operator arguments.
 /// @param reg The yank register used.
-static void yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
+static void do_autocmd_textyankpost(oparg_T *oap, yankreg_T *reg)
   FUNC_ATTR_NONNULL_ALL
 {
   static bool recursive = false;
@@ -2548,7 +2556,7 @@ static void yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
 
   // the yanked text
   list_T *list = list_alloc();
-  for (linenr_T i = 0; i < reg->y_size; i++) {
+  for (size_t i = 0; i < reg->y_size; i++) {
     list_append_string(list, reg->y_array[i], -1);
   }
   list->lv_lock = VAR_FIXED;
@@ -2565,7 +2573,7 @@ static void yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
   dict_add_nr_str(dict, "regname", 0, (char_u *)buf);
 
   // kind of operation (yank/delete/change)
-  buf[0] = get_op_char(oap->op_type);
+  buf[0] = (char)get_op_char(oap->op_type);
   buf[1] = NUL;
   dict_add_nr_str(dict, "operator", 0, (char_u *)buf);
 
@@ -2582,23 +2590,24 @@ static void yank_do_autocmd(oparg_T *oap, yankreg_T *reg)
 /*
  * Put contents of register "regname" into the text.
  * Caller must check "regname" to be valid!
- * "flags": PUT_FIXINDENT	make indent look nice
- *	    PUT_CURSEND		leave cursor after end of new text
- *	    PUT_LINE		force linewise put (":put")
+ * "flags": PUT_FIXINDENT     make indent look nice
+ *          PUT_CURSEND       leave cursor after end of new text
+ *          PUT_LINE          force linewise put (":put")
     dir: BACKWARD for 'P', FORWARD for 'p' */
 void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
 {
-  char_u      *ptr;
-  char_u      *newp, *oldp;
+  char_u *ptr;
+  char_u *newp;
+  char_u *oldp;
   int yanklen;
-  int totlen = 0;                       /* init for gcc */
+  size_t totlen = 0;  // init for gcc
   linenr_T lnum;
   colnr_T col;
-  long i;  // index in y_array[]
+  size_t i;  // index in y_array[]
   MotionType y_type;
-  long y_size;
-  int oldlen;
-  long y_width = 0;
+  size_t y_size;
+  size_t oldlen;
+  int y_width = 0;
   colnr_T vcol;
   int delcount;
   int incr = 0;
@@ -2628,12 +2637,79 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
    * special characters (newlines, etc.).
    */
   if (regname == '.') {
-    (void)stuff_inserted((dir == FORWARD ? (count == -1 ? 'o' : 'a') :
-                          (count == -1 ? 'O' : 'i')), count, FALSE);
-    /* Putting the text is done later, so can't really move the cursor to
-     * the next character.  Use "l" to simulate it. */
-    if ((flags & PUT_CURSEND) && gchar_cursor() != NUL)
-      stuffcharReadbuff('l');
+    bool non_linewise_vis = (VIsual_active && VIsual_mode != 'V');
+
+    // PUT_LINE has special handling below which means we use 'i' to start.
+    char command_start_char = non_linewise_vis ? 'c' :
+      (flags & PUT_LINE ? 'i' : (dir == FORWARD ? 'a' : 'i'));
+
+    // To avoid 'autoindent' on linewise puts, create a new line with `:put _`.
+    if (flags & PUT_LINE) {
+      do_put('_', NULL, dir, 1, PUT_LINE);
+    }
+
+    // If given a count when putting linewise, we stuff the readbuf with the
+    // dot register 'count' times split by newlines.
+    if (flags & PUT_LINE) {
+      stuffcharReadbuff(command_start_char);
+      for (; count > 0; count--) {
+        (void)stuff_inserted(NUL, 1, count != 1);
+        if (count != 1) {
+          // To avoid 'autoindent' affecting the text, use Ctrl_U to remove any
+          // whitespace. Can't just insert Ctrl_U into readbuf1, this would go
+          // back to the previous line in the case of 'noautoindent' and
+          // 'backspace' includes "eol". So we insert a dummy space for Ctrl_U
+          // to consume.
+          stuffReadbuff((char_u *)"\n ");
+          stuffcharReadbuff(Ctrl_U);
+        }
+      }
+    } else {
+      (void)stuff_inserted(command_start_char, count, false);
+    }
+
+    // Putting the text is done later, so can't move the cursor to the next
+    // character.  Simulate it with motion commands after the insert.
+    if (flags & PUT_CURSEND) {
+      if (flags & PUT_LINE) {
+        stuffReadbuff((char_u *)"j0");
+      } else {
+        // Avoid ringing the bell from attempting to move into the space after
+        // the current line. We can stuff the readbuffer with "l" if:
+        // 1) 'virtualedit' is "all" or "onemore"
+        // 2) We are not at the end of the line
+        // 3) We are not  (one past the end of the line && on the last line)
+        //    This allows a visual put over a selection one past the end of the
+        //    line joining the current line with the one below.
+
+        // curwin->w_cursor.col marks the byte position of the cursor in the
+        // currunt line. It increases up to a max of
+        // STRLEN(ml_get(curwin->w_cursor.lnum)). With 'virtualedit' and the
+        // cursor past the end of the line, curwin->w_cursor.coladd is
+        // incremented instead of curwin->w_cursor.col.
+        char_u *cursor_pos = get_cursor_pos_ptr();
+        bool one_past_line = (*cursor_pos == NUL);
+        bool eol = false;
+        if (!one_past_line) {
+          eol = (*(cursor_pos + mb_ptr2len(cursor_pos)) == NUL);
+        }
+
+        bool ve_allows = (ve_flags == VE_ALL || ve_flags == VE_ONEMORE);
+        bool eof = curbuf->b_ml.ml_line_count == curwin->w_cursor.lnum
+                   && one_past_line;
+        if (ve_allows || !(eol || eof)) {
+          stuffcharReadbuff('l');
+        }
+      }
+    } else if (flags & PUT_LINE) {
+      stuffReadbuff((char_u *)"g'[");
+    }
+
+    // So the 'u' command restores cursor position after ".p, save the cursor
+    // position now (though not saving any text).
+    if (command_start_char == 'a') {
+      u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1);
+    }
     return;
   }
 
@@ -2705,7 +2781,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
   if (curbuf->terminal) {
     for (int i = 0; i < count; i++) {
       // feed the lines to the terminal
-      for (int j = 0; j < y_size; j++) {
+      for (size_t j = 0; j < y_size; j++) {
         if (j) {
           // terminate the previous line
           terminal_send(curbuf->terminal, "\n", 1);
@@ -2736,7 +2812,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       if (dir == FORWARD && *p != NUL) {
         mb_ptr_adv(p);
       }
-      ptr = vim_strnsave(oldp, p - oldp);
+      ptr = vim_strnsave(oldp, (size_t)(p - oldp));
       ml_replace(curwin->w_cursor.lnum, ptr, false);
       nr_lines++;
       dir = FORWARD;
@@ -2761,11 +2837,13 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
   }
 
   if (y_type == kMTBlockWise) {
-    lnum = curwin->w_cursor.lnum + y_size + 1;
-    if (lnum > curbuf->b_ml.ml_line_count)
+    lnum = curwin->w_cursor.lnum + (linenr_T)y_size + 1;
+    if (lnum > curbuf->b_ml.ml_line_count) {
       lnum = curbuf->b_ml.ml_line_count + 1;
-    if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL)
+    }
+    if (u_save(curwin->w_cursor.lnum - 1, lnum) == FAIL) {
       goto end;
+    }
   } else if (y_type == kMTLineWise) {
     lnum = curwin->w_cursor.lnum;
     /* Correct line number for closed fold.  Don't move the cursor yet,
@@ -2811,7 +2889,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
    * Block mode
    */
   if (y_type == kMTBlockWise) {
-    char c = gchar_cursor();
+    int c = gchar_cursor();
     colnr_T endcol2 = 0;
 
     if (dir == FORWARD && c != NUL) {
@@ -2820,14 +2898,12 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       else
         getvcol(curwin, &curwin->w_cursor, NULL, NULL, &col);
 
-      if (has_mbyte)
-        /* move to start of next multi-byte character */
-        curwin->w_cursor.col += (*mb_ptr2len)(get_cursor_pos_ptr());
-      else if (c != TAB || ve_flags != VE_ALL)
-        ++curwin->w_cursor.col;
-      ++col;
-    } else
+      // move to start of next multi-byte character
+      curwin->w_cursor.col += (*mb_ptr2len)(get_cursor_pos_ptr());
+      col++;
+    } else {
       getvcol(curwin, &curwin->w_cursor, &col, NULL, &endcol2);
+    }
 
     col += curwin->w_cursor.coladd;
     if (ve_flags == VE_ALL
@@ -2864,7 +2940,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       }
       /* get the old line and advance to the position to insert at */
       oldp = get_cursor_line_ptr();
-      oldlen = (int)STRLEN(oldp);
+      oldlen = STRLEN(oldp);
       for (ptr = oldp; vcol < col && *ptr; ) {
         /* Count a tab for what it's worth (if list mode not on) */
         incr = lbr_chartabsize_adv(oldp, &ptr, (colnr_T)vcol);
@@ -2881,8 +2957,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
         bd.startspaces = incr - bd.endspaces;
         --bd.textcol;
         delcount = 1;
-        if (has_mbyte)
-          bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol);
+        bd.textcol -= (*mb_head_off)(oldp, oldp + bd.textcol);
         if (oldp[bd.textcol] != TAB) {
           /* Only a Tab can be split into spaces.  Other
            * characters will have to be moved to after the
@@ -2901,10 +2976,11 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       if (spaces < 0)
         spaces = 0;
 
-      /* insert the new text */
-      totlen = count * (yanklen + spaces) + bd.startspaces + bd.endspaces;
-      newp = (char_u *) xmalloc((size_t)(totlen + oldlen + 1));
-      /* copy part up to cursor to new line */
+      // insert the new text
+      totlen = (size_t)(count * (yanklen + spaces)
+                        + bd.startspaces + bd.endspaces);
+      newp = (char_u *) xmalloc(totlen + oldlen + 1);
+      // copy part up to cursor to new line
       ptr = newp;
       memmove(ptr, oldp, (size_t)bd.textcol);
       ptr += bd.textcol;
@@ -2925,10 +3001,10 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       /* may insert some spaces after the new text */
       memset(ptr, ' ', (size_t)bd.endspaces);
       ptr += bd.endspaces;
-      /* move the text after the cursor to the end of the line. */
+      // move the text after the cursor to the end of the line.
       memmove(ptr, oldp + bd.textcol + delcount,
-          (size_t)(oldlen - bd.textcol - delcount + 1));
-      ml_replace(curwin->w_cursor.lnum, newp, FALSE);
+              (size_t)((int)oldlen - bd.textcol - delcount + 1));
+      ml_replace(curwin->w_cursor.lnum, newp, false);
 
       ++curwin->w_cursor.lnum;
       if (i == 0)
@@ -2943,7 +3019,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
 
     /* adjust '] mark */
     curbuf->b_op_end.lnum = curwin->w_cursor.lnum - 1;
-    curbuf->b_op_end.col = bd.textcol + totlen - 1;
+    curbuf->b_op_end.col = bd.textcol + (colnr_T)totlen - 1;
     curbuf->b_op_end.coladd = 0;
     if (flags & PUT_CURSEND) {
       colnr_T len;
@@ -2963,21 +3039,13 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
       // if type is kMTCharWise, FORWARD is the same as BACKWARD on the next
       // char
       if (dir == FORWARD && gchar_cursor() != NUL) {
-        if (has_mbyte) {
-          int bytelen = (*mb_ptr2len)(get_cursor_pos_ptr());
-
-          /* put it on the next of the multi-byte character. */
-          col += bytelen;
-          if (yanklen) {
-            curwin->w_cursor.col += bytelen;
-            curbuf->b_op_end.col += bytelen;
-          }
-        } else {
-          ++col;
-          if (yanklen) {
-            ++curwin->w_cursor.col;
-            ++curbuf->b_op_end.col;
-          }
+        int bytelen = (*mb_ptr2len)(get_cursor_pos_ptr());
+
+        // put it on the next of the multi-byte character.
+        col += bytelen;
+        if (yanklen) {
+          curwin->w_cursor.col += bytelen;
+          curbuf->b_op_end.col += bytelen;
         }
       }
       curbuf->b_op_start = curwin->w_cursor;
@@ -2994,13 +3062,13 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
      */
     if (y_type == kMTCharWise && y_size == 1) {
       do {
-        totlen = count * yanklen;
+        totlen = (size_t)(count * yanklen);
         if (totlen > 0) {
           oldp = ml_get(lnum);
           newp = (char_u *) xmalloc((size_t)(STRLEN(oldp) + totlen + 1));
           memmove(newp, oldp, (size_t)col);
           ptr = newp + col;
-          for (i = 0; i < count; i++) {
+          for (i = 0; i < (size_t)count; i++) {
             memmove(ptr, y_array[0], (size_t)yanklen);
             ptr += yanklen;
           }
@@ -3015,7 +3083,9 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
         }
         if (VIsual_active)
           lnum++;
-      } while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum);
+      } while (VIsual_active
+               && (lnum <= curbuf->b_visual.vi_end.lnum
+                   || lnum <= curbuf->b_visual.vi_start.lnum));
 
       if (VIsual_active) {  /* reset lnum to the last visual line */
         lnum--;
@@ -3037,7 +3107,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
           // Then append y_array[0] to first line.
           lnum = new_cursor.lnum;
           ptr = ml_get(lnum) + col;
-          totlen = (int)STRLEN(y_array[y_size - 1]);
+          totlen = STRLEN(y_array[y_size - 1]);
           newp = (char_u *) xmalloc((size_t)(STRLEN(ptr) + totlen + 1));
           STRCPY(newp, y_array[y_size - 1]);
           STRCAT(newp, ptr);
@@ -3097,8 +3167,13 @@ error:
         if (dir == FORWARD)
           curbuf->b_op_start.lnum++;
       }
-      mark_adjust(curbuf->b_op_start.lnum + (y_type == kMTCharWise),
-                  (linenr_T)MAXLNUM, nr_lines, 0L);
+      // Skip mark_adjust when adding lines after the last one, there
+      // can't be marks there.
+      if (curbuf->b_op_start.lnum + (y_type == kMTCharWise) - 1 + nr_lines
+          < curbuf->b_ml.ml_line_count) {
+        mark_adjust(curbuf->b_op_start.lnum + (y_type == kMTCharWise),
+                    (linenr_T)MAXLNUM, nr_lines, 0L);
+      }
 
       // note changed text for displaying and folding
       if (y_type == kMTCharWise) {
@@ -3217,22 +3292,19 @@ int get_register_name(int num)
  */
 void ex_display(exarg_T *eap)
 {
-  int i, n;
-  long j;
-  char_u              *p;
-  yankreg_T      *yb;
+  char_u *p;
+  yankreg_T *yb;
   int name;
-  int attr;
-  char_u              *arg = eap->arg;
+  char_u *arg = eap->arg;
   int clen;
 
   if (arg != NULL && *arg == NUL)
     arg = NULL;
-  attr = hl_attr(HLF_8);
+  int attr = hl_attr(HLF_8);
 
   /* Highlight title */
   MSG_PUTS_TITLE(_("\n--- Registers ---"));
-  for (i = -1; i < NUM_REGISTERS && !got_int; i++) {
+  for (int i = -1; i < NUM_REGISTERS && !got_int; i++) {
     name = get_register_name(i);
 
     if (arg != NULL && vim_strchr(arg, name) == NULL) {
@@ -3261,8 +3333,8 @@ void ex_display(exarg_T *eap)
       msg_putchar(name);
       MSG_PUTS("   ");
 
-      n = (int)Columns - 6;
-      for (j = 0; j < yb->y_size && n > 1; ++j) {
+      int n = (int)Columns - 6;
+      for (size_t j = 0; j < yb->y_size && n > 1; j++) {
         if (j) {
           MSG_PUTS_ATTR("^J", attr);
           n -= 2;
@@ -3438,7 +3510,7 @@ static char_u *skip_comment(char_u *line, int process, int include_space, int *i
 // to set those marks.
 //
 // return FAIL for failure, OK otherwise
-int do_join(long count,
+int do_join(size_t count,
             int insert_space,
             int save_undo,
             int use_formatoptions,
@@ -3461,24 +3533,21 @@ int do_join(long count,
                         && has_format_option(FO_REMOVE_COMS);
   int prev_was_comment;
 
-  assert(count > 1);
-  if (save_undo && u_save((linenr_T)(curwin->w_cursor.lnum - 1),
-          (linenr_T)(curwin->w_cursor.lnum + count)) == FAIL)
+  if (save_undo && u_save(curwin->w_cursor.lnum - 1,
+                          curwin->w_cursor.lnum + (linenr_T)count) == FAIL) {
     return FAIL;
-
-  /* Allocate an array to store the number of spaces inserted before each
-   * line.  We will use it to pre-compute the length of the new line and the
-   * proper placement of each original line in the new one. */
+  }
+  // Allocate an array to store the number of spaces inserted before each
+  // line.  We will use it to pre-compute the length of the new line and the
+  // proper placement of each original line in the new one.
   spaces = xcalloc(count, 1);
   if (remove_comments) {
     comments = xcalloc(count, sizeof(*comments));
   }
 
-  /*
-   * Don't move anything, just compute the final line length
-   * and setup the array of space strings lengths
-   */
-  for (t = 0; t < count; ++t) {
+  // Don't move anything, just compute the final line length
+  // and setup the array of space strings lengths
+  for (t = 0; t < (linenr_T)count; t++) {
     curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
     if (t == 0 && setmark) {
       // Set the '[ mark.
@@ -3558,7 +3627,7 @@ int do_join(long count,
    * column.  This is not Vi compatible, but Vi deletes the marks, thus that
    * should not really be a problem.
    */
-  for (t = count - 1;; --t) {
+  for (t = (linenr_T)count - 1;; t--) {
     cend -= currsize;
     memmove(cend, curr, (size_t)currsize);
     if (spaces[t] > 0) {
@@ -3595,8 +3664,8 @@ int do_join(long count,
    * have moved up (last line deleted), so the current lnum is kept in t.
    */
   t = curwin->w_cursor.lnum;
-  ++curwin->w_cursor.lnum;
-  del_lines(count - 1, FALSE);
+  curwin->w_cursor.lnum++;
+  del_lines((long)count - 1, false);
   curwin->w_cursor.lnum = t;
 
   /*
@@ -3778,8 +3847,8 @@ fex_format (
    * Set v:lnum to the first line number and v:count to the number of lines.
    * Set v:char to the character to be inserted (can be NUL).
    */
-  set_vim_var_nr(VV_LNUM, lnum);
-  set_vim_var_nr(VV_COUNT, count);
+  set_vim_var_nr(VV_LNUM, (varnumber_T)lnum);
+  set_vim_var_nr(VV_COUNT, (varnumber_T)count);
   set_vim_var_char(c);
 
   /*
@@ -4473,7 +4542,7 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
           firstdigit = 'a';
         }
       } else {
-        firstdigit -= Prenum1;
+        firstdigit -= (int)Prenum1;
       }
     } else {
       if (26 - CharOrd(firstdigit) - 1 < Prenum1) {
@@ -4483,7 +4552,7 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
           firstdigit = 'z';
         }
       } else {
-        firstdigit += Prenum1;
+        firstdigit += (int)Prenum1;
       }
     }
     curwin->w_cursor.col = col;
@@ -4591,12 +4660,12 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
     // Prepare the leading characters in buf1[].
     // When there are many leading zeros it could be very long.
     // Allocate a bit too much.
-    buf1 = xmalloc(length + NUMBUFLEN);
+    buf1 = xmalloc((size_t)length + NUMBUFLEN);
     if (buf1 == NULL) {
       goto theend;
     }
     ptr = buf1;
-    if (negative && (!visual || (visual && was_positive))) {
+    if (negative && (!visual || was_positive)) {
       *ptr++ = '-';
     }
     if (pre) {
@@ -4604,7 +4673,7 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
       length--;
     }
     if (pre == 'b' || pre == 'B' || pre == 'x' || pre == 'X') {
-      *ptr++ = pre;
+      *ptr++ = (char_u)pre;
       length--;
     }
 
@@ -4668,6 +4737,8 @@ int do_addsub(int op_type, pos_T *pos, int length, linenr_T Prenum1)
 theend:
   if (visual) {
     curwin->w_cursor = save_cursor;
+  } else if (did_change) {
+    curwin->w_set_curswant = true;
   }
 
   return did_change;
@@ -4767,8 +4838,6 @@ static void *get_reg_wrap_one_line(char_u *s, int flags)
 /// @returns NULL for error.
 void *get_reg_contents(int regname, int flags)
 {
-  long i;
-
   // Don't allow using an expression register inside an expression.
   if (regname == '=') {
     if (flags & kGRegNoExpr) {
@@ -4804,7 +4873,7 @@ void *get_reg_contents(int regname, int flags)
 
   if (flags & kGRegList) {
     list_T *list = list_alloc();
-    for (int i = 0; i < reg->y_size; i++) {
+    for (size_t i = 0; i < reg->y_size; i++) {
       list_append_string(list, reg->y_array[i], -1);
     }
 
@@ -4815,7 +4884,7 @@ void *get_reg_contents(int regname, int flags)
    * Compute length of resulting string.
    */
   size_t len = 0;
-  for (i = 0; i < reg->y_size; i++) {
+  for (size_t i = 0; i < reg->y_size; i++) {
     len += STRLEN(reg->y_array[i]);
     /*
      * Insert a newline between lines and after last line if
@@ -4832,7 +4901,7 @@ void *get_reg_contents(int regname, int flags)
    * Copy the lines of the yank register into the string.
    */
   len = 0;
-  for (i = 0; i < reg->y_size; i++) {
+  for (size_t i = 0; i < reg->y_size; i++) {
     STRCPY(retval + len, reg->y_array[i]);
     len += STRLEN(retval + len);
 
@@ -4888,7 +4957,7 @@ void write_reg_contents(int name, const char_u *str, ssize_t len,
 
 void write_reg_contents_lst(int name, char_u **strings, int maxlen,
                             bool must_append, MotionType yank_type,
-                            long block_len)
+                            colnr_T block_len)
 {
   if (name == '/' || name == '=') {
     char_u  *s = strings[0];
@@ -4913,7 +4982,8 @@ void write_reg_contents_lst(int name, char_u **strings, int maxlen,
     return;
   }
 
-  str_to_reg(reg, yank_type, (char_u *) strings, -1, block_len, true);
+  str_to_reg(reg, yank_type, (char_u *)strings, STRLEN((char_u *)strings),
+             block_len, true);
   finish_write_reg(name, reg, old_y_previous);
 }
 
@@ -4941,7 +5011,7 @@ void write_reg_contents_ex(int name,
                            ssize_t len,
                            bool must_append,
                            MotionType yank_type,
-                           long block_len)
+                           colnr_T block_len)
 {
   if (len < 0) {
     len = (ssize_t) STRLEN(str);
@@ -4991,7 +5061,7 @@ void write_reg_contents_ex(int name,
     // Copy the input string into the adjusted memory at the specified
     // offset.
     expr_line = xrealloc(expr_line, totlen + 1);
-    memcpy(expr_line + offset, str, (size_t) len);
+    memcpy(expr_line + offset, str, (size_t)len);
     expr_line[totlen] = NUL;
 
     return;
@@ -5005,7 +5075,7 @@ void write_reg_contents_ex(int name,
   if (!(reg = init_write_reg(name, &old_y_previous, must_append))) {
     return;
   }
-  str_to_reg(reg, yank_type, str, len, block_len, false);
+  str_to_reg(reg, yank_type, str, (size_t)len, block_len, false);
   finish_write_reg(name, reg, old_y_previous);
 }
 
@@ -5061,7 +5131,7 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type,
                          (y_ptr->y_size + newlines) * sizeof(char_u *));
   y_ptr->y_array = pp;
 
-  linenr_T lnum = y_ptr->y_size;  // The current line number.
+  size_t lnum = y_ptr->y_size;  // The current line number.
 
   // If called with `blocklen < 0`, we have to update the yank reg's width.
   size_t maxlen = 0;
@@ -5080,7 +5150,9 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type,
     for (const char_u *start = str, *end = str + len;
          start < end + extraline;
          start += line_len + 1, lnum++) {
-      line_len = (const char_u *) xmemscan(start, '\n', end - start) - start;
+      assert(end - start >= 0);
+      line_len = (size_t)((char_u *)xmemscan(start, '\n',
+                                             (size_t)(end - start)) - start);
       if (line_len > maxlen) {
         maxlen = line_len;
       }
@@ -5090,7 +5162,7 @@ static void str_to_reg(yankreg_T *y_ptr, MotionType yank_type,
       char_u *s = xmallocz(line_len + extra);
       memcpy(s, pp[lnum], extra);
       memcpy(s + extra, start, line_len);
-      ssize_t s_len = extra + line_len;
+      size_t s_len = extra + line_len;
 
       if (append) {
         xfree(pp[lnum]);
@@ -5427,7 +5499,8 @@ static yankreg_T *adjust_clipboard_name(int *name, bool quiet, bool writing)
   if (*name == '*' || *name == '+') {
     if(!eval_has_provider("clipboard")) {
       if (!quiet) {
-        EMSG("clipboard: provider is not available");
+        EMSG("clipboard: No provider. Try \":CheckHealth\" or "
+             "\":h clipboard\".");
       }
       return NULL;
     }
@@ -5435,7 +5508,8 @@ static yankreg_T *adjust_clipboard_name(int *name, bool quiet, bool writing)
   } else if ((*name == NUL) && (cb_flags & CB_UNNAMEDMASK)) {
     if(!eval_has_provider("clipboard")) {
       if (!quiet && !clipboard_didwarn_unnamed) {
-        msg((char_u*)"clipboard: provider not available, ignoring clipboard=unnamed[plus]");
+        msg((char_u *)"clipboard: No provider. Try \":CheckHealth\" or "
+            "\":h clipboard\".");
         clipboard_didwarn_unnamed = true;
       }
       return NULL;
@@ -5450,7 +5524,7 @@ static yankreg_T *adjust_clipboard_name(int *name, bool quiet, bool writing)
 
     yankreg_T *target;
     if (cb_flags & CB_UNNAMEDPLUS) {
-      *name = cb_flags & CB_UNNAMED ? '"': '+';
+      *name = (cb_flags & CB_UNNAMED && writing) ? '"': '+';
       target = &y_regs[PLUS_REGISTER];
     } else {
       *name = '*';
@@ -5474,7 +5548,7 @@ static bool get_clipboard(int name, yankreg_T **target, bool quiet)
   free_register(reg);
 
   list_T *args = list_alloc();
-  char_u regname = name;
+  char_u regname = (char_u)name;
   list_append_string(args, &regname, 1);
 
   typval_T result = eval_call_provider("clipboard", "get", args);
@@ -5519,8 +5593,8 @@ static bool get_clipboard(int name, yankreg_T **target, bool quiet)
     reg->y_type = kMTUnknown;
   }
 
-  reg->y_array = xcalloc(lines->lv_len, sizeof(uint8_t *));
-  reg->y_size = lines->lv_len;
+  reg->y_array = xcalloc((size_t)lines->lv_len, sizeof(uint8_t *));
+  reg->y_size = (size_t)lines->lv_len;
   reg->additional_data = NULL;
   reg->timestamp = 0;
   // Timestamp is not saved for clipboard registers because clipboard registers
@@ -5551,14 +5625,15 @@ static bool get_clipboard(int name, yankreg_T **target, bool quiet)
   }
 
   if (reg->y_type == kMTBlockWise) {
-    int maxlen = 0;
-    for (int i = 0; i < reg->y_size; i++) {
-      int rowlen = STRLEN(reg->y_array[i]);
+    size_t maxlen = 0;
+    for (size_t i = 0; i < reg->y_size; i++) {
+      size_t rowlen = STRLEN(reg->y_array[i]);
       if (rowlen > maxlen) {
         maxlen = rowlen;
       }
     }
-    reg->y_width = maxlen-1;
+    assert(maxlen <= INT_MAX);
+    reg->y_width = (int)maxlen - 1;
   }
 
   *target = reg;
@@ -5566,7 +5641,7 @@ static bool get_clipboard(int name, yankreg_T **target, bool quiet)
 
 err:
   if (reg->y_array) {
-    for (int i = 0; i < reg->y_size; i++) {
+    for (size_t i = 0; i < reg->y_size; i++) {
       xfree(reg->y_array[i]);
     }
     xfree(reg->y_array);
@@ -5590,7 +5665,7 @@ static void set_clipboard(int name, yankreg_T *reg)
 
   list_T *lines = list_alloc();
 
-  for (int i = 0; i < reg->y_size; i++) {
+  for (size_t i = 0; i < reg->y_size; i++) {
     list_append_string(lines, reg->y_array[i], -1);
   }
 
@@ -5615,26 +5690,26 @@ static void set_clipboard(int name, yankreg_T *reg)
   }
   list_append_string(args, &regtype, 1);
 
-  char_u regname = name;
+  char_u regname = (char_u)name;
   list_append_string(args, &regname, 1);
 
   (void)eval_call_provider("clipboard", "set", args);
 }
 
-/// Avoid clipboard (slow) during batch operations (:global).
-void start_global_changes(void)
+/// Avoid clipboard (slow) during batch operations (i.e., a script).
+void start_batch_changes(void)
 {
-  if (++global_change_count > 1) {
+  if (++batch_change_count > 1) {
     return;
   }
   clipboard_delay_update = true;
   clipboard_needs_update = false;
 }
 
-/// Update the clipboard after :global changes finished.
-void end_global_changes(void)
+/// Update the clipboard after batch changes finished.
+void end_batch_changes(void)
 {
-  if (--global_change_count > 0) {
+  if (--batch_change_count > 0) {
     // recursive
     return;
   }
@@ -5678,8 +5753,8 @@ const void *op_register_iter(const void *const iter, char *const name,
   if (iter_reg - &(y_regs[0]) == NUM_SAVED_REGISTERS || reg_empty(iter_reg)) {
     return NULL;
   }
-  size_t iter_off = iter_reg - &(y_regs[0]);
-  *name = (char) get_register_name(iter_off);
+  int iter_off = (int)(iter_reg - &(y_regs[0]));
+  *name = (char)get_register_name(iter_off);
   *reg = *iter_reg;
   while (++iter_reg - &(y_regs[0]) < NUM_SAVED_REGISTERS) {
     if (!reg_empty(iter_reg)) {
diff --git a/src/nvim/ops.h b/src/nvim/ops.h
index 8c8a586957..44df2e9e0c 100644
--- a/src/nvim/ops.h
+++ b/src/nvim/ops.h
@@ -79,7 +79,7 @@ enum GRegFlags {
 /// Definition of one register
 typedef struct yankreg {
   char_u **y_array;   ///< Pointer to an array of line pointers.
-  linenr_T y_size;    ///< Number of lines in y_array.
+  size_t y_size;      ///< Number of lines in y_array.
   MotionType y_type;  ///< Register type
   colnr_T y_width;    ///< Register width (only valid for y_type == kBlockWise).
   Timestamp timestamp;  ///< Time when register was last modified.
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 45ebb4fa4c..a4e7da770e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -213,12 +213,12 @@ typedef struct vimoption {
 #define P_VI_DEF        0x400U   /* Use Vi default for Vim */
 #define P_VIM           0x800U   /* Vim option */
 
-/* when option changed, what to display: */
-#define P_RSTAT         0x1000U  /* redraw status lines */
-#define P_RWIN          0x2000U  /* redraw current window */
-#define P_RBUF          0x4000U  /* redraw current buffer */
-#define P_RALL          0x6000U  /* redraw all windows */
-#define P_RCLR          0x7000U  /* clear and redraw all */
+// when option changed, what to display:
+#define P_RSTAT         0x1000U  ///< redraw status lines
+#define P_RWIN          0x2000U  ///< redraw current window and recompute text
+#define P_RBUF          0x4000U  ///< redraw current buffer and recompute text
+#define P_RALL          0x6000U  ///< redraw all windows
+#define P_RCLR          0x7000U  ///< clear and redraw all
 
 #define P_COMMA         0x8000U    ///< comma separated list
 #define P_ONECOMMA      0x18000U   ///< P_COMMA and cannot have two consecutive
@@ -236,6 +236,9 @@ typedef struct vimoption {
 #define P_NO_ML        0x2000000U  ///< not allowed in modeline
 #define P_CURSWANT     0x4000000U  ///< update curswant required; not needed
                                    ///< when there is a redraw flag
+#define P_NO_DEF_EXP   0x8000000U  ///< Do not expand default value.
+
+#define P_RWINONLY     0x10000000U  ///< only redraw current window
 
 #define HIGHLIGHT_INIT \
   "8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText," \
@@ -245,7 +248,7 @@ typedef struct vimoption {
   "A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,>:SignColumn,-:Conceal," \
   "B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel," \
   "x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill," \
-  "!:CursorColumn,.:CursorLine,o:ColorColumn"
+  "!:CursorColumn,.:CursorLine,o:ColorColumn,q:QuickFixLine"
 
 /*
  * options[] is initialized here.
@@ -287,6 +290,8 @@ static char *(p_fdm_values[]) =       { "manual", "expr", "marker", "indent",
 static char *(p_fcl_values[]) =       { "all", NULL };
 static char *(p_cot_values[]) =       { "menu", "menuone", "longest", "preview",
                                         "noinsert", "noselect", NULL };
+static char *(p_icm_values[]) =       { "nosplit", "split", NULL };
+static char *(p_scl_values[]) =       { "yes", "no", "auto", NULL };
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "option.c.generated.h"
@@ -520,6 +525,8 @@ static void set_runtimepath_default(void)
 #undef SITE_SIZE
 #undef AFTER_SIZE
   set_string_default("runtimepath", rtp, true);
+  // Make a copy of 'rtp' for 'packpath'
+  set_string_default("packpath", rtp, false);
   xfree(data_dirs);
   xfree(config_dirs);
   xfree(data_home);
@@ -676,15 +683,18 @@ void set_init_1(void)
 #endif
                      false);
 
-  char *backupdir = stdpaths_user_data_subpath("backup", 0);
+  char *backupdir = stdpaths_user_data_subpath("backup", 0, true);
   const size_t backupdir_len = strlen(backupdir);
   backupdir = xrealloc(backupdir, backupdir_len + 3);
   memmove(backupdir + 2, backupdir, backupdir_len + 1);
   memmove(backupdir, ".,", 2);
-  set_string_default("viewdir", stdpaths_user_data_subpath("view", 0), true);
+  set_string_default("viewdir", stdpaths_user_data_subpath("view", 0, true),
+                     true);
   set_string_default("backupdir", backupdir, true);
-  set_string_default("directory", stdpaths_user_data_subpath("swap", 2), true);
-  set_string_default("undodir", stdpaths_user_data_subpath("undo", 0), true);
+  set_string_default("directory", stdpaths_user_data_subpath("swap", 2, true),
+                     true);
+  set_string_default("undodir", stdpaths_user_data_subpath("undo", 0, true),
+                     true);
   // Set default for &runtimepath. All necessary expansions are performed in
   // this function.
   set_runtimepath_default();
@@ -726,6 +736,9 @@ void set_init_1(void)
    * default.
    */
   for (opt_idx = 0; options[opt_idx].fullname; opt_idx++) {
+    if (options[opt_idx].flags & P_NO_DEF_EXP) {
+      continue;
+    }
     char *p;
     if ((options[opt_idx].flags & P_GETTEXT)
         && options[opt_idx].var != NULL) {
@@ -771,14 +784,11 @@ void set_init_1(void)
   }
   fenc_default = p;
 
-  // Initialize multibyte (utf-8) handling
-  mb_init();
-
-  // Don't change &encoding when resetting to defaults with ":set all&".
-  opt_idx = findoption((char_u *)"encoding");
-  if (opt_idx >= 0) {
-    options[opt_idx].flags |= P_NODEFAULT;
-  }
+#ifdef HAVE_WORKING_LIBINTL
+  // GNU gettext 0.10.37 supports this feature: set the codeset used for
+  // translated messages independently from the current locale.
+  (void)bind_textdomain_codeset(PROJECT_NAME, (char *)p_enc);
+#endif
 
   /* Set the default for 'helplang'. */
   set_helplang_default(get_mess_lang());
@@ -1023,6 +1033,15 @@ void set_init_3(void)
     xfree(p);
   }
 
+  if (bufempty()) {
+    int idx_ffs = findoption((char_u *)"ffs");
+
+    // Apply the first entry of 'fileformats' to the initial buffer.
+    if (idx_ffs >= 0 && (options[idx_ffs].flags & P_WAS_SET)) {
+      set_fileformat(default_fileformat(), OPT_LOCAL);
+    }
+  }
+
   set_title_defaults();
 }
 
@@ -1473,16 +1492,19 @@ do_set (
                * default value was already expanded, only
                * required when an environment variable was set
                * later */
-              if (newval == NULL)
+              new_value_alloced = true;
+              if (newval == NULL) {
                 newval = empty_option;
-              else {
+              } else if (!(options[opt_idx].flags | P_NO_DEF_EXP)) {
                 s = option_expand(opt_idx, newval);
-                if (s == NULL)
+                if (s == NULL) {
                   s = newval;
+                }
                 newval = vim_strsave(s);
+              } else {
+                newval = (char_u *)xstrdup((char *)newval);
               }
-              new_value_alloced = TRUE;
-            } else if (nextchar == '<') {             /* set to global val */
+            } else if (nextchar == '<') {  // set to global val
               newval = vim_strsave(*(char_u **)get_varp_scope(
                       &(options[opt_idx]), OPT_GLOBAL));
               new_value_alloced = TRUE;
@@ -1708,13 +1730,25 @@ do_set (
               }
 
               if (flags & P_FLAGLIST) {
-                /* Remove flags that appear twice. */
-                for (s = newval; *s; ++s)
-                  if ((!(flags & P_COMMA) || *s != ',')
-                      && vim_strchr(s + 1, *s) != NULL) {
-                    STRMOVE(s, s + 1);
-                    --s;
+                // Remove flags that appear twice.
+                for (s = newval; *s; s++) {
+                  // if options have P_FLAGLIST and P_ONECOMMA such as
+                  // 'whichwrap'
+                  if (flags & P_ONECOMMA) {
+                    if (*s != ',' && *(s + 1) == ','
+                        && vim_strchr(s + 2, *s) != NULL) {
+                      // Remove the duplicated value and the next comma.
+                      STRMOVE(s, s + 2);
+                      s -= 2;
+                    }
+                  } else {
+                    if ((!(flags & P_COMMA) || *s != ',')
+                        && vim_strchr(s + 1, *s) != NULL) {
+                      STRMOVE(s, s + 1);
+                      s--;
+                    }
                   }
+                }
               }
 
               if (save_arg != NULL)                 /* number for 'whichwrap' */
@@ -2020,13 +2054,15 @@ static char_u *option_expand(int opt_idx, char_u *val)
   if (!(options[opt_idx].flags & P_EXPAND) || options[opt_idx].var == NULL)
     return NULL;
 
-  /* If val is longer than MAXPATHL no meaningful expansion can be done,
-   * expand_env() would truncate the string. */
-  if (val != NULL && STRLEN(val) > MAXPATHL)
-    return NULL;
-
-  if (val == NULL)
+  if (val == NULL) {
     val = *(char_u **)options[opt_idx].var;
+  }
+
+  // If val is longer than MAXPATHL no meaningful expansion can be done,
+  // expand_env() would truncate the string.
+  if (val == NULL || STRLEN(val) > MAXPATHL) {
+    return NULL;
+  }
 
   /*
    * Expanding this with NameBuff, expand_env() must not be passed IObuff.
@@ -2129,6 +2165,7 @@ void check_buf_options(buf_T *buf)
   check_string_option(&buf->b_p_nf);
   check_string_option(&buf->b_p_qe);
   check_string_option(&buf->b_p_syn);
+  check_string_option(&buf->b_s.b_syn_isk);
   check_string_option(&buf->b_s.b_p_spc);
   check_string_option(&buf->b_s.b_p_spf);
   check_string_option(&buf->b_s.b_p_spl);
@@ -2313,50 +2350,46 @@ set_string_option_global (
   }
 }
 
-/*
- * Set a string option to a new value, and handle the effects.
- *
- * Returns NULL on success or error message on error.
- */
-static char_u *
-set_string_option (
-    int opt_idx,
-    char_u *value,
-    int opt_flags                  /* OPT_LOCAL and/or OPT_GLOBAL */
-)
+/// Set a string option to a new value, handling the effects
+///
+/// @param[in]  opt_idx  Option to set.
+/// @param[in]  value  New value.
+/// @param[in]  opt_flags  Option flags: expected to contain #OPT_LOCAL and/or
+///                        #OPT_GLOBAL.
+///
+/// @return NULL on success, error message on error.
+static char *set_string_option(const int opt_idx, const char *const value,
+                               const int opt_flags)
+  FUNC_ATTR_NONNULL_ARG(2) FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  char_u      *s;
-  char_u      **varp;
-  char_u      *oldval;
-  char *saved_oldval = NULL;
-  char_u      *r = NULL;
-
-  if (options[opt_idx].var == NULL)     /* don't set hidden option */
+  if (options[opt_idx].var == NULL) {  // don't set hidden option
     return NULL;
+  }
 
-  s = vim_strsave(value);
-  varp = (char_u **)get_varp_scope(&(options[opt_idx]),
-      (opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0
-      ? (((int)options[opt_idx].indir & PV_BOTH)
-        ? OPT_GLOBAL : OPT_LOCAL)
-      : opt_flags);
-  oldval = *varp;
+  char *const s = xstrdup(value);
+  char **const varp = (char **)get_varp_scope(
+      &(options[opt_idx]),
+      ((opt_flags & (OPT_LOCAL | OPT_GLOBAL)) == 0
+       ? (((int)options[opt_idx].indir & PV_BOTH)
+          ? OPT_GLOBAL : OPT_LOCAL)
+       : opt_flags));
+  char *const oldval = *varp;
   *varp = s;
 
-  if (!starting) {
-    saved_oldval = xstrdup((char *) oldval);
-  }
+  char *const saved_oldval = (starting ? NULL : xstrdup(oldval));
 
-  if ((r = did_set_string_option(opt_idx, varp, (int)true, oldval, NULL,
-          opt_flags)) == NULL)
-    did_set_option(opt_idx, opt_flags, TRUE);
+  char *const r = (char *)did_set_string_option(
+      opt_idx, (char_u **)varp, (int)true, (char_u *)oldval, NULL, opt_flags);
+  if (r == NULL) {
+    did_set_option(opt_idx, opt_flags, true);
+  }
 
   // call autocommand after handling side effects
   if (saved_oldval != NULL) {
     char buf_type[7];
     vim_snprintf(buf_type, ARRAY_SIZE(buf_type), "%s",
                  (opt_flags & OPT_LOCAL) ? "local" : "global");
-    set_vim_var_string(VV_OPTION_NEW, (char *) (*varp), -1);
+    set_vim_var_string(VV_OPTION_NEW, (char *)(*varp), -1);
     set_vim_var_string(VV_OPTION_OLD, saved_oldval, -1);
     set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
     apply_autocmds(EVENT_OPTIONSET,
@@ -2369,6 +2402,18 @@ set_string_option (
   return r;
 }
 
+/// Return true if "val" is a valid 'filetype' name.
+/// Also used for 'syntax' and 'keymap'.
+static bool valid_filetype(char_u *val)
+{
+  for (char_u *s = val; *s != NUL; s++) {
+    if (!ASCII_ISALNUM(*s) && vim_strchr((char_u *)".-_", *s) == NULL) {
+      return false;
+    }
+  }
+  return true;
+}
+
 /*
  * Handle string options that need some action to perform when changed.
  * Returns NULL for success, or an error message for an error.
@@ -2442,16 +2487,13 @@ did_set_string_option (
   else if (varp == &curwin->w_p_briopt) {
     if (briopt_check(curwin) == FAIL)
       errmsg = e_invarg;
-  }
-  /*
-   * 'isident', 'iskeyword', 'isprint or 'isfname' option: refill chartab[]
-   * If the new option is invalid, use old value.  'lisp' option: refill
-   * chartab[] for '-' char
-   */
-  else if (  varp == &p_isi
+  } else if (varp == &p_isi
              || varp == &(curbuf->b_p_isk)
              || varp == &p_isp
              || varp == &p_isf) {
+    // 'isident', 'iskeyword', 'isprint or 'isfname' option: refill g_chartab[]
+    // If the new option is invalid, use old value.  'lisp' option: refill
+    // g_chartab[] for '-' char
     if (init_chartab() == FAIL) {
       did_chartab = TRUE;           /* need to restore it below */
       errmsg = e_invarg;            /* error in value */
@@ -2510,15 +2552,15 @@ did_set_string_option (
   else if (varp == &p_sbo) {
     if (check_opt_strings(p_sbo, p_scbopt_values, TRUE) != OK)
       errmsg = e_invarg;
-  }
-  /* 'ambiwidth' */
-  else if (varp == &p_ambw) {
-    if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK)
+  } else if (varp == &p_ambw || (int *)varp == &p_emoji) {
+    // 'ambiwidth'
+    if (check_opt_strings(p_ambw, p_ambw_values, false) != OK) {
       errmsg = e_invarg;
-    else if (set_chars_option(&p_lcs) != NULL)
+    } else if (set_chars_option(&p_lcs) != NULL) {
       errmsg = (char_u *)_("E834: Conflicts with value of 'listchars'");
-    else if (set_chars_option(&p_fcs) != NULL)
+    } else if (set_chars_option(&p_fcs) != NULL) {
       errmsg = (char_u *)_("E835: Conflicts with value of 'fillchars'");
+    }
   }
   /* 'background' */
   else if (varp == &p_bg) {
@@ -2563,19 +2605,17 @@ did_set_string_option (
       errmsg = e_invarg;
   /* 'encoding' and 'fileencoding' */
   } else if (varp == &p_enc || gvarp == &p_fenc) {
-    if (varp == &p_enc && did_source_startup_scripts) {
-       errmsg = e_afterinit;
-    } else if (gvarp == &p_fenc) {
-      if (!MODIFIABLE(curbuf) && opt_flags != OPT_GLOBAL)
+    if (gvarp == &p_fenc) {
+      if (!MODIFIABLE(curbuf) && opt_flags != OPT_GLOBAL) {
         errmsg = e_modifiable;
-      else if (vim_strchr(*varp, ',') != NULL)
-        /* No comma allowed in 'fileencoding'; catches confusing it
-         * with 'fileencodings'. */
+      } else if (vim_strchr(*varp, ',') != NULL) {
+        // No comma allowed in 'fileencoding'; catches confusing it
+        // with 'fileencodings'.
         errmsg = e_invarg;
-      else {
-        /* May show a "+" in the title now. */
+      } else {
+        // May show a "+" in the title now.
         redraw_titles();
-        /* Add 'fileencoding' to the swap file. */
+        // Add 'fileencoding' to the swap file.
         ml_setflags(curbuf);
       }
     }
@@ -2586,25 +2626,24 @@ did_set_string_option (
       xfree(*varp);
       *varp = p;
       if (varp == &p_enc) {
-        errmsg = mb_init();
-        redraw_titles();
+        // only encoding=utf-8 allowed
+        if (STRCMP(p_enc, "utf-8") != 0) {
+          errmsg = e_invarg;
+        }
       }
     }
-
-    if (errmsg == NULL) {
-      /* When 'keymap' is used and 'encoding' changes, reload the keymap
-       * (with another encoding). */
-      if (varp == &p_enc && *curbuf->b_p_keymap != NUL)
-        (void)keymap_init();
-    }
   } else if (varp == &p_penc) {
     /* Canonize printencoding if VIM standard one */
     p = enc_canonize(p_penc);
     xfree(p_penc);
     p_penc = p;
   } else if (varp == &curbuf->b_p_keymap) {
-    /* load or unload key mapping tables */
-    errmsg = keymap_init();
+    if (!valid_filetype(*varp)) {
+      errmsg = e_invarg;
+    } else {
+      // load or unload key mapping tables
+      errmsg = keymap_init();
+    }
 
     if (errmsg == NULL) {
       if (*curbuf->b_p_keymap != NUL) {
@@ -2734,6 +2773,10 @@ did_set_string_option (
                   ? ((shada_idx = findoption((char_u *) "shada")))
                   : shada_idx)
                : opt_idx);
+    // Update free_oldval now that we have the opt_idx for 'shada', otherwise
+    // there would be a disconnect between the check for P_ALLOCED at the start
+    // of the function and the set of P_ALLOCED at the end of the fuction.
+    free_oldval = (options[opt_idx].flags & P_ALLOCED);
     for (s = p_shada; *s; ) {
       /* Check it's a valid character */
       if (vim_strchr((char_u *)"!\"%'/:<@cfhnrs", *s) == NULL) {
@@ -2967,6 +3010,11 @@ did_set_string_option (
     } else {
       completeopt_was_set();
     }
+  } else if (varp == &curwin->w_p_scl) {
+    // 'signcolumn'
+    if (check_opt_strings(*varp, p_scl_values, false) != OK) {
+      errmsg = e_invarg;
+    }
   }
   /* 'pastetoggle': translate key codes like in a mapping */
   else if (varp == &p_pt) {
@@ -3093,9 +3141,21 @@ did_set_string_option (
   else if (gvarp == &p_cino) {
     /* TODO: recognize errors */
     parse_cino(curbuf);
-  }
-  /* Options that are a list of flags. */
-  else {
+  // inccommand
+  } else if (varp == &p_icm) {
+      if (check_opt_strings(p_icm, p_icm_values, false) != OK) {
+        errmsg = e_invarg;
+      }
+  } else if (gvarp == &p_ft) {
+    if (!valid_filetype(*varp)) {
+      errmsg = e_invarg;
+    }
+  } else if (gvarp == &p_syn) {
+    if (!valid_filetype(*varp)) {
+      errmsg = e_invarg;
+    }
+  } else {
+    // Options that are a list of flags.
     p = NULL;
     if (varp == &p_ww)
       p = (char_u *)WW_ALL;
@@ -3190,8 +3250,9 @@ did_set_string_option (
       for (p = q; *p != NUL; ++p)
         if (vim_strchr((char_u *)"_.,", *p) != NULL)
           break;
-      vim_snprintf((char *)fname, 200, "spell/%.*s.vim", (int)(p - q), q);
-      source_runtime(fname, TRUE);
+      vim_snprintf((char *)fname, sizeof(fname), "spell/%.*s.vim",
+                   (int)(p - q), q);
+      source_runtime(fname, DIP_ALL);
     }
   }
 
@@ -3402,9 +3463,10 @@ char_u *check_stl_option(char_u *s)
     if (!*s)
       break;
     s++;
-    if (*s != '%' && *s != ')')
-      ++itemcnt;
-    if (*s == '%' || *s == STL_TRUNCMARK || *s == STL_MIDDLEMARK) {
+    if (*s != '%' && *s != ')') {
+      itemcnt++;
+    }
+    if (*s == '%' || *s == STL_TRUNCMARK || *s == STL_SEPARATE) {
       s++;
       continue;
     }
@@ -3648,14 +3710,16 @@ set_bool_option (
   /* when 'insertmode' is set from an autocommand need to do work here */
   else if ((int *)varp == &p_im) {
     if (p_im) {
-      if ((State & INSERT) == 0)
-        need_start_insertmode = TRUE;
-      stop_insert_mode = FALSE;
-    } else {
-      need_start_insertmode = FALSE;
-      stop_insert_mode = TRUE;
-      if (restart_edit != 0 && mode_displayed)
-        clear_cmdline = TRUE;           /* remove "(insert)" */
+      if ((State & INSERT) == 0) {
+        need_start_insertmode = true;
+      }
+      stop_insert_mode = false;
+    } else if (old_value) {  // only reset if it was set previously
+      need_start_insertmode = false;
+      stop_insert_mode = true;
+      if (restart_edit != 0 && mode_displayed) {
+        clear_cmdline = true;  // remove "(insert)"
+      }
       restart_edit = 0;
     }
   }
@@ -3685,23 +3749,19 @@ set_bool_option (
         }
       }
     }
-  }
-
-  /*
-   * When 'lisp' option changes include/exclude '-' in
-   * keyword characters.
-   */
-  else if (varp == (char_u *)&(curbuf->b_p_lisp)) {
-    (void)buf_init_chartab(curbuf, FALSE);          /* ignore errors */
-  }
-  /* when 'title' changed, may need to change the title; same for 'icon' */
-  else if ((int *)varp == &p_title) {
-    did_set_title(FALSE);
+  } else if (varp == (char_u *)&(curbuf->b_p_lisp)) {
+    // When 'lisp' option changes include/exclude '-' in
+    // keyword characters.
+    (void)buf_init_chartab(curbuf, false);          // ignore errors
+  } else if ((int *)varp == &p_title) {
+    // when 'title' changed, may need to change the title; same for 'icon'
+    did_set_title(false);
   } else if ((int *)varp == &p_icon) {
-    did_set_title(TRUE);
-  } else if ((bool *)varp == &curbuf->b_changed) {
-    if (!value)
-      save_file_ff(curbuf);             /* Buffer is unchanged */
+    did_set_title(true);
+  } else if ((int *)varp == &curbuf->b_changed) {
+    if (!value) {
+      save_file_ff(curbuf);             // Buffer is unchanged
+    }
     redraw_titles();
     modified_was_set = value;
   }
@@ -3729,11 +3789,12 @@ set_bool_option (
   else if ((int *)varp == &curwin->w_p_wrap) {
     if (curwin->w_p_wrap)
       curwin->w_leftcol = 0;
-  } else if ((bool *)varp == &p_ea) {
-    if (p_ea && !old_value)
+  } else if ((int *)varp == &p_ea) {
+    if (p_ea && !old_value) {
       win_equal(curwin, false, 0);
-  } else if ((bool *)varp == &p_acd) {
-    /* Change directories when the 'acd' option is set now. */
+    }
+  } else if ((int *)varp == &p_acd) {
+    // Change directories when the 'acd' option is set now.
     do_autochdir();
   }
   /* 'diff' */
@@ -4029,15 +4090,16 @@ set_num_option (
       errmsg = e_invarg;
       curwin->w_p_fdc = 12;
     }
-  }
-  /* 'shiftwidth' or 'tabstop' */
-  else if (pp == &curbuf->b_p_sw || pp == &curbuf->b_p_ts) {
-    if (foldmethodIsIndent(curwin))
+  // 'shiftwidth' or 'tabstop'
+  } else if (pp == &curbuf->b_p_sw || pp == (long *)&curbuf->b_p_ts) {
+    if (foldmethodIsIndent(curwin)) {
       foldUpdateAll(curwin);
-    /* When 'shiftwidth' changes, or it's zero and 'tabstop' changes:
-     * parse 'cinoptions'. */
-    if (pp == &curbuf->b_p_sw || curbuf->b_p_sw == 0)
+    }
+    // When 'shiftwidth' changes, or it's zero and 'tabstop' changes:
+    // parse 'cinoptions'.
+    if (pp == &curbuf->b_p_sw || curbuf->b_p_sw == 0) {
       parse_cino(curbuf);
+    }
   }
   /* 'maxcombine' */
   else if (pp == &p_mco) {
@@ -4297,17 +4359,24 @@ static void check_redraw(uint32_t flags)
   bool doclear = (flags & P_RCLR) == P_RCLR;
   bool all = ((flags & P_RALL) == P_RALL || doclear);
 
-  if ((flags & P_RSTAT) || all)         /* mark all status lines dirty */
+  if ((flags & P_RSTAT) || all) {  // mark all status lines dirty
     status_redraw_all();
+  }
 
-  if ((flags & P_RBUF) || (flags & P_RWIN) || all)
+  if ((flags & P_RBUF) || (flags & P_RWIN) || all) {
     changed_window_setting();
-  if (flags & P_RBUF)
+  }
+  if (flags & P_RBUF) {
     redraw_curbuf_later(NOT_VALID);
-  if (doclear)
+  }
+  if (flags & P_RWINONLY) {
+    redraw_later(NOT_VALID);
+  }
+  if (doclear) {
     redraw_all_later(CLEAR);
-  else if (all)
+  } else if (all) {
     redraw_all_later(NOT_VALID);
+  }
 }
 
 /// Find index for named option
@@ -4405,6 +4474,7 @@ bool get_tty_option(char *name, char **value)
 
   if (is_tty_option(name)) {
     if (value) {
+      // XXX: All other t_* options were removed in 3baba1e7.
       *value = xstrdup("");
     }
     return true;
@@ -4490,10 +4560,11 @@ get_option_value (
   else {
     /* Special case: 'modified' is b_changed, but we also want to consider
      * it set when 'ff' or 'fenc' changed. */
-    if ((bool *)varp == &curbuf->b_changed)
+    if ((int *)varp == &curbuf->b_changed) {
       *numval = curbufIsChanged();
-    else
+    } else {
       *numval = *(int *)varp;
+    }
   }
   return 1;
 }
@@ -4652,26 +4723,28 @@ set_option_value (
       EMSG(_(e_sandbox));
       return NULL;
     }
-    if (flags & P_STRING)
-      return set_string_option(opt_idx, string, opt_flags);
-    else {
+    if (flags & P_STRING) {
+      const char *s = (const char *)string;
+      if (s == NULL) {
+        s = "";
+      }
+      return (char_u *)set_string_option(opt_idx, s, opt_flags);
+    } else {
       varp = get_varp_scope(&(options[opt_idx]), opt_flags);
       if (varp != NULL) {       /* hidden option is not changed */
         if (number == 0 && string != NULL) {
           int idx;
 
-          /* Either we are given a string or we are setting option
-           * to zero. */
-          for (idx = 0; string[idx] == '0'; ++idx)
-            ;
+          // Either we are given a string or we are setting option
+          // to zero.
+          for (idx = 0; string[idx] == '0'; idx++) {}
           if (string[idx] != NUL || idx == 0) {
-            /* There's another character after zeros or the string
-             * is empty.  In both cases, we are trying to set a
-             * num option using a string. */
+            // There's another character after zeros or the string
+            // is empty.  In both cases, we are trying to set a
+            // num option using a string.
             EMSG3(_("E521: Number required: &%s = '%s'"),
-                name, string);
-            return NULL;                 /* do nothing as we hit an error */
-
+                  name, string);
+            return NULL;  // do nothing as we hit an error
           }
         }
         if (flags & P_NUM)
@@ -4724,7 +4797,6 @@ static int find_key_option(const char_u *arg)
   return find_key_option_len(arg, STRLEN(arg));
 }
 
-
 /*
  * if 'all' == 0: show changed options
  * if 'all' == 1: show all normal options
@@ -4859,14 +4931,15 @@ showoneopt (
 
   varp = get_varp_scope(p, opt_flags);
 
-  /* for 'modified' we also need to check if 'ff' or 'fenc' changed. */
-  if ((p->flags & P_BOOL) && ((bool *)varp == &curbuf->b_changed
-                              ? !curbufIsChanged() : !*(bool *)varp))
+  // for 'modified' we also need to check if 'ff' or 'fenc' changed.
+  if ((p->flags & P_BOOL) && ((int *)varp == &curbuf->b_changed
+                              ? !curbufIsChanged() : !*(int *)varp)) {
     MSG_PUTS("no");
-  else if ((p->flags & P_BOOL) && *(int *)varp < 0)
+  } else if ((p->flags & P_BOOL) && *(int *)varp < 0) {
     MSG_PUTS("--");
-  else
+  } else {
     MSG_PUTS("  ");
+  }
   MSG_PUTS(p->fullname);
   if (!(p->flags & P_BOOL)) {
     msg_putchar('=');
@@ -5369,6 +5442,7 @@ static char_u *get_varp(vimoption_T *p)
   case PV_UDF:    return (char_u *)&(curbuf->b_p_udf);
   case PV_WM:     return (char_u *)&(curbuf->b_p_wm);
   case PV_KMAP:   return (char_u *)&(curbuf->b_p_keymap);
+  case PV_SCL:    return (char_u *)&(curwin->w_p_scl);
   default:        EMSG(_("E356: get_varp ERROR"));
   }
   /* always return a valid pointer to avoid a crash! */
@@ -5446,7 +5520,8 @@ void copy_winopt(winopt_T *from, winopt_T *to)
   to->wo_fde = vim_strsave(from->wo_fde);
   to->wo_fdt = vim_strsave(from->wo_fdt);
   to->wo_fmr = vim_strsave(from->wo_fmr);
-  check_winopt(to);             /* don't want NULL pointers */
+  to->wo_scl = vim_strsave(from->wo_scl);
+  check_winopt(to);             // don't want NULL pointers
 }
 
 /*
@@ -5469,6 +5544,7 @@ static void check_winopt(winopt_T *wop)
   check_string_option(&wop->wo_fde);
   check_string_option(&wop->wo_fdt);
   check_string_option(&wop->wo_fmr);
+  check_string_option(&wop->wo_scl);
   check_string_option(&wop->wo_rlc);
   check_string_option(&wop->wo_stl);
   check_string_option(&wop->wo_cc);
@@ -5487,6 +5563,7 @@ void clear_winopt(winopt_T *wop)
   clear_string_option(&wop->wo_fde);
   clear_string_option(&wop->wo_fdt);
   clear_string_option(&wop->wo_fmr);
+  clear_string_option(&wop->wo_scl);
   clear_string_option(&wop->wo_rlc);
   clear_string_option(&wop->wo_stl);
   clear_string_option(&wop->wo_cc);
@@ -5606,6 +5683,7 @@ void buf_copy_options(buf_T *buf, int flags)
       /* Don't copy 'syntax', it must be set */
       buf->b_p_syn = empty_option;
       buf->b_p_smc = p_smc;
+      buf->b_s.b_syn_isk = empty_option;
       buf->b_s.b_p_spc = vim_strsave(p_spc);
       (void)compile_cap_prog(&buf->b_s);
       buf->b_s.b_p_spf = vim_strsave(p_spf);
@@ -5655,7 +5733,7 @@ void buf_copy_options(buf_T *buf, int flags)
         buf->b_p_isk = save_p_isk;
       else {
         buf->b_p_isk = vim_strsave(p_isk);
-        did_isk = TRUE;
+        did_isk = true;
         buf->b_p_ts = p_ts;
         buf->b_help = false;
         if (buf->b_p_bt[0] == 'h')
@@ -5836,6 +5914,7 @@ set_context_in_set_cmd (
     if (p == (char_u *)&p_bdir
         || p == (char_u *)&p_dir
         || p == (char_u *)&p_path
+        || p == (char_u *)&p_pp
         || p == (char_u *)&p_rtp
         || p == (char_u *)&p_cdpath
         || p == (char_u *)&p_vdir
@@ -6569,10 +6648,8 @@ int get_sw_value(buf_T *buf)
   return (int)result;
 }
 
-/*
- * Return the effective softtabstop value for the current buffer, using the
- * 'tabstop' value when 'softtabstop' is negative.
- */
+// Return the effective softtabstop value for the current buffer,
+// using the effective shiftwidth  value when 'softtabstop' is negative.
 int get_sts_value(void)
 {
   long result = curbuf->b_p_sts < 0 ? get_sw_value(curbuf) : curbuf->b_p_sts;
@@ -6698,3 +6775,184 @@ unsigned int get_bkc_value(buf_T *buf)
 {
   return buf->b_bkc_flags ? buf->b_bkc_flags : bkc_flags;
 }
+
+/// Return the current end-of-line type: EOL_DOS, EOL_UNIX or EOL_MAC.
+int get_fileformat(buf_T *buf)
+{
+  int c = *buf->b_p_ff;
+
+  if (buf->b_p_bin || c == 'u') {
+    return EOL_UNIX;
+  }
+  if (c == 'm') {
+    return EOL_MAC;
+  }
+  return EOL_DOS;
+}
+
+/// Like get_fileformat(), but override 'fileformat' with "p" for "++opt=val"
+/// argument.
+///
+/// @param eap  can be NULL!
+int get_fileformat_force(buf_T *buf, exarg_T *eap)
+{
+  int c;
+
+  if (eap != NULL && eap->force_ff != 0) {
+    c = eap->cmd[eap->force_ff];
+  } else {
+    if ((eap != NULL && eap->force_bin != 0)
+        ? (eap->force_bin == FORCE_BIN) : buf->b_p_bin) {
+      return EOL_UNIX;
+    }
+    c = *buf->b_p_ff;
+  }
+  if (c == 'u') {
+    return EOL_UNIX;
+  }
+  if (c == 'm') {
+    return EOL_MAC;
+  }
+  return EOL_DOS;
+}
+
+/// Return the default fileformat from 'fileformats'.
+int default_fileformat(void)
+{
+  switch (*p_ffs) {
+  case 'm':   return EOL_MAC;
+  case 'd':   return EOL_DOS;
+  }
+  return EOL_UNIX;
+}
+
+/// Set the current end-of-line type to EOL_UNIX, EOL_MAC, or EOL_DOS.
+///
+/// Sets 'fileformat'.
+///
+/// @param eol_style End-of-line style.
+/// @param opt_flags OPT_LOCAL and/or OPT_GLOBAL
+void set_fileformat(int eol_style, int opt_flags)
+{
+  char *p = NULL;
+
+  switch (eol_style) {
+      case EOL_UNIX:
+          p = FF_UNIX;
+          break;
+      case EOL_MAC:
+          p = FF_MAC;
+          break;
+      case EOL_DOS:
+          p = FF_DOS;
+          break;
+  }
+
+  // p is NULL if "eol_style" is EOL_UNKNOWN.
+  if (p != NULL) {
+    set_string_option_direct((char_u *)"ff",
+                             -1,
+                             (char_u *)p,
+                             OPT_FREE | opt_flags,
+                             0);
+  }
+
+  // This may cause the buffer to become (un)modified.
+  check_status(curbuf);
+  redraw_tabline = true;
+  need_maketitle = true;  // Set window title later.
+}
+
+/// Skip to next part of an option argument: Skip space and comma.
+char_u *skip_to_option_part(char_u *p)
+{
+  if (*p == ',') {
+    p++;
+  }
+  while (*p == ' ') {
+    p++;
+  }
+  return p;
+}
+
+/// Isolate one part of a string option separated by `sep_chars`.
+///
+/// @param[in,out]  option    advanced to the next part
+/// @param[in,out]  buf       copy of the isolated part
+/// @param[in]      maxlen    length of `buf`
+/// @param[in]      sep_chars chars that separate the option parts
+///
+/// @return length of `*option`
+size_t copy_option_part(char_u **option, char_u *buf, size_t maxlen,
+                        char *sep_chars)
+{
+  size_t len = 0;
+  char_u  *p = *option;
+
+  // skip '.' at start of option part, for 'suffixes'
+  if (*p == '.') {
+    buf[len++] = *p++;
+  }
+  while (*p != NUL && vim_strchr((char_u *)sep_chars, *p) == NULL) {
+    // Skip backslash before a separator character and space.
+    if (p[0] == '\\' && vim_strchr((char_u *)sep_chars, p[1]) != NULL) {
+      p++;
+    }
+    if (len < maxlen - 1) {
+      buf[len++] = *p;
+    }
+    p++;
+  }
+  buf[len] = NUL;
+
+  if (*p != NUL && *p != ',') {  // skip non-standard separator
+    p++;
+  }
+  p = skip_to_option_part(p);    // p points to next file name
+
+  *option = p;
+  return len;
+}
+
+/// Return TRUE when 'shell' has "csh" in the tail.
+int csh_like_shell(void)
+{
+  return strstr((char *)path_tail(p_sh), "csh") != NULL;
+}
+
+/// Return true when window "wp" has a column to draw signs in.
+bool signcolumn_on(win_T *wp)
+{
+    if (*wp->w_p_scl == 'n') {
+      return false;
+    }
+    if (*wp->w_p_scl == 'y') {
+      return true;
+    }
+    return wp->w_buffer->b_signlist != NULL;
+}
+
+/// Get window or buffer local options.
+dict_T * get_winbuf_options(int bufopt)
+{
+  dict_T *d = dict_alloc();
+
+  for (int opt_idx = 0; options[opt_idx].fullname; opt_idx++) {
+    struct vimoption *opt = &options[opt_idx];
+
+    if ((bufopt && (opt->indir & PV_BUF))
+        || (!bufopt && (opt->indir & PV_WIN))) {
+      char_u *varp = get_varp(opt);
+
+      if (varp != NULL) {
+        if (opt->flags & P_STRING) {
+          dict_add_nr_str(d, opt->fullname, 0L, *(char_u **)varp);
+        } else {
+          dict_add_nr_str(d, opt->fullname, *varp, NULL);
+        }
+      }
+    }
+  }
+
+  return d;
+}
diff --git a/src/nvim/option.h b/src/nvim/option.h
index 5c2b2662b5..60f14dea44 100644
--- a/src/nvim/option.h
+++ b/src/nvim/option.h
@@ -1,22 +1,25 @@
 #ifndef NVIM_OPTION_H
 #define NVIM_OPTION_H
 
+#include "nvim/ex_cmds_defs.h"  // for exarg_T
+
 /* flags for buf_copy_options() */
 #define BCO_ENTER       1       /* going to enter the buffer */
 #define BCO_ALWAYS      2       /* always copy the options */
 #define BCO_NOHELP      4       /* don't touch the help related options */
 
-/*
- * "flags" values for option-setting functions.
- * When OPT_GLOBAL and OPT_LOCAL are both missing, set both local and global
- * values, get local value.
- */
-#define OPT_FREE        1       /* free old value if it was allocated */
-#define OPT_GLOBAL      2       /* use global value */
-#define OPT_LOCAL       4       /* use local value */
-#define OPT_MODELINE    8       /* option in modeline */
-#define OPT_WINONLY     16      /* only set window-local options */
-#define OPT_NOWIN       32      /* don't set window-local options */
+/// Flags for option-setting functions
+///
+/// When OPT_GLOBAL and OPT_LOCAL are both missing, set both local and global
+/// values, get local value.
+typedef enum {
+  OPT_FREE     = 1,   ///< Free old value if it was allocated.
+  OPT_GLOBAL   = 2,   ///< Use global value.
+  OPT_LOCAL    = 4,   ///< Use local value.
+  OPT_MODELINE = 8,   ///< Option in modeline.
+  OPT_WINONLY  = 16,  ///< Only set window-local options.
+  OPT_NOWIN    = 32,  ///< Don’t set window-local options.
+} OptionFlags;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "option.h.generated.h"
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h
index 904e97f8ca..32021da922 100644
--- a/src/nvim/option_defs.h
+++ b/src/nvim/option_defs.h
@@ -1,8 +1,6 @@
 #ifndef NVIM_OPTION_DEFS_H
 #define NVIM_OPTION_DEFS_H
 
-#include <stdbool.h>
-
 #include "nvim/types.h"
 #include "nvim/macros.h"  // For EXTERN
 
@@ -258,7 +256,7 @@ enum {
   STL_ARGLISTSTAT     = 'a',  ///< Argument list status as (x of y).
   STL_PAGENUM         = 'N',  ///< Page number (when printing).
   STL_VIM_EXPR        = '{',  ///< Start of expression to substitute.
-  STL_MIDDLEMARK      = '=',  ///< Separation between left and right.
+  STL_SEPARATE        = '=',  ///< Separation between alignment sections.
   STL_TRUNCMARK       = '<',  ///< Truncation mark if line is too long.
   STL_USER_HL         = '*',  ///< Highlight from (User)1..9 or 0.
   STL_HIGHLIGHT       = '#',  ///< Highlight name.
@@ -274,7 +272,7 @@ enum {
   STL_HELPFLAG, STL_HELPFLAG_ALT, STL_FILETYPE, STL_FILETYPE_ALT, \
   STL_PREVIEWFLAG, STL_PREVIEWFLAG_ALT, STL_MODIFIED, STL_MODIFIED_ALT, \
   STL_QUICKFIX, STL_PERCENTAGE, STL_ALTPERCENT, STL_ARGLISTSTAT, STL_PAGENUM, \
-  STL_VIM_EXPR, STL_MIDDLEMARK, STL_TRUNCMARK, STL_USER_HL, STL_HIGHLIGHT, \
+  STL_VIM_EXPR, STL_SEPARATE, STL_TRUNCMARK, STL_USER_HL, STL_HIGHLIGHT, \
   STL_TABPAGENR, STL_TABCLOSENR, STL_CLICK_FUNC, \
   0, \
 })
@@ -296,16 +294,16 @@ enum {
  * The following are actual variables for the options
  */
 
-EXTERN long p_aleph;            /* 'aleph' */
-EXTERN bool p_acd;              /* 'autochdir' */
-EXTERN char_u   *p_ambw;        /* 'ambiwidth' */
-EXTERN int p_ar;                /* 'autoread' */
-EXTERN int p_aw;                /* 'autowrite' */
-EXTERN int p_awa;               /* 'autowriteall' */
-EXTERN char_u   *p_bs;          /* 'backspace' */
-EXTERN char_u   *p_bg;          /* 'background' */
-EXTERN int p_bk;                /* 'backup' */
-EXTERN char_u   *p_bkc;         /* 'backupcopy' */
+EXTERN long p_aleph;            // 'aleph'
+EXTERN int p_acd;               // 'autochdir'
+EXTERN char_u   *p_ambw;        // 'ambiwidth'
+EXTERN int p_ar;                // 'autoread'
+EXTERN int p_aw;                // 'autowrite'
+EXTERN int p_awa;               // 'autowriteall'
+EXTERN char_u   *p_bs;          // 'backspace'
+EXTERN char_u   *p_bg;          // 'background'
+EXTERN int p_bk;                // 'backup'
+EXTERN char_u   *p_bkc;         // 'backupcopy'
 EXTERN unsigned int bkc_flags;  ///< flags from 'backupcopy'
 #ifdef IN_OPTION_C
 static char *(p_bkc_values[]) =
@@ -370,17 +368,17 @@ static char *(p_cb_values[]) = {"unnamed", "unnamedplus", NULL};
 # define CB_UNNAMED             0x001
 # define CB_UNNAMEDPLUS         0x002
 # define CB_UNNAMEDMASK         (CB_UNNAMED | CB_UNNAMEDPLUS)
-EXTERN long p_cwh;              /* 'cmdwinheight' */
-EXTERN long p_ch;               /* 'cmdheight' */
-EXTERN int p_confirm;           /* 'confirm' */
-EXTERN int p_cp;                /* 'compatible' */
-EXTERN char_u   *p_cot;         /* 'completeopt' */
-EXTERN long p_ph;               /* 'pumheight' */
-EXTERN char_u   *p_cpo;         /* 'cpoptions' */
-EXTERN char_u   *p_csprg;       /* 'cscopeprg' */
-EXTERN int p_csre;              /* 'cscoperelative' */
-EXTERN char_u   *p_csqf;        /* 'cscopequickfix' */
-#  define       CSQF_CMDS   "sgdctefi"
+EXTERN long p_cwh;              // 'cmdwinheight'
+EXTERN long p_ch;               // 'cmdheight'
+EXTERN int p_confirm;           // 'confirm'
+EXTERN int p_cp;                // 'compatible'
+EXTERN char_u   *p_cot;         // 'completeopt'
+EXTERN long p_ph;               // 'pumheight'
+EXTERN char_u   *p_cpo;         // 'cpoptions'
+EXTERN char_u   *p_csprg;       // 'cscopeprg'
+EXTERN int p_csre;              // 'cscoperelative'
+EXTERN char_u   *p_csqf;        // 'cscopequickfix'
+#  define       CSQF_CMDS   "sgdctefia"
 #  define       CSQF_FLAGS  "+-0"
 EXTERN int p_cst;               /* 'cscopetag' */
 EXTERN long p_csto;             /* 'cscopetagorder' */
@@ -397,28 +395,30 @@ EXTERN char_u   *p_dir;         /* 'directory' */
 EXTERN char_u   *p_dy;          /* 'display' */
 EXTERN unsigned dy_flags;
 #ifdef IN_OPTION_C
-static char *(p_dy_values[]) = {"lastline", "uhex", NULL};
+static char *(p_dy_values[]) = { "lastline", "truncate", "uhex", NULL };
 #endif
 #define DY_LASTLINE             0x001
-#define DY_UHEX                 0x002
-EXTERN int p_ed;                /* 'edcompatible' */
-EXTERN char_u   *p_ead;         /* 'eadirection' */
-EXTERN bool p_ea;               /* 'equalalways' */
-EXTERN char_u   *p_ep;          /* 'equalprg' */
-EXTERN int p_eb;                /* 'errorbells' */
-EXTERN char_u   *p_ef;          /* 'errorfile' */
-EXTERN char_u   *p_efm;         /* 'errorformat' */
-EXTERN char_u   *p_gefm;        /* 'grepformat' */
-EXTERN char_u   *p_gp;          /* 'grepprg' */
-EXTERN char_u   *p_ei;          /* 'eventignore' */
-EXTERN int p_ek;                /* 'esckeys' */
-EXTERN int p_exrc;              /* 'exrc' */
-EXTERN char_u   *p_fencs;       /* 'fileencodings' */
-EXTERN char_u   *p_ffs;         /* 'fileformats' */
-EXTERN bool p_fic;              ///< 'fileignorecase'
-EXTERN char_u   *p_fcl;         /* 'foldclose' */
-EXTERN long p_fdls;             /* 'foldlevelstart' */
-EXTERN char_u   *p_fdo;         /* 'foldopen' */
+#define DY_TRUNCATE             0x002
+#define DY_UHEX                 0x004
+EXTERN int p_ed;                // 'edcompatible'
+EXTERN int p_emoji;             // 'emoji'
+EXTERN char_u   *p_ead;         // 'eadirection'
+EXTERN int p_ea;                // 'equalalways'
+EXTERN char_u   *p_ep;          // 'equalprg'
+EXTERN int p_eb;                // 'errorbells'
+EXTERN char_u   *p_ef;          // 'errorfile'
+EXTERN char_u   *p_efm;         // 'errorformat'
+EXTERN char_u   *p_gefm;        // 'grepformat'
+EXTERN char_u   *p_gp;          // 'grepprg'
+EXTERN char_u   *p_ei;          // 'eventignore'
+EXTERN int p_ek;                // 'esckeys'
+EXTERN int p_exrc;              // 'exrc'
+EXTERN char_u   *p_fencs;       // 'fileencodings'
+EXTERN char_u   *p_ffs;         // 'fileformats'
+EXTERN int p_fic;               // 'fileignorecase'
+EXTERN char_u   *p_fcl;         // 'foldclose'
+EXTERN long p_fdls;             // 'foldlevelstart'
+EXTERN char_u   *p_fdo;         // 'foldopen'
 EXTERN unsigned fdo_flags;
 # ifdef IN_OPTION_C
 static char *(p_fdo_values[]) = {"all", "block", "hor", "mark", "percent",
@@ -456,80 +456,82 @@ EXTERN int p_hid;               // 'hidden'
 // Use P_HID to check if a buffer is to be hidden when it is no longer
 // visible in a window.
 # define P_HID(buf) (buf_hide(buf))
-EXTERN char_u   *p_hl;          /* 'highlight' */
-EXTERN int p_hls;               /* 'hlsearch' */
-EXTERN long p_hi;               /* 'history' */
-EXTERN int p_hkmap;             /* 'hkmap' */
-EXTERN int p_hkmapp;            /* 'hkmapp' */
-EXTERN int p_fkmap;             /* 'fkmap' */
-EXTERN int p_altkeymap;         /* 'altkeymap' */
-EXTERN int p_arshape;           /* 'arabicshape' */
-EXTERN int p_icon;              /* 'icon' */
-EXTERN char_u   *p_iconstring;  /* 'iconstring' */
-EXTERN int p_ic;                /* 'ignorecase' */
-EXTERN int p_is;                /* 'incsearch' */
-EXTERN int p_im;                /* 'insertmode' */
-EXTERN char_u   *p_isf;         /* 'isfname' */
-EXTERN char_u   *p_isi;         /* 'isident' */
-EXTERN char_u   *p_isp;         /* 'isprint' */
-EXTERN int p_js;                /* 'joinspaces' */
-EXTERN char_u   *p_kp;          /* 'keywordprg' */
-EXTERN char_u   *p_km;          /* 'keymodel' */
-EXTERN char_u   *p_langmap;     /* 'langmap'*/
-EXTERN int p_lnr;               /* 'langnoremap'*/
-EXTERN char_u   *p_lm;          /* 'langmenu' */
-EXTERN char_u   *p_lispwords;   /* 'lispwords' */
-EXTERN long p_ls;               /* 'laststatus' */
-EXTERN long p_stal;             /* 'showtabline' */
-EXTERN char_u   *p_lcs;         /* 'listchars' */
-
-EXTERN int p_lz;                /* 'lazyredraw' */
-EXTERN int p_lpl;               /* 'loadplugins' */
-EXTERN int p_magic;             /* 'magic' */
-EXTERN char_u   *p_mef;         /* 'makeef' */
-EXTERN char_u   *p_mp;          /* 'makeprg' */
-EXTERN char_u   *p_cc;          /* 'colorcolumn' */
-EXTERN int p_cc_cols[256];      /* array for 'colorcolumn' columns */
-EXTERN long p_mat;              /* 'matchtime' */
-EXTERN long p_mco;              /* 'maxcombine' */
-EXTERN long p_mfd;              /* 'maxfuncdepth' */
-EXTERN long p_mmd;              /* 'maxmapdepth' */
-EXTERN long p_mm;               /* 'maxmem' */
-EXTERN long p_mmp;              /* 'maxmempattern' */
-EXTERN long p_mmt;              /* 'maxmemtot' */
-EXTERN long p_mis;              /* 'menuitems' */
-EXTERN char_u   *p_msm;         /* 'mkspellmem' */
-EXTERN long p_mls;              /* 'modelines' */
-EXTERN char_u   *p_mouse;       /* 'mouse' */
-EXTERN char_u   *p_mousem;      /* 'mousemodel' */
-EXTERN long p_mouset;           /* 'mousetime' */
-EXTERN int p_more;              /* 'more' */
-EXTERN char_u   *p_opfunc;      /* 'operatorfunc' */
-EXTERN char_u   *p_para;        /* 'paragraphs' */
-EXTERN int p_paste;             /* 'paste' */
-EXTERN char_u   *p_pt;          /* 'pastetoggle' */
-EXTERN char_u   *p_pex;         /* 'patchexpr' */
-EXTERN char_u   *p_pm;          /* 'patchmode' */
-EXTERN char_u   *p_path;        /* 'path' */
-EXTERN char_u   *p_cdpath;      /* 'cdpath' */
-EXTERN long p_rdt;              /* 'redrawtime' */
-EXTERN int p_remap;             /* 'remap' */
-EXTERN long p_re;               /* 'regexpengine' */
-EXTERN long p_report;           /* 'report' */
-EXTERN long p_pvh;              /* 'previewheight' */
-EXTERN int p_ari;               /* 'allowrevins' */
-EXTERN int p_ri;                /* 'revins' */
-EXTERN int p_ru;                /* 'ruler' */
-EXTERN char_u   *p_ruf;         /* 'rulerformat' */
-EXTERN char_u   *p_rtp;         /* 'runtimepath' */
-EXTERN long p_sj;               /* 'scrolljump' */
-EXTERN long p_so;               /* 'scrolloff' */
-EXTERN char_u   *p_sbo;         /* 'scrollopt' */
-EXTERN char_u   *p_sections;    /* 'sections' */
-EXTERN int p_secure;            /* 'secure' */
-EXTERN char_u   *p_sel;         /* 'selection' */
-EXTERN char_u   *p_slm;         /* 'selectmode' */
-EXTERN char_u   *p_ssop;        /* 'sessionoptions' */
+EXTERN char_u   *p_hl;          // 'highlight'
+EXTERN int p_hls;               // 'hlsearch'
+EXTERN long p_hi;               // 'history'
+EXTERN int p_hkmap;             // 'hkmap'
+EXTERN int p_hkmapp;            // 'hkmapp'
+EXTERN int p_fkmap;             // 'fkmap'
+EXTERN int p_altkeymap;         // 'altkeymap'
+EXTERN int p_arshape;           // 'arabicshape'
+EXTERN int p_icon;              // 'icon'
+EXTERN char_u   *p_iconstring;  // 'iconstring'
+EXTERN int p_ic;                // 'ignorecase'
+EXTERN int p_is;                // 'incsearch'
+EXTERN char_u   *p_icm;         // 'inccommand'
+EXTERN int p_im;                // 'insertmode'
+EXTERN char_u   *p_isf;         // 'isfname'
+EXTERN char_u   *p_isi;         // 'isident'
+EXTERN char_u   *p_isp;         // 'isprint'
+EXTERN int p_js;                // 'joinspaces'
+EXTERN char_u   *p_kp;          // 'keywordprg'
+EXTERN char_u   *p_km;          // 'keymodel'
+EXTERN char_u   *p_langmap;     // 'langmap'*/
+EXTERN int p_lnr;               // 'langnoremap'*/
+EXTERN char_u   *p_lm;          // 'langmenu'
+EXTERN char_u   *p_lispwords;   // 'lispwords'
+EXTERN long p_ls;               // 'laststatus'
+EXTERN long p_stal;             // 'showtabline'
+EXTERN char_u   *p_lcs;         // 'listchars'
+
+EXTERN int p_lz;                // 'lazyredraw'
+EXTERN int p_lpl;               // 'loadplugins'
+EXTERN int p_magic;             // 'magic'
+EXTERN char_u   *p_mef;         // 'makeef'
+EXTERN char_u   *p_mp;          // 'makeprg'
+EXTERN char_u   *p_cc;          // 'colorcolumn'
+EXTERN int p_cc_cols[256];      // array for 'colorcolumn' columns
+EXTERN long p_mat;              // 'matchtime'
+EXTERN long p_mco;              // 'maxcombine'
+EXTERN long p_mfd;              // 'maxfuncdepth'
+EXTERN long p_mmd;              // 'maxmapdepth'
+EXTERN long p_mm;               // 'maxmem'
+EXTERN long p_mmp;              // 'maxmempattern'
+EXTERN long p_mmt;              // 'maxmemtot'
+EXTERN long p_mis;              // 'menuitems'
+EXTERN char_u   *p_msm;         // 'mkspellmem'
+EXTERN long p_mls;              // 'modelines'
+EXTERN char_u   *p_mouse;       // 'mouse'
+EXTERN char_u   *p_mousem;      // 'mousemodel'
+EXTERN long p_mouset;           // 'mousetime'
+EXTERN int p_more;              // 'more'
+EXTERN char_u   *p_opfunc;      // 'operatorfunc'
+EXTERN char_u   *p_para;        // 'paragraphs'
+EXTERN int p_paste;             // 'paste'
+EXTERN char_u   *p_pt;          // 'pastetoggle'
+EXTERN char_u   *p_pex;         // 'patchexpr'
+EXTERN char_u   *p_pm;          // 'patchmode'
+EXTERN char_u   *p_path;        // 'path'
+EXTERN char_u   *p_cdpath;      // 'cdpath'
+EXTERN long p_rdt;              // 'redrawtime'
+EXTERN int p_remap;             // 'remap'
+EXTERN long p_re;               // 'regexpengine'
+EXTERN long p_report;           // 'report'
+EXTERN long p_pvh;              // 'previewheight'
+EXTERN int p_ari;               // 'allowrevins'
+EXTERN int p_ri;                // 'revins'
+EXTERN int p_ru;                // 'ruler'
+EXTERN char_u   *p_ruf;         // 'rulerformat'
+EXTERN char_u   *p_pp;          // 'packpath'
+EXTERN char_u   *p_rtp;         // 'runtimepath'
+EXTERN long p_sj;               // 'scrolljump'
+EXTERN long p_so;               // 'scrolloff'
+EXTERN char_u   *p_sbo;         // 'scrollopt'
+EXTERN char_u   *p_sections;    // 'sections'
+EXTERN int p_secure;            // 'secure'
+EXTERN char_u   *p_sel;         // 'selection'
+EXTERN char_u   *p_slm;         // 'selectmode'
+EXTERN char_u   *p_ssop;        // 'sessionoptions'
 EXTERN unsigned ssop_flags;
 # ifdef IN_OPTION_C
 /* Also used for 'viewoptions'! */
@@ -619,7 +621,7 @@ EXTERN long p_titlelen;         ///< 'titlelen'
 EXTERN char_u *p_titleold;      ///< 'titleold'
 EXTERN char_u *p_titlestring;   ///< 'titlestring'
 EXTERN char_u *p_tsr;           ///< 'thesaurus'
-EXTERN bool p_tgc;              ///< 'termguicolors'
+EXTERN int p_tgc;               ///< 'termguicolors'
 EXTERN int p_ttimeout;          ///< 'ttimeout'
 EXTERN long p_ttm;              ///< 'ttimeoutlen'
 EXTERN char_u *p_udir;          ///< 'undodir'
@@ -648,26 +650,26 @@ char_u  *p_vfile = (char_u *)""; /* used before options are initialized */
 #else
 extern char_u   *p_vfile;       /* 'verbosefile' */
 #endif
-EXTERN int p_warn;              /* 'warn' */
-EXTERN char_u   *p_wop;         /* 'wildoptions' */
-EXTERN long p_window;           /* 'window' */
-EXTERN char_u   *p_wak;         /* 'winaltkeys' */
-EXTERN char_u   *p_wig;         /* 'wildignore' */
-EXTERN char_u   *p_ww;          /* 'whichwrap' */
-EXTERN long p_wc;               /* 'wildchar' */
-EXTERN long p_wcm;              /* 'wildcharm' */
-EXTERN bool p_wic;              ///< 'wildignorecase'
-EXTERN char_u   *p_wim;         /* 'wildmode' */
-EXTERN int p_wmnu;              /* 'wildmenu' */
-EXTERN long p_wh;               /* 'winheight' */
-EXTERN long p_wmh;              /* 'winminheight' */
-EXTERN long p_wmw;              /* 'winminwidth' */
-EXTERN long p_wiw;              /* 'winwidth' */
-EXTERN bool p_ws;               /* 'wrapscan' */
-EXTERN int p_write;             /* 'write' */
-EXTERN int p_wa;                /* 'writeany' */
-EXTERN int p_wb;                /* 'writebackup' */
-EXTERN long p_wd;               /* 'writedelay' */
+EXTERN int p_warn;              // 'warn'
+EXTERN char_u   *p_wop;         // 'wildoptions'
+EXTERN long p_window;           // 'window'
+EXTERN char_u   *p_wak;         // 'winaltkeys'
+EXTERN char_u   *p_wig;         // 'wildignore'
+EXTERN char_u   *p_ww;          // 'whichwrap'
+EXTERN long p_wc;               // 'wildchar'
+EXTERN long p_wcm;              // 'wildcharm'
+EXTERN int p_wic;               // 'wildignorecase'
+EXTERN char_u   *p_wim;         // 'wildmode'
+EXTERN int p_wmnu;              // 'wildmenu'
+EXTERN long p_wh;               // 'winheight'
+EXTERN long p_wmh;              // 'winminheight'
+EXTERN long p_wmw;              // 'winminwidth'
+EXTERN long p_wiw;              // 'winwidth'
+EXTERN int p_ws;                // 'wrapscan'
+EXTERN int p_write;             // 'write'
+EXTERN int p_wa;                // 'writeany'
+EXTERN int p_wb;                // 'writebackup'
+EXTERN long p_wd;               // 'writedelay'
 
 EXTERN int p_force_on;          ///< options that cannot be turned off.
 EXTERN int p_force_off;         ///< options that cannot be turned on.
@@ -797,7 +799,8 @@ enum {
   , WV_WFH
   , WV_WFW
   , WV_WRAP
-  , WV_COUNT        /* must be the last one */
+  , WV_SCL
+  , WV_COUNT        // must be the last one
 };
 
 /* Value for b_p_ul indicating the global value must be used. */
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 218e34f595..fd68d1cde0 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -17,8 +17,8 @@
 -- types: bool, number, string
 -- lists: (nil), comma, onecomma, flags, flagscomma
 -- scopes: global, buffer, window
--- redraw options: statuslines, current_window, current_buffer, all_windows, 
---                 everything, curswant
+-- redraw options: statuslines, current_window, curent_window_only,
+--                 current_buffer, all_windows, everything, curswant
 -- default: {vi=…[, vim=…]}
 -- defaults: {condition=#if condition, if_true=default, if_false=default}
 -- #if condition:
@@ -165,7 +165,7 @@ return {
       deny_duplicates=true,
       secure=true,
       vi_def=true,
-      expand=true,
+      expand='nodefault',
       varname='p_bdir',
       defaults={if_true={vi=''}}
     },
@@ -539,7 +539,7 @@ return {
       full_name='cursorline', abbreviation='cul',
       type='bool', scope={'window'},
       vi_def=true,
-      redraw={'current_window'},
+      redraw={'current_window_only'},
       defaults={if_true={vi=false}}
     },
     {
@@ -616,7 +616,7 @@ return {
       deny_duplicates=true,
       secure=true,
       vi_def=true,
-      expand=true,
+      expand='nodefault',
       varname='p_dir',
       defaults={if_true={vi=''}}
     },
@@ -644,6 +644,14 @@ return {
       defaults={if_true={vi=false}}
     },
     {
+      full_name='emoji', abbreviation='emo',
+      type='bool', scope={'global'},
+      vi_def=true,
+      redraw={'everything'},
+      varname='p_emoji',
+      defaults={if_true={vi=true}}
+    },
+    {
       full_name='encoding', abbreviation='enc',
       type='string', scope={'global'},
       deny_in_modelines=true,
@@ -1180,6 +1188,14 @@ return {
       }
     },
     {
+      full_name='inccommand', abbreviation='icm',
+      type='string', scope={'global'},
+      vi_def=true,
+      redraw={'everything'},
+      varname='p_icm',
+      defaults={if_true={vi=""}}
+    },
+    {
       full_name='include', abbreviation='inc',
       type='string', scope={'global', 'buffer'},
       vi_def=true,
@@ -1556,7 +1572,7 @@ return {
       full_name='mouse',
       type='string', list='flags', scope={'global'},
       varname='p_mouse',
-      defaults={if_true={vi="", vim="a"}}
+      defaults={if_true={vi="", vim=""}}
     },
     {
       full_name='mousefocus', abbreviation='mousef',
@@ -1640,6 +1656,16 @@ return {
       defaults={if_true={vi=""}}
     },
     {
+      full_name='packpath', abbreviation='pp',
+      type='string', list='onecomma', scope={'global'},
+      deny_duplicates=true,
+      secure=true,
+      vi_def=true,
+      expand=true,
+      varname='p_pp',
+      defaults={if_true={vi=''}}
+    },
+    {
       full_name='paragraphs', abbreviation='para',
       type='string', scope={'global'},
       vi_def=true,
@@ -1881,7 +1907,7 @@ return {
       deny_duplicates=true,
       secure=true,
       vi_def=true,
-      expand=true,
+      expand='nodefault',
       varname='p_rtp',
       defaults={if_true={vi=''}}
     },
@@ -2144,6 +2170,14 @@ return {
       defaults={if_true={vi=0}}
     },
     {
+      full_name='signcolumn', abbreviation='scl',
+      type='string', scope={'window'},
+      vi_def=true,
+      alloced=true,
+      redraw={'current_window'},
+      defaults={if_true={vi="auto"}}
+    },
+    {
       full_name='smartcase', abbreviation='scs',
       type='bool', scope={'global'},
       vi_def=true,
@@ -2497,7 +2531,7 @@ return {
       deny_duplicates=true,
       secure=true,
       vi_def=true,
-      expand=true,
+      expand='nodefault',
       varname='p_udir',
       defaults={if_true={vi=''}}
     },
@@ -2558,7 +2592,7 @@ return {
       type='string', scope={'global'},
       secure=true,
       vi_def=true,
-      expand=true,
+      expand='nodefault',
       varname='p_vdir',
       defaults={if_true={vi=''}}
     },
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index edc430410c..747a34d8ce 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -12,7 +12,6 @@
 #include "nvim/os/os.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
 #include "nvim/eval.h"
@@ -113,11 +112,11 @@ int64_t os_get_pid(void)
 #endif
 }
 
-/// Get the hostname of the machine running Neovim.
+/// Gets the hostname of the current machine.
 ///
-/// @param hostname Buffer to store the hostname.
-/// @param len Length of `hostname`.
-void os_get_hostname(char *hostname, size_t len)
+/// @param hostname   Buffer to store the hostname.
+/// @param size       Size of `hostname`.
+void os_get_hostname(char *hostname, size_t size)
 {
 #ifdef HAVE_SYS_UTSNAME_H
   struct utsname vutsname;
@@ -125,8 +124,7 @@ void os_get_hostname(char *hostname, size_t len)
   if (uname(&vutsname) < 0) {
     *hostname = '\0';
   } else {
-    strncpy(hostname, vutsname.nodename, len - 1);
-    hostname[len - 1] = '\0';
+    xstrlcpy(hostname, vutsname.nodename, size);
   }
 #else
   // TODO(unknown): Implement this for windows.
@@ -227,25 +225,24 @@ char_u *expand_env_save_opt(char_u *src, bool one)
 /// "~/" is also expanded, using $HOME. For Unix "~user/" is expanded.
 /// Skips over "\ ", "\~" and "\$" (not for Win32 though).
 /// If anything fails no expansion is done and dst equals src.
-/// @param src Input string e.g. "$HOME/vim.hlp"
-/// @param dst Where to put the result
-/// @param dstlen Maximum length of the result
+///
+/// @param src        Input string e.g. "$HOME/vim.hlp"
+/// @param dst[out]   Where to put the result
+/// @param dstlen     Maximum length of the result
 void expand_env(char_u *src, char_u *dst, int dstlen)
 {
   expand_env_esc(src, dst, dstlen, false, false, NULL);
 }
 
 /// Expand environment variable with path name and escaping.
-/// "~/" is also expanded, using $HOME. For Unix "~user/" is expanded.
-/// Skips over "\ ", "\~" and "\$" (not for Win32 though).
-/// If anything fails no expansion is done and dst equals src.
-/// prefix recognize the start of a new name, for '~' expansion.
-/// @param srcp Input string e.g. "$HOME/vim.hlp"
-/// @param dst Where to put the result
-/// @param dstlen Maximum length of the result
-/// @param esc Should we escape spaces in expanded variables?
-/// @param one Should we expand more than one '~'?
-/// @param prefix Common prefix for paths, can be NULL
+/// @see expand_env
+///
+/// @param srcp       Input string e.g. "$HOME/vim.hlp"
+/// @param dst[out]   Where to put the result
+/// @param dstlen     Maximum length of the result
+/// @param esc        Escape spaces in expanded variables
+/// @param one        `srcp` is a single filename
+/// @param prefix     Start again after this (can be NULL)
 void expand_env_esc(char_u *restrict srcp,
                     char_u *restrict dst,
                     int dstlen,
@@ -561,8 +558,8 @@ const void *vim_colon_env_iter_rev(const char *const val,
 /// Vim's version of getenv().
 /// Special handling of $HOME, $VIM and $VIMRUNTIME, allowing the user to
 /// override the vim runtime directory at runtime.  Also does ACP to 'enc'
-/// conversion for Win32.  Results must be freed by the calling function.
-/// @param name Name of environment variable to expand
+/// conversion for Win32.  Result must be freed by the caller.
+/// @param name Environment variable to expand
 char *vim_getenv(const char *name)
 {
   const char *kos_env_path = os_getenv(name);
@@ -599,6 +596,27 @@ char *vim_getenv(const char *name)
     if (p_hf != NULL && vim_strchr(p_hf, '$') == NULL) {
       vim_path = (char *)p_hf;
     }
+
+#ifdef WIN32
+    // Find runtime path relative to the nvim binary i.e. ../share/runtime
+    if (vim_path == NULL) {
+      char exe_name[MAXPATHL];
+      size_t exe_name_len = MAXPATHL;
+      if (os_exepath(exe_name, &exe_name_len) == 0) {
+        char *path_end = (char *)path_tail_with_sep((char_u *)exe_name);
+        *path_end = '\0';  // remove the trailing "nvim.exe"
+        path_end = (char *)path_tail((char_u *)exe_name);
+        *path_end = '\0';  // remove the trailing "bin/"
+        if (append_path(
+            exe_name,
+            "share" _PATHSEPSTR "nvim" _PATHSEPSTR "runtime" _PATHSEPSTR,
+            MAXPATHL) == OK) {
+          vim_path = exe_name;
+        }
+      }
+    }
+#endif
+
     if (vim_path != NULL) {
       // remove the file name
       char *vim_path_end = (char *)path_tail((char_u *)vim_path);
diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c
new file mode 100644
index 0000000000..cf5bfd60ae
--- /dev/null
+++ b/src/nvim/os/fileio.c
@@ -0,0 +1,318 @@
+/// @file fileio.c
+///
+/// Buffered reading/writing to a file. Unlike fileio.c this is not dealing with
+/// Neovim stuctures for buffer, with autocommands, etc: just fopen/fread/fwrite
+/// replacement.
+
+#include <assert.h>
+#include <stddef.h>
+#include <stdbool.h>
+#include <fcntl.h>
+
+#include "auto/config.h"
+
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
+
+#include <uv.h>
+
+#include "nvim/os/fileio.h"
+#include "nvim/memory.h"
+#include "nvim/os/os.h"
+#include "nvim/globals.h"
+#include "nvim/rbuffer.h"
+#include "nvim/macros.h"
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "os/fileio.c.generated.h"
+#endif
+
+/// Open file
+///
+/// @param[out]  ret_fp  Address where information needed for reading from or
+///                      writing to a file is saved
+/// @param[in]  fname  File name to open.
+/// @param[in]  flags  Flags, @see FileOpenFlags. Currently reading from and
+///                    writing to the file at once is not supported, so either
+///                    FILE_WRITE_ONLY or FILE_READ_ONLY is required.
+/// @param[in]  mode  Permissions for the newly created file (ignored if flags
+///                   does not have FILE_CREATE\*).
+///
+/// @return Error code (@see os_strerror()) or 0.
+int file_open(FileDescriptor *const ret_fp, const char *const fname,
+              const int flags, const int mode)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  int os_open_flags = 0;
+  int fd;
+  TriState wr = kNone;
+#define FLAG(flags, flag, fcntl_flags, wrval, cond) \
+  do { \
+    if (flags & flag) { \
+      os_open_flags |= fcntl_flags; \
+      assert(cond); \
+      if (wrval != kNone) { \
+        wr = wrval; \
+      } \
+    } \
+  } while (0)
+  FLAG(flags, kFileWriteOnly, O_WRONLY, kTrue, true);
+  FLAG(flags, kFileCreateOnly, O_CREAT|O_EXCL|O_WRONLY, kTrue, true);
+  FLAG(flags, kFileCreate, O_CREAT|O_WRONLY, kTrue, !(flags & kFileCreateOnly));
+  FLAG(flags, kFileTruncate, O_TRUNC|O_WRONLY, kTrue,
+       !(flags & kFileCreateOnly));
+  FLAG(flags, kFileReadOnly, O_RDONLY, kFalse, wr != kTrue);
+#ifdef O_NOFOLLOW
+  FLAG(flags, kFileNoSymlink, O_NOFOLLOW, kNone, true);
+#endif
+#undef FLAG
+
+  fd = os_open(fname, os_open_flags, mode);
+
+  if (fd < 0) {
+    return fd;
+  }
+
+  ret_fp->wr = (wr == kTrue);
+  ret_fp->fd = fd;
+  ret_fp->eof = false;
+  ret_fp->rv = rbuffer_new(kRWBufferSize);
+  ret_fp->_error = 0;
+  if (ret_fp->wr) {
+    ret_fp->rv->data = ret_fp;
+    ret_fp->rv->full_cb = (rbuffer_callback)&file_rb_write_full_cb;
+  }
+  return 0;
+}
+
+/// Like file_open(), but allocate and return ret_fp
+///
+/// @param[out]  error  Error code, @see os_strerror(). Is set to zero on
+///                     success.
+/// @param[in]  fname  File name to open.
+/// @param[in]  flags  Flags, @see FileOpenFlags.
+/// @param[in]  mode  Permissions for the newly created file (ignored if flags
+///                   does not have FILE_CREATE\*).
+///
+/// @return [allocated] Opened file or NULL in case of error.
+FileDescriptor *file_open_new(int *const error, const char *const fname,
+                              const int flags, const int mode)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  FileDescriptor *const fp = xmalloc(sizeof(*fp));
+  if ((*error = file_open(fp, fname, flags, mode)) != 0) {
+    xfree(fp);
+    return NULL;
+  }
+  return fp;
+}
+
+/// Close file and free its buffer
+///
+/// @param[in,out]  fp  File to close.
+///
+/// @return 0 or error code.
+int file_close(FileDescriptor *const fp) FUNC_ATTR_NONNULL_ALL
+{
+  const int error = file_fsync(fp);
+  const int error2 = os_close(fp->fd);
+  rbuffer_free(fp->rv);
+  if (error2 != 0) {
+    return error2;
+  }
+  return error;
+}
+
+/// Close and free file obtained using file_open_new()
+///
+/// @param[in,out]  fp  File to close.
+///
+/// @return 0 or error code.
+int file_free(FileDescriptor *const fp) FUNC_ATTR_NONNULL_ALL
+{
+  const int ret = file_close(fp);
+  xfree(fp);
+  return ret;
+}
+
+/// Flush file modifications to disk
+///
+/// @param[in,out]  fp  File to work with.
+///
+/// @return 0 or error code.
+int file_fsync(FileDescriptor *const fp)
+  FUNC_ATTR_NONNULL_ALL
+{
+  if (!fp->wr) {
+    return 0;
+  }
+  file_rb_write_full_cb(fp->rv, fp);
+  if (fp->_error != 0) {
+    const int error = fp->_error;
+    fp->_error = 0;
+    return error;
+  }
+  return os_fsync(fp->fd);
+}
+
+/// Buffer used for writing
+///
+/// Like IObuff, but allows file_\* callers not to care about spoiling it.
+static char writebuf[kRWBufferSize];
+
+/// Function run when RBuffer is full when writing to a file
+///
+/// Actually does writing to the file, may also be invoked directly.
+///
+/// @param[in,out]  rv  RBuffer instance used.
+/// @param[in,out]  fp  File to work with.
+static void file_rb_write_full_cb(RBuffer *const rv, FileDescriptor *const fp)
+  FUNC_ATTR_NONNULL_ALL
+{
+  assert(fp->wr);
+  assert(rv->data == (void *)fp);
+  if (rbuffer_size(rv) == 0) {
+    return;
+  }
+  const size_t read_bytes = rbuffer_read(rv, writebuf, kRWBufferSize);
+  const ptrdiff_t wres = os_write(fp->fd, writebuf, read_bytes);
+  if (wres != (ptrdiff_t)read_bytes) {
+    if (wres >= 0) {
+      fp->_error = UV_EIO;
+    } else {
+      fp->_error = (int)wres;
+    }
+  }
+}
+
+/// Read from file
+///
+/// @param[in,out]  fp  File to work with.
+/// @param[out]  ret_buf  Buffer to read to. Must not be NULL.
+/// @param[in]  size  Number of bytes to read. Buffer must have at least ret_buf
+///                   bytes.
+///
+/// @return error_code (< 0) or number of bytes read.
+ptrdiff_t file_read(FileDescriptor *const fp, char *const ret_buf,
+                    const size_t size)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  assert(!fp->wr);
+  char *buf = ret_buf;
+  size_t read_remaining = size;
+  RBuffer *const rv = fp->rv;
+  while (read_remaining) {
+    const size_t rv_size = rbuffer_size(rv);
+    if (rv_size > 0) {
+      const size_t rsize = rbuffer_read(rv, buf, MIN(rv_size, read_remaining));
+      buf += rsize;
+      read_remaining -= rsize;
+    }
+    if (fp->eof) {
+      break;
+    }
+    if (read_remaining) {
+      assert(rbuffer_size(rv) == 0);
+      rbuffer_reset(rv);
+#ifdef HAVE_READV
+      // If there is readv() syscall, then take an opportunity to populate
+      // both target buffer and RBuffer at once, …
+      size_t write_count;
+      struct iovec iov[] = {
+        { .iov_base = buf, .iov_len = read_remaining },
+        { .iov_base = rbuffer_write_ptr(rv, &write_count),
+          .iov_len = kRWBufferSize },
+      };
+      assert(write_count == kRWBufferSize);
+      const ptrdiff_t r_ret = os_readv(fp->fd, &fp->eof, iov,
+                                       ARRAY_SIZE(iov));
+      if (r_ret > 0) {
+        if (r_ret > (ptrdiff_t)read_remaining) {
+          rbuffer_produced(rv, (size_t)(r_ret - (ptrdiff_t)read_remaining));
+          read_remaining = 0;
+        } else {
+          buf += (size_t)r_ret;
+          read_remaining -= (size_t)r_ret;
+        }
+      } else if (r_ret < 0) {
+        return r_ret;
+      }
+#else
+      if (read_remaining >= kRWBufferSize) {
+        // …otherwise leave RBuffer empty and populate only target buffer,
+        // because filtering information through rbuffer will be more syscalls.
+        const ptrdiff_t r_ret = os_read(fp->fd, &fp->eof, buf, read_remaining);
+        if (r_ret >= 0) {
+          read_remaining -= (size_t)r_ret;
+          return (ptrdiff_t)(size - read_remaining);
+        } else if (r_ret < 0) {
+          return r_ret;
+        }
+      } else {
+        size_t write_count;
+        const ptrdiff_t r_ret = os_read(fp->fd, &fp->eof,
+                                        rbuffer_write_ptr(rv, &write_count),
+                                        kRWBufferSize);
+        assert(write_count == kRWBufferSize);
+        if (r_ret > 0) {
+          rbuffer_produced(rv, (size_t)r_ret);
+        } else if (r_ret < 0) {
+          return r_ret;
+        }
+      }
+#endif
+    }
+  }
+  return (ptrdiff_t)(size - read_remaining);
+}
+
+/// Write to a file
+///
+/// @param[in]  fd  File descriptor to write to.
+/// @param[in]  buf  Data to write. May be NULL if size is zero.
+/// @param[in]  size  Amount of bytes to write.
+///
+/// @return Number of bytes written or libuv error code (< 0).
+ptrdiff_t file_write(FileDescriptor *const fp, const char *const buf,
+                     const size_t size)
+  FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ARG(1)
+{
+  assert(fp->wr);
+  const size_t written = rbuffer_write(fp->rv, buf, size);
+  if (fp->_error != 0) {
+    const int error = fp->_error;
+    fp->_error = 0;
+    return error;
+  } else if (written != size) {
+    return UV_EIO;
+  }
+  return (ptrdiff_t)written;
+}
+
+/// Buffer used for skipping. Its contents is undefined and should never be
+/// used.
+static char skipbuf[kRWBufferSize];
+
+/// Skip some bytes
+///
+/// This is like `fseek(fp, size, SEEK_CUR)`, but actual implementation simply
+/// reads to a buffer and discards the result.
+ptrdiff_t file_skip(FileDescriptor *const fp, const size_t size)
+  FUNC_ATTR_NONNULL_ALL
+{
+  assert(!fp->wr);
+  size_t read_bytes = 0;
+  do {
+    const ptrdiff_t new_read_bytes = file_read(
+        fp, skipbuf, MIN(size - read_bytes, sizeof(skipbuf)));
+    if (new_read_bytes < 0) {
+      return new_read_bytes;
+    } else if (new_read_bytes == 0) {
+      break;
+    }
+    read_bytes += (size_t)new_read_bytes;
+  } while (read_bytes < size && !file_eof(fp));
+
+  return (ptrdiff_t)read_bytes;
+}
diff --git a/src/nvim/os/fileio.h b/src/nvim/os/fileio.h
new file mode 100644
index 0000000000..2cffd5c851
--- /dev/null
+++ b/src/nvim/os/fileio.h
@@ -0,0 +1,72 @@
+#ifndef NVIM_OS_FILEIO_H
+#define NVIM_OS_FILEIO_H
+
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "nvim/func_attr.h"
+#include "nvim/rbuffer.h"
+
+/// Structure used to read from/write to file
+typedef struct {
+  int fd;  ///< File descriptor.
+  int _error;  ///< Error code for use with RBuffer callbacks or zero.
+  RBuffer *rv;  ///< Read or write buffer.
+  bool wr;  ///< True if file is in write mode.
+  bool eof;  ///< True if end of file was encountered.
+} FileDescriptor;
+
+/// file_open() flags
+typedef enum {
+  kFileReadOnly = 1,  ///< Open file read-only. Default.
+  kFileCreate = 2,  ///< Create file if it does not exist yet.
+                    ///< Implies kFileWriteOnly.
+  kFileWriteOnly = 4,  ///< Open file for writing only.
+                       ///< Cannot be used with kFileReadOnly.
+  kFileNoSymlink = 8,  ///< Do not allow symbolic links.
+  kFileCreateOnly = 16,  ///< Only create the file, failing if it already
+                         ///< exists. Implies kFileWriteOnly. Cannot be used
+                         ///< with kFileCreate.
+  kFileTruncate = 32,  ///< Truncate the file if it exists.
+                       ///< Implies kFileWriteOnly. Cannot be used with
+                       ///< kFileCreateOnly.
+} FileOpenFlags;
+
+static inline bool file_eof(const FileDescriptor *const fp)
+  REAL_FATTR_PURE REAL_FATTR_WARN_UNUSED_RESULT REAL_FATTR_NONNULL_ALL;
+
+/// Check whether end of file was encountered
+///
+/// @param[in]  fp  File to check.
+///
+/// @return true if it was, false if it was not or read operation was never
+///         performed.
+static inline bool file_eof(const FileDescriptor *const fp)
+{
+  return fp->eof && rbuffer_size(fp->rv) == 0;
+}
+
+static inline int file_fd(const FileDescriptor *const fp)
+  REAL_FATTR_PURE REAL_FATTR_WARN_UNUSED_RESULT REAL_FATTR_NONNULL_ALL;
+
+/// Return the file descriptor associated with the FileDescriptor structure
+///
+/// @param[in]  fp  File to check.
+///
+/// @return File descriptor.
+static inline int file_fd(const FileDescriptor *const fp)
+{
+  return fp->fd;
+}
+
+enum {
+  /// Read or write buffer size
+  ///
+  /// Currently equal to (IOSIZE - 1), but they do not need to be connected.
+  kRWBufferSize = 1024
+};
+
+#ifdef INCLUDE_GENERATED_DECLARATIONS
+# include "os/fileio.h.generated.h"
+#endif
+#endif  // NVIM_OS_FILEIO_H
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 143a7160b0..30e08ac129 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -1,23 +1,51 @@
 // fs.c -- filesystem access
 #include <stdbool.h>
-
+#include <stddef.h>
 #include <assert.h>
+#include <limits.h>
 #include <fcntl.h>
+#include <errno.h>
+
+#include "auto/config.h"
+
+#ifdef HAVE_SYS_UIO_H
+# include <sys/uio.h>
+#endif
+
+#include <uv.h>
 
 #include "nvim/os/os.h"
 #include "nvim/os/os_defs.h"
 #include "nvim/ascii.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
+#include "nvim/assert.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/path.h"
 #include "nvim/strings.h"
 
+#ifdef WIN32
+#include "nvim/mbyte.h"  // for utf8_to_utf16, utf16_to_utf8
+#endif
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/fs.c.generated.h"
 #endif
 
+#define RUN_UV_FS_FUNC(ret, func, ...) \
+    do { \
+      bool did_try_to_free = false; \
+uv_call_start: {} \
+      uv_fs_t req; \
+      ret = func(&fs_loop, &req, __VA_ARGS__); \
+      uv_fs_req_cleanup(&req); \
+      if (ret == UV_ENOMEM && !did_try_to_free) { \
+        try_to_free_memory(); \
+        did_try_to_free = true; \
+        goto uv_call_start; \
+      } \
+    } while (0)
+
 // Many fs functions from libuv return that value on success.
 static const int kLibuvSuccess = 0;
 static uv_loop_t fs_loop;
@@ -135,8 +163,12 @@ int os_nodetype(const char *name)
   // saves us the hassle.
 
   int nodetype = NODE_WRITABLE;
-  int fd = os_open(name, O_RDONLY, 0);
-  switch(uv_guess_handle(fd)) {
+  int fd = os_open(name, O_RDONLY
+#ifdef O_NONBLOCK
+                   | O_NONBLOCK
+#endif
+                   , 0);
+  switch (uv_guess_handle(fd)) {
     case UV_TTY:         // FILE_TYPE_CHAR
       nodetype = NODE_WRITABLE;
       break;
@@ -160,6 +192,18 @@ int os_nodetype(const char *name)
   return nodetype;
 }
 
+/// Gets the absolute path of the currently running executable.
+///
+/// @param[out] buffer Returns the path string.
+/// @param[in]  size   Size of `buffer`.
+///
+/// @return `0` on success, or libuv error code on failure.
+int os_exepath(char *buffer, size_t *size)
+  FUNC_ATTR_NONNULL_ALL
+{
+  return uv_exepath(buffer, size);
+}
+
 /// Checks if the given path represents an executable file.
 ///
 /// @param[in]  name     Name of the executable.
@@ -325,13 +369,168 @@ static bool is_executable_in_path(const char_u *name, char_u **abspath)
 int os_open(const char* path, int flags, int mode)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t open_req;
-  int r = uv_fs_open(&fs_loop, &open_req, path, flags, mode, NULL);
-  uv_fs_req_cleanup(&open_req);
-  // r is the same as open_req.result (except for OOM: then only r is set).
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_open, path, flags, mode, NULL);
   return r;
 }
 
+/// Close a file
+///
+/// @return 0 or libuv error code on failure.
+int os_close(const int fd)
+{
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_close, fd, NULL);
+  return r;
+}
+
+/// Read from a file
+///
+/// Handles EINTR and ENOMEM, but not other errors.
+///
+/// @param[in]  fd  File descriptor to read from.
+/// @param[out]  ret_eof  Is set to true if EOF was encountered, otherwise set
+///                       to false. Initial value is ignored.
+/// @param[out]  ret_buf  Buffer to write to. May be NULL if size is zero.
+/// @param[in]  size  Amount of bytes to read.
+///
+/// @return Number of bytes read or libuv error code (< 0).
+ptrdiff_t os_read(const int fd, bool *ret_eof, char *const ret_buf,
+                  const size_t size)
+  FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  *ret_eof = false;
+  if (ret_buf == NULL) {
+    assert(size == 0);
+    return 0;
+  }
+  size_t read_bytes = 0;
+  bool did_try_to_free = false;
+  while (read_bytes != size) {
+    const ptrdiff_t cur_read_bytes = read(fd, ret_buf + read_bytes,
+                                          size - read_bytes);
+    if (cur_read_bytes > 0) {
+      read_bytes += (size_t)cur_read_bytes;
+      assert(read_bytes <= size);
+    }
+    if (cur_read_bytes < 0) {
+      const int error = os_translate_sys_error(errno);
+      errno = 0;
+      if (error == UV_EINTR || error == UV_EAGAIN) {
+        continue;
+      } else if (error == UV_ENOMEM && !did_try_to_free) {
+        try_to_free_memory();
+        did_try_to_free = true;
+        continue;
+      } else {
+        return (ptrdiff_t)error;
+      }
+    }
+    if (cur_read_bytes == 0) {
+      *ret_eof = true;
+      break;
+    }
+  }
+  return (ptrdiff_t)read_bytes;
+}
+
+#ifdef HAVE_READV
+/// Read from a file to multiple buffers at once
+///
+/// Wrapper for readv().
+///
+/// @param[in]  fd  File descriptor to read from.
+/// @param[out]  ret_eof  Is set to true if EOF was encountered, otherwise set
+///                       to false. Initial value is ignored.
+/// @param[out]  iov  Description of buffers to write to. Note: this description
+///                   may change, it is incorrect to use data it points to after
+///                   os_readv().
+/// @param[in]  iov_size  Number of buffers in iov.
+ptrdiff_t os_readv(int fd, bool *ret_eof, struct iovec *iov, size_t iov_size)
+  FUNC_ATTR_NONNULL_ALL
+{
+  *ret_eof = false;
+  size_t read_bytes = 0;
+  bool did_try_to_free = false;
+  size_t toread = 0;
+  for (size_t i = 0; i < iov_size; i++) {
+    // Overflow, trying to read too much data
+    assert(toread <= SIZE_MAX - iov[i].iov_len);
+    toread += iov[i].iov_len;
+  }
+  while (read_bytes < toread && iov_size && !*ret_eof) {
+    ptrdiff_t cur_read_bytes = readv(fd, iov, (int)iov_size);
+    if (toread && cur_read_bytes == 0) {
+      *ret_eof = true;
+    }
+    if (cur_read_bytes > 0) {
+      read_bytes += (size_t)cur_read_bytes;
+      while (iov_size && cur_read_bytes) {
+        if (cur_read_bytes < (ptrdiff_t)iov->iov_len) {
+          iov->iov_len -= (size_t)cur_read_bytes;
+          iov->iov_base = (char *)iov->iov_base + cur_read_bytes;
+          cur_read_bytes = 0;
+        } else {
+          cur_read_bytes -= (ptrdiff_t)iov->iov_len;
+          iov_size--;
+          iov++;
+        }
+      }
+    } else if (cur_read_bytes < 0) {
+      const int error = os_translate_sys_error(errno);
+      errno = 0;
+      if (error == UV_EINTR || error == UV_EAGAIN) {
+        continue;
+      } else if (error == UV_ENOMEM && !did_try_to_free) {
+        try_to_free_memory();
+        did_try_to_free = true;
+        continue;
+      } else {
+        return (ptrdiff_t)error;
+      }
+    }
+  }
+  return (ptrdiff_t)read_bytes;
+}
+#endif  // HAVE_READV
+
+/// Write to a file
+///
+/// @param[in]  fd  File descriptor to write to.
+/// @param[in]  buf  Data to write. May be NULL if size is zero.
+/// @param[in]  size  Amount of bytes to write.
+///
+/// @return Number of bytes written or libuv error code (< 0).
+ptrdiff_t os_write(const int fd, const char *const buf, const size_t size)
+  FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  if (buf == NULL) {
+    assert(size == 0);
+    return 0;
+  }
+  size_t written_bytes = 0;
+  while (written_bytes != size) {
+    const ptrdiff_t cur_written_bytes = write(fd, buf + written_bytes,
+                                              size - written_bytes);
+    if (cur_written_bytes > 0) {
+      written_bytes += (size_t)cur_written_bytes;
+    }
+    if (cur_written_bytes < 0) {
+      const int error = os_translate_sys_error(errno);
+      errno = 0;
+      if (error == UV_EINTR || error == UV_EAGAIN) {
+        continue;
+      } else {
+        return error;
+      }
+    }
+    if (cur_written_bytes == 0) {
+      return UV_UNKNOWN;
+    }
+  }
+  return (ptrdiff_t)written_bytes;
+}
+
 /// Flushes file modifications to disk.
 ///
 /// @param fd the file descriptor of the file to flush to disk.
@@ -339,9 +538,8 @@ int os_open(const char* path, int flags, int mode)
 /// @return `0` on success, a libuv error code on failure.
 int os_fsync(int fd)
 {
-  uv_fs_t fsync_req;
-  int r = uv_fs_fsync(&fs_loop, &fsync_req, fd, NULL);
-  uv_fs_req_cleanup(&fsync_req);
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_fsync, fd, NULL);
   return r;
 }
 
@@ -379,16 +577,9 @@ int32_t os_getperm(const char_u *name)
 int os_setperm(const char_u *name, int perm)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t request;
-  int result = uv_fs_chmod(&fs_loop, &request,
-                           (const char*)name, perm, NULL);
-  uv_fs_req_cleanup(&request);
-
-  if (result == kLibuvSuccess) {
-    return OK;
-  }
-
-  return FAIL;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_chmod, (const char *)name, perm, NULL);
+  return (r == kLibuvSuccess ? OK : FAIL);
 }
 
 /// Changes the ownership of the file referred to by the open file descriptor.
@@ -397,24 +588,21 @@ int os_setperm(const char_u *name, int perm)
 ///
 /// @note If the `owner` or `group` is specified as `-1`, then that ID is not
 /// changed.
-int os_fchown(int file_descriptor, uv_uid_t owner, uv_gid_t group)
-  FUNC_ATTR_NONNULL_ALL
+int os_fchown(int fd, uv_uid_t owner, uv_gid_t group)
 {
-  uv_fs_t request;
-  int result = uv_fs_fchown(&fs_loop, &request, file_descriptor,
-                            owner, group, NULL);
-  uv_fs_req_cleanup(&request);
-  return result;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_fchown, fd, owner, group, NULL);
+  return r;
 }
 
-/// Check if a file exists.
+/// Check if a path exists.
 ///
-/// @return `true` if `name` exists.
-bool os_file_exists(const char_u *name)
+/// @return `true` if `path` exists
+bool os_path_exists(const char_u *path)
   FUNC_ATTR_NONNULL_ALL
 {
   uv_stat_t statbuf;
-  return os_stat((char *)name, &statbuf) == kLibuvSuccess;
+  return os_stat((char *)path, &statbuf) == kLibuvSuccess;
 }
 
 /// Check if a file is readable.
@@ -423,9 +611,8 @@ bool os_file_exists(const char_u *name)
 bool os_file_is_readable(const char *name)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  uv_fs_t req;
-  int r = uv_fs_access(&fs_loop, &req, name, R_OK, NULL);
-  uv_fs_req_cleanup(&req);
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_access, name, R_OK, NULL);
   return (r == 0);
 }
 
@@ -437,9 +624,8 @@ bool os_file_is_readable(const char *name)
 int os_file_is_writable(const char *name)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  uv_fs_t req;
-  int r = uv_fs_access(&fs_loop, &req, name, W_OK, NULL);
-  uv_fs_req_cleanup(&req);
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_access, name, W_OK, NULL);
   if (r == 0) {
     return os_isdir((char_u *)name) ? 2 : 1;
   }
@@ -452,16 +638,10 @@ int os_file_is_writable(const char *name)
 int os_rename(const char_u *path, const char_u *new_path)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t request;
-  int result = uv_fs_rename(&fs_loop, &request,
-                            (const char *)path, (const char *)new_path, NULL);
-  uv_fs_req_cleanup(&request);
-
-  if (result == kLibuvSuccess) {
-    return OK;
-  }
-
-  return FAIL;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_rename, (const char *)path, (const char *)new_path,
+                 NULL);
+  return (r == kLibuvSuccess ? OK : FAIL);
 }
 
 /// Make a directory.
@@ -470,10 +650,9 @@ int os_rename(const char_u *path, const char_u *new_path)
 int os_mkdir(const char *path, int32_t mode)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t request;
-  int result = uv_fs_mkdir(&fs_loop, &request, path, mode, NULL);
-  uv_fs_req_cleanup(&request);
-  return result;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_mkdir, path, mode, NULL);
+  return r;
 }
 
 /// Make a directory, with higher levels when needed
@@ -555,10 +734,9 @@ int os_mkdtemp(const char *template, char *path)
 int os_rmdir(const char *path)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t request;
-  int result = uv_fs_rmdir(&fs_loop, &request, path, NULL);
-  uv_fs_req_cleanup(&request);
-  return result;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_rmdir, path, NULL);
+  return r;
 }
 
 /// Opens a directory.
@@ -600,10 +778,9 @@ void os_closedir(Directory *dir)
 int os_remove(const char *path)
   FUNC_ATTR_NONNULL_ALL
 {
-  uv_fs_t request;
-  int result = uv_fs_unlink(&fs_loop, &request, path, NULL);
-  uv_fs_req_cleanup(&request);
-  return result;
+  int r;
+  RUN_UV_FS_FUNC(r, uv_fs_unlink, path, NULL);
+  return r;
 }
 
 /// Get the file information for a given path
@@ -742,10 +919,222 @@ bool os_fileid_equal(const FileID *file_id_1, const FileID *file_id_2)
 /// @param file_info Pointer to a `FileInfo`
 /// @return `true` if the `FileID` and the `FileInfo` represent te same file.
 bool os_fileid_equal_fileinfo(const FileID *file_id,
-                                const FileInfo *file_info)
+                              const FileInfo *file_info)
   FUNC_ATTR_NONNULL_ALL
 {
   return file_id->inode == file_info->stat.st_ino
          && file_id->device_id == file_info->stat.st_dev;
 }
 
+#ifdef WIN32
+# include <shlobj.h>
+
+/// When "fname" is the name of a shortcut (*.lnk) resolve the file it points
+/// to and return that name in allocated memory.
+/// Otherwise NULL is returned.
+char_u * os_resolve_shortcut(char_u *fname)
+{
+  HRESULT hr;
+  IPersistFile *ppf = NULL;
+  OLECHAR wsz[MAX_PATH];
+  char_u *rfname = NULL;
+  int len;
+  IShellLinkW *pslw = NULL;
+  WIN32_FIND_DATAW ffdw;
+
+  // Check if the file name ends in ".lnk". Avoid calling CoCreateInstance(),
+  // it's quite slow.
+  if (fname == NULL) {
+    return rfname;
+  }
+  len = (int)STRLEN(fname);
+  if (len <= 4 || STRNICMP(fname + len - 4, ".lnk", 4) != 0) {
+    return rfname;
+  }
+
+  CoInitialize(NULL);
+
+  // create a link manager object and request its interface
+  hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
+                        &IID_IShellLinkW, (void **)&pslw);
+  if (hr == S_OK) {
+    WCHAR *p;
+    int conversion_result = utf8_to_utf16((char *)fname, &p);
+    if (conversion_result != 0) {
+      EMSG2("utf8_to_utf16 failed: %s", uv_strerror(conversion_result));
+    }
+
+    if (p != NULL) {
+      // Get a pointer to the IPersistFile interface.
+      hr = pslw->lpVtbl->QueryInterface(
+          pslw, &IID_IPersistFile, (void **)&ppf);
+      if (hr != S_OK) {
+        goto shortcut_errorw;
+      }
+
+      // "load" the name and resolve the link
+      hr = ppf->lpVtbl->Load(ppf, p, STGM_READ);
+      if (hr != S_OK) {
+        goto shortcut_errorw;
+      }
+
+#  if 0  // This makes Vim wait a long time if the target does not exist.
+      hr = pslw->lpVtbl->Resolve(pslw, NULL, SLR_NO_UI);
+      if (hr != S_OK) {
+        goto shortcut_errorw;
+      }
+#  endif
+
+      // Get the path to the link target.
+      ZeroMemory(wsz, MAX_PATH * sizeof(WCHAR));
+      hr = pslw->lpVtbl->GetPath(pslw, wsz, MAX_PATH, &ffdw, 0);
+      if (hr == S_OK && wsz[0] != NUL) {
+        int conversion_result = utf16_to_utf8(wsz, &rfname);
+        if (conversion_result != 0) {
+          EMSG2("utf16_to_utf8 failed: %s", uv_strerror(conversion_result));
+        }
+      }
+
+shortcut_errorw:
+      xfree(p);
+      goto shortcut_end;
+    }
+  }
+
+shortcut_end:
+  // Release all interface pointers (both belong to the same object)
+  if (ppf != NULL) {
+    ppf->lpVtbl->Release(ppf);
+  }
+  if (pslw != NULL) {
+    pslw->lpVtbl->Release(pslw);
+  }
+
+  CoUninitialize();
+  return rfname;
+}
+
+#endif
+
+int os_translate_sys_error(int sys_errno) {
+#ifdef HAVE_UV_TRANSLATE_SYS_ERROR
+  return uv_translate_sys_error(sys_errno);
+#elif WIN32
+  // TODO(equalsraf): libuv does not yet expose uv_translate_sys_error()
+  // in its public API, include a version here until it can be used.
+  // See https://github.com/libuv/libuv/issues/79
+# ifndef ERROR_SYMLINK_NOT_SUPPORTED
+#  define ERROR_SYMLINK_NOT_SUPPORTED 1464
+# endif
+
+  if (sys_errno <= 0) {
+    return sys_errno;  // If < 0 then it's already a libuv error
+  }
+
+  switch (sys_errno) {
+    case ERROR_NOACCESS:                    return UV_EACCES;
+    case WSAEACCES:                         return UV_EACCES;
+    case ERROR_ADDRESS_ALREADY_ASSOCIATED:  return UV_EADDRINUSE;
+    case WSAEADDRINUSE:                     return UV_EADDRINUSE;
+    case WSAEADDRNOTAVAIL:                  return UV_EADDRNOTAVAIL;
+    case WSAEAFNOSUPPORT:                   return UV_EAFNOSUPPORT;
+    case WSAEWOULDBLOCK:                    return UV_EAGAIN;
+    case WSAEALREADY:                       return UV_EALREADY;
+    case ERROR_INVALID_FLAGS:               return UV_EBADF;
+    case ERROR_INVALID_HANDLE:              return UV_EBADF;
+    case ERROR_LOCK_VIOLATION:              return UV_EBUSY;
+    case ERROR_PIPE_BUSY:                   return UV_EBUSY;
+    case ERROR_SHARING_VIOLATION:           return UV_EBUSY;
+    case ERROR_OPERATION_ABORTED:           return UV_ECANCELED;
+    case WSAEINTR:                          return UV_ECANCELED;
+    case ERROR_NO_UNICODE_TRANSLATION:      return UV_ECHARSET;
+    case ERROR_CONNECTION_ABORTED:          return UV_ECONNABORTED;
+    case WSAECONNABORTED:                   return UV_ECONNABORTED;
+    case ERROR_CONNECTION_REFUSED:          return UV_ECONNREFUSED;
+    case WSAECONNREFUSED:                   return UV_ECONNREFUSED;
+    case ERROR_NETNAME_DELETED:             return UV_ECONNRESET;
+    case WSAECONNRESET:                     return UV_ECONNRESET;
+    case ERROR_ALREADY_EXISTS:              return UV_EEXIST;
+    case ERROR_FILE_EXISTS:                 return UV_EEXIST;
+    case ERROR_BUFFER_OVERFLOW:             return UV_EFAULT;
+    case WSAEFAULT:                         return UV_EFAULT;
+    case ERROR_HOST_UNREACHABLE:            return UV_EHOSTUNREACH;
+    case WSAEHOSTUNREACH:                   return UV_EHOSTUNREACH;
+    case ERROR_INSUFFICIENT_BUFFER:         return UV_EINVAL;
+    case ERROR_INVALID_DATA:                return UV_EINVAL;
+    case ERROR_INVALID_PARAMETER:           return UV_EINVAL;
+    case ERROR_SYMLINK_NOT_SUPPORTED:       return UV_EINVAL;
+    case WSAEINVAL:                         return UV_EINVAL;
+    case WSAEPFNOSUPPORT:                   return UV_EINVAL;
+    case WSAESOCKTNOSUPPORT:                return UV_EINVAL;
+    case ERROR_BEGINNING_OF_MEDIA:          return UV_EIO;
+    case ERROR_BUS_RESET:                   return UV_EIO;
+    case ERROR_CRC:                         return UV_EIO;
+    case ERROR_DEVICE_DOOR_OPEN:            return UV_EIO;
+    case ERROR_DEVICE_REQUIRES_CLEANING:    return UV_EIO;
+    case ERROR_DISK_CORRUPT:                return UV_EIO;
+    case ERROR_EOM_OVERFLOW:                return UV_EIO;
+    case ERROR_FILEMARK_DETECTED:           return UV_EIO;
+    case ERROR_GEN_FAILURE:                 return UV_EIO;
+    case ERROR_INVALID_BLOCK_LENGTH:        return UV_EIO;
+    case ERROR_IO_DEVICE:                   return UV_EIO;
+    case ERROR_NO_DATA_DETECTED:            return UV_EIO;
+    case ERROR_NO_SIGNAL_SENT:              return UV_EIO;
+    case ERROR_OPEN_FAILED:                 return UV_EIO;
+    case ERROR_SETMARK_DETECTED:            return UV_EIO;
+    case ERROR_SIGNAL_REFUSED:              return UV_EIO;
+    case WSAEISCONN:                        return UV_EISCONN;
+    case ERROR_CANT_RESOLVE_FILENAME:       return UV_ELOOP;
+    case ERROR_TOO_MANY_OPEN_FILES:         return UV_EMFILE;
+    case WSAEMFILE:                         return UV_EMFILE;
+    case WSAEMSGSIZE:                       return UV_EMSGSIZE;
+    case ERROR_FILENAME_EXCED_RANGE:        return UV_ENAMETOOLONG;
+    case ERROR_NETWORK_UNREACHABLE:         return UV_ENETUNREACH;
+    case WSAENETUNREACH:                    return UV_ENETUNREACH;
+    case WSAENOBUFS:                        return UV_ENOBUFS;
+    case ERROR_BAD_PATHNAME:                return UV_ENOENT;
+    case ERROR_DIRECTORY:                   return UV_ENOENT;
+    case ERROR_FILE_NOT_FOUND:              return UV_ENOENT;
+    case ERROR_INVALID_NAME:                return UV_ENOENT;
+    case ERROR_INVALID_DRIVE:               return UV_ENOENT;
+    case ERROR_INVALID_REPARSE_DATA:        return UV_ENOENT;
+    case ERROR_MOD_NOT_FOUND:               return UV_ENOENT;
+    case ERROR_PATH_NOT_FOUND:              return UV_ENOENT;
+    case WSAHOST_NOT_FOUND:                 return UV_ENOENT;
+    case WSANO_DATA:                        return UV_ENOENT;
+    case ERROR_NOT_ENOUGH_MEMORY:           return UV_ENOMEM;
+    case ERROR_OUTOFMEMORY:                 return UV_ENOMEM;
+    case ERROR_CANNOT_MAKE:                 return UV_ENOSPC;
+    case ERROR_DISK_FULL:                   return UV_ENOSPC;
+    case ERROR_EA_TABLE_FULL:               return UV_ENOSPC;
+    case ERROR_END_OF_MEDIA:                return UV_ENOSPC;
+    case ERROR_HANDLE_DISK_FULL:            return UV_ENOSPC;
+    case ERROR_NOT_CONNECTED:               return UV_ENOTCONN;
+    case WSAENOTCONN:                       return UV_ENOTCONN;
+    case ERROR_DIR_NOT_EMPTY:               return UV_ENOTEMPTY;
+    case WSAENOTSOCK:                       return UV_ENOTSOCK;
+    case ERROR_NOT_SUPPORTED:               return UV_ENOTSUP;
+    case ERROR_BROKEN_PIPE:                 return UV_EOF;
+    case ERROR_ACCESS_DENIED:               return UV_EPERM;
+    case ERROR_PRIVILEGE_NOT_HELD:          return UV_EPERM;
+    case ERROR_BAD_PIPE:                    return UV_EPIPE;
+    case ERROR_NO_DATA:                     return UV_EPIPE;
+    case ERROR_PIPE_NOT_CONNECTED:          return UV_EPIPE;
+    case WSAESHUTDOWN:                      return UV_EPIPE;
+    case WSAEPROTONOSUPPORT:                return UV_EPROTONOSUPPORT;
+    case ERROR_WRITE_PROTECT:               return UV_EROFS;
+    case ERROR_SEM_TIMEOUT:                 return UV_ETIMEDOUT;
+    case WSAETIMEDOUT:                      return UV_ETIMEDOUT;
+    case ERROR_NOT_SAME_DEVICE:             return UV_EXDEV;
+    case ERROR_INVALID_FUNCTION:            return UV_EISDIR;
+    case ERROR_META_EXPANSION_TOO_LONG:     return UV_E2BIG;
+    default:                                return UV_UNKNOWN;
+  }
+#else
+  const int error = -errno;
+  STATIC_ASSERT(-EINTR == UV_EINTR, "Need to translate error codes");
+  STATIC_ASSERT(-EAGAIN == UV_EAGAIN, "Need to translate error codes");
+  STATIC_ASSERT(-ENOMEM == UV_ENOMEM, "Need to translate error codes");
+  return error;
+#endif
+}
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 7687b14f02..f264a26939 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -19,7 +19,7 @@
 #include "nvim/getchar.h"
 #include "nvim/main.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
+#include "nvim/state.h"
 
 #define READ_BUFFER_SIZE 0xfff
 #define INPUT_BUFFER_SIZE (READ_BUFFER_SIZE * 4)
@@ -39,8 +39,6 @@ static int events_enabled = 0;
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/input.c.generated.h"
 #endif
-// Helper function used to push bytes from the 'event' key sequence partially
-// between calls to os_inchar when maxlen < 3
 
 void input_init(void)
 {
@@ -60,8 +58,8 @@ void input_start(int fd)
   }
 
   global_fd = fd;
-  rstream_init_fd(&loop, &read_stream, fd, READ_BUFFER_SIZE, NULL);
-  rstream_start(&read_stream, read_cb);
+  rstream_init_fd(&main_loop, &read_stream, fd, READ_BUFFER_SIZE);
+  rstream_start(&read_stream, read_cb, NULL);
 }
 
 void input_stop(void)
@@ -71,7 +69,7 @@ void input_stop(void)
   }
 
   rstream_stop(&read_stream);
-  stream_close(&read_stream, NULL);
+  stream_close(&read_stream, NULL, NULL);
 }
 
 static void cursorhold_event(void **argv)
@@ -87,8 +85,8 @@ static void create_cursorhold_event(void)
   // have been called(inbuf_poll would return kInputAvail)
   // TODO(tarruda): Cursorhold should be implemented as a timer set during the
   // `state_check` callback for the states where it can be triggered.
-  assert(!events_enabled || queue_empty(loop.events));
-  queue_put(loop.events, cursorhold_event, 0);
+  assert(!events_enabled || multiqueue_empty(main_loop.events));
+  multiqueue_put(main_loop.events, cursorhold_event, 0);
 }
 
 // Low level input function
@@ -147,7 +145,7 @@ bool os_char_avail(void)
 void os_breakcheck(void)
 {
   if (!got_int) {
-    loop_poll_events(&loop, 0);
+    loop_poll_events(&main_loop, 0);
   }
 }
 
@@ -172,12 +170,13 @@ bool os_isatty(int fd)
 
 size_t input_enqueue(String keys)
 {
-  char *ptr = keys.data, *end = ptr + keys.size;
+  char *ptr = keys.data;
+  char *end = ptr + keys.size;
 
   while (rbuffer_space(input_buffer) >= 6 && ptr < end) {
     uint8_t buf[6] = { 0 };
-    unsigned int new_size = trans_special((const uint8_t **)&ptr, keys.size,
-                                          buf, true);
+    unsigned int new_size
+        = trans_special((const uint8_t **)&ptr, (size_t)(end - ptr), buf, true);
 
     if (new_size) {
       new_size = handle_mouse_event(&ptr, buf, new_size);
@@ -187,8 +186,7 @@ size_t input_enqueue(String keys)
 
     if (*ptr == '<') {
       char *old_ptr = ptr;
-      // Invalid or incomplete key sequence, skip until the next '>' or until
-      // *end
+      // Invalid or incomplete key sequence, skip until the next '>' or *end.
       do {
         ptr++;
       } while (ptr < end && *ptr != '>');
@@ -266,29 +264,32 @@ static unsigned int handle_mouse_event(char **ptr, uint8_t *buf,
   }
 
   static int orig_num_clicks = 0;
-  static int orig_mouse_code = 0;
-  static int orig_mouse_col = 0;
-  static int orig_mouse_row = 0;
-  static uint64_t orig_mouse_time = 0;  // time of previous mouse click
-  uint64_t mouse_time = os_hrtime();    // time of current mouse click
-
-  // compute the time elapsed since the previous mouse click and
-  // convert p_mouse from ms to ns
-  uint64_t timediff = mouse_time - orig_mouse_time;
-  uint64_t mouset = (uint64_t)p_mouset * 1000000;
-  if (mouse_code == orig_mouse_code
-      && timediff < mouset
-      && orig_num_clicks != 4
-      && orig_mouse_col == mouse_col
-      && orig_mouse_row == mouse_row) {
-    orig_num_clicks++;
-  } else {
-    orig_num_clicks = 1;
+  if (mouse_code != KE_LEFTRELEASE && mouse_code != KE_RIGHTRELEASE
+      && mouse_code != KE_MIDDLERELEASE) {
+      static int orig_mouse_code = 0;
+      static int orig_mouse_col = 0;
+      static int orig_mouse_row = 0;
+      static uint64_t orig_mouse_time = 0;  // time of previous mouse click
+      uint64_t mouse_time = os_hrtime();    // time of current mouse click (ns)
+
+      // compute the time elapsed since the previous mouse click and
+      // convert p_mouse from ms to ns
+      uint64_t timediff = mouse_time - orig_mouse_time;
+      uint64_t mouset = (uint64_t)p_mouset * 1000000;
+      if (mouse_code == orig_mouse_code
+          && timediff < mouset
+          && orig_num_clicks != 4
+          && orig_mouse_col == mouse_col
+          && orig_mouse_row == mouse_row) {
+        orig_num_clicks++;
+      } else {
+        orig_num_clicks = 1;
+      }
+      orig_mouse_code = mouse_code;
+      orig_mouse_col = mouse_col;
+      orig_mouse_row = mouse_row;
+      orig_mouse_time = mouse_time;
   }
-  orig_mouse_code = mouse_code;
-  orig_mouse_col = mouse_col;
-  orig_mouse_row = mouse_row;
-  orig_mouse_time = mouse_time;
 
   uint8_t modifiers = 0;
   if (orig_num_clicks == 2) {
@@ -322,7 +323,7 @@ static bool input_poll(int ms)
     prof_inchar_enter();
   }
 
-  LOOP_PROCESS_EVENTS_UNTIL(&loop, NULL, ms, input_ready() || input_eof);
+  LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, ms, input_ready() || input_eof);
 
   if (do_profiling == PROF_YES && ms) {
     prof_inchar_exit();
@@ -386,6 +387,8 @@ static void process_interrupts(void)
   }
 }
 
+// Helper function used to push bytes from the 'event' key sequence partially
+// between calls to os_inchar when maxlen < 3
 static int push_event_key(uint8_t *buf, int maxlen)
 {
   static const uint8_t key[3] = { K_SPECIAL, KS_EXTRA, KE_EVENT };
@@ -419,5 +422,5 @@ static void read_error_exit(void)
 
 static bool pending_events(void)
 {
-  return events_enabled && !queue_empty(loop.events);
+  return events_enabled && !multiqueue_empty(main_loop.events);
 }
diff --git a/src/nvim/os/os_defs.h b/src/nvim/os/os_defs.h
index eee0cdd10b..14c210c69c 100644
--- a/src/nvim/os/os_defs.h
+++ b/src/nvim/os/os_defs.h
@@ -16,7 +16,7 @@
 #define BASENAMELEN (NAME_MAX - 5)
 
 // Use the system path length if it makes sense.
-#if defined(PATH_MAX) && (PATH_MAX > 1000)
+#if defined(PATH_MAX) && (PATH_MAX > 1024)
 # define MAXPATHL PATH_MAX
 #else
 # define MAXPATHL 1024
@@ -46,4 +46,10 @@
 /// negative libuv error codes are returned by a number of os functions.
 #define os_strerror uv_strerror
 
+#ifdef WIN32
+# define os_strtok strtok_s
+#else
+# define os_strtok strtok_r
+#endif
+
 #endif  // NVIM_OS_OS_DEFS_H
diff --git a/src/nvim/os/pty_process.h b/src/nvim/os/pty_process.h
new file mode 100644
index 0000000000..94923499ca
--- /dev/null
+++ b/src/nvim/os/pty_process.h
@@ -0,0 +1,9 @@
+#ifndef NVIM_OS_PTY_PROCESS_H
+#define NVIM_OS_PTY_PROCESS_H
+
+#ifdef WIN32
+# include "nvim/os/pty_process_win.h"
+#else
+# include "nvim/os/pty_process_unix.h"
+#endif
+#endif  // NVIM_OS_PTY_PROCESS_H
diff --git a/src/nvim/event/pty_process.c b/src/nvim/os/pty_process_unix.c
index 8eef72f12f..b57a69b82b 100644
--- a/src/nvim/event/pty_process.c
+++ b/src/nvim/os/pty_process_unix.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <unistd.h>
 #include <termios.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -26,11 +25,12 @@
 #include "nvim/event/rstream.h"
 #include "nvim/event/wstream.h"
 #include "nvim/event/process.h"
-#include "nvim/event/pty_process.h"
+#include "nvim/os/pty_process_unix.h"
 #include "nvim/log.h"
+#include "nvim/os/os.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/pty_process.c.generated.h"
+# include "os/pty_process_unix.c.generated.h"
 #endif
 
 bool pty_process_spawn(PtyProcess *ptyproc)
@@ -44,7 +44,7 @@ bool pty_process_spawn(PtyProcess *ptyproc)
   Process *proc = (Process *)ptyproc;
   assert(!proc->err);
   uv_signal_start(&proc->loop->children_watcher, chld_handler, SIGCHLD);
-  ptyproc->winsize = (struct winsize){ptyproc->height, ptyproc->width, 0, 0};
+  ptyproc->winsize = (struct winsize){ ptyproc->height, ptyproc->width, 0, 0 };
   uv_disable_stdio_inheritance();
   int master;
   int pid = forkpty(&master, NULL, &termios, &ptyproc->winsize);
@@ -86,11 +86,10 @@ error:
   return false;
 }
 
-void pty_process_resize(PtyProcess *ptyproc, uint16_t width,
-    uint16_t height)
+void pty_process_resize(PtyProcess *ptyproc, uint16_t width, uint16_t height)
   FUNC_ATTR_NONNULL_ALL
 {
-  ptyproc->winsize = (struct winsize){height, width, 0, 0};
+  ptyproc->winsize = (struct winsize){ height, width, 0, 0 };
   ioctl(ptyproc->tty_fd, TIOCSWINSZ, &ptyproc->winsize);
 }
 
@@ -132,6 +131,12 @@ static void init_child(PtyProcess *ptyproc) FUNC_ATTR_NONNULL_ALL
   signal(SIGTERM, SIG_DFL);
   signal(SIGALRM, SIG_DFL);
 
+  Process *proc = (Process *)ptyproc;
+  if (proc->cwd && os_chdir(proc->cwd) != 0) {
+    fprintf(stderr, "chdir failed: %s\n", strerror(errno));
+    return;
+  }
+
   setenv("TERM", ptyproc->term_name ? ptyproc->term_name : "ansi", 1);
   execvp(ptyproc->process.argv[0], ptyproc->process.argv);
   fprintf(stderr, "execvp failed: %s\n", strerror(errno));
diff --git a/src/nvim/event/pty_process.h b/src/nvim/os/pty_process_unix.h
index 446d7fd3c8..f7c57b3839 100644
--- a/src/nvim/event/pty_process.h
+++ b/src/nvim/os/pty_process_unix.h
@@ -1,5 +1,5 @@
-#ifndef NVIM_EVENT_PTY_PROCESS_H
-#define NVIM_EVENT_PTY_PROCESS_H
+#ifndef NVIM_OS_PTY_PROCESS_UNIX_H
+#define NVIM_OS_PTY_PROCESS_UNIX_H
 
 #include <sys/ioctl.h>
 
@@ -25,6 +25,7 @@ static inline PtyProcess pty_process_init(Loop *loop, void *data)
 }
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "event/pty_process.h.generated.h"
+# include "os/pty_process_unix.h.generated.h"
 #endif
-#endif  // NVIM_EVENT_PTY_PROCESS_H
+
+#endif  // NVIM_OS_PTY_PROCESS_UNIX_H
diff --git a/src/nvim/os/pty_process_win.h b/src/nvim/os/pty_process_win.h
new file mode 100644
index 0000000000..20cc589925
--- /dev/null
+++ b/src/nvim/os/pty_process_win.h
@@ -0,0 +1,28 @@
+#ifndef NVIM_OS_PTY_PROCESS_WIN_H
+#define NVIM_OS_PTY_PROCESS_WIN_H
+
+#include "nvim/event/libuv_process.h"
+
+typedef struct pty_process {
+  Process process;
+  char *term_name;
+  uint16_t width, height;
+} PtyProcess;
+
+#define pty_process_spawn(job) libuv_process_spawn((LibuvProcess *)job)
+#define pty_process_close(job) libuv_process_close((LibuvProcess *)job)
+#define pty_process_close_master(job) libuv_process_close((LibuvProcess *)job)
+#define pty_process_resize(job, width, height)
+#define pty_process_teardown(loop)
+
+static inline PtyProcess pty_process_init(Loop *loop, void *data)
+{
+  PtyProcess rv;
+  rv.process = process_init(loop, kProcessTypePty, data);
+  rv.term_name = NULL;
+  rv.width = 80;
+  rv.height = 24;
+  return rv;
+}
+
+#endif  // NVIM_OS_PTY_PROCESS_WIN_H
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index f5a1637c94..9514936ad0 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -14,18 +14,20 @@
 #include "nvim/os/shell.h"
 #include "nvim/os/signal.h"
 #include "nvim/types.h"
+#include "nvim/main.h"
 #include "nvim/vim.h"
 #include "nvim/message.h"
 #include "nvim/memory.h"
 #include "nvim/ui.h"
-#include "nvim/misc2.h"
 #include "nvim/screen.h"
 #include "nvim/memline.h"
 #include "nvim/option_defs.h"
 #include "nvim/charset.h"
 #include "nvim/strings.h"
 
-#define DYNAMIC_BUFFER_INIT {NULL, 0, 0}
+#define DYNAMIC_BUFFER_INIT { NULL, 0, 0 }
+#define NS_1_SECOND         1000000000U     // 1 second, in nanoseconds
+#define OUT_DATA_THRESHOLD  1024 * 10U      // 10KB, "a few screenfuls" of data.
 
 typedef struct {
   char *data;
@@ -53,12 +55,12 @@ char **shell_build_argv(const char *cmd, const char *extra_args)
   size_t i = tokenize(p_sh, rv);
 
   if (extra_args) {
-    rv[i++] = xstrdup(extra_args);   // Push a copy of `extra_args`
+    rv[i++] = xstrdup(extra_args);        // Push a copy of `extra_args`
   }
 
   if (cmd) {
-    i += tokenize(p_shcf, rv + i);   // Split 'shellcmdflag'
-    rv[i++] = xstrdup(cmd);          // Push a copy of the command.
+    i += tokenize(p_shcf, rv + i);        // Split 'shellcmdflag'
+    rv[i++] = shell_xescape_xquote(cmd);  // Copy (and escape) `cmd`.
   }
 
   rv[i] = NULL;
@@ -162,7 +164,7 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args)
 /// @param input The input to the shell (NULL for no input), passed to the
 ///              stdin of the resulting process.
 /// @param len The length of the input buffer (not used if `input` == NULL)
-/// @param[out] output A pointer to to a location where the output will be
+/// @param[out] output Pointer to a location where the output will be
 ///                    allocated and stored. Will point to NULL if the shell
 ///                    command did not output anything. If NULL is passed,
 ///                    the shell output will be ignored.
@@ -187,6 +189,9 @@ static int do_os_system(char **argv,
                         bool silent,
                         bool forward_output)
 {
+  out_data_decide_throttle(0);  // Initialize throttle decider.
+  out_data_ring(NULL, 0);       // Initialize output ring-buffer.
+
   // the output buffer
   DynamicBuffer buf = DYNAMIC_BUFFER_INIT;
   stream_read_cb data_cb = system_data_cb;
@@ -205,29 +210,29 @@ static int do_os_system(char **argv,
   xstrlcpy(prog, argv[0], MAXPATHL);
 
   Stream in, out, err;
-  LibuvProcess uvproc = libuv_process_init(&loop, &buf);
+  LibuvProcess uvproc = libuv_process_init(&main_loop, &buf);
   Process *proc = &uvproc.process;
-  Queue *events = queue_new_child(loop.events);
+  MultiQueue *events = multiqueue_new_child(main_loop.events);
   proc->events = events;
   proc->argv = argv;
   proc->in = input != NULL ? &in : NULL;
   proc->out = &out;
   proc->err = &err;
   if (!process_spawn(proc)) {
-    loop_poll_events(&loop, 0);
-    // Failed, probably due to `sh` not being executable
+    loop_poll_events(&main_loop, 0);
+    // Failed, probably due to 'sh' not being executable
     if (!silent) {
       MSG_PUTS(_("\nCannot execute "));
       msg_outtrans((char_u *)prog);
       msg_putchar('\n');
     }
-    queue_free(events);
+    multiqueue_free(events);
     return -1;
   }
 
   // We want to deal with stream events as fast a possible while queueing
   // process events, so reset everything to NULL. It prevents closing the
-  // streams while there's still data in the OS buffer(due to the process
+  // streams while there's still data in the OS buffer (due to the process
   // exiting before all data is read).
   if (input != NULL) {
     proc->in->events = NULL;
@@ -235,10 +240,10 @@ static int do_os_system(char **argv,
   }
   proc->out->events = NULL;
   rstream_init(proc->out, 0);
-  rstream_start(proc->out, data_cb);
+  rstream_start(proc->out, data_cb, &buf);
   proc->err->events = NULL;
   rstream_init(proc->err, 0);
-  rstream_start(proc->err, data_cb);
+  rstream_start(proc->err, data_cb, &buf);
 
   // write the input, if any
   if (input) {
@@ -250,14 +255,18 @@ static int do_os_system(char **argv,
       return -1;
     }
     // close the input stream after everything is written
-    wstream_set_write_cb(&in, shell_write_cb);
+    wstream_set_write_cb(&in, shell_write_cb, NULL);
   }
 
-  // invoke busy_start here so event_poll_until wont change the busy state for
-  // the UI
+  // Invoke busy_start here so LOOP_PROCESS_EVENTS_UNTIL will not change the
+  // busy state.
   ui_busy_start();
   ui_flush();
   int status = process_wait(proc, -1, NULL);
+  if (!got_int && out_data_decide_throttle(0)) {
+    // Last chunk of output was skipped; display it now.
+    out_data_ring(NULL, SIZE_MAX);
+  }
   ui_busy_stop();
 
   // prepare the out parameters if requested
@@ -277,8 +286,8 @@ static int do_os_system(char **argv,
     }
   }
 
-  assert(queue_empty(events));
-  queue_free(events);
+  assert(multiqueue_empty(events));
+  multiqueue_free(events);
 
   return status;
 }
@@ -309,25 +318,192 @@ static void system_data_cb(Stream *stream, RBuffer *buf, size_t count,
   dbuf->len += nread;
 }
 
+/// Tracks output received for the current executing shell command, and displays
+/// a pulsing "..." when output should be skipped. Tracking depends on the
+/// synchronous/blocking nature of ":!".
+//
+/// Purpose:
+///   1. CTRL-C is more responsive. #1234 #5396
+///   2. Improves performance of :! (UI, esp. TUI, is the bottleneck).
+///   3. Avoids OOM during long-running, spammy :!.
+///
+/// Vim does not need this hack because:
+///   1. :! in terminal-Vim runs in cooked mode, so CTRL-C is caught by the
+///      terminal and raises SIGINT out-of-band.
+///   2. :! in terminal-Vim uses a tty (Nvim uses pipes), so commands
+///      (e.g. `git grep`) may page themselves.
+///
+/// @param size Length of data, used with internal state to decide whether
+///             output should be skipped. size=0 resets the internal state and
+///             returns the previous decision.
+///
+/// @returns true if output should be skipped and pulse was displayed.
+///          Returns the previous decision if size=0.
+static bool out_data_decide_throttle(size_t size)
+{
+  static uint64_t   started     = 0;  // Start time of the current throttle.
+  static size_t     received    = 0;  // Bytes observed since last throttle.
+  static size_t     visit       = 0;  // "Pulse" count of the current throttle.
+  static char       pulse_msg[] = { ' ', ' ', ' ', '\0' };
+
+  if (!size) {
+    bool previous_decision = (visit > 0);
+    started = received = visit = 0;
+    return previous_decision;
+  }
+
+  received += size;
+  if (received < OUT_DATA_THRESHOLD
+      // Display at least the first chunk of output even if it is big.
+      || (!started && received < size + 1000)) {
+    return false;
+  } else if (!visit) {
+    started = os_hrtime();
+  } else if (visit % 20 == 0) {
+    uint64_t since = os_hrtime() - started;
+    if (since > (3 * NS_1_SECOND)) {
+      received = visit = 0;
+      return false;
+    }
+  }
+
+  visit++;
+  // Pulse "..." at the bottom of the screen.
+  size_t tick = (visit % 20 == 0)
+                ? 3  // Force all dots "..." on last visit.
+                : (visit % 4);
+  pulse_msg[0] = (tick == 0) ? ' ' : '.';
+  pulse_msg[1] = (tick == 0 || 1 == tick) ? ' ' : '.';
+  pulse_msg[2] = (tick == 0 || 1 == tick || 2 == tick) ? ' ' : '.';
+  if (visit == 1) {
+    screen_del_lines(0, 0, 1, (int)Rows, NULL);
+  }
+  int lastrow = (int)Rows - 1;
+  screen_puts_len((char_u *)pulse_msg, ARRAY_SIZE(pulse_msg), lastrow, 0, 0);
+  ui_flush();
+  return true;
+}
+
+/// Saves output in a quasi-ringbuffer. Used to ensure the last ~page of
+/// output for a shell-command is always displayed.
+///
+/// Init mode: Resets the internal state.
+///   output = NULL
+///   size   = 0
+/// Print mode: Displays the current saved data.
+///   output = NULL
+///   size   = SIZE_MAX
+///
+/// @param  output  Data to save, or NULL to invoke a special mode.
+/// @param  size    Length of `output`.
+static void out_data_ring(char *output, size_t size)
+{
+#define MAX_CHUNK_SIZE (OUT_DATA_THRESHOLD / 2)
+  static char    last_skipped[MAX_CHUNK_SIZE];  // Saved output.
+  static size_t  last_skipped_len = 0;
+
+  assert(output != NULL || (size == 0 || size == SIZE_MAX));
+
+  if (output == NULL && size == 0) {          // Init mode
+    last_skipped_len = 0;
+    return;
+  }
+
+  if (output == NULL && size == SIZE_MAX) {   // Print mode
+    out_data_append_to_screen(last_skipped, last_skipped_len, true);
+    return;
+  }
+
+  // This is basically a ring-buffer...
+  if (size >= MAX_CHUNK_SIZE) {               // Save mode
+    size_t start = size - MAX_CHUNK_SIZE;
+    memcpy(last_skipped, output + start, MAX_CHUNK_SIZE);
+    last_skipped_len = MAX_CHUNK_SIZE;
+  } else if (size > 0) {
+    // Length of the old data that can be kept.
+    size_t keep_len   = MIN(last_skipped_len, MAX_CHUNK_SIZE - size);
+    size_t keep_start = last_skipped_len - keep_len;
+    // Shift the kept part of the old data to the start.
+    if (keep_start) {
+      memmove(last_skipped, last_skipped + keep_start, keep_len);
+    }
+    // Copy the entire new data to the remaining space.
+    memcpy(last_skipped + keep_len, output, size);
+    last_skipped_len = keep_len + size;
+  }
+}
+
+/// Continue to append data to last screen line.
+///
+/// @param output       Data to append to screen lines.
+/// @param remaining    Size of data.
+/// @param new_line     If true, next data output will be on a new line.
+static void out_data_append_to_screen(char *output, size_t remaining,
+                                      bool new_line)
+{
+  static colnr_T last_col = 0;  // Column of last row to append to.
+
+  size_t off = 0;
+  int last_row = (int)Rows - 1;
+
+  while (off < remaining) {
+    // Found end of line?
+    if (output[off] == NL) {
+      // Can we start a new line or do we need to continue the last one?
+      if (last_col == 0) {
+        screen_del_lines(0, 0, 1, (int)Rows, NULL);
+      }
+      screen_puts_len((char_u *)output, (int)off, last_row, last_col, 0);
+      last_col = 0;
+
+      size_t skip = off + 1;
+      output += skip;
+      remaining -= skip;
+      off = 0;
+      continue;
+    }
+
+    // Translate NUL to SOH
+    if (output[off] == NUL) {
+      output[off] = 1;
+    }
+
+    off++;
+  }
+
+  if (remaining) {
+    if (last_col == 0) {
+      screen_del_lines(0, 0, 1, (int)Rows, NULL);
+    }
+    screen_puts_len((char_u *)output, (int)remaining, last_row, last_col, 0);
+    last_col += (colnr_T)remaining;
+  }
+
+  if (new_line) {
+    last_col = 0;
+  }
+
+  ui_flush();
+}
+
 static void out_data_cb(Stream *stream, RBuffer *buf, size_t count, void *data,
     bool eof)
 {
+  // We always output the whole buffer, so the buffer can never
+  // wrap around.
   size_t cnt;
   char *ptr = rbuffer_read_ptr(buf, &cnt);
 
-  if (!cnt) {
-    return;
+  if (ptr != NULL && cnt > 0
+      && out_data_decide_throttle(cnt)) {  // Skip output above a threshold.
+    // Save the skipped output. If it is the final chunk, we display it later.
+    out_data_ring(ptr, cnt);
+  } else {
+    out_data_append_to_screen(ptr, cnt, eof);
   }
 
-  size_t written = write_output(ptr, cnt, false, eof);
-  // No output written, force emptying the Rbuffer if it is full.
-  if (!written && rbuffer_size(buf) == rbuffer_capacity(buf)) {
-    screen_del_lines(0, 0, 1, (int)Rows, NULL);
-    screen_puts_len((char_u *)ptr, (int)cnt, (int)Rows - 1, 0, 0);
-    written = cnt;
-  }
-  if (written) {
-    rbuffer_consumed(buf, written);
+  if (cnt) {
+    rbuffer_consumed(buf, cnt);
   }
 }
 
@@ -500,5 +676,51 @@ static size_t write_output(char *output, size_t remaining, bool to_buffer,
 
 static void shell_write_cb(Stream *stream, void *data, int status)
 {
-  stream_close(stream, NULL);
+  if (status) {
+    // Can happen if system() tries to send input to a shell command that was
+    // backgrounded (:call system("cat - &", "foo")). #3529 #5241
+    msg_schedule_emsgf(_("E5677: Error writing input to shell-command: %s"),
+                       uv_err_name(status));
+  }
+  if (stream->closed) {  // Process may have exited before this write.
+    ELOG("stream was already closed");
+    return;
+  }
+  stream_close(stream, NULL, NULL);
+}
+
+/// Applies 'shellxescape' (p_sxe) and 'shellxquote' (p_sxq) to a command.
+///
+/// @param cmd Command string
+/// @return    Escaped/quoted command string (allocated).
+static char *shell_xescape_xquote(const char *cmd)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  if (*p_sxq == NUL) {
+    return xstrdup(cmd);
+  }
+
+  const char *ecmd = cmd;
+  if (*p_sxe != NUL && STRCMP(p_sxq, "(") == 0) {
+    ecmd = (char *)vim_strsave_escaped_ext((char_u *)cmd, p_sxe, '^', false);
+  }
+  size_t ncmd_size = strlen(ecmd) + STRLEN(p_sxq) * 2 + 1;
+  char *ncmd = xmalloc(ncmd_size);
+
+  // When 'shellxquote' is ( append ).
+  // When 'shellxquote' is "( append )".
+  if (STRCMP(p_sxq, "(") == 0) {
+    vim_snprintf(ncmd, ncmd_size, "(%s)", ecmd);
+  } else if (STRCMP(p_sxq, "\"(") == 0) {
+    vim_snprintf(ncmd, ncmd_size, "\"(%s)\"", ecmd);
+  } else {
+    vim_snprintf(ncmd, ncmd_size, "%s%s%s", p_sxq, ecmd, p_sxq);
+  }
+
+  if (ecmd != cmd) {
+    xfree((void *)ecmd);
+  }
+
+  return ncmd;
 }
+
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index 0ff6016e32..1ac6d3f5e1 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -2,15 +2,18 @@
 #include <stdbool.h>
 
 #include <uv.h>
+#ifndef WIN32
+# include <signal.h>  // for sigset_t
+#endif
 
 #include "nvim/ascii.h"
 #include "nvim/vim.h"
 #include "nvim/globals.h"
 #include "nvim/memline.h"
 #include "nvim/eval.h"
+#include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/event/signal.h"
 #include "nvim/os/signal.h"
 #include "nvim/event/loop.h"
@@ -28,10 +31,20 @@ static bool rejecting_deadly;
 
 void signal_init(void)
 {
-  signal_watcher_init(&loop, &spipe, NULL);
-  signal_watcher_init(&loop, &shup, NULL);
-  signal_watcher_init(&loop, &squit, NULL);
-  signal_watcher_init(&loop, &sterm, NULL);
+#ifndef WIN32
+  // Ensure a clean slate by unblocking all signals. For example, if SIGCHLD is
+  // blocked, libuv may hang after spawning a subprocess on Linux. #5230
+  sigset_t mask;
+  sigemptyset(&mask);
+  if (pthread_sigmask(SIG_SETMASK, &mask, NULL) != 0) {
+    ELOG("Could not unblock signals, nvim might behave strangely.");
+  }
+#endif
+
+  signal_watcher_init(&main_loop, &spipe, NULL);
+  signal_watcher_init(&main_loop, &shup, NULL);
+  signal_watcher_init(&main_loop, &squit, NULL);
+  signal_watcher_init(&main_loop, &sterm, NULL);
 #ifdef SIGPIPE
   signal_watcher_start(&spipe, on_signal, SIGPIPE);
 #endif
@@ -41,7 +54,7 @@ void signal_init(void)
 #endif
   signal_watcher_start(&sterm, on_signal, SIGTERM);
 #ifdef SIGPWR
-  signal_watcher_init(&loop, &spwr, NULL);
+  signal_watcher_init(&main_loop, &spwr, NULL);
   signal_watcher_start(&spwr, on_signal, SIGPWR);
 #endif
 }
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c
index 81ceb919c4..afb9bdec31 100644
--- a/src/nvim/os/stdpaths.c
+++ b/src/nvim/os/stdpaths.c
@@ -16,20 +16,29 @@ static const char *xdg_env_vars[] = {
   [kXDGDataDirs] = "XDG_DATA_DIRS",
 };
 
+#ifdef WIN32
+static const char *const xdg_defaults_env_vars[] = {
+  [kXDGConfigHome] = "LOCALAPPDATA",
+  [kXDGDataHome] = "LOCALAPPDATA",
+  [kXDGCacheHome] = "TEMP",
+  [kXDGRuntimeDir] = NULL,
+  [kXDGConfigDirs] = NULL,
+  [kXDGDataDirs] = NULL,
+};
+#endif
+
 /// Defaults for XDGVarType values
 ///
 /// Used in case environment variables contain nothing. Need to be expanded.
 static const char *const xdg_defaults[] = {
 #ifdef WIN32
-  // Windows
-  [kXDGConfigHome] = "$LOCALAPPDATA",
-  [kXDGDataHome]   = "$LOCALAPPDATA",
-  [kXDGCacheHome]  = "$TEMP",
+  [kXDGConfigHome] = "~\\AppData\\Local",
+  [kXDGDataHome] = "~\\AppData\\Local",
+  [kXDGCacheHome] = "~\\AppData\\Local\\Temp",
   [kXDGRuntimeDir] = NULL,
   [kXDGConfigDirs] = NULL,
   [kXDGDataDirs] = NULL,
 #else
-  // Linux, BSD, CYGWIN, Apple
   [kXDGConfigHome] = "~/.config",
   [kXDGDataHome] = "~/.local/share",
   [kXDGCacheHome] = "~/.cache",
@@ -50,7 +59,14 @@ char *stdpaths_get_xdg_var(const XDGVarType idx)
   const char *const env = xdg_env_vars[idx];
   const char *const fallback = xdg_defaults[idx];
 
-  const char *const env_val = os_getenv(env);
+  const char *env_val = os_getenv(env);
+
+#ifdef WIN32
+  if (env_val == NULL) {
+    env_val = os_getenv(xdg_defaults_env_vars[idx]);
+  }
+#endif
+
   char *ret = NULL;
   if (env_val != NULL) {
     ret = xstrdup(env_val);
@@ -100,18 +116,30 @@ char *stdpaths_user_conf_subpath(const char *fname)
 ///
 /// @param[in]  fname  New component of the path.
 /// @param[in]  trailing_pathseps  Amount of trailing path separators to add.
+/// @param[in]  escape_commas  If true, all commas will be escaped.
 ///
-/// @return [allocated] `$XDG_DATA_HOME/nvim/{fname}`
+/// @return [allocated] `$XDG_DATA_HOME/nvim/{fname}`.
 char *stdpaths_user_data_subpath(const char *fname,
-                                 const size_t trailing_pathseps)
+                                 const size_t trailing_pathseps,
+                                 const bool escape_commas)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
 {
   char *ret = concat_fnames_realloc(get_xdg_home(kXDGDataHome), fname, true);
-  if (trailing_pathseps) {
-    const size_t len = strlen(ret);
-    ret = xrealloc(ret, len + trailing_pathseps + 1);
-    memset(ret + len, PATHSEP, trailing_pathseps);
-    ret[len + trailing_pathseps] = NUL;
+  const size_t len = strlen(ret);
+  const size_t numcommas = (escape_commas ? memcnt(ret, ',', len) : 0);
+  if (numcommas || trailing_pathseps) {
+    ret = xrealloc(ret, len + trailing_pathseps + numcommas + 1);
+    for (size_t i = 0 ; i < len + numcommas ; i++) {
+      if (ret[i] == ',') {
+        memmove(ret + i + 1, ret + i, len - i + numcommas);
+        ret[i] = '\\';
+        i++;
+      }
+    }
+    if (trailing_pathseps) {
+      memset(ret + len + numcommas, PATHSEP, trailing_pathseps);
+    }
+    ret[len + trailing_pathseps + numcommas] = NUL;
   }
   return ret;
 }
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index 188f0802c9..8ce2ecf4f4 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -7,8 +7,10 @@
 #include <uv.h>
 
 #include "nvim/os/time.h"
+#include "nvim/os/input.h"
 #include "nvim/event/loop.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 
 static uv_mutex_t delay_mutex;
 static uv_cond_t delay_cond;
@@ -33,38 +35,54 @@ uint64_t os_hrtime(void)
   return uv_hrtime();
 }
 
-/// Sleeps for a certain amount of milliseconds
+/// Sleeps for a certain amount of milliseconds.
 ///
 /// @param milliseconds Number of milliseconds to sleep
-/// @param ignoreinput If true, allow a SIGINT to interrupt us
+/// @param ignoreinput If true, only SIGINT (CTRL-C) can interrupt.
 void os_delay(uint64_t milliseconds, bool ignoreinput)
 {
   if (ignoreinput) {
     if (milliseconds > INT_MAX) {
       milliseconds = INT_MAX;
     }
-    LOOP_PROCESS_EVENTS_UNTIL(&loop, NULL, (int)milliseconds, got_int);
+    LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, (int)milliseconds, got_int);
   } else {
-    os_microdelay(milliseconds * 1000);
+    os_microdelay(milliseconds * 1000u, ignoreinput);
   }
 }
 
-/// Sleeps for a certain amount of microseconds
+/// Sleeps for a certain amount of microseconds.
 ///
-/// @param microseconds Number of microseconds to sleep
-void os_microdelay(uint64_t microseconds)
+/// @param ms          Number of microseconds to sleep.
+/// @param ignoreinput If true, ignore all input (including SIGINT/CTRL-C).
+///                    If false, waiting is aborted on any input.
+void os_microdelay(uint64_t ms, bool ignoreinput)
 {
-  uint64_t elapsed = 0;
-  uint64_t ns = microseconds * 1000;  // convert to nanoseconds
+  uint64_t elapsed = 0u;
   uint64_t base = uv_hrtime();
+  // Convert microseconds to nanoseconds, or UINT64_MAX on overflow.
+  const uint64_t ns = (ms < UINT64_MAX / 1000u) ? ms * 1000u : UINT64_MAX;
 
   uv_mutex_lock(&delay_mutex);
 
   while (elapsed < ns) {
-    if (uv_cond_timedwait(&delay_cond, &delay_mutex, ns - elapsed)
-        == UV_ETIMEDOUT)
+    // If ignoring input, we simply wait the full delay.
+    // Else we check for input in ~100ms intervals.
+    const uint64_t ns_delta = ignoreinput
+                              ? ns - elapsed
+                              : MIN(ns - elapsed, 100000000u);  // 100ms
+
+    const int rv = uv_cond_timedwait(&delay_cond, &delay_mutex, ns_delta);
+    if (0 != rv && UV_ETIMEDOUT != rv) {
+      assert(false);
+      break;
+    }  // Else: Timeout proceeded normally.
+
+    if (!ignoreinput && os_char_avail()) {
       break;
-    uint64_t now = uv_hrtime();
+    }
+
+    const uint64_t now = uv_hrtime();
     elapsed += now - base;
     base = now;
   }
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c
index 8ebb7562ef..1c94ef0067 100644
--- a/src/nvim/os/users.c
+++ b/src/nvim/os/users.c
@@ -6,7 +6,6 @@
 #include "nvim/os/os.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
-#include "nvim/misc2.h"
 #include "nvim/strings.h"
 #ifdef HAVE_PWD_H
 # include <pwd.h>
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 2ed0c2c856..08294fa6a0 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -27,7 +27,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/mouse.h"
 #include "nvim/garray.h"
 #include "nvim/path.h"
@@ -566,10 +565,11 @@ int mch_expand_wildcards(int num_pat, char_u **pat, int *num_file,
   /*
    * Move the file names to allocated memory.
    */
-  for (j = 0, i = 0; i < *num_file; ++i) {
-    /* Require the files to exist.	Helps when using /bin/sh */
-    if (!(flags & EW_NOTFOUND) && !os_file_exists((*file)[i]))
+  for (j = 0, i = 0; i < *num_file; i++) {
+    // Require the files to exist. Helps when using /bin/sh
+    if (!(flags & EW_NOTFOUND) && !os_path_exists((*file)[i])) {
       continue;
+    }
 
     /* check if this entry should be included */
     dir = (os_isdir((*file)[i]));
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 41fd69f238..374d72ddd3 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -18,7 +18,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/option.h"
 #include "nvim/os/os.h"
 #include "nvim/os/shell.h"
@@ -172,19 +171,23 @@ char_u *path_next_component(char_u *fname)
   return fname;
 }
 
-/*
- * Get a pointer to one character past the head of a path name.
- * Unix: after "/"; DOS: after "c:\"; Mac: no head.
- * If there is no head, path is returned.
- */
+/// Get a pointer to one character past the head of a path name.
+/// Unix: after "/"; Win: after "c:\"
+/// If there is no head, path is returned.
 char_u *get_past_head(char_u *path)
 {
-  char_u  *retval;
+  char_u *retval = path;
 
-  retval = path;
+#ifdef WIN32
+  // May skip "c:"
+  if (isalpha(path[0]) && path[1] == ':') {
+    retval = path + 2;
+  }
+#endif
 
-  while (vim_ispathsep(*retval))
+  while (vim_ispathsep(*retval)) {
     ++retval;
+  }
 
   return retval;
 }
@@ -388,15 +391,22 @@ char *concat_fnames_realloc(char *fname1, const char *fname2, bool sep)
                           fname2, len2, sep);
 }
 
-/*
- * Add a path separator to a file name, unless it already ends in a path
- * separator.
- */
-void add_pathsep(char *p)
+/// Adds a path separator to a filename, unless it already ends in one.
+///
+/// @return `true` if the path separator was added or already existed.
+///         `false` if the filename is too long.
+bool add_pathsep(char *p)
   FUNC_ATTR_NONNULL_ALL
 {
-  if (*p != NUL && !after_pathsep(p, p + strlen(p)))
-    strcat(p, PATHSEPSTR);
+  const size_t len = strlen(p);
+  if (*p != NUL && !after_pathsep(p, p + len)) {
+    const size_t pathsep_len = sizeof(PATHSEPSTR);
+    if (len > MAXPATHL - pathsep_len) {
+      return false;
+    }
+    memcpy(p + len, PATHSEPSTR, pathsep_len);
+  }
+  return true;
 }
 
 /// Get an allocated copy of the full path to a file.
@@ -414,15 +424,11 @@ char *FullName_save(char *fname, bool force)
   }
 
   char *buf = xmalloc(MAXPATHL);
-  char *new_fname = NULL;
-  if (vim_FullName(fname, buf, MAXPATHL, force) != FAIL) {
-    new_fname = xstrdup(buf);
-  } else {
-    new_fname = xstrdup(fname);
+  if (vim_FullName(fname, buf, MAXPATHL, force) == FAIL) {
+    xfree(buf);
+    return xstrdup(fname);
   }
-  xfree(buf);
-
-  return new_fname;
+  return buf;
 }
 
 /// Saves the absolute path.
@@ -562,11 +568,12 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
   while (*path_end != NUL) {
     /* May ignore a wildcard that has a backslash before it; it will
      * be removed by rem_backslash() or file_pat_to_reg_pat() below. */
-    if (path_end >= path + wildoff && rem_backslash(path_end))
+    if (path_end >= path + wildoff && rem_backslash(path_end)) {
       *p++ = *path_end++;
-    else if (*path_end == '/') {
-      if (e != NULL)
+    } else if (vim_ispathsep_nocolon(*path_end)) {
+      if (e != NULL) {
         break;
+      }
       s = p + 1;
     } else if (path_end >= path + wildoff
                && (vim_strchr((char_u *)"*?[{~$", *path_end) != NULL
@@ -579,7 +586,7 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
     }
     if (has_mbyte) {
       len = (size_t)(*mb_ptr2len)(path_end);
-      STRNCPY(p, path_end, len);
+      memcpy(p, path_end, len);
       p += len;
       path_end += len;
     } else
@@ -684,7 +691,7 @@ static size_t do_path_expand(garray_T *gap, const char_u *path,
           }
           // add existing file or symbolic link
           if ((flags & EW_ALLLINKS) ? os_fileinfo_link((char *)buf, &file_info)
-              : os_file_exists(buf)) {
+              : os_path_exists(buf)) {
             addfile(gap, buf, flags);
           }
         }
@@ -899,17 +906,30 @@ static void uniquefy_paths(garray_T *gap, char_u *pattern)
     /* Shorten the filename while maintaining its uniqueness */
     path_cutoff = get_path_cutoff(path, &path_ga);
 
-    /* we start at the end of the path */
-    pathsep_p = path + len - 1;
-
-    while (find_previous_pathsep(path, &pathsep_p))
-      if (vim_regexec(&regmatch, pathsep_p + 1, (colnr_T)0)
-          && is_unique(pathsep_p + 1, gap, i)
-          && path_cutoff != NULL && pathsep_p + 1 >= path_cutoff) {
-        sort_again = true;
-        memmove(path, pathsep_p + 1, STRLEN(pathsep_p));
-        break;
+    // Don't assume all files can be reached without path when search
+    // pattern starts with **/, so only remove path_cutoff
+    // when possible.
+    if (pattern[0] == '*' && pattern[1] == '*'
+        && vim_ispathsep_nocolon(pattern[2])
+        && path_cutoff != NULL
+        && vim_regexec(&regmatch, path_cutoff, (colnr_T)0)
+        && is_unique(path_cutoff, gap, i)) {
+      sort_again = true;
+      memmove(path, path_cutoff, STRLEN(path_cutoff) + 1);
+    } else {
+      // Here all files can be reached without path, so get shortest
+      // unique path.  We start at the end of the path. */
+      pathsep_p = path + len - 1;
+      while (find_previous_pathsep(path, &pathsep_p)) {
+        if (vim_regexec(&regmatch, pathsep_p + 1, (colnr_T)0)
+            && is_unique(pathsep_p + 1, gap, i)
+            && path_cutoff != NULL && pathsep_p + 1 >= path_cutoff) {
+          sort_again = true;
+          memmove(path, pathsep_p + 1, STRLEN(pathsep_p));
+          break;
+        }
       }
+    }
 
     if (path_is_absolute_path(path)) {
       /*
@@ -1205,10 +1225,11 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file,
 
       /* When EW_NOTFOUND is used, always add files and dirs.  Makes
        * "vim c:/" work. */
-      if (flags & EW_NOTFOUND)
+      if (flags & EW_NOTFOUND) {
         addfile(&ga, t, flags | EW_DIR | EW_FILE);
-      else if (os_file_exists(t))
+      } else if (os_path_exists(t)) {
         addfile(&ga, t, flags);
+      }
       xfree(t);
     }
 
@@ -1327,7 +1348,7 @@ void addfile(
   if (!(flags & EW_NOTFOUND)
       && ((flags & EW_ALLLINKS)
           ? !os_fileinfo_link((char *)f, &file_info)
-          : !os_file_exists(f))) {
+          : !os_path_exists(f))) {
     return;
   }
 
@@ -1631,30 +1652,37 @@ bool vim_isAbsName(char_u *name)
 
 /// Save absolute file name to "buf[len]".
 ///
-/// @param      fname is the filename to evaluate
-/// @param[out] buf   is the buffer for returning the absolute path for `fname`
-/// @param      len   is the length of `buf`
-/// @param      force is a flag to force expanding even if the path is absolute
+/// @param      fname filename to evaluate
+/// @param[out] buf   contains `fname` absolute path, or:
+///                   - truncated `fname` if longer than `len`
+///                   - unmodified `fname` if absolute path fails or is a URL
+/// @param      len   length of `buf`
+/// @param      force flag to force expanding even if the path is absolute
 ///
 /// @return           FAIL for failure, OK otherwise
 int vim_FullName(const char *fname, char *buf, size_t len, bool force)
   FUNC_ATTR_NONNULL_ARG(2)
 {
-  int retval = OK;
-  int url;
-
   *buf = NUL;
-  if (fname == NULL)
+  if (fname == NULL) {
     return FAIL;
+  }
 
-  url = path_with_url(fname);
-  if (!url)
-    retval = path_get_absolute_path((char_u *)fname, (char_u *)buf, len, force);
-  if (url || retval == FAIL) {
-    /* something failed; use the file name (truncate when too long) */
+  if (strlen(fname) > (len - 1)) {
+    xstrlcpy(buf, fname, len);  // truncate
+    return FAIL;
+  }
+
+  if (path_with_url(fname)) {
     xstrlcpy(buf, fname, len);
+    return OK;
   }
-  return retval;
+
+  int rv = path_get_absolute_path((char_u *)fname, (char_u *)buf, len, force);
+  if (rv == FAIL) {
+    xstrlcpy(buf, fname, len);  // something failed; use the filename
+  }
+  return rv;
 }
 
 /// Get the full resolved path for `fname`
@@ -2098,7 +2126,6 @@ int path_full_dir_name(char *directory, char *buffer, size_t len)
 }
 
 // Append to_append to path with a slash in between.
-// Append to_append to path with a slash in between.
 int append_path(char *path, const char *to_append, size_t max_len)
 {
   size_t current_length = strlen(path);
@@ -2115,7 +2142,7 @@ int append_path(char *path, const char *to_append, size_t max_len)
   }
 
   // Glue both paths with a slash.
-  if (current_length > 0 && path[current_length-1] != '/') {
+  if (current_length > 0 && !vim_ispathsep_nocolon(path[current_length-1])) {
     current_length += 1;  // Count the trailing slash.
 
     // +1 for the NUL at the end.
@@ -2123,7 +2150,7 @@ int append_path(char *path, const char *to_append, size_t max_len)
       return FAIL;
     }
 
-    STRCAT(path, "/");
+    STRCAT(path, PATHSEPSTR);
   }
 
   // +1 for the NUL at the end.
@@ -2161,7 +2188,8 @@ static int path_get_absolute_path(const char_u *fname, char_u *buf,
         relative_directory[0] = '/';
         relative_directory[1] = NUL;
       } else {
-        STRNCPY(relative_directory, fname, p-fname);
+        assert(p >= fname);
+        memcpy(relative_directory, fname, (size_t)(p - fname));
         relative_directory[p-fname] = NUL;
       }
       end_of_path = (char *) (p + 1);
@@ -2181,9 +2209,16 @@ static int path_get_absolute_path(const char_u *fname, char_u *buf,
 
 /// Check if the given file is absolute.
 ///
-/// This just checks if the file name starts with '/' or '~'.
 /// @return `TRUE` if "fname" is absolute.
 int path_is_absolute_path(const char_u *fname)
 {
+#ifdef WIN32
+  // A name like "d:/foo" and "//server/share" is absolute
+  return ((isalpha(fname[0]) && fname[1] == ':'
+           && vim_ispathsep_nocolon(fname[2]))
+          || (vim_ispathsep_nocolon(fname[0]) && fname[0] == fname[1]));
+#else
+  // UNIX: This just checks if the file name starts with '/' or '~'.
   return *fname == '/' || *fname == '~';
+#endif
 }
diff --git a/src/nvim/po/CMakeLists.txt b/src/nvim/po/CMakeLists.txt
index 184c4894b9..d2b62f89a0 100644
--- a/src/nvim/po/CMakeLists.txt
+++ b/src/nvim/po/CMakeLists.txt
@@ -22,16 +22,14 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
     ko.UTF-8
     nl
     no
-    pl
+    pl.UTF-8
     pt_BR
     ru
     sk
     sv
     uk
     vi
-    zh_CN
     zh_CN.UTF-8
-    zh_TW
     zh_TW.UTF-8)
 
   set(NEOVIM_RELATIVE_SOURCES)
@@ -48,7 +46,7 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
         -DXGETTEXT_PRG=${XGETTEXT_PRG}
         -DPOT_FILE=${NVIM_POT}
         -DSEARCH_DIR=${CMAKE_CURRENT_SOURCE_DIR}
-        "'-DSOURCES=${NEOVIM_RELATIVE_SOURCES}'"
+        "\"-DSOURCES=${NEOVIM_RELATIVE_SOURCES}\""
         -P ${PROJECT_SOURCE_DIR}/cmake/RunXgettext.cmake
     DEPENDS ${NEOVIM_SOURCES})
 
@@ -143,27 +141,9 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
   BuildPoIconv(cs ISO-8859-2 cp1250)
   BuildMo(cs.cp1250)
 
-  BuildPoIconv(pl ISO-8859-2 cp1250)
-  BuildMo(pl.cp1250)
-
-  BuildPoIconv(pl ISO-8859-2 UTF-8)
-  BuildMo(pl.UTF-8)
-
   BuildPoIconv(sk ISO-8859-2 cp1250)
   BuildMo(sk.cp1250)
 
-  BuildPoIconv(ru UTF-8 cp1251)
-  BuildMo(ru.cp1251)
-
-  BuildPoIconv(uk UTF-8 cp1251)
-  BuildMo(uk.cp1251)
-
-  BuildPoIconvGeneric(ko ko.UTF-8 ko UTF-8 euc-kr)
-  BuildMo(ko)
-
-  BuildPoIconvGenericWithCharset(zh_CN.cp936 zh_CN zh_CN.cp936 gb2312 cp936 gbk)
-  BuildMo(zh_CN.cp936)
-
   add_custom_target(update-po-nb
     COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_SOURCE_DIR}/no.po ${CMAKE_CURRENT_SOURCE_DIR}/nb.po
@@ -172,15 +152,6 @@ if(HAVE_WORKING_LIBINTL AND GETTEXT_FOUND AND XGETTEXT_PRG AND ICONV_PRG)
   CheckPo(nb)
   BuildMo(nb)
 
-  add_executable(sjiscorr sjiscorr.c)
-  add_custom_target(update-po-ja.sjis
-    COMMAND iconv -f utf-8 -t cp932 ${CMAKE_CURRENT_SOURCE_DIR}/ja.po |
-        $<TARGET_FILE:sjiscorr> > ${CMAKE_CURRENT_SOURCE_DIR}/ja.sjis.po
-    DEPENDS ja.po sjiscorr)
-  list(APPEND UPDATE_PO_TARGETS update-po-ja.sjis)
-  CheckPo(ja.sjis)
-  BuildMo(ja.sjis)
-
   foreach(LANGUAGE ${LANGUAGES})
     set(poFile "${CMAKE_CURRENT_SOURCE_DIR}/${LANGUAGE}.po")
 
diff --git a/src/nvim/po/af.po b/src/nvim/po/af.po
index 6bb93b9e02..eb6be42688 100644
--- a/src/nvim/po/af.po
+++ b/src/nvim/po/af.po
@@ -2722,11 +2722,6 @@ msgstr "E49: Ongeldige rolgrootte"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4305,10 +4300,6 @@ msgstr "re�l %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ongeldige registernaam: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Boodskappe onderhouers: Danie Roux en Jean Jordaan <droux@tuks.co.za>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Onderbreek: "
diff --git a/src/nvim/po/ca.po b/src/nvim/po/ca.po
index 79434cfdcd..7d32db9f97 100644
--- a/src/nvim/po/ca.po
+++ b/src/nvim/po/ca.po
@@ -2717,11 +2717,6 @@ msgstr "E49: La dist�ncia de despla�ament no �s v�lida"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4293,10 +4288,6 @@ msgstr "l�nia %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: El nom de registre no �s v�lid: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Traducci� dels missatges: Ernest Adrogu� <eadrogue@gmx.net>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Interrupci�: "
diff --git a/src/nvim/po/cs.cp1250.po b/src/nvim/po/cs.cp1250.po
index 1e62034317..112e949815 100644
--- a/src/nvim/po/cs.cp1250.po
+++ b/src/nvim/po/cs.cp1250.po
@@ -2763,11 +2763,6 @@ msgstr "E49: Chybn� hodnota volby 'scroll'"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4378,10 +4373,6 @@ msgstr "��dek %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nen� p��pustn� jm�no registru"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Spr�vce zpr�v: Bram Moolenaar <Bram@vim.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "P�eru�en�: "
diff --git a/src/nvim/po/cs.po b/src/nvim/po/cs.po
index dd7016fedb..3839230df2 100644
--- a/src/nvim/po/cs.po
+++ b/src/nvim/po/cs.po
@@ -2763,11 +2763,6 @@ msgstr "E49: Chybn� hodnota volby 'scroll'"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4378,10 +4373,6 @@ msgstr "��dek %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nen� p��pustn� jm�no registru"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Spr�vce zpr�v: Bram Moolenaar <Bram@vim.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "P�eru�en�: "
diff --git a/src/nvim/po/de.po b/src/nvim/po/de.po
index 4950533a21..f04d3be4b4 100644
--- a/src/nvim/po/de.po
+++ b/src/nvim/po/de.po
@@ -2137,11 +2137,6 @@ msgstr "E900: Ung�ltige Job-ID"
 msgid "E901: Job table is full"
 msgstr "E901: Job-Tabelle ist voll"
 
-#: ../globals.h:1021
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr "E902: \"%s\" ist nicht ausf�hrbar"
-
 #: ../globals.h:1023
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
diff --git a/src/nvim/po/en_GB.po b/src/nvim/po/en_GB.po
index b4b38e11e3..00a05195b4 100644
--- a/src/nvim/po/en_GB.po
+++ b/src/nvim/po/en_GB.po
@@ -2623,11 +2623,6 @@ msgstr ""
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4128,10 +4123,6 @@ msgstr ""
 msgid "E354: Invalid register name: '%s'"
 msgstr ""
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Messages maintainer: Mike Williams <mrw@eandem.co.uk>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr ""
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 5b0cb2260b..b7bc6397ef 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-30 17:54+0200\n"
-"PO-Revision-Date: 2015-07-30 18:00+0200\n"
+"POT-Creation-Date: 2016-07-02 16:21+0200\n"
+"PO-Revision-Date: 2016-07-02 17:05+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -32,98 +32,76 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../api/private/helpers.c:201
 #, fuzzy
-msgid "Unable to get option value"
-msgstr "fiaskis akiri valoron de opcio"
+#~ msgid "Unable to get option value"
+#~ msgstr "fiaskis akiri valoron de opcio"
 
-#: ../api/private/helpers.c:204
 #, fuzzy
-msgid "internal error: unknown option type"
-msgstr "interna eraro: neniu vim-a listero"
+#~ msgid "internal error: unknown option type"
+#~ msgstr "interna eraro: neniu vim-a listero"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[Listo de lokoj]"
 
 # DP: Ĉu vere indas traduki Quickfix?
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Listo de rapidriparoj]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: Aŭtokomandoj haltigis komandon"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Ne eblas disponigi iun ajn bufron, nun eliras..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 
-#: ../buffer.c:763
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: Neniu bufro estis forviŝita"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Neniu bufro estis detruita"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 bufro malŝargita"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d bufroj malŝargitaj"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 bufro forviŝita"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d bufroj forviŝitaj"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 bufro detruita"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d bufroj detruitaj"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Ne eblas malŝargi la lastan bufron"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: Neniu modifita bufro trovita"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: Estas neniu listigita bufro"
 
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Ne eblas iri preter la lastan bufron"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Ne eblas iri antaŭ la unuan bufron"
 
-#: ../buffer.c:945
 #, c-format
 msgid ""
 "E89: No write since last change for buffer %<PRId64> (add ! to override)"
@@ -132,103 +110,80 @@ msgstr ""
 "transpasi)"
 
 #. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Averto: Listo de dosiernomoj troas"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
 msgid "E92: Buffer %<PRId64> not found"
 msgstr "E92: Bufro %<PRId64> ne trovita"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: Pli ol unu kongruo kun %s"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: Neniu bufro kongruas kun %s"
 
-#: ../buffer.c:2161
 #, c-format
 msgid "line %<PRId64>"
 msgstr "linio %<PRId64>"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufro kun tiu nomo jam ekzistas"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr "[Modifita]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[Ne redaktita]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[Nova dosiero]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[Eraroj de legado]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[Nurlegebla]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[nurlegebla]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 linio --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
 msgid "%<PRId64> lines --%d%%--"
 msgstr "%<PRId64> linioj --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
 msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
 msgstr "linio %<PRId64> de %<PRId64> --%d%%-- kol "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[Neniu nomo]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "helpo"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[Helpo]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[Antaŭvido]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "Ĉio"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "Subo"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "Supro"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -236,12 +191,10 @@ msgstr ""
 "\n"
 "# Listo de bufroj:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[Malneto]"
 
 # DP: Vidu ":help sign-support" por klarigo pri "Sign"
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -249,200 +202,153 @@ msgstr ""
 "\n"
 "--- Emfazaj simbolaĵoj ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "Emfazaj simbolaĵoj de %s:"
 
-#: ../buffer.c:4543
 #, c-format
 msgid "    line=%<PRId64>  id=%d  name=%s"
 msgstr "    linio=%<PRId64>  id=%d  nomo=%s"
 
-#: ../cursor_shape.c:68
 msgid "E545: Missing colon"
 msgstr "E545: Mankas dupunkto"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
 msgid "E546: Illegal mode"
 msgstr "E546: Reĝimo nepermesata"
 
-#: ../cursor_shape.c:134
 msgid "E548: digit expected"
 msgstr "E548: cifero atendata"
 
-#: ../cursor_shape.c:138
 msgid "E549: Illegal percentage"
 msgstr "E549: Nevalida procento"
 
-#: ../diff.c:146
 #, c-format
 msgid "E96: Can not diff more than %<PRId64> buffers"
 msgstr "E96: Ne eblas dosierdiferenci pli ol %<PRId64> bufrojn"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: Ne eblas krei dosierdiferencojn"
 
-#: ../diff.c:966
 msgid "E816: Cannot read patch output"
 msgstr "E816: Ne eblas legi eliron de flikilo \"patch\""
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: Ne eblas legi eliron de dosierdiferencilo \"diff\""
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Aktuala bufro ne estas en dosierdiferenca reĝimo"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: Neniu alia bufro en dosierdiferenca reĝimo estas modifebla"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Neniu alia bufro en dosierdiferenca reĝimo"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: Pli ol du bufroj en dosierdiferenca reĝimo, ne scias kiun uzi"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Ne eblas trovi bufron \"%s\""
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Bufro \"%s\" ne estas en dosierdiferenca reĝimo"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Bufro ŝanĝiĝis neatendite"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: Eskapsigno nepermesebla en duliteraĵo"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: Dosiero de klavmapo ne troveblas"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: Uzo de \":loadkeymap\" nur eblas en vim-skripto"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: Malplena rikordo en klavmapo"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " Kompletigo de ŝlosilvorto (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " Reĝimo ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " Kompletigo de tuta linio (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " Kompletigo de dosiernomo (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " Kompletigo de etikedo (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " Kompletigo de ŝablona dosierindiko (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " Kompletigo de difino (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " Kompletigo de vortaro (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " Kompletigo de tezaŭro (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " Kompletigo de komanda linio (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " Kompletigo difinita de uzanto (^U^N^P)"
 
 # DP: Ĉu eblas trovi pli bonan tradukon?
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " Kompletigo Omni (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Sugesto de literumo (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " Kompletigo loka de ŝlosilvorto (^N/^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "Atingis finon de alineo"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: Kompletiga funkcio ŝanĝis la fenestron"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: Kompletiga funkcio forviŝis tekston"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "La opcio 'dictionary' estas malplena"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "La opcio 'thesaurus' estas malplena"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Analizas vortaron: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (enmeto) Rulumo (^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (anstataŭigo) Rulumo (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "Analizas: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "Analizas etikedojn."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " Aldonanta"
 
@@ -450,576 +356,469 @@ msgstr " Aldonanta"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- Serĉanta..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "Reveninta al originalo"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "Vorto el alia linio"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "La sola kongruo"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "kongruo %d de %d"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "kongruo %d"
 
-#: ../eval.c:137
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""
 
-#: ../eval.c:138
 #, c-format
 msgid "E684: list index out of range: %<PRId64>"
 msgstr "E684: indekso de listo ekster limoj: %<PRId64>"
 
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Nedifinita variablo: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: Mankas ']'"
 
-#: ../eval.c:141
 #, c-format
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: Argumento de %s devas esti Listo"
 
-#: ../eval.c:143
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
 
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
-
-#: ../eval.c:145
 msgid "E714: List required"
 msgstr "E714: Listo bezonata"
 
-#: ../eval.c:146
 msgid "E715: Dictionary required"
 msgstr "E715: Vortaro bezonata"
 
-#: ../eval.c:147
+msgid "E928: String required"
+msgstr "E928: Ĉeno bezonata"
+
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Tro da argumentoj por funkcio: %s"
 
-#: ../eval.c:148
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
 msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
 
-#: ../eval.c:150
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
 
-#: ../eval.c:151
 msgid "E717: Dictionary entry already exists"
 msgstr "E717: Rikordo de vortaro jam ekzistas"
 
-#: ../eval.c:152
 msgid "E718: Funcref required"
 msgstr "E718: Funcref bezonata"
 
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Nevalida datumtipo de variablo de %s="
 
-#: ../eval.c:155
 #, c-format
 msgid "E130: Unknown function: %s"
 msgstr "E130: Nekonata funkcio: %s"
 
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nevalida nomo de variablo: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: uzo de Glitpunktnombro kiel Ĉeno"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: Malpli da celoj ol Listeroj"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: Pli da celoj ol Listeroj"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "Duobla ; en listo de variabloj"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Ne eblas listigi variablojn de %s"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Nur eblas indeksi Liston aŭ Vortaron"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] devas esti laste"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] bezonas listan valoron"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: Lista valoro havas pli da eroj ol la celo"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: Lista valoro ne havas sufiĉe da eroj"
 
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" mankas post \":for\""
 
-#: ../eval.c:3063
 #, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Mankas krampoj: %s"
 
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Ne estas tia variablo: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: variablo ingita tro profunde por malŝlosi"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Mankas ':' post '?'"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: Eblas nur kompari Liston kun Listo"
 
-#: ../eval.c:3895
 msgid "E692: Invalid operation for Lists"
 msgstr "E692: Nevalida operacio de Listoj"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Eblas nur kompari Vortaron kun Vortaro"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Nevalida operacio de Vortaro"
 
-#: ../eval.c:3932
 msgid "E693: Can only compare Funcref with Funcref"
 msgstr "E693: Eblas nur kompari Funcref kun Funcref"
 
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Nevalida operacio de Funcref-oj"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Ne eblas uzi '%' kun Glitpunktnombro"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: Mankas ')'"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Ne eblas indeksi Funcref"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Ne eblas indeksi specialan variablon"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Mankas nomo de opcio: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Nekonata opcio: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Mankas citilo: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Mankas citilo: %s"
 
-#: ../eval.c:5084
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mankas komo en Listo: %s"
 
-#: ../eval.c:5091
 #, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Mankas fino de Listo ']': %s"
 
-#: ../eval.c:5750
 msgid "Not enough memory to set references, garbage collection aborted!"
-msgstr "Ne sufiĉa memory por valorigi referencojn, senrubigado ĉesigita!"
+msgstr "Ne sufiĉa memoro por valorigi referencojn, senrubigado ĉesigita!"
 
-#: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Mankas dupunkto en la vortaro: %s"
 
-#: ../eval.c:6499
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
 
-#: ../eval.c:6517
 #, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Mankas komo en la vortaro: %s"
 
-#: ../eval.c:6524
 #, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Mankas fino de vortaro '}': %s"
 
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variablo ingita tro profunde por vidigi"
 
-#: ../eval.c:7188
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Tro da argumentoj por funkcio: %s"
 
-#: ../eval.c:7190
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: Nevalidaj argumentoj por funkcio: %s"
 
-#: ../eval.c:7377
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Nekonata funkcio: %s"
 
-#: ../eval.c:7383
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
 
-#: ../eval.c:7387
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s"
 
-#: ../eval.c:7391
 #, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s"
 
-#: ../eval.c:7453
 msgid "E808: Number or Float required"
 msgstr "E808: Nombro aŭ Glitpunktnombro bezonata"
 
-#: ../eval.c:7503
 msgid "add() argument"
 msgstr "argumento de add()"
 
-#: ../eval.c:7907
 msgid "E699: Too many arguments"
 msgstr "E699: Tro da argumentoj"
 
-#: ../eval.c:8073
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
 
-#: ../eval.c:8156
 msgid "&Ok"
 msgstr "&Bone"
 
-#: ../eval.c:8676
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Ŝlosilo jam ekzistas: %s"
 
-#: ../eval.c:8692
 msgid "extend() argument"
 msgstr "argumento de extend()"
 
-#: ../eval.c:8915
 msgid "map() argument"
 msgstr "argumento de map()"
 
-#: ../eval.c:8916
 msgid "filter() argument"
 msgstr "argumento de filter()"
 
-#: ../eval.c:9229
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld linioj: "
 
-#: ../eval.c:9291
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Nekonata funkcio: %s"
 
-#: ../eval.c:10729
 msgid "called inputrestore() more often than inputsave()"
 msgstr "alvokis inputrestore() pli ofte ol inputsave()"
 
-#: ../eval.c:10771
 msgid "insert() argument"
 msgstr "argumento de insert()"
 
-#: ../eval.c:10841
 msgid "E786: Range not allowed"
 msgstr "E786: Amplekso nepermesebla"
 
-#: ../eval.c:11140
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
-#: ../eval.c:11980
 msgid "E726: Stride is zero"
 msgstr "E726: Paŝo estas nul"
 
-#: ../eval.c:11982
 msgid "E727: Start past end"
 msgstr "E727: Komenco preter fino"
 
-#: ../eval.c:12024 ../eval.c:15297
 msgid "<empty>"
 msgstr "<malplena>"
 
-#: ../eval.c:12282
 msgid "remove() argument"
 msgstr "argumento de remove()"
 
-#: ../eval.c:12466
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)"
 
-#: ../eval.c:12593
 msgid "reverse() argument"
 msgstr "argumento de reverse()"
 
-#: ../eval.c:13721
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Nevalida ago: '%s'"
+
 msgid "sort() argument"
 msgstr "argumento de sort()"
 
-#: ../eval.c:13721
 #, fuzzy
-msgid "uniq() argument"
-msgstr "argumento de add()"
+#~ msgid "uniq() argument"
+#~ msgstr "argumento de add()"
 
-#: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: Ordiga funkcio fiaskis"
 
-#: ../eval.c:13806
 #, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Ordiga funkcio fiaskis"
+#~ msgid "E882: Uniq compare function failed"
+#~ msgstr "E702: Ordiga funkcio fiaskis"
 
-#: ../eval.c:14085
 msgid "(Invalid)"
 msgstr "(Nevalida)"
 
-#: ../eval.c:14590
 msgid "E677: Error writing temp file"
 msgstr "E677: Eraro dum skribo de provizora dosiero"
 
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Uzo de Glitpunktnombro kiel Nombro"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: Uzo de Funcref kiel Nombro"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: Uzo de Listo kiel Nombro"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Uzo de Vortaro kiel Nombro"
 
-#: ../eval.c:16259
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Uzo de Funcref kiel Glitpunktnombro"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Uzo de Ĉeno kiel Glitpunktnombro"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Uzo de Listo kiel Glitpunktnombro"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: uzo de Funcref kiel Ĉeno"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: uzo de Listo kiel Ĉeno"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: uzo de Vortaro kiel Ĉeno"
 
-#: ../eval.c:16619
+msgid "E908: using an invalid value as a String"
+msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
+
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Nekongrua datumtipo de variablo: %s"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Ne eblas forviŝi variablon %s"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Nomo de variablo Funcref devas finiĝi per majusklo: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Valoro estas ŝlosita: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Ne eblas ŝanĝi valoron de %s"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: variablo ingita tro profunde por fari kopion"
 
-#: ../eval.c:17249
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Nedifinita funkcio: %s"
 
-#: ../eval.c:17260
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: Mankas '(': %s"
 
-#: ../eval.c:17293
 msgid "E862: Cannot use g: here"
 msgstr "E862: Ne eblas uzi g: ĉi tie"
 
-#: ../eval.c:17312
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Nevalida argumento: %s"
 
-#: ../eval.c:17323
 #, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Ripetita nomo de argumento: %s"
 
-#: ../eval.c:17416
 msgid "E126: Missing :endfunction"
 msgstr "E126: Mankas \":endfunction\""
 
-#: ../eval.c:17537
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
 
-#: ../eval.c:17549
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata"
 
-#: ../eval.c:17604
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s"
 
-#: ../eval.c:17716
 msgid "E129: Function name required"
 msgstr "E129: Nomo de funkcio bezonata"
 
-#: ../eval.c:17824
 #, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
+#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
+#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
 
-#: ../eval.c:17833
 #, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
+#~ msgid "E884: Function name cannot contain a colon: %s"
+#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
 
-#: ../eval.c:18336
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
 
-#: ../eval.c:18441
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'"
 
-#: ../eval.c:18568
 #, c-format
 msgid "calling %s"
 msgstr "alvokas %s"
 
-#: ../eval.c:18651
 #, c-format
 msgid "%s aborted"
 msgstr "%s ĉesigita"
 
-#: ../eval.c:18653
 #, c-format
 msgid "%s returning #%<PRId64>"
 msgstr "%s liveras #%<PRId64>"
 
-#: ../eval.c:18670
 #, c-format
 msgid "%s returning %s"
 msgstr "%s liveras %s"
 
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
 msgid "continuing in %s"
 msgstr "daŭrigas en %s"
 
-#: ../eval.c:18795
 msgid "E133: :return not inside a function"
 msgstr "E133: \":return\" ekster funkcio"
 
-#: ../eval.c:19159
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1027,7 +826,6 @@ msgstr ""
 "\n"
 "# mallokaj variabloj:\n"
 
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
@@ -1035,104 +833,82 @@ msgstr ""
 "\n"
 "\tLaste ŝaltita de "
 
-#: ../eval.c:19272
 msgid "No old files"
 msgstr "Neniu malnova dosiero"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Deksesuma %02x,  Okuma %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, Deksesuma %04x, Okuma %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Deksesuma %08x, Okuma %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: Movas liniojn en ilin mem"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 linio movita"
 
-#: ../ex_cmds.c:749
 #, c-format
 msgid "%<PRId64> lines moved"
 msgstr "%<PRId64> linioj movitaj"
 
-#: ../ex_cmds.c:1175
 #, c-format
 msgid "%<PRId64> lines filtered"
 msgstr "%<PRId64> linioj filtritaj"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filtraj* Aŭtokomandoj ne rajtas ŝanĝi aktualan bufron"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s en linio: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: Tro da eraroj, nun ignoras la reston de la dosiero"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Legado de dosiero viminfo \"%s\"%s%s%s"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " informo"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " markoj"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " malnovaj dosieroj"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " FIASKIS"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Dosiero viminfo ne skribeblas: %s"
 
-#: ../ex_cmds.c:1626
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
 
-#: ../ex_cmds.c:1635
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "Skribas dosieron viminfo \"%s\""
 
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Tiu dosiero viminfo estis kreita de Vim %s.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1140,47 +916,37 @@ msgstr ""
 "# Vi povas redakti ĝin se vi estas singarda.\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "Nevalida eka signo"
 
-#: ../ex_cmds.c:2162
 msgid "Write partial file?"
 msgstr "Ĉu skribi partan dosieron?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: Uzu ! por skribi partan bufron"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Ĉu anstataŭigi ekzistantan dosieron \"%s\"?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Permutodosiero .swp \"%s\" ekzistas, ĉu tamen anstataŭigi ĝin?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Permutodosiero .swp ekzistas: %s (:silent! por transpasi)"
 
-#: ../ex_cmds.c:2381
 #, c-format
 msgid "E141: No file name for buffer %<PRId64>"
 msgstr "E141: Neniu dosiernomo de bufro %<PRId64>"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Dosiero ne skribita: Skribo malŝaltita per la opcio 'write'"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1189,7 +955,6 @@ msgstr ""
 "La opcio 'readonly' estas ŝaltita por \"%s\".\n"
 "Ĉu vi tamen volas skribi?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1200,84 +965,66 @@ msgstr ""
 "Bonŝance ĝi eble skribeblus.\n"
 "Ĉu vi volas provi?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" estas nurlegebla (aldonu ! por transpasi)"
 
-#: ../ex_cmds.c:3120
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Aŭtokomandoj neatendite forviŝis novan bufron %s"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: nenumera argumento de :z"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: Ŝelkomandoj nepermeseblaj en rvim"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Ne eblas limigi regulesprimon per literoj"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "ĉu anstataŭigi per %s (y/n/a/q/l/^E/^Y)?"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(Interrompita) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 kongruo"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 anstataŭigo"
 
-#: ../ex_cmds.c:4387
 #, c-format
 msgid "%<PRId64> matches"
 msgstr "%<PRId64> kongruoj"
 
-#: ../ex_cmds.c:4388
 #, c-format
 msgid "%<PRId64> substitutions"
 msgstr "%<PRId64> anstataŭigoj"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " en 1 linio"
 
-#: ../ex_cmds.c:4395
 #, c-format
 msgid " on %<PRId64> lines"
 msgstr " en %<PRId64> linioj"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Ne eblas fari \":global\" rekursie"
 
 # DP: global estas por ":global" do mi ne tradukis ĝin
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: Regulesprimo mankas el global"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Ŝablono trovita en ĉiuj linioj: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "Ŝablono ne trovita: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1288,334 +1035,268 @@ msgstr ""
 "$"
 
 # This message should *so* be E42!
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: Ne paniku!"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: Bedaŭrinde estas neniu helpo '%s' por %s"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: Bedaŭrinde estas neniu helpo por %s"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "Bedaŭrinde, la helpdosiero \"%s\" ne troveblas"
 
-#: ../ex_cmds.c:5323
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: Ne estas dosierujo: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Ne eblas malfermi %s en skribreĝimo"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Ne eblas malfermi %s en legreĝimo"
 
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Miksaĵo de kodoprezento de helpa dosiero en lingvo: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s"
 
-#: ../ex_cmds.c:5687
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Nekonata simbola komando: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: Mankas nomo de simbolo"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: Tro da simboloj estas difinitaj"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Nevalida teksto de simbolo: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Nekonata simbolo: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: Mankas numero de simbolo"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nevalida nomo de bufro: %s"
 
-#: ../ex_cmds.c:6008
 #, c-format
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>"
 
-#: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (nesubtenata)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[Forviŝita]"
 
-#: ../ex_cmds2.c:139
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
 msgid "line %<PRId64>: %s"
 msgstr "linio %<PRId64>: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "kmd: %s"
 
-#: ../ex_cmds2.c:322
+msgid "frame is zero"
+msgstr "kadro estas nul"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "kadro je la plej alta nivelo: %d"
+
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
 msgstr "Kontrolpunkto en \"%s%s\" linio %<PRId64>"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Kontrolpunkto ne trovita: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "Neniu kontrolpunkto estas difinita"
 
-#: ../ex_cmds2.c:617
 #, c-format
 msgid "%3d  %s %s  line %<PRId64>"
 msgstr "%3d  %s %s  linio %<PRId64>"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Ĉu konservi ŝanĝojn al \"%s\"?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "Sen titolo"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Neniu skribo de post la lasta ŝanĝo por bufro \"%s\""
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "Averto: Eniris neatendite alian bufron (kontrolu aŭtokomandojn)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: Estas nur unu redaktenda dosiero"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: Ne eblas iri antaŭ ol la unuan dosieron"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Ne eblas iri preter la lastan dosieron"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: kompililo nesubtenata: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Serĉado de \"%s\" en \"%s\""
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "Serĉado de \"%s\""
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "ne trovita en 'runtimepath': \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "ne trovita en '%s: \"%s\""
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Ne eblas ruli dosierujon: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "ne eblis ruli \"%s\""
 
-#: ../ex_cmds2.c:2520
 #, c-format
 msgid "line %<PRId64>: could not source \"%s\""
 msgstr "linio %<PRId64>: ne eblis ruli \"%s\""
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "rulas \"%s\""
 
-#: ../ex_cmds2.c:2537
 #, c-format
 msgid "line %<PRId64>: sourcing \"%s\""
 msgstr "linio %<PRId64>: rulas \"%s\""
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "finis ruli %s"
 
-#: ../ex_cmds2.c:2765
 msgid "modeline"
 msgstr "reĝimlinio"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd argumento"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c argumento"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "medivariablo"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "erartraktilo"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: Averto: Neĝusta disigilo de linio, ^M eble mankas"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: \":scriptencoding\" uzita ekster rulita dosiero"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: \":finish\" uzita ekster rulita dosiero"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Aktuala %slingvo: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Ne eblas ŝanĝi la lingvon al \"%s\""
 
 #. don't redisplay the window
 #. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Eniras reĝimon Ex. Tajpu \"visual\" por iri al reĝimo Normala."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: Ĉe fino-de-dosiero"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: Komando tro rekursia"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Escepto nekaptita: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "Fino de rulita dosiero"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "Fino de funkcio"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: Ambigua uzo de komando difinita de uzanto"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: Ne estas redaktila komando"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: Inversa amplekso donita"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "Inversa amplekso donita, permuteblas"
 
 #. append
 #. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: Uzu w aŭ w>>"
 
-#: ../ex_docmd.c:3454
 msgid "E319: The command is not available in this version"
 msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: Nur unu dosiernomo permesebla"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "1 plia redaktenda dosiero. Ĉu tamen eliri?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "%d pliaj redaktendaj dosieroj. Ĉu tamen eliri?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: 1 plia redaktenda dosiero"
 
-#: ../ex_docmd.c:4250
 #, c-format
 msgid "E173: %<PRId64> more files to edit"
 msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1623,352 +1304,273 @@ msgstr ""
 "\n"
 "    Nomo        Argumentoj Adreso    Kompleto  Difino"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "Neniu komando difinita de uzanto trovita"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: Neniu atributo specifita"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: Nevalida nombro de argumentoj"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: Kvantoro ne povas aperi dufoje"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: Nevalida defaŭlta valoro de kvantoro"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: argumento bezonata por -complete"
 
-#: ../ex_docmd.c:4933
 msgid "E179: argument required for -addr"
 msgstr "E179: argumento bezonata por -addr"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Nevalida atributo: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: Nevalida komanda nomo"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: Komandoj difinataj de uzanto devas eki per majusklo"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: Rezervita nomo, neuzebla por komando difinita de uzanto"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Neniu komando-difinita-de-uzanto kiel: %s"
 
-#: ../ex_docmd.c:5516
 #, c-format
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: Nevalida valoro de tipo de adreso: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Nevalida valoro de kompletigo: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr ""
 "E468: Argumento de kompletigo nur permesebla por kompletigo difinita de "
 "uzanto"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
 
-#: ../ex_docmd.c:5257
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Ne eblas trovi agordaron de koloroj '%s'"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Bonvenon, uzanto de Vim!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: Ne eblas fermi lastan langeton"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "Jam nur unu langeto"
 
-#: ../ex_docmd.c:6004
 #, c-format
 msgid "Tab page %d"
 msgstr "Langeto %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "Neniu permutodosiero .swp"
 
-#: ../ex_docmd.c:6478
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Ne eblas ŝanĝi dosierujon, bufro estas ŝanĝita (aldonu ! por transpasi)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: Neniu antaŭa dosierujo"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: Nekonata"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: \":winsize\" bezonas du numerajn argumentojn"
 
-#: ../ex_docmd.c:6655
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: Akiro de pozicio de fenestro ne estas realigita por tiu platformo"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: \":winpos\" bezonas du numerajn argumentojn"
 
-#: ../ex_docmd.c:7241
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Ne eblas krei dosierujon %s"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ekzistas (aldonu ! por transpasi)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Ne eblas malfermi \"%s\" por skribi"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Argumento devas esti litero, citilo aŭ retrocitilo"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Tro profunda rekursia alvoko de \":normal\""
 
-#: ../ex_docmd.c:7807
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Neniu alterna dosiernomo por anstataŭigi al '#'"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: neniu dosiernomo de aŭtokomando por anstataŭigi al \"<afile>\""
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr ""
 "E496: neniu numero de bufro de aŭtokomando por anstataŭigi al \"<abuf>\""
 
 # DP: ĉu match estas verbo aŭ nomo en la angla version?
 # AM: ĉi tie, nomo, ŝajnas al mi
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr ""
 "E497: neniu nomo de kongruo de aŭtokomando por anstataŭigi al \"<amatch>\""
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: neniu dosiernomo \":source\" por anstataŭigi al \"<sfile>\""
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: neniu uzebla numero de linio por \"<slnum>\""
 
-#: ../ex_docmd.c:7903
 #, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
+#~ msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+#~ msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Liveras malplenan ĉenon"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"
 
-#: ../ex_eval.c:464
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Ne eblas lanĉi (:throw) escepton kun prefikso 'Vim'"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Escepto lanĉita: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "Escepto finiĝis: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "Escepto ne konservita: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
 msgid "%s, line %<PRId64>"
 msgstr "%s, linio %<PRId64>"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Kaptis escepton: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s iĝis atendanta(j)"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s daŭrigita(j)"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s ne konservita(j)"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "Escepto"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "Eraro kaj interrompo"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "Eraro"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "Interrompo"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: \":if\" tro profunde ingita"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: \":endif\" sen \":if\""
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: \":else\" sen \":if\""
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: \":elseif\" sen \":if\""
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: pluraj \":else\""
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: \":elseif\" post \":else\""
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: \":while/:for\" ingita tro profunde"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: \":continue\" sen \":while\" aŭ \":for\""
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: \":break\" sen \":while\" aŭ \":for\""
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: Uzo de \":endfor\" kun \":while\""
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Uzo de \":endwhile\" kun \":for\""
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: \":try\" ingita tro profunde"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: \":catch\" sen \":try\""
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: \":catch\" post \":finally\""
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: \":finally\" sen \":try\""
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: pluraj \":finally\""
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: \":endtry\" sen \":try\""
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: \":endfunction\" ekster funkcio"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: Ne eblas redakti alian bufron nun"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Ne eblas ŝanĝi informon de bufro nun"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "nomo de etikedo"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " tipo de dosiero\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "opcio 'history' estas nul"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1977,35 +1579,30 @@ msgstr ""
 "\n"
 "# Historio %s (de plej nova al plej malnova):\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "Komanda linio"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "Serĉa ĉeno"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "Esprimo"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "Eniga linio"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "Sencimiga linio"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar preter la longo de komando"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
-#: ../file_search.c:203
 msgid "E854: path too long for completion"
 msgstr "E854: tro longa vojo por kompletigo"
 
-#: ../file_search.c:446
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -2014,208 +1611,160 @@ msgstr ""
 "E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
 "sekvita de '%s'."
 
-#: ../file_search.c:1505
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
 
-#: ../file_search.c:1508
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
 
-#: ../file_search.c:1512
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
 
-#: ../file_search.c:1515
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
 
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Aŭtokomandoj ŝanĝis bufron aŭ nomon de bufro"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "Nevalida dosiernomo"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "estas dosierujo"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "ne estas dosiero"
 
-#: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
 msgstr "[Nova dosiero]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[Nova DOSIERUJO]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[Dosiero tro granda]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[Permeso rifuzita]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: La aŭtokomandoj *ReadPre igis la dosieron nelegebla"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: La aŭtokomandoj *ReadPre ne rajtas ŝanĝi la aktualan bufron"
 
-#: ../fileio.c:672
 msgid "Nvim: Reading from stdin...\n"
 msgstr "Vim: Legado el stdin...\n"
 
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverto igis la dosieron nelegebla!"
 
 #. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[rektvica memoro/kontaktoskatolo]"
 
 #. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[rektvica memoro]"
 
 #. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[kontaktoskatolo]"
 
 #. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[speciala signo]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR mankas]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[divido de longaj linioj]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[NE konvertita]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[konvertita]"
 
-#: ../fileio.c:1831
 #, c-format
 msgid "[CONVERSION ERROR in line %<PRId64>]"
 msgstr "[ERARO DE KONVERTO en linio %<PRId64>]"
 
-#: ../fileio.c:1835
 #, c-format
 msgid "[ILLEGAL BYTE in line %<PRId64>]"
 msgstr "[NEVALIDA BAJTO en linio %<PRId64>]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[ERAROJ DE LEGADO]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "Ne eblas trovi provizoran dosieron por konverti"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "Konverto kun 'charconvert' fiaskis"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "ne eblas legi la eligon de 'charconvert'"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Neniu kongrua aŭtokomando por la bufro acwrite"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Aŭtokomandoj forviŝis aŭ malŝargis la skribendan bufron"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Aŭtokomando ŝanĝis la nombron de linioj neatendite"
 
-#: ../fileio.c:2548 ../fileio.c:2565
 msgid "is not a file or writable device"
 msgstr "ne estas dosiero aŭ skribebla aparatdosiero"
 
-#: ../fileio.c:2601
 msgid "is read-only (add ! to override)"
 msgstr "estas nurlegebla (aldonu ! por transpasi)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: Ne eblas skribi restaŭrkopion (aldonu ! por transpasi)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: Eraro dum fermo de restaŭrkopio (aldonu ! transpasi)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: Ne eblas legi restaŭrkopion (aldonu ! por transpasi)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
 
 #. Can't write without a tempfile!
-#: ../fileio.c:3121
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Ne eblas trovi provizoran dosieron por skribi"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: Ne eblas konverti (aldonu ! por skribi sen konverto)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: Ne eblas malfermi ligitan dosieron por skribi"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: Ne eblas malfermi la dosieron por skribi"
 
 # AM: fsync: ne traduku (nomo de C-komando)
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: Fsync fiaskis"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: Fermo fiaskis"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: skriberaro, konverto fiaskis (igu 'fenc' malplena por transpasi)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
@@ -2224,56 +1773,43 @@ msgstr ""
 "E513: skriberaro, konverto fiaskis en linio %<PRId64> (igu 'fenc' malplena  "
 "por transpasi)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: skriberaro (ĉu plena dosiersistemo?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " ERARO DE KONVERTO"
 
-#: ../fileio.c:3509
 #, c-format
 msgid " in line %<PRId64>;"
 msgstr " en linio %<PRId64>;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[Aparatdosiero]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[Nova]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " postaldonita(j)"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [s]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " skribita(j)"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patchmode: ne eblas konservi originalan dosieron"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: ne eblas tuŝi malplenan originalan dosieron"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: Ne eblas forviŝi restaŭrkopion"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2281,96 +1817,75 @@ msgstr ""
 "\n"
 "AVERTO: Originala dosiero estas eble perdita aŭ difekta\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "ne eliru el la redaktilo ĝis kiam la dosiero estas sukcese konservita!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[formato dos]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[formato mac]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unikso]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[formato unikso]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 linio, "
 
-#: ../fileio.c:3833
 #, c-format
 msgid "%<PRId64> lines, "
 msgstr "%<PRId64> linioj, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 signo"
 
-#: ../fileio.c:3838
 #, c-format
 msgid "%<PRId64> characters"
 msgstr "%<PRId64> signoj"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[sen EOL]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[Nekompleta lasta linio]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "AVERTO: La dosiero estas ŝanĝita de post kiam ĝi estis legita!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "Ĉu vi vere volas skribi al ĝi"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Eraro dum skribo de \"%s\""
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Eraro dum fermo de \"%s\""
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Eraro dum lego de \"%s\""
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: Aŭtokomando FileChangedShell forviŝis bufron"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: Dosiero \"%s\" ne plu haveblas"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -2378,38 +1893,30 @@ msgid ""
 msgstr ""
 "W12: Averto: Dosiero \"%s\" ŝanĝiĝis kaj la bufro estis ŝanĝita ankaŭ en Vim"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "Vidu \":help W12\" por pliaj informoj."
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Averto: La dosiero \"%s\" ŝanĝiĝis ekde redakti ĝin"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "Vidu \":help W11\" por pliaj informoj."
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: Averto: Permeso de dosiero \"%s\" ŝanĝiĝis ekde redakti ĝin"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "Vidu \":help W16\" por pliaj informoj."
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Averto: Dosiero \"%s\" kreiĝis post la komenco de redaktado"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "Averto"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2417,48 +1924,39 @@ msgstr ""
 "&Bone\n"
 "Ŝ&argi Dosieron"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--Forviŝita--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
 
-#: ../fileio.c:5897
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Nevalida signo post *: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: Ne estas tia evento: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: Ne ekzistas tia grupo aŭ evento: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2466,108 +1964,85 @@ msgstr ""
 "\n"
 "--- Aŭto-Komandoj ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <bufro=%d>: nevalida numero de bufro "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Ne eblas plenumi aŭtokomandojn por ĈIUJ eventoj"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "Neniu kongrua aŭtokomando"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: aŭtokomando tro ingita"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Aŭtokomandoj por \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "Plenumado de %s"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "aŭtokomando %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: Mankas {."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: Mankas }."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: Neniu faldo trovita"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: Ne eblas krei faldon per la aktuala 'foldmethod'"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Ne eblas forviŝi faldon per la aktuala 'foldmethod'"
 
-#: ../fold.c:1784
 #, c-format
 msgid "+--%3ld lines folded "
 msgstr "+--%3ld linioj falditaj "
 
 #. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: rekursia mapo"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: malloka mallongigo jam ekzistas por %s"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: malloka mapo jam ekzistas por %s"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: mallongigo jam ekzistas por %s"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: mapo jam ekzistas por %s"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "Neniu mallongigo trovita"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "Neniu mapo trovita"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Nevalida reĝimo"
 
 #. key value of 'cedit' option
 #. type of cmdline window or 0
 #. result of cmdline window or 0
-#: ../globals.h:924
 msgid "--No lines in buffer--"
 msgstr "--Neniu linio en bufro--"
 
@@ -2575,658 +2050,504 @@ msgstr "--Neniu linio en bufro--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: ../globals.h:996
 msgid "E470: Command aborted"
 msgstr "E470: komando ĉesigita"
 
-#: ../globals.h:997
 msgid "E471: Argument required"
 msgstr "E471: Argumento bezonata"
 
-#: ../globals.h:998
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ devus esti sekvita de /, ? aŭ &"
 
-#: ../globals.h:1000
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr ""
 "E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras"
 
-#: ../globals.h:1002
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
 
-#: ../globals.h:1003
 msgid "E171: Missing :endif"
 msgstr "E171: Mankas \":endif\""
 
-#: ../globals.h:1004
 msgid "E600: Missing :endtry"
 msgstr "E600: Mankas \":endtry\""
 
-#: ../globals.h:1005
 msgid "E170: Missing :endwhile"
 msgstr "E170: Mankas \":endwhile\""
 
-#: ../globals.h:1006
 msgid "E170: Missing :endfor"
 msgstr "E170: Mankas \":endfor\""
 
-#: ../globals.h:1007
 msgid "E588: :endwhile without :while"
 msgstr "E588: \":endwhile\" sen \":while\""
 
-#: ../globals.h:1008
 msgid "E588: :endfor without :for"
 msgstr "E588: \":endfor\" sen \":for\""
 
-#: ../globals.h:1009
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)"
 
-#: ../globals.h:1010
 msgid "E472: Command failed"
 msgstr "E472: La komando fiaskis"
 
-#: ../globals.h:1011
 msgid "E473: Internal error"
 msgstr "E473: Interna eraro"
 
-#: ../globals.h:1012
 msgid "Interrupted"
 msgstr "Interrompita"
 
-#: ../globals.h:1013
 msgid "E14: Invalid address"
 msgstr "E14: Nevalida adreso"
 
-#: ../globals.h:1014
 msgid "E474: Invalid argument"
 msgstr "E474: Nevalida argumento"
 
-#: ../globals.h:1015
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Nevalida argumento: %s"
 
-#: ../globals.h:1016
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Nevalida esprimo: %s"
 
-#: ../globals.h:1017
 msgid "E16: Invalid range"
 msgstr "E16: Nevalida amplekso"
 
-#: ../globals.h:1018
 msgid "E476: Invalid command"
 msgstr "E476: Nevalida komando"
 
-#: ../globals.h:1019
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" estas dosierujo"
 
-#: ../globals.h:1020
 #, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: Nevalida grando de rulumo"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
+#~ msgid "E900: Invalid job id"
+#~ msgstr "E49: Nevalida grando de rulumo"
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
+#~ msgid "E901: Job table is full"
+#~ msgstr ""
 
-#: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: Alvoko al biblioteko fiaskis por \"%s()\""
 
-#: ../globals.h:1026
 msgid "E19: Mark has invalid line number"
 msgstr "E19: Marko havas nevalidan numeron de linio"
 
-#: ../globals.h:1027
 msgid "E20: Mark not set"
 msgstr "E20: Marko ne estas agordita"
 
-#: ../globals.h:1029
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: Ne eblas fari ŝanĝojn, 'modifiable' estas malŝaltita"
 
-#: ../globals.h:1030
 msgid "E22: Scripts nested too deep"
 msgstr "E22: Tro profunde ingitaj skriptoj"
 
-#: ../globals.h:1031
 msgid "E23: No alternate file"
 msgstr "E23: Neniu alterna dosiero"
 
-#: ../globals.h:1032
 msgid "E24: No such abbreviation"
 msgstr "E24: Ne estas tia mallongigo"
 
-#: ../globals.h:1033
 msgid "E477: No ! allowed"
 msgstr "E477: Neniu ! permesebla"
 
-#: ../globals.h:1035
 msgid "E25: Nvim does not have a built-in GUI"
 msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
 
-#: ../globals.h:1036
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Neniu grupo de emfazo kiel: %s"
 
-#: ../globals.h:1037
 msgid "E29: No inserted text yet"
 msgstr "E29: Ankoraŭ neniu enmetita teksto"
 
-#: ../globals.h:1038
 msgid "E30: No previous command line"
 msgstr "E30: Neniu antaŭa komanda linio"
 
-#: ../globals.h:1039
 msgid "E31: No such mapping"
 msgstr "E31: Neniu tiel mapo"
 
-#: ../globals.h:1040
 msgid "E479: No match"
 msgstr "E479: Neniu kongruo"
 
-#: ../globals.h:1041
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: Neniu kongruo: %s"
 
-#: ../globals.h:1042
 msgid "E32: No file name"
 msgstr "E32: Neniu dosiernomo"
 
-#: ../globals.h:1044
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: Neniu antaŭa regulesprimo de anstataŭigo"
 
-#: ../globals.h:1045
 msgid "E34: No previous command"
 msgstr "E34: Neniu antaŭa komando"
 
-#: ../globals.h:1046
 msgid "E35: No previous regular expression"
 msgstr "E35: Neniu antaŭa regulesprimo"
 
-#: ../globals.h:1047
 msgid "E481: No range allowed"
 msgstr "E481: Amplekso nepermesebla"
 
-#: ../globals.h:1048
 msgid "E36: Not enough room"
 msgstr "E36: Ne sufiĉe da spaco"
 
-#: ../globals.h:1049
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: Ne eblas krei dosieron %s"
 
-#: ../globals.h:1050
 msgid "E483: Can't get temp file name"
 msgstr "E483: Ne eblas akiri provizoran dosiernomon"
 
-#: ../globals.h:1051
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Ne eblas malfermi dosieron %s"
 
-#: ../globals.h:1052
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Ne eblas legi dosieron %s"
 
-#: ../globals.h:1054
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
 
-#: ../globals.h:1055
 #, fuzzy
-msgid "E37: No write since last change"
-msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
+#~ msgid "E37: No write since last change"
+#~ msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
 
-#: ../globals.h:1056
 msgid "E38: Null argument"
 msgstr "E38: Nula argumento"
 
-#: ../globals.h:1057
 msgid "E39: Number expected"
 msgstr "E39: Nombro atendita"
 
-#: ../globals.h:1058
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Ne eblas malfermi eraran dosieron %s"
 
-#: ../globals.h:1059
 msgid "E41: Out of memory!"
 msgstr "E41: Ne plu restas memoro!"
 
-#: ../globals.h:1060
 msgid "Pattern not found"
 msgstr "Ŝablono ne trovita"
 
-#: ../globals.h:1061
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: Ŝablono ne trovita: %s"
 
-#: ../globals.h:1062
 msgid "E487: Argument must be positive"
 msgstr "E487: La argumento devas esti pozitiva"
 
-#: ../globals.h:1064
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Ne eblas reiri al antaŭa dosierujo"
 
-#: ../globals.h:1066
 msgid "E42: No Errors"
 msgstr "E42: Neniu eraro"
 
-#: ../globals.h:1067
 msgid "E776: No location list"
 msgstr "E776: Neniu listo de loko"
 
-#: ../globals.h:1068
 msgid "E43: Damaged match string"
 msgstr "E43: Difekta kongruenda ĉeno"
 
-#: ../globals.h:1069
 msgid "E44: Corrupted regexp program"
 msgstr "E44: Difekta programo de regulesprimo"
 
-#: ../globals.h:1071
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
 
-#: ../globals.h:1073
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
 
-#: ../globals.h:1075
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
 
-#: ../globals.h:1076
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
+
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Eraro dum legado de erardosiero"
 
-#: ../globals.h:1078
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: Nepermesebla en sabloludejo"
 
-#: ../globals.h:1080
 msgid "E523: Not allowed here"
 msgstr "E523: Nepermesebla tie"
 
-#: ../globals.h:1082
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Reĝimo de ekrano ne subtenata"
 
-#: ../globals.h:1083
 msgid "E49: Invalid scroll size"
 msgstr "E49: Nevalida grando de rulumo"
 
-#: ../globals.h:1084
 msgid "E91: 'shell' option is empty"
 msgstr "E91: La opcio 'shell' estas malplena"
 
-#: ../globals.h:1085
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: Ne eblis legi datumojn de simboloj!"
 
-#: ../globals.h:1086
 msgid "E72: Close error on swap file"
 msgstr "E72: Eraro dum malfermo de permutodosiero .swp"
 
-#: ../globals.h:1087
 msgid "E73: tag stack empty"
 msgstr "E73: malplena stako de etikedo"
 
-#: ../globals.h:1088
 msgid "E74: Command too complex"
 msgstr "E74: Komando tro kompleksa"
 
-#: ../globals.h:1089
 msgid "E75: Name too long"
 msgstr "E75: Nomo tro longa"
 
-#: ../globals.h:1090
 msgid "E76: Too many ["
 msgstr "E76: Tro da ["
 
-#: ../globals.h:1091
 msgid "E77: Too many file names"
 msgstr "E77: Tro da dosiernomoj"
 
-#: ../globals.h:1092
 msgid "E488: Trailing characters"
 msgstr "E488: Vostaj signoj"
 
-#: ../globals.h:1093
 msgid "E78: Unknown mark"
 msgstr "E78: Nekonata marko"
 
-#: ../globals.h:1094
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Ne eblas malvolvi ĵokerojn"
 
-#: ../globals.h:1096
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'"
 
-#: ../globals.h:1098
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
 
-#: ../globals.h:1099
 msgid "E80: Error while writing"
 msgstr "E80: Eraro dum skribado"
 
-#: ../globals.h:1100
 msgid "Zero count"
 msgstr "Nul kvantoro"
 
-#: ../globals.h:1101
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
 
-#: ../globals.h:1102
 #, c-format
 msgid "E685: Internal error: %s"
 msgstr "E685: Interna eraro: %s"
 
-#: ../globals.h:1104
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
 
-#: ../globals.h:1105
 msgid "E749: empty buffer"
 msgstr "E749: malplena bufro"
 
-#: ../globals.h:1226
 #, c-format
 msgid "E86: Buffer %<PRId64> does not exist"
 msgstr "E86: La bufro %<PRId64> ne ekzistas"
 
-#: ../globals.h:1108
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
 
-#: ../globals.h:1109
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Dosiero estas ŝargita en alia bufro"
 
-#: ../globals.h:1110
 #, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: La opcio '%s' ne estas ŝaltita"
 
-#: ../globals.h:1111
 msgid "E850: Invalid register name"
 msgstr "E850: Nevalida nomo de reĝistro"
 
-#: ../globals.h:1114
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
 
-#: ../globals.h:1115
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
 
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: Mankas dupunkto"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: Nevalida komponento"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: cifero atendita"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "Paĝo %d"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "Neniu presenda teksto"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "Presas paĝon %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " Kopio %d de %d"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "Presis: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "Presado ĉesigita"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Eraro dum skribo de PostSkripta eliga dosiero"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: Ne eblas malfermi dosieron \"%s\""
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: Ne eblas legi dosieron de PostSkripta rimedo \"%s\""
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: \"%s\" ne estas dosiero de PostSkripta rimedo"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: \"%s\" ne estas subtenata dosiero de PostSkripta rimedo"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: \"%s\" dosiero de rimedo havas neĝustan version"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: Nekongrua plurbajta kodoprezento kaj signaro."
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr ""
 "E674: printmbcharset ne rajtas esti malplena kun plurbajta kodoprezento."
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Neniu defaŭlta tiparo specifita por plurbajta presado."
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: Ne eblas malfermi eligan PostSkriptan dosieron"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: Ne eblas malfermi dosieron \"%s\""
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: Dosiero de PostSkripta rimedo \"prolog.ps\" ne troveblas"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: Dosiero de PostSkripta rimedo \"cidfont.ps\" ne troveblas"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: Dosiero de PostSkripta rimedo \"%s.ps\" ne troveblas"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: Ne eblas konverti al la presa kodoprezento \"%s\""
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "Sendas al presilo..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: Presado de PostSkripta dosiero fiaskis"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "Laboro de presado sendita."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "Aldoni novan datumbazon"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "Serĉi ŝablonon"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "Montri tiun mesaĝon"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "Ĉesigi konekton"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "Repravalorizi ĉiujn konektojn"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "Montri konektojn"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Uzo: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "Tiu ĉi komando de cscope ne subtenas dividon de fenestro.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: Uzo: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: etikedo netrovita"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Eraro de stat(%s): %d"
 
-#: ../if_cscope.c:551
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ne estas dosierujo aŭ valida datumbazo de cscope"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "Aldonis datumbazon de cscope %s"
 
-#: ../if_cscope.c:616
 #, c-format
 msgid "E262: error reading cscope connection %<PRId64>"
 msgstr "E262: eraro dum legado de konekto de cscope %<PRId64>"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: nekonata tipo de serĉo de cscope"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Ne eblis krei duktojn de cscope"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Ne eblis forki cscope"
 
-#: ../if_cscope.c:849
 #, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "plenumo de cs_create_connection fiaskis"
+#~ msgid "cs_create_connection setpgid failed"
+#~ msgstr "plenumo de cs_create_connection fiaskis"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "plenumo de cs_create_connection fiaskis"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen de to_fp fiaskis"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fdopen de fr_fp fiaskis"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Ne eblis naskigi procezon cscope"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: neniu konekto al cscope"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: nevalida flago cscopequickfix %c de %c"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: neniu kongruo trovita por serĉo per cscope %s de %s"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "komandoj de cscope:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (Uzo: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
 "       c: Find functions calling this function\n"
@@ -3237,6 +2558,7 @@ msgid ""
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
 "       t: Find this text string\n"
+"       a: Find assignments to this symbol\n"
 msgstr ""
 "\n"
 "       c: Trovi funkciojn, kiuj alvokas tiun funkcion\n"
@@ -3247,32 +2569,27 @@ msgstr ""
 "       i: Trovi dosierojn, kiuj inkluzivas (#include) tiun dosieron\n"
 "       s: Trovi tiun C-simbolon\n"
 "       t: Trovi tiun ĉenon\n"
+"       a: Trovi valirizojn al tiu simbolo\n"
 
-#: ../if_cscope.c:1226
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ripetita datumbazo de cscope ne aldonita"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: konekto cscope %s netrovita"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "konekto cscope %s fermita"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: neriparebla eraro en cs_manage_matches"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Etikedo de cscope: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3280,87 +2597,67 @@ msgstr ""
 "\n"
 " nro   linio"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "dosiernomo / kunteksto / linio\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Eraro de cscope: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "Reŝargo de ĉiuj datumbazoj de cscope"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "neniu konekto de cscope\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nomo de datumbazo                   prefiksa vojo\n"
 
-#: ../main.c:144
 msgid "Unknown option argument"
 msgstr "Nekonata argumento de opcio"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "Tro da argumentoj de redakto"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "Argumento mankas post"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "Forĵetindaĵo post argumento de opcio"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "Tro da argumentoj \"+komando\", \"-c komando\" aŭ \"--cmd komando\""
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "Nevalida argumento por"
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d redaktendaj dosieroj\n"
 
-#: ../main.c:1342
 msgid "Attempt to open script file again: \""
 msgstr "Provas malfermi skriptan dosieron denove: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "Ne eblas malfermi en lega reĝimo: \""
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "Ne eblas malfermi por eligo de skripto: \""
 
-#: ../main.c:1622
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Averto: Eligo ne estas al terminalo\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Averto: Enigo ne estas el terminalo\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "komanda linio pre-vimrc"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Ne eblas legi el \"%s\""
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3369,23 +2666,18 @@ msgstr ""
 "Pliaj informoj per: \"vim -h\"\n"
 
 # DP: tajpu "vim --help" por testi tiujn mesaĝojn
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[dosiero...]     redakti specifita(j)n dosiero(j)n"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-                legi tekston el stdin"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t etikedo       redakti dosieron kie etikedo estas difinata"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [erardosiero] redakti dosieron kun unua eraro"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3395,11 +2687,9 @@ msgstr ""
 "\n"
 "  uzo:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [argumentoj] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3407,7 +2697,6 @@ msgstr ""
 "\n"
 "   aŭ:"
 
-#: ../main.c:2196
 msgid ""
 "\n"
 "\n"
@@ -3417,197 +2706,151 @@ msgstr ""
 "\n"
 "Argumentoj:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tNur dosiernomoj post tio"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tNe malvolvi ĵokerojn"
 
-#: ../main.c:2201
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tReĝimo Vi (kiel \"vi\")"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tReĝimo Ex (kiel \"ex\")"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\tPlibonigita Ex-reĝimo"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tSilenta (stapla) reĝimo (nur por \"ex\")"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tKompara reĝimo (kiel \"vimdiff\")"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tFacila reĝimo (kiel \"evim\", senreĝima)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tNurlegebla reĝimo (kiel \"view\")"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\tLimigita reĝimo (kiel \"rvim\")"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\tŜanĝoj (skribo al dosieroj) nepermeseblaj"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tŜanĝoj al teksto nepermeseblaj"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tDuuma reĝimo"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tReĝimo Lisp"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tKongrua kun Vi: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tNe tute kongrua kun Vi: 'nocompatible'"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr ""
 "-V[N][dosiernomo]\tEsti babilema [nivelo N] [konservi mesaĝojn al dosiernomo]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tSencimiga reĝimo"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tNeniu permutodosiero .swp, uzas nur memoron"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tListigi permutodosierojn .swp kaj eliri"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (kun dosiernomo)\tRestaŭri kolapsintan seancon"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\tKiel -r"
 
-#: ../main.c:2221
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tKomenci en araba reĝimo"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tKomenci en hebrea reĝimo"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tKomenci en persa reĝimo"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminalo>\tAgordi terminalon al <terminalo>"
 
-#: ../main.c:2225
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tUzi <vimrc> anstataŭ iun ajn .vimrc"
 
-#: ../main.c:2226
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tNe ŝargi kromaĵajn skriptojn"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\t\tMalfermi N langetojn (defaŭlto: po unu por ĉiu dosiero)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tMalfermi N fenestrojn (defaŭlto: po unu por ĉiu dosiero)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\tKiel -o sed dividi vertikale"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tKomenci ĉe la fino de la dosiero"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<numL>\t\tKomenci ĉe linio <numL>"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr ""
 "--cmd <komando>\tPlenumi <komando>-n antaŭ ol ŝargi iun ajn dosieron vimrc"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <komando>\t\tPlenumi <komando>-n post kiam la unua dosiero ŝargiĝis"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr ""
 "-S <seanco>\t\tRuli dosieron <seanco>-n post kiam la unua dosiero ŝargiĝis"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <skripto>\t\tLegi komandojn en Normala reĝimo el dosiero <skripto>"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr ""
 "-w <eligaskripto>\tPostaldoni ĉiujn tajpitajn komandojn al dosiero "
 "<eligaskripto>"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr ""
 "-W <eligaskripto>\tSkribi ĉiujn tajpitajn komandojn al dosiero <eligaskripto>"
 
-#: ../main.c:2240
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <dosiero>  Skribi mesaĝojn de komenca tempomezurado al "
 "<dosiero>"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tUzi <viminfo> anstataŭ .viminfo"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  aŭ  --help\tAfiŝi Helpon (tiun mesaĝon) kaj eliri"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfiŝi informon de versio kaj eliri"
 
-#: ../mark.c:676
 msgid "No marks set"
 msgstr "Neniu marko"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Neniu marko kongruas kun \"%s\""
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3616,7 +2859,6 @@ msgstr ""
 "mark linio kol dosiero/teksto"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3625,7 +2867,6 @@ msgstr ""
 " salt linio kol dosiero/teksto"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3633,7 +2874,6 @@ msgstr ""
 "\n"
 "ŝanĝo  linio kol teksto"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3642,7 +2882,6 @@ msgstr ""
 "# Markoj de dosiero:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3650,7 +2889,6 @@ msgstr ""
 "\n"
 "# Saltlisto (plej novaj unue):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3658,85 +2896,66 @@ msgstr ""
 "\n"
 "# Historio de markoj en dosieroj (de plej nova al plej malnova):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "Mankas '>'"
 
-#: ../memfile.c:426
 msgid "E293: block was not locked"
 msgstr "E293: bloko ne estis ŝlosita"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Eraro de enpoziciigo dum lego de permutodosiero .swp"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: Eraro de lego en permutodosiero .swp"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: Eraro de enpoziciigo dum skribo de permutodosiero .swp"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: Skriberaro en permutodosiero .swp"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: Permutodosiero .swp jam ekzistas (ĉu atako per simbola ligilo?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: Ĉu ne akiris blokon n-ro 0?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: Ĉu ne akiris blokon n-ro 1?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Ĉu ne akiris blokon n-ro 2?"
 
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ve, perdis la permutodosieron .swp!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: Ne eblis renomi la permutodosieron .swp"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
 "E303: Ne eblas malfermi permutodosieron .swp de \"%s\", restaŭro neeblas"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Ne akiris blokon 0??"
 
 #. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Neniu permutodosiero .swp trovita por %s"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Entajpu la uzendan numeron de permutodosiero .swp (0 por eliri): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Ne eblas malfermi %s"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "Ne eblas legi blokon 0 de "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3744,28 +2963,22 @@ msgstr ""
 "\n"
 "Eble neniu ŝanĝo estis farita aŭ Vim ne ĝisdatigis la permutodosieron .swp."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " ne uzeblas per tiu versio de vim.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Uzu version 3.0 de Vim\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ne aspektas kiel permutodosiero .swp de Vim"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " ne uzeblas per tiu komputilo.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "La dosiero estas kreita je "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3773,85 +2986,66 @@ msgstr ""
 ",\n"
 "aŭ la dosiero estas difekta."
 
-#: ../memline.c:945
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " difektiĝis (paĝa grando pli malgranda ol minimuma valoro).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Uzado de permutodosiero .swp \"%s\""
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "Originala dosiero \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Averto: Originala dosiero eble ŝanĝiĝis"
 
-#: ../memline.c:1061
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Ne eblas legi blokon 1 de %s"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???MULTAJ LINIOJ MANKAS"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???NOMBRO DE LINIOJ NE ĜUSTAS"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???MALPLENA BLOKO"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???LINIOJ MANKANTAJ"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr ""
 "E310: Nevalida identigilo de bloko 1 (ĉu %s ne estas permutodosiero .swp?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???MANKAS BLOKO"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ekde tie ĝis ???FINO linioj estas eble difektaj"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ekde tie ĝis ???FINO linioj estas eble enmetitaj/forviŝitaj"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???FINO"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Restaŭro interrompita"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr "E312: Eraroj dum restaŭro; rigardu liniojn komencantajn per ???"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "Vidu \":help E312\" por pliaj informoj."
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Restaŭro finiĝis. Indus kontroli ĉu ĉio estas en ordo."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3859,16 +3053,13 @@ msgstr ""
 "\n"
 "(Indas konservi tiun dosieron per alia nomo\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "kaj lanĉi diff kun la originala dosiero por kontroli la ŝanĝojn)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr ""
 "Restaŭro finiĝis. La enhavo de la bufro samas kun la enhavo de la dosiero."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3879,51 +3070,39 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "Permutodosiero .swp trovita:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   En la aktuala dosierujo:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   Uzado de specifita nomo:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   En dosierujo "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "     -- nenio --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "       posedata de: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "    dato: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "              dato: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [de Vim versio 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [ne aspektas kiel permutodosiero .swp de Vim]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "        dosiernomo: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3931,15 +3110,12 @@ msgstr ""
 "\n"
 "          modifita: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "JES"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "ne"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3947,11 +3123,9 @@ msgstr ""
 "\n"
 "        uzantonomo: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr " komputila nomo: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3959,7 +3133,6 @@ msgstr ""
 "\n"
 "    komputila nomo: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3967,11 +3140,9 @@ msgstr ""
 "\n"
 "        proceza ID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (ankoraŭ ruliĝas)"
 
-#: ../memline.c:1586
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3979,97 +3150,75 @@ msgstr ""
 "\n"
 "         [neuzebla per tiu komputilo]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [nelegebla]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [nemalfermebla]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: Ne eblas konservi, ne estas permutodosiero .swp"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "Dosiero konservita"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: Konservo fiaskis"
 
-#: ../memline.c:1819
 #, c-format
 msgid "E315: ml_get: invalid lnum: %<PRId64>"
 msgstr "E315: ml_get: nevalida lnum: %<PRId64>"
 
-#: ../memline.c:1851
 #, c-format
 msgid "E316: ml_get: cannot find line %<PRId64>"
 msgstr "E316: ml_get: ne eblas trovi linion %<PRId64>"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: nevalida referenco de bloko id 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx devus esti 0"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: Ĉu ĝisdatigis tro da blokoj?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: nevalida referenco de bloko id 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "ĉu forviŝita bloko 1?"
 
-#: ../memline.c:2707
 #, c-format
 msgid "E320: Cannot find line %<PRId64>"
 msgstr "E320: Ne eblas trovi linion %<PRId64>"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: nevalida referenco de bloko id"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count estas nul"
 
-#: ../memline.c:2955
 #, c-format
 msgid "E322: line number out of range: %<PRId64> past the end"
 msgstr "E322: numero de linio ekster limoj: %<PRId64> preter la fino"
 
-#: ../memline.c:2959
 #, c-format
 msgid "E323: line count wrong in block %<PRId64>"
 msgstr "E323: nevalida nombro de linioj en bloko %<PRId64>"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "Stako pligrandiĝas"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: nevalida referenco de bloko id 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Buklo de simbolaj ligiloj por \"%s\""
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: ATENTO"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4077,39 +3226,32 @@ msgstr ""
 "\n"
 "Trovis permutodosieron .swp kun la nomo \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "Dum malfermo de dosiero \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      PLI NOVA ol permutodosiero .swp!\n"
 
-#: ../memline.c:3244
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) Alia programo eble redaktas la saman dosieron.\n"
-"    Se jes, estu singarda por ne havi du malsamajn\n"
-"    aperojn de la sama dosiero, kiam vi faros ŝanĝojn."
+"(1) Alia programo eble redaktas la saman dosieron. Se jes, estu singarda\n"
+"    por ne havi du malsamajn aperojn de la sama dosiero, kiam vi faros\n"
+"    ŝanĝojn. Eliru aŭ daŭrigu singarde.\n"
 
-#: ../memline.c:3245
 msgid "  Quit, or continue with caution.\n"
 msgstr "  Eliru, aŭ daŭrigu singarde.\n"
 
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Redakta seanco de tiu dosiero kolapsis.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    Se veras, uzu \":recover\" aŭ \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4117,11 +3259,9 @@ msgstr ""
 "\"\n"
 "    por restaŭri la ŝanĝojn (vidu \":help recovery\").\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    Se vi jam faris ĝin, forviŝu la permutodosieron .swp \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4129,25 +3269,20 @@ msgstr ""
 "\"\n"
 "    por eviti tiun mesaĝon.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "Permutodosiero .swp \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" jam ekzistas!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - ATENTO"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "Permutodosiero .swp jam ekzistas!"
 
 # AM: ĉu Vim konvertos la unuliterajn respondojn de la uzulo?
 # DP: jes, la '&' respondoj bone funkcias (mi kontrolis)
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4161,7 +3296,6 @@ msgstr ""
 "&Eliri\n"
 "Ĉe&sigi"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4185,48 +3319,38 @@ msgstr ""
 #.
 #. ".s?a"
 #. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: Tro da dosieroj trovitaj"
 
-#: ../memory.c:227
 #, c-format
 msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
 msgstr "E342: Ne plu restas memoro! (disponigo de %<PRIu64> bajtoj)"
 
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Parto de vojo de menuero ne estas sub-menuo"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: Menuo nur ekzistas en alia reĝimo"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Neniu menuo \"%s\""
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: Malplena nomo de menuo"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: Vojo de menuo ne rajtas konduki al sub-menuo"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: Aldono de menueroj direkte al menuzono estas malpermesita"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Disigilo ne rajtas esti ero de vojo de menuo"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4234,73 +3358,54 @@ msgstr ""
 "\n"
 "--- Menuoj ---"
 
-#: ../menu.c:1313
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Vojo de menuo devas konduki al menuero"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: Menuo netrovita: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: Menuo ne estas difinita por reĝimo %s"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Vojo de menuo devas konduki al sub-menuo"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: Menuo ne trovita - kontrolu nomojn de menuoj"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "Eraro okazis dum traktado de %s:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "linio %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nevalida nomo de reĝistro: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Flegado de mesaĝoj: Dominique PELLÉ <dominique.pelle@gmail.com>"
-
-#: ../message.c:986
 msgid "Interrupt: "
 msgstr "Interrompo: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "Premu ENEN-KLAVON aŭ tajpu komandon por daŭrigi"
 
-#: ../message.c:1843
 #, c-format
 msgid "%s line %<PRId64>"
 msgstr "%s linio %<PRId64>"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- Pli --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SPACETO/d/j: ekrano/paĝo/sub linio, b/u/k: supre, q: eliri "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "Demando"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4308,7 +3413,6 @@ msgstr ""
 "&Jes\n"
 "&Ne"
 
-#: ../message.c:3033
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4320,7 +3424,6 @@ msgstr ""
 
 # AM: ĉu Vim konvertos unuliterajn respondojn?
 # DP: jes, '&' bone funkcias (mi kontrolis)
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4334,175 +3437,136 @@ msgstr ""
 "&Forlasi Ĉion\n"
 "&Rezigni"
 
-#: ../message.c:3058
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Ne sufiĉaj argumentoj por printf()"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: Atendis Glitpunktnombron kiel argumento de printf()"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Tro da argumentoj al printf()"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Averto: Ŝanĝo de nurlegebla dosiero"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "Tajpu nombron kaj <Enenklavon> aŭ alklaku per la muso (malpleno rezignas): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Tajpu nombron kaj <Enenklavon> (malpleno rezignas): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 plia linio"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 malplia linio"
 
-#: ../misc1.c:2593
 #, c-format
 msgid "%<PRId64> more lines"
 msgstr "%<PRId64> pliaj linioj"
 
-#: ../misc1.c:2596
 #, c-format
 msgid "%<PRId64> fewer lines"
 msgstr "%<PRId64> malpliaj linioj"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (Interrompita)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "Bip!"
 
-#: ../misc2.c:738
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Alvokas ŝelon por plenumi: \"%s\""
 
-#: ../normal.c:183
 msgid "E349: No identifier under cursor"
 msgstr "E349: Neniu identigilo sub la kursoro"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' estas malplena"
 
-#: ../normal.c:2637
 msgid "Warning: terminal cannot highlight"
 msgstr "Averto: terminalo ne povas emfazi"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: Neniu ĉeno sub la kursoro"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Ne eblas forviŝi faldon per aktuala 'foldmethod'"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: Listo de ŝanĝoj estas malplena"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: Ĉe komenco de ŝanĝlisto"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: Ĉe fino de ŝanĝlisto"
 
-#: ../normal.c:7053
 msgid "Type  :quit<Enter>  to exit Nvim"
 msgstr "Tajpu \":quit<Enenklavo>\" por eliri el Vim"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 linio %sita 1 foje"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 linio %sita %d foje"
 
-#: ../ops.c:253
 #, c-format
 msgid "%<PRId64> lines %sed 1 time"
 msgstr "%<PRId64> linio %sita 1 foje"
 
-#: ../ops.c:256
 #, c-format
 msgid "%<PRId64> lines %sed %d times"
 msgstr "%<PRId64> linioj %sitaj %d foje"
 
-#: ../ops.c:592
 #, c-format
 msgid "%<PRId64> lines to indent... "
 msgstr "%<PRId64> krommarĝenendaj linioj... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 linio krommarĝenita "
 
-#: ../ops.c:636
 #, c-format
 msgid "%<PRId64> lines indented "
 msgstr "%<PRId64> linioj krommarĝenitaj "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "ne eblas kopii; forviŝi tamene"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 linio ŝanĝita"
 
-#: ../ops.c:1931
 #, c-format
 msgid "%<PRId64> lines changed"
 msgstr "%<PRId64> linioj ŝanĝitaj"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "bloko de 1 linio kopiita"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 linio kopiita"
 
-#: ../ops.c:2525
 #, c-format
 msgid "block of %<PRId64> lines yanked"
 msgstr "bloko de %<PRId64> linioj kopiita"
 
-#: ../ops.c:2528
 #, c-format
 msgid "%<PRId64> lines yanked"
 msgstr "%<PRId64> linioj kopiitaj"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Nenio en reĝistro %s"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4510,11 +3574,9 @@ msgstr ""
 "\n"
 "--- Reĝistroj ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "Nevalida nomo de reĝistro"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4522,17 +3584,14 @@ msgstr ""
 "\n"
 "# Reĝistroj:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: Nekonata tipo de reĝistro %d"
 
-#: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
 msgstr "%<PRId64> Kolumnoj; "
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4541,7 +3600,6 @@ msgstr ""
 "Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
 "%<PRId64> de %<PRId64> Bajtoj"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4550,7 +3608,6 @@ msgstr ""
 "Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
 "%<PRId64> de %<PRId64> Signoj; %<PRId64> de %<PRId64> Bajtoj"
 
-#: ../ops.c:5123
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
@@ -4559,7 +3616,6 @@ msgstr ""
 "Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
 "Bajto %<PRId64> de %<PRId64>"
 
-#: ../ops.c:5133
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
@@ -4568,140 +3624,108 @@ msgstr ""
 "Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
 "Signo %<PRId64> de %<PRId64>; Bajto %<PRId64> de %<PRId64>"
 
-#: ../ops.c:5146
 #, c-format
 msgid "(+%<PRId64> for BOM)"
 msgstr "(+%<PRId64> por BOM)"
 
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Folio %N"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Dankon pro flugi per Vim"
 
 #. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: Nekonata opcio"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: Opcio ne subtenata"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Nepermesebla en reĝimlinio"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: Klavkodo ne agordita"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: Nombro bezonata post ="
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: Netrovita en termcap"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Nevalida signo <%s>"
 
-#: ../option.c:2253
 #, c-format
 msgid "For option %s"
 msgstr "Por opcio %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno"
 
-#: ../option.c:3885
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' kaj 'patchmode' estas egalaj"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: Konfliktoj kun la valoro de 'listchars'"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Konfliktoj kun la valoro de 'fillchars'"
 
-#: ../option.c:4163
 msgid "E524: Missing colon"
 msgstr "E524: Mankas dupunkto"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: Ĉeno de nula longo"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Mankas nombro post <%s>"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: Mankas komo"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: Devas specifi ' valoron"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: enhavas nepreseblan aŭ plurĉellarĝan signon"
 
-#: ../option.c:4469
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Nevalida signo post <%c>"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: komo bezonata"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' devas esti malplena aŭ enhavi %s"
 
-#: ../option.c:4928
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: '}' mankas"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: tro da elementoj"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: misekvilibritaj grupoj"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: Antaŭvida fenestro jam ekzistas"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr "W17: La araba bezonas UTF-8, tajpu \":set encoding=utf-8\""
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Bezonas almenaŭ %d liniojn"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Bezonas almenaŭ %d kolumnojn"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Nekonata opcio: %s"
@@ -4709,12 +3733,10 @@ msgstr "E355: Nekonata opcio: %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Nombro bezonata: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4722,7 +3744,6 @@ msgstr ""
 "\n"
 "--- Kodoj de terminalo ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4730,7 +3751,6 @@ msgstr ""
 "\n"
 "--- Mallokaj opcioj ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4738,7 +3758,6 @@ msgstr ""
 "\n"
 "--- Valoroj de lokaj opcioj ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4746,21 +3765,17 @@ msgstr ""
 "\n"
 "--- Opcioj ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: ERARO get_varp"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': Kongrua signo mankas por %s"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s"
 
-#: ../os/shell.c:194
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4768,7 +3783,6 @@ msgstr ""
 "\n"
 "Ne eblas plenumi ŝelon "
 
-#: ../os/shell.c:439
 msgid ""
 "\n"
 "shell returned "
@@ -4776,7 +3790,6 @@ msgstr ""
 "\n"
 "ŝelo liveris "
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4784,7 +3797,6 @@ msgstr ""
 "\n"
 "Ne povis akiri kuntekston de sekureco por "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4792,219 +3804,181 @@ msgstr ""
 "\n"
 "Ne povis ŝalti kuntekston de sekureco por "
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "Ne povis ŝalti kuntekston de sekureco %s por %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr ""
+"Ne povis akiri kuntekston de sekureco %s por %s. Gi nun estas forigata!"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Tro da %%%c en formata ĉeno"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: Neatendita %%%c en formata ĉeno"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: Mankas ] en formata ĉeno"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: Nesubtenata %%%c en formata ĉeno"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: Nevalida %%%c en prefikso de formata ĉeno"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: Nevalida %%%c en formata ĉeno"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' enhavas neniun ŝablonon"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Nomo de dosierujo mankas aŭ estas malplena"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: Ne plu estas eroj"
 
-#: ../quickfix.c:1674
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d de %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (forviŝita linio)"
 
-#: ../quickfix.c:1863
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Ĉe la subo de stako de rapidriparo"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Ĉe la supro de stako de rapidriparo"
 
-#: ../quickfix.c:1880
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "listo de eraroj %d de %d; %d eraroj"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 
-#: ../quickfix.c:2812
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Dosiernomo mankas aŭ nevalida ŝablono"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Ne eblas malfermi dosieron \"%s\""
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Bufro ne estas ŝargita"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: Ĉeno aŭ Listo atendita"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: nevalida ano en %s%%[]"
 
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: Mankas ] post %s["
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Neekvilibra %s%%("
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: Neekvilibra %s("
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: Neekvilibra %s"
 
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( estas permesebla tie"
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 kaj aliaj estas nepermeseblaj tie"
 
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: Mankas ] post %s%%["
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: Malplena %s%%[]"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: Ŝablono tro longa"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: Tro da \\z("
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: Tro da %s("
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: Neekvilibra \\z("
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: nevalida signo post %s@"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: Tro da kompleksaj %s{...}-oj"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: Ingita %s*"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: Ingita %s%c"
 
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: nevalida uzo de \\_"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c sekvas nenion"
 
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: Nevalida retro-referenco"
 
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Nevalida signo post \\z"
 
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Nevalida signo post %s%%[dxouU]"
 
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Nevalida signo post %s%%"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Sintaksa eraro en %s{...}"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "Eksteraj subkongruoj:\n"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5012,65 +3986,52 @@ msgstr ""
 "E864: \\%#= povas nur esti sekvita de 0, 1, aŭ 2. La aŭtomata motoro de "
 "regulesprimo estos uzata "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c"
 
-#: ../regexp_nfa.c:242
 #, fuzzy, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo "
+#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
+#~ msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo "
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, fuzzy, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
+#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
+#~ msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
 
-#: ../regexp_nfa.c:1802
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) Nekonata operatoro '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFS-regulesprimo) Eraro dum legado de limoj de ripeto"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr ""
 "E871: (NFA-regulesprimo) Ne povas havi mult-selekton tuj post alia mult-"
 "selekto!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA-regulesprimo) tro da '('"
 
-#: ../regexp_nfa.c:2042
 #, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E872: (NFA-regulesprimo) tro da '('"
+#~ msgid "E879: (NFA regexp) Too many \\z("
+#~ msgstr "E872: (NFA-regulesprimo) tro da '('"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA-regulesprimo) propra end-eraro"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) Ne povis elpreni de la staplo!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5078,177 +4039,136 @@ msgstr ""
 "E875: (NFA-regulesprimo) (dum konverto de postmeto al NFA), restas tro da "
 "statoj en la staplo"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi la tutan NFA "
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "Ne povis malfermi provizoran protokolan dosieron por skribi, nun montras sur "
 "stderr ..."
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) NE POVIS MALFERMI %s!"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "Ne povis malfermi la provizoran protokolan dosieron por skribi "
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " V-ANSTATAŬIGO"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " ANSTATAŬIGO"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " INVERSI"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " ENMETO"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (enmeto)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (anstataŭigo)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (v-anstataŭigo)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " hebrea"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " araba"
 
-#: ../screen.c:7456
 msgid " (lang)"
 msgstr " (lingvo)"
 
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (algluo)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " VIDUMA"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " VIDUMA LINIO"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " VIDUMA BLOKO"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " APARTIGO"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " APARTIGITA LINIO"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " APARTIGITA BLOKO"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "registrado"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Nevalida serĉenda ĉeno: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: serĉo atingis SUPRON sen trovi: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: serĉo atingis SUBON sen trovi: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: Atendis '?' aŭ '/' post ';'"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (enhavas antaŭe listigitajn kongruojn)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- Inkluzivitaj dosieroj "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "netrovitaj "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "en serĉvojo ---\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (Jam listigita)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  NETROVITA"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "Skanado de inkluzivitaj dosieroj: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "Serĉado de inkluzivitaj dosieroj %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: Kongruo estas ĉe aktuala linio"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "Ĉiuj inkluzivitaj dosieroj estis trovitaj"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "Neniu inkluzivita dosiero"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: Ne eblis trovi difinon"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Ne eblis trovi ŝablonon"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Anstataŭigi "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5259,97 +4179,76 @@ msgstr ""
 "# Lasta serĉa ŝablono %s:\n"
 "~"
 
-#: ../spell.c:951
 msgid "E759: Format error in spell file"
 msgstr "E759: Eraro de formato en literuma dosiero"
 
-#: ../spell.c:952
 msgid "E758: Truncated spell file"
 msgstr "E758: Trunkita literuma dosiero"
 
-#: ../spell.c:953
 #, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "Vosta teksto en %s linio %d: %s"
 
-#: ../spell.c:954
 #, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "Nomo de afikso tro longa en %s linio %d: %s"
 
-#: ../spell.c:955
 msgid "E761: Format error in affix file FOL, LOW or UPP"
 msgstr "E761: Eraro de formato en afiksa dosiero FOL, LOW aŭ UPP"
 
-#: ../spell.c:957
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: Signo en FOL, LOW aŭ UPP estas ekster limoj"
 
-#: ../spell.c:958
 msgid "Compressing word tree..."
 msgstr "Densigas arbon de vortoj..."
 
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Literumilo ne estas ŝaltita"
 
-#: ../spell.c:2249
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr "Averto: Ne eblas trovi vortliston \"%s.%s.spl\" aŭ \"%s.ascii.spl\""
 
-#: ../spell.c:2473
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Legado de literuma dosiero \"%s\""
 
-#: ../spell.c:2496
 msgid "E757: This does not look like a spell file"
 msgstr "E757: Tio ne ŝajnas esti literuma dosiero"
 
-#: ../spell.c:2501
 msgid "E771: Old spell file, needs to be updated"
 msgstr "E771: Malnova literuma dosiero, ĝisdatigo bezonata"
 
-#: ../spell.c:2504
 msgid "E772: Spell file is for newer version of Vim"
 msgstr "E772: Literuma dosiero estas por pli nova versio de Vim"
 
-#: ../spell.c:2602
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: Nesubtenata sekcio en literuma dosiero"
 
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "Averto: regiono %s ne subtenata"
 
-#: ../spell.c:4550
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "Legado de afiksa dosiero %s ..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "Malsukceso dum konverto de vorto en %s linio %d: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Konverto en %s nesubtenata: de %s al %s"
 
-#: ../spell.c:4642
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Nevalida valoro de FLAG en %s linio %d: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG post flagoj en %s linio %d: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5358,7 +4257,6 @@ msgstr ""
 "Difino de COMPOUNDFORBIDFLAG post ano PFX povas doni neĝustajn rezultojn en "
 "%s linio %d"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5367,42 +4265,34 @@ msgstr ""
 "Difino de COMPOUNDPERMITFLAG post ano PFX povas doni neĝustajn rezultojn en "
 "%s linio %d"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "Nevalida valoro de COMPOUNDRULES en %s linio %d: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Nevalida valoro de COMPOUNDWORDMAX en %s linio %d: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "Nevalida valoro de COMPOUNDMIN en %s linio %d: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Nevalida valoro de COMPOUNDSYLMAX en %s linio %d: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "Nevalida valoro de CHECKCOMPOUNDPATTERN en %s linio %d: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr "Malsama flago de kombino en daŭra bloko de afikso en %s linio %d: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "Ripetita afikso en %s linio %d: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5411,334 +4301,268 @@ msgstr ""
 "Afikso ankaŭ uzata por BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST en "
 "%s linio %d: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "Y aŭ N atendita en %s linio %d: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "Nevalida kondiĉo en %s linio %d: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "Neatendita nombro REP(SAL) en %s linio %d"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "Neatendita nombro de MAPen %s linio %d"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "Ripetita signo en MAP en %s linio %d"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "Neagnoskita aŭ ripetita ano en %s linio %d: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "Mankas linio FOL/LOW/UPP en %s"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "COMPOUNDSYLMAX uzita sen SYLLABLE"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "Tro da prokrastitaj prefiksoj"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "Tro da kunmetitaj flagoj"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "Tro da prokrastitaj prefiksoj kaj/aŭ kunmetitaj flagoj"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "Mankas SOFO%s-aj linioj en %s"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "Ambaŭ SAL kaj SOFO linioj en %s"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "Flago ne estas nombro en %s linio %d: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "Nevalida flago en %s linio %d: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "Valoro de %s malsamas ol tiu en alia dosiero .aff"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "Legado de vortardosiero %s ..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: Ne estas nombro de vortoj en %s"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "linio %6d, vorto %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "Ripetita vorto en %s linio %d: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "Unua ripetita vorto en %s linio %d: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d ripetita(j) vorto(j) en %s"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d ignorita(j) vorto(j) kun neaskiaj signoj en %s"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "Legado de dosiero de vortoj %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "Ripetita linio /encoding= ignorita en %s linio %d: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "Linio /encoding= post vorto ignorita en %s linio %d: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "Ripetita linio /regions= ignorita en %s linio %d: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "Tro da regionoj en %s linio %d: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "Linio / ignorita en %s linio %d: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "Nevalida regiono nr en %s linio %d: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "Nekonata flago en %s linio %d: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Ignoris %d vorto(j)n kun neaskiaj signoj"
 
-#: ../spell.c:6656
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "Relegas la dosieron de literumo..."
 
 #. Go through the trie of good words, soundfold each word and add it to
 #. the soundfold trie.
-#: ../spell.c:7357
 msgid "Performing soundfolding..."
 msgstr "Fonetika analizado..."
 
-#: ../spell.c:7368
 #, c-format
 msgid "Number of words after soundfolding: %<PRId64>"
 msgstr "Nombro de vortoj post fonetika analizado: %<PRId64>"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "Totala nombro de vortoj: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "Skribado de dosiero de sugesto %s ..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Evaluo de memoro uzata: %d bajtoj"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Nomo de eliga dosiero ne devas havi nomon de regiono"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: Nur 8 regionoj subtenataj"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: Nevalida regiono en %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Averto: ambaŭ NOBREAK kaj NOBREAK specifitaj"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "Skribado de literuma dosiero %s ..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "Farita!"
 
-#: ../spell.c:8034
 #, c-format
 msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' ne havas %<PRId64> rikordojn"
 
-#: ../spell.c:8074
 #, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "Vorto fortirita el %s"
+#~ msgid "Word '%.*s' removed from %s"
+#~ msgstr "Vorto fortirita el %s"
 
-#: ../spell.c:8117
 #, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "Vorto aldonita al %s"
+#~ msgid "Word '%.*s' added to %s"
+#~ msgstr "Vorto aldonita al %s"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj"
 
-#: ../spell.c:8684
 msgid "Sorry, no suggestions"
 msgstr "Bedaŭrinde ne estas sugestoj"
 
-#: ../spell.c:8687
 #, c-format
 msgid "Sorry, only %<PRId64> suggestions"
 msgstr "Bedaŭrinde estas nur %<PRId64> sugestoj"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
-#: ../spell.c:8704
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Anstataŭigi \"%.*s\" per:"
 
-#: ../spell.c:8737
 #, c-format
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
-#: ../spell.c:8882
 msgid "E752: No previous spell replacement"
 msgstr "E752: Neniu antaŭa literuma anstataŭigo"
 
-#: ../spell.c:8925
 #, c-format
 msgid "E753: Not found: %s"
 msgstr "E753: Netrovita: %s"
 
-#: ../spell.c:9276
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
 msgstr "E778: Tio ne ŝajnas esti dosiero .sug: %s"
 
-#: ../spell.c:9282
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: Malnova dosiero .sug, bezonas ĝisdatigon: %s"
 
-#: ../spell.c:9286
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"
 msgstr "E780: Dosiero .sug estas por pli nova versio de Vim: %s"
 
-#: ../spell.c:9295
 #, c-format
 msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: Dosiero .sug ne kongruas kun dosiero .spl: %s"
 
-#: ../spell.c:9305
 #, c-format
 msgid "E782: error while reading .sug file: %s"
 msgstr "E782: eraro dum legado de dosiero .sug: %s"
 
 #. This should have been checked when generating the .spl
 #. file.
-#: ../spell.c:11575
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: ripetita signo en rikordo MAP"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "Neniu sintaksa elemento difinita por tiu bufro"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Nevalida argumento: %s"
 
-#: ../syntax.c:3299
+msgid "syntax iskeyword "
+msgstr "sintakso iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Nenia sintaksa fasko: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "sinkronigo per C-stilaj komentoj"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "neniu sinkronigo"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "sinkronigo ekas "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " linioj antaŭ supra linio"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5746,7 +4570,6 @@ msgstr ""
 "\n"
 "--- Eroj de sintaksa sinkronigo ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5754,7 +4577,6 @@ msgstr ""
 "\n"
 "sinkronigo per eroj"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5762,272 +4584,217 @@ msgstr ""
 "\n"
 "--- Sintakseroj ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Nenia sintaksa fasko: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimuma "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maksimuma "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; kongruo "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " liniavancoj"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: La argumento \"contains\" ne akcepteblas tie"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: nevalida valoro de cchar"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: La argumento \"group[t]here\" ne akcepteblas tie"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Ne trovis regionan elementon por %s"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: Dosiernomo bezonata"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: Tro da sintaksaj inkluzivoj"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Mankas ']': %s"
 
-#: ../syntax.c:4531
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: vosta signo post ']': %s]%s"
+
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: Mankas '=': %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Ne sufiĉaj argumentoj: sintaksa regiono %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: Tro da sintaksaj grupoj"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: Neniu fasko specifita"
 
 #. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Disigilo de ŝablono netrovita: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Forĵetindaĵo post ŝablono: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: sintaksa sinkronigo: ŝablono de linia daŭrigo specifita dufoje"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Nevalidaj argumentoj: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: Mankas egalsigno: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Malplena argumento: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s ne estas permesebla tie"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s devas esti la unua ano de la listo \"contains\""
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Nekonata nomo de grupo: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Nevalida \":syntax\" subkomando: %s"
 
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
+#~ msgid ""
+#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+#~ msgstr ""
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: emfaza grupo netrovita: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Tro argumentoj: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: neatendita egalsigno: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: mankas egalsigno: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: mankas argumento: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Nevalida valoro: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: Nekonata malfona koloro"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: Nekonata fona koloro"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Kolora nomo aŭ nombro nerekonita: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: kodo de terminalo estas tro longa: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Nevalida argumento: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Tro da malsamaj atributoj de emfazo uzataj"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: Nepresebla signo en nomo de grupo"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: Nevalida signo en nomo de grupo"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: Tro da emfazaj kaj sintaksaj grupoj"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ĉe subo de stako de etikedoj"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: ĉe supro de stako de etikedoj"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Ne eblas iri antaŭ la unuan kongruan etikedon"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: etikedo netrovita: %s"
 
 # DP: "pri" estas "priority"
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "nro pri tipo etikedo"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "dosiero\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: Estas nur unu kongrua etikedo"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: Ne eblas iri preter lastan kongruan etikedon"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "La dosiero \"%s\" ne ekzistas"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "etikedo %d de %d%s"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " aŭ pli"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  Uzo de etikedo kun malsama uskleco!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Dosiero \"%s\" ne ekzistas"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6035,79 +4802,62 @@ msgstr ""
 "\n"
 "nro AL etikedo     DE   linio en dosiero/teksto"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Serĉado de dosiero de etikedoj %s"
 
-#: ../tag.c:1545
 msgid "Ignoring long line in tags file"
 msgstr "Ignoro de longa linio en etikeda dosiero"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Eraro de formato en etikeda dosiero \"%s\""
 
-#: ../tag.c:1917
 #, c-format
 msgid "Before byte %<PRId64>"
 msgstr "Antaŭ bajto %<PRId64>"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Etikeda dosiero ne estas ordigita: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: Neniu etikeda dosiero"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Ne eblas trovi ŝablonon de etikedo"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: Ne eblis trovi etikedon, nur divenas!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "Ripetita kamponomo: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' nekonata. Haveblaj terminaloj estas:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "defaŭlto al '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: Ne eblas malfermi la dosieron termcap"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: Ne trovis rikordon de terminalo terminfo"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: Ne trovis rikordon de terminalo en termcap"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: Neniu rikordo \"%s\" en termcap"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: kapablo de terminalo \"cm\" bezonata"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6115,169 +4865,132 @@ msgstr ""
 "\n"
 "--- Klavoj de terminalo ---"
 
-#: ../ui.c:481
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Eraro dum legado de eniro, elironta...\n"
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 #, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Nombro de linioj ŝanĝiĝis neatendite"
+#~ msgid "E881: Line count changed unexpectedly"
+#~ msgstr "E834: Nombro de linioj ŝanĝiĝis neatendite"
 
-#: ../undo.c:627
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Ne eblas malfermi la malfaran dosieron por skribi: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: Difektita malfara dosiero (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "Ne eblis skribi malfaran dosieron en iu dosiero ajn de 'undodir'"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "Ne superskribos malfaran dosieron, ne eblis legi: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "Ne superskribos, tio ne estas malfara dosiero: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "Preterpasas skribon de malfara dosiero, nenio por malfari"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "Skribas malfaran dosieron: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: Skriberaro en malfara dosiero: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "Ne legas malfaran dosieron, posedanto malsamas: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "Legado de malfara dosiero: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: Ne eblas malfermi malfaran dosieron por legi: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Ne estas malfara dosiero: %s"
 
-#: ../undo.c:1313
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Malkongrua malfara dosiero: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "Enhavo de dosiero ŝanĝiĝis, ne eblas uzi malfarajn informojn"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "Finis legi malfaran dosieron %s"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "Jam al la plej malnova ŝanĝo"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "Jam al la plej nova ŝanĝo"
 
-#: ../undo.c:1806
 #, c-format
 msgid "E830: Undo number %<PRId64> not found"
 msgstr "E830: Malfara numero %<PRId64> netrovita"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: nevalidaj numeroj de linioj"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "plia linio"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "pliaj linioj"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "malpli linio"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "malpli linioj"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "ŝanĝo"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "ŝanĝoj"
 
-#: ../undo.c:2225
 #, c-format
 msgid "%<PRId64> %s; %s #%<PRId64>  %s"
 msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "antaŭ"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "post"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "Nenio por malfari"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
-#: ../undo.c:2360
 #, c-format
 msgid "%<PRId64> seconds ago"
 msgstr "antaŭ %<PRId64> sekundoj"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: listo de malfaro estas difekta"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: linio de malfaro mankas"
 
-#: ../version.c:600
 msgid ""
 "\n"
 "Included patches: "
@@ -6285,7 +4998,6 @@ msgstr ""
 "\n"
 "Flikaĵoj inkluzivitaj: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6293,11 +5005,9 @@ msgstr ""
 "\n"
 "Ekstraj flikaĵoj: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modifita de "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6305,11 +5015,9 @@ msgstr ""
 "\n"
 "Kompilita "
 
-#: ../version.c:649
 msgid "by "
 msgstr "de "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6317,169 +5025,130 @@ msgstr ""
 "\n"
 "Grandega versio "
 
-#: ../version.c:661
 msgid "without GUI."
 msgstr "sen grafika interfaco."
 
-#: ../version.c:662
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Ebloj inkluzivitaj (+) aŭ ne (-):\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "          sistema dosiero vimrc: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "        dosiero vimrc de uzanto: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr "    2-a dosiero vimrc de uzanto: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr "    3-a dosiero vimrc de uzanto: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "         dosiero exrc de uzanto: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "     2-a dosiero exrc de uzanto: \""
 
-#: ../version.c:699
 msgid "  fall-back for $VIM: \""
 msgstr "               defaŭlto de $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "         defaŭlto de VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "Kompilado: "
 
-#: ../version.c:712
 msgid "Linking: "
 msgstr "Ligado: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "  SENCIMIGA MUNTO"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi plibonigita"
 
-#: ../version.c:769
 msgid "version "
 msgstr "versio "
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "de Bram Moolenaar kaj aliuloj"
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim estas libera programo kaj disdoneblas libere"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "Helpu malriĉajn infanojn en Ugando!"
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "tajpu  :help iccf<Enenklavo>      por pliaj informoj   "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "tajpu  :q<Enenklavo>              por eliri            "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tajpu  :help<Enenklavo>  aŭ  <F1> por aliri la helpon  "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:781
 msgid "type  :help version7<Enter>   for version info"
 msgstr "tajpu  :help version7<Enenklavo>  por informo de versio"
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Ruliĝas en reĝimo kongrua kun Vi"
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "tajpu :set nocp<Enenklavo>        por Vim defaŭltoj    "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tajpu :help cp-default<Enenklavo> por pliaj informoj   "
 
-#: ../version.c:827
 msgid "Sponsor Vim development!"
 msgstr "Subtenu la programadon de Vim!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Iĝu registrita uzanto de Vim!"
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "tajpu  :help sponsor<Enenklavo>   por pliaj informoj   "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "tajpu  :help register<Enenklavo>  por pliaj informoj   "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menuo Helpo->Subteni/Registri     por pliaj informoj   "
 
-#: ../window.c:119
 msgid "Already only one window"
 msgstr "Jam nur unu fenestro"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: Ne estas antaŭvida fenestro"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Ne eblas dividi supralivan kaj subdekstran samtempe"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: Ne eblas rotacii kiam alia fenestro estas dividita"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: Ne eblas fermi la lastan fenestron"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: Ne eblas fermi la fenestron de aŭtokomandoj"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: Ne eblas fermi fenestron, nur la fenestro de aŭtokomandoj restus"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: La alia fenestro enhavas ŝanĝojn"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: Neniu dosiernomo sub la kursoro"
 
@@ -6650,6 +5319,12 @@ msgstr "E446: Neniu dosiernomo sub la kursoro"
 #~ msgid "E232: Cannot create BalloonEval with both message and callback"
 #~ msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
 
+msgid "Yes"
+msgstr "Jes"
+
+msgid "No"
+msgstr "Ne"
+
 # todo '_' is for hotkey, i guess?
 #~ msgid "Input _Methods"
 #~ msgstr "Enigaj _metodoj"
diff --git a/src/nvim/po/es.po b/src/nvim/po/es.po
index 8a9c86e88d..ed96e4de94 100644
--- a/src/nvim/po/es.po
+++ b/src/nvim/po/es.po
@@ -2748,11 +2748,6 @@ msgstr "E49: La longitud de desplazamiento no es válida"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4377,12 +4372,6 @@ msgstr "línea %4ld"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nombre de registro no válido: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Traducción: Proyecto vim-doc-es <http://www.assembla.com/wiki/show/vim-doc-"
-"es>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Interrupción: "
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index d4082135aa..d30faeb554 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -2691,11 +2691,6 @@ msgstr "E49: Virheellinen vierityskoko"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4275,10 +4270,6 @@ msgstr "rivi %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Virheellinen rekisterin nimi: %s"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "K��nn�ksen yll�pit�j�: Flammie Pirinen <flammie@iki.fi>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Keskeytys: "
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 41efd5c5e3..61920697d0 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran�ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-30 17:54+0200\n"
-"PO-Revision-Date: 2015-07-30 18:00+0200\n"
+"POT-Creation-Date: 2016-07-02 16:21+0200\n"
+"PO-Revision-Date: 2016-07-02 17:06+0200\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -24,106 +24,84 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO_8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../api/private/helpers.c:201
 #, fuzzy
-msgid "Unable to get option value"
-msgstr "impossible d'obtenir la valeur d'une option"
+#~ msgid "Unable to get option value"
+#~ msgstr "impossible d'obtenir la valeur d'une option"
 
-#: ../api/private/helpers.c:204
 #, fuzzy
-msgid "internal error: unknown option type"
-msgstr "erreur interne : pas d'�l�ment de liste vim"
+#~ msgid "internal error: unknown option type"
+#~ msgstr "erreur interne : pas d'�l�ment de liste vim"
 
 # DB - TODO : Trouver une traduction valable et attest�e pour "location".
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[Liste des emplacements]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Liste Quickfix]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: Des autocommandes ont caus� la terminaison de la commande"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Aucun tampon ne peut �tre allou�, Vim doit s'arr�ter"
 
 # AB - La situation est probablement plus grave que la version anglaise ne le
 #      laisse entendre (voir l'aide en ligne). La version fran�aise est plus
 #      explicite.
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr ""
 "E83: L'allocation du tampon a �chou� : arr�tez Vim, lib�rez de la m�moire"
 
-#: ../buffer.c:763
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a �t� d�charg�"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: Aucun tampon n'a �t� effac�"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Aucun tampon n'a �t� d�truit"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 tampon a �t� d�charg�"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d tampons ont �t� d�charg�s"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 tampon a �t� effac�"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d tampons ont �t� effac�s"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 tampon a �t� d�truit"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d tampons ont �t� d�truits"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Impossible de d�charger le dernier tampon"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: Aucun tampon n'est modifi�"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: Aucun tampon n'est list�"
 
 # AB - Je ne suis pas s�r que l'on puisse obtenir ce message.
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Impossible d'aller apr�s le dernier tampon"
 
 # AB - Je ne suis pas s�r que l'on puisse obtenir ce message.
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Impossible d'aller avant le premier tampon"
 
-#: ../buffer.c:945
 #, c-format
 msgid ""
 "E89: No write since last change for buffer %<PRId64> (add ! to override)"
@@ -131,77 +109,62 @@ msgstr ""
 "E89: Le tampon %<PRId64> n'a pas �t� enregistr� (ajoutez ! pour passer outre)"
 
 #. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Alerte : La liste des noms de fichier d�borde"
 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise. Ce message est similaire au message E86.
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
 msgid "E92: Buffer %<PRId64> not found"
 msgstr "E92: Le tampon %<PRId64> n'existe pas"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: Plusieurs tampons correspondent � %s"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: Aucun tampon ne correspond � %s"
 
-#: ../buffer.c:2161
 #, c-format
 msgid "line %<PRId64>"
 msgstr "ligne %<PRId64>"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Un tampon porte d�j� ce nom"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr "[Modifi�]"
 
 # AB - "[In�dit�]" est plus correct, mais sonne faux.
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[Non �dit�]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[Nouveau fichier]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[Erreurs de lecture]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[RO]"
 
 # AB - La version courte, "[RO]", devrait-elle �tre traduite par "[LS]" ?
 #      Il faudrait faire un sondage aupr�s des utilisateurs francophones.
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[lecture-seule]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 ligne --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
 msgid "%<PRId64> lines --%d%%--"
 msgstr "%<PRId64> lignes --%d%%--"
 
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB - Mon avis : oui.
-#: ../buffer.c:2530
 #, c-format
 msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
 msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col "
@@ -209,16 +172,13 @@ msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col "
 # DB - Je trouvais [Aucun fichier] (VO : [No file]) plus naturel
 #      lors du lancement de Vim en mode graphique (ce message
 #      appara�t notamment dans le titre de la fen�tre).
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[Aucun nom]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "aide"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[Aide]"
 
@@ -226,24 +186,19 @@ msgstr "[Aide]"
 #      traduction litt�rale et br�ve, mais qui risque fort d'�tre mal comprise.
 #      J'ai finalement choisi d'utiliser une abr�viation, mais cela ne me
 #      satisfait pas.
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[Pr�visu]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "Tout"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "Bas"
 
 # AB - Attention, on passe de trois � quatre lettres.
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "Haut"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -251,11 +206,9 @@ msgstr ""
 "\n"
 "# Liste des tampons :\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[Brouillon]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -263,29 +216,23 @@ msgstr ""
 "\n"
 "--- Symboles ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "Symboles dans %s :"
 
-#: ../buffer.c:4543
 #, c-format
 msgid "    line=%<PRId64>  id=%d  name=%s"
 msgstr "    ligne=%<PRId64>  id=%d  nom=%s"
 
-#: ../cursor_shape.c:68
 msgid "E545: Missing colon"
 msgstr "E545: ':' manquant"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
 msgid "E546: Illegal mode"
 msgstr "E546: Mode non autoris�"
 
-#: ../cursor_shape.c:134
 msgid "E548: digit expected"
 msgstr "E548: chiffre attendu"
 
-#: ../cursor_shape.c:138
 msgid "E549: Illegal percentage"
 msgstr "E549: Pourcentage non autoris�"
 
@@ -293,145 +240,115 @@ msgstr "E549: Pourcentage non autoris�"
 #      Vim fait en pratique appel au programme "diff" pour evaluer les
 #      diff�rences entre fichiers, "to diff" a �t� traduit par "utiliser diff"
 #      et d'autres expressions appropri�es.
-#: ../diff.c:146
 #, c-format
 msgid "E96: Can not diff more than %<PRId64> buffers"
 msgstr "E96: Impossible d'utiliser diff sur plus de %<PRId64> tampons"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Impossible de lire ou �crire des fichiers temporaires"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: diff ne fonctionne pas"
 
-#: ../diff.c:966
 msgid "E816: Cannot read patch output"
 msgstr "E816: Le fichier interm�diaire produit par patch n'a pu �tre lu"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: Le fichier interm�diaire produit par diff n'a pu �tre lu"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Le tampon courant n'est pas en mode diff"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: Aucun autre tampon en mode diff n'est modifiable"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Aucun autre tampon n'est en mode diff"
 
 # AB - La version fran�aise est meilleure que la version anglaise, mais elle
 #      peut �tre am�lior�e.
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr "E101: Plus de deux tampons sont en mode diff, soyez plus pr�cis"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Le tampon %s est introuvable"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Le tampon %s n'est pas en mode diff"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Le tampon a �t� modifi� inopin�ment"
 
 # AB - Je cherche une traduction plus concise pour "escape".
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: Un digraphe ne peut contenir le caract�re d'�chappement"
 
 # AB - La version fran�aise est trop verbeuse.
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: Le fichier descripteur de clavier est introuvable"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :loadkeymap ne peut �tre utilis� que dans un script Vim"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: Entr�e du descripteur de clavier (keymap) vide"
 
 # AB - Remplacer "compl�tion" par "compl�tement" ? Voir l'�thymologie
 #      d'"accr�tion".
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " Compl�tement de mot-cl� (^N^P)"
 
 # DB - todo : Faut-il une majuscule � "mode" ?
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " mode ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " Compl�tement de ligne enti�re (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " Compl�tement de nom de fichier (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " Compl�tement de marqueur (^]^N^P)"
 
 # AB - J'ai d� avoir une bonne raison de faire une version fran�aise aussi
 #      diff�rente de la version anglaise. Il me faut la retrouver.
 # DB - TODO
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " Compl�tement global de mot-cl� (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " Compl�tement de d�finition (^D^N^P)"
 
 # AB - Trouver une meilleure formulation que "selon le".
 # DB : proposition : "avec"
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " Compl�tement avec le dictionnaire (^K^N^P)"
 
 # AB - Trouver une meilleure formulation que "selon le".
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " Compl�tement avec le th�saurus (^T^N^P)"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
 # DB : Suggestion.
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " Compl�tement de ligne de commande (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " Compl�tement d�fini par l'utilisateur (^U^N^P)"
 
 # DB : On doit pouvoir trouver nettement mieux que �a.
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " Compl�tement selon le type de fichier (Omni) (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Suggestion d'orthographe (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " Compl�tement local de mot-cl� (^N/^P)"
 
@@ -439,45 +356,35 @@ msgstr " Compl�tement local de mot-cl� (^N/^P)"
 #      Il faut �viter de le faire trop long. Je pense que la version fran�aise
 #      est suffisamment compr�hensible dans le contexte dans lequel elle est
 #      affich�e.
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "Fin du paragraphe"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: La fonction de compl�tement a chang� la fen�tre"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: La fonction de compl�tement a effac� du texte"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "L'option 'dictionary' est vide"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "L'option 'thesaurus' est vide"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Examen du dictionnaire : %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (insertion) D�filement (^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (remplacement) D�filement (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "Examen : %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "Examen des marqueurs."
 
@@ -485,7 +392,6 @@ msgstr "Examen des marqueurs."
 #      op�ration de compl�tion est r�p�t�e (typiquement avec CTRL-X CTRL-N).
 #      Que ce soit en anglais ou en fran�ais, il y a un probl�me de majuscules.
 #      Bien qu'insatisfaisante, cette traduction semble optimale.
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " Ajout"
 
@@ -493,236 +399,189 @@ msgstr " Ajout"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- Recherche en cours..."
 
 # AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
 # AB - Faut-il utiliser "origine" ou "originel" au lieu d'"original" ?
 # DB : Suggestion.
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "Retour au point de d�part"
 
 # AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "Mot d'une autre ligne"
 
 # AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "La seule correspondance"
 
 # AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB : Pour moi, non.
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "Correspondance %d sur %d"
 
 # AB - Ce texte s'ajoute � la fin d'un des messages de compl�tion ci-dessus.
 # DB - todo : la VO n'a pas de majuscule.
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "Correspondance %d"
 
-#: ../eval.c:137
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caract�res inattendus avant '='"
 
-#: ../eval.c:138
 #, c-format
 msgid "E684: list index out of range: %<PRId64>"
 msgstr "E684: index de Liste hors limites : %<PRId64> au-del� de la fin"
 
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Variable non d�finie : %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ']' manquant"
 
-#: ../eval.c:141
 #, c-format
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: L'argument de %s doit �tre une Liste"
 
-#: ../eval.c:143
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: L'argument de %s doit �tre une Liste ou un Dictionnaire"
 
-#: ../eval.c:144
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
 
-#: ../eval.c:145
 msgid "E714: List required"
 msgstr "E714: Liste requise"
 
-#: ../eval.c:146
 msgid "E715: Dictionary required"
 msgstr "E715: Dictionnaire requis"
 
+msgid "E928: String required"
+msgstr "E928: Chaine requis"
+
 # DB : Suggestion
-#: ../eval.c:147
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: La fonction %s a re�u trop d'arguments"
 
-#: ../eval.c:148
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
 msgstr "E716: La cl� %s n'existe pas dans le Dictionnaire"
 
-#: ../eval.c:150
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
 
-#: ../eval.c:151
 msgid "E717: Dictionary entry already exists"
 msgstr "E717: Une entr�e du Dictionnaire porte d�j� ce nom"
 
-#: ../eval.c:152
 msgid "E718: Funcref required"
 msgstr "E718: R�f�rence de fonction (Funcref) requise"
 
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Type de variable erron� avec %s="
 
-#: ../eval.c:155
 #, c-format
 msgid "E130: Unknown function: %s"
 msgstr "E130: Fonction inconnue : %s"
 
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nom de variable invalide : %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: Utilisation d'un Flottant comme une Cha�ne"
 
 # DB - todo : trouver mieux que "destinations".
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: Moins de destinations que d'�l�ments dans la Liste"
 
 # DB - todo : trouver mieux que "destinations".
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: Plus de destinations que d'�l�ments dans la Liste"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "Double ; dans une liste de variables"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Impossible de lister les variables de %s"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Seul une Liste ou un Dictionnaire peut �tre index�"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] ne peut �tre sp�cifi� qu'en dernier"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
-msgstr "E709: [:] requiert une Liste"
+msgstr "E709: [:] n?cessite une Liste"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: La Liste a plus d'�l�ments que la destination"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: La Liste n'a pas assez d'�l�ments"
 
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" manquant apr�s :for"
 
-#: ../eval.c:3063
 #, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Parenth�ses manquantes : %s"
 
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variable inexistante : %s"
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: variable trop imbriqu�e pour la (d�)verrouiller"
 
 # AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
 #      la lourdeur d'une traduction plus correcte.
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Il manque ':' apr�s '?'"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: Une Liste ne peut �tre compar�e qu'avec une Liste"
 
-#: ../eval.c:3895
 msgid "E692: Invalid operation for Lists"
 msgstr "E692: Op�ration invalide avec les Listes"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Un Dictionnaire ne peut �tre compar� qu'avec un Dictionnaire"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Op�ration invalide avec les Dictionnaires"
 
 # DB - todo : Traduction valable (et courte) pour Funcref ?
-#: ../eval.c:3932
 msgid "E693: Can only compare Funcref with Funcref"
 msgstr "E693: Une Funcref ne peut �tre compar�e qu'� une Funcref"
 
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Op�ration invalide avec les Funcrefs"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Impossible d'utiliser '%' avec un Flottant"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' manquant"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Impossible d'indexer une Funcref"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../eval.c:4839
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Il manque un nom d'option apr�s %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Option inconnue : %s"
@@ -730,270 +589,215 @@ msgstr "E113: Option inconnue : %s"
 # AB - La version fran�aise est meilleure que la version anglaise, qui est
 #      erron�e, d'ailleurs : il s'agit d'une "double quote" et non d'une
 #      "quote".
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Il manque \" � la fin de %s"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Il manque ' � la fin de %s"
 
-#: ../eval.c:5084
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
 
-#: ../eval.c:5091
 #, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Il manque ']' � la fin de la Liste %s"
 
-#: ../eval.c:5750
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "Pas assez de m�moire pour les r�f�rences, arr�t du ramassage de mi�tes !"
 
-#: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Il manque ':' dans le Dictionnaire %s"
 
-#: ../eval.c:6499
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Cl� \"%s\" dupliqu�e dans le Dictionnaire"
 
-#: ../eval.c:6517
 #, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Il manque une virgule dans le Dictionnaire %s"
 
-#: ../eval.c:6524
 #, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Il manque '}' � la fin du Dictionnaire %s"
 
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variable trop imbriqu�e pour �tre affich�e"
 
-#: ../eval.c:7188
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Trop d'arguments pour la fonction %s"
 
-#: ../eval.c:7190
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: Arguments invalides pour la fonction %s"
 
-#: ../eval.c:7377
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Fonction inconnue : %s"
 
-#: ../eval.c:7383
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: La fonction %s n'a pas re�u assez d'arguments"
 
-#: ../eval.c:7387
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> utilis� en dehors d'un script : %s"
 
-#: ../eval.c:7391
 #, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Appel d'une fonction � dict � sans Dictionnaire : %s"
 
-#: ../eval.c:7453
 msgid "E808: Number or Float required"
 msgstr "E808: Nombre ou Flottant requis"
 
-#: ../eval.c:7503
 msgid "add() argument"
 msgstr "argument de add()"
 
-#: ../eval.c:7907
 msgid "E699: Too many arguments"
 msgstr "E699: Trop d'arguments"
 
-#: ../eval.c:8073
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
 
 # AB - Texte par d�faut du bouton de la bo�te de dialogue affich�e par la
 #      fonction confirm().
-#: ../eval.c:8156
 msgid "&Ok"
 msgstr "&Ok"
 
-#: ../eval.c:8692
 msgid "extend() argument"
 msgstr "argument de extend()"
 
-#: ../eval.c:9345
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: un mappage existe d�j� pour %s"
 
-#: ../eval.c:8915
 msgid "map() argument"
 msgstr "argument de map()"
 
-#: ../eval.c:8916
 msgid "filter() argument"
 msgstr "argument de filter()"
 
-#: ../eval.c:9229
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld lignes : "
 
-#: ../eval.c:9291
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Fonction inconnue : %s"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../eval.c:10729
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() a �t� appel� plus de fois qu'inputsave()"
 
-#: ../eval.c:10771
 msgid "insert() argument"
 msgstr "argument de insert()"
 
-#: ../eval.c:10841
 msgid "E786: Range not allowed"
 msgstr "E786: Les plages ne sont pas autoris�es"
 
-#: ../eval.c:11140
 msgid "E701: Invalid type for len()"
 msgstr "E701: Type invalide avec len()"
 
-#: ../eval.c:11980
 msgid "E726: Stride is zero"
 msgstr "E726: Le pas est nul"
 
-#: ../eval.c:11982
 msgid "E727: Start past end"
 msgstr "E727: D�but au-del� de la fin"
 
-#: ../eval.c:12024 ../eval.c:15297
 msgid "<empty>"
 msgstr "<vide>"
 
-#: ../eval.c:12282
 msgid "remove() argument"
 msgstr "argument de remove()"
 
-#: ../eval.c:12466
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Trop de liens symboliques (cycle ?)"
 
-#: ../eval.c:12593
 msgid "reverse() argument"
 msgstr "argument de reverse()"
 
-#: ../eval.c:13721
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Action invalide : � %s �"
+
 msgid "sort() argument"
 msgstr "argument de sort()"
 
-#: ../eval.c:13721
 #, fuzzy
-msgid "uniq() argument"
-msgstr "argument de add()"
+#~ msgid "uniq() argument"
+#~ msgstr "argument de add()"
 
-#: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: La fonction de comparaison de sort() a �chou�"
 
-#: ../eval.c:13806
 #, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: La fonction de comparaison de sort() a �chou�"
+#~ msgid "E882: Uniq compare function failed"
+#~ msgstr "E702: La fonction de comparaison de sort() a �chou�"
 
-#: ../eval.c:14085
 msgid "(Invalid)"
 msgstr "(Invalide)"
 
-#: ../eval.c:14590
 msgid "E677: Error writing temp file"
 msgstr "E677: Erreur lors de l'�criture du fichier temporaire"
 
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Utilisation d'un Flottant comme un Nombre"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: Utilisation d'une Funcref comme un Nombre"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: Utilisation d'une Liste comme un Nombre"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
 
-#: ../eval.c:16259
 msgid "E729: using Funcref as a String"
 msgstr "E729: Utilisation d'une Funcref comme une Cha�ne"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: Utilisation d'une Liste comme une Cha�ne"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Utilisation d'un Dictionnaire comme une Cha�ne"
 
 # DB : On doit pouvoir trouver nettement mieux que �a.
-#: ../eval.c:16619
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
 msgstr "E706: Type de variable incoh�rent pour %s"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Impossible de supprimer la variable %s"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Le nom d'une variable entre en conflit avec la fonction %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: La valeur de %s est verrouill�e"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Impossible de modifier la valeur de %s"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: variable trop imbriqu�e pour en faire une copie"
 
-#: ../eval.c:17249
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Fonction non d�finie : %s"
@@ -1001,112 +805,92 @@ msgstr "E123: Fonction non d�finie : %s"
 # AB - La version fran�aise est plus consistante que la version anglaise.
 # AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
 #      la lourdeur d'une traduction plus correcte.
-#: ../eval.c:17260
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: Il manque '(' apr�s %s"
 
-#: ../eval.c:17293
 msgid "E862: Cannot use g: here"
 msgstr "E862: Impossible d'utiliser g: ici"
 
-#: ../eval.c:17312
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Argument invalide : %s"
 
-#: ../eval.c:17323
 #, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Nom d'argument dupliqu� : %s"
 
-#: ../eval.c:17416
 msgid "E126: Missing :endfunction"
 msgstr "E126: Il manque :endfunction"
 
-#: ../eval.c:17537
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
 
-#: ../eval.c:17549
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Impossible de red�finir fonction %s : d�j� utilis�e"
 
 # DB - Le contenu du "c-format" est le nom de la fonction.
-#: ../eval.c:17604
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script"
 
-#: ../eval.c:17716
 msgid "E129: Function name required"
 msgstr "E129: Nom de fonction requis"
 
-#: ../eval.c:17824
 #, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
+#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
+#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
 
-#: ../eval.c:17833
 #, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
+#~ msgid "E884: Function name cannot contain a colon: %s"
+#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
 
 # AB - Il est difficile de cr�er une version fran�aise qui fasse moins de 80
 #      caract�res de long, nom de la fonction compris : "It is in use" est une
 #      expression tr�s dense. Traductions possibles : "elle est utilis�e",
 #      "elle s'ex�cute" ou "elle est occup�e".
-#: ../eval.c:18336
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Impossible d'effacer %s : cette fonction est utilis�e"
 
 # AB - V�rifier dans la litt�rature technique s'il n'existe pas une meilleure
 #      traduction pour "function call depth".
-#: ../eval.c:18441
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr ""
 "E132: La profondeur d'appel de fonction est sup�rieure � 'maxfuncdepth'"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
-#: ../eval.c:18568
 #, c-format
 msgid "calling %s"
 msgstr "appel de %s"
 
 # AB - V�rifier.
-#: ../eval.c:18651
 #, c-format
 msgid "%s aborted"
 msgstr "%s annul�e"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
-#: ../eval.c:18653
 #, c-format
 msgid "%s returning #%<PRId64>"
 msgstr "%s a retourn� #%<PRId64>"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
-#: ../eval.c:18670
 #, c-format
 msgid "%s returning %s"
 msgstr "%s a retourn� \"%s\""
 
 # AB - Ce texte fait partie d'un message de d�bogage.
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
 msgid "continuing in %s"
 msgstr "de retour dans %s"
 
-#: ../eval.c:18795
 msgid "E133: :return not inside a function"
 msgstr "E133: :return en dehors d'une fonction"
 
 # AB - La version fran�aise est capitalis�e pour �tre en accord avec les autres
 #      commentaires enregistr�s dans le fichier viminfo.
-#: ../eval.c:19159
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1115,7 +899,6 @@ msgstr ""
 "# Variables globales:\n"
 
 # DB - Plus pr�cis ("la derni�re fois") ?
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
@@ -1123,41 +906,33 @@ msgstr ""
 "\n"
 "\tModifi� la derni�re fois dans "
 
-#: ../eval.c:19272
 msgid "No old files"
 msgstr "Aucun vieux fichier"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Hexa %02x,  Octal %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, Hexa %04x, Octal %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Hexa %08x, Octal %o"
 
 # AB - La version anglaise est tr�s mauvaise, ce qui m'oblige a inventer une
 #      version fran�aise.
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: La destination est dans la plage d'origine"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 ligne d�plac�e"
 
-#: ../ex_cmds.c:749
 #, c-format
 msgid "%<PRId64> lines moved"
 msgstr "%<PRId64> lignes d�plac�es"
 
-#: ../ex_cmds.c:1175
 #, c-format
 msgid "%<PRId64> lines filtered"
 msgstr "%<PRId64> lignes filtr�es"
@@ -1167,27 +942,23 @@ msgstr "%<PRId64> lignes filtr�es"
 #      au filtrage (FilterReadPre, FilterReadPost, FilterWritePre et
 #      FilterWritePost) que "*Filter*" que l'on confond avec une tentative de
 #      mise en valeur.
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr ""
 "E135: Les autocommandes Filter* ne doivent pas changer le tampon courant"
 
 # AB - Il faut respecter l'esprit plus que la lettre. Dans le cas pr�sent,
 #      nettement plus.
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[Attention : tout n'est pas enregistr�]\n"
 
 # AB - Le num�ro et le message d'erreur (%s ci-dessous) et le "num�ro" de ligne
 #      sont des cha�nes de caract�res dont le contenu est � la discr�tion de
 #      l'appelant de la fonction viminfo_error().
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo : %s � la ligne "
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr ""
 "E136: Il y a trop d'erreurs ; interruption de la lecture du fichier viminfo"
@@ -1195,30 +966,25 @@ msgstr ""
 # AB - Ce texte fait partie d'un message de d�bogage.
 # DB - ... dont les valeurs possibles sont les messages
 #      qui suivent.
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Lecture du fichier viminfo \"%s\"%s%s%s"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
 # DB - Voir ci-dessus.
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " info"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
 # DB - Voir ci-dessus.
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " marques"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " vieux fichiers"
 
 # AB - Ce texte fait partie d'un message de d�bogage.
 # DB - Voir ci-dessus.
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " �CHEC"
 
@@ -1227,7 +993,6 @@ msgstr " �CHEC"
 # AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
 #      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: L'�criture dans le fichier %s est interdite"
@@ -1235,25 +1000,21 @@ msgstr "E137: L'�criture dans le fichier %s est interdite"
 # AB - Le point d'exclamation est superflu.
 # AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
 #      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
-#: ../ex_cmds.c:1626
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Impossible d'�crire le fichier %s"
 
 # AB - Ce texte est un message de d�bogage.
-#: ../ex_cmds.c:1635
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "�criture du fichier viminfo \"%s\""
 
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Ce fichier viminfo a �t� g�n�r� par Vim %s.\n"
 
 # AB - Les deux versions, bien que diff�rentes, se valent.
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1261,58 +1022,48 @@ msgstr ""
 "# Vous pouvez l'�diter, mais soyez prudent.\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# 'encoding' dans lequel ce fichier a �t� �crit\n"
 
 # AB - Ce texte est pass� en argument � la fonction viminfo_error().
 # AB - "ill�gal" est un terme trop fort � mon go�t.
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "Caract�re initial non valide"
 
 # AB - Ceci est un contenu de bo�te de dialogue (�ventuellement en mode texte).
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../ex_cmds.c:2162
 msgid "Write partial file?"
 msgstr "Perdre une partie du fichier ?"
 
 # AB - La version fran�aise est nettement meilleure que la version anglaise.
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr ""
 "E140: Une partie du fichier serait perdue (ajoutez ! pour passer outre)"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "�craser le fichier %s existant ?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Le fichier d'�change \"%s\" existe d�j�, l'�craser ?"
 
 # DB - Un peu long � mon avis.
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Le fichier d'�change %s existe d�j� (:silent! pour passer outre)"
 
-#: ../ex_cmds.c:2381
 #, c-format
 msgid "E141: No file name for buffer %<PRId64>"
 msgstr "E141: Pas de nom de fichier pour le tampon %<PRId64>"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
 "E142: L'option 'nowrite' est activ�e et emp�che toute �criture du fichier"
 
 # AB - Ceci est un contenu de bo�te de dialogue (�ventuellement en mode texte).
 # AB - "activ�e pour" n'est pas une formulation tr�s heureuse.
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1321,7 +1072,6 @@ msgstr ""
 "L'option 'readonly' est activ�e pour \"%s\".\n"
 "Voulez-vous tout de m�me enregistrer ?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1332,7 +1082,6 @@ msgstr ""
 "Il peut �tre possible de l'�crire tout de m�me.\n"
 "Tenter ?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)"
@@ -1342,84 +1091,68 @@ msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)"
 #      devrait n'�tre affich� qu'apr�s une tentative d'ouverture de fichier,
 #      la version actuelle devrait donc suffire.
 # DB - Suggestion : "nouveau tampon" ?
-#: ../ex_cmds.c:3120
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Une autocommande a effac� le nouveau tampon %s"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: L'argument de :z n'est pas num�rique"
 
 # AB - La version fran�aise fera peut-�tre mieux passer l'am�re pilule.
 #      La consultation de l'aide donnera l'explication compl�te � ceux qui
 #      ne comprendraient pas � quoi ce message est d�.
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: Les commandes externes sont indisponibles dans rvim"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr ""
 "E146: Les expressions r�guli�res ne peuvent pas �tre d�limit�es par des "
 "lettres"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "remplacer par %s (y/n/a/q/l/^E/^Y)?"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(Interrompu) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 correspondance"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 substitution"
 
-#: ../ex_cmds.c:4387
 #, c-format
 msgid "%<PRId64> matches"
 msgstr "%<PRId64> correspondances"
 
-#: ../ex_cmds.c:4388
 #, c-format
 msgid "%<PRId64> substitutions"
 msgstr "%<PRId64> substitutions"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " sur 1 ligne"
 
-#: ../ex_cmds.c:4395
 #, c-format
 msgid " on %<PRId64> lines"
 msgstr " sur %<PRId64> lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ne peut pas ex�cuter :global"
 
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: :global doit �tre suivi par une expression r�guli�re"
 
 # AB - Ce message est utilis� lorsque :vglobal ne trouve rien. Lorsque :global
 #      ne trouve rien, c'est "Pattern not found: %s" / "Motif introuvable: %s"
 #      qui est utilis�.
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Motif trouv� dans toutes les lignes : %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "Motif introuvable: %s"
@@ -1430,7 +1163,6 @@ msgstr "Motif introuvable: %s"
 #      � internationalisation. J'attends que les deux autres messages soient
 #      traduisibles pour traduire celui-ci.
 # DB - TODO : Qu'en est-il � pr�sent ?
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1441,43 +1173,35 @@ msgstr ""
 "$"
 
 # This message should *so* be E42!
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: Pas de panique !"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: D�sol�, aucune aide en langue '%s' pour %s"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: D�sol�, aucune aide pour %s"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "D�sol�, le fichier d'aide \"%s\" est introuvable"
 
-#: ../ex_cmds.c:5323
 #, c-format
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s n'est pas un r�pertoire"
 
 # AB - La version anglaise est plus pr�cise, mais trop technique.
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Impossible d'�crire %s"
 
 # AB - La version anglaise est plus pr�cise, mais trop technique.
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Impossible de lire %s"
 
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Encodages diff�rents dans les fichiers d'aide en langue %s"
@@ -1487,315 +1211,250 @@ msgstr "E670: Encodages diff�rents dans les fichiers d'aide en langue %s"
 #      traduction de 40 caract�res ou moins. Ce qui est loin d'�tre le cas
 #      pr�sent.
 # DB - Suggestion.
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Marqueur \"%s\" dupliqu� dans le fichier %s/%s"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
-#: ../ex_cmds.c:5687
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Commande inconnue : :sign %s"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: Il manque le nom du symbole"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: Trop de symboles sont d�finis"
 
 # AB - Cette traduction ne me satisfait pas.
 # DB - Suggestion.
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Le texte du symbole est invalide : %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Symbole inconnu : %s"
 
 # AB - La version fran�aise est meilleure que la version anglaise.
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: Il manque l'ID du symbole"
 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise. Ce message est similaire au message E102.
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Le tampon %s est introuvable"
 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise.
-#: ../ex_cmds.c:6008
 #, c-format
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: Le symbole %<PRId64> est introuvable"
 
-#: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (non support�)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[Effac�]"
 
 # AB - La version fran�aise de la premi�re phrase ne me satisfait pas.
 # DB - Suggestion.
-#: ../ex_cmds2.c:139
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Mode d�bogage activ�. Tapez \"cont\" pour continuer."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
 msgid "line %<PRId64>: %s"
 msgstr "ligne %<PRId64> : %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "cmde : %s"
 
-#: ../ex_cmds2.c:322
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
 msgstr "Point d'arr�t dans %s%s ligne %<PRId64>"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Le point d'arr�t %s est introuvable"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "Aucun point d'arr�t n'est d�fini"
 
 # AB - Le deuxi�me %s est remplac� par "func" ou "file" sans que l'on puisse
 #      traduire ces mots.
-#: ../ex_cmds2.c:617
 #, c-format
 msgid "%3d  %s %s  line %<PRId64>"
 msgstr "%3d  %s %s  ligne %<PRId64>"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
 
 # AB - "changes to" est redondant et a �t� omis de la version fran�aise.
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Enregistrer \"%s\" ?"
 
 # AB - Si les parenth�ses posent probl�me, il faudra remettre les guillemets
 #      ci-dessus.
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "(sans titre)"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message est similaire au message E89.
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Le tampon %s n'a pas �t� enregistr�"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Alerte : Entr�e inattendue dans un autre tampon (v�rifier autocmdes)"
+msgstr "Alerte : Entr�e inattendue dans un autre tampon (v�rifier autocommandes)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: Il n'y a qu'un seul fichier � �diter"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: Impossible d'aller avant le premier fichier"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Impossible d'aller au-del� du dernier fichier"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: Compilateur %s non support�"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Recherche de \"%s\" dans \"%s\""
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "Recherche de \"%s\""
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "introuvable dans 'runtimepath' : \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "introuvable dans '%s' : \"%s\""
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Impossible de sourcer un r�pertoire : \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "impossible de sourcer \"%s\""
 
-#: ../ex_cmds2.c:2520
 #, c-format
 msgid "line %<PRId64>: could not source \"%s\""
 msgstr "ligne %<PRId64> : impossible de sourcer \"%s\""
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "sourcement \"%s\""
 
-#: ../ex_cmds2.c:2537
 #, c-format
 msgid "line %<PRId64>: sourcing \"%s\""
 msgstr "ligne %<PRId64> : sourcement de \"%s\""
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "fin du sourcement de %s"
 
-#: ../ex_cmds2.c:2765
 msgid "modeline"
 msgstr "ligne de mode"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "argument --cmd"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "argument -c"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "variable d'environnement"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "gestionnaire d'erreur"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: Alerte : S�parateur de ligne erron�, ^M possiblement manquant"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding utilis� en dehors d'un fichier sourc�"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish utilis� en dehors d'un fichier sourc�"
 
 # DB - Le premier %s est, au choix : "time ", "ctype " ou "messages ",
 #      sans qu'il soit possible de les traduire.
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Langue courante pour %s : \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Impossible de choisir la langue \"%s\""
 
 #. don't redisplay the window
 #. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Mode Ex activ�. Tapez \"visual\" pour passer en mode Normal."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: � la fin du fichier"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: Commande trop r�cursive"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Exception non intercept�e : %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "Fin du fichier sourc�"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "Fin de la fonction"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: Utilisation ambigu� d'une commande d�finie par l'utilisateur"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: Commande inconnue"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: La plage sp�cifi�e est invers�e"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "La plage sp�cifi�e est invers�e, OK pour l'inverser"
 
 #. append
 #. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"
 
-#: ../ex_docmd.c:3454
 msgid "E319: The command is not available in this version"
 msgstr "E319: D�sol�, cette commande n'est pas disponible dans cette version"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: Un seul nom de fichier autoris�"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "Encore 1 fichier � �diter. Quitter tout de m�me ?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "Encore %d fichiers � �diter. Quitter tout de m�me ?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: encore 1 fichier � �diter"
 
-#: ../ex_docmd.c:4250
 #, c-format
 msgid "E173: %<PRId64> more files to edit"
 msgstr "E173: encore %<PRId64> fichiers � �diter"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La commande existe d�j� : ajoutez ! pour la red�finir"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1803,356 +1462,277 @@ msgstr ""
 "\n"
 "    Nom         Args       Adresse   Complet.  D�finition"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "Aucune commande d�finie par l'utilisateur trouv�e"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: Pas d'attribut sp�cifi�"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: Nombre d'arguments invalide"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: Le quantificateur ne peut �tre sp�cifi� deux fois"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: La valeur par d�faut du quantificateur est invalide"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: argument requis avec -complete"
 
-#: ../ex_docmd.c:4933
 msgid "E179: argument required for -addr"
 msgstr "E179: argument requis avec -addr"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Attribut invalide : %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: Nom de commande invalide"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: Les commandes utilisateur doivent commencer par une majuscule"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr ""
 "E841: Nom r�serv�, ne peux pas �tre utilis� pour une commande utilisateur"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Aucune commande %s d�finie par l'utilisateur"
 
-#: ../ex_docmd.c:5516
 #, c-format
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: Valeur de type d'adresse invalide : %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Valeur invalide pour \"-complete=\" : %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Seul le compl�tement personnalis� accepte un argument"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Le compl�tement personnalis� requiert une fonction en argument"
 
-#: ../ex_docmd.c:5257
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Impossible de trouver le jeu de couleurs '%s'"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Bienvenue, utilisateur de Vim !"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: Impossible de fermer le dernier onglet"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "Il ne reste d�j� plus qu'un seul onglet"
 
-#: ../ex_docmd.c:6004
 #, c-format
 msgid "Tab page %d"
 msgstr "Onglet %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "Pas de fichier d'�change"
 
-#: ../ex_docmd.c:6478
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Tampon modifi� : impossible de changer de r�pertoire (ajoutez ! pour "
 "passer outre)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: Pas de r�pertoire pr�c�dent"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: Inconnu"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize requiert deux arguments num�riques"
 
 # DB : Suggestion, sans doute perfectible.
-#: ../ex_docmd.c:6655
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: R�cup�rer la position de la fen�tre non impl�ment� dans cette version"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos requiert deux arguments num�riques"
 
-#: ../ex_docmd.c:7241
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Impossible de cr�er le r�pertoire \"%s\""
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" existe (ajoutez ! pour passer outre)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Impossible d'ouvrir \"%s\" pour y �crire"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: L'argument doit �tre une lettre ou une (contre-)apostrophe"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Appel r�cursif de :normal trop important"
 
-#: ../ex_docmd.c:7807
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Aucun nom de fichier alternatif � substituer � '#'"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: Aucun nom de ficher d'autocommande � substituer � \"<afile>\""
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: Aucun num�ro de tampon d'autocommande � substituer � \"<abuf>\""
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: Aucune correspondance d'autocommande � substituer � \"<amatch>\""
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: Aucun nom de fichier :source � substituer � \"<sfile>\""
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: aucun num�ro de ligne � utiliser pour \"<slnum>\""
 
-#: ../ex_docmd.c:7903
 #, c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Nom de fichier vide pour '%' ou '#', ne marche qu'avec \":p:h\""
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: �valu� en une cha�ne vide"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Impossible d'ouvrir le viminfo en lecture"
 
-#: ../ex_eval.c:464
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Impossible d'�mettre des exceptions avec 'Vim' comme pr�fixe"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Exception �mise : %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "Exception termin�e : %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "Exception �limin�e : %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
 msgid "%s, line %<PRId64>"
 msgstr "%s, ligne %<PRId64>"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Exception intercept�e : %s"
 
 # DB - Le c-format est f�minin, singulier ou pluriel (cf. 3 messages plus bas).
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s mise(s) en attente"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s r�-�mise(s)"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s �limin�e(s)"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "Exception"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "Erreur et interruption"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "Erreur"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "Interruption"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: Imbrication de :if trop importante"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :endif sans :if"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :else sans :if"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif sans :if"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: Il ne peut y avoir qu'un seul :else"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :elseif apr�s :else"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: Imbrication de :while ou :for trop importante"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :continue sans :while ou :for"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :break sans :while ou :for"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: Utilisation de :endfor avec :while"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Utilisation de :endwhile avec :for"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: Imbrication de :try trop importante"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :catch sans :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch apr�s :finally"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :finally sans :try"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: Il ne peut y avoir qu'un seul :finally"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :endtry sans :try"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction en dehors d'une fonction"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: L'�dition d'un autre tampon n'est plus permise"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr ""
 "E811: Changement des informations du tampon n'est pas permise maintenant"
 
 # DB - TODO : Pas compris le message ni comment le d�clencher malgr� une visite
 #      dans le code.
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "nom du marqueur"
 
 # DB - TODO : Idem pr�c�dent.
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " type de fichier\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "l'option 'history' vaut z�ro"
 
 # DB - Messages et les suivants : fichier .viminfo.
 #      Pas de majuscule n�cessaire pour les messages d'apr�s.
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -2161,35 +1741,30 @@ msgstr ""
 "\n"
 "# Historique %s (chronologie d�croissante) :\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "ligne de commande"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "cha�ne de recherche"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "expression"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "ligne de saisie"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "Ligne de d�bogage"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar au-del� de la longueur de la commande"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Fen�tre ou tampon actif effac�"
 
-#: ../file_search.c:203
 msgid "E854: path too long for completion"
 msgstr "E854: chemin trop long pour compl�tement"
 
-#: ../file_search.c:446
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -2198,216 +1773,168 @@ msgstr ""
 "E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
 "suivi de '%s'."
 
-#: ../file_search.c:1505
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
 
-#: ../file_search.c:1508
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
 
-#: ../file_search.c:1512
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
 
-#: ../file_search.c:1515
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: Plus de fichier \"%s\" dans 'path'"
 
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Des autocommandes ont chang� le tampon ou le nom du tampon"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "Nom de fichier invalide"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "est un r�pertoire"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "n'est pas un fichier"
 
-#: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
 msgstr "[Nouveau fichier]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[Nouveau R�PERTOIRE]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[Fichier trop volumineux]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[Permission refus�e]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: Les autocommandes *ReadPre ont rendu le fichier illisible"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr ""
 "E201: Autocommandes *ReadPre ne doivent pas modifier le contenu du tampon "
 "courant"
 
-#: ../fileio.c:672
 msgid "Nvim: Reading from stdin...\n"
 msgstr "Vim : Lecture de stdin...\n"
 
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: La conversion a rendu le fichier illisible !"
 
 #. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
 #. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[fifo]"
 
 #. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[socket]"
 
 #. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[caract�re sp�cial]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR manquant]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[lignes longues coup�es]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[NON converti]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[converti]"
 
-#: ../fileio.c:1831
 #, c-format
 msgid "[CONVERSION ERROR in line %<PRId64>]"
 msgstr "[ERREUR DE CONVERSION � la ligne %<PRId64>]"
 
-#: ../fileio.c:1835
 #, c-format
 msgid "[ILLEGAL BYTE in line %<PRId64>]"
 msgstr "[OCTET INVALIDE � la ligne %<PRId64>]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[ERREURS DE LECTURE]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "Impossible de g�n�rer un fichier temporaire pour la conversion"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "La conversion avec 'charconvert' a �chou�"
 
 # DB : Pas de majuscule ?
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "Impossible de lire la sortie de 'charconvert'"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Pas d'autocommande correspondante pour le tampon acwrite"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Des autocommandes ont effac� ou d�charg� le tampon � �crire"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr ""
 "E204: L'autocommande a modifi� le nombre de lignes de mani�re inattendue"
 
-#: ../fileio.c:2548 ../fileio.c:2565
 msgid "is not a file or writable device"
 msgstr "n'est pas un fichier ou un p�riph�rique inscriptible"
 
-#: ../fileio.c:2601
 msgid "is read-only (add ! to override)"
 msgstr "est en lecture seule (ajoutez ! pour passer outre)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: Impossible d'�crire la copie de secours (! pour passer outre)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: Erreur de fermeture de la copie de secours (! pour passer outre)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr ""
 "E508: Impossible de lire le fichier pour la copie de secours (ajoutez ! pour "
 "passer outre)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr ""
 "E509: Impossible de cr�er la copie de secours (ajoutez ! pour passer outre)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr ""
 "E510: Impossible de g�n�rer la copie de secours (ajoutez ! pour passer outre)"
 
 #. Can't write without a tempfile!
-#: ../fileio.c:3121
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Impossible de g�n�rer un fichier temporaire pour y �crire"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: Impossible de convertir (ajoutez ! pour �crire sans convertir)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: Impossible d'ouvrir le lien pour y �crire"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: Impossible d'ouvrir le fichier pour y �crire"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: Fsynch a �chou�"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: Erreur de fermeture de fichier"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr ""
 "E513: Erreur d'�criture, �chec de conversion (videz 'fenc' pour passer outre)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
@@ -2416,56 +1943,43 @@ msgstr ""
 "E513: Erreur d'�criture, �chec de conversion � la ligne %<PRId64> (videz "
 "'fenc' pour passer outre)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: erreur d'�criture (syst�me de fichiers plein ?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " ERREUR DE CONVERSION"
 
-#: ../fileio.c:3509
 #, c-format
 msgid " in line %<PRId64>;"
 msgstr " � la ligne %<PRId64>"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[P�riph.]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[Nouveau]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " ajout�(s)"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [e]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " �crit(s)"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patchmode : impossible d'enregistrer le fichier original"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode : impossible de cr�er le fichier original vide"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: Impossible d'effacer la copie de secours"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2474,99 +1988,78 @@ msgstr ""
 "ALERTE: Le fichier original est peut-�tre perdu ou endommag�\n"
 
 # DB - todo : un peu long...
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr ""
 "ne quittez pas l'�diteur tant que le fichier n'est pas correctement "
 "enregistr� !"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[format dos]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[format mac]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[format unix]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 ligne, "
 
-#: ../fileio.c:3833
 #, c-format
 msgid "%<PRId64> lines, "
 msgstr "%<PRId64> lignes, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 caract�re"
 
-#: ../fileio.c:3838
 #, c-format
 msgid "%<PRId64> characters"
 msgstr "%<PRId64> caract�res"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[Derni�re ligne incompl�te]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ALERTE : Le fichier a �t� modifi� depuis que Vim l'a lu !"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "Voulez-vous vraiment �crire dedans"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Erreur lors de l'�criture dans \"%s\""
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Erreur lors de la fermeture de \"%s\""
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Erreur lors de la lecture de \"%s\""
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: L'autocommande FileChangedShell a effac� le tampon"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: Le fichier \"%s\" n'est plus disponible"
 
 # DB - todo : Suggestion. Bof bof, � am�liorer.
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -2574,40 +2067,32 @@ msgid ""
 msgstr ""
 "W12: Alerte : Le fichier \"%s\" a �t� modifi�, ainsi que le tampon dans Vim"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "Consultez \":help W12\" pour plus d'information."
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Alerte : Le fichier \"%s\" a chang� depuis le d�but de l'�dition"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "Consultez \":help W11\" pour plus d'information."
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
 "W16: Alerte : Les permissions de \"%s\" ont chang� depuis le d�but de "
 "l'�dition"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "Consultez \":help W16\" pour plus d'information."
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Alerte : Le fichier \"%s\" a �t� cr�� apr�s le d�but de l'�dition"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "Alerte"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2615,48 +2100,39 @@ msgstr ""
 "&Ok\n"
 "&Charger le fichier"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Impossible de pr�parer le rechargement de \"%s\""
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Impossible de recharger \"%s\""
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--Effac�--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marqu�es pour auto-suppression : %s <tampon=%d>"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
 
-#: ../fileio.c:5897
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Caract�re non valide apr�s * : %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: Aucun �v�nement %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: Aucun �v�nement ou groupe %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2664,102 +2140,80 @@ msgstr ""
 "\n"
 "--- Auto-commandes ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <buffer=%d> : num�ro de tampon invalide"
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr ""
 "E217: Impossible d'ex�cuter les autocommandes pour TOUS les �v�nements (ALL)"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "Aucune autocommande correspondante"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommandes trop imbriqu�es"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "Autocommandes %s pour \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "Ex�cution de %s"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommande %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { manquant."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } manquant."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: Aucun repli trouv�"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: Impossible de cr�er un repli avec la 'foldmethod'e actuelle"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Impossible de supprimer un repli avec la 'foldmethod'e actuelle"
 
-#: ../fold.c:1784
 #, c-format
 msgid "+--%3ld lines folded "
 msgstr "+--%3ld lignes repli�es "
 
 #. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: Ajout au tampon de lecture"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: mappage r�cursif"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: une abr�viation globale existe d�j� pour %s"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: un mappage global existe d�j� pour %s"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: une abr�viation existe d�j� pour %s"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: un mappage existe d�j� pour %s"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "Aucune abr�viation trouv�e"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "Aucun mappage trouv�"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap : mode invalide"
 
@@ -2768,7 +2222,6 @@ msgstr "E228: makemap : mode invalide"
 #. key value of 'cedit' option
 #. type of cmdline window or 0
 #. result of cmdline window or 0
-#: ../globals.h:924
 msgid "--No lines in buffer--"
 msgstr "--Le tampon est vide--"
 
@@ -2776,667 +2229,510 @@ msgstr "--Le tampon est vide--"
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: ../globals.h:996
 msgid "E470: Command aborted"
 msgstr "E470: Commande annul�e"
 
-#: ../globals.h:997
 msgid "E471: Argument required"
 msgstr "E471: Argument requis"
 
-#: ../globals.h:998
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: \\ devrait �tre suivi de /, ? ou &"
 
-#: ../globals.h:1000
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr ""
 "E11: Invalide dans la fen�tre ligne-de-commande ; <CR> ex�cute, CTRL-C quitte"
 
-#: ../globals.h:1002
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
 "E12: commande non autoris�e depuis un exrc/vimrc dans r�pertoire courant ou "
 "une recherche de marqueur"
 
-#: ../globals.h:1003
 msgid "E171: Missing :endif"
 msgstr "E171: :endif manquant"
 
-#: ../globals.h:1004
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry manquant"
 
-#: ../globals.h:1005
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile manquant"
 
-#: ../globals.h:1006
 msgid "E170: Missing :endfor"
 msgstr "E170: :endfor manquant"
 
-#: ../globals.h:1007
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile sans :while"
 
-#: ../globals.h:1008
 msgid "E588: :endfor without :for"
 msgstr "E588: :endfor sans :for"
 
-#: ../globals.h:1009
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Le fichier existe d�j� (ajoutez ! pour passer outre)"
 
-#: ../globals.h:1010
 msgid "E472: Command failed"
 msgstr "E472: La commande a �chou�"
 
-#: ../globals.h:1011
 msgid "E473: Internal error"
 msgstr "E473: Erreur interne"
 
-#: ../globals.h:1012
 msgid "Interrupted"
 msgstr "Interrompu"
 
-#: ../globals.h:1013
 msgid "E14: Invalid address"
 msgstr "E14: Adresse invalide"
 
-#: ../globals.h:1014
 msgid "E474: Invalid argument"
 msgstr "E474: Argument invalide"
 
-#: ../globals.h:1015
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Argument invalide : %s"
 
-#: ../globals.h:1016
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Expression invalide : %s"
 
-#: ../globals.h:1017
 msgid "E16: Invalid range"
 msgstr "E16: Plage invalide"
 
-#: ../globals.h:1018
 msgid "E476: Invalid command"
 msgstr "E476: Commande invalide"
 
-#: ../globals.h:1019
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: \"%s\" est un r�pertoire"
 
-#: ../globals.h:1020
 #, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: Valeur de d�filement invalide"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
+#~ msgid "E900: Invalid job id"
+#~ msgstr "E49: Valeur de d�filement invalide"
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
+#~ msgid "E901: Job table is full"
+#~ msgstr ""
 
-#: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: L'appel � la biblioth�que a �chou� pour \"%s()\""
 
-#: ../globals.h:1026
 msgid "E19: Mark has invalid line number"
 msgstr "E19: La marque a un num�ro de ligne invalide"
 
-#: ../globals.h:1027
 msgid "E20: Mark not set"
 msgstr "E20: Marque non positionn�e"
 
-#: ../globals.h:1029
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: Impossible de modifier, 'modifiable' est d�sactiv�"
 
-#: ../globals.h:1030
 msgid "E22: Scripts nested too deep"
 msgstr "E22: Trop de r�cursion dans les scripts"
 
-#: ../globals.h:1031
 msgid "E23: No alternate file"
 msgstr "E23: Pas de fichier alternatif"
 
-#: ../globals.h:1032
 msgid "E24: No such abbreviation"
 msgstr "E24: Cette abr�viation n'existe pas"
 
-#: ../globals.h:1033
 msgid "E477: No ! allowed"
 msgstr "E477: Le ! n'est pas autoris�"
 
-#: ../globals.h:1035
 msgid "E25: Nvim does not have a built-in GUI"
 msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
 
-#: ../globals.h:1036
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Aucun nom de groupe de surbrillance %s"
 
-#: ../globals.h:1037
 msgid "E29: No inserted text yet"
 msgstr "E29: Pas encore de texte ins�r�"
 
-#: ../globals.h:1038
 msgid "E30: No previous command line"
 msgstr "E30: Aucune ligne de commande pr�c�dente"
 
-#: ../globals.h:1039
 msgid "E31: No such mapping"
 msgstr "E31: Mappage inexistant"
 
-#: ../globals.h:1040
 msgid "E479: No match"
 msgstr "E479: Aucune correspondance"
 
-#: ../globals.h:1041
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: Aucune correspondance : %s"
 
-#: ../globals.h:1042
 msgid "E32: No file name"
 msgstr "E32: Aucun nom de fichier"
 
-#: ../globals.h:1044
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: Aucune expression r�guli�re de substitution pr�c�dente"
 
-#: ../globals.h:1045
 msgid "E34: No previous command"
 msgstr "E34: Aucune commande pr�c�dente"
 
-#: ../globals.h:1046
 msgid "E35: No previous regular expression"
 msgstr "E35: Aucune expression r�guli�re pr�c�dente"
 
-#: ../globals.h:1047
 msgid "E481: No range allowed"
 msgstr "E481: Les plages ne sont pas autoris�es"
 
-#: ../globals.h:1048
 msgid "E36: Not enough room"
 msgstr "E36: Pas assez de place"
 
-#: ../globals.h:1049
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: Impossible de cr�er le fichier %s"
 
-#: ../globals.h:1050
 msgid "E483: Can't get temp file name"
 msgstr "E483: Impossible d'obtenir un nom de fichier temporaire"
 
-#: ../globals.h:1051
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
 
-#: ../globals.h:1052
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Impossible de lire le fichier %s"
 
-#: ../globals.h:1054
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: Modifications non enregistr�es (ajoutez ! pour passer outre)"
 
 # AB - Il faut respecter l'esprit plus que la lettre. Dans le cas pr�sent,
 #      nettement plus.
-#: ../globals.h:1055
 #, fuzzy
-msgid "E37: No write since last change"
-msgstr "[Attention : tout n'est pas enregistr�]\n"
+#~ msgid "E37: No write since last change"
+#~ msgstr "[Attention : tout n'est pas enregistr�]\n"
 
-#: ../globals.h:1056
 msgid "E38: Null argument"
 msgstr "E38: Argument null"
 
-#: ../globals.h:1057
 msgid "E39: Number expected"
 msgstr "E39: Nombre attendu"
 
-#: ../globals.h:1058
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s"
 
-#: ../globals.h:1059
 msgid "E41: Out of memory!"
 msgstr "E41: M�moire �puis�e"
 
-#: ../globals.h:1060
 msgid "Pattern not found"
 msgstr "Motif introuvable"
 
-#: ../globals.h:1061
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: Motif introuvable : %s"
 
-#: ../globals.h:1062
 msgid "E487: Argument must be positive"
 msgstr "E487: L'argument doit �tre positif"
 
-#: ../globals.h:1064
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Impossible de retourner au r�pertoire pr�c�dent"
 
-#: ../globals.h:1066
 msgid "E42: No Errors"
 msgstr "E42: Aucune erreur"
 
 # DB - TODO : trouver une traduction valable et attest�e pour "location".
-#: ../globals.h:1067
 msgid "E776: No location list"
 msgstr "E776: Aucune liste d'emplacements"
 
-#: ../globals.h:1068
 msgid "E43: Damaged match string"
 msgstr "E43: La cha�ne de recherche est endommag�e"
 
-#: ../globals.h:1069
 msgid "E44: Corrupted regexp program"
 msgstr "E44: L'automate de regexp est corrompu"
 
-#: ../globals.h:1071
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
 
-#: ../globals.h:1073
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: La variable \"%s\" est en lecture seule"
 
-#: ../globals.h:1075
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr ""
 "E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
 
-#: ../globals.h:1076
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
 
-#: ../globals.h:1078
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: Op�ration interdite dans le bac � sable"
 
-#: ../globals.h:1080
 msgid "E523: Not allowed here"
 msgstr "E523: Interdit � cet endroit"
 
-#: ../globals.h:1082
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Choix du mode d'�cran non support�"
 
-#: ../globals.h:1083
 msgid "E49: Invalid scroll size"
 msgstr "E49: Valeur de d�filement invalide"
 
-#: ../globals.h:1084
 msgid "E91: 'shell' option is empty"
 msgstr "E91: L'option 'shell' est vide"
 
-#: ../globals.h:1085
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: Impossible de lire les donn�es du symbole !"
 
-#: ../globals.h:1086
 msgid "E72: Close error on swap file"
 msgstr "E72: Erreur lors de la fermeture du fichier d'�change"
 
-#: ../globals.h:1087
 msgid "E73: tag stack empty"
 msgstr "E73: La pile des marqueurs est vide"
 
-#: ../globals.h:1088
 msgid "E74: Command too complex"
 msgstr "E74: Commande trop complexe"
 
-#: ../globals.h:1089
 msgid "E75: Name too long"
 msgstr "E75: Nom trop long"
 
-#: ../globals.h:1090
 msgid "E76: Too many ["
 msgstr "E76: Trop de ["
 
-#: ../globals.h:1091
 msgid "E77: Too many file names"
 msgstr "E77: Trop de noms de fichiers"
 
-#: ../globals.h:1092
 msgid "E488: Trailing characters"
 msgstr "E488: Caract�res surnum�raires"
 
-#: ../globals.h:1093
 msgid "E78: Unknown mark"
 msgstr "E78: Marque inconnue"
 
-#: ../globals.h:1094
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Impossible de d�velopper les m�tacaract�res"
 
-#: ../globals.h:1096
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' ne peut pas �tre plus petit que 'winminheight'"
 
-#: ../globals.h:1098
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
 
-#: ../globals.h:1099
 msgid "E80: Error while writing"
 msgstr "E80: Erreur lors de l'�criture"
 
-#: ../globals.h:1100
 msgid "Zero count"
 msgstr "Le quantificateur est nul"
 
-#: ../globals.h:1101
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> utilis� en dehors d'un script"
 
-#: ../globals.h:1102
 #, c-format
 msgid "E685: Internal error: %s"
 msgstr "E685: Erreur interne : %s"
 
-#: ../globals.h:1104
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: le motif utilise plus de m�moire que 'maxmempattern'"
 
-#: ../globals.h:1105
 msgid "E749: empty buffer"
 msgstr "E749: tampon vide"
 
-#: ../buffer.c:1587
 #, c-format
 msgid "E86: Buffer %<PRId64> does not exist"
 msgstr "E86: Le tampon %<PRId64> n'existe pas"
 
-#: ../globals.h:1108
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: D�limiteur ou motif de recherche invalide"
 
-#: ../globals.h:1109
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Le fichier est charg� dans un autre tampon"
 
-#: ../globals.h:1110
 #, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: L'option '%s' n'est pas activ�e"
 
-#: ../globals.h:1111
 msgid "E850: Invalid register name"
 msgstr "E850: Nom de registre invalide"
 
-#: ../globals.h:1114
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "La recherche a atteint le HAUT, et continue en BAS"
 
-#: ../globals.h:1115
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "La recherche a atteint le BAS, et continue en HAUT"
 
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: ':' manquant"
 
 # DB - Il s'agit ici d'un probl�me lors du parsing d'une option dont le contenu
 #      est une liste d'�l�ments s�par�s par des virgules.
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: �l�ment invalide"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: chiffre attendu"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "Aucun texte � imprimer"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "Impression de la page %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " Copie %d sur %d"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "Imprim� : %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "Impression interrompue"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Erreur lors de l'�criture du fichier PostScript"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: Impossible d'ouvrir le fichier \"%s\""
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: Impossible de lire le fichier de ressource PostScript \"%s\""
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: \"%s\" n'est pas un fichier de ressource PostScript"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: \"%s\" n'est pas un fichier de ressource PostScript support�"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: La version du fichier de ressource \"%s\" est erron�e"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: Jeu de caract�res et encodage multi-octets incompatibles"
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr ""
 "E674: 'printmbcharset' ne peut pas �tre vide avec un encodage multi-octets"
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Aucune police par d�faut pour l'impression multi-octets"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: Impossible d'ouvrir le fichier PostScript de sortie"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: Impossible d'ouvrir le fichier \"%s\""
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: Le fichier de ressource PostScript \"prolog.ps\" est introuvable"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr ""
 "E456: Le fichier de ressource PostScript \"cidfont.ps\" est introuvable"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: Le fichier de ressource PostScript \"%s.ps\" est introuvable"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: La conversion pour imprimer dans l'encodage \"%s\" a �chou�"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "Envoi � l'imprimante..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: L'impression du fichier PostScript a �chou�"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "T�che d'impression envoy�e."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "Ajouter une base de donn�es"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "Rechercher un motif"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "Afficher ce message"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "Fermer une connexion"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "R�initialiser toutes les connexions"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "Afficher les connexions"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Utilisation : cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "Cette commande cscope ne supporte pas le partage de la fen�tre.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: Utilisation : cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag : marqueur introuvable"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Erreur stat(%s) : %d"
 
-#: ../if_cscope.c:551
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s n'est pas un r�pertoire ou une base de donn�es cscope valide"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "Base de donn�es cscope %s ajout�e"
 
-#: ../if_cscope.c:616
 #, c-format
 msgid "E262: error reading cscope connection %<PRId64>"
 msgstr "E262: erreur lors de la lecture de la connexion cscope %<PRId64>"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: type de recherche cscope inconnu"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Impossible de cr�er les tuyaux (pipes) cscope"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Impossible de forker pour cscope"
 
-#: ../if_cscope.c:849
 #, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "exec de cs_create_connection a �chou�"
+#~ msgid "cs_create_connection setpgid failed"
+#~ msgstr "exec de cs_create_connection a �chou�"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "exec de cs_create_connection a �chou�"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection : fdopen pour to_fp a �chou�"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection : fdopen pour fr_fp a �chou�"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Impossible d'engendrer le processus cscope"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: Aucune connexion cscope"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: Drapeau cscopequickfix %c invalide pour %c"
 
 # DB - todo
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: aucune correspondance trouv�e pour la requ�te cscope %s de %s"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "commandes cscope :\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (Utilisation : %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
 "       c: Find functions calling this function\n"
@@ -3447,6 +2743,7 @@ msgid ""
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
 "       t: Find this text string\n"
+"       a: Find assignments to this symbol\n"
 msgstr ""
 "\n"
 "       c: Trouver les fonctions appelant cette fonction\n"
@@ -3457,32 +2754,27 @@ msgstr ""
 "       i: Trouver les fichiers qui #incluent ce fichier\n"
 "       s: Trouver ce symbole C\n"
 "       t: Trouver cette cha�ne\n"
+"       a: Trouver les assignements � ce symbole\n"
 
-#: ../if_cscope.c:1226
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: base de donn�es cscope redondante non ajout�e"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: Connexion cscope %s introuvable"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "connexion cscope %s ferm�e"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: erreur fatale dans cs_manage_matches"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Marqueur cscope : %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3491,87 +2783,67 @@ msgstr ""
 "   #   ligne"
 
 # DB - todo : Faut-il respecter l'alignement ici ?
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "nom      / contexte/ ligne\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Erreur cscope : %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "Toutes les bases de donn�es cscope ont �t� r�initialis�es"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "aucune connexion cscope\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nom de la base de donn�es           chemin\n"
 
-#: ../main.c:144
 msgid "Unknown option argument"
 msgstr "Option inconnue"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "Trop d'arguments d'�dition"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "Argument manquant apr�s"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "arguments en trop apr�s l'option"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "Trop d'arguments \"+command\", \"-c command\" ou \"--cmd command\""
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "Argument invalide pour"
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d fichiers � �diter\n"
 
-#: ../main.c:1342
 msgid "Attempt to open script file again: \""
 msgstr "Nouvelle tentative pour ouvrir le script : \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "Impossible d'ouvrir en lecture : \""
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "Impossible d'ouvrir pour la sortie script : \""
 
-#: ../main.c:1622
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim : Alerte : L'entr�e ne se fait pas sur un terminal\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "ligne de commande pre-vimrc"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Impossible de lire \"%s\""
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3579,23 +2851,18 @@ msgstr ""
 "\n"
 "Plus d'info avec : \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[fichier ...]  ouvrir le ou les fichiers sp�cifi�s"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-              lire le texte � partir de stdin"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t marqueur    ouvrir le fichier qui contient le marqueur"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [fichErr]   ouvrir � l'endroit de la premi�re erreur"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3605,11 +2872,9 @@ msgstr ""
 "\n"
 "utilisation :"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [args] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3617,7 +2882,6 @@ msgstr ""
 "\n"
 "    ou :"
 
-#: ../main.c:2196
 msgid ""
 "\n"
 "\n"
@@ -3627,192 +2891,146 @@ msgstr ""
 "\n"
 "Arguments :\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\tSeuls des noms de fichier sont sp�cifi�s apr�s ceci"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\tNe pas d�velopper les m�tacaract�res"
 
-#: ../main.c:2201
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\tMode Vi (comme \"vi\")"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\tMode Ex (comme \"ex\")"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\tMode Ex am�lior�"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\tMode silencieux (batch) (seulement pour \"ex\")"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\tMode diff (comme \"vimdiff\")"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\tMode facile (comme \"evim\", vim sans modes)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\tMode lecture seule (comme \"view\")"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\tMode restreint (comme \"rvim\")"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\tInterdire l'enregistrement des fichiers"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\tInterdire toute modification de texte"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\tMode binaire"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\tMode lisp"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\tCompatible avec Vi : 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\tPas totalement compatible avec Vi : 'nocompatible'"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr "-V[N][<fichier>]\tMode verbeux [niveau N] [dans <fichier>]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\tMode d�bogage"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\tNe pas utiliser de fichier d'�change, seulement la m�moire"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\tLister les fichiers d'�change et quitter"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r <fichier>\tR�cup�rer une session plant�e"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\tComme -r"
 
-#: ../main.c:2221
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\tD�marrer en mode arabe"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\tD�marrer en mode h�breu"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\tD�marrer en mode farsi"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <term>\tR�gler le type du terminal sur <terminal>"
 
-#: ../main.c:2225
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel"
 
-#: ../main.c:2226
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\tNe charger aucun greffon"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\tOuvrir N onglets (d�faut : un pour chaque fichier)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\tOuvrir N fen�tres (d�faut : une pour chaque fichier)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\tComme -o, mais partager verticalement"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\tOuvrir � la fin du fichier"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<numL>\tOuvrir le fichier � la ligne <numL>"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <cmde>\tEx�cuter <commande> avant de charger les fichiers vimrc"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <cmde>\tEx�cuter <commande> une fois le 1er fichier charg�"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr ""
 "-S <session>\tSourcer le fichier <session> une fois le 1er fichier charg�"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <src>\tLire les commandes du mode Normal � partir du fichier <src>"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <dest>\tAjouter toutes les commandes tap�es dans le fichier <dest>"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <dest>\t�crire toutes les commandes tap�es dans le fichier <dest>"
 
-#: ../main.c:2240
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <fich>\t�crire les messages d'horodatage au d�marrage dans "
 "<fich>"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\tUtiliser <viminfo> au lieu du viminfo habituel"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h ou --help\t\tAfficher l'aide (ce message) puis quitter"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfficher les informations de version et quitter"
 
-#: ../mark.c:676
 msgid "No marks set"
 msgstr "Aucune marque positionn�e"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Aucune marque ne correspond � \"%s\""
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3821,7 +3039,6 @@ msgstr ""
 "marq ligne col fichier/texte"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3830,7 +3047,6 @@ msgstr ""
 " saut ligne col fichier/texte"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3838,7 +3054,6 @@ msgstr ""
 "\n"
 "modif  ligne col fichier/texte"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3847,7 +3062,6 @@ msgstr ""
 "# Marques dans le fichier :\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3855,7 +3069,6 @@ msgstr ""
 "\n"
 "# Liste de sauts (le plus r�cent en premier) :\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3863,84 +3076,65 @@ msgstr ""
 "\n"
 "# Historique des marques dans les fichiers (les plus r�centes en premier) :\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "'>' manquant"
 
-#: ../memfile.c:426
 msgid "E293: block was not locked"
 msgstr "E293: le bloc n'�tait pas verrouill�"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Erreur de positionnement lors de la lecture du fichier d'�change"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: Erreur de lecture dans le fichier d'�change"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: Erreur de positionnement lors de l'�criture du fichier d'�change"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: Erreur d'�criture dans le fichier d'�change"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: Le fichier d'�change existe d�j� (attaque par symlink ?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: Bloc n�0 non r�cup�r� ?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: Bloc n�1 non r�cup�r� ?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Bloc n�2 non r�cup�r� ?"
 
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Oups, le fichier d'�change a disparu !"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: Impossible de renommer le fichier d'�change"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: Impossible d'ouvrir fichier .swp pour \"%s\", r�cup. impossible"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0() : bloc 0 non r�cup�r� ?!"
 
 #. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Aucun fichier d'�change trouv� pour %s"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Entrez le num�ro du fichier d'�change � utiliser (0 pour quitter) : "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Impossible d'ouvrir %s"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "Impossible de lire le bloc 0 de "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3949,28 +3143,22 @@ msgstr ""
 "Il est possible qu'aucune modification n'a �t� faite ou que Vim n'a pas mis "
 "� jour  le fichier d'�change."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " ne peut pas �tre utilis� avec cette version de Vim.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Utilisez Vim version 3.0.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ne semble pas �tre un fichier d'�change de Vim"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " ne peut pas �tre utilis� sur cet ordinateur.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "Le fichier a �t� cr�� le "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3978,86 +3166,67 @@ msgstr ""
 ",\n"
 "ou le fichier a �t� endommag�."
 
-#: ../memline.c:945
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " a �t� endommag� (taille de page inf�rieure � la valeur minimale).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Utilisation du fichier d'�change \"%s\""
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "Fichier original \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Alerte : Le fichier original a pu �tre modifi�"
 
-#: ../memline.c:1061
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Impossible de lire le bloc 1 de %s"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???DE NOMBREUSES LIGNES MANQUENT"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???NOMBRE DE LIGNES ERRON�"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???BLOC VIDE"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???LIGNES MANQUANTES"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ID du bloc 1 erron� (%s n'est pas un fichier d'�change ?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???BLOC MANQUANT"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? d'ici jusqu'� ???FIN des lignes peuvent �tre corrompues"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? d'ici jusqu'� ???FIN des lignes ont pu �tre ins�r�es/effac�es"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???FIN"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: R�cup�ration interrompue"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: Erreurs lors de la r�cup�ration ; examinez les lignes commen�ant "
 "par ???"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "Consultez \":help E312\" pour plus d'information."
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "R�cup�ration achev�e. V�rifiez que tout est correct."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -4065,17 +3234,14 @@ msgstr ""
 "\n"
 "(Vous voudrez peut-�tre enregistrer ce fichier sous un autre nom\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "et lancer diff avec le fichier original pour rep�rer les changements)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr ""
 "R�cup�ration achev�e. Le contenu du tampon est identique au contenu du "
 "fichier."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -4086,51 +3252,39 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "Fichiers d'�change trouv�s :"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   Dans le r�pertoire courant :\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "Utilisant le nom indiqu� :\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   Dans le r�pertoire "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "     -- aucun --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "      propri�t� de : "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "    dat� : "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "              dat� : "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [de Vim version 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [ne semble pas �tre un fichier d'�change Vim]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "    nom de fichier : "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -4138,15 +3292,12 @@ msgstr ""
 "\n"
 "           modifi� : "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "OUI"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "non"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -4154,11 +3305,9 @@ msgstr ""
 "\n"
 " nom d'utilisateur : "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   nom d'h�te : "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -4166,7 +3315,6 @@ msgstr ""
 "\n"
 "        nom d'h�te : "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -4174,11 +3322,9 @@ msgstr ""
 "\n"
 "      processus n� : "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (en cours d'ex�cution)"
 
-#: ../memline.c:1586
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -4186,97 +3332,75 @@ msgstr ""
 "\n"
 "         [inutilisable sur cet ordinateur]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [ne peut �tre lu]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [ne peut �tre ouvert]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: Pr�servation impossible, il n'y a pas de fichier d'�change"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "Fichier pr�serv�"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: �chec de la pr�servation"
 
-#: ../memline.c:1819
 #, c-format
 msgid "E315: ml_get: invalid lnum: %<PRId64>"
 msgstr "E315: ml_get : num�ro de ligne invalide : %<PRId64>"
 
-#: ../memline.c:1851
 #, c-format
 msgid "E316: ml_get: cannot find line %<PRId64>"
 msgstr "E316: ml_get : ligne %<PRId64> introuvable"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: mauvais id de pointeur de bloc 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx devrait �tre 0"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: Trop de blocs mis � jour ?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: mauvais id de pointeur de bloc 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "bloc 1 effac� ?"
 
-#: ../memline.c:2707
 #, c-format
 msgid "E320: Cannot find line %<PRId64>"
 msgstr "E320: Ligne %<PRId64> introuvable"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: mauvais id de pointeur de bloc"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count vaut z�ro"
 
-#: ../memline.c:2955
 #, c-format
 msgid "E322: line number out of range: %<PRId64> past the end"
 msgstr "E322: num�ro de ligne hors limites : %<PRId64> au-del� de la fin"
 
-#: ../memline.c:2959
 #, c-format
 msgid "E323: line count wrong in block %<PRId64>"
 msgstr "E323: nombre de lignes erron� dans le bloc %<PRId64>"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "La taille de la pile s'accro�t"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: mauvais id de pointeur de block 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: cycle de liens symboliques avec \"%s\""
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: ATTENTION"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4284,15 +3408,12 @@ msgstr ""
 "\n"
 "Trouv� un fichier d'�change nomm� \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "Lors de l'ouverture du fichier \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      PLUS R�CENT que le fichier d'�change !\n"
 
-#: ../memline.c:3244
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -4304,19 +3425,15 @@ msgstr ""
 "    Si c'est le cas, faites attention � ne pas vous retrouver avec\n"
 "    deux versions diff�rentes du m�me fichier en faisant des modifications."
 
-#: ../memline.c:3245
 msgid "  Quit, or continue with caution.\n"
 msgstr "  Quittez, ou continuez prudemment.\n"
 
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Une session d'�dition de ce fichier a plant�.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    Si c'est le cas, utilisez \":recover\" ou \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4324,11 +3441,9 @@ msgstr ""
 "\"\n"
 "    pour r�cup�rer le fichier (consultez \":help recovery\").\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    Si vous l'avez d�j� fait, effacez le fichier d'�change \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4336,23 +3451,18 @@ msgstr ""
 "\"\n"
 "    pour �viter ce message.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "Le fichier d'�change \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" existe d�j� !"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - ATTENTION"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "Un fichier d'�change existe d�j� !"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4366,7 +3476,6 @@ msgstr ""
 "&Quitter\n"
 "&Abandonner"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4390,50 +3499,40 @@ msgstr ""
 #.
 #. ".s?a"
 #. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: Trop de fichiers d'�change trouv�s"
 
-#: ../memory.c:227
 #, c-format
 msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
 msgstr "E342: M�moire �puis�e ! (allocation de %<PRIu64> octets)"
 
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Une partie du chemin de l'�l�ment de menu n'est pas un sous-menu"
 
 # DB - todo : J'h�site avec
 #      msgstr "E328: Le menu n'existe pas dans ce mode"
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: Le menu n'existe que dans un autre mode"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Aucun menu \"%s\""
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: Nom de menu vide"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: Le chemin de menu ne doit pas conduire � un sous-menu"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: Ajout d'�l�ments de menu directement dans barre de menu interdit"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Un s�parateur ne peut faire partie d'un chemin de menu"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4441,75 +3540,56 @@ msgstr ""
 "\n"
 "--- Menus ---"
 
-#: ../menu.c:1313
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Le chemin du menu doit conduire � un �l�ment de menu"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: Menu introuvable : %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: Le menu n'est pas d�fini pour le mode %s"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: Le chemin du menu doit conduire � un sous-menu"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: Menu introuvable - v�rifiez les noms des menus"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "Erreur d�tect�e en traitant %s :"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "ligne %4ld :"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nom de registre invalide : '%s'"
 
 # DB - todo : mettre � jour ?
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Maintenance des messages : Dominique Pell� <dominique.pelle@gmail.com>"
-
-#: ../message.c:986
 msgid "Interrupt: "
 msgstr "Interruption : "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "Appuyez sur ENTR�E ou tapez une commande pour continuer"
 
-#: ../message.c:1843
 #, c-format
 msgid "%s line %<PRId64>"
 msgstr "%s, ligne %<PRId64>"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- Plus --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr ""
 "ESPACE/d/j : �cran/page/ligne vers le bas, b/u/k : vers le haut, q : quitter"
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "Question"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4517,7 +3597,6 @@ msgstr ""
 "&Oui\n"
 "&Non"
 
-#: ../message.c:3033
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4527,7 +3606,6 @@ msgstr ""
 "&Non\n"
 "&Annuler"
 
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4541,176 +3619,137 @@ msgstr ""
 "Tout aban&donner\n"
 "&Annuler"
 
-#: ../message.c:3058
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Pas assez d'arguments pour printf()"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() attend un argument de type Flottant"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Trop d'arguments pour printf()"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Alerte : Modification d'un fichier en lecture seule"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr "Tapez un nombre et <Entr�e> ou cliquez avec la souris (rien annule) :"
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Tapez un nombre et <Entr�e> (rien annule) :"
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 ligne en plus"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 ligne en moins"
 
-#: ../misc1.c:2593
 #, c-format
 msgid "%<PRId64> more lines"
 msgstr "%<PRId64> lignes en plus"
 
-#: ../misc1.c:2596
 #, c-format
 msgid "%<PRId64> fewer lines"
 msgstr "%<PRId64> lignes en moins"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (Interrompu)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "Bip !"
 
-#: ../misc2.c:738
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Appel du shell pour ex�cuter : \"%s\""
 
-#: ../normal.c:183
 msgid "E349: No identifier under cursor"
 msgstr "E349: Aucun identifiant sous le curseur"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' est vide"
 
 # DB : Il est ici question du mode Visuel.
-#: ../normal.c:2637
 msgid "Warning: terminal cannot highlight"
 msgstr "Alerte : le terminal ne peut pas surligner"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: Aucune cha�ne sous le curseur"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Impossible d'effacer des replis avec la 'foldmethod'e actuelle"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: La liste des modifications (changelist) est vide"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: Au d�but de la liste des modifications"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: � la fin de la liste des modifications"
 
-#: ../normal.c:7053
 msgid "Type  :quit<Enter>  to exit Nvim"
 msgstr "tapez  :q<Entr�e>  pour quitter Vim"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 ligne %s�e 1 fois"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 ligne %s�e %d fois"
 
-#: ../ops.c:253
 #, c-format
 msgid "%<PRId64> lines %sed 1 time"
 msgstr "%<PRId64> lignes %s�es 1 fois"
 
-#: ../ops.c:256
 #, c-format
 msgid "%<PRId64> lines %sed %d times"
 msgstr "%<PRId64> lignes %s�es %d fois"
 
-#: ../ops.c:592
 #, c-format
 msgid "%<PRId64> lines to indent... "
 msgstr "%<PRId64> lignes � indenter... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 ligne indent�e "
 
-#: ../ops.c:636
 #, c-format
 msgid "%<PRId64> lines indented "
 msgstr "%<PRId64> lignes indent�es "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
 
 # DB - Question O/N.
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "impossible de r�aliser une copie ; effacer tout de m�me"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 ligne modifi�e"
 
-#: ../ops.c:1931
 #, c-format
 msgid "%<PRId64> lines changed"
 msgstr "%<PRId64> lignes modifi�es"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "bloc de 1 ligne copi�"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 ligne copi�e"
 
-#: ../ops.c:2525
 #, c-format
 msgid "block of %<PRId64> lines yanked"
 msgstr "bloc de %<PRId64> lignes copi�"
 
-#: ../ops.c:2528
 #, c-format
 msgid "%<PRId64> lines yanked"
 msgstr "%<PRId64> lignes copi�es"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Le registre %s est vide"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4718,11 +3757,9 @@ msgstr ""
 "\n"
 "--- Registres ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "Nom de registre invalide"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4730,17 +3767,14 @@ msgstr ""
 "\n"
 "# Registres :\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: Type de registre %d inconnu"
 
-#: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
 msgstr "%<PRId64> Colonnes ; "
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4749,7 +3783,6 @@ msgstr ""
 "%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
 "sur %<PRId64> Octets s�lectionn�s"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4758,7 +3791,6 @@ msgstr ""
 "%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
 "sur %<PRId64> Caract�res ; %<PRId64> sur %<PRId64> octets s�lectionn�s"
 
-#: ../ops.c:5123
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
@@ -4767,7 +3799,6 @@ msgstr ""
 "Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
 "%<PRId64> ; Octet %<PRId64> sur %<PRId64>"
 
-#: ../ops.c:5133
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
@@ -4776,105 +3807,81 @@ msgstr ""
 "Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
 "%<PRId64> ; Caract�re %<PRId64> sur %<PRId64> ; Octet %<PRId64> sur %<PRId64>"
 
-#: ../ops.c:5146
 #, c-format
 msgid "(+%<PRId64> for BOM)"
 msgstr "(+%<PRId64> pour le BOM)"
 
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Page %N"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Merci d'avoir choisi Vim"
 
 #. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: Option inconnue"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: Option non support�e"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Non autoris� dans une ligne de mode"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: Le code de touche n'est pas configur�"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: Nombre requis apr�s ="
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: Introuvable dans termcap"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Caract�re <%s> invalide"
 
-#: ../option.c:2253
 #, c-format
 msgid "For option %s"
 msgstr "Pour l'option %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ne doit pas �tre une cha�ne vide"
 
-#: ../option.c:3885
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' et 'patchmode' sont �gaux"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: Conflits avec la valeur de 'listchars'"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Conflits avec la valeur de 'fillchars'"
 
-#: ../option.c:4163
 msgid "E524: Missing colon"
 msgstr "E524: ':' manquant"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: Cha�ne de longueur nulle"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Nombre manquant apr�s <%s>"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: Virgule manquante"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: Une valeur ' doit �tre sp�cifi�e"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: contient des caract�res � largeur double non-imprimables"
 
-#: ../option.c:4469
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Caract�re invalide apr�s <%c>"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: virgule requise"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' doit �tre vide ou contenir %s"
@@ -4882,37 +3889,29 @@ msgstr "E537: 'commentstring' doit �tre vide ou contenir %s"
 # DB - Le code est sans ambigu�t� sur le caract�re manquant.
 #      � d�faut d'une traduction valable, au moins comprend-on
 #      ce qui se passe.
-#: ../option.c:4928
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: '}' manquant"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: trop d'�l�ments"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: parenth�ses non �quilibr�es"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: Il existe d�j� une fen�tre de pr�visualisation"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr "W17: L'arabe requiert l'UTF-8, tapez ':set encoding=utf-8'"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Au moins %d lignes sont n�cessaires"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Au moins %d colonnes sont n�cessaires"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Option inconnue : %s"
@@ -4920,12 +3919,10 @@ msgstr "E355: Option inconnue : %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Nombre requis : &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4933,7 +3930,6 @@ msgstr ""
 "\n"
 "--- Codes de terminal ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4941,7 +3937,6 @@ msgstr ""
 "\n"
 "--- Valeur des options globales ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4949,7 +3944,6 @@ msgstr ""
 "\n"
 "--- Valeur des options locales ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4957,21 +3951,17 @@ msgstr ""
 "\n"
 "--- Options ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: ERREUR get_varp"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap' : Aucun caract�re correspondant pour %s"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap' : Caract�res surnum�raires apr�s point-virgule : %s"
 
-#: ../os/shell.c:194
 msgid ""
 "\n"
 "Cannot execute shell "
@@ -4979,7 +3969,6 @@ msgstr ""
 "\n"
 "Impossible d'ex�cuter le shell "
 
-#: ../os/shell.c:439
 msgid ""
 "\n"
 "shell returned "
@@ -4987,7 +3976,6 @@ msgstr ""
 "\n"
 "le shell a retourn� "
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4995,7 +3983,6 @@ msgstr ""
 "\n"
 "Impossible d'obtenir le contexte de s�curit� pour "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -5003,218 +3990,171 @@ msgstr ""
 "\n"
 "Impossible de modifier le contexte de s�curit� pour "
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Trop de %%%c dans la cha�ne de format"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: %%%c inattendu dans la cha�ne de format"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: ] manquant dans la cha�ne de format"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: %%%c non support� dans la cha�ne de format"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: %%%c invalide dans le pr�fixe de la cha�ne de format"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: %%%c invalide dans la cha�ne de format"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' ne contient aucun motif"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Nom de r�pertoire vide ou absent"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: Plus d'�l�ments"
 
-#: ../quickfix.c:1674
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d sur %d)%s%s : "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (ligne effac�e)"
 
-#: ../quickfix.c:1863
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: En bas de la pile quickfix"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Au sommet de la pile quickfix"
 
-#: ../quickfix.c:1880
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "liste d'erreurs %d sur %d ; %d erreurs"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �criture impossible, l'option 'buftype' est activ�e"
 
-#: ../quickfix.c:2812
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Nom de fichier manquant ou motif invalide"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Impossible d'ouvrir le fichier \"%s\""
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: le tampon n'est pas charg�"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: Cha�ne ou Liste attendue"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: �l�ment invalide dans %s%%[]"
 
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: ']' manquant apr�s %s["
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Pas de correspondance pour %s%%("
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ouvrante non ferm�e"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) fermante non ouverte"
 
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( n'est pas autoris� ici"
 
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 et co. ne sont pas autoris�s ici"
 
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: ']' manquant apr�s %s%%["
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] vide"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: Motif trop long"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: Trop de \\z("
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: Trop de %s("
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: Pas de correspondance pour \\z("
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: caract�re invalide apr�s %s@"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: Trop de %s{...}s complexes"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: %s* imbriqu�s"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: %s%c imbriqu�s"
 
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: utilisation invalide de \\_"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: %s%c ne suit aucun atome"
 
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: post-r�f�rence invalide"
 
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Caract�re invalide apr�s \\z"
 
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Caract�re invalide apr�s %s%%[dxouU]"
 
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Caract�re invalide apr�s %s%%"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Erreur de syntaxe dans %s{...}"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "Sous-correspondances externes :\n"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5222,63 +4162,50 @@ msgstr ""
 "E864: \\%#= peut �tre suivi uniquement de 0, 1 ou 2. Le moteur automatique "
 "sera utilis� "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Fin de regexp rencontr�e pr�matur�ment"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (regexp NFA) %c au mauvais endroit"
 
-#: ../regexp_nfa.c:242
 #, fuzzy, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (regexp NFA) Classe de caract�re invalide "
+#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
+#~ msgstr "E877: (regexp NFA) Classe de caract�re invalide "
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, fuzzy, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
+#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
+#~ msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
 
-#: ../regexp_nfa.c:1802
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) Op�rateur inconnu '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (regexp NFA) Erreur � la lecture des limites de r�p�tition"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (regexp NFA) Trop de '('"
 
-#: ../regexp_nfa.c:2042
 #, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E872: (regexp NFA) Trop de '('"
+#~ msgid "E879: (NFA regexp) Too many \\z("
+#~ msgstr "E872: (regexp NFA) Trop de '('"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) erreur de terminaison"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) Impossible de d�piler !"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5286,178 +4213,137 @@ msgstr ""
 "E875: (regexp NFA) (lors de la conversion de postfix � NFA), il reste trop "
 "d'�tats sur la pile"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (regexp NFA) Pas assez de m�moire pour stocker le NFA"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "Impossible d'ouvrir le fichier de log temporaire en �criture, affichage sur "
 "stderr ... "
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) IMPOSSIBLE D'OUVRIR %s !"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "Impossible d'ouvrir le fichier de log en �criture"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " VREMPLACEMENT"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " REMPLACEMENT"
 
 # DB - todo
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " REVERSE"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " INSERTION"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (insertion)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (remplacement)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (vremplacement)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " h�breu"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " arabe"
 
-#: ../screen.c:7456
 msgid " (lang)"
 msgstr " (langue)"
 
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (collage)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " VISUEL"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " VISUEL LIGNE"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " VISUEL BLOC"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " S�LECTION"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " S�LECTION LIGNE"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " S�LECTION BLOC"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "Enregistrement"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Cha�ne de recherche invalide : %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: la recherche a atteint le HAUT sans trouver : %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: la recherche a atteint le BAS sans trouver : %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: '?' ou '/' attendu apr�s ';'"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (inclut des correspondances list�es pr�c�demment)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- Fichiers inclus "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "introuvables "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "dans le chemin ---\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (D�j� list�)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  INTROUVABLE"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "Examen des fichiers inclus : %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "Recherche du fichier inclus %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: La correspondance est sur la ligne courante"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "Tous les fichiers inclus ont �t� trouv�s"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "Aucun fichier inclus"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: Impossible de trouver la d�finition"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Impossible de trouver le motif"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Substitue "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5468,97 +4354,76 @@ msgstr ""
 "# Dernier motif de recherche %s :\n"
 "~"
 
-#: ../spell.c:951
 msgid "E759: Format error in spell file"
 msgstr "E759: Erreur de format du fichier orthographique"
 
-#: ../spell.c:952
 msgid "E758: Truncated spell file"
 msgstr "E758: Fichier orthographique tronqu�"
 
-#: ../spell.c:953
 #, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "Texte en trop dans %s ligne %d : %s"
 
-#: ../spell.c:954
 #, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "Nom d'affixe trop long dans %s ligne %d : %s"
 
-#: ../spell.c:955
 msgid "E761: Format error in affix file FOL, LOW or UPP"
 msgstr "E761: Erreur de format dans le fichier d'affixe FOL, LOW et UPP"
 
-#: ../spell.c:957
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: Un caract�re dans FOL, LOW ou UPP est hors-limites"
 
-#: ../spell.c:958
 msgid "Compressing word tree..."
 msgstr "Compression de l'arbre des mots"
 
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: La v�rification orthographique n'est pas activ�e"
 
-#: ../spell.c:2249
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr "Alerte : Liste de mots \"%s.%s.spl\" ou \"%s.ascii.spl\" introuvable"
 
-#: ../spell.c:2473
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Lecture du fichier orthographique \"%s\""
 
-#: ../spell.c:2496
 msgid "E757: This does not look like a spell file"
 msgstr "E757: Le fichier ne ressemble pas � un fichier orthographique"
 
-#: ../spell.c:2501
 msgid "E771: Old spell file, needs to be updated"
 msgstr "E771: Fichier orthographique obsol�te, sa mise � jour est n�cessaire"
 
-#: ../spell.c:2504
 msgid "E772: Spell file is for newer version of Vim"
 msgstr "E772: Le fichier est pr�vu pour une version de Vim plus r�cente"
 
-#: ../spell.c:2602
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: Section non support�e dans le fichier orthographique"
 
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "Alerte : r�gion %s non support�e"
 
-#: ../spell.c:4550
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "Lecture du fichier d'affixes %s..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "�chec de conversion du mot dans %s ligne %d : %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "La conversion dans %s non support�e : de %s vers %s"
 
-#: ../spell.c:4642
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Valeur de FLAG invalide dans %s ligne %d : %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG trouv� apr�s des drapeaux dans %s ligne %d : %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5567,7 +4432,6 @@ msgstr ""
 "D�finir COMPOUNDFORBIDFLAG apr�s des PFX peut donner des r�sultats erron�s "
 "dans %s ligne %d"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5576,45 +4440,37 @@ msgstr ""
 "D�finir COMPOUNDPERMITFLAG apr�s des PFX peut donner des r�sultats erron�s "
 "dans %s ligne %d"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "Valeur de COMPOUNDRULES erron�e dans %s ligne %d : %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Valeur de COMPOUNDWORDMAX erron�e dans %s ligne %d : %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "Valeur de COMPOUNDMIN erron�e dans %s ligne %d : %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Valeur de COMPOUNDSYLMAX erron�e dans %s ligne %d : %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "Valeur de CHECKCOMPOUNDPATTERN erron�e dans %s ligne %d : %s"
 
 # DB - TODO
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "Drapeaux de composition diff�rents dans un bloc d'affixes continu dans %s "
 "ligne %d : %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "Affixe dupliqu� dans %s ligne %d : %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5623,339 +4479,270 @@ msgstr ""
 "Affixe aussi utilis�e pour BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/"
 "NOSUGGEST dans %s ligne %d : %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "Y ou N attendu dans %s ligne %d : %s"
 
 # DB - todo (regexp impossible � compiler...)
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "Condition non valide dans %s ligne %d : %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "Nombre de REP(SAL) attendu dans %s ligne %d"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "Nombre de MAP attendu dans %s ligne %d"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "Caract�re dupliqu� dans MAP dans %s ligne %d"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "�l�ment non reconnu ou dupliqu� dans %s ligne %d : %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "Ligne FOL/LOW/UPP manquante dans %s"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "Utilisation de COMPOUNDSYLMAX sans SYLLABLE"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "Trop de pr�fixes report�s (PFXPOSTPONE)"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "Trop de drapeaux de composition"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "Trop de pr�fixes report�s et/ou de drapeaux de composition"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "Ligne SOFO%s manquante dans %s"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "Lignes SAL et lignes SOFO pr�sentes dans %s"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "Le drapeau n'est pas un nombre dans %s ligne %d : %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "Drapeau non autoris� dans %s ligne %d : %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "La valeur de %s est diff�rente de celle d'un autre fichier .aff"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "Lecture du fichier orthographique %s..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: Nombre de mots non indiqu� dans %s"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "ligne %6d, mot %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "Mot dupliqu� dans %s ligne %d : %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "Premier mot dupliqu� dans %s ligne %d : %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d mot(s) dupliqu�(s) dans %s"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "%d mot(s) ignor�(s) avec des caract�res non-ASCII dans %s"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "Lecture de la liste de mots %s..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "Ligne /encoding= en double ignor�e dans %s ligne %d : %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "Ligne /encoding= apr�s des mots ignor�e dans %s ligne %d : %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "Ligne /regions= en double ignor�e dans %s ligne %d : %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "Trop de r�gions dans %s ligne %d : %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "Ligne / ignor�e dans %s ligne %d : %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "Num�ro de r�gion invalide dans %s ligne %d : %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "Drapeaux non reconnus dans %s ligne %d : %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "%d mot(s) ignor�(s) avec des caract�res non-ASCII"
 
-#: ../spell.c:6656
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "%d noeuds compress�s sur %d ; %d (%d%%) restants "
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "Relecture du fichier orthographique"
 
 #. Go through the trie of good words, soundfold each word and add it to
 #. the soundfold trie.
-#: ../spell.c:7357
 msgid "Performing soundfolding..."
 msgstr "Analyse phon�tique en cours..."
 
-#: ../spell.c:7368
 #, c-format
 msgid "Number of words after soundfolding: %<PRId64>"
 msgstr "Nombre de mots apr�s l'analyse phon�tique : %<PRId64>"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "Nombre total de mots : %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "�criture du fichier de suggestions %s..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Estimation de m�moire consomm�e : %d octets"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Le nom du fichier ne doit pas contenir de nom de r�gion"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: 8 r�gions au maximum sont support�es"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: R�gion invalide dans %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Alerte : la composition et NOBREAK sont tous les deux sp�cifi�s"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "�criture du fichier orthographique %s..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "Termin� !"
 
 # DB - todo : perfectible.
-#: ../spell.c:8034
 #, c-format
 msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' n'a pas %<PRId64> entr�es"
 
-#: ../spell.c:8074
 #, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "Mot retir� de %s"
+#~ msgid "Word '%.*s' removed from %s"
+#~ msgstr "Mot retir� de %s"
 
-#: ../spell.c:8117
 #, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "Mot ajout� dans %s"
+#~ msgid "Word '%.*s' added to %s"
+#~ msgstr "Mot ajout� dans %s"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr ""
 "E763: Les caract�res de mots diff�rent entre les fichiers orthographiques"
 
-#: ../spell.c:8684
 msgid "Sorry, no suggestions"
 msgstr "D�sol�, aucune suggestion"
 
-#: ../spell.c:8687
 #, c-format
 msgid "Sorry, only %<PRId64> suggestions"
 msgstr "D�sol�, seulement %<PRId64> suggestions"
 
 #. for when 'cmdheight' > 1
 #. avoid more prompt
-#: ../spell.c:8704
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Remplacer \"%.*s\" par :"
 
 # DB - todo : l'int�r�t de traduire ce message m'�chappe.
-#: ../spell.c:8737
 #, c-format
 msgid " < \"%.*s\""
 msgstr " < \"%.*s\""
 
-#: ../spell.c:8882
 msgid "E752: No previous spell replacement"
 msgstr "E752: Pas de suggestion orthographique pr�c�dente"
 
-#: ../spell.c:8925
 #, c-format
 msgid "E753: Not found: %s"
 msgstr "E753: Introuvable : %s"
 
-#: ../spell.c:9276
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
 msgstr "E778: %s ne semble pas �tre un fichier .sug"
 
-#: ../spell.c:9282
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: Fichier de suggestions obsol�te, mise � jour n�cessaire : %s"
 
-#: ../spell.c:9286
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"
 msgstr "E780: Fichier .sug pr�vu pour une version de Vim plus r�cente : %s"
 
-#: ../spell.c:9295
 #, c-format
 msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: Le fichier .sug ne correspond pas au fichier .spl : %s"
 
-#: ../spell.c:9305
 #, c-format
 msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s"
 
 #. This should have been checked when generating the .spl
 #. file.
-#: ../spell.c:11575
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: caract�res dupliqu� dans l'entr�e MAP"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argument invalide : %s"
 
-#: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Aucune grappe de syntaxe %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "synchronisation sur les commentaires de type C"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "Aucune synchronisation"
 
 # DB - Les deux messages qui suivent vont ensemble.
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "La synchronisation d�bute "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " lignes avant la ligne du haut"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5963,7 +4750,6 @@ msgstr ""
 "\n"
 "--- �l�ments de synchronisation syntaxique ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5971,7 +4757,6 @@ msgstr ""
 "\n"
 "synchronisation sur �l�ments"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5979,275 +4764,216 @@ msgstr ""
 "\n"
 "--- �l�ments de syntaxe ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Aucune grappe de syntaxe %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimum "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maximum "
 
 # DB - todo
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; correspond avec "
 
 # DB - todo
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " coupures de ligne"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: L'argument � contains � n'est pas accept� ici"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: valeur de cchar invalide"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: L'argument � group[t]here � n'est pas accept� ici"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Aucun �l�ment de type r�gion trouv� pour %s"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: Nom de fichier requis"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: Trop d'inclusions de syntaxe"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' manquant : %s"
 
-#: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' manquant : %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Pas assez d'arguments : syntax region %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: Trop de grappes de syntaxe"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: Aucune grappe sp�cifi�e"
 
 #. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: D�limiteur de motif introuvable : %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: caract�res en trop apr�s le motif : %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr ""
 "E403: synchro syntax : motif de continuation de ligne pr�sent deux fois"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Arguments invalides : %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: '=' manquant : %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Argument vide : %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s n'est pas autoris� ici"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s doit �tre le premier �l�ment d'une liste � contains �"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Nom de groupe inconnu : %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Sous-commande de :syntax invalide : %s"
 
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
+#~ msgid ""
+#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+#~ msgstr ""
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: boucle r�cursive lors du chargement de syncolor.vim"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: groupe de surbrillance introuvable : %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Trop peu d'arguments : \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Trop d'arguments : \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: le groupe a d�j� des attributs, lien de surbrillance ignor�"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: signe �gal inattendu : %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: '=' manquant : %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: argument manquant : %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Valeur invalide : %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: Couleur de premier plan inconnue"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: Couleur d'arri�re-plan inconnue"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Nom ou num�ro de couleur non reconnu : %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: le code de terminal est trop long : %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Argument invalide : %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr ""
 "E424: Trop d'attributs de surbrillance diff�rents en cours d'utilisation"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: Caract�re non-imprimable dans un nom de groupe"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: Caract�re invalide dans un nom de groupe"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: Trop de groupes de surbrillance et de syntaxe"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: En bas de la pile de marqueurs"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: Au sommet de la pile de marqueurs"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: Impossible d'aller avant le premier marqueur correspondant"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: Marqueur introuvable : %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # pri type marqueur"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "fichier\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: Il n'y a qu'un marqueur correspondant"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: Impossible d'aller au-del� du dernier marqueur correspondant"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "Le fichier \"%s\" n'existe pas"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "marqueur %d sur %d%s"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " ou plus"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  Utilisation d'un marqueur avec une casse diff�rente !"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Le fichier \"%s\" n'existe pas"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6255,80 +4981,63 @@ msgstr ""
 "\n"
 "  # VERS marqueur  DE ligne   dans le fichier/texte"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Examen du fichier de marqueurs %s"
 
-#: ../tag.c:1545
 msgid "Ignoring long line in tags file"
 msgstr "Ignore longue ligne dans le fichier de marqueurs"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\""
 
-#: ../tag.c:1917
 #, c-format
 msgid "Before byte %<PRId64>"
 msgstr "Avant l'octet %<PRId64>"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Le fichier de marqueurs %s n'est pas ordonn�"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: Aucun fichier de marqueurs"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Le motif de marqueur est introuvable"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: Marqueur introuvable, tentative pour deviner !"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "Nom de champ dupliqu� : %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' inconnu. Les terminaux int�gr�s sont :"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "utilisation par d�faut de '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: Impossible d'ouvrir le fichier termcap"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: La description du terminal est introuvable dans terminfo"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: La description du terminal est introuvable dans termcap"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: Aucune entr�e \"%s\" dans termcap"
 
 # DB - todo : Comment am�liorer ?
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: capacit� de terminal \"cm\" requise"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6336,174 +5045,137 @@ msgstr ""
 "\n"
 "--- Touches du terminal ---"
 
-#: ../ui.c:481
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim : Erreur lors de la lecture de l'entr�e, sortie...\n"
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 #, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Le nombre de lignes a �t� chang� inopin�ment"
+#~ msgid "E881: Line count changed unexpectedly"
+#~ msgstr "E834: Le nombre de lignes a �t� chang� inopin�ment"
 
-#: ../undo.c:627
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Impossible d'ouvrir le fichier d'annulations en �criture : %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: Fichier d'annulations corrompu (%s) : %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr ""
 "Impossible d'�crire le fichier d'annulations dans n'importe quel r�pertoire "
 "de 'undodir'"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "Le fichier d'annulations ne sera pas �cras�, impossible de lire : %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "Fichier ne sera pas �cras�, ce n'est pas un fichier d'annulations : %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "Le fichier d'annulations n'est pas �crit, rien � annuler"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "�criture du fichier d'annulations : %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: Erreur d'�criture dans le fichier d'annulations : %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "Le fichier d'annulations n'est pas lu, propri�taire diff�rent : %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "Lecture du fichier d'annulations : %s..."
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: Impossible d'ouvrir le fichier d'annulations en lecture : %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Ce n'est pas un fichier d'annulations : %s"
 
-#: ../undo.c:1313
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Fichier d'annulations incompatible : %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr ""
 "Le contenu du fichier a chang�, impossible d'utiliser les informations "
 "d'annulation"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "Fin de lecture du fichier d'annulations %s"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "D�j� � la modification la plus ancienne"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "D�j� � la modification la plus r�cente"
 
-#: ../undo.c:1806
 #, c-format
 msgid "E830: Undo number %<PRId64> not found"
 msgstr "E830: Annulation n� %<PRId64> introuvable"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo : num�ros de ligne erron�s"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "ligne en plus"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "lignes en plus"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "ligne en moins"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "lignes en moins"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "modification"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "modifications"
 
-#: ../undo.c:2225
 #, c-format
 msgid "%<PRId64> %s; %s #%<PRId64>  %s"
 msgstr "%<PRId64> %s ; %s #%<PRId64> ; %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "avant"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "apr�s"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "Rien � annuler"
 
 # DB - Les deux premi�res colonnes sont align�es � droite.
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "num�ro modif.   instant            enregistr�"
 
-#: ../undo.c:2360
 #, c-format
 msgid "%<PRId64> seconds ago"
 msgstr "il y a %<PRId64> secondes"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n'est pas autoris� apr�s une annulation"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: la liste d'annulation est corrompue"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: ligne d'annulation manquante"
 
-#: ../version.c:600
 msgid ""
 "\n"
 "Included patches: "
@@ -6511,7 +5183,6 @@ msgstr ""
 "\n"
 "Rustines incluses : "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6519,11 +5190,9 @@ msgstr ""
 "\n"
 "Rustines extra : "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modifi� par "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6531,11 +5200,9 @@ msgstr ""
 "\n"
 "Compil� "
 
-#: ../version.c:649
 msgid "by "
 msgstr "par "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6543,164 +5210,125 @@ msgstr ""
 "\n"
 "�norme version "
 
-#: ../version.c:661
 msgid "without GUI."
 msgstr "sans interface graphique."
 
-#: ../version.c:662
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Fonctionnalit�s incluses (+) ou non (-) :\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "         fichier vimrc syst�me : \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "     fichier vimrc utilisateur : \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr " 2me fichier vimrc utilisateur : \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr " 3me fichier vimrc utilisateur : \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "      fichier exrc utilisateur : \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "  2me fichier exrc utilisateur : \""
 
-#: ../version.c:699
 msgid "  fall-back for $VIM: \""
 msgstr "               $VIM par d�faut : \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "        $VIMRUNTIME par d�faut : \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "Compilation : "
 
-#: ../version.c:712
 msgid "Linking: "
 msgstr "�dition de liens : "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "  VERSION DE D�BOGAGE"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi Am�lior�"
 
-#: ../version.c:769
 msgid "version "
 msgstr "version "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "par Bram Moolenaar et al."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim est un logiciel libre"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "Aidez les enfants pauvres d'Ouganda !"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "tapez  :help iccf<Entr�e>       pour plus d'informations          "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "tapez  :q<Entr�e>               pour sortir du programme          "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tapez  :help<Entr�e>  ou  <F1>  pour acc�der � l'aide en ligne    "
 
-#: ../version.c:781
 msgid "type  :help version7<Enter>   for version info"
 msgstr "tapez  :help version7<Entr�e>   pour lire les notes de mise � jour"
 
 # DB - Pour les trois messages qui suivent :
 #        :set cp
 #        :intro
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Compatibilit� avec Vi activ�e"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "tapez  :set nocp<Entr�e>       pour la d�sactiver"
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tapez  :help cp-default<Entr�e>  pour plus d'info"
 
-#: ../version.c:827
 msgid "Sponsor Vim development!"
 msgstr "Sponsorisez le d�veloppement de Vim !"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Devenez un utilisateur de Vim enregistr� !"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "tapez  :help sponsor<Entr�e>    pour plus d'informations          "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "tapez  :help register<Entr�e>   pour plus d'informations          "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "menu  Aide->Sponsor/Enregistrement pour plus d'info"
 
-#: ../window.c:119
 msgid "Already only one window"
 msgstr "Il n'y a d�j� plus qu'une fen�tre"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: Il n'y a pas de fen�tre de pr�visualisation"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Impossible de partager topleft et botright en m�me temps"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: Rotation impossible quand une autre fen�tre est partag�e"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: Impossible de fermer la derni�re fen�tre"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: Impossible de fermer la fen�tre des autocommandes"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr ""
 "E814: Impossible de fermer la fen�tre, seule la fen�tre des autocommandes "
 "resterait"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: Les modifications de l'autre fen�tre n'ont pas �t� enregistr�es"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: Aucun nom de fichier sous le curseur"
 
@@ -6881,6 +5509,12 @@ msgstr "E446: Aucun nom de fichier sous le curseur"
 #~ msgid "E232: Cannot create BalloonEval with both message and callback"
 #~ msgstr "E232: Impossible de cr�er un BalloonEval avec message ET callback"
 
+msgid "Yes"
+msgstr "Oui"
+
+msgid "No"
+msgstr "Non"
+
 # todo '_' is for hotkey, i guess?
 #~ msgid "Input _Methods"
 #~ msgstr "_M�thodes de saisie"
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index f7117c6e86..761539039d 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -2684,11 +2684,6 @@ msgstr "E49: M�id neamhbhail� scrollaithe"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4286,11 +4281,6 @@ msgstr "l�ne %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ainm neamhbhail� tabhaill: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Cothaitheoir na dteachtaireachta�: Kevin P. Scannell <scannell@slu.edu>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Idirbhriseadh: "
diff --git a/src/nvim/po/it.po b/src/nvim/po/it.po
index 171e155689..b8b119ade6 100644
--- a/src/nvim/po/it.po
+++ b/src/nvim/po/it.po
@@ -13,13 +13,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-11 20:58+0200\n"
-"PO-Revision-Date:  2015-08-11 22:02+0200\n"
-"Last-Translator:   Vlad Sandrini   <vlad.gently@gmail.com>\n"
-"Language-Team:     Italian                   Antonio Colombo <azc100@gmail."
-"com>                   Vlad Sandrini <vlad.gently@gmail."
-"com>                   Luciano Montanaro <mikelima@cirulla.net>\n"
-"Language: \n"
+"POT-Creation-Date: 2016-02-11 12:10+0100\n"
+"PO-Revision-Date:  2016-02-11 14:42+0200\n"
+"Last-Translator:   Antonio Colombo   <azc100@gmail.com>\n"
+"Language-Team:     Antonio Colombo   <azc100@gmail.com>"
+"                   Vlad Sandrini     <vlad.gently@gmail.com"
+"                   Luciano Montanaro <mikelima@cirulla.net>\n"
+"Language: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO_8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -491,10 +491,6 @@ msgstr "E686: L'argomento di %s deve essere una Lista"
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: L'argomento di %s deve essere una Lista o un Dizionario"
 
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Non posso usare una chiave nulla per il Dizionario"
-
 #: ../eval.c:145
 msgid "E714: List required"
 msgstr "E714: � necessaria una Lista"
@@ -548,7 +544,7 @@ msgstr "E461: Nome di variabile non ammesso: %s"
 # nuovo
 #: ../eval.c:157
 msgid "E806: using Float as a String"
-msgstr "E806: uso di un numero con virgola come stringa"
+msgstr "E806: uso di un Numero-a-virgola-mobile come Stringa"
 
 #: ../eval.c:1830
 msgid "E687: Less targets than List items"
@@ -635,7 +631,7 @@ msgstr "E694: Operazione non valida per Funcref"
 
 #: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Non si pu� usare '%' con un numero con virgola"
+msgstr "E804: Non si pu� usare '%' con un Numero-a-virgola-mobile"
 
 #: ../eval.c:4478
 msgid "E110: Missing ')'"
@@ -645,6 +641,9 @@ msgstr "E110: Manca ')'"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Non posso indicizzare un Funcref"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Non posso indicizzare una variabile speciale"
+
 #: ../eval.c:4839
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -736,7 +735,7 @@ msgstr "E725: Chiamata di funzione dict in assenza di Dizionario: %s"
 
 #: ../eval.c:7453
 msgid "E808: Number or Float required"
-msgstr "E808: Ci vuole un numero intero o con virgola"
+msgstr "E808: Ci vuole un Numero o un Numero-a-virgola-mobile"
 
 #: ../eval.c:7503
 msgid "add() argument"
@@ -847,7 +846,7 @@ msgstr "E677: Errore in scrittura su file temporaneo"
 
 #: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
-msgstr "E805: Uso di un numero con virgola come intero"
+msgstr "E805: Uso di un Numero-a-virgola-mobile come Numero"
 
 #: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
@@ -861,6 +860,18 @@ msgstr "E745: Uso di Lista come Numero"
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Uso di Dizionario come Numero"
 
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Uso di Funcref come Numero-a-virgola-mobile"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Uso di Stringa come Numero-a-virgola-mobile"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Uso di Lista come Numero-a-virgola-mobile"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Uso di Dizionario come Numero-a-virgola-mobile"
+
 #: ../eval.c:16259
 msgid "E729: using Funcref as a String"
 msgstr "E729: uso di Funcref come Stringa"
@@ -873,6 +884,10 @@ msgstr "E730: uso di Lista come Stringa"
 msgid "E731: using Dictionary as a String"
 msgstr "E731: uso di Dizionario come Stringa"
 
+# nuovo
+msgid "E908: using an invalid value as a String"
+msgstr "E908: uso di un valore non valido come Stringa"
+
 #: ../eval.c:16619
 #, c-format
 msgid "E706: Variable type mismatch for: %s"
@@ -960,12 +975,14 @@ msgid "E129: Function name required"
 msgstr "E129: Nome funzione necessario"
 
 #: ../eval.c:17824
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: Il nome funzione deve iniziare con una maiuscola o \"s:\": %s"
+msgstr "E128: Il nome funzione deve iniziare con maiuscola o \"s:\": %s"
 
 #: ../eval.c:17833
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: Il nome funzione non pu� contenere una virgola: %s"
+msgstr "E884: Il nome della funzione non pu� contenere un due punti: %s"
 
 #: ../eval.c:18336
 #, c-format
@@ -1382,6 +1399,13 @@ msgstr "riga %<PRId64>: %s"
 msgid "cmd: %s"
 msgstr "com: %s"
 
+msgid "frame is zero"
+msgstr "al livello zero"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "al livello pi� alto: %d"
+
 #: ../ex_cmds2.c:322
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@@ -1422,8 +1446,7 @@ msgstr "E162: Buffer \"%s\" non salvato dopo modifica"
 #: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
-"Avviso: Entrato in altro buffer inaspettatamente (controllare "
-"autocomandi)"
+"Avviso: Entrato in altro buffer inaspettatamente (controllare autocomandi)"
 
 #: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
@@ -2301,19 +2324,19 @@ msgstr "[in formato DOS]"
 
 #: ../fileio.c:3801
 msgid "[mac]"
-msgstr "[MAC]"
+msgstr "[Mac]"
 
 #: ../fileio.c:3801
 msgid "[mac format]"
-msgstr "[in formato MAC]"
+msgstr "[in formato Mac]"
 
 #: ../fileio.c:3807
 msgid "[unix]"
-msgstr "[UNIX]"
+msgstr "[Unix]"
 
 #: ../fileio.c:3807
 msgid "[unix format]"
-msgstr "[in formato UNIX]"
+msgstr "[in formato Unix]"
 
 #: ../fileio.c:3831
 msgid "1 line, "
@@ -2518,7 +2541,7 @@ msgstr "E490: Non trovo alcuna piegatura"
 
 #: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Non posso create piegatura con il 'foldmethod' in uso"
+msgstr "E350: Non posso creare piegatura con il 'foldmethod' in uso"
 
 #: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
@@ -2681,11 +2704,6 @@ msgstr "E900: 'Job id' non valido"
 msgid "E901: Job table is full"
 msgstr "E901: Job table piena"
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr "E902: \"%s\" non � un esegubile"
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -2864,6 +2882,9 @@ msgstr "E46: Non posso cambiare la variabile read-only \"%s\""
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Non posso impostare la variabile read-only in ambiente protetto: \"%s\""
 
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Non posso usare una chiave nulla per il Dizionario"
+
 #: ../globals.h:1076
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Errore leggendo il file errori"
@@ -4087,12 +4108,12 @@ msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) Un altro programma pu� essere in edit sullo stesso file.\n"
-"    Se � cos�, attenzione a non trovarti con due versioni\n"
-"    differenti dello stesso file a cui vengono apportate modifiche."
+"(1) Un altro programma pu� essere in edit sullo stesso file.  Se � cos�,\n"
+"    attenzione a non finire con due sessioni differenti che modificano lo\n"
+"    stesso file.  Uscire da Vim, o continuare con cautela.\n"
 
 #: ../memline.c:3245
 msgid "  Quit, or continue with caution.\n"
@@ -4268,10 +4289,6 @@ msgstr "riga %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nome registro non valido: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Manutentore messaggi: Vlad Sandrini <marco@sandrini.biz>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Interruzione: "
@@ -4335,7 +4352,7 @@ msgstr "E766: Argomenti non sufficienti per printf()"
 
 #: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Numero con virgola atteso come argomento per printf()"
+msgstr "E807: Numero-a-virgola-mobile atteso come argomento per printf()"
 
 #: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
@@ -4526,7 +4543,8 @@ msgstr "E574: Tipo di registro sconosciuto: %d"
 msgid ""
 "E883: search pattern and expression register may not contain two or more "
 "lines"
-msgstr "E883: espressione di ricerca e registro dell'espressione non possono "
+msgstr ""
+"E883: espressione di ricerca e registro dell'espressione non possono "
 "contenere due o pi� righe"
 
 #: ../ops.c:5089
@@ -4794,6 +4812,14 @@ msgstr ""
 "\n"
 "Non posso impostare il contesto di sicurezza per "
 
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "Non posso impostare il contesto di sicurezza %s per %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "Non posso ottenere il contesto di sicurezza %s per %s. Lo rimuovo!"
+
 #: ../os_unix.c:1558 ../os_unix.c:1647
 #, c-format
 msgid "dlerror = \"%s\""
@@ -4890,6 +4916,7 @@ msgid "E777: String or List expected"
 msgstr "E777: aspettavo Stringa o Lista"
 
 #: ../regexp.c:359
+#, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: elemento non valido in %s%%[]"
 
@@ -5005,6 +5032,7 @@ msgid "External submatches:\n"
 msgstr "Sotto-corrispondenze esterne:\n"
 
 #: ../regexp.c:2470
+#, c-format
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA regexp) non riesco a ripetere %s"
 
@@ -5399,8 +5427,7 @@ msgstr "Valore errato per CHECKCOMPOUNDPATTERN in %s riga %d: %s"
 #: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr ""
-"Flag combinazione diverso in blocco affissi continuo in %s riga %d: %s"
+msgstr "Flag combinazione diverso in blocco affissi continuo in %s riga %d: %s"
 
 #: ../spell.c:4850
 #, c-format
@@ -5639,10 +5666,12 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' non ha %<PRId64> elementi"
 
 #: ../spell.c:8074
+#, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "Parola '%.*s' rimossa da %s"
 
 #: ../spell.c:8117
+#, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "Parola '%.*s' aggiunta a %s"
 
@@ -5720,6 +5749,9 @@ msgstr "Nessun elemento sintattico definito per questo buffer"
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argomento non ammesso: %s"
 
+msgid "syntax iskeyword "
+msgstr "syntax iskeyword "
+
 #: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5816,6 +5848,9 @@ msgstr "E847: Troppe inclusioni di sintassi"
 msgid "E789: Missing ']': %s"
 msgstr "E789: Manca ']': %s"
 
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: Caratteri in pi� dopo ']': %s]%s"
+
 #: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index d3061d3c5a..c6425324b1 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -1,11 +1,11 @@
-# Japanese translation for Vim			vim:set foldmethod=marker:
+# Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Last Change: 2013 Jul 06
+# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# 			  vim-jp (http://vim-jp.org/)
 #
-# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
 # Generated from ja.po, DO NOT EDIT.
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2013-07-06 15:00+0900\n"
+"POT-Creation-Date: 2016-02-01 09:02+0900\n"
+"PO-Revision-Date: 2016-02-01 09:08+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
-"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
@@ -34,7 +34,7 @@ msgstr "�������顼: ̤�ΤΥ��ץ���󷿤Ǥ�"
 
 #: ../buffer.c:92
 msgid "[Location List]"
-msgstr "[���ꥹ��]"
+msgstr "[�����������ꥹ��]"
 
 #: ../buffer.c:93
 msgid "[Quickfix List]"
@@ -277,7 +277,7 @@ msgstr "E810: ����ե�������ɹ��⤷���Ͻ�����Ǥ��ޤ���"
 
 #: ../diff.c:755
 msgid "E97: Cannot create diffs"
-msgstr "E97: ��ʬ������Ǥ��ޤ��� "
+msgstr "E97: ��ʬ������Ǥ��ޤ���"
 
 #: ../diff.c:966
 msgid "E816: Cannot read patch output"
@@ -293,7 +293,7 @@ msgstr "E99: ���ߤΥХåե��Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
 #: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: ��ʬ�⡼�ɤǤ���¾�ΥХåե����ѹ���ǽ�Ǥ�"
+msgstr "E793: ��ʬ�⡼�ɤǤ���¾�ΥХåե����ѹ��Ǥ��ޤ���"
 
 #: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
@@ -349,7 +349,7 @@ msgstr " ��(����)�䴰 (^L^N^P)"
 
 #: ../edit.c:86
 msgid " File name completion (^F^N^P)"
-msgstr "�ե�����̾�䴰 (^F^N^P)"
+msgstr " �ե�����̾�䴰 (^F^N^P)"
 
 #: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
@@ -377,7 +377,7 @@ msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
 
 #: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
-msgstr " �桼������䴰 (^U^N^P)"
+msgstr " �桼��������䴰 (^U^N^P)"
 
 #: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
@@ -679,6 +679,11 @@ msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
 
+#: ../eval.c:5807
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr ""
+"�����٥å����쥯��������ߤ��ޤ���! ���Ȥ��������Τ˥��꤬��­���ޤ���"
+
 #: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
@@ -721,7 +726,7 @@ msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
 #: ../eval.c:7383
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ؿ��ΰ��������ʲ᤮�ޤ�: %s"
+msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
 
 #: ../eval.c:7387
 #, c-format
@@ -826,18 +831,16 @@ msgid "sort() argument"
 msgstr "sort() ���"
 
 #: ../eval.c:13721
-#, fuzzy
 msgid "uniq() argument"
-msgstr "add() ���"
+msgstr "uniq() ���"
 
 #: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
 
 #: ../eval.c:13806
-#, fuzzy
 msgid "E882: Uniq compare function failed"
-msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
+msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
 
 #: ../eval.c:14085
 msgid "(Invalid)"
@@ -863,6 +866,18 @@ msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
 
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: �ؿ����ȷ�����ư���������Ȥ��ư��äƤ��ޤ���"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: ʸ�������ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: �ꥹ�ȷ�����ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: ���񷿤���ư���������Ȥ��ư��äƤ��ޤ�"
+
 #: ../eval.c:16259
 msgid "E729: using Funcref as a String"
 msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
@@ -961,14 +976,14 @@ msgid "E129: Function name required"
 msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
 
 #: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �ؿ�̾����ʸ���ǻϤޤ뤫�������ޤޤʤ���Фʤ�ޤ���: %s"
+msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
 
 #: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �ؿ�̾����ʸ���ǻϤޤ뤫�������ޤޤʤ���Фʤ�ޤ���: %s"
+msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
 
 #: ../eval.c:18336
 #, c-format
@@ -1081,7 +1096,7 @@ msgstr "E136: viminfo: ���顼��¿�᤮��Τ�, �ʹߤϥ����åפ��ޤ�"
 #: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfo�ե����� \"%s\"%s%s%s ���ɹ����� "
+msgstr "viminfo�ե����� \"%s\"%s%s%s ���ɹ�����"
 
 #: ../ex_cmds.c:1460
 msgid " info"
@@ -1357,6 +1372,10 @@ msgstr "E158: ̵���ʥХåե�̾�Ǥ�: %s"
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: ̵����sign���̻ҤǤ�: %<PRId64>"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: �ѹ��Ǥ��ʤ� sign �Ǥ�: %s"
+
 #: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (�󥵥ݡ���)"
@@ -1379,6 +1398,13 @@ msgstr "�� %<PRId64>: %s"
 msgid "cmd: %s"
 msgstr "���ޥ��: %s"
 
+msgid "frame is zero"
+msgstr "�ե졼�ब 0 �Ǥ�"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "�ǹ��٥�Υե졼��: %d"
+
 #: ../ex_cmds2.c:322
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@@ -1528,7 +1554,8 @@ msgstr "E197: ����� \"%s\" ������Ǥ��ޤ���"
 #. don't wait for return
 #: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Ex�⡼�ɤ�����ޤ�. �Ρ��ޥ�����ˤ�\"visual\"�����Ϥ��Ƥ�������."
+msgstr ""
+"Ex�⡼�ɤ�����ޤ�. �Ρ��ޥ�⡼�ɤ����ˤ�\"visual\"�����Ϥ��Ƥ�������."
 
 #: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
@@ -1553,7 +1580,7 @@ msgstr "�ؿ��κǸ�Ǥ�"
 
 #: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: �桼��������ޥ�ɤΤ����ޤ��ʻ��ѤǤ�"
+msgstr "E464: �桼����������ޥ�ɤΤ����ޤ��ʻ��ѤǤ�"
 
 #: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
@@ -1606,14 +1633,14 @@ msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������"
 #: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    ̾��        ���� �ϰ�  �䴰      ���"
+"    ̾��        ����       ���ɥ쥹  �䴰      ���"
 
 #: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
-msgstr "�桼��������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
+msgstr "�桼����������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
 
 #: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
@@ -1633,7 +1660,10 @@ msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
 
 #: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
-msgstr "E179: -�䴰�Τ���ΰ�����ɬ�פǤ�"
+msgstr "E179: -complete �ˤϰ�����ɬ�פǤ�"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr �ˤϰ�����ɬ�פǤ�"
 
 #: ../ex_docmd.c:4635
 #, c-format
@@ -1650,12 +1680,16 @@ msgstr "E183: �桼��������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
 
 #: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: ͽ��̾�ʤΤ�, �桼��������ޥ�ɤ����ѤǤ��ޤ���"
+msgstr "E841: ͽ��̾�ʤΤ�, �桼����������ޥ�ɤ����ѤǤ��ޤ���"
 
 #: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: ���Υ桼��������ޥ�ɤϤ���ޤ���: %s"
+msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: ̵���ʥ��ɥ쥹�������ͤǤ�: %s"
 
 #: ../ex_docmd.c:5219
 #, c-format
@@ -2019,11 +2053,11 @@ msgstr "�����ʥե�����̾"
 
 #: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
-msgstr " �ϥǥ��쥯�ȥ�Ǥ�"
+msgstr "�ϥǥ��쥯�ȥ�Ǥ�"
 
 #: ../fileio.c:397
 msgid "is not a file"
-msgstr " �ϥե�����ǤϤ���ޤ���"
+msgstr "�ϥե�����ǤϤ���ޤ���"
 
 #: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
@@ -2039,7 +2073,7 @@ msgstr "[�ե��������]"
 
 #: ../fileio.c:534
 msgid "[Permission Denied]"
-msgstr "[ǧ�Ĥ�����ޤ���]"
+msgstr "[���¤�����ޤ���]"
 
 #: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
@@ -2210,7 +2244,7 @@ msgstr " �Ѵ����顼"
 #: ../fileio.c:3509
 #, c-format
 msgid " in line %<PRId64>;"
-msgstr "�� %<PRId64>;"
+msgstr " �� %<PRId64>;"
 
 #: ../fileio.c:3519
 msgid "[Device]"
@@ -2650,11 +2684,6 @@ msgstr "E49: ̵���ʥ����������̤Ǥ�"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -2766,9 +2795,8 @@ msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
 
 #: ../globals.h:1055
-#, fuzzy
 msgid "E37: No write since last change"
-msgstr "[�Ǹ���ѹ�����¸����Ƥ��ޤ���]\n"
+msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ���"
 
 #: ../globals.h:1056
 msgid "E38: Null argument"
@@ -2810,7 +2838,7 @@ msgstr "E42: ���顼�Ϥ���ޤ���"
 
 #: ../globals.h:1067
 msgid "E776: No location list"
-msgstr "E776: ���ꥹ�ȤϤ���ޤ���"
+msgstr "E776: �����������ꥹ�ȤϤ���ޤ���"
 
 #: ../globals.h:1068
 msgid "E43: Damaged match string"
@@ -3831,7 +3859,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"���줫��.swp�ե�����������Ƥ�������\n"
+"����.swp�ե�����Ϻ�����Ƥ⹽���ޤ���\n"
 "\n"
 
 #. use msg() to start the scrolling properly
@@ -3845,7 +3873,7 @@ msgstr "   ���ߤΥǥ��쥯�ȥ�:\n"
 
 #: ../memline.c:1448
 msgid "   Using specified name:\n"
-msgstr "   ����̾���������:\n"
+msgstr "   �ʲ���̾���������:\n"
 
 #: ../memline.c:1450
 msgid "   In directory "
@@ -3901,7 +3929,7 @@ msgid ""
 "         user name: "
 msgstr ""
 "\n"
-"          �桼��̾: "
+"        �桼����̾: "
 
 #: ../memline.c:1568
 msgid "   host name: "
@@ -4050,12 +4078,12 @@ msgid ""
 msgstr ""
 "\n"
 "(1) �̤Υץ�����बƱ���ե�������Խ����Ƥ��뤫�⤷��ޤ���.\n"
-"    ���ξ��ˤ�, �ѹ��򤷤��ݤ˺ǽ�Ū��, Ʊ���ե�����ΰۤʤ�\n"
-"    2�ĤΥ��󥹥��󥹤��Ǥ��Ƥ��ޤ����Ȥ����դ��Ƥ�������."
+"    ���ξ��ˤ�, �ѹ��򤷤Ƥ��ޤ���1�ĤΥե�������Ф��ưۤʤ�2�Ĥ�\n"
+"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������."
 
 #: ../memline.c:3245
 msgid "  Quit, or continue with caution.\n"
-msgstr "  ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
+msgstr "    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
 
 #: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
@@ -4225,10 +4253,6 @@ msgstr "�� %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: ̵���ʥ쥸����̾: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "���ܸ��å���������/�ƽ�: ¼�� ��Ϻ <koron.kaoriya@gmail.com>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "�����: "
@@ -4479,6 +4503,11 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: ̤�ΤΥ쥸������ %d �Ǥ�"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr "E883: �����ѥ�����ȼ��쥸�����ˤ�2�԰ʾ��ޤ���ޤ���"
+
 #: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
@@ -4563,6 +4592,10 @@ msgstr "E522: termcap ��˸��Ĥ���ޤ���"
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ������ʸ���Ǥ� <%s>"
 
+#, c-format
+msgid "For option %s"
+msgstr "���ץ����: %s"
+
 #: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' �ˤ϶�ʸ���������Ǥ��ޤ���"
@@ -4740,6 +4773,14 @@ msgstr ""
 "\n"
 "�������ƥ�����ƥ����Ȥ�����Ǥ��ޤ��� "
 
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "�������ƥ�����ƥ����� %s �� %s ������Ǥ��ޤ���"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "�������ƥ�����ƥ����� %s �� %s ��������Ǥ��ޤ���. ������ޤ�!"
+
 #: ../os_unix.c:1558 ../os_unix.c:1647
 #, c-format
 msgid "dlerror = \"%s\""
@@ -4960,6 +5001,10 @@ msgstr "E554: %s{...} ���ʸˡ���顼������ޤ�"
 msgid "External submatches:\n"
 msgstr "��������ʬ����:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA ����ɽ��) �����֤��ޤ��� %s"
+
 #: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@@ -4968,6 +5013,9 @@ msgstr ""
 "E864: \\%#= �ˤ� 0, 1 �⤷���� 2 �Τߤ�³�����ޤ�������ɽ�����󥸥�ϼ�ư��"
 "�򤵤�ޤ���"
 
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "���Υѥ�����˥Хå��ȥ�å��� RE ���󥸥��Ŭ�Ѥ��ޤ�: "
+
 #: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) ���Ԥ���᤯����ɽ���ν�ü����ã���ޤ���"
@@ -4980,7 +5028,7 @@ msgstr "E866: (NFA ����ɽ��) ���֤����äƤ��ޤ�: %c"
 #: ../regexp_nfa.c:242
 #, c-format
 msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
+msgstr "E877: (NFA ����ɽ��) ̵����ʸ�����饹: %<PRId64>"
 
 #: ../regexp_nfa.c:1261
 #, c-format
@@ -5590,14 +5638,14 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' �ˤ� %<PRId64> �ĤΥ���ȥ�Ϥ���ޤ���"
 
 #: ../spell.c:8074
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "%s ����ñ�줬�������ޤ���"
+msgstr "ñ�� '%.*s' �� %s ����������ޤ���"
 
 #: ../spell.c:8117
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "%s ��ñ�줬�ɲä���ޤ���"
+msgstr "ñ�� '%.*s' �� %s ���ɲä���ޤ���"
 
 #: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
@@ -5673,6 +5721,9 @@ msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �����ʰ����Ǥ�: %s"
 
+msgid "syntax iskeyword "
+msgstr "���󥿥å����� iskeyword "
+
 #: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5769,6 +5820,10 @@ msgstr "E847: ��ʸ�μ�����(include)��¿�᤮�ޤ�"
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ������ޤ���: %s"
 
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: ']' �θ����;ʬ��ʸ��������ޤ�: %s]%s"
+
 #: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5874,7 +5929,7 @@ msgstr "E415: ͽ����������Ǥ�: %s"
 #: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
-msgstr "E416: ���椬������ޤ���: %s"
+msgstr "E416: ���椬����ޤ���: %s"
 
 #: ../syntax.c:6418
 #, c-format
@@ -6078,9 +6133,8 @@ msgstr "Vim: ���Ϥ��ɹ�����Υ��顼�ˤ�꽪λ���ޤ�...\n"
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
 #: ../undo.c:379
-#, fuzzy
 msgid "E881: Line count changed unexpectedly"
-msgstr "E834: ͽ�������ԥ�����Ȥ��Ѥ��ޤ���"
+msgstr "E881: ͽ�������ԥ�����Ȥ��Ѥ��ޤ���"
 
 #: ../undo.c:627
 #, c-format
@@ -6287,23 +6341,23 @@ msgstr "      �����ƥ� vimrc: \""
 
 #: ../version.c:672
 msgid "     user vimrc file: \""
-msgstr "        �桼�� vimrc: \""
+msgstr "      �桼���� vimrc: \""
 
 #: ../version.c:677
 msgid " 2nd user vimrc file: \""
-msgstr "     ��2�桼�� vimrc: \""
+msgstr "   ��2�桼���� vimrc: \""
 
 #: ../version.c:682
 msgid " 3rd user vimrc file: \""
-msgstr "     ��3�桼�� vimrc: \""
+msgstr "   ��3�桼���� vimrc: \""
 
 #: ../version.c:687
 msgid "      user exrc file: \""
-msgstr "         �桼�� exrc: \""
+msgstr "       �桼���� exrc: \""
 
 #: ../version.c:692
 msgid "  2nd user exrc file: \""
-msgstr "      ��2�桼�� exrc: \""
+msgstr "    ��2�桼���� exrc: \""
 
 #: ../version.c:699
 msgid "  fall-back for $VIM: \""
@@ -6379,7 +6433,7 @@ msgstr "Vim�γ�ȯ����礷�Ƥ�������!"
 
 #: ../version.c:828
 msgid "Become a registered Vim user!"
-msgstr "Vim����Ͽ�桼���ˤʤäƤ�������!"
+msgstr "Vim����Ͽ�桼�����ˤʤäƤ�������!"
 
 #: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
@@ -6391,7 +6445,7 @@ msgstr "�ܺ٤ʾ����           :help register<Enter>  "
 
 #: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�ܺ٤ϥ�˥塼�� �إ�ע����ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����   "
+msgstr "�ܺ٤ϥ�˥塼�� �إ��->���ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����"
 
 #: ../window.c:119
 msgid "Already only one window"
@@ -6429,6 +6483,9 @@ msgstr "E445: ¾�Υ�����ɥ��ˤ��ѹ�������ޤ�"
 msgid "E446: No file name under cursor"
 msgstr "E446: ��������β��˥ե�����̾������ޤ���"
 
+msgid "List or number required"
+msgstr "�ꥹ�Ȥ����ͤ�ɬ�פǤ�"
+
 #~ msgid "E831: bf_key_init() called with empty password"
 #~ msgstr "E831: bf_key_init() �����ѥ���ɤǸƤӽФ���ޤ���"
 
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index 6bdfcb426f..e12cfb7e70 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -1,11 +1,11 @@
-# Japanese translation for Vim			vim:set foldmethod=marker:
+# Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
 # Do ":help credits" in Vim to see a list of people who contributed.
 #
-# Last Change: 2013 Jul 06
+# Copyright (C) 2001-2016 MURAOKA Taro <koron.kaoriya@gmail.com>,
+# 			  vim-jp (http://vim-jp.org/)
 #
-# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
 # THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
 #
 # Original translations.
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2013-07-06 15:00+0900\n"
+"POT-Creation-Date: 2016-02-01 09:02+0900\n"
+"PO-Revision-Date: 2013-06-02-01 09:08+09n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
-"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
+"Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -34,7 +34,7 @@ msgstr "内部エラー: 未知のオプション型です"
 
 #: ../buffer.c:92
 msgid "[Location List]"
-msgstr "[場所リスト]"
+msgstr "[ロケーションリスト]"
 
 #: ../buffer.c:93
 msgid "[Quickfix List]"
@@ -277,7 +277,7 @@ msgstr "E810: 一時ファイルの読込もしくは書込ができません"
 
 #: ../diff.c:755
 msgid "E97: Cannot create diffs"
-msgstr "E97: 差分を作成できません "
+msgstr "E97: 差分を作成できません"
 
 #: ../diff.c:966
 msgid "E816: Cannot read patch output"
@@ -293,7 +293,7 @@ msgstr "E99: 現在のバッファは差分モードではありません"
 
 #: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: 差分モードである他のバッファは変更可能です"
+msgstr "E793: 差分モードである他のバッファは変更できません"
 
 #: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
@@ -349,7 +349,7 @@ msgstr " 行(全体)補完 (^L^N^P)"
 
 #: ../edit.c:86
 msgid " File name completion (^F^N^P)"
-msgstr "ファイル名補完 (^F^N^P)"
+msgstr " ファイル名補完 (^F^N^P)"
 
 #: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
@@ -377,7 +377,7 @@ msgstr " コマンドライン補完 (^V^N^P)"
 
 #: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
-msgstr " ユーザ定義補完 (^U^N^P)"
+msgstr " ユーザー定義補完 (^U^N^P)"
 
 #: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
@@ -679,6 +679,10 @@ msgstr "E696: リスト型にカンマがありません: %s"
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: リスト型の最後に ']' がありません: %s"
 
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr ""
+"ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
+
 #: ../eval.c:6475
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
@@ -721,7 +725,7 @@ msgstr "E117: 未知の関数です: %s"
 #: ../eval.c:7383
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が少な過ぎます: %s"
+msgstr "E119: 関数の引数が足りません: %s"
 
 #: ../eval.c:7387
 #, c-format
@@ -826,18 +830,16 @@ msgid "sort() argument"
 msgstr "sort() の引数"
 
 #: ../eval.c:13721
-#, fuzzy
 msgid "uniq() argument"
-msgstr "add() の引数"
+msgstr "uniq() の引数"
 
 #: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: ソートの比較関数が失敗しました"
 
 #: ../eval.c:13806
-#, fuzzy
 msgid "E882: Uniq compare function failed"
-msgstr "E702: ソートの比較関数が失敗しました"
+msgstr "E882: Uniq の比較関数が失敗しました"
 
 #: ../eval.c:14085
 msgid "(Invalid)"
@@ -863,6 +865,18 @@ msgstr "E745: リスト型を数値として扱っています"
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: 辞書型を数値として扱っています"
 
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: 文字列を浮動小数点数として扱っています"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: リスト型を浮動小数点数として扱っています"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: 辞書型を浮動小数点数として扱っています"
+
 #: ../eval.c:16259
 msgid "E729: using Funcref as a String"
 msgstr "E729: 関数参照型を文字列として扱っています"
@@ -961,14 +975,14 @@ msgid "E129: Function name required"
 msgstr "E129: 関数名が要求されます"
 
 #: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s"
+msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
 
 #: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: 関数名は大文字で始まるかコロンを含まなければなりません: %s"
+msgstr "E884: 関数名にはコロンは含められません: %s"
 
 #: ../eval.c:18336
 #, c-format
@@ -1081,7 +1095,7 @@ msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップし�
 #: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfoファイル \"%s\"%s%s%s を読込み中 "
+msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
 
 #: ../ex_cmds.c:1460
 msgid " info"
@@ -1357,6 +1371,10 @@ msgstr "E158: 無効なバッファ名です: %s"
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: 無効なsign識別子です: %<PRId64>"
 
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: 変更できない sign です: %s"
+
 #: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (非サポート)"
@@ -1379,6 +1397,13 @@ msgstr "行 %<PRId64>: %s"
 msgid "cmd: %s"
 msgstr "コマンド: %s"
 
+msgid "frame is zero"
+msgstr "フレームが 0 です"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "最高レベルのフレーム: %d"
+
 #: ../ex_cmds2.c:322
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
@@ -1528,7 +1553,8 @@ msgstr "E197: 言語を \"%s\" に設定できません"
 #. don't wait for return
 #: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Exモードに入ります. ノーマルに戻るには\"visual\"と入力してください."
+msgstr ""
+"Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
 
 #: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
@@ -1553,7 +1579,7 @@ msgstr "関数の最後です"
 
 #: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ユーザ定義コマンドのあいまいな使用です"
+msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
 
 #: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
@@ -1606,14 +1632,14 @@ msgstr "E174: コマンドが既にあります: 再定義するには ! を追�
 #: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    名前        引数 範囲  補完      定義"
+"    名前        引数       アドレス  補完      定義"
 
 #: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
-msgstr "ユーザ定義コマンドが見つかりませんでした"
+msgstr "ユーザー定義コマンドが見つかりませんでした"
 
 #: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
@@ -1633,7 +1659,10 @@ msgstr "E178: カウントの省略値が無効です"
 
 #: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
-msgstr "E179: -補完のための引数が必要です"
+msgstr "E179: -complete には引数が必要です"
+
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr には引数が必要です"
 
 #: ../ex_docmd.c:4635
 #, c-format
@@ -1646,16 +1675,20 @@ msgstr "E182: 無効なコマンド名です"
 
 #: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ユーザ定義コマンドは英大文字で始まらなければなりません"
+msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
 
 #: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: 予約名なので, ユーザ定義コマンドに利用できません"
+msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
 
 #: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: そのユーザ定義コマンドはありません: %s"
+msgstr "E184: そのユーザー定義コマンドはありません: %s"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: 無効なアドレスタイプ値です: %s"
 
 #: ../ex_docmd.c:5219
 #, c-format
@@ -2019,11 +2052,11 @@ msgstr "不正なファイル名"
 
 #: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
-msgstr " はディレクトリです"
+msgstr "はディレクトリです"
 
 #: ../fileio.c:397
 msgid "is not a file"
-msgstr " はファイルではありません"
+msgstr "はファイルではありません"
 
 #: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
@@ -2039,7 +2072,7 @@ msgstr "[ファイル過大]"
 
 #: ../fileio.c:534
 msgid "[Permission Denied]"
-msgstr "[認可がありません]"
+msgstr "[権限がありません]"
 
 #: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
@@ -2210,7 +2243,7 @@ msgstr " 変換エラー"
 #: ../fileio.c:3509
 #, c-format
 msgid " in line %<PRId64>;"
-msgstr "行 %<PRId64>;"
+msgstr " 行 %<PRId64>;"
 
 #: ../fileio.c:3519
 msgid "[Device]"
@@ -2650,11 +2683,6 @@ msgstr "E49: 無効なスクロール量です"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -2766,9 +2794,8 @@ msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
 
 #: ../globals.h:1055
-#, fuzzy
 msgid "E37: No write since last change"
-msgstr "[最後の変更が保存されていません]\n"
+msgstr "E37: 最後の変更が保存されていません"
 
 #: ../globals.h:1056
 msgid "E38: Null argument"
@@ -2810,7 +2837,7 @@ msgstr "E42: エラーはありません"
 
 #: ../globals.h:1067
 msgid "E776: No location list"
-msgstr "E776: 場所リストはありません"
+msgstr "E776: ロケーションリストはありません"
 
 #: ../globals.h:1068
 msgid "E43: Damaged match string"
@@ -3831,7 +3858,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"それから.swpファイルを削除してください\n"
+"元の.swpファイルは削除しても構いません\n"
 "\n"
 
 #. use msg() to start the scrolling properly
@@ -3845,7 +3872,7 @@ msgstr "   現在のディレクトリ:\n"
 
 #: ../memline.c:1448
 msgid "   Using specified name:\n"
-msgstr "   ある名前を使用中:\n"
+msgstr "   以下の名前を使用中:\n"
 
 #: ../memline.c:1450
 msgid "   In directory "
@@ -3901,7 +3928,7 @@ msgid ""
 "         user name: "
 msgstr ""
 "\n"
-"          ユーザ名: "
+"        ユーザー名: "
 
 #: ../memline.c:1568
 msgid "   host name: "
@@ -4050,12 +4077,12 @@ msgid ""
 msgstr ""
 "\n"
 "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
-"    この場合には, 変更をした際に最終的に, 同じファイルの異なる\n"
-"    2つのインスタンスができてしまうことに注意してください."
+"    この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
+"    インスタンスができてしまうので, そうしないように気をつけてください."
 
 #: ../memline.c:3245
 msgid "  Quit, or continue with caution.\n"
-msgstr "  終了するか, 注意しながら続けてください.\n"
+msgstr "    終了するか, 注意しながら続けてください.\n"
 
 #: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
@@ -4225,10 +4252,6 @@ msgstr "行 %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 無効なレジスタ名: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "日本語メッセージ翻訳/監修: 村岡 太郎 <koron.kaoriya@gmail.com>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "割込み: "
@@ -4479,6 +4502,11 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: 未知のレジスタ型 %d です"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
+
 #: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
@@ -4563,6 +4591,10 @@ msgstr "E522: termcap 内に見つかりません"
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 不正な文字です <%s>"
 
+#, c-format
+msgid "For option %s"
+msgstr "オプション: %s"
+
 #: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' には空文字列を設定できません"
@@ -4740,6 +4772,14 @@ msgstr ""
 "\n"
 "セキュリティコンテキストを設定できません "
 
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "セキュリティコンテキスト %s を %s に設定できません"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
+
 #: ../os_unix.c:1558 ../os_unix.c:1647
 #, c-format
 msgid "dlerror = \"%s\""
@@ -4960,6 +5000,10 @@ msgstr "E554: %s{...} 内に文法エラーがあります"
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA 正規表現) 繰り返せません %s"
+
 #: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
@@ -4968,6 +5012,9 @@ msgstr ""
 "E864: \\%#= には 0, 1 もしくは 2 のみが続けられます。正規表現エンジンは自動選"
 "択されます。"
 
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
+
 #: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
@@ -4980,7 +5027,7 @@ msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
 #: ../regexp_nfa.c:242
 #, c-format
 msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
+msgstr "E877: (NFA 正規表現) 無効な文字クラス: %<PRId64>"
 
 #: ../regexp_nfa.c:1261
 #, c-format
@@ -5590,14 +5637,14 @@ msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
 
 #: ../spell.c:8074
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "%s から単語が削除されました"
+msgstr "単語 '%.*s' が %s から削除されました"
 
 #: ../spell.c:8117
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "%s に単語が追加されました"
+msgstr "単語 '%.*s' が %s へ追加されました"
 
 #: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
@@ -5673,6 +5720,9 @@ msgstr "このバッファに定義された構文要素はありません"
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
 
+msgid "syntax iskeyword "
+msgstr "シンタックス用 iskeyword "
+
 #: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
@@ -5769,6 +5819,10 @@ msgstr "E847: 構文の取り込み(include)が多過ぎます"
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' がありません: %s"
 
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
+
 #: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
@@ -5874,7 +5928,7 @@ msgstr "E415: 予期せぬ等号です: %s"
 #: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
-msgstr "E416: 等号ががありません: %s"
+msgstr "E416: 等号がありません: %s"
 
 #: ../syntax.c:6418
 #, c-format
@@ -6078,9 +6132,8 @@ msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
 #: ../undo.c:379
-#, fuzzy
 msgid "E881: Line count changed unexpectedly"
-msgstr "E834: 予期せず行カウントが変わりました"
+msgstr "E881: 予期せず行カウントが変わりました"
 
 #: ../undo.c:627
 #, c-format
@@ -6287,23 +6340,23 @@ msgstr "      システム vimrc: \""
 
 #: ../version.c:672
 msgid "     user vimrc file: \""
-msgstr "        ユーザ vimrc: \""
+msgstr "      ユーザー vimrc: \""
 
 #: ../version.c:677
 msgid " 2nd user vimrc file: \""
-msgstr "     第2ユーザ vimrc: \""
+msgstr "   第2ユーザー vimrc: \""
 
 #: ../version.c:682
 msgid " 3rd user vimrc file: \""
-msgstr "     第3ユーザ vimrc: \""
+msgstr "   第3ユーザー vimrc: \""
 
 #: ../version.c:687
 msgid "      user exrc file: \""
-msgstr "         ユーザ exrc: \""
+msgstr "       ユーザー exrc: \""
 
 #: ../version.c:692
 msgid "  2nd user exrc file: \""
-msgstr "      第2ユーザ exrc: \""
+msgstr "    第2ユーザー exrc: \""
 
 #: ../version.c:699
 msgid "  fall-back for $VIM: \""
@@ -6379,7 +6432,7 @@ msgstr "Vimの開発を応援してください!"
 
 #: ../version.c:828
 msgid "Become a registered Vim user!"
-msgstr "Vimの登録ユーザになってください!"
+msgstr "Vimの登録ユーザーになってください!"
 
 #: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
@@ -6391,7 +6444,7 @@ msgstr "詳細な情報は           :help register<Enter>  "
 
 #: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "詳細はメニューの ヘルプ→スポンサー/登録 を参照して下さい   "
+msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
 #: ../window.c:119
 msgid "Already only one window"
@@ -6429,6 +6482,9 @@ msgstr "E445: 他のウィンドウには変更があります"
 msgid "E446: No file name under cursor"
 msgstr "E446: カーソルの下にファイル名がありません"
 
+msgid "List or number required"
+msgstr "リストか数値が必要です"
+
 #~ msgid "E831: bf_key_init() called with empty password"
 #~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
 
diff --git a/src/nvim/po/ja.sjis.po b/src/nvim/po/ja.sjis.po
deleted file mode 100644
index 7dac89e172..0000000000
--- a/src/nvim/po/ja.sjis.po
+++ /dev/null
@@ -1,8155 +0,0 @@
-# Japanese translation for Vim			vim:set foldmethod=marker:
-#
-# Do ":help uganda"  in Vim to read copying and usage conditions.
-# Do ":help credits" in Vim to see a list of people who contributed.
-#
-# Last Change: 2013 Jul 06
-#
-# Copyright (C) 2001-13 MURAOKA Taro <koron.kaoriya@gmail.com>
-# THIS FILE IS DISTRIBUTED UNDER THE VIM LICENSE.
-#
-# Original translations.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Vim 7.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2013-07-06 15:00+0900\n"
-"Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
-"Language-Team: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
-"Language: Japanese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=cp932\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "�I�v�V�����̒l�͎擾�ł��܂���"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "�����G���[: ���m�̃I�v�V�����^�ł�"
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[�ꏊ���X�g]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Quickfix���X�g]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr "E855: autocommand���R�}���h�̒�~�������N�����܂���"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: �o�b�t�@��1�‚��쐬�ł��Ȃ��̂�, �I�����܂�..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: �o�b�t�@���쐬�ł��Ȃ��̂�, ���̂��g�p���܂�..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: ������ꂽ�o�b�t�@�͂���܂���"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: �폜���ꂽ�o�b�t�@�͂���܂���"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: �j�����ꂽ�o�b�t�@�͂���܂���"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "1 �‚̃o�b�t�@���������܂���"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "%d �‚̃o�b�t�@���������܂���"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "1 �‚̃o�b�t�@���폜����܂���"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "%d �‚̃o�b�t�@���폜����܂���"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "1 �‚̃o�b�t�@���j������܂���"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "%d �‚̃o�b�t�@���j������܂���"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: �Ō�̃o�b�t�@�͉���ł��܂���"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: �ύX���ꂽ�o�b�t�@�͂���܂���"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: ���X�g�\\�������o�b�t�@�͂���܂���"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: �o�b�t�@ %<PRId64> �͂���܂���"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �Ō�̃o�b�t�@���z���Ĉړ��͂ł��܂���"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: �ŏ��̃o�b�t�@���O�ւ͈ړ��ł��܂���"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: �o�b�t�@ %<PRId64> �̕ύX�͕ۑ�����Ă��܂��� (! �ŕύX��j��)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: �x��: �t�@�C�����̃��X�g�����߂��܂�"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �o�b�t�@ %<PRId64> �����‚���܂���"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: %s �ɕ����̊Y��������܂���"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: %s �ɊY������o�b�t�@�͂���܂���ł���"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "�s %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: ���̖��O�̃o�b�t�@�͊��ɂ���܂�"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [�ύX����]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[���ҏW]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[�V�t�@�C��]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[�Ǎ��G���[]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[�ǐ�]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[�Ǎ���p]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �s --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �s --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�s %<PRId64> (�S�� %<PRId64>) --%d%%-- col "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[����]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "�w���v"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[�w���v]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[�v���r���[]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "�S��"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "����"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "�擪"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# �o�b�t�@���X�g:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[������]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- �T�C�� ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s �̃T�C��:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    �s=%<PRId64>  ���ʎq=%d  ���O=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: �R����������܂���"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: �s���ȃ��[�h�ł�"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ���l���K�v�ł�"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: �s���ȃp�[�Z���e�[�W�ł�"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64> �ȏ�̃o�b�t�@��diff�ł��܂���"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: �ꎞ�t�@�C���̓Ǎ��������͏������ł��܂���"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: �������쐬�ł��܂��� "
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: patch�̏o�͂�Ǎ��߂܂���"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: diff�̏o�͂�Ǎ��߂܂���"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: ���݂̃o�b�t�@�͍������[�h�ł͂���܂���"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: �������[�h�ł��鑼�̃o�b�t�@�͕ύX�”\\�ł�"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: �������[�h�ł��鑼�̃o�b�t�@�͂���܂���"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr ""
-"E101: �������[�h�̃o�b�t�@��2�ˆȏ゠��̂ŁA�ǂ���g��������ł��܂���"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �o�b�t�@ \"%s\" �����‚���܂���"
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: �o�b�t�@ \"%s\" �͍������[�h�ł͂���܂���"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: �\\�������o�b�t�@���ύX�ύX����܂���"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: ������Escape�͎g�p�ł��܂���"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: �L�[�}�b�v�t�@�C�������‚���܂���"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: :source �Ŏ捞�ރt�@�C���ȊO�ł� :loadkeymap ���g���܂���"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: ��̃L�[�}�b�v�G���g��"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " �L�[���[�h�⊮ (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ���[�h (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " �s(�S��)�⊮ (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr "�t�@�C�����⊮ (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " �^�O�⊮ (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " �p�X�p�^�[���⊮ (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " ��`�⊮ (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " �����⊮ (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " �V�\\�[���X�⊮ (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " �R�}���h���C���⊮ (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " ���[�U��`�⊮ (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " �I���j�⊮ (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " �Ԃ�C����� (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " �Ǐ��L�[���[�h�⊮ (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�i���̍Ō�Ƀq�b�g"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: ��Ԋ֐����E�B���h�E��ύX���܂���"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: �⊮�֐����e�L�X�g���폜���܂���"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' �I�v�V��������ł�"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' �I�v�V��������ł�"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "�������X�L������: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (�}��) �X�N���[��(^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�u��) �X�N���[�� (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "�X�L������: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "�^�O���X�L������."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " �lj���"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- ������..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "�n�߂ɖ߂�"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "���̍s�̒P��"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "�B��̊Y��"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "%d �Ԗڂ̊Y�� (�S�Y�� %d �’�)"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "%d �Ԗڂ̊Y��"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: �\\�����ʕ����� :let �ɂ���܂���"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: ���X�g�̃C���f�b�N�X���͈͊O�ł�: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ����`�̕ϐ��ł�: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ']' �����‚���܂���"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �̈����̓��X�g�^�łȂ���΂Ȃ�܂���"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �̈����̓��X�g�^�܂��͎����^�łȂ���΂Ȃ�܂���"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: �����^�ɋ�̃L�[���g�����Ƃ͂ł��܂���"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: ���X�g�^���K�v�ł�"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: �����^���K�v�ł�"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �֐��̈��������߂��܂�: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: �����^�ɃL�[�����݂��܂���: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �֐� %s �͒�`�ςł�, �Ē�`����ɂ� ! ��lj����Ă�������"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: �����^���ɃG���g�������ɑ��݂��܂�"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: �֐��Q�ƌ^���v������܂�"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: [:] �������^�Ƒg�ݍ��킹�Ă͎g���܂���"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: �قȂ����^�̕ϐ��ł� %s="
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ���m�̊֐��ł�: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: �s���ȕϐ����ł�: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: ���������_���𕶎���Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: �^�[�Q�b�g�����X�g�^���̗v�f�������Ȃ��ł�"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: �^�[�Q�b�g�����X�g�^���̗v�f���������ł�"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "���X�g�^�̒l��2�ˆȏ�� ; �����o����܂���"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: %s �̒l���ꗗ�\\���ł��܂���"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ���X�g�^�Ǝ����^�ȊO�̓C���f�b�N�X�w��ł��܂���"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] �͍Ō�łȂ���΂����܂���"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] �ɂ̓��X�g�^�̒l���K�v�ł�"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: ���X�g�^�ϐ��Ƀ^�[�Q�b�g���������v�f������܂�"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: ���X�g�^�ϐ��ɏ\\���Ȑ��̗v�f������܂���"
-
-#
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: :for �̌�� \"in\" ������܂���"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: �J�b�R '(' ������܂���: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: ���̕ϐ��͂���܂���: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: (�A��)���b�N����ɂ͕ϐ��̓���q���[�߂��܂�"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: '?' �̌�� ':' ������܂���"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: ���X�g�^�̓��X�g�^�Ƃ�����r�ł��܂���"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: ���X�g�^�ɂ͖����ȑ���ł�"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: �����^�͎����^�Ƃ�����r�ł��܂���"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: �����^�ɂ͖����ȑ���ł�"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: �֐��Q�ƌ^�͊֐��Q�ƌ^�Ƃ�����r�ł��܂���"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: �֐��Q�ƌ^�ɂ͖����ȑ���ł�"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: '%' �𕂓������_���Ƒg�ݍ��킹�Ă͎g���܂���"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ')' �����‚���܂���"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: �֐��Q�ƌ^�̓C���f�b�N�X�ł��܂���"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: �I�v�V������������܂���: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: ���m�̃I�v�V�����ł�: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ���p�� (\") ������܂���: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ���p�� (') ������܂���: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ���X�g�^�ɃJ���}������܂���: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ���X�g�^�̍Ō�� ']' ������܂���: %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: �����^�ɃR����������܂���: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: �����^�ɏd���L�[������܂�: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: �����^�ɃJ���}������܂���: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: �����^�̍Ō�� '}' ������܂���: %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: �\\������ɂ͕ϐ��̓���q���[�߂��܂�"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �֐��̈��������߂��܂�: %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �֐��̖����Ȉ����ł�: %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ���m�̊֐��ł�: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �֐��̈��������ȉ߂��܂�: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: �X�N���v�g�ȊO��<SID>���g���܂���: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: �����p�֐����Ă΂�܂���������������܂���: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: ���l�����������_�����K�v�ł�"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "add() �̈���"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ���������߂��܂�"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() �͑}�����[�h�ł������p�ł��܂���"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: �L�[�͊��ɑ��݂��܂�: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "extend() �̈���"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "map() �̈���"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "filter() �̈���"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld �s: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ���m�̊֐��ł�: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() �� inputsave() ���������Ă΂�܂���"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "insert() �̈���"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �͈͎w��͋��‚���Ă��܂���"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() �ɂ͖����Ȍ^�ł�"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: �X�g���C�h(�O�i��)�� 0 �ł�"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: �J�n�ʒu���I���ʒu���z���܂���"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<��>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "remove() �̈���"
-
-# Added at 10-Mar-2004.
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �V���{���b�N�����N�����߂��܂� (�z�‚��Ă���”\\��������܂�)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "reverse() �̈���"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "sort() �̈���"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "add() �̈���"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: �\\�[�g�̔�r�֐������s���܂���"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: �\\�[�g�̔�r�֐������s���܂���"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(����)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: �ꎞ�t�@�C���������ɃG���[���������܂���"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: ���������_���𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: �֐��Q�ƌ^�𐔒l�Ƃ��Ĉ����Ă��܂��B"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: ���X�g�^�𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: �����^�𐔒l�Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: �֐��Q�ƌ^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: ���X�g�^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: �����^�𕶎���Ƃ��Ĉ����Ă��܂�"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �ϐ��̌^����v���܂���: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: �ϐ� %s ���폜�ł��܂���"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: �֐��Q�ƌ^�ϐ����͑啶���Ŏn�܂�Ȃ���΂Ȃ�܂���: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �ϐ����������̊֐����ƏՓ˂��܂�: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: �l�����b�N����Ă��܂�: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "�s��"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s �̒l��ύX�ł��܂���"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: �R�s�[�����ɂ͕ϐ��̓���q���[�߂��܂�"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ����`�̊֐��ł�: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ������܂���: %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: �����ł� g: �͎g���܂���"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �s���Ȉ����ł�: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ���������d�����Ă��܂�: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ������܂���"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �֐������ϐ����ƏՓ˂��܂�: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �֐� %s ���Ē�`�ł��܂���: �g�p���ł�"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �֐������X�N���v�g�̃t�@�C�����ƈ�v���܂���: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �֐������v������܂�"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �֐����͑啶���Ŏn�܂邩�R�������܂܂Ȃ���΂Ȃ�܂���: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �֐����͑啶���Ŏn�܂邩�R�������܂܂Ȃ���΂Ȃ�܂���: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �֐� %s ���폜�ł��܂���: �g�p���ł�"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �֐��ďo�̓���q���� 'maxfuncdepth' �𒴂��܂���"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s �����s���ł�"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s �����f����܂���"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s �� #%<PRId64> ��Ԃ��܂���"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s �� %s ��Ԃ��܂���"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "%s �̎��s���p�����ł�"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: �֐��O�� :return ������܂���"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# �O���[�o���ϐ�:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "�Â��t�@�C���͂���܂���"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  16�i�� %02x,  8�i�� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, 16�i�� %04x, 8�i�� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, 16�i�� %08x, 8�i�� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: �s�����ꎩ�g�ɂ͈ړ��ł��܂���"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "1 �s���ړ�����܂���"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> �s���ړ�����܂���"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> �s���t�B���^��������܂���"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *�t�B���^* autocommand�͌��݂̃o�b�t�@��ύX���Ă͂����܂���"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[�Ō�̕ύX���ۑ�����Ă��܂���]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s �s��: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �G���[�����߂���̂�, �ȍ~�̓X�L�b�v���܂�"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfo�t�@�C�� \"%s\"%s%s%s ��Ǎ��ݒ� "
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ���"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " �}�[�N"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " ���t�@�C���Q"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ���s"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: viminfo�t�@�C���������݂ł��܂���: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: viminfo�t�@�C�� %s ��ۑ��ł��܂���!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "viminfo�t�@�C�� \"%s\" �������ݒ�"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# ���� viminfo �t�@�C���� Vim %s �ɂ���Đ�������܂���.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# �ύX����ۂɂ͏\\�����ӂ��Ă�������!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# ���̃t�@�C���������ꂽ���� 'encoding' �̒l\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "�s���Ȑ擪�����ł�"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "�t�@�C���𕔕��I�ɕۑ����܂���?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: �o�b�t�@�𕔕��I�ɕۑ�����ɂ� ! ���g���Ă�������"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "�����̃t�@�C�� \"%s\" ���㏑�����܂���?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "�X���b�v�t�@�C�� \"%s\" �����݂��܂�. �㏑�����������܂���?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: �X���b�v�t�@�C�������݂��܂�: %s (:silent! ��lj��ŏ㏑)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: �o�b�t�@ %<PRId64> �ɂ͖��O������܂���"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: �t�@�C���͕ۑ�����܂���ł���: 'write' �I�v�V�����ɂ�薳���ł�"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" �ɂ� 'readonly' �I�v�V�������ݒ肳��Ă��܂�.\n"
-"�㏑�����������܂���?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"�t�@�C�� \"%s\" �̃p�[�~�b�V�������Ǎ���p�ł�.\n"
-"����ł����炭�������ނ��Ƃ͉”\\�ł�.\n"
-"�p�����܂���?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" �͓Ǎ���p�ł� (���������ɂ� ! ��lj�)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: autocommand���\\�������V�����o�b�t�@ %s ���폜���܂���"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: ���ł͂Ȃ������� :z �ɓn����܂���"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim�ł̓V�F���R�}���h���g���܂���"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ���K�\\���͕����ŋ�؂邱�Ƃ��ł��܂���"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s �ɒu�����܂���? (y/n/a/q/l/^E/^Y)"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(�����܂�܂���) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1 �ӏ��Y�����܂���"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1 �ӏ��u�����܂���"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> �ӏ��Y�����܂���"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> �ӏ��u�����܂���"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " (�v 1 �s��)"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " (�v %<PRId64> �s��)"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ���ċA�I�ɂ͎g���܂���"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global�R�}���h�ɐ��K�\\�����w�肳��Ă��܂���"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "�p�^�[�����S�Ă̍s�Ō��‚���܂���: %s"
-
-#: ../ex_cmds.c:4510
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "�p�^�[���͌��‚���܂���ł���: %s"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# �Ō�ɒu�����ꂽ������:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: �Q�ĂȂ��ł�������"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: �c�O�ł��� '%s' �̃w���v�� %s �ɂ͂���܂���"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: �c�O�ł��� %s �ɂ̓w���v������܂���"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "�c�O�ł����w���v�t�@�C�� \"%s\" �����‚���܂���"
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �f�B���N�g���ł͂���܂���: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: �����ݗp�� %s ���J���܂���"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �Ǎ��p�� %s ���J���܂���"
-
-# Added at 29-Apr-2004.
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: 1�‚̌���̃w���v�t�@�C���ɕ����̃G���R�[�h�����݂��Ă��܂�: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: �^�O \"%s\" ���t�@�C�� %s/%s �ɏd�����Ă��܂�"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: ���m��sign�R�}���h�ł�: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: sign��������܂���"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: sign�̒�`���������‚���܂���"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ������sign�̃e�L�X�g�ł�: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: ���m��sign�ł�: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: sign�̔ԍ�������܂���"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: �����ȃo�b�t�@���ł�: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ������sign���ʎq�ł�: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (��T�|�[�g)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[�폜��]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�f�o�b�O���[�h�ɓ���܂�. ������ɂ� \"cont\" �Ɠ��͂��Ă�������."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�s %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "�R�}���h: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "�u���[�N�|�C���g \"%s%s\" �s %<PRId64>"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �u���[�N�|�C���g�����‚���܂���: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "�u���[�N�|�C���g����`����Ă��܂���"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �s %<PRId64>"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ���߂� \":profile start {fname}\" �����s���Ă�������"
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "�ύX�� \"%s\" �ɕۑ����܂���?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "����"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: �o�b�t�@ \"%s\" �̕ύX�͕ۑ�����Ă��܂���"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "�x��: �\\���������o�b�t�@�ֈړ����܂��� (autocommands �𒲂ׂĂ�������)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: �ҏW����t�@�C����1�‚�������܂���"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: �ŏ��̃t�@�C�����O�ɂ͍s���܂���"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: �Ō�̃t�@�C�����z���Č�ɂ͍s���܂���"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ���̃R���p�C���ɂ͑Ή����Ă��܂���: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\" �� \"%s\" ���猟����"
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\" ��������"
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' �̒��ɂ͌��‚���܂���: \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "�f�B���N�g���͎捞�߂܂���: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\" ���捞�߂܂���"
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�s %<PRId64>: \"%s\" ���捞�߂܂���"
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\" ���捞��"
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�s %<PRId64>: %s ���捞��"
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s �̎捞������"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "���[�h�s"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ����"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ����"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "�‹��ϐ�"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "�G���[�n���h��"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: �x��: �s��؂��s���ł�. ^M ���Ȃ��̂ł��傤"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish ���捞�X�N���v�g�ȊO�Ŏg�p����܂���"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "���݂� %s����: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: ����� \"%s\" �ɐݒ�ł��܂���"
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Ex���[�h�ɓ���܂�. �m�[�}���ɖ߂�ɂ�\"visual\"�Ɠ��͂��Ă�������."
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: �t�@�C���̏I���ʒu"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: �R�}���h���ċA�I�߂��܂�"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: ��O���ߑ�����܂���ł���: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "�捞�t�@�C���̍Ō�ł�"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "�֐��̍Ō�ł�"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ���[�U��`�R�}���h�̂����܂��Ȏg�p�ł�"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: �G�f�B�^�̃R�}���h�ł͂���܂���"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: �t���܂͈̔͂��w�肳��܂���"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "�t���܂͈̔͂��w�肳��܂���, ���ւ��܂���?"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: w �������� w>> ���g�p����������"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: ���̃o�[�W�����ł͂��̃R�}���h�͗��p�ł��܂���, ���߂�Ȃ���"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: �t�@�C������ 1 �‚ɂ��Ă�������"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "�ҏW���ׂ��t�@�C���� 1 �‚���܂���, �I�����܂���?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "�ҏW���ׂ��t�@�C�������� %d �‚���܂���, �I�����܂���?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: �ҏW���ׂ��t�@�C���� 1 �‚���܂�"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: �ҏW���ׂ��t�@�C�������� %<PRId64> �‚���܂�"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: �R�}���h�����ɂ���܂�: �Ē�`����ɂ� ! ��lj����Ă�������"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    ���O        ���� �͈�  �⊮      ��`"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "���[�U��`�R�}���h�����‚���܂���ł���"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: �����͒�`����Ă��܂���"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: �����̐��������ł�"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: �J�E���g��2�d�w�肷�邱�Ƃ͂ł��܂���"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: �J�E���g�̏ȗ��l�������ł�"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -�⊮�̂��߂̈������K�v�ł�"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: �����ȑ����ł�: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: �����ȃR�}���h���ł�"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ���[�U��`�R�}���h�͉p�啶���Ŏn�܂�Ȃ���΂Ȃ�܂���"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: �\\�񖼂Ȃ̂�, ���[�U��`�R�}���h�ɗ��p�ł��܂���"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ���̃��[�U��`�R�}���h�͂���܂���: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: �����ȕ⊮�w��ł�: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �⊮�����̓J�X�^���⊮�ł����g�p�ł��܂���"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: �J�X�^���⊮�ɂ͈����Ƃ��Ċ֐����K�v�ł�"
-
-#: ../ex_docmd.c:5257
-#, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �J���[�X�L�[�� '%s' �����‚���܂���"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "Vim �g������A�₠!"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: �Ō�̃^�u�y�[�W��‚��邱�Ƃ͂ł��܂���"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "���Ƀ^�u�y�[�W��1�‚�������܂���"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "�^�u�y�[�W %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "�X���b�v�t�@�C��������܂���"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr ""
-"E747: �o�b�t�@���C������Ă���̂�, �f�B���N�g����ύX�ł��܂��� (! ��lj���"
-"�㏑)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: �O�̃f�B���N�g���͂���܂���"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: ���m"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize �ɂ�2�‚̐��l�̈������K�v�ł�"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr ""
-"E188: ���̃v���b�g�z�[���ɂ̓E�B���h�E�ʒu�̎擾�@�\\�͎�������Ă��܂���"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos �ɂ�2�‚̐��l�̈������K�v�ł�"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: �f�B���N�g�����쐬�ł��܂���: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" �����݂��܂� (�㏑����ɂ� ! ��lj����Ă�������)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: \"%s\" �������ݗp�Ƃ��ĊJ���܂���"
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ������1�����̉p�������p�� (' �� `) �łȂ���΂����܂���"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �̍ċA���p���[���Ȃ�߂��܂���"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: '#'��u�������镛�t�@�C���̖��O������܂���"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: \"<afile>\"��u��������autocommand�̃t�@�C����������܂���"
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: \"<abuf>\"��u��������autocommand�o�b�t�@�ԍ�������܂���"
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: \"<amatch>\"��u��������autocommand�̊Y����������܂���"
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: \"<sfile>\"��u�������� :source �Ώۃt�@�C����������܂���"
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: \"<slnum>\"��u��������s�ԍ�������܂���"
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr ""
-"E499: '%' �� '#' �������t�@�C���Ȃ̂� \":p:h\" �𔺂�Ȃ��g�����͂ł��܂���"
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: �󕶎���Ƃ��ĕ]������܂���"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: viminfo�t�@�C����Ǎ��p�Ƃ��ĊJ���܂���"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: 'Vim' �Ŏn�܂��O�� :throw �ł��܂���"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "��O���������܂���: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "��O���������܂���: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "��O���j������܂���: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, �s %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "��O���ߑ�����܂���: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s �ɂ�薢�����Ԃ������܂���"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s ���ĊJ���܂���"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s ���j������܂���"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "��O"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "�G���[�Ɗ�����"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "�G���["
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "������"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: :if �̓���q���[�߂��܂�"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :if �̂Ȃ� :endif ������܂�"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :if �̂Ȃ� :else ������܂�"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :if �̂Ȃ� :elseif ������܂�"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: ������ :else ������܂�"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :else �̌�� :elseif ������܂�"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: :while �� :for �̓���q���[�߂��܂�"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :while �� :for �̂Ȃ� :continue ������܂�"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :while �� :for �̂Ȃ� :break ������܂�"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: :endfor �� :while �Ƒg�ݍ��킹�Ă��܂�"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: :endwhile �� :for �Ƒg�ݍ��킹�Ă��܂�"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: :try �̓���q���[�߂��܂�"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :try �̂Ȃ� :catch ������܂�"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :finally �̌�� :catch ������܂�"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :try �̂Ȃ� :finally ������܂�"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: ������ :finally ������܂�"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :try �̂Ȃ� :endtry �ł�"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: �֐��̊O�� :endfunction ������܂���"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: ���݂͑��̃o�b�t�@��ҏW���邱�Ƃ͋�����܂���"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: ���݂̓o�b�t�@����ύX���邱�Ƃ͋�����܂���"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "�^�O��"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " �t�@�C�����\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "�I�v�V���� 'history' ���[���ł�"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ���ڂ̗��� (�V�������̂���Â����̂�):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "�R�}���h���C��"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "����������"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "��"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "���͍s"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ���R�}���h���𒴂��܂���"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: �A�N�e�B�u�ȃE�B���h�E���o�b�t�@���폜����܂���"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: �p�X�����߂��ĕ⊮�ł��܂���"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: �����ȃp�X�ł�: '**[���l]' ��path�̍Ōォ '%s' �������ĂȂ��Ƃ����܂�"
-"��."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath�ɂ͂���ȏ� \"%s\" �Ƃ����t�@�C��������܂���"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: �p�X�ɂ͂���ȏ� \"%s\" �Ƃ����t�@�C��������܂���"
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: autocommand���o�b�t�@���o�b�t�@����ύX���܂���"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "�s���ȃt�@�C����"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr " �̓f�B���N�g���ł�"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr " �̓t�@�C���ł͂���܂���"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[�V�t�@�C��]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[�V�K�f�B���N�g��]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[�t�@�C���ߑ�]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[�F�‚�����܂���]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre autocommand ���t�@�C����Ǎ��s�‚ɂ��܂���"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre autocommand �͌��݂̃o�b�t�@��ς����܂���"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: �W�����͂���Ǎ���...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: �ϊ����t�@�C����Ǎ��s�‚ɂ��܂���"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[FIFO/�\\�P�b�g]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[FIFO]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[�\\�P�b�g]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr "[�L�����N�^�E�f�o�C�X]"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[CR��]"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[���s����]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[���ϊ�]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[�ϊ���]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> �s�ڂŕϊ��G���[]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> �s�ڂ̕s���ȃo�C�g]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[�Ǎ��G���[]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "�ϊ��ɕK�v�Ȉꎞ�t�@�C�������‚���܂���"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "'charconvert' �ɂ��ϊ������s���܂���"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "'charconvert' �̏o�͂�Ǎ��߂܂���ł���"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwrite�o�b�t�@�̊Y������autocommand�͑��݂��܂���"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: �ۑ�����o�b�t�@��autocommand���폜��������܂���"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: autocommand���\\�����ʕ��@�ōs����ύX���܂���"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "�̓t�@�C���ł������݉”\\�f�o�C�X�ł�����܂���"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "�͓Ǎ���p�ł� (���������ɂ� ! ��lj�)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �o�b�N�A�b�v�t�@�C����ۑ��ł��܂��� (! ��lj��ŋ����ۑ�)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: �o�b�N�A�b�v�t�@�C����‚���ۂɃG���[���������܂��� (! ��lj��ŋ���)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �o�b�N�A�b�v�p�t�@�C����Ǎ��߂܂��� (! ��lj��ŋ����Ǎ�)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �o�b�N�A�b�v�t�@�C�������܂��� (! ��lj��ŋ����쐬)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �o�b�N�A�b�v�t�@�C�������܂��� (! ��lj��ŋ����쐬)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �ۑ��p�ꎞ�t�@�C�������‚���܂���"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: �ϊ��ł��܂��� (! ��lj��ŕϊ������ɕۑ�)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �����N���ꂽ�t�@�C���ɏ����߂܂���"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �����ݗp�Ƀt�@�C�����J���܂���"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: fsync �Ɏ��s���܂���"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �‚��邱�ƂɎ��s"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: �����݃G���[, �ϊ����s (�㏑����ɂ� 'fenc' ����ɂ��Ă�������)"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: �����݃G���[, �ϊ����s, �s�� %<PRId64> (�㏑����ɂ� 'fenc' ����ɂ���"
-"��������)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: �����݃G���[, (�t�@�C���V�X�e�������t?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " �ϊ��G���["
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr "�s %<PRId64>;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[�f�o�C�X]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[�V]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " �lj�"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ������"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: patchmode: ���{�t�@�C����ۑ��ł��܂���"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: ��̌��{�t�@�C����touch�ł��܂���"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: �o�b�N�A�b�v�t�@�C���������܂���"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"�x��: ���{�t�@�C��������ꂽ���ύX����܂���\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "�t�@�C���̕ۑ��ɐ�������܂ŃG�f�B�^���I�����Ȃ��ł�������!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[dos�t�H�[�}�b�g]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[mac�t�H�[�}�b�g]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[unix�t�H�[�}�b�g]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 �s, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> �s, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 ����"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ����"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[�ŏI�s���s���S]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "�x��: �Ǎ��񂾌�Ƀt�@�C���ɕύX������܂���!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "�{���ɏ㏑�����܂���"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: \"%s\" �������ݒ��̃G���[�ł�"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: \"%s\" ��‚��鎞�ɃG���[�ł�"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: \"%s\" ��Ǎ����̃G���[�ł�"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: autocommand �� FileChangedShell ���o�b�t�@���폜���܂���"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: �t�@�C�� \"%s\" �͊��ɑ��݂��܂���"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr "W12: �x��: �t�@�C�� \"%s\" ���ύX����Vim�̃o�b�t�@���ύX����܂���"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "�ڍׂ� \":help W12\" ���Q�Ƃ��Ă�������"
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: �x��: �t�@�C�� \"%s\" �͕ҏW�J�n��ɕύX����܂���"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "�ڍׂ� \":help W11\" ���Q�Ƃ��Ă�������"
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: �x��: �t�@�C�� \"%s\" �̃��[�h���ҏW�J�n��ɕύX����܂���"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "�ڍׂ� \":help W16\" ���Q�Ƃ��Ă�������"
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: �x��: �t�@�C�� \"%s\" �͕ҏW�J�n��ɍ쐬����܂���"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "�x��"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"&OK\n"
-"�t�@�C���Ǎ�(&L)"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: \"%s\" �������[�h���鏀�����ł��܂���ł���"
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: \"%s\" �̓����[�h�ł��܂���ł���"
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--�폜��--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "autocommand: %s <�o�b�t�@=%d> �������I�ɍ폜����܂�"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: ���̃O���[�v�͂���܂���: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * �̌�ɕs���ȕ���������܂���: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: ���̂悤�ȃC�x���g�͂���܂���: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: ���̂悤�ȃO���[�v�������̓C�x���g�͂���܂���: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Auto-Commands ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <�o�b�t�@=%d>: �����ȃo�b�t�@�ԍ��ł� "
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: �S�ẴC�x���g�ɑ΂��Ă�autocommand�͎��s�ł��܂���"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "�Y������autocommand�͑��݂��܂���"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand�̓���q���[�߂��܂�"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands for \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "%s �����s���Ă��܂�"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "autocommand %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: { ������܂���."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: } ������܂���."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: �܏�݂�����܂���"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ���݂� 'foldmethod' �ł͐܏�݂��쐬�ł��܂���"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ���݂� 'foldmethod' �ł͐܏�݂��폜�ł��܂���"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �s���܏�܂�܂��� "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: �Ǎ��o�b�t�@�֒lj�"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: �ċA�I�}�b�s���O"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s �Ƃ����O���[�o���Z�k���͂͊��ɑ��݂��܂�"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s �Ƃ����O���[�o���}�b�s���O�͊��ɑ��݂��܂�"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s �Ƃ����Z�k���͂͊��ɑ��݂��܂�"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s �Ƃ����}�b�s���O�͊��ɑ��݂��܂�"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "�Z�k���͂͌��‚���܂���ł���"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "�}�b�s���O�͌��‚���܂���ł���"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: �s���ȃ��[�h"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--�o�b�t�@�ɍs������܂���--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: �R�}���h�����f����܂���"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: �������K�v�ł�"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ �̌�� / �� ? �� & �łȂ���΂Ȃ�܂���"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: �R�}���h���C���ł͖����ł�; <CR>�Ŏ��s, CTRL-C�ł�߂�"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ���݂̃f�B���N�g����^�O�����ł�exrc/vimrc�̃R�}���h�͋��‚���܂���"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ������܂���"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ������܂���"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ������܂���"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ������܂���"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while �̂Ȃ� :endwhile ������܂�"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor �̂Ȃ� :for ������܂�"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �t�@�C�������݂��܂� (! ��lj��ŏ㏑)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: �R�}���h�����s���܂���"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �����G���[�ł�"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "�����܂�܂���"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: �����ȃA�h���X�ł�"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: �����Ȉ����ł�"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: �����Ȉ����ł�: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: �����Ȏ��ł�: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: �����Ȕ͈͂ł�"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: �����ȃR�}���h�ł�"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" �̓f�B���N�g���ł�"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: �����ȃX�N���[���ʂł�"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() �̃��C�u�����ďo�Ɏ��s���܂���"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: �}�[�N�ɖ����ȍs�ԍ����w�肳��Ă��܂���"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: �}�[�N�͐ݒ肳��Ă��܂���"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' ���I�t�Ȃ̂�, �ύX�ł��܂���"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: �X�N���v�g�̓���q���[�߂��܂�"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: ���t�@�C���͂���܂���"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: ���̂悤�ȒZ�k���͂͂���܂���"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! �͋��‚���Ă��܂���"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI�͎g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ���̂悤�Ȗ��̃n�C���C�g�O���[�v�͂���܂���: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: �܂��e�L�X�g���}������Ă��܂���"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: �ȑO�ɃR�}���h�s������܂���"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: ���̂悤�ȃ}�b�s���O�͂���܂���"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: �Y���͂���܂���"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: �Y���͂���܂���: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: �t�@�C����������܂���"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ���K�\\���u�����܂����s����Ă��܂���"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: �R�}���h���܂����s����Ă��܂���"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ���K�\\�����܂����s����Ă��܂���"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: �͈͎w��͋��‚���Ă��܂���"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: �E�B���h�E�ɏ\\���ȍ����������͕�������܂���"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �t�@�C�� %s ���쐬�ł��܂���"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �ꎞ�t�@�C���̖��O���擾�ł��܂���"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �t�@�C�� \"%s\" ���J���܂���"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �t�@�C�� %s ��Ǎ��߂܂���"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: �Ō�̕ύX���ۑ�����Ă��܂��� (! ��lj��ŕύX��j��)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[�Ō�̕ύX���ۑ�����Ă��܂���]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: ��������ł�"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ���l���v������Ă��܂�"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �G���[�t�@�C�� %s ���J���܂���"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: ���������s���ʂĂ܂���!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�p�^�[���͌��‚���܂���ł���"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �p�^�[���͌��‚���܂���ł���: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �����͐��̒l�łȂ���΂Ȃ�܂���"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �O�̃f�B���N�g���ɖ߂�܂���"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: �G���[�͂���܂���"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: �ꏊ���X�g�͂���܂���"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: �Y�������񂪔j�����Ă��܂�"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: �s���Ȑ��K�\\���v���O�����ł�"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' �I�v�V�������ݒ肳��Ă��܂� (! ��lj��ŏ㏑��)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: �ǎ��p�ϐ� \"%s\" �ɂ͒l��ݒ�ł��܂���"
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: �T���h�{�b�N�X�ł͕ϐ� \"%s\" �ɒl��ݒ�ł��܂���"
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: �G���[�t�@�C���̓Ǎ����ɃG���[���������܂���"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �T���h�{�b�N�X�ł͋�����܂���"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �����ł͋��‚���܂���"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: �X�N���[�����[�h�̐ݒ�ɂ͑Ή����Ă��܂���"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: �����ȃX�N���[���ʂł�"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' �I�v�V��������ł�"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign �̃f�[�^��Ǎ��߂܂���ł���"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: �X���b�v�t�@�C���̃N���[�Y���G���[�ł�"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: �^�O�X�^�b�N����ł�"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: �R�}���h�����G�߂��܂�"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ���O�����߂��܂�"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ �����߂��܂�"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �t�@�C���������߂��܂�"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: �]���ȕ��������ɂ���܂�"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: ���m�̃}�[�N"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ���C���h�J�[�h��W�J�ł��܂���"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' �� 'winminheight' ��菬�����ł��܂���"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' �� 'winminwidth' ��菬�����ł��܂���"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: �����ݒ��̃G���["
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "�[���J�E���g"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: �X�N���v�g�ȊO��<SID>���g���܂���"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �����G���[�ł�: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: �p�^�[���� 'maxmempattern' �ȏ�̃��������g�p���܂�"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �o�b�t�@����ł�"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: �����p�^�[������؂�L�����s���ł�"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: �������O�̃t�@�C�������̃o�b�t�@�œǍ��܂�Ă��܂�"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: �I�v�V���� '%s' �͐ݒ肳��Ă��܂���"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: �����ȃ��W�X�^���ł�"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "��܂Ō��������̂ʼn��ɖ߂�܂�"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "���܂Ō��������̂ŏ�ɖ߂�܂�"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: �R����������܂���"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: �s���ȍ\\���v�f�ł�"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: ���l���K�v�ł�"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "%d �y�[�W"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "�������e�L�X�g������܂���"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "�����: �y�[�W %d (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " �R�s�[ %d (�S %d ��)"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "������܂���: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "��������~����܂���"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: PostScript�o�̓t�@�C���̏����݃G���[�ł�"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: �t�@�C�� \"%s\" ���J���܂���"
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: PostScript�̃��\\�[�X�t�@�C�� \"%s\" ��Ǎ��߂܂���"
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: �t�@�C�� \"%s\" �� PostScript ���\\�[�X�t�@�C���ł͂���܂���"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: �t�@�C�� \"%s\" �͑Ή����Ă��Ȃ� PostScript ���\\�[�X�t�@�C���ł�"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ���\\�[�X�t�@�C�� \"%s\" �̓o�[�W�������قȂ�܂�"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: �݊����̖����}���`�o�C�g�G���R�[�f�B���O�ƕ����Z�b�g�ł�"
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: �}���`�o�C�g�G���R�[�f�B���O�ł� printmbcharset ����ɂł��܂���"
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr ""
-"E675: �}���`�o�C�g������������邽�߂̃f�t�H���g�t�H���g���w�肳��Ă��܂���"
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: PostScript�o�͗p�̃t�@�C�����J���܂���"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: �t�@�C�� \"%s\" ���J���܂���"
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"prolog.ps\" �����‚���܂���"
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"cidfont.ps\" �����‚���܂���"
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: PostScript�̃��\\�[�X�t�@�C�� \"%s.ps\" �����‚���܂���"
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: ����G���R�[�h \"%s\" �֕ϊ��ł��܂���"
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "�v�����^�ɑ��M��..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: PostScript�t�@�C���̈���Ɏ��s���܂���"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "����W���u�𑗐M���܂���."
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "�V�f�[�^�x�[�X��lj�"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "�p�^�[���̃N�G���[��lj�"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "���̃��b�Z�[�W��\\������"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "�ڑ����I������"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "�S�Ă̐ڑ����ď���������"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "�ڑ���\\������"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �g�p���@: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "����cscope�R�}���h�͕����E�B���h�E�ł̓T�|�[�g����܂���.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: �g�p�@: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �^�O�����‚���܂���"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) �G���[: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s �̓f�B���N�g���y�їL����cscope�̃f�[�^�x�[�X�ł͂���܂���"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "cscope�f�[�^�x�[�X %s ��lj�"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscope�̐ڑ� %<PRId64> ��Ǎ��ݒ��̃G���[�ł�"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: ���m��cscope�����^�ł�"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: cscope�p�C�v���쐬�ł��܂���ł���"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: cscope�̋N������(fork)�Ɏ��s���܂���"
-
-#: ../if_cscope.c:849
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection �ւ� setpgid �Ɏ��s���܂���"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection �̎��s�Ɏ��s���܂���"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: to_fp �� fdopen �Ɏ��s���܂���"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fr_fp �� fdopen �Ɏ��s���܂���"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: cscope�v���Z�X���N���ł��܂���ł���"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: cscope�ڑ��Ɏ��s���܂���"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: ������ cscopequickfix �t���O %c �� %c �ł�"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: cscope�N�G���[ %s of %s �ɊY��������܂���ł���"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "cscope�R�}���h:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (�g�p�@: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: ���̊֐����Ă�ł���֐���T��\n"
-"       d: ���̊֐�����Ă�ł���֐���T��\n"
-"       e: ����egrep�p�^�[����T��\n"
-"       f: ���̃t�@�C����T��\n"
-"       g: ���̒�`��T��\n"
-"       i: ���̃t�@�C����#include���Ă���t�@�C����T��\n"
-"       s: ����C�V���{����T��\n"
-"       t: ���̃e�L�X�g�������T��\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: �d������cscope�f�[�^�x�[�X�͒lj�����܂���ł���"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: cscope�ڑ� %s �����‚���܂���ł���"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "cscope�ڑ� %s ���‚����܂���"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: cs_manage_matches �Œv���I�ȃG���[�ł�"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Cscope �^�O: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   �s�ԍ�"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "�t�@�C���� / ���� / �s\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: cscope�G���[: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "�S�Ă�cscope�f�[�^�x�[�X�����Z�b�g���܂�"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "cscope�ڑ�������܂���\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    �f�[�^�x�[�X��                      prepend �p�X\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "���m�̃I�v�V���������ł�"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�ҏW���������߂��܂�"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "����������܂���"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "�I�v�V���������̌�ɃS�~������܂�"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\", \"-c command\", \"--cmd command\" �̈��������߂��܂�"
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "�����Ȉ����ł�: "
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d �‚̃t�@�C�����ҏW���T���Ă��܂�\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "�X�N���v�g�t�@�C�����ĂъJ���Ă݂܂�: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�Ǎ��p�Ƃ��ĊJ���܂���"
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "�X�N���v�g�o�͗p���J���܂���"
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: �x��: �[���ւ̏o�͂ł͂���܂���\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: �x��: �[������̓��͂ł͂���܂���\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "vimrc�O�̃R�}���h���C��"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: \"%s\"����Ǎ��ނ��Ƃ��ł��܂���"
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"���ڍׂȏ���: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[�t�@�C��..]    ����t�@�C����ҏW����"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               �W�����͂���e�L�X�g��Ǎ���"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t �^�O         �^�O����`���ꂽ�Ƃ��납��ҏW����"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �ŏ��̃G���[�ŕҏW����"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"�g�p�@:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [����] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   ��������:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"����:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t���̂��Ƃɂ̓t�@�C��������"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t���C���h�J�[�h��W�J���Ȃ�"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi���[�h (\"vi\" �Ɠ���)"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx���[�h (\"ex\" �Ɠ���)"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\t����Ex���[�h"
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t�T�C�����g(�o�b�`)���[�h (\"ex\" ��p)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\t�������[�h (\"vidiff\" �Ɠ���)"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t�C�[�W�[���[�h (\"evim\" �Ɠ���, ���[�h��)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t�Ǎ���p���[�h (\"view\" �Ɠ���)"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t�������[�h (\"rvim\" �Ɠ���)"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t�ύX (�t�@�C���ۑ���) ���ł��Ȃ��悤�ɂ���"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t�e�L�X�g�̕ҏW���s�Ȃ��Ȃ��悤�ɂ���"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t�o�C�i�����[�h"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tLisp���[�h"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tVi�݊����[�h: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tVi��݊����[�h: 'nocompatible"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr "-V[N][fname]\t\t���O�o�͐ݒ� [���x�� N] [���O�t�@�C���� fname]"
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t�f�o�b�O���[�h"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t�X���b�v�t�@�C�����g�p��������������"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�X���b�v�t�@�C����񋓂��I��"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (�t�@�C����)\t�N���b�V�������Z�b�V�����𕜋A"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t-r�Ɠ���"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t�A���r�A�ꃂ�[�h�ŋN������"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t�w�u���C�ꃂ�[�h�ŋN������"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t�y���V�A�ꃂ�[�h�ŋN������"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�[���� <terminal> �ɐݒ肷��"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t.vimrc�̑���� <vimrc> ���g��"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�v���O�C���X�N���v�g�����[�h���Ȃ�"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tN �ƒ^�u�y�[�W���J��(�ȗ��l: �t�@�C���ɂ‚�1��)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tN �ƒE�B���h�E���J��(�ȗ��l: �t�@�C���ɂ‚�1��)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\t-o�Ɠ���������������"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�t�@�C���̍Ōォ��͂��߂�"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t<lnum> �s����͂��߂�"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\tvimrc�����[�h����O�� <command> �����s����"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <command>\t\t�ŏ��̃t�@�C�������[�h�� <command> �����s����"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t�ŏ��̃t�@�C�������[�h��t�@�C�� <session> ���捞��"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t�t�@�C�� <scriptin> ����m�[�}���R�}���h��Ǎ���"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���͂����S�R�}���h���t�@�C�� <scriptout> �ɒlj�����"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���͂����S�R�}���h���t�@�C�� <scriptout> �ɕۑ�����"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr "--startuptime <file>\t�N���ɂ����������Ԃ̏ڍׂ� <file> �֏o�͂���"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t.viminfo�̑���� <viminfo> ���g��"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h or  --help\t�w���v(���̃��b�Z�[�W)��\\�����I������"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t�o�[�W��������\\�����I������"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "�}�[�N���ݒ肳��Ă��܂���"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: \"%s\" �ɊY������}�[�N������܂���"
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"mark   �s   �� �t�@�C��/�e�L�X�g"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" jump   �s   �� �t�@�C��/�e�L�X�g"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"�ύX   �s    ��  �e�L�X�g"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# �t�@�C���}�[�N:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# �W�����v���X�g (�V�������̂���):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# �t�@�C�����}�[�N�̗��� (�V�������̂���Â�����):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "'>' �����‚���܂���"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: �u���b�N�����b�N����Ă��܂���"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: �X���b�v�t�@�C���Ǎ����ɃV�[�N�G���[�ł�"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: �X���b�v�t�@�C���̓Ǎ��݃G���[�ł�"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: �X���b�v�t�@�C�������ݎ��ɃV�[�N�G���[�ł�"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: �X���b�v�t�@�C���̏����݃G���[�ł�"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �X���b�v�t�@�C�������ɑ��݂��܂� (symlink�ɂ��U��?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �u���b�N 0 ���擾�ł��܂���?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �u���b�N 1 ���擾�ł��܂���?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �u���b�N 2 ���擾�ł��܂���?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ������, �X���b�v�t�@�C���������܂���!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: �X���b�v�t�@�C���̖��O��ς����܂���"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: \"%s\" �̃X���b�v�t�@�C�����J���Ȃ��̂Ń��J�o���͕s�”\\�ł�"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): �u���b�N 0 ���擾�ł��܂���ł���??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: %s �ɂ̓X���b�v�t�@�C�������‚���܂���"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "�g�p����X���b�v�t�@�C���̔ԍ�����͂��Ă�������(0 �ŏI��): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: %s ���J���܂���"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "�u���b�N 0 ��Ǎ��߂܂��� "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"���炭�ύX������Ă��Ȃ���Vim���X���b�v�t�@�C�����X�V���Ă��܂���."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " Vim�̂��̃o�[�W�����ł͎g�p�ł��܂���.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "Vim�̃o�[�W����3.0���g�p���Ă�������.\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s ��Vim�̃X���b�v�t�@�C���ł͂Ȃ��悤�ł�"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " ���̃R���s���[�^�ł͎g�p�ł��܂���.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���̃t�@�C���͎��̏ꏊ�ō���܂��� "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"�������̓t�@�C�����������Ă��܂�."
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr " �͑������Ă��܂� (�y�[�W�T�C�Y���ŏ��l��������Ă��܂�).\n"
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "�X���b�v�t�@�C�� \"%s\" ���g�p��"
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "���{�t�@�C�� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: �x��: ���{�t�@�C�����ύX����Ă��܂�"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: %s ����u���b�N 1 ��Ǎ��߂܂���"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???�����̍s�������Ă��܂�"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???�s�����Ԉ���Ă��܂�"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???�u���b�N����ł�"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???�s�������Ă��܂�"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �u���b�N 1 ��ID���Ԉ���Ă��܂�(%s ��.swp�t�@�C���łȂ�?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???�u���b�N������܂���"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �������� ???END �܂ł̍s���j�󂳂�Ă���悤�ł�"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? �������� ???END �܂ł̍s���}�����폜���ꂽ�悤�ł�"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???END"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: ���J�o���������܂�܂���"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr ""
-"E312: ���J�o���̍Œ��ɃG���[�����o����܂���; ???�Ŏn�܂�s���Q�Ƃ��Ă�������"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "�ڍׂ� \":help E312\" ���Q�Ƃ��Ă�������"
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "���J�o�����I�����܂���. �S�Ă����������`�F�b�N���Ă�������."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(�ύX���`�F�b�N���邽�߂�, ���̃t�@�C����ʂ̖��O�ŕۑ��������\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "���{�t�@�C���Ƃ� diff �����s����Ɨǂ��ł��傤)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "��������. �o�b�t�@�̓��e�̓t�@�C���Ɠ����ɂȂ�܂���."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"���ꂩ��.swp�t�@�C�����폜���Ă�������\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "�X���b�v�t�@�C�����������‚���܂���:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   ���݂̃f�B���N�g��:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   ���閼�O���g�p��:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   �f�B���N�g�� "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- �Ȃ� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "            ���L��: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "   ���t: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "             ���t: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [from Vim version 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [Vim�̃X���b�v�t�@�C���ł͂Ȃ��悤�ł�]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "        �t�@�C����: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"          �ύX���: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "����"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "�Ȃ�"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"          ���[�U��: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "   �z�X�g��: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"          �z�X�g��: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"        �v���Z�XID: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (�܂����s��)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [���̃R���s���[�^�ł͎g�p�ł��܂���]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�Ǎ��߂܂���]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�J���܂���]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �X���b�v�t�@�C���������̂ňێ��ł��܂���"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "�t�@�C�����ێ�����܂�"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: �ێ��Ɏ��s���܂���"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ������lnum�ł�: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �s %<PRId64> �����‚����܂���"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx �� 0 �ł���ׂ��ł�"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: �X�V���ꂽ�u���b�N�����߂��邩��?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "�u���b�N 1 �͏����ꂽ?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �s %<PRId64> �����‚���܂���"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂�"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count ���[���ł�"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: �s�ԍ����͈͊O�ł�: %<PRId64> �����Ă��܂�"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �u���b�N %<PRId64> �̍s�J�E���g���Ԉ���Ă��܂�"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "�X�^�b�N�T�C�Y�������܂�"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: �|�C���^�u���b�N��ID���Ԉ���Ă��܂� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: \"%s\" �̃V���{���b�N�����N�����[�v�ɂȂ��Ă��܂�"
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: ����"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"���̖��O�ŃX���b�v�t�@�C�������‚��܂��� \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "���̃t�@�C�����J���Ă���Œ� \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      �X���b�v�t�@�C�������V�����ł�!\n"
-
-#: ../memline.c:3244
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) �ʂ̃v���O�����������t�@�C����ҏW���Ă��邩������܂���.\n"
-"    ���̏ꍇ�ɂ�, �ύX�������ۂɍŏI�I��, �����t�@�C���̈قȂ�\n"
-"    2�‚̃C���X�^���X���ł��Ă��܂����Ƃɒ��ӂ��Ă�������."
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "  �I�����邩, ���ӂ��Ȃ��瑱���Ă�������.\n"
-
-#: ../memline.c:3246
-msgid "(2) An edit session for this file crashed.\n"
-msgstr "(2) ���̃t�@�C���̕ҏW�Z�b�V�������N���b�V������.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���̏ꍇ�ɂ� \":recover\" �� \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    ���g�p���ĕύX�����J�o�[���܂�(\":help recovery\" ���Q��).\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    ���ɂ�����s�Ȃ����̂Ȃ��, �X���b�v�t�@�C�� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    �������΂��̃��b�Z�[�W������ł��܂�.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "�X���b�v�t�@�C�� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" �����ɂ���܂�!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - ����"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "�X���b�v�t�@�C�������ɑ��݂��܂�!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�Ǎ���p�ŊJ��(&O)\n"
-"�Ƃɂ����ҏW����(&E)\n"
-"����������(&R)\n"
-"�I������(&Q)\n"
-"���~����(&A)"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�Ǎ���p�ŊJ��(&O)\n"
-"�Ƃɂ����ҏW����(&E)\n"
-"����������(&R)\n"
-"�폜����(&D)\n"
-"�I������(&Q)\n"
-"���~����(&A)"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: �X���b�v�t�@�C�����������‚���܂���"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: ������������܂���!  (%<PRIu64> �o�C�g�������v��)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ���j���[�A�C�e���̃p�X�̕������T�u���j���[�ł͂���܂���"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ���j���[�͑��̃��[�h�ɂ�������܂�"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: \"%s\" �Ƃ������j���[�͂���܂���"
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: ���j���[������ł�"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ���j���[�p�X�̓T�u���j���[�𐶂���ׂ��ł͂���܂���"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ���j���[�o�[�ɂ͒��ڃ��j���[�A�C�e����lj��ł��܂���"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ��؂�̓��j���[�p�X�̈ꕔ�ł͂���܂���"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- ���j���[ ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ���j���[�p�X�̓��j���[�A�C�e���𐶂��Ȃ���΂����܂���"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: ���j���[�����‚���܂���: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s �ɂ̓��j���[����`����Ă��܂���"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ���j���[�p�X�̓T�u���j���[�𐶂��Ȃ���΂����܂���"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: ���j���[�����‚���܂��� - ���j���[�����m�F���Ă�������"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "%s �̏������ɃG���[�����o����܂���:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "�s %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �����ȃ��W�X�^��: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "���{�ꃁ�b�Z�[�W�|��/�ďC: ���� ���Y <koron.kaoriya@gmail.com>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "������: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "������ɂ�ENTER���������R�}���h����͂��Ă�������"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �s %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- �p�� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ���/�y�[�W/�s ��, b/u/k: ��, q: �I�� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "����"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"�͂�(&Y)\n"
-"������(&N)"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"�͂�(&Y)\n"
-"������(&N)\n"
-"�L�����Z��(&C)"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"�͂�(&Y)\n"
-"������(&N)\n"
-"�S�ĕۑ�(&A)\n"
-"�S�ĕ���(&D)\n"
-"�L�����Z��(&C)"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: printf() �̈������s�\\���ł�"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: printf() �̈����ɂ͕��������_�������҂���Ă��܂�"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: printf() �̈��������߂��܂�"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: �x��: �Ǎ���p�t�@�C����ύX���܂�"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr ""
-"�ԍ���<Enter>����͂��邩�}�E�X�ŃN���b�N���Ă������� (��ŃL�����Z��): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "�ԍ���<Enter>����͂��Ă������� (��ŃL�����Z��): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "1 �s �lj����܂���"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "1 �s �폜���܂���"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> �s �lj����܂���"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> �s �폜���܂���"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (�����܂�܂���)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "�r�[�b!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "���s�̂��߂ɃV�F�����ďo����: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: �J�[�\\���̈ʒu�ɂ͎��ʎq������܂���"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' �I�v�V��������ł�"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "�x��: �g�p���Ă���[���̓n�C���C�g�ł��܂���"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: �J�[�\\���̈ʒu�ɂ͕����񂪂���܂���"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ���݂� 'foldmethod' �ł͐܏�݂������ł��܂���"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: �ύX���X�g����ł�"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: �ύX���X�g�̐擪"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: �ύX���X�g�̖���"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "Vim���I������ɂ� :quit<Enter> �Ɠ��͂��Ă�������"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 �s�� %s �� 1 �񏈗�����܂���"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 �s�� %s �� %d �񏈗�����܂���"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �s�� %s �� 1 �񏈗�����܂���"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �s�� %s �� %d �񏈗�����܂���"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> �s���C���f���g����܂�... "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "1 �s���C���f���g���܂��� "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> �s���C���f���g���܂��� "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: �܂����W�X�^���g�p���Ă��܂���"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "�����N�ł��܂���; �Ƃɂ�������"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "1 �s���ύX����܂���"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> �s���ύX����܂���"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "1 �s�̃u���b�N�������N����܂���"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "1 �s�������N����܂���"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> �s�̃u���b�N�������N����܂���"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> �s�������N����܂���"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: ���W�X�^ %s �ɂ͉�������܂���"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- ���W�X�^ ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "�s���ȃ��W�X�^��"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# ���W�X�^:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: ���m�̃��W�X�^�^ %d �ł�"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"�I�� %s%<PRId64> / %<PRId64> �s; %<PRId64> / %<PRId64> �P��; %<PRId64> / "
-"%<PRId64> �o�C�g"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"�I�� %s%<PRId64> / %<PRId64> �s; %<PRId64> / %<PRId64> �P��; %<PRId64> / "
-"%<PRId64> ����; %<PRId64> / %<PRId64> �o�C�g"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s / %s; �s %<PRId64> of %<PRId64>; �P�� %<PRId64> / %<PRId64>; �o�C�g "
-"%<PRId64> / %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s / %s; �s %<PRId64> / %<PRId64>; �P�� %<PRId64> / %<PRId64>; ���� "
-"%<PRId64> / %<PRId64>; �o�C�g %<PRId64> of %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=%N �y�[�W"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "Vim ���g���Ă���Ă��肪�Ƃ�"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: ���m�̃I�v�V�����ł�"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: �I�v�V�����̓T�|�[�g����Ă��܂���"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: modeline �ł͋��‚���܂���"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr "E846: �L�[�R�[�h���ݒ肳��Ă��܂���"
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: = �̌�ɂ͐������K�v�ł�"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: termcap ���Ɍ��‚���܂���"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: �s���ȕ����ł� <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: 'term' �ɂ͋󕶎����ݒ�ł��܂���"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' �� 'patchmode' �������ł�"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: 'listchars'�̒l�ɖ���������܂�"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: 'fillchars'�̒l�ɖ���������܂�"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: �R����������܂���"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: ������̒������[���ł�"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: <%s> �̌�ɐ���������܂���"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: �J���}������܂���"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ' �̒l���w�肵�Ȃ���΂Ȃ�܂���"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: �\\���ł��Ȃ����������C�h�������܂�ł��܂�"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: <%c> �̌�ɕs���ȕ���������܂�"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: �J���}���K�v�ł�"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' �͋�ł��邩 %s ���܂ޕK�v������܂�"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: �����I�����Ă��܂���"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: �v�f�����߂��܂�"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: �O���[�v���ލ����܂���"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: �v���r���[�E�B���h�E�����ɑ��݂��܂�"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: �A���r�A�����ɂ�UTF-8���K�v�Ȃ̂�, ':set encoding=utf-8' ���Ă�������"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: �Œ� %d �̍s�����K�v�ł�"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: �Œ� %d �̃J���������K�v�ł�"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: ���m�̃I�v�V�����ł�: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: �������K�v�ł�: &%s = '%s'"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- �[���R�[�h ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- �O���[�o���I�v�V�����l ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- ���[�J���I�v�V�����l ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- �I�v�V���� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp �G���["
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': %s �ɑΉ����镶��������܂���"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': �Z�~�R�����̌�ɗ]���ȕ���������܂�: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�V�F�������s�ł��܂��� "
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"�V�F�����l��Ԃ��܂��� "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"�Z�L�����e�B�R���e�L�X�g���擾�ł��܂��� "
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"�Z�L�����e�B�R���e�L�X�g��ݒ�ł��܂��� "
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path�ɂ� \"%s\" �Ƃ����t�@�C��������܂���"
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: �t�H�[�}�b�g������� %%%c �����߂��܂�"
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: �t�H�[�}�b�g������ɗ\\������ %%%c ������܂���"
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: �t�H�[�}�b�g������� ] ������܂���"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: �t�H�[�}�b�g������ł� %%%c �̓T�|�[�g����܂���"
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: �t�H�[�}�b�g������̑O�u�ɖ����� %%%c ������܂�"
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: �t�H�[�}�b�g������ɖ����� %%%c ������܂�"
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' �Ƀp�^�[�����w�肳��Ă��܂���"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: �f�B���N�g��������������ł�"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: �v�f����������܂���"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d of %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (�s���폜����܂���)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: quickfix �X�^�b�N�̖����ł�"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: quickfix �X�^�b�N�̐擪�ł�"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "�G���[�ꗗ %d of %d; %d �ƒG���["
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: 'buftype' �I�v�V�������ݒ肳��Ă���̂ŏ����݂܂���"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: �t�@�C�����������������ȃp�^�[���ł�"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "�t�@�C�� \"%s\" ���J���܂���"
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: �o�b�t�@�͓ǂݍ��܂�܂���ł���"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: �����񂩃��X�g���K�v�ł�"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: �����ȍ��ڂł�: %s%%[]"
-
-#
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ �̌�� ] ������܂���"
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: %s%%( ���ނ荇���Ă��܂���"
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: %s( ���ނ荇���Ă��܂���"
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: %s) ���ނ荇���Ă��܂���"
-
-#
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( �̓R�R�ł͋��‚���Ă��܂���"
-
-#
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 ���̑��̓R�R�ł͋��‚���Ă��܂���"
-
-#
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ �̌�� ] ������܂���"
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] ����ł�"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: �p�^�[�������߂��܂�"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: \\z( �����߂��܂�"
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s( �����߂��܂�"
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: \\z( ���ނ荇���Ă��܂���"
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ �̌�ɕs���ȕ���������܂���"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ���G�� %s{...} �����߂��܂�"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61:%s* ������q�ɂȂ��Ă��܂�"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62:%s%c ������q�ɂȂ��Ă��܂�"
-
-#
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: \\_ �̖����Ȏg�p���@�ł�"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64:%s%c �̌�ɂȂɂ�����܂���"
-
-#
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: �s���Ȍ���Q�Ƃł�"
-
-#
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: \\z �̌�ɕs���ȕ���������܂���"
-
-#
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: %s%%[dxouU] �̌�ɕs���ȕ���������܂���"
-
-#
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: %s%% �̌�ɕs���ȕ���������܂���"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} ���ɕ��@�G���[������܂�"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�O���̕����Y��:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: \\%#= �ɂ� 0, 1 �������� 2 �݂̂��������܂��B���K�\\���G���W���͎����I"
-"������܂��B"
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (NFA) ���҂�葁�����K�\\���̏I�[�ɓ��B���܂���"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (NFA ���K�\\��) �ʒu������Ă��܂�: %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) ���m�̃I�y���[�^�ł�: '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) ���m�̃I�y���[�^�ł�: '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) ���m�̃I�y���[�^�ł�: '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr "E870: (NFA ���K�\\��) �J��Ԃ��̐����񐔂�Ǎ����ɃG���["
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA ���K�\\��) �J��Ԃ� �̌�� �J��Ԃ� �͂ł��܂���!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (NFA ���K�\\��) '(' �����߂��܂�"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (NFA ���K�\\��) \\z( �����߂��܂�"
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (NFA ���K�\\��) �I�[�L��������܂���"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (NFA) �X�^�b�N���|�b�v�ł��܂���!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (NFA ���K�\\��) (��u�������NFA�ɕϊ�����) �X�^�b�N�Ɏc���ꂽ�X�e�[�g��"
-"���߂��܂�"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (NFA ���K�\\��) NFA�S�̂�ۑ�����ɂ͋󂫃X�y�[�X������܂���"
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"NFA���K�\\���G���W���p�̃��O�t�@�C���������p�Ƃ��ĊJ���܂���B���O�͕W���o�͂�"
-"�o�͂��܂��B"
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) ���O�t�@�C�� %s ���J���܂���!"
-
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "NFA���K�\\���G���W���p�̃��O�t�@�C���������p�Ƃ��ĊJ���܂���B"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " ���z�u��"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " �u��"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ���]"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " �}��"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (�}��)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (�u��)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (���z�u��)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " �w�u���C"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " �A���r�A"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (�\\��t��)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " �r�W���A��"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " �r�W���A�� �s"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " �r�W���A�� ��`"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " �Z���N�g"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " �s�w���I��"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ��`�I��"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "�L�^��"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: �����Ȍ���������ł�: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ��܂Ō������܂������Y���ӏ��͂���܂���: %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ���܂Ō������܂������Y���ӏ��͂���܂���: %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ';' �̂��Ƃɂ� '?' �� '/' �����҂���Ă���"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (�O�ɗ񋓂����Y���ӏ����܂�)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- �C���N���[�h���ꂽ�t�@�C�� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "���‚���܂��� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "�p�X�� ----\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (���ɗ�)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  ���‚���܂���"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "�C���N���[�h���ꂽ�t�@�C�����X�L������: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "�C���N���[�h���ꂽ�t�@�C�����X�L������ %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: ���ݍs�ɊY��������܂�"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "�S�ẴC���N���[�h���ꂽ�t�@�C�������‚���܂���"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "�C���N���[�h�t�@�C���͂���܂���"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: ��`�����‚����܂���"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: �p�^�[�������‚����܂���"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Substitute "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# �Ō�� %s�����p�^�[��:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: �X�y���t�@�C���̏����G���[�ł�"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: �X�y���t�@�C�����؎���Ă���悤�ł�"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "%s (%d �s��) �ɑ����e�L�X�g: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "%s (%d �s��) �� affix �������߂��܂�: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr ""
-"E761: affix�t�@�C���� FOL, LOW �������� UPP �̃t�H�[�}�b�g�ɃG���[������܂�"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL, LOW �������� UPP �̕������͈͊O�ł�"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "�P��c���[�����k���Ă��܂�..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: �X�y���`�F�b�N�͖���������Ă��܂�"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"�x��: �P�ꃊ�X�g \"%s.%s.spl\" ����� \"%s.ascii.spl\" �͌��‚���܂���"
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "�X�y���t�@�C�� \"%s\" ��Ǎ���"
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: �X�y���t�@�C���ł͂Ȃ��悤�ł�"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: �Â��X�y���t�@�C���Ȃ̂�, �A�b�v�f�[�g���Ă�������"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: ���V�����o�[�W������ Vim �p�̃X�y���t�@�C���ł�"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: �X�y���t�@�C���ɃT�|�[�g���Ă��Ȃ��Z�N�V����������܂�"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "�x��9: %s �Ƃ����͈͂̓T�|�[�g����Ă��܂���"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "affix �t�@�C�� %s ��Ǎ���..."
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "%s (%d �s��) �̒P���ϊ��ł��܂���ł���: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "%s ���̎��̕ϊ��̓T�|�[�g����Ă��܂���: %s ���� %s ��"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "%s ���� %d �s�ڂ� FLAG �ɖ����Ȓl������܂�: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "%s ���� %d �s�ڂɃt���O�̓�d�g�p������܂�: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"%s �� %d �s�ڂ� PFX ���ڂ̌�� COMPOUNDFORBIDFLAG �̒�`�͌�������ʂ𐶂���"
-"���Ƃ�����܂�"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"%s �� %d �s�ڂ� PFX ���ڂ̌�� COMPOUNDPERMITFLAG �̒�`�͌�������ʂ𐶂���"
-"���Ƃ�����܂�"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "COMPOUNDRULES �̒l�Ɍ�肪����܂�. �t�@�C�� %s �� %d �s��: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� COMPOUNDWORDMAX �̒l�Ɍ�肪����܂�: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� COMPOUNDMIN �̒l�Ɍ�肪����܂�: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� COMPOUNDSYLMAX �̒l�Ɍ�肪����܂�: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� CHECKCOMPOUNDPATTERN �̒l�Ɍ�肪����܂�: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr ""
-"%s �� %d �s�ڂ� �A�� affix �u���b�N�̃t���O�̑g�����ɈႢ������܂�: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �d������ affix �����o���܂���: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"%s �� %d �s�ڂ� affix �� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
-"�Ɏg�p���Ă�������: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "%s �� %d �s�ڂł� Y �� N ���K�v�ł�: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �����͉��Ă��܂�: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "%s �� %d �s�ڂɂ� REP(SAL) �̉񐔂��K�v�ł�"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "%s �� %d �s�ڂɂ� MAP �̉񐔂��K�v�ł�"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "%s �� %d �s�ڂ� MAP �ɏd����������������܂�"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �F���ł��Ȃ����d���������ڂ�����܂�: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%s �s�ڂ� FOL/LOW/UPP ������܂���"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "SYLLABLE ���w�肳��Ȃ� COMPOUNDSYLMAX"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "�x����u�q�����߂��܂�"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "�����t���O�����߂��܂�"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "�x����u�q ��/�������� �����t���O�����߂��܂�"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "SOFO%s �s�� %s �ɂ���܂���"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "SAL�s �� SOFO�s �� %s �ŗ����w�肳��Ă��܂�"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "%s �� %d �s�� �t���O�����l�ł͂���܂���: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �t���O���s���ł�: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "�l %s �͑��� .aff �t�@�C���Ŏg�p���ꂽ�̂ƈقȂ�܂�"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "�����t�@�C�� %s ���X�L������..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: %s �ɂ͒P�ꐔ������܂���"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "�s %6d, �P�� %6d - %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �d���P�ꂪ���‚���܂���: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "�d���̂����ŏ��̒P��� %s �� %d �s�ڂł�: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d �‚̒P�ꂪ���‚���܂��� (%s ��)"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "��ASCII�������܂� %d �‚̒P��𖳎����܂��� (%s ��)"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "�W�����͂���Ǎ��ݒ� %s ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �d������ /encoding= �s�𖳎����܂���: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �P��̌�� /encoding= �s�𖳎����܂���: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �d������ /regions= �s�𖳎����܂���: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "%s �� %d �s��, �͈͎w�肪���߂��܂�: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "%s �� %d �s�ڂ� �d������ / �s�𖳎����܂���: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "%s �� %d �s�� ������ nr �̈�ł�: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "%s �� %d �s�� �F���s�\\�ȃt���O�ł�: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "��ASCII�������܂� %d �‚̒P��𖳎����܂���"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "�m�[�h %d ��(�S %d �’�) �����k���܂���; �c�� %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "�X�y���t�@�C�����t�Ǎ���"
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "�����􍞂݂����s��..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "�����􍞂݌�̑��P�ꐔ: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "���P�ꐔ: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "�C�����t�@�C�� \"%s\" �������ݒ�..."
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "���胁�����g�p��: %d �o�C�g"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: �o�̓t�@�C�����ɂ͔͈͖����܂߂��܂���"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: �͈͂� 8 �‚܂ł����T�|�[�g����Ă��܂���"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: �����Ȕ͈͂ł�: %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "�x��: �����t���O�� NOBREAK �������Ƃ��w�肳��܂���"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "�X�y���t�@�C�� %s �������ݒ�..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "���s���܂���!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' �ɂ� %<PRId64> �‚̃G���g���͂���܂���"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "%s ����P�ꂪ�폜����܂���"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "%s �ɒP�ꂪ�lj�����܂���"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: �P��̕������X�y���t�@�C���ƈقȂ�܂�"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "�c�O�ł���, �C�����͂���܂���"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "�c�O�ł���, �C������ %<PRId64> �‚�������܂���"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" �����֕ϊ�:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: �X�y���u�����܂����s����Ă��܂���"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ���‚���܂���: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug �t�@�C���ł͂Ȃ��悤�ł�: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: �Â� .sug �t�@�C���Ȃ̂�, �A�b�v�f�[�g���Ă�������: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ���V�����o�[�W������ Vim �p�� .sug �t�@�C���ł�: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug �t�@�C���� .spl �t�@�C���ƈ�v���܂���: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug �t�@�C���̓Ǎ����ɃG���[���������܂���: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: MAP �G���g���ɏd�����������݂��܂�"
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "���̃o�b�t�@�ɒ�`���ꂽ�\\���v�f�͂���܂���"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: �s���Ȉ����ł�: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "C���ꕗ�R�����g���瓯����"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "�񓯊�"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "�����J�n "
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " �s�O(�g�b�v�s����)"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �\\�������v�f ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"�v�f��œ�����"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �\\���v�f ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: ���̂悤�ȍ\\���N���X�^�͂���܂���: %s"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "minimal "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "maximal "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; �Y�� "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr " �‚̉��s"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ���̏ꏊ�ł͈���contains�͋��‚���Ă��܂���"
-
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: ������cchar�̒l�ł�"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: �����ł̓O���[�v�͋��‚���܂���"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s �͈̔͗v�f�����‚���܂���"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: �t�@�C�������K�v�ł�"
-
-#: ../syntax.c:4221
-msgid "E847: Too many syntax includes"
-msgstr "E847: �\\���̎�荞��(include)�����߂��܂�"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ']' ������܂���: %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: '=' ������܂���: %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: ����������܂���: �\\���͈� %s"
-
-#: ../syntax.c:4870
-msgid "E848: Too many syntax clusters"
-msgstr "E848: �\\���N���X�^�����߂��܂�"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: �N���X�^���w�肳��Ă��܂���"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: �p�^�[����؂肪���‚���܂���: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: �p�^�[���̂��ƂɃS�~������܂�: %s"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: �\\������: �A���s�p�^�[����2�x�w�肳��܂���"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: �s���Ȉ����ł�: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: ����������܂���: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: ��̈���: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s �̓R�R�ł͋��‚���Ă��܂���"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s �͓��e���X�g�̐擪�łȂ���΂Ȃ�Ȃ�"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: ���m�̃O���[�v��: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ������ :syntax �̃T�u�R�}���h: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: syncolor.vim �̍ċA�Ăяo�������o���܂���"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: �n�C���C�g�O���[�v�����‚���܂���: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: �������[���ł͂Ȃ�: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ���������߂��܂�: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: �O���[�v���ݒ肳��Ă���̂Ńn�C���C�g�����N�͖�������܂�"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: �\\�����ʓ����ł�: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ������������܂���: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ����������܂���: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: �s���Ȓl�ł�: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: ���m�̑O�i�F�ł�"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: ���m�̔w�i�F�ł�"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: �J���[����ԍ���F���ł��܂���: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: �I�[�R�[�h�����߂��܂�: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: �s���Ȉ����ł�: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: �����̈قȂ�n�C���C�g�������g���߂��Ă��܂�"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: �O���[�v���Ɉ���s�”\\�ȕ���������܂�"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: �O���[�v���ɕs���ȕ���������܂�"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: �n�C���C�g�ƍ\\���O���[�v�����߂��܂�"
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: �^�O�X�^�b�N�̖����ł�"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: �^�O�X�^�b�N�̐擪�ł�"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �ŏ��̊Y���^�O�𒴂��Ė߂邱�Ƃ͂ł��܂���"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �^�O�����‚���܂���: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "�t�@�C��\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: �Y���^�O��1�‚�����������܂���"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �Ō�ɊY������^�O�𒴂��Đi�ނ��Ƃ͂ł��܂���"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "�t�@�C�� \"%s\" ������܂���"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "�^�O %d (�S%d%s)"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " ������ȏ�"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  �^�O���قȂ�case�Ŏg�p���܂�!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: �t�@�C�� \"%s\" ������܂���"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # TO �^�O        FROM �s    in file/text"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "�^�O�t�@�C�� %s ��������"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "�^�O�t�@�C�����̒����s�𖳎����܂�"
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: �^�O�t�@�C�� \"%s\" �̃t�H�[�}�b�g�ɃG���[������܂�"
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "���O�� %<PRId64> �o�C�g"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: �^�O�t�@�C�����\\�[�g����Ă��܂���: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: �^�O�t�@�C��������܂���"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �^�O�p�^�[�������‚����܂���"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �^�O�����‚����Ȃ��̂ŒP�ɐ������܂�!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "�d�������t�B�[���h��: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' �͖��m�ł�. ���s�̑g�ݍ��ݒ[���͎��̂Ƃ���ł�:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "�ȗ��l�����̂悤�ɐݒ肵�܂� '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: termcap�t�@�C�����J���܂���"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfo�ɒ[���G���g�������‚����܂���"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcap�ɒ[���G���g�������‚����܂���"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap�� \"%s\" �̃G���g��������܂���"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �[���� \"cm\" �@�\\���K�v�ł�"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- �[���L�[ ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: ���͂�Ǎ��ݒ��̃G���[�ɂ��I�����܂�...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: �\\�������s�J�E���g���ς��܂���"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: �����ݗp�ɃA���h�D�t�@�C�����J���܂���: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: �A���h�D�t�@�C�������Ă��܂� (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "'undodir'�̃f�B���N�g���ɃA���h�D�t�@�C�����������߂܂���"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "�A���h�D�t�@�C���Ƃ��ēǂݍ��߂Ȃ��̂ŏ㏑�����܂���: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "�A���h�D�t�@�C���ł͂Ȃ��̂ŏ㏑�����܂���: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "�Ώۂ��Ȃ��̂ŃA���h�D�t�@�C���̏������݂��X�L�b�v���܂�"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "�A���h�D�t�@�C���������ݒ�: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: �A���h�D�t�@�C���̏������݃G���[�ł�: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "�I�[�i�[���قȂ�̂ŃA���h�D�t�@�C����ǂݍ��݂܂���: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "�A���h�D�t�@�C���Ǎ���: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: �A���h�D�t�@�C����Ǎ��p�Ƃ��ĊJ���܂���: %s"
-
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: �A���h�D�t�@�C���ł͂���܂���: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: �݊����̖����A���h�D�t�@�C���ł�: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "�t�@�C���̓��e���ς���Ă��邽�߁A�A���h�D���𗘗p�ł��܂���"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "�A���h�D�t�@�C�� %s �̎捞������"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "���Ɉ�ԌÂ��ύX�ł�"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "���Ɉ�ԐV�����ύX�ł�"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: �A���h�D�ԍ� %<PRId64> �͌��‚���܂���"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: �s�ԍ����Ԉ���Ă��܂�"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "�s �lj����܂���"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "�s �lj����܂���"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "�s �폜���܂���"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "�s �폜���܂���"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "�ӏ��ύX���܂���"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "�ӏ��ύX���܂���"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "�O��"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "���"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "�A���h�D�Ώۂ�����܂���"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr "�ʔ�   �ύX��   �ύX����           �ۑ���"
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> �b�o�߂��Ă��܂�"
-
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undo �̒���� undojoin �͂ł��܂���"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: �A���h�D���X�g�����Ă��܂�"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: �A���h�D�s������܂���"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"�K�p�σp�b�`: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"�lj��g���p�b�`: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Modified by "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"Compiled "
-
-#: ../version.c:649
-msgid "by "
-msgstr "by "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"Huge �� "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "without GUI."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  �@�\\�̈ꗗ �L��(+)/����(-)\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "      �V�X�e�� vimrc: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "        ���[�U vimrc: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr "     ��2���[�U vimrc: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr "     ��3���[�U vimrc: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "         ���[�U exrc: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "      ��2���[�U exrc: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "       �ȗ����� $VIM: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "�ȗ����� $VIMRUNTIME: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "�R���p�C��: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "�����N: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "�f�o�b�O�r���h"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMproved"
-
-#: ../version.c:769
-msgid "version "
-msgstr "version "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "by Bram Moolenaar ��."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim �̓I�[�v���\\�[�X�ł��莩�R�ɔz�z�”\\�ł�"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "�E�K���_�̌b�܂�Ȃ��q�������ɉ�����!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "�ڍׂȏ���           :help iccf<Enter>      "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "�I������ɂ�           :q<Enter>              "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "�I�����C���w���v��     :help<Enter> �� <F1>   "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�o�[�W��������       :help version7<Enter>  "
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Vi�݊����[�h�œ��쒆"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "Vim�����l�ɂ���ɂ�    :set nocp<Enter>       "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�ڍׂȏ���           :help cp-default<Enter>"
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "Vim�̊J�����������Ă�������!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "Vim�̓o�^���[�U�ɂȂ��Ă�������!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "�ڍׂȏ���           :help sponsor<Enter>   "
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "�ڍׂȏ���           :help register<Enter>  "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�ڍׂ̓��j���[�� �w���v���X�|���T�[/�o�^ ���Q�Ƃ��ĉ�����   "
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "���ɃE�B���h�E��1�‚�������܂���"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: �v���r���[�E�B���h�E������܂���"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����ƉE���𓯎��ɕ������邱�Ƃ͂ł��܂���"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: ���̃E�B���h�E����������Ă��鎞�ɂ͏���ł��܂���"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: �Ō�̃E�B���h�E��‚��邱�Ƃ͂ł��܂���"
-
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: autocmd�E�B���h�E�͕‚����܂���"
-
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: autocmd�E�B���h�E�����c��Ȃ����߁A�E�B���h�E�͕‚����܂���"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: ���̃E�B���h�E�ɂ͕ύX������܂�"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: �J�[�\\���̉��Ƀt�@�C����������܂���"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() ����p�X���[�h�ŌĂяo����܂���"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish�Í��̃r�b�O/���g���G���f�B�A�����Ԉ���Ă��܂�"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256�̃e�X�g�Ɏ��s���܂���"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish�Í��̃e�X�g�Ɏ��s���܂���"
-
-#~ msgid "Patch file"
-#~ msgstr "�p�b�`�t�@�C��"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "����(&O)\n"
-#~ "�L�����Z��(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim �T�[�o�ւ̐ڑ�������܂���"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s �֑��邱�Ƃ��ł��܂���"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �T�[�o�̉���������܂���"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �N���C�A���g�֑��邱�Ƃ��ł��܂���"
-
-#~ msgid "Save As"
-#~ msgstr "�ʖ��ŕۑ�"
-
-#~ msgid "Edit File"
-#~ msgstr "�t�@�C����ҏW"
-
-# Added at 27-Jan-2004.
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (���‚���܂���)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Vim�X�N���v�g�̎捞��"
-
-#~ msgid "unknown"
-#~ msgstr "�s��"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "�V�����E�B���h�E�Ńt�@�C����ҏW���܂�"
-
-#~ msgid "Append File"
-#~ msgstr "�lj��t�@�C��"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "�E�B���h�E�ʒu: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "���_�C���N�g��ۑ����܂�"
-
-#~ msgid "Save View"
-#~ msgstr "�r���[��ۑ����܂�"
-
-#~ msgid "Save Session"
-#~ msgstr "�Z�b�V��������ۑ����܂�"
-
-#~ msgid "Save Setup"
-#~ msgstr "�ݒ��ۑ����܂�"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< �� +eval �@�\\�������Ɨ��p�ł��܂���"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: ���̃o�[�W�����ɍ����͂���܂���"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr " �̓f�o�C�X�ł� ('opendevice' �I�v�V�����ʼn���ł��܂�)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "�W�����͂���Ǎ��ݒ�..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish����]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[����]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: �t�@�C�������m�̕��@�ňÍ�������Ă��܂�"
-
-# Added at 19-Jan-2004.
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans�͖��ύX�̃o�b�t�@���㏑���邱�Ƃ͋��‚��Ă��܂���"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans�o�b�t�@�̈ꕔ�������o�����Ƃ͂ł��܂���"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "'opendevice' �I�v�V�����ɂ��f�o�C�X�ւ̏������݂͂ł��܂���"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: ���\\�[�X�t�H�[�N�������邩������܂��� (! ��lj��ŋ���)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: GUI�p�̃v���Z�X�̋N���Ɏ��s���܂���"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: �q�v���Z�X��GUI�̋N���Ɏ��s���܂���"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUI���J�n�ł��܂���"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"����Ǎ��ނ��Ƃ��ł��܂���"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: �L���ȃt�H���g�����‚���Ȃ��̂�, GUI���J�n�ł��܂���"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' �������ł�"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' �ɐݒ肳�ꂽ�l�������ł�"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: %s �̐F�����蓖�Ă��܂���"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "�J�[�\\���̈ʒu�Ƀ}�b�`�͂���܂���, �����������Ă��܂�"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�J���܂���> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �t�H���g %s ���擾�ł��܂���"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ���݂̃f�B���N�g���ɖ߂�܂���"
-
-#~ msgid "Pathname:"
-#~ msgstr "�p�X��:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ���݂̃f�B���N�g�����擾�ł��܂���"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "�L�����Z��"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "�X�N���[���o�[: �摜���擾�ł��܂���ł���."
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim �_�C�A���O"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: ���b�Z�[�W�ƃR�[���o�b�N�̂��� BalloonEval ���쐬�ł��܂���"
-
-#~ msgid "Input _Methods"
-#~ msgstr "�C���v�b�g���\\�b�h"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - �����ƒu��..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - ����..."
-
-#~ msgid "Find what:"
-#~ msgstr "����������:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�u��������:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "���m�ɊY��������̂���"
-
-#~ msgid "Match case"
-#~ msgstr "�啶��/����������ʂ���"
-
-#~ msgid "Direction"
-#~ msgstr "����"
-
-#~ msgid "Up"
-#~ msgstr "��"
-
-#~ msgid "Down"
-#~ msgstr "��"
-
-#~ msgid "Find Next"
-#~ msgstr "��������"
-
-#~ msgid "Replace"
-#~ msgstr "�u��"
-
-#~ msgid "Replace All"
-#~ msgstr "�S�Ēu��"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: �Z�b�V�����}�l�[�W������ \"die\" �v�����󂯎��܂���\n"
-
-#~ msgid "Close"
-#~ msgstr "�‚���"
-
-#~ msgid "New tab"
-#~ msgstr "�V�K�^�u�y�[�W"
-
-#~ msgid "Open Tab..."
-#~ msgstr "�^�u�y�[�W���J��..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: ���C���E�B���h�E���s�ӂɔj�󂳂�܂���\n"
-
-#~ msgid "&Filter"
-#~ msgstr "�t�B���^(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "�L�����Z��(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "�f�B���N�g��"
-
-#~ msgid "Filter"
-#~ msgstr "�t�B���^"
-
-#~ msgid "&Help"
-#~ msgstr "�w���v(&H)"
-
-#~ msgid "Files"
-#~ msgstr "�t�@�C��"
-
-#~ msgid "&OK"
-#~ msgstr "&OK"
-
-#~ msgid "Selection"
-#~ msgstr "�I��"
-
-#~ msgid "Find &Next"
-#~ msgstr "��������(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "�u��(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "�S�Ēu��(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "�A���h�D(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �^�C�g���� \"%s\" �̃E�B���h�E�͌��‚���܂���"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �����̓T�|�[�g����܂���: \"-%s\"; OLE�ł��g�p���Ă�������."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDI�A�v���̒��ł̓E�B���h�E���J���܂���"
-
-#~ msgid "Close tab"
-#~ msgstr "�^�u�y�[�W��‚���"
-
-#~ msgid "Open tab..."
-#~ msgstr "�^�u�y�[�W���J��"
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "���������� ('\\' ����������ɂ� '\\\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "�����E�u�� ('\\' ����������ɂ� '\\\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "�g���܂���"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "�f�B���N�g��\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �F�w�肪�������Ȃ��̂ŃG���g�������蓖�Ă��܂���"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: �ȉ��̕����Z�b�g�̃t�H���g������܂��� %s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: �t�H���g�Z�b�g��: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "�t�H���g '%s' �͌Œ蕝�ł͂���܂���"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: �t�H���g�Z�b�g��: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "�t�H���g0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "�t�H���g1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "�t�H���g%<PRId64> �̕����t�H���g0��2�{�ł͂���܂���"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "�t�H���g0�̕�: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "�t�H���g1�̕�: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "�����ȃt�H���g�w��ł�"
-
-#~ msgid "&Dismiss"
-#~ msgstr "�p������(&D)"
-
-#~ msgid "no specific match"
-#~ msgstr "�}�b�`������̂�����܂���"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - �t�H���g�I��"
-
-#~ msgid "Name:"
-#~ msgstr "���O:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "�T�C�Y���|�C���g�ŕ\\������"
-
-#~ msgid "Encoding:"
-#~ msgstr "�G���R�[�h:"
-
-#~ msgid "Font:"
-#~ msgstr "�t�H���g:"
-
-#~ msgid "Style:"
-#~ msgstr "�X�^�C��:"
-
-#~ msgid "Size:"
-#~ msgstr "�T�C�Y:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: �n���O���I�[�g�}�g���G���["
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat �G���["
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscope�f�[�^�x�[�X: %s ���J�����Ƃ��ł��܂���"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscope�f�[�^�x�[�X�̏����擾�ł��܂���"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Lua���C�u���������[�h�ł��܂���."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "�A���h�D��񂪕ۑ��ł��܂���"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: ���̃R�}���h�͖����ł�. MzScheme ���C�u���������[�h�ł��܂���."
-
-#~ msgid "invalid expression"
-#~ msgstr "�����Ȏ��ł�"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "���̓R���p�C�����ɖ����ɂ���Ă��܂�"
-
-#~ msgid "hidden option"
-#~ msgstr "�B���I�v�V����"
-
-#~ msgid "unknown option"
-#~ msgstr "���m�̃I�v�V�����ł�"
-
-#~ msgid "window index is out of range"
-#~ msgstr "�͈͊O�̃E�B���h�E�ԍ��ł�"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "�o�b�t�@���J���܂���"
-
-#~ msgid "cannot delete line"
-#~ msgstr "�s�������܂���"
-
-#~ msgid "cannot replace line"
-#~ msgstr "�s��u���ł��܂���"
-
-#~ msgid "cannot insert line"
-#~ msgstr "�s��}���ł��܂���"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "������ɂ͉��s�������܂߂��܂���"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "Scheme�l��Vim�ւ̕ϊ��G���["
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim �G���[: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim �G���["
-
-#~ msgid "buffer is invalid"
-#~ msgstr "�o�b�t�@�͖����ł�"
-
-#~ msgid "window is invalid"
-#~ msgstr "�E�B���h�E�͖����ł�"
-
-#~ msgid "linenr out of range"
-#~ msgstr "�͈͊O�̍s�ԍ��ł�"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "�T���h�{�b�N�X�ł͋�����܂���"
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: ���C�u���� %s �����[�h�ł��܂���ł���"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "���̃R�}���h�͖����ł�, ���߂�Ȃ���: Perl���C�u���������[�h�ł��܂���ł�"
-#~ "��."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: �T���h�{�b�N�X�ł� Safe ���W���[�����g�p���Ȃ�Perl�X�N���v�g�͋ւ���"
-#~ "��Ă��܂�"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: ����Vim�ł� :py3 ���g������� :python ���g���܂���"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: ���̃R�}���h�͖����ł�,���߂�Ȃ���: Python���C�u���������[�h�ł���"
-#~ "����ł���."
-
-# Added at 07-Feb-2004.
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python ���ċA�I�Ɏ��s���邱�Ƃ͂ł��܂���"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: ����Vim�ł� :python ���g������� :py3 ���g���܂���"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ �͕�����̃C���X�^���X�łȂ���΂Ȃ�܂���"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: ���̃R�}���h�͖����ł�,���߂�Ȃ���: Ruby���C�u���������[�h�ł��܂�"
-#~ "��ł���."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: �\\������ return �ł�"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: �\\������ next �ł�"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: �\\������ break �ł�"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: �\\������ redo �ł�"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: rescue �̊O�� retry �ł�"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: ��舵���Ȃ�������O������܂�"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: ���m��longjmp���: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "�����ƒ�`��؂�ւ���"
-
-#~ msgid "Show base class of"
-#~ msgstr "���̃N���X�̊���\\��"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "�I�[�o�[���C�h���ꂽ�����o�֐���\\��"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "�t�@�C������񕜂���"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�v���W�F�N�g����񕜂���"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "�S�Ẵv���W�F�N�g����񕜂���"
-
-#~ msgid "Retrieve"
-#~ msgstr "��"
-
-#~ msgid "Show source of"
-#~ msgstr "���̃\\�[�X��\\������"
-
-#~ msgid "Find symbol"
-#~ msgstr "���‚����V���{��"
-
-#~ msgid "Browse class"
-#~ msgstr "�N���X���Q��"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "�K�w�ŃN���X��\\��"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "���肳�ꂽ�K�w�ŃN���X��\\��"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref �̎Q�Ɛ�"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ���Q�Ƃ����"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref �����̂��̂������Ă��܂�"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref ���g�p�����"
-
-#~ msgid "Show docu of"
-#~ msgstr "���̕��͂�\\��"
-
-#~ msgid "Generate docu for"
-#~ msgstr "���̕��͂𐶐�"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+�ɐڑ��ł��܂���. �‹����`�F�b�N���Ă�������(sniffemacs �� $PATH ��"
-#~ "�Ȃ���΂Ȃ�܂���).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: �Ǎ����ɃG���[���������܂���. �ؒf���܂���"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "����SNiFF+ �̏�Ԃ́u"
-
-#~ msgid "not "
-#~ msgstr "��"
-
-#~ msgid "connected"
-#~ msgstr "�ڑ��v�ł�"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ���m�� SNiFF+ ���N�G�X�g�ł�: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+ �ւ̐ڑ����̃G���[�ł�"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ �ɐڑ�����Ă��܂���"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SNiFF+ �o�b�t�@������܂���"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: �����ݒ��ɃG���[�����������̂Őؒf���܂���"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "�����ȃo�b�t�@�ԍ��ł�"
-
-#~ msgid "not implemented yet"
-#~ msgstr "�܂���������Ă��܂���"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "�s��ݒ�ł��܂���"
-
-#~ msgid "invalid mark name"
-#~ msgstr "�����ȃ}�[�N���ł�"
-
-#~ msgid "mark not set"
-#~ msgstr "�}�[�N�͐ݒ肳��Ă��܂���"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�s %d �� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "�s�̑}��/�lj����ł��܂���"
-
-#~ msgid "line number out of range"
-#~ msgstr "�͈͊O�̍s�ԍ��ł�"
-
-#~ msgid "unknown flag: "
-#~ msgstr "���m�̃t���O: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "���m�� vimOption �ł�"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "�L�[�{�[�h������"
-
-#~ msgid "vim error"
-#~ msgstr "vim �G���["
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "�o�b�t�@/�E�B���h�E�쐬�R�}���h���쐬�ł��܂���: �I�u�W�F�N�g�����������"
-#~ "���܂���"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "�R�[���o�b�N�R�}���h��o�^�ł��܂���: �o�b�t�@/�E�B���h�E�����ɏ��������"
-#~ "����"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL �v���I�G���[: reflist ����!? vim-dev@vim.org �ɕ񍐂��Ă�������"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "�R�[���o�b�N�R�}���h��o�^�ł��܂���: �o�b�t�@/�E�B���h�E�̎Q�Ƃ����‚���"
-#~ "�܂���"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: ���̃R�}���h�͖����ł�,���߂�Ȃ���: Tcl���C�u���������[�h�ł��܂���"
-#~ "�ł���."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: �I���R�[�h %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "�s���擾�ł��܂���"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "���߃T�[�o�̖��O��o�^�ł��܂���"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �ړI�̃v���O�����ւ̃R�}���h���M�Ɏ��s���܂���"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: �����ȃT�[�oID���g���܂���: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM ���̂̓o�^�v���p�e�B���s���ł�. �������܂���!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans �͂���GUI�ł͗��p�ł��܂���\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "����Vim�ɂ�diff�@�\\������܂���(�R���p�C�����ݒ�)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' �g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: �G���[: NetBeans����gvim���X�^�[�g�ł��܂���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "�召���������������ꍇ�͑啶���ɂ��邽�߂� / ��O�u���Ă�������"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t����gvim��OLE�Ƃ��ēo�^����"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvim��OLE�o�^����������"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUI�ŋN������ (\"gvim\" �Ɠ���)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f or  --nofork\t�t�H�A�O���E���h: GUI���n�߂�Ƃ���fork���Ȃ�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t�E�B���h�E���J���̂� newcli ���g�p���Ȃ�"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tI/O�� <device> ���g�p����"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrc�̑���� <gvimrc> ���g��"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�Í������ꂽ�t�@�C����ҏW����"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tvim���w�肵�� X �T�[�o�ɐڑ�����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tX�T�[�o�ɐڑ����Ȃ�"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t�”\\�Ȃ��Vim�T�[�o�� <files> ��ҏW����"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  ����, �T�[�o�������Ă��x�������o�͂��Ȃ�"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>\t--remote�� �t�@�C���̕ҏW���I���̂�҂�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <files>  ����, �T�[�o�������Ă��x�������o�͂��Ȃ�"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remote�Ńt�@�C��1�‚ɂ‚�1�‚̃^�u"
-#~ "�y�[�W���J��"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\tVim�T�[�o�� <keys> �𑗐M���ďI������"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�T�[�o�� <expr> �����s���Č��ʂ�\\������"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tVim�T�[�o���̈ꗗ��\\�����ďI������"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\tVim�T�[�o <name> �ɑ��M/���O�ݒ肷��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ɂ���ĉ��߂�������(Motif�o�[�W����):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ɂ���ĉ��߂�������(neXtaw�o�[�W����):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ɂ���ĉ��߂�������(Athena�o�[�W����):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t<display> ��vim�����s����"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t�ŏ���������Ԃ�vim���N������"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t�w�i�F�� <color> ���g��(���`: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t�O�i�F�� <color> ���g��(���`: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\t�e�L�X�g�\\���� <font> ���g��(���`: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t������ <font> ���g��"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <for>\t�Α̎��� <font> ���g��"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t�����z�u�� <geom> ���g��(���`: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t���E�̕��� <width> �ɂ���(���`: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <width>  �X�N���[���o�[�̕��� <width> �ɂ���(���`: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\t���j���[�o�[�̍����� <height> �ɂ���(���`: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t���]�f�����g�p����(���`: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t���]�f�����g�p���Ȃ�(���`: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t����̃��\\�[�X���g�p����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ɂ���ĉ��߂�������(GTK+�o�[�W����):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t<display> ��vim�����s����(���`: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t���C���E�B���h�E�����ʂ����ӂȖ���(role)��ݒ肷��"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t�قȂ�GTK widget��Vim���J��"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\t�E�B���h�EID��W���o�͂ɏo�͂���"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <�e�̃^�C�g��>\tVim��e�A�v���P�[�V�����̒��ŋN������"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t�قȂ�Win32 widget�̓�����Vim���J��"
-
-#~ msgid "No display"
-#~ msgstr "�f�B�X�v���C�����‚���܂���"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": ���M�Ɏ��s���܂���.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": ���M�Ɏ��s���܂���. ���[�J���ł̎��s�����݂Ă��܂�\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �� (%d �’�) �̃t�@�C����ҏW���܂���"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "�f�B�X�v���C������܂���: ���̑��M�Ɏ��s���܂���.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ���̑��M�Ɏ��s���܂���.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: �����ȃR�[�h�y�[�W�ł�"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: IC�̒l��ݒ�ł��܂���"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �C���v�b�g�R���e�L�X�g�̍쐬�Ɏ��s���܂���"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �C���v�b�g���\\�b�h�̃I�[�v���Ɏ��s���܂���"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: �x��: IM�̔j��R�[���o�b�N��ݒ�ł��܂���ł���"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: �C���v�b�g���\\�b�h�͂ǂ�ȃX�^�C�����T�|�[�g���܂���"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: �C���v�b�g���\\�b�h�� my preedit type ���T�|�[�g���܂���"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: �X���b�v�t�@�C���̈Í����X�V���ɃG���[���������܂���"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s �͂��̃o�[�W������Vim�ŃT�|�[�g���Ă��Ȃ��`���ňÍ�������Ă��܂�"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "�X���b�v�t�@�C���͈Í�������Ă��܂�: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "�V�����Í��L�[����͂������ƂɃe�L�X�g�t�@�C����ۑ����Ă��Ȃ��ꍇ��,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "�V�����Í��L�[����͂��Ă�������."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "�Í��L�[��ς������ƂɃe�L�X�g�t�@�C����ۑ������ꍇ��, �e�L�X�g�t�@�C����"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "�X���b�v�t�@�C���ɓ����Í��L�[���g�����߂�enter�����������Ă�������."
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "�X���b�v�t�@�C������擾�����Í��L�[���e�L�X�g�t�@�C���Ɏg���܂�.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [����Vim�o�[�W�����ł͎g�p�ł��܂���]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "���̃��j���[��؂���"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "�f�B���N�g���I���_�C�A���O"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�t�@�C���ۑ��_�C�A���O"
-
-#~ msgid "Open File dialog"
-#~ msgstr "�t�@�C���Ǎ��_�C�A���O"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: �R���\\�[�����[�h�ł̓t�@�C���u���E�U���g���܂���, ���߂�Ȃ���"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: �t�@�C����ۑ���...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: �I�����܂���.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "�G���[: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[������(�o�C�g)] ������-����� %<PRIu64>-%<PRIu64>, �g�p�� %<PRIu64>, �s�["
-#~ "�N�� %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[�ďo] �� re/malloc() �� %<PRIu64>, �� free() �� %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: �s�������Ȃ�߂��܂���"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �����G���[: lalloc(%<PRId64>,)"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: �s���� 'mouseshape' �ł�"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "�Í����p�̃L�[����͂��Ă�������: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "������x�����L�[����͂��Ă�������: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "�L�[����v���܂���"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2 �ɐڑ��ł��܂���"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans �ɐڑ��ł��܂���"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: NetBeans�̐ڑ����t�@�C���̃A�N�Z�X���[�h�ɖ�肪����܂�: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans �̃\\�P�b�g��Ǎ���"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �o�b�t�@ %<PRId64> �� NetBeans �ڑ��������܂���"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeans�͂���GUI�ɂ͑Ή����Ă��܂���"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: NetBeans�͊��ɐڑ����Ă��܂�"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s �͓Ǎ���p�ł� (���������ɂ� ! ��lj�)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ���]���@�\\�������ɂȂ��Ă��܂�"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> �s�������"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUI�ł� 'term' ��ύX�ł��܂���"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUI���X�^�[�g����ɂ� \":gui\" ���g�p���Ă�������"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+2 GUI�ł͕ύX�ł��܂���"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: �����ȃt�H���g�ł�"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �t�H���g�Z�b�g��I���ł��܂���"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: �����ȃt�H���g�Z�b�g�ł�"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ���C�h�t�H���g��I���ł��܂���"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: �����ȃ��C�h�t�H���g�ł�"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: �}�E�X�̓T�|�[�g����܂���"
-
-#~ msgid "cannot open "
-#~ msgstr "�J���܂��� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: �E�B���h�E���J���܂���!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados�̃o�[�W���� 2.04������ȍ~���K�v�ł�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s �̃o�[�W���� %<PRId64> ���K�v�ł�\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NIL���J���܂���:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "�쐬�ł��܂��� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim�� %d �ŏI�����܂�\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�R���\\�[�����[�h��ύX�ł��܂���?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: �R���\\�[���ł͂Ȃ�??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f �I�v�V�����ŃV�F�������s�ł��܂���"
-
-#~ msgid "Cannot execute "
-#~ msgstr "���s�ł��܂��� "
-
-#~ msgid "shell "
-#~ msgstr "�V�F�� "
-
-#~ msgid " returned\n"
-#~ msgstr " �߂�܂���\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE �������߂��܂�."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "���o�̓G���["
-
-#~ msgid "Message"
-#~ msgstr "���b�Z�[�W"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ��80�ł͂Ȃ�����, �O���R�}���h�����s�ł��܂���"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: �v�����^�̑I���Ɏ��s���܂���"
-
-#~ msgid "to %s on %s"
-#~ msgstr "%s �� (%s ���)"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: ���m�̃v�����^�I�v�V�����ł�: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: ����G���[: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "������Ă��܂�: '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: �����Z�b�g�� \"%s\" �͕s���ł� (�t�H���g�� \"%s\")"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: '%c' �͕s���ȕ����ł� (�t�H���g�� \"%s\")"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: 2�d�̃V�O�i���̂���, �I�����܂�\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: �v���I�V�O�i�� %s �����m���܂���\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: �v���I�V�O�i�������m���܂���\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "X�T�[�o�ւ̐ڑ��� %<PRId64> �~���b������܂���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X �̃G���[�����o���܂���r\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "X display �̃`�F�b�N�Ɏ��s���܂���"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X display �� open ���^�C���A�E�g���܂���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "sh �V�F�������s�ł��܂���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�p�C�v���쐬�ł��܂���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "fork �ł��܂���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�R�}���h�𒆒f���܂���\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ��ICE�ڑ��������܂���"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "X display �� open �Ɏ��s���܂���"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ��save-yourself�v�����������Ă��܂�"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ���ڑ����J�n���Ă��܂�"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE�ڑ������s�����悤�ł�"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection�����s���܂���: %s"
-
-#~ msgid "At line"
-#~ msgstr "�s"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll �����[�h�ł��܂���ł���"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM�G���["
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "DLL����֐��|�C���^���擾�ł��܂���ł���"
-
-#~ msgid "shell returned %d"
-#~ msgstr "�V�F�����R�[�h %d �ŏI�����܂���"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: �C�x���g %s �����m\n"
-
-#~ msgid "close"
-#~ msgstr "�‚���"
-
-#~ msgid "logoff"
-#~ msgstr "���O�I�t"
-
-#~ msgid "shutdown"
-#~ msgstr "�V���b�g�_�E��"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: �R�}���h������܂���"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE�� $PATH �̒��Ɍ��‚���܂���.\n"
-#~ "�O���R�}���h�̏I����Ɉꎞ��~�����܂���.\n"
-#~ "�ڍׂ�  :help win32-vimrun  ���Q�Ƃ��Ă�������."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim�̌x��"
-
-#~ msgid "Error file"
-#~ msgstr "�G���[�t�@�C��"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: �����N���X���܂�NFA�\\�z�Ɏ��s���܂���!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) ���݉��f���̃u�����`�ɏ\\���ȃ����������蓖�Ă��܂���!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "�x��: �P�ꃊ�X�g \"%s_%s.spl\" ����� \"%s_ascii.spl\" �͌��‚���܂���"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s ���̕ϊ��̓T�|�[�g����Ă��܂���"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: ������������Ȃ��̂ŁA�P�ꃊ�X�g�͕s���S�ł�"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: �^�O�t�@�C���̃p�X�� %s �ɐ؂�̂Ă��܂���\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�V�����V�F�����N�����܂�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "��̑I��̈�̂�����CUT_BUFFER0���g�p����܂���"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "�”\\�ȃA���h�D�͂���܂���: �Ƃ肠���������܂�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: ��Í����t�@�C�����Í������ꂽ�A���h�D�t�@�C�����g���Ă܂�: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: �Í������ꂽ�A���h�D�t�@�C���̉�ǂɎ��s���܂���: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: �A���h�D�t�@�C�����Í�������Ă��܂�: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 �r�b�g GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �r�b�g GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �r�b�g GUI ��"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " in Win32s ���[�h"
-
-#~ msgid " with OLE support"
-#~ msgstr " with OLE �T�|�[�g"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �r�b�g �R���\\�[�� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �r�b�g �R���\\�[�� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 �r�b�g ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 �r�b�g MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 �r�b�g MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�ʏ� �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny �� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "with GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "with GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "with X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "with X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "with X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "with Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "with GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "with Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "with Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "with (�N���V�b�N) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     �V�X�e�� gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       ���[�U gvimrc: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "    ��2���[�U gvimrc: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "    ��3���[�U gvimrc: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    �V�X�e�����j���[: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "�R���p�C��: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�ڍׂ̓��j���[�� �w���v���ǎ� ���Q�Ƃ��ĉ�����   "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "���[�h���Ŏ��s��, �^�C�v�����������}������܂�"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "���j���[�� �ҏW���S�̐ݒ聨�}��(���S��)���[�h�ؑ� "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              ���[�h�L��       "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "���j���[�� �ҏW���S�̐ݒ聨Vi�݊����[�h�ؑ�      "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              ��Vim�Ƃ��ē���    "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "   �x��: Windows 95/98/Me �����o  "
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr " �ڍׂȏ���          :help windows95<Enter> "
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "������Vim�ŕҏW���� (&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "1�‚�Vim�ŕҏW���� (&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Vim�ō�����\\������"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Vim�ŕҏW���� (&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�N���ς�Vim�ŕҏW���� - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�I�������t�@�C����Vim�ŕҏW����"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "�v���Z�X�̍쐬�Ɏ��s: gvim���‹��ϐ�PATH��ɂ��邩�m�F���Ă�������!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll �G���["
-
-#~ msgid "Path length too long!"
-#~ msgstr "�p�X���������܂�!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: ���m�̃t�H���g�Z�b�g: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: ���m�̃t�H���g: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: �t�H���g \"%s\" �͌Œ蕝�ł͂���܂���"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: ���C�u�����̊֐� %s �����[�h�ł��܂���ł���"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �w�u���C��͎g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �y���V�A��͎g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: �A���r�A��͎g�p�s�”\\�ł�: �R���p�C�����ɖ����ɂ���Ă��܂�\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: %s �Ƃ������O�̓o�^���ꂽ�T�[�o�͂���܂���"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �f�B�X�v���C���J���܂���"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �����Ȏ����󂯎��܂���"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: �̈悪�ی삳��Ă���̂�, �ύX�ł��܂���"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans �͓Ǎ���p�t�@�C����ύX���邱�Ƃ������܂���"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "�Í��L�[���K�v�ł�: \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "��̃L�[�͋��‚���Ă��܂���"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "�����̓��b�N����Ă��܂�"
-
-#~ msgid "list is locked"
-#~ msgstr "���X�g�̓��b�N����Ă��܂�"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "�����ɃL�[ '%s' ��lj�����̂Ɏ��s���܂���"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "�C���f�b�N�X�� %s �ł͂Ȃ��������X���C�X�ɂ��Ă�������"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr ""
-#~ "str() �������� unicode() �̃C���X�^���X�����҂���Ă���̂� %s �ł���"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "bytes() �������� str() �̃C���X�^���X�����҂���Ă���̂� %s �ł���"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr "long() ������֕ϊ��”\\�Ȃ��̂����҂���Ă���̂� %s �ł���"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "int() ������֕ϊ��”\\�Ȃ��̂����҂���Ă���̂� %s �ł���"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "C����� int �^�Ƃ��Ă͒l���傫�߂��܂�"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "C����� int �^�Ƃ��Ă͒l�������߂��܂�"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "���l�� 0 ���傫���Ȃ���΂Ȃ�܂���"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "���l�� 0 ������ȏ�łȂ���΂Ȃ�܂���"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject�����������܂���"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "�����ȑ����ł�: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: I/O�I�u�W�F�N�g�̏������G���["
-
-#~ msgid "failed to change directory"
-#~ msgstr "�����̕ύX�Ɏ��s���܂���"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "imp.find_module() �� %s ��Ԃ��܂��� (���Ғl: 2 �v�f�̃^�v��)"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "impl.find_module() �� %d �v�f�̃^�v����Ԃ��܂��� (���Ғl: 2)"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "�����G���[: imp.find_module �� NULL ���܂ރ^�v����Ԃ��܂���"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "vim.Dictionary�����͏����܂���"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "�Œ肳�ꂽ�����͕ύX�ł��܂���"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "���� %s �͐ݒ�ł��܂���"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "�C�e���[�V�������� hashtab ���ύX����܂���"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr "�V�[�P���X�̗v�f���ɂ� 2 �����҂���Ă��܂����� %d �ł���"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "���X�g�̃R���X�g���N�^�̓L�[���[�h�������󂯕t���܂���"
-
-#~ msgid "list index out of range"
-#~ msgstr "���X�g�͈͊O�̃C���f�b�N�X�ł�"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "�����G���[: vim�̃��X�g�v�f %d �̎擾�Ɏ��s���܂���"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "���X�g�ւ̗v�f�lj��Ɏ��s���܂���"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "�����G���[: vim�̃��X�g�v�f %d �͂���܂���"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "�����G���[: ���X�g�ւ̗v�f�lj��Ɏ��s���܂���"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "vim.List �����͏����܂���"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "�Œ肳�ꂽ���X�g�͕ύX�ł��܂���"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "�����֐� %s �͑��݂��܂���"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "�֐� %s ������܂���"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "�֐��̃R���X�g���N�^�̓L�[���[�h�������󂯕t���܂���"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "�֐� %s �̎��s�Ɏ��s���܂���"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "�E�B���h�E��؊����ɖ�肪�������܂���"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "�O���[�o���I�v�V���� %s �̐ݒ�����͂ł��܂���"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "�O���[�o���Ȓl�̖����I�v�V���� %s �̐ݒ�����͂ł��܂���"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "�폜���ꂽ�^�u���Q�Ƃ��悤�Ƃ��܂���"
-
-#~ msgid "no such tab page"
-#~ msgstr "���̂悤�ȃ^�u�y�[�W�͂���܂���"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "�폜���ꂽ�E�B���h�E���Q�Ƃ��悤�Ƃ��܂���"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "�Ǎ���p����: �o�b�t�@�["
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "�J�[�\\���ʒu���o�b�t�@�̊O���ł�"
-
-#~ msgid "no such window"
-#~ msgstr "���̂悤�ȃE�B���h�E�͂���܂���"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "�폜���ꂽ�o�b�t�@���Q�Ƃ��悤�Ƃ��܂���"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "�o�b�t�@���̕ύX�Ɏ��s���܂���"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "�}�[�N����1�����̃A���t�@�x�b�g�łȂ���΂Ȃ�܂���"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "vim.Buffer�I�u�W�F�N�g�����҂���Ă���̂� %s �ł���"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "�w�肳�ꂽ�o�b�t�@ %d �ւ̐؂�ւ��Ɏ��s���܂���"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "vim.Window�I�u�W�F�N�g�����҂���Ă���̂� %s �ł���"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "���݂̃^�u�ɂ͎w�肳�ꂽ�E�B���h�E������܂���ł���"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "�w�肳�ꂽ�E�B���h�E�ɐ؂�ւ��܂���ł���"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "vim.TabPage�I�u�W�F�N�g�����҂���Ă���̂� %s �ł���"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "�w�肳�ꂽ�^�u�y�[�W�ɐ؂�ւ��܂���ł���"
-
-#~ msgid "failed to run the code"
-#~ msgstr "�R�[�h�̎��s�Ɏ��s���܂���"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: ���]���͗L����python�I�u�W�F�N�g��Ԃ��܂���ł���"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: �Ԃ��ꂽpython�I�u�W�F�N�g��vim�̒l�ɕϊ��ł��܂���ł���"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "%s vim�̎����^�ɕϊ��ł��܂���"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "%s ��vim�̍\\���̂ɕϊ��ł��܂���"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "�����G���[: NULL�Q�Ƃ��n����܂���"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "�����G���[: �����Ȓl�^�ł�"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "�p�X�t�b�N�̐ݒ�Ɏ��s���܂���: sys.path_hooks �����X�g�ł͂���܂���\n"
-#~ "�����ɉ��L�����{���Ă�������:\n"
-#~ "- vim.path_hooks �� sys.path_hooks �֒lj�\n"
-#~ "- vim.VIM_SPECIAL_PATH �� sys.path �֒lj�\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "�p�X�̐ݒ�Ɏ��s���܂���: sys.path �����X�g�ł͂���܂���\n"
-#~ "������ vim.VIM_SPECIAL_PATH �� sys.path �ɒlj����Ă�������"
diff --git a/src/nvim/po/ko.UTF-8.po b/src/nvim/po/ko.UTF-8.po
index 149286eda8..7afa507edb 100644
--- a/src/nvim/po/ko.UTF-8.po
+++ b/src/nvim/po/ko.UTF-8.po
@@ -2648,11 +2648,6 @@ msgstr "E49: 스크롤 크기가 잘못되었습니다"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4224,10 +4219,6 @@ msgstr "%4ld 줄:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 잘못된 레지스터 이름: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "메시지 관리자: Bram Moolenaar <Bram@vim.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "중단: "
diff --git a/src/nvim/po/ko.po b/src/nvim/po/ko.po
deleted file mode 100644
index b6aaf37bbb..0000000000
--- a/src/nvim/po/ko.po
+++ /dev/null
@@ -1,7858 +0,0 @@
-# Korean translation for Vim
-#
-# FIRST AUTHOR SungHyun Nam <goweol@gmail.com>, 2000-2011
-#
-# Generated from ko.UTF-8, DO NOT EDIT.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vim 7.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2010-02-18 09:49+0900\n"
-"Last-Translator: SungHyun Nam <goweol@gmail.com>\n"
-"Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=euc-kr\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "�ɼ� ���� �ڿ� ������ ��"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[��ġ ���]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Quickfix ���]"
-
-#: ../buffer.c:94
-#, fuzzy
-msgid "E855: Autocommands caused command to abort"
-msgstr "E812: Autocommand�� ���۳� �����̸��� �ٲپ����ϴ�"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ���۸� �Ҵ��� �� ��� �����ϴ�..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ���۸� �Ҵ��� �� ��� �ٸ� �� ����մϴ�..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: ������ ���۰� �����ϴ�"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: ������ ���۰� �����ϴ�"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: ������ ������ ���۰� �����ϴ�"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "���� �� ���� ���������ϴ�"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "���� %d ���� ���������ϴ�"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "���� �� ���� ���������ϴ�"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "���� %d ���� ���������ϴ�"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "���� �� ���� ������ ���������ϴ�"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "���� %d���� ������ ���������ϴ�"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: ������ ���۸� ���� �� �����ϴ�"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: �ٲ� ���۸� ã�� �� �����ϴ�"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: ������ ���۰� �����ϴ�"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: ���� %<PRId64>��(��) �������� �ʽ��ϴ�"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: ������ �����Դϴ�"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: ù ��° �����Դϴ�"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr ""
-"E89: ���� %<PRId64>��(��) ���������� ��ģ �� �������� �ʾҽ��ϴ� (�����"
-"�� ! ���ϱ�)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ���: ���� �̸� ����� ���ƽ��ϴ�"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: ���� %<PRId64>��(��) ã�� �� �����ϴ�"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: %s��(��) �ϳ� �̻� ã�ҽ��ϴ�"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: %s�� �´� ���۰� �����ϴ�"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "%<PRId64> ��"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: �� �̸��� ���� ���۰� �̹� �ֽ��ϴ�"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [�ٲ�]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[��ġ�� �ʾ���]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[�� ����]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[�б� ����]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[�б� ����]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[�б� ����]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �� --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �� --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "%<PRId64> / %<PRId64> �� --%d%%-- ĭ "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[�̸� ����]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "����"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[����]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[�̸� ����]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "���"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "�ٴ�"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "�����"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# ���� ���:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[Scratch]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- ��ȣ ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s�� ���� ��ȣ:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  id=%d  �̸�=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: �ݷ��� �����ϴ�"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: �̻��� ���"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ���ڰ� �ʿ��մϴ�"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: �̻��� �����"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64>�� �̻��� ���ۿ� ���ؼ��� diff�� �� �� �����ϴ�"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: �ӽ� ������ �аų� �� �� �����ϴ�"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: diff�� ���� �� �����ϴ�"
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: patch ����� ���� �� �����ϴ�"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: diff ����� ���� �� �����ϴ�"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: ���� ���۴� diff ���°� �ƴմϴ�"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: ���� ������ diff ���� ���۴� �����ϴ�"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: �ٸ� �����߿� diff ������ �� �����ϴ�"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr ""
-"E101: �ΰ� �̻��� ���۰� diff ���¿��� � ���� ����� �� �� �� �����ϴ�"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: \"%s\" ���۸� ã�� �� �����ϴ�"
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: \"%s\" ���۴� diff ���°� �ƴմϴ�"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ���۰� �𸣴� ���̿� �ٲ�����ϴ�"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: digraph���� Escape�� �� �� �����ϴ�"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: Ű�� ������ ã�� �� �����ϴ�"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: �ҷ����� ���Ͽ��� :loadkeymap�� ������� �ʾҽ��ϴ�"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: Ű�� ��Ʈ���� �������"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " ���� �ϼ� (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ��� (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " ��ü �� �ϼ� (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " ���� �̸� �ϼ� (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " �±� �ϼ� (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " ��� ���� �ϼ� (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " ���� �ϼ� (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Dictionary �ϼ� (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " ������� �ϼ� (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " ������ �ϼ� (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " ����� ���� �ϼ� (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni �ϼ� (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " �ܾ� ���� (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " ���� ���� �ϼ� (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�ܶ��� ������ ����"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: Completion ����� â�� �ٲپ����ϴ�"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: Completion ����� ���ڿ��� �������ϴ�"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "'dictionary' �ɼ��� ������ϴ�"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "'thesaurus' �ɼ��� ������ϴ�"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "���� � ��: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (�����ֱ�) ��ũ�� (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�ٲ�) ��ũ�� (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "� ��: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "�±� ã�� ��."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " ���ϱ�"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- � ��..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "������� ����"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "�ٸ� �ٿ� ����"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "The only match"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "match %d of %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "match %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: ':let'�� �𸣴� ����"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: ��� ��ȣ�� ������ ���: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ���� �� �� ����: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ']'�� �����ϴ�"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s ���ڴ� List�̾�� �մϴ�"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s ���ڴ� List Ȥ�� Dictionary���� �մϴ�"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Dictionary�� �� Ű�� �� �� �����ϴ�"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: List�� �ʿ��մϴ�"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionary�� �ʿ��մϴ�"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �Լ��� �ʹ� ���� ���� �ѱ�: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary�� �� ����: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �Լ� %s��(��) �̹� �ֽ��ϴ�, �ٲٷ��� !�� ���ϼ���"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: �̹� Dictionary �׸��� �ֽ��ϴ�"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: Funcref�� �ʿ��մϴ�"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Dictionary�� [:]�� ����� �� �����ϴ�"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: %s=�� ���� �߸��� ������"
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: �𸣴� �Լ�: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ���������� ���� ��: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: Float�� String���� ���"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: List �׸񺸴� ���� ���"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: List �׸񺸴� ���� ���"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "���� ��Ͽ� �ߺ��� ;"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: %s ���� ����� ������ �� �����ϴ�"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: List�� Dictionary�� ������ �� �ֽ��ϴ�"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:]�� �������� ��ġ�ؾ� �մϴ�"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:]�� List ���� �ʿ��մϴ�"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: List ���� ��󺸴� ���� �׸��� ������ �ֽ��ϴ�"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: List ���� ����� �׸��� ������ ���� �ʽ��ϴ�"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: :for �ڿ� \"in\"�� �����ϴ�"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ��ȣ ����: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: �̷� ���� ����: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: ���(����)�ϱ⿡ ������ �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: '?' �ڿ� ':'�� �����ϴ�"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: List�� List�͸� ���� �� �ֽ��ϴ�"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: List�� ���� �߸��� ����"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: Dictionary�� Dictionary�͸� ���� �� �ֽ��ϴ�"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Dictionary�� ���� �߸��� ����"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcref�� Funcref�͸� ���� �� �ֽ��ϴ�"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Funcrefs�� ���� �߸��� ����"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Float�� '%'�� ����� �� �����ϴ�"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ')'�� �����ϴ�"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: Funcref�� ������ �� �����ϴ�"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: �ɼ� �̸� ����: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: �𸣴� �ɼ�: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ����ǥ ����: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ����ǥ ����: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: List�� �޸� ����: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: List ���� ']' ����: %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Dictionary�� �ݷ� ����: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Dictionary�� �ߺ��� Ű: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Dictionary�� �޸� ����: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Dictionary ���� '}' ����: %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: ������ ǥ���ϱ⿡ �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �Լ� %s�� �ʹ� ���� ���ڰ� ���޵Ǿ����ϴ�"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �Լ� %s(��)�� �߸��� ���ڰ� �Ѱ������ϴ�"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: �𸣴� �Լ�: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �Լ��� ���� ���� �ѱ�: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ��ũ��Ʈ ���ؽ�Ʈ �ۿ��� <SID> ���: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Dictionary���� �����Լ��� �ҷ���: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: Number Ȥ�� Float�� �ʿ��մϴ�"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "-c ����"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: �ʹ� ���� ����"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete()�� �Է� ��忡���� ���� �� �ֽ��ϴ�"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "Ȯ��(&O)"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Ű�� �̹� ������: %s"
-
-#: ../eval.c:8692
-#, fuzzy
-msgid "extend() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "-c ����"
-
-#: ../eval.c:8916
-#, fuzzy
-msgid "filter() argument"
-msgstr "-c ����"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: �𸣴� �Լ�: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore()�� inputsave()���� ���� �ҷ������ϴ�"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "-c ����"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: ������ ������ �ʽ��ϴ�"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len()�� �߸��� ��"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: Stride�� 0"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ������ġ�� ���� ����ħ"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<�������>"
-
-#: ../eval.c:12282
-#, fuzzy
-msgid "remove() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �ʹ� ���� �ɺ��� ��ũ (�ݺ���ȯ?)"
-
-#: ../eval.c:12593
-#, fuzzy
-msgid "reverse() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "sort() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: ���� �� ����� �����߽��ϴ�"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: ���� �� ����� �����߽��ϴ�"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(�߸��Ǿ����ϴ�)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: �ӽ� ���� ���� ����"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Float�� Number�� ���"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Funcref�� Number�� ���"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: List�� Number�� ���"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Dictionary�� Number�� ���"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: Funcref�� String���� ���"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: List�� String���� ���"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Dictionary�� String���� ���"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: ���� �� �ٸ�: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: ���� %s�� ������ �� �����ϴ�"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Funcref �������� �빮�ڷ� �����ؾ� ��: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �������� �̹� �ִ� �Լ����� �浹: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: ���� �������: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "��"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: %s ���� �ٲ� �� �����ϴ�"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: �����ϱ⿡ ������ �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ���� �� �� �Լ�: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '('�� ����: %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: IC ���� ������ �� �����ϴ�"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �߸��� ����: %s"
-
-#: ../eval.c:17323
-#, fuzzy, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "�ߺ��� �ʵ� ��: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction�� �����ϴ�"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �Լ����� �������� �浹: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �Լ� %s��(��) �ٽ� ������ �� �����ϴ�: ������Դϴ�"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �Լ����� ��ũ��Ʈ ���ϸ��� �ٸ�: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �Լ� �̸��� �ʿ��մϴ�"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �Լ� �̸��� �빮�ڷ� �����ϰų� �ݷ��� �����ؾ� ��: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �Լ� �̸��� �빮�ڷ� �����ϰų� �ݷ��� �����ؾ� ��: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �Լ� %s��(��) ���� �� �����ϴ�: ������Դϴ�"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �Լ��� �θ� ���̰� 'maxfuncdepth'���� Ů�ϴ�"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s ��� ��"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s��(��) �����Ǿ����ϴ�"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s��(��) #%<PRId64>��(��) �����־����ϴ�"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s��(��) %s��(��) �����־����ϴ�"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "%s���� ���"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return�� �Լ� �ȿ� ���� �ʽ��ϴ�"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ���� ����:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLast set from "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "old ������ �����ϴ�"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  ������ %02x,  ���� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d,  ������ %04x,  ���� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d,  ������ %08x,  ���� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: ���� �� �ڽ����� �̵��Ϸ��� �߽��ϴ�"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "1 �� �Ű������ϴ�"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> �� �Ű������ϴ�"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> ���� �ɷ����ϴ�"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* �ڵ������� ���� ���۸� �ٲپ�� �� �˴ϴ�"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[���������� ��ģ �� ���� �� ��]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: �ٿ� %s: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �ʹ� ���� ����, ������ �dzʶ�"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "viminfo ���� \"%s\"%s%s%s��(��) �д� ��"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ����"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " ��ũ"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr ""
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ����"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo ������ ���� ������ �����ϴ�: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Viminfo ���� %s��(��) �� �� �����ϴ�!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Viminfo ���� \"%s\"��(��) ���� ��"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# �� viminfo ������ ���� ���� ���Դϴ� Vim %s.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ���ɸ� �Ѵٸ� ��ĥ ���� �ֽ��ϴ�!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# �� ������ ����Ǿ��� ���� 'encoding'�� ��\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "�̻��� ���� ����"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "���� �Ϻθ� �����ұ��?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ���� �Ϻθ� ������ !�� ����Ͻʽÿ�"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "�̹� �ִ� \"%s\" ������ ������?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "���� ���� \"%s\"�� �ֽ��ϴ�, ������?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ���� ���� ����: %s (������� :silent! ���)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: ���� %<PRId64>�� ���� �̸��� �����ϴ�"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ������ ������ ����: 'write' �ɼǿ� ���� �� ���� �����ϴ�"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"'readonly' �ɼ��� \"%s\"�� ���� �����Ǿ� �ֽ��ϴ�.\n"
-"�׷��� ���⸦ ���Ͻʴϱ�?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"���� \"%s\"�� �б������Դϴ�.\n"
-"�׷��� ���Ⱑ ������ ���� �𸨴ϴ�.\n"
-"�� �� �� �����?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\"�� �б� �����Դϴ� (������� ! ���ϱ�)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommand�� �� �ۿ� �� ���� %s��(��) �������ϴ�"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: ���ڰ� �ƴ� ���ڰ� :z�� �־������ϴ�"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim������ �� ������ ����� �� �����ϴ�"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ����ǥ������ ���ڷ� ���е� �� �����ϴ�"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "%s(��)�� �ٲ� (y/n/a/q/l/^E/^Y)?"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(�ߴܵǾ����ϴ�) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1�� ���"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1�� �ٲ���"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64>�� ���"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64>�� �ٲ���"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " �� �ٿ���"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " %<PRId64> �ٿ���"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global�� ��� ȣ�� �� �� �����ϴ�"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global���� ����ǥ������ �������ϴ�"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "���� �ٿ��� ������ ã�ҽ��ϴ�: %s"
-
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
-msgid "Pattern not found: %s"
-msgstr "������ ã�� �� �����ϴ�"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ���������� �ٲ� ���ڿ�:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: ��Ȳ���� ���ʽÿ�!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: �̾��մϴ�, ���� '%s'��(��) %s�� ���� �����ϴ�"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: �̾��մϴ�, %s�� ���� ������ �����ϴ�"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "�̾��մϴ�, ���� ���� \"%s\"��(��) ã�� �� �����ϴ�"
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ���丮�� �ƴ�: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: ���� ���� %s��(��) �� �� �����ϴ�"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �б� ���� %s��(��) �� �� �����ϴ�"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: �� ������ ���� ���ڵ� ���: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: \"%s\" �±װ� %s/%s ���Ͽ��� �ߺ��Ǿ����ϴ�"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: �𸣴� sign ����: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: sign �̸��� �����ϴ�"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: �ʹ� ���� sign�� ���ǵǾ� �ֽ��ϴ�"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: �߸��� sign �ؽ�Ʈ: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: �𸣴� sign: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: sign ��ȣ�� �����ϴ�"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: �߸��� ���� �̸�: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: �߸��� sign ID: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (�������� ����)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[���������ϴ�]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "����� ���·� ��.  ����Ϸ��� \"cont\"�� �Է��Ͻʽÿ�."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "%<PRId64> ��: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "����: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "������: \"%s%s\" %<PRId64> ��"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �������� ã�� �� �����ϴ�: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "�������� ���ǵǾ� ���� �ʽ��ϴ�"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  %<PRId64> ��"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ���� \":profile start {fname}\"�� ����ϼ���"
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "\"%s\"�� �ٲ� ������ �����ұ��?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "���� ����"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ���� \"%s\"�� ���߿� �ٲ� ������ ������ �ʾҽ��ϴ�"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "���: �� �ۿ� �ٸ� ���۷� �����ϴ� (autocommand�� Ȯ���Ͻʽÿ�)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: ��ĥ ������ �ϳ� �ۿ� �����ϴ�"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: ù ��° ���� �������δ� �� �� �����ϴ�"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: ������ ���� �ڷδ� �� �� �����ϴ�"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: �����Ϸ��� �������� ����: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "\"%s\"��(��) \"%s\"���� � ��"
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "\"%s\"��(��) � ��"
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath'���� � �� ����: \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "���丮�� source�� �� ����: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "\"%s\"��(��) �ҷ� ���� �� �����ϴ�"
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "%<PRId64> ��: \"%s\"��(��) �ҷ� ���� �� �����ϴ�"
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "\"%s\"��(��) �ҷ����̴� ��"
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "%<PRId64> ��: \"%s\" �ҷ����̴� ��"
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "%s �ҷ����̱� ��"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr ""
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ����"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ����"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "ȯ�� ����"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "���� �ڵ鷯"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ���: �߸��� �� ������. ^M�� ���� �� �����ϴ�"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding�� �ҷ����� ���� �ۿ��� ���Ǿ����ϴ�"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish�� �ҷ����� ���� �ۿ��� ���Ǿ����ϴ�"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "���� %s���: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �� \"%s\"(��)�� ������ �� �����ϴ�"
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Ex ���·� ��ȯ.  Normal ���·� ������ \"visual\"�� �Է��Ͻʽÿ�."
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: ������ �������Դϴ�"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: ������ �ʹ� ���� �ٽ� �ݺ��Ǿ����ϴ�"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: ���ܰ� �߻����� �ʾҽ��ϴ�: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "�ҷ����� ������ ������"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "�Լ��� ������"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ����� ���� ������ ��ȣ�ϰ� ����ϰ� �ֽ��ϴ�"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: ������ ������ �ƴմϴ�"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: �ݴ� ������ �־������ϴ�"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "�ݴ� ������ �־������ϴ�, ���������"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: w�� w>>�� ����Ͻʽÿ�"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: �̾��մϴ�, �� ������ ���� �ǿ��� ����� �� �����ϴ�"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: ������ �ϳ��� ���� �̸��� ��� �����մϴ�"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "��ĥ ������ �� �� �� �ֽ��ϴ�. �׷��� �������?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "��ĥ ������ %d �� �� �ֽ��ϴ�. �׷��� �������?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: ��ĥ ������ �� �� �� �ֽ��ϴ�"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: ��ĥ ������ %<PRId64> �� �� �ֽ��ϴ�"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ������ �̹� �����մϴ�: �ٲٷ��� !�� ���ϼ���"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    �̸�        ���� ����  �ϼ�      ����"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "����� ���� ������ ã�� �� �����ϴ�"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: ���õ� �Ӽ��� �����ϴ�"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: �߸��� ���� ����"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ī��Ʈ�� �� �� �̻� ���õ� �� �����ϴ�"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: �߸��� �⺻ ī��Ʈ ��"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete�� ���ڰ� �ʿ��մϴ�"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: �߸��� �Ӽ�: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: �߸��� ���� �̸�"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ����� ���� ������ �빮�ڷ� �����ؾ� �մϴ�"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: ����� �̸�, ����� ���� �������� ���� �� �����ϴ�"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: �׷� ����� ���� ���� ����: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: �߸��� ������ ��: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �ϼ� ���ڴ� ����� �ϼ������� ���˴ϴ�"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ����� �ϼ��� �Լ� ���ڰ� �ʿ��մϴ�"
-
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �� ��Ŵ %s��(��) ã�� �� �����ϴ�"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "�� ����ڴ�, ȯ���մϴ�!"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: ������ ���� ���� �� �����ϴ�"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "�̹� �ϳ��� �Ǹ� �ֽ��ϴ�"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "�� ������ %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "���� ������ �����ϴ�"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: ���丮�� �ٲ� �� ���� ��, ���۴� ������ (������� ! ���ϱ�)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: ���� ���丮�� �����ϴ�"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: ��"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize�� �ΰ��� ���ڰ� �ʿ��մϴ�"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: �� �÷����� ���� â ��ġ ��� ����� �������� �ʾҽ��ϴ�"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos���� �ΰ��� ���ڰ� �ʿ��մϴ�"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: ���丮 ���� ����: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\"��(��) �����մϴ� (������� ! ���ϱ�)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ���� ���� \"%s\"��(��) �� �� �����ϴ�"
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ���ڴ� ���ڳ� ��/�� �ο� ��ȣ���� �մϴ�"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal�� ��� ȣ���� �ʹ� ���� ������ϴ�"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: '#'�� ���� ġȯ�� ��ü ���� �̸��� �����ϴ�"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: \"<afile>\"�� ���� ġȯ�� �ڵ����� ���� �̸��� �����ϴ�"
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: \"<abuf>\"�� ���� ġȯ�� �ڵ����� ���� ��ȣ�� �����ϴ�"
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: \"<amatch>\"�� ���� ġȯ�� �ڵ����� ��ġ �̸��� �����ϴ�"
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: \"<sfile>\"�� ���� ġȯ�� :source ���� �̸��� �����ϴ�"
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: \"<slnum>\"�� ���� �� ��ȣ�� �����ϴ�"
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: '%'�� '#'�� ���� �� ���� �̸�, ������ \":p:h\"�͸� �����մϴ�"
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: �� ���ڿ����� ���� ���Ϸ��� �մϴ�"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ���� viminfo ������ �� �� �����ϴ�"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: 'Vim' ���λ�� ���ܸ� :throw�� �� �����ϴ�"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "���� thrown: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "���� �����: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "���� ������: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, %<PRId64> ��"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "���� �߻�: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s��(��) pending �Ǿ����ϴ�"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s��(��) �簳 �Ǿ����ϴ�"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s��(��) ���������ϴ�"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "����"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "������ ���ͷ�Ʈ"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "����"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "���ͷ�Ʈ"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: :if�� �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :if���� :endif�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :if���� :else�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :if���� :elseif�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: �������� :else�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :else �ڿ� :elseif�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: :while/:for�� �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :while Ȥ�� :for���� :continue�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :while Ȥ�� :for���� :break�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: :while�� :endfor�� ���Ǿ����ϴ�"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: :for�� :endwhile�� ���Ǿ����ϴ�"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: :try�� �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :try���� :catch�� �ֽ��ϴ�"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :finally �ڿ� :catch�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :try���� :finally�� �ֽ��ϴ�"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: �������� :finally�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :try���� :endtry�� �ֽ��ϴ�"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction�� function ���� �����ϴ�"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: ������ �ٸ� ���۸� ������ �� �����ϴ�"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: ������ ���� ������ �ٲ� �� �����ϴ�"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "�±��̸�"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " kind file\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "'history' �ɼ��� 0�Դϴ�"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s �����丮 (���ͺ��� ������ �� ��):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "���� ��"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "ã�� ���ڿ�"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "ǥ��"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "�Է� ��"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar�� ���� ���̸� ������ϴ�"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: Ȱ���� â�̳� ���۰� ���������ϴ�"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr ""
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: �߸��� ���: '**[��ȣ]'�� ����� �������� ��ġ�ϰų� '%s' �ڿ� �־�� "
-"�մϴ�."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath���� \"%s\" ���丮�� ã�� �� �����ϴ�"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path���� \"%s\" ������ ã�� �� �����ϴ�"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath���� �� �̻��� \"%s\" ���丮�� ã�� �� �����ϴ�"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: path���� �� �̻��� \"%s\" ������ ã�� �� �����ϴ�"
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: Autocommand�� ���۳� �����̸��� �ٲپ����ϴ�"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "�߸��� ���� �̸�"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "��(��) ���丮�Դϴ�"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "��(��) ������ �ƴմϴ�"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[�� ����]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[�� ���丮]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[������ �ʹ� ŭ]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[��� �� �˴ϴ�]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre �ڵ������� ������ ���� ���ϰ� ��������ϴ�"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre �ڵ������� ���� ���۸� �ٲٸ� �� �˴ϴ�"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "��: ǥ���Է¿��� �д� ��...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ��ȯ�� ������ ���� ���� �����ϴ�!"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[����/����]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[����]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[����]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr ""
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[CR ����]"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[�� �� �߸�]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[��ȯ �� �˴ϴ�]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[��ȯ �Ǿ����ϴ�]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> �ٿ��� ��ȯ ����]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> �ٿ� �߸��� ����Ʈ]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[�б� ����]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "��ȯ�ϱ� ���� �ӽ� ������ ã�� �� �����ϴ�"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "'charconvert'�� ����� ��ȯ�� �����߽��ϴ�"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "'charconvert'�� ��°���� ���� �� �����ϴ�"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: acwrite ���ۿ� ���� autocommand�� ã�� �� �����ϴ�"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: �� ���۸� �ڵ������� ����ų� �ݾҽ��ϴ�"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand�� �߸��� ������� ���� �ٲپ����ϴ�"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "���� Ȥ�� �� �� �ִ� ��ġ�� �ƴմϴ�"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "�б� �����Դϴ� (������� ! ���ϱ�)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: ��������� �� �� �����ϴ� (������� ! ���ϱ�)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: ������� �ݱ� ���� (������� ! ���ϱ�)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: ����� ������ ���� �� �����ϴ� (������� ! ���ϱ�)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: ��������� ���� �� �����ϴ� (������� ! ���ϱ�)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: ��������� ���� �� �����ϴ� (������� ! ���ϱ�)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �� �ӽ� ������ ã�� �� �����ϴ�"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: ��ȯ�� �� �����ϴ� (��ȯ ���� �����Ϸ��� ! ���ϱ�)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �� ����� ������ �� �� �����ϴ�"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �� ������ �� �� �����ϴ�"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync�� �����߽��ϴ�"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �ݱⰡ �����߽��ϴ�"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ���� ����, ��ȯ ���� (�����Ϸ��� 'fenc'�� ���� ��)"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: ���� ����, %<PRId64> �ٿ��� ��ȯ ���� (�����Ϸ��� 'fenc'�� ���� ��)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: ���� ���� (���� �ý����� ��á����?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " ��ȯ ����"
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr "%<PRId64> �ٿ���;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[��ġ]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[���ο�]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " ���߽��ϴ�"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ���� �߽��ϴ�"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: ��ġ ����: ���� ������ ������ �� �����ϴ�"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: ��ġ ����: �� ���� ������ ���� �� �����ϴ�"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: ��� ������ ���� �� �����ϴ�"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"���: ���� ������ �������ų� ������ �� �ֽ��ϴ�\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "������ ���������� ����� ������ �����⸦ ������ ���ʽÿ�!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[����]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[���� ����]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[��]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[�� ����]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[���н�]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[���н� ����]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 ��, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> ��, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 ����"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ����"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[�ҿ����� ������ ��]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "���: ������ ���� �ڿ� �ٲ�����ϴ�!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "������ ���⸦ ���Ͻʴϱ�"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: \"%s\"�� ���� ����"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: \"%s\" �ݱ� ����"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: \"%s\" �б� ����"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell �ڵ������� ���۸� �������ϴ�"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ���� \"%s\"��(��) �� �̻� ����� �� �����ϴ�"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr ""
-"W12: ���: ���� \"%s\"��(��) �ٲ���� ���������� ���� ���۵� �ٲ�����ϴ�"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "�� ���� ������ ������ \":help W12\"�� �Է��ϼ���."
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ���: ���� \"%s\"��(��) ��ġ�� ������ �ڿ� �ٲ�����ϴ�"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "�� ���� ������ ������ \":help W11\"�� �Է��ϼ���."
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ���: ���� \"%s\"�� ���°� ��ġ�� ������ �ڿ� �ٲ�����ϴ�"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "�� ���� ������ ������ \":help W16\"�� �Է��ϼ���."
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ���: ���� \"%s\"��(��) ��ġ�� ������ �ڿ� ��������ϴ�"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "���"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"Ȯ��(&O)\n"
-"���� �ҷ�����(&L)"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: \"%s\"�� ��ε带 �غ��� �� �����ϴ�"
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: \"%s\"��(��) �ٽ� �ε��� �� �����ϴ�"
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--������--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "autocommand �ڵ�����: %s <buffer=%d>"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: �̷� �׷� ����: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * �ڿ� �̻��� ����: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: �׷� �̺�Ʈ ����: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: �׷� �׷��̳� �̺�Ʈ ����: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- �ڵ�-���� ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: �߸��� ���� ��ȣ"
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ALL �̺�Ʈ�� ���� �ڵ������� ������ �� �����ϴ�"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "�´� �ڵ������� �����ϴ�"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: �ڵ������� �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr ""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "%s ������"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "�ڵ����� %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: {�� �����ϴ�."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: }�� �����ϴ�."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: fold�� �����ϴ�"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: ������ 'foldmethod'���� ���⸦ ���� �� �����ϴ�"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: ������ 'foldmethod'���� ���⸦ ���� �� �����ϴ�"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �� ���� "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: ������ ���ۿ� ���ϱ�"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: ��� ����"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s ���� �� �̹� �����մϴ�"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s ���� ������ �̹� �����մϴ�"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s �� �̹� �����մϴ�"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s ������ �̹� �����մϴ�"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "�� ã�� �� �����ϴ�"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "������ ã�� �� �����ϴ�"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: �̻��� ����"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--���ۿ� �� ����--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: ������ �����Ǿ����ϴ�"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ���ڰ� �ʿ��մϴ�"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: /, ? Ȥ�� &�� \\ �ڿ� �;� �մϴ�"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ������ â�� �߸���; <CR> ����, CTRL-C ������"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ���� ���丮 �Ǵ� �±� ã�⿡�� exrc/vimrc������ ������ ��� �� �˴ϴ�"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif�� �����ϴ�"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry�� �����ϴ�"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile�� �����ϴ�"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ����"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while���� :endwhile�� �ֽ��ϴ�"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :for ���� :endfor"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ������ �ֽ��ϴ� (������� ! ���)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ������ �����߽��ϴ�"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: ���� ����"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "�ߴܵǾ����ϴ�"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: �߸��� �ּ�"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: �߸��� ����"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: �߸��� ����: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: �߸��� ǥ����: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: �߸��� ����"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: �߸��� ����"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\"��(��) ���丮�Դϴ�"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ��ũ�� ũ�Ⱑ �߸��Ǿ����ϴ�"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ���̺귯�� \"%s()\" �θ��� ����"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ��ũ�� �߸��� �� ��ȣ�� ������ �ֽ��ϴ�"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: ��ũ�� �����Ǿ� ���� �ʽ��ϴ�"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: �ٲ� �� ����, 'modifiable'�� �����ֽ��ϴ�"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ��ũ��Ʈ�� �ʹ� ���� ��ø�Ǿ����ϴ�"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: �ٸ� ������ �����ϴ�"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: �׷� ���� �����ϴ�"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: !�� ������ �ʽ��ϴ�"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI�� ����� �� �����ϴ�: ������ �� ���Ե��� �ʾҽ��ϴ�"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: �̷� ���̶���Ʈ �׷� �̸��� �����ϴ�: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: �Էµ� �ؽ�Ʈ�� ���� �����ϴ�"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: ���� ���� ���� �����ϴ�"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: �׷� ������ �����ϴ�"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: ���� �ʽ��ϴ�"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: ���� ����: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: ���� �̸��� �����ϴ�"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ���� �ٲٱ� ���� ǥ������ �����ϴ�"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: ���� ������ �����ϴ�"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ���� ����ǥ������ �����ϴ�"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: ������ ������ �ʽ��ϴ�"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: �� ������ ������� �ʽ��ϴ�"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: %s ������ ���� �� �����ϴ�"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �ӽ� ���� �̸��� ���� �� �����ϴ�"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: %s ������ �� �� �����ϴ�"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: %s ������ ���� �� �����ϴ�"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ���������� ��ģ �� ������� �ʾҽ��ϴ� (�����Ϸ��� ! ���ϱ�)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[���������� ��ģ �� ���� �� ��]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: �� ����"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ���ڰ� �ʿ��մϴ�"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �������� %s��(��) �� �� �����ϴ�"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �޸𸮰� �ٴڳ����ϴ�!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "������ ã�� �� �����ϴ�"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ������ ã�� �� �����ϴ�: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: ���ڴ� ����̾�� �մϴ�"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ���� ���丮�� �� �� �����ϴ�"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: ���� ����"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: ��ġ ��� ����"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ���� �´� ���ڿ�"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ���� ����ǥ���� ���α׷�"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' �ɼ��� �����Ǿ� �ֽ��ϴ� (������� ! ���ϱ�)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: �б� ���� ���� \"%s\"��(��) �ٲ� �� �����ϴ�"
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: sandbox �ȿ����� ������ ������ �� ����: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: �������� �д� ���߿� ����"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: sandbox������ ������ �ʽ��ϴ�"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: ���⿡�� ������ �ʽ��ϴ�"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ��ũ�� ���� ������ �������� �ʽ��ϴ�"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ��ũ�� ũ�Ⱑ �߸��Ǿ����ϴ�"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' �ɼ��� ������ϴ�"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign �ڷḦ ���� �� �����ϴ�"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: ���� ������ ���� �� �����ϴ�"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: �±� ������ ������ϴ�"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ������ �ʹ� �����մϴ�"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: �̸��� �ʹ� ��ϴ�"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [�� �ʹ� �����ϴ�"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: ���� �̸��� �ʹ� �����ϴ�"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: ���� ���ڰ� �� �ֽ��ϴ�"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: �𸣴� ��ũ"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ���� ���ڸ� Ȯ���� �� �����ϴ�"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight'�� 'winminheight'���� Ŀ�� �մϴ�"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth'�� 'winminwidth'���� Ŀ�� �մϴ�"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: ���� �߿� ����"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "Zero count"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ��ũ��Ʈ ���ؽ�Ʈ �ۿ��� <SID> ���"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: ���� ����: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ������ 'maxmempattern'���� ���� �޸𸮸� ����մϴ�"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �� ����"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: �߸��� ã�� ���� Ȥ�� ������"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ������ �ٸ� ���ۿ� �ε��Ǿ� �ֽ��ϴ�"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: �ɼ� '%s'��(��) �����Ǿ� ���� �ʽ��ϴ�"
-
-#: ../globals.h:1111
-#, fuzzy
-msgid "E850: Invalid register name"
-msgstr "E354: �߸��� �������� �̸�: '%s'"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "���� ���, ������ ���"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "������ ���, ���� ���"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: �ݷ��� �����ϴ�"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: �̻��� ������Ʈ"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: ���ڰ� �ʿ��մϴ�"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "������ %d"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "�μ�� �ؽ�Ʈ�� �����ϴ�"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "������ %d ��� (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " ���� %d / %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "��: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "�μⰡ ��ҵǾ����ϴ�."
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: ����Ʈ��ũ��Ʈ ������Ͽ� �� �� �����ϴ�."
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: \"%s\" ������ �� �� �����ϴ�"
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ����Ʈ��ũ��Ʈ ���ҽ� ���� \"%s\"��(��) ���� �� �����ϴ�"
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: ���� \"%s\"��(��) ����Ʈ��ũ��Ʈ ���ҽ� ������ �ƴմϴ�"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: ���� \"%s\"��(��) �����Ǵ� ����Ʈ��ũ��Ʈ ���ҽ� ������ �ƴմϴ�"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" ���ҽ� ������ ������ �߸��Ǿ����ϴ�"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: ȣȯ���� �ʴ� ���߹��� ���ڵ��� ���ڼ�."
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset�� ���߹��� ���ڵ����� �ݵ�� �����Ǿ�� �մϴ�."
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: ���߹��� �μ⸦ ���� �۲��� �����Ǿ� ���� �ʽ��ϴ�"
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ����Ʈ��ũ��Ʈ ��������� �� �� �����ϴ�"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: \"%s\" ������ �� �� �����ϴ�"
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: ����Ʈ��ũ��Ʈ ���ҽ� ���� \"prolog.ps\"�� ã�� �� �����ϴ�"
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: ����Ʈ��ũ��Ʈ ���ҽ� ���� \"cidfont.ps\"�� ã�� �� �����ϴ�"
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: ����Ʈ��ũ��Ʈ ���ҽ� ���� \"%s.ps\"�� ã�� �� �����ϴ�"
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: \"%s\" �μ� ���ڵ����� ��ȯ�� �� �����ϴ�"
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "�����ͷ� ������ ��..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: ����Ʈ��ũ��Ʈ ������ �μ��� �� �����ϴ�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "�μ��۾��� �������ϴ�."
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "�� �����ͺ��̽� ���ϱ�"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr ""
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "�� �޽��� ���̱�"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "���� ����"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "��� ���� �ٽ� �ʱ�ȭ"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "���� �����ֱ�"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: ����: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "�� cscope ������ â �����⸦ �������� �ʽ��ϴ�.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: ����: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �±׸� ã�� �� �����ϴ�"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) ����: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s��(��) ���丮�� Ȥ�� cscope �����ͺ��̽��� �ƴմϴ�"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "cscope �����ͺ��̽� %s�� ���߽��ϴ�."
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscope ���� %<PRId64> �б� ����"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: �𸣴� cscope ã�� ����"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: cscope �������� ���� �� �����ϴ�"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: cscope�� fork�� �� �����ϴ�"
-
-#: ../if_cscope.c:849
-#, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection ������ �����߽��ϴ�"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection ������ �����߽��ϴ�"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: to_fp�� ���� fdopen ����"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fr_fp�� ���� fdopen ����"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: cscope ���μ����� spawn�� �� �����ϴ�"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: cscope ������ �����ϴ�"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr ""
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr ""
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "cscope ����:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (����: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: �� �Լ��� �θ��� �Լ��� ã��\n"
-"       d: �� �Լ��� ���� �ҷ����� �Լ��� ã��\n"
-"       e: �� egrep ���� �\n"
-"       f: �� ���� �\n"
-"       g: �� ���� �\n"
-"       i: �� ������ �����ϴ� ���ϵ� ã��\n"
-"       s: �� C �ɺ� ã��\n"
-"       t: �� ���ڿ� ã��\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: �ߺ��� cscope �����ͺ��̽��� �������� �ʾҽ��ϴ�"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: cscope ���� %s��(��) ã�� �� �����ϴ�"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "cscope ���� %s��(��) �������ϴ�"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: cs_manage_matches�� �ɰ��� ����"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Cscope �±�: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   ��"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "���� �̸� / ���ؽ�Ʈ / ��\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: Cscope ����: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "��� cscope �����ͺ��̽� ����"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "cscope ������ �����ϴ�\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    �����ͺ��̽� �̸�                   prepend path\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "�𸣴� �ɼ� ����"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�ʹ� ���� ���� ����"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "�ڿ� ���ڰ� ����"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "�ɼ� ���� �ڿ� ������ ��"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "�ʹ� ���� \"+command\" \"-c command\" Ȥ�� \"--cmd command\" ����"
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr ""
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d ������ ��ġ��\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "��ũ��Ʈ ������ �ٽ� ������ �õ�: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�б� ���� �� �� ����: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "��ũ��Ʈ ����� �� �� ����: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "��: ���: �͹̳η� ����� �� �����ϴ�\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "��: ���: �͹̳η� ���� �Է¹��� �� �����ϴ�\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "pre-vimrc ���� ��"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: \"%s\"���� ���� �� �����ϴ�"
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"�� ���� ������ ���Ͻø�: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[���� ..]       �־��� ���� ��ġ��"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               ǥ���Է¿��� �ؽ�Ʈ �б�"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �±װ� ���ǵ� ��ġ���� ���� ��ġ��"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [��������]   ù ��° ������ �� ���� ��ġ��"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"����:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [����] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   Ȥ��:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"����:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t�� �ڿ��� ���� �̸���"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t���ϵ�ī�带 Ȯ������ ����"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi ���� (\"vi\"�� ����)"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx ���� (\"ex\"�� ����)"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t������ (��ġ) ���� (\"ex\"��)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ���� (\"vimdiff\"�� ����)"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t���� ���� (\"evim\"�� ����, modeless)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t�б� ���� ���� (\"view\"�� ����)"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t���ѵ� ���� (\"rvim\"�� ����)"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t����(���� ����)�� ������ ����"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t�ؽ�Ʈ ������ ������ ����"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t���� ����"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\t������ ����"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tVi ȣȯ: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tVi�� ȣȯ���� ����: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t����� ����"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t���� ���� ���� �޸𸮸� ���"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t���� ���� ����� ǥ���� �� ������"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (���� �̸��� �Բ�)\t�ļյǾ��� ���� ����"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t-r�� ����"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\tArabic ���� ����"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\tHebrew ���� ����"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tFarsi ���� ����"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�͹̳� ������ <terminal>�� ����"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t.vimrc ��� <vimrc>�� ���"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�÷����� ��ũ��Ʈ�� �ҷ������� ����"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tN���� �� ���� (�⺻: ���Ϻ��� �ϳ�)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tN���� â ���� (�⺻: ���Ϻ��� �ϳ�)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\t-o�� ������ � �������� ������"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t���� ���������� ����"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t<lnum> �ٿ��� ����"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <����>\tvimrc ������ �б� ���� <����>�� ����"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <����>\t\tù° ������ ���� �� <����>�� ����"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <����>\t\tù° ������ ���� �� <����> ���� �ҷ� ���̱�"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t<scriptin> ���Ͽ��� Normal ���� ���� �б�"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t��� �Էµ� ������ <scriptout> ���Ͽ� �߰�"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t��� �Էµ� ������ <scriptout> ���Ͽ� ����"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr "--startuptime <file>\tstartup timing �޽����� <file>�� ����"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t.viminfo ��� <viminfo>�� ���"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h Ȥ�� --help\t����(�� �޽���)�� ����� �� ������"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t�� ������ ����� �� ������"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "������ ��ũ�� �����ϴ�"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: \"%s\"�� �´� ��ũ�� �����ϴ�"
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"��ũ ����  col ����/�ؽ�Ʈ"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" ���� ����  col ����/�ؽ�Ʈ"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# ���� ��ũ:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ������� (������ ����):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# ���ϳ��� ��ũ �����丮 (���ͺ��� ������ ��):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "'>'�� �����ϴ�"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: ������ ������� �ʾҽ��ϴ�"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: ���� ������ �б� ���� Ư�� ��ġ�� �� �� �����ϴ�"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: ���� ������ ���� �� �����ϴ�"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: ���� ������ ���� ���� Ư�� ��ġ�� �� �� �����ϴ�"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: ���� ������ �� �� �����ϴ�"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: ���� ������ �̹� �����մϴ� (symlink ����?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: ���� ��ȣ 0�� ���� ���߳���?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: ���� ��ȣ 1�� ���� ���߳���?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: ���� ��ȣ 2�� ���� ���߳���?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ����, ���� ������ �Ҿ���Ƚ��ϴ�!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: ���� ���� �̸��� �ٲ� �� �����ϴ�"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: \"%s\"�� ���� ������ �� �� ��� ������ �Ұ����մϴ�"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): ���� 0�� ���� ���߳���??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: %s�� ���� ������ ã�� �� �����ϴ�"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "����� ���� ���� ��ȣ�� �Է��Ͻʽÿ� (0�� ������): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: %s��(��) �� �� �����ϴ�"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "Unable to read block 0 from "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"� ������ �����ų� ���� ���� ������ �������� ���� �� �����ϴ�."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " cannot be used with this version of Vim.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "�� 3.0 ���� ����Ͻʽÿ�.\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s��(��) �� ���� ������ �ƴ� �� �����ϴ�"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " �� ��ǻ�Ϳ����� ���� �� �����ϴ�.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr ""
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "���� ���� \"%s\"��(��) ����մϴ�"
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "���� ���� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ���: ���� ������ �ٲ�����ϴ�"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: %s�� ���� 1�� ���� �� �����ϴ�"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???���� ���� �Ҿ����"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???�� ��ȣ�� �߸��Ǿ����ϴ�"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???�� ����"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???���� �Ҿ����"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ���� 1�� ID�� �߸��Ǿ����ϴ� (%s��(��) .swp ������ �ƴѰ�?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???���� �Ҿ����"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ������� ???�������� ���� �������ϴ�"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ������� ???�������� ���� �������ų� ������ ���� �� �����ϴ�"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???��"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: ���� �ߴܵǾ����ϴ�"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: ���� ���� ���� ������ϴ�; ???�� �����ϴ� ���� ã�ƺ��ʽÿ�"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "�� ���� ������ ������ \":help E312\"�� �Է��ϼ���."
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "������ �������ϴ�. ��� �� ������ �� Ȯ���� ���ž߸� �մϴ�."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(��¼�� �ٸ� �̸����� �����ϰ� ������ ���� �𸣰ڽ��ϴ�\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "�׸��� �ٲ� ������ Ȯ���Ϸ��� ���� ���Ͽ� ���� diff�� �����ϼ���)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "������ �������ϴ�. ������ ������ ���� ����� �����ϴ�."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"���� .swp ������ ����ŵ� �˴ϴ�.\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "���� ������ ���:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   ���� ���丮��:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   ���õ� �̸��� ���:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   In directory "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- ���� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "          ������: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "   ��¥: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "             ��¥: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [�� 3.0 ���� ��]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [�� ���� ���Ϸ� ������ �ʽ��ϴ�]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "         ���� �̸�: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"          ����: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "��"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "�ƴϿ�"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"         ����� �̸�: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "  ȣ��Ʈ �̸�: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"         ȣ��Ʈ �̸�: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"        ����� ID: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (���� ������)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [�� ��ǻ�Ϳ����� ����� �� ����]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [���� �� ����]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�� �� ����]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ������ �� �����ϴ�, ���� ������ �����ϴ�"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "������ �����Ǿ����ϴ�"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: ���� ������ �����߽��ϴ�"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: �߸��� lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: %<PRId64> ���� ã�� �� �����ϴ�"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: �߸��� ������ ���� id 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx�� 0���߸� �մϴ�"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: �ʹ� ���� ������ ���ŵǾ�����?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: �߸��� ������ ���� id 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "���� 1�� ����������?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: %<PRId64> ���� ã�� �� �����ϴ�"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: �߸��� ������ ���� id"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count�� 0�Դϴ�"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: �� ��ȣ�� ������ ������ϴ�: ���������� %<PRId64> ��ŭ"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: ���� %<PRId64>�� �� ������ Ʋ�Ƚ��ϴ�"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "���� ũ�� ����"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: �߸��� ������ ���� id 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr ""
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: �ָ�"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"Found a swap file by the name \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "While opening file \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      NEWER than swap file!\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) �ٸ� ���α׷��� ���� ������ ��ġ�� �ִ����� �� �ֽ��ϴ�.\n"
-"    ���� �׷��ٸ� ���� ������ �� ���� ���α׷����� ��ġ��\n"
-"    �ʵ��� �����Ͻñ� �ٶ��ϴ�.\n"
-
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    �����ų� ������ �����Ͻ÷��� ����Ͻʽÿ�.\n"
-
-#: ../memline.c:3246
-#, fuzzy
-msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) ������ ��ġ�ٰ� �׾������ϴ�.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���� �׷��ٸ� \":recover\" Ȥ�� \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    �� ����Ͽ� �����Ͻʽÿ� (\":help recovery\" ����).\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    �̹� �����ϼ̾��ٸ� �������� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    ��(��) ����ž� �� �޽����� ������ϴ�.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "���� ���� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\"�� �̹� �����մϴ�!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "�� - �ָ�"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "���� ������ �̹� �����մϴ�!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�б� �������� ����(&O)\n"
-"�׳� ��ġ��(&E)\n"
-"����(&R)\n"
-"������(&Q)\n"
-"������(&A)"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�б� �������� ����(&O)\n"
-"������ ����(&E)\n"
-"����(&R)\n"
-"����(&D)\n"
-"������(&Q)\n"
-"������(&A)"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: �ʹ� ���� ���� ������ �߰ߵǾ����ϴ�"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �޸� ����!  (%<PRIu64> ����Ʈ�� �Ҵ�)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: �޴� �׸� ����� �κ��� ���� �޴��� �ƴմϴ�"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: �޴��� �ٸ� ��忡���� �����մϴ�"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: \"%s\" �޴� ����"
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: �޴� �̸� ����"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ���� �޴� �տ��� �޴� ��ΰ� ���� �� �����ϴ�"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: �޴��ٿ� ��ٷ� �޴� �׸��� ���� ���� �����ϴ�"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: �����ڴ� �޴� ����� �κ��� �� �� �����ϴ�"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- �޴� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �޴� �׸� �տ��� �޴� ��ΰ� �־�� �մϴ�"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: �޴��� ã�� �� �����ϴ�: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ��忡 ���� �޴��� ���ǵǾ� ���� �ʽ��ϴ�"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ���� �޴� �տ� �޴� ��ΰ� �־�� �մϴ�"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: �޴��� ã�� �� ���� - �޴� �̸��� Ȯ���Ͻʽÿ�"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "%s ������ ���� �߰�:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "%4ld ��:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �߸��� �������� �̸�: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "�޽��� ������: Bram Moolenaar <Bram@vim.org>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "�ߴ�: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "����Ϸ��� ���� Ȥ�� ������ �Է��Ͻʽÿ�"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �� %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- �� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ȭ��/������/���� �Ʒ���, b/u/k: ����, q: ���� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "����"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"��(&Y)\n"
-"�ƴϿ�(&N)"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"�ƴϿ�(&N)\n"
-"���(&C)"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"�ƴϿ�(&N)\n"
-"��� ����(&A)\n"
-"��� ����(&D)\n"
-"���(&C)"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: printf()�� �Ѿ�� ���� ������ ����"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: printf()�� ������� Float ����"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: printf()�� �ʹ� ���� ���� �Ѿ��"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ���: �б� ���� ������ ��ġ�� �ֽ��ϴ�"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "���� �Է��� <����>�� ���콺 Ŭ�� (���ھ����� ���): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "���� �Է��� <����> (���ھ����� ���): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "�� �� �̻�"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "�� �� ����"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> ���� ���� ��"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> ���� ���� ��"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (�ߴܵǾ����ϴ�)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "��!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "�����Ϸ��� �� �θ�: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: Ŀ�� �ؿ� �ĺ��ڰ� �����ϴ�"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc'�� ����ֽ��ϴ�"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "���: �͹̳��� ����� ���¸� ǥ���� �� �����ϴ�"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: Ŀ�� �ؿ� ���ڿ��� �����ϴ�"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: ������ 'foldmethod'���� ���⸦ ���� �� �����ϴ�"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: changelist�� ������ϴ�"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr ""
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr ""
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "VIM�� ��ġ����  :quit<Enter>  �Է�"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 line %sed 1 time"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 line %sed %d times"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> lines %sed 1 time"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> lines %sed %d times"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> lines to indent... "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "1 line indented "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> lines indented "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr ""
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "cannot yank; delete anyway"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "1 line changed"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> lines changed"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "block of 1 line yanked"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "1 line yanked"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "block of %<PRId64> lines yanked"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> lines yanked"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: %s �������Ϳ� �ƹ� �͵� �����ϴ�"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- �������� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "�̻��� �������� �̸�"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# ��������:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: �𸣴� �������� ���� %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Selected %s%<PRId64> of %<PRId64> ����; %<PRId64> of %<PRId64> �ܾ�; "
-"%<PRId64> of %<PRId64> ����Ʈ"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Selected %s%<PRId64> of %<PRId64> ����; %<PRId64> of %<PRId64> �ܾ�; "
-"%<PRId64> of %<PRId64> ����; %<PRId64> of %<PRId64> ����Ʈ"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Col %s of %s; ���� %<PRId64> of %<PRId64>; �ܾ� %<PRId64> of %<PRId64>; ����"
-"Ʈ %<PRId64> of %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Col %s of %s; ���� %<PRId64> of %<PRId64>; �ܾ� %<PRId64> of %<PRId64>; ���� "
-"%<PRId64> of %<PRId64>; ����Ʈ %<PRId64> of %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=������ %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "���� ���� �� �ּż� �������ϴ�"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: �𸣴� �ɼ�"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: �������� �ʴ� �ɼ��Դϴ�"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: �����ο��� ���� �� �����ϴ�"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr ""
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: = �ڿ� ���ڰ� �ʿ��մϴ�"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: termcap���� ã�� �� �����ϴ�"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: �̻��� ���� <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: 'term'�� �� ���ڿ��� ������ �� �����ϴ�"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext'�� 'patchmode'�� �����մϴ�"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: 'listchars' ���� �浹�� �߻��մϴ�"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: 'fillchars' ���� �浹�� �߻��մϴ�"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: �ݷ��� �����ϴ�"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: �� ���ڿ��Դϴ�"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: <%s> �ڿ� ���ڰ� �����ϴ�"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: �޸��� �����ϴ�"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ' ���� ������ �ּž� �մϴ�"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: ����� �� ����, Ȥ�� ���̵� ���ڸ� �����ϰ� �ֽ��ϴ�"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: <%c> �ڿ� �̻��� ����"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: �޸��� �ʿ��մϴ�"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring'�� ��ų� %s��(��) �����ؾ� �մϴ�"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: ������ ���� ǥ���� �迭"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: �ʹ� ���� �׸�"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ������ �� ���� �׷�"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: �̸� ���� â�� �̹� �����մϴ�"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabic�� UTF-8 ���ڵ� �ʿ�, ':set encoding=utf-8' �ϼ���"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: ��� %d ���� �ʿ��մϴ�"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: ��� %d ĭ�� �ʿ��մϴ�"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: �𸣴� �ɼ�: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: ���ڰ� �ʿ�: &%s = '%s'"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- �͹̳� �ڵ� ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- ���� �ɼ� �� ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- ���� �ɼ� �� ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- �ɼ� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp ����"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': %s�� ���� �´� ���ڰ� �����ϴ�"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': �����ݷ� �ڿ� ���ڰ� �� ����: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Cannot execute shell "
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"shell returned "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"Could not get security context for "
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"Could not set security context for "
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path���� \"%s\" ������ ã�� �� �����ϴ�"
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: ���� ���ڿ��� %%%c��(��) �ʹ� �����ϴ�"
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: ���� ���ڿ��� %%%c��(��) �߸��Ǿ����ϴ�"
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: ���� ���ڿ��� ]�� �����ϴ�"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: ���� ���ڿ��� �������� �ʴ� %%%c��(��) �ֽ��ϴ�"
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: ���� ���ڿ� ���ο� �߸��� %%%c��(��) �ֽ��ϴ�"
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: ���� ���ڿ��� �߸��� %%%c��(��) �ֽ��ϴ�"
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat'�� � ���ϵ� �����ϰ� ���� �ʽ��ϴ�"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: �����ų� �� ���丮 �̸�"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: �� �̻��� �׸��� �����ϴ�"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d of %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (���� ������)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: ���Ƚ� ������ �ٴ��Դϴ�"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: ���Ƚ� ������ ������Դϴ�"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "error list %d of %d; %d errors"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: �� �� ����, 'buftype' �ɼ��� �����Ǿ� �ֽ��ϴ�"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: ���ϸ� ���� Ȥ�� �߸��� ����"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "\"%s\" ������ �� �� �����ϴ�"
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: ���۰� �ε���� �ʾҽ��ϴ�"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: String�̳� List�� �־�� ��"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: %s%%[]�� �߸��� �׸�"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ �ڿ� ]�� �����ϴ�"
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: ���� �ʴ� %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: ���� �ʴ� %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: ���� �ʴ� %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z(�� ���⿡�� ������ �ʽ��ϴ�"
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 ���� ���⿡�� ������ �ʽ��ϴ�"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ �ڿ� ]�� �����ϴ�"
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: �� %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: ������ �ʹ� ��ϴ�"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: \\z(�� �ʹ� �����ϴ�"
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: %s(�� �ʹ� �����ϴ�"
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: ���� �ʴ� \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ �ڿ� �߸��� ����"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: %s{...}s�� �ʹ� ����"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Nested %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Nested %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: \\_�� �� �� ���"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c �ڿ� �ƹ��͵� �����ϴ�"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: �̻��� ���� ����"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: \\z �ڿ� �̻��� ����"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: %s%%[dxouU] �ڿ� �̻��� ����"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: %s%% �ڿ� �̻��� ����"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...}�� ���� ����"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�ܺ� submatches:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr ""
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
-
-#: ../regexp_nfa.c:2042
-#, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: \\z(�� �ʹ� �����ϴ�"
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
-
-#: ../regexp_nfa.c:6049
-#, fuzzy
-msgid "Could not open temporary log file for writing "
-msgstr "E828: ���� ���� undo�� �� �� �����ϴ�: %s"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " ����ġȯ"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " �ٲٱ�"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " �ݴ�"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " �����ֱ�"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (�����ֱ�)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (�ٲٱ�)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (����ġȯ)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " ����"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " �ƶ���"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (���)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (���̱�)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " ���־�"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " ���־� ����"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " ���־� ����"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ������"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ���� ������"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ���� ������"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "�����"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: �߸��� ã�� ���ڿ�: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ó������ �´� ���ڿ��� �����ϴ�: %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ������ �´� ���ڿ��� �����ϴ�: %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ';' �ڿ��� '?'�� '/'�� �;� �մϴ�"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (������ �¾Ҵ� ��� ����)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- Included files "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "not found "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "in path ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (Already listed)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  �� ���"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "���Ե� ���� ã�� ��: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "���Ե� ���� %s ã�� ��"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: �´� �� ���� �ٿ� �ֽ��ϴ�"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "��� ���Ե� ������ ã�ҽ��ϴ�"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "���Ե� ������ �����ϴ�"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: ���Ǹ� ã�� �� �����ϴ�"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: ������ ã�� �� �����ϴ�"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Substitute "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: spell ���� ���� ����"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: �߸� spell ����"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "Trailing text in %s line %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "Affix name too long in %s line %d: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: affix ���� FOL, LOW Ȥ�� UPP�� ���� ����"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL, LOW Ȥ�� UPP�� ���ڰ� ������ ���"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "�ܾ� Ʈ�� ������..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ����� �˻簡 Ȱ��ȭ�Ǿ� ���� �ʽ��ϴ�"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "���: �ܾ� ��� \"%s.%s.spl\" Ȥ�� \"%s.ascii.spl\"�� ã�� �� �����ϴ�"
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "spell ���� \"%s\"��(��) �а� �ֽ��ϴ�"
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: spell ������ �ƴ� �� �����ϴ�"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: ������ spell ����, ������ �ʿ��մϴ�"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Spell ������ �� ������ Vim���Դϴ�"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: spell ���Ͽ� �������� �ʴ� ����"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "���: %s ������ �������� �ʽ��ϴ�"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "affix ���� %s �д� ��"
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "%s ���� %d�� �ִ� �ܾ� ��ȯ ����: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "%s�� ��ȯ�� �������� �ʽ��ϴ�: %s���� %s��"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "%s ���� %d�� FLAG�� ���� �߸��� ��: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "%s ���� %d�� �÷��װ� ���� �� FLAG: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"%s ���� %d�� PFX �ڿ� COMPOUNDFORBIDFLAG�� ������ ���� �߸��� ����� �ʷ��� "
-"�� �ֽ��ϴ�"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"%s ���� %d�� PFX �ڿ� COMPOUNDPERMITFLAG�� ������ ���� �߸��� ����� �ʷ��� "
-"�� �ֽ��ϴ�"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� COMPOUNDRULES ��: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� COMPOUNDWORDMAX ��: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� COMPOUNDMIN ��: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� COMPOUNDSYLMAX ��: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� CHECKCOMPOUNDPATTERN ��: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr "%s ���� %d�� ���ӵ� affix ���Ͽ� �ٸ� ���� �÷���: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "%s ���� %d�� �ߺ��� affix: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"%s ���� %d�� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST�� ���ؼ��� "
-"affix�� ����: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "%s ���� %d�� Y�� N�� ����: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "%s ���� %d�� ������ ����: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "%s ���� %d�� REP(SAL) ī��Ʈ�� ����"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "%s ���� %d�� MAP ī��Ʈ�� ����"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "%s ���� %d�� MAP�� �ߺ��� ����"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "%s ���� %d�� �𸣴� Ȥ�� �ߺ��� �׸�: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%s�� FOL/LOW/UPP�� ������ ����"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "COMPOUNDSYLMAX�� SYLLABLE���� ����"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "postponed ���λ簡 �ʹ� �����ϴ�"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "compound �÷��װ� �ʹ� �����ϴ�"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "postponed ���λ��(��) compound �÷��װ� �ʹ� �����ϴ�"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "SOFO%s�� ������ ������ %s�� �ֽ��ϴ�"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "%s�� SAL�� SOFO ������ �� �� �ֽ��ϴ�"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "%s ���� %d�� ���ڰ� �ƴ� �÷���: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� �÷���: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "%s ���� �ٸ� .aff ���Ͽ��� ���� �Ͱ� �ٸ��ϴ�"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "���� ���� %s �д� �� ..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: %s�� �ܾ� ī��Ʈ�� �����ϴ�"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "���� %6d, �ܾ� %6d - %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "%s ���� %d�� �ߺ��� �ܾ�: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "%s ���� %d�� ó�� �ߺ��� �ܾ�: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d���� �ߺ��� �ܾ %s�� �ֽ��ϴ�"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "���õ� %d���� �ƽ�Ű���ڿ��� �ƴ� �ܾ %s�� �ֽ��ϴ�"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "�ܾ� ���� %s �д� �� ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "%s ���� %d�� �ߺ��� /encoding= ���� ���õ�: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s ���� %d�� �ܾ� ���� /encoding= ���� ���õ�: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "%s ���� %d�� �ߺ��� /regions= ���� ���õ�: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "%s ���� %d�� �ʹ� ���� ����: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "%s ���� %d�� / ���� ���õ�: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "%s ���� %d�� �߸��� ���� ��ȣ: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "%s ���� %d�� �𸣴� �÷���: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "�ƽ�Ű ���ڿ��� �ƴ� %d���� �ܾ ���õǾ����ϴ�"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "%d/%d ��尡 �����; %d (%d%%)�� ����"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "����� ������ �д� ��..."
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "soundfold ������..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "soundfold ���� ���� �ܾ� ��: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "�� �ܾ� ��: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "%s ���� ������ ���� �� ..."
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "������ ��Ÿ�� �޸� ��뷮: %d ����Ʈ"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: ���� ���ϸ��� ���� �̸��� �޶�� �մϴ�"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: �ִ� 8���� ������ �����˴ϴ�"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: %s�� �߸��� ����"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "���: compound�� NOBREAK �� �� ���õ�"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "spell ���� %s ���� �� ..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "��!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile'�� %<PRId64> �׸��� �����ϴ�"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "%s���� �ܾ� ������"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "%s�� �ܾ� �߰���"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: �ܾ spell ���� ���� �ٸ��ϴ�"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "�˼�, ������ �� �����ϴ�"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "�˼�, %<PRId64>���� ����"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Change \"%.*s\" to:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ö�ڰ� �ٲ����� �����ϴ�"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: � �� ����: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ������ �ƴ� �� ����: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ������ .sug ����, ���� �ʿ�: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: .sug ������ �� ������ Vim����: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ������ .spl ���ϰ� ���� ����: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ���� �б� ����: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: MAP �׸� �ߺ��� ����"
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "�� ���ۿ� ���� ���ǵ� ���� �׸��� �����ϴ�"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: �߸��� ����: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �̷� ���� Ŭ�����ʹ� �����ϴ�: %s"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "C-���� �ּ����� �������"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "������� ����"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "syncing starts "
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " lines before top line"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- Syntax sync �׸�� ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"syncing on items"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- Syntax �׸� ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: �̷� ���� Ŭ�����ʹ� �����ϴ�: %s"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "minimal "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "maximal "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; match "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr " line breaks"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: contains ���ڴ� ���⿡ �� �� �����ϴ�"
-
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: �߸��� cchar ��"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: group[t]here�� ���⿡�� ���� �� �����ϴ�"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: %s�� ���� region �׸��� ã�� ���߽��ϴ�"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: �����̸��� �ʿ��մϴ�"
-
-#: ../syntax.c:4221
-#, fuzzy
-msgid "E847: Too many syntax includes"
-msgstr "E77: ���� �̸��� �ʹ� �����ϴ�"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ']' ����: %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: '=' ����: %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: ���ġ ���� ����: ���� ���� %s"
-
-#: ../syntax.c:4870
-#, fuzzy
-msgid "E848: Too many syntax clusters"
-msgstr "E391: �̷� ���� Ŭ�����ʹ� �����ϴ�: %s"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: Ŭ�����Ͱ� ���õ��� �ʾҽ��ϴ�"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: ���� �����ڸ� ã�� �� �����ϴ�: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: ���� �ڿ� ������: %s"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: syntax sync: �� ���� ������ �� �� ���Ǿ����ϴ�"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: ���������� ����: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: ���� ��ȣ�� ������: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: �� ����: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s��(��) ���⿡�� ������ �ʽ��ϴ�"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s��(��) contains ����� ù ��°���� �մϴ�"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: �𸣴� �׷� �̸�: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: �߸��� :syntax ���� ����: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: syncolor.vim �ݺ� �ε�"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: ���̶���Ʈ �׷��� ã�� �� �����ϴ�: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ���ġ ���� ����: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �ʹ� ���� ����: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: group�� �������� �ֽ��ϴ�, highlight link ���õ�"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ����� ���� ��ȣ: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ���� ��ȣ�� ������: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ���ڰ� ������: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ���������� ��: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: �𸣴� FG ����"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: �𸣴� BG ����"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: �� �̸��̳� ���ڸ� �ν��� �� ����: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: �͹̳� �ڵ尡 �ʹ� ��: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: �߸��� ����: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: �ʹ� ���� �ٸ� ���̶���Ʈ �Ӽ��� ���ǰ� �ֽ��ϴ�"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: �׷� �̸��� ����� �� ���� ���ڰ� �ֽ��ϴ�"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: �׷� �̸��� �̻��� ����"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr ""
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: �±� ������ ���Դϴ�"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: �±� ������ ó���Դϴ�"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: ù ��° �´� �±� �������δ� �� �� �����ϴ�"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �±׸� ã�� �� ����: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "����\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: �´� �±װ� �ϳ� �ۿ� �����ϴ�"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ������ �´� �±� �ڷδ� �� �� �����ϴ�"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "���� \"%s\"��(��) �������� �ʽ��ϴ�"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "tag %d of %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " or more"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  Using tag with different case!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: ���� \"%s\"��(��) �������� �ʽ��ϴ�"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "�±� ���� %s ã�� ��"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "�±� ������ �ʹ� �� ������ �����մϴ�"
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: �±� ���� \"%s\"�� ���� ������ �ֽ��ϴ�"
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Before byte %<PRId64>"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: �±� ������ ���ĵǾ� ���� ����: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: �±� ������ �����ϴ�"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �±� ������ ã�� �� �����ϴ�"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �±׸� ã�� �� ������ �̰� �����ϴ�!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "�ߺ��� �ʵ� ��: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' not known. Available builtin terminals are:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "defaulting to '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: termcap ������ �� �� �����ϴ�"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: �͹̳� �׸��� terminfo���� ã�� �� �����ϴ�"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: �͹̳� �׸��� termcap���� ã�� �� �����ϴ�"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap�� \"%s\" �׸��� �����ϴ�"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �͹̳��� \"cm\" ����� �����ؾ� �մϴ�"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- �͹̳� Ű ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "��: �Է� �д� �� ����, ��������...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: �� ������ �𸣴� ���̿� �ٲ�����ϴ�"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: ���� ���� undo�� �� �� �����ϴ�: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: ���� undo ���� (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "'undodir'�� �ִ� � ���丮���� undo ������ �� �� �����ϴ�"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "���� ���� ��� undo ���Ͽ� ��� �� �����ϴ�: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "undo ������ �ƴϾ ��� �� �����ϴ�: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "undo�� ������ ��� undo ���� ������ �dzʶݴϴ�"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "undo ���� ���� ��: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: undo ���� ���� ����: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "�����ڰ� �޶� undo ������ ���� �ʽ��ϴ�: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "undo ���� �д� ��: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: �б� ���� undo ������ �� �� �����ϴ�: %s"
-
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: undo ������ �ƴմϴ�: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: ȣȯ���� �ʴ� undo ����: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "���� ������ �ٲ�, undo ������ ����� �� �����ϴ�"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "undo ���� %s��(��) �о�鿴���ϴ�"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "�� �̻��� ������ �������ϴ�"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "�� �̻��� ������ �������ϴ�"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Undo ��ȣ %<PRId64>�� ã�� �� �����ϴ�"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: �߸��� �� ��ȣ"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "more line"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "more lines"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "line less"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "fewer lines"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "change"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "changes"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "before"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "after"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "����� �� �����ϴ�"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr ""
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> seconds ago"
-
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undo �ڿ� undojoin�� �� �� �����ϴ�"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: undo ����� �������ϴ�"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: undo ���� �����ϴ�"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"���Ե� ��ġ: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"������ ��ġ: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Modified by "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"Compiled "
-
-#: ../version.c:649
-msgid "by "
-msgstr "by "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"Huge ���� "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "GUI ����."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  ��� (+: ���Ե�, -: ���� �� ��):\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "        �ý��� vimrc ����: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "        ����� vimrc ����: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " ����� �� ��° vimrc ����: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " ����� �� ��° vimrc ����: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "         ����� exrc ����: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  ����� �� ��° exrc ����: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "  fall-back for $VIM: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr " f-b for $VIMRUNTIME: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "������: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "��ũ: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ����� ����"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "�� - ���� Vi"
-
-#: ../version.c:769
-msgid "version "
-msgstr "�� "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "by Bram Moolenaar et al."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "���� �ҽ��� ���� �ְ� ��¥�� �����˴ϴ�"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "�찣�ٿ� ��� ������ ���̸� �����ּ���!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "�̿� ���� ������ ������    :help iccf<����>       �Է�"
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "��������                   :q<����>               �Է�"
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "�¶��� ������ ������     :help<����> �Ǵ� <F1>  �Է�"
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�� ������ ������           :help version7<����>   �Է�"
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Vi ȣȯ ���·� �������Դϴ�"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "�� �⺻���� ����Ϸ���     :set nocp<����>        �Է�"
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�̿� ���� ������ ������    :help cp-default<����> �Է�"
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "�� ������ �Ŀ��� �ּ���!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "�� ����ڷ� ����ϼ���!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "�̿� ���� ������ ������    :help sponsor<����>    �Է�"
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "�̿� ���� ������ ������    :help register<����>   �Է�"
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�̿� ���� ������ ������    �޴� ����->Sponsor/Register"
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�̹� �ϳ��� â�� �ֽ��ϴ�"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: �̸� ���� â�� �����ϴ�"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: �� ���ʰ� �Ʒ� �������� ���ÿ� ���� �� �����ϴ�"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: �ٸ� â�� �������� ������ ȸ���� �� �����ϴ�"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: ������ â�� ���� �� �����ϴ�"
-
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: autocmd â�� ���� �� �����ϴ�"
-
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: � ���� �� ����, autocmd � ����"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: �ٸ� â�� �ٲ�����ϴ�"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: Ŀ�� �ؿ� ���� �̸��� �����ϴ�"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: �� ��й�ȣ�� bf_key_init() �Լ��� �ҷ������ϴ�"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish big/little endian use wrong"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256 ������ �����߽��ϴ�."
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish ������ �����߽��ϴ�."
-
-#~ msgid "Patch file"
-#~ msgstr "��Ű ����"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "Ȯ��(&O)\n"
-#~ "���(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim ������ ����Ǿ� ���� �ʽ��ϴ�"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s(��)�� ���� �� �����ϴ�"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: ������ ������ ���� �� �����ϴ�"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Ŭ���̾�Ʈ�� ���� �� �����ϴ�"
-
-#~ msgid "Save As"
-#~ msgstr "�ٸ� �̸����� ����"
-
-#~ msgid "Edit File"
-#~ msgstr "���� ��ġ��"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�� ���)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "�� ��ũ��Ʈ �ε�"
-
-#~ msgid "unknown"
-#~ msgstr "��"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "�� â���� ���� ��ġ��"
-
-#~ msgid "Append File"
-#~ msgstr "���� �߰�"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "â ��ġ: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "���𷺼� ����"
-
-#~ msgid "Save View"
-#~ msgstr "���� ����"
-
-#~ msgid "Save Session"
-#~ msgstr "���� ����"
-
-#~ msgid "Save Setup"
-#~ msgstr "���� ����"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #<�� +eval ����� ���ԵǾ�� ����� �� �ֽ��ϴ�"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: �� �ǿ��� digraph�� �����ϴ�"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "��(��) ��ġ�� �ƴմϴ� ('opendevice' �ɼ����� ����)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "ǥ���Է¿��� �д� ��..."
-
-#~ msgid "[crypted]"
-#~ msgstr "[��ȣȭ �Ǿ����ϴ�]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: ������ �𸣴� ������� ��ȣȭ�Ǿ� �ֽ��ϴ�"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans������ �ٲ��� ���� ���۸� �� �� �����ϴ�"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans ���ۿ� ���ؼ��� �κ� ������ �� �� �����ϴ�"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "��ġ ���Ⱑ 'opendevice' �ɼ����� ����"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: The resource fork will be lost (������� ! ���ϱ�)"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUI�� ������ �� �����ϴ�"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"���� ���� �� �����ϴ�"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: ������ �۲��� ã�� �� ��� GUI�� ������ �� �����ϴ�"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide'�� �̻��մϴ�"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' ���� �̻��մϴ�"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: �� %s��(��) �Ҵ��� �� �����ϴ�"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�� �� ����> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �۲� %s��(��) ���� �� �����ϴ�"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ���� ���丮�� ���ư� �� �����ϴ�"
-
-#~ msgid "Pathname:"
-#~ msgstr "��� �̸�:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ���� ���丮�� ���� �� �����ϴ�"
-
-#~ msgid "OK"
-#~ msgstr "Ȯ��"
-
-#~ msgid "Cancel"
-#~ msgstr "���"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "��ũ�ѹ� ����: �� �Ƚ����� ������Ʈ���� ���� �� �����ϴ�."
-
-#~ msgid "Vim dialog"
-#~ msgstr "�� ��ȭ����"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr ""
-#~ "E232: �޽����� �ݹ� ��θ� ����ؼ��� BalloonEval�� ���� �� �����ϴ�"
-
-#~ msgid "Input _Methods"
-#~ msgstr "�Է� ���(_M)"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "�� - ã�Ƽ� �ٲٱ�..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "�� - �..."
-
-#~ msgid "Find what:"
-#~ msgstr "���� ����:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�ٲ� ���ڿ�:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "�Ȱ��� ������"
-
-#~ msgid "Direction"
-#~ msgstr "����"
-
-#~ msgid "Up"
-#~ msgstr "����"
-
-#~ msgid "Down"
-#~ msgstr "�Ʒ���"
-
-#~ msgid "Find Next"
-#~ msgstr "���� �"
-
-#~ msgid "Replace"
-#~ msgstr "�ٲٱ�"
-
-#~ msgid "Replace All"
-#~ msgstr "��� �ٲٱ�"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "��: ���� �����ڷκ��� \"die\" ��û�� �޾ҽ��ϴ�\n"
-
-#~ msgid "Close"
-#~ msgstr "�ݱ�"
-
-#~ msgid "New tab"
-#~ msgstr "�� ��"
-
-#~ msgid "Open Tab..."
-#~ msgstr "�� ����..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "��: ���� â�� �װ� �� ���Դϴ�\n"
-
-#~ msgid "&Filter"
-#~ msgstr "�Ÿ���(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "���(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "���丮"
-
-#~ msgid "Filter"
-#~ msgstr "�Ÿ���"
-
-#~ msgid "&Help"
-#~ msgstr "����(&H)"
-
-#~ msgid "Files"
-#~ msgstr "����"
-
-#~ msgid "&OK"
-#~ msgstr "Ȯ��(&O)"
-
-#~ msgid "Selection"
-#~ msgstr "������"
-
-#~ msgid "Find &Next"
-#~ msgstr "���� �(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "�ٲٱ�(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "��� �ٲٱ�(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "���(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: â ���� \"%s\"��(��) ã�� �� �����ϴ�"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �������� �ʴ� ����: \"-%s\": OLE ���� ����Ͻʽÿ�."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDI �������α׷� �ȿ��� â�� �� �� �����ϴ�"
-
-#~ msgid "Close tab"
-#~ msgstr "�� �ݱ�"
-
-#~ msgid "Open tab..."
-#~ msgstr "�� ����..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "���ڿ� ã�� ('\\'�� ã������ '\\\\' ���)"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "���ڿ� ã�� �ٲٱ� ('\\'�� ã������ '\\\\' ���)"
-
-#~ msgid "Not Used"
-#~ msgstr "��� �ʵ�"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "���丮\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "�� E458: ����� ��Ʈ���� �Ҵ��� �� �����ϴ�, ��� ���� �߸��� �� �ֽ��ϴ�"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: ���� ���ڼ��� �۲��� �۲ü� %s�� �����ϴ�:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: �۲ü� �̸�: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "�۲� '%s'��(��) �������̰� �ƴմϴ�"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: �۲ü� �̸�: %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "�۲�0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "�۲�1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "�۲�%<PRId64> �ʺ� �۲�0�� �ι谡 �ƴմϴ�\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "�۲�0 �ʺ�: %<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "�۲�1 �ʺ�: %<PRId64>\n"
-#~ "\n"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - �۲� ���ñ�"
-
-#~ msgid "Name:"
-#~ msgstr "�̸�:"
-
-#~ msgid "Encoding:"
-#~ msgstr "���ڵ�:"
-
-#~ msgid "Font:"
-#~ msgstr "�۲�:"
-
-#~ msgid "Style:"
-#~ msgstr "��Ÿ��:"
-
-#~ msgid "Size:"
-#~ msgstr "ũ��:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: �ѱ� ���丶Ÿ ����"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ����"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscope �����ͺ��̽��� �� �� ����: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscope �����ͺ��̽� ������ ���� �� �����ϴ�"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "undo ������ ������ �� �����ϴ�"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: �̾��մϴ�, �� ������ ����� �� �����ϴ�, MzScheme ���̺귯���� �ε�"
-#~ "�� �� �����ϴ�."
-
-#~ msgid "invalid expression"
-#~ msgstr "�߸��� ǥ����"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "ǥ������ �������� �ʵ��� ������ �Ǿ����ϴ�"
-
-#~ msgid "unknown option"
-#~ msgstr "�𸣴� �ɼ�"
-
-#~ msgid "window index is out of range"
-#~ msgstr "â ��ȣ�� ������ ������ϴ�"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "���۸� �� �� �������ϴ�"
-
-#~ msgid "cannot delete line"
-#~ msgstr "���� ���� �� �����ϴ�"
-
-#~ msgid "cannot replace line"
-#~ msgstr "���� �ٲ� �� �����ϴ�"
-
-#~ msgid "cannot insert line"
-#~ msgstr "���� �������� �� �����ϴ�"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "���ڿ��� newline�� ������ �� �����ϴ�"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim ����: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim ����"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "���۰� �̻��մϴ�"
-
-#~ msgid "window is invalid"
-#~ msgstr "â�� �̻��մϴ�"
-
-#~ msgid "linenr out of range"
-#~ msgstr "�� ��ȣ�� ������ ������ϴ�"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "Vim sandbox������ ������ �ʽ��ϴ�"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: �� Vim�� :py3�� ����� �Ŀ� :python�� ����� �� �����ϴ�"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: �̾��մϴ�, �� ������ ����� �� �����ϴ�, ���̽� ���̺귯���� �ε�"
-#~ "�� �� �����ϴ�."
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python�� ���ȣ���� �� �����ϴ�"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject �Ӽ��� ���� �� �����ϴ�"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace�� �������߸� �մϴ�"
-
-#~ msgid "invalid attribute"
-#~ msgstr "�߸��� �Ӽ�"
-
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<%p�� ���� ��ü (������)>"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: �� Vim�� :python�� ����� �Ŀ� :py3�� ����� �� �����ϴ�"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: �̾��մϴ�, �� ������ ����� �� �����ϴ�, ��� ���̺귯���� �ε��� "
-#~ "�� �����ϴ�."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: ����� return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: ����� next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: ����� break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: ����� redo"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: ó���ʵ� ����"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: �𸣴� longjmp ���� %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "��� ����/����"
-
-#~ msgid "Show base class of"
-#~ msgstr "...�� �⺻ Ŭ���� �����ֱ�"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+�� ������ �� �����ϴ�. ȯ���� Ȯ���Ͻʽÿ� (sniffemacs�� $PATH���� "
-#~ "ã������ �մϴ�).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: �д� �� ����. ����"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ is currently "
-
-#~ msgid "not "
-#~ msgstr "not "
-
-#~ msgid "connected"
-#~ msgstr "connected"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: �𸣴� SNiFF+ ��û: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+�� ���� ����"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SniFF+�� ������� �ʾҽ��ϴ�"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SniFF+ ���۰� �ƴմϴ�"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: ���� ���� ����. ������ϴ�"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "�߸��� ���� ��ȣ"
-
-#~ msgid "not implemented yet"
-#~ msgstr "���� �������� �ʾҽ��ϴ�"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "���� ������ �� �����ϴ�"
-
-#~ msgid "invalid mark name"
-#~ msgstr "�߸��� ��ũ �̸�"
-
-#~ msgid "mark not set"
-#~ msgstr "��ũ�� �������� �ʾҽ��ϴ�"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�� %d �� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "���� �����ְų� ���� �� �����ϴ�"
-
-#~ msgid "line number out of range"
-#~ msgstr "�� ��ȣ�� ������ ������ϴ�"
-
-#~ msgid "unknown flag: "
-#~ msgstr "�𸣴� �÷���: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "�𸣴� �� �ɼ�"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "Ű���� ���ͷ�Ʈ"
-
-#~ msgid "vim error"
-#~ msgstr "�� ����"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "����/â ������ ���� �� �����ϴ�: ��ü�� �������ϴ�"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "�ݹ� ������ ����� �� �����ϴ�: ����/â�� �̹� ���������ϴ�"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL �ɰ��� ����: reflist�� ������!? �� ������ vim-dev@vim.org�� �˷�"
-#~ "�ֽʽÿ�"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr "�ݹ� ������ ����� �� �����ϴ�: ����/â ������ ã�� �� �����ϴ�"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: �̾��մϴ�, �� ������ ����� �� �����ϴ�, Tcl ���̺귯���� �ε��� "
-#~ "�� �����ϴ�."
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr ""
-#~ "E281: TCL ����: ������ �ڵ尡 ������ �ƴѰ�!? �� ������ vim-dev@vim.org�� "
-#~ "�˷��ֽʽÿ�"
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: ���� �ڵ� %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "���� ���� �� �����ϴ�"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "���� ���� �̸��� ����� �� �����ϴ�"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: ������α׷����� ���� �����Ⱑ �����߽��ϴ�"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: �߸��� ���� id ����: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: �� �ν��Ͻ� ������Ʈ�� �Ӽ��� �߸��Ǿ� �ֽ��ϴ�. �������ϴ�!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "�� GUI�� netbeans�� �������� �ʽ��ϴ�\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "�� ���� diff ��� ���� ������ �Ǿ����ϴ�."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb'�� ����� �� ����: �������� �� ���Ե��� ����\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ����: NetBeans���� gvim ���� ����\n"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t�� gvim OLE�� ���"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvim�� OLE���� ������"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUI�� ���� (\"gvim\"�� ����)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f Ȥ�� --nofork\t���׶���: GUI�� ������ �� fork���� �� ��"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t� �� �� newcli ������� ����"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <��ġ>\t\tI/O�� <��ġ> ���"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrc ��� <gvimrc>�� ���"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t��ȣȭ�� ���� ��ġ��"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\t���� Ư�� X-������ ����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tX ������ �������� ����"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t�����ϸ� �� �������� <files> ����"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  ����, ������ ���ٰ� �������� ����"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>  --remote�� ������ �� ��ĥ ������ ��ٸ��ϴ�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-wait-silent <files>  ����, ������ ���ٰ� �������� ����"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remote�� ������ ���Ϻ��� �� ����"
-#~ "�� ���"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\t�� ������ <keys>�� ������ ������"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�� �������� <expr> �����ϰ� ��� ���"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\t��� ������ �� ���� �̸��� ǥ���ϰ� ������"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\t�� ���� <name>�� �ǰų� ������ ������"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�� �˰� �ִ� ���� (��Ƽ�� ��):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�� �˰� �ִ� ���� (neXtaw ��):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�� �˰� �ִ� ���� (���׳� ��):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t���� <display>���� ����"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t������ ���·� �� ����"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t���� ������ <color> ��� (also: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t�Ϲ� ���� <color> ��� (also: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\t�Ϲ� �ؽ�Ʈ�� <font> ��� (also: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t���� �ؽ�Ʈ�� <font> ���"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\t����� �ؽ�Ʈ�� <font> ���"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t�ʱ� ������Ʈ���� <geom> ��� (also: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t�����ڸ� ���̿� <width> ��� (also: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr "-scrollbarwidth <width>  ��ũ�ѹ� ���̿� <width> ��� (also: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <height>\t�޴��� ���̿� <height> ��� (also: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t���� ���� ��� (also: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t���� ���� ��� �� �� (also: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t���õ� ���ҽ� ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�� �˰��ִ� ���� (RISC OS ��):\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <����>\tĭ���� â �ʱ� �ʺ�"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <����>\t�ٿ��� â �ʱ� ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�� �˰��ִ� ���� (GTK+ ��):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t���� <display>���� ���� (also: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t���� â ������ ���� ������ ���� ����"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t���� �ٸ� GTK ���� �ȿ��� ����"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <parent title>\tVim�� �θ� ���� ���α׷� ������ ����"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t�ٸ� win32 ���� �ȿ��� Vim ����"
-
-#~ msgid "No display"
-#~ msgstr "���÷��̰� �����ϴ�"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �����Ⱑ �����Ͽ����ϴ�.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": ������ ����. ���ÿ��� ����˴ϴ�\n"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "���÷��� ����: ǥ���� �����Ⱑ �����߽��ϴ�.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ǥ���� �����Ⱑ �����߽��ϴ�.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: �������� �ڵ��������� �ƴմϴ�"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �Է� ���ؽ�Ʈ�� ���� �� �����ϴ�"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �Է� ����� ���ٰ� �����߽��ϴ�"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: ���: IM�� �ı� �ݹ��� ������ �� �����ϴ�"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: �Է� ����� � ���ĵ� �������� �ʽ��ϴ�"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: �Է� ����� �� preedit ������ �������� �ʽ��ϴ�"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: ���� ������ ��ȣȭ�� �� �����ϴ�"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s��(��) ��ȣȭ�Ǿ� �ִ� ��, �� Vim�� ��ȣȭ�� �������� �ʽ��ϴ�"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "���� ������ ��ȣȭ��: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "���ο� ��ȣ Ű�� �Է��ߴ� ��, ������ �������� �ʾҾ��ٸ�,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "���ο� ��ȣ Ű�� �Է��ϼ���."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "��ȣ Ű�� �ٲ� �Ŀ� ������ �����߾��ٸ� ���� Ű�� �ؽ�Ʈ ���ϰ�"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� �����Ϸ��� ���͸� ��������"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "�ؽ�Ʈ ���Ͽ� �������Ͽ��� ������ ��ȣ Ű�� ����մϴ�.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�� �̹� �ǿ����� ����� �� ����]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "�� �޴��� ���"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "���丮 ���� ��ȭ����"
-
-#~ msgid "Save File dialog"
-#~ msgstr "���� ���� ��ȭ����"
-
-#~ msgid "Open File dialog"
-#~ msgstr "���� ���� ��ȭ����"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: �̾��մϴ�, �ܼ� ���¿��� ���� �������� �����ϴ�"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "��: ���� ������...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "��: �������ϴ�.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "����: "
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: ���� �ʹ� ��������ϴ�"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: ���� ����: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: �̻��� ���콺���"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "��ȣ Ű �Է�: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "���� Ű�� �ٽ� �Է�: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Ű�� ���� �ʽ��ϴ�!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2�� ������ �� �����ϴ�"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans�� ������ �� �����ϴ�"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: NetBeans ���� ���� ������ ���� ��尡 �߸���: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans ���Ͽ��� �б�"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: ���� %<PRId64>�� ���� NetBeans ������ �Ҿ���Ƚ��ϴ�"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: �� GUI�� netbeans�� �������� �ʽ��ϴ�"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans�� �̹� ����Ǿ� �ֽ��ϴ�"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Eval ����� �����ֽ��ϴ�"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "freeing %<PRId64> lines"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUI������ term�� �ٲ� �� �����ϴ�"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUI�� �����Ϸ��� \":gui\"�� ����Ͻʽÿ�"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+ 2 GUI������ �ٲ� �� �����ϴ�"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: �߸��� �۲�(��)"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �۲ü��� ���� �� �����ϴ�"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: �߸��� �۲ü�"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ���̵� �۲��� ���� �� �����ϴ�"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: �߸��� ���̵� �۲�"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ���콺�� �������� �ʽ��ϴ�"
-
-#~ msgid "cannot open "
-#~ msgstr "cannot open "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "��: â�� �� �� �����ϴ�!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "�ƹ̰����� 2.04�� �� ���� ���� �ʿ��մϴ�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Need %s version %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NIL�� �� �� ����:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Cannot create "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "���� %d ������ �����ϴ�\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�ܼ� ���¸� �ٲ� �� �����ϴ� ?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: �ܼ��� �ƴѰ�??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f �ɼ��� ���� ��� ���� ������ �� �����ϴ�"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Cannot execute "
-
-#~ msgid "shell "
-#~ msgstr "shell "
-
-#~ msgid " returned\n"
-#~ msgstr " returned\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE�� �ʹ� �۽��ϴ�."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "I/O ����"
-
-#~ msgid "Message"
-#~ msgstr "�޽���"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns'�� 80�� �ƴϾ, �ܺ� ������ ������ �� �����ϴ�"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: �����͸� ������ ���߽��ϴ�"
-
-#~ msgid "to %s on %s"
-#~ msgstr "to %s on %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: �𸣴� ������ �۲�: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: �μ� ����: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "'%s' ���"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: �߸��� ���ڼ� �̸� \"%s\"��(��) �۲� �̸� \"%s\"�� �ֽ��ϴ�"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: �߸��� ���� '%c'��(��) �۲� �̸� \"%s\"�� �ֽ��ϴ�"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "��: ���� �ñ׳� �� ��, �����ϴ�\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "��: %s �ñ׳��� ��ҽ��ϴ�\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "��: ���� �ñ׳��� ��ҽ��ϴ�\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "X ���÷��̸� ���� �� %<PRId64> msec�� �ɷȽ��ϴ�"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��: X ������ ������ϴ�\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "X ���÷��� ������ �����߽��ϴ�"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X ���÷��̸� ���ٰ� �ð��� �ʰ��Ǿ����ϴ�"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�� sh�� ������ �� �����ϴ�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�������� ���� �� �����ϴ�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�ڽ� ���μ����� ���� �� �����ϴ�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "������ �����������ϴ�\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP�� ICE ������ �Ҿ���Ƚ��ϴ�"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "X ���÷��� ���Ⱑ �����߽��ϴ�"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP�� save-yourself ��û�� �����ϰ� �ֽ��ϴ�"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP�� ������ ���� ���Դϴ�"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP�� ICE ���� ���ø� �����߽��ϴ�"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection ����: %s"
-
-#~ msgid "At line"
-#~ msgstr "At line"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll�� �ҷ� ���� �� �����ϴ�!"
-
-#~ msgid "VIM Error"
-#~ msgstr "�� ����"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "�Լ� �����͸� DLL�� �ٲ� �� �����ϴ�!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "���� %d��(��) �����־����ϴ�"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "��: %s �̺�Ʈ�� ��ҽ��ϴ�\n"
-
-#~ msgid "close"
-#~ msgstr "�ݱ�"
-
-#~ msgid "logoff"
-#~ msgstr "�α׾ƿ�"
-
-#~ msgid "shutdown"
-#~ msgstr "�˴ٿ�"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: ������ ã�� �� �����ϴ�"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE�� $PATH���� ã�� �� �����ϴ�.\n"
-#~ "�ܺ� ������ ���� �� ���� �� �����ϴ�.\n"
-#~ "�� ���� ������ ���÷��� :help win32-vimrun�� ���ʽÿ�."
-
-#~ msgid "Vim Warning"
-#~ msgstr "�� ���"
-
-#~ msgid "Error file"
-#~ msgstr "���� ����"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "���: �ܾ� ��� \"%s_%s.spl\" Ȥ�� \"%s_ascii.spl\"�� ã�� �� �����ϴ�"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s�� ��ȯ�� �������� �ʽ��ϴ�"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: %s�� ���� �±� ���� ��ΰ� �߷Ƚ��ϴ�\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�� ���� ���۵Ǿ����ϴ�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "�� ������ ��� CUT_BUFFER0�� ����߽��ϴ�"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "��� �Ұ���; ��·�� ����մϴ�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: ��ȣȭ���� ���� ������ ��ȣȭ�� undo ������ ������ �ֽ��ϴ�: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Undo ������ �ص��� �� �����ϴ�: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Undo ������ ��ȣȭ�Ǿ����ϴ�: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 ��Ʈ GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64��Ʈ GUI ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32��Ʈ GUI ����"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " Win32s ����"
-
-#~ msgid " with OLE support"
-#~ msgstr " OLE ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64��Ʈ �ܼ� ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32��Ʈ �ܼ� ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16��Ʈ ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32��Ʈ MS-DOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16��Ʈ MS-DOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (���н�) ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "RISC OS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big ���� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normal ���� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small ���� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny ���� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "(Ŭ����) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "       �ý��� gvimrc ����: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       ����� gvimrc ����: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "����� �� ��° gvimrc ����: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "����� �� ��° gvimrc ����: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    �ý��� �޴� ����: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "�����Ϸ�: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�̿� ���� ������ ������    �޴����� ����->����  ����"
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "������ �������̸�, �Էµ� ���ڴ� ���Ե˴ϴ�"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "�޴����� ����->���� ����->���� ��� ����� �����Ͻø� "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                         �� ��带 ����� �� �ֽ��ϴ� "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "�޴����� ����->���� ����->Vi ȣȯ ����� �����Ͻø�   "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                          Vim�� �⺻������ �����մϴ� "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "���: �������� 95/98/ME�� ���"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "�̿� ���� ������ ������    :help windows95<����>  �Է�"
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: %s ���̺귯���� �ε��� �� �����ϴ�"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "�̾��մϴ�, �� ������ ����� �� �����ϴ�, Perl ���̺귯���� �ε��� �� ����"
-#~ "�ϴ�."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr "E299: Safe �����̴� sandbox���� Perl evaluation�� ���ѵ˴ϴ�"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "���� ������ ����(&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�ϳ��� �����θ� ����(&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "������ Diff"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "������ ����(&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�ϳ��� �����θ� ���� - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "���õ� ����(��)�� ������ ����"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "���μ��� ���� ����: gvim�� path�� �ִ� �� Ȯ���ϼ���!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ����"
-
-#~ msgid "Path length too long!"
-#~ msgstr "��ΰ� �ʹ� ��ϴ�"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: �𸣴� �۲ü�: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: �𸣴� �۲�: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: �۲� \"%s\"��(��) �������̰� �ƴմϴ�"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: %s ���̺귯�� �Լ��� �ε��� �� �����ϴ�"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: Hebrew�� ����� �� �����ϴ�: ������ �� ���Ե��� �ʾҽ��ϴ�\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Farsi�� ����� �� �����ϴ�: ������ �� ���Ե��� �ʾҽ��ϴ�\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: Arabic�� ����� �� �����ϴ�: ������ �� ���Ե��� �ʾҽ��ϴ�\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: \"%s\"��(��) ��ϵ� �������� �ƴմϴ�"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ���÷��̸� �� �� �����ϴ�"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �߸��� ǥ������ �޾������ϴ�"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: ������ ��ȣ�ǰ� �־ ������ �� �����ϴ�"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans�� �б� ���� ������ �ٲ� �� �����ϴ�"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "\"%s\"�� ���� ��ȣ Ű�� �ʿ��մϴ�"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines()�� ���ڿ� ����� �ʿ��մϴ�"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: ���̽�: I/O ��ü �ʱ�ȭ�� ������ ������ϴ�"
-
-#~ msgid "no such buffer"
-#~ msgstr "�׷� ���۴� �����ϴ�"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "������ â�� �����Ϸ��� �Ͽ����ϴ�"
-
-#~ msgid "readonly attribute"
-#~ msgstr "�б� ���� �Ӽ�"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "�ۼ� ��ġ�� ���� �ۿ� �ֽ��ϴ�"
-
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<%p�� â ��ü (������)>"
-
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<%p�� â ��ü (��)>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<â %d>"
-
-#~ msgid "no such window"
-#~ msgstr "�׷� â�� �����ϴ�"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "������ ���۸� �����Ϸ��� �Ͽ����ϴ�"
diff --git a/src/nvim/po/nb.po b/src/nvim/po/nb.po
index ce635e098c..fefcf20b69 100644
--- a/src/nvim/po/nb.po
+++ b/src/nvim/po/nb.po
@@ -2699,11 +2699,6 @@ msgstr "E49: Ugyldig \"scroll\"-verdi"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4275,11 +4270,6 @@ msgstr "linje %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ugyldig registernavn: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Vedlikeholder for norsk oversettelse: �yvind A. Holm <sunny@sunbase.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Avbryt: "
diff --git a/src/nvim/po/nl.po b/src/nvim/po/nl.po
index ea609c0f69..f2877903f2 100644
--- a/src/nvim/po/nl.po
+++ b/src/nvim/po/nl.po
@@ -2685,11 +2685,6 @@ msgstr "E49: ongeldige scroll-grootte"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4282,10 +4277,6 @@ msgstr "regel %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr ""
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Vertaald door: Erwin Poeze <erwin.poeze@gmail.com>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr ""
diff --git a/src/nvim/po/no.po b/src/nvim/po/no.po
index ce635e098c..fefcf20b69 100644
--- a/src/nvim/po/no.po
+++ b/src/nvim/po/no.po
@@ -2699,11 +2699,6 @@ msgstr "E49: Ugyldig \"scroll\"-verdi"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4275,11 +4270,6 @@ msgstr "linje %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ugyldig registernavn: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Vedlikeholder for norsk oversettelse: �yvind A. Holm <sunny@sunbase.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Avbryt: "
diff --git a/src/nvim/po/pl.UTF-8.po b/src/nvim/po/pl.UTF-8.po
index 68cb9e72d5..0757afd3ae 100644
--- a/src/nvim/po/pl.UTF-8.po
+++ b/src/nvim/po/pl.UTF-8.po
@@ -2658,11 +2658,6 @@ msgstr "E49: Niewłaściwa wielkość przewinięcia"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4243,10 +4238,6 @@ msgstr "wiersz %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Niewłaściwa nazwa rejestru: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Opiekun komunikatów: Mikołaj Machowski <mikmach@wp.pl>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Przerwanie: "
diff --git a/src/nvim/po/pl.cp1250.po b/src/nvim/po/pl.cp1250.po
deleted file mode 100644
index 3fcdbfb87d..0000000000
--- a/src/nvim/po/pl.cp1250.po
+++ /dev/null
@@ -1,8264 +0,0 @@
-# translation of pl.po to Polish
-# Polish Translation for Vim
-#
-# updated 2013 for vim-7.4
-#
-# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
-# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013.
-msgid ""
-msgstr ""
-"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2010-08-10 18:15+0200\n"
-"Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=cp1250\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "nie mog� pobra� warto�ci opcji"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "b��d wewn�trzny: nieznany typ opcji"
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[Lista lokacji]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Lista quickfix]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr "E855: Autokomendy spowodowa�y porzucenie komendy"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: Nie mog� zarezerwowa� bufora; zako�czenie..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: Nie mog� zarezerwowa� bufora; u�ywam innego..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: Nie wy�adowano �adnego bufora"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: Nie skasowano �adnego bufora"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: Nie wyrzucono �adnego bufora"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "1 bufor wy�adowany"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "wy�adowano %d bufor�w"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "1 bufor skasowany"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "%d bufor�w skasowano"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "wyrzucono 1 bufor "
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "wyrzucono %d bufor�w"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: Nie mog� wy�adowa� ostatniego bufora"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: Nie znaleziono zmienionych bufor�w"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: Nie ma wylistowanych bufor�w"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Bufor \"%<PRId64>\" nie istnieje"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: Nie mog� przej�� poza ostatni bufor"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: Nie mog� przej�� przed pierwszy bufor"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: Nie zapisano zmian w buforze %<PRId64> (wymu� przez !)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: OSTRZE�ENIE: Przepe�nienie listy nazw plik�w"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Nie znaleziono bufora %<PRId64>"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: Wielokrotne dopasowania dla %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: �aden bufor nie pasuje do %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "wiersz %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: Bufor o tej nazwie ju� istnieje"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [Zmieniony]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[Nie edytowany]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[Nowy Plik]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[B��d odczytu]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[RO]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[tylko odczyt]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 wiersz --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> wiersze --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "wiersz %<PRId64> z %<PRId64> --%d%%-- kol "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[Bez nazwy]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "pomoc"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[Pomoc]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[Podgl�d]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "Wszystko"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "D�"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "G�ra"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Lista bufor�w:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[Notka]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Znaki ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "Znaki dla %s:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    wiersz=%<PRId64>  id=%d  nazwa=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: Brak dwukropka"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: Niedozwolony tryb"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: oczekiwa�em na cyfr�"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: Niedozwolony procent"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Nie mog� zr�nicowa� wi�cej ni� %<PRId64> bufor�w"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: Nie mog� otworzy� lub zapisa� plik�w tymczasowych"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: Nie mog� stworzy� r�nic"
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: Nie mog� odczyta� wyj�cia pliku �aty"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: Nie mog� wczyta� wyj�cia r�nicy"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Bie��cy bufor nie jest w trybie r�nic"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: �aden inny bufor w trybie diff nie jest modyfikowalny"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: Brak innego bufora w trybie r�nic"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr ""
-"E101: Wi�cej ni� jeden bufor w trybie r�nicowania, nie wiem kt�rego u�y�"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Nie mog� znale�� bufora \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: Bufor \"%s\" nie jest w trybie r�nicowania"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: Nieoczekiwana zmiana bufora"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: Escape jest niedozwolone w dwugrafie"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: Nie znaleziono pliku rozk�adu klawiszy"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: Zastosowano :loadkeymap w niewczytanym pliku"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: Pusty wpis keymap"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " Dope�nianie s��w kluczowych (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " Dope�nianie pe�nych wierszy (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " Dope�nianie nazw plik�w (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " Dope�nianie znacznik�w (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " Dope�nianie wzorc�w trop�w (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " Dope�nianie definicji (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Dope�nianie ze s�ownik�w (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Dope�nianie z tezaurusa (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " Dope�nianie wiersza polece� (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr "Dope�nianie zdefiniowane przez u�ytkownika (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni uzupe�nianie (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr "Propozycja pisowni (^L^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " Lokalne dope�nianie s��w kluczowych (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "Dobi�em do ko�ca akapitu"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: Funkcja uzupe�niania zmieni�a okno"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: Funkcja uzupe�nania usun�a tekst"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "opcja 'dictionary' jest pusta"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "opcja 'thesaurus' jest pusta"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "Przegl�dam s�ownik: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (wprowadzanie) Przewijanie (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (zamiana) Przewijanie (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "Przegl�dam: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "Przegl�dam znaczniki."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " Dodaj�"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- Szukam..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "Z powrotem na pierwotnym"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "Wyraz z innego wiersza"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "Jedyne dopasowanie"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "pasuje %d z %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "pasuje %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Nieoczekiwane znaki w :let"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: Indeks listy poza zakresem: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Nieokre�lona zmienna: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: Brak ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argument %s musi by� List�"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argument %s musi by� List� lub S�ownikiem"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Nie mo�na u�y� pustego klucza dla S�ownika"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: wymagana Lista"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: wymagany S�ownik"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Zbyt wiele argument�w dla funkcji: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Klucz nie istnieje w S�owniku: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: Funkcja %s ju� istnieje; aby j� zamieni� u�yj !"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: istnieje ju� taki element S�ownika"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: wymagana Funcref"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Nie mo�na u�y� [:] przy S�owniku"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Z�y typ zmiennej dla %s="
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Nieznana funkcja: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: Niedozwolona nazwa zmiennej: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: U�ycie Zmiennoprzecinkowej jako �a�cucha"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: Mniej cel�w ni� element�w Listy"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: Wi�cej cel�w ni� element�w Listy"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "Podw�jny ; w li�cie zmiennych"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: Nie mog� wypisa� zmiennych dla %s"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: Indeks mo�e istnie� tylko dla Listy lub S�ownika"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] musi by� ostatnie"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] wymaga warto�ci listy"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: Lista ma wi�cej element�w ni� cel"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: Lista nie ma wystarczaj�cej ilo�ci element�w"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: Brak \"in\" po :for"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Brak nawias�w: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: Nie istnieje zmienna: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: zmienna zagnie�d�ona zbyt g��boko dla (un)lock"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: Brak ':' po '?'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: List� mog� por�wna� tylko z List�"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: Nieprawid�owa operacja dla Listy"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: S�ownik mog� por�wna� tylko ze S�ownikiem"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Nieprawid�owa operacja dla S�ownika"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcref mog� por�wna� tylko z Funcref"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Nieprawid�owa operacja dla Funcref"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Nie mog� u�y� '%' w Zmiennoprzecinkowej"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: Brak ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: Nie mo�na zindeksowa� Funcref"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: Brak nazwy opcji: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: Nieznana opcja: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: Brak cudzys�owu: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: Brak cudzys�owu: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Brakuj�cy przecinek w Li�cie: '%s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Brak zako�czenia Listy ']': %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Brak dwukropka w S�owniku: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Powt�rzony klucz w S�owniku: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Brakuj�cy przecinek w S�owniku: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Brak ko�ca w S�owniku '}': %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: Zmienna zagnie�d�ona zbyt g��boko by pokaza�"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: Zbyt wiele argument�w dla funkcji %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Zbyt wiele argument�w dla funkcji %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Nieznana funkcja: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Za ma�o argument�w dla funkcji: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: U�ycie <SID> poza kontekstem skryptu: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Wywo�anie funkcji \"dict\" bez S�ownika: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: Wymagana Liczba lub Zmiennoprzecinkowa"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "argument add()"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: Za du�o argument�w"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() mo�e by� u�yte tylko w trybie Wprowadzania"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Klucz ju� istnieje: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "argument extend()"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "argument map()"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "argument filter()"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld wierszy: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: Nieznana funkcja: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "wywo�ano inputrestore() wi�cej razy ni� inputsave()"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "argument insert()"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: Zakres niedozwolony"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: Nieprawid�owy typ dla len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: Skok to zero"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: Pocz�tek po ko�cu"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<pusty>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "argument remove()"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: Za du�o dowi�za� symbolicznych (p�tla?)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "argument reverse()"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "argument sort()"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "argument add()"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Funkcja por�wnywania w sort nie powiod�a si�"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Funkcja por�wnywania w sort nie powiod�a si�"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(Niew�a�ciwe)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: B��d zapisywania pliku tymczasowego"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: U�ycie Zmiennoprzecinkowej jako Liczby"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: U�ycie Funcref jako Liczby"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: U�ycie Listy jako Liczby"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: U�ycie S�ownika jako Liczby"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: U�ycie Funcref jako �a�cucha"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: U�ycie Listy jako �a�cucha"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: U�ycie S�ownika jako �a�cucha"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Nieprawid�owy typ zmiennej dla: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Nie mog� usun�� zmiennej %s"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Nazwa Funcref musi si� zaczyna� wielk� liter�: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Nazwa zmiennej jest w konflikcie z istniej�c� funkcj�: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Warto�� jest zablokowana: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Nie mog� zmieni� warto�ci %s"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: Zmienna zagnie�d�ona zbyt g��boko by zrobi� kopi�"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nieznana funkcja: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Brak '(': %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: Nie mo�na tutaj u�y� g:"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Niedozwolony argument: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Powt�rzona nazwa argumentu: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: Brak :endfunction"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Nazwa funkcji jest w konflikcie ze zmienn�: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Nie mog� redefiniowa� funkcji %s: jest w u�yciu"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Nazwa funkcji nie pasuje do nazwy skryptu: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: Wymagana jest nazwa funkcji"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Nazwa funkcji musi rozpoczyna� si� wielk� liter� lub zawiera� "
-"dwukropek: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Nazwa funkcji musi rozpoczyna� si� wielk� liter� lub zawiera� "
-"dwukropek: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Nie mog� skasowa� funkcji %s: jest w u�yciu"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Zagnie�d�enie wywo�a� funkcji ponad 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "wywo�uj� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "porzucono %s"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s zwraca #%<PRId64>"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s zwraca %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "kontynuacja w %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return poza funkcj�"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# zmienne globalne:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatnie ustawienie przez "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "Brak starych plik�w"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  Hex %02x,  Oktal %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, Hex %04x,  Oktal %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Hex %08x, Oktal %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: Przeniesienie wierszy na siebie samych"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "1 wiersz przeniesiony"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> wiersze przeniesione"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> wierszy przefiltrowanych"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: Autokomendy *Filter* nie mog� zmienia� bie��cego bufora"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[Brak zapisu od czasu ostatniej zmiany]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s w wierszu: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: Zbyt wiele b��d�w; pomijam reszt� pliku"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Wczytuj� plik viminfo \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " informacja"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " zak�adki"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " stare pliki"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " NIE POWIOD�O SI�"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Plik viminfo jest niezapisywalny: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Nie mog� zapisa� pliku viminfo %s!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Zapisuj� plik viminfo \"%s\""
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Ten plik viminfo zosta� wygenerowany przez Vima %s.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Mo�esz go ostro�nie edytowa�!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Warto�� 'encoding' w czasie zapisu tego pliku\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "Niedopuszczalny pocz�tkowy znak"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "Zapisa� cz�ciowo plik?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: Stosuj ! do zapisania cz�ciowo bufora"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "Nadpisa� istniej�cy plik \"%s\"?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Plik wymiany \"%s\" istnieje, czy go nadpisa�?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: Plik wymiany istnieje: %s (wymu� poprzez :silent!)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Brak nazwy pliku dla bufora %<PRId64>"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: Plik niezapisany: Zapis jest wy��czony opcj� 'write'"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"opcja 'readonly' nastawiona dla \"%s\".\n"
-"Czy chcesz go pomimo tego zapisa�?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"Prawa pliku \"%s\" s� tylko do odczytu.\n"
-"Mimo to by� mo�e uda si� zmieni� ten plik.\n"
-"Chcesz spr�bowa�?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" jest tylko do odczytu (dodaj ! aby wymusi�)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autokomendy nieoczekiwanie skasowa�y nowy bufor %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: nienumeryczny argument dla :z"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Komendy pow�oki s� niedozwolone w rvim"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: Wzorce regularne nie mog� by� rozgraniczane literami"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "zamie� na %s (y/n/a/q/l/^E/^Y)?"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(Przerwane) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1 pasuje"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1 podstawienie "
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> dopasowa�"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> podstawie�"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " w 1 wierszu"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " w %<PRId64> wierszach"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: Nie mog� wykona� :global rekursywnie"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: Brak wzorca regularnego w :global"
-
-# c-format
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "Wzorzec znaleziono w ka�dym wierszu: %s"
-
-#: ../ex_cmds.c:4510
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "Nie znaleziono wzorca: %s"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Ostatni podstawiany ci�g:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: Nie panikuj!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Przykro mi, brak '%s' pomocy dla %s"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Przykro mi, ale brak pomocy o %s"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Przykro mi, nie ma pliku pomocy \"%s\""
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Nie jest katalogiem: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: Nie mog� otworzy� %s do zapisu"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: Nie mog� otworzy� %s do odczytu"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: Mieszanka kodowa� w pliku pomocy w ramach j�zyka: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Powt�rzony znacznik \"%s\" w pliku %s/%s"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Nieznana komenda znaku: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: Brak nazwy znaku"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: Zbyt wiele nazw znak�w"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: Niew�a�ciwy tekst znaku: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Nieznany znak: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: Brak numeru znaku"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Niew�a�ciwa nazwa bufora: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Niew�a�ciwe ID znaku: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr "(nie wspomagane)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[Skasowano]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Wchodz� w tryb odpluskwiania. Wprowad� \"cont\" aby kontynuowa�."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "wiersz %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "cmd: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Punkt kontrolny w \"%s%s\" wiersz %<PRId64>"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Nie znaleziono punktu kontrolnego: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "Nie okre�lono �adnych punkt�w kontrolnych"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  wiersz %<PRId64>"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Pierwsze u�ycie \":profile start {fname}\""
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Zachowa� zmiany w \"%s\"?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "Bez Tytu�u"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Nie zapisano zmian w buforze \"%s\""
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "OSTRZE�ENIE: Nieoczekiwane wej�cie w inny bufor (sprawd� autokomendy)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: Tylko jeden plik w edycji"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: Nie mo�na przej�� przed pierwszy plik"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Nie mo�na przej�� za ostatni plik"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: nie wspierany kompilator: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Szukanie \"%s\" w \"%s\""
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Szukanie \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "nie znaleziono w 'runtimepath': \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Nie mo�na wczyta� katalogu: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "nie mog�em wczyta� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "wiersz: %<PRId64> nie mog�em wczyta� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "wczytywanie \"%s\""
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "wiersz %<PRId64>: wczytywanie \"%s\""
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "sko�czono wczytywanie %s"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "modeline"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd argument"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c argument"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "zmienna �rodowiskowa"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "obs�uga b��du"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: OSTRZE�ENIE: Niew�a�ciwy separator wierszy, pewnie brak ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: u�yto :scriptencoding poza wczytywanym plikiem"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: u�yto :finish poza wczytywanym plikiem"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Bie��cy %sj�zyk: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Nie mog� ustawi� j�zyka na \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Wchodz� w tryb Ex. Wprowad� \"visual\" aby przej�� do trybu Normal."
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: Na ko�cu pliku"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: Komenda zbyt rekursywna"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: Nie znaleziono wyj�tku: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "Koniec wczytywanego pliku"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "Koniec funkcji"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr ""
-"E464: Niejednoznaczne zastosowanie komendy zdefiniowanej przez u�ytkownika"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: Nie jest komend� edytora"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: Dano wsteczny zakres"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "Dano wsteczny zakres; zamiana jest mo�liwa"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: Stosuj w lub w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: Przykro mi, ale ta komenda nie jest dost�pna w tej wersji"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: Tylko pojedyncza nazwa pliku dozwolona"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 wi�cej plik do edycji.  Mimo to wyj��?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "jeszcze %d plik�w do edycji.  Mimo to wyj��?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1 wi�cej plik do edycji"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: jeszcze %<PRId64> plik�w do edycji"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: Komenda ju� istnieje; aby j� przedefiniowa� stosuj !"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    Nazwa       Arg. Zak.  Gotowo��  Definicja"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "Nie znaleziono komend zdefiniowanych przez u�ytkownika"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: Nie okre�lono atrybutu"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: Niew�a�ciwa ilo�� argument�w"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: Mno�nik nie mo�e by� podany dwukrotnie"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: Niew�a�ciwa domy�lna warto�� mno�nika"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete wymaga argumentu"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: Niew�a�ciwy atrybut: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: Niew�a�ciwa nazwa komendy"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr ""
-"E183: Komendy zdefiniowane przez u�ytkownika musz� rozpoczyna� si� du�� "
-"liter�"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: Nazwa zastrze�ona, nie mo�na jej u�y� w komendzie u�ytkownika"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: Nie ma takiej komendy u�ytkownika: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Niew�a�ciwa warto�� dope�niania: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468: Argument depe�niania dozwolony wy��cznie dla dope�niania u�ytkownika"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Dope�nianie u�ytkownika wymaga funkcji jako argumentu"
-
-#: ../ex_docmd.c:5257
-#, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: Nie mog� znale�� zestawu kolor�w '%s'"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "Witaj u�ytkowniku Vima!"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: Nie mog� zamkn�� ostatniej karty"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "Jest ju� tylko jedna karta"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "Karta %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "Brak pliku wymiany"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr ""
-"E747: Nie mog� zmieni� katalogu, bufor zosta� zmodyfikowany (dodaj ! aby "
-"wymusi�)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: Nie ma poprzedniego katalogu"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: Nieznany"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize wymaga dw�ch argument�w numerycznych"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr ""
-"E188: Pozyskiwanie pozycji okna nie jest zaimplementowane dla tego systemu"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos wymaga dw�ch argument�w numerycznych"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: Nie mog� utworzy� katalogu: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" istnieje (wymu� poprzez !)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Nie mog� otworzy� \"%s\" do zapisu"
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: Argument musi by� liter� albo cudzys�owem w prz�d/ty�"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: Rekursywne zastosowanie :normal za g��bokie"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: Brak nazwy zamiennego pliku do podstawienia pod '#'"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: brak nazwy pliku autokomend do podstawienia pod \"<afile>\""
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: brak numeru bufora autokomend do podstawienia pod  \"<abuf>\""
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: brak nazwy dopasowania autokomend pod \"<amatch>\""
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: brak nazwy pliku :source do postawienia pod \"<sfile>\""
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: brak numeru linii by u�y� z \"<slnum>\""
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: Pusta nazwa pliku dla '%' lub '#', dzia�a tylko z \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: Wynikiem jest pusty ci�g"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Nie mog� otworzy� pliku viminfo do odczytu"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: Nie mo�na ':throw' wyj�tk�w z prefiksem 'Vim'"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "Wyj�tek: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "Wyj�tek zako�czony: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "Wyj�tek odrzucony: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, wiersz %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "Wyj�tek przechwycony: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s zosta� zawieszony"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s przywr�cony"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s odrzucony"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "Wyj�tek"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "B��d i przerwanie"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "B��d"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "Przerwanie"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: zbyt g��bokie zagnie�d�enie :if"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif bez :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else bez :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif bez :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: wielokrotne :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif po :else"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: zbyt g��bokie zagnie�d�enie :while/:for"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue bez :while lub :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break bez :while lub :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: U�ycie :endfor z :while"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: U�ycie :endwhile z :for"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: zbyt g��bokie zagnie�d�enie :try"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch bez :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch za :finally"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally bez :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: wielokrotne :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry bez :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction poza funkcj�"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Nie mo�na teraz edytowa� innego bufora"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: Nie mo�na teraz zmienia� informacji o buforze"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "nazwa znacznika"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " pokrewny plik\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "opcja 'history' jest zerowa"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s Historia (od najnowszych po najstarsze):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "Wiersz polece�"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "Szukany ci�g"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "Wyra�enie"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "Wiersz wprowadze�"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar przekracza d�ugo�� polecenia"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: Aktywny widok lub bufor skasowany"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: �cie�ka za d�uga by uzupe�ni�"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Niew�a�ciwy trop: '**[numer]' musi by� na ko�cu tropu lub po nim musi "
-"by� '%s'."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Nie mog� znale�� katalogu \"%s\" w cdpath"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Nie mog� znale�� pliku \"%s\" w tropie"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Katalogu \"%s\" nie ma wi�cej w cdpath"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Pliku \"%s\" nie ma wi�cej w tropie"
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: Autokomendy zmieni�y bufor lub jego nazw�"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "Niedopuszczalna nazwa pliku"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "jest katalogiem"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "nie jest plikiem"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[Nowy Plik]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[Nowy KATALOG]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[Za du�y plik]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[Nie dozwolono]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: Autokomendy *ReadPre zrobi�y plik nieodczytywalnym"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: Autokomendy *ReadPre nie mog� zmienia� bie��cego bufora"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: Wczytywanie ze stdin...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: Nie mo�na otworzy� pliku utworzonego przez przemian�!"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[socket]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr "[specjalny znak]"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[brak CR]'"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[d�ugie wiersze rozdzielane]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[NIE przemienione]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[przemienione]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[B��D W PRZEMIANIE w linii %<PRId64>]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[NIEDOZWOLONY BAJT w wierszu %<PRId64>]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[B��DY W ODCZYCIE]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "Nie mog� znale�� pliku tymczasowego w celu przemiany"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "Nieudana przemiana z 'charconvert'"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "nie mog� odczyta� wyj�cia z 'charconvert'"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Brak pasuj�cych autokomend dla bufora acwrite"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr ""
-"E203: Autokomendy skasowa�y lub wy�adowa�y bufor przeznaczony do zapisu"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autokomenda zmieni�a liczb� wierszy w nieoczekiwany spos�b"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "nie jest plikiem lub zapisywalnym przyrz�dem"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "jest tylko do odczytu (wymu� poprzez !)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Nie mog� zapisa� do pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: B��d podczas zamykania pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: Nie mog� odczyta� pliku w celu zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: Nie mog� stworzy� pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: Nie mog� zrobi� pliku zabezpieczenia (wymu� przez !)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: Nie mog� znale�� pliku tymczasowego do zapisania"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: Nie mog� przemieni� (u�yj ! by zapisa� bez przemiany)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Nie mog� otworzy� pod��czonego pliku do zapisu"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: Nie mog� otworzy� pliku do zapisu"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync nie powi�d� si�"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: Zamkni�cie si� nie powiod�o"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: B��d zapisu, przemiana si� nie powiod�a (opr�nij 'fenc' aby wymusi�)"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: B��d zapisu, przemiana si� nie powiod�a w wierszu %<PRId64> (opr�nij "
-"'fenc' by wymusi�)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: b��d w zapisie (mo�e system plik�w jest przepe�niony?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " B��D W PRZEMIANIE"
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr " w wierszu %<PRId64>;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[Urz�dzenie]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[Nowy]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " do��czono"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " zapisano"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode: nie mog� zapisa� oryginalnego pliku"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: nie mog� stworzy� pustego oryginalnego pliku"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: Nie mog� skasowa� pliku zabezpieczenia"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"OSTRZE�ENIE: Oryginalny plik mo�e zosta� utracony lub uszkodzony\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "nie wychod� edytora, dop�ki plik nie zosta� poprawnie zapisany!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[format dos-a]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[format maca]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[format unixa]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 wiersz, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> wierszy, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 znak"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> znak�w"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[Niekompletny ostatni wiersz]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "OSTRZE�ENIE: Plik zmieni� si� od czasu ostatniego odczytu!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "Czy naprawd� chcesz go zapisa�"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: B��d zapisywania do \"%s\""
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: B��d w trakcie zamykania \"%s\""
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: B��d odczytu \"%s\""
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: Autokomenda FileChangedShell skasowa�a bufor"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: Plik \"%s\" nie jest d�u�ej dost�pny"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr ""
-"W12: OSTRZE�ENIE: Plik \"%s\" zmieni� si� od czasu rozpocz�cia edycji, bufor "
-"w Vimie r�wnie� zosta� zmieniony"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "Zobacz \":help W12\"  dla dalszych informacji."
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: OSTRZE�ENIE: Plik \"%s\" zmieni� si� od czasu rozpocz�cia edycji"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "Zobacz \":help W11\"  dla dalszych informacji."
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr ""
-"W16: OSTRZE�ENIE: Tryb pliku \"%s\" zmieni� si� od czasu rozpocz�cia edycji"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "Zobacz \":help W16\"  dla dalszych informacji."
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: OSTRZE�ENIE: Plik \"%s\" zosta� stworzony po rozpocz�ciu edycji"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "OSTRZE�ENIE"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"&OK\n"
-"&Za�aduj Plik"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: Nie mo�na przygotowa� prze�adowania \"%s\""
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: Nie mo�na prze�adowa� \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--Skasowano--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "auto-usuwanie autokomendy: %s <buffer=%d>"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: Nie ma takiej grupy: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: Niedopuszczalny znak po *: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: Nie ma takiego wydarzenia: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: Nie ma takiej grupy lub wydarzenia: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Autokomendy ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: niew�a�ciwy numer bufora"
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Nie mo�na wykonywa� autokomend dla wydarze� ALL"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "Brak pasuj�cych autokomend"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: zbyt g��bokie zagnie�d�enie autokomend"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Autokomend dla \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "Wykonuj� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "autokomenda %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: Brak {."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: Brak }."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: Nie znaleziono zwini�cia"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Nie mo�na utworzy� zwini�cia przy bie��cej 'foldmethod'"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Nie mo�na skasowa� zwini�cia przy bie��cej 'foldmethod'"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld wierszy zwini�to "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: Dodaj do bufora odczytu"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: rekursywne przyporz�dkowanie"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: istnieje ju� globalny skr�t dla %s"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: istnieje ju� globalne przyporz�dkowanie dla %s"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: istnieje ju� skr�t dla %s"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: istnieje ju� przyporz�dkowanie dla %s"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "Nie znaleziono skr�tu"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "Nie znaleziono przyporz�dkowania"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: Niedopuszczalny tryb"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--Brak wierszy w buforze--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: Przerwanie komendy"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: wymagany argument"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: po \\ powinno by� /, ? lub &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: Niedozwolone w oknie wiersza polece�; <CR> wykonuje, CTRL-C opuszcza"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: Komenda niedozwolona z exrc/vimrc w bie��cym szukaniu katalogu lub "
-"znacznika"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: Brak :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: Brak :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: Brak :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: Brak :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile bez :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor bez :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Plik istnieje (wymu� poprzez !)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: Komenda nie powiod�a si�"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: B��d wewn�trzny"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "Przerwane"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: Niew�a�ciwy adres"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: Niew�a�ciwy argument"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Niew�a�ciwy argument: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Niew�a�ciwe wyra�enie: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: Niew�a�ciwy zakres"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: Niew�a�ciwa komenda"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" jest katalogiem"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: Niew�a�ciwa wielko�� przewini�cia"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Wywo�anie z biblioteki nie powiod�o si� dla \"%s()\""
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Zak�adka ma niew�a�ciwy numer wiersza"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: Zak�adka nienastawiona"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Nie mog� wykona� zmian, 'modifiable' jest wy��czone"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Zbyt g��bokie zagnie�d�enie skrypt�w"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: Brak pliku zamiany"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: Nie ma takiego skr�tu"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: Niedozwolone !"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI nie mo�e by� u�yte: Nie w��czono podczas kompilacji"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Brak takiej nazwy grupy pod�wietlania: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: Nie wprowadzono jeszcze �adnego tekstu"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: Nie ma poprzedniego wiersza polece�"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: Nie ma takiego przyporz�dkowania"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: Brak dopasowa�"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Brak dopasowa�: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: Brak nazwy pliku"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Brak poprzedniego podstawieniowego wyra�enia regularnego"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: Brak poprzedniej komendy"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: Brak poprzedniego wyra�enia regularnego"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: Zakres niedozwolony"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: Brak miejsca"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Nie mog� stworzy� pliku %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: Nie mog� pobra� nazwy pliku tymczasowego"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Nie mog� otworzy� pliku %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Nie mog� odczyta� pliku %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Nie zapisano od ostatniej zmiany (wymu� przez !)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[Brak zapisu od czasu ostatniej zmiany]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: Zerowy argument"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: Oczekuj� liczby"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Nie mog� otworzy� pliku b��d�w %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: Pami�� wyczerpana!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "Nie znaleziono wzorca"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Nie znaleziono wzorca: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: Argument musi by� dodatni"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Nie mo�na przej�� do poprzedniego katalogu"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: Brak B��d�w"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: Brak listy lokacji"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: Popsuty ci�g wzorca"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: Zepsuty program wyra�e� regularnych"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: opcja 'readonly' jest ustawiona (wymu� poprzez !)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Nie mog� zmieni� zmiennej tylko do odczytu \"%s\""
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Nie mog� ustawi� zmiennej w piaskownicy: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: B��d w trakcie czytania pliku b��d�w"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Niedozwolone w piaskownicy"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: Niedozwolone w tym miejscu"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Ustawianie trybu ekranu niewspomagane"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: Niew�a�ciwa wielko�� przewini�cia"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: opcja 'shell' jest pusta"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Nie mog�em wczyta� danych znaku!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: B��d podczas zamykania pliku wymiany"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: stos znacznik�w jest pusty"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: Komenda jest zbyt skomplikowana"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: Zbyt d�uga nazwa"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: Zbyt wiele ["
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: Zbyt wiele nazw plik�w"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: Nadst�pne znaczki"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: Nieznana zak�adka"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Nie mog� rozwin�� znak�w wieloznacznych"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' nie mo�e by� mniejsze ni� 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' nie mo�e by� mniejsze ni� 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: B��d w trakcie zapisu"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "Zerowy licznik"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: U�ycie <SID> poza kontekstem skryptu"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: B��d wewn�trzny: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: Wzorzec u�ywa wi�cej pami�ci ni� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: pusty bufor"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Niew�a�ciwy wzorzec wyszukiwania lub delimiter"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Plik jest za�adowany w innym buforze"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: Nie ustawiono opcji '%s'"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: Niew�a�ciwa nazwa rejestru"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "szukanie dobi�o G�RY; kontynuacja od KO�CA"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "szukanie dobi�o KO�CA; kontynuacja od G�RY"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: Brak dwukropka"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: Niedozwolona cz��"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: oczekiwa�em na cyfr�"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "Strona %d"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "Brak tekstu do drukowania"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Drukuj� stron� %d (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " Kopia %d z %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "Wydrukowano: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "Drukowanie odwo�ane"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nie mo�na zapisa� do wyj�ciowego pliku PostScriptu"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: Nie mog� otworzy� pliku \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nie mo�na odczyta� pliku zasob�w PostScriptu \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: plik \"%s\" nie jest plikiem zasob�w PostScriptu"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasob�w PostScriptu"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" nieprawid�owa wersja pliku zasob�w"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znak�w."
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset nie mo�e by� pusty przy kodowaniu wielobajtowym."
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: Nie okre�lono domy�lnej czcionki dla drukowania wielobajtowego."
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nie mo�na otworzy� pliku PostScript do wyj�cia"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nie mog� otworzy� pliku \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"prolog.ps\""
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"cidfont.ps\""
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"%s.ps\""
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Nie mo�na przekonwertowa� by drukowa� kodowanie \"%s\""
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "Przesy�am do drukarki..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: Drukowanie pliku PostScript nie powiod�o si�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "Zadanie drukowanie przes�ane."
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "Dodaj now� baz� danych"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "Zapytane o wzorzec"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "Poka� ten komunikat"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "Zabij po��czenie"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "Pon�w wszelkie po��czenia"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "Poka� po��czenia"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: Zastosowanie: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Ta komenda cscope nie wspomaga podzielenia okna.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: Zastosowanie: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: nie znaleziono znacznika"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) b��d: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s nie jest katalogiem lub poprawn� baz� danych cscope"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "Dodano baz� danych cscope %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: b��d odczytu po��czenia z cscope %<PRId64>"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: nieznany typ szukania cscope"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: Nie mog�em stworzy� potoku do cscope"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: Nie mog�em utworzy� rozwidlenia dla cscope"
-
-#: ../if_cscope.c:849
-msgid "cs_create_connection setpgid failed"
-msgstr "nie powiod�o si� setpgid cs_create_connection"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "wykonanie cs_create_connection nie powiod�o si�"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen dla to_fp nie powiod�o si�"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen dla fr_fp nie powiod�o si�"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: Nie mog�em stworzy� procesu cscope"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: brak po��czenia z cscope"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: nieprawid�owa flaga cscopequickfix %c dla %c"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: brak dopasowa� dla zapytania cscope %s o %s"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "komendy cscope:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (U�ycie: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: znajd� funkcje wywo�uj�ce t� funkcj�\n"
-"       d: znajd� funkcje wywo�ywane przez t� funkcj�\n"
-"       e: znajd� ten wzorzec egrep\n"
-"       f: znajd� ten plik\n"
-"       g: znajd� t� definicj�\n"
-"       i: znajd� pliki w��czaj�ce (#include) ten plik\n"
-"       s: znajd� ten symbol C\n"
-"       t: znajd� ten �a�cuch znak�w\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: nie dodano duplikatu bazy danych cscope"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: nie ma po��czenia %s z cscope"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "po��czenie %s z cscope zosta�o zamkni�te"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: b��d krytyczny w cs_manage_matches"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Znacznik cscope: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   wiersz"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "nazwa pliku  / kontekst / wiersz\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: B��d cscope: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "Wszystkie bazy danych cscope prze�adowano"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "brak po��cze� z cscope\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid   nazwa bazy danych               przedsionek tropu\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "Nieznany argument opcji"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "Zbyt wiele argument�w"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "Brak argumentu po"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "�miecie po argumencie opcji"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr ""
-"Zbyt wiele argument�w \"+komenda\", \"-c komenda\" lub \"--cmd komenda\""
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "Niew�a�ciwy argument dla"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d plik�w do edycji\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "Pr�ba ponownego otworzenia pliku skryptu: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "Nie mog� otworzy� do odczytu: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "Nie mog� otworzy� dla wyj�cia skryptu: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: OSTRZE�ENIE: Wyj�cie nie jest terminalem\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: OSTRZE�ENIE: Wej�cie nie pochodzi z terminala\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "linia polece� pre-vimrc"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: Nie mog� czyta� z \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"Dalsze informacje poprzez: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[plik ..]       edytuj zadane pliki"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               czytaj tekst ze stdin"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t znacznik   edytuj plik, w kt�rym dany znacznik jest zdefiniowany"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  edytuj plik, zawieraj�cy pierwszy b��d"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"u�ycie:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [argumenty]"
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   lub:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"Argumenty:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tTylko nazwy plik�w po tym"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tNie rozwijaj znak�w specjalnych"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tTryb vi (jak \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tTryb ex (jak \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\tUsprawniony tryb Ex"
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tCichy tryb (t�a) (tylko dla \"ex\")"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tTryb r�nic (jak \"vimdiff\")"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tTryb �atwy (jak \"evim\", bez tryb�w)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tTryb wy��cznie do odczytu (jak \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tTryb ograniczenia (jak \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tModyfikacje (zapisywanie plik�w) niedozwolone"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tZakaz modyfikacji tekstu"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\tTryb binarny"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tTryb lisp"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tB�d� zgodny z Vi: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tB�d� niezupe�nie zgodny z Vi: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr "-V[N][nazwap]\t\tGadatliwy [poziom N] [zapisuj wiadomo�ci do nazwap]"
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tTryb odpluskwiania"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tZamiast pliku wymiany, u�ywaj tylko pami�ci"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tWylicz pliki wymiany i zako�cz"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (z nazw� pliku)\tOdtw�rz za�aman� sesj�"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tTo�same z -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\trozpocznij w trybie arabskim"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\trozpocznij w trybie hebrajskim"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\trozpocznij w trybie farsi"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\tUstaw typ terminala na <terminal>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tU�yj <vimrc> zamiast jakiegokolwiek .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tNie �aduj skrypt�w wtyczek"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tOtw�rz N kart (domy�lnie: po jednej dla ka�dego pliku)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tOtw�rz N okien (domy�lnie: po jednym dla ka�dego pliku)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\ttak samo jak -o tylko dziel okno pionowo"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tZacznij na ko�cu pliku"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\tZacznij w wierszu <lnum>"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr ""
-"-cmd <command>\t\tWykonaj komend� <command> przed za�adowaniem "
-"jakiegokolwiek pliku vimrc"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr ""
-"-c <command>\t\tWykonaj komend� <command> po za�adowaniu pierwszego pliku"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <sesja>\t\tWczytaj plik <sesja> po za�adowaniu pierwszego pliku"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\tWczytuj komendy trybu normalnego z pliku <scriptin>"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr ""
-"-w <scriptout>\tDo��cz wszystkie wprowadzane komendy do pliku <scriptout>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr ""
-"-W <scriptout>\tZapisuj wszystkie wprowadzane komendy do pliku <scriptout>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-"--startuptime <plik>\n"
-"Zapisz wiadomo�ci o d�ugo�ci startu do <plik>"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tU�ywaj <viminfo> zamiast .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  lub  --help\twy�wietl Pomoc (czyli t� wiadomo��) i zako�cz"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\twy�wietl informacj� o wersji i zako�cz"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "Brak zak�adek"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: �adna zak�adka nie pasuje do \"%s\""
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"zak�. wiersz kol plik/tekst"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" skok wiersz kol plik/tekst"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"zmie� wrsz. kol tekst"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Zak�adki w plikach:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Lista odniesie� (pocz�wszy od najnowszych):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historia zak�adek w plikach (od najnowszych po najstarsze):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "Brak '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: blok nie by� zablokowany"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: B��d w trakcie czytania pliku wymiany"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: B��d odczytu pliku wymiany"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: B��d szukania w pliku wymiany"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: B��d zapisu w pliku wymiany"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Plik wymiany ju� istnieje (atak symlink?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: Nie otrzyma�em bloku nr 0?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: Nie otrzyma�em bloku nr 1?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: Nie otrzyma�em bloku nr 2?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: Ojej, zgubi�em plik wymiany!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: Nie mog�em zmieni� nazwy pliku wymiany"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr ""
-"E303: Nie mog� otworzy� pliku wymiany dla \"%s\"; odtworzenie niemo�liwe"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block(): Nie otrzyma�em bloku 0??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: Nie znaleziono pliku wymiany dla %s"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "Wprowad� numer pliku wymiany, kt�rego u�y� (0 by wyj��): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: Nie mog� otworzy� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "Nie mog� odczyta� bloku 0 z "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"Mo�e nie wykonano zmian albo Vim nie zaktualizowa� pliku wymiany."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " nie mo�e by� stosowany z t� wersj� Vima.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "U�yj Vima w wersji 3.0.\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s nie wygl�da na plik wymiany Vima"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " nie mo�e by� stosowany na tym komputerze.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "Ten plik zosta� stworzony na "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"lub plik zosta� uszkodzony."
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-" zosta� uszkodzony (wielko�� strony jest mniejsza ni� najmniejsza warto��).\n"
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "U�ywam pliku wymiany \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "Oryginalny plik \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: OSTRZE�ENIE: Oryginalny plik m�g� by� zmieniony"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: Nie mog� odczyta� bloku 1 z %s"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???BRAKUJE WIELU WIERSZY"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???LICZNIK WIERSZY NIEZGODNY"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???PUSTY BLOK"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???BRAKUJE WIERSZY"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: Niew�a�ciwe ID bloku 1 (mo�e %s nie jest plikiem .swp?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???BRAK BLOKU"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? od tego miejsca po ???KONIEC wiersze mog� by� pomieszane"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? od tego miejsca po ???KONIEC wiersze mog� by� w�o�one/skasowane"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???KONIEC"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: Przerwanie odtwarzania"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: Wykryto b��dy podczas odtwarzania; od kt�rych wierszy zacz�� ???"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "Zobacz \":help E312\" dla dalszych informacji."
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr ""
-"Odtwarzanie zako�czono. Powiniene� sprawdzi� czy wszystko jest w porz�dku."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(Mo�esz chcie� zapisa� ten plik pod inn� nazw�\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "i wykona� diff z oryginalnym plikiem aby sprawdzi� zmiany)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "Odzyskiwanie zako�czone. Zawarto�� bufora jest r�wna zawarto�ci pliku."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"Mo�esz teraz chcie� usun�� plik .swp.\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "Znalezione pliki wymiany:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   W bie��cym katalogu:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   U�ywam podanej nazwy:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   W katalogu "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "     -- �aden --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "   posiadany przez: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "   data: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              data: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [po Vimie wersja 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [nie wygl�da na plik wymiany Vima]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "       nazwa pliku: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"         zmieniono: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "TAK"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "nie"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"        u�ytkownik: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "   nazwa hosta: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"      nazwa hosta: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"        ID procesu: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (dalej dzia�a)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"     [nie do u�ytku na tym komputerze]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "        [nieodczytywalny]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "            [nieotwieralny]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: Nie mog� zabezpieczy�, bo brak pliku wymiany"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "Plik zabezpieczono"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: Nieudane zabezpieczenie"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: niew�a�ciwy lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: nie znaleziono wiersza %<PRId64>"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: niepoprawne id wska�nika bloku 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx powinien by� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: Zaktualizowano zbyt wiele blok�w?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: niepoprawne id wska�nika bloku 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "blok nr 1 skasowany?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Nie mog� znale�� wiersza %<PRId64>"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: niepoprawne id bloku odniesienia"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count wynosi zero"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: numer wiersza poza zakresem: %<PRId64> jest poza ko�cem"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: liczba wierszy niepoprawna w bloku %<PRId64>"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "Wielko�� stosu wzrasta"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: niepoprawne id bloku odniesienia 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: P�tla dowi�za� dla \"%s\""
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: UWAGA"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"Znalaz�em plik wymiany o nazwie \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "Podczas otwierania pliku \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      NOWSZE od pliku wymiany!\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) Pewnie inny program obrabia ten sam plik.\n"
-"    Je�li tak, b�d� ostro�ny, aby nie sko�czy� z dwoma\n"
-"    r�nymi wersjami tego samego pliku po zmianach.\n"
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Zako�cz lub ostro�nie kontynuuj.\n"
-
-#: ../memline.c:3246
-msgid "(2) An edit session for this file crashed.\n"
-msgstr "(2) Sesja edycji dla pliku za�ama�a si�.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Je�li tak, to u�yj \":recover\" lub \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    aby odzyska� zmiany (zobacz \":help recovery)\").\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    Je�li ju� to zrobi�e�, usu� plik wymiany \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    aby unikn�� tej wiadomo�ci.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "Plik wymiany \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" ju� istnieje!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - UWAGA"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "Plik wymiany ju� istnieje!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&Otw�rz Read-Only\n"
-"&Edytuj pomimo\n"
-"O&dtw�rz\n"
-"&Zako�cz\n"
-"&Porzu�"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&Otw�rz Read-Only\n"
-"&Edytuj pomimo\n"
-"O&dtw�rz\n"
-"&Usu�\n"
-"&Zako�cz\n"
-"&Porzu�"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: Znaleziono zbyt wiele plik�w wymiany"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Brak pami�ci!  (rezerwacja %<PRIu64> bajt�w)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: Cz�� tropu punktu menu nie okre�la podmenu"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Menu istnieje tylko w innym trybie"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: Nie ma menu \"%s\""
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: Pusta nazwa menu"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: Trop menu nie mo�e prowadzi� do podmenu"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: Nie wolno dodawa� punkt�w menu wprost do paska menu"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: Separator nie mo�e by� cz�ci� tropu menu"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- Menu ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: Trop menu musi prowadzi� do punktu menu"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: Nie znaleziono menu: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Menu nie jest zdefiniowane dla trybu %s"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: Trop menu musi prowadzi� do podmenu"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: Nie znaleziono menu - sprawd� nazwy menu"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "Wykryto b��d podczas przetwarzania %s:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "wiersz %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: Niew�a�ciwa nazwa rejestru: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Opiekun komunikat�w: Miko�aj Machowski <mikmach@wp.pl>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "Przerwanie: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "Naci�nij ENTER lub wprowad� komend� aby kontynuowa�"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s wiersz %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- Wi�cej --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ekran/strona/wiersz w d�, b/u/k: do g�ry, q: zako�cz"
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "Pytanie"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"&Tak\n"
-"&Nie"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Tak\n"
-"&Nie\n"
-"&Zako�cz"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"&Tak\n"
-"&Nie\n"
-"Zapisz &wszystkie\n"
-"&Odrzu� wszystkie\n"
-"&Zako�cz"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: Za ma�o argument�w dla printf()"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Spodziewany argument Zmiennoprzecinkowy w printf()"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: Za du�o argument�w dla printf()"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: OSTRZE�ENIE: Zmiany w pliku tylko do odczytu"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "Wpisz numer i <Enter> lub wybierz mysz� (pusta warto�� anuluje): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "Wpisz numer i <Enter> (puste anuluje): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "1 wiersz wi�cej"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "1 wiersz mniej"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "dodano %<PRId64> wierszy"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "usuni�to %<PRId64> wierszy"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (Przerwane)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "Biiip!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "Wywo�uj� pow�ok� do wykonania: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: Brak identyfikatora pod kursorem"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' jest pusta"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "OSTRZE�ENIE: terminal nie wykonuje pod�wietlania"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: Brak ci�gu pod kursorem"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: Nie mog� skasowa� zwini�cia z bie��c� 'foldmethod'"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: lista zmian (changelist) jest pusta"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: Na pocz�tku listy zmian"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: Na ko�cu listy zmian"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "wprowad�  :quit<Enter>    zako�czenie programu"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 wiersz %sed 1 raz"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 wiersz %sed %d razy"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> wierszy %sed 1 raz"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> wierszy %sed %d razy"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> wierszy do wci�cia... "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "1 wiersz wci�ty "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> wierszy wci�tych "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: Brak poprzednio u�ytego rejestru"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "nie mog� skopiowa�, mimo to kasuj�"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "1 wiersz zmieniono"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> wierszy zmieniono"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "skopiowano blok 1 wiersza"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "1 wiersz skopiowano"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> wierszy skopiowanych"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> wierszy skopiowanych"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: Pusty rejestr %s"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Rejestry ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "Niedozwolona nazwa rejestru"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# Rejestry:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Nieznany typ rejestru %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Kolumn; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S��w; "
-"%<PRId64> z %<PRId64> Bajt�w"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S��w; "
-"%<PRId64> z %<PRId64> Znak�w; %<PRId64> z %<PRId64> Bajt�w"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S�owo %<PRId64> z %<PRId64>; Bajt "
-"%<PRId64> z %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S�owo %<PRId64> z %<PRId64>; Znak "
-"%<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> dla BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Strona %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "Dzi�ki za lot Vimem"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: Nieznana opcja"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: Opcja nie jest wspomagana"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: Niedozwolone w modeline"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr "E846: Kod klucza nie jest ustawiony"
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: Po = wymagany jest numer"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Nie znaleziono w termcap"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: Niedozwolony znak <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Nie mog� ustawi� 'term' na pusty ci�g"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' i 'patchmode' s� to�same"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: Konflikty warto�ci 'listchars'"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: Konflikty warto�ci 'fillchars'"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: Brak dwukropka"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: Ci�g o zerowej d�ugo�ci"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: Brak numeru po <%s>"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: Brak przecinka"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: Musi okre�la� warto�� '"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: zawiera niewy�wietlalny lub szeroki znak"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: Niedozwolony znak po <%c>"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: wymagany przecinek"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' musi by� pusty lub zawiera� %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: Niedomkni�ty ci�g wyra�e�"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: zbyt wiele element�w"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: niezbalansowane grupy"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: okno podgl�du ju� istnieje"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabski wymaga UTF-8, zr�b ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: Potrzebuj� przynajmniej %d wierszy"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: Potrzebuj� przynajmniej %d kolumn"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: Nieznana opcja: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: Wymagana Liczba: &%s = '%s'"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- Kody terminala ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- Globalne warto�ci opcji ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- Lokalne warto�ci opcji ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- Opcje ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: B��D get_varp"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': Brak pasuj�cego znaku dla %s"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Dodatkowe znaki po �redniku: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Nie mog� wykona� pow�oki "
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"pow�oka zwr�ci�a "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"Nie mog� uzyska� kontekstu bezpiecze�stwa dla"
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"Nie mo�na uzyska� kontekstu bezpiecze�stwa dla"
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Nie mog� znale�� pliku \"%s\" w tropie"
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: Zbyt wiele %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: Nieoczekiwane %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: Brak ] w ci�gu formatuj�cym"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: Niewspomagane %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: Niepoprawne %%%c w prefiksie ci�gu formatuj�cego"
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: Niepoprawne %%%c w ci�gu formatuj�cym"
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' nie zawiera wzorca"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: Pusta nazwa katalogu lub jej brak"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: Nie ma wi�cej element�w"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d z %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (wiersz skasowany)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Na dole stosu quickfix"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: Na g�rze stosu quickfix"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "lista b��d�w %d z %d; %d b��d�w"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: Nie mog� zapisa�, opcja 'buftype' jest ustawiona"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: Brak nazwy pliku lub niew�a�ciwa �cie�ka"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "Nie mog� otworzy� pliku \"%s\""
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: Bufor nie jest za�adowany"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: Oczekiwa�em na �a�cuch lub list�"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: Niew�a�ciwy element w %s%%[]"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: Brak ] po %s["
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: Niesparowany %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: Niesparowany %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: Niesparowany %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( jest niedozwolone w tym miejscu"
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 i podobne s� niedozwolone w tym miejscu"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: Brak ] po %s%%["
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: Pusty %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: Zbyt d�ugi wzorzec"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: Zbyt wiele \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Zbyt wiele %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: Niesparowany \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: niedozwolony znak po %s@"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Zbyt wiele z�o�onych %s{...}"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Zagnie�d�one %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Zagnie�d�one %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: Niedozwolone u�ycie \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c po niczym"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: Niew�a�ciwe odwo�anie wsteczne"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: niedopuszczalny znak po \\z"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: Niedozwolony znak po %s%%[dxouU]"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: Niedozwolony znak po %s%%"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: B��d sk�adni w %s{...}"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "Zewn�trzne poddopasowania:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E:864: \\%#= mo�e by� tylko przed 0, 1 lub 2. Zostanie u�yty silnik "
-"automatyczny"
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (NFA) przedwczesny koniec wyra�enia regularnego"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (wyra�enie regularne NFA) Niepoprawnie umieszczone %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) Nieznany operator '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) Nieznany operator '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) Nieznany operator '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-"E870: (wyra�enie regularne NFA) B��d przy odczytywaniu limit�w powt�rze�"
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-"E871: (wyra�enie regularne NFA) wielokrotne nie mo�e by� po wielokrotnym!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (wyra�enie regularne NFA) Zbyt du�o '('"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (wyra�enie regularne NFA) Za du�o \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (wyra�enie regularne NFA) b��d poprawnego zako�czenia"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (NFA) Nie mo�na zdj�� elementu ze stosu!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (wyra�enie regularne NFA) (w trakcie konwersji postfix do NFA), za "
-"wiele stan�w na stosie"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (wyra�enie regularne NFA) Nie ma miejsca na ca�e NFA "
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"Nie mo�na otworzy� do zapisu tymczasowego pliku, pokazuj� na stderr... "
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) NIE MO�NA OTWORZY� %s !"
-
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "Nie mo�na otworzy� do zapisu tymczasowego pliku logowania"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " V-ZAMIANA"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " ZAMIANA"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " NEGATYW"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " WPROWADZANIE"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (wprowadzanie)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (zamiana)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (v-zamiana)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " Hebrajski"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " Arabski"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (j�zyk)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (wklejanie)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " WIZUALNY"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " WIZUALNY LINIOWY"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " WIZUALNY BLOKOWY"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ZAZNACZANIE"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ZAZNACZANIE LINIOWE"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ZAZNACZANIE BLOKOWE"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "zapis"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: Niew�a�ciwy ci�g do szukania: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: szukanie dobi�o G�RY bez znalezienia: %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: szukanie dobi�o KO�CA bez znalezienia : %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: Oczekuj� '?' lub '/' po ';'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (zawiera poprzednio wymienione dopasowanie)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- Zawarte pliki "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "nie znaleziono"
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "w tropie ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (Ju� wymienione)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  NIE ZNALEZIONO"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "Przegl�d w��czonego pliku: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "Przeszukiwanie w��czonego pliku %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: Wzorzec pasuje w bie��cym wierszu"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "Wszelkie w��czane pliki odnaleziono"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "Brak w��czanych plik�w"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: Nie znalaz�em definicji"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: Nie znalaz�em wzorca"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Podstawienie "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Ostatni %sWyszukiwany wzorzec:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: Nieprawid�owy format pliku sprawdzania pisowni"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: Obci�ty plik sprawdzania pisowni"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "Zb�dny tekst w %s wiersz %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "Za d�uga nazwa afiksu w %s wiersz %d: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: B��d formatu w pliku afiks�w FOL, LOW lub UPP"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasi�giem"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "Kompresja drzewa s��w..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Sprawdzanie pisowni nie jest w��czone"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"Ostrze�enie: Nie mog� znale�� listy s��w \"%s.%s.spl\" lub \"%s.ascii.spl\""
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "Odczytuj� plik sprawdzania pisowni \"%s\""
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: To nie wygl�da na plik sprawdzania pisowni"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: Stary plik sprawdzania pisowni, wymagane uaktualnienie"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Plik sprawdzania pisowni dla nowszej wersji Vima"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: Niewspierana sekcja w pliku sprawdzania pisowni"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "Ostrze�enie: region %s nie jest wspierany"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "Czytam plik afiks�w %s ..."
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "Konwersja nie powiod�a si� dla wyrazu w %s wierszu %d: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "Konwersja w %s nie jest wspierana: od %s do %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "Nieprawid�owa warto�� FLAG w %s wierz %d: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "FLAG po u�yciu flag w %s wiersz %d: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"Definiowanie COMPOUNDFORBIDFLAG po PFX mo�e skutkowa� z�ym wynikiem w %s "
-"wiersz %d"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"Definiowanie COMPOUNDPERMITFLAG po PFX mo�e skutkowa� z�ym wynikiem w %s "
-"wiersz %d"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDRULES w %s wiersz %d: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDWORDMAX w %s wiersz %d: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDMIM w %s wiersz %d: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDSYLMAX w %s wiersz %d: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "Z�a warto�� CHECKCOMPOUNDPATTERN w %s wiersz %d: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr "R�ne flagi z�o�e� w kontynuowanym bloku afiksu w %s wiersz %d: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "Powt�rzony afiks w %s wiersz %d: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"Afiks u�yty tak�e dla BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST w "
-"%s wiersz %d: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "Oczekiwano Y lub N w %s wierszu %d: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "B��dny warunek w %s wiersz %d: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "Oczekiwano ilo�ci REP(SAL) w %s wierszu %d"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "Oczekiwano ilo�ci MAP w %s wierszu %d"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "Powt�rzony znak w MAP w %s wierszu %d"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "Nieznany lub powt�rzony element w %s wierszu %d: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "Brak wiersza FOL/LOW/UPP w %s"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "COMPOUNDSYLMAX u�yty bez SYLLABLE"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "Zbyt wiele op�nionych prefiks�w"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "Zbyt wiele flag z�o�e�"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "Zbyt wiele op�nionych prefiks�w i/lub flag z�o�e�"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "Brak wiersza SOFO%s wiersz w %s"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "Wiersze SAL i SOFO w %s"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "Flaga nie jest liczb� w %s wiersz %d: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "Nieprawid�owa flaga w %s wiersz %d: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "Warto�� %s r�ni si� od tej u�ytej w innym pliku .aff"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Czytam plik s�ownika %s ..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: Brak ilo�ci s��w w %s"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "wiersz %6d, s�owo %6d - %s"
-
-# c-format
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "Powt�rzony wyraz w %s wierszu %d: %s"
-
-# c-format
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "Pierwszy powt�rzony wyraz w %s wiersz %d: %s"
-
-# c-format
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d powt�rzony(ch) wyraz(�w) w %s"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "Zignorowa�em %d s��w ze znakami nie ASCII w %s"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "Odczytuj� plik wyraz�w %s ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Zignorowano powt�rzony wiersz /encoding= w %s wierszu %d: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "Zignorowano wiersz /encoding= po wyrazie w %s wierszu %d: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Powt�rzony wiersz /regions= zignorowano w %s wierszu %d: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "Za du�o region�w w %s wiersz %d: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "wiersz / zignorowano w %s wierszu %d: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "Nieprawid�owy numer regionu w %s wierszu %d: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "Nieznane flagi w %s wiersz %d: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "Zignorowa�em %d s��w ze znakami nie ASCII"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "Skompresowano %d z %d w�z��w; pozostaje %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "Odczytuj� plik sprawdzania pisowni..."
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "Wykonuj� kompresj� d�wi�kow�..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Liczba s��w po kompresji d�wi�kowej: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "Ca�kowita liczba s��w: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Zapisuj� plik sugestii %s ..."
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Oczekiwane zu�ycie pami�ci: %d bajt�w"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: Nazwa pliku wynikowego nie mo�e by� nazw� regionu"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: Wspieram tylko 8 region�w"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: Nieprawid�owy region w %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "Ostrze�enie: okre�lono zar�wno z�o�enia jak i NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "Zapisuj� plik sprawdzania pisowni %s ..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "Zrobione!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' nie posiada wpis�w %<PRId64>"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "Usuni�to s�owo z %s"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "Dodano s�owo do %s"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: Znaki wyraz�w r�ni� si� mi�dzy plikami sprawdzania pisowni"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "Przykro mi, brak podpowiedzi"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "Przykro mi, tylko %<PRId64> podpowiedzi"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Zmie� \"%.*s\" na:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: Brak poprzednich podmian sprawdzania pisowni"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Nie znaleziono: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Ten plik nie wygl�da na plik .sug: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Stary plik .sug, konieczne jest uaktualnienie: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Plik .sug dla nowszej wersji Vima: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Plik .sug nie pasuje do pliku .spl: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: B��d w czasie odczytu pliku .sug: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: Podwojony znak we wpisie MAP"
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "Brak element�w sk�adni okre�lonych dla tego bufora"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: Niedozwolony argument: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: Nie ma takiego klastra sk�adni: %s"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "synchronizacja komentarzy w stylu C"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "brak synchronizacji"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "pocz�tek synchronizacji"
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " wierszy przed g�rn� lini�"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- Elementy synchronizacji sk�adni ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"synchronizuj� na elementach"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- Elementy sk�adni ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: Nie ma takiego klastra sk�adni: %s"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "minimalnie "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "maksymalnie "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; pasuje "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr "znak�w nowego wiersza"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: argument contains niedozwolony w tym miejscu"
-
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: Niew�a�ciwa warto�� cchar"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: group[t]here niedozwolone w tym miejscu"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: Nie znalaz�em element�w regionu dla %s"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: Wymagana nazwa pliku"
-
-#: ../syntax.c:4221
-msgid "E847: Too many syntax includes"
-msgstr "E847: Za du�o w��czonych sk�adni"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: Brak ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: Brak '=': %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: Za ma�o argument�w: syntax region %s"
-
-#: ../syntax.c:4870
-msgid "E848: Too many syntax clusters"
-msgstr "E848: Za du�o klastr�w sk�adni"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: Brak specyfikacji klastra"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: Brak ogranicznika wzorca: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: �mieci po wzorcu: %s"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: syntax sync: wielokrotnie podane wzorce kontynuacji wiersza"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: Niedozwolone argumenty: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: Brak znaku r�wno�ci: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: Pusty argument: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s jest niedozwolone w tym miejscu"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s musi by� pierwsze w li�cie contains"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: Nieznana nazwa grupy: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: Niew�a�ciwa podkomenda :syntax : %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-"  WSZYTKO    ILO��  PASUJE  NAJWOLN.    �REDNIO   NAZWA              WZORZEC"
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: rekursywna p�tla wczytuj�ca syncolor.vim"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: nie znaleziono grupy pod�wietlania: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Zbyt ma�o argument�w: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Zbyt wiele argument�w: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: grupa ma ustawienia; zignorowane pod��czenie pod�wietlania"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: nieoczekiwany znak r�wno�ci: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: brak znaku r�wno�ci: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: brak argumentu: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: Niedozwolona warto��: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: Kolor FG nieznany"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: Kolor BG nieznany"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Nazwa lub liczba koloru nierozpoznana: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: za d�ugi kod terminala: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: Niedozwolony argument: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Zbyt wiele r�nych atrybut�w podkre�lania w u�yciu"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: Niedrukowalny znak w nazwie grupy"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: nieprawid�owy znak w nazwie grupy"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: Za du�o grup pod�wietlania i sk�adni"
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: na dole stosu znacznik�w"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: na g�rze stosu znacznik�w"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: Nie mo�na przej�� przed pierwszy pasuj�cy znacznik"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: nie znaleziono znacznika: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri rodzaj znacznik"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "plik\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: Pasuje tylko jeden znacznik"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: Nie mo�na przej�� za ostatni pasuj�cy znacznik"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "Plik \"%s\" nie istnieje"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "znacznik %d z %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " lub wi�cej"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  U�ywam znacznika o odmiennej wielko�ci liter!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: Plik \"%s\" nie istnieje"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # DO znacznik  OD wiersza      w pliku/tek�cie"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "Szukam w pliku znacznik�w %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "Ignoruj� d�ugie wiersze w pliku znacznik�w"
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: B��d formatu w pliku znacznik�w \"%s\""
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Przed bajtem %<PRId64>"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: Plik znacznik�w nieuporz�dkowany: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: Brak pliku znacznik�w"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: Nie mog� znale�� wzorca znacznika"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: Nie znalaz�em znacznika - tylko zgaduj�!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "Powt�rzona nazwa pola: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' nieznany. Mo�liwe typy wbudowanych terminali:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "domy�lnie jest '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: Nie mog� otworzy� pliku termcap"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: Nie ma opisu takiego terminala w terminfo"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: Nie ma opisu takiego terminala w termcap"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Brak opisu \"%s\" w termcap"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: wymagana zdolno�� \"cm\" terminala"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- Klawisze terminala ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: B��d podczas wczytywania wej�cia, ko�cz�...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Niespodziewana zmiana ilo�ci linii"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: Nie mog� otworzy� do zapisu pliku undo: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: Uszkodzony plik undo (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "Nie mo�na zapisa� pliku undo w �adnym katalogu z 'undodir'"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "Nie nadpisz� plikiem undo, nie mog� odczyta�: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "Nie nadpisz�, to nie jest plik undo: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "Pomijam zapis pliku undo, nic do cofni�cia"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "Zapisuj� plik undo: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: B��d zapisu w pliku undo: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "Nie wczytuj� pliku undo, inny w�a�ciciel: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "Wczytuj� plik undo: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: Nie mog� otworzy� pliku undo do odczytu: %s"
-
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: To nie jest plik undo: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: Niekompatybilny plik undo: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "Zawarto�� pliku si� zmieni�a, nie mog� u�y� pliku undo"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "Sko�czono wczytywanie pliku undo %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "Ju� w miejscu ostatniej zmiany"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "Ju� w miejscu najnowszej zmiany"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Nie znaleziono numeru cofni�cia %<PRId64>"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: niew�a�ciwe numery wierszy"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "1 wiersz wi�cej"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "wi�cej wierszy"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "1 wiersz mniej"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "mniej wierszy"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "1 zmiana"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "zmiany"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "przed"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "za"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "Nie ma zmian do cofni�cia"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr "liczba zmiany   kiedy              zapisano"
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> sekund temu"
-
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undojoin nie jest dozwolone po undo"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: uszkodzona lista cofania"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: brak wiersza cofania"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"Zadane �aty: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"Ekstra �aty: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Zmieniony przez "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"Skompilowany "
-
-#: ../version.c:649
-msgid "by "
-msgstr "przez "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"Olbrzymia wersja "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "bez GUI."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  Opcje w��czone (+) lub nie (-):\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "       vimrc systemu: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "   vimrc u�ytkownika: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " 2-gi plik vimrc u�ytkownika: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " 3-ci plik vimrc u�ytkownika: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "    exrc u�ytkownika: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  2-gi plik exrc u�ytkownika: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "   odwet dla $VIM-a: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "f-b dla $VIMRUNTIME: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "Kompilacja: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "Konsolidacja: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  KOMPILACJA DEBUG"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi rozbudowany"
-
-#: ../version.c:769
-msgid "version "
-msgstr "wersja "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "Autor: Bram Moolenaar i Inni."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim jest open source i rozprowadzany darmowo"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "Pom� biednym dzieciom w Ugandzie!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "wprowad� :help iccf<Enter>        dla informacji o tym  "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "wprowad� :q<Enter>                zako�czenie programu   "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "wprowad� :help<Enter>  lub  <F1>  pomoc na bie��co       "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "wprowad� :help version7<Enter>    dla informacji o wersji"
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Dzia�am w trybie zgodno�ci z Vi"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "wprowad� :set nocp<Enter>         warto�ci domy�lne Vim-a"
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "wprowad� :help cp-default<Enter>  dla informacji to tym  "
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "Sponsoruj rozw�j Vima!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "Zosta� zarejestrowanym u�ytkownikiem Vima!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "wprowad� :help sponsor<Enter>        dla informacji"
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "wprowad� :help register<Enter>        dla informacji"
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "menu Pomoc->Sponsoruj/Zarejestruj si� dla informacji"
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "Ju� jest tylko jeden widok"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: Nie ma okna podgl�du"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Nie mog� rozdzieli� lewo-g�rnego i prawo-dolnego jednocze�nie"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: Nie mog� przekr�ci�, gdy inne okno jest rozdzielone"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: Nie mog� zamkn�� ostatniego okna"
-
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: Nie mo�na zamkn�� okna autocmd"
-
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: Nie mo�na zamkn�� okna, zosta�oby tylko okno autocmd"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: Inne okno zawiera zmiany"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: Brak nazwy pliku pod kursorem"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() wywo�any z pustym has�em"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish u�ywa b��dnej kolejno�ci bajt�w"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: test sha256 nie powi�d� si�"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: test Blowfisha nie powi�d� si�"
-
-#~ msgid "Patch file"
-#~ msgstr "Plik �ata"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&OK\n"
-#~ "&Zako�cz"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Brak po��czenia z serwerem Vim"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Nie mog� wys�a� do %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Nie mog� czyta� odpowiedzi serwera"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Nie mog� wys�a� do klienta"
-
-#~ msgid "Save As"
-#~ msgstr "Zapisz jako"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Wczytaj skrypt Vima"
-
-#~ msgid "Edit File"
-#~ msgstr "Edytuj Plik"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (NIE ZNALEZIONO)"
-
-#~ msgid "unknown"
-#~ msgstr "nieznany"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Edytuj plik w nowym oknie"
-
-#~ msgid "Append File"
-#~ msgstr "Do��cz plik"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Pozycja okna: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Zapisz przekierowanie"
-
-#~ msgid "Save View"
-#~ msgstr "Zapisz widok"
-
-#~ msgid "Save Session"
-#~ msgstr "Zapisz sesj�"
-
-#~ msgid "Save Setup"
-#~ msgstr "Zapisz ustawienia"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< nie jest dost�pne bez w�a�ciwo�ci +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Brak dwugraf�w w tej wersji"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "jest urz�dzeniem (wy��czonym w opcji 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Wczytywanie ze stdin..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[zakodowane]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Plik zaszyfrowano w nieznany spos�b"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans nie pozwala na zapis niezmodyfikowanych bufor�w"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Cz�ciowy zapis niemo�liwy dla bufor�w NetBeans"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "zapisywanie do urz�dzenia wy��czone w opcji 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Rozdzia� zasob�w zostanie utracony (wymu� przez !)"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<nie mog� otworzy�> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: nie mog� otrzyma� czcionki %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: nie mog� powr�ci� do bie��cego katalogu"
-
-#~ msgid "Pathname:"
-#~ msgstr "Trop:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: nie mog� otrzyma� bie��cego katalogu"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "Zako�cz"
-
-#~ msgid "Vim dialog"
-#~ msgstr "VIM - Dialog"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Scrollbar Widget: Nie mog�em otrzyma� rozmiar�w rysunku na przycisku."
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Nie mog� stworzy� BalloonEval z powiadomieniem i wywo�aniem"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: Nie mog�em stworzy� nowego procesu dla GUI"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: Proces potomny nie m�g� uruchomi� GUI"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Nie mog� odpali� GUI"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Nie mog� czyta� z \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: Nie mo�na uruchomi� GUI, brak prawid�owej czcionki"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: Niew�a�ciwe 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Nieprawid�owa warto�� 'imactivatekey'"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Nie mog� zarezerwowa� koloru %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Brak dopasowania przy kursorze, szukam dalej"
-
-#~ msgid "Input _Methods"
-#~ msgstr "Input _Methods"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Szukaj i Zamie�..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - Szukaj..."
-
-#~ msgid "Find what:"
-#~ msgstr "Znajd�:"
-
-#~ msgid "Replace with:"
-#~ msgstr "Zamie� na:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Dopasuj tylko ca�e wyrazy"
-
-#~ msgid "Match case"
-#~ msgstr "Dopasuj wielko�� liter"
-
-#~ msgid "Direction"
-#~ msgstr "Kierunek"
-
-#~ msgid "Up"
-#~ msgstr "W g�r�"
-
-#~ msgid "Down"
-#~ msgstr "W d�"
-
-#~ msgid "Find Next"
-#~ msgstr "Znajd� nast�pne"
-
-#~ msgid "Replace"
-#~ msgstr "Zamie�"
-
-#~ msgid "Replace All"
-#~ msgstr "Zamie� wszystkie"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: otrzymano ��danie \"die\" od mened�era sesji\n"
-
-#~ msgid "Close"
-#~ msgstr "Zamknij"
-
-#~ msgid "New tab"
-#~ msgstr "Nowa karta"
-
-#~ msgid "Open Tab..."
-#~ msgstr "Otw�rz kart�..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: G��wne okno nieoczekiwanie zniszczone\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Filtr"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Anuluj"
-
-#~ msgid "Directories"
-#~ msgstr "Katalogi"
-
-#~ msgid "Filter"
-#~ msgstr "Filtr"
-
-#~ msgid "&Help"
-#~ msgstr "&Pomoc"
-
-#~ msgid "Files"
-#~ msgstr "Pliki"
-
-#~ msgid "&OK"
-#~ msgstr "&OK"
-
-#~ msgid "Selection"
-#~ msgstr "Wyb�r"
-
-#~ msgid "Find &Next"
-#~ msgstr "Znajd� &nast�pne"
-
-#~ msgid "&Replace"
-#~ msgstr "&Zamie�"
-
-#~ msgid "Replace &All"
-#~ msgstr "Zamie� &wszystko"
-
-#~ msgid "&Undo"
-#~ msgstr "&Cofnij"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Nie mog� znale�� tytu�u okna \"%s\""
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Argument nie jest wspomagany: \"-%s\"; U�ywaj wersji OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Nie mo�na otworzy� okna wewn�trz aplikacji MDI"
-
-#~ msgid "Close tab"
-#~ msgstr "Zamknij kart�"
-
-#~ msgid "Open tab..."
-#~ msgstr "Otw�rz kart�..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Znajd� ci�g (u�yj '\\\\' do szukania '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Szukanie i Zamiana (u�yj '\\\\' do szukania '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "Nie u�ywany"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Katalog\t*.nic\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Nie mog� zarezerwowa� mapy kolor�w, pewne kolory mog� by� "
-#~ "nieprawid�owe"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: Brak czcionek dla nast�puj�cych zestaw�w znak�w w zestawie czcionek "
-#~ "%s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nazwa zestawu czcionek: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Czcionka '%s' nie posiada znak�w jednolitej szeroko�ci"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: Nazwa zestawu czcionek: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "Font0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "Font1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "Szeroko�� font%<PRId64> nie jest podw�jn� szeroko�ci� font0"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "Szeroko�� font0: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "Szeroko�� font1: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "Nieprawid�owy opis czcionki"
-
-#~ msgid "&Dismiss"
-#~ msgstr "&Anuluj"
-
-#~ msgid "no specific match"
-#~ msgstr "brak okre�lonego dopasowania"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - wyb�r czcionki"
-
-#~ msgid "Name:"
-#~ msgstr "Nazwa:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Poka� wielko�� w punktach"
-
-#~ msgid "Encoding:"
-#~ msgstr "Kodowanie:"
-
-#~ msgid "Font:"
-#~ msgstr "Czcionka:"
-
-#~ msgid "Style:"
-#~ msgstr "Styl:"
-
-#~ msgid "Size:"
-#~ msgstr "Wielko��:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: B��D w automacie Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: b��d stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: nie mog� otworzy� bazy danych cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: nie mog� uzyska� informacji z bazy danych cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Nie mo�na wczyta� biblioteki Lua."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "nie mog� zachowa� informacji cofania"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: Przykro mi, ta komenda jest wy��czona, biblioteka MzScheme nie mo�e "
-#~ "by� za�adowana."
-
-#~ msgid "invalid expression"
-#~ msgstr "niepoprawne wyra�enie"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "wyra�enia wy��czone podczas kompilacji"
-
-#~ msgid "hidden option"
-#~ msgstr "ukryta opcja"
-
-#~ msgid "unknown option"
-#~ msgstr "nieznana opcja"
-
-#~ msgid "window index is out of range"
-#~ msgstr "indeks okna poza zakresem"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "nie mog� otworzy� bufora"
-
-#~ msgid "cannot delete line"
-#~ msgstr "nie mog� skasowa� wiersza"
-
-#~ msgid "cannot replace line"
-#~ msgstr "nie mog� zamieni� wiersza"
-
-#~ msgid "cannot insert line"
-#~ msgstr "nie mog� wprowadzi� wiersza"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ci�g nie mo�e zawiera� znak�w nowego wiersza"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "b��d przy konwersji warto�ci Scheme do Vima"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "B��d vima: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "B��d Vima"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "bufor jest niewa�ny"
-
-#~ msgid "window is invalid"
-#~ msgstr "okno jest niewa�ne"
-
-#~ msgid "linenr out of range"
-#~ msgstr "numer wiersza poza zakresem"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "Niedozwolone w piaskownicy Vima"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Python: nie mo�na u�ywa� :py i :py3 w czasie jednej sesji"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Pythona"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Python: nie mo�na u�ywa� :py i :py3 w czasie jednej sesji"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Nie mo�na wywo�a� Pythona rekursywnie"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ musi by� reprezentacj� �a�cucha"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Ruby."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: nieoczekiwany return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: nieoczekiwany next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: nieoczekiwany break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: nieoczekiwane redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: ponowna pr�ba poza klauzul� ratunku"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: nieobs�ugiwany wyj�tek"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: Nieznany status longjmp %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Prze��cz mi�dzy implementacj�/okre�leniem"
-
-#~ msgid "Show base class of"
-#~ msgstr "Poka� baz� klasy"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Poka� przepisan� funkcj� cz�onow�"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "Pobieraj z pliku"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "Pobieraj z projektu"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Pobieraj z wszystkich projekt�w"
-
-#~ msgid "Retrieve"
-#~ msgstr "Pobierz"
-
-#~ msgid "Show source of"
-#~ msgstr "Poka� �r�d�o dla"
-
-#~ msgid "Find symbol"
-#~ msgstr "Znajd� symbol"
-
-#~ msgid "Browse class"
-#~ msgstr "Przejrzyj klas�"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Poka� klas� w hierarchii"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Poka� klas� w ograniczonej hierarchii"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref odnosi si� do"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ma odniesienia od"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ma"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref u�yte przez"
-
-#~ msgid "Show docu of"
-#~ msgstr "Poka� dokumentacj� dla"
-
-#~ msgid "Generate docu for"
-#~ msgstr "Utw�rz dokumentacj� dla"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Nie mog� pod��czy� do SNiFF+. Sprawd� �rodowisko (sniffemacs musi by� "
-#~ "odnaleziony w $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: B��d podczas czytania. Roz��czenie"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ jest obecnie "
-
-#~ msgid "not "
-#~ msgstr "nie "
-
-#~ msgid "connected"
-#~ msgstr "pod��czony"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Nieznane zapytanie SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: B��d w trakcie pod��czania do SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ niepod��czony"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Nie jest buforem SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: B��d w trakcie zapisu. Roz��czony"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "niew�a�ciwy numer bufora"
-
-#~ msgid "not implemented yet"
-#~ msgstr "obecnie nie zaimplementowano"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "nie mog� ustawi� wiersza(y)"
-
-#~ msgid "invalid mark name"
-#~ msgstr "niepoprawna nazwa zak�adki"
-
-#~ msgid "mark not set"
-#~ msgstr "zak�adka nie ustawiona"
-
-#~ msgid "row %d column %d"
-#~ msgstr "wiersz %d kolumna %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "nie mog� wprowadzi�/do��czy� wiersza"
-
-#~ msgid "line number out of range"
-#~ msgstr "numer wiersza poza zakresem"
-
-#~ msgid "unknown flag: "
-#~ msgstr "nieznana flaga: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "nieznane vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "przerwanie klawiatury"
-
-#~ msgid "vim error"
-#~ msgstr "b��d vima"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "nie mog� stworzy� bufora/okna komendy: obiekt jest kasowany"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "nie mog� zarejestrowa� wstecznego wywo�ania komendy: bufor/okno ju� "
-#~ "zosta�a skasowana"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL FATALNY B��D: reflist zepsuta!? Prosz� z�o�y� raport o tym na "
-#~ "vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "nie mog� zarejestrowa� wstecznego wywo�ania komendy: brak odniesienia do "
-#~ "bufora/okna"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Tcl."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: kod wyj�cia %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "nie mog� dosta� wiersza"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Nie mog� zarejestrowa� nazwy serwera komend"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Wys�anie komendy do programu docelowego nie powiod�o si�"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: U�yto niew�a�ciwego id serwera: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: wcielenia instancji rejestru Vima jest �le sformowane.  Skasowano!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans nie s� obs�ugiwane przez to GUI\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Ta wersja Vima nie by�a skompilowanego z opcj� r�nic (diff)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' - nie mo�e by� u�yte: nie w��czone przy kompilacji\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: B��d: Nie mo�na uruchomi� gvim z NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "gdzie wielko�� znak�w jest ignorowana dodaj na pocz�tku / by flaga by�a "
-#~ "wielk� liter�"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tZarejestruj tego gvima w OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tWyrejestruj gvima z OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tStartuj w GUI (tak jak \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  lub --nofork\tPierwszy plan: Nie wydzielaj przy odpalaniu GUI"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tNie stosuj newcli do otwierania okien"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tU�ywaj <device> do I/O"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tU�yj <gvimrc> zamiast jakiegokolwiek .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tEdytuj zakodowane pliki"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tPod��cz vima to danego X-serwera"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNie ��cz z serwerem X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <pliki>\tEdytuj pliki w serwerze Vima je�li mo�liwe"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <pliki> To samo, nie narzekaj je�li nie ma serwera"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <pliki>\tTak jak --remote, lecz czekaj na pliki przed edycj�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <pliki>  To samo, nie narzekaj je�li nie ma serwera"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <pliki>  tak jak --remote ale u�ywa jednej "
-#~ "karty na plik"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <klawisze>\tWy�lij <klawisze> do serwera Vima i zako�cz"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <wyr>\tWykonaj <wyra�enie> w serwerze i wypisz wynik"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tWymie� nazwy dost�pnych serwer�w Vima i zako�cz"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nazwa>\t\tOdsy�aj do/sta� si� serwerem Vim <nazwa>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\tZa�aduj vim na <display>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tZacznij Vim jako ikon�"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <kolor>\tU�ywaj <kolor> dla t�a (r�wnie�: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <kolor>\tU�ywaj <kolor> dla normalnego tekstu (r�wnie�: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\tU�ywaj <font> dla normalnego tekstu (r�wnie�: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\tU�ywaj <font> dla wyt�uszczonego tekstu"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\tU�ywaj <font> dla pochy�ego"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <geom>\tU�ywaj <geom> dla pocz�tkowych rozmiar�w (r�wnie�: -"
-#~ "geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <szer>\tU�yj ramki o grubo�ci <szer> (r�wnie�: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <szer>  U�ywaj przewijacza o szeroko�ci <szer> (r�wnie�: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\tStosuj belk� menu o wysoko�ci <height> (r�wnie�: -"
-#~ "mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tStosuj negatyw kolor�w (r�wnie�: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNie stosuj negatywu kolor�w (r�wnie�: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\tUstaw okre�lony zas�b"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja GTK+):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\tZastartuj vim na <display> (r�wnie�: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\tUstaw unikatow� rol� do identyfikacji g��wnego okna"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tOtw�rz Vim wewn�trz innego widgetu GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "-echo-wid\t\tGvim wypisze Window ID na wyj�cie standardowe"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <tytu� rodzica>\tOtw�rz Vima wewn�trz rodzicielskiej aplikacji"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tOtw�rz Vima wewn�trz innego elementu win32"
-
-#~ msgid "No display"
-#~ msgstr "Brak display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Wys�anie nie powiod�o si�.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Wys�anie nie powiod�o si�. Pr�buj� wykona� na miejscu\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "otworzono %d z %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Brak terminala: Wys�anie wyra�enia nie powiod�o si�.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Wys�anie wyra�enia nie powiod�o si�.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: To nie jest wa�na strona kodowa"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Nie mog� nastawi� warto�ci IC"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Nie mog�em stworzy� kontekstu wprowadze�"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Nie mog�em otworzy� sposobu wprowadze�"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: OSTRZE�ENIE: Nie mog�em zlikwidowa� wywo�ania dla IM"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: metoda wprowadze� nie wspomaga �adnego stylu"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: metoda wprowadze� nie wspomaga mojego typu preedit"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: B��d w czasie uaktualniania szyfrowania pliku wymiany"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s jest zaszyfrowany a ta wersja Vima nie wspiera szyfrowania"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Zaszyfrowany plik wymiany: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Je�li podano nowy klucz szyfruj�cy, ale nie zapisano pliku tekstowego,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "wprowad� nowy klucz szyfruj�cy."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Je�li zapisano plik tekstowy po zmianie klucza szyfruj�cego wci�nij Enter"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "aby u�y� tego samego klucza dla pliku tekstowego i wymiany"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "U�ywam klucza szyfruj�cego z pliku wymiany do pliku tekstowego.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [nie nadaje si� dla tej wersji Vima]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Oderwij to menu"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Dialog wyboru katalogu"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Dialog zapisywania pliku"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Dialog otwierania pliku"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Przykro mi, nie ma przegl�darki plik�w w trybie konsoli"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: zachowuj� plik...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Zako�czono.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "B��D: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[bajt�w] totalne alokacje-zwolnienia %<PRIu64>-%<PRIu64>, w u�ytku "
-#~ "%<PRIu64>, maksymalne u�ycie %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[wywo�ania] wszystkich re/malloc()-�w %<PRIu64>, wszystkich free()-�w "
-#~ "%<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Wiersz staje si� zbyt d�ugi"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Wewn�trzny b��d: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Niedozwolony obrys myszki"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Wprowad� klucz do odkodowania: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Wprowad� ponownie ten sam klucz: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Klucze nie pasuj� do siebie!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Nie mo�na po��czy� z Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Nie mo�na po��czy� z Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: B��dny tryb dost�pu pliku info po��czenia NetBeans: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "odczyt z gniazda Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Bufor %<PRId64> utraci� po��czenie z NetBeans"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans nie s� obs�ugiwane przez to GUI"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans ju� pod��czone"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s jest tylko do odczytu (dodaj ! aby wymusi�)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Funkcjonalno�� eval nie jest dost�pna"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "zwalniam %<PRId64> wierszy"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Nie mog� zmieni� term w GUI"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: U�yj \":gui\" do odpalenia GUI"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Nie mog� zmieni� w GTK+2 GUI"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Niedozwolona czcionka/ki"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: nie mog� wybra� zestawu czcionek"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Niedozwolony zestaw czcionek"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: nie mog� wybra� szerokiej czcionki"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Niedozwolona szeroka czcionka"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Brak wspomagania myszki"
-
-#~ msgid "cannot open "
-#~ msgstr "nie mog� otworzy� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Nie mog� otworzy� okna!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Potrzebuj� Amigados w wersji 2.04 lub p�niejsz�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Potrzebuj� %s w wersji %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Nie mog� otworzy� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Nie mog� stworzy� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim ko�czy prac� z %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "nie mog� zmieni� trybu konsoli ?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: nie jest konsol�??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Nie mog� wykona� pow�oki z opcj� -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Nie mog� wykona� "
-
-#~ msgid "shell "
-#~ msgstr "pow�oka "
-
-#~ msgid " returned\n"
-#~ msgstr " zwr�ci�\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE zbyt niskie."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "B��D I/O"
-
-#~ msgid "Message"
-#~ msgstr "Wiadomo��"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' nie wynosi 80, nie mog� wykona� zewn�trznych komend"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Wyb�r drukarki nie powi�d� si�"
-
-#~ msgid "to %s on %s"
-#~ msgstr "do %s z %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Nieznana czcionka drukarki: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: B��d drukarki: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Wydrukowano '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr ""
-#~ "E244: Niedozwolona nazwa zestawu znak�w \"%s\" w nazwie czcionki \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Niedozwolony znak '%c' w nazwie czcionki \"%s\""
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Podw�jny sygna�, wychodz�\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Za�apa� �miertelny sygna� %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Za�apa� �miertelny sygna�\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Otwieranie ekranu X trwa�o %<PRId64> msec"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Dosta� b��d X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Test ekranu X nie powi�d� si�"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Pr�ba otwarcia ekranu X trwa�a zbyt d�ugo"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� wykona� pow�oki sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� stworzy� potok�w\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� rozdzieli� si�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Komenda zako�czona\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP straci� po��czenie ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "Otwarcie ekranu X nie powiod�o si�"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP obs�uguje ��danie samozapisu"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP otwiera po��czenie"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "Obserwacja po��czenia XSMP ICE nie powiod�a si�"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection nie powiod�o si�: %s"
-
-#~ msgid "At line"
-#~ msgstr "W wierszu"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Nie mog� za�adowa� vim32.dll!"
-
-#~ msgid "VIM Error"
-#~ msgstr "B��d VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Nie zdo�a�em poprawi� wska�nik�w funkcji w DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "pow�oka zwr�ci�a %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Za�apa� wydarzenie %s\n"
-
-#~ msgid "close"
-#~ msgstr "zamknij"
-
-#~ msgid "logoff"
-#~ msgstr "wyloguj"
-
-#~ msgid "shutdown"
-#~ msgstr "zako�cz"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Nie znaleziono komendy"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE nie znaleziono w twoim $PATH.\n"
-#~ "Zewn�trzne komendy nie b�d� wstrzymane po wykonaniu.\n"
-#~ "Zobacz  :help wim32-vimrun  aby otrzyma� wi�cej informacji."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim Ostrze�enie"
-
-#~ msgid "Error file"
-#~ msgstr "Plik b��du"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: B��d przy budowwaniu NFA z klas� ekwiwalencji"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr ""
-#~ "E878: (NFA) Nie mo�na przydzieli� pami�ci do przej�cia przez ga��zie!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "Ostrze�enie: Nie mog� znale�� listy s��w \"%s_%s.spl\" lub \"%s_ascii.spl"
-#~ "\""
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Konwersja w %s nie jest wspierana"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr ""
-#~ "E845: Nie wystarczaj�ca ilo�� pami�ci, lista s��w b�dzie niekompletna"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Trop szukania pliku znacznik�w obci�ty dla %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "uruchomiono now� pow�ok�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "U�ywam CUT_BUFFER0 zamiast pustego wyboru"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Cofni�cie niemo�liwe; mimo to kontynuuj�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Nie zaszyfrowany plik ma zaszyfrowany plik undo: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Nie powiod�o si� odszyfrowywanie pliku undo: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Plik undo jest zaszyfrowany: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "16/32-bit wersja GUI dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "64 bitowa wersja GUI dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja GUI dla MS-Windows"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " w trybie Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " ze wspomaganiem OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja na konsol� dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja na konsol� dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 bitowa wersja dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja dla MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 bitowa wersja dla MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Du�a wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normalna wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Ma�a wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malutka wersja "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "z GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "z GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "z X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "z X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "z X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "z Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "z GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "z Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "z Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "z (klasycznym) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     gvimrc systemu: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "  gvimrc u�ytkownika: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "2-gi plik gvimrc u�ytkownika: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "3-ci plik gvimrc u�ytkownika: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr " systemowy plik menu: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Kompilator: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menu Pomoc->Sieroty        dla informacji to tym  "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Uruchomiony bez tryb�w, wpisany tekst jest wprowadzany"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menu  Edytuj->Ustawienia globalne->Tryb wstawiania"
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                  dla dw�ch tryb�w           "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menu Edytuj->Ustawienia globalne->Kompatybilno�� z Vi"
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "     dla domy�lnych ustawie� Vima   "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "OSTRZE�ENIE: wykryto Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "wprowad� :help windows95<Enter>   dla informacji to tym  "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Nie mog�em za�adowa� biblioteki %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "Przykro mi, ta komenda jest wy��czona: nie mog�em za�adowa� biblioteki "
-#~ "Perla."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr "E299: wyliczenie Perla zabronione w piaskownicy bez modu�u Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Edytuj w &wielu Vimach"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Edytuj w pojedynczym &Vimie"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Diff z Vimem"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Edytuj w &Vimie"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Edytuj z istniej�cym Vimem - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Edytuj wybrane pliki w Vimie"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "B��d tworzenia procesu: Sprawd� czy gvim jest w twojej �cie�ce!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "b��d gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "Za d�uga �cie�ka!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Nieznany zestaw czcionek: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Nieznana czcionka: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: Czcionka \"%s\" nie ma sta�ej szeroko�ci znak�w"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Nie mo�na za�adowa� funkcji biblioteki %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E26: Hebrajski nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Farsi nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: Arabski nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: brak zarejestrowanego serwera o nazwie \"%s\""
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: nie mog� otworzy� ekranu"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Odebra�em niew�a�ciwe wyra�enie"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Region jest chroniony, nie mog� zmieni�"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans nie zezwala na zmiany w plikach tylko do odczytu"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Potrzebuj� klucza szyfrowania dla \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "puste klucze nie s� dozwolone"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "s�ownik jest zablokowany"
-
-#~ msgid "list is locked"
-#~ msgstr "lista jest zablokowana"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "nie powiod�o si� dodanie klucza '%s' do s�ownika"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "indeks musi by� liczb� lub wycinkiem, nie %s"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr "czeka�em na str() lub unicode(), a dosta�em %s"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "czeka�em na bytes() lub str(), a dosta�em %s"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr ""
-#~ "czeka�em na int(), long() lub co� co mo�na zmieni� na long(), ale "
-#~ "dosta�em %s"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr ""
-#~ "czeka�em na int() lub co� co mo�na zmieni� na int(), ale dosta�em %s"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "warto�� zbyt du�a by zmie�ci�a si� w typie int C"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "warto�� jest zbyt ma�a by zmie�ci�a si� w typie int C"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "liczba musi by� wi�ksza ni� zero"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "liczba musi by� wi�ksza lub mniejsza ni� zero"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "nie mog� skasowa� atrybut�w OutputObject"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "niepoprawny atrybut: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: B��d w uruchomieniu obiekt�w I/O"
-
-#~ msgid "failed to change directory"
-#~ msgstr "nie powiod�a si� zmiana katalogu"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "czeka�em na 3-krotk� jako wynik imp.find_module(), a dosta�em %s"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr ""
-#~ "czeka�em na 3-krotk� jako wynik imp.find_module(), a dosta�em krotk� o "
-#~ "wielko�ci %d"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "wewn�trzny b��d: imp.find_module zwr�ci� krotk� z NULL"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "nie mog� usun�� atrybut�w vim.Dictionary"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "nie mog� zmieni� zablokowanego s�ownika"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "nie mog� ustawi� atrybutu %s"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "hashtab zmieni� si� w czasie iteracji"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr ""
-#~ "czeka�em na element sekwencyjny od d�ugo�ci 2, a dosta�em sekwencj� o "
-#~ "d�ugo�ci %d"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "konstruktor listy nie akceptuje s��w kluczowych jako argument�w"
-
-#~ msgid "list index out of range"
-#~ msgstr "indeks listy poza zakresem"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "b��d wewn�trzny: nie powiod�o si� pobranie z listy Vima elementu %d"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "nie powiod�o si� dodanie elementu do listy"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "b��d wewn�trzny: w li�cie Vima brak elementu %d"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "b��d wewn�trzny: nie powiod�o si� dodanie elementu do listy"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "nie mog� usun�� atrybut�w vim.List"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "nie mog� zmieni� zablokowanej listy"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "nie nazwana funkcja %s nie istnieje"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "funkcja %s nie istnieje"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "konstruktor funkcji nie akceptuje s��w kluczowych jako argument�w"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "nie mog� uruchomi� funkcji %s"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "wyst�pi� problem w czasie zmiany okien"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "nie mog� wyzerowa� opcji globalnej %s"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "nie mog� wyzerowa� opcji %s, kt�ra nie ma warto�ci globalnej"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "pr�ba odniesienia do skasowanej karty"
-
-#~ msgid "no such tab page"
-#~ msgstr "nie ma takiej karty"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "pr�ba odniesienia do skasowanego okna"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "atrybut tylko do odczytu: bufor"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "pozycja kursora poza buforem"
-
-#~ msgid "no such window"
-#~ msgstr "nie ma takiego okna"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "pr�ba odniesienia do skasowanego bufora"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "nie powiod�a si� zmiana nazwy bufora"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "nazwa zak�adki musi by� pojedynczym znakiem"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.Buffer, a dosta�em %s"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "nie przeszed�em do bufora %d"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.Window, a dosta�em %s"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "nie znaleziono okna na bie��cej karcie"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "nie przeszed�em do okre�lonego okna"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.TabPage, a dosta�em %s"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "nie przeszed�em do okre�lonej karty"
-
-#~ msgid "failed to run the code"
-#~ msgstr "uruchomienie kodu si� nie powiod�o"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: eval nie zwr�ci�o odpowiedniego obiektu pythona"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Nie powiod�a si� konwersja obiektu pythona do warto�ci Vima"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "nie mo�na konwertowa� %s do s�ownika Vima"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "nie mo�na konwertowa� %s do struktury Vima"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "b��d wewn�trzny: przekazano referencj� NULL"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "b��d wewn�trzny: b��dny typ warto�ci"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "Nie mog� ustawi� haka �cie�ki: sys.path_hooks nie jest list�\n"
-#~ "Powiniene� teraz wykona� nast�puj�ce czynno�ci:\n"
-#~ "- doda� vim.path_hook do sys.path_hooks\n"
-#~ "- doda� vim.VIM_SPECIAL_PATH do sys.path\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "Nie mog� ustawi� �cie�ki: sys.path nie jest list�\n"
-#~ "Powinno si� teraz doda� vim.VIM_SPECIAL_PATH do sys.path"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace musi by� liczb� ca�kowit�"
-
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<obiekt bufora (skasowany) w %p>"
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr ""
-#~ "E281: B��D TCL: kod zako�czeniowy nie jest ca�kowity!? Prosz� z�o�y� "
-#~ "raport o tym na vim-dev@vim.org"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja RISC OS):\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <number>\tPocz�tkowa szeroko�� okna w kolumnach"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <number>\tPocz�tkowa wysoko�� okna w wierszach"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla RISC OS"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() wymaga listy ci�g�w"
-
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<obiekt okna (skasowany) w %p>"
-
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<obiekt okna (nieznany) w %p>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<okno %d>"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <nazwa>\t\tU�ywaj zasob�w tak jak by Vim by� <nazwa>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (Niezaimplementowane)\n"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: argument containedin niedozwolony w tym miejscu"
-
-#~ msgid "Vim dialog..."
-#~ msgstr "Dialog Vima..."
-
-#~ msgid "Font Selection"
-#~ msgstr "Wyb�r czcionki"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: styl nadpunktowy wymaga +fontset"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: Tw�j GTK+ jest starszy ni� 1.2.3. Pole statusu wy��czono"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: Serwer metod wprowadze� nie jest uruchomiony"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "z GTK-GNOME GUI."
-
-#~ msgid "with GTK GUI."
-#~ msgstr "z GTK GUI."
-
-#~ msgid "[NL found]"
-#~ msgstr "[znaleziono NL]"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: wyczerpano maksymaln� liczb� po��cze� cscope"
diff --git a/src/nvim/po/pl.po b/src/nvim/po/pl.po
deleted file mode 100644
index 2a2d12daac..0000000000
--- a/src/nvim/po/pl.po
+++ /dev/null
@@ -1,8264 +0,0 @@
-# translation of pl.po to Polish
-# Polish Translation for Vim
-#
-# updated 2013 for vim-7.4
-#
-# FIRST AUTHOR Marcin Dalecki <martin@dalecki.de>, 2000.
-# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013.
-msgid ""
-msgstr ""
-"Project-Id-Version: pl\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2010-08-10 18:15+0200\n"
-"Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
-"Language: pl\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "nie mog� pobra� warto�ci opcji"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "b��d wewn�trzny: nieznany typ opcji"
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[Lista lokacji]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Lista quickfix]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr "E855: Autokomendy spowodowa�y porzucenie komendy"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: Nie mog� zarezerwowa� bufora; zako�czenie..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: Nie mog� zarezerwowa� bufora; u�ywam innego..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: Nie wy�adowano �adnego bufora"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: Nie skasowano �adnego bufora"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: Nie wyrzucono �adnego bufora"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "1 bufor wy�adowany"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "wy�adowano %d bufor�w"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "1 bufor skasowany"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "%d bufor�w skasowano"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "wyrzucono 1 bufor "
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "wyrzucono %d bufor�w"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: Nie mog� wy�adowa� ostatniego bufora"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: Nie znaleziono zmienionych bufor�w"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: Nie ma wylistowanych bufor�w"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Bufor \"%<PRId64>\" nie istnieje"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: Nie mog� przej�� poza ostatni bufor"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: Nie mog� przej�� przed pierwszy bufor"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: Nie zapisano zmian w buforze %<PRId64> (wymu� przez !)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: OSTRZE�ENIE: Przepe�nienie listy nazw plik�w"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Nie znaleziono bufora %<PRId64>"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: Wielokrotne dopasowania dla %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: �aden bufor nie pasuje do %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "wiersz %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: Bufor o tej nazwie ju� istnieje"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [Zmieniony]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[Nie edytowany]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[Nowy Plik]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[B��d odczytu]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[RO]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[tylko odczyt]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 wiersz --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> wiersze --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "wiersz %<PRId64> z %<PRId64> --%d%%-- kol "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[Bez nazwy]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "pomoc"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[Pomoc]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[Podgl�d]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "Wszystko"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "D�"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "G�ra"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Lista bufor�w:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[Notka]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Znaki ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "Znaki dla %s:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    wiersz=%<PRId64>  id=%d  nazwa=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: Brak dwukropka"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: Niedozwolony tryb"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: oczekiwa�em na cyfr�"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: Niedozwolony procent"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Nie mog� zr�nicowa� wi�cej ni� %<PRId64> bufor�w"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: Nie mog� otworzy� lub zapisa� plik�w tymczasowych"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: Nie mog� stworzy� r�nic"
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: Nie mog� odczyta� wyj�cia pliku �aty"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: Nie mog� wczyta� wyj�cia r�nicy"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: Bie��cy bufor nie jest w trybie r�nic"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: �aden inny bufor w trybie diff nie jest modyfikowalny"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: Brak innego bufora w trybie r�nic"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr ""
-"E101: Wi�cej ni� jeden bufor w trybie r�nicowania, nie wiem kt�rego u�y�"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Nie mog� znale�� bufora \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: Bufor \"%s\" nie jest w trybie r�nicowania"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: Nieoczekiwana zmiana bufora"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: Escape jest niedozwolone w dwugrafie"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: Nie znaleziono pliku rozk�adu klawiszy"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: Zastosowano :loadkeymap w niewczytanym pliku"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: Pusty wpis keymap"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " Dope�nianie s��w kluczowych (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X tryb (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " Dope�nianie pe�nych wierszy (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " Dope�nianie nazw plik�w (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " Dope�nianie znacznik�w (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " Dope�nianie wzorc�w trop�w (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " Dope�nianie definicji (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Dope�nianie ze s�ownik�w (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Dope�nianie z tezaurusa (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " Dope�nianie wiersza polece� (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr "Dope�nianie zdefiniowane przez u�ytkownika (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni uzupe�nianie (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr "Propozycja pisowni (^L^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " Lokalne dope�nianie s��w kluczowych (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "Dobi�em do ko�ca akapitu"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: Funkcja uzupe�niania zmieni�a okno"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: Funkcja uzupe�nania usun�a tekst"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "opcja 'dictionary' jest pusta"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "opcja 'thesaurus' jest pusta"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "Przegl�dam s�ownik: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (wprowadzanie) Przewijanie (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (zamiana) Przewijanie (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "Przegl�dam: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "Przegl�dam znaczniki."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " Dodaj�"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- Szukam..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "Z powrotem na pierwotnym"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "Wyraz z innego wiersza"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "Jedyne dopasowanie"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "pasuje %d z %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "pasuje %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: Nieoczekiwane znaki w :let"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: Indeks listy poza zakresem: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: Nieokre�lona zmienna: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: Brak ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argument %s musi by� List�"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argument %s musi by� List� lub S�ownikiem"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Nie mo�na u�y� pustego klucza dla S�ownika"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: wymagana Lista"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: wymagany S�ownik"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Zbyt wiele argument�w dla funkcji: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Klucz nie istnieje w S�owniku: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: Funkcja %s ju� istnieje; aby j� zamieni� u�yj !"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: istnieje ju� taki element S�ownika"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: wymagana Funcref"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Nie mo�na u�y� [:] przy S�owniku"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: Z�y typ zmiennej dla %s="
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Nieznana funkcja: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: Niedozwolona nazwa zmiennej: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: U�ycie Zmiennoprzecinkowej jako �a�cucha"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: Mniej cel�w ni� element�w Listy"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: Wi�cej cel�w ni� element�w Listy"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "Podw�jny ; w li�cie zmiennych"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: Nie mog� wypisa� zmiennych dla %s"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: Indeks mo�e istnie� tylko dla Listy lub S�ownika"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] musi by� ostatnie"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] wymaga warto�ci listy"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: Lista ma wi�cej element�w ni� cel"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: Lista nie ma wystarczaj�cej ilo�ci element�w"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: Brak \"in\" po :for"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Brak nawias�w: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: Nie istnieje zmienna: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: zmienna zagnie�d�ona zbyt g��boko dla (un)lock"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: Brak ':' po '?'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: List� mog� por�wna� tylko z List�"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: Nieprawid�owa operacja dla Listy"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: S�ownik mog� por�wna� tylko ze S�ownikiem"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: Nieprawid�owa operacja dla S�ownika"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcref mog� por�wna� tylko z Funcref"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: Nieprawid�owa operacja dla Funcref"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Nie mog� u�y� '%' w Zmiennoprzecinkowej"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: Brak ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: Nie mo�na zindeksowa� Funcref"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: Brak nazwy opcji: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: Nieznana opcja: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: Brak cudzys�owu: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: Brak cudzys�owu: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Brakuj�cy przecinek w Li�cie: '%s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Brak zako�czenia Listy ']': %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Brak dwukropka w S�owniku: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Powt�rzony klucz w S�owniku: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Brakuj�cy przecinek w S�owniku: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Brak ko�ca w S�owniku '}': %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: Zmienna zagnie�d�ona zbyt g��boko by pokaza�"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: Zbyt wiele argument�w dla funkcji %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Zbyt wiele argument�w dla funkcji %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Nieznana funkcja: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Za ma�o argument�w dla funkcji: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: U�ycie <SID> poza kontekstem skryptu: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Wywo�anie funkcji \"dict\" bez S�ownika: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: Wymagana Liczba lub Zmiennoprzecinkowa"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "argument add()"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: Za du�o argument�w"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() mo�e by� u�yte tylko w trybie Wprowadzania"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Klucz ju� istnieje: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "argument extend()"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "argument map()"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "argument filter()"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld wierszy: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: Nieznana funkcja: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "wywo�ano inputrestore() wi�cej razy ni� inputsave()"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "argument insert()"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: Zakres niedozwolony"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: Nieprawid�owy typ dla len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: Skok to zero"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: Pocz�tek po ko�cu"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<pusty>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "argument remove()"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: Za du�o dowi�za� symbolicznych (p�tla?)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "argument reverse()"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "argument sort()"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "argument add()"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Funkcja por�wnywania w sort nie powiod�a si�"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Funkcja por�wnywania w sort nie powiod�a si�"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(Niew�a�ciwe)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: B��d zapisywania pliku tymczasowego"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: U�ycie Zmiennoprzecinkowej jako Liczby"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: U�ycie Funcref jako Liczby"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: U�ycie Listy jako Liczby"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: U�ycie S�ownika jako Liczby"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: U�ycie Funcref jako �a�cucha"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: U�ycie Listy jako �a�cucha"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: U�ycie S�ownika jako �a�cucha"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Nieprawid�owy typ zmiennej dla: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Nie mog� usun�� zmiennej %s"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Nazwa Funcref musi si� zaczyna� wielk� liter�: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Nazwa zmiennej jest w konflikcie z istniej�c� funkcj�: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Warto�� jest zablokowana: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "Nieznane"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Nie mog� zmieni� warto�ci %s"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: Zmienna zagnie�d�ona zbyt g��boko by zrobi� kopi�"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nieznana funkcja: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Brak '(': %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: Nie mo�na tutaj u�y� g:"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Niedozwolony argument: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Powt�rzona nazwa argumentu: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: Brak :endfunction"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Nazwa funkcji jest w konflikcie ze zmienn�: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Nie mog� redefiniowa� funkcji %s: jest w u�yciu"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Nazwa funkcji nie pasuje do nazwy skryptu: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: Wymagana jest nazwa funkcji"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Nazwa funkcji musi rozpoczyna� si� wielk� liter� lub zawiera� "
-"dwukropek: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Nazwa funkcji musi rozpoczyna� si� wielk� liter� lub zawiera� "
-"dwukropek: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Nie mog� skasowa� funkcji %s: jest w u�yciu"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Zagnie�d�enie wywo�a� funkcji ponad 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "wywo�uj� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "porzucono %s"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s zwraca #%<PRId64>"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s zwraca %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "kontynuacja w %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return poza funkcj�"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# zmienne globalne:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tOstatnie ustawienie przez "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "Brak starych plik�w"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  Hex %02x,  Oktal %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, Hex %04x,  Oktal %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Hex %08x, Oktal %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: Przeniesienie wierszy na siebie samych"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "1 wiersz przeniesiony"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> wiersze przeniesione"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> wierszy przefiltrowanych"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: Autokomendy *Filter* nie mog� zmienia� bie��cego bufora"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[Brak zapisu od czasu ostatniej zmiany]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s w wierszu: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: Zbyt wiele b��d�w; pomijam reszt� pliku"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Wczytuj� plik viminfo \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " informacja"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " zak�adki"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " stare pliki"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " NIE POWIOD�O SI�"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Plik viminfo jest niezapisywalny: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Nie mog� zapisa� pliku viminfo %s!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Zapisuj� plik viminfo \"%s\""
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Ten plik viminfo zosta� wygenerowany przez Vima %s.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Mo�esz go ostro�nie edytowa�!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Warto�� 'encoding' w czasie zapisu tego pliku\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "Niedopuszczalny pocz�tkowy znak"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "Zapisa� cz�ciowo plik?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: Stosuj ! do zapisania cz�ciowo bufora"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "Nadpisa� istniej�cy plik \"%s\"?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "Plik wymiany \"%s\" istnieje, czy go nadpisa�?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: Plik wymiany istnieje: %s (wymu� poprzez :silent!)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Brak nazwy pliku dla bufora %<PRId64>"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: Plik niezapisany: Zapis jest wy��czony opcj� 'write'"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"opcja 'readonly' nastawiona dla \"%s\".\n"
-"Czy chcesz go pomimo tego zapisa�?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"Prawa pliku \"%s\" s� tylko do odczytu.\n"
-"Mimo to by� mo�e uda si� zmieni� ten plik.\n"
-"Chcesz spr�bowa�?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: \"%s\" jest tylko do odczytu (dodaj ! aby wymusi�)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autokomendy nieoczekiwanie skasowa�y nowy bufor %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: nienumeryczny argument dla :z"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Komendy pow�oki s� niedozwolone w rvim"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: Wzorce regularne nie mog� by� rozgraniczane literami"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "zamie� na %s (y/n/a/q/l/^E/^Y)?"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(Przerwane) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1 pasuje"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1 podstawienie "
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> dopasowa�"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> podstawie�"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " w 1 wierszu"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " w %<PRId64> wierszach"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: Nie mog� wykona� :global rekursywnie"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: Brak wzorca regularnego w :global"
-
-# c-format
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "Wzorzec znaleziono w ka�dym wierszu: %s"
-
-#: ../ex_cmds.c:4510
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "Nie znaleziono wzorca: %s"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Ostatni podstawiany ci�g:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: Nie panikuj!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Przykro mi, brak '%s' pomocy dla %s"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: Przykro mi, ale brak pomocy o %s"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "Przykro mi, nie ma pliku pomocy \"%s\""
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Nie jest katalogiem: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: Nie mog� otworzy� %s do zapisu"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: Nie mog� otworzy� %s do odczytu"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: Mieszanka kodowa� w pliku pomocy w ramach j�zyka: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Powt�rzony znacznik \"%s\" w pliku %s/%s"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: Nieznana komenda znaku: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: Brak nazwy znaku"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: Zbyt wiele nazw znak�w"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: Niew�a�ciwy tekst znaku: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: Nieznany znak: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: Brak numeru znaku"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: Niew�a�ciwa nazwa bufora: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Niew�a�ciwe ID znaku: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr "(nie wspomagane)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[Skasowano]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Wchodz� w tryb odpluskwiania. Wprowad� \"cont\" aby kontynuowa�."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "wiersz %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "cmd: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Punkt kontrolny w \"%s%s\" wiersz %<PRId64>"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: Nie znaleziono punktu kontrolnego: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "Nie okre�lono �adnych punkt�w kontrolnych"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  wiersz %<PRId64>"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Pierwsze u�ycie \":profile start {fname}\""
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "Zachowa� zmiany w \"%s\"?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "Bez Tytu�u"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Nie zapisano zmian w buforze \"%s\""
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "OSTRZE�ENIE: Nieoczekiwane wej�cie w inny bufor (sprawd� autokomendy)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: Tylko jeden plik w edycji"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: Nie mo�na przej�� przed pierwszy plik"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: Nie mo�na przej�� za ostatni plik"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: nie wspierany kompilator: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "Szukanie \"%s\" w \"%s\""
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "Szukanie \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "nie znaleziono w 'runtimepath': \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "Nie mo�na wczyta� katalogu: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "nie mog�em wczyta� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "wiersz: %<PRId64> nie mog�em wczyta� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "wczytywanie \"%s\""
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "wiersz %<PRId64>: wczytywanie \"%s\""
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "sko�czono wczytywanie %s"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "modeline"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd argument"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c argument"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "zmienna �rodowiskowa"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "obs�uga b��du"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: OSTRZE�ENIE: Niew�a�ciwy separator wierszy, pewnie brak ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: u�yto :scriptencoding poza wczytywanym plikiem"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: u�yto :finish poza wczytywanym plikiem"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "Bie��cy %sj�zyk: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Nie mog� ustawi� j�zyka na \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Wchodz� w tryb Ex. Wprowad� \"visual\" aby przej�� do trybu Normal."
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: Na ko�cu pliku"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: Komenda zbyt rekursywna"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: Nie znaleziono wyj�tku: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "Koniec wczytywanego pliku"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "Koniec funkcji"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr ""
-"E464: Niejednoznaczne zastosowanie komendy zdefiniowanej przez u�ytkownika"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: Nie jest komend� edytora"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: Dano wsteczny zakres"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "Dano wsteczny zakres; zamiana jest mo�liwa"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: Stosuj w lub w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: Przykro mi, ale ta komenda nie jest dost�pna w tej wersji"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: Tylko pojedyncza nazwa pliku dozwolona"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 wi�cej plik do edycji.  Mimo to wyj��?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "jeszcze %d plik�w do edycji.  Mimo to wyj��?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1 wi�cej plik do edycji"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: jeszcze %<PRId64> plik�w do edycji"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: Komenda ju� istnieje; aby j� przedefiniowa� stosuj !"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    Nazwa       Arg. Zak.  Gotowo��  Definicja"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "Nie znaleziono komend zdefiniowanych przez u�ytkownika"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: Nie okre�lono atrybutu"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: Niew�a�ciwa ilo�� argument�w"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: Mno�nik nie mo�e by� podany dwukrotnie"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: Niew�a�ciwa domy�lna warto�� mno�nika"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete wymaga argumentu"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: Niew�a�ciwy atrybut: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: Niew�a�ciwa nazwa komendy"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr ""
-"E183: Komendy zdefiniowane przez u�ytkownika musz� rozpoczyna� si� du�� "
-"liter�"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E841: Nazwa zastrze�ona, nie mo�na jej u�y� w komendzie u�ytkownika"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: Nie ma takiej komendy u�ytkownika: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: Niew�a�ciwa warto�� dope�niania: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468: Argument depe�niania dozwolony wy��cznie dla dope�niania u�ytkownika"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Dope�nianie u�ytkownika wymaga funkcji jako argumentu"
-
-#: ../ex_docmd.c:5257
-#, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: Nie mog� znale�� zestawu kolor�w '%s'"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "Witaj u�ytkowniku Vima!"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: Nie mog� zamkn�� ostatniej karty"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "Jest ju� tylko jedna karta"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "Karta %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "Brak pliku wymiany"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr ""
-"E747: Nie mog� zmieni� katalogu, bufor zosta� zmodyfikowany (dodaj ! aby "
-"wymusi�)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: Nie ma poprzedniego katalogu"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: Nieznany"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize wymaga dw�ch argument�w numerycznych"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr ""
-"E188: Pozyskiwanie pozycji okna nie jest zaimplementowane dla tego systemu"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos wymaga dw�ch argument�w numerycznych"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: Nie mog� utworzy� katalogu: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" istnieje (wymu� poprzez !)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: Nie mog� otworzy� \"%s\" do zapisu"
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: Argument musi by� liter� albo cudzys�owem w prz�d/ty�"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: Rekursywne zastosowanie :normal za g��bokie"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: Brak nazwy zamiennego pliku do podstawienia pod '#'"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: brak nazwy pliku autokomend do podstawienia pod \"<afile>\""
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: brak numeru bufora autokomend do podstawienia pod  \"<abuf>\""
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: brak nazwy dopasowania autokomend pod \"<amatch>\""
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: brak nazwy pliku :source do postawienia pod \"<sfile>\""
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: brak numeru linii by u�y� z \"<slnum>\""
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: Pusta nazwa pliku dla '%' lub '#', dzia�a tylko z \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: Wynikiem jest pusty ci�g"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Nie mog� otworzy� pliku viminfo do odczytu"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: Nie mo�na ':throw' wyj�tk�w z prefiksem 'Vim'"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "Wyj�tek: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "Wyj�tek zako�czony: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "Wyj�tek odrzucony: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, wiersz %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "Wyj�tek przechwycony: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s zosta� zawieszony"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s przywr�cony"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s odrzucony"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "Wyj�tek"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "B��d i przerwanie"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "B��d"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "Przerwanie"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: zbyt g��bokie zagnie�d�enie :if"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif bez :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else bez :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif bez :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: wielokrotne :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif po :else"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: zbyt g��bokie zagnie�d�enie :while/:for"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue bez :while lub :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break bez :while lub :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: U�ycie :endfor z :while"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: U�ycie :endwhile z :for"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: zbyt g��bokie zagnie�d�enie :try"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch bez :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch za :finally"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally bez :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: wielokrotne :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry bez :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction poza funkcj�"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Nie mo�na teraz edytowa� innego bufora"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: Nie mo�na teraz zmienia� informacji o buforze"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "nazwa znacznika"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " pokrewny plik\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "opcja 'history' jest zerowa"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s Historia (od najnowszych po najstarsze):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "Wiersz polece�"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "Szukany ci�g"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "Wyra�enie"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "Wiersz wprowadze�"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar przekracza d�ugo�� polecenia"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: Aktywny widok lub bufor skasowany"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: �cie�ka za d�uga by uzupe�ni�"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Niew�a�ciwy trop: '**[numer]' musi by� na ko�cu tropu lub po nim musi "
-"by� '%s'."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Nie mog� znale�� katalogu \"%s\" w cdpath"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Nie mog� znale�� pliku \"%s\" w tropie"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Katalogu \"%s\" nie ma wi�cej w cdpath"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Pliku \"%s\" nie ma wi�cej w tropie"
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: Autokomendy zmieni�y bufor lub jego nazw�"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "Niedopuszczalna nazwa pliku"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "jest katalogiem"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "nie jest plikiem"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[Nowy Plik]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[Nowy KATALOG]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[Za du�y plik]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[Nie dozwolono]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: Autokomendy *ReadPre zrobi�y plik nieodczytywalnym"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: Autokomendy *ReadPre nie mog� zmienia� bie��cego bufora"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: Wczytywanie ze stdin...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: Nie mo�na otworzy� pliku utworzonego przez przemian�!"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[socket]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr "[specjalny znak]"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[brak CR]'"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[d�ugie wiersze rozdzielane]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[NIE przemienione]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[przemienione]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[B��D W PRZEMIANIE w linii %<PRId64>]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[NIEDOZWOLONY BAJT w wierszu %<PRId64>]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[B��DY W ODCZYCIE]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "Nie mog� znale�� pliku tymczasowego w celu przemiany"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "Nieudana przemiana z 'charconvert'"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "nie mog� odczyta� wyj�cia z 'charconvert'"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: Brak pasuj�cych autokomend dla bufora acwrite"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr ""
-"E203: Autokomendy skasowa�y lub wy�adowa�y bufor przeznaczony do zapisu"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autokomenda zmieni�a liczb� wierszy w nieoczekiwany spos�b"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "nie jest plikiem lub zapisywalnym przyrz�dem"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "jest tylko do odczytu (wymu� poprzez !)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: Nie mog� zapisa� do pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: B��d podczas zamykania pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: Nie mog� odczyta� pliku w celu zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: Nie mog� stworzy� pliku zabezpieczenia (wymu� przez !)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: Nie mog� zrobi� pliku zabezpieczenia (wymu� przez !)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: Nie mog� znale�� pliku tymczasowego do zapisania"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: Nie mog� przemieni� (u�yj ! by zapisa� bez przemiany)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: Nie mog� otworzy� pod��czonego pliku do zapisu"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: Nie mog� otworzy� pliku do zapisu"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync nie powi�d� si�"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: Zamkni�cie si� nie powiod�o"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: B��d zapisu, przemiana si� nie powiod�a (opr�nij 'fenc' aby wymusi�)"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: B��d zapisu, przemiana si� nie powiod�a w wierszu %<PRId64> (opr�nij "
-"'fenc' by wymusi�)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: b��d w zapisie (mo�e system plik�w jest przepe�niony?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " B��D W PRZEMIANIE"
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr " w wierszu %<PRId64>;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[Urz�dzenie]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[Nowy]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " do��czono"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " zapisano"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode: nie mog� zapisa� oryginalnego pliku"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patchmode: nie mog� stworzy� pustego oryginalnego pliku"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: Nie mog� skasowa� pliku zabezpieczenia"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"OSTRZE�ENIE: Oryginalny plik mo�e zosta� utracony lub uszkodzony\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "nie wychod� edytora, dop�ki plik nie zosta� poprawnie zapisany!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[format dos-a]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[format maca]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[format unixa]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 wiersz, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> wierszy, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 znak"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> znak�w"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[Niekompletny ostatni wiersz]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "OSTRZE�ENIE: Plik zmieni� si� od czasu ostatniego odczytu!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "Czy naprawd� chcesz go zapisa�"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: B��d zapisywania do \"%s\""
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: B��d w trakcie zamykania \"%s\""
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: B��d odczytu \"%s\""
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: Autokomenda FileChangedShell skasowa�a bufor"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: Plik \"%s\" nie jest d�u�ej dost�pny"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr ""
-"W12: OSTRZE�ENIE: Plik \"%s\" zmieni� si� od czasu rozpocz�cia edycji, bufor "
-"w Vimie r�wnie� zosta� zmieniony"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "Zobacz \":help W12\"  dla dalszych informacji."
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: OSTRZE�ENIE: Plik \"%s\" zmieni� si� od czasu rozpocz�cia edycji"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "Zobacz \":help W11\"  dla dalszych informacji."
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr ""
-"W16: OSTRZE�ENIE: Tryb pliku \"%s\" zmieni� si� od czasu rozpocz�cia edycji"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "Zobacz \":help W16\"  dla dalszych informacji."
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: OSTRZE�ENIE: Plik \"%s\" zosta� stworzony po rozpocz�ciu edycji"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "OSTRZE�ENIE"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"&OK\n"
-"&Za�aduj Plik"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: Nie mo�na przygotowa� prze�adowania \"%s\""
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: Nie mo�na prze�adowa� \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--Skasowano--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "auto-usuwanie autokomendy: %s <buffer=%d>"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: Nie ma takiej grupy: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: Niedopuszczalny znak po *: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: Nie ma takiego wydarzenia: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: Nie ma takiej grupy lub wydarzenia: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Autokomendy ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: niew�a�ciwy numer bufora"
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: Nie mo�na wykonywa� autokomend dla wydarze� ALL"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "Brak pasuj�cych autokomend"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: zbyt g��bokie zagnie�d�enie autokomend"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Autokomend dla \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "Wykonuj� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "autokomenda %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: Brak {."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: Brak }."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: Nie znaleziono zwini�cia"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Nie mo�na utworzy� zwini�cia przy bie��cej 'foldmethod'"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Nie mo�na skasowa� zwini�cia przy bie��cej 'foldmethod'"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld wierszy zwini�to "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: Dodaj do bufora odczytu"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: rekursywne przyporz�dkowanie"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: istnieje ju� globalny skr�t dla %s"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: istnieje ju� globalne przyporz�dkowanie dla %s"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: istnieje ju� skr�t dla %s"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: istnieje ju� przyporz�dkowanie dla %s"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "Nie znaleziono skr�tu"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "Nie znaleziono przyporz�dkowania"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: Niedopuszczalny tryb"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--Brak wierszy w buforze--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: Przerwanie komendy"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: wymagany argument"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: po \\ powinno by� /, ? lub &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: Niedozwolone w oknie wiersza polece�; <CR> wykonuje, CTRL-C opuszcza"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: Komenda niedozwolona z exrc/vimrc w bie��cym szukaniu katalogu lub "
-"znacznika"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: Brak :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: Brak :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: Brak :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: Brak :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile bez :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor bez :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Plik istnieje (wymu� poprzez !)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: Komenda nie powiod�a si�"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: B��d wewn�trzny"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "Przerwane"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: Niew�a�ciwy adres"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: Niew�a�ciwy argument"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Niew�a�ciwy argument: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Niew�a�ciwe wyra�enie: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: Niew�a�ciwy zakres"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: Niew�a�ciwa komenda"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" jest katalogiem"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: Niew�a�ciwa wielko�� przewini�cia"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Wywo�anie z biblioteki nie powiod�o si� dla \"%s()\""
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Zak�adka ma niew�a�ciwy numer wiersza"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: Zak�adka nienastawiona"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Nie mog� wykona� zmian, 'modifiable' jest wy��czone"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Zbyt g��bokie zagnie�d�enie skrypt�w"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: Brak pliku zamiany"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: Nie ma takiego skr�tu"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: Niedozwolone !"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI nie mo�e by� u�yte: Nie w��czono podczas kompilacji"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Brak takiej nazwy grupy pod�wietlania: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: Nie wprowadzono jeszcze �adnego tekstu"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: Nie ma poprzedniego wiersza polece�"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: Nie ma takiego przyporz�dkowania"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: Brak dopasowa�"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Brak dopasowa�: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: Brak nazwy pliku"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Brak poprzedniego podstawieniowego wyra�enia regularnego"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: Brak poprzedniej komendy"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: Brak poprzedniego wyra�enia regularnego"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: Zakres niedozwolony"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: Brak miejsca"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Nie mog� stworzy� pliku %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: Nie mog� pobra� nazwy pliku tymczasowego"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Nie mog� otworzy� pliku %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Nie mog� odczyta� pliku %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Nie zapisano od ostatniej zmiany (wymu� przez !)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[Brak zapisu od czasu ostatniej zmiany]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: Zerowy argument"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: Oczekuj� liczby"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Nie mog� otworzy� pliku b��d�w %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: Pami�� wyczerpana!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "Nie znaleziono wzorca"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Nie znaleziono wzorca: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: Argument musi by� dodatni"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Nie mo�na przej�� do poprzedniego katalogu"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: Brak B��d�w"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: Brak listy lokacji"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: Popsuty ci�g wzorca"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: Zepsuty program wyra�e� regularnych"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: opcja 'readonly' jest ustawiona (wymu� poprzez !)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Nie mog� zmieni� zmiennej tylko do odczytu \"%s\""
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Nie mog� ustawi� zmiennej w piaskownicy: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: B��d w trakcie czytania pliku b��d�w"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Niedozwolone w piaskownicy"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: Niedozwolone w tym miejscu"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Ustawianie trybu ekranu niewspomagane"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: Niew�a�ciwa wielko�� przewini�cia"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: opcja 'shell' jest pusta"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Nie mog�em wczyta� danych znaku!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: B��d podczas zamykania pliku wymiany"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: stos znacznik�w jest pusty"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: Komenda jest zbyt skomplikowana"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: Zbyt d�uga nazwa"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: Zbyt wiele ["
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: Zbyt wiele nazw plik�w"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: Nadst�pne znaczki"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: Nieznana zak�adka"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Nie mog� rozwin�� znak�w wieloznacznych"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' nie mo�e by� mniejsze ni� 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' nie mo�e by� mniejsze ni� 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: B��d w trakcie zapisu"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "Zerowy licznik"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: U�ycie <SID> poza kontekstem skryptu"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: B��d wewn�trzny: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: Wzorzec u�ywa wi�cej pami�ci ni� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: pusty bufor"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Niew�a�ciwy wzorzec wyszukiwania lub delimiter"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Plik jest za�adowany w innym buforze"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: Nie ustawiono opcji '%s'"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: Niew�a�ciwa nazwa rejestru"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "szukanie dobi�o G�RY; kontynuacja od KO�CA"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "szukanie dobi�o KO�CA; kontynuacja od G�RY"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: Brak dwukropka"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: Niedozwolona cz��"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: oczekiwa�em na cyfr�"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "Strona %d"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "Brak tekstu do drukowania"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Drukuj� stron� %d (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " Kopia %d z %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "Wydrukowano: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "Drukowanie odwo�ane"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Nie mo�na zapisa� do wyj�ciowego pliku PostScriptu"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: Nie mog� otworzy� pliku \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: Nie mo�na odczyta� pliku zasob�w PostScriptu \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: plik \"%s\" nie jest plikiem zasob�w PostScriptu"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: plik \"%s\" nie jest wspieranym plikiem zasob�w PostScriptu"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" nieprawid�owa wersja pliku zasob�w"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Niekompatybilne kodowanie wielobajtowe i zestaw znak�w."
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset nie mo�e by� pusty przy kodowaniu wielobajtowym."
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: Nie okre�lono domy�lnej czcionki dla drukowania wielobajtowego."
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: Nie mo�na otworzy� pliku PostScript do wyj�cia"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: Nie mog� otworzy� pliku \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"prolog.ps\""
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"cidfont.ps\""
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Nie mo�na znale�� pliku zasob�w PostScriptu \"%s.ps\""
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: Nie mo�na przekonwertowa� by drukowa� kodowanie \"%s\""
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "Przesy�am do drukarki..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: Drukowanie pliku PostScript nie powiod�o si�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "Zadanie drukowanie przes�ane."
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "Dodaj now� baz� danych"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "Zapytane o wzorzec"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "Poka� ten komunikat"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "Zabij po��czenie"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "Pon�w wszelkie po��czenia"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "Poka� po��czenia"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: Zastosowanie: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "Ta komenda cscope nie wspomaga podzielenia okna.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: Zastosowanie: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: nie znaleziono znacznika"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) b��d: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s nie jest katalogiem lub poprawn� baz� danych cscope"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "Dodano baz� danych cscope %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: b��d odczytu po��czenia z cscope %<PRId64>"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: nieznany typ szukania cscope"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: Nie mog�em stworzy� potoku do cscope"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: Nie mog�em utworzy� rozwidlenia dla cscope"
-
-#: ../if_cscope.c:849
-msgid "cs_create_connection setpgid failed"
-msgstr "nie powiod�o si� setpgid cs_create_connection"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "wykonanie cs_create_connection nie powiod�o si�"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen dla to_fp nie powiod�o si�"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen dla fr_fp nie powiod�o si�"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: Nie mog�em stworzy� procesu cscope"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: brak po��czenia z cscope"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: nieprawid�owa flaga cscopequickfix %c dla %c"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: brak dopasowa� dla zapytania cscope %s o %s"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "komendy cscope:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (U�ycie: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: znajd� funkcje wywo�uj�ce t� funkcj�\n"
-"       d: znajd� funkcje wywo�ywane przez t� funkcj�\n"
-"       e: znajd� ten wzorzec egrep\n"
-"       f: znajd� ten plik\n"
-"       g: znajd� t� definicj�\n"
-"       i: znajd� pliki w��czaj�ce (#include) ten plik\n"
-"       s: znajd� ten symbol C\n"
-"       t: znajd� ten �a�cuch znak�w\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: nie dodano duplikatu bazy danych cscope"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: nie ma po��czenia %s z cscope"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "po��czenie %s z cscope zosta�o zamkni�te"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: b��d krytyczny w cs_manage_matches"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Znacznik cscope: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   wiersz"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "nazwa pliku  / kontekst / wiersz\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: B��d cscope: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "Wszystkie bazy danych cscope prze�adowano"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "brak po��cze� z cscope\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid   nazwa bazy danych               przedsionek tropu\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "Nieznany argument opcji"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "Zbyt wiele argument�w"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "Brak argumentu po"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "�miecie po argumencie opcji"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr ""
-"Zbyt wiele argument�w \"+komenda\", \"-c komenda\" lub \"--cmd komenda\""
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "Niew�a�ciwy argument dla"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d plik�w do edycji\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "Pr�ba ponownego otworzenia pliku skryptu: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "Nie mog� otworzy� do odczytu: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "Nie mog� otworzy� dla wyj�cia skryptu: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: OSTRZE�ENIE: Wyj�cie nie jest terminalem\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: OSTRZE�ENIE: Wej�cie nie pochodzi z terminala\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "linia polece� pre-vimrc"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: Nie mog� czyta� z \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"Dalsze informacje poprzez: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[plik ..]       edytuj zadane pliki"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               czytaj tekst ze stdin"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t znacznik   edytuj plik, w kt�rym dany znacznik jest zdefiniowany"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  edytuj plik, zawieraj�cy pierwszy b��d"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"u�ycie:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [argumenty]"
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   lub:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"Argumenty:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tTylko nazwy plik�w po tym"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tNie rozwijaj znak�w specjalnych"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tTryb vi (jak \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tTryb ex (jak \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\tUsprawniony tryb Ex"
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tCichy tryb (t�a) (tylko dla \"ex\")"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tTryb r�nic (jak \"vimdiff\")"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tTryb �atwy (jak \"evim\", bez tryb�w)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tTryb wy��cznie do odczytu (jak \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tTryb ograniczenia (jak \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tModyfikacje (zapisywanie plik�w) niedozwolone"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tZakaz modyfikacji tekstu"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\tTryb binarny"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tTryb lisp"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tB�d� zgodny z Vi: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tB�d� niezupe�nie zgodny z Vi: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr "-V[N][nazwap]\t\tGadatliwy [poziom N] [zapisuj wiadomo�ci do nazwap]"
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tTryb odpluskwiania"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tZamiast pliku wymiany, u�ywaj tylko pami�ci"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tWylicz pliki wymiany i zako�cz"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (z nazw� pliku)\tOdtw�rz za�aman� sesj�"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tTo�same z -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\trozpocznij w trybie arabskim"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\trozpocznij w trybie hebrajskim"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\trozpocznij w trybie farsi"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\tUstaw typ terminala na <terminal>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tU�yj <vimrc> zamiast jakiegokolwiek .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tNie �aduj skrypt�w wtyczek"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tOtw�rz N kart (domy�lnie: po jednej dla ka�dego pliku)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tOtw�rz N okien (domy�lnie: po jednym dla ka�dego pliku)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\ttak samo jak -o tylko dziel okno pionowo"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tZacznij na ko�cu pliku"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\tZacznij w wierszu <lnum>"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr ""
-"-cmd <command>\t\tWykonaj komend� <command> przed za�adowaniem "
-"jakiegokolwiek pliku vimrc"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr ""
-"-c <command>\t\tWykonaj komend� <command> po za�adowaniu pierwszego pliku"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <sesja>\t\tWczytaj plik <sesja> po za�adowaniu pierwszego pliku"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\tWczytuj komendy trybu normalnego z pliku <scriptin>"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr ""
-"-w <scriptout>\tDo��cz wszystkie wprowadzane komendy do pliku <scriptout>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr ""
-"-W <scriptout>\tZapisuj wszystkie wprowadzane komendy do pliku <scriptout>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-"--startuptime <plik>\n"
-"Zapisz wiadomo�ci o d�ugo�ci startu do <plik>"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tU�ywaj <viminfo> zamiast .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  lub  --help\twy�wietl Pomoc (czyli t� wiadomo��) i zako�cz"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\twy�wietl informacj� o wersji i zako�cz"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "Brak zak�adek"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: �adna zak�adka nie pasuje do \"%s\""
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"zak�. wiersz kol plik/tekst"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" skok wiersz kol plik/tekst"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"zmie� wrsz. kol tekst"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Zak�adki w plikach:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Lista odniesie� (pocz�wszy od najnowszych):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Historia zak�adek w plikach (od najnowszych po najstarsze):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "Brak '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: blok nie by� zablokowany"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: B��d w trakcie czytania pliku wymiany"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: B��d odczytu pliku wymiany"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: B��d szukania w pliku wymiany"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: B��d zapisu w pliku wymiany"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Plik wymiany ju� istnieje (atak symlink?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: Nie otrzyma�em bloku nr 0?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: Nie otrzyma�em bloku nr 1?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: Nie otrzyma�em bloku nr 2?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: Ojej, zgubi�em plik wymiany!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: Nie mog�em zmieni� nazwy pliku wymiany"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr ""
-"E303: Nie mog� otworzy� pliku wymiany dla \"%s\"; odtworzenie niemo�liwe"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block(): Nie otrzyma�em bloku 0??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: Nie znaleziono pliku wymiany dla %s"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "Wprowad� numer pliku wymiany, kt�rego u�y� (0 by wyj��): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: Nie mog� otworzy� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "Nie mog� odczyta� bloku 0 z "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"Mo�e nie wykonano zmian albo Vim nie zaktualizowa� pliku wymiany."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " nie mo�e by� stosowany z t� wersj� Vima.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "U�yj Vima w wersji 3.0.\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s nie wygl�da na plik wymiany Vima"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " nie mo�e by� stosowany na tym komputerze.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "Ten plik zosta� stworzony na "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"lub plik zosta� uszkodzony."
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-" zosta� uszkodzony (wielko�� strony jest mniejsza ni� najmniejsza warto��).\n"
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "U�ywam pliku wymiany \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "Oryginalny plik \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: OSTRZE�ENIE: Oryginalny plik m�g� by� zmieniony"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: Nie mog� odczyta� bloku 1 z %s"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???BRAKUJE WIELU WIERSZY"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???LICZNIK WIERSZY NIEZGODNY"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???PUSTY BLOK"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???BRAKUJE WIERSZY"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: Niew�a�ciwe ID bloku 1 (mo�e %s nie jest plikiem .swp?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???BRAK BLOKU"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? od tego miejsca po ???KONIEC wiersze mog� by� pomieszane"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? od tego miejsca po ???KONIEC wiersze mog� by� w�o�one/skasowane"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???KONIEC"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: Przerwanie odtwarzania"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: Wykryto b��dy podczas odtwarzania; od kt�rych wierszy zacz�� ???"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "Zobacz \":help E312\" dla dalszych informacji."
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr ""
-"Odtwarzanie zako�czono. Powiniene� sprawdzi� czy wszystko jest w porz�dku."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(Mo�esz chcie� zapisa� ten plik pod inn� nazw�\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "i wykona� diff z oryginalnym plikiem aby sprawdzi� zmiany)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "Odzyskiwanie zako�czone. Zawarto�� bufora jest r�wna zawarto�ci pliku."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"Mo�esz teraz chcie� usun�� plik .swp.\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "Znalezione pliki wymiany:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   W bie��cym katalogu:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   U�ywam podanej nazwy:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   W katalogu "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "     -- �aden --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "   posiadany przez: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "   data: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              data: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [po Vimie wersja 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [nie wygl�da na plik wymiany Vima]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "       nazwa pliku: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"         zmieniono: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "TAK"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "nie"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"        u�ytkownik: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "   nazwa hosta: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"      nazwa hosta: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"        ID procesu: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (dalej dzia�a)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"     [nie do u�ytku na tym komputerze]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "        [nieodczytywalny]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "            [nieotwieralny]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: Nie mog� zabezpieczy�, bo brak pliku wymiany"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "Plik zabezpieczono"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: Nieudane zabezpieczenie"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: niew�a�ciwy lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: nie znaleziono wiersza %<PRId64>"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: niepoprawne id wska�nika bloku 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx powinien by� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: Zaktualizowano zbyt wiele blok�w?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: niepoprawne id wska�nika bloku 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "blok nr 1 skasowany?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Nie mog� znale�� wiersza %<PRId64>"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: niepoprawne id bloku odniesienia"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count wynosi zero"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: numer wiersza poza zakresem: %<PRId64> jest poza ko�cem"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: liczba wierszy niepoprawna w bloku %<PRId64>"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "Wielko�� stosu wzrasta"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: niepoprawne id bloku odniesienia 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: P�tla dowi�za� dla \"%s\""
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: UWAGA"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"Znalaz�em plik wymiany o nazwie \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "Podczas otwierania pliku \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      NOWSZE od pliku wymiany!\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) Pewnie inny program obrabia ten sam plik.\n"
-"    Je�li tak, b�d� ostro�ny, aby nie sko�czy� z dwoma\n"
-"    r�nymi wersjami tego samego pliku po zmianach.\n"
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Zako�cz lub ostro�nie kontynuuj.\n"
-
-#: ../memline.c:3246
-msgid "(2) An edit session for this file crashed.\n"
-msgstr "(2) Sesja edycji dla pliku za�ama�a si�.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Je�li tak, to u�yj \":recover\" lub \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    aby odzyska� zmiany (zobacz \":help recovery)\").\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    Je�li ju� to zrobi�e�, usu� plik wymiany \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    aby unikn�� tej wiadomo�ci.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "Plik wymiany \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" ju� istnieje!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - UWAGA"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "Plik wymiany ju� istnieje!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&Otw�rz Read-Only\n"
-"&Edytuj pomimo\n"
-"O&dtw�rz\n"
-"&Zako�cz\n"
-"&Porzu�"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&Otw�rz Read-Only\n"
-"&Edytuj pomimo\n"
-"O&dtw�rz\n"
-"&Usu�\n"
-"&Zako�cz\n"
-"&Porzu�"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: Znaleziono zbyt wiele plik�w wymiany"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Brak pami�ci!  (rezerwacja %<PRIu64> bajt�w)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: Cz�� tropu punktu menu nie okre�la podmenu"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: Menu istnieje tylko w innym trybie"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: Nie ma menu \"%s\""
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: Pusta nazwa menu"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: Trop menu nie mo�e prowadzi� do podmenu"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: Nie wolno dodawa� punkt�w menu wprost do paska menu"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: Separator nie mo�e by� cz�ci� tropu menu"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- Menu ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: Trop menu musi prowadzi� do punktu menu"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: Nie znaleziono menu: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Menu nie jest zdefiniowane dla trybu %s"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: Trop menu musi prowadzi� do podmenu"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: Nie znaleziono menu - sprawd� nazwy menu"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "Wykryto b��d podczas przetwarzania %s:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "wiersz %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: Niew�a�ciwa nazwa rejestru: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Opiekun komunikat�w: Miko�aj Machowski <mikmach@wp.pl>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "Przerwanie: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "Naci�nij ENTER lub wprowad� komend� aby kontynuowa�"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s wiersz %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- Wi�cej --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ekran/strona/wiersz w d�, b/u/k: do g�ry, q: zako�cz"
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "Pytanie"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"&Tak\n"
-"&Nie"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Tak\n"
-"&Nie\n"
-"&Zako�cz"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"&Tak\n"
-"&Nie\n"
-"Zapisz &wszystkie\n"
-"&Odrzu� wszystkie\n"
-"&Zako�cz"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: Za ma�o argument�w dla printf()"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Spodziewany argument Zmiennoprzecinkowy w printf()"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: Za du�o argument�w dla printf()"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: OSTRZE�ENIE: Zmiany w pliku tylko do odczytu"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "Wpisz numer i <Enter> lub wybierz mysz� (pusta warto�� anuluje): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "Wpisz numer i <Enter> (puste anuluje): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "1 wiersz wi�cej"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "1 wiersz mniej"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "dodano %<PRId64> wierszy"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "usuni�to %<PRId64> wierszy"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (Przerwane)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "Biiip!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "Wywo�uj� pow�ok� do wykonania: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: Brak identyfikatora pod kursorem"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' jest pusta"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "OSTRZE�ENIE: terminal nie wykonuje pod�wietlania"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: Brak ci�gu pod kursorem"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: Nie mog� skasowa� zwini�cia z bie��c� 'foldmethod'"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: lista zmian (changelist) jest pusta"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: Na pocz�tku listy zmian"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: Na ko�cu listy zmian"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "wprowad�  :quit<Enter>    zako�czenie programu"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 wiersz %sed 1 raz"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 wiersz %sed %d razy"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> wierszy %sed 1 raz"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> wierszy %sed %d razy"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> wierszy do wci�cia... "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "1 wiersz wci�ty "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> wierszy wci�tych "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: Brak poprzednio u�ytego rejestru"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "nie mog� skopiowa�, mimo to kasuj�"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "1 wiersz zmieniono"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> wierszy zmieniono"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "skopiowano blok 1 wiersza"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "1 wiersz skopiowano"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> wierszy skopiowanych"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> wierszy skopiowanych"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: Pusty rejestr %s"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- Rejestry ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "Niedozwolona nazwa rejestru"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# Rejestry:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Nieznany typ rejestru %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Kolumn; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S��w; "
-"%<PRId64> z %<PRId64> Bajt�w"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Wybrano %s%<PRId64> z %<PRId64> Wierszy; %<PRId64> z %<PRId64> S��w; "
-"%<PRId64> z %<PRId64> Znak�w; %<PRId64> z %<PRId64> Bajt�w"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S�owo %<PRId64> z %<PRId64>; Bajt "
-"%<PRId64> z %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s z %s; Wiersz %<PRId64> z %<PRId64>; S�owo %<PRId64> z %<PRId64>; Znak "
-"%<PRId64> z %<PRId64>; Bajt %<PRId64> z %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> dla BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Strona %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "Dzi�ki za lot Vimem"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: Nieznana opcja"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: Opcja nie jest wspomagana"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: Niedozwolone w modeline"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr "E846: Kod klucza nie jest ustawiony"
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: Po = wymagany jest numer"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Nie znaleziono w termcap"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: Niedozwolony znak <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Nie mog� ustawi� 'term' na pusty ci�g"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' i 'patchmode' s� to�same"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: Konflikty warto�ci 'listchars'"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: Konflikty warto�ci 'fillchars'"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: Brak dwukropka"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: Ci�g o zerowej d�ugo�ci"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: Brak numeru po <%s>"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: Brak przecinka"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: Musi okre�la� warto�� '"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: zawiera niewy�wietlalny lub szeroki znak"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: Niedozwolony znak po <%c>"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: wymagany przecinek"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' musi by� pusty lub zawiera� %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: Niedomkni�ty ci�g wyra�e�"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: zbyt wiele element�w"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: niezbalansowane grupy"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: okno podgl�du ju� istnieje"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabski wymaga UTF-8, zr�b ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: Potrzebuj� przynajmniej %d wierszy"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: Potrzebuj� przynajmniej %d kolumn"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: Nieznana opcja: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: Wymagana Liczba: &%s = '%s'"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- Kody terminala ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- Globalne warto�ci opcji ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- Lokalne warto�ci opcji ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- Opcje ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: B��D get_varp"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': Brak pasuj�cego znaku dla %s"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': Dodatkowe znaki po �redniku: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Nie mog� wykona� pow�oki "
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"pow�oka zwr�ci�a "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"Nie mog� uzyska� kontekstu bezpiecze�stwa dla"
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"Nie mo�na uzyska� kontekstu bezpiecze�stwa dla"
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Nie mog� znale�� pliku \"%s\" w tropie"
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: Zbyt wiele %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: Nieoczekiwane %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: Brak ] w ci�gu formatuj�cym"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: Niewspomagane %%%c w ci�gu formatuj�cym"
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: Niepoprawne %%%c w prefiksie ci�gu formatuj�cego"
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: Niepoprawne %%%c w ci�gu formatuj�cym"
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' nie zawiera wzorca"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: Pusta nazwa katalogu lub jej brak"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: Nie ma wi�cej element�w"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d z %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (wiersz skasowany)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Na dole stosu quickfix"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: Na g�rze stosu quickfix"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "lista b��d�w %d z %d; %d b��d�w"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: Nie mog� zapisa�, opcja 'buftype' jest ustawiona"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: Brak nazwy pliku lub niew�a�ciwa �cie�ka"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "Nie mog� otworzy� pliku \"%s\""
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: Bufor nie jest za�adowany"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: Oczekiwa�em na �a�cuch lub list�"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: Niew�a�ciwy element w %s%%[]"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: Brak ] po %s["
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: Niesparowany %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: Niesparowany %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: Niesparowany %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( jest niedozwolone w tym miejscu"
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 i podobne s� niedozwolone w tym miejscu"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: Brak ] po %s%%["
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: Pusty %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: Zbyt d�ugi wzorzec"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: Zbyt wiele \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: Zbyt wiele %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: Niesparowany \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: niedozwolony znak po %s@"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: Zbyt wiele z�o�onych %s{...}"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Zagnie�d�one %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Zagnie�d�one %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: Niedozwolone u�ycie \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c po niczym"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: Niew�a�ciwe odwo�anie wsteczne"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: niedopuszczalny znak po \\z"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: Niedozwolony znak po %s%%[dxouU]"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: Niedozwolony znak po %s%%"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: B��d sk�adni w %s{...}"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "Zewn�trzne poddopasowania:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E:864: \\%#= mo�e by� tylko przed 0, 1 lub 2. Zostanie u�yty silnik "
-"automatyczny"
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (NFA) przedwczesny koniec wyra�enia regularnego"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (wyra�enie regularne NFA) Niepoprawnie umieszczone %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) Nieznany operator '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) Nieznany operator '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) Nieznany operator '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-"E870: (wyra�enie regularne NFA) B��d przy odczytywaniu limit�w powt�rze�"
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-"E871: (wyra�enie regularne NFA) wielokrotne nie mo�e by� po wielokrotnym!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (wyra�enie regularne NFA) Zbyt du�o '('"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (wyra�enie regularne NFA) Za du�o \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (wyra�enie regularne NFA) b��d poprawnego zako�czenia"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (NFA) Nie mo�na zdj�� elementu ze stosu!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (wyra�enie regularne NFA) (w trakcie konwersji postfix do NFA), za "
-"wiele stan�w na stosie"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (wyra�enie regularne NFA) Nie ma miejsca na ca�e NFA "
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"Nie mo�na otworzy� do zapisu tymczasowego pliku, pokazuj� na stderr... "
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) NIE MO�NA OTWORZY� %s !"
-
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "Nie mo�na otworzy� do zapisu tymczasowego pliku logowania"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " V-ZAMIANA"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " ZAMIANA"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " NEGATYW"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " WPROWADZANIE"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (wprowadzanie)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (zamiana)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (v-zamiana)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " Hebrajski"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " Arabski"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (j�zyk)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (wklejanie)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " WIZUALNY"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " WIZUALNY LINIOWY"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " WIZUALNY BLOKOWY"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ZAZNACZANIE"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ZAZNACZANIE LINIOWE"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ZAZNACZANIE BLOKOWE"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "zapis"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: Niew�a�ciwy ci�g do szukania: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: szukanie dobi�o G�RY bez znalezienia: %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: szukanie dobi�o KO�CA bez znalezienia : %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: Oczekuj� '?' lub '/' po ';'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (zawiera poprzednio wymienione dopasowanie)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- Zawarte pliki "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "nie znaleziono"
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "w tropie ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (Ju� wymienione)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  NIE ZNALEZIONO"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "Przegl�d w��czonego pliku: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "Przeszukiwanie w��czonego pliku %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: Wzorzec pasuje w bie��cym wierszu"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "Wszelkie w��czane pliki odnaleziono"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "Brak w��czanych plik�w"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: Nie znalaz�em definicji"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: Nie znalaz�em wzorca"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Podstawienie "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Ostatni %sWyszukiwany wzorzec:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: Nieprawid�owy format pliku sprawdzania pisowni"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: Obci�ty plik sprawdzania pisowni"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "Zb�dny tekst w %s wiersz %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "Za d�uga nazwa afiksu w %s wiersz %d: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: B��d formatu w pliku afiks�w FOL, LOW lub UPP"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Znak w FOL, LOW lub UPP jest poza zasi�giem"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "Kompresja drzewa s��w..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Sprawdzanie pisowni nie jest w��czone"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"Ostrze�enie: Nie mog� znale�� listy s��w \"%s.%s.spl\" lub \"%s.ascii.spl\""
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "Odczytuj� plik sprawdzania pisowni \"%s\""
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: To nie wygl�da na plik sprawdzania pisowni"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: Stary plik sprawdzania pisowni, wymagane uaktualnienie"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Plik sprawdzania pisowni dla nowszej wersji Vima"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: Niewspierana sekcja w pliku sprawdzania pisowni"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "Ostrze�enie: region %s nie jest wspierany"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "Czytam plik afiks�w %s ..."
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "Konwersja nie powiod�a si� dla wyrazu w %s wierszu %d: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "Konwersja w %s nie jest wspierana: od %s do %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "Nieprawid�owa warto�� FLAG w %s wierz %d: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "FLAG po u�yciu flag w %s wiersz %d: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"Definiowanie COMPOUNDFORBIDFLAG po PFX mo�e skutkowa� z�ym wynikiem w %s "
-"wiersz %d"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"Definiowanie COMPOUNDPERMITFLAG po PFX mo�e skutkowa� z�ym wynikiem w %s "
-"wiersz %d"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDRULES w %s wiersz %d: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDWORDMAX w %s wiersz %d: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDMIM w %s wiersz %d: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "Z�a warto�� COMPOUNDSYLMAX w %s wiersz %d: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "Z�a warto�� CHECKCOMPOUNDPATTERN w %s wiersz %d: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr "R�ne flagi z�o�e� w kontynuowanym bloku afiksu w %s wiersz %d: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "Powt�rzony afiks w %s wiersz %d: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"Afiks u�yty tak�e dla BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST w "
-"%s wiersz %d: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "Oczekiwano Y lub N w %s wierszu %d: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "B��dny warunek w %s wiersz %d: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "Oczekiwano ilo�ci REP(SAL) w %s wierszu %d"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "Oczekiwano ilo�ci MAP w %s wierszu %d"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "Powt�rzony znak w MAP w %s wierszu %d"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "Nieznany lub powt�rzony element w %s wierszu %d: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "Brak wiersza FOL/LOW/UPP w %s"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "COMPOUNDSYLMAX u�yty bez SYLLABLE"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "Zbyt wiele op�nionych prefiks�w"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "Zbyt wiele flag z�o�e�"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "Zbyt wiele op�nionych prefiks�w i/lub flag z�o�e�"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "Brak wiersza SOFO%s wiersz w %s"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "Wiersze SAL i SOFO w %s"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "Flaga nie jest liczb� w %s wiersz %d: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "Nieprawid�owa flaga w %s wiersz %d: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "Warto�� %s r�ni si� od tej u�ytej w innym pliku .aff"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "Czytam plik s�ownika %s ..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: Brak ilo�ci s��w w %s"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "wiersz %6d, s�owo %6d - %s"
-
-# c-format
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "Powt�rzony wyraz w %s wierszu %d: %s"
-
-# c-format
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "Pierwszy powt�rzony wyraz w %s wiersz %d: %s"
-
-# c-format
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d powt�rzony(ch) wyraz(�w) w %s"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "Zignorowa�em %d s��w ze znakami nie ASCII w %s"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "Odczytuj� plik wyraz�w %s ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Zignorowano powt�rzony wiersz /encoding= w %s wierszu %d: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "Zignorowano wiersz /encoding= po wyrazie w %s wierszu %d: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Powt�rzony wiersz /regions= zignorowano w %s wierszu %d: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "Za du�o region�w w %s wiersz %d: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "wiersz / zignorowano w %s wierszu %d: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "Nieprawid�owy numer regionu w %s wierszu %d: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "Nieznane flagi w %s wiersz %d: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "Zignorowa�em %d s��w ze znakami nie ASCII"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "Skompresowano %d z %d w�z��w; pozostaje %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "Odczytuj� plik sprawdzania pisowni..."
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "Wykonuj� kompresj� d�wi�kow�..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Liczba s��w po kompresji d�wi�kowej: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "Ca�kowita liczba s��w: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "Zapisuj� plik sugestii %s ..."
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "Oczekiwane zu�ycie pami�ci: %d bajt�w"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: Nazwa pliku wynikowego nie mo�e by� nazw� regionu"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: Wspieram tylko 8 region�w"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: Nieprawid�owy region w %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "Ostrze�enie: okre�lono zar�wno z�o�enia jak i NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "Zapisuj� plik sprawdzania pisowni %s ..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "Zrobione!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' nie posiada wpis�w %<PRId64>"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "Usuni�to s�owo z %s"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "Dodano s�owo do %s"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: Znaki wyraz�w r�ni� si� mi�dzy plikami sprawdzania pisowni"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "Przykro mi, brak podpowiedzi"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "Przykro mi, tylko %<PRId64> podpowiedzi"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Zmie� \"%.*s\" na:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: Brak poprzednich podmian sprawdzania pisowni"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Nie znaleziono: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Ten plik nie wygl�da na plik .sug: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Stary plik .sug, konieczne jest uaktualnienie: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Plik .sug dla nowszej wersji Vima: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Plik .sug nie pasuje do pliku .spl: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: B��d w czasie odczytu pliku .sug: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: Podwojony znak we wpisie MAP"
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "Brak element�w sk�adni okre�lonych dla tego bufora"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: Niedozwolony argument: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: Nie ma takiego klastra sk�adni: %s"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "synchronizacja komentarzy w stylu C"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "brak synchronizacji"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "pocz�tek synchronizacji"
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " wierszy przed g�rn� lini�"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- Elementy synchronizacji sk�adni ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"synchronizuj� na elementach"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- Elementy sk�adni ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: Nie ma takiego klastra sk�adni: %s"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "minimalnie "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "maksymalnie "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; pasuje "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr "znak�w nowego wiersza"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: argument contains niedozwolony w tym miejscu"
-
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: Niew�a�ciwa warto�� cchar"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: group[t]here niedozwolone w tym miejscu"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: Nie znalaz�em element�w regionu dla %s"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: Wymagana nazwa pliku"
-
-#: ../syntax.c:4221
-msgid "E847: Too many syntax includes"
-msgstr "E847: Za du�o w��czonych sk�adni"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: Brak ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: Brak '=': %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: Za ma�o argument�w: syntax region %s"
-
-#: ../syntax.c:4870
-msgid "E848: Too many syntax clusters"
-msgstr "E848: Za du�o klastr�w sk�adni"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: Brak specyfikacji klastra"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: Brak ogranicznika wzorca: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: �mieci po wzorcu: %s"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: syntax sync: wielokrotnie podane wzorce kontynuacji wiersza"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: Niedozwolone argumenty: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: Brak znaku r�wno�ci: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: Pusty argument: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s jest niedozwolone w tym miejscu"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s musi by� pierwsze w li�cie contains"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: Nieznana nazwa grupy: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: Niew�a�ciwa podkomenda :syntax : %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-"  WSZYTKO    ILO��  PASUJE  NAJWOLN.    �REDNIO   NAZWA              WZORZEC"
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: rekursywna p�tla wczytuj�ca syncolor.vim"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: nie znaleziono grupy pod�wietlania: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: Zbyt ma�o argument�w: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Zbyt wiele argument�w: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: grupa ma ustawienia; zignorowane pod��czenie pod�wietlania"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: nieoczekiwany znak r�wno�ci: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: brak znaku r�wno�ci: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: brak argumentu: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: Niedozwolona warto��: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: Kolor FG nieznany"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: Kolor BG nieznany"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: Nazwa lub liczba koloru nierozpoznana: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: za d�ugi kod terminala: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: Niedozwolony argument: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: Zbyt wiele r�nych atrybut�w podkre�lania w u�yciu"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: Niedrukowalny znak w nazwie grupy"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: nieprawid�owy znak w nazwie grupy"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: Za du�o grup pod�wietlania i sk�adni"
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: na dole stosu znacznik�w"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: na g�rze stosu znacznik�w"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: Nie mo�na przej�� przed pierwszy pasuj�cy znacznik"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: nie znaleziono znacznika: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri rodzaj znacznik"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "plik\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: Pasuje tylko jeden znacznik"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: Nie mo�na przej�� za ostatni pasuj�cy znacznik"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "Plik \"%s\" nie istnieje"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "znacznik %d z %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " lub wi�cej"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  U�ywam znacznika o odmiennej wielko�ci liter!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: Plik \"%s\" nie istnieje"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # DO znacznik  OD wiersza      w pliku/tek�cie"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "Szukam w pliku znacznik�w %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "Ignoruj� d�ugie wiersze w pliku znacznik�w"
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: B��d formatu w pliku znacznik�w \"%s\""
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Przed bajtem %<PRId64>"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: Plik znacznik�w nieuporz�dkowany: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: Brak pliku znacznik�w"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: Nie mog� znale�� wzorca znacznika"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: Nie znalaz�em znacznika - tylko zgaduj�!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "Powt�rzona nazwa pola: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' nieznany. Mo�liwe typy wbudowanych terminali:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "domy�lnie jest '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: Nie mog� otworzy� pliku termcap"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: Nie ma opisu takiego terminala w terminfo"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: Nie ma opisu takiego terminala w termcap"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Brak opisu \"%s\" w termcap"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: wymagana zdolno�� \"cm\" terminala"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- Klawisze terminala ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: B��d podczas wczytywania wej�cia, ko�cz�...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Niespodziewana zmiana ilo�ci linii"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: Nie mog� otworzy� do zapisu pliku undo: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: Uszkodzony plik undo (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "Nie mo�na zapisa� pliku undo w �adnym katalogu z 'undodir'"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "Nie nadpisz� plikiem undo, nie mog� odczyta�: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "Nie nadpisz�, to nie jest plik undo: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "Pomijam zapis pliku undo, nic do cofni�cia"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "Zapisuj� plik undo: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: B��d zapisu w pliku undo: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "Nie wczytuj� pliku undo, inny w�a�ciciel: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "Wczytuj� plik undo: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: Nie mog� otworzy� pliku undo do odczytu: %s"
-
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: To nie jest plik undo: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: Niekompatybilny plik undo: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "Zawarto�� pliku si� zmieni�a, nie mog� u�y� pliku undo"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "Sko�czono wczytywanie pliku undo %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "Ju� w miejscu ostatniej zmiany"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "Ju� w miejscu najnowszej zmiany"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Nie znaleziono numeru cofni�cia %<PRId64>"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: niew�a�ciwe numery wierszy"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "1 wiersz wi�cej"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "wi�cej wierszy"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "1 wiersz mniej"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "mniej wierszy"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "1 zmiana"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "zmiany"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "przed"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "za"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "Nie ma zmian do cofni�cia"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr "liczba zmiany   kiedy              zapisano"
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> sekund temu"
-
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undojoin nie jest dozwolone po undo"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: uszkodzona lista cofania"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: brak wiersza cofania"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"Zadane �aty: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"Ekstra �aty: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Zmieniony przez "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"Skompilowany "
-
-#: ../version.c:649
-msgid "by "
-msgstr "przez "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"Olbrzymia wersja "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "bez GUI."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  Opcje w��czone (+) lub nie (-):\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "       vimrc systemu: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "   vimrc u�ytkownika: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " 2-gi plik vimrc u�ytkownika: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " 3-ci plik vimrc u�ytkownika: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "    exrc u�ytkownika: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  2-gi plik exrc u�ytkownika: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "   odwet dla $VIM-a: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "f-b dla $VIMRUNTIME: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "Kompilacja: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "Konsolidacja: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  KOMPILACJA DEBUG"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi rozbudowany"
-
-#: ../version.c:769
-msgid "version "
-msgstr "wersja "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "Autor: Bram Moolenaar i Inni."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim jest open source i rozprowadzany darmowo"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "Pom� biednym dzieciom w Ugandzie!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "wprowad� :help iccf<Enter>        dla informacji o tym  "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "wprowad� :q<Enter>                zako�czenie programu   "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "wprowad� :help<Enter>  lub  <F1>  pomoc na bie��co       "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "wprowad� :help version7<Enter>    dla informacji o wersji"
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Dzia�am w trybie zgodno�ci z Vi"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "wprowad� :set nocp<Enter>         warto�ci domy�lne Vim-a"
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "wprowad� :help cp-default<Enter>  dla informacji to tym  "
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "Sponsoruj rozw�j Vima!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "Zosta� zarejestrowanym u�ytkownikiem Vima!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "wprowad� :help sponsor<Enter>        dla informacji"
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "wprowad� :help register<Enter>        dla informacji"
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "menu Pomoc->Sponsoruj/Zarejestruj si� dla informacji"
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "Ju� jest tylko jeden widok"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: Nie ma okna podgl�du"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Nie mog� rozdzieli� lewo-g�rnego i prawo-dolnego jednocze�nie"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: Nie mog� przekr�ci�, gdy inne okno jest rozdzielone"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: Nie mog� zamkn�� ostatniego okna"
-
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: Nie mo�na zamkn�� okna autocmd"
-
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: Nie mo�na zamkn�� okna, zosta�oby tylko okno autocmd"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: Inne okno zawiera zmiany"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: Brak nazwy pliku pod kursorem"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() wywo�any z pustym has�em"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish u�ywa b��dnej kolejno�ci bajt�w"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: test sha256 nie powi�d� si�"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: test Blowfisha nie powi�d� si�"
-
-#~ msgid "Patch file"
-#~ msgstr "Plik �ata"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&OK\n"
-#~ "&Zako�cz"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Brak po��czenia z serwerem Vim"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Nie mog� wys�a� do %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Nie mog� czyta� odpowiedzi serwera"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Nie mog� wys�a� do klienta"
-
-#~ msgid "Save As"
-#~ msgstr "Zapisz jako"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Wczytaj skrypt Vima"
-
-#~ msgid "Edit File"
-#~ msgstr "Edytuj Plik"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (NIE ZNALEZIONO)"
-
-#~ msgid "unknown"
-#~ msgstr "nieznany"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Edytuj plik w nowym oknie"
-
-#~ msgid "Append File"
-#~ msgstr "Do��cz plik"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Pozycja okna: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Zapisz przekierowanie"
-
-#~ msgid "Save View"
-#~ msgstr "Zapisz widok"
-
-#~ msgid "Save Session"
-#~ msgstr "Zapisz sesj�"
-
-#~ msgid "Save Setup"
-#~ msgstr "Zapisz ustawienia"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< nie jest dost�pne bez w�a�ciwo�ci +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Brak dwugraf�w w tej wersji"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "jest urz�dzeniem (wy��czonym w opcji 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Wczytywanie ze stdin..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[zakodowane]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Plik zaszyfrowano w nieznany spos�b"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans nie pozwala na zapis niezmodyfikowanych bufor�w"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Cz�ciowy zapis niemo�liwy dla bufor�w NetBeans"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "zapisywanie do urz�dzenia wy��czone w opcji 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Rozdzia� zasob�w zostanie utracony (wymu� przez !)"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<nie mog� otworzy�> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: nie mog� otrzyma� czcionki %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: nie mog� powr�ci� do bie��cego katalogu"
-
-#~ msgid "Pathname:"
-#~ msgstr "Trop:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: nie mog� otrzyma� bie��cego katalogu"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "Zako�cz"
-
-#~ msgid "Vim dialog"
-#~ msgstr "VIM - Dialog"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Scrollbar Widget: Nie mog�em otrzyma� rozmiar�w rysunku na przycisku."
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Nie mog� stworzy� BalloonEval z powiadomieniem i wywo�aniem"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: Nie mog�em stworzy� nowego procesu dla GUI"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: Proces potomny nie m�g� uruchomi� GUI"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Nie mog� odpali� GUI"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Nie mog� czyta� z \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: Nie mo�na uruchomi� GUI, brak prawid�owej czcionki"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: Niew�a�ciwe 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Nieprawid�owa warto�� 'imactivatekey'"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Nie mog� zarezerwowa� koloru %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Brak dopasowania przy kursorze, szukam dalej"
-
-#~ msgid "Input _Methods"
-#~ msgstr "Input _Methods"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Szukaj i Zamie�..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - Szukaj..."
-
-#~ msgid "Find what:"
-#~ msgstr "Znajd�:"
-
-#~ msgid "Replace with:"
-#~ msgstr "Zamie� na:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Dopasuj tylko ca�e wyrazy"
-
-#~ msgid "Match case"
-#~ msgstr "Dopasuj wielko�� liter"
-
-#~ msgid "Direction"
-#~ msgstr "Kierunek"
-
-#~ msgid "Up"
-#~ msgstr "W g�r�"
-
-#~ msgid "Down"
-#~ msgstr "W d�"
-
-#~ msgid "Find Next"
-#~ msgstr "Znajd� nast�pne"
-
-#~ msgid "Replace"
-#~ msgstr "Zamie�"
-
-#~ msgid "Replace All"
-#~ msgstr "Zamie� wszystkie"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: otrzymano ��danie \"die\" od mened�era sesji\n"
-
-#~ msgid "Close"
-#~ msgstr "Zamknij"
-
-#~ msgid "New tab"
-#~ msgstr "Nowa karta"
-
-#~ msgid "Open Tab..."
-#~ msgstr "Otw�rz kart�..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: G��wne okno nieoczekiwanie zniszczone\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Filtr"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Anuluj"
-
-#~ msgid "Directories"
-#~ msgstr "Katalogi"
-
-#~ msgid "Filter"
-#~ msgstr "Filtr"
-
-#~ msgid "&Help"
-#~ msgstr "&Pomoc"
-
-#~ msgid "Files"
-#~ msgstr "Pliki"
-
-#~ msgid "&OK"
-#~ msgstr "&OK"
-
-#~ msgid "Selection"
-#~ msgstr "Wyb�r"
-
-#~ msgid "Find &Next"
-#~ msgstr "Znajd� &nast�pne"
-
-#~ msgid "&Replace"
-#~ msgstr "&Zamie�"
-
-#~ msgid "Replace &All"
-#~ msgstr "Zamie� &wszystko"
-
-#~ msgid "&Undo"
-#~ msgstr "&Cofnij"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Nie mog� znale�� tytu�u okna \"%s\""
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Argument nie jest wspomagany: \"-%s\"; U�ywaj wersji OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Nie mo�na otworzy� okna wewn�trz aplikacji MDI"
-
-#~ msgid "Close tab"
-#~ msgstr "Zamknij kart�"
-
-#~ msgid "Open tab..."
-#~ msgstr "Otw�rz kart�..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Znajd� ci�g (u�yj '\\\\' do szukania '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Szukanie i Zamiana (u�yj '\\\\' do szukania '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "Nie u�ywany"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Katalog\t*.nic\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Nie mog� zarezerwowa� mapy kolor�w, pewne kolory mog� by� "
-#~ "nieprawid�owe"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: Brak czcionek dla nast�puj�cych zestaw�w znak�w w zestawie czcionek "
-#~ "%s:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nazwa zestawu czcionek: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Czcionka '%s' nie posiada znak�w jednolitej szeroko�ci"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: Nazwa zestawu czcionek: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "Font0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "Font1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "Szeroko�� font%<PRId64> nie jest podw�jn� szeroko�ci� font0"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "Szeroko�� font0: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "Szeroko�� font1: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "Nieprawid�owy opis czcionki"
-
-#~ msgid "&Dismiss"
-#~ msgstr "&Anuluj"
-
-#~ msgid "no specific match"
-#~ msgstr "brak okre�lonego dopasowania"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - wyb�r czcionki"
-
-#~ msgid "Name:"
-#~ msgstr "Nazwa:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Poka� wielko�� w punktach"
-
-#~ msgid "Encoding:"
-#~ msgstr "Kodowanie:"
-
-#~ msgid "Font:"
-#~ msgstr "Czcionka:"
-
-#~ msgid "Style:"
-#~ msgstr "Styl:"
-
-#~ msgid "Size:"
-#~ msgstr "Wielko��:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: B��D w automacie Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: b��d stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: nie mog� otworzy� bazy danych cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: nie mog� uzyska� informacji z bazy danych cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Nie mo�na wczyta� biblioteki Lua."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "nie mog� zachowa� informacji cofania"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: Przykro mi, ta komenda jest wy��czona, biblioteka MzScheme nie mo�e "
-#~ "by� za�adowana."
-
-#~ msgid "invalid expression"
-#~ msgstr "niepoprawne wyra�enie"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "wyra�enia wy��czone podczas kompilacji"
-
-#~ msgid "hidden option"
-#~ msgstr "ukryta opcja"
-
-#~ msgid "unknown option"
-#~ msgstr "nieznana opcja"
-
-#~ msgid "window index is out of range"
-#~ msgstr "indeks okna poza zakresem"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "nie mog� otworzy� bufora"
-
-#~ msgid "cannot delete line"
-#~ msgstr "nie mog� skasowa� wiersza"
-
-#~ msgid "cannot replace line"
-#~ msgstr "nie mog� zamieni� wiersza"
-
-#~ msgid "cannot insert line"
-#~ msgstr "nie mog� wprowadzi� wiersza"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ci�g nie mo�e zawiera� znak�w nowego wiersza"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "b��d przy konwersji warto�ci Scheme do Vima"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "B��d vima: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "B��d Vima"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "bufor jest niewa�ny"
-
-#~ msgid "window is invalid"
-#~ msgstr "okno jest niewa�ne"
-
-#~ msgid "linenr out of range"
-#~ msgstr "numer wiersza poza zakresem"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "Niedozwolone w piaskownicy Vima"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Python: nie mo�na u�ywa� :py i :py3 w czasie jednej sesji"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Pythona"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Python: nie mo�na u�ywa� :py i :py3 w czasie jednej sesji"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Nie mo�na wywo�a� Pythona rekursywnie"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ musi by� reprezentacj� �a�cucha"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Ruby."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: nieoczekiwany return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: nieoczekiwany next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: nieoczekiwany break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: nieoczekiwane redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: ponowna pr�ba poza klauzul� ratunku"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: nieobs�ugiwany wyj�tek"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: Nieznany status longjmp %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Prze��cz mi�dzy implementacj�/okre�leniem"
-
-#~ msgid "Show base class of"
-#~ msgstr "Poka� baz� klasy"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Poka� przepisan� funkcj� cz�onow�"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "Pobieraj z pliku"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "Pobieraj z projektu"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Pobieraj z wszystkich projekt�w"
-
-#~ msgid "Retrieve"
-#~ msgstr "Pobierz"
-
-#~ msgid "Show source of"
-#~ msgstr "Poka� �r�d�o dla"
-
-#~ msgid "Find symbol"
-#~ msgstr "Znajd� symbol"
-
-#~ msgid "Browse class"
-#~ msgstr "Przejrzyj klas�"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Poka� klas� w hierarchii"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Poka� klas� w ograniczonej hierarchii"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref odnosi si� do"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ma odniesienia od"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ma"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref u�yte przez"
-
-#~ msgid "Show docu of"
-#~ msgstr "Poka� dokumentacj� dla"
-
-#~ msgid "Generate docu for"
-#~ msgstr "Utw�rz dokumentacj� dla"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Nie mog� pod��czy� do SNiFF+. Sprawd� �rodowisko (sniffemacs musi by� "
-#~ "odnaleziony w $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: B��d podczas czytania. Roz��czenie"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ jest obecnie "
-
-#~ msgid "not "
-#~ msgstr "nie "
-
-#~ msgid "connected"
-#~ msgstr "pod��czony"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Nieznane zapytanie SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: B��d w trakcie pod��czania do SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ niepod��czony"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Nie jest buforem SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: B��d w trakcie zapisu. Roz��czony"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "niew�a�ciwy numer bufora"
-
-#~ msgid "not implemented yet"
-#~ msgstr "obecnie nie zaimplementowano"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "nie mog� ustawi� wiersza(y)"
-
-#~ msgid "invalid mark name"
-#~ msgstr "niepoprawna nazwa zak�adki"
-
-#~ msgid "mark not set"
-#~ msgstr "zak�adka nie ustawiona"
-
-#~ msgid "row %d column %d"
-#~ msgstr "wiersz %d kolumna %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "nie mog� wprowadzi�/do��czy� wiersza"
-
-#~ msgid "line number out of range"
-#~ msgstr "numer wiersza poza zakresem"
-
-#~ msgid "unknown flag: "
-#~ msgstr "nieznana flaga: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "nieznane vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "przerwanie klawiatury"
-
-#~ msgid "vim error"
-#~ msgstr "b��d vima"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "nie mog� stworzy� bufora/okna komendy: obiekt jest kasowany"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "nie mog� zarejestrowa� wstecznego wywo�ania komendy: bufor/okno ju� "
-#~ "zosta�a skasowana"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL FATALNY B��D: reflist zepsuta!? Prosz� z�o�y� raport o tym na "
-#~ "vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "nie mog� zarejestrowa� wstecznego wywo�ania komendy: brak odniesienia do "
-#~ "bufora/okna"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: Przykro mi, ta komenda jest wy��czona, bo nie mo�na za�adowa� "
-#~ "biblioteki Tcl."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: kod wyj�cia %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "nie mog� dosta� wiersza"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Nie mog� zarejestrowa� nazwy serwera komend"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Wys�anie komendy do programu docelowego nie powiod�o si�"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: U�yto niew�a�ciwego id serwera: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: wcielenia instancji rejestru Vima jest �le sformowane.  Skasowano!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans nie s� obs�ugiwane przez to GUI\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Ta wersja Vima nie by�a skompilowanego z opcj� r�nic (diff)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' - nie mo�e by� u�yte: nie w��czone przy kompilacji\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: B��d: Nie mo�na uruchomi� gvim z NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "gdzie wielko�� znak�w jest ignorowana dodaj na pocz�tku / by flaga by�a "
-#~ "wielk� liter�"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tZarejestruj tego gvima w OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tWyrejestruj gvima z OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tStartuj w GUI (tak jak \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  lub --nofork\tPierwszy plan: Nie wydzielaj przy odpalaniu GUI"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tNie stosuj newcli do otwierania okien"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tU�ywaj <device> do I/O"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tU�yj <gvimrc> zamiast jakiegokolwiek .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tEdytuj zakodowane pliki"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tPod��cz vima to danego X-serwera"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNie ��cz z serwerem X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <pliki>\tEdytuj pliki w serwerze Vima je�li mo�liwe"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <pliki> To samo, nie narzekaj je�li nie ma serwera"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <pliki>\tTak jak --remote, lecz czekaj na pliki przed edycj�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <pliki>  To samo, nie narzekaj je�li nie ma serwera"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <pliki>  tak jak --remote ale u�ywa jednej "
-#~ "karty na plik"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <klawisze>\tWy�lij <klawisze> do serwera Vima i zako�cz"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <wyr>\tWykonaj <wyra�enie> w serwerze i wypisz wynik"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tWymie� nazwy dost�pnych serwer�w Vima i zako�cz"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nazwa>\t\tOdsy�aj do/sta� si� serwerem Vim <nazwa>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\tZa�aduj vim na <display>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tZacznij Vim jako ikon�"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <kolor>\tU�ywaj <kolor> dla t�a (r�wnie�: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <kolor>\tU�ywaj <kolor> dla normalnego tekstu (r�wnie�: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\tU�ywaj <font> dla normalnego tekstu (r�wnie�: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\tU�ywaj <font> dla wyt�uszczonego tekstu"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\tU�ywaj <font> dla pochy�ego"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <geom>\tU�ywaj <geom> dla pocz�tkowych rozmiar�w (r�wnie�: -"
-#~ "geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <szer>\tU�yj ramki o grubo�ci <szer> (r�wnie�: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <szer>  U�ywaj przewijacza o szeroko�ci <szer> (r�wnie�: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\tStosuj belk� menu o wysoko�ci <height> (r�wnie�: -"
-#~ "mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tStosuj negatyw kolor�w (r�wnie�: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNie stosuj negatywu kolor�w (r�wnie�: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\tUstaw okre�lony zas�b"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja GTK+):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\tZastartuj vim na <display> (r�wnie�: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\tUstaw unikatow� rol� do identyfikacji g��wnego okna"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tOtw�rz Vim wewn�trz innego widgetu GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "-echo-wid\t\tGvim wypisze Window ID na wyj�cie standardowe"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <tytu� rodzica>\tOtw�rz Vima wewn�trz rodzicielskiej aplikacji"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tOtw�rz Vima wewn�trz innego elementu win32"
-
-#~ msgid "No display"
-#~ msgstr "Brak display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Wys�anie nie powiod�o si�.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Wys�anie nie powiod�o si�. Pr�buj� wykona� na miejscu\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "otworzono %d z %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Brak terminala: Wys�anie wyra�enia nie powiod�o si�.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Wys�anie wyra�enia nie powiod�o si�.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: To nie jest wa�na strona kodowa"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Nie mog� nastawi� warto�ci IC"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Nie mog�em stworzy� kontekstu wprowadze�"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Nie mog�em otworzy� sposobu wprowadze�"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: OSTRZE�ENIE: Nie mog�em zlikwidowa� wywo�ania dla IM"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: metoda wprowadze� nie wspomaga �adnego stylu"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: metoda wprowadze� nie wspomaga mojego typu preedit"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: B��d w czasie uaktualniania szyfrowania pliku wymiany"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s jest zaszyfrowany a ta wersja Vima nie wspiera szyfrowania"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Zaszyfrowany plik wymiany: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Je�li podano nowy klucz szyfruj�cy, ale nie zapisano pliku tekstowego,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "wprowad� nowy klucz szyfruj�cy."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Je�li zapisano plik tekstowy po zmianie klucza szyfruj�cego wci�nij Enter"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "aby u�y� tego samego klucza dla pliku tekstowego i wymiany"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "U�ywam klucza szyfruj�cego z pliku wymiany do pliku tekstowego.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [nie nadaje si� dla tej wersji Vima]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Oderwij to menu"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Dialog wyboru katalogu"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Dialog zapisywania pliku"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Dialog otwierania pliku"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Przykro mi, nie ma przegl�darki plik�w w trybie konsoli"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: zachowuj� plik...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Zako�czono.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "B��D: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[bajt�w] totalne alokacje-zwolnienia %<PRIu64>-%<PRIu64>, w u�ytku "
-#~ "%<PRIu64>, maksymalne u�ycie %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[wywo�ania] wszystkich re/malloc()-�w %<PRIu64>, wszystkich free()-�w "
-#~ "%<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Wiersz staje si� zbyt d�ugi"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Wewn�trzny b��d: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Niedozwolony obrys myszki"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Wprowad� klucz do odkodowania: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Wprowad� ponownie ten sam klucz: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Klucze nie pasuj� do siebie!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Nie mo�na po��czy� z Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Nie mo�na po��czy� z Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: B��dny tryb dost�pu pliku info po��czenia NetBeans: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "odczyt z gniazda Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Bufor %<PRId64> utraci� po��czenie z NetBeans"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans nie s� obs�ugiwane przez to GUI"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans ju� pod��czone"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s jest tylko do odczytu (dodaj ! aby wymusi�)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Funkcjonalno�� eval nie jest dost�pna"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "zwalniam %<PRId64> wierszy"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Nie mog� zmieni� term w GUI"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: U�yj \":gui\" do odpalenia GUI"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Nie mog� zmieni� w GTK+2 GUI"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Niedozwolona czcionka/ki"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: nie mog� wybra� zestawu czcionek"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Niedozwolony zestaw czcionek"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: nie mog� wybra� szerokiej czcionki"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Niedozwolona szeroka czcionka"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Brak wspomagania myszki"
-
-#~ msgid "cannot open "
-#~ msgstr "nie mog� otworzy� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Nie mog� otworzy� okna!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Potrzebuj� Amigados w wersji 2.04 lub p�niejsz�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Potrzebuj� %s w wersji %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Nie mog� otworzy� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Nie mog� stworzy� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim ko�czy prac� z %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "nie mog� zmieni� trybu konsoli ?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: nie jest konsol�??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Nie mog� wykona� pow�oki z opcj� -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Nie mog� wykona� "
-
-#~ msgid "shell "
-#~ msgstr "pow�oka "
-
-#~ msgid " returned\n"
-#~ msgstr " zwr�ci�\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE zbyt niskie."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "B��D I/O"
-
-#~ msgid "Message"
-#~ msgstr "Wiadomo��"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' nie wynosi 80, nie mog� wykona� zewn�trznych komend"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Wyb�r drukarki nie powi�d� si�"
-
-#~ msgid "to %s on %s"
-#~ msgstr "do %s z %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Nieznana czcionka drukarki: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: B��d drukarki: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Wydrukowano '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr ""
-#~ "E244: Niedozwolona nazwa zestawu znak�w \"%s\" w nazwie czcionki \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Niedozwolony znak '%c' w nazwie czcionki \"%s\""
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Podw�jny sygna�, wychodz�\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Za�apa� �miertelny sygna� %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Za�apa� �miertelny sygna�\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Otwieranie ekranu X trwa�o %<PRId64> msec"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Dosta� b��d X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Test ekranu X nie powi�d� si�"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Pr�ba otwarcia ekranu X trwa�a zbyt d�ugo"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� wykona� pow�oki sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� stworzy� potok�w\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Nie mog� rozdzieli� si�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Komenda zako�czona\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP straci� po��czenie ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "Otwarcie ekranu X nie powiod�o si�"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP obs�uguje ��danie samozapisu"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP otwiera po��czenie"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "Obserwacja po��czenia XSMP ICE nie powiod�a si�"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection nie powiod�o si�: %s"
-
-#~ msgid "At line"
-#~ msgstr "W wierszu"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Nie mog� za�adowa� vim32.dll!"
-
-#~ msgid "VIM Error"
-#~ msgstr "B��d VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Nie zdo�a�em poprawi� wska�nik�w funkcji w DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "pow�oka zwr�ci�a %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Za�apa� wydarzenie %s\n"
-
-#~ msgid "close"
-#~ msgstr "zamknij"
-
-#~ msgid "logoff"
-#~ msgstr "wyloguj"
-
-#~ msgid "shutdown"
-#~ msgstr "zako�cz"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Nie znaleziono komendy"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE nie znaleziono w twoim $PATH.\n"
-#~ "Zewn�trzne komendy nie b�d� wstrzymane po wykonaniu.\n"
-#~ "Zobacz  :help wim32-vimrun  aby otrzyma� wi�cej informacji."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim Ostrze�enie"
-
-#~ msgid "Error file"
-#~ msgstr "Plik b��du"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: B��d przy budowwaniu NFA z klas� ekwiwalencji"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr ""
-#~ "E878: (NFA) Nie mo�na przydzieli� pami�ci do przej�cia przez ga��zie!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "Ostrze�enie: Nie mog� znale�� listy s��w \"%s_%s.spl\" lub \"%s_ascii.spl"
-#~ "\""
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Konwersja w %s nie jest wspierana"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr ""
-#~ "E845: Nie wystarczaj�ca ilo�� pami�ci, lista s��w b�dzie niekompletna"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Trop szukania pliku znacznik�w obci�ty dla %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "uruchomiono now� pow�ok�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "U�ywam CUT_BUFFER0 zamiast pustego wyboru"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Cofni�cie niemo�liwe; mimo to kontynuuj�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Nie zaszyfrowany plik ma zaszyfrowany plik undo: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Nie powiod�o si� odszyfrowywanie pliku undo: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Plik undo jest zaszyfrowany: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "16/32-bit wersja GUI dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "64 bitowa wersja GUI dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja GUI dla MS-Windows"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " w trybie Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " ze wspomaganiem OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja na konsol� dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja na konsol� dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 bitowa wersja dla MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 bitowa wersja dla MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 bitowa wersja dla MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Du�a wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normalna wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Ma�a wersja "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malutka wersja "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "z GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "z GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "z X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "z X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "z X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "z Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "z GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "z Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "z Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "z (klasycznym) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     gvimrc systemu: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "  gvimrc u�ytkownika: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "2-gi plik gvimrc u�ytkownika: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "3-ci plik gvimrc u�ytkownika: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr " systemowy plik menu: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Kompilator: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menu Pomoc->Sieroty        dla informacji to tym  "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Uruchomiony bez tryb�w, wpisany tekst jest wprowadzany"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menu  Edytuj->Ustawienia globalne->Tryb wstawiania"
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                  dla dw�ch tryb�w           "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menu Edytuj->Ustawienia globalne->Kompatybilno�� z Vi"
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "     dla domy�lnych ustawie� Vima   "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "OSTRZE�ENIE: wykryto Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "wprowad� :help windows95<Enter>   dla informacji to tym  "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Nie mog�em za�adowa� biblioteki %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "Przykro mi, ta komenda jest wy��czona: nie mog�em za�adowa� biblioteki "
-#~ "Perla."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr "E299: wyliczenie Perla zabronione w piaskownicy bez modu�u Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Edytuj w &wielu Vimach"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Edytuj w pojedynczym &Vimie"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Diff z Vimem"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Edytuj w &Vimie"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Edytuj z istniej�cym Vimem - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Edytuj wybrane pliki w Vimie"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "B��d tworzenia procesu: Sprawd� czy gvim jest w twojej �cie�ce!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "b��d gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "Za d�uga �cie�ka!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Nieznany zestaw czcionek: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Nieznana czcionka: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: Czcionka \"%s\" nie ma sta�ej szeroko�ci znak�w"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Nie mo�na za�adowa� funkcji biblioteki %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E26: Hebrajski nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Farsi nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: Arabski nie mo�e by� u�yty: Nie w��czono podczas kompilacji\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: brak zarejestrowanego serwera o nazwie \"%s\""
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: nie mog� otworzy� ekranu"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Odebra�em niew�a�ciwe wyra�enie"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Region jest chroniony, nie mog� zmieni�"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans nie zezwala na zmiany w plikach tylko do odczytu"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Potrzebuj� klucza szyfrowania dla \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "puste klucze nie s� dozwolone"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "s�ownik jest zablokowany"
-
-#~ msgid "list is locked"
-#~ msgstr "lista jest zablokowana"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "nie powiod�o si� dodanie klucza '%s' do s�ownika"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "indeks musi by� liczb� lub wycinkiem, nie %s"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr "czeka�em na str() lub unicode(), a dosta�em %s"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "czeka�em na bytes() lub str(), a dosta�em %s"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr ""
-#~ "czeka�em na int(), long() lub co� co mo�na zmieni� na long(), ale "
-#~ "dosta�em %s"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr ""
-#~ "czeka�em na int() lub co� co mo�na zmieni� na int(), ale dosta�em %s"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "warto�� zbyt du�a by zmie�ci�a si� w typie int C"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "warto�� jest zbyt ma�a by zmie�ci�a si� w typie int C"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "liczba musi by� wi�ksza ni� zero"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "liczba musi by� wi�ksza lub mniejsza ni� zero"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "nie mog� skasowa� atrybut�w OutputObject"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "niepoprawny atrybut: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: B��d w uruchomieniu obiekt�w I/O"
-
-#~ msgid "failed to change directory"
-#~ msgstr "nie powiod�a si� zmiana katalogu"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "czeka�em na 3-krotk� jako wynik imp.find_module(), a dosta�em %s"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr ""
-#~ "czeka�em na 3-krotk� jako wynik imp.find_module(), a dosta�em krotk� o "
-#~ "wielko�ci %d"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "wewn�trzny b��d: imp.find_module zwr�ci� krotk� z NULL"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "nie mog� usun�� atrybut�w vim.Dictionary"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "nie mog� zmieni� zablokowanego s�ownika"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "nie mog� ustawi� atrybutu %s"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "hashtab zmieni� si� w czasie iteracji"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr ""
-#~ "czeka�em na element sekwencyjny od d�ugo�ci 2, a dosta�em sekwencj� o "
-#~ "d�ugo�ci %d"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "konstruktor listy nie akceptuje s��w kluczowych jako argument�w"
-
-#~ msgid "list index out of range"
-#~ msgstr "indeks listy poza zakresem"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "b��d wewn�trzny: nie powiod�o si� pobranie z listy Vima elementu %d"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "nie powiod�o si� dodanie elementu do listy"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "b��d wewn�trzny: w li�cie Vima brak elementu %d"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "b��d wewn�trzny: nie powiod�o si� dodanie elementu do listy"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "nie mog� usun�� atrybut�w vim.List"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "nie mog� zmieni� zablokowanej listy"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "nie nazwana funkcja %s nie istnieje"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "funkcja %s nie istnieje"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "konstruktor funkcji nie akceptuje s��w kluczowych jako argument�w"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "nie mog� uruchomi� funkcji %s"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "wyst�pi� problem w czasie zmiany okien"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "nie mog� wyzerowa� opcji globalnej %s"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "nie mog� wyzerowa� opcji %s, kt�ra nie ma warto�ci globalnej"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "pr�ba odniesienia do skasowanej karty"
-
-#~ msgid "no such tab page"
-#~ msgstr "nie ma takiej karty"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "pr�ba odniesienia do skasowanego okna"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "atrybut tylko do odczytu: bufor"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "pozycja kursora poza buforem"
-
-#~ msgid "no such window"
-#~ msgstr "nie ma takiego okna"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "pr�ba odniesienia do skasowanego bufora"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "nie powiod�a si� zmiana nazwy bufora"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "nazwa zak�adki musi by� pojedynczym znakiem"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.Buffer, a dosta�em %s"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "nie przeszed�em do bufora %d"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.Window, a dosta�em %s"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "nie znaleziono okna na bie��cej karcie"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "nie przeszed�em do okre�lonego okna"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "oczekiwa�em na obiekt vim.TabPage, a dosta�em %s"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "nie przeszed�em do okre�lonej karty"
-
-#~ msgid "failed to run the code"
-#~ msgstr "uruchomienie kodu si� nie powiod�o"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: eval nie zwr�ci�o odpowiedniego obiektu pythona"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Nie powiod�a si� konwersja obiektu pythona do warto�ci Vima"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "nie mo�na konwertowa� %s do s�ownika Vima"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "nie mo�na konwertowa� %s do struktury Vima"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "b��d wewn�trzny: przekazano referencj� NULL"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "b��d wewn�trzny: b��dny typ warto�ci"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "Nie mog� ustawi� haka �cie�ki: sys.path_hooks nie jest list�\n"
-#~ "Powiniene� teraz wykona� nast�puj�ce czynno�ci:\n"
-#~ "- doda� vim.path_hook do sys.path_hooks\n"
-#~ "- doda� vim.VIM_SPECIAL_PATH do sys.path\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "Nie mog� ustawi� �cie�ki: sys.path nie jest list�\n"
-#~ "Powinno si� teraz doda� vim.VIM_SPECIAL_PATH do sys.path"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace musi by� liczb� ca�kowit�"
-
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<obiekt bufora (skasowany) w %p>"
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr ""
-#~ "E281: B��D TCL: kod zako�czeniowy nie jest ca�kowity!? Prosz� z�o�y� "
-#~ "raport o tym na vim-dev@vim.org"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumenty rozpoznawane przez gvim (wersja RISC OS):\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <number>\tPocz�tkowa szeroko�� okna w kolumnach"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <number>\tPocz�tkowa wysoko�� okna w wierszach"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "wersja dla RISC OS"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() wymaga listy ci�g�w"
-
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<obiekt okna (skasowany) w %p>"
-
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<obiekt okna (nieznany) w %p>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<okno %d>"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <nazwa>\t\tU�ywaj zasob�w tak jak by Vim by� <nazwa>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (Niezaimplementowane)\n"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: argument containedin niedozwolony w tym miejscu"
-
-#~ msgid "Vim dialog..."
-#~ msgstr "Dialog Vima..."
-
-#~ msgid "Font Selection"
-#~ msgstr "Wyb�r czcionki"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: styl nadpunktowy wymaga +fontset"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: Tw�j GTK+ jest starszy ni� 1.2.3. Pole statusu wy��czono"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: Serwer metod wprowadze� nie jest uruchomiony"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "z GTK-GNOME GUI."
-
-#~ msgid "with GTK GUI."
-#~ msgstr "z GTK GUI."
-
-#~ msgid "[NL found]"
-#~ msgstr "[znaleziono NL]"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: wyczerpano maksymaln� liczb� po��cze� cscope"
diff --git a/src/nvim/po/pt_BR.po b/src/nvim/po/pt_BR.po
index 60c11d4b5a..05986cf097 100644
--- a/src/nvim/po/pt_BR.po
+++ b/src/nvim/po/pt_BR.po
@@ -2478,11 +2478,6 @@ msgstr "E900: Id do job � inv�lido"
 msgid "E901: Job table is full"
 msgstr "E901: Tabela de jobs está cheia"
 
-#: ../globals.h:1021
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr "E902: \"%s\" não é um executável"
-
 #: ../globals.h:1023
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
diff --git a/src/nvim/po/ru.cp1251.po b/src/nvim/po/ru.cp1251.po
deleted file mode 100644
index 29e8c83ee6..0000000000
--- a/src/nvim/po/ru.cp1251.po
+++ /dev/null
@@ -1,8282 +0,0 @@
-# Russian translation for Vim
-#
-# �� �������� ������������� ������� � ��������� Vim ":help uganda"
-#
-# vassily "vr" ragosin <vrr@users.sourceforge.net>, 2004
-# Sergey Alyoshin <alyoshin.s@gmail.com>, 2013
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vim_ru\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2014-10-10 12:00+0400\n"
-"Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n"
-"Language-Team: \n"
-"Language: Russian\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=cp1251\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "���������� �������� �������� �����"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "���������� ������: ����������� ��� �����"
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[������ ������������]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[������ ������� �����������]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr "E855: ����������� ������� ����������� �������"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ���������� �������� ������ ���� ��� ������ ������, �����..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ���������� �������� ������ ��� ������, ���������� ������ �����..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: �� ���� ����� �� ��� �������� �� ������"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: �� ���� ����� �� ��� �����"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: �� ���� ����� �� ��� ������"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "���� ����� �������� �� ������"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "����� ��������� ������� �� ������: %d"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "���� ����� �����"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "����� ������� �������: %d"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "���� ����� ������"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "����� ������� �������: %d"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: ���������� ��������� �� ������ ��������� �����"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: ���������� ������� �� ����������"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: ������ � ������ �����������"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: ����� %<PRId64> �� ����������"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: ��� ��������� �����"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: ��� ������ �����"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr ""
-"E89: ��������� � ������ %<PRId64> �� ��������� (�������� !, ����� ������ "
-"��������)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ��������������: ������������ ������ ��� ������"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: ����� %<PRId64> �� ������"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: ��������� ������������ ��� %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: ��� ���������������� %s ������"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "������ %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: ����� � ����� ������ ��� ����������"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [�������]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[�� ��������������]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[����� ����]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[������ ������]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[��]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[������ ��� ������]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "���� ������ --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> ���. --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "���. %<PRId64> �� %<PRId64> --%d%%-- ���. "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[��� �����]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "�������"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[�������]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[������������]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "����"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "�����"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "�������"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# ������ �������:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[���������]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- ������ ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "������ ��� %s:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ������=%<PRId64>  id=%d  ���=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: ��������� ���������"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: ������������ �����"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ��������� ������ �����"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: ������������ �������� ���������"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: ������� �� ��������� ����� �� ����� ��� � %<PRId64> �������"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: ���������� ��������� ��� �������� ��������� �����"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: ���������� ������� ����� �������"
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: ���������� ��������� ����� patch"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: ���������� ��������� ����� diff"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: �������� ����� �� ��������� � ������ �������"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: ������ ��� ���������� ������� � ������ �������"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: ������ ��� ������� � ������ �������"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: � ������ ������� ����� ���� �������, �� ���� �������"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �� ���� ����� ����� \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ����� \"%s\" �� ��������� � ������ �������"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ����� ���������� ���������"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: ������������ ������ Escape ������ ������������ � �������"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: ���� � ���������� ���������� �� ������"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: ������� :loadkeymap ��������� ��� ����� ��������"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: ������ ������ ��������� ����������"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " �������������� ��������� ����� (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ����� ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " �������������� ����� ������ (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " �������������� ����� ����� (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " �������������� ����� (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " �������������� ������� ���� (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " �������������� ����������� (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " �������������� �� ������� (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " �������������� ��������� (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " �������������� ��������� ������ (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " ���������������� �������������� (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " Omni-���������� (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ����������� ����������� ������������ (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " ������� �������������� ��������� ����� (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "����� ������"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: ������� �������������� �������� ����"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: ������� �������������� ������� �����"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "�� ������ �������� ����� 'dictionary'"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "�� ������ �������� ����� 'thesaurus'"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "�������� �������: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (�������) ��������� (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (������) ��������� (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "��������: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "����������� ����� ����� �����."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " ����������"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- �����..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "�������� �����"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "����� �� ������ ������"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "������������ ������������"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "������������ %d �� %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "������������ %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: ����������� ������� � :let"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: ������ ������ �� ��������� ���������: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ������������� ����������: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ��������� ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: �������� %s ������ ���� �������"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: �������� %s ������ ���� ������� ��� �������"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: ���������� ������������ ������ ���� ��� �������"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: ��������� ������"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ��������� �������"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: ������� ����� ���������� ��� ������� %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ��� ����� � �������: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ������� %s ��� ����������. �������� !, ����� �������� �."
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ������ ��� ���������� � �������"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: ��������� ������ �� �������"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: ���������� ������������ [:] �� �������"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: ������������ ��� ���������� ��� %s="
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ����������� �������: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ������������ ��� ����������: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: ������������� ����� � ��������� ������ ��� ������"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: ����� ������ ��� ��������� ������"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: ����� ������ ��� ��������� ������"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "������� ; � ������ ����������"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: ���������� ���������� ���������� ��� %s"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: �������������� �������� ������ ������ ��� �������"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] ������ ���� ���������"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ������� ��������� ������"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: ��������� ������-�������� ������ ��� � ����"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: ������-�������� �� �������� ���������� ���������"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: ��������� \"in\" ����� :for"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ��������� ������: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: ��� ����� ����������: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: ������� ������� ��������� ���������� ��� (���)����������"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: ��������� ':' ����� '?'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: ������ ����� ���������� ������ �� �������"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: ������������ �������� ��� �������"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: ������� ����� ���������� ������ �� �������"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: ������������ �������� ��� �������"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ������ �� ������� ����� ���������� ������ � ������� �� �������"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: ������������ �������� ��� ������ �� �������"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: ���������� ������������ '%' � ������ � ��������� ������"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ��������� ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: ���������� ������������� ������ �� �������"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: �� ������� ��� �����: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: ����������� �����: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ��������� �������: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ��������� �������: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ��������� ������� � ������: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ��������� ��������� ������ ']': %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ��������� ��������� � �������: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ������ ����� � �������: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ��������� ������� � �������: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ��������� ��������� ������� '}': %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: ������� ������� ��������� ���������� ��� �����������"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: ������� ����� ���������� ��� ������� %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ��������� ��� ������� %s ������ �������"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ����������� �������: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ������������ ���������� ��� ������� %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ������������ ��� ��������: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: ����� ������� dict ��� �������: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: ��������� ����� ����� ��� � ��������� ������"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "��������� add()"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ������� ����� ����������"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ����� �������������� ������ � ������ �������"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ���� ��� ����������: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "��������� extend()"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "��������� map()"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "��������� filter()"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld �����: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ����������� �������: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "������� inputrestore() ���������� ����, ��� ������� inputsave()"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "��������� insert()"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �������� �� �����������"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: ������������ ��� ��� len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ������� ���"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ������ ����� �����"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<�����>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "��������� remove()"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ������� ����� ������������� ������ (����?)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "��������� reverse()"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "��������� sort()"
-
-#: ../eval.c:13721
-msgid "uniq() argument"
-msgstr "��������� uniq()"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: ��������� ���������� ������� ��������� ��� ����������"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr ""
-"E882: ��������� ���������� ������� ��������� ��� �������� ��������������"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(�����������)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: ������ ������ �� ��������� ����"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: ������������� ����� � ��������� ������ ��� ������"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: ������������� ������ �� ������� ��� �����"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: ������������� ������ ��� �����"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: ������������� ������� ��� �����"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: ������������� ������ �� ������� ��� ������"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: ������������� ������ ��� ������"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: ������������� ������� ��� ������"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �������������� ���� ���������� ���: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: ���������� ������� ���������� %s"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr ""
-"E704: ��� ���������� ������ �� ������� ������ ���������� � ��������� �����: "
-"%s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ��� ���������� ����������� � ������������ ��������: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: �������� %s �������������"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "����������"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: ���������� �������� �������� %s"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ������� ������� ��������� ���������� ��� �����������"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ������������� �������: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: ��������� '(': %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: ����� ���������� ������������ g:"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: ������������ ��������: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ������������� ��� ���������: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: ��������� ������� :endfunction"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: ��� ������� ����������� � ����������: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���������� �������������� ������� %s, ��� ������������"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ��� ������� �� ������������� ����� ����� ��������: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: ��������� ��� �������"
-
-#: ../eval.c:17824
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: ��� ������� ������ ���������� � ��������� ����� ��� \"s:\": %s"
-
-#: ../eval.c:17833
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: ��� ������� �� ����� ��������� ���������: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: ���������� ������� ������� %s, ��� ������������"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ������� ������ ������� ������, ��� �������� 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "����� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s ��������"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s ���������� #%<PRId64>"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ���������� %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "����������� � %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: ������� :return ��� �������"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ���������� ����������:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t� ��������� ��� ����� �������� � "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "��� ������ ������"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, Hex %04x, Octal %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, Hex %08x, Octal %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: ������ ������������ ���� �� ����"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "���������� ���� ������"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "���������� �����: %<PRId64>"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "��������� ����� ������ �����: %<PRId64>"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: ����������� *Filter* �� ������ �������� �������� �����"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[��������� �� ���������]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s � ������: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr ""
-"E136: viminfo: ������� ����� ������, ��������� ����� ����� ����� ���������"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "������ ����� viminfo \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ����"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " �������"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " ������ ������"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ��������"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: ����� �� ������ ����� viminfo �����������: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: ���������� �������� ���� viminfo %s!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "������ ����� viminfo \"%s\""
-
-#, c-format
-msgid "E886: Can't rename viminfo file to %s!"
-msgstr "E886: ���������� ������������� ���� viminfo � %s!"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# ���� ���� viminfo ������������� ������ Vim %s.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ��� ����� (���������!) �������������.\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# �������� ����� 'encoding' � ������ ������ �����\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "������������ ��������� ������"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "�������� ���� ��������?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ��� ������ ����� ������ ����������� !"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "������������ ������������ ���� \"%s\"?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "����-���� \"%s\" ����������, ������������?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ����-���� ����������: %s (:silent! ����� ������ ��������)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: ����� %<PRId64> �� ������ � ������ �����"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ���� �� ��������: ������ ��������� ������ 'write'"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"��� \"%s\" �������� ����� 'readonly'.\n"
-"��������?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"���� \"%s\" ����� ����� ������� ������ ��� ������.\n"
-"��, ��������, ���� ������� ��������.\n"
-"������ �����������?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr ""
-"E505: \"%s\" ������ ������ ��� ������ (�������� !, ����� ������ ��������)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: ����������� ���������� ����� ����� ����� %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: �������� ������� :z ������ ���� ������"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: ������������� ������ �������� �� ����������� � rvim."
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ���������� ��������� �� ����� ����������� �������"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "�������� �� %s? (y/n/a/q/l/^E/^Y)"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(��������)"
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "���� ������������"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "���� ������"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> ������������"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> �����"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " � ����� ������"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " � %<PRId64> ���."
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: ������� :global �� ����� ���� �����������"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: � ������� :global ��������� ���������� ���������"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "������������ ������� ������� �� ������ ������: %s"
-
-#: ../ex_cmds.c:4510
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "������ �� ������: %s"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ��������� ������ ��� ������:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: �����������, ������ �����������!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: � ���������, ������� '%s' ��� %s �����������"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: � ��������� ������� ��� %s �����������"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "��������, ���� ������� \"%s\" �� ������"
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: %s �� �������� ���������"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: ���������� ������� %s ��� ������"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: ���������� ������� %s ��� ������"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ����� ������� ���������� ������ ��������� ��� ������ �����: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: ������������� ����� \"%s\" � ����� %s/%s"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: ����������� ������� ������ %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: ��������� ��� ������"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: ���������� ������� ����� �������"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ������������ ����� ������: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: ����������� ������: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: �������� ����� ������"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ������������ ��� ������: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ������������ ID ������: %<PRId64>"
-
-#, c-format
-msgid "E885: Not possible to change sign %s"
-msgstr "E885: ���������� �������� ������ %s"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (�� ��������������)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[�������]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "������� ����� �������. ��� ����������� �������� \"cont\""
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "������ %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "�������: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "����� ��������� � \"%s%s\" ���. %<PRId64>"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ����� ��������� �� �������: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "����� ��������� �� ����������"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s ���. %<PRId64>"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ������ ������������� \":profile start {���-�����}\""
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "��������� ��������� � \"%s\"?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "��� �����"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ������������� ��������� � ������ \"%s\""
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ""
-"��������������: ����������� ������� � ������ ����� (��������� �����������)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: ��� �������������� �������� ������ ���� ����"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: ��� ������ ����"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: ��� ��������� ����"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ���������� �� ��������������: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "����� \"%s\" � \"%s\""
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "����� \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "�� ������� � 'runtimepath': \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "������ ������� �������: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "���������� ������� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "������ %<PRId64>: ���������� ������� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "���������� �������� \"%s\""
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "������ %<PRId64>: ���������� \"%s\""
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "���������� �������� %s ���������"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "�������� ������"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ��������"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ��������"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "���������� ���������"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "���������� ������"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr ""
-"W15: ��������������: ������������ ����������� ������. �������� ��������� ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: ������� :scriptencoding ������������ ��� ����� ��������"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: ������� :finish ������������ ��� ����� ��������"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "�������� %s����: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: ���������� ������� ���� �� \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "������� � ����� Ex. ��� �������� � ������� ����� �������� \"visual\""
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: � ����� �����"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: ������� ����������� �������"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: �������������� �������� �� ����������: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "����� ���������� �����"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "����� �������"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ������������� ������������� ������� ������������"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: ��� �� ������� ���������"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: ����� �������� ��������"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "����� �������� ��������, ������ ������� �������"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: ����������� w ��� w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: ��������, ��� ������� ���������� � ������ ������"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: ��������� ������������ ������ ���� ��� �����"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "1 ���� ������� ��������������. �����?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "���� ������������������� ����� (%d). �����?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: 1 ���� ������� ��������������."
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: ���� ������������������� ����� (%<PRId64>)."
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ������� ��� ����������. �������� ! ��� ������."
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    ���      �����. ����. ������.    �����������"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "�������, ����������� �������������, �� ����������."
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: �������� �� �����"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: ������������ ���������� ����������"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: �����-��������� ������ ��������� ������"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: ������������ �������� �����-��������� �� ���������"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: ��� -complete ��������� ������� ��������"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ������������ �������: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: ������������ ��� �������"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ������� ������������ ������ ���������� � ��������� �����"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr ""
-"E841: ����������������� ��� �� ����� �������������� ��� ������ ������������"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ��� ����� ������� ������������: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ������������ �������� ����������: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr ""
-"E468: �������� �������������� ����� ������������ ������ � ������ �����������"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ������ ���������� ������� �������� ��������� �������"
-
-#: ../ex_docmd.c:5257
-#, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: ���������� ����� �������� ����� '%s'"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "������������ ���, ������������ Vim!"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: ������ ������� ��������� �������"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "�� ������ ����� ���� �������"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "������� %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "��� ����-�����"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr ""
-"E747: ����� �������� ����������, ����� ������� (�������� !, ����� ������ "
-"��������)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: ��� ����������� ��������"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: ����������"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: ������� :winsize ������� �������� ���� �������� ����������"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: � ������ ������� ����������� ��������� ���� �� ��������"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: ������� :winpos ������� �������� ���� �������� ����������"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: ���������� ������� �������: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" ���������� (�������� !, ����� ������ ��������)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: ���������� ������� ��� ������ \"%s\""
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: �������� ������ ���� ������/�������� �������� ��� ������"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: ������� �������� �������� ��� ������������� ������� :normal"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: ��� ��������� ����� ����� ��� ������ '#'"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: ��� �������������� ����� ����� ��� ������ \"<afile>\""
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: ��� �������������� ������ ������ ��� ������ \"<abuf>\""
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ��� �������������� ����� ������������ ��� ������ \"<amatch>\""
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ��� ����� ����� :source ��� ������ \"<sfile>\""
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: ��� ������ ������ ��� ������������� \"<slnum>\""
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: ������ ��� ����� ��� '%' ��� '#', �������� ������ c \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: ����������� ��������� �������� ������ ������"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: ���������� ������� ���� viminfo ��� ������"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr ""
-"E608: ���������� ��������� ������� :throw ��� ���������� � ���������� 'Vim'"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "�������������� ��������: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "��������� ��������� �������������� ��������: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "�������������� �������� ���������������: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, ������ %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "��������� �������������� ��������: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s ��������� ��������"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s ������������"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s ���������"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "�������������� ��������"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "������ � ����������"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "������"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "����������"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: ������� ������� ��������� :if"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif ��� :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else ��� :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ��� :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: ���������� ��������� :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif ����� :else"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: ������� �������� �������� :while ��� :for"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue ��� :while ��� :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break ��� :while ��� :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: ������������� :endfor � :while"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: ������������� :endwhile � :for"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: ������� ������� ��������� :try"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch ��� :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch ��� :finally"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally ��� :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: ���������� ��������� :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry ��� :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: ������� :endfunction ����� �������������� ������ ������ �������"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: ������ �� ����������� �������������� ������� ������"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: ������ �� ����������� ��������� ���������� � ������"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "��� �����"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " ��� �����\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "�������� ����� 'history' ����� ����"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s, ������� (������� �� ������� � �������):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "��������� ������"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "������ ������"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "���������"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "������ �����"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ������ ����� �������"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: ������� �������� ���� ��� �����"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: ������� ������� ���� ��� ��������������"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: ����������� ����� ����: '**[�����]' ������ ���� ���� � ����� ����, "
-"���� �� ��� ������ ��������� '%s'"
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: ������� \"%s\" �� ������ � ���� ��� ����� ��������"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: ���� \"%s\" � ��������� ��������� �� ������"
-
-msgid "List or number required"
-msgstr "��������� ������ ��� �����"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: � ���� ����� �������� ������ ��� ��������� \"%s\""
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: � ��������� ��������� ������ ��� ������ \"%s\""
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: ����������� �������� ����� ��� ��� ������"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "������������ ��� �����"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "�������� ���������"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "�� �������� ������"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[����� ����]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[����� �������]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[���� ������� �������]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[������ ��������]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: � ���������� ���������� ���������� *ReadPre ���� ���� ����������"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: ����������� *ReadPre �� ������ �������� �������� �����"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: ������ �� ������������ ������ ����� stdin...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: � ���������� �������������� ���� ���� ����������!"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/������]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[������]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr "[����������� ����������]"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[��������� ������� CR]"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[������� ������ �������]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[��� ��������������]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[��������������]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[������ �������������� � ������ %<PRId64>]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[������������ ���� � ������ %<PRId64>]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[������ ������]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "��������� ���� ��� ��������������� �� ������"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "�������������� � ������� 'charconvert' �� ���������"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "���������� ��������� ����� 'charconvert'"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: ��� ���������� ���������� ��� ������ acwrite"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr ""
-"E203: �����, ������� ����������� ��������, ����� ��� �������� ������������"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: ���������� ����� �������� ������������ ����������� �������"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "�� �������� ������ ��� �����������, ��������� ��� ������"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "������ ������ ��� ������ (�������� !, ����� ������ ��������)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr ""
-"E506: ������ � ��������� ���� ���������� (�������� !, ����� ������ ��������)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: ������ �������� ���������� ����� (�������� !, ����� ������ ��������)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr ""
-"E508: ���������� ��������� ��������� ���� (�������� !, ����� ������ ��������)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr ""
-"E509: ���������� ������� ��������� ���� (�������� !, ����� ������ ��������)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr ""
-"E510: ���������� ������� ��������� ���� (�������� !, ����� ������ ��������)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: ��������� ���� ��� ������ �� ������"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr ""
-"E213: ������������� ���������� (�������� ! ��� ������ ��� �������������)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: ���������� ������� ��������� ���� ��� ������"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: ���������� ������� ���� ��� ������"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: �� ������� ��������� ������� fsync()"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �������� �������� �� �������"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr ""
-"E513: ������ ������, �������������� �� ������� (�������� 'fenc', ����� "
-"������)"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: ������ ������, �������������� �� ������� �� ������ %<PRId64> (�������� "
-"'fenc', ����� ������)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: ������ ������ (��� ���������� �����?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " ������ ��������������"
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr " �� ������ %<PRId64>;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[����������]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[�����]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [�]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " ���������"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [�]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ��������"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: ����� ��������: ���������� ���������� ��������� �����"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr ""
-"E206: ����� ��������: ���������� ������� ��������� ������� ��������� �����"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: ���������� ������� ��������� ����"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"��������������: �������� ���� ����� ���� ������� ��� ��������\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "�� �������� �� ���������, ���� ���� �� ����� ������� �������!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[������ dos]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[������ mac]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[������ unix]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 ������, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "�����: %<PRId64>, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 ������"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "��������: %<PRId64>"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[������������� ��������� ������]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "��������������: ���� ������� � ������� ������!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "�������� ������ �������� � ���� ����"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: ������ ������ � \"%s\""
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: ������ �������� \"%s\""
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: ������ ������ \"%s\""
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: ����� ����� ��� ���������� ����������� FileChangedShell"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ���� \"%s\" ������ �� ��������"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr ""
-"W12: ��������������: ���� \"%s\" � ����� Vim ���� �������� ���������� ���� "
-"�� �����"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "��. \":help W12\" ��� �������������� ����������."
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr ""
-"W11: ��������������: ���� \"%s\" ��� ������� ����� ������ ��������������"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "��. \":help W11\" ��� �������������� ����������."
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr ""
-"W16: ��������������: ����� ������� � ����� \"%s\" ��� ������� ����� ������ "
-"��������������"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "��. \":help W16\" ��� �������������� ����������."
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr ""
-"W13: ��������������: ���� \"%s\" ��� ������ ����� ������ ��������������"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "��������������"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"&OK\n"
-"&L ��������� ����"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: ���������� ������������� � ������������ \"%s\""
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: ���������� ��������� ������������ \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--�������--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "����-�������� �����������: %s <������=%d>"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: ������ \"%s\" �� ����������"
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: ������������ ������� ����� *: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: �������������� �������: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: �������������� ������ ��� �������: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- ����������� ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: ������������ ����� ������ "
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ���������� ��������� ����������� ��� ���� �������"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "��� ���������� ����������"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: ������� ������� ��������� �����������"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s ����������� ��� \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "���������� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "����������� %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: ��������� {."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: ��������� }."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: ������� �� ����������"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr ""
-"E350: ������� �� ����� ���� ������� � ������� ��������� ����� 'foldmethod'"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr ""
-"E351: ������� �� ����� ���� ������� � ������� ��������� ����� 'foldmethod'"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld ����� � �������"
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: ���������� � ����� ������"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: ����������� ��������"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: ��� ���� ���������� ���������� ��� %s"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: ��� ���� ���������� �������� ��� %s"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: ��� ���� ���������� ��� %s"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: ��� ���� �������� ��� %s"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "���������� �� �������"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "�������� �� �������"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ������������ �����"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "-- ��� ����� � ������ --"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: ���������� ������� ��������"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ��������� ������� ��������"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: ����� \\ ������ ���� ������ /, ? ��� &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr ""
-"E11: ����������� � ���� ��������� ������; <CR> ����������, CTRL-C �����"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ������� �� ����������� � exrc/vimrc � ������� �������� ��� ������ �����"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: ����������� ������� :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: ����������� ������� :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: ����������� ������� :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: ����������� ������� :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: ������� :endwhile ��� ������ ������� :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ��� :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ���� ���������� (�������� !, ����� ������������)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: �� ������� ��������� �������"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: ���������� ������"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "��������"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ������������ �����"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ������������ ��������"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ������������ ��������: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ������������ ���������: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ������������ ��������"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ������������ �������"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" �������� ���������"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ������������ ������ ���������"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ��������� ����� ������� \"%s()\" �� ����������"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ������� ��������� �� ������������ ����� ������"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: ������� �� ����������"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ��������� ����������, ��� ��� ��������� ����� 'modifiable'"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ������� ������� ��������� ��������"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: �������� ���� �� ����������"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: ��� ������ ����������"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! �� �����������"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr ""
-"E25: ����������� ������������� ������������ ���������� ��������� ��� "
-"����������"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ������ ��������� ���������� %s �� ����������"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: ���� ��� ������������ ������"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: ���������� ��������� ������ ���"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: ����� �������� �� ����������"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: ��� ������������"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: ��� ������������: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: ��� ����� �����"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ��� ����������� ����������� ��������� ��� ������"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: ��� ���������� �������"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ��� ����������� ����������� ���������"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: ������������� ��������� �� �����������"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ������������ �����"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ���������� ������� ���� %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: ���������� �������� ��� ���������� �����"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ���������� ������� ���� %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ���������� ��������� ���� %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ��������� �� ��������� (�������� !, ����� ������ ��������)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[��������� �� ���������]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: ������� ��������"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ��������� �����"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �� ������� ������� ���� ������ %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �� ������� ������!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "������ �� ������"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ������ �� ������: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �������� ������ ���� ������������� ������"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ������� � ���������� ������� ����������"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: ��� ������"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: ��� ������ ������������"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ���������� ������ ������������"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ��������� ��������� ���������� ��������� ����������"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: �������� ����� 'readonly' (�������� !, ����� ������ ��������)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ���������� �������� ���������� ������ ��� ������ \"%s\""
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: ���������� �������� ���������� � ���������: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ������ ��� ������ ����� ������"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �� ����������� � ���������"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: ����� �� ���������"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ������ ����� ������ �� ��������������"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ������������ ������ ���������"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: ��������� ����� 'shell' �������� ������ ������"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: ���������� ��������� ������ � �������!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: ������ �������� ����-�����"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: ���� ����� ������"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ������� ������� �������"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ������� ������� ���"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: ������� ����� �������� ["
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: ������� ����� ��� ������"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: ������ ������� �� ������"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: ����������� �������"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ���������� ��������� ����������� �� �����"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr ""
-"E591: �������� ����� 'winheight' �� ����� ���� ������ �������� 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr ""
-"E592: �������� ����� 'winwidth' �� ����� ���� ������ �������� 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: ������ ��� ������"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "������� �������� ��������"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ������������� <SID> ��� ��������� ��������"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: ���������� ������: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ������ ���������� ������ ������ ��� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: ������ �����"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ������������ ������ ������ ��� �����������"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ���� �������� � ������ ������"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ����� '%s' �� �����������"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: ������������ ��� ��������"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "����� ����� ��������� � ����� ���������"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "����� ����� ��������� � ������ ���������"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: ��������� ���������"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: ������������ ���������"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: ��������� ������� �����"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "�������� %d"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "�������� ������"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "������ ���. %d (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " ����� %d �� %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "����������: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "������ ����������"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: ������ ������ � ���� PostScript"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: ���������� ������� ���� \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: ���������� ��������� ���� �������� PostScript \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: ���� \"%s\" �� �������� ������ �������� PostScript"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: ���� \"%s\" �� �������� ���������� ������ �������� PostScript"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ���� �������� \"%s\" ����������� ������"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: ������������� ������������� ��������� � ����� ��������."
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset �� ����� ���� ������ ��� ������������� ���������."
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: ��� ����������� ������ �� ��������� ��� ������������� ������."
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: ���������� ������� ���� PostScript"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: ���������� ������� ���� \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: ���� �������� PostScript \"prolog.ps\" �� ������"
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: ���� �������� PostScript \"cidfont.ps\" �� ������"
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: ���� �������� PostScript \"%s.ps\" �� ������"
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: ���������� ������������� � ��������� ������ \"%s\""
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "�������� �� ������..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: �� ������� ��������� ������ ����� PostScript"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "������� �� ������ ����������."
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "�������� ����� ���� ������"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "������ �� �������"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "�������� ��� ���������"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "����� ����������"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "������ ���������������� ��� ����������"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "�������� ����������"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �������������: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "��� ������� cscope �� ������������ ���������� ����.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: �������������: cstag <���>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: ����� �� �������"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: ������ stat(%s): %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s �� �������� ��������� ��� ������ ���� cscope"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "��������� ���� ������ cscope %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: ������ ��������� ���������� �� ���������� cscope %<PRId64>"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: ����������� ��� ������ cscope"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: ���������� ������� ����� ��� cscope"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: ���������� ��������� fork() ��� cscope"
-
-#: ../if_cscope.c:849
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection: �� ������� ��������� setpgid"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection: �� ������� ��������� exec"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: �� ������� ��������� fdopen ��� to_fp"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: �� ������� ��������� fdopen ��� fr_fp"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: �� ������� ��������� ������� cscope"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: ���������� � cscope �� �������"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: ������������ ���� cscopequickfix %c ��� %c"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: �� ������� ������������ �� ������� cscope %s ��� %s"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "������� cscope:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (�������������: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: ����� ������� ���������� ��� �������\n"
-"       d: ����� ������� ���������� ���� ��������\n"
-"       e: ����� ���� ������ egrep\n"
-"       f: ����� ���� ����\n"
-"       g: ����� ��� �����������\n"
-"       i: ����� ����� ���������� (#include) ���� ����\n"
-"       s: ����� ���� C-������\n"
-"       t: ����� ��� ��������� ������\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: ������ ���� ������ cscope ��� ������������"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: ���������� � cscope %s �� ����������"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "���������� � cscope %s �������"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: ����������� ������ � cs_manage_matches"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "����� cscope: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   ������"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "��� ����� / �������� / ������\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: ������ cscope: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "������������ ���� ��� ������ cscope"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "���������� � cscope �����������\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ���� ������                         ��������� ����\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "����������� �������������� ��������"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "������� ����� ���������� ��������������"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "�������� �������� �����"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "����� ����� ��������������� ���������"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr ""
-"������� ����� ���������� \"+�������\", \"-c �������\" ��� \"--cmd �������\""
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "������������ �������� ���"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "������ ��� ��������������: %d\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "������� ���������� �������� ����� ��������: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "���������� ������� ��� ������: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "���������� ������� ��� ������ ��������: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ��������������: ����� �������������� �� �� ��������\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ��������������: ���� ���������� �� � ���������\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "��������� ������ ����� ����������� vimrc"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: ���������� ��������� ������ �� \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"�������������� ����������: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[���� ..] �������������� ��������� ������"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-           ������ ������ �� ������ ����� stdin"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t �����    �������������� ����� � ��������� ������"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr ""
-"-q [����-������]\n"
-"\t\t\t\t    �������������� ����� � ������ �������"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"�������������:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [���������] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   ���:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"���������:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t����� ����������� ������ ����� ������"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t�� ��������� ����������� �� �����"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\t����� Vi (��� \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\t����� Ex (��� \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\t���������� ����� Ex"
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t����� (��������) ����� (������ ��� \"ex\")"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\t����� ������� (��� \"vimdiff\")"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t������� ����� (��� \"evim\", �����������)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t������ ��� ������ (��� \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t������������ ����� (��� \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t��� ����������� ���������� ��������� (������ ������)"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t��� ����������� �������� ��������� � �����"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t�������� �����"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\t����� Lisp"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t����� ������������� � Vi: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t����� �������� ������������� � Vi: 'nocompatible'"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-"-V[N][����]\t\t�������� �������������� ���������\n"
-"\t\t\t\t[������� N] [���������� � ����]"
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t����� �������"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t��� ����-�����, ������������ ������ ������"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t������� ������ ����-������ � ��������� ������"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (� ������ �����)\t������������ �������� ����������� �����"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t�� ��, ��� � -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t������ � �������� ������"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t������ � ������ \"�����\""
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t������ � ������ \"�����\""
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <��������>\t��������� ��������� ��� <���������>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t������������ <vimrc> ������ ����� ������ .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�� ��������� �������� �������"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr ""
-"-p[N]\t\t������� N ������� (�� ���������: �� �����\n"
-"\t\t\t\t�� ������ ����)"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr ""
-"-o[N]\t\t������� N ���� (�� ���������: �� ������\n"
-"\t\t\t\t�� ������ ����)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\t�� ��, ��� � -o, �� � ������������ ����������� ����"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t������ �������������� � ����� �����"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t������ �������������� � ������ � ������� <lnum>"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <�������>\t��������� <�������> ����� ��������� ����� vimrc"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <�������>\t\t��������� <�������> ����� �������� ������� �����"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr ""
-"-S <�����>\t\t��������� �������� <������> ����� ��������\n"
-"\t\t\t\t������� �����"
-
-# \n\t\t.. ��� �������� � 80 ��������
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr ""
-"-s <��������>\t��������� ������� �������� ������ ��\n"
-"\t\t\t\t����� <��������>"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <��������>\t��������� ��� �������� ������� � ���� <��������>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <��������>\t�������� ��� �������� ������� � ���� <��������>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr "--startuptime <����>\t�������� ��������� ����� � ������� � <����>"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t������������ ������ .viminfo ���� <viminfo>"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h ��� --help\t������� ������� (��� ���������) � ��������� ������"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t������� ���������� � ������ Vim � ��������� ������"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "��� ������������� �������"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: ��� �������, ����������� � \"%s\""
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"����� ���  ��� ����/�����"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-"������ ���  ��� ����/�����"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"�����.  ���  ��� �����"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# ���������� �������:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ������ ������� (������� ����� ������):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# ������� ������� ������� (�� ����� ������ � ������):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "��������� '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: ���� �� ������������"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: ������ ������ ��� ������ ����-�����"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: ������ ������ ����-�����"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: ������ ������ ��� ������ ����-�����"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: ������ ��� ������ ����-�����"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr ""
-"E300: ����-���� ��� ���������� (����� � �������������� ���������� ������?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �� ������� ���� ����� 0?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �� ������� ���� ����� 1?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �� ������� ���� ����� 2?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ��, ��������� ����-����!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: ���������� ������������� ����-����"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr ""
-"E303: �� ������� ������� ����-���� ��� \"%s\", �������������� ����������"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): �� ������� ���� 0??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: ����-���� ��� %s �� ������"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr ""
-"������� ����� ����-�����, ������� ������� ������������ (0 ��� ������): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: �� ���� ������� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "���������� ��������� ���� 0 �� "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"��� ���������, ��� Vim �� ���� �������� ����-����"
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " ������ ������������ � ������ ������ Vim.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "����������� Vim ������ 3.0.\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s �� �������� ����-������ Vim"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " ������ ������������ �� ���� ����������.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���� ��� ������ "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"���� ���� ��� ��������."
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr " ��� �������� (������ �������� ������ ������������ ��������).\n"
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "������������ ����-���� \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "�������� ���� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ��������������: �������� ���� ��� ���� �������"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: ���������� ��������� ���� 1 �� %s"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???����������� ����� �����"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???������������ �������� �ר����� �����"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???������ ����"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???����������� ������"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ������������ ���� 1 ID (%s �� �������� ������ .swp?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???�������� ����"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "???������ ����� ���� ��������� ������ �� ???�����"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "???������ ����� ���� ��������� ��� ������� ������ �� ???�����"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???�����"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: �������������� ��������"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr ""
-"E312: �� ����� �������������� ���������� ������; ��. ������, ������������ "
-"� ???"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "��. \":help E312\" ��� �������������� ����������."
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "�������������� ���������. ���������, �� �� � �������."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(������ �������� ���� ��� ������ ������ � �������� ��� � ��������\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "������ ��� ������ ��������� diff)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "�������������� ���������. ���������� ������� � ������ ������������."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"��������, ������ �� �������� ������� ���� .swp.\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "���������� ����-�����:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   � ������� ��������:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   � ��������� ������:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   � ��������   "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- ��� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "          ��������: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "    ����: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              ����: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [�� Vim ������ 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [�� �������� ����-������ Vim]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "         ��� �����: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"           �������: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "��"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "���"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"      ������������: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "  ���������: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"         ���������: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"           �������: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (��� �����������)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [�� �������� ��� ������������� �� ���� ����������]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�� ��������]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�� �����������]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: ���������� �������� ����-����, ��������� �� �� ���������"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "����-���� �������"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: ��������� ������� ���������� ����-�����"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ������������ �������� lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: ���������� ����� ������ %<PRId64>"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: ������������ �������� ��������� ����� 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "�������� stack_idx ������ ���� ����� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: ��������� ������� ����� ������?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: ������������ �������� ��������� ����� 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "����� ���� 1?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: ������ %<PRId64> �� ����������"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: ������������ �������� ��������� �����"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "�������� pe_line_count ����� ����"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: ����� ������ �� ��������� ���������: %<PRId64>"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: ������������ �������� �������� ����� � ����� %<PRId64>"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "������ ����� ��������"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: ������������ �������� ��������� ����� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: ����� ���������� ������ ��� \"%s\""
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: ��������"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"��������� ����-���� � ������ \""
-
-# � ��������� �����, ����� ��������������� �� ����� �������� ����������.
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "��� �������� �����: \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "                    ����� ������, ��� ����-����!\n"
-
-#: ../memline.c:3244
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) ��������, �������������� ����� �� ����� ����������� � ������ ���������.\n"
-"    ���� ��� ���, �� ������ ����������� ��� �������� ���������, �����\n"
-"    � ��� �� ��������� ��� ������ �������� ������ � ���� �� �����."
-
-# ��������� ���������, " \n" ��������� �.�. ������ �� ����������.
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr ""
-" \n"
-"    ��������� ������ ��� ����������� � �������������.\n"
-
-#: ../memline.c:3246
-msgid "(2) An edit session for this file crashed.\n"
-msgstr "(2) ����� �������������� ����� ����� �������� ��������.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    � ���� ������, ����������� ������� \":recover\" ��� \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    ��� �������������� ��������� (��. \":help recovery\").\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    ���� �� ��� ��������� ��� ��������, ������� ����-���� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    ����� �������� ��������� ����� ��������� � �������.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "����-���� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" ��� ����������!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM � ��������"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "����-���� ��� ����������!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&O ������� ��� ������\n"
-"&E �������������\n"
-"&R ������������\n"
-"&Q �����\n"
-"&A ��������"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&O ������� ��� ������\n"
-"&E �������������\n"
-"&R ������������\n"
-"&D �������\n"
-"&Q �����\n"
-"&A ��������"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: ���������� ������� ����� ����-������"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �� ������� ������! (���������� %<PRIu64> ����)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ��������� ���� � �������� ���� �� �������� �������"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ���� � ���� ������ �� ����������"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: ��� ���� %s"
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: ������ ��� ����"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ���� � ���� �� ������ ����� � �������"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: �������� ���� ������ ��������� ��������������� � ������� ����"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ����������� �� ����� ���� ����������� ���� � ����"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- ���� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ���� � ���� ������ ����� � �������� ����"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: ���� �� �������: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: ���� �� ���������� ��� ������ %s"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ���� � ���� ������ ����� � �������"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: ���� �� ������� � ��������� ����� ����"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "���������� ������ ��� ��������� %s:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "������ %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ������������ ��� ��������: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"������� ��������� �� ������� ����: ������� ������� <vrr@users.sourceforge."
-"net>, ������ ����� <alyoshin.s@gmail.com>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "����������: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "������� ENTER ��� ������� ������� ��� �����������"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s ������ %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- ����������� ������� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: �����/��������/������ ����, b/u/k: �����, q: ����� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "������"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"&Y ��\n"
-"&N ���"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&��\n"
-"&���\n"
-"�&�����"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"&Y ��\n"
-"&N ���\n"
-"&A ��������� ���\n"
-"&D �������� ���\n"
-"&C ������"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: ������������ ���������� ��� printf()"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: �������� �������� ���� � ��������� ������ ��� printf()"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: ������� ����� ���������� ��� printf()"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ��������������: ��������� ����� � ������� ������ ��� ������"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "������� ����� � <Enter> ��� �������� ����� (����� ��� ������): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "������� ����� � <Enter> (����� ��� ������): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "��������� ���� ������"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "������ ���� ������"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "��������� �����: %<PRId64>"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "������ �����: %<PRId64>"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (��������)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "��-��!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "����� �������� ��� ����������: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: ��� ����� � ������� �������"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: ��������� ����� 'operatorfunc' �������� ������ ������"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "��������������: �������� �� ����� ��������� ���������"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: ��� ������ � ������� �������"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr ""
-"E352: ���������� ������� ������� � ������� ��������� ����� 'foldmethod'"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: ������ ��������� ������"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: � ������ ������ ���������"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: � ����� ������ ���������"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "������� :quit<Enter>  ��� ������ �� Vim"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "�������� ������� � 1 ������ (%s 1 ���)"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "�������� ������� � 1 ������ (%s %d ���)"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "�������� �������, %<PRId64> ����� (%s 1 ���)"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "�������� �������, %<PRId64> ����� (%s %d ���)"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "���������� ������� ������� (%<PRId64>)..."
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "������� ������ � ����� ������ "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "�������� ������� � ������� (%<PRId64>) "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: ��� ����������� ��������������� ��������"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "����������� �� �������, �������� ���������"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "�������� 1 ������"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "�������� �����: %<PRId64>"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "���������� ���� �� ����� ������"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "����������� ���� ������"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "���������� ���� �� �����: %<PRId64>"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "����������� �����: %<PRId64>"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: � �������� %s ������ ���"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- �������� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "������������ ��� ��������"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# ��������:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: ����������� ��� �������� %d"
-
-msgid ""
-"E883: search pattern and expression register may not contain two or more "
-"lines"
-msgstr ""
-"E883: ������ ������ � ������� ��������� �� ����� ��������� ���� ��� ����� "
-"�����"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "�������: %<PRId64>; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"�������� %s%<PRId64> �� %<PRId64> �����; %<PRId64> �� %<PRId64> ����; "
-"%<PRId64> �� %<PRId64> ����"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"�������� %s%<PRId64> �� %<PRId64> ���.; %<PRId64> �� %<PRId64> ����; "
-"%<PRId64> �� %<PRId64> ����.; %<PRId64> �� %<PRId64> ����"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"���. %s �� %s; ���. %<PRId64> �� %<PRId64>; ��. %<PRId64> �� %<PRId64>; ���� "
-"%<PRId64> �� %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"���. %s �� %s; ���. %<PRId64> �� %<PRId64>; ��. %<PRId64> �� %<PRId64>; "
-"����. %<PRId64> �� %<PRId64>; ���� %<PRId64> �� %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> � ������ BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=���. %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "���������� �� ������������� Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: ����������� �����"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: ����� �� ��������������"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: �� ����������� � �������� ������"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr "E846: ��� ������� �� ����������"
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: ����� = ��������� ������� �����"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: �� ���������� � termcap"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: ������������ ������ <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: �������� ����� 'term' �� ����� ���� ������ �������"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: �������� ����� 'backupext' � 'patchmode' �����"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: ����������� �� ��������� 'listchars'"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: ����������� �� ��������� 'fillchars'"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: ��������� ���������"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: ������ � ������� ������"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: ��������� ����� ����� <%s>"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: ��������� �������"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ���������� ������� �������� ��� '"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: �������� ���������� ������ ��� ������ ������� ������"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: ������������ ������ ����� <%c>"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: ��������� �������"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr ""
-"E537: �������� ����� 'commentstring' ������ ���� ������ ������� ��� "
-"��������� %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: ���������� ������������������ ���������"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: ������� ����� ���������"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ������������������ ������"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: ���� ������������� ��� ����"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: �������� ������� ������������� UTF-8, ������� ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: ����� ���� �� %d �����"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: ����� ���� �� %d �������"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: ����������� �����: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: ��������� ������� �����: &%s = '%s'"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- ������������ ���� ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- ���������� �������� ����� ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- ������� �������� ����� ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- ����� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: ������ get_varp"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': ��� ���������������� ������� ��� %s"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': ������ ������� ����� ����� � �������: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"���������� ��������� �������� "
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"�������� ��������� ������ "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"���������� �������� �������� ������������ ��� "
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"���������� ���������� �������� ������������ ��� "
-
-msgid "Could not set security context "
-msgstr "���������� ���������� �������� ������������ "
-
-msgid " for "
-msgstr " ��� "
-
-#. no enough size OR unexpected error
-msgid "Could not get security context "
-msgstr "���������� �������� �������� ������������ "
-
-msgid ". Removing it!\n"
-msgstr ". ����� �����!\n"
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ���� \"%s\" �� ������ �� ��������� �����"
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: � ������ ������� ������� ����� %%%c"
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: ����������� ������� %%%c � ������ �������"
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: � ������ ������� ��������� ]"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: %%%c �� �������������� � ������ �������"
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: ������������ %%%c � ��������� � ������ �������"
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: ������������ %%%c � ������ �������"
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: � �������� ����� 'errorformat' ����������� ������"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: ��� �������� �� ������ ��� ����� ������ ������"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: ������ ��� ���������"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d �� %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (������ �������)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: ����� ����� ������� �����������"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: ������� ����� ������� �����������"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "������ ������ %d �� %d; %d ������"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr ""
-"E382: ������ ����������, �������� ����� 'buftype' �� �������� ������ �������"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: ��� ����� ����� ��� ������������ ������"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "���������� ������� ���� \"%s\""
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: ����� �� ��������"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: ��������� ������ ��� ������"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: ������������ ������� � %s%%[]"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: ��������� ] ����� %s["
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: ��� ���� ��� %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: ��� ���� ��� %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: ��� ���� ��� %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( �� ����� ���� ������������ �����"
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 � �.�. �� ����� ���� ������������ �����"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: ��������� ] ����� %s%%["
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: ������ %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: ������� ������� ������"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: ������� ����� \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: ������� ����� %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: ��� ���� ��� \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: ������������ ������ ����� %s@"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ������� ����� ������� ����������� %s{...}"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: ��������� %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: ��������� %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: ������������ ������������� \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c �� �� ��� �� �������"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: ������������ �������� ������"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: ������������ ������ ����� \\z"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: ������������ ������ ����� %s%%[dxouU]"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: ������������ ������ ����� %s%%"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: �������������� ������ � %s{...}"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "������� ���������������:\n"
-
-#, c-format
-msgid "E888: (NFA regexp) cannot repeat %s"
-msgstr "E888: (���. ��������� ���) ���������� ��������� %s"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: ����� \\%#= ����� ���� ������ 0, 1 ��� 2. ����� �������������� "
-"�������������� ������"
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (���) ����������� ����� ����������� ���������"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (���. ��������� ���) ����������� %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (���) ����������� �������� '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (���) ����������� �������� '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (���) ����������� �������� '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr "E870: (���. ��������� ���) ������ ��� ������ ������ ����������"
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (���. ��������� ���) ��������� �� ����� ��������� �� ����������!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (���. ��������� ���) ������� ����� '('"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (���. ��������� ���) ������� ����� \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (���. ��������� ���) ������ ����������� ����������"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (���. ��������� ���) ���������� ����� �� �����!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (���. ��������� ���) � ����� �������� ������� ����� ��������� (��� "
-"�������������� �� postfix � ���)"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (���. ��������� ���) ������������ ����� ��� �������� ����� ���"
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"���������� ������� ���� ���������� ������� ��� ������, ����� �� stderr..."
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(���) ���������� ������� %s!"
-
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "���������� ������� ���� ���������� ������� ��� ������"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " ����������� ������"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " ������"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ��������"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " �������"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (�������)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (������)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (����������� ������)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " �����"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " ��������"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (�������)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " ���������� �����"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " ���������� ������"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " ���������� ����"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ���������"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ��������� ������"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ��������� �����"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "������"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: ������������ ������ ������: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ����� �������� � ������ ���������; %s �� �������"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ����� �������� � ����� ���������; %s �� �������"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ����� ';' ��������� ���� '?' ��� '/'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (�������� ������ ���������� ������������)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- ���������� ����� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "�� ������� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "�� ���� ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr " (��� ��������)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr " �� �������"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "�������� ���������� ������: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "����� ����������� ����� %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: ������������ � ������� ������"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "������� ��� ���������� �����"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "���������� ������ ���"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: ����������� �� �������"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: ������ �� ������"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "������ "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# ��������� %s������ ������:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ������ ������� � ����� ������������"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: ���� ������������ �������"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "������ ����� �� ������ � %s ���. %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "��� ������� ������� ������� � %s, ������ %d: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: ������ ������� � ����� �������� FOL, LOW ��� UPP"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: ������� � FOL, LOW ��� UPP �� ��������� ���������"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "������ ������ ����..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: �������� ������������ ���������"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"��������������: ���������� ����� ������ ���� \"%s.%s.spl\" ��� \"%s.ascii.spl"
-"\""
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "������ ����� ������������ \"%s\""
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: ��� �� ������ �� ���� ������������"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: ������ ���� ������������, ��������� ��� ����������"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: ���� ������������ ������������ ��� ����� ����� ������ Vim"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: ���������������� ������ � ����� ������������"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "��������������: ������ %s �� ��������������"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "������ ����� �������� %s ..."
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "�� ������� ������������� ����� � %s, ������ %d: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "�������������� � %s �� ��������������: �� %s � %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "������������ �������� FLAG � %s, ������ %d: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "FLAG ����� ������������� ������ � %s, ������ %d: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"����������� COMPOUNDFORBIDFLAG ����� �������� PFX ����� ���� ������������ "
-"���������� � %s, ������ %d"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"����������� COMPOUNDPERMITFLAG ����� �������� PFX ����� ���� ������������ "
-"���������� � %s, ������ %d"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "������������ �������� COMPOUNDRULES � %s, ������ %d: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "������������ �������� COMPOUNDWORDMAX � %s, ������ %d: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "������������ �������� COMPOUNDMIN � %s, ������ %d: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "������������ �������� COMPOUNDSYLMAX � %s, ������ %d: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "������������ �������� CHECKCOMPOUNDPATTERN � %s, ������ %d: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr ""
-"������ ������������ ���� � ������������ ����� ������� � %s, ������ %d: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "������������� ������ � %s, ������ %d: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"������ ����� ������������ ��� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/"
-"NOSUGGEST � %s, ������ %d: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "��������� Y ��� N � %s, ������ %d: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "���������� ������� � %s, ������ %d: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "�������� ������� REP(SAL) � %s, ������ %d"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "�������� ������� MAP � %s, ������ %d"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "������������� ������ � MAP � %s, ������ %d"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "�������������� ��� ������������� ������� � %s, ������ %d: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "��������� ������ FOL/LOW/UPP � %s"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "COMPOUNDSYLMAX ������������ ��� SYLLABLE"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "������� ����� ���������� ���������"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "������� ����� ��������� ������"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "������� ����� ���������� ��������� �/��� ��������� ������"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "��������� ������ SOFO%s � %s"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "��� ������ SAL � SOFO � %s"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "���� �� �������� ������ � %s, ������ %d: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "������������ ���� � %s �� ������ %d: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "%s ����� ������ ��������, ��� � ����� .aff"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "������ ����� ������� %s ..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: ���������� ���� �� ������� � %s"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "������ %6d, ����� %6d � %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "������ ����� � %s �� ������ %d: %s "
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "������ ������ ����� � %s �� ������ %d: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d ������������� ���� � %s"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "��������� %d ���� � �� ASCII ��������� � %s"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "������ ����� ���� %s ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "��������������� ������������� ������ /encoding= � %s, ������ %d: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "��������������� ������ /encoding= ����� ����� � %s, ������ %d: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "������������ ������ ������ /regions= � %s, ������ %d: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "������� ����� �������� � %s, ������ %d: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "/ ������ ������������ � %s, ������ %d: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "������������ ����� ������� � %s, ������ %d: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "�������������� ����� � %s, ������ %d: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "��������� %d ���� � �� ASCII ���������"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "����� %d �� %d �����; �������� %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "������ ����������� ����� ������������..."
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "���������� �������� ������..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "���������� ���� ����� �������� ������: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "����� ���������� ����: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "������ ����� ����������� ����������� ������������ %s"
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "������ ������������� ������ ��� ����������: %d ����"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: ��� ��������� ����� �� ������ ��������� �������� �������"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: �������������� �� ����� 8-�� ��������"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: ������������ ������ � %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "��������������: ��� ��������� � ������� NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "������ ����� ������������ %s ..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "���������!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' �� �������� %<PRId64> ���������"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "����� ������� �� %s"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "����� ��������� � %s"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: ������� ���� ���������� � ������ ������������"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��������, ��� �������������"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��������, ������ %<PRId64> �������������"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "�������� \"%.*s\" ��:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ��� ���������� ������ ������������"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: �� �������: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: ��� �� ������ �� ���� .sug: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ������ ���� .sug, ������� ����������: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ���� .sug ��� ����� ����� ������ Vim: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: ���� .sug �� ������������� ����� .spl: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: ������ ��� ������ ����� .sug: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: ������������� ������ � �������� MAP"
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "�������������� �������� ��� ������� ������ �� ����������"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: ������������ ��������: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �������������� ������� %s �� ������"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "������������� �� ������������ � ����� ����� C"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "��� �������������"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "������������� ������ "
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " ����� ����� ������� �������"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �������� ������������� ���������� ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"������������� �� ���������"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �������������� �������� ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: �������������� ������� %s �� ������"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "������� "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "�������� "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; ������������ "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr " ��������� �����"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ����� ������ ������������ �������� contains"
-
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: ������������ �������� cchar"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ����� ������ ������������ group[t]here"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: ������� ������� ��� %s �� ������"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: ��������� ������� ��� �����"
-
-#: ../syntax.c:4221
-msgid "E847: Too many syntax includes"
-msgstr "E847: ������� ����� �������������� ���������"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ��������� ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: ��������� '=': %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: �� ������� ����������: �������������� ������ %s"
-
-#: ../syntax.c:4870
-msgid "E848: Too many syntax clusters"
-msgstr "E848: ������� ����� �������������� ���������"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: ������� �� ������"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: �� ������ ����������� ��������: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: ����� ����� �������: %s"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr ""
-"E403: ������������� ����������: ������ ����������� ������ ������ ������"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: ������������ ���������: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: �������� ���� ���������: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: ������ ��������: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s �� ����������� � ���� �����"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s ������ ���� ������ � ������ contains"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: ����������� ������: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ������������ ���������� :syntax: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-"  �����       ���.  �����. ���������    �������    ���                ������"
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: ����������� ����� ��� �������� syncolor.vim"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: ������ ��������� ���������� %s �� �������"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: �� ������� ����������: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ������� ����� ����������: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: � ������ ���� ���������, ������������ highlight link"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ����������� ���� ���������: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: �������� ���� ���������: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: �������� ��������: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ������������ ��������: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: ����������� ���� ������"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: ����������� ���� ����"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: ��� ��� ����� ����� �� ��������: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: ������� ������� ��� ���������: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: ������������ ��������: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ������������ ������� ����� ������ ��������� ��������� ����������"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: ���������� ������ � ����� ������"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: ������������ ������ � ����� ������"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: ������� ����� ����� ��������� � ����������"
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: ����� ����� �����"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: ������� ����� �����"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: ���������� ������� � ������� �� ������ ����������� �����"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: ����� �� �������: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # ��� ���  �����"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "����\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: ���� ������ ���� ����������� �����"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: ���������� ������� � ������� �� ��������� ����������� ������"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "���� \"%s\" �� ����������"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "����� %d �� %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " � �����"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr " ������������ ����� � ��������� � ������ ��������!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: ���� \"%s\" �� ����������"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # �  �����       ��   ���.  � �����/������"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "����� � ����� ����� %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "������������� ������� ������ � ����� tags"
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: ������ ������� � ����� ����� \"%s\""
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "����� ������ %<PRId64>"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: ���� ����� �� ������������: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: ���� ����� �� ���������"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �� ������ ������ �����"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: ����� �� �������, �������� �������!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "������������� ��� ����: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' �� ��������. �������� ���������� ���������:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "�� ��������� '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: ���������� ������� ���� termcap"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: � terminfo ��� ������ �� ���� ���������"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: � termcap ��� ������ �� ���� ���������"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: � termcap ��� ������ \"%s\""
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ��������� ����������� ��������� \"cm\""
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- ������ ��������� ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: ������ ������ �����, �����...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: ���������� ��������� ������� �����"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: ���������� ������� ���� ����� ��� ������: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: ���� ����� �������� (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "���������� �������� ���� ����� � �����-���� �������� �� 'undodir'"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "���� ����� �� �����������, ���������� ���������: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "���������� �� ���������, ��� �� ���� �����: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "��������� ������ ����� �����, ������ ��������"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "������ ����� �����: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: ������ ��� ������ ����� �����: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "���� ����� �� ��������, ������ ��������: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "������ ����� �����: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: ���������� ������� ���� ����� ��� ������: %s"
-
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: ��� �� ���� �����: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: ������������� ���� �����: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "���������� ���������� �����, ���������� ������������ ���������� �����"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "��������� ������ ����� ����� %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "��� �� ����� ������ ���������"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "��� �� ����� ��������� ���������"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: �� ������� ������ ����� %<PRId64>"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: ������������ ������ �����"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "���. ���������"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "���. ���������"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "���. �������"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "���. �������"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "���."
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "���."
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "�����"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "�����"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "������ ��������"
-
-# ��������� ������� :undolist
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr " �����  �����.  �����              ���������"
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> � �����"
-
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: ����������� ����� �� ����������� ����� ������"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: �������� ������ ������"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: �������� ������ ������"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"��������: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"�������������� ��������: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "� �����������, ��������� "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"������������� "
-
-#: ../version.c:649
-msgid "by "
-msgstr " "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"�������� ������ "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "��� ������������ ����������."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  ���������� (+) � ����������� (-) �����������:\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "            ������������� ���� vimrc: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "         ���������������� ���� vimrc: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr "  ������ ���������������� ���� vimrc: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr "  ������ ���������������� ���� vimrc: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "          ���������������� ���� exrc: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "   ������ ���������������� ���� exrc: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "          �������� $VIM �� ���������: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "   �������� $VIMRUNTIME �� ���������: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "��������� ����������: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "������: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ���������� ������"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM � Vi IMproved (���������� Vi)"
-
-#: ../version.c:769
-msgid "version "
-msgstr "������ "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "���� ��������� � ������"
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim ��� �������� ���������������� ��������� � �������� �����"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "������ ����� � ������ ����� ���� ������!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "�������� :help iccf<Enter>       ��� �������������� ����������"
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "�������� :q<Enter>               ����� ����� �� ���������     "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "�������� :help<Enter> ��� <F1>   ��� ��������� �������        "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�������� :help version7<Enter>   ����� ������ �� ���� ������  "
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "������ � Vi-����������� ������"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "�������� :set nocp<Enter>        ��� �������� � ����� Vim     "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�������� :help cp-default<Enter> ��� �������������� ����������"
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "�������� � ���������� Vim!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "������� ������������������ ������������� Vim!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "�������� :help sponsor<Enter>    ��� ��������� ����������     "
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "�������� :help register<Enter>   ��� ��������� ����������     "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "���� �������->������/����������� ��� ��������� ����������       "
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�� ������ ����� ���� ����"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: ���� ������������� �����������"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ���� �� ����� ���� ������������ ����� ������ � ������ �����"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: ���������� �������� �������, ���� ������ ���� ���������"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: ������ ������� ��������� ����"
-
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: ������ ������� ���� ����������"
-
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: ������ ������� ����, ��������� ������ ���� ����������"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: � ������ ���� ���� ������������� ���������"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: ��� ����� ����� � ������� �������"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() ������ � ������ �������"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr ""
-#~ "E817: ������������ ������������� ���������/������� ������� ���� � Blowfish"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: �� ������� ��������� ���� sha256"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: �� ������� ��������� ���� Blowfish"
-
-#~ msgid "Patch file"
-#~ msgstr "����-��������"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&OK\n"
-#~ "&C ������"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: ��� ����� � �������� Vim"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: �� ���� ��������� ��������� ��� %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: ������ �� ��������"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �� ���� �������� �������"
-
-#~ msgid "Save As"
-#~ msgstr "��������� ���"
-
-#~ msgid "Edit File"
-#~ msgstr "�������������� �����"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�� �������)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "��������� �������� Vim"
-
-#~ msgid "unknown"
-#~ msgstr "����������"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "������������� ���� � ����� ����"
-
-#~ msgid "Append File"
-#~ msgstr "�������� ����"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "��������� ����: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "��������������� ������"
-
-#~ msgid "Save View"
-#~ msgstr "���������� ����"
-
-#~ msgid "Save Session"
-#~ msgstr "���������� ������"
-
-#~ msgid "Save Setup"
-#~ msgstr "���������� ��������"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< �� �������� ��� ����������� +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: � ���� ������ ������� �� ��������"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "�������� ����������� (��������� ��� ����� 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "������ �� ������������ ������ ����� stdin..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�����������]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: ���� ���������� ����������� �������"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans �� ��������� ��������� ������ ������������ �������"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "��������� ������ ������� NetBeans �� �����������"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "������ � ���������� ��������� ��� ����� 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr ""
-#~ "E460: ����� ������� ����� �������� (�������� !, ����� ������ ��������)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: ���������� ������� ����� ������� ��� ����. ����������"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: ��������-������� �� ������� ��������� ����. ���������"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: ���������� ������� � ����� ������������ ����������"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: ���������� ��������� ������ \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: ���������� ������� � ����� ����. ����������, ����������� ������ "
-#~ "������"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: ������������ �������� ����� 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: ������������ �������� ����� 'imactivatekey'"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: ���������� ��������� ���� %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "��� ���������� ��� ��������, ����� ����������"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<������ �������> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: ����� %s �� ������"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ������� � ������� ������� ����������"
-
-#~ msgid "Pathname:"
-#~ msgstr "���� � �����:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: �� ���� ����� ������� �������"
-
-#~ msgid "OK"
-#~ msgstr "��"
-
-#~ msgid "Cancel"
-#~ msgstr "������"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "������ ���������: �� ���� ���������� ��������� ��������"
-
-#~ msgid "Vim dialog"
-#~ msgstr "���������� ���� Vim"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr ""
-#~ "E232: \"������\" ��� ����������, ���������� � ���������, � �������� "
-#~ "�����, �� ����� ���� ������"
-
-#~ msgid "Input _Methods"
-#~ msgstr "������ �����"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM � ����� � ������..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM � �����..."
-
-#~ msgid "Find what:"
-#~ msgstr "��� ����:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�� ��� ��������:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "������ ������ ������������"
-
-#~ msgid "Match case"
-#~ msgstr "����������������� ������������"
-
-#~ msgid "Direction"
-#~ msgstr "�����������"
-
-#~ msgid "Up"
-#~ msgstr "�����"
-
-#~ msgid "Down"
-#~ msgstr "����"
-
-#~ msgid "Find Next"
-#~ msgstr "����� ���������"
-
-#~ msgid "Replace"
-#~ msgstr "������"
-
-#~ msgid "Replace All"
-#~ msgstr "�������� ���"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: ������� ������ �� ����������� ������ �� ���������� �������\n"
-
-#~ msgid "Close"
-#~ msgstr "�������"
-
-#~ msgid "New tab"
-#~ msgstr "����� �������"
-
-#~ msgid "Open Tab..."
-#~ msgstr "������� �������..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �������� ���� ���� ���������� �������\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&������"
-
-#~ msgid "&Cancel"
-#~ msgstr "�&�����"
-
-#~ msgid "Directories"
-#~ msgstr "��������"
-
-#~ msgid "Filter"
-#~ msgstr "������"
-
-#~ msgid "&Help"
-#~ msgstr "&�������"
-
-#~ msgid "Files"
-#~ msgstr "�����"
-
-#~ msgid "&OK"
-#~ msgstr "&��"
-
-#~ msgid "Selection"
-#~ msgstr "���������"
-
-#~ msgid "Find &Next"
-#~ msgstr "����� &���������"
-
-#~ msgid "&Replace"
-#~ msgstr "��&����"
-
-#~ msgid "Replace &All"
-#~ msgstr "�������� &���"
-
-#~ msgid "&Undo"
-#~ msgstr "�&�����"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: ���� � ���������� \"%s\" �� ����������"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �������� �� ��������������: \"-%s\"; ����������� ������ OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: ���������� ������� ���� ������ ���������� MDI"
-
-#~ msgid "Close tab"
-#~ msgstr "������� �������"
-
-#~ msgid "Open tab..."
-#~ msgstr "������� �������..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "����� ������ (����������� '\\\\' ��� ������ '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "����� � ������ (����������� '\\\\' ��� ������ '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "�� ������������"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "�������\t*.������\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: ���������� �������� ������ � ������� �����, ��������� ����� "
-#~ "����� ������������ �����������"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: � ������ ������� %s ����������� ������ ��� ��������� ���������:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: ����� �������: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "����� '%s' �� �������� ������������"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: ����� �������: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "Font0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "Font1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr ""
-#~ "������ ������ font%<PRId64> ������ ���� ����� ������ ������ ������ font0"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "������ ������ font0: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "������ ������ font1: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "������������ ����������� ������"
-
-#~ msgid "&Dismiss"
-#~ msgstr "�&��������"
-
-#~ msgid "no specific match"
-#~ msgstr "��� ������������ ����������"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim � ����� ������"
-
-#~ msgid "Name:"
-#~ msgstr "��������:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "���������� ������ � �������"
-
-#~ msgid "Encoding:"
-#~ msgstr "���������:"
-
-#~ msgid "Font:"
-#~ msgstr "�����:"
-
-#~ msgid "Style:"
-#~ msgstr "�����:"
-
-#~ msgid "Size:"
-#~ msgstr "������:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ������ ���������� ������"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: ������ stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: ���������� ������� ���� ������ cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: ���������� � ���� ������ cscope �� ��������"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "���������� Lua �� ����� ���� ���������."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "���������� ��������� ���������� �� ������ ��������"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: � ��������� ��� ������� �� ��������, ��������� �� ��������� "
-#~ "���������� MzScheme"
-
-#~ msgid "invalid expression"
-#~ msgstr "������������ ���������"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "��������� ��������� ��� ����������"
-
-#~ msgid "hidden option"
-#~ msgstr "������� �����"
-
-#~ msgid "unknown option"
-#~ msgstr "����������� �����"
-
-#~ msgid "window index is out of range"
-#~ msgstr "������ ���� �� ��������� ���������"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "���������� ������� �����"
-
-#~ msgid "cannot delete line"
-#~ msgstr "���������� ������� ������"
-
-#~ msgid "cannot replace line"
-#~ msgstr "���������� �������� ������"
-
-#~ msgid "cannot insert line"
-#~ msgstr "���������� �������� ������"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "������ �� ����� ��������� ������ ����� ������"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "���������� ������������� �������� Scheme � Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "������ Vim: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "������ Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "������������ �����"
-
-#~ msgid "window is invalid"
-#~ msgstr "������������ ����"
-
-#~ msgid "linenr out of range"
-#~ msgstr "����� ������ �� ��������� ���������"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "�� ����������� � ��������� Vim"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr ""
-#~ "E836: ������ Vim �� ����� ��������� :python ����� ������������� :py3"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: � ��������� ��� ������� �� ��������, ��������� �� ��������� "
-#~ "���������� Python"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: ���������� ��������� ����������� ����� Python"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr ""
-#~ "E837: ������ Vim �� ����� ��������� :py3 ����� ������������� :python"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ ������ ���� ����������� ��� �������"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: � ��������� ��� ������� �� ��������, ��������� �� ��������� "
-#~ "���������� Ruby"
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: ����������� return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: ����������� next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: ����������� break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: ����������� redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: retry ��� ��������� rescue"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: �������������� ����������"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: ����������� ��������� longjmp %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "������������ ����� �����������/������������"
-
-#~ msgid "Show base class of"
-#~ msgstr "�������� �������� �����"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "�������� ������������� �������"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "�������� �� �����"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�������� �� �������"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "�������� �� ���� ��������"
-
-#~ msgid "Retrieve"
-#~ msgstr "��������"
-
-#~ msgid "Show source of"
-#~ msgstr "�������� �������� ���"
-
-#~ msgid "Find symbol"
-#~ msgstr "����� ������"
-
-#~ msgid "Browse class"
-#~ msgstr "�������� ������"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "�������� ����� � ��������"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "�������� ����� � ������������ ��������"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ��������� ��"
-
-#~ msgid "Xref referred by"
-#~ msgstr "������ �� xref ��"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref �����"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref ������������"
-
-#~ msgid "Show docu of"
-#~ msgstr "�������� docu"
-
-#~ msgid "Generate docu for"
-#~ msgstr "������� docu"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "���������� �������������� � SNiFF+. ��������� ��������� ���������."
-#~ "(sniffemacs ������ ���� ������� � ���������� $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: ������ �� ����� ������. ������������"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "� ��������� ������ SNiFF+ "
-
-#~ msgid "not "
-#~ msgstr "�� "
-
-#~ msgid "connected"
-#~ msgstr "�����������"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ����������� ������ SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: ������ ���������� �� SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ �� �����������"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: ��� �� ����� SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: ������ �� ����� ������. ������������"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "������������ ����� ������"
-
-#~ msgid "not implemented yet"
-#~ msgstr "���� �� �����������"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "���������� ��������� ������ ��� ������"
-
-#~ msgid "invalid mark name"
-#~ msgstr "������������ ��� �������"
-
-#~ msgid "mark not set"
-#~ msgstr "������� �� �����������"
-
-#~ msgid "row %d column %d"
-#~ msgstr "��� %d ������� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "���������� �������� ��� �������� ������"
-
-#~ msgid "line number out of range"
-#~ msgstr "����� ������ �� ��������� ���������"
-
-#~ msgid "unknown flag: "
-#~ msgstr "����������� ����: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "����������� vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "������������ ����������"
-
-#~ msgid "vim error"
-#~ msgstr "������ VIM"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "���������� ������� ������� ������ ��� ����: ������ � �������� ��������"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "���������� ���������������� ������� � �������� �������: ����� ��� ���� � "
-#~ "�������� ��������"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: ����������� ������ TCL: �������� ������ ������?! �������� �� ���� "
-#~ "�� ������ vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "���������� ���������������� ������� � �������� �������: ������ �� ����� "
-#~ "��� ���� �� ����������"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: � ��������� ��� ������� �� ��������, ��������� �� ��������� "
-#~ "���������� Tcl"
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: ��� ������ %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "���������� �������� ������"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "���������� ���������������� ��� ������� ������"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �� ������� �������� ������� � ������ ���������"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ������������ ������������ id �������: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: ����������� ������������ �������� ������� �������� VIM � �������. "
-#~ "�������!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "NetBeans �� �������������� � ���� ����������� �����������\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr ""
-#~ "������ Vim ��� ������������� � ����������� ������������ ��������� �������"
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "���������� ������������ '-nb': �� �������� ��� ����������\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ������: �� ������� ��������� gvim �� NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "���� ������� ������������, �������� ����� ������ / ��� �������� ��������"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t���������������� ���� gvim ��� OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\t��������� ����������� ������� gvim ��� OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\t��������� � ����������� ����������� (��� \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr ""
-#~ "-f  ��� --nofork\t� �������� ������: �� ��������� fork ��� ������� GUI"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t�� ������������ newcli ��� �������� ����"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <����������>\t\t������������ ��� I/O ��������� <����������>"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t������������ <gvimrc> ������ ����� ������ .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�������������� ������������� ������"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <�����>\t������������ VIM � ���������� X-�������"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t�� ��������� ���������� � �������� X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <�����>\t�� ����������� ������������� <�����> �� ������� Vim"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <�����>  �� ��, �� ��� ����� �� ���������� �������"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <�����>  �� ��, ��� � --remote, �� � ��������� ����������"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <�����>  �� ��, �� ��� ����� �� ���������� �������"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <�����>  �� ��, ��� � --remote, �� � "
-#~ "���������"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <������>\t��������� <������> �� ������ Vim � �����"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <�����>\t��������� <�����> �� ������� Vim � ����������"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr ""
-#~ "--serverlist\t\t�������� ������ ��� �������� Vim � ��������� ������"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr ""
-#~ "--servername <���>\t��������� ��/����� �������� Vim � ��������� <������>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (������ Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (������ neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (������ Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <�������>\t��������� VIM �� ��������� <�������>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t��������� VIM � �������� ����"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr ""
-#~ "-background <����>\t������������ ��������� <����> ��� ���� (�����: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <����>\t������������ <����> ��� �������� ������ (�����: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr ""
-#~ "-font <�����>\t\t������������ <�����> ��� �������� ������ (�����: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <�����>\t������������ <�����> ��� ������� ������"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <�����>\t������������ <�����> ��� ���������� ������"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <���������>\t������������ ��������� <���������> (�����: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <������>\t������������ <������> ������� (�����: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <������> ������������ ������ ������ ��������� (�����: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <������>\t������������ <������> ���� (�����: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t������������ ��������� ���������� (�����: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t�� ������������ ��������� ���������� (�����: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <������>\t���������� ��������� <������>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (������ GTK+):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr ""
-#~ "-display <�������>\t��������� VIM �� ��������� <�������> (�����: --"
-#~ "display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
-#~ "--role <����>\t���������� ���������� <����> ��� ������������� �������� "
-#~ "����"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t������� Vim ������ ������� ���������� GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr ""
-#~ "--echo-wid\t\t������� Window ID ��� gvim �� ����������� ����� ������"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <��������� ��������>\t������� Vim � ������������ ����������"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t������� Vim ������ ������� ���������� win32"
-
-#~ msgid "No display"
-#~ msgstr "��� �������"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �������� �� �������.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": �������� �� �������. ������� �������� ����������\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "��������������� %d �� %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "��� �������: �������� ��������� �� �������.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": �������� ��������� �� �������.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ������������ ��� ���������"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: ���������� ��������� �������� ��������� �����"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: ���������� ������� �������� �����"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: ��������� ������� ������� ����� �����"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: ��������������: ���������� ��������� ���. ����� ����������� ������ "
-#~ "�����"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ����� ����� �� ������������ �����"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr ""
-#~ "E289: ����� ����� �� ������������ ��� ��� ���������������� ��������������"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: ������ ��� ���������� ���������� ����-�����"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s ����������, � ��� ������ Vim �� ������������ ����������"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "����-���� ����������: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "���� �� ����� ����� ������ ��� ����������, �� �� �������� ��������� ����,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "�� ������� ����� ������ ��� ����������."
-
-# ������� ��������� ������� �� ��� �����, ����� ������
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "���� �� �������� ��������� ���� ����� ��������� ������ ����������, �� "
-#~ "�������"
-
-# ������� ��������� ������� �� ��� �����, ����� ������
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "Enter ��� ������������� ������ ����� ��� ���������� ����� � ����-�����"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr ""
-#~ "������������� ����� ���������� �� ����-����� ��� ���������� �����.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�� �������� ��� ������������� � ������ ������� Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "�������� ��� ����"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "����� ��������"
-
-#~ msgid "Save File dialog"
-#~ msgstr "���������� �����"
-
-#~ msgid "Open File dialog"
-#~ msgstr "�������� �����"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: ��������, �� � ���������� ������ ��� ���������� �� �������� �������"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: ���������� ������...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ������.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "������: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[����] ����� �����.-�����. %<PRIu64>-%<PRIu64>, �������. %<PRIu64>, ����. "
-#~ "�������. %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[������] re/malloc() ����� %<PRIu64>, free() ����� %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: ������ ���������� ������� �������"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: ���������� ������: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ������������ ����� �������"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "������� ������ ��� ����������: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "��������� ���� ������: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "�������� ������ �� ���������!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "���������� ����������� � NetBeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "���������� ����������� � NetBeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: ������������ ����� ������� � ���������� � ���������� � NetBeans: "
-#~ "\"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "������ �� ������ NetBeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �������� ���������� � NetBeans ��� ������ %<PRId64>"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeans �� �������������� � ���� ����������� �����������"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: ��� �������� � NetBeans"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr ""
-#~ "E505: %s ������ ������ ��� ������ (�������� !, ����� ������ ��������)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: eval �� ��������"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "������� �����: %<PRId64>"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: � ����������� ���������� �������� �������� ����������"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: ��� ������� ������������ ���������� ����������� \":gui\""
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: �� ����� ���� �������� � ����������� ���������� GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: ������������ ������"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: ���������� ������� ��������� �����"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ������������ ��������� �����"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ���������� ������� ����� � ��������� ������� ������"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ������������ ����� � ��������� ������� ������"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ���� �� ��������������"
-
-#~ msgid "cannot open "
-#~ msgstr "���������� ������� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ���������� ������� ����!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "���������� Amigados ������ 2.04 ��� ����� �������\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "���������� %s ������ %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "���������� ������� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "���������� ������� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "����������� ������ Vim � ����� %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "���������� ������� ����� �������?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: �� � �������??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: ���������� ��������� �������� � ���������� -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "���������� ��������� "
-
-#~ msgid "shell "
-#~ msgstr "�������� "
-
-#~ msgid " returned\n"
-#~ msgstr " ��������� ������\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "������� ����� �������� ANCHOR_BUF_SIZE."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "������ �����/������"
-
-#~ msgid "Message"
-#~ msgstr "���������"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr ""
-#~ "�������� ����� 'columns' �� ����� 80, ������� ��������� �� �����������"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: ��������� ���������� ������ ��������"
-
-#~ msgid "to %s on %s"
-#~ msgstr "� %s �� %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: ����������� ����� ��������: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: ������ ������: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "������ '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: ������������ ��� ��������� \"%s\" � ����� ������ \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: ������������ ������ '%c' � ����� ������ \"%s\""
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: ������� ������, ���������� ������\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: ������� ������������ ������ %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: ������� ������������ ������\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "�������� ������� X ������ %<PRId64> msec"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: ������ X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "�������� ������� X ��������� ��������"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "�������� ������� X �� ��������� � ��������� �����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ��������� �������� sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ������� �����\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ��������� fork()\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ������� ��������\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ������� ���������� ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "��������� �������� ������� X"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ������������ ������ ��������������"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ��������� ����������"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP �������� �������� �� ����������� ICE"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP �������� ��������� SmcOpenConnection: %s"
-
-#~ msgid "At line"
-#~ msgstr "� ������"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "���������� ��������� vim32.dll!"
-
-#~ msgid "VIM Error"
-#~ msgstr "������ VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "���������� ��������� ��������� ������� ��� DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "���������� ������ �������� � ����� %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: ����������� ������� %s\n"
-
-#~ msgid "close"
-#~ msgstr "��������"
-
-#~ msgid "logoff"
-#~ msgstr "����������"
-
-#~ msgid "shutdown"
-#~ msgstr "����������"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: ������� �� �������"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE �� ������ � ����, �������� � $PATH.\n"
-#~ "������� ������� �� ����� ��������������� ����� ����������.\n"
-#~ "�������������� ���������� � :help win32-vimrun"
-
-#~ msgid "Vim Warning"
-#~ msgstr "�������������� Vim"
-
-#~ msgid "Error file"
-#~ msgstr "���� ������"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: ������ ��� �������� ��� � ������� ���������������!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (���) ���������� �������� ������ ��� ������� �����!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "��������������: ���������� ����� ������ ���� \"%s_%s.spl\" ��� \"%s_ascii."
-#~ "spl\""
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "�������������� � %s �� ��������������"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: ������������ ����������� ������, ������ ���� ����� �� �����"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: ���� � ����� ����� %s �������\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "������ ����� ��������\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "������ ������� ��������� ������������ CUT_BUFFER0"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "������ ����������; ���������� ����������"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: �� ������������� ���� ����� ������������� ���� �����: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: �� ������� ����������� ���� �����: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: ���� ����� ����������: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ � ����������� ����������� ��� MS-Windows 16/32 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ � ����������� ����������� ��� MS-Windows 64 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ � ����������� ����������� ��� MS-Windows 32 ���"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " � ������ Win32"
-
-#~ msgid " with OLE support"
-#~ msgstr " � ���������� OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ������ ��� MS-Windows 64 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "���������� ������ ��� MS-Windows 32 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MS-Windows 16 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MS-DOS 32 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MS-DOS 16 ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MacOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "������ ��� OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "������� ������ "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "������� ������ "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "����� ������ "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "������ \"�����\" "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "� ����������� ����������� GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "� ����������� ����������� GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "� ����������� ����������� X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "� ����������� ����������� X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "� ����������� ����������� X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "� ����������� ����������� Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "� ����������� �����������."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "� ����������� ����������� Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "� ����������� ����������� Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "� ������������ ����������� �����������."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "           ������������� ���� gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "        ���������������� ���� gvimrc: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr " ������ ���������������� ���� gvimrc: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr " ������ ���������������� ���� gvimrc: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "             ������������� ���� ����: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "����������: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "���� �������->������             ��� ��������� ����������     "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "����������� ������, ������� ��������� ������"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr ""
-#~ "���� ������->���������� ���������->����� �������                     "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                                 ��� ���� �������               "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr ""
-#~ "���� ������->���������� ���������->������������� � Vi                "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                                 ��� �������� � ����� Vim       "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "��������������: ���������� Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "�������� :help windows95<Enter>  ��� ��������� ����������     "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: ���������� ��������� ���������� %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "��������, ������ ������� ���������: ���������� ��������� ���������� Perl"
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: �� ����������� ���������� Perl � ��������� ��� ������ ������������"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "������������� � &������ Vim-��"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "������������� � &����� Vim"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "�������� � ������� Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "��&����������� � ������� Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "������������� � ���������� Vim � "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "������������� ���������� ����� � ������� Vim"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "������ �������� ��������: ��������� ����������� gvim � ����!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "������ gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "������� ������� ����!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: ����������� ��������� �����: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: ����������� �����: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: ����� \"%s\" �� �������� ������������"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �� ������� ��������� ������� %s �� ����������"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: ����� �������� ��� ����������\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: ����� ��������� ��� ����������\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: �������� �������� ��� ����������\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: ������ \"%s\" �� ���������������"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ���������� ������� �������"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �������� ������������ ���������"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: ���������� �������� ���������� �������"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans �� ��������� ��������� � ������ ������ ��� ������"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "��������� ���� ���������� ��� \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "������ ����� �� ���������"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "������� ������������"
-
-#~ msgid "list is locked"
-#~ msgstr "������ ������������"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "���������� �������� ���� '%s' � �������"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "������ ������ ���� ����� ������ ��� ��������, � �� %s"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr "�������� ��������� str() ��� unicode(), �� ������� %s"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "�������� ��������� bytes() ��� str(), �� ������� %s"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr ""
-#~ "��������� int(), long() ��� ���-�� ���������� � long(), �� �������� %s"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "��������� int() ��� ���-�� ���������� � int(), �� �������� %s"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "�������� ������� ������ ��� �������������� ���� C"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "�������� ������� ���� ��� �������������� ���� C"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "����� ������ ���� ������ ����"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "����� ������ ���� ������ ��� ����� ����"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "���������� ������� �������� OutputObject"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "������������ �������: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: ������ ������������� �������� I/O"
-
-#~ msgid "failed to change directory"
-#~ msgstr "���������� ������� �������"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "�������� 3-������ ��� ��������� imp.find_module(), �� ������� %s"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr ""
-#~ "�������� 3-������ ��� ��������� imp.find_module(), �� ������� ������ � "
-#~ "�������� %d"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "���������� ������: imp.find_module ��������� "
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "���������� ������� �������� vim.Dictionary"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "���������� �������� ������������� �������"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "���������� ���������� ������� %s"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "���-������� ���������� ��� ��������"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr ""
-#~ "�������� �������-������������������ ������� 2, � ������ ���������� "
-#~ "������������������ %d"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "����������� ������ �� ��������� �������� ����� ��� ���������"
-
-#~ msgid "list index out of range"
-#~ msgstr "������ ������ �� ��������� ���������"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "���������� ������: �� ������� �������� ������� VIM-������ %d"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "���������� �������� ������� � ������"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "���������� ������: ��� �������� VIM-������ %d"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "���������� ������: �� ������� �������� ������� � ������"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "���������� ������� �������� vim.List"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "���������� �������� ������������� ������"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "�� ���������� ���������� ������� %s"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "������� %s �� ����������"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "����������� ������� �� ��������� �������� ����� ��� ���������"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "���������� ��������� ������� %s"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "�������� ��� ������������ ����"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "���������� �������� ���������� ����� %s"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "���������� �������� ����� %s ��� ����������� ��������"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "������� ��������� �� �������� �������"
-
-#~ msgid "no such tab page"
-#~ msgstr "��� ����� �������"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "������� ��������� �� �������� ����"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "������� ������ ��� ������: �����"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "������� ������� ��������� ��� ������"
-
-#~ msgid "no such window"
-#~ msgstr "��� ������ ����"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "������� ��������� �� ������������ �����"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "���������� ������������� �����"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "�������� ������� ������ ���� ����� ��������"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "�������� ������ vim.Buffer, �� ������� %s"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "���������� ������������� �� ����� %d"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "�������� ������ vim.Window, �� ������� %s"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "���������� ����� ���� � ������� �������"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "���������� ������������� �� ��������� ����"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "�������� ������ vim.TabPage, �� ������� %s"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "���������� ������������� �� ��������� �������"
-
-#~ msgid "failed to run the code"
-#~ msgstr "���������� ��������� ���"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval �� ��������� ����������� ������� Python"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr ""
-#~ "E859: �� ������� ������������� ������������ ������ Python � �������� VIM"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "���������� ������������� %s � ������� VIM"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "���������� ������������� %s � ��������� VIM"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "���������� ������: �������� ������ �� NULL"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "���������� ������: ������������ ��� ��������"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "������ ��� ��������� ������������ ����: sys.path_hooks �� �������� "
-#~ "�������\n"
-#~ "������� ������� ���������:\n"
-#~ "� �������� vim.path_hook  � sys.path_hooks\n"
-#~ "� �������� vim.VIM_SPECIAL_PATH � sys.path\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "������ ��� ��������� ����: sys.path �� �������� �������\n"
-#~ "������� �������� vim.VIM_SPECIAL_PATH � sys.path"
-
-#~ msgid ""
-#~ "E887: Sorry, this command is disabled, the Python's site module could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E887: � ��������� ��� ������� �� ��������, ��������� �� �������� ������ "
-#~ "Python site."
diff --git a/src/nvim/po/ru.po b/src/nvim/po/ru.po
index c8146e8c47..a4668743ba 100644
--- a/src/nvim/po/ru.po
+++ b/src/nvim/po/ru.po
@@ -2676,11 +2676,6 @@ msgstr "E49: Недопустимый размер прокрутки"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4281,12 +4276,6 @@ msgstr "строка %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Недопустимое имя регистра: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Перевод сообщений на русский язык: Василий Рагозин <vrr@users.sourceforge."
-"net>, Сергей Алёшин <alyoshin.s@gmail.com>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Прерывание: "
diff --git a/src/nvim/po/sjiscorr.c b/src/nvim/po/sjiscorr.c
deleted file mode 100644
index ebcbe16dee..0000000000
--- a/src/nvim/po/sjiscorr.c
+++ /dev/null
@@ -1,45 +0,0 @@
-// Simplistic program to correct SJIS inside strings.
-// When a trail byte is a backslash it needs to be doubled.
-// Public domain.
-
-#include <stdio.h>
-#include <string.h>
-
-int main(int argc, char **argv)
-{
-	char buffer[BUFSIZ];
-	char *p;
-
-	while (fgets(buffer, BUFSIZ, stdin) != NULL)
-	{
-		for (p = buffer; *p != 0; p++)
-		{
-			if (strncmp(p, "charset=utf-8", 13) == 0)
-			{
-				fputs("charset=cp932", stdout);
-				p += 12;
-			}
-			else if (strncmp(p, "# Original translations", 23) == 0)
-			{
-				fputs("# generated from ja.po, DO NOT EDIT", stdout);
-				while (p[1] != '\n')
-					++p;
-			}
-			else if (*(unsigned char *)p == 0x81 && p[1] == '_')
-			{
-				putchar('\\');
-				++p;
-			}
-			else
-			{
-				if (*p & 0x80)
-				{
-					putchar(*p++);
-					if (*p == '\\')
-						putchar(*p);
-				}
-				putchar(*p);
-			}
-		}
-	}
-}
diff --git a/src/nvim/po/sk.cp1250.po b/src/nvim/po/sk.cp1250.po
index e3b7508cdc..4b1e64bd02 100644
--- a/src/nvim/po/sk.cp1250.po
+++ b/src/nvim/po/sk.cp1250.po
@@ -2689,11 +2689,6 @@ msgstr "E49: Chybn� hodnota ve�kosti rolovania"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4273,10 +4268,6 @@ msgstr "riadok %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nie je pr�stupn� meno registru"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Spr�vca prekladu: Lubomir Host <rajo@platon.sk>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Preru�enie: "
diff --git a/src/nvim/po/sk.po b/src/nvim/po/sk.po
index 53f8a7b911..e48a5de927 100644
--- a/src/nvim/po/sk.po
+++ b/src/nvim/po/sk.po
@@ -2689,11 +2689,6 @@ msgstr "E49: Chybn� hodnota ve�kosti rolovania"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4273,10 +4268,6 @@ msgstr "riadok %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: '%s' nie je pr�stupn� meno registru"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Spr�vca prekladu: Lubomir Host <rajo@platon.sk>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Preru�enie: "
diff --git a/src/nvim/po/sv.po b/src/nvim/po/sv.po
index eedaecd1e7..f27ffa0dd4 100644
--- a/src/nvim/po/sv.po
+++ b/src/nvim/po/sv.po
@@ -4742,11 +4742,6 @@ msgstr "E900: Ogiltigt jobb-id"
 msgid "E901: Job table is full"
 msgstr "E901: Jobbtabellen �r full"
 
-#: ../globals.h:1008
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr "E902: \"%s\" �r inte k�rbar"
-
 #: ../globals.h:1009
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
diff --git a/src/nvim/po/uk.cp1251.po b/src/nvim/po/uk.cp1251.po
deleted file mode 100644
index 2c6f3423ae..0000000000
--- a/src/nvim/po/uk.cp1251.po
+++ /dev/null
@@ -1,8388 +0,0 @@
-#
-# Ukrainian Vim translation [uk]
-#
-# Copyright (C) 2001 Bohdan Vlasyuk <bohdan@vstu.edu.ua>
-# Bohdan donated this work to be distributed with Vim under the Vim license.
-#
-# Thanks to:
-#   Dmytro Kovalov <dmytro.kovalov@nssmb.com> for useful suggestions
-#   Dmytro O. Redchuk <dor@kiev-online.net> for viminfo bug
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: vim 7.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2010-06-18 21:53+0300\n"
-"Last-Translator: ������� ������ <sakhnik@gmail.com>\n"
-"Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
-"Language: uk\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=cp1251\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "�� ������� �������� �������� �����"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "�������� �������: �������� ��� �����"
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[������ ����]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[������ ����������]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr "E855: ����������� �������� �� ���������� �������"
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: ���� ��������� ��������� ��� ���� �����, ���������� ������..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: ���� ��������� ��������� �����, ���� ����������� �����..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: ����� � ������ �� ��� ������������"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: ����� � ������ �� �������"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: ����� � ������ �� �������"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "����������� ���� �����"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "����������� %d ������(��)"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "������� ���� �����"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "������� %d ������(��)"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "������� ���� �����"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "������� %d ������(��)"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: �� ���� ����������� �������� �����"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: ����� ����� �� ������"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: � ������ ���� ������"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: ������ %<PRId64> ����"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �� ��� �������� �����"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: �� ��� ��������� �����"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: ����� %<PRId64> �� ���� (! ��� �� �������)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ��������: ������ ���� ����� �����������"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: ����� %<PRId64> �� ��������"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: �������� ����� ���� � %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: �� �������� �����, ������ �� %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "����� %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: ����� � ����� ������ ��� ����"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [������]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[�� ����������]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[����� ����]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[������� �������]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[RO]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[���� ������]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "���� ����� --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �����(��) --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "����� %<PRId64> � %<PRId64> --%d%%-- ������� "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[��� �����]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "��������"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[��������]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[��������]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "���"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "�����"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "����"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# ������ ������:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr "[� ����]"
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- �������� ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "�������� ��� %s:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    �����=%<PRId64>  id=%d �����=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: ��������� ���������"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: ������������ �����"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ������� �����"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: ������������ �������"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: �� ����� ���������� ����� %<PRId64> ������(��)"
-
-#: ../diff.c:753
-msgid "E810: Cannot read or write temp files"
-msgstr "E810: �� ����� ������ �� ���������� �������� �����"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: �� ������� �������� ���������"
-
-#: ../diff.c:966
-msgid "E816: Cannot read patch output"
-msgstr "E816: �� ������� ��������� ��������� patch"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: �� ������� ��������� ��������� diff"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: ��� ����� �� � ����� ���������"
-
-#: ../diff.c:2100
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: ���� ����� ������������ ������ � ����� ���������"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: ���� ����� ������ � ����� ���������"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr ""
-"E101: ����� ��� ������ � ����� ���������, �� ��������, ������ �� ��� "
-"�����������"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �� ������� ������ ����� �%s�"
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ����� �%s� �� � ����� ���������"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ����� ���������� �������"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: � �������� �� ���� �������� escape"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: �� �������� ���� ���������"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: :loadkeymap ����������� �� � ���� ������"
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr "E791: ������� ��������� ��������"
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " ���������� �������� ��� (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ����� ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " ���������� ������ ����� (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " ���������� ����� ����� (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " ���������� �崳� (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " ���������� ����� �� ������� (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " ���������� ���������� (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " ���������� � �������� (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " ���������� � ��������� (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " ���������� ������ (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " ������������� ���������� (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " ������� ���������� (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ������������ ������� (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " ���������� ������� �������� ��� (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�������� ����� ���������"
-
-# msgstr "E443: "
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr "E839: ������� ���������� ������ ����"
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr "E840: ������� ���������� ������� �����"
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "����� 'dictionary' �������"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "����� 'thesaurus' �������"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "��������� �������: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (�������) ���������� (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�����) ���������� (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "����� �: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "����� ����� �崳�."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " ��������"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- �����..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "���������� ������"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "����� � ������ �����"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "������ ���"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "��� %d � %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "��� %d"
-
-# msgstr "E17: "
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: ����������� ������� � :let"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: ������ ������ ���� ������: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: ����������� �����: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ����� ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: �������� � %s �� ���� �������"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: �������� � %s �� ���� ������� �� ���������"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: ���� �������� �� ���� ���� ��������"
-
-# msgstr "E396: "
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: ������� ������"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ������� �������"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �������� ��������� ��� �������: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ���� ������ ����� � ��������: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ������� %s ��� ����, ! ��� �������"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ����� � �������� ��� ����"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: ����� ��������� �� �������"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: �� ����� ����������� [:] � ���������"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: ������������ ��� ����� ��� %s="
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ������� �������: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ������������ ����� �����: %s"
-
-# msgstr "E373: "
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: Float ����� �� String"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: ֳ��� �����, ��� �������� ������"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: ֳ��� �����, ��� �������� ������"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "����� ; � ������ ������"
-
-# msgstr "E235: "
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: �� ����� ������������ ����� � %s"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ��������� ������ ���� ���� ����� �� ������ �� ��������"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] �� ���� ���������"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ������ ������"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: ������ �� ����� ��������, ��� ����"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: ������ �� ����������� ��������"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: ��������� �in� ���� :for"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ��������� �����: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: ����� ����: �%s�"
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: ����� �� �������� �������� ��� ���� ��-/��������."
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: ����� ':' ���� '?'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: ������ ����� �������� ����� � �������"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: ���������� �������� ��� �������"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: ������� ����� �������� ����� �� ���������"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: ���������� �������� ��� ���������"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ������� ����� �������� ����� � ��������"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: ���������� �������� ��� ��������"
-
-#: ../eval.c:4277
-msgid "E804: Cannot use '%' with Float"
-msgstr "E804: �� ����� �������� '%' ��� Float"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ��������� ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: ������� �� �� ����������"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: ����� ����� �����: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: ������� �����: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ����� �����: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ����� �����: %s"
-
-# msgstr "E404: "
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: ����� ���� � ������: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ���� ������� ������ ']': %s"
-
-# msgstr "E235: "
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ����� ��������� � ��������: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���������� ����� � ��������: �%s�"
-
-# msgstr "E235: "
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ����� ���� � ��������: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ���� ������� �������� '}': %s"
-
-# msgstr "E21: "
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: � ������ �������� �������� ��� �� ��������"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �������� ��������� ��� ������� %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: ����������� ��������� ������� %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ������� �������: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ������ ��������� ��� ������� %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ��������������� �� � �������� �������: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: ������ dict-������� ��� ��������: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: ����� ������� Number �� Float"
-
-# msgstr "E14: "
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "�������� add()"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: �������� ���������"
-
-# msgstr "E327: "
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ����� ������� ����� � ����� �������"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&O:������"
-
-# msgstr "E226: "
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ���� ��� ����: %s"
-
-# msgstr "E14: "
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "�������� extend()"
-
-# msgstr "E14: "
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "�������� map()"
-
-# msgstr "E14: "
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "�������� filter()"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld �����: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ������� �������: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "������� �� inputrestore() ������, ��� �� inputsave()"
-
-# msgstr "E14: "
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "�������� insert()"
-
-# msgstr "E406: "
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �������� �� ���������"
-
-# msgstr "E177: "
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: ����������� ��� ��� len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ���� ��������"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ������� �� �����"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<������>"
-
-# msgstr "E14: "
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "�������� remove()"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �������� ���������� �������� (����?)"
-
-# msgstr "E14: "
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "�������� reverse()"
-
-# msgstr "E14: "
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "�������� sort()"
-
-# msgstr "E14: "
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "�������� add()"
-
-# msgstr "E364: "
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: ������� � ������� ���������"
-
-# msgstr "E364: "
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: ������� � ������� ���������"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(���������)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: �� ������� �������� ���������� ����"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Float ����� �� Number"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Funcref ����� �� Number"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: List ����� �� Number"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Dictionary ����� �� Number"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: Funcref ����� �� String"
-
-# msgstr "E373: "
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: List ����� �� String"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Dictionary ����� �� String"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: ������������ ��� �����: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: �� ����� ������� ����� %s"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: ����� ����� Funcref �� ���������� � ������ �����: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: ����� ����� ������� � �������� ��������: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: �������� ��������: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "�������"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: �� ����� ������ �������� %s"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ����� �������� ������� ������� ��� ������� �� ����"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ����������� �������: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: ����� '(': %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: ��� �� ����� ����������� g:"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: ������������ ��������: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ����� ��������� ������������: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: ����� :endfunction"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: ����� ������� ������� � ������: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �� ������� ������������� ������� %s: ���� ���������������"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ����� ������� �� �������� � ������ ����� �������: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �� ������� ����� �������"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: ����� ������� �� ���������� � ������ ����� ��� ������ ���������: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: ����� ������� �� ���������� � ������ ����� ��� ������ ���������: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �� ������� ������� ������� %s: ���� ���������������"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ������� ������� ������� �������� 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "����������� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s ���������"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s ������� #%<PRId64>"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ������� %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "����������� � %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return ���� ������ �������"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ��������� �����:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t�������� ������ � "
-
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "������� ������� �����"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  ���� %02x, �� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, ���� %04x, �� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, ���� %08x, �� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: ��������� ���������� ����� ��� � ����"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "��������� ���� �����"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "��������� %<PRId64> �����(��)"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "³������������ %<PRId64> �����(��)"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: ����������� *Filter* �� ������� �������� �������� �����"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[���� �� ��������]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s � �����: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �������� �������, ����� ����� ���� ���������"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "��������� ���� viminfo: �%s�%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ����������"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " ��������"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " ���� �����"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " �� �������"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: �� ��������� ����� � ���� viminfo: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: �� ������� �������� ���� viminfo %s!"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "���������� ���� viminfo �%s�"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# ��� ���� ����������� ��������� Vim %s.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ������ ����������, ��� ��������!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# �������� 'encoding' �� ��� ��������� ����� �����\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "������������ ������ �� ������� �����"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "�������� ������� �����?"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ������������ ! ��� ������ ������� ������"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "���������� �������� ���� �%s�?"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "���� ����� �%s� ����, ������������?"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: ���� ����� ����: %s (:silent! ��������)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: ���� �������� ����� ��� ������ %<PRId64>"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: ���� �� ��������: ����� ���������� ������ 'write'"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"��� �%s� ����������� 'readonly'.\n"
-"������ ��� ���� ���������� �����?"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-"���� �%s� ��������� ����� ������.\n"
-"�����, �������, ���� ����� ��������.\n"
-"������ ����������?"
-
-#: ../ex_cmds.c:2451
-#, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: �%s� ����� ��� ������� (! ��� �� �������)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: ����������� ���������� ������� ����� ����� %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: ���������� �������� ��� :z"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: � rvim �� ��������� ������� ��������"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: ��������� ������ �� ����� �������� �������"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "������� �� %s (y/n/a/q/l/^E/^Y)?"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(���������) "
-
-# msgstr "E31: "
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "���� ���"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "���� �����"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> ����(��)"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> ����(�)"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr " � ������ �����"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " � %<PRId64> ������"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global �� ����� ������� ����������"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: � global ����� ������"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "������ �������� � ������� �����: %s"
-
-#: ../ex_cmds.c:4510
-#, c-format
-msgid "Pattern not found: %s"
-msgstr "������ �� ��������: %s"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ������� �����:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: ��� ������!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: �������, ���� �������� '%s' ��� %s"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: �������, ���� �������� ��� %s"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "�������, ���� �������� �%s� �� ��������"
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �� � ���������: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: �� ������� ������� %s ��� ������"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �� ������� ������� %s ��� �������"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ̳������ �������� ����� �������� ��� ���� %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: ���������� ��� �%s� � ���� %s/%s"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: ������� ������� �������: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: ��������� ����� �������"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: ��������� �������� �������"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ����������� ������: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: �������� ������: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: ��������� ����� �������"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ���������� ����� ������: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ������������ ID �������: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (�� �����������)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[�������]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "����� ������������.  ��� ���������� ������ �cont�."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "����� %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "�������: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "����� ������� � �%s%s� ����� %<PRId64>"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: ����� ������� �� ��������: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "�� ��������� ����� ����� �������"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d %s %s   ����� %<PRId64>"
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: �������� ������ �:profile start {����}�"
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "�������� ���� � �%s�?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "����������"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ����� �%s� �� ����������� ����"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr ""
-"��������: ���������� ��������� � ������ ����� (�������� �����������)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: ���������� ���� ���� ����"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: �� ��� ��������� ����"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: �� ��� �������� ����"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ��������� �� �����������: %s"
-
-# msgstr "E195: "
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "����� �%s� � �%s�"
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "����� �%s�"
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "� 'runtimepath' �� �������� �%s�"
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "�� ������� ��������� �������: �%s�"
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "�� ������� �������� �%s�"
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "����� %<PRId64>: �� ������� �������� �%s�"
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "���������� �%s�"
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "����� %<PRId64>: ���������� �%s�"
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "�������� ��������� %s"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "modeline"
-
-# msgstr "E14: "
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ��������"
-
-# msgstr "E14: "
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ��������"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "����� ��������"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr "�������� �������"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ������������: ������������ ��������� �����, �������, ����� ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: :scriptencoding ����������� ���� ����������� ������"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: :finish ����������� ���� ����������� ������"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "���� (%s): �%s�"
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �� ������� ���������� ���� �%s�"
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "����� Ex. ��� ���������� �� ����������� ������ ��������� �visual�"
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: ʳ���� �����"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: ������� ������� ����������"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: ��������� �������� �� ���������: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "ʳ���� ������������ �����"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "ʳ���� �������"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ������������� ������ ������� �����������"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: �� �� ������� ���������"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: �������� ������ ��������"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "�������� ������ ��������, ��� ������� ������ � ������"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: ��������� w ��� w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: �������, ���� ������� ���� � ��� ����"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: ��������� ����� ���� ����� �����"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "���������� ������������ �� ���� ����. ��� ���� �����?"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "�� � %d �� ����������� �����. ��� ���� �����?"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: ���������� ������������ �� ���� ����"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: ���������� %<PRId64> �� ����������� �����"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: ������� ��� ����, ! ��� ������� ��"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    �����       ���. ����  ���������� ����������"
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "�� �������� ������ �����������"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: �� ������� ��������"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: ����������� ������� ���������"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ˳������� �� ���� ���� ������� ����"
-
-# msgstr "E177: "
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: ����������� ��������� �������� ���������"
-
-# msgstr "E178: "
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: ��� -complete �������� ��������"
-
-# msgstr "E180: "
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ������������ �������: %s"
-
-# msgstr "E181: "
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: ����������� ����� �������"
-
-# msgstr "E182: "
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: ������� ����������� ������� ���������� � ������ �����"
-
-#: ../ex_docmd.c:4696
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr ""
-"E841: ������������� �����, �� ����� ����������� ��� ������������� �������"
-
-# msgstr "E183: "
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: ������� ����������� �� ��������: %s"
-
-# msgstr "E179: "
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ����������� ����������: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �������� ���������� ����� ��� ��������������� ����������"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: ������������� ���������� ������ ��������-�������"
-
-# msgstr "E184: "
-#: ../ex_docmd.c:5257
-#, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �� ������� ������ ����� ������� �%s�"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "³�����, ����������� Vim!"
-
-# msgstr "E443: "
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: �� ����� ������� ������� �������"
-
-# msgstr "E444: "
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "��� � ��� ���� ���� �������"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "������� %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "���� ����� �����"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: �� ������� ������ �������, ����� �� ���� (! ��� �� �������)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: �� ��� ��������� �������"
-
-# msgstr "E186: "
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: �������"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize ������ ��� �������� ���������"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: �� ����� �������� ������� ���� �� ��� ��������"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos ������ ��� �������� ���������"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: �� ������� �������� �������: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: ���� �%s� ���� (! ��� �� �������)"
-
-# msgstr "E189: "
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �� ������� ������� �%s� ��� ������"
-
-# msgstr "E190: "
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: �������� �� ���� ������, ` ��� '"
-
-# msgstr "E191: "
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: �������� ��������� :normal"
-
-# msgstr "E193: "
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: ���� ����� ���������� ����� ��� ����� '#'"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: ���� ����� ����� ����������� ��� ����� �<afile>�"
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: ���� ������ ������ ����������� ��� ����� �<abuf>�"
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ���� ����� ���� ����������� ��� ����� �<amatch>�"
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ���� ����� ����� :source ��� ����� �<sfile>�"
-
-#: ../ex_docmd.c:7876
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E842: ���� ������ �����, ��� ����������� � �<sfile>�"
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: ����� ����� ��� '%' �� '#' �������, ������ ���� � �:p:h�"
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: ��������� � �������� �����"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: �� ������� ��������� ���� viminfo"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: �� ����� �������� (:throw) ������� � ��������� 'Vim'"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "��������� ��������: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "������� ��������: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "������� �������: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, ����� %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "������� ��������� ��������: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "��������� %s"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "³�������� %s"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "������� %s"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "�������"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "�������, ���������"
-
-# msgstr "E231: "
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "�������"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "���������"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: ������� ������ ��������� :if"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif ��� :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else ��� :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ��� :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: �� ���� :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif ���� :else"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: �������� ��������� :while/:for"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue ��� :while �� :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break ��� :while �� :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: ����� :endfor �� :while"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: ����� :endwhile �� :for"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: �������� ��������� :try"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch ��� :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch ���� :finally"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally ��� :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: �� ���� :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :entry ��� :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction ���� ������ �������"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: ����� �� ����� ���������� ����� �����"
-
-#: ../ex_getln.c:1656
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E811: ����� �� ����� �������� ���������� ������"
-
-# msgstr "E197: "
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "����� ���"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " ��� �����\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "����� 'history' �������"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# ��������� %s (�� ���������):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "�������"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "������ �����"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "������"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "������� �����"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ���� ������ �������"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: ������� ���� ��� ����� ���� �������"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: ���� ������� ������ ��� ����������"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: ����������� ����: `**[�����]' ������� ���� ��������� ����� ��� ����� "
-"'%s'."
-
-# msgstr "E343: "
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: �� ������� ������ ������� �%s� � cdpath"
-
-# msgstr "E344: "
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: �� ������� ������ ���� �%s� � path"
-
-# msgstr "E345: "
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: � cdpath ���� ����� �������� �%s�"
-
-# msgstr "E346: "
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: � ����� ������ ����� ���� ����� �%s�"
-
-#: ../fileio.c:137
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E812: ����������� ������ ����� �� ���� �����"
-
-# msgstr "E199: "
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "����������� ����� �����"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "�������"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "�� ����"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[����� ����]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[����� �������]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[���� ���������]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[³��������]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: ����������� *ReadPre ������������ ������� �����"
-
-# msgstr "E200: "
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: ����������� *ReadPre �� ������� �������� ��� �����"
-
-# msgstr "E201: "
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: �������� � stdin...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ����������� ������������ ������� �����!"
-
-# msgstr "E202: "
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[�����/�����]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[�����]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[�����]"
-
-#. or character special
-#: ../fileio.c:1801
-msgid "[character special]"
-msgstr "[����. ����������]"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[����� CR]"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[������� ���� �����]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[�� ������������]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[������������]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[������� ��������ֲ� � ����� %<PRId64>]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[����������� ���� � ����� %<PRId64>]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[������� �������]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "�� ������� �������� ���������� ���� ��� �����������"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "����������� � 'charconvert' �� �������"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "�� ������� ��������� ���� 'charconvert'"
-
-# msgstr "E217: "
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: ���� ��������� ����������"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: ����������� ������� ��� ����������� �����, �� ��� ���� ���������"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: ����������� ����������� ����� ������ ������� �����"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "�� ��������� ��� ������"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "���� ��� ������� (! ��� �� �������)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �� ������� �������� ��������� ���� (! ��� �� �������)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: ������� �������� ���������� ����� (! ��� �� �������)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr ""
-"E508: �� ������� ��������� ���� ��� �������� �������� ���� (! ��� �� "
-"�������)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �� ������� �������� �������� ���� (! ��� �� �������)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �� ������� ������� �������� ���� (! ��� �� �������)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �� ������� �������� ���������� ���� ��� ������"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: �� ������� ����������� (! ��� �������� ��� �����������)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �� ������� ������� ��� ������ ��'������ ����"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �� ������� ������� ���� ��� ������"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: �� ������� �������� fsync"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �� ������� �������"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: ������� ������, ����������� �� ������� (������� 'fenc')"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: ������� ������, ����������� �� ������� � ����� %<PRId64> (������� "
-"'fenc')"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: ������� ������ (��������� ����� ����?)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " ������� ��������ֲ�"
-
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr " � ����� %<PRId64>;"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[�������]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[�����]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr "[�]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " ���������"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr "[�]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ���������"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: �������: �� ������� �������� �������"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: �������: �� ������� �������� �������"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: �� ������� ������� ��������� ����"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"������������: �������, ������, ��������� �� �����������\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "�� �������� � ���������, ���� ���� �� ��������!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[������ dos]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[������ mac]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[������ unix]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "���� �����, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> �����, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "���� ������"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> �������"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[�������� �������� �����]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "������������: ���� ������� � ���� ���������� �������!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "�� ������ ������ ���� ����������??"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: ������� ������ � �%s�"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: ������� �������� �%s�"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: ������� ������� �%s�"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: ����������� FileChangedShell ������� �����"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ���� �%s� ����� �� ��������"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr "W12: ������������: ���� �%s� �������, ��� � ����� � Vim �����"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "���. �:help W12� ��� ���������."
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ������������: ���� �%s� ������� ���� ������� �����������"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "���. �:help W11� ��� ���������."
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ������������: ����� ����� �%s� ������� ���� ������� �����������"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "���. �:help W16� ��� ���������."
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ������������: ���� �%s� ���� �������� ���� ������� �����������"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "������������"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"&O:������\n"
-"&L:�����������"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �� ������� ���������� �%s�, ��� ����������"
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: �� ������� ���������� �%s�"
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--�������--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr "����������� �������� �����������: %s <�����=%d>"
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: ���� ���� �����: �%s�"
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: ������������ ������ ���� *: %s"
-
-# msgstr "E215: "
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: ���� ���� ��䳿: %s"
-
-# msgstr "E215: "
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: ���� ���� ����� �� ��䳿: %s"
-
-# msgstr "E216: "
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- ����������� ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <�����=%d>: ����������� ����� ������ "
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: �� ���� ���������� ����������� ��� �Ѳ� ����"
-
-# msgstr "E217: "
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "���� ��������� ����������"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: �������� ��������� ����������"
-
-# msgstr "E218: "
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "����������� %s ��� �%s�"
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "���������� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "����������� %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: ����� {."
-
-# msgstr "E219: "
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: ����� }."
-
-# msgstr "E220: "
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: ������� �� ��������"
-
-# msgstr "E349: "
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: �� ������� �������� ������� ������� 'foldmethod'"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: �� ������� ������� ������� ������� 'foldmethod'"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+-- �������� %3ld ����� "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: ������ �� ������ �������"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: ����� ����������"
-
-# msgstr "E223: "
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: �������� ���������� ��� %s ��� ����"
-
-# msgstr "E224: "
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: �������� ����� ��� %s ��� ����"
-
-# msgstr "E225: "
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: ��� � ���������� ��� %s"
-
-# msgstr "E226: "
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: ��� � ����� ��� %s"
-
-# msgstr "E227: "
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "���������� �� ��������"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "����� �� ��������"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ������������� �����"
-
-# msgstr "E447: "
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--������� �����--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: ������� ���������"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ��������� ������� ��������"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: �� \\ �� ��� /, ? ��� &"
-
-# msgstr "E10: "
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ������������ � ���� ������, <CR> ������, CTRL-C ��������"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr ""
-"E12: ������� �� ��������� � exrc/vimrc � ������ ��������� �������� �� ���"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: ����� :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: ����� :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: ����� :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: ����� :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile ��� :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ��� :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ���� ���� (! ��� �� �������)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ������� �� �������"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �������� �������"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "���������"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ����������� ������"
-
-# msgstr "E14: "
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ����������� ��������"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ����������� ��������: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ������������ �����: %s"
-
-# msgstr "E15: "
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ����������� ���"
-
-# msgstr "E16: "
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ���������� �������"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: �%s� � �� �������"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ����������� ����� �����"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ����������� ������ �� �%s()� �� ������"
-
-# msgstr "E18: "
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: � ������ ����������� ����� �����"
-
-# msgstr "E19: "
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: ������ �� �����������"
-
-# msgstr "E20: "
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: ���� �� ���������: �������� 'modifiable'"
-
-# msgstr "E21: "
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: �������� ��������� �������"
-
-# msgstr "E22: "
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: ���� ���������� �����"
-
-# msgstr "E23: "
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: ������ ���������� ����"
-
-# msgstr "E24: "
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! �� ���������"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: �� ����� ����������� GUI: �� �������� �� ��� ���������"
-
-# msgstr "E25: "
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ���� ���� ����� �����������: %s"
-
-# msgstr "E28: "
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: ����� �� �� ���� ������"
-
-# msgstr "E29: "
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: �� �� ���� ������"
-
-# msgstr "E30: "
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: ���� ���� �����"
-
-# msgstr "E31: "
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: ������� ����"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: ������� ����: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: ����� ����� �����"
-
-# msgstr "E32: "
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ����� ������ �� �� �����������������"
-
-# msgstr "E33: "
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: ������ �� �� ����"
-
-# msgstr "E34: "
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ������ ������ �� �� ����"
-
-# msgstr "E35: "
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: �� ��������� ��������� ���"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ̳��� �� ���������"
-
-# msgstr "E36: "
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �� ������� �������� ���� %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �� ������� ���������� ����� ����������� �����"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �� ������� ������� ���� %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �� ������� ��������� ���� %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ���� �� ���� �������� (! ��� �� �������)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[���� �� ��������]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: ³������� ��������"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ��������� �����"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �� ������� ������� ���� ������� %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �������� ���'��!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "������ �� ��������"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: ������ �� ��������: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �������� �� ���� ��������"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �� ������� ������� �� ������������ ��������"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: ����� �������"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: ���� ������ ����"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ����� ���� ����������"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: dz������� �������� ���������� ������"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: ����������� ����� 'readonly' (! ��� �� �������)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ����� ����� ��� �������: �%s�"
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: �� ����� ���������� ����� � ��������: �%s�"
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ������� ������� ����� �������"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �� ��������� � ��������"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �� ��������� ���"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ����� ������ �� �����������"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ����������� ����� �����"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: ����� 'shell' �������"
-
-# msgstr "E254: "
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: �� ����� ������� ���� ������!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: ������� �� ��� �������� ����� �����"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: ���� �崳� ��������"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ������� ������� �������"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ������� ��'�"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: �������� '['"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �������� ���� �����"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: ��������� �������"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: ������� ������"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �� ������� �������� ������"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' �� ���� ���� ������ �� 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' �� ���� ���� ������ �� 'winminwidth'"
-
-# msgstr "E79: "
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: ������� �� ��� ������"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "������� �������"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ��������������� �� � �������� �������"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �������� �������: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ������ ����������� �����, ��� 'maxmempattern', ���'��"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �������� �����"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ����������� ������ ��� ������ �� ���������"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: ���� ��� ����������� � ����� �����"
-
-# msgstr "E235: "
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ����� '%s' �� �����������"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: ����������� ����� �������"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "����� ����� �� �������, ������������ � ʲ���"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "����� ����� �� ʲ���, ������������ � �������"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: ��������� ���������"
-
-# msgstr "E347: "
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: ����������� ���������"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: ��������� �����"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "������� %d"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "ͳ���� ���������"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "��������� ������� %d (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr " ���� %d � %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "�����������: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "���� ���������"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: �� ������� �������� �������� ���� PostScript"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: �� ������� ������� ���� �%s�"
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �� ������� ��������� ���� ������� PostScript �%s�"
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: �%s� �� � ������ ������� PostScript"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: �%s� �� � ������������ ������ ������� PostScript"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: ����������� ����� ����� ������� �%s�"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: �������� ������������� ��������� � ���� �������."
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr ""
-"E674: printmbcharset �� ���� ���� �������� � �������������� ����������."
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: �� ��������� ����� ��� ��������������� �����."
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: �� ������� ������� ���� PostScript ��� ������"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: �� ������� ������� ���� �%s�"
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript �prolog.ps�"
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript �cidfont.ps�"
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �� ������� ������ ���� ������� PostScript �%s.ps�"
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: �� ������� ����������� �� ��������� ����� �%s�"
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "³��������� �� �������..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: �� ������� ����������� ���� PostScript"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "�������� ����� �������."
-
-# msgstr "E255: "
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "������ ���� ���� �����"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "����� �� �������"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "�������� �� �����������"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "������� �'�������"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "������������� �� �'�������"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "�������� �'�������"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: ������������: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "�� ������� cscope �� �쳺 ����� ����.\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: ������������: cstag <�������-��>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �� �� ��������"
-
-# msgstr "E257: "
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) �������: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s �� � �� ���������, �� ����� ����� cscope"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "������ ���� ����� cscope %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: ������� ������� � �'������� cscope %<PRId64>"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: �������� ��� ������ cscope"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: �� ������� �������� ������ �� cscope"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: �� ������� �������� ������ ��� cscope"
-
-#: ../if_cscope.c:849
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection: ������� setpgid"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection: ������� �� ��� ���������"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ��� to_fp �� ������"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ��� fr_fp �� ������"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: �� ������� �������� ������ cscope"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: ������� �'������� �� cscope"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: ����������� ��������� cscopequickfix %c ��� %c"
-
-# msgstr "E258: "
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: ��� ������ cscope %s � %s ������ �� ��������"
-
-# msgstr "E259: "
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "������� cscope:\n"
-
-#: ../if_cscope.c:1150
-#, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (������������: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-"\n"
-"       c: ������ �������, �� ���������� �� �������\n"
-"       d: ������ �������, �� ������������ ���� ��������\n"
-"       e: ������ ��� ������ egrep\n"
-"       f: ������ ��� ����\n"
-"       g: ������ �� ����������\n"
-"       i: ������ �����, �� ��������� � ���� ��� ����\n"
-"       s: ������ ��� ������ C\n"
-"       t: ������ ��� �����\n"
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: �������� ���� ����� cscope �� ������"
-
-# msgstr "E260: "
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: �'������� � cscope %s �� ��������"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "�'������� � cscope %s ��������"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: �������� ������� � cs_manage_matches"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "�� cscope: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   �����"
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "���� / �������� / �����\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: ������� cscope: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "�� ���� ����� cscope ���������������"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "������� �'������� � cscope\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ����� ���� �����                    ����\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "�������� �������� �����"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�������� ���������"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "��������� �������� ����"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "����� ���� ��������� �����"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "�������� ��������� � �+�������, �-c ������� ��� �--cmd �������"
-
-# msgstr "E14: "
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "������������ �������� �"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d �����(��)\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "������ �������� ������� ������: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�� ������� ���������: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "�� ������� ������� �� �������� ����: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ������������: ���� �� � �������\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ������������: �������� �� � ��������\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "������� ����� vimrc"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �� ������� ��������� � �%s�"
-
-# msgstr "E282: "
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"ij�������� �����: �vim -h�\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[���� ..]       ���������� ������� �����"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               ������ ����� � stdin"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t ������      ������� �� ���"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [����]       ������� �� ����� �������"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"������:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [���������] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   ���:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"���������:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t���� ����� ����� ���� �����"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t�� ���������� �������"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\t����� Vi (���� �vi�)"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\t����� Ex (���� �ex�)"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\t���������� ����� Ex"
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t��������� (��������) ����� (���� ��� �ex�)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\t����� ��������� (���� �vimdiff�)"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t������� ����� (���� �evim�, ��� ������)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t����� ��������� (���� �view�)"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t��������� ����� (���� �rvim�)"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t���� (����� �����) �� ���������"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t���� � ����� ����� �� ���������"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t�������� �����"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\t����� lisp"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t������� � Vi �����: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t�� ����� ������� � Vi �����: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr "-V[N][����]\t\t������ ���������� [����� N] [���� ����. ����������]"
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t����� ������������"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t�� ��������������� ���� �����, ������� ��� � ���'��"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�������� ����� ����� � �����"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (����� �����)\t³������� ������� ��������� �����"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t�� ����, �� � -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t��������� � ����� �������� ����"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t��������� � ����� ������"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t��������� � ����� ������� ����"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <�������>\t���������� ��� �������� � <�������>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t����������� ������� ���� ������ .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�� ��������� ������� ����������"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\t³������ N ������� (��� �� ����� ��� ������� �����)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t³������ N ���� (��� �� ������ ��� ������� �����)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tͳ�� -o, ��� ������� ���� �����������"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t��������� � ���� �����"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<�����>\t\t��������� � ��������� <�����>"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <�������>\t�������� <�������> ����� ������������� vimrc"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <�������>\t\t�������� <�������> ���� ������������ ������� �����"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <�����>\t\t�������� ������� ���� ���� ������� ������������� �����"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <������>\t\t������� ������� ����������� ������ � ����� <������>"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <������>\t\t�������� �� ������� ������� �� ����� <������>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-w <������>\t\t�������� �� ������� ������� � ���� <������>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-"--startuptime <����>\t�������� �������� ����������� � �������� �������� "
-"�� <�����>"
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t����������� <viminfo> ������ .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  ��  --help\t����������� �� ����������� � �����"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t����������� ���������� ��� ����� �������� � �����"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "�� ����������� ����� ������"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: ������ �%s� �� ��������"
-
-# msgstr "E283: "
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"���. ���.  ���. ����/�����"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" ����� ���. �����. ����/�����"
-
-# msgstr "E283: "
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"������ ���. �����. �����"
-
-# TODO
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# ������:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ������ �������� (�� ���������):\n"
-
-# TODO
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# ��������� ������ � ������ (�� ���������):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "��������� '>'"
-
-# msgstr "E292: "
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: ���� �� ���� �����������"
-
-# msgstr "E293: "
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: ������� ���� ������� � ���� �����"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: ������� ���������� ����� �����"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: ������� ���� ������� �� ��� ������ � ���� �����"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: ������� ������ ����� �����"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: ���� ����� ��� ���� (����� ���������� ����������?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: ���� ����� 0?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: ���� ����� 1?"
-
-# msgstr "E298: "
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: ���� ����� 2?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ��, �������� ���� �����!!!"
-
-# msgstr "E301: "
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: �� ������� ������������� ����� �����"
-
-# msgstr "E302: "
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: �� ������� ��������� ���� ����� ��� �%s�, ���������� ���������"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): ���� ����� 0??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: �� �������� ����� ����� ��� %s"
-
-# msgstr "E305: "
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "������ ����� ����� �����, ������ �����������, (0 ��� ������):"
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: �� ������� ������� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "�� ������� ��������� ���� 0 � "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"�������, ��� �� ����, ��� Vim �� ������� ���� �����."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " �� ����� ����������� � ���� ����� Vim.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "������� Vim 3.0\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s �� ����� �� ���� ����� Vim"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " �� ����� ����������� �� ����� ����'����.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���� ���� �������� �� "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"��� ���� ���� ����������."
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr " ����������� (����� ������� ������ ����������� ��������).\n"
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "��������������� ���� ����� �%s�"
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "���������� ���� �%s�"
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ������������: �������, ���������� ���� ���� ������"
-
-# msgstr "E308: "
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: �� ������� ��������� ���� 1 � %s"
-
-# msgstr "E309: "
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "??? ����Ӫ �������� ���ʲ�"
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "??? ����������� ʲ��ʲ��� ���ʲ�"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "??? �����Ͳ� ����"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "??? �������Ͳ �����"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: ������������� ����� 1 ������������ (%s �� � ������ �����?)"
-
-# msgstr "E310: "
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "??? ��������� ����"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? ����� � �� `??? ʲ����' �����, �������, ��������"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? ����� � �� `??? ʲ����' �����, �������, ���� ������/�������"
-
-#: ../memline.c:1181
-msgid "???END"
-msgstr "??? ʲ����"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: ³��������� ���������"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr ""
-"E312: ϳ� ��� ���������� �������� �������. ����������� �����, �� "
-"����������� � ???"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "���. �:help E312� ��� ���������."
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "³��������� ��������, �������� �� ��� ������."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(�������, ������� �������� ��� ���� �� ����� ������\n"
-
-#: ../memline.c:1252
-msgid "and run diff with the original file to check for changes)"
-msgstr "� ��������� diff � ��������� ��� ��������� ����)"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "³��������� ��������. ���� ������ ������� � ������ �����."
-
-#: ../memline.c:1255
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"\n"
-"�������, ����� �� ������ ������� ���� ����� .swp.\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "�������� ����� �����:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   � ��������� �������:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   �������������� ������� �����:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   � ������� "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- ������� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "           �������: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "   ����: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "             ����: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [�� Vim 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "        [�� ����� �� ���� �����]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "         ����� �����: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"           ������: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "���"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "��"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"          ����������: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "   ����� �����: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"          ����� �����: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"         ID �������: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (����������)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [����������� �� ����� ����'����]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�� ����� ���������]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�� ����� �������]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �� ������� ����������, ���� ����� �����"
-
-# msgstr "E313: "
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "���� ���������"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: ���������� �� �������"
-
-# msgstr "E314: "
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ������������ lnum: %<PRId64>"
-
-# msgstr "E315: "
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �� ������� ����� %<PRId64>"
-
-# msgstr "E316: "
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: �������� ����� ���������� 3"
-
-# msgstr "E317: "
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx �� ���� ����� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: ��������� �������� �����?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: �������� ����� ���������� 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "���� 1 �������?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �� ������� ������ ����� %<PRId64>"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: �������� ����� ����������"
-
-# msgstr "E317: "
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count ������� 0"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: ����� ����� ������ �� ���: %<PRId64> �� �����"
-
-# msgstr "E322: "
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: ʳ������ ����� � ����� %<PRId64>"
-
-# msgstr "E323: "
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "����� ����� ����������"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: �������� ����� ���������� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: ������� ��������� ��������� �%s�"
-
-# msgstr "E317: "
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: �����"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"�������� ���� ����� � ������ \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "��� ������� ����� \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      ��²��� �� ���� �����!\n"
-
-#: ../memline.c:3244
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) �������, ���� �������� ��� ������ ��� ����� ����. ���� �� ���,\n"
-"    ������ ��������, ��� �� ���������� ��� ���� ����������\n"
-"    ������ � ���� ������ ����� ���� ���."
-
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "  ������ ��� ����������� ��������.\n"
-
-#: ../memline.c:3246
-msgid "(2) An edit session for this file crashed.\n"
-msgstr "(2) ����� ����������� ����� ����� ������ �����.\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ���� �� ������ ���������, ��������� �:recover� ��� �vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"�\n"
-"    ��� �������� ���� (���. �:help recovery�).\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    ���� �� ��� �� �������, ������� ���� ����� �"
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"�,\n"
-"    ��� ��������� ����� �����������.\n"
-"\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "���� ����� �"
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "� ��� ����!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM � �����"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "���� ����� ��� ����!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&O:³������ ���� ��� �������\n"
-"&E:��� ���� ����������\n"
-"&R:³�������\n"
-"&Q:�����\n"
-"&A:���������"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"&O:³������ ���� ��� �������\n"
-"&E:��� ���� ����������\n"
-"&R:³�������\n"
-"&D:������� ����\n"
-"&Q:�����\n"
-"&A:���������"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: �������� �������� ����� �����"
-
-# msgstr "E341: "
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �������� ���'��!  (������� ���� %<PRIu64> �����)"
-
-# msgstr "E326: "
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: ������� ����� �� �������� ���� �� � ������"
-
-# msgstr "E327: "
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ���� ���� ���� ����� � ������ �����"
-
-# msgstr "E328: "
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: ���� ���� �%s�"
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr "E792: ������� ����� ����"
-
-# msgstr "E329: "
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: ���� �� ���� �� ������� ����� �� ������"
-
-# msgstr "E330: "
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: �� ����� �������� �������� ���� ������ �� ��������� ����"
-
-# msgstr "E331: "
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ��������� �� ���� ���� �������� ����� ����"
-
-# msgstr "E332: "
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- ���� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: ���� ������� ����� �� �������� ����"
-
-# msgstr "E333: "
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: ���� �� ��������: %s"
-
-# msgstr "E334: "
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: ��� ������ %s ���� �� ���������"
-
-# msgstr "E335: "
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: ���� ������� ����� �� ������"
-
-# msgstr "E336: "
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: ���� �� �������� � �������� �����"
-
-# msgstr "E337: "
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "�������� ������� �� ��� ��������� %s:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "����� %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ����������� ����� �������: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "�����������: ������� ������ <sakhnik@gmail.com>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "���������: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "��������� ENTER ��� ������ ������� ��� �����������"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s ����� %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- �� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " ������/d/j: ���� �� �����/�������/�����, b/u/k: �����, q: ����� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "���������"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"&Y:���\n"
-"&N:ͳ"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y:���\n"
-"&N:ͳ\n"
-"&C:���������"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"&Y:���\n"
-"&N:ͳ\n"
-"&A:��\n"
-"&D:�������\n"
-"&C:���������"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: ����������� ��������� ��� printf()"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: ��������� �������� Float ��� printf()"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: �������� ��������� ��� printf()"
-
-# msgstr "E338: "
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ������������: ��������� ���� ����������� ���� ��� �������"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "������� ����� � <Enter> �� �������� ������ (������� �������): "
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "������� ����� � <Enter> (������� �������): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "������ ���� �����"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "������� ���� �����"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "������ �����: %<PRId64>"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "������� �����: %<PRId64>"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (���������)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "�����!"
-
-# msgstr "E342: "
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "����������� �������� ��� ��������: �%s�"
-
-# msgstr "E348: "
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: ���� �������������� ��� ��������"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' �������"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "������������: ������� �� ������� �������"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: ���� ����� �� ������"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: �� ������� ������� ������� �������� ������� 'foldmethod'"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: ������ ��� ��������"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: ������� ������ ���"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: ʳ���� ������ ���"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "������ :quit<Enter>  ��� ����� � Vim"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "���� ����� %s-��"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "���� ����� %s-�� %d ����"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> ����� %s-��"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> ����� %s-�� %d ����"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "���������� �������� %<PRId64> �����..."
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "�������� ���� �����"
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "�������� �����: %<PRId64>"
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: ������� ����� ��� �� ���������"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "�� ������� �����'�����; ��� ���� �������?"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "���� ����� ������"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "������ �����: %<PRId64>"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "�����'���� ���� � ������ �����"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "�����'���� ���� �����"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "�����'���� ���� �� %<PRId64> �����"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "�����'���� �����: %<PRId64>"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: � ������ %s ������ ����"
-
-# msgstr "E353: "
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- ������� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "����������� ����� �������"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# �������:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: �������� ��� ������� %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "����.: %<PRId64>; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"������� %s%<PRId64> � %<PRId64> �����; %<PRId64> � %<PRId64> ���; "
-"%<PRId64> � %<PRId64> �����"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"������� %s%<PRId64> � %<PRId64> �����; %<PRId64> � %<PRId64> ���; "
-"%<PRId64> of %<PRId64> �������; %<PRId64> � %<PRId64> �����"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"������� %s � %s; ����� %<PRId64> � %<PRId64>; ����� %<PRId64> � %<PRId64>; "
-"���� %<PRId64> � %<PRId64>"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"������� %s � %s; ����� %<PRId64> � %<PRId64>; ����� %<PRId64> � %<PRId64>; "
-"������ %<PRId64> of %<PRId64>; ���� %<PRId64> � %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> ��� BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=����. %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "������ �� ���� Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: ������� �����"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: ����� �� �����������"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: �� ��������� � modeline"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr "E846: ��� ����� �� �����������"
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: ϳ��� = ������� ������� �����"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: �� �������� ����� ����������� ��������"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: ������������ ������ <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: �� ������� ���������� 'term'"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: ����� 'backupext' � 'patchmode' �������"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr "E834: �������� �� ��������� 'listchars'"
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr "E835: �������� �� ��������� 'fillchars'"
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: ����� ���������"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: ����� ��������"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: ϳ��� <%s> ����� �����"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: ����� ����"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ������� ������� �������� '"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: ̳����� ���������� ��� ��������� �������"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: ������������ ������ ���� <%c>"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: ������� ����"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' �� ���� ��������� �� ������ %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: ������������ ������ �� ���������"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: �������� ��������"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ����� �� ������������"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: ³��� ��������� ��� ����"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr ""
-"W17: ��� �������� ���� ������� UTF-8, ��������� ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: ������� ���������� %d �����"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: ������� ���������� %d ��������"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: ������� �����: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: ������� ������� Number: &%s = '%s'"
-
-# msgstr "E355: "
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- ���� �������� ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- �������� ��������� ����� ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- �������� ��������� ����� ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- ����� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: ������� get_varp"
-
-# msgstr "E356: "
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': ��� ������� %s ���� ����"
-
-# msgstr "E357: "
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': ���� ������� ���� `;': %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�� ������� ��������� ��������"
-
-# msgstr "E362: "
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"�������� ���������: "
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-"\n"
-"�� ������� �������� �������� ������� ��� "
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-"\n"
-"�� ������� ���������� �������� ������� ��� "
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = �%s�"
-
-# msgstr "E446: "
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ���� �%s� �� �������� � ����� ������"
-
-# msgstr "E371: "
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: �������� %%%c � ����� �������"
-
-# msgstr "E372: "
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: ������������ `%%%c' � ����� �������"
-
-# msgstr "E373: "
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: ��������� ] � ����� �������"
-
-# msgstr "E374: "
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: %%%c � ����� ������� �� �����������"
-
-# msgstr "E375: "
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: ���������� `%%%c' � ������� ����� �������"
-
-# msgstr "E376: "
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: ���������� `%%%c' � ����� �������"
-
-# msgstr "E377: "
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' �� ������ ������"
-
-# msgstr "E378: "
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: ��������� �� ������� ����� ��������"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: ���� ����� ��������"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d � %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (����� �������)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: ��� ����� ����������"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: ������� ����� ����������"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "������ ������� %d � %d; %d �������"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: �� ���� ��������, ������� ����� 'buftype'"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: ��������� ����� ����� �� ����������� ������"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "�� ������� ������� ���� �%s�"
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: ����� �� �����������"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: ��������� String �� List"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: ����������� ������� � %s%%[]"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: ����� ] ���� %s["
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: ���� ���� %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: ���� ���� %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: ���� ���� %s)"
-
-# msgstr "E406: "
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ��� �� ���������"
-
-# msgstr "E406: "
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 �� ��. ��� �� ���������"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: ��������� ] ���� %s%%["
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: %s%%[] ��������"
-
-# msgstr "E382: "
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: ������ ������� ������"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: �������� \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: �������� %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: ���� ���� \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: ������������ ������ ���� %s@"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: �������� �������� %s{...}"
-
-# msgstr "E339: "
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: �������� %s*"
-
-# msgstr "E61: "
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: �������� %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: ���������� ����� \\_"
-
-# msgstr "E62: "
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: ϳ��� %s%c ������ ����"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: ���������� �������� ���������"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: ������������ ������ ���� \\z"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: ������������ ������ ���� %s%%[dxouU]"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: ������������ ������ ���� %s%%"
-
-# msgstr "E64: "
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: ����������� ������� � %s{...}"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�������� ��-����:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-"E864: ���� \\%#= ���� ���� ����� 0, 1, or 2. ���� ����������� ������������ "
-"�������� "
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (NFA) ������ �������� ����� ����������� ������"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (NFA regexp) �� �� ���� %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) �������� �������� '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) �������� �������� '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) �������� �������� '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr "E870: (NFA regexp) �� ������� ��������� ��� ����������"
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) ������ �� ���� ���� �� ������!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (NFA regexp) �������� '('"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (NFA regexp) �������� \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (NFA regexp) ������� ��������� ����������"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (NFA) ���� ��������!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (NFA regexp) (ϳ� ��� ������������ � �������� � NFA) ���������� "
-"�������� ������ � �����"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (NFA regexp) ����������� �����, ��� �������� ���� NFA "
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"�� ������� ������� ���������� ���� ������� ��� ������, ���������� �� "
-"stderr ... "
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) �� ������� ²������ %s!"
-
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "�� ������� ������� ���������� ���� ������� ��� ������ "
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " ²�� ��̲��"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " ��̲��"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ������в�"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " �������"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (�������)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (�����)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (��� �����)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " �����"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " ��������"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (����)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " �����"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " ����� ���ʲ�"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " ����� �����"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ��IJ�����"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ��IJ����� ���ʲ�"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ��IJ����� �����"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "��� �����"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: ������������ ������ ��� ������: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: ����� ����� �� ������� ��� ���� � %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: ����� ����� �� ʲ��� ��� ���� � %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ϳ��� `;' �� ���� `?' ��� `/'"
-
-# msgstr "E386: "
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (����� � ����������� ������)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- �������� ����� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "�� �������� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "� ����� ������ ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (��� � ������)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  �� ��������"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "����� � ���������� ����: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "�������� � ���������� ���� %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: ��� � ��������� �����"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "���� �������� �� �������� �����"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "������� ���������� �����"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: ���������� �� ��������"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: ������ �� ��������"
-
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "����� "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# ���. %s������ ������:\n"
-"~"
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ������� ������� � ���� ����������"
-
-# msgstr "E364: "
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: �������� ���� ����������"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "������ ����� � %s � ����� %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "����� ������ �������� � %s � ����� %d: %s"
-
-# msgstr "E430: "
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: ������� ������� � ���� ������ FOL, LOW �� UPP"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: ������ � FOL, LOW �� UPP ���� ������"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "���������� ������ ���..."
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: �������� ���������� �� ���������"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-"������������: �� ������� ������ ������ ��� �%s.%s.spl� �� �%s.ascii.spl�"
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "�������� ���� ���������� �%s�"
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: �� ����� �� ���� ����������"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: ���� ���������� ������, ����� ��������"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: ���� ���������� ����������� ��� ���� ���� ���� Vim"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: ����������� ������ � ���� ����������"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "������������: ����� %s �� �����������"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "�������� ���� ������ %s ..."
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "������� ������������ ����� � %s � ����� %d: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "������������ � %s �� �����������: � %s �� %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "���������� �������� FLAG � %s � ����� %d: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "FLAG ���� ������������ ��������� � %s � ����� %d: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"���������� COMPOUNDFORBIDFLAG ���� �������� PFX ���� ���� ������������ "
-"��������� � %s � ����� %d"
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-"���������� COMPOUNDPERMITFLAG ���� �������� PFX ���� ���� ������������ "
-"��������� � %s � ����� %d"
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "����������� �������� COMPOUNDRULES � %s � ����� %d: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "����������� �������� COMPOUNDWORDMAX � %s � ����� %d: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "����������� �������� COMPOUNDMIN � %s � ����� %d: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "����������� �������� COMPOUNDSYLMAX � %s � ����� %d: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "����������� �������� CHECKCOMPOUNDPATTERN � %s � ����� %d: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr ""
-"����� ��������� ��������� � ����������� ����� ������ � %s � ����� %d: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "�������� ����� � %s � ����� %d: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"����� ����� ��������������� ��� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/"
-"NOSUGGEST � %s � ����� %d: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "����� Y �� N � %s � ����� %d: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "���������� ����� � %s � ����� %d: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "����� ������� REP(SAL) � %s � ����� %d"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "����� ������� MAP � %s � ����� %d"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "���������� ������� � MAP � %s � ����� %d"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "������������ �� ��������� ������� � %s � ����� %d: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "��������� ����� FOL/LOW/UPP � %s"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "����� COMPOUNDSYLMAX ��� SYLLABLE"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "�������� ���������� ��������"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "�������� �������� ���������"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "�������� ���������� �������� �/��� �������� ���������"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "��������� ����� SOFO%s � %s"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "������ ����� SAL � SOFO � %s"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "��������� �� � ������ � %s � ����� %d: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "������������ ��������� � %s � ����� %d: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "�������� %s ����������� �� ����, �� ����� � ������ ���� .aff"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "��������� ����������� ���� %s ..."
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: ���� ������� ��� � %s"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "����� %6d, ����� %6d - %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "���������� ����� � %s � ����� %d: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "����� ���������� ����� � %s � ����� %d: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "%d ������������ ��� � %s"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "��������� %d ���(~) �� ��-ASCII ��������� � %s"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "�������� ���� ��� %s ..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "���������� ����� /encoding= ������������ � %s � ����� %d: %s"
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "����� /encoding= ���� ����� ������������ � %s � ����� %d: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "���������� ����� /regions= ������������ � %s � ����� %d: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "�������� ������� � %s � ����� %d: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "����� / ������������ � %s � ����� %d: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "����������� ����� ������ � %s � ����� %d: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "����������� �������� � %s � ����� %d: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "������������ %d ��� �� ��-ASCII ���������"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "�������� %d � %d �����; ���������� %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "������������ ���� ����������..."
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "���������� ��������� �����..."
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "ʳ������ ��� ���� ��������� �����: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "����� ������� ���: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "���������� ���� ��������� %s ..."
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "������ ���������� ���'��: %d ����"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: �������� ���� �� ������� ���� ����� ������"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ϳ���������� ����� �� ������ �������"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: ����������� ����� � %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "������������: ��������� ������ `������� �����' � NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "���������� ���� ���������� %s ..."
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "��������!"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' �� ������ %<PRId64> ��������"
-
-#: ../spell.c:8074
-#, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "����� '%.*s' ������� � %s"
-
-#: ../spell.c:8117
-#, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "����� '%.*s' ������ �� %s"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: ������� � ���� ����������� � ������ ����������"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��������, ���� ����������"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��������, ����� %<PRId64> ����������"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "������� �%.*s� ��:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < �%.*s�"
-
-# msgstr "E34: "
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ���� ���������� �����"
-
-# msgstr "E333: "
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: �� ��������: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: �� ����� �� ���� .sug: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: ��������� ���� .sug, ����� ��������: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ���� .sug ��� ���� ���� ���� Vim: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: ���� .sug �� ������� ����� .spl: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: ������� ������� ����� .sug: %s"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr "E783: ��������� ������ � ������� MAP"
-
-# msgstr "E391: "
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "��� ������ �� ��������� �������� ����������"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: ������������ ��������: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: ���� ������ ������������� ��������: %s"
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "�������������� �� ���������� ����� �"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "��� �������������"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "���������� ������������� �� "
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr " ����� ����� ������ ������"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �������� ������������� ���������� ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"������������� �� ���������"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �������� ���������� ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: ���� ������ ������������� ��������: %s"
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "���������� "
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "������������ "
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; ��� "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr " ������� �����"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ̳����� ����������� ��� ���������"
-
-# msgstr "E14: "
-#: ../syntax.c:4096
-msgid "E844: invalid cchar value"
-msgstr "E844: ���������� �������� cchar"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: group[t]hete ��� ������������"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �� �������� ������� ������ ��� %s"
-
-# msgstr "E396: "
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: ������� ����� �����"
-
-#: ../syntax.c:4221
-msgid "E847: Too many syntax includes"
-msgstr "E847: �������� ������������ ��������"
-
-#: ../syntax.c:4303
-#, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E789: ��������� ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: ��������� `=': %s"
-
-# ---------------------------------------
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: ����� ���������: ������������ ����� %s"
-
-#: ../syntax.c:4870
-msgid "E848: Too many syntax clusters"
-msgstr "E848: �������� ������������ ��������"
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: ������� �� �������"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: ʳ���� ������ �� ��������: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: ����� ���� ������: %s"
-
-# msgstr "E402: "
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr ""
-"E403: ����������� �������������: ������ ��� ����������� ����� ������� ����"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: ����������� ���������: %s"
-
-# msgstr "E404: "
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: ��������� ���� ������: %s"
-
-# msgstr "E405: "
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: �������� ��������: %s"
-
-# msgstr "E406: "
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s ��� �� ���������"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s �� ���� ������ ������ � ������ contains"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: ������� ����� �����: %s"
-
-# msgstr "E409: "
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ����������� ��������� :syntax: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-"  ������     �-��   �ϲ��.  �����²�.   ������.   �����              ������"
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: ����������� ���� ������� syncolor.vim"
-
-# msgstr "E410: "
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: ����� ����������� �� ��������: %s"
-
-# msgstr "E411: "
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ����������� ���������: �:highlight link %s�"
-
-# msgstr "E412: "
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �������� ���������: �:highlight link %s�"
-
-# msgstr "E413: "
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: ����� �� settings, highlight link ������������"
-
-# msgstr "E414: "
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ����������� ���� ������: %s"
-
-# msgstr "E415: "
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ��������� ���� ������: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ��������� ��������: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ����������� ��������: %s"
-
-# msgstr "E418: "
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: �������� ���� ������"
-
-# msgstr "E419: "
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: �������� ���� ����"
-
-# msgstr "E420: "
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: ����������� ����� ��� ����� �������: %s"
-
-# msgstr "E421: "
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: ������� ������ ��� ��������: %s"
-
-# msgstr "E422: "
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: ������������ ��������: %s"
-
-# msgstr "E423: "
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ����������� �������� ����� �������� �������"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: ����������� ������ � ���� �����"
-
-# msgstr "E181: "
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: ����������� ������ � ���� �����"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr "E849: �������� ���� ����������� � ����������"
-
-# msgstr "E424: "
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: ʳ���� ����� �崳�"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: ������� ����� �崳�"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �� ��� ��������� ��������� ��"
-
-# msgstr "E425: "
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �� �� ��������: %s"
-
-# msgstr "E426: "
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # �� ��� ��"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "����\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: ���� ���� ��������� ��"
-
-# msgstr "E427: "
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �� ��� �������� ��������� ��"
-
-# msgstr "E428: "
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "���� �%s� �� ����"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "�� %d � %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " ��� �����"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  ����������� ��, �� ���������� ����� � ��� �����"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: ���� �%s� �� ����"
-
-# msgstr "E429: "
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # �� ���        � �����  � ����/�����"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "�������� � ���� �崳� %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr "���������� ������ ����� � ���� � ����������"
-
-# msgstr "E430: "
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: ������� ������� � ���� �崳� �%s�"
-
-# msgstr "E431: "
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "����� ������ %<PRId64>"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: ���� �崳� �� �������������: %s"
-
-# msgstr "E432: "
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: ���� ����� �崳�"
-
-# msgstr "E433: "
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �� ������� ������ ������ ���"
-
-# msgstr "E434: "
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �� ������� ������ ��, ����� ����������!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr "����� ���� ������������: %s"
-
-# msgstr "E435: "
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' �� ������. ��������� ��������:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "��������� '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: �� ������� ������� ���� ����������� ��������"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: ���� ���������� ��� �������"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: ���� ���������� ��� ��������� ��������"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: ���� ������ �%s� ��� ��������� ��������"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: ������� ��������� �������� �cm�"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- ������ �������� ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: ������� ������� �����, ������ �����������...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E834: ʳ������ ����� ���������� ��������"
-
-#: ../undo.c:627
-#, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E828: �� ������� ������� ���� ����� ��� ������: %s"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr "E825: ���� ����� ���������� (%s): %s"
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "�� ������� �������� ���� ����� � ����� � ��������� � 'undodir'"
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr "Will not overwrite with undo file, cannot read: %s"
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "�� ����� ������������, �� �� ���� �����: %s"
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr "���� ����� �� ����������, ������ ���������"
-
-#: ../undo.c:1121
-#, c-format
-msgid "Writing undo file: %s"
-msgstr "���������� ���� �����: %s"
-
-#: ../undo.c:1213
-#, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E829: ������� ������ � ���� �����: %s"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr "���� ����� ��������� �� ����, ������� �����: %s"
-
-#: ../undo.c:1292
-#, c-format
-msgid "Reading undo file: %s"
-msgstr "�������� ���� �����: %s"
-
-#: ../undo.c:1299
-#, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E822: �� ������� ������� ���� ��� �������: %s"
-
-# msgstr "E333: "
-#: ../undo.c:1308
-#, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E823: �� ���� �����: %s"
-
-#: ../undo.c:1313
-#, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E824: ��������� ���� �����: %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr "���� ����� �������, �� ����� ����������� ���������� ��� ������"
-
-#: ../undo.c:1497
-#, c-format
-msgid "Finished reading undo file %s"
-msgstr "�������� ������� ����� ����� %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "��� �� ���������� ����"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "��� �� ��������� ����"
-
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: ���� %<PRId64> �� �������� � �����"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: ����������� ������ �����"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "������ �����"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "����� ������"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "������� �����"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "����� �������"
-
-# msgstr "E438: "
-#: ../undo.c:2193
-msgid "change"
-msgstr "����"
-
-# msgstr "E438: "
-#: ../undo.c:2195
-msgid "changes"
-msgstr "���"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "�����"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "����"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "���� ������ �����������"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr "�����  ����    ���             ���������"
-
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> ������ ����"
-
-# msgstr "E406: "
-#: ../undo.c:2372
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: �� ����� �������� undojoin ���� undo"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: ������ ���������� ����������"
-
-# msgstr "E439: "
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: ³������� ����� ����������"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"�������� �����: "
-
-#: ../version.c:627
-msgid ""
-"\n"
-"Extra patches: "
-msgstr ""
-"\n"
-"�������� �����: "
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "����� "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"���������� "
-
-#: ../version.c:649
-msgid "by "
-msgstr " "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"������ ����� "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "��� GUI."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  �������� (+) ��� �� �������� (-) ����������:\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "   ��������� vimrc: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "     vimrc �����������: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " ������ vimrc �����������: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " ����� vimrc �����������: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "      exrc �����������: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  ������ exrc �����������: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "  ����� ��� $VIM: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr " ����� ��� $VIMRUNTIME: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "������������: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "������������: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ���Ѳ� ��� ������������"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - ���������� Vi"
-
-#: ../version.c:769
-msgid "version "
-msgstr "����� "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "�����: Bram Moolenaar �� ��."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim � �� ������� � ����� ��������������� ��������"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "��������� ������� � ������!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr ":help iccf<Enter>         ���������                "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr ":q<Enter>                 ����� � Vim              "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr ":help<Enter> ��� <F1>     �������� ��������        "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr ":help version7<Enter>     ���������� ��� �����    "
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "�� �������� � ����� �������� � Vi"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr ":set nocp<Enter>          ����� ��������� � Vi    "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr ":help cp-default<Enter>   ���������� ��� ���������"
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "ϳ��������� �������� ��������� Vim!"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "������� ������������� ������������ Vim!"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr ":help sponsor<Enter>      �������� ����������      "
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr ":help register<Enter>     �������� ����������      "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "����  ��������->�������/���������  ���������      "
-
-# msgstr "E444: "
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�� ��� ����� ����"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: ���� ���� ���������"
-
-# msgstr "E441: "
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: �� ������� ��������� ������� topleft � botright"
-
-# msgstr "E442: "
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: �� ������� ���������� ����, ��������� ����"
-
-# msgstr "E443: "
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: �� ������� ������� ������� ����"
-
-# msgstr "E443: "
-#: ../window.c:1810
-msgid "E813: Cannot close autocmd window"
-msgstr "E813: �� ������� ������� ���� autocmd"
-
-# msgstr "E443: "
-#: ../window.c:1814
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: �� ������� ������� ����, ���������� � ����� ���� autocmd"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: � ������ ���� � ����"
-
-# msgstr "E445: "
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: ���� ����� ����� ��� ��������"
-
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: ��������� bf_key_init() � �������� �������"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: ����������� ������������ ������� ����� Blowfish (BE/LE)"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: �� ������� �������� sha256"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: �� ������� �������� Blowfish"
-
-#~ msgid "Patch file"
-#~ msgstr "�����"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&O:������\n"
-#~ "&C:���������"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: ���� �'������� �� �������� Vim"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: �� ������� ������� �� %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �� ������� ��������� ������� �������"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �� ������� �������� �볺���"
-
-#~ msgid "Save As"
-#~ msgstr "�������� ��"
-
-#~ msgid "Source Vim script"
-#~ msgstr "��������� ������ Vim"
-
-#~ msgid "Edit File"
-#~ msgstr "���������� ����"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�� ��������)"
-
-#~ msgid "unknown"
-#~ msgstr "�������"
-
-# msgstr "E185: "
-#~ msgid "Edit File in new window"
-#~ msgstr "���������� ���� � ������ ����"
-
-#~ msgid "Append File"
-#~ msgstr "�������� ����"
-
-# msgstr "E187: "
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "������� ����: X %d, Y %d"
-
-# msgstr "E188: "
-#~ msgid "Save Redirection"
-#~ msgstr "�������� ��������������� ����"
-
-#~ msgid "Save View"
-#~ msgstr "�������� ������"
-
-#~ msgid "Save Session"
-#~ msgstr "�������� �����"
-
-#~ msgid "Save Setup"
-#~ msgstr "�������� ������������"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< �� �������� ��� ��������� +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: � ��� ���� ���� ��������"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "� �������� (�������� ������ 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "�������� � stdin..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�����������]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: ���� ����������� �������� �������"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans �� �������� ���������� � �������� ������"
-
-# msgstr "E391: "
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "������� ������ ���������� ��� ������ NetBeans"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "����� �� �������� ���������� ������ 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: � ������� ����� �������� (! ��� �� �������)"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�� �����������> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �� ������� �������� ����� %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: �� ������� ����������� � �������� �������"
-
-#~ msgid "Pathname:"
-#~ msgstr "����:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: �� ������� �������� �������� �������"
-
-#~ msgid "OK"
-#~ msgstr "������"
-
-#~ msgid "Cancel"
-#~ msgstr "���������"
-
-#~ msgid "Vim dialog"
-#~ msgstr "ij���� Vim"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "Scrollbar Widget: �� ������� ��������� ����� ��������� ��������."
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: �� ������� �������� BalloonEval � ������������ � ��������"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: �� ������� �������� ����� ������ ��� GUI"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: �������� ������ �� ��� ��������� GUI"
-
-# msgstr "E228: "
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: �� ������� ��������� GUI"
-
-# msgstr "E229: "
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: �� ������� ��������� � �%s�"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: �� ������� ��������� GUI, �� �������� �����"
-
-# msgstr "E230: "
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: ����������� 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: �������� 'imactivatekey' ����������"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: �� ������� �������� ���� %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "���� ��� ��������, ����� �����"
-
-#~ msgid "Input _Methods"
-#~ msgstr "������ ��������"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - ������ � �������..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - �����..."
-
-#~ msgid "Find what:"
-#~ msgstr "������:"
-
-#~ msgid "Replace with:"
-#~ msgstr "������� ��:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "���� ����� �����"
-
-#~ msgid "Match case"
-#~ msgstr "������� �� ������"
-
-#~ msgid "Direction"
-#~ msgstr "������"
-
-#~ msgid "Up"
-#~ msgstr "�����"
-
-#~ msgid "Down"
-#~ msgstr "����"
-
-#~ msgid "Find Next"
-#~ msgstr "��������"
-
-#~ msgid "Replace"
-#~ msgstr "�������"
-
-#~ msgid "Replace All"
-#~ msgstr "������� ��"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: ������� ����� �die� �� ��������� ����\n"
-
-#~ msgid "Close"
-#~ msgstr "�������"
-
-#~ msgid "New tab"
-#~ msgstr "���� �������"
-
-#~ msgid "Open Tab..."
-#~ msgstr "³������ �������..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: ���������� ��������� ������� ����\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&F:Գ���������"
-
-#~ msgid "&Cancel"
-#~ msgstr "&C:���������"
-
-#~ msgid "Directories"
-#~ msgstr "��������"
-
-#~ msgid "Filter"
-#~ msgstr "Գ����"
-
-#~ msgid "&Help"
-#~ msgstr "&H:��������"
-
-#~ msgid "Files"
-#~ msgstr "�����"
-
-#~ msgid "&OK"
-#~ msgstr "&O:������"
-
-#~ msgid "Selection"
-#~ msgstr "��������"
-
-#~ msgid "Find &Next"
-#~ msgstr "&N:������ ���"
-
-#~ msgid "&Replace"
-#~ msgstr "&R:�������"
-
-#~ msgid "Replace &All"
-#~ msgstr "&A:������� ��"
-
-#~ msgid "&Undo"
-#~ msgstr "&U:���������"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �� ������� ������ ���� �%s�"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �������� �� �����������: �-%s�; ������������ ����� � OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: �� ������� ������� ���� ��������� �������� MDI"
-
-#~ msgid "Close tab"
-#~ msgstr "������� �������"
-
-#~ msgid "Open tab..."
-#~ msgstr "³������ �������..."
-
-# msgstr "E245: "
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "������ ����� ('\\\\' ��� ������ '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "������ � ������� ('\\\\' ��� ������ '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "����"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "�������\t*.������\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: ���� ������ ������ � �����, ���� ������� ������ ���� "
-#~ "�����������"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: ������ ��� ��� ������� ������� � ����� %s:"
-
-# msgstr "E250: "
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: ����� ������ ������: %s"
-
-# msgstr "E252: "
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "����� '%s' �� � ������������"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: ����� ������ ������: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "�����0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "�����1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "������ ������%<PRId64> �� ����� ����� �� ������ ������0"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "������ ������0: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "������ ������1: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "���������� ������������ ������"
-
-#~ msgid "&Dismiss"
-#~ msgstr "&D:���������"
-
-#~ msgid "no specific match"
-#~ msgstr "���� ����������� ����"
-
-# msgstr "E234: "
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - ���� ������"
-
-#~ msgid "Name:"
-#~ msgstr "�����:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "�������� ����� � �������"
-
-#~ msgid "Encoding:"
-#~ msgstr "���������:"
-
-#~ msgid "Font:"
-#~ msgstr "�����:"
-
-#~ msgid "Style:"
-#~ msgstr "�����:"
-
-#~ msgid "Size:"
-#~ msgstr "�����:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ������� �������� Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: ������� stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: �� ������� ������� ���� ����� cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: �� ������� �������� ���������� � ���� ����� cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "�� ������� ����������� �������� Lua"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "�� ������� �������� ���������� ��� ����������"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: �������, �� ������� ��������, �������� MzScheme �� ������ ���� "
-#~ "�����������."
-
-#~ msgid "invalid expression"
-#~ msgstr "����������� �����"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "������� ������ �������� �� ��� ���������"
-
-#~ msgid "hidden option"
-#~ msgstr "��������� �����"
-
-#~ msgid "unknown option"
-#~ msgstr "������� �����"
-
-#~ msgid "window index is out of range"
-#~ msgstr "����������� ����� ����"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "�� ������� ������� �����"
-
-#~ msgid "cannot delete line"
-#~ msgstr "��������� ������� �����"
-
-#~ msgid "cannot replace line"
-#~ msgstr "��������� ������� �����"
-
-#~ msgid "cannot insert line"
-#~ msgstr "�� ������� �������� �����"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "����� ��� ���� �����"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "�� ������� ����������� �������� Scheme � Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "������� Vim: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "������� Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "����� �����������"
-
-#~ msgid "window is invalid"
-#~ msgstr "���� ����������"
-
-#~ msgid "linenr out of range"
-#~ msgstr "����� ����� �� ������ �����"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "�� ��������� � �������� Vim"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Python: �� ����� ����������� :py � :py3 � ������ �����"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: �������, �� ������� ��������, �������� Python �� ���� ���� "
-#~ "�����������."
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Python: �� ����� ����������� :py � :py3 � ������ �����"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: �� ����� ���������� ��������� Python"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ �� ���� ����������� String"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: �������, �� ������� ��������, �������� Ruby �� ���� ���� "
-#~ "�����������."
-
-# msgstr "E414: "
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: ����������� return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: ����������� next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: ����������� break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: ����������� redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: retry ���� rescue"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: ������������ �������"
-
-# msgstr "E233: "
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: �������� ������ longjmp: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "���������� ���������/����������"
-
-#~ msgid "Show base class of"
-#~ msgstr "������ ������� ����"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "�������� ������� �������-�����"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "��������� � �����"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�������� � �������"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "�������� � ��� �������"
-
-#~ msgid "Retrieve"
-#~ msgstr "��������"
-
-#~ msgid "Show source of"
-#~ msgstr "�������"
-
-#~ msgid "Find symbol"
-#~ msgstr "������ ������"
-
-#~ msgid "Browse class"
-#~ msgstr "����������� ����"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "�������� ���� � ��������"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "�������� ���� � ��������� ��������"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ����� ��"
-
-#~ msgid "Xref referred by"
-#~ msgstr "�� Xref ������� �"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ��"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref �����������"
-
-#~ msgid "Show docu of"
-#~ msgstr "�������� docu"
-
-#~ msgid "Generate docu for"
-#~ msgstr "�������� docu ���"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "�� ������� �'�������� � SNiFF+. �������� �������� (sniffemacs �� ���� "
-#~ "� $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: ������� �� ��� �������. ³�'������"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ ����� "
-
-#~ msgid "not "
-#~ msgstr "�� "
-
-#~ msgid "connected"
-#~ msgstr "��'�������"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: �������� ����� �� SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: ������� �'������� �� SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ �� ��'������"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: �� � ������� SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: ������� ������. ³�'������"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "����������� ����� ������"
-
-#~ msgid "not implemented yet"
-#~ msgstr "�� �� ����������"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "�� ������� ���������� �����"
-
-#~ msgid "invalid mark name"
-#~ msgstr "����������� ����� ��������"
-
-# msgstr "E19: "
-#~ msgid "mark not set"
-#~ msgstr "������ �� �������"
-
-#~ msgid "row %d column %d"
-#~ msgstr "����� %d ������� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "�� ������� ��������/������ �����"
-
-#~ msgid "line number out of range"
-#~ msgstr "����� ����� �� ������ �����"
-
-#~ msgid "unknown flag: "
-#~ msgstr "�������� ���������: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "������� vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "��������� � ���������"
-
-#~ msgid "vim error"
-#~ msgstr "������� Vim"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "�� ������� �������� ������� ����/������: ��'��� ���������"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "�� ������� ������������ ����: �����/���� ��� ���������"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: �������� ������� TCL: ������� ���������� ������ ��������!? ���� "
-#~ "�����, �������� � vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "�� ������� ������������ ������� ��䳿: ��������� �� �����/���� �� "
-#~ "��������"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: �������, �� ������� ��������, �������� Tcl �� ���� ���� "
-#~ "�����������."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: ��� ������ %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "�� ������� ������ �����"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "�� ������� ������������ ����� ������� ������"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �� ������� ������� ������� �� ��������-���"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ����������� ����������� ������������� �������: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: ������� ������ ������ VIM ����������� �����������.  �������!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans �� ����������� � ��� GUI\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "�� ����� Vim �� ���� ������������ � ��������� ���������."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "�� ����� ����������� '-nb': �� ��������� �� ��� ���������\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: �������: �� ������� ��������� gvim ��� NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "���� ������ ����������, ������� / ������� ��� ��������� ��� � ��������� "
-#~ "������."
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t������������ ��� gvim ��� OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\t��������� ��������� ����� gvim ��� OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\t��������� GUI (���� �gvim�)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  ��  --nofork\t�������� ����: ������� ������� ���� ������� GUI"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t�� ��������������� newcli ��� �������� ����"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <�������>\t\t\t��������������� <�������> ��� �����/������"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-u <gvimrc>\t\t����������� ������� ���� ������ .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t���������� ����������� �����"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <�������>\tϳ�'������ vim �� �������� ������� ������� X"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t�� �'���������� � X ��������"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <�����>\t���������� <�����> �� ������ Vim, ���� �� �������"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent <�����>  �� ����, ����� �� ���������� �� ���������� "
-#~ "�������"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <�����>   ..., ��� �������� ���� �� ����� ������ "
-#~ "������������"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <�����>  �� ����, ����� �� ����������, ���� ������� "
-#~ "����"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <�����>  ��� ����, �� --remote, ��� �� "
-#~ "������� �� ����"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <�������> ³������ <�������> ������� � ��������� ������"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <�����> �������� <�����> � ������ Vim � ����������� "
-#~ "���������"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr ""
-#~ "--serverlist\t\t�������� ������ ������� ������� Vim � ��������� ������"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <�����>\t�������� ��/����� Vim �������� � <������>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (����� Motif)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (����� neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ��� gvim (����� Athena)\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <�������>\t�������� vim �� �������� <������>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t��������� Vim � �������� ���� ����"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <����>\t����������� <����> ��� ���� (�����: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <����>\t����������� <����> ��� ���������� ������ (�����: -"
-#~ "fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr ""
-#~ "-font <�����>\t����������� <�����> ��� ���������� ������ (�����: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <�����>\t����������� <�����> ��� ������� ������"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <�����>\t����������� <�����> ��� �������� ������"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <����>\t������ ������ � ��������� (�����: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <����>\t���������� ������� ��� <����> (�����: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <����>  ���������� ������� ������ ����� (�����: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <������>\t���������� ������ ���� <������> (�����: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t�������� ������� (�����: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t�� �������� ������� (�����: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <������>\t\t���������� ���������� ������"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� gvim (����� GTK+)\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <�������>\t�������� vim �� <������> (�����: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
-#~ "--role <����>\t���������� ��������� ���� ��� ������������� ��������� ����"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t³������ Vim � ������ ������� ���������� GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\t��� gvim ������� ������������� ���� �� stdout"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <��������� ������>\t³������ Vim ��������� ������������ ����"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t³������ Vim ��������� ������ �������� win32"
-
-#~ msgid "No display"
-#~ msgstr "���� �������"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �� ������� �������.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": �� ������� �������. ������ �������� �� ����\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "������������ %d � %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "���� �������: ³������ ����� �� �������.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ³������ ����� �� �������.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ���������� ������ �������"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: �� ������� ���������� �������� ��������� �����"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �� ������� �������� �������� �����"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �� ������� �������� ����� �����"
-
-# msgstr "E286: "
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: ������������: �� ������� ���������� � ����� ����� ���� ��������"
-
-# msgstr "E287: "
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ����� ����� �� ������� ����"
-
-# msgstr "E288: "
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ����� ����� �� ������� ������������ ����"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: ������� ���������� ���������� ����� �����"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s �����������, � �� ����� Vim �� ������� ����������"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "���� ����� ������������: �%s�"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "���� �� ������ ����� ���� �����, ��� �� �������� ��������� ����,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "������ ����� ���� �����."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "���� �� �������� ��������� ���� ���� ���� ����� �����, ��������� enter"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "��� ����������� ��������� ���� ��� ���������� ����� �� ����� �����"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "��� ���������� ����� ��������������� ���� ����� � ����� �����.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�� ��������� ��� ���� ���� Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "³������ �� ����"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "������� �������"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�����'����� ����"
-
-#~ msgid "Open File dialog"
-#~ msgstr "³������ ����"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: �������, ��� � ������ ���� ������ ������ �����"
-
-#~ msgid "ERROR: "
-#~ msgstr "�������: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[����]  ������ ����/����. %<PRIu64>/%<PRIu64>, �����. %<PRIu64>, ����. "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[�������] ������ re/malloc() - %<PRIu64>, ������ free() - %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: ����� ��� ������� ������"
-
-# msgstr "E340: "
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �������� �������: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ������������ ������ ����"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "������ ���� �����: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "�������� ����: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "����� �� �������!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "�� ������� �'�������� �� Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "�� ������� �'�������� �� Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: ������������ ����� ������� �� ����� ���������� ��� �'������� � "
-#~ "NetBenans: �%s�"
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "�������� � ������ Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �������� ��'���� �� NetBeans ��� ������ %<PRId64>"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans �� ����������� � ��� GUI"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans ��� ��'������"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s ����� ��� ������� (! ��� �� �������)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ��������� eval ����������"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "�������� �����: %<PRId64>"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: �� ������� ������ term � GUI"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: ���������� �:gui� ��� ������� GUI"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: �� ����� ������ � GUI GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: �����������(�) �����(�)"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �� ������� ������� ���� ������"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ������������ ���� ������"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �� ������� ����������� ���������� �����"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ����������� ���������� �����"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ���� �� �����������"
-
-# msgstr "E358: "
-#~ msgid "cannot open "
-#~ msgstr "�� ������� ������� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: �� ������� ������� ����!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "������� Amigados 2.04 ��� ������\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "������� %s ���� %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "�� ������� ������� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "�� ������� �������� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim ������� ������ � %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�� ���� ������ ����� ������ ?!\n"
-
-# msgstr "E359: "
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: �� �������??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: �� ������� ��������� �������� � ������ -f"
-
-# msgstr "E360: "
-#~ msgid "Cannot execute "
-#~ msgstr "�� ������� �������� "
-
-#~ msgid "shell "
-#~ msgstr "�������� "
-
-#~ msgid " returned\n"
-#~ msgstr " ���������\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE �������"
-
-#~ msgid "I/O ERROR"
-#~ msgstr "������� �����/������"
-
-#~ msgid "Message"
-#~ msgstr "�����������"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' �� 80, �� ����� ���������� �������� �������"
-
-# msgstr "E364: "
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: �� ������� ������� �������"
-
-#~ msgid "to %s on %s"
-#~ msgstr "�� %s � %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: �������� ����� ��������: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: ������� �����: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "��������� '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: ���������� ����� ������ ������� �%s� � ���� ������ �%s�"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: ���������� ������ %c � ���� ������ �%s�"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "�� �������� ������� X ���� %<PRId64> ��������"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: ������� X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "������� � �� ������� ��������"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "����� ��� ���������� �������� ������� �"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�� ������� ��������� �������� `sh'\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�� ����� �������� ������\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�� ������� ����������\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "������� �������� ���������\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ������� �'������� ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "�� ������� ������� ������� X"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ������������ ����� '������� ����'"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ����������� �'�������"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ������������� �� �'�������� � ICE �� �������"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP �� ������� SmcOpenConnection: %s"
-
-#~ msgid "At line"
-#~ msgstr "�����:"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "�� ������� ����������� vim32.dll"
-
-#~ msgid "VIM Error"
-#~ msgstr "������� VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "�� ������� ��������� ��������� �� ������� DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "�������� ��������� %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: �������� ���� %s\n"
-
-#~ msgid "close"
-#~ msgstr "close"
-
-#~ msgid "logoff"
-#~ msgstr "logoff"
-
-#~ msgid "shutdown"
-#~ msgstr "shutdown"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: ������� �� ��������"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "���� VIMRUN.EXE �� �������� � ����� ������.\n"
-#~ "�������� ������� �� ������ ����������� ���� ���������.\n"
-#~ "�������  :help win32-vimrun ��� �������� ���������."
-
-#~ msgid "Vim Warning"
-#~ msgstr "������������ Vim"
-
-# msgstr "E231: "
-#~ msgid "Error file"
-#~ msgstr "���� �������"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: �� ������� ���������� NFA � ������ �������������!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) �� ������� �������� ������ ��� ������ ����!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "������������: �� ������� ������ ������ ��� �%s_%s.spl� �� �%s_ascii.spl�"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "������������ � %s �� �����������"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: ����������� �����, ������ ��� ���� ��������"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: ���� ����� �崳� ��������� �� %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�������� ���� ��������\n"
-
-# msgstr "E242: "
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "����������� CUT_BUFFER0 ������ ���������� ��������"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "���������� ���� ���������, ��� ���� ����������"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: �������������� ���� �� ������������ ���� �����: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: �� ������� ������������ ���� �����: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: ���� ����� ������������: %s"
-
-# msgstr "E440: "
-# ---------------------------------------
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� � GUI ��� 16/32-�������� Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� � GUI ��� 64-�������� MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� � GUI ��� 32-�������� Windows"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " � ����� Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " � ��������� OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ����� ��� 64-�������� Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ����� ��� 32-�������� Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� 16-�������� Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� 32-�������� MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� 16-�������� MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� MacOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "����� ��� OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "������ ����� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "��������� ����� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "���� ����� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "�������� ����� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "� GUI GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "� GUI GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "� GUI X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "� GUI X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "� GUI X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "� GUI Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "� GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "� GUI Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "� GUI Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "� (���������) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "  ��������� gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    gvimrc �����������: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "������ gvimrc �����������: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "����� gvimrc �����������: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    �������� ����: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "���������: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "����  Help->Orphans       �������� ����������      "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "��� ������, ����� �� ������� ������������"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "����  Edit->Global Settings->Toggle Insert Mode    "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                          ��� ���� ������         "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "����  Edit->Global Settings->Toggle Vi Compatible  "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "              ��� �������� � ����� �������� � Vi"
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "������������: �� ����������� Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr ":help windows95<Enter>    ���������� ��� ��        "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: �� ������� ����������� �������� %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "�������, �� ������� ��������, �������� Perl �� ���� ���� �����������."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: ���������� ������ Perl ���������� � �������� ��� ������ Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "���������� � (&m)����� Vim"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "���������� � ������ &Vim"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "�������� � ��������� Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "���������� �� ��������� &Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "���������� � ��� ���������� Vim - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "������ ������� ����� � ��������� Vim"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "������� ��������� �������, �������� �� � gvim � ����� ������!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "������� gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "���� ������� ������!"
-
-# msgstr "E233: "
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: �������� ���� ������: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: �������� �����: %s"
-
-# msgstr "E235: "
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: ����� �%s� �� ������������"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �� ������� ����������� ��������� ������� %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �� ����� ����������� �����: �� �������� �� ��� ���������\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �� ����� ����������� ����: �� �������� �� ��� ���������\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: �� ����� ����������� �������� ����: �� �������� �� ��� "
-#~ "���������\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: ���� ������������� ������� � ������ �%s�"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �� ������� ������� �������"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �������� ����������� �����"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: �� ����� ������ ��������� �����"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans �� �������� �������� �������� �� ������ �����"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "��� �%s� ������� ����: "
-
-# msgstr "E406: "
-#~ msgid "empty keys are not allowed"
-#~ msgstr "������� ����� �� ���������"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "������� �����������"
-
-#~ msgid "list is locked"
-#~ msgstr "������ �����������"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "�� ������� ������ ���� '%s' �� ��������"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "������ �� ���� ����� �� ���, �� %s"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr "���������� ��������� str() �� unicode(), ��� �������� %s"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "���������� ��������� bytes() �� str(), ��� �������� %s"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr ""
-#~ "���������� int(), long() �� ����, �� ���� ���� ������ long(), ��� "
-#~ "�������� %s"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr ""
-#~ "���������� int() �� ����, �� ���� ���� ������ int(), ��� �������� %s"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "�������� ��������, ��� ��������� � ��� C int"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "�������� ������, ��� ��������� � ��� C int"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "����� �� ���� �����, ��� ����"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "����� �� ���� �� �����, ��� ����"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "�� ������� ������� �������� OutputObject"
-
-# msgstr "E180: "
-#~ msgid "invalid attribute: %s"
-#~ msgstr "������������ �������: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: ������� ������������ ��'���� �����/������"
-
-#~ msgid "failed to change directory"
-#~ msgstr "�� ������� ������ ���������"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "���������� 3-������ �� ��������� imp.find_module(), ��� �������� %s"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "���������� 3-������ �� ��������� imp.find_module(), ��� �������� %d"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "�������� �������: imp.find_module ��������� ������ � NULL"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "�� ������� ������� �������� vim.Dictionary"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "�� ����� ������ ���������� �������"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "�� ����� ���������� ������� %s"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "���-������� �������� �� ��� �����������"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr ""
-#~ "����������� ������������ ������� 2, ��� �������� ������������ ������ "
-#~ "%d"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "��������� ����������� �� ������ ��������� ���������"
-
-#~ msgid "list index out of range"
-#~ msgstr "������ ������ �� ������"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "�������� �������: �� ������� �������� ������� ������ vim %d"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "�� ������� ������ ������� �� ������"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "�������� �������: ���� �������� ������ vim %d"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "�������� �������: �� ������� ������ ������� �� ������"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "�� ������� ������� �������� vim.List"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "�� ����� ������ ���������� ������"
-
-# msgstr "E428: "
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "�������� ������� %s �� ����"
-
-# msgstr "E428: "
-#~ msgid "function %s does not exist"
-#~ msgstr "������� %s �� ����"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "����������� ������� �� ������ ��������� ���������"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "�� ������� �������� ������� %s"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "�� ������� ���������� ����"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "�� ������� ������� ��������� ����� %s"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "�� ������� ������� ����� %s, ��� �� �� ����������� ��������"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "������ ��������� �� ������� �������"
-
-#~ msgid "no such tab page"
-#~ msgstr "���� ������� ����"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "������ ���������� �� ��������� ����"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "������� ���� ��� �������: �����"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "������ �� ������ ������"
-
-#~ msgid "no such window"
-#~ msgstr "������ ���� ����"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "������ ��������� �� ��������� ������"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "�� ������� ������������� �����"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "������ ���� �� ���� ���� ������"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "���������� �ᒺ�� vim.Buffer, ��� �������� %s"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "�� ������� ������������ �� ������ %d"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "���������� �ᒺ�� vim.Window, ��� �������� %s"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "�� ������� ������ ���� � �������� �������"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "�� ����������� �� ��������� ����"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "���������� �ᒺ�� vim.TabPage, ��� �������� %s"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "�� ����������� �� ������� �������"
-
-#~ msgid "failed to run the code"
-#~ msgstr "�� ������� �������� ���"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval �� �������� ������ �ᒺ�� python"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: �� ������� ����������� �ᒺ�� python � �������� vim"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "�� ������� ����������� %s � ������� vim"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "�� ������� ����������� %s � ��������� vim"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "�������� �������: �������� ��������� NULL"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "�������� �������: ������������ ��� ��������"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "�� ������� ���������� �������� �����: sys.path_hooks �� ������\n"
-#~ "��� ��� ������� ���:\n"
-#~ "- ������� vim.path_hook �� sys.path_hooks\n"
-#~ "- ������� vim.VIM_SPECIAL_PATH �� sys.path\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "�� ������� ���������� ����: sys.path �� ������\n"
-#~ "��� ��� ������ vim.VIM_SPECIAL_PATH �� sys.path"
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index eaa3a5bfa9..cff140508b 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
+"POT-Creation-Date: 2016-11-06 07:25+0200\n"
 "PO-Revision-Date: 2010-06-18 21:53+0300\n"
 "Last-Translator: Анатолій Сахнік <sakhnik@gmail.com>\n"
 "Language-Team: Bohdan Vlasyuk <bohdan@vstu.edu.ua>\n"
@@ -21,216 +21,341 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "не вдалося отримати значення опції"
+msgid "Index out of bounds"
+msgstr "Індекс поза межами"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "внутрішня помилка: невідомий тип опції"
+msgid "Line index is too high"
+msgstr "Номер рядка завеликий"
+
+msgid "Argument \"start\" is higher than \"end\""
+msgstr "Аргумент «start» більший, ніж «end»"
+
+msgid "All items in the replacement array must be strings"
+msgstr "Всі елементи в масиві заміни мають бути текстовими"
+
+msgid "string cannot contain newlines"
+msgstr "текст має бути одним рядком"
+
+msgid "Failed to save undo information"
+msgstr "Не вдалося записати інформацію для скасування"
+
+msgid "Failed to delete line"
+msgstr "Не вдалося знищити рядок"
+
+msgid "Index value is too high"
+msgstr "Значення індексу завелике"
+
+msgid "Failed to replace line"
+msgstr "Не вдалося замінити рядок"
+
+msgid "Failed to insert line"
+msgstr "Не вдалося вставити рядок"
+
+msgid "Failed to rename buffer"
+msgstr "Не вдалося перейменувати буфер"
+
+msgid "Mark name must be a single character"
+msgstr "Назва позначки має бути одним символом"
+
+msgid "Invalid mark name"
+msgstr "Неправильна назва помітки"
+
+msgid "Line number outside range"
+msgstr "Номер рядка поза межами"
+
+msgid "Column value outside range"
+msgstr "Значення колонки поза межами"
+
+msgid "Keyboard interrupt"
+msgstr "Перервано з клавіатури"
+
+msgid "Key not found"
+msgstr "Ключ не знайдено"
+
+msgid "Dictionary is locked"
+msgstr "Словник заблоковано"
+
+msgid "Empty dictionary keys aren't allowed"
+msgstr "Не дозволено порожні ключі в словнику"
+
+msgid "Key length is too high"
+msgstr "Довжина ключа завелика"
+
+#, c-format
+msgid "Key \"%s\" doesn't exist"
+msgstr "Ключ «%s» не існує"
+
+msgid "Empty option name"
+msgstr "Порожня назва опції"
+
+#, c-format
+msgid "Invalid option name \"%s\""
+msgstr "Неправильна назва опції «%s»"
+
+#, c-format
+msgid "Unable to get value for option \"%s\""
+msgstr "Не вдалося отримати значення опції «%s»"
+
+#, c-format
+msgid "Unknown type for option \"%s\""
+msgstr "Невідомий тип для опції «%s»"
+
+#, c-format
+msgid "Unable to unset option \"%s\""
+msgstr "Не вдалося прибрати опцію «%s»"
+
+#, c-format
+msgid "Cannot unset option \"%s\" because it doesn't have a global value"
+msgstr "Не вдалося скинути опцію «%s», тому що в неї немає глобального значення"
+
+#, c-format
+msgid "Option \"%s\" requires a boolean value"
+msgstr "Опція «%s» потребує логічне значення"
+
+#, c-format
+msgid "Option \"%s\" requires an integer value"
+msgstr "Опція «%s» вимагає ціле значення"
+
+#, c-format
+msgid "Value for option \"%s\" is outside range"
+msgstr "Значення для опції «%s» поза межами"
+
+#, c-format
+msgid "Option \"%s\" requires a string value"
+msgstr "Опція «%s» вимагає рядкове значення"
+
+msgid "Invalid buffer id"
+msgstr "Некоректний ід. буфера"
+
+msgid "Invalid window id"
+msgstr "Некоректний ід. вікна"
+
+msgid "Invalid tabpage id"
+msgstr "Некоректний ід. вкладки"
+
+msgid "Integer value outside range"
+msgstr "Ціле значення поза межами"
+
+msgid "Problem while switching windows"
+msgstr "Невдача при перемиканні вікон"
+
+msgid "UI already attached for channel"
+msgstr "До каналу вже приєднано інтерфейс користувача"
+
+msgid "Expected width > 0 and height > 0"
+msgstr "Очікується ширина > 0 і висота > 0"
+
+msgid "UI is not attached for channel"
+msgstr "Інтерфейс користувача не під’єднано до каналу"
+
+msgid "rgb must be a Boolean"
+msgstr "rgb має бути Boolean"
+
+msgid "popupmenu_external must be a Boolean"
+msgstr "popupmenu_external має бути Boolean"
+
+msgid "No such ui option"
+msgstr "Немає такої опції інтерфейсу користувача"
+
+msgid "Failed to evaluate expression"
+msgstr "Не вдалося обчислити вираз"
+
+msgid "Function called with too many arguments."
+msgstr "Функцію викликано із завеликою кількістю аргументів."
+
+msgid "Error calling function."
+msgstr "Помилка виклику функції."
+
+msgid "String length is too high"
+msgstr "Довжина тексту завелика"
+
+msgid "Directory string is too long"
+msgstr "Назва каталогу завелика"
+
+msgid "Failed to change directory"
+msgstr "Не вдалося змінити каталог"
+
+#, c-format
+msgid "Failed to switch to buffer %d"
+msgstr "Не вдалося перемкнутися до буфера %d"
+
+#, c-format
+msgid "Failed to switch to window %d"
+msgstr "Не вдалося перемкнутися до вікна %d"
+
+#, c-format
+msgid "Failed to switch to tabpage %d"
+msgstr "Не вдалося перемкнутися до вкладки %d"
+
+msgid "All items in calls array must be arrays"
+msgstr "Всі елементи масиву calls мають бути масивами"
+
+msgid "All items in calls array must be arrays of size 2"
+msgstr "Всі елементи в масиві calls мають бути масивами довжиною 2"
+
+msgid "name must be String"
+msgstr "Назва має бути String"
+
+msgid "args must be Array"
+msgstr "args має бути Array"
+
+msgid "Argument \"pos\" must be a [row, col] array"
+msgstr "Аргумент «pos» має бути масивом [ряд, ст]"
+
+msgid "Cursor position outside buffer"
+msgstr "Положення курсора поза буфером"
+
+msgid "Height value outside range"
+msgstr "Значення висоти поза межами"
+
+msgid "Width value outside range"
+msgstr "Значення ширини поза межами"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[Список місць]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Список виправлень]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: Автокоманди призвели до скасування команди"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: Немає можливості розмістити хоч один буфер, завершення роботи..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: Немає можливості розмістити буфер, буде використано інший..."
 
-#: ../buffer.c:763
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Жоден з буферів не був вивантажений"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: Жоден з буферів не знищено"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Жоден з буферів не витерто"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "Вивантажено один буфер"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "Вивантажено %d буфери(ів)"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "Знищено один буфер"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "Знищено %d буфери(ів)"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "Витерто один буфер"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "Витерто %d буфери(ів)"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: Не можу вивантажити останній буфер"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: Жоден буфер не змінено"
 
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: У списку немає буферів"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Буфера %<PRId64> немає"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: Це вже останній буфер"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: Це вже найперший буфер"
 
-#: ../buffer.c:945
+#, c-format
+msgid "E89: %s will be killed(add ! to override)"
+msgstr "E89: «%s» буде вбито(! щоб не зважати)"
+
 #, c-format
 msgid ""
 "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr "E89: Буфер %<PRId64> має зміни (! щоб не зважати)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Обережно: Список назв файлів переповнено"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
 msgid "E92: Buffer %<PRId64> not found"
 msgstr "E92: Буфер %<PRId64> не знайдено"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: Знайдено кілька збігів з %s"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: Не знайдено буфер, схожий на %s"
 
-#: ../buffer.c:2161
 #, c-format
 msgid "line %<PRId64>"
 msgstr "рядок %<PRId64>"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Буфер з такою назвою вже існує"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [Змінено]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[Не редаговано]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[Новий файл]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[Помилки читання]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[RO]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[лише читати]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "один рядок --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
 msgid "%<PRId64> lines --%d%%--"
 msgstr "%<PRId64> рядки(ів) --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
 msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
 msgstr "рядок %<PRId64> з %<PRId64> --%d%%-- колонка "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[Без назви]"
 
-#. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "допомога"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[Допомога]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[Перегляд]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "Усе"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "Знизу"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "Вгорі"
 
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Список буферів:\n"
-
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[З нуля]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -238,809 +363,666 @@ msgstr ""
 "\n"
 "--- Позначки ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "Позначки для %s:"
 
-#: ../buffer.c:4543
 #, c-format
 msgid "    line=%<PRId64>  id=%d  name=%s"
 msgstr "    рядок=%<PRId64>  id=%d назва=%s"
 
-#: ../cursor_shape.c:68
 msgid "E545: Missing colon"
 msgstr "E545: Пропущено двокрапку"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
 msgid "E546: Illegal mode"
 msgstr "E546: Неправильний режим"
 
-#: ../cursor_shape.c:134
 msgid "E548: digit expected"
 msgstr "E548: Потрібна цифра"
 
-#: ../cursor_shape.c:138
 msgid "E549: Illegal percentage"
 msgstr "E549: Неправильний відсоток"
 
-#: ../diff.c:146
 #, c-format
 msgid "E96: Can not diff more than %<PRId64> buffers"
 msgstr "E96: Не можна порівнювати понад %<PRId64> буфери(ів)"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Не можна читати чи записувати тимчасові файли"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: Не вдалося створити порівняння"
 
-#: ../diff.c:966
 msgid "E816: Cannot read patch output"
 msgstr "E816: Не вдалося прочитати результат patch"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: Не вдалося прочитати результат diff"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: Цей буфер не в режимі порівняння"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: Немає більше модифіковних буферів в режимі порівняння"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: Немає інших буферів в режимі порівняння"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: Понад два буфери у режимі порівняння, не зрозуміло, котрий із них "
 "використати"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: Не вдалося знайти буфер «%s»"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Буфер «%s» не в режимі порівняння"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Буфер несподівано змінився"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: У диграфах не може міститися escape"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: Не знайдено файл розкладки"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :loadkeymap використано не у файлі команд"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: Елемент розкладки порожній"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " Доповнення ключових слів (^N^P)"
 
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " Режим ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " Доповнення усього рядка (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " Доповнення назви файлу (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
-msgstr " Доповнення теґів (^]^N^P)"
+msgstr " Доповнення з міток (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " Доповнення шляху за зразком (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " Доповнення визначення (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " Доповнення зі словника (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " Доповнення з тезаурусу (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " Доповнення команд (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " Користувацьке доповнення (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " Кмітливе доповнення (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Орфографічна підказка (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " Доповнення місцевих ключових слів (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "Трапився кінець параграфа"
 
-# msgstr "E443: "
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: Функція доповнення змінила вікно"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: Функція доповнення знищила текст"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "Опція 'dictionary' порожня"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "Опція 'thesaurus' порожня"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Сканується словник: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (вставка) Прогорнути (^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (заміна) Прогорнути (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "Пошук у: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "Пошук серед теґів."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " Додається"
 
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- Пошук..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "Початковий варіант"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "Слово з іншого рядка"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "Єдиний збіг"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "збіг %d з %d"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "збіг %d"
 
-# msgstr "E17: "
-#: ../eval.c:137
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Неочікувані символи у :let"
 
-#: ../eval.c:138
 #, c-format
 msgid "E684: list index out of range: %<PRId64>"
 msgstr "E684: Індекс списку поза межами: %<PRId64>"
 
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Невизначена змінна: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: Бракує ']'"
 
-#: ../eval.c:141
 #, c-format
 msgid "E686: Argument of %s must be a List"
 msgstr "E686: Аргумент у %s має бути списком"
 
-#: ../eval.c:143
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
 msgstr "E712: Аргумент у %s має бути списком чи словником"
 
-#: ../eval.c:144
 msgid "E713: Cannot use empty key for Dictionary"
 msgstr "E713: Ключ словника не може бути порожнім"
 
-# msgstr "E396: "
-#: ../eval.c:145
 msgid "E714: List required"
 msgstr "E714: Потрібен список"
 
-#: ../eval.c:146
 msgid "E715: Dictionary required"
 msgstr "E715: Потрібен словник"
 
-#: ../eval.c:147
+msgid "E928: String required"
+msgstr "E928: Потрібен String"
+
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Забагато аргументів для функції: %s"
 
-#: ../eval.c:148
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
 msgstr "E716: Немає такого ключа у словнику: %s"
 
-#: ../eval.c:150
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
 msgstr "E122: Функція %s уже існує, ! щоб замінити"
 
-#: ../eval.c:151
 msgid "E717: Dictionary entry already exists"
 msgstr "E717: Запис у словнику вже існує"
 
-#: ../eval.c:152
 msgid "E718: Funcref required"
 msgstr "E718: Треба посилання на функцію"
 
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Не можна використати [:] зі словником"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Неправильний тип змінної для %s="
 
-#: ../eval.c:155
 #, c-format
 msgid "E130: Unknown function: %s"
 msgstr "E130: Невідома функція: %s"
 
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Неприпустима назва змінної: %s"
 
-# msgstr "E373: "
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: Float вжито як String"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: Цілей менше, ніж елементів списку"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: Цілей більше, ніж елементів списку"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "Друга ; у списку змінних"
 
-# msgstr "E235: "
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Не можна перерахувати змінні у %s"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Індексний доступ може бути тільки до списку чи словника"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] має бути останньою"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] вимагає список"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: Список має більше елементів, ніж ціль"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: Список має недостатньо елементів"
 
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: Пропущено «in» після :for"
 
-#: ../eval.c:3063
 #, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Пропущено дужки: %s"
 
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Змінної немає: «%s»"
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: Змінна має забагато вкладень щоб бути за-/відкритою."
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: Бракує ':' після '?'"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: Список можна порівняти тільки зі списком"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: Некоректна операція над списком"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Словник можна порівняти тільки із словником"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Некоректна операція над словником"
 
-#: ../eval.c:3932
 msgid "E693: Can only compare Funcref with Funcref"
 msgstr "E693: Функцію можна порівняти тільки з функцією"
 
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Некоректна операція над функцією"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: Не можна виконати '%' над Float"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: Пропущено ')'"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Функція не має індексації"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Спеціальна змінна не має індексації"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Бракує назви опції: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Невідома опція: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Бракує лапки: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Бракує лапки: %s"
 
-# msgstr "E404: "
-#: ../eval.c:5084
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Бракує коми у списку: %s"
 
-#: ../eval.c:5091
 #, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Немає кінцівки списку ']': %s"
 
-# msgstr "E235: "
-#: ../eval.c:6475
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr "Недостатньо пам’яті для встановлення посилань, збирання сміття припинено!"
+
+msgid "Argument is not a function or function name"
+msgstr "Аргумент не функція чи назва функції"
+
+#, c-format
+msgid "Function %s doesn't exist"
+msgstr "Функції «%s» немає"
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Бракує двокрапки у словнику: %s"
 
-#: ../eval.c:6499
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Повторення ключа в словнику: «%s»"
 
-# msgstr "E235: "
-#: ../eval.c:6517
 #, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Бракує коми у словнику: %s"
 
-#: ../eval.c:6524
 #, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Немає кінцівки словника '}': %s"
 
-# msgstr "E21: "
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: У змінній забагато вкладень щоб її показати"
-
-#: ../eval.c:7188
 #, c-format
 msgid "E740: Too many arguments for function %s"
 msgstr "E740: Забагато аргументів для функції %s"
 
-#: ../eval.c:7190
 #, c-format
 msgid "E116: Invalid arguments for function %s"
 msgstr "E116: Неправильні аргументи функції %s"
 
-#: ../eval.c:7377
 #, c-format
 msgid "E117: Unknown function: %s"
 msgstr "E117: Невідома функція: %s"
 
-#: ../eval.c:7383
 #, c-format
 msgid "E119: Not enough arguments for function: %s"
 msgstr "E119: Замало аргументів для функції %s"
 
-#: ../eval.c:7387
 #, c-format
 msgid "E120: Using <SID> not in a script context: %s"
 msgstr "E120: <SID> використовується не у контексті скрипту: %s"
 
-#: ../eval.c:7391
 #, c-format
 msgid "E725: Calling dict function without Dictionary: %s"
 msgstr "E725: Виклик dict-функції без словника: %s"
 
-#: ../eval.c:7453
 msgid "E808: Number or Float required"
 msgstr "E808: Треба вказати Number чи Float"
 
-# msgstr "E14: "
-#: ../eval.c:7503
+#, c-format
+msgid "Error converting the call result: %s"
+msgstr "Не вдалося перетворити результат виклику: %s"
+
 msgid "add() argument"
 msgstr "аргумент add()"
 
-#: ../eval.c:7907
 msgid "E699: Too many arguments"
 msgstr "E699: Забагато аргументів"
 
-# msgstr "E327: "
-#: ../eval.c:8073
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() можна вживати тільки в режимі вставки"
 
-#: ../eval.c:8156
 msgid "&Ok"
 msgstr "&O:Гаразд"
 
-# msgstr "E226: "
-#: ../eval.c:8676
+msgid "extend() argument"
+msgstr "аргумент extend()"
+
 #, c-format
 msgid "E737: Key already exists: %s"
 msgstr "E737: Ключ вже існує: %s"
 
-# msgstr "E14: "
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "аргумент extend()"
-
-# msgstr "E14: "
-#: ../eval.c:8915
 msgid "map() argument"
 msgstr "аргумент map()"
 
-# msgstr "E14: "
-#: ../eval.c:8916
 msgid "filter() argument"
 msgstr "аргумент filter()"
 
-#: ../eval.c:9229
 #, c-format
 msgid "+-%s%3ld lines: "
 msgstr "+-%s%3ld рядків: "
 
-#: ../eval.c:9291
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Невідома функція: %s"
 
-#: ../eval.c:10729
+msgid "E5000: Cannot find tab number."
+msgstr "E5000: Не можна знайти номер вкладки."
+
+msgid "E5001: Higher scope cannot be -1 if lower scope is >= 0."
+msgstr "E5001: Вища область не може бути -1, якщо нижча область >= 0."
+
+msgid "E5002: Cannot find window number."
+msgstr "E5002: Неможливо знайти номер вікна."
+
+msgid "5000: Cannot find tab number."
+msgstr "5000: Не можна знайти номер вкладки."
+
 msgid "called inputrestore() more often than inputsave()"
 msgstr "Виклики до inputrestore() частіше, ніж до inputsave()"
 
-# msgstr "E14: "
-#: ../eval.c:10771
 msgid "insert() argument"
 msgstr "аргумент insert()"
 
-# msgstr "E406: "
-#: ../eval.c:10841
 msgid "E786: Range not allowed"
 msgstr "E786: Інтервал не дозволено"
 
-# msgstr "E177: "
-#: ../eval.c:11140
+msgid "Invalid stream on rpc job, use jobclose(id, 'rpc')"
+msgstr "Некоректний потік на завданні rpc, вживайте jobclose(id, 'rpc')"
+
+msgid "Invalid job stream: Not an rpc job"
+msgstr "Некоректний потік завдання: Не є завданням rpc"
+
+#, c-format
+msgid "Invalid job stream \"%s\""
+msgstr "Некоректний потік завдання «%s»"
+
+msgid "Can't send data to the job: stdin is closed"
+msgstr "Неможливо надіслати дані завданню: вхідний потік закрито"
+
+msgid "Can't send raw data to rpc channel"
+msgstr "Неможливо надіслати дані у канал завдання"
+
+msgid "Argument vector must have at least one item"
+msgstr "Вектор аргументів має мати щонайменше один елемент"
+
+msgid "E474: Failed to convert list to string"
+msgstr "E474: Не вдалося перетворити список у текст"
+
+#, c-format
+msgid "E474: Failed to parse %.*s"
+msgstr "E474: Не вдалося розібрати %.*s"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Некоректний тип для len()"
 
-#: ../eval.c:11980
+#, c-format
+msgid "msgpackdump() argument, index %i"
+msgstr "аргумент msgpackdump(), індекс %i"
+
 msgid "E726: Stride is zero"
 msgstr "E726: Крок нульовий"
 
-#: ../eval.c:11982
 msgid "E727: Start past end"
 msgstr "E727: Початок за кінцем"
 
-#: ../eval.c:12024 ../eval.c:15297
 msgid "<empty>"
 msgstr "<нічого>"
 
-# msgstr "E14: "
-#: ../eval.c:12282
 msgid "remove() argument"
 msgstr "аргумент remove()"
 
-#: ../eval.c:12466
 msgid "E655: Too many symbolic links (cycle?)"
 msgstr "E655: Забагато символьних посилань (цикл?)"
 
-# msgstr "E14: "
-#: ../eval.c:12593
 msgid "reverse() argument"
 msgstr "аргумент reverse()"
 
-# msgstr "E14: "
-#: ../eval.c:13721
 msgid "sort() argument"
 msgstr "аргумент sort()"
 
-# msgstr "E14: "
-#: ../eval.c:13721
-#, fuzzy
 msgid "uniq() argument"
-msgstr "аргумент add()"
+msgstr "аргумент uniq()"
 
-# msgstr "E364: "
-#: ../eval.c:13776
 msgid "E702: Sort compare function failed"
 msgstr "E702: Помилка у функції порівняння"
 
-# msgstr "E364: "
-#: ../eval.c:13806
-#, fuzzy
 msgid "E882: Uniq compare function failed"
-msgstr "E702: Помилка у функції порівняння"
+msgstr "E882: Помилка у функції порівняння uniq"
 
-#: ../eval.c:14085
 msgid "(Invalid)"
 msgstr "(Неможливо)"
 
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: Не вдалося записати тимчасовий файл"
+msgid "Can only call this function in an unmodified buffer"
+msgstr "Цю функцію можна викликати тільки у незміненому буфері"
 
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Float вжито як Number"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: Funcref вжито як Number"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: List вжито як Number"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Dictionary вжито як Number"
 
-#: ../eval.c:16259
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref вжито як Float"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: String вжито як Float"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: List вжито як Float"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Dictionary вжито як Float"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: Funcref вжито як String"
 
-# msgstr "E373: "
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: List вжито як String"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Dictionary вжито як String"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Неправильний тип змінної: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: некоректне значення вжито як String"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: Не можна знищити змінну %s"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Назва змінної Funcref має починатися з великої літери: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Назва змінної співпадає з існуючою функцією: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: Значення захищене: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: Не можна змінити значення %s"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: Змінна вкладена занадто глибоко щоб зробити її копію"
 
-#: ../eval.c:17249
 #, c-format
 msgid "E123: Undefined function: %s"
 msgstr "E123: Невизначена функція: %s"
 
-#: ../eval.c:17260
 #, c-format
 msgid "E124: Missing '(': %s"
 msgstr "E124: Бракує '(': %s"
 
-#: ../eval.c:17293
 msgid "E862: Cannot use g: here"
 msgstr "E862: Тут не можна використати g:"
 
-#: ../eval.c:17312
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Недозволений аргумент: %s"
 
-#: ../eval.c:17323
 #, c-format
 msgid "E853: Duplicate argument name: %s"
 msgstr "E853: Назва аргументу повторюється: %s"
 
-#: ../eval.c:17416
 msgid "E126: Missing :endfunction"
 msgstr "E126: Бракує :endfunction"
 
-#: ../eval.c:17537
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Назва функції співпадає зі змінною: %s"
 
-#: ../eval.c:17549
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
 msgstr "E127: Не вдалося перевизначити функцію %s: вона використовується"
 
-#: ../eval.c:17604
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Назва функції не збігається з назвою файлу скрипту: %s"
 
-#: ../eval.c:17716
 msgid "E129: Function name required"
 msgstr "E129: Не вказано назву функції"
 
-#: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Назва функції має починатися з великої літери або містити двокрапку: %s"
+msgstr "E128: Назва функції має починатися з великої літери або \"s:\": %s"
 
-#: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Назва функції має починатися з великої літери або містити двокрапку: %s"
+msgstr "E884: Назва функції не може містити двокрапку: %s"
 
-#: ../eval.c:18336
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Не вдалося знищити функцію %s: Вона використовується"
 
-#: ../eval.c:18441
+#, c-format
+msgid "Cannot delete function %s: It is being used internally"
+msgstr "Не вдалося знищити функцію %s: Вона використовується"
+
 msgid "E132: Function call depth is higher than 'maxfuncdepth'"
 msgstr "E132: Глибина викликів функції перевищує 'maxfuncdepth'"
 
-#: ../eval.c:18568
 #, c-format
 msgid "calling %s"
 msgstr "викликається %s"
 
-#: ../eval.c:18651
 #, c-format
 msgid "%s aborted"
 msgstr "%s припинено"
 
-#: ../eval.c:18653
 #, c-format
 msgid "%s returning #%<PRId64>"
 msgstr "%s повертає #%<PRId64>"
 
-#: ../eval.c:18670
 #, c-format
 msgid "%s returning %s"
 msgstr "%s повертає %s"
 
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
 msgid "continuing in %s"
 msgstr "продовження в %s"
 
-#: ../eval.c:18795
 msgid "E133: :return not inside a function"
 msgstr "E133: :return поза межами функції"
 
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# глобальні змінні:\n"
-
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
@@ -1048,152 +1030,305 @@ msgstr ""
 "\n"
 "\tВостаннє змінена у "
 
-#: ../eval.c:19272
 msgid "No old files"
 msgstr "Жодного старого файлу"
 
-#: ../ex_cmds.c:122
 #, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  шіст %02x, віс %03o"
+msgid "E474: Expected comma before list item: %s"
+msgstr "E474: Очікується кома перед елементом списка: %s"
 
-#: ../ex_cmds.c:145
 #, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, шіст %04x, віс %o"
+msgid "E474: Expected colon before dictionary value: %s"
+msgstr "E474: Очікується двокрапка перед значенням у словнику: %s"
 
-#: ../ex_cmds.c:146
 #, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, шіст %08x, віс %o"
+msgid "E474: Expected string key: %s"
+msgstr "E474: Очікується текстовий ключ: %s"
 
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: Неможливо перемістити рядки самі в себе"
+#, c-format
+msgid "E474: Expected comma before dictionary key: %s"
+msgstr "E474: Очікується кома перед словниковим ключем: %s"
 
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "Переміщено один рядок"
+#, c-format
+msgid "E474: Unfinished escape sequence: %.*s"
+msgstr "E474: Не закінчено послідовність escape: %.*s"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "Переміщено %<PRId64> рядки(ів)"
+msgid "E474: Unfinished unicode escape sequence: %.*s"
+msgstr "E474: Не закінчено escape-послідовність юнікоду: %.*s"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "Відфільтровано %<PRId64> рядки(ів)"
+msgid "E474: Expected four hex digits after \\u: %.*s"
+msgstr "E474: Очікується чотири шістнадцяткові цифри після \\u: %.*s"
 
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: Автокоманди *Filter* не повинні змінювати поточний буфер"
+#, c-format
+msgid "E474: Unknown escape sequence: %.*s"
+msgstr "E474: Невідома послідовність escape: %.*s"
 
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[Зміни не записано]\n"
+#, c-format
+msgid "E474: ASCII control characters cannot be present inside string: %.*s"
+msgstr "E474: Керуючі символи ASCII не можуть бути всередині тексту: %.*s"
+
+#, c-format
+msgid "E474: Only UTF-8 strings allowed: %.*s"
+msgstr "E474: Дозволено тільки текст UTF-8: %.*s"
 
-#: ../ex_cmds.c:1424
 #, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s в рядку: "
+msgid ""
+"E474: Only UTF-8 code points up to U+10FFFF are allowed to appear unescaped: "
+"%.*s"
+msgstr ""
+"E474: Тільки точки коду UTF-8 до U+10FFFF можуть бути присутні без escape: "
+"%.*s"
 
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: Забагато помилок, решта файлу буде пропущено"
+#, c-format
+msgid "E474: Expected string end: %.*s"
+msgstr "E474: Очікувався кінець рядка: %.*s"
 
-#: ../ex_cmds.c:1458
 #, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Зчитується файл viminfo: «%s»%s%s%s"
+msgid "E474: Failed to convert string \"%.*s\" from UTF-8"
+msgstr "E474: Не вдалося перетворити текст «%.*s» з UTF-8"
 
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " інформація"
+#, c-format
+msgid "E474: Leading zeroes are not allowed: %.*s"
+msgstr "E474: Початкові нулі не дозволено: %.*s"
 
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " позначки"
+#, c-format
+msgid "E474: Missing number after minus sign: %.*s"
+msgstr "E474: Бракує числа після знаку: %.*s"
 
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " старі файли"
+#, c-format
+msgid "E474: Missing number after decimal dot: %.*s"
+msgstr "E474: Бракує числа після десяткової крапки: %.*s"
 
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " НЕ ВДАЛОСЯ"
+#, c-format
+msgid "E474: Missing exponent: %.*s"
+msgstr "E474: Бракує експоненти: %.*s"
+
+#, c-format
+msgid ""
+"E685: internal error: while converting number \"%.*s\" to float string2float "
+"consumed %zu bytes in place of %zu"
+msgstr ""
+"E685: внутрішня помилка: при перетворенні числа «%.*s» у float, string2float "
+"спожив %zu байтів замість %zu"
+
+#, c-format
+msgid ""
+"E685: internal error: while converting number \"%.*s\" to integer vim_str2nr "
+"consumed %i bytes in place of %zu"
+msgstr ""
+"E685: внутрішня помилка: при перетворенні числа «%.*s» у ціле, vim_str2nr "
+"спожив %i байтів замість %zu"
+
+msgid "E474: Attempt to decode a blank string"
+msgstr "E474: Спроба декодування порожнього тексту"
+
+#, c-format
+msgid "E474: No container to close: %.*s"
+msgstr "E474: Немає контейнера щоб закрити: %.*s"
+
+#, c-format
+msgid "E474: Closing list with curly bracket: %.*s"
+msgstr "E474: Закривається список фігурною дужкою: %.*s"
+
+#, c-format
+msgid "E474: Closing dictionary with square bracket: %.*s"
+msgstr "E474: Закриття словника квадратною дужкою: %.*s"
+
+#, c-format
+msgid "E474: Trailing comma: %.*s"
+msgstr "E474: Зайва кома: %.*s"
+
+#, c-format
+msgid "E474: Expected value after colon: %.*s"
+msgstr "E474: Очікується значення після двокрапки: %.*s"
+
+#, c-format
+msgid "E474: Expected value: %.*s"
+msgstr "E474: Очікується значення: %.*s"
+
+#, c-format
+msgid "E474: Comma not inside container: %.*s"
+msgstr "E474: Кома поза контейнером: %.*s"
+
+#, c-format
+msgid "E474: Duplicate comma: %.*s"
+msgstr "E474: Зайва кома: %.*s"
+
+#, c-format
+msgid "E474: Comma after colon: %.*s"
+msgstr "E474: Кома після двокрапки: %.*s"
+
+#, c-format
+msgid "E474: Using comma in place of colon: %.*s"
+msgstr "E474: Кома замість двокрапки: %.*s"
+
+#, c-format
+msgid "E474: Leading comma: %.*s"
+msgstr "E474: Кома на початку: %.*s"
+
+#, c-format
+msgid "E474: Colon not inside container: %.*s"
+msgstr "E474: Двокрапка не всередині контейнера: %.*s"
+
+#, c-format
+msgid "E474: Using colon not in dictionary: %.*s"
+msgstr "E474: Двокрапка не в словнику: %.*s"
 
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Не дозволено запис у файл viminfo: %s"
+msgid "E474: Unexpected colon: %.*s"
+msgstr "E474: Несподівана двокрапка: %.*s"
 
-#: ../ex_cmds.c:1626
 #, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Не вдалося записати файл viminfo %s!"
+msgid "E474: Colon after comma: %.*s"
+msgstr "E474: Двокрапка після коми: %.*s"
 
-#: ../ex_cmds.c:1635
 #, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Записується файл viminfo «%s»"
+msgid "E474: Duplicate colon: %.*s"
+msgstr "E474: Зайва двокрапка: %.*s"
 
-#. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Цей файл автоматично створений Vim %s.\n"
+msgid "E474: Expected null: %.*s"
+msgstr "E474: Несподіваний null: %.*s"
 
-#: ../ex_cmds.c:1722
+#, c-format
+msgid "E474: Expected true: %.*s"
+msgstr "E474: Очікується true: %.*s"
+
+#, c-format
+msgid "E474: Expected false: %.*s"
+msgstr "E474: Очікується false: %.*s"
+
+#, c-format
+msgid "E474: Unidentified byte: %.*s"
+msgstr "E474: Невизначений байт: %.*s"
+
+#, c-format
+msgid "E474: Trailing characters: %.*s"
+msgstr "E474: Надлишкові символи: %.*s"
+
+#, c-format
+msgid "E474: Unexpected end of input: %.*s"
+msgstr "E474: Несподіваний кінець: %.*s"
+
+#, c-format
+msgid "key %s"
+msgstr "ключ %s"
+
+#, c-format
+msgid "key %s at index %i from special map"
+msgstr "ключ %s за індексом %i із спеціальної мапи"
+
+#, c-format
+msgid "index %i"
+msgstr "індекс %i"
+
+msgid "itself"
+msgstr "сам себе"
+
+msgid "E724: unable to correctly dump variable with self-referencing container"
+msgstr "E724: не вдалося коректно злити змінну з контейнером, який сам на себе посилається"
+
+msgid "E474: Unable to represent NaN value in JSON"
+msgstr "E474: Неможливо представити значення NaN у JSON"
+
+msgid "E474: Unable to represent infinity in JSON"
+msgstr "E474: Неможливо представити нескінченність у JSON"
+
+#, c-format
+msgid "E474: Failed to convert string \"%.*s\" to UTF-8"
+msgstr "E474: Не вдалося перетворити рядок «%.*s» до UTF-8"
+
+#, c-format
 msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
+"E474: String \"%.*s\" contains byte that does not start any UTF-8 character"
 msgstr ""
-"# Можете редагувати, але ОБЕРЕЖНО!\n"
-"\n"
+"E474: Текст \"%.*s\" містить байт, що не починає жодного символу UTF-8"
+
+#, c-format
+msgid ""
+"E474: UTF-8 string contains code point which belongs to a surrogate pair: "
+"%.*s"
+msgstr ""
+"E474: текст UTF-8 містить точку кодування, яка належить сурогатній парі: "
+"%.*s"
+
+msgid "E474: Unable to convert EXT string to JSON"
+msgstr "E474: Не вдалося перетворити рядок EXT у JSON"
+
+#, c-format
+msgid "E474: Error while dumping %s, %s: attempt to dump function reference"
+msgstr "E474: Помилка при злитті %s, %s: спроба злити посилання на функцію"
+
+msgid "E474: Invalid key in special dictionary"
+msgstr "E474: Неправильний ключ у спеціальному словнику"
+
+#, c-format
+msgid "E951: Error while dumping %s, %s: attempt to dump function reference"
+msgstr "E951: Помилка при зливанні %s, %s: спроба злити посилання на функцію"
+
+#, c-format
+msgid "E952: Unable to dump %s: container references itself in %s"
+msgstr "E952: Неможливо злити %s: контейнер посилається на самого себе у %s"
+
+#, c-format
+msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
+msgstr "<%s>%s%s  %d,  шіст %02x, віс %03o"
+
+#, c-format
+msgid "> %d, Hex %04x, Octal %o"
+msgstr "> %d, шіст %04x, віс %o"
+
+#, c-format
+msgid "> %d, Hex %08x, Octal %o"
+msgstr "> %d, шіст %08x, віс %o"
+
+msgid "E134: Move lines into themselves"
+msgstr "E134: Неможливо перемістити рядки самі в себе"
 
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# Значення 'encoding' під час створення цього файлу\n"
+msgid "1 line moved"
+msgstr "Переміщено один рядок"
 
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "Недозволений символ на початку рядка"
+#, c-format
+msgid "%<PRId64> lines moved"
+msgstr "Переміщено %<PRId64> рядки(ів)"
+
+#, c-format
+msgid "%<PRId64> lines filtered"
+msgstr "Відфільтровано %<PRId64> рядки(ів)"
+
+msgid "E135: *Filter* Autocommands must not change current buffer"
+msgstr "E135: Автокоманди *Filter* не повинні змінювати поточний буфер"
+
+msgid "[No write since last change]\n"
+msgstr "[Зміни не записано]\n"
 
-#: ../ex_cmds.c:2162
 msgid "Write partial file?"
 msgstr "Записати частину файлу?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: Використайте ! для запису частини буфера"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Переписати існуючий файл «%s»?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Файл обміну «%s» існує, перезаписати?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Файл обміну існує: %s (:silent! переважує)"
 
-#: ../ex_cmds.c:2381
 #, c-format
 msgid "E141: No file name for buffer %<PRId64>"
 msgstr "E141: Немає вхідного файлу для буфера %<PRId64>"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Файл не записано: запис заборонено опцією 'write'"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1202,7 +1337,6 @@ msgstr ""
 "Для «%s» встановлено 'readonly'.\n"
 "Бажаєте все одно продовжити запис?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1213,816 +1347,581 @@ msgstr ""
 "Проте, можливо, його можна записати.\n"
 "Хочете спробувати?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: «%s» тільки для читання (! щоб не зважати)"
 
-#: ../ex_cmds.c:3120
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Автокоманди несподівано знищили новий буфер %s"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: нечисловий аргумент для :z"
 
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: У rvim не дозволені команди оболонки"
+msgid "E145: Shell commands not allowed in restricted mode"
+msgstr "E145: У обмеженому режимі не дозволені команди оболонки"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: Регулярні вирази не можна розділяти літерами"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "Замінити на %s (y/n/a/q/l/^E/^Y)?"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(Перервано) "
 
-# msgstr "E31: "
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "Один збіг"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "Одна заміна"
 
-#: ../ex_cmds.c:4387
 #, c-format
 msgid "%<PRId64> matches"
 msgstr "%<PRId64> збіги(ів)"
 
-#: ../ex_cmds.c:4388
 #, c-format
 msgid "%<PRId64> substitutions"
 msgstr "%<PRId64> замін(и)"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " в одному рядку"
 
-#: ../ex_cmds.c:4395
 #, c-format
 msgid " on %<PRId64> lines"
 msgstr " в %<PRId64> рядках"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global не можна вживати рекурсивно"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: У global бракує зразка"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Зразок знайдено у кожному рядку: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "Зразок не знайдено: %s"
 
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Остання заміна:\n"
-"$"
-
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: Без паніки!"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: Вибачте, немає допомоги '%s' для %s"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: Вибачте, немає допомоги для %s"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "Вибачте, файл допомоги «%s» не знайдено"
 
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Не є каталогом: %s"
-
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Не вдалося відкрити %s для запису"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Не вдалося відкрити %s для читання"
 
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Мішанина кодувань файлу допомоги для мови %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Повторення теґу «%s» у файлі %s/%s"
+msgstr "E154: Повторення мітки «%s» у файлі %s/%s"
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: Не є каталогом: %s"
 
-#: ../ex_cmds.c:5687
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Невідома команда надпису: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: Пропущено назву надпису"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: Визначено забагато надписів"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Некоректний надпис: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Невідомий надпис: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: Пропущено номер надпису"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Некоректна назва буфера: %s"
 
-#: ../ex_cmds.c:6008
 #, c-format
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: Неправильний ID надпису: %<PRId64>"
 
-#: ../ex_cmds.c:6066
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Неможливо змінити знак %s"
+
 msgid " (not supported)"
 msgstr " (не підтримується)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[Знищено]"
 
-#: ../ex_cmds2.c:139
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Режим налагодження.  Щоб продовжити введіть «cont»."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
 msgid "line %<PRId64>: %s"
 msgstr "рядок %<PRId64>: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "команда: %s"
 
-#: ../ex_cmds2.c:322
+msgid "frame is zero"
+msgstr "кадр нульовий"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "кадр на найвищому рівні: %d"
+
 #, c-format
 msgid "Breakpoint in \"%s%s\" line %<PRId64>"
 msgstr "Точка зупинки в «%s%s» рядок %<PRId64>"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Точку зупинки не знайдено: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "Не визначено жодної точки зупинки"
 
-#: ../ex_cmds2.c:617
 #, c-format
 msgid "%3d  %s %s  line %<PRId64>"
 msgstr "%3d %s %s   рядок %<PRId64>"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Спочатку зробіть «:profile start {файл}»"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Зберегти зміни в «%s»?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "Неназваний"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Буфер «%s» має незбережені зміни"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr ""
 "Обережно: Несподівано опинилися у іншому буфері (перевірте автокоманди)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: Редагується лише один файл"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: Це вже найперший файл"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: Це вже останній файл"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: Компілятор не підтримується: %s"
 
-# msgstr "E195: "
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Пошук «%s» в «%s»"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "Пошук «%s»"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "В 'runtimepath' не знайдено «%s»"
+msgid "not found in '%s': \"%s\""
+msgstr "не знайдено в '%s': «%s»"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Не вдалося прочитати каталог: «%s»"
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "Не вдалося виконати «%s»"
 
-#: ../ex_cmds2.c:2520
 #, c-format
 msgid "line %<PRId64>: could not source \"%s\""
 msgstr "рядок %<PRId64>: не вдалося виконати «%s»"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "виконується «%s»"
 
-#: ../ex_cmds2.c:2537
 #, c-format
 msgid "line %<PRId64>: sourcing \"%s\""
 msgstr "рядок %<PRId64>: виконується «%s»"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "закінчено виконання %s"
 
-#: ../ex_cmds2.c:2765
 msgid "modeline"
 msgstr "modeline"
 
-# msgstr "E14: "
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd аргумент"
 
-# msgstr "E14: "
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c аргумент"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "змінна оточення"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "обробник помилки"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: Застереження: Неправильний роздільник рядків, можливо, бракує ^M"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding використано поза виконуваним файлом"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish використано поза виконуваним файлом"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "Мова (%s): «%s»"
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Не вдалося встановити мову «%s»"
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Режим Ex. Для повернення до нормального режиму виконайте «visual»"
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: Кінець файлу"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: Команда занадто рекурсивна"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Виняткова ситуація не оброблена: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "Кінець виконуваного файлу"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "Кінець функції"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: Неоднозначний вжиток команди користувача"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: Це не команда редактора"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: Інтервал задано навиворіт"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "Інтервал задано навиворіт, щоб поміняти місцями — ГАРАЗД"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: Спробуйте w або w>>"
 
-#: ../ex_docmd.c:3454
 msgid "E319: The command is not available in this version"
 msgstr "E319: Вибачте, цієї команди немає у цій версії"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: Дозволено тільки одну назву файлу"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "Залишилося відредагувати ще один файл. Все одно вийти?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "Ще є %d не редагованих файлів. Все одно вийти?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: Залишилося відредагувати ще один файл"
 
-#: ../ex_docmd.c:4250
 #, c-format
 msgid "E173: %<PRId64> more files to edit"
 msgstr "E173: Залишилося %<PRId64> не редагованих файлів"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: Команда вже існує, ! щоб замінити її"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    Назва       Арг. Межа  Доповнення Визначення"
+"    Назва       Арг.       Адреса   Доповнення Визначення"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "Не знайдено команд користувача"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: Не вказано атрибутів"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: Неправильна кількість аргументів"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: Лічильник не може бути вказано двічі"
 
-# msgstr "E177: "
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: Неправильне початкове значення лічильника"
 
-# msgstr "E178: "
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: для -complete потрібний аргумент"
 
-# msgstr "E180: "
-#: ../ex_docmd.c:4635
+msgid "E179: argument required for -addr"
+msgstr "E179: для -addr потрібний аргумент"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Неправильний атрибут: %s"
 
-# msgstr "E181: "
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: Неправильна назва команди"
 
-# msgstr "E182: "
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: Команди користувача повинні починатися з великої літери"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr ""
 "E841: Зарезервована назва, не можна використати для користувацької команди"
 
-# msgstr "E183: "
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: Команду користувача не знайдено: %s"
 
-# msgstr "E179: "
-#: ../ex_docmd.c:5219
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Неправильне значення типу адреси: %s"
+
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Неправильне доповнення: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Аргумент дозволений тільки для користувацького доповнення"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Користувацьке доповнення вимагає аргумент-функцію"
 
-# msgstr "E184: "
-#: ../ex_docmd.c:5257
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Не вдалося знайти схему кольорів «%s»"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Вітання, користувачу Vim!"
 
-# msgstr "E443: "
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: Не можна закрити останню вкладку"
 
-# msgstr "E444: "
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "Вже й так лише одна вкладка"
 
-#: ../ex_docmd.c:6004
 #, c-format
 msgid "Tab page %d"
 msgstr "Вкладка %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "Немає файлу обміну"
 
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: Не вдалося змінити каталог, буфер має зміни (! щоб не зважати)"
-
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: Це вже найперший каталог"
 
-# msgstr "E186: "
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: Невідомо"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize вимагає два числових аргументи"
 
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: Не можна отримати позицію вікна на цій платформі"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos вимагає два числових аргументи"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: Не вдалося створити каталог: %s"
-
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: Файл «%s» існує (! щоб не зважати)"
 
-# msgstr "E189: "
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Не вдалося відкрити «%s» для запису"
 
-# msgstr "E190: "
-#. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Аргумент має бути літерою, ` або '"
 
-# msgstr "E191: "
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Забагато вкладених :normal"
 
-# msgstr "E193: "
-#: ../ex_docmd.c:7807
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Немає назви вторинного файлу для заміни '#'"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: Немає назви файлу автокоманди для заміни «<afile>»"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: Немає номера буфера автокоманди для заміни «<abuf>»"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: Немає назви збігу автокоманди для заміни «<amatch>»"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: Немає назви файлу :source для заміни «<sfile>»"
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: немає номера рядка, щоб використати з «<sfile>»"
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Назва файлу для '%' чи '#' порожня, працює лише з «:p:h»"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Результат — порожній рядок"
 
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Не вдалося прочитати файл viminfo"
-
-#: ../ex_eval.c:464
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Не можна викидати (:throw) винятки з префіксом 'Vim'"
 
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Виняткова ситуація: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "Виняток закінчено: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "Виняток скинуто: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
 msgid "%s, line %<PRId64>"
 msgstr "%s, рядок %<PRId64>"
 
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Спіймано виняткову ситуацію: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "Очікується %s"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "Відновлено %s"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "Скинуто %s"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "Виняток"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "Помилка, перервано"
 
-# msgstr "E231: "
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "Помилка"
 
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "Перервано"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: Занадто багато вкладених :if"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :endif без :if"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :else без :if"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif без :if"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: Не одне :else"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :elseif після :else"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: Забагато вкладених :while/:for"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :continue без :while чи :for"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :break без :while чи :for"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: Вжито :endfor із :while"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: Вжито :endwhile із :for"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: Забагато вкладених :try"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :catch без :try"
 
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch після :finally"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :finally без :try"
 
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: Не одне :finally"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :entry без :try"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction поза межами функції"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: Зараз не можна редагувати інший буфер"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Зараз не можна змінювати інформацію буфера"
 
-# msgstr "E197: "
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "назва теґу"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " тип файлу\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "Опція 'history' порожня"
 
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Попередні %s (від найновіших):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "команди"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "шукані рядки"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "вирази"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "введені рядки"
-
-#: ../ex_getln.c:5117
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar поза межами команди"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Активне вікно або буфер було знищено"
 
-#: ../file_search.c:203
 msgid "E854: path too long for completion"
 msgstr "E854: шлях занадто довгий для доповнення"
 
-#: ../file_search.c:446
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -2031,218 +1930,155 @@ msgstr ""
 "E343: Некоректний шлях: `**[число]' повинне бути наприкінці шляху або перед "
 "'%s'."
 
-# msgstr "E343: "
-#: ../file_search.c:1505
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
 msgstr "E344: Не вдалося знайти каталог «%s» у cdpath"
 
-# msgstr "E344: "
-#: ../file_search.c:1508
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
 msgstr "E345: Не вдалося знайти файл «%s» у path"
 
-# msgstr "E345: "
-#: ../file_search.c:1512
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
 msgstr "E346: У cdpath немає більше каталогу «%s»"
 
-# msgstr "E346: "
-#: ../file_search.c:1515
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
 msgstr "E347: У шляху пошуку більше немає файлів «%s»"
 
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Автокоманди змінили буфер чи його назву"
 
-# msgstr "E199: "
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "Недозволена назва файлу"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "каталог"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "не файл"
 
-#: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
 msgstr "[Новий файл]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[Новий каталог]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[Файл завеликий]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[Відмовлено]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: Автокоманди *ReadPre унеможливили читання файлу"
 
-# msgstr "E200: "
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: Автокоманди *ReadPre не повинні змінювати цей буфер"
 
-# msgstr "E201: "
-#: ../fileio.c:672
 msgid "Nvim: Reading from stdin...\n"
 msgstr "Vim: Читається з stdin...\n"
 
-#. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Конвертація унеможливила читання файлу!"
 
-# msgstr "E202: "
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[канал/сокет]"
 
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[канал]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[сокет]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[спец. символьний]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[Бракує CR]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[Розбито довгі рядки]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[НЕ конвертовано]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[конвертовано]"
 
-#: ../fileio.c:1831
 #, c-format
 msgid "[CONVERSION ERROR in line %<PRId64>]"
 msgstr "[ПОМИЛКА КОНВЕРТАЦІЇ у рядку %<PRId64>]"
 
-#: ../fileio.c:1835
 #, c-format
 msgid "[ILLEGAL BYTE in line %<PRId64>]"
 msgstr "[НЕКОРЕКТНИЙ БАЙТ у рядку %<PRId64>]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[ПОМИЛКА ЧИТАННЯ]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "Не вдалося підшукати тимчасовий файл для конвертації"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "Конвертація з 'charconvert' не вдалася"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "не вдалося прочитати вивід 'charconvert'"
 
-# msgstr "E217: "
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Немає відповідних автокоманд"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Автокоманда знищила або вивантажила буфер, що мав бути записаний"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Автокоманда несподіваним чином змінила кількість рядків"
 
-#: ../fileio.c:2548 ../fileio.c:2565
 msgid "is not a file or writable device"
 msgstr "Не придатний для запису"
 
-#: ../fileio.c:2601
 msgid "is read-only (add ! to override)"
 msgstr "лише для читання (! щоб не зважати)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: Не вдалося записати резервний файл (! щоб не зважати)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr "E507: Помилка закриття резервного файлу (! щоб не зважати)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr ""
 "E508: Не вдалося прочитати файл щоб створити резервну копію (! щоб не "
 "зважати)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: Не вдалося створити резервну копію (! щоб не зважати)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: Не вдалося зробити резервну копію (! щоб не зважати)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Не вдалося підшукати тимчасовий файл для запису"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: Не вдалося перетворити (! щоб записати без конвертації)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: Не вдалося відкрити для запису зв'язаний файл"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: Не вдалося відкрити файл для запису"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: Не вдалося виконати fsync"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: Не вдалося закрити"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: Помилка запису, конвертація не вдалася (скиньте 'fenc')"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
 "E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
@@ -2251,56 +2087,43 @@ msgstr ""
 "E513: Помилка запису, конвертація не вдалася у рядку %<PRId64> (скиньте "
 "'fenc')"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: Помилка запису (скінчилось вільне місце?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " ПОМИЛКА КОНВЕРТАЦІЇ"
 
-#: ../fileio.c:3509
 #, c-format
 msgid " in line %<PRId64>;"
 msgstr " у рядку %<PRId64>;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[Пристрій]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[Новий]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr "[д]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " дописаний"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr "[з]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " записаний"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Латання: не вдалося зберегти оригінал"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: Латання: не вдалося створити оригінал"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: Не вдалося знищити резервний файл"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2308,134 +2131,102 @@ msgstr ""
 "\n"
 "ЗАСТЕРЕЖЕННЯ: Оригінал, мабуть, втрачений чи пошкоджений\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "Не виходьте з редактора, доки файл не записано!"
 
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[формат dos]"
 
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
+msgid "[dos]"
+msgstr "[dos]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[формат mac]"
 
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
+msgid "[mac]"
+msgstr "[mac]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[формат unix]"
 
-#: ../fileio.c:3831
+msgid "[unix]"
+msgstr "[unix]"
+
 msgid "1 line, "
 msgstr "один рядок, "
 
-#: ../fileio.c:3833
 #, c-format
 msgid "%<PRId64> lines, "
 msgstr "%<PRId64> рядків, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "один символ"
 
-#: ../fileio.c:3838
 #, c-format
 msgid "%<PRId64> characters"
 msgstr "%<PRId64> символів"
 
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[Неповний останній рядок]"
 
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
+msgid "[noeol]"
+msgstr "[noeol]"
+
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "ЗАСТЕРЕЖЕННЯ: Файл змінився з часу останнього читання!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "Ви справді хочете його переписати??"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Помилка запису у «%s»"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Помилка закриття «%s»"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Помилка читання «%s»"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: Автокоманда FileChangedShell знищила буфер"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: Файл «%s» більше не досяжний"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: Застереження: Файл «%s» змінився, але й буфер у Vim також"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "Див. «:help W12» для уточнення."
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Застереження: Файл «%s» змінився після початку редагування"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "Див. «:help W11» для уточнення."
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: Застереження: Режим файлу «%s» змінився після початку редагування"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "Див. «:help W16» для уточнення."
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Застереження: Файл «%s» було створено після початку редагування"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "Застереження"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2443,51 +2234,37 @@ msgstr ""
 "&O:Гаразд\n"
 "&L:Завантажити"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Не вдалося підготувати «%s», щоб перечитати"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Не вдалося перечитати «%s»"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--Знищено--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Автоматичне знищення автокоманди: %s <буфер=%d>"
 
-#. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Немає такої групи: «%s»"
 
-#: ../fileio.c:5897
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Недозволений символ після *: %s"
 
-# msgstr "E215: "
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: Немає такої події: %s"
 
-# msgstr "E215: "
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: Немає такої групи чи події: %s"
 
-# msgstr "E216: "
-#. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2495,802 +2272,602 @@ msgstr ""
 "\n"
 "--- Автокоманди ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <буфер=%d>: некоректний номер буфера "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Не можу виконувати автокоманди для УСІХ подій"
 
-# msgstr "E217: "
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "Немає відповідних автокоманд"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: Забагато вкладених автокоманд"
 
-# msgstr "E218: "
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "Автокоманди %s для «%s»"
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "Виконується %s"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "автокоманда %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: Бракує {."
 
-# msgstr "E219: "
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: Бракує }."
 
-# msgstr "E220: "
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: Згорток не знайдено"
 
-# msgstr "E349: "
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: Не вдалося створити згортку методом 'foldmethod'"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Не вдалося знищити згортку методом 'foldmethod'"
 
-#: ../fold.c:1784
 #, c-format
 msgid "+--%3ld lines folded "
 msgstr "+-- згорнуто %3ld рядків "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: Додати до буфера читання"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: Заміна рекурсивна"
 
-# msgstr "E223: "
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: Загальне скорочення для %s вже існує"
 
-# msgstr "E224: "
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: Загальна заміна для %s вже існує"
 
-# msgstr "E225: "
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: Вже є скорочення для %s"
 
-# msgstr "E226: "
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: Вже є заміна для %s"
 
-# msgstr "E227: "
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "Скорочення не знайдено"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "Заміни не знайдено"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Неприпустимий режим"
 
-# msgstr "E447: "
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
 msgid "--No lines in buffer--"
 msgstr "--Жодного рядка--"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
 msgid "E470: Command aborted"
 msgstr "E470: Команду перервано"
 
-#: ../globals.h:997
+msgid "E905: Cannot set this option after startup"
+msgstr "E905: Не вдалося встановити цю опцію після запуску"
+
+msgid "E903: Could not spawn API job"
+msgstr "E903: Не вдалося запустити задачу"
+
 msgid "E471: Argument required"
 msgstr "E471: Необхідно вказати аргумент"
 
-#: ../globals.h:998
 msgid "E10: \\ should be followed by /, ? or &"
 msgstr "E10: За \\ має йти /, ? або &"
 
-# msgstr "E10: "
-#: ../globals.h:1000
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: Неприпустимо у вікні команд, <CR> виконує, CTRL-C виходить"
 
-#: ../globals.h:1002
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
-"E12: Команда не дозволена у exrc/vimrc у пошуку поточного каталогу чи теґу"
+"E12: Команда не дозволена у exrc/vimrc у пошуку поточного каталогу чи мітки"
 
-#: ../globals.h:1003
 msgid "E171: Missing :endif"
 msgstr "E171: Бракує :endif"
 
-#: ../globals.h:1004
 msgid "E600: Missing :endtry"
 msgstr "E600: Бракує :endtry"
 
-#: ../globals.h:1005
 msgid "E170: Missing :endwhile"
 msgstr "E170: Бракує :endwhile"
 
-#: ../globals.h:1006
 msgid "E170: Missing :endfor"
 msgstr "E170: Бракує :endfor"
 
-#: ../globals.h:1007
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile без :while"
 
-#: ../globals.h:1008
 msgid "E588: :endfor without :for"
 msgstr "E588: :endfor без :for"
 
-#: ../globals.h:1009
 msgid "E13: File exists (add ! to override)"
 msgstr "E13: Файл існує (! щоб не зважати)"
 
-#: ../globals.h:1010
 msgid "E472: Command failed"
 msgstr "E472: Команда на вдалась"
 
-#: ../globals.h:1011
 msgid "E473: Internal error"
 msgstr "E473: Внутрішня помилка"
 
-#: ../globals.h:1012
 msgid "Interrupted"
 msgstr "Перервано"
 
-#: ../globals.h:1013
 msgid "E14: Invalid address"
 msgstr "E14: Неправильна адреса"
 
-# msgstr "E14: "
-#: ../globals.h:1014
 msgid "E474: Invalid argument"
 msgstr "E474: Некоректний аргумент"
 
-#: ../globals.h:1015
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Некоректний аргумент: %s"
 
-#: ../globals.h:1016
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Неправильний вираз: %s"
 
-# msgstr "E15: "
-#: ../globals.h:1017
 msgid "E16: Invalid range"
 msgstr "E16: Неправильні межі"
 
-# msgstr "E16: "
-#: ../globals.h:1018
 msgid "E476: Invalid command"
 msgstr "E476: Некоректна команда"
 
-#: ../globals.h:1019
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: «%s» — це каталог"
 
-#: ../globals.h:1020
-#, fuzzy
 msgid "E900: Invalid job id"
-msgstr "E49: Некоректний розмір зсуву"
+msgstr "E900: Некоректний ід. завдання"
 
-#: ../globals.h:1021
 msgid "E901: Job table is full"
-msgstr ""
+msgstr "E901: Таблиця завдань заповнена"
 
-#: ../globals.h:1022
 #, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
+msgid "E903: Process for command \"%s\" could not be spawned"
+msgstr "E903: Не вдалося запустити процес для команди «%s»"
+
+msgid "E904: Job is not connected to a pty"
+msgstr "E904: Завдання не приєднане до pty"
 
-#: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
 msgstr "E364: Бібліотечний виклик до «%s()» не вдався"
 
-# msgstr "E18: "
-#: ../globals.h:1026
+#, c-format
+msgid "E739: Cannot create directory %s: %s"
+msgstr "E739: Не вдалося створити каталог %s: %s"
+
 msgid "E19: Mark has invalid line number"
 msgstr "E19: У помітки некоректний номер рядка"
 
-# msgstr "E19: "
-#: ../globals.h:1027
 msgid "E20: Mark not set"
 msgstr "E20: Помітку не встановлено"
 
-# msgstr "E20: "
-#: ../globals.h:1029
 msgid "E21: Cannot make changes, 'modifiable' is off"
 msgstr "E21: Зміни не дозволені: вимкнено 'modifiable'"
 
-# msgstr "E21: "
-#: ../globals.h:1030
 msgid "E22: Scripts nested too deep"
 msgstr "E22: Забагато вкладених скриптів"
 
-# msgstr "E22: "
-#: ../globals.h:1031
 msgid "E23: No alternate file"
 msgstr "E23: Немає вторинного файлу"
 
-# msgstr "E23: "
-#: ../globals.h:1032
 msgid "E24: No such abbreviation"
 msgstr "E24: Такого скорочення немає"
 
-# msgstr "E24: "
-#: ../globals.h:1033
 msgid "E477: No ! allowed"
 msgstr "E477: ! не дозволено"
 
-#: ../globals.h:1035
 msgid "E25: Nvim does not have a built-in GUI"
 msgstr "E25: Не можна використати GUI: Не ввімкнено під час компіляції"
 
-# msgstr "E25: "
-#: ../globals.h:1036
 #, c-format
 msgid "E28: No such highlight group name: %s"
 msgstr "E28: Немає такої групи підсвічування: %s"
 
-# msgstr "E28: "
-#: ../globals.h:1037
 msgid "E29: No inserted text yet"
 msgstr "E29: Текст ще не було додано"
 
-# msgstr "E29: "
-#: ../globals.h:1038
 msgid "E30: No previous command line"
 msgstr "E30: Ще не було команд"
 
-# msgstr "E30: "
-#: ../globals.h:1039
 msgid "E31: No such mapping"
 msgstr "E31: Немає такої заміни"
 
-# msgstr "E31: "
-#: ../globals.h:1040
 msgid "E479: No match"
 msgstr "E479: Жодного збігу"
 
-#: ../globals.h:1041
 #, c-format
 msgid "E480: No match: %s"
 msgstr "E480: Жодного збігу: %s"
 
-#: ../globals.h:1042
 msgid "E32: No file name"
 msgstr "E32: Бракує назви файлу"
 
-# msgstr "E32: "
-#: ../globals.h:1044
 msgid "E33: No previous substitute regular expression"
 msgstr "E33: Заміна зразків ще не використовувалась"
 
-# msgstr "E33: "
-#: ../globals.h:1045
 msgid "E34: No previous command"
 msgstr "E34: Команд ще не було"
 
-# msgstr "E34: "
-#: ../globals.h:1046
 msgid "E35: No previous regular expression"
 msgstr "E35: Зразків пошуку ще не було"
 
-# msgstr "E35: "
-#: ../globals.h:1047
 msgid "E481: No range allowed"
 msgstr "E481: Не дозволено вказувати межі"
 
-#: ../globals.h:1048
 msgid "E36: Not enough room"
 msgstr "E36: Місця не вистачить"
 
-# msgstr "E36: "
-#: ../globals.h:1049
 #, c-format
 msgid "E482: Can't create file %s"
 msgstr "E482: Не вдалося створити файл %s"
 
-#: ../globals.h:1050
 msgid "E483: Can't get temp file name"
 msgstr "E483: Не вдалося сформувати назву тимчасового файлу"
 
-#: ../globals.h:1051
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Не вдалося відкрити файл %s"
 
-#: ../globals.h:1052
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Не вдалося прочитати файл %s"
 
-#: ../globals.h:1054
 msgid "E37: No write since last change (add ! to override)"
 msgstr "E37: Зміни не було записано (! щоб не зважати)"
 
-#: ../globals.h:1055
-#, fuzzy
 msgid "E37: No write since last change"
-msgstr "[Зміни не записано]\n"
+msgstr "E37: Не записано після останніх змін"
 
-#: ../globals.h:1056
 msgid "E38: Null argument"
 msgstr "E38: Відсутній аргумент"
 
-#: ../globals.h:1057
 msgid "E39: Number expected"
 msgstr "E39: Очікується число"
 
-#: ../globals.h:1058
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: Не вдалося відкрити файл помилок %s"
 
-#: ../globals.h:1059
 msgid "E41: Out of memory!"
 msgstr "E41: Забракло пам'яті!"
 
-#: ../globals.h:1060
 msgid "Pattern not found"
 msgstr "Зразок не знайдено"
 
-#: ../globals.h:1061
 #, c-format
 msgid "E486: Pattern not found: %s"
 msgstr "E486: Зразок не знайдено: %s"
 
-#: ../globals.h:1062
 msgid "E487: Argument must be positive"
 msgstr "E487: Аргумент має бути додатний"
 
-#: ../globals.h:1064
 msgid "E459: Cannot go back to previous directory"
 msgstr "E459: Не вдалося перейти до попереднього каталогу"
 
-#: ../globals.h:1066
 msgid "E42: No Errors"
 msgstr "E42: Жодної помилки"
 
-#: ../globals.h:1067
 msgid "E776: No location list"
 msgstr "E776: Немає списку місць"
 
-#: ../globals.h:1068
 msgid "E43: Damaged match string"
 msgstr "E43: Текст збігу пошкоджено"
 
-#: ../globals.h:1069
 msgid "E44: Corrupted regexp program"
 msgstr "E44: Зіпсована програма регулярних виразів"
 
-#: ../globals.h:1071
 msgid "E45: 'readonly' option is set (add ! to override)"
 msgstr "E45: Встановлено опцію 'readonly' (! щоб не зважати)"
 
-#: ../globals.h:1073
 #, c-format
 msgid "E46: Cannot change read-only variable \"%s\""
 msgstr "E46: Змінна тільки для читання: «%s»"
 
-#: ../globals.h:1075
 #, c-format
 msgid "E794: Cannot set variable in the sandbox: \"%s\""
 msgstr "E794: Не можна встановити змінну у пісочниці: «%s»"
 
-#: ../globals.h:1076
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Помилка читання файлу помилок"
 
-#: ../globals.h:1078
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: На дозволено у пісочниці"
 
-#: ../globals.h:1080
 msgid "E523: Not allowed here"
 msgstr "E523: Не дозволено тут"
 
-#: ../globals.h:1082
 msgid "E359: Screen mode setting not supported"
 msgstr "E359: Режим екрану не підтримується"
 
-#: ../globals.h:1083
 msgid "E49: Invalid scroll size"
 msgstr "E49: Некоректний розмір зсуву"
 
-#: ../globals.h:1084
 msgid "E91: 'shell' option is empty"
 msgstr "E91: Опція 'shell' порожня"
 
-# msgstr "E254: "
-#: ../globals.h:1085
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: Не можна зчитати дані напису!"
 
-#: ../globals.h:1086
 msgid "E72: Close error on swap file"
 msgstr "E72: Помилка під час закриття файлу обміну"
 
-#: ../globals.h:1087
 msgid "E73: tag stack empty"
-msgstr "E73: Стек теґів порожній"
+msgstr "E73: Стек міток порожній"
 
-#: ../globals.h:1088
 msgid "E74: Command too complex"
 msgstr "E74: Занадто складна команда"
 
-#: ../globals.h:1089
 msgid "E75: Name too long"
 msgstr "E75: Задовге ім'я"
 
-#: ../globals.h:1090
 msgid "E76: Too many ["
 msgstr "E76: Забагато '['"
 
-#: ../globals.h:1091
 msgid "E77: Too many file names"
 msgstr "E77: Забагато назв файлів"
 
-#: ../globals.h:1092
 msgid "E488: Trailing characters"
 msgstr "E488: Надлишкові символи"
 
-#: ../globals.h:1093
 msgid "E78: Unknown mark"
 msgstr "E78: Невідома помітка"
 
-#: ../globals.h:1094
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Не вдалося розкрити шаблон"
 
-#: ../globals.h:1096
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: 'winheight' не може бути меншим за 'winminheight'"
 
-#: ../globals.h:1098
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: 'winwidth' не може бути меншим за 'winminwidth'"
 
-# msgstr "E79: "
-#: ../globals.h:1099
 msgid "E80: Error while writing"
 msgstr "E80: Помилка під час запису"
 
-#: ../globals.h:1100
 msgid "Zero count"
 msgstr "Нульова кількість"
 
-#: ../globals.h:1101
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> використовується не в контексті скрипту"
 
-#: ../globals.h:1102
 #, c-format
 msgid "E685: Internal error: %s"
 msgstr "E685: Внутрішня помилка: %s"
 
-#: ../globals.h:1104
 msgid "E363: pattern uses more memory than 'maxmempattern'"
 msgstr "E363: Зразок використовує більше, ніж 'maxmempattern', пам'яті"
 
-#: ../globals.h:1105
 msgid "E749: empty buffer"
 msgstr "E749: Порожній буфер"
 
-#: ../globals.h:1108
+#, c-format
+msgid "E86: Buffer %<PRId64> does not exist"
+msgstr "E86: Буфера %<PRId64> немає"
+
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: Некоректний зразок для пошуку чи роздільник"
 
-#: ../globals.h:1109
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Файл уже завантажено в інший буфер"
 
-# msgstr "E235: "
-#: ../globals.h:1110
 #, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: Опція '%s' не встановлена"
 
-#: ../globals.h:1111
 msgid "E850: Invalid register name"
 msgstr "E850: Неправильна назва регістру"
 
-#: ../globals.h:1114
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Каталог не знайдено у '%s': «%s»"
+
+msgid "E519: Option not supported"
+msgstr "E519: Опція не підтримується"
+
 msgid "search hit TOP, continuing at BOTTOM"
 msgstr "Пошук дійшов до ПОЧАТКУ, продовжується з КІНЦЯ"
 
-#: ../globals.h:1115
 msgid "search hit BOTTOM, continuing at TOP"
 msgstr "Пошук дійшов до КІНЦЯ, продовжується з ПОЧАТКУ"
 
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: Пропущено двокрапку"
 
-# msgstr "E347: "
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: Некоректний компонент"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: очікується цифра"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "Сторінка %d"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "Нічого друкувати"
 
-#: ../hardcopy.c:668
 #, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Друкується сторінка %d (%d%%)"
+msgid "Printing page %d (%zu%%)"
+msgstr "Друкується сторінка %d (%zu%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " Копія %d з %d"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "Надруковано: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "Друк перервано"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Не вдалося записати вихідний файл PostScript"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: Не вдалося відкрити файл «%s»"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: Не вдалося прочитати файл ресурсів PostScript «%s»"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: «%s» не є файлом ресурсів PostScript"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: «%s» не є підтримуваним файлом ресурсів PostScript"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: Неправильна версія файлу ресурсів «%s»"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: Несумісні багатобайтове кодування й набір символів."
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr ""
 "E674: printmbcharset не може бути порожнім з багатобайтовим кодуванням."
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Не зазначено шрифт для багатобайтового друку."
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: Не вдалося відкрити файл PostScript для виводу"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: Не вдалося відкрити файл «%s»"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: Не вдалося знайти файл ресурсів PostScript «prolog.ps»"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: Не вдалося знайти файл ресурсів PostScript «cidfont.ps»"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: Не вдалося знайти файл ресурсів PostScript «%s.ps»"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: Не вдалося перетворити до кодування друку «%s»"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "Відсилається на принтер..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: Не вдалося надрукувати файл PostScript"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "Завдання друку відіслано."
 
-# msgstr "E255: "
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "Додати нову базу даних"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "Запит за зразком"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "Показати це повідомлення"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "Знищити з'єднання"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "Перезапустити усі з'єднання"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "Показати з'єднання"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: Використання: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "Ця команда cscope не вміє ділити вікно.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: Використання: cstag <ідентиф-ор>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: теґ не знайдено"
+msgstr "E257: cstag: мітку не знайдено"
 
-# msgstr "E257: "
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) помилка: %d"
 
-#: ../if_cscope.c:551
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s не є ні каталогом, ні базою даних cscope"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "Додано базу даних cscope %s"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: Помилка читання зі з'єднання cscope %<PRId64>"
+msgid "E262: error reading cscope connection %<PRIu64>"
+msgstr "E262: помилка читання зі з'єднання cscope %<PRIu64>"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: Невідомий тип пошуку cscope"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Не вдалося створити канали до cscope"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Не вдалося розділити процес для cscope"
 
-#: ../if_cscope.c:849
 msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection: помилка setpgid"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection: помилка під час виконання"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: fdopen для to_fp не вдався"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fdopen для fr_fp не вдався"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Не вдалося створити процес cscope"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: жодного з'єднання із cscope"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: Некоректний прапорець cscopequickfix %c для %c"
 
-# msgstr "E258: "
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: Для запиту cscope %s з %s нічого не знайдено"
 
-# msgstr "E259: "
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "Команди cscope:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (Використання: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3301,6 +2878,8 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: Знайти присвоєння цього символу\n"
+"       a: Знайти присвоєння цього символу\n"
 "       c: Знайти функції, що викликають цю функцію\n"
 "       d: Знайти функції, що викликаються цією функцією\n"
 "       e: Знайти цей шаблон egrep\n"
@@ -3310,32 +2889,24 @@ msgstr ""
 "       s: Знайти цей символ C\n"
 "       t: Знайти цей текст\n"
 
-#: ../if_cscope.c:1226
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: Повторна база даних cscope не додана"
 
-# msgstr "E260: "
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: З'єднання з cscope %s не знайдено"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "З'єднання з cscope %s закінчено"
 
-#. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: Фатальна помилка в cs_manage_matches"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
-msgstr "Теґ cscope: %s"
+msgstr "Мітка cscope: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3343,330 +2914,222 @@ msgstr ""
 "\n"
 "   #   рядок"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "файл / контекст / рядок\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Помилка cscope: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "Усі бази даних cscope перезавантажено"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "Жодного з'єднання з cscope\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    назва бази даних                    шлях\n"
 
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "Невідомий аргумент опції"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "Забагато аргументів"
-
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "Пропущено аргумент після"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "Сміття після аргументу опції"
 
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "Забагато аргументів у «+команда», «-c команда» або «--cmd команда»"
+msgid "Unknown option argument"
+msgstr "Невідомий аргумент опції"
 
-# msgstr "E14: "
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "Неправильний аргумент у"
+msgid "Too many edit arguments"
+msgstr "Забагато аргументів"
 
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d файли(ів)\n"
+msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
+msgstr "Забагато аргументів у «+команда», «-c команда» або «--cmd команда»"
 
-#: ../main.c:1342
 msgid "Attempt to open script file again: \""
 msgstr "Спроба повторно відкрити скрипт: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "Не вдалося прочитати: \""
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "Не вдалося відкрити як вихідний файл: \""
 
-#: ../main.c:1622
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Застереження: Вивід не у термінал\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Застереження: Уведення не з терміналу\n"
 
-#. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "команди перед vimrc"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Не вдалося прочитати з «%s»"
 
-# msgstr "E282: "
-#: ../main.c:2149
 msgid ""
 "\n"
-"More info with: \"vim -h\"\n"
+"More info with \""
 msgstr ""
 "\n"
-"Дізнайтеся більше: «vim -h»\n"
+"Дізнайтеся більше: \""
 
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[файл ..]       редагувати вказані файли"
+msgid "Usage:\n"
+msgstr "Вжиток:\n"
 
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               читати текст з stdin"
+msgid "  nvim [arguments] [file ...]      Edit specified file(s)\n"
+msgstr "  nvim [аргументи] [файл ...]      Редагувати вказані файли\n"
 
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t помітка      перейти до теґу"
+msgid "  nvim [arguments] -               Read text from stdin\n"
+msgstr "  nvim [аргументи] -               Читати текст з stdin\n"
 
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [файл]       перейти до першої помилки"
+msgid "  nvim [arguments] -t <tag>        Edit file where tag is defined\n"
+msgstr "  nvim [аргументи] -t <мітка>      Редагувати файл, де визначено мітку\n"
 
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"Вжиток:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [аргументи] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   або:"
+msgid "  nvim [arguments] -q [errorfile]  Edit file with first error\n"
+msgstr "  nvim [аргументи] -q [ф.помилки]  Редагувати файл з першою помилкою\n"
 
-#: ../main.c:2196
 msgid ""
 "\n"
-"\n"
 "Arguments:\n"
 msgstr ""
 "\n"
-"\n"
 "Аргументи:\n"
 
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tЛише назви файлів після цього"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\tНе розкривати шаблони"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tРежим Vi (ніби «vi»)"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tРежим Ex (ніби «ex»)"
+msgid "  --                    Only file names after this\n"
+msgstr "  --                    Лише назви файлів після цього\n"
 
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr "-E\t\t\tПокращений режим Ex"
+msgid "  --literal             Don't expand wildcards\n"
+msgstr "  --literal             Не розкривати шаблони\n"
 
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tМовчазний (пакетний) режим (лише для «ex»)"
+msgid "  -e                    Ex mode\n"
+msgstr "  -e                    Режим Ex\n"
 
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tРежим порівняння (ніби «vimdiff»)"
+msgid "  -E                    Improved Ex mode\n"
+msgstr "  -E                    Покращений режим Ex\n"
 
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tПростий режим (ніби «evim», без режимів)"
+msgid "  -s                    Silent (batch) mode (only for ex mode)\n"
+msgstr "  -s                    Мовчазний (пакетний) режим (лише для «ex»)\n"
 
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tРежим перегляду (ніби «view»)"
+msgid "  -d                    Diff mode\n"
+msgstr "  -d                    Режим порівняння\n"
 
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tОбмежений режим (ніби «rvim»)"
+msgid "  -R                    Read-only mode\n"
+msgstr "  -R                    Режим тільки для читання\n"
 
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tЗміни (запис файлів) не дозволено"
+msgid "  -Z                    Restricted mode\n"
+msgstr "  -Z                    Обмежений режим\n"
 
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tЗміни в тексті файлів не дозволено"
+msgid "  -m                    Modifications (writing files) not allowed\n"
+msgstr "  -m                    Зміни (запис файлів) не дозволено\n"
 
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\tДвійковий режим"
+msgid "  -M                    Modifications in text not allowed\n"
+msgstr "  -M                    Зміни в тексті файлів не дозволено\n"
 
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tРежим lisp"
+msgid "  -b                    Binary mode\n"
+msgstr "  -b                    Двійковий режим\n"
 
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tСумісний з Vi режим: 'compatible'"
+msgid "  -l                    Lisp mode\n"
+msgstr "  -l                    Режим Lisp\n"
 
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tНе зовсім сумісний з Vi режим: 'nocompatible'"
+msgid "  -A                    Arabic mode\n"
+msgstr "  -A                    Режим арабської мови\n"
 
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr "-V[N][файл]\t\tБільше повідомлень [рівень N] [файл журн. повідомлень]"
+msgid "  -F                    Farsi mode\n"
+msgstr "  -F                    Режим перської мови\n"
 
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tРежим налагодження"
+msgid "  -H                    Hebrew mode\n"
+msgstr "  -H                    Режим івриту\n"
 
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tНе використовувати файл обміну, тримати усе в пам'яті"
+msgid "  -V[N][file]           Be verbose [level N][log messages to file]\n"
+msgstr "  -V[N][файл]           Більше повідомлень [рівень N] [файл журн. повідомлень]\n"
 
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tПоказати файли обміну і вийти"
+msgid "  -D                    Debugging mode\n"
+msgstr "  -D                    Режим налагодження\n"
 
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (назва файлу)\tВідновити аварійно закінчений сеанс"
+msgid "  -n                    No swap file, use memory only\n"
+msgstr "  -n                    Не використовувати файл обміну, тримати усе в пам'яті\n"
 
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tТе саме, що й -r"
+msgid "  -r, -L                List swap files and exit\n"
+msgstr "  -r, -L                Показати файли обміну і вийти\n"
 
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\tЗапустити в режимі арабської мови"
+msgid "  -r <file>             Recover crashed session\n"
+msgstr "  -r <файл>             Відновити аварійно закінчений сеанс\n"
 
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\tЗапустити в режимі івриту"
+msgid "  -u <vimrc>            Use <vimrc> instead of the default\n"
+msgstr "  -u <vimrc>            Використати <vimrc> замість стандартного\n"
 
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tЗапустити в режимі перської мови"
+msgid "  -i <shada>            Use <shada> instead of the default\n"
+msgstr "  -i <shada>            Вжити <shada> запість стандартного\n"
 
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <термінал>\tВстановити тип терміналу у <термінал>"
+msgid "  --noplugin            Don't load plugin scripts\n"
+msgstr "  --noplugin            Не вантажити скрипти доповнення\n"
 
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tВикористати поданий файл замість .vimrc"
+msgid "  -o[N]                 Open N windows (default: one for each file)\n"
+msgstr "  -o[N]                 Відкрити N вікон (стандартно: по одному для кожного файлу)\n"
 
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\tНе вантажити скрипти доповнення"
+msgid "  -O[N]                 Like -o but split vertically\n"
+msgstr "  -O[N]                 Ніби -o, але поділити вікна вертикально\n"
 
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tВідкрити N вкладок (або по одній для кожного файлу)"
+msgid "  -p[N]                 Open N tab pages (default: one for each file)\n"
+msgstr "  -p[N]                 Відкрити N вкладок (стандартно: по одній для кожного файлу)\n"
 
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tВідкрити N вікон (або по одному для кожного файлу)"
+msgid "  +                     Start at end of file\n"
+msgstr "  +                     Розпочати в кінці файлу\n"
 
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tНіби -o, але поділити вікна вертикально"
+msgid "  +<linenum>            Start at line <linenum>\n"
+msgstr "  +<рядок>              Розпочати у <рядку>\n"
 
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tРозпочати в кінці файлу"
+msgid "  +/<pattern>           Start at first occurrence of <pattern>\n"
+msgstr "  +/<шаблон>            Розпочати, де найперше трапиться <шаблон>\n"
 
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<рядок>\t\tРозпочати у вказаному <рядку>"
+msgid "  --cmd <command>       Execute <command> before loading any vimrc\n"
+msgstr "  --cmd <команда>       Виконати <команду> перед завантаженням vimrc\n"
 
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <команда>\tВиконати <команду> перед завантаженням vimrc"
+msgid ""
+"  -c <command>          Execute <command> after loading the first file\n"
+msgstr ""
+"  -c <команда>          Виконати <команду> після завантаження першого файлу\n"
 
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <команда>\t\tВиконати <команду> після завантаження першого файлу"
+msgid "  -S <session>          Source <session> after loading the first file\n"
+msgstr "  -S <сеанс>            Виконати <сеанс> після першого завантаженого файлу\n"
 
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <сеанс>\t\tВиконати поданий файл після першого завантаженого файлу"
+msgid "  -s <scriptin>         Read Normal mode commands from <scriptin>\n"
+msgstr "  -s <скрипт>           Зчитати команди нормального режиму з файлу <скрипт>\n"
 
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <скрипт>\t\tЗчитати команди нормального режиму з файлу <скрипт>"
+msgid "  -w <scriptout>        Append all typed characters to <scriptout>\n"
+msgstr "  -w <скрипт>           Дописати усі набрані команди до файлу <скрипт>\n"
 
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <скрипт>\t\tДописати усі набрані команди до файлу <скрипт>"
+msgid "  -W <scriptout>        Write all typed characters to <scriptout>\n"
+msgstr "  -W <скрипт>           Записати усі набрані символи у файл <скрипт>\n"
 
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-w <скрипт>\t\tЗаписати усі набрані команди у файл <скрипт>"
+msgid "  --startuptime <file>  Write startup timing messages to <file>\n"
+msgstr "  --startuptime <файл>  Записати профіль запуску до <файлу>\n"
 
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
+msgid ""
+"  --api-info            Dump API metadata serialized to msgpack and exit\n"
 msgstr ""
-"--startuptime <файл>\tЗаписати запускні повідомлення з часовими відмітками "
-"до <файлу>"
+"  --api-info            Злити метадані API, серіалізовані у msgpack, і вийти\n"
+
+msgid "  --embed               Use stdin/stdout as a msgpack-rpc channel\n"
+msgstr "  --embed               Використати stdin/stdout, як канал msgpack-rpc\n"
 
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tВикористати <viminfo> замість .viminfo"
+msgid "  --headless            Don't start a user interface\n"
+msgstr "  --headless            Не запускати інтерфейс користувача\n"
 
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  чи  --help\tНадрукувати це повідомлення і вийти"
+msgid "  -v, --version         Print version information and exit\n"
+msgstr "  -v, --version         Надрукувати інформацію про версію програми і вийти\n"
 
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\tНадрукувати інформацію про версію програми і вийти"
+msgid "  -h, --help            Print this help message and exit\n"
+msgstr "  -h, --help            Надрукувати це повідомлення і вийти\n"
 
-#: ../mark.c:676
 msgid "No marks set"
 msgstr "Не встановлено жодної помітки"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: Помітку «%s» не знайдено"
 
-# msgstr "E283: "
-#. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3674,8 +3137,6 @@ msgstr ""
 "\n"
 "пом. ряд.  кол. файл/текст"
 
-#. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3683,9 +3144,6 @@ msgstr ""
 "\n"
 " точка ряд. стовп. файл/текст"
 
-# msgstr "E283: "
-#. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3693,117 +3151,60 @@ msgstr ""
 "\n"
 "змінити ряд. стовп. текст"
 
-# TODO
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Помітки:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Список переходів (від найновіших):\n"
-
-# TODO
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Попередні помітки в файлах (від найновіших):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "Пропущено '>'"
-
-# msgstr "E292: "
-#: ../memfile.c:426
 msgid "E293: block was not locked"
 msgstr "E293: Блок не було зафіксовано"
 
-# msgstr "E293: "
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Помилка зміни позиції у файлі обміну"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: Помилка зчитування файлу обміну"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: Помилка зміни позиції під час запису у файл обміну"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: Помилка запису файлу обміну"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: Файл обміну вже існує (атака символьним посиланням?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: Немає блоку 0?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: Немає блоку 1?"
 
-# msgstr "E298: "
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Немає блоку 2?"
 
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ой, втрачено файл обміну!!!"
 
-# msgstr "E301: "
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: Не вдалося перейменувати файлу обміну"
 
-# msgstr "E302: "
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: Не вдалося прочитати файл обміну для «%s», відновлення неможливе"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Немає блоку 0??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Не знайдено файлу обміну для %s"
 
-# msgstr "E305: "
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Введіть номер файлу обміну, котрий використати, (0 для виходу):"
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Не вдалося відкрити %s"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "Не вдалося прочитати блок 0 з "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3811,28 +3212,22 @@ msgstr ""
 "\n"
 "Напевно, змін не було, або Vim не поновив файл обміну."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " не можна використати з цією версією Vim.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Знайдіть Vim 3.0\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s не схоже на файл обміну Vim"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " не можна використати на цьому комп'ютері.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "Файл було створено на "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3840,89 +3235,67 @@ msgstr ""
 ",\n"
 "або файл було пошкоджено."
 
-#: ../memline.c:945
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " пошкоджений (розмір сторінки менший мінімального значення).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Використовується файл обміну «%s»"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "Початковий файл «%s»"
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Застереження: Можливо, початковий файл було змінено"
 
-# msgstr "E308: "
-#: ../memline.c:1061
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Не вдалося прочитати блок 1 з %s"
 
-# msgstr "E309: "
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "??? БРАКУЄ БАГАТЬОХ РЯДКІВ"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "??? НЕПРАВИЛЬНА КІЛЬКІСТЬ РЯДКІВ"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "??? ПОРОЖНІЙ БЛОК"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "??? ПРОПУЩЕНІ РЯДКИ"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: Ідентифікатор блоку 1 неправильний (%s не є файлом обміну?)"
 
-# msgstr "E310: "
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "??? ПРОПУЩЕНО БЛОК"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? звідси і до `??? КІНЕЦЬ' рядки, можливо, сплутані"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? звідси і до `??? КІНЕЦЬ' рядки, можливо, були додані/знищені"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "??? КІНЕЦЬ"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Відновлення перервано"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: Під час відновлення знайдено помилки. Перегляньте рядки, що "
 "починаються з ???"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "Див. «:help E312» для уточнення."
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Відновлення закінчено, перевірте чи все гаразд."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3930,15 +3303,12 @@ msgstr ""
 "\n"
 "(Можливо, потрібно записати цей файл під іншою назвою\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "і запустити diff з оригіналом щоб перевірити зміни)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "Відновлення закінчено. Вміст буфера співпадає зі вмістом файлу."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3948,52 +3318,42 @@ msgstr ""
 "Можливо, тепер ви хочете знищити файл обміну .swp.\n"
 "\n"
 
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "Знайдено файли обміну:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   В поточному каталозі:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   Використовуючи вказану назву:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   У каталозі "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- жодного --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "           власник: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   дата: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             дата: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [від Vim 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "        [не схоже на файл обміну]"
 
-#: ../memline.c:1552
+msgid "         [garbled strings (not nul terminated)]"
+msgstr "         [пошкоджений текст (не закінчується nul)]"
+
 msgid "         file name: "
 msgstr "         назва файлу: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -4001,15 +3361,12 @@ msgstr ""
 "\n"
 "           змінено: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "ТАК"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "ні"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -4017,11 +3374,9 @@ msgstr ""
 "\n"
 "          користувач: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   назва вузла: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -4029,7 +3384,6 @@ msgstr ""
 "\n"
 "          назва вузла: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -4037,11 +3391,9 @@ msgstr ""
 "\n"
 "         ID процесу: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (виконується)"
 
-#: ../memline.c:1586
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -4049,106 +3401,75 @@ msgstr ""
 "\n"
 "         [непридатний на цьому комп'ютері]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [не можна прочитати]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [не можна відкрити]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: Не вдалося заготовити, немає файлу обміну"
 
-# msgstr "E313: "
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "Файл збережено"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: Збереження не вдалося"
 
-# msgstr "E314: "
-#: ../memline.c:1819
 #, c-format
 msgid "E315: ml_get: invalid lnum: %<PRId64>"
 msgstr "E315: ml_get: неправильний lnum: %<PRId64>"
 
-# msgstr "E315: "
-#: ../memline.c:1851
 #, c-format
 msgid "E316: ml_get: cannot find line %<PRId64>"
 msgstr "E316: ml_get: не знайшов рядок %<PRId64>"
 
-# msgstr "E316: "
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: Вказівник блоку помилковий 3"
 
-# msgstr "E317: "
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx має бути рівним 0"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: Поновлено забагато блоків?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: Вказівник блоку помилковий 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "блок 1 знищено?"
 
-#: ../memline.c:2707
 #, c-format
 msgid "E320: Cannot find line %<PRId64>"
 msgstr "E320: Не вдалося знайти рядок %<PRId64>"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: Вказівник блоку помилковий"
 
-# msgstr "E317: "
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count дорівнює 0"
 
-#: ../memline.c:2955
 #, c-format
 msgid "E322: line number out of range: %<PRId64> past the end"
 msgstr "E322: Номер рядка вийшов за межі: %<PRId64> за кінцем"
 
-# msgstr "E322: "
-#: ../memline.c:2959
 #, c-format
 msgid "E323: line count wrong in block %<PRId64>"
 msgstr "E323: Кількість рядків у блоці %<PRId64>"
 
-# msgstr "E323: "
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "Розмір стеку збільшується"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: Вказівник блоку помилковий 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Циклічні символьні посилання «%s»"
 
-# msgstr "E317: "
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: УВАГА"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4156,39 +3477,29 @@ msgstr ""
 "\n"
 "Знайдено файл обміну з назвою \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "При відкритті файлу \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      НОВІШИЙ за файл обміну!\n"
 
-#: ../memline.c:3244
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) Можливо, інша програма вже редагує цей самий файл. Якщо це так,\n"
-"    будьте обережні, щоб не залишилися два різні екземпляри\n"
-"    одного й того самого файлу після змін."
+"    будьте обережні, щоб не залишилися два різні екземпляри одного й того\n"
+"    самого файлу після змін.  Вийдіть чи продовжуйте обережно.\n"
 
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Вийдіть або продовжуйте обережно.\n"
-
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Сеанс редагування цього файлу зазнав краху.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    Якщо це справді трапилося, спробуйте «:recover» або «vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4196,11 +3507,9 @@ msgstr ""
 "»\n"
 "    щоб відновити зміни (див. «:help recovery»).\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    Якщо ви вже це зробили, знищіть файл обміну «"
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4209,23 +3518,18 @@ msgstr ""
 "    щоб позбутися цього повідомлення.\n"
 "\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "Файл обміну «"
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "» вже існує!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM — УВАГА"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "Файл обміну вже існує!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4239,7 +3543,6 @@ msgstr ""
 "&Q:Вийти\n"
 "&A:Перервати"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4255,64 +3558,46 @@ msgstr ""
 "&Q:Вийти\n"
 "&A:Перервати"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: Знайдено забагато файлів обміну"
 
-# msgstr "E341: "
-#: ../memory.c:227
+#, c-format
+msgid ""
+"E303: Unable to create directory \"%s\" for swap file, recovery impossible: "
+"%s"
+msgstr ""
+"E303: Не вдалося створити каталог «%s» для файлу обміну, відновлення неможливе: "
+"%s"
+
+msgid "Vim: Data too large to fit into virtual memory space\n"
+msgstr "Vim: Даних забагато щоб влізти у віртуальний адресний простір\n"
+
 #, c-format
 msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
 msgstr "E342: Забракло пам'яті!  (потрібно було %<PRIu64> байтів)"
 
-# msgstr "E326: "
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Частина шляху до елемента меню не є підменю"
 
-# msgstr "E327: "
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: Меню може бути тільки в іншому режимі"
 
-# msgstr "E328: "
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Немає меню «%s»"
 
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: Порожня назва меню"
 
-# msgstr "E329: "
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: Шлях до меню не повинен вести до підменю"
 
-# msgstr "E330: "
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: Не можна додавати елементи меню просто до верхнього меню"
 
-# msgstr "E331: "
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Роздільник не може бути частиною шляху меню"
 
-# msgstr "E332: "
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4320,78 +3605,48 @@ msgstr ""
 "\n"
 "--- Меню ---"
 
-#: ../menu.c:1313
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Шлях повинен вести до елемента меню"
 
-# msgstr "E333: "
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: Меню не знайдено: %s"
 
-# msgstr "E334: "
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: Для режиму %s меню не визначено"
 
-# msgstr "E335: "
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: Шлях повинен вести до підменю"
-
-# msgstr "E336: "
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: Меню не знайдено — перевірте назву"
-
-# msgstr "E337: "
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "Виявлено помилку під час виконання %s:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "рядок %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Неправильна назва регістру: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "Українізація: Анатолій Сахнік <sakhnik@gmail.com>"
-
-#: ../message.c:986
 msgid "Interrupt: "
 msgstr "Перервано: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "Натисніть ENTER або введіть команду для продовження"
 
-#: ../message.c:1843
 #, c-format
 msgid "%s line %<PRId64>"
 msgstr "%s рядок %<PRId64>"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- Ще --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " ПРОБІЛ/d/j: вниз на екран/сторінку/рядок, b/u/k: вгору, q: вийти "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "Запитання"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4399,7 +3654,6 @@ msgstr ""
 "&Y:Так\n"
 "&N:Ні"
 
-#: ../message.c:3033
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4409,7 +3663,6 @@ msgstr ""
 "&N:Ні\n"
 "&C:Скасувати"
 
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4423,178 +3676,158 @@ msgstr ""
 "&D:Жодного\n"
 "&C:Скасувати"
 
-#: ../message.c:3058
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Недостатньо аргументів для printf()"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: Очікується аргумент Float для printf()"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Забагато аргументів для printf()"
 
-# msgstr "E338: "
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Застереження: Змінюється файл призначений лише для читання"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr "Наберіть число й <Enter> чи клацніть мишкою (порожнє скасовує): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Наберіть число й <Enter> (порожнє скасовує): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "додано один рядок"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "знищено один рядок"
 
-#: ../misc1.c:2593
 #, c-format
 msgid "%<PRId64> more lines"
 msgstr "додано рядків: %<PRId64>"
 
-#: ../misc1.c:2596
 #, c-format
 msgid "%<PRId64> fewer lines"
 msgstr "знищено рядків: %<PRId64>"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (Перервано)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "Дзень!"
 
-# msgstr "E342: "
-#: ../misc2.c:738
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Викликається оболонка щоб виконати: «%s»"
 
-# msgstr "E348: "
-#: ../normal.c:183
+#, c-format
+msgid "Invalid channel \"%<PRIu64>\""
+msgstr "Некоректний канал «%<PRIu64>»"
+
+msgid "Message is not an array"
+msgstr "Повідомлення не є масивом"
+
+msgid "Message is empty"
+msgstr "Повідомлення порожнє"
+
+msgid "Message type must be an integer"
+msgstr "Повідомлення має бути цілим числом"
+
+msgid "Unknown message type"
+msgstr "Невідомий тип повідомлення"
+
+msgid "Request array size should be 4 (request) or 3 (notification)"
+msgstr "Розмір масиву запиту має бути 4 (запит) чи 3 (повідомлення)"
+
+msgid "ID must be a positive integer"
+msgstr "ID має бути додатним числом"
+
+msgid "Method must be a string"
+msgstr "Метод має бути текстом"
+
+msgid "Parameters must be an array"
+msgstr "Параметри має бути масивом"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: Немає ідентифікатора над курсором"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' порожня"
 
-#: ../normal.c:2637
 msgid "Warning: terminal cannot highlight"
 msgstr "Застереження: Термінал не підтримує кольори"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: Немає рядка на курсорі"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: Не вдалося знищити згортки поточним методом 'foldmethod'"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: Список змін порожній"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: Початок списку змін"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: Кінець списку змін"
 
-#: ../normal.c:7053
 msgid "Type  :quit<Enter>  to exit Nvim"
 msgstr "Уведіть :quit<Enter>  щоб вийти з Vim"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "Один рядок %s-но"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "Один рядок %s-но %d разів"
 
-#: ../ops.c:253
 #, c-format
 msgid "%<PRId64> lines %sed 1 time"
 msgstr "%<PRId64> рядків %s-но"
 
-#: ../ops.c:256
 #, c-format
 msgid "%<PRId64> lines %sed %d times"
 msgstr "%<PRId64> рядків %s-но %d разів"
 
-#: ../ops.c:592
 #, c-format
 msgid "%<PRId64> lines to indent... "
 msgstr "Залишилося вирівняти %<PRId64> рядків..."
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "Вирівняно один рядок"
 
-#: ../ops.c:636
 #, c-format
 msgid "%<PRId64> lines indented "
 msgstr "Вирівняно рядків: %<PRId64>"
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: Регістри перед цим не вживались"
 
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "не вдалося запам'ятати; все одно знищити?"
-
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "Один рядок змінено"
 
-#: ../ops.c:1931
 #, c-format
 msgid "%<PRId64> lines changed"
 msgstr "Змінено рядків: %<PRId64>"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "Запам'ятав блок з одного рядка"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "Запам'ятав один рядок"
 
-#: ../ops.c:2525
 #, c-format
 msgid "block of %<PRId64> lines yanked"
 msgstr "Запам'ятав блок із %<PRId64> рядків"
 
-#: ../ops.c:2528
 #, c-format
 msgid "%<PRId64> lines yanked"
 msgstr "Запам'ятав рядків: %<PRId64>"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: У регістрі %s нічого немає"
 
-# msgstr "E353: "
-#. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4602,29 +3835,16 @@ msgstr ""
 "\n"
 "--- Регістри ---"
 
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "Неправильна назва регістру"
-
-#: ../ops.c:4533
 msgid ""
-"\n"
-"# Registers:\n"
+"E883: search pattern and expression register may not contain two or more "
+"lines"
 msgstr ""
-"\n"
-"# Регістри:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Невідомий тип регістру %d"
+"E883: шаблон пошуку і реєстр виразу не можуть містити два чи більше рядків"
 
-#: ../ops.c:5089
 #, c-format
 msgid "%<PRId64> Cols; "
 msgstr "довж.: %<PRId64>; "
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4633,7 +3853,6 @@ msgstr ""
 "Вибрано %s%<PRId64> з %<PRId64> рядків; %<PRId64> з %<PRId64> слів; "
 "%<PRId64> з %<PRId64> байтів"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
@@ -4642,7 +3861,6 @@ msgstr ""
 "Вибрано %s%<PRId64> з %<PRId64> рядків; %<PRId64> з %<PRId64> слів; "
 "%<PRId64> of %<PRId64> символів; %<PRId64> з %<PRId64> байтів"
 
-#: ../ops.c:5123
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
@@ -4651,7 +3869,6 @@ msgstr ""
 "Колонка %s з %s; рядок %<PRId64> з %<PRId64>; слово %<PRId64> з %<PRId64>; "
 "байт %<PRId64> з %<PRId64>"
 
-#: ../ops.c:5133
 #, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
@@ -4660,150 +3877,101 @@ msgstr ""
 "Колонка %s з %s; рядок %<PRId64> з %<PRId64>; слово %<PRId64> з %<PRId64>; "
 "символ %<PRId64> of %<PRId64>; байт %<PRId64> з %<PRId64>"
 
-#: ../ops.c:5146
 #, c-format
 msgid "(+%<PRId64> for BOM)"
 msgstr "(+%<PRId64> для BOM)"
 
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Стор. %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "Дякуємо за вибір Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: Невідома опція"
 
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: Опція не підтримується"
-
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: Не дозволено у modeline"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: Код ключа не встановлено"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: Після = потрібно вказати число"
 
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Не знайдено серед можливостей терміналів"
-
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Недозволений символ <%s>"
 
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Не вдалося спорожнити 'term'"
+#, c-format
+msgid "For option %s"
+msgstr "Для опції %s"
 
-#: ../option.c:3885
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: Опції 'backupext' і 'patchmode' однакові"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: Конфліктує із значенням 'listchars'"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Конфліктує із значенням 'fillchars'"
 
-#: ../option.c:4163
 msgid "E524: Missing colon"
 msgstr "E524: Бракує двокрапки"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: Рядок порожній"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Після <%s> бракує числа"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: Бракує коми"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: Потрібно вказати значення '"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: Містить недруковні або розширені символи"
 
-#: ../option.c:4469
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Недозволений символ після <%c>"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: Потрібна кома"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' має бути порожньою чи містити %s"
 
-#: ../option.c:4928
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Послідовність виразів не завершено"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: Забагато елементів"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: Групи не збалансовано"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: Вікно перегляду вже існує"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: Для арабської мови потрібне UTF-8, виконайте ':set encoding=utf-8'"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: Потрібно щонайменше %d рядків"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Потрібно щонайменше %d стовпців"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Невідома опція: %s"
 
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Потрібно вказати Number: &%s = '%s'"
 
-# msgstr "E355: "
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4811,7 +3979,6 @@ msgstr ""
 "\n"
 "--- Коди терміналу ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4819,7 +3986,6 @@ msgstr ""
 "\n"
 "--- Значення загальних опцій ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4827,7 +3993,6 @@ msgstr ""
 "\n"
 "--- Значення локальних опцій ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4835,40 +4000,42 @@ msgstr ""
 "\n"
 "--- Опції ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: Помилка get_varp"
 
-# msgstr "E356: "
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': Для символу %s немає пари"
 
-# msgstr "E357: "
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Зайві символи після `;': %s"
 
-#: ../os/shell.c:194
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = «%s»"
+
+msgid "Vim: Error reading input, exiting...\n"
+msgstr "Vim: Помилка читання вводу, робота завершується...\n"
+
 msgid ""
 "\n"
-"Cannot execute shell "
+"shell returned "
 msgstr ""
 "\n"
-"Не вдалося запустити оболонку"
+"оболонка повернула: "
 
-# msgstr "E362: "
-#: ../os/shell.c:439
 msgid ""
 "\n"
-"shell returned "
+"Cannot execute "
 msgstr ""
 "\n"
-"оболонка повернула: "
+"Не вдалося виконати "
+
+#, c-format
+msgid "E5677: Error writing input to shell-command: %s"
+msgstr "E5677: Не вдалося записати на вхід команди оболонки: %s"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4876,7 +4043,6 @@ msgstr ""
 "\n"
 "Не вдалося отримати контекст безпеки для "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4884,234 +4050,173 @@ msgstr ""
 "\n"
 "Не вдалося встановити контекст безпеки для "
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = «%s»"
-
-# msgstr "E446: "
-#: ../path.c:1449
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
 msgstr "E447: Файл «%s» не знайдено у шляху пошуку"
 
-# msgstr "E371: "
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Забагато %%%c у рядку формату"
 
-# msgstr "E372: "
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: Неочікуваний `%%%c' у рядку формату"
 
-# msgstr "E373: "
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: Пропущено ] у рядку формату"
 
-# msgstr "E374: "
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: %%%c у рядку формату не підтримується"
 
-# msgstr "E375: "
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: Помилковий `%%%c' у префіксі рядку формату"
 
-# msgstr "E376: "
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: Помилковий `%%%c' у рядку формату"
 
-# msgstr "E377: "
-#. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' не містить зразок"
 
-# msgstr "E378: "
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Пропущена чи порожня назва каталогу"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: Немає більше елементів"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: Активне вікно було закрито"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d з %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (рядок знищено)"
 
-#: ../quickfix.c:1863
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Дно стеку виправлень"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Вершина стеку виправлень"
 
-#: ../quickfix.c:1880
 #, c-format
 msgid "error list %d of %d; %d errors"
 msgstr "список помилок %d з %d; %d помилок"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Не можу записати, вказана опція 'buftype'"
 
-#: ../quickfix.c:2812
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Пропущено назву файлу чи некоректний шаблон"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Не вдалося відкрити файл «%s»"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Буфер не завантажено"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: Очікується String чи List"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: Некоректний елемент у %s%%[]"
 
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: Бракує ] після %s["
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Немає пари %s%%("
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: Немає пари %s("
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: Немає пари %s)"
 
-# msgstr "E406: "
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( тут не дозволено"
 
-# msgstr "E406: "
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 та ін. тут не дозволено"
 
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: Пропущено ] після %s%%["
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] порожній"
 
-# msgstr "E382: "
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: Зразок занадто довгий"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: Забагато \\z("
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: Забагато %s("
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: Немає пари \\z("
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: Недозволений символ після %s@"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: Забагато складних %s{...}"
 
-# msgstr "E339: "
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: Вкладені %s*"
 
-# msgstr "E61: "
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: Вкладені %s%c"
 
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: Некоректно вжито \\_"
 
-# msgstr "E62: "
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: Після %s%c нічого немає"
 
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: Некоректне зворотнє посилання"
 
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Неправильний символ після \\z"
 
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Недозволений символ після %s%%[dxouU]"
 
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Недозволений символ після %s%%"
 
-# msgstr "E64: "
-#: ../regexp.c:3017
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA regexp) неможливо повторити %s"
+
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Синтаксична помилка в %s{...}"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "Зовнішні під-збіги:\n"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5119,345 +4224,384 @@ msgstr ""
 "E864: після \\%#= може бути тільки 0, 1, or 2. Буде використано автоматичний "
 "механізм "
 
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr "E865: (NFA) Зарано трапився кінець регулярного виразу"
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr "E866: (NFA regexp) Не на місці %c"
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr "E867: (NFA) Невідомий оператор '\\z%c'"
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr "E867: (NFA) Невідомий оператор '\\%%%c'"
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr "E869: (NFA) Невідомий оператор '\\@%c'"
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr "E870: (NFA regexp) Не вдалося прочитати межі повторення"
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr "E871: (NFA regexp) Мульти не може бути за мульти!"
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr "E872: (NFA regexp) Забагато '('"
-
-#: ../regexp_nfa.c:2042
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E879: (NFA regexp) Забагато \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr "E873: (NFA regexp) помилка належного припинення"
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr "E874: (NFA) Стек порожній!"
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-"E875: (NFA regexp) (Під час перетворення з постфікс у NFA) залишилося "
-"забагато станів у стеку"
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr "E876: (NFA regexp) Недостатньо пам’яті, щоб зберегти весь NFA "
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-"Не вдалося відкрити тимчасовий файл журналу для запису, показується на "
-"stderr ... "
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr "(NFA) НЕ ВДАЛОСЯ ВІДКРИТИ %s!"
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Перемикання до простого рушія регулярних виразів: "
 
-#: ../regexp_nfa.c:6049
-msgid "Could not open temporary log file for writing "
-msgstr "Не вдалося відкрити тимчасовий файл журналу для запису "
+msgid " TERMINAL"
+msgstr " ТЕРМІНАЛ"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " ВІРТ ЗАМІНА"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " ЗАМІНА"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " НАВИВОРІТ"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " ВСТАВКА"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (вставка)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (заміна)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (вірт заміна)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " Іврит"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " Арабська"
 
-#: ../screen.c:7456
 msgid " (lang)"
 msgstr " (мова)"
 
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (клей)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " ВИБІР"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " ВИБІР РЯДКІВ"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " ВИБІР БЛОКУ"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " ВИДІЛЕННЯ"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " ВИДІЛЕННЯ РЯДКІВ"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " ВИДІЛЕННЯ БЛОКУ"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "йде запис"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Неправильний зразок для пошуку: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: Пошук дійшов до ПОЧАТКУ без збігів з %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: Пошук дійшов до КІНЦЯ без збігів з %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: Після `;' має бути `?' або `/'"
 
-# msgstr "E386: "
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (разом з попередніми збігами)"
 
-#. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- Включені файли "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "не знайдено "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "у шляху пошуку ---\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (Уже у списку)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  НЕ ЗНАЙДЕНО"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "Пошук у включеному файлі: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "Шукається у включеному файлі %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: Збіг у поточному рядку"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "Були знайдені всі включені файли"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "Жодного включеного файлу"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: Визначення не знайдено"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Зразок не знайдено"
 
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Заміна "
+msgid "too few bytes read"
+msgstr "прочитано замало байтів"
+
+#, c-format
+msgid "System error while skipping in ShaDa file: %s"
+msgstr "Системна помилка при пропусканні у файлі ShaDa: %s"
 
-#: ../search.c:4681
 #, c-format
 msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
+"Error while reading ShaDa file: last entry specified that it occupies "
+"%<PRIu64> bytes, but file ended earlier"
 msgstr ""
-"\n"
-"# Ост. %sЗразок пошуку:\n"
-"~"
+"Помилка при читанні файлу ShaDa: останнє поле зазначило, що воно займає "
+"%<PRIu64> байтів, але файл закінчився раніше"
+
+#, c-format
+msgid "System error while closing ShaDa file: %s"
+msgstr "Системна помилка при закритті файлу ShaDa: %s"
+
+#, c-format
+msgid "System error while writing ShaDa file: %s"
+msgstr "Системна помилка при читанні з файлу ShaDa: %s"
+
+#, c-format
+msgid "Reading ShaDa file \"%s\"%s%s%s"
+msgstr "Зчитується файл ShaDa: «%s»%s%s%s"
+
+msgid " info"
+msgstr " інформація"
+
+msgid " marks"
+msgstr " позначки"
+
+msgid " oldfiles"
+msgstr " старі файли"
+
+msgid " FAILED"
+msgstr " НЕ ВДАЛОСЯ"
+
+#, c-format
+msgid "System error while opening ShaDa file %s for reading: %s"
+msgstr "Системна помилка при відкритті файлу ShaDa %s для читання: %s"
+
+msgid "additional elements of ShaDa "
+msgstr "додаткові елементи ShaDa "
+
+msgid "additional data of ShaDa "
+msgstr "додаткові дані ShaDa "
+
+#, c-format
+msgid "Failed to write variable %s"
+msgstr "Не вдалося записати змінну %s"
+
+#, c-format
+msgid ""
+"Failed to parse ShaDa file due to a msgpack parser error at position "
+"%<PRIu64>"
+msgstr ""
+"Не вдалося розібрати файл ShaDa через помилку розбору msgpack у позиції "
+"%<PRIu64>"
+
+#, c-format
+msgid ""
+"Failed to parse ShaDa file: incomplete msgpack string at position %<PRIu64>"
+msgstr ""
+"Не вдалося розібрати файл ShaDa: неповний текст msgpack у позиції %<PRIu64>"
+
+#, c-format
+msgid ""
+"Failed to parse ShaDa file: extra bytes in msgpack string at position "
+"%<PRIu64>"
+msgstr ""
+"Не вдалося розібрати файл ShaDa: зайві байти у тексті msgpack у позиції "
+"%<PRIu64>"
+
+#, c-format
+msgid ""
+"System error while opening ShaDa file %s for reading to merge before writing "
+"it: %s"
+msgstr ""
+"Системна помилка при відкритті файлу ShaDa %s для читання щоб виконати злиття "
+"перед записом: %s"
+
+#, c-format
+msgid "E929: All %s.tmp.X files exist, cannot write ShaDa file!"
+msgstr "E929: Усі файли %s.tmp.X зайнято, неможливо записати файл ShaDa!"
+
+#, c-format
+msgid "System error while opening temporary ShaDa file %s for writing: %s"
+msgstr "Системна помилка при відкритті тимчасового файлу ShaDa %s для запису: %s"
+
+#, c-format
+msgid "Failed to create directory %s for writing ShaDa file: %s"
+msgstr "Не вдалося створити каталог %s для запису файлу ShaDa: %s"
+
+#, c-format
+msgid "System error while opening ShaDa file %s for writing: %s"
+msgstr "Системна помилка при відкритті файлу ShaDa %s для запису: %s"
+
+#, c-format
+msgid "Writing ShaDa file \"%s\""
+msgstr "Записується файл ShaDa «%s»"
+
+#, c-format
+msgid "Failed setting uid and gid for file %s: %s"
+msgstr "Не вдалося встановити uid і gid для файлу %s: %s"
+
+#, c-format
+msgid "E137: ShaDa file is not writable: %s"
+msgstr "E137: Не дозволено запис у файл ShaDa: %s"
+
+#, c-format
+msgid "Can't rename ShaDa file from %s to %s!"
+msgstr "Не вдалося перейменувати файл ShaDa з %s у %s!"
+
+#, c-format
+msgid "Did not rename %s because %s does not looks like a ShaDa file"
+msgstr "Не перейменував %s, тому що %s не схожий на файл ShaDa"
+
+#, c-format
+msgid "Did not rename %s to %s because there were errors during writing it"
+msgstr "Не вдалося перейменувати %s у %s через помилки під час запису"
+
+#, c-format
+msgid "Do not forget to remove %s or rename it manually to %s."
+msgstr "Не забудьте знищити %s чи перейменувати його самостійно у %s."
+
+#, c-format
+msgid "System error while reading ShaDa file: %s"
+msgstr "Системна помилка при читанні файлу ShaDa: %s"
+
+#, c-format
+msgid "System error while reading integer from ShaDa file: %s"
+msgstr "Системна помилка при читанні цілого числа з файлу ShaDa: %s"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: expected positive integer at position "
+"%<PRIu64>, but got nothing"
+msgstr ""
+"Помилка при читанні файлу ShaDa: очікувалося додатне число у позиції "
+"%<PRIu64>, але нічого немає"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: expected positive integer at position "
+"%<PRIu64>"
+msgstr ""
+"Помилка при читанні файлу ShaDa: очікувалося додатне число у позиції "
+"%<PRIu64>"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: there is an item at position %<PRIu64> that "
+"must not be there: Missing items are for internal uses only"
+msgstr ""
+"Помилка при читанні файлу ShaDa: неочікуваний елемент у позиції %<PRIu64>:"
+" Пропущені елементи тільки для внутрішнього вжитку"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+"entry that is not a dictionary"
+msgstr ""
+"Помилка при читанні файлу ShaDa: список буферів у позиції %<PRIu64> містить "
+"поле, яке не є словником"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+"entry with invalid line number"
+msgstr ""
+"Помилка при читанні файлу ShaDa: список буферів у позиції %<PRIu64> містить "
+"поле з некоректним номером рядка"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+"entry with invalid column number"
+msgstr ""
+"Помилка при читанні файлу ShaDa: список буферів у позиції %<PRIu64> містить "
+"поле з некоректним номером стовпця"
+
+#, c-format
+msgid ""
+"Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+"entry that does not have a file name"
+msgstr ""
+"Помилка при читанні файлу ShaDa: список буферів у позиції %<PRIu64> містить "
+"поле, яке не має назву файлу"
 
-#: ../spell.c:951
 msgid "E759: Format error in spell file"
 msgstr "E759: Помилка формату у файлі орфографії"
 
-# msgstr "E364: "
-#: ../spell.c:952
 msgid "E758: Truncated spell file"
 msgstr "E758: Обірваний файл орфографії"
 
-#: ../spell.c:953
 #, c-format
 msgid "Trailing text in %s line %d: %s"
 msgstr "Зайвий текст у %s у рядку %d: %s"
 
-#: ../spell.c:954
 #, c-format
 msgid "Affix name too long in %s line %d: %s"
 msgstr "Назва афіксу завелика у %s у рядку %d: %s"
 
-# msgstr "E430: "
-#: ../spell.c:955
 msgid "E761: Format error in affix file FOL, LOW or UPP"
 msgstr "E761: Помилка формату у файлі афіксів FOL, LOW чи UPP"
 
-#: ../spell.c:957
 msgid "E762: Character in FOL, LOW or UPP is out of range"
 msgstr "E762: Символ у FOL, LOW чи UPP поза межами"
 
-#: ../spell.c:958
 msgid "Compressing word tree..."
 msgstr "Стискується дерево слів..."
 
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: Перевірка орфографії не дозволена"
 
-#: ../spell.c:2249
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
 "Застереження: Не вдалося знайти список слів «%s.%s.spl» чи «%s.ascii.spl»"
 
-#: ../spell.c:2473
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Читається файл орфографії «%s»"
 
-#: ../spell.c:2496
 msgid "E757: This does not look like a spell file"
 msgstr "E757: Не схоже на файл орфографії"
 
-#: ../spell.c:2501
 msgid "E771: Old spell file, needs to be updated"
 msgstr "E771: Файл орфографії старий, треба поновити"
 
-#: ../spell.c:2504
 msgid "E772: Spell file is for newer version of Vim"
 msgstr "E772: Файл орфографії призначений для більш нової версії Vim"
 
-#: ../spell.c:2602
 msgid "E770: Unsupported section in spell file"
 msgstr "E770: Недозволена секція у файлі орфографії"
 
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "Застереження: регіон %s не підтримується"
 
-#: ../spell.c:4550
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "Читається файл афіксів %s ..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "Помилка перетворення слова у %s у рядку %d: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Перетворення у %s не підтримується: з %s до %s"
 
-#: ../spell.c:4642
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Некоректне значення FLAG у %s у рядку %d: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG після використання прапорців у %s у рядку %d: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5466,7 +4610,6 @@ msgstr ""
 "Визначення COMPOUNDFORBIDFLAG після елементу PFX може дати неправильний "
 "результат у %s у рядку %d"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5475,382 +4618,299 @@ msgstr ""
 "Визначення COMPOUNDPERMITFLAG після елементу PFX можу дати неправильний "
 "результат у %s у рядку %d"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "Неправильне значення COMPOUNDRULES у %s у рядку %d: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Неправильне значення COMPOUNDWORDMAX у %s у рядку %d: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "Неправильне значення COMPOUNDMIN у %s у рядку %d: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Неправильне значення COMPOUNDSYLMAX у %s у рядку %d: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "Неправильне значення CHECKCOMPOUNDPATTERN у %s у рядку %d: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "Інший прапорець комбінації у продовженні блоку афіксів у %s у рядку %d: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "Подвійний афікс у %s у рядку %d: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGESTin %s "
 "line %d: %s"
 msgstr ""
-"Афікс також використовується для BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/"
-"NOSUGGEST у %s у рядку %d: %s"
+"Афікс також вживається для BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST"
+" у %s рядок %d: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "Треба Y чи N у %s у рядку %d: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "Непридатна умова у %s у рядку %d: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "Треба кількість REP(SAL) у %s у рядку %d"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "Треба кількість MAP у %s у рядку %d"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "Повторення символу у MAP у %s у рядку %d"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "Нерозпізнаний чи повторний елемент у %s у рядку %d: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "Пропущено рядок FOL/LOW/UPP у %s"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "Вжито COMPOUNDSYLMAX без SYLLABLE"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "Забагато відкладених префіксів"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "Забагато складних прапорців"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "Забагато відкладених префіксів і/або складних прапорців"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "Пропущено рядок SOFO%s у %s"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "Обидва рядки SAL і SOFO у %s"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "Прапорець не є числом у %s у рядку %d: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "Неправильний прапорець у %s у рядку %d: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "Значення %s відрізняється від того, що вжито у іншому файлі .aff"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "Зчитується словниковий файл %s ..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: Немає кількості слів у %s"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "рядок %6d, слово %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "Повторення слова у %s у рядку %d: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "Перше повторення слова у %s у рядку %d: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d повторюваних слів у %s"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Пропущено %d слів(~) із не-ASCII символами у %s"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "Читається файл слів %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "Повторення рядка /encoding= проігноровано у %s у рядку %d: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "Рядок /encoding= після слова проігноровано у %s у рядку %d: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "Повторення рядка /regions= проігноровано у %s у рядку %d: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "Забагато регіонів у %s у рядку %d: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "Рядок / проігноровано у %s у рядку %d: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "Некоректний номер регіону у %s у рядку %d: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "Нерозпізнані прапорці у %s у рядку %d: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Проігноровано %d слів із не-ASCII символами"
 
-#: ../spell.c:6656
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Стиснено %d з %d вузлів; залишилося %d (%d%%)"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "Перечитується файл орфографії..."
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
 msgid "Performing soundfolding..."
 msgstr "Виконується згортання звуків..."
 
-#: ../spell.c:7368
 #, c-format
 msgid "Number of words after soundfolding: %<PRId64>"
 msgstr "Кількість слів після згортання звуків: %<PRId64>"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "Повна кількість слів: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "Записується файл припущень %s ..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Оцінка споживання пам'яті: %d байт"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: Вихідний файл не повинен мати назву регіону"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: Підтримується тільки до восьми регіонів"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: Некоректний регіон у %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Застереження: зазначено обидва `складні слова' і NOBREAK"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "Записується файл орфографії %s ..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "Зроблено!"
 
-#: ../spell.c:8034
 #, c-format
 msgid "E765: 'spellfile' does not have %<PRId64> entries"
 msgstr "E765: 'spellfile' не містить %<PRId64> елементів"
 
-#: ../spell.c:8074
 #, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "Слово '%.*s' знищено з %s"
 
-#: ../spell.c:8117
 #, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "Слово '%.*s' додано до %s"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Символи у слові відрізняються у файлах орфографії"
 
-#: ../spell.c:8684
 msgid "Sorry, no suggestions"
 msgstr "Пробачте, немає пропозицій"
 
-#: ../spell.c:8687
 #, c-format
 msgid "Sorry, only %<PRId64> suggestions"
 msgstr "Пробачте, тільки %<PRId64> пропозицій"
 
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
 #, c-format
 msgid "Change \"%.*s\" to:"
 msgstr "Замінити «%.*s» на:"
 
-#: ../spell.c:8737
 #, c-format
 msgid " < \"%.*s\""
 msgstr " < «%.*s»"
 
-# msgstr "E34: "
-#: ../spell.c:8882
 msgid "E752: No previous spell replacement"
 msgstr "E752: Немає попередньої заміни"
 
-# msgstr "E333: "
-#: ../spell.c:8925
 #, c-format
 msgid "E753: Not found: %s"
 msgstr "E753: Не знайдено: %s"
 
-#: ../spell.c:9276
 #, c-format
 msgid "E778: This does not look like a .sug file: %s"
 msgstr "E778: Не схоже на файл .sug: %s"
 
-#: ../spell.c:9282
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
 msgstr "E779: Застарілий файл .sug, треба поновити: %s"
 
-#: ../spell.c:9286
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"
 msgstr "E780: Файл .sug для більш нової версії Vim: %s"
 
-#: ../spell.c:9295
 #, c-format
 msgid "E781: .sug file doesn't match .spl file: %s"
 msgstr "E781: Файл .sug не відповідає файлу .spl: %s"
 
-#: ../spell.c:9305
 #, c-format
 msgid "E782: error while reading .sug file: %s"
 msgstr "E782: Помилка читання файлу .sug: %s"
 
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: Повторено символ у елементі MAP"
 
-# msgstr "E391: "
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "Для буфера не визначено елементів синтаксису"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Неправильний аргумент: %s"
 
-#: ../syntax.c:3299
+msgid "syntax iskeyword "
+msgstr "синтаксис iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Немає такого синтаксичного кластера: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "синхронізується по коментарях стилю С"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "без синхронізації"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "починається синхронізація за "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " рядків перед першим рядком"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5858,7 +4918,6 @@ msgstr ""
 "\n"
 "--- Елементи синхронізації синтаксису ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5866,7 +4925,6 @@ msgstr ""
 "\n"
 "синхронізація по елементах"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5874,569 +4932,374 @@ msgstr ""
 "\n"
 "--- Елементи синтаксису ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: Немає такого синтаксичного кластера: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "мінімальний "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "максимальний "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; збіг "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " розриви рядків"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: Містить неприйнятні тут аргументи"
 
-# msgstr "E14: "
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: Некоректне значення cchar"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: group[t]hete тут неприйнятний"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: Не знайдено елемент регіону для %s"
 
-# msgstr "E396: "
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: Потрібна назва файлу"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: Забагато синтаксичних включень"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: Пропущено ']': %s"
 
-#: ../syntax.c:4531
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: Зайвий символ після ']': %s]%s"
+
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: Пропущено `=': %s"
 
-# ---------------------------------------
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Бракує аргументів: синтаксичний регіон %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: Забагато синтаксичних кластерів"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: Кластер не вказано"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Кінець зразку не знайдено: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Сміття після зразку: %s"
 
-# msgstr "E402: "
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr ""
 "E403: Синтаксична синхронізація: зразок для продовження рядка вказано двічі"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Неправильні аргументи: %s"
 
-# msgstr "E404: "
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: Пропущено знак рівності: %s"
 
-# msgstr "E405: "
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Порожній аргумент: %s"
 
-# msgstr "E406: "
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s тут не дозволено"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s має бути першим рядком у списку contains"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Невідома назва групи: %s"
 
-# msgstr "E409: "
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Неправильна підкоманда :syntax: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
 "  ВСЬОГО     К-ТЬ   СПІВП.  НАЙПОВІЛ.   СЕРЕДН.   НАЗВА              ШАБЛОН"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: Рекурсивний цикл читання syncolor.vim"
 
-# msgstr "E410: "
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: Групу підсвічування не знайдено: %s"
 
-# msgstr "E411: "
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Недостатньо аргументів: «:highlight link %s»"
 
-# msgstr "E412: "
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Забагато аргументів: «:highlight link %s»"
 
-# msgstr "E413: "
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: Грума має settings, highlight link проігноровано"
 
-# msgstr "E414: "
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: Несподіваний знак рівності: %s"
 
-# msgstr "E415: "
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: Пропущено знак рівності: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: Пропущено аргумент: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Неправильне значення: %s"
 
-# msgstr "E418: "
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: Невідомий колір тексту"
 
-# msgstr "E419: "
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: Невідомий колір фону"
 
-# msgstr "E420: "
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: Нерозпізнана назва або номер кольору: %s"
 
-# msgstr "E421: "
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: Занадто довгий код терміналу: %s"
-
-# msgstr "E422: "
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Неправильний аргумент: %s"
 
-# msgstr "E423: "
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Використано забагато різних атрибутів кольору"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: Недруковний символ у назві групи"
 
-# msgstr "E181: "
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: Некоректний символ у назві групи"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: Забагато груп підсвічування і синтаксису"
 
-# msgstr "E424: "
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
-msgstr "E555: Кінець стеку теґів"
+msgstr "E555: Кінець стеку міток"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
-msgstr "E556: Вершина стеку теґів"
+msgstr "E556: Вершина стеку міток"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: Це вже найперший відповідний теґ"
+msgstr "E425: Це вже найперша відповідна мітка"
 
-# msgstr "E425: "
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: Теґ не знайдено: %s"
+msgstr "E426: Мітку не знайдено: %s"
 
-# msgstr "E426: "
-#: ../tag.c:528
 msgid "  # pri kind tag"
-msgstr "  # прі тип теґ"
+msgstr "  # прі тип мітка"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "файл\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
-msgstr "E427: Лише один відповідний теґ"
+msgstr "E427: Лише одна відповідна мітка"
 
-# msgstr "E427: "
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: Це вже останній відповідний теґ"
+msgstr "E428: Це вже остання відповідна мітка"
 
-# msgstr "E428: "
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "Файл «%s» не існує"
 
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "теґ %d з %d%s"
+msgstr "мітка %d з %d%s"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " або більше"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
-msgstr "  Використано теґ, не розрізняючи великі й малі літери"
+msgstr "  Використано мітку, не розрізняючи великі й малі літери!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Файл «%s» не існує"
 
-# msgstr "E429: "
-#. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
 msgstr ""
 "\n"
-"  # ДО теґу        З рядка  у файлі/тексті"
+"  # ДО мітки       З рядка  у файлі/тексті"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Шукається у файлі теґів %s"
 
-#: ../tag.c:1545
 msgid "Ignoring long line in tags file"
 msgstr "Ігнорується довгий рядок у файлі з позначками"
 
-# msgstr "E430: "
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Помилка формату у файлі теґів «%s»"
 
-# msgstr "E431: "
-#: ../tag.c:1917
 #, c-format
 msgid "Before byte %<PRId64>"
 msgstr "Перед байтом %<PRId64>"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Файл теґів не впорядкований: %s"
 
-# msgstr "E432: "
-#. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: Немає файлу теґів"
 
-# msgstr "E433: "
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
-msgstr "E434: Не вдалося знайти зразок теґу"
+msgstr "E434: Не вдалося знайти зразок мітки"
 
-# msgstr "E434: "
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: Не вдалося знайти теґ, тільки припущення!"
+msgstr "E435: Не вдалося знайти мітку, тільки припущення!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "Назва поля повторюється: %s"
 
-# msgstr "E435: "
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' не відомий. Вбудовані термінали:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "початково '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: Не вдалося відкрити файл можливостей терміналів"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: Немає інформації про термінал"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: Немає інформації про можливості терміналу"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: Немає запису «%s» про можливості терміналу"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: Потрібна можливість терміналу «cm»"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- Клавіші терміналу ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: Помилка читання вводу, робота завершується...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
 msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Кількість рядків несподівано змінилася"
+msgstr "E881: Кількість рядків несподівано змінилася"
 
-#: ../undo.c:627
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Не вдалося відкрити файл історії для запису: %s"
 
-#: ../undo.c:717
+#, c-format
+msgid "E926: Unable to create directory \"%s\" for undo file: %s"
+msgstr "E926: Не вдалося створити каталог «%s» для файлу зворотніх змін: %s"
+
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: Файл історії пошкоджено (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "Не вдалося записати файл історії у жодну з директорій у 'undodir'"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "Will not overwrite with undo file, cannot read: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "Не можна перезаписати, це не файл історії: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "Файл історії не записується, нічого повертати"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "Записується файл історії: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: Помилка запису у файлі історії: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "Файл історії прочитано не буде, власник інший: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "Читається файл історії: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: Не вдалося відкрити файл для читання: %s"
 
-# msgstr "E333: "
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Не файл історії: %s"
 
-#: ../undo.c:1313
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Несумісний файл історії: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "Вміст файлу змінився, не можна використати інформацію про історію"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "Закінчено читання файлу історії %s"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "Вже на найстаршій зміні"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "Вже на найновішій зміні"
 
-#: ../undo.c:1806
 #, c-format
 msgid "E830: Undo number %<PRId64> not found"
 msgstr "E830: Зміну %<PRId64> не знайдено в історії"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: неправильні номери рядків"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "додано рядок"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "рядків додано"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "знищено рядок"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "рядків знищено"
 
-# msgstr "E438: "
-#: ../undo.c:2193
 msgid "change"
 msgstr "зміна"
 
-# msgstr "E438: "
-#: ../undo.c:2195
 msgid "changes"
 msgstr "змін"
 
-#: ../undo.c:2225
 #, c-format
 msgid "%<PRId64> %s; %s #%<PRId64>  %s"
 msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
 
-#: ../undo.c:2228
-msgid "before"
-msgstr "перед"
-
-#: ../undo.c:2228
 msgid "after"
 msgstr "після"
 
-#: ../undo.c:2325
+msgid "before"
+msgstr "перед"
+
 msgid "Nothing to undo"
 msgstr "Немає нічого скасовувати"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "номер  зміни    час             збережено"
 
-#: ../undo.c:2360
 #, c-format
 msgid "%<PRId64> seconds ago"
 msgstr "%<PRId64> секунд тому"
 
-# msgstr "E406: "
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: Не можна виконати undojoin після undo"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: Список скасування пошкоджено"
 
-# msgstr "E439: "
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: Відсутній рядок скасування"
 
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"Включені латки: "
-
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6444,11 +5307,6 @@ msgstr ""
 "\n"
 "Додаткові латки: "
 
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Змінив "
-
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6456,1933 +5314,95 @@ msgstr ""
 "\n"
 "Скомпілював "
 
-#: ../version.c:649
 msgid "by "
 msgstr " "
 
-#: ../version.c:660
 msgid ""
 "\n"
-"Huge version "
+"\n"
+"Optional features included (+) or not (-): "
 msgstr ""
 "\n"
-"Гігантська версія "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "без GUI."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  Включені (+) або не включені (-) компоненти:\n"
+"\n"
+"Включені (+) або не включені (-) компоненти: "
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "   системний vimrc: \""
 
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "     vimrc користувача: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " другий vimrc користувача: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " третій vimrc користувача: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "      exrc користувача: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  другий exrc користувача: \""
-
-#: ../version.c:699
 msgid "  fall-back for $VIM: \""
 msgstr "  заміна для $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr " заміна для $VIMRUNTIME: \""
 
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "Скомпільовано: "
+msgid "by Bram Moolenaar et al."
+msgstr "автор: Bram Moolenaar та ін."
 
-#: ../version.c:712
-msgid "Linking: "
-msgstr "Скомпоновано: "
+msgid "Nvim is open source and freely distributable"
+msgstr "Nvim — це відкрита й вільно розповсюджувана програма"
 
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ВЕРСІЯ ДЛЯ НАЛАГОДЖЕННЯ"
+msgid "https://neovim.io/community"
+msgstr "https://neovim.io/community"
 
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Покращений Vi"
+msgid "type  :help nvim<Enter>       if you are new! "
+msgstr ":help nvim<Enter>       якщо ви вперше!       "
 
-#: ../version.c:769
-msgid "version "
-msgstr "версія "
+msgid "type  :CheckHealth<Enter>     to optimize Nvim"
+msgstr ":CheckHealth<Enter>     щоб оптимізувати Nvim "
 
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "автор: Bram Moolenaar та ін."
+msgid "type  :q<Enter>               to exit         "
+msgstr ":q<Enter>               вихід з Vim           "
 
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim — це відкрита й вільно розповсюджувана програма"
+msgid "type  :help<Enter>            for help        "
+msgstr ":help<Enter>            щоб отримати допомогу "
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "Допоможіть сиротам з Уганди!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
-msgstr ":help iccf<Enter>         подробиці                "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr ":q<Enter>                 вихід з Vim              "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr ":help<Enter> або <F1>     перегляд допомоги        "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr ":help version7<Enter>     інформація про версію    "
+msgstr ":help iccf<Enter>       подробиці             "
 
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Ви працюєте в режимі сумісному з Vi"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr ":set nocp<Enter>          режим несумісний з Vi    "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr ":help cp-default<Enter>   інформація про сумісність"
-
-#: ../version.c:827
 msgid "Sponsor Vim development!"
 msgstr "Підтримайте розробку редактора Vim!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Станьте зареєстрованим користувачем Vim!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
-msgstr ":help sponsor<Enter>      подальша інформація      "
+msgstr ":help sponsor<Enter>    подальша інформація   "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
-msgstr ":help register<Enter>     подальша інформація      "
+msgstr ":help register<Enter>   подальша інформація   "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "меню  Допомога->Спонсор/Реєстрація  подробиці      "
+msgstr "меню  Допомога->Спонсор/Реєстрація  подробиці    "
 
-# msgstr "E444: "
-#: ../window.c:119
 msgid "Already only one window"
 msgstr "Це вже єдине вікно"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: Немає вікна перегляду"
 
-# msgstr "E441: "
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: Не вдалося одночасно розбити topleft і botright"
 
-# msgstr "E442: "
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: Не вдалося перемістити вікно, заважають інші"
 
-# msgstr "E443: "
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: Не вдалося закрити останнє вікно"
 
-# msgstr "E443: "
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: Не вдалося закрити вікно autocmd"
 
-# msgstr "E443: "
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: Не вдалося закрити вікно, залишилося б тільки вікно autocmd"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: У іншому вікні є зміни"
 
-# msgstr "E445: "
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: Немає назви файлу над курсором"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: Викликано bf_key_init() з порожнім паролем"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Неправильне використання порядку байтів Blowfish (BE/LE)"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: Не пройшла перевірка sha256"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Не пройшла перевірка Blowfish"
-
-#~ msgid "Patch file"
-#~ msgstr "Латка"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&O:Гаразд\n"
-#~ "&C:Скасувати"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Немає з'єднання із сервером Vim"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Не вдалося відіслати до %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Не вдалося прочитати відповідь сервера"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Не вдалося надіслати клієнту"
-
-#~ msgid "Save As"
-#~ msgstr "Зберегти як"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Прочитати скрипт Vim"
-
-#~ msgid "Edit File"
-#~ msgstr "Редагувати Файл"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (НЕ ЗНАЙДЕНО)"
-
-#~ msgid "unknown"
-#~ msgstr "Невідомо"
-
-# msgstr "E185: "
-#~ msgid "Edit File in new window"
-#~ msgstr "Редагувати файл у новому вікні"
-
-#~ msgid "Append File"
-#~ msgstr "Дописати файл"
-
-# msgstr "E187: "
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Позиція вікна: X %d, Y %d"
-
-# msgstr "E188: "
-#~ msgid "Save Redirection"
-#~ msgstr "Зберегти переадресований вивід"
-
-#~ msgid "Save View"
-#~ msgstr "Зберегти вигляд"
-
-#~ msgid "Save Session"
-#~ msgstr "Зберегти сеанс"
-
-#~ msgid "Save Setup"
-#~ msgstr "Зберегти налаштування"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< не доступна без можливості +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: У цій версії немає диграфів"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "є пристроєм (вимкнено опцією 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Читається з stdin..."
-
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[зашифровано]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Файл зашифровано невідомим методом"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans не дозволяє записувати у незмінені буфери"
-
-# msgstr "E391: "
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Часткові записи заборонені для буферів NetBeans"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "Запис до пристрою заборонено опцією 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Гілку ресурсів можна втратити (! щоб не зважати)"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<не відкривається> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: не вдалося отримати шрифт %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: не вдалося повернутися в поточний каталог"
-
-#~ msgid "Pathname:"
-#~ msgstr "Шлях:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: не вдалося отримати поточний каталог"
-
-#~ msgid "OK"
-#~ msgstr "Гаразд"
-
-#~ msgid "Cancel"
-#~ msgstr "Скасувати"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Діалог Vim"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "Scrollbar Widget: Не вдалося визначити розмір скороченої картинки."
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Не вдалося створити BalloonEval з повідомленням і функцією"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: Не вдалося створити новий процес для GUI"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: Дочірній процес не зміг запустити GUI"
-
-# msgstr "E228: "
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Не вдалося запустити GUI"
-
-# msgstr "E229: "
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Не вдалося прочитати з «%s»"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: Не вдалося запустити GUI, не знайдено шрифт"
-
-# msgstr "E230: "
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: Некоректний 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Значення 'imactivatekey' некоректне"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Не вдалося отримати колір %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Немає над курсором, пошук триває"
-
-#~ msgid "Input _Methods"
-#~ msgstr "Методи введення"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Знайти й замінити..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - Пошук..."
-
-#~ msgid "Find what:"
-#~ msgstr "Знайти:"
-
-#~ msgid "Replace with:"
-#~ msgstr "Замінити на:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Лише повне слово"
-
-#~ msgid "Match case"
-#~ msgstr "Зважати на регістр"
-
-#~ msgid "Direction"
-#~ msgstr "Напрям"
-
-#~ msgid "Up"
-#~ msgstr "Вгору"
-
-#~ msgid "Down"
-#~ msgstr "Униз"
-
-#~ msgid "Find Next"
-#~ msgstr "Наступне"
-
-#~ msgid "Replace"
-#~ msgstr "Замінити"
-
-#~ msgid "Replace All"
-#~ msgstr "Замінити усі"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: Отримав запит «die» від менеджера сесій\n"
-
-#~ msgid "Close"
-#~ msgstr "Закрити"
-
-#~ msgid "New tab"
-#~ msgstr "Нова вкладка"
-
-#~ msgid "Open Tab..."
-#~ msgstr "Відкрити вкладку..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: Несподівано знищилося головне вікно\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&F:Фільтрувати"
-
-#~ msgid "&Cancel"
-#~ msgstr "&C:Скасувати"
-
-#~ msgid "Directories"
-#~ msgstr "Каталоги"
-
-#~ msgid "Filter"
-#~ msgstr "Фільтр"
-
-#~ msgid "&Help"
-#~ msgstr "&H:Допомога"
-
-#~ msgid "Files"
-#~ msgstr "Файли"
-
-#~ msgid "&OK"
-#~ msgstr "&O:Гаразд"
-
-#~ msgid "Selection"
-#~ msgstr "Виділення"
-
-#~ msgid "Find &Next"
-#~ msgstr "&N:Знайти далі"
-
-#~ msgid "&Replace"
-#~ msgstr "&R:Замінити"
-
-#~ msgid "Replace &All"
-#~ msgstr "&A:Замінити усі"
-
-#~ msgid "&Undo"
-#~ msgstr "&U:Скасувати"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Не вдалося знайти вікно «%s»"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Аргумент не підтримується: «-%s»; користуйтесь версією з OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Не вдалося відкрити вікно всередині програми MDI"
-
-#~ msgid "Close tab"
-#~ msgstr "Закрити вкладку"
-
-#~ msgid "Open tab..."
-#~ msgstr "Відкрити вкладку..."
-
-# msgstr "E245: "
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Знайти рядок ('\\\\' щоб знайти '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Знайти і замінити ('\\\\' щоб знайти '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "Немає"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Каталог\t*.нічого\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Немає вільних комірок у палітрі, деякі кольори можуть бути "
-#~ "неправильні"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Шрифти для цих символів відсутні у наборі %s:"
-
-# msgstr "E250: "
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Назва набору шрифтів: %s"
-
-# msgstr "E252: "
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Шрифт '%s' не є моноширинним"
-
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: Назва набору шрифтів: %s"
-
-#~ msgid "Font0: %s"
-#~ msgstr "Шрифт0: %s"
-
-#~ msgid "Font1: %s"
-#~ msgstr "Шрифт1: %s"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "Ширина шрифту%<PRId64> не більша удвічі за ширину шрифту0"
-
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "Ширина шрифту0: %<PRId64>"
-
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "Ширина шрифту1: %<PRId64>"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "Некоректна специфікація шрифту"
-
-#~ msgid "&Dismiss"
-#~ msgstr "&D:Припинити"
-
-#~ msgid "no specific match"
-#~ msgstr "немає конкретного збігу"
-
-# msgstr "E234: "
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - Вибір шрифту"
-
-#~ msgid "Name:"
-#~ msgstr "Назва:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Показати розмір у пунктах"
-
-#~ msgid "Encoding:"
-#~ msgstr "Кодування:"
-
-#~ msgid "Font:"
-#~ msgstr "Шрифт:"
-
-#~ msgid "Style:"
-#~ msgstr "Стиль:"
-
-#~ msgid "Size:"
-#~ msgstr "Розмір:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: Помилка автомату Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: помилка stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: Не вдалося відкрити базу даних cscope: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: Не вдалося отримати інформацію з бази даних cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Не вдалося завантажити бібліотеку Lua"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "не вдалося зберегти інформацію для скасування"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: Вибачте, ця команда вимкнена, бібліотеки MzScheme не можуть бути "
-#~ "завантажені."
-
-#~ msgid "invalid expression"
-#~ msgstr "некоректний вираз"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "обробку виразів вимкнено під час компіляції"
-
-#~ msgid "hidden option"
-#~ msgstr "прихована опція"
-
-#~ msgid "unknown option"
-#~ msgstr "невідома опція"
-
-#~ msgid "window index is out of range"
-#~ msgstr "некоректний номер вікна"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "не вдалося відкрити буфер"
-
-#~ msgid "cannot delete line"
-#~ msgstr "неможливо знищити рядок"
-
-#~ msgid "cannot replace line"
-#~ msgstr "неможливо замінити рядок"
-
-#~ msgid "cannot insert line"
-#~ msgstr "не вдалося вставити рядок"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "більше ніж один рядок"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "не вдалося перетворити значення Scheme у Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Помилка Vim: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Помилка Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "буфер непридатний"
-
-#~ msgid "window is invalid"
-#~ msgstr "вікно непридатне"
-
-#~ msgid "linenr out of range"
-#~ msgstr "номер рядка за межами файлу"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "не дозволено у пісочниці Vim"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Python: Не можна використати :py і :py3 в одному сеансі"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Вибачте, ця команда вимкнена, бібліотека Python не може бути "
-#~ "завантажена."
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Python: Не можна використати :py і :py3 в одному сеансі"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Не можна рекурсивно викликати Python"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ має бути екземпляром String"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: Вибачте, ця команда вимкнена, бібліотека Ruby не може бути "
-#~ "завантажена."
-
-# msgstr "E414: "
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: несподіваний return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: несподіваний next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: несподіваний break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: несподіваний redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: retry поза rescue"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: Необроблений виняток"
-
-# msgstr "E233: "
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: Невідомий статус longjmp: %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Перемкнути реалізацію/визначення"
-
-#~ msgid "Show base class of"
-#~ msgstr "Знайти базовий клас"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Показати замінені функції-члени"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "Прочитати з файлу"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "Отримати з проекту"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Отримати з усіх проектів"
-
-#~ msgid "Retrieve"
-#~ msgstr "Отримати"
-
-#~ msgid "Show source of"
-#~ msgstr "Джерело"
-
-#~ msgid "Find symbol"
-#~ msgstr "Знайти символ"
-
-#~ msgid "Browse class"
-#~ msgstr "Переглянути клас"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Показати клас в ієрархії"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Показати клас в обмеженій ієрархії"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref вказує на"
-
-#~ msgid "Xref referred by"
-#~ msgstr "На Xref вказано з"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref має"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref використано"
-
-#~ msgid "Show docu of"
-#~ msgstr "Показати docu"
-
-#~ msgid "Generate docu for"
-#~ msgstr "Створити docu для"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Не вдалося з'єднатися зі SNiFF+. Перевірте оточення (sniffemacs має бути "
-#~ "у $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: Помилка під час читання. Від'єднано"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ зараз "
-
-#~ msgid "not "
-#~ msgstr "не "
-
-#~ msgid "connected"
-#~ msgstr "під'єднаний"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Невідомий запит до SNiFF+: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Помилка з'єднання до SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ не під'єднано"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Не є буфером SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: Помилка запису. Від'єднано"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "неправильна назва буфера"
-
-#~ msgid "not implemented yet"
-#~ msgstr "ще не реалізовано"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "не вдалося встановити рядки"
-
-#~ msgid "invalid mark name"
-#~ msgstr "неправильна назва позначки"
-
-# msgstr "E19: "
-#~ msgid "mark not set"
-#~ msgstr "помітку не вказано"
-
-#~ msgid "row %d column %d"
-#~ msgstr "рядок %d колонка %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "Не вдалося вставити/додати рядок"
-
-#~ msgid "line number out of range"
-#~ msgstr "номер рядка за межами файлу"
-
-#~ msgid "unknown flag: "
-#~ msgstr "невідомий прапорець: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "Невідома vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "перервано з клавіатури"
-
-#~ msgid "vim error"
-#~ msgstr "помилка Vim"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "не вдалося створити команду вікна/буфера: об'єкт знищується"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "Не вдалося зареєструвати подію: буфер/вікно уже знищується"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: ФАТАЛЬНА ПОМИЛКА TCL: можливо пошкоджено список посилань!? Будь "
-#~ "ласка, повідомте у vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "Не вдалося зареєструвати команду події: посилання на буфер/вікно не "
-#~ "знайдено"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: Вибачте, ця команда вимкнена, бібліотека Tcl не може бути "
-#~ "завантажена."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: Код виходу %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "не вдалося дістати рядок"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Не вдалося зареєструвати назву сервера команд"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Не вдалося відіслати команду до програми-цілі"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Використано некоректний ідентифікатор сервера: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: Реквізит реєстру зразку VIM сформований неправильно.  Знищено!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans не підтримується з цим GUI\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Ця версія Vim не була скомпільована з підтримкою порівняння."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "Не можна використати '-nb': не дозволено під час компіляції\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: Помилка: Не вдалося запустити gvim для NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "Якщо регістр ігнорується, додайте / спереду щоб прапорець був у верхньому "
-#~ "регістрі."
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tЗареєструвати цей gvim для OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tСкасувати реєстрацію цього gvim для OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tЗапустити GUI (ніби «gvim»)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  чи  --nofork\tПередній план: тримати термінал після запуску GUI"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tНе використовувати newcli для відкриття вікна"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <пристрій>\t\t\tВикористовувати <пристрій> для вводу/виводу"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-u <gvimrc>\t\tВикористати поданий файл замість .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tРедагувати зашифровані файли"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <дисплей>\tПід'єднати vim до заданого дисплею сервера X"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tНе з'єднуватися з X сервером"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <файли>\tРедагувати <файли> на сервері Vim, якщо це можливо"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent <файли>  Те саме, тільки не скаржитися на відсутність "
-#~ "сервера"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <файли>   ..., але зачекати поки усі файли будуть "
-#~ "відредаговані"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <файли>  Те саме, тільки не скаржитися, якщо сервера "
-#~ "немає"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <файли>  Так само, як --remote, але по "
-#~ "вкладці на файл"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <символи> Відіслати <символи> серверу і завершити роботу"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <вираз> Виконати <вираз> у сервері Vim і надрукувати "
-#~ "результат"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr ""
-#~ "--serverlist\t\tПоказати список наявних серверів Vim і завершити роботу"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <назва>\tНадіслати до/стати Vim сервером з <назвою>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Аргументи для gvim (версія Motif)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Аргументи для gvim (версія neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Аргументи для gvim (версія Athena)\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <дисплей>\tВиконати vim на заданому <дисплеї>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tЗапустити Vim і згорнути його вікно"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <колір>\tВикористати <колір> для фону (також: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <колір>\tВикористати <колір> для звичайного тексту (також: -"
-#~ "fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr ""
-#~ "-font <шрифт>\tВикористати <шрифт> для звичайного тексту (також: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <шрифт>\tВикористати <шрифт> для жирного тексту"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <шрифт>\tВикористати <шрифт> для похилого тексту"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <геом>\tЗадати розміри й положення (також: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <товщ>\tВстановити товщину меж <товщ> (також: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <товщ>  Встановити товщину лінійки зсуву (також: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <висота>\tВстановити висоту меню <висота> (також: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tОбернути кольори (також: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tНе обертати кольори (також: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <ресурс>\t\tВстановити зазначений ресурс"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Аргументи gvim (версія GTK+)\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <дисплей>\tВиконати vim на <дисплеї> (також: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
-#~ "--role <роль>\tВстановити унікальну роль для ідентифікації головного вікна"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tВідкрити Vim в іншому елементі інтерфейсу GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tХай gvim надрукує ідентифікатор вікна на stdout"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <заголовок батька>\tВідкрити Vim всередині батьківського вікна"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tВідкрити Vim всередині іншого елементу win32"
-
-#~ msgid "No display"
-#~ msgstr "Немає дисплею"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Не вдалося відіслати.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Не вдалося відіслати. Спроба виконати на місці\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "відредаговано %d з %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Немає дисплею: Відіслати вираз не вдалося.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Відіслати вираз не вдалося.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Некоректна кодова сторінка"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Не вдалося встановити значення контексту вводу"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Не вдалося створити контекст вводу"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Не вдалося створити метод вводу"
-
-# msgstr "E286: "
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: Застереження: Не вдалося встановити в методі вводу подію знищення"
-
-# msgstr "E287: "
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: Метод вводу не підтримує стилі"
-
-# msgstr "E288: "
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: Метод вводу не підтримує відредаговані типи"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: Помилка поновлення шифрування файлу обміну"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s зашифровано, а ця версія Vim не підтримує шифрування"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Файл обміну зашифрований: «%s»"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Якщо ви задали новий ключ шифру, але не записали текстовий файл,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "введіть новий ключ шифру."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Якщо ви записали текстовий файл після зміни ключа шифру, натисніть enter"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "щоб використати однаковий ключ для текстового файлу та файлу обміну"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "Для текстового файлу використовується ключ шифру з файлу обміну.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [не придатний для цієї версії Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Відірвати це меню"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Вибрати каталог"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Запам'ятати файл"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Відкрити файл"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Вибачте, але в консолі немає діалогу вибору файлу"
-
-#~ msgid "ERROR: "
-#~ msgstr "ПОМИЛКА: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[байт]  всього розм/знищ. %<PRIu64>/%<PRIu64>, викор. %<PRIu64>, макс. "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[виклики] усього re/malloc() - %<PRIu64>, усього free() - %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Рядок стає занадто довгим"
-
-# msgstr "E340: "
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Внутрішня помилка: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Неправильний вигляд миші"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Вкажіть ключ шифру: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Повторіть ключ: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Ключі не однакові!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Не вдалося з'єднатися із Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Не вдалося з'єднатися із Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: Неправильний режим доступу до файлу інформації про з'єднання з "
-#~ "NetBenans: «%s»"
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "читається з сокета Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Втрачено зв'язок із NetBeans для буфера %<PRId64>"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans не підтримується з цим GUI"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans вже під'єднано"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s тільки для читання (! щоб не зважати)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Можливість eval недоступна"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "Звільнено рядків: %<PRId64>"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Не вдалося змінити term в GUI"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: Застосуйте «:gui» для запуску GUI"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Не можна змінити в GUI GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Некоректний(і) шрифт(и)"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: Не вдалося вибрати набір шрифтів"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Неправильний набір шрифтів"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: Не вдалося використати розширений шрифт"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Некоректний розширений шрифт"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Миша не підтримується"
-
-# msgstr "E358: "
-#~ msgid "cannot open "
-#~ msgstr "не вдалося відкрити "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Не вдалося відкрити вікно!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Потрібна Amigados 2.04 або пізніша\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Потрібно %s версії %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Не вдалося відкрити NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Не вдалося створити "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim завершує роботу з %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "не можу змінити режим консолі ?!\n"
-
-# msgstr "E359: "
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: не консоль??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Не вдалося запустити оболонку з опцією -f"
-
-# msgstr "E360: "
-#~ msgid "Cannot execute "
-#~ msgstr "Не вдалося виконати "
-
-#~ msgid "shell "
-#~ msgstr "оболонку "
-
-#~ msgid " returned\n"
-#~ msgstr " повернуто\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE замалий"
-
-#~ msgid "I/O ERROR"
-#~ msgstr "Помилка вводу/виводу"
-
-#~ msgid "Message"
-#~ msgstr "Повідомлення"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' не 80, не можна виконувати зовнішні команди"
-
-# msgstr "E364: "
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Не вдалося вибрати принтер"
-
-#~ msgid "to %s on %s"
-#~ msgstr "на %s з %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Невідомий шрифт принтера: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Помилка друку: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Друкується '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Некоректна назва набору символів «%s» у назві шрифту «%s»"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Помилковий символ %c в назві шрифту «%s»"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "На відкриття дисплею X пішло %<PRId64> мілісекунд"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Помилка X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Дисплей Х не пройшов перевірку"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Сплив час очікування відкриття дисплею Х"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Не вдалося запустити оболонку `sh'\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Не можна створити канали\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Не вдалося роздвоїтися\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Команда закінчила виконання\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP втратив з'єднання ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "Не вдалося відкрити дисплей X"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP обробляється запит 'збережи себе'"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP відкривається з'єднання"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP спостереження за з'єднанням з ICE не вдалося"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP не вдалося SmcOpenConnection: %s"
-
-#~ msgid "At line"
-#~ msgstr "Рядок:"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Не вдалося завантажити vim32.dll"
-
-#~ msgid "VIM Error"
-#~ msgstr "Помилка VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Не вдалося виправити вказівники на функції DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "оболонка повернула %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Виявлено подію %s\n"
-
-#~ msgid "close"
-#~ msgstr "close"
-
-#~ msgid "logoff"
-#~ msgstr "logoff"
-
-#~ msgid "shutdown"
-#~ msgstr "shutdown"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Команду не знайдено"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "Файл VIMRUN.EXE не знайдено у шляху пошуку.\n"
-#~ "Зовнішні команди не будуть призупинені після виконання.\n"
-#~ "Гляньте  :help win32-vimrun щоб отримати подробиці."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Застереження Vim"
-
-# msgstr "E231: "
-#~ msgid "Error file"
-#~ msgstr "Файл помилок"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: Не вдалося побудувати NFA з класом еквівалентності!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) Не вдалося отримати пам’ять для обходу гілок!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "Застереження: Не вдалося знайти список слів «%s_%s.spl» чи «%s_ascii.spl»"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Перетворення у %s не підтримується"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: Недостатньо пам’яті, список слів буде неповним"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Шлях файлу теґів скорочено до %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "запущено нову оболонку\n"
-
-# msgstr "E242: "
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "Використано CUT_BUFFER0 замість порожнього виділення"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Скасування буде неможливе, все одно продовжити"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Незашифрований файл має зашифрований файл історії: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Не вдалося розшифрувати файл історії: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Файл історії зашифрований: %s"
-
-# msgstr "E440: "
-# ---------------------------------------
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія з GUI для 16/32-розрядної Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія з GUI для 64-розрядної MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія з GUI для 32-розрядної Windows"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " в режимі Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " з підтримкою OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Консольна версія для 64-розрядної Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Консольна версія для 32-розрядної Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для 16-розрядної Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для 32-розрядної MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для 16-розрядної MS-DOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для MacOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Версія для OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Велика версія "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Нормальна версія "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Мала версія "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Крихітна версія "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "з GUI GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "з GUI GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "з GUI X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "з GUI X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "з GUI X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "з GUI Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "з GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "з GUI Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "з GUI Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "з (класичним) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "  системний gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    gvimrc користувача: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "другий gvimrc користувача: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "третій gvimrc користувача: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    системне меню: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Компілятор: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "меню  Help->Orphans       подальша інформація      "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Без режимів, текст що набрано вставляється"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "меню  Edit->Global Settings->Toggle Insert Mode    "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                          для двох режимів         "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "меню  Edit->Global Settings->Toggle Vi Compatible  "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "              щоб починати в режимі сумісності з Vi"
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "ЗАСТЕРЕЖЕННЯ: Ви користуєтеся Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr ":help windows95<Enter>    інформація про це        "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Не вдалося завантажити бібліотеку %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "Вибачте, ця команда вимкнена, бібліотека Perl не може бути завантажена."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: Обчислення виразів Perl заборонене у пісочниці без модуля Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Редагувати у (&m)різних Vim"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Редагувати у одному &Vim"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Порівняти з допомогою Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Редагувати за допомогою &Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Редагувати у вже запущеному Vim - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Редагує вибрані файли з допомогою Vim"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "Помилка створення процесу, перевірте чи є gvim у шляху пошуку!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "помилка gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "Шлях занадто довгий!"
-
-# msgstr "E233: "
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Невідомий набір шрифтів: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Невідомий шрифт: %s"
-
-# msgstr "E235: "
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: Шрифт «%s» не моноширинний"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Не вдалося завантажити бібліотечну функцію %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: Не можна використати іврит: Не ввімкнено під час компіляції\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Не можна використати фарсі: Не ввімкнено під час компіляції\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: Не можна використати арабську мову: Не ввімкнено під час "
-#~ "компіляції\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: Немає зареєстрованих серверів з назвою «%s»"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: Не вдалося відкрити дисплей"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Отримано некоректний вираз"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Не можна змінити захищений регіон"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans не дозволяє змінювати захищені від запису файли"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Для «%s» потрібен ключ: "
-
-# msgstr "E406: "
-#~ msgid "empty keys are not allowed"
-#~ msgstr "порожні ключі не дозволені"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "словник заблоковано"
-
-#~ msgid "list is locked"
-#~ msgstr "список заблоковано"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "не вдалося додати ключ '%s' до словника"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "індекс має бути цілий чи зріз, не %s"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr "очікувався екземпляр str() чи unicode(), але отримано %s"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "очікувався екземпляр bytes() чи str(), але отримано %s"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr ""
-#~ "очікувався int(), long() чи щось, що може бути вміщене long(), але "
-#~ "отримано %s"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr ""
-#~ "очікувався int() чи щось, що може бути вміщене int(), але отримано %s"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "значення завелике, щоб вміститися у тип C int"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "значення замале, щоб вміститися у тип C int"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "число має бути більше, ніж нуль"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "число має бути не менше, ніж нуль"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "не вдалося знищити атрибути OutputObject"
-
-# msgstr "E180: "
-#~ msgid "invalid attribute: %s"
-#~ msgstr "неправильний атрибут: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: Помилка ініціалізації об'єктів вводу/виводу"
-
-#~ msgid "failed to change directory"
-#~ msgstr "не вдалося змінити директорію"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "очікувався 3-кортеж як результат imp.find_module(), але отримано %s"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "очікувався 3-кортеж як результат imp.find_module(), але отримано %d"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "внутрішня помилка: imp.find_module повернула кортеж з NULL"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "не вдалося знищити атрибути vim.Dictionary"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "не можна змінити фіксований словник"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "не можна встановити атрибут %s"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "хеш-таблиця змінилася під час перебирання"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr ""
-#~ "очікувалась послідовність розміром 2, але отримано послідовність розміру "
-#~ "%d"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "списковий конструктор не приймає іменовані аргументи"
-
-#~ msgid "list index out of range"
-#~ msgstr "індекс списку за межами"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "внутрішня помилка: не вдалося отримати елемент списку vim %d"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "не вдалося додати елемент до списку"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "внутрішня помилка: немає елемента списку vim %d"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "внутрішня помилка: не вдалося додати елемент до списку"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "не вдалося знищити атрибути vim.List"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "не можна змінити фіксований список"
-
-# msgstr "E428: "
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "безіменної функції %s не існує"
-
-# msgstr "E428: "
-#~ msgid "function %s does not exist"
-#~ msgstr "функції %s не існує"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "конструктор функції не приймає іменовані аргументи"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "не вдалося виконати функцію %s"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "не вдалося перемкнути вікна"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "не вдалося скинути глобальну опцію %s"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "не вдалося скинути опцію %s, яка не має глобального значення"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "спроба звернення до знищеної вкладки"
-
-#~ msgid "no such tab page"
-#~ msgstr "такої вкладки немає"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "спроба звернутися до знищеного вікна"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "атрибут лише для читання: буфер"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "курсор за межами буфера"
-
-#~ msgid "no such window"
-#~ msgstr "такого вікна немає"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "спроба звернення до знищеного буфера"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "не вдалося перейменувати буфер"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "назвою мітки має бути один символ"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "очікувався об’єкт vim.Buffer, але отримано %s"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "не вдалося перемкнутися до буфера %d"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "очікувався об’єкт vim.Window, але отримано %s"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "не вдалося знайти вікно у поточній вкладці"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "не перемкнувся до вказаного вікна"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "очікувався об’єкт vim.TabPage, але отримано %s"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "не перемкнувся до вказаної вкладки"
-
-#~ msgid "failed to run the code"
-#~ msgstr "не вдалося виконати код"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval не повернув дійсний об’єкт python"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Не вдалося перетворити об’єкт python у значення vim"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "не вдалося перетворити %s у словник vim"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "не вдалося перетворити %s у структуру vim"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "внутрішня помилка: передано посилання NULL"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "внутрішня помилка: неправильний тип значення"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "Не вдалося встановити обробник шляху: sys.path_hooks не список\n"
-#~ "Вам слід вчинити так:\n"
-#~ "- додайте vim.path_hook до sys.path_hooks\n"
-#~ "- додайте vim.VIM_SPECIAL_PATH до sys.path\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "Не вдалося встановити шлях: sys.path не список\n"
-#~ "Вас слід додати vim.VIM_SPECIAL_PATH до sys.path"
+msgid "List or number required"
+msgstr "Очікується список чи число"
diff --git a/src/nvim/po/vi.po b/src/nvim/po/vi.po
index a720510426..456e640a80 100644
--- a/src/nvim/po/vi.po
+++ b/src/nvim/po/vi.po
@@ -2720,11 +2720,6 @@ msgstr "E49: Kích thước thanh cuộn không cho phép"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4311,11 +4306,6 @@ msgstr "dòng %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Tên sổ đăng ký không cho phép: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"Bản dịch các thông báo sang tiếng Việt: Phan Vĩnh Thịnh <teppi@vnlinux.org>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "Gián đoạn: "
diff --git a/src/nvim/po/zh_CN.UTF-8.po b/src/nvim/po/zh_CN.UTF-8.po
index 82b895d9d6..981719a2e7 100644
--- a/src/nvim/po/zh_CN.UTF-8.po
+++ b/src/nvim/po/zh_CN.UTF-8.po
@@ -2675,11 +2675,6 @@ msgstr "E49: 无效的滚动大小"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4264,10 +4259,6 @@ msgstr "第 %4ld 行:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 无效的寄存器名: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "简体中文消息维护者: Yuheng Xie <elephant@linux.net.cn>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "已中断: "
diff --git a/src/nvim/po/zh_CN.cp936.po b/src/nvim/po/zh_CN.cp936.po
deleted file mode 100644
index cf66010c71..0000000000
--- a/src/nvim/po/zh_CN.cp936.po
+++ /dev/null
@@ -1,7932 +0,0 @@
-# Chinese (simplified) Translation for Vim
-#
-# Do ":help uganda"  in Vim to read copying and usage conditions.
-# Do ":help credits" in Vim to see a list of people who contributed.
-#
-# FIRST AUTHOR  Wang Jun <junw@turbolinux.com.cn>
-#
-# TRANSLATORS
-#   Edyfox <edyfox@gmail.com>
-#   Yuheng Xie <elephant@linux.net.cn>
-#
-# Generated from zh_CN.po, DO NOT EDIT.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Vim(Simplified Chinese)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2006-04-21 14:00+0800\n"
-"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
-"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gbk\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "ѡ��������������Ч"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[Location �б�]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Quickfix �б�]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr ""
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: �޷������κλ��������˳�����..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: �޷����仺������ʹ����һ��������..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: û���ͷ��κλ�����"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: û��ɾ���κλ�����"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: û������κλ�����"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "�ͷ��� 1 ��������"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "�ͷ��� %d ��������"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "ɾ���� 1 ��������"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "ɾ���� %d ��������"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "����� 1 ��������"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "����� %d ��������"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: �޷��ͷ����һ��������"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: û���޸Ĺ��Ļ�����"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: û�п��г��Ļ�����"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: ������ %<PRId64> ������"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �޷��л����������һ��������"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: �޷��л������ǵ�һ��������"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: ������ %<PRId64> ���޸ĵ���δ���� (��� ! ǿ��ִ��)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ����: �ļ�������"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �Ҳ��������� %<PRId64>"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: �ҵ���ֹһ�� %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: û��ƥ��Ļ����� %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "�� %<PRId64> ��"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: ���л�����ʹ�ø�����"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [���޸�]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[δ�༭]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[���ļ�]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[������]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[ֻ��]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[ֻ��]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �� --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �� --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�� %<PRId64> / %<PRId64> --%d%%-- �� "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[���]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "����"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[����]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[Ԥ��]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "ȫ��"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "�׶�"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "����"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# �������б�:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr ""
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Signs ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s �� Signs:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  id=%d  ����=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: ȱ��ð��"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: ��Ч��ģʽ"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: �˴���Ҫ����"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: ��Ч�İٷֱ�"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: ���ܱȽ�(diff) %<PRId64> �����ϵĻ�����"
-
-#: ../diff.c:753
-#, fuzzy
-msgid "E810: Cannot read or write temp files"
-msgstr "E557: �޷��� termcap �ļ�"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: �޷����� diff"
-
-#: ../diff.c:966
-#, fuzzy
-msgid "E816: Cannot read patch output"
-msgstr "E98: �޷���ȡ diff �����"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: �޷���ȡ diff �����"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: ��ǰ���������� diff ģʽ"
-
-#: ../diff.c:2100
-#, fuzzy
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E100: û���������� diff ģʽ�Ļ�����"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: û���������� diff ģʽ�Ļ�����"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ���������ϵĻ��������� diff ģʽ�����ܾ�������һ��"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �Ҳ��������� \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ������ \"%s\" ���� diff ģʽ"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ����ظı��˻�����"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: �����ַ�(digraph)�в���ʹ�� Escape"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: �Ҳ��� Keymap �ļ�"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: �����ڽű��ļ���ʹ�� :loadkeymap "
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr ""
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " �ؼ��ֲ�ȫ (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " ���в�ȫ (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " �ļ�����ȫ (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " Tag ��ȫ (^]^N^P)"
-
-#: ../edit.c:88
-#, fuzzy
-msgid " Path pattern completion (^N^P)"
-msgstr " ·��ģʽ��ȫ (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " ���岹ȫ (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Dictionary ��ȫ (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Thesaurus ��ȫ (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " �����в�ȫ (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " �û��Զ��岹ȫ (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " ȫ�ܲ�ȫ (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ƴд���� (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " �ؼ��־ֲ���ȫ (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�ѵ������β"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr ""
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr ""
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "ѡ�� 'dictionary' Ϊ��"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "ѡ�� 'thesaurus' Ϊ��"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "����ɨ�� dictionary: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (����) Scroll (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�滻) Scroll (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "����ɨ��: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "ɨ���ǩ."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " ����"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- ������..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "�ص����"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "��һ�еĴ�"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "Ψһƥ��"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "ƥ�� %d / %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "ƥ�� %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: :let �г����쳣�ַ�"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: List ����������Χ: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: δ����ı���: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ȱ�� ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �IJ��������� List"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �IJ��������� List ���� Dictionary"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Dictionary �ļ�����Ϊ��"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: ��Ҫ List"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ��Ҫ Dictionary"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary �в����ڼ�: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ���� %s �Ѵ��ڣ���� ! ǿ���滻"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Dictionary ���Ѵ���"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: ��Ҫ Funcref"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: %s= �ı������Ͳ���ȷ"
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: δ֪�ĺ���: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ��Ч�ı�����: %s"
-
-#: ../eval.c:157
-#, fuzzy
-msgid "E806: using Float as a String"
-msgstr "E730: �� List �� String ʹ��"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: Ŀ��� List ������"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: Ŀ��� List ������"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "������������ ;"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: �޷��г� %s �ı���"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ֻ������ List �� Dictionary"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] ���������"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ��Ҫһ�� List ֵ"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: List ֵ�����Ŀ���"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: List ֵû���㹻�����"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: :for ��ȱ�� \"in\""
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ȱ������: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: �޴˱���: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: (un)lock �ı���Ƕ�׹���"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: '?' ��ȱ�� ':'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: ֻ�ܱȽ� List �� List"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: �� List ���IJ���"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: ֻ�ܱȽ� Dictionary �� Dictionary"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: �� Dictionary ���IJ���"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ֻ�ܱȽ� Funcref �� Funcref"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: �� Funcrefs ���IJ���"
-
-#: ../eval.c:4277
-#, fuzzy
-msgid "E804: Cannot use '%' with Float"
-msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ȱ�� ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: ��������һ�� Funcref"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: ȱ��ѡ������: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: δ֪��ѡ��: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ȱ������: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ȱ������: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: List ��ȱ�ٶ���: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: List ȱ�ٽ����� ']': %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Dictionary ��ȱ��ð��: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Dictionary �г����ظ��ļ�: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Dictionary ��ȱ�ٶ���: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Dictionary ȱ�ٽ����� '}': %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: ����Ƕ�׹����޷���ʾ"
-
-#: ../eval.c:7188
-#, fuzzy, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:7190
-#, fuzzy, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:7377
-#, fuzzy, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E130: δ֪�ĺ���: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ���� %s �IJ���̫��"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ������ script ��������ʹ��: %s"
-
-#: ../eval.c:7391
-#, fuzzy, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E720: Dictionary ��ȱ��ð��: %s"
-
-#: ../eval.c:7453
-#, fuzzy
-msgid "E808: Number or Float required"
-msgstr "E521: = ������Ҫ����"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "-c ����"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ��������"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ֻ���ڲ���ģʽ��ʹ��"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "ȷ��(&O)"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ���Ѵ���: %s"
-
-#: ../eval.c:8692
-#, fuzzy
-msgid "extend() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "-c ����"
-
-#: ../eval.c:8916
-#, fuzzy
-msgid "filter() argument"
-msgstr "-c ����"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: δ֪�ĺ���: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() �ĵ��ô������� inputsave()"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "-c ����"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �������ķ�Χ"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() ��������Ч"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ������"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ��ʼֵ����ֵֹ��"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<��>"
-
-#: ../eval.c:12282
-#, fuzzy
-msgid "remove() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �������ӹ���(ѭ����)"
-
-#: ../eval.c:12593
-#, fuzzy
-msgid "reverse() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "sort() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Sort �ȽϺ���ʧ��"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Sort �ȽϺ���ʧ��"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(��Ч)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: д��ʱ�ļ�����"
-
-#: ../eval.c:16159
-#, fuzzy
-msgid "E805: Using a Float as a Number"
-msgstr "E745: �� List ������ʹ��"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: �� Funcref ������ʹ��"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: �� List ������ʹ��"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: �� Dictionary ������ʹ��"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: �� Funcref �� String ʹ��"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: �� List �� String ʹ��"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: �� Dictionary �� String ʹ��"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �������Ͳ�ƥ��: %s"
-
-#: ../eval.c:16705
-#, fuzzy, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E738: �޷��г� %s �ı���"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Funcref �����������Դ�д��ĸ��ͷ: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �����������к�������ͻ: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: ֵ������: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "δ֪"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: �޷��ı� %s ��ֵ"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ����Ƕ�׹����޷�����"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ���� %s �����"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: ȱ�� '(': %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: �����趨 IC ֵ"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: ���IJ���: %s"
-
-#: ../eval.c:17323
-#, fuzzy, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E125: ���IJ���: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: ȱ�� :endfunction"
-
-#: ../eval.c:17537
-#, fuzzy, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E746: ��������ű��ļ�����ƥ��: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���� %s ����ʹ���У��������¶���"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ��������ű��ļ�����ƥ��: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: ��Ҫ������"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �޷�ɾ������ %s: ����ʹ����"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ����������ȳ��� 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "���� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s ����ֹ"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s ���� #%<PRId64> "
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ���� %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "�� %s ���"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return ���ں�����"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ȫ�ֱ���:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t����޸��� "
-
-#: ../eval.c:19272
-#, fuzzy
-msgid "No old files"
-msgstr "û�а����ļ�"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  ʮ������ %02x,  �˽��� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, ʮ������ %04x, �˽��� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, ʮ������ %08x, �˽��� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: �����ƶ���������"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "�ƶ��� 1 ��"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "�ƶ��� %<PRId64> ��"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "������ %<PRId64> ��"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[���޸ĵ���δ����]\n"
-
-# bad to translate
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s ���: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ������࣬�����ļ���ʣ�ಿ��"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "��ȡ viminfo �ļ� \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ��Ϣ"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " ���"
-
-#: ../ex_cmds.c:1462
-#, fuzzy
-msgid " oldfiles"
-msgstr "û�а����ļ�"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ʧ��"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo �ļ�����д��: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: �޷�д�� viminfo �ļ� %s��"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "д�� viminfo �ļ� \"%s\""
-
-# do not translate to avoid writing Chinese in files
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, fuzzy, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# ��� viminfo �ļ����� Vim %s ���ɵġ�\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:1722
-#, fuzzy
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ���Ҫ�����޸����ر�С�ģ�\n"
-"\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:1723
-#, fuzzy
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' �ڴ��ļ�����ʱ��ֵ\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "��Ч�������ַ�"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "Ҫд�벿���ļ���"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ��ʹ�� ! ��д�벿�ֻ�����"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "�����Ѵ��ڵ��ļ� \"%s\" ��"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "�����ļ� \"%s\" �Ѵ��ڣ�ȷʵҪ������"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: �����ļ��Ѵ���: %s (:silent! ǿ��ִ��)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: ������ %<PRId64> û���ļ���"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: �ļ�δд��: д�뱻 'write' ѡ�����"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" ���趨 'readonly' ѡ�\n"
-"ȷʵҪ������"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-
-#: ../ex_cmds.c:2451
-#, fuzzy, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "ֻ�� (��� ! ǿ��ִ��)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: �Զ����������ɾ�����»����� %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z �����ܷ����ֵIJ���"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim �н�ֹʹ�� shell ����"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: �������ʽ��������ĸ���ֽ�"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "�滻Ϊ %s (y/n/a/q/l/^E/^Y)��"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(���ж�) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1 ��ƥ�䣬"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1 ���滻��"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> ��ƥ�䣬"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> ���滻��"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr "�� 1 ��"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr "�� %<PRId64> ��"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ���ܵݹ�ִ��"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global ȱ���������ʽ"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "ÿ�ж�ƥ�����ʽ: %s"
-
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
-msgid "Pattern not found: %s"
-msgstr "�Ҳ���ģʽ"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:4587
-#, fuzzy
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ������滻�ַ���:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: ��Ҫ�ţ�"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ��Ǹ��û�� '%s' �� %s ��˵��"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: ��Ǹ��û�� %s ��˵��"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "��Ǹ���Ҳ��������ļ� \"%s\""
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ����Ŀ¼: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: �޷��򿪲�д�� %s"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �޷��򿪲���ȡ %s"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ��һ�������л���˶��ְ����ļ�����: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Tag \"%s\" ���ļ� %s/%s ���ظ�����"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: δ֪�� sign ����: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: ȱ�� sign ����"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: Signs �������"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ���� sign ����: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: δ֪�� sign: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: ȱ�� sign ��"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ��Ч�Ļ�������: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ���� sign ID: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (��֧��)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[��ɾ��]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�������ģʽ������ \"cont\" �������С�"
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�� %<PRId64> ��: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "����: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "�ϵ� \"%s%s\" �� %<PRId64> ��"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �Ҳ����ϵ�: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "û�ж���ϵ�"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �� %<PRId64> ��"
-
-#: ../ex_cmds2.c:942
-#, fuzzy
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ����ʹ�� :profile start <fname>"
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "���ı䱣�浽 \"%s\" ��"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "���"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ������ \"%s\" ���޸ĵ���δ����"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "����: ����ؽ��������������� (�����Զ�����)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: ֻ��һ���ļ��ɱ༭"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: �޷��л������ǵ�һ���ļ�"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: �޷��л����������һ���ļ�"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ��֧�ֱ�����: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "���ڲ��� \"%s\"���� \"%s\" ��"
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "���ڲ��� \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "����ִ��Ŀ¼: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "����ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�� %<PRId64> ��: ����ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�� %<PRId64> ��: ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "����ִ�� %s"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "modeline"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ����"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ����"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "��������"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr ""
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ����: ������зָ��������������� ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: �ڽű��ļ���ʹ���� :scriptencoding"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: �ڽű��ļ���ʹ���� :finish"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "��ǰ�� %s����: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �����趨����Ϊ \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "���� Ex ģʽ������ \"visual\" �ص�����ģʽ��"
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: �ѵ��ļ�ĩβ"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: ����ݹ��������"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: �쳣û�б�����: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "�ű��ļ�����"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "��������"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ��ȷ�����û��Զ�������"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: ���DZ༭��������"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: ʹ��������ķ�Χ"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "ʹ��������ķ�Χ��ȷ��������"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: ��ʹ�� w �� w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: ��Ǹ�������ڴ˰汾�в�����"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: ֻ����һ���ļ���"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "���� 1 ���ļ�δ�༭��ȷʵҪ�˳���"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "���� %d ���ļ�δ�༭��ȷʵҪ�˳���"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: ���� 1 ���ļ�δ�༭"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: ���� %<PRId64> ���ļ�δ�༭"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: �����Ѵ���: ��� ! ǿ���滻"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    ����        ���� ��Χ  ��ȫ      ����      "
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "�Ҳ����û��Զ�������"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: û��ָ������"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: ���IJ�������"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ����ָ�����μ���"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: ��Ч�ļ���Ĭ��ֵ"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete ��Ҫ����"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ��������: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: ����������"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �û��Զ�����������Դ�д��ĸ��ͷ"
-
-#: ../ex_docmd.c:4696
-#, fuzzy
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E464: ��ȷ�����û��Զ�������"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: û������û��Զ�������: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ��Ч�IJ�ȫ����: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: ֻ�� custom ��ȫ����������"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Custom ��ȫ��Ҫһ����������"
-
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �Ҳ�����ɫ���� %s"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "���ã�Vim �û���"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: ���ܹر����һ�� tab ҳ"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "�Ѿ�ֻʣһ�� tab ҳ��"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "Tab ҳ %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "�޽����ļ�"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: ���ܸı�Ŀ¼�����������޸� (��� ! ǿ��ִ��)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: ǰһ��Ŀ¼������"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: δ֪"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize ��Ҫ�������ֲ���"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: �ڴ�ƽ̨�ϲ��ܻ�ô���λ��"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos ��Ҫ�������ֲ���"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: �޷�����Ŀ¼: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" �Ѵ��� (��� ! ǿ��ִ��)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �޷��򿪲�д�� \"%s\""
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ����������һ����ĸ������/������"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �ݹ��������"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: û�������滻 '#' �Ľ����ļ���"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: û�������滻 \"<afile>\" ���Զ������ļ���"
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: û�������滻 \"<abuf>\" ���Զ����������"
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: û�������滻 \"<amatch>\" ���Զ�����ƥ����"
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
-
-#: ../ex_docmd.c:7876
-#, fuzzy
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: '%' �� '#' Ϊ���ļ�����ֻ������ \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: ���Ϊ���ַ���"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: ���� :throw ǰ׺Ϊ 'Vim' ���쳣"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "�׳��쳣: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "����쳣: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "�����쳣: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s���� %<PRId64> ��"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "�����쳣: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr ""
-
-#: ../ex_eval.c:679
-#, fuzzy, c-format
-msgid "%s resumed"
-msgstr " �ѷ���\n"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr ""
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "�쳣"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "������ж�"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "����"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "�ж�"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: :if Ƕ�ײ�������"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: ��� :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif �� :else ����"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: :while/:for Ƕ�ײ�������"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue ȱ�ٶ�Ӧ�� :while �� :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break ȱ�ٶ�Ӧ�� :while �� :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: :while �� :endfor ��β"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: :for �� :endwhile ��β"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: :try Ƕ�ײ�������"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch ȱ�ٶ�Ӧ�� :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch �� :finally ����"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally ȱ�ٶ�Ӧ�� :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: ��� :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry ȱ�ٶ�Ӧ�� :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction ���ں�����"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Ŀǰ�������༭��Ļ�����"
-
-#: ../ex_getln.c:1656
-#, fuzzy
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E788: Ŀǰ�������༭��Ļ�����"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "tag ��"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " ���� �ļ�\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "ѡ�� 'history' Ϊ��"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5046
-#, fuzzy, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ��ʷ��¼ (���µ���):\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5047
-#, fuzzy
-msgid "Command Line"
-msgstr "������"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5048
-#, fuzzy
-msgid "Search String"
-msgstr "�����ַ���"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5049
-#, fuzzy
-msgid "Expression"
-msgstr "����ʽ"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5050
-#, fuzzy
-msgid "Input Line"
-msgstr "������"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ���������"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: ����ڻ򻺳����ѱ�ɾ��"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr ""
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr "E343: ��Ч��·��: '**[number]' ������·��ĩβ���ߺ���� '%s'��"
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ���Ҳ���Ŀ¼ \"%s\""
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: ��·�����Ҳ����ļ� \"%s\""
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: ��·�����Ҳ���������ļ� \"%s\""
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: ��·�����Ҳ���������ļ� \"%s\""
-
-#: ../fileio.c:137
-#, fuzzy
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "��Ч���ļ���"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "��Ŀ¼"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "�����ļ�"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[���ļ�]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[��Ŀ¼]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[�ļ�����]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[Ȩ�޲���]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre �Զ�������ļ����ɶ�"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre �Զ���������ı䵱ǰ������"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: �ӱ�׼�����ȡ...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת�������ļ����ɶ�"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[socket]"
-
-#. or character special
-#: ../fileio.c:1801
-#, fuzzy
-msgid "[character special]"
-msgstr "1 ���ַ�"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[ȱ�� CR]'"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[���зָ�]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[δת��]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[��ת��]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[�� %<PRId64> ��ת������]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[�� %<PRId64> ����Ч�ַ�]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[������]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "�Ҳ�������ת������ʱ�ļ�"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "'charconvert' ת��ʧ��"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "�޷���ȡ 'charconvert' �����"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: �Ҳ��� acwrite ��������Ӧ���Զ�����"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: �Զ�����ɾ�����ͷ���Ҫд��Ļ�����"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: �Զ���������ظı�������"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "�����ļ����д���豸"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "ֻ�� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �޷�д�뱸���ļ� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: �رձ����ļ����� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �޷���ȡ�ļ��Թ����� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �޷����������ļ� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �޷����ɱ����ļ� (��� ! ǿ��ִ��)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: �޷�ת�� (��� ! ǿ�Ʋ�ת��д��)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �޷��򿪲�д�������ļ�"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �޷��򿪲�д���ļ�"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: ͬ��ʧ��"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �ر�ʧ��"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
-
-#: ../fileio.c:3441
-#, fuzzy, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: д����� (�ļ�ϵͳ������)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " ת������"
-
-#: ../fileio.c:3509
-#, fuzzy, c-format
-msgid " in line %<PRId64>;"
-msgstr "�� %<PRId64> ��"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[�豸]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[��]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " ��׷��"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ���"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode: �޷�����ԭʼ�ļ�"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patchmode: �޷����ɿյ�ԭʼ�ļ�"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: �޷�ɾ�������ļ�"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"����: ԭʼ�ļ������Ѷ�ʧ����\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "���ļ���ȷд��ǰ�����˳��༭����"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[dos ��ʽ]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[mac ��ʽ]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[unix ��ʽ]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 �У�"
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> �У�"
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 ���ַ�"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ���ַ�"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[���һ�в�����]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "����: ���ļ��Զ�����ѷ����䶯������"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "ȷʵҪд����"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: д���ļ� \"%s\" ����"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: �ر��ļ� \"%s\" ����"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: ��ȡ�ļ� \"%s\" ����"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell �Զ�����ɾ���˻�����"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: �ļ� \"%s\" �Ѿ�������"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr "W12: ����: �ļ� \"%s\" �ѱ䶯�������� Vim �еĻ�����Ҳ�ѱ䶯"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "��һ��˵����� \":help W12\""
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ����: �༭��ʼ���ļ� \"%s\" �ѱ䶯"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "��һ��˵����� \":help W11\""
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ����: �༭��ʼ���ļ� \"%s\" ��ģʽ�ѱ䶯"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "��һ��˵����� \":help W16\""
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ����: �༭��ʼ���ļ� \"%s\" �ѱ�����"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "����"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"ȷ��(&O)\n"
-"�����ļ�(&L)"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �޷�Ϊ���¼��� \"%s\" ��׼��"
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: �޷����¼��� \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--��ɾ��--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr ""
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: �޴���: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ��������Ч�ַ�: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: �޴��¼�: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: �޴�����¼�: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- �Զ����� ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: ��Ч�Ļ������� "
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ���ܶ������¼�ִ���Զ�����"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "û��ƥ����Զ�����"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: �Զ�����Ƕ�ײ�������"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s �Զ����� \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "ִ�� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "�Զ����� %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: ȱ�� {��"
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: ȱ�� }��"
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: �Ҳ����۵�"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: �����ڵ�ǰ�� 'foldmethod' �´����۵�"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: �����ڵ�ǰ�� 'foldmethod' ��ɾ���۵�"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--���۵� %3ld ��"
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: ���ӵ��Ѷ���������"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: �ݹ�ӳ��"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: ȫ����д %s �Ѵ���"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: ȫ��ӳ�� %s �Ѵ���"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: ��д %s �Ѵ���"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: ӳ�� %s �Ѵ���"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "�Ҳ�����д"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "�Ҳ���ӳ��"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ��Ч��ģʽ"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--������������--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: �����ֹ"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ��Ҫ����"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ����Ӧ�ø��� /��? �� &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: �������д�������Ч��<CR> ִ�У�CTRL-C �˳�"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: ��ǰĿ¼�е� exrc/vimrc �� tag �����в�����������"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: ȱ�� :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: ȱ�� :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱ�� :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: ȱ�� :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile ȱ�ٶ�Ӧ�� :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ȱ�ٶ�Ӧ�� :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ļ��Ѵ��� (��� ! ǿ��ִ��)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ����ִ��ʧ��"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �ڲ�����"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "���ж�"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ��Ч�ĵ�ַ"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ���IJ���"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ���IJ���: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ��Ч�ı���ʽ: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ��Ч�ķ�Χ"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ��������"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" ��Ŀ¼"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ��Ч�Ĺ�����С"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ���ú����� \"%s()\" ʧ��"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ��ǵ��к���Ч"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: û���趨���"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: �����޸ģ���Ϊѡ�� 'modifiable' �ǹص�"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: �ű�Ƕ�׹���"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: û�н����ļ�"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: û�������д"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ����ʹ�� \"!\""
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: �޷�ʹ��ͼ�ν���: ����ʱû������"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: û���������Ⱥ����: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: û�в��������"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: û��ǰһ��������"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: û�����ӳ��"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: û��ƥ��"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: û��ƥ��: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: û���ļ���"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: û��ǰһ���滻�������ʽ"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: û��ǰһ������"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: û��ǰһ���������ʽ"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: ����ʹ�÷�Χ"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: û���㹻�Ŀռ�"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �޷������ļ� %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �޷���ȡ��ʱ�ļ���"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �޷����ļ� %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �޷���ȡ�ļ� %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ���޸ĵ���δ���� (���� ! ǿ��ִ��)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[���޸ĵ���δ����]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: �յIJ���"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: �˴���Ҫ����"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �޷��򿪴����ļ� %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �ڴ治�㣡"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�Ҳ���ģʽ"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �Ҳ���ģʽ: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: ��������������"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �޷��ص�ǰһ��Ŀ¼"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: û�д���"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: û�� location �б�"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ���𻵵�ƥ���ַ���"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ���𻵵��������ʽ����"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: ���趨ѡ�� 'readonly' (��� ! ǿ��ִ��)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ���ܸı�ֻ������ \"%s\""
-
-#: ../globals.h:1075
-#, fuzzy, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E46: ������ sandbox ���趨����: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ��ȡ�����ļ�ʧ��"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �������� sandbox ��ʹ��"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �������ڴ�ʹ��"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ��֧���趨��Ļģʽ"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ��Ч�Ĺ�����С"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: ѡ�� 'shell' Ϊ��"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: �޷���ȡ sign ���ݣ�"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: �����ļ��رմ���"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: tag ��ջΪ��"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ���������"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ���ֹ���"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ ����"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �ļ�������"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: �����β���ַ�"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: δ֪�ı��"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �޷���չͨ���"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ������ 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ������ 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: ����"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "������"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: �ڽű�������ʹ���� <SID>"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �ڲ�����: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ����ʽ���ڴ�ʹ�ó��� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �յĻ�����"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ��Ч����������ʽ��ָ���"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: �ļ�������һ���������б�����"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: û���趨ѡ�� '%s'"
-
-#: ../globals.h:1111
-#, fuzzy
-msgid "E850: Invalid register name"
-msgstr "E354: ��Ч�ļĴ�����: '%s'"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: ȱ��ð��"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: ���IJ���"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: Ӧ��Ҫ������"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "�� %d ҳ"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "û��Ҫ��ӡ������"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "���ڴ�ӡ�� %d ҳ (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr "���� %d / %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "�Ѵ�ӡ: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "��ӡ��ֹ"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: д�� PostScript ����ļ�����"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: �޷����ļ� \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �޷���ȡ PostScript ��Դ�ļ� \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: �ļ� \"%s\" ���� PostScript ��Դ�ļ�"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: �ļ� \"%s\" ������֧�ֵ� PostScript ��Դ�ļ�"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" ��Դ�ļ��汾����ȷ"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: �����ݵĶ��ֽڱ�����ַ�����"
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset �ڶ��ֽڱ����²���Ϊ�ա�"
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: û��ָ�����ֽڴ�ӡ��Ĭ�����塣"
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: �޷��� PostScript ����ļ�"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: �޷����ļ� \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"prolog.ps\""
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"cidfont.ps\""
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"%s.ps\""
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: �޷�ת������ӡ���� \"%s\""
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "���͵���ӡ������"
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: �޷���ӡ PostScript �ļ�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "��ӡ�����ѱ����͡�"
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "����һ���µ����ݿ�"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "��ѯһ��ģʽ"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "��ʾ����Ϣ"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "����һ������"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "������������"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "��ʾ����"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �÷�: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "��� cscope ���֧�ַָ�ڡ�\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: �÷�: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �Ҳ��� tag"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) ����: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s ����Ŀ¼����Ч�� cscope ���ݿ�"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "������ cscope ���ݿ� %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: ��ȡ cscope ���� %<PRId64> ����"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: δ֪�� cscope ��������"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: �޷����� cscope �ܵ�"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: �޷��� cscope ���� fork"
-
-#: ../if_cscope.c:849
-#, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection ִ��ʧ��"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection ִ��ʧ��"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen to_fp ʧ��"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen fr_fp ʧ��"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: �޷����� cscope ����"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: û�� cscope ����"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: cscopequickfix ��־ %c �� %c ��Ч"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: cscope ��ѯ %s %s û���ҵ�ƥ��Ľ��"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "cscope ����:\n"
-
-#: ../if_cscope.c:1150
-#, fuzzy, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %-30s (�÷�: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: �ظ��� cscope ���ݿ�δ������"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: �Ҳ��� cscope ���� %s"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "cscope ���� %s �ѹر�"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: cs_manage_matches ���ش���"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Cscope tag: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   ��  "
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "�ļ��� / ������ / ��\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: Cscope ����: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "���� cscope ���ݿ��ѱ�����"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "û�� cscope ����\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ���ݿ���                            prepend path\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "δ֪��ѡ�����"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�༭��������"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "ȱ�ٱ�Ҫ�IJ���"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "ѡ��������������Ч"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\"��\"-c command\" �� \"--cmd command\" ��������"
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "���IJ���"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "���� %d ���ļ��ȴ��༭\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "��ͼ�ٴδ򿪽ű��ļ�: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�޷��򿪲���ȡ: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "�޷��򿪲�����ű�: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ����: ������ǵ��ն�(��Ļ)\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ����: ���벻�������ն�(����)\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "pre-vimrc ������"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �޷���ȡ \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"������Ϣ���: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[�ļ� ..]       �༭ָ�����ļ�"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               �ӱ�׼����(stdin)��ȡ�ı�"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �༭ tag ���崦���ļ�"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �༭��һ�����������ļ�"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"�÷�:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [����] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"  ��:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"����:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t�����Ժ�ֻ���ļ���"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t����չͨ���"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t����(������)ģʽ (ֻ���� \"ex\" һ��ʹ��)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t����ģʽ (ͬ \"evim\"����ģʽ)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tֻ��ģʽ (ͬ \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t����ģʽ (ͬ \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t�����޸�(д���ļ�)"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t�ı������޸�"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t������ģʽ"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tLisp ģʽ"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t���ݴ�ͳ�� Vi: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t����ȫ���ݴ�ͳ�� Vi: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t����ģʽ"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t��ʹ�ý����ļ���ֻʹ���ڴ�"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�г������ļ����˳�"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (���ļ���)\t\t�ָ������ĻỰ"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tͬ -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t�� Arabic ģʽ����"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t�� Hebrew ģʽ����"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t�� Farsi ģʽ����"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�趨�ն�����Ϊ <terminal>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹ�� <vimrc> ����κ� .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t������ plugin �ű�"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-P[N]\t\t�� N ����ǩҳ (Ĭ��ֵ: ÿ���ļ�һ��)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t�� N ������ (Ĭ��ֵ: ÿ���ļ�һ��)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o ����ֱ�ָ�"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�����������ļ�ĩβ"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t������������ <lnum> ��"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t�����κ� vimrc �ļ�ǰִ�� <command>"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <command>\t\t���ص�һ���ļ���ִ�� <command>"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t���ص�һ���ļ���ִ���ļ� <session>"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t���ļ� <scriptin> ��������ģʽ������"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���������������׷�ӵ��ļ� <scriptout>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���������������д�뵽�ļ� <scriptout>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹ�� <viminfo> ȡ�� .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  ��  --help\t��ӡ����(����Ϣ)���˳�"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "û���趨���"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: û��ƥ�� \"%s\" �ı��"
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"���   ��   �� �ļ�/�ı�"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" ��ת   ��   �� �ļ�/�ı�"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"  �ı�   ��   �� �ı�"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# �ļ����:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ��ת�б� (���µ���):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# �ļ��ڵı����ʷ��¼ (���µ���):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "ȱ�� '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: �������"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: �����ļ���ȡ��λ����"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: �����ļ���ȡ����"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: �����ļ�д�붨λ����"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: �����ļ�д�����"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �����ļ��Ѵ��� (�������ӹ�����)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �Ҳ����� 0��"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �Ҳ����� 1��"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �Ҳ����� 2��"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: �ޣ������ļ������ˣ�����"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: �޷������������ļ�"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: �޷��� \"%s\" �Ľ����ļ����ָ���������"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): �Ҳ����� 0��"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: �Ҳ��� %s �Ľ����ļ�"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "������Ҫʹ�õĽ����ļ���� (0 �˳�): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: �޷��� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "�޷���ȡ�� 0: "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"������û�����κ��޸Ļ��� Vim �����������½����ļ���"
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " �����ڸð汾�� Vim ��ʹ�á�\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "ʹ�� Vim 3.0��\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s ������������ Vim �����ļ�"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " ��������̨������ʹ�á�\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���ļ������� "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-"��\n"
-"���Ǵ��ļ����𻵡�"
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "ʹ�ý����ļ� \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "ԭʼ�ļ� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ����: ԭʼ�ļ������ѱ��޸�"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: �޷��� %s ��ȡ�� 1"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1065
-#, fuzzy
-msgid "???MANY LINES MISSING"
-msgstr "???ȱ����̫����"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1076
-#, fuzzy
-msgid "???LINE COUNT WRONG"
-msgstr "???��������"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1082
-#, fuzzy
-msgid "???EMPTY BLOCK"
-msgstr "???�յĿ�"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1103
-#, fuzzy
-msgid "???LINES MISSING"
-msgstr "???ȱ����һЩ��"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ���)"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1133
-#, fuzzy
-msgid "???BLOCK MISSING"
-msgstr "???ȱ�ٿ�"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1147
-#, fuzzy
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �����ﵽ ???END ���п����ѻ���"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1164
-#, fuzzy
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? �����ﵽ ???END ���п����ѱ�����/ɾ����"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1181
-#, fuzzy
-msgid "???END"
-msgstr "???END"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: �ָ��ѱ��ж�"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: �ָ�ʱ����������ע�⿪ͷΪ ??? ����"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "������Ϣ��� \":help E312\""
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "�ָ���ϡ���ȷ��һ��������"
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(�������Ҫ������ļ�����Ϊ����ļ���\n"
-
-#: ../memline.c:1252
-#, fuzzy
-msgid "and run diff with the original file to check for changes)"
-msgstr "������ diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr ""
-
-#: ../memline.c:1255
-#, fuzzy
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"Ȼ��� .swp �ļ�ɾ����\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "�ҵ������ļ�:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   λ�ڵ�ǰĿ¼:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   ʹ��ָ��������:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   λ��Ŀ¼ "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- �� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "            ������: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "    ����: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              ����: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [���� Vim �汾 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [������ Vim �����ļ�]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "            �ļ���: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"            �޸Ĺ�: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "��"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "��"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"            �û���: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "      ������: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"            ������: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"           ���� ID: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (��������)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [�����ڱ�����ʹ��]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�޷���ȡ]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�޷���]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �޷�������û�н����ļ�"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "�ļ��ѱ���"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: ����ʧ��"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ���� lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �Ҳ����� %<PRId64> ��"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: ָ��� id ���� 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx Ӧ���� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: ������̫��Ŀ飿"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: ָ��� id ���� 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "ɾ���˿� 1��"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �Ҳ����� %<PRId64> ��"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: ָ��� id ����"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count ��"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: �кų�����Χ: %<PRId64> ������β"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �� %<PRId64> ��������"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "��ջ��С����"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: ָ��� id ���� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: \"%s\" �������ӳ���ѭ��"
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: ע��"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"���ֽ����ļ� \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "���ڴ��ļ� \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      �Ƚ����ļ��£�\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) ��һ���������Ҳ�ڱ༭ͬһ���ļ���\n"
-"    ������������޸�ʱ��ע�����ͬһ���ļ�����������ͬ�İ汾��\n"
-"\n"
-
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    �˳�����С�ĵؼ�����\n"
-
-#: ../memline.c:3246
-#, fuzzy
-msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) �ϴα༭���ļ�ʱ������\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ��������������� \":recover\" �� \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    �ָ��޸ĵ����� (��� \":help recovery\")��\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    ������Ѿ������˻ָ�����ɾ�������ļ� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    �Ա����ٿ�������Ϣ��\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "�����ļ� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" �Ѵ��ڣ�"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - ע��"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "�����ļ��Ѵ��ڣ�"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"��ֻ����ʽ��(&O)\n"
-"ֱ�ӱ༭(&E)\n"
-"�ָ�(&R)\n"
-"�˳�(&Q)\n"
-"��ֹ(&A)"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"��ֻ����ʽ��(&O)\n"
-"ֱ�ӱ༭(&E)\n"
-"�ָ�(&R)\n"
-"ɾ�������ļ�(&D)\n"
-"�˳�(&Q)\n"
-"��ֹ(&A)"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: �ҵ�̫�ཻ���ļ�"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �ڴ治�㣡(���� %<PRIu64> �ֽ�)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: �˵����ij����·�������Ӳ˵�"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: �˵�ֻ������ģʽ�д���"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: û�в˵� \"%s\""
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-#, fuzzy
-msgid "E792: Empty menu name"
-msgstr "E749: �յĻ�����"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: �˵�·������ָ���Ӳ˵�"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ���ܰѲ˵���ֱ�Ӽӵ��˵�����"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: �ָ��߲����Dz˵�·����һ����"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- �˵� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �˵�·������ָ��˵���"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: �Ҳ����˵�: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽ�в˵�δ����"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: �˵�·������ָ���Ӳ˵�"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: �Ҳ����˵� - ����˵�����"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "���� %s ʱ��������:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "�� %4ld ��:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ��Ч�ļĴ�����: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "����������Ϣά����: Yuheng Xie <elephant@linux.net.cn>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "���ж�: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "�밴 ENTER �������������"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �� %<PRId64> ��"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- ���� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " �ո�/d/j: ��Ļ/ҳ/�� �·���b/u/k: �Ϸ���q: �˳� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "����"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"��(&Y)\n"
-"��(&N)"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"��(&N)\n"
-"ȡ��(&C)"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"��(&N)\n"
-"ȫ������(&A)\n"
-"ȫ������(&D)\n"
-"ȡ��(&C)"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: printf() �IJ�������"
-
-#: ../message.c:3119
-#, fuzzy
-msgid "E807: Expected Float argument for printf()"
-msgstr "E766: printf() �IJ�������"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: printf() �IJ�������"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ����: �����޸�һ��ֻ���ļ�"
-
-#: ../misc1.c:2537
-#, fuzzy
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "���������ֻ������ (<Enter> ȡ��): "
-
-#: ../misc1.c:2539
-#, fuzzy
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "��ѡ������ (<Enter> ȡ��): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "���� 1 ��"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "���� 1 ��"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "���� %<PRId64> ��"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "���� %<PRId64> ��"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (���ж�)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "Beep!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "���� shell ִ��: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: ��괦û��ʶ����"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' ��"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "����: ����ն˲�����ʾ����"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: ��괦û���ַ���"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: �����ڵ�ǰ�� 'foldmethod' ��ɾ�� fold"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: �ı��б�Ϊ��"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: ���ڸı��б��Ŀ�ʼ��"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: ���ڸı��б���ĩβ��"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "����  :quit<Enter>  �˳� Vim"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 �� %s �� 1 ��"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 �� %s �� %d ��"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �� %s �� 1 ��"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �� %s �� %d ��"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "���� %<PRId64> ���� "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "������ 1 �� "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "������ %<PRId64> �� "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: û��ǰһ��ʹ�õļĴ���"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "�޷����ƣ���Ϊɾ��"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "�ı��� 1 ��"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "�ı��� %<PRId64> ��"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "������ 1 �еĿ�"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "������ 1 ��"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "������ %<PRId64> �еĿ�"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "������ %<PRId64> ��"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: �Ĵ��� %s ��û�ж���"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- �Ĵ��� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "��Ч�ļĴ�����"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# �Ĵ���:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: δ֪�ļĴ������� %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"ѡ���� %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> ����; %<PRId64>/"
-"%<PRId64> ���ֽ�"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"ѡ���� %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> ����; %<PRId64>/"
-"%<PRId64> ���ַ�; %<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s ��; �� %<PRId64>/%<PRId64> ��; �� %<PRId64>/%<PRId64> ����; �� "
-"%<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s ��; �� %<PRId64>/%<PRId64> ��; �� %<PRId64>/%<PRId64> ����; �� "
-"%<PRId64>/%<PRId64> ���ַ�; �� %<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr ""
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr ""
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "��л��ѡ�� Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: δ֪��ѡ��"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: ��֧�ָ�ѡ��"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: �������� modeline ��ʹ��"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr ""
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: = ������Ҫ����"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Termcap �����Ҳ���"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: ��Ч���ַ� <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: �����趨 'term' Ϊ���ַ���"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' �� 'patchmode' ���"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr ""
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr ""
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: ȱ��ð��"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: �ַ�������Ϊ��"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: <%s> ����ȱ������"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: ȱ�ٶ���"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ����ָ��һ�� ' ֵ"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: ����������ʾ�ַ�����ַ�"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: <%c> ��������Ч���ַ�"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: ��Ҫ����"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' ����Ϊ�ջ���� %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: û�н����ı���ʽ����"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: ��Ŀ����"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ���ҵ���"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: Ԥ�������Ѵ���"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabic ��Ҫ UTF-8����ִ�� ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: ������Ҫ %d ��"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: ������Ҫ %d ��"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: δ֪��ѡ��: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, fuzzy, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: = ������Ҫ����"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- �ն˱��� ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- ȫ��ѡ��ֵ ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- �ֲ�ѡ��ֵ ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- ѡ�� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp ����"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': �Ҳ��� %s ��Ӧ���ַ�"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': �ֺź��ж�����ַ�: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�޷�ִ�� shell"
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell �ѷ���"
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-
-# do not translate
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ��·�����Ҳ����ļ� \"%s\""
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: ��ʽ���ַ�������̫�� %%%c "
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: ��ʽ���ַ�����Ӧ�ó��� %%%c "
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: ��ʽ���ַ��������� ]"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: ��ʽ���ַ������в�֧�ֵ� %%%c "
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: ��ʽ���ַ�����ͷ���в���ȷ�� %%%c "
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: ��ʽ���ַ������в���ȷ�� %%%c "
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' δ�趨"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: �Ҳ���Ŀ¼���ƻ��ǿյ�Ŀ¼����"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: û�и������"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d / %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (����ɾ��)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ��ջ�׶�"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: Quickfix ��ջ����"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "�����б� %d / %d���� %d ������"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: �޷�д�룬���趨ѡ�� 'buftype'"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: ȱ���ļ�����ģʽ��Ч"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "�޷����ļ� \"%s\""
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: ���������"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: �˴���Ҫ String ���� List"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: %s%%[] ����������"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ ��ȱ�� ]"
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: ��ƥ��� %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: ��ƥ��� %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: ��ƥ��� %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: �˴������� \\z("
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: �˴������� \\z1 ��"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ ��ȱ�� ]"
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: �յ� %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: ģʽ̫��"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: ̫�� \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: ̫�� %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: ��ƥ��� \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ ��������Ч���ַ�"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ̫�ิ�ӵ� %s{...}s"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Ƕ�׵� %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Ƕ�׵� %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: ����ȷ��ʹ�� \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c ǰ��������"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: ��Ч�Ļ���"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: \\z ��������Ч���ַ�"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: %s%%[dxouU] ��������Ч���ַ�"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: %s%% ��������Ч���ַ�"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} ���﷨����"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�ⲿ����:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr ""
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
-
-#: ../regexp_nfa.c:2042
-#, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: ̫�� \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
-
-#: ../regexp_nfa.c:6049
-#, fuzzy
-msgid "Could not open temporary log file for writing "
-msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " V-�滻"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " �滻"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ����"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " ����"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (����)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (�滻)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (V-�滻)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " Hebrew"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " Arabic"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (ճ��)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " ����"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " ���� ��"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " ���� ��"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ѡ��"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ѡ�� ��"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ѡ�� ��"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "��¼��"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: ��Ч�IJ����ַ���: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: �Ѳ��ҵ��ļ���ͷ���Ҳ��� %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: �Ѳ��ҵ��ļ���β���Ҳ��� %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: �� ';' ����Ӧ���� '?' �� '/'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (�����ϴ��г�������)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- �����ļ� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "�Ҳ��� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "��·�� ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (���г�)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  �Ҳ���"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "���Ұ����ļ�: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "���Ұ������ļ� %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: ��ǰ��ƥ��"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "���а����ļ������ҵ�"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "û�а����ļ�"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: �Ҳ�������"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: �Ҳ��� pattern"
-
-#: ../search.c:4668
-#, fuzzy
-msgid "Substitute "
-msgstr "1 ���滻��"
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ƴд�ļ���ʽ����"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: �ѽضϵ�ƴд�ļ�"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "%s �� %d �У�����ĺ����ַ�: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "%s �� %d �У�����������̫��: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: �����ļ� FOL��LOW �� UPP �и�ʽ����"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL��LOW �� UPP ���ַ�������Χ"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "ѹ������������"
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ƴд���δ����"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "����: �Ҳ��������б� \"%s.%s.spl\" or \"%s.ascii.spl\""
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "��ȡƴд�ļ� \"%s\""
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: �⿴����������ƴд�ļ�"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: �ɰ汾��ƴд�ļ�����Ҫ����"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Ϊ���߰汾�� Vim ���õ�ƴд�ļ�"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: ƴд�ļ��д��ڲ�֧�ֵĽ�"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "����: ���� %s ��֧��"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "���� %s ת��ʧ�ܣ��� %d ��: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "��֧�� %s �е�ת��: �� %s �� %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "%s �� %d �У�FLAG ��ֵ��Ч: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "%s �� %d �У���ʹ�ñ�־����� FLAG: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4747
-#, fuzzy, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDMIN ֵ: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDWORDMAX ֵ: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDMIN ֵ: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDSYLMAX ֵ: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "%s �� %d �У������ CHECKCOMPOUNDPATTERN ֵ: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr "%s �� %d �У��������ĸ��ӿ��г��ֲ�ͬ����ϱ�־: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��ĸ�����: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"%s �� %d �У������ BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST ʹ"
-"��: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "%s �� %d �У��˴���Ҫ Y �� N: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "%s �� %d �����������: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "%s �� %d �У��˴���Ҫ REP(SAL) ����"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "%s �� %d �У��˴���Ҫ MAP ����"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "%s �� %d �У�MAP �д����ظ����ַ�"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "%s �� %d �У��޷�ʶ����ظ�����: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%s ��ȱ�� FOL/LOW/UPP ��"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "��û�� SYLLABLE �������ʹ���� COMPOUNDSYLMAX"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "̫���ӳ�ǰ׺"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "̫����ϱ�־"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "̫���ӳ�ǰ׺��/����ϱ�־"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "%s ��ȱ�� SOFO%s ��"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "%s ͬʱ���� SQL �� SOFO ��"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "%s �� %d �У���־��������: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "%s �� %d �У���Ч�ı�־: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "%s ��ֵ����һ�� .aff �ļ���ʹ�õ�ֵ����ͬ"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "��ȡ�ֵ��ļ� %s ����"
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: %s ��û�е��ʼ���"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "�� %6d ���� %6d ������ - %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��ĵ���: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "%s �� %d �У��״��ظ��ĵ���: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "���� %d ���ظ��ĵ��ʣ��� %s ��"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "�����˺��з� ASCII �ַ��� %d �����ʣ��� %s ��"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s �� %d �У����ʺ�� /encoding= ���ѱ�����: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��� /regions= ���ѱ�����: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "%s �� %d �У�̫������: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "%s �� %d �У�/ ���ѱ�����: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "%s �� %d �����������: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "%s �� %d �У�����ʶ��ı�־: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "�����˺��з� ASCII �ַ��� %d ������"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "ѹ���� %d/%d ���ڵ㣻ʣ�� %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "��ȡƴд�ļ�����"
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "���� soundfolding����"
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "soundfolding ��ĵ�����: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "��������: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "д�뽨���ļ� %s ����"
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "��������ʱ�ڴ�����: %d �ֽ�"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: ����ļ������ܺ���������"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ���ֻ֧�� 8 ������"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: %s ������Ч�ķ�Χ"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "����: ͬʱָ���� compounding �� NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "д��ƴд�ļ� %s ����"
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "��ɣ�"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' û�� %<PRId64> ��"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "�� %s ��ɾ���˵���"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "�� %s �������˵���"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: ƴд�ļ�֮����ַ�����ͬ"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��Ǹ��û�н���"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��Ǹ��ֻ�� %<PRId64> ������"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "�� \"%.*s\" ����"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ֮ǰû��ƴд�滻"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: �Ҳ���: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: ������������ .sug �ļ�: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr ""
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr ""
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr ""
-
-#: ../spell.c:9305
-#, fuzzy, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E47: ��ȡ�����ļ�ʧ��"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr ""
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "���������û�ж����κ��﷨��"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: ���IJ���: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "C���ע��ͬ����"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "û��ͬ��"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "ͬ����ʼ"
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr "�кų�����Χ"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �﷨ͬ����Ŀ (Syntax sync items) ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"ͬ����:"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �﷨��Ŀ ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "��С"
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "���"
-
-#: ../syntax.c:3513
-#, fuzzy
-msgid "; match "
-msgstr "ƥ�� %d"
-
-#: ../syntax.c:3515
-#, fuzzy
-msgid " line breaks"
-msgstr "����һ��"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ʹ���˲���ȷ�IJ���"
-
-#: ../syntax.c:4096
-#, fuzzy
-msgid "E844: invalid cchar value"
-msgstr "E474: ���IJ���"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹ���˲���ȷ�IJ���"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �Ҳ��� %s �� region item"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: ��Ҫ�ļ�����"
-
-#: ../syntax.c:4221
-#, fuzzy
-msgid "E847: Too many syntax includes"
-msgstr "E77: �ļ�������"
-
-#: ../syntax.c:4303
-#, fuzzy, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E747: ȱ�� ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: ȱ�� '=': %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: syntax region %s �IJ���̫��"
-
-#: ../syntax.c:4870
-#, fuzzy
-msgid "E848: Too many syntax clusters"
-msgstr "E391: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: û��ָ��������"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: �Ҳ����ָ�����: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: '%s' ����Ķ�������ʶ��"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: �﷨ͬ��: �����з���ָ��������"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: ���IJ���: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: ȱ�ٵȺ�: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: �յIJ���: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s �����ڴ˳���"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s �������б���ĵ�һ��"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: ����ȷ������: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ����ȷ�� :syntax ������: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: ���� syncolor.vim ʱ����Ƕ��ѭ��"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: �Ҳ��� highlight group: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ����̫��: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ��������: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: ���趨��, ���� highlight link"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: �����еĵȺ�: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ȱ�ٵȺ�: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ȱ�ٲ���: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ���Ϸ���ֵ: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: �����ǰ����ɫ"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: ����ı�����ɫ"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: �������ɫ���ƻ���ֵ: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: �ն˱���̫��: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: ���IJ���: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ʹ����̫�಻ͬ�ĸ���������"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: �����д��ڲ�����ʾ�ַ�"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: �����к�����Ч�ַ�"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr ""
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: ���� tag ��ջ�ײ�"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: ���� tag ��ջ����"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �ѵ���һ��ƥ��� tag"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �Ҳ��� tag: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "�ļ�\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: ֻ��һ��ƥ��� tag"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �������һ��ƥ��� tag"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "�ļ� \"%s\" ������"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "�ҵ� tag: %d / %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " �����"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  �Բ�ͬ��Сд��ʹ�� tag��"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: �ļ� \"%s\" ������"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # �� tag         ��   ��    �� �ļ�/�ı�"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "���� tag �ļ� %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr ""
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Tag �ļ� \"%s\" ��ʽ����"
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "�ڵ� %<PRId64> �ֽ�֮ǰ"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: Tag �ļ�δ����: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: û�� tag �ļ�"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �Ҳ��� tag ģʽ"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �Ҳ��� tag�����Ų£�"
-
-#: ../tag.c:2797
-#, fuzzy, c-format
-msgid "Duplicate field name: %s"
-msgstr "%s �� %d �У��ظ��ĸ�����: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' δ֪�����õ��ڽ��ն���:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "Ĭ��ֵΪ: '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: �޷��� termcap �ļ�"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: �� terminfo ���Ҳ����ն���"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: �� termcap ���Ҳ����ն���"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap ��û�� \"%s\" ��"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �ն���Ҫ���� \"cm\""
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- �ն˰��� ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: �������˳���...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E787: ����ظı��˻�����"
-
-#: ../undo.c:627
-#, fuzzy, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E212: �޷��򿪲�д���ļ�"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr ""
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr ""
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr ""
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr ""
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr ""
-
-#: ../undo.c:1121
-#, fuzzy, c-format
-msgid "Writing undo file: %s"
-msgstr "д�� viminfo �ļ� \"%s\""
-
-#: ../undo.c:1213
-#, fuzzy, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E297: �����ļ�д�����"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr ""
-
-#: ../undo.c:1292
-#, fuzzy, c-format
-msgid "Reading undo file: %s"
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../undo.c:1299
-#, fuzzy, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
-
-#: ../undo.c:1308
-#, fuzzy, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E753: �Ҳ���: %s"
-
-#: ../undo.c:1313
-#, fuzzy, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E484: �޷����ļ� %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr ""
-
-#: ../undo.c:1497
-#, fuzzy, c-format
-msgid "Finished reading undo file %s"
-msgstr "����ִ�� %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "��λ����ɵĸı�"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "��λ�����µĸı�"
-
-#: ../undo.c:1806
-#, fuzzy, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "�Ҳ��������� %<PRId64>"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: �кŴ���"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "�����"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "�����"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "�б�ȥ��"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "�б�ȥ��"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "�з����ı�"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "�з����ı�"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s��%s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "before"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "after"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "�޿ɳ���"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr ""
-
-#: ../undo.c:2360
-#, fuzzy, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> ��; "
-
-#: ../undo.c:2372
-#, fuzzy
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E407: %s �����ڴ˳���"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: �������"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: �Ҳ���Ҫ��������"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"��������: "
-
-#: ../version.c:627
-#, fuzzy
-msgid ""
-"\n"
-"Extra patches: "
-msgstr "�ⲿ����:\n"
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "�޸��� "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"����"
-
-#: ../version.c:649
-msgid "by "
-msgstr "�� "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"���Ͱ汾 "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "��ͼ�ν��档"
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  ��ʹ��(+)�벻��ʹ��(-)�Ĺ���:\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "     ϵͳ vimrc �ļ�: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "     �û� vimrc �ļ�: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " �ڶ��û� vimrc �ļ�: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " �����û� vimrc �ļ�: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "      �û� exrc �ļ�: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  �ڶ��û� exrc �ļ�: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "         $VIM Ԥ��ֵ: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "  $VIMRUNTIME Ԥ��ֵ: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "���뷽ʽ: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "���ӷ�ʽ: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ���԰汾"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMproved"
-
-#: ../version.c:769
-msgid "version "
-msgstr "�汾 "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "���� Bram Moolenaar ��"
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim �ǿ����ɷַ��Ŀ���Դ��������"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "�����ڸɴ�Ŀ�����ͯ��"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "����  :help iccf<Enter>       �鿴˵��        "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "����  :q<Enter>               �˳�            "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "����  :help<Enter>  ��  <F1>  �鿴���߰���    "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "����  :help version7<Enter>   �鿴�汾��Ϣ    "
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "������ Vi ����ģʽ"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "����  :set nocp<Enter>        �ָ�Ĭ�ϵ� Vim  "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "����  :help cp-default<Enter> �鿴���˵��    "
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "���� Vim �Ŀ�����"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "��Ϊ Vim ��ע���û���"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "����  :help sponsor<Enter>    �鿴˵��        "
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "����  :help register<Enter>   �鿴˵��        "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�˵�  Help->Sponsor/Register  �鿴˵��           "
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�Ѿ�ֻʣһ��������"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: û��Ԥ������"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����ͬʱ���� topleft �� botright �ָ�"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: �������ָ��ʱ������ת"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:1810
-#, fuzzy
-msgid "E813: Cannot close autocmd window"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:1814
-#, fuzzy
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: ���������иı������"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: ��괦û���ļ���"
-
-#~ msgid "Patch file"
-#~ msgstr "Patch �ļ�"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "ȷ��(&O)\n"
-#~ "ȡ��(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: û�е� Vim ������������"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: �޷����͵� %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �޷���ȡ��������Ӧ"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �޷����͵��ͻ���"
-
-#~ msgid "Save As"
-#~ msgstr "����Ϊ"
-
-#~ msgid "Edit File"
-#~ msgstr "�༭�ļ�"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�Ҳ���)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "ִ�� Vim �ű�"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "���´��ڱ༭�ļ�"
-
-#~ msgid "Append File"
-#~ msgstr "׷���ļ�"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "�����: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "�����ض���"
-
-#~ msgid "Save View"
-#~ msgstr "������ͼ"
-
-#~ msgid "Save Session"
-#~ msgstr "����Ự"
-
-#~ msgid "Save Setup"
-#~ msgstr "�����趨"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: �˰汾�޸����ַ�(digraph)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "�ӱ�׼�����ȡ..."
-
-#~ msgid "[NL found]"
-#~ msgstr "[�ҵ� NL]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�Ѽ���]"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans ������δ�޸ĵĻ�����д��"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans �����������������"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork �ᶪʧ (��� ! ǿ��ִ��)"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: �޷�����ͼ�ν���"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: �޷���ȡ�ļ� \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: �޷�����ͼ�ν��棬�Ҳ�����Ч������"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: ���� 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' ��ֵ��Ч"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: �޷�������ɫ %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "�ڹ�괦û��ƥ�䣬������һ��"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�޷���>"
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �޷���ȡ���� %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: �޷����ص�ǰĿ¼"
-
-#~ msgid "Pathname:"
-#~ msgstr "·��:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: �޷���ȡ��ǰĿ¼"
-
-#~ msgid "OK"
-#~ msgstr "ȷ��"
-
-#~ msgid "Cancel"
-#~ msgstr "ȡ��"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "����������: �޷���ȡ����ͼ��ļ��δ�С"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim �Ի���"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: ����ͬʱʹ����Ϣ�ͻص����������� BalloonEval"
-
-#~ msgid "Vim dialog..."
-#~ msgstr "Vim �Ի���..."
-
-#~ msgid "Input _Methods"
-#~ msgstr "���뷨(_M)"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - ���Һ��滻..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - ����..."
-
-#~ msgid "Find what:"
-#~ msgstr "��������:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�滻Ϊ:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "ƥ�������Ĵ�"
-
-#~ msgid "Match case"
-#~ msgstr "ƥ���Сд"
-
-#~ msgid "Direction"
-#~ msgstr "����"
-
-#~ msgid "Up"
-#~ msgstr "����"
-
-#~ msgid "Down"
-#~ msgstr "����"
-
-#~ msgid "Find Next"
-#~ msgstr "������һ��"
-
-#~ msgid "Replace"
-#~ msgstr "�滻"
-
-#~ msgid "Replace All"
-#~ msgstr "ȫ���滻"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: �ӻỰ�������յ� \"die\" ����\n"
-
-#~ msgid "Close"
-#~ msgstr "�ر�"
-
-#~ msgid "New tab"
-#~ msgstr "�½���ǩ"
-
-#~ msgid "Open Tab..."
-#~ msgstr "�򿪱�ǩ..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �����ڱ�����شݻ�\n"
-
-#~ msgid "Font Selection"
-#~ msgstr "ѡ������"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "ʹ�� CUT_BUFFER0 ��ȡ����ѡ��"
-
-#~ msgid "&Filter"
-#~ msgstr "����(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "ȡ��(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "Ŀ¼"
-
-#~ msgid "Filter"
-#~ msgstr "������"
-
-#~ msgid "&Help"
-#~ msgstr "����(&H)"
-
-#~ msgid "Files"
-#~ msgstr "�ļ�"
-
-#~ msgid "&OK"
-#~ msgstr "ȷ��(&O)"
-
-#~ msgid "Selection"
-#~ msgstr "ѡ��"
-
-#~ msgid "Find &Next"
-#~ msgstr "������һ��(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "�滻(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "ȫ���滻(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "����(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �Ҳ������ڱ��� \"%s\""
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: ��֧�ֵIJ���: \"-%s\"����ʹ�� OLE �汾��"
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: �޷��� MDI Ӧ�ó����д򿪴���"
-
-#~ msgid "Close tab"
-#~ msgstr "�رձ�ǩ"
-
-#~ msgid "Open tab..."
-#~ msgstr "�򿪱�ǩ..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "�����ַ��� (ʹ�� '\\\\' ������ '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "���Һ��滻�ַ��� (ʹ�� '\\\\' ������ '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "δʹ��"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Ŀ¼\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �޷�������ɫ���ijЩ��ɫ���ܲ���ȷ"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Fontset %s ȱ�������ַ���������:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Fontset ����: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "'%s' ���ǹ̶����ȵ�����"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Fontset ����: %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "����0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "����1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "����%<PRId64>�Ŀ��Ȳ�������0������\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "����0�Ŀ��ȣ�%<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "����1�Ŀ���: %<PRId64>\n"
-#~ "\n"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "ָ������Ч������"
-
-#~ msgid "&Dismiss"
-#~ msgstr "ȡ��(&D)"
-
-#~ msgid "no specific match"
-#~ msgstr "�Ҳ���ƥ�����"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - ����ѡ����"
-
-#~ msgid "Name:"
-#~ msgstr "����:"
-
-#~ msgid "Encoding:"
-#~ msgstr "����:"
-
-#~ msgid "Font:"
-#~ msgstr "����:"
-
-#~ msgid "Style:"
-#~ msgstr "���:"
-
-#~ msgid "Size:"
-#~ msgstr "�ߴ�:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: Hangul automata ����"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ����"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: �޷��� cscope ���ݿ�: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: �޷���ȡ cscope ���ݿ���Ϣ"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: �Ѵﵽ cscope �����������"
-
-#~ msgid ""
-#~ "???: Sorry, this command is disabled, the MzScheme library could not be "
-#~ "loaded."
-#~ msgstr "???: ��Ǹ����������ã��޷����� MzScheme ��"
-
-#~ msgid "invalid expression"
-#~ msgstr "��Ч�ı���ʽ"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "����ʱû�����ñ���ʽ"
-
-#~ msgid "hidden option"
-#~ msgstr "���ص�ѡ��"
-
-#~ msgid "unknown option"
-#~ msgstr "δ֪��ѡ��"
-
-#~ msgid "window index is out of range"
-#~ msgstr "��������������Χ"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "�޷��򿪻�����"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "�޷����泷����Ϣ"
-
-#~ msgid "cannot delete line"
-#~ msgstr "�޷�ɾ����"
-
-#~ msgid "cannot replace line"
-#~ msgstr "�޷��滻��"
-
-#~ msgid "cannot insert line"
-#~ msgstr "�޷�������"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "�ַ������ܰ�������(NL)"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim ����: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim ����"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "��������Ч"
-
-#~ msgid "window is invalid"
-#~ msgstr "������Ч"
-
-#~ msgid "linenr out of range"
-#~ msgstr "�кų�����Χ"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "�������� sandbox ��ʹ��"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr "E263: ��Ǹ����������ã��޷����� Python �⡣"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: ���ܵݹ���� Python"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "����ɾ�� OutputObject ����"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace ����������"
-
-#~ msgid "invalid attribute"
-#~ msgstr "��������"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() ��Ҫ�ַ����б�������"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: ��ʼ�� I/O �������"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "��ͼ�����ѱ�ɾ���Ļ�����"
-
-#~ msgid "line number out of range"
-#~ msgstr "�кų�����Χ"
-
-#~ msgid "<buffer object (deleted) at %8lX>"
-#~ msgstr "<����������(��ɾ��): %8lX>"
-
-#~ msgid "invalid mark name"
-#~ msgstr "��Ч�ı������"
-
-#~ msgid "no such buffer"
-#~ msgstr "�޴˻�����"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "��ͼ�����ѱ�ɾ���Ĵ���"
-
-#~ msgid "readonly attribute"
-#~ msgstr "ֻ������"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "���λ���ڻ�������"
-
-#~ msgid "<window object (deleted) at %.8lX>"
-#~ msgstr "<���ڶ���(��ɾ��): %.8lX>"
-
-#~ msgid "<window object (unknown) at %.8lX>"
-#~ msgstr "<���ڶ���(δ֪): %.8lX>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<���� %d>"
-
-#~ msgid "no such window"
-#~ msgstr "�޴˴���"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr "E266: ��Ǹ����������ã��޷����� Ruby ��"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: δ֪�� longjmp ״̬ %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "�л�ʵ��/����"
-
-#~ msgid "Show base class of"
-#~ msgstr "��ʾ base class of:"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "��ʾ�����ǵij�Ա����"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "�ָ�: ���ļ�"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�ָ�: �Ӷ���"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "�ָ�: ��������Ŀ"
-
-#~ msgid "Retrieve"
-#~ msgstr "�ָ�"
-
-#~ msgid "Show source of"
-#~ msgstr "��ʾԴ����: "
-
-#~ msgid "Find symbol"
-#~ msgstr "���� symbol"
-
-#~ msgid "Browse class"
-#~ msgstr "��� class"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "��ʾ��ι�ϵ����"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "��ʾ restricted ��ι�ϵ�� class"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ���"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ��˭�ο�:"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ��"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref ��˭ʹ��:"
-
-#~ msgid "Show docu of"
-#~ msgstr "��ʾ�ļ�: "
-
-#~ msgid "Generate docu for"
-#~ msgstr "�����ļ�: "
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "�������ӵ� SNiFF+�����黷������ ($PATH ���������ҵ� sniffemacs)\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: ��ȡ����. ȡ������"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ Ŀǰ"
-
-#~ msgid "not "
-#~ msgstr "δ"
-
-#~ msgid "connected"
-#~ msgstr "������"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ����ȷ�� SNiff+ ����: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: ���ӵ� SNiFF+ ʧ��"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: δ���ӵ� SNiFF+"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: ���� SNiFF+ �Ļ�����"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: д����󡣽�������"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "��Ч�Ļ�������"
-
-#~ msgid "not implemented yet"
-#~ msgstr "��δʵ��"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "�޷��趨��"
-
-#~ msgid "mark not set"
-#~ msgstr "û���趨���"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�� %d �� �� %d ��"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "�޷�����/׷����"
-
-#~ msgid "unknown flag: "
-#~ msgstr "δ֪�ı�־: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "δ֪�� vim ѡ��"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "�����ж�"
-
-#~ msgid "vim error"
-#~ msgstr "vim ����"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "�޷�����������/��������: ���󽫱�ɾ��"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "�޷�ע��ص�����: ������/�����ѱ�ɾ��"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr "E280: TCL ���ش���: reflist �𻵣����뱨��� vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr "�޷�ע��ص�����: �Ҳ���������/��������"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr "E571: ��Ǹ����������ã��޷����� Tcl ��"
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr "E281: TCL ����: �˳�����ֵ�������������뱨��� vim-dev@vim.org"
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: �˳�����ֵ %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "�޷���ȡ��"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "�޷�ע�������������"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248:  �޷��������Ŀ�ij���"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ʹ������Ч�ķ����� id: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM ʵ��ע������������ɾ����"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "�� Vim ����ʱû�м��� diff ����"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ����: �޷��� NetBeans ������ gvim\n"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tע��� gvim �� OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tʹ��ͼ�ν��� (ͬ \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  ��  --nofork\tǰ̨: ����ͼ�ν���ʱ�� fork"
-
-#~ msgid "-V[N]\t\tVerbose level"
-#~ msgstr "-V[N]\t\tVerbose �ȼ�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t��ʹ�� newcli ���򿪴���"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tʹ�� <device> �����������"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> ����κ� .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�༭���ܵ��ļ�"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\t�� vim ��ָ���� X-server ����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t�����ӵ� X Server"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t���п��ܣ��� Vim �������ϱ༭�ļ� <files>"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>  ͬ --remote ����ȴ��ļ���ɱ༭"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-wait-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
-
-#~ msgid "--remote-tab <files>  As --remote but open tab page for each file"
-#~ msgstr "--remote-tab <files>  ͬ --remote ����ÿ���ļ���һ����ǩҳ"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\t�ͳ� <keys> �� Vim ���������˳�"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�� Vim ���������� <expr> ��ֵ����ӡ���"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\t�г����õ� Vim ���������Ʋ��˳�"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\t���͵����Ϊ Vim ������ <name>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (Motif �汾) ��ʶ��IJ���:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (neXtaw �汾) ��ʶ��IJ���:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (Athena �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t�� <display> ������ vim"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t����������"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��Ϊ <name>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (��δʵ��)\n"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\tʹ�� <color> ��Ϊ����ɫ (Ҳ���� -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\tʹ�� <color> ��Ϊһ��������ɫ (Ҳ���� -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\tʹ�� <font> ��Ϊһ������ (Ҳ���� -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\tʹ�� <font> ��Ϊ��������"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\tʹ�� <font> ��Ϊб������"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\tʹ�� <geom> ��Ϊ��ʼλ�� (Ҳ���� -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t�趨�߿����Ϊ <width> (Ҳ���� -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr "-scrollbarwidth <width> �趨����������Ϊ <width> (Ҳ���� -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <height>\t�趨�˵����߶�Ϊ <height> (Ҳ���� -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tʹ�÷��� (Ҳ���� -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t��ʹ�÷��� (Ҳ���� +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t�趨ָ������Դ"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (RISC OS �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <number>\t���ڳ�ʼ����"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <number>\t���ڳ�ʼ�߶�"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (GTK+ �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t�� <display> ������ vim (Ҳ���� --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t�����������������ڵĴ��ڽ�ɫ��"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t����һ�� GTK �����д� Vim"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <parent title>\t�ڸ�Ӧ�ó����д� Vim"
-
-#~ msgid "No display"
-#~ msgstr "û�� display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": ����ʧ�ܡ�\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": ����ʧ�ܡ����Ա���ִ��\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �� %d �ѱ༭"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "û�� display: ���ͱ���ʽʧ�ܡ�\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ���ͱ���ʽʧ�ܡ�\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ��Ч�Ĵ���ҳ"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �޷���������������"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �޷������뷨"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: ����: �޷��趨���뷨���ͷŻص�����"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ���뷨��֧���κη��"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ���뷨��֧���ҵ�Ԥ�༭����"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: over-the-spot �����Ҫ Fontset"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: ��� GTK+ �� 1.2.3 �ɡ�״̬�������á�"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: ���뷨������δ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�����ڸð汾�� Vim ��ʹ��]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "˺�´˲˵�"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "ѡ��Ŀ¼�Ի���"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�����ļ��Ի���"
-
-#~ msgid "Open File dialog"
-#~ msgstr "���ļ��Ի���"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: ��Ǹ������̨ģʽ��û���ļ������"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: ���ڱ����ļ�����\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ������\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "����: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[�ֽ�] �ܹ� alloc-free %<PRIu64>-%<PRIu64>��ʹ���� %<PRIu64>���߷�ʹ�� "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[����] �ܹ� re/malloc(): %<PRIu64>���ܹ� free()': %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: �����"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �ڲ�����: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ��Ч�������״"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "��������: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "��������һ��: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "�������벻ƥ�䣡"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "�޷����ӵ� Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "�޷����ӵ� Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: NetBeans ������Ϣ�ļ��д���ķ���ģʽ: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "�� Netbeans �׽��ֶ�ȡ"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: ������ %<PRId64> ��ʧ NetBeans ����"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ��ֵ���ܲ�����"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "�ͷ��� %<PRId64> ��"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: ��ͼ�ν����в��ܸı��ն�"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: ���� \":gui\" ����ͼ�ν���"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: �� GTK+ 2 ͼ�ν����в��ܸ���"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: ��������"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �޷�ѡ�� Fontset"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ���� Fontset"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �޷�ѡ�������"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ��Ч�Ŀ�����"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ��֧�����"
-
-#~ msgid "cannot open "
-#~ msgstr "���ܴ�"
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ���ܴ򿪴���!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "��Ҫ Amigados �汾 2.04 ����\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "��Ҫ %s �汾 %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "���ܴ� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "���ܴ��� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim ����ֵ: %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�����л�����̨(console)ģʽ !?\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ��������̨(console)??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: ������ -f ѡ��ִ�� shell"
-
-#~ msgid "Cannot execute "
-#~ msgstr "����ִ�� "
-
-#~ msgid "shell "
-#~ msgstr "shell "
-
-#~ msgid " returned\n"
-#~ msgstr " �ѷ���\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE ̫С"
-
-#~ msgid "I/O ERROR"
-#~ msgstr "I/O ����"
-
-#~ msgid "Message"
-#~ msgstr "��Ϣ"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ���� 80, ����ִ���ⲿ����"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: ѡ���ӡ��ʧ��"
-
-#~ msgid "to %s on %s"
-#~ msgstr "�� %s �� %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: δ֪�Ĵ�ӡ������: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: ��ӡ����: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "��ӡ '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: �ַ��� \"%s\" ���ܶ�Ӧ����\"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: ����ȷ���ַ� '%c' �������������� \"%s\" ��"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: ˫���źţ��˳���\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: ���ص������ź�(deadly signal) %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: ���ص������ź�(deadly signal)\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "�� X display ��ʱ %<PRId64> ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X ����\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "���� X display ʧ��"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "�� X display ��ʱ"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷�ִ�� shell sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷������ܵ�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷� fork\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�����ѽ���\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ��ʧ�˵� ICE ������"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "�� X display ʧ��"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ���� save-yourself ����"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ������"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE ���Ӽ���ʧ��"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection ����ʧ��: %s"
-
-#~ msgid "At line"
-#~ msgstr "���к� "
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "�޷����� vim32.dll��"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM ����"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "�޷������� DLL �ĺ���ָ��!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "Shell ���� %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: ���ص� %s �¼�\n"
-
-#~ msgid "close"
-#~ msgstr "�ر�"
-
-#~ msgid "logoff"
-#~ msgstr "ע��"
-
-#~ msgid "shutdown"
-#~ msgstr "�ػ�"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: �Ҳ�������"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "����� $PATH ���Ҳ��� VIMRUN.EXE��\n"
-#~ "�ⲿ����ִ����Ϻ󽫲�����ͣ��\n"
-#~ "��һ��˵����� :help win32-vimrun"
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim ����"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "��֧�� %s �е�ת��"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: ʹ���˲���ȷ�IJ���"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Tag �ļ�·�����ض�Ϊ %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "������ shell\n"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "�޷������������"
-
-#~ msgid "number changes  time"
-#~ msgstr "  ���    �ı�  ʱ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 λͼ�ν���汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 λͼ�ν���汾"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " Win32s ģʽ"
-
-#~ msgid " with OLE support"
-#~ msgstr " �� OLE ֧��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 λ����̨�汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 λ����̨�汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 λ MS-DOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 λ MS-DOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "RISC OS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "���Ͱ汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�����汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "С�Ͱ汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "΢�Ͱ汾 "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "�� GTK2-GNOME ͼ�ν��档"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "�� GTK-GNOME ͼ�ν��档"
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "�� GTK2 ͼ�ν��档"
-
-#~ msgid "with GTK GUI."
-#~ msgstr "�� GTK ͼ�ν��档"
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "�� X11-Motif ͼ�ν��档"
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "�� X11-neXtaw ͼ�ν��档"
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "�� X11-Athena ͼ�ν��档"
-
-#~ msgid "with Photon GUI."
-#~ msgstr "�� Photon ͼ�ν��档"
-
-#~ msgid "with GUI."
-#~ msgstr "��ͼ�ν��档"
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "�� Carbon ͼ�ν��档"
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "�� Cocoa ͼ�ν��档"
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "��(��ͳ)ͼ�ν��档"
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "    ϵͳ gvimrc �ļ�: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    �û� gvimrc �ļ�: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "�ڶ��û� gvimrc �ļ�: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "�����û� gvimrc �ļ�: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "        ϵͳ�˵��ļ�: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "������: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�˵�  Help->Orphans           �鿴˵��           "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "��ģʽ���У��������ּ�����"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "�˵�  Edit->Global Settings->Toggle Insert Mode  "
-
-#, fuzzy
-#~ msgid "                              for two modes      "
-#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
-
-#, fuzzy
-#~ msgid "                              for Vim defaults   "
-#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "����: ��⵽ Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "����  :help windows95<Enter>  �鿴���˵��    "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: �޷����ؿ� %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr "��Ǹ�����������: �޷����� Perl �⡣"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "�ö�� Vim �༭(&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�õ��� Vim �༭(&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "�� Vim �Ƚ�(diff)"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "�� Vim �༭(&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�õ�ǰ�� Vim �༭ - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�� Vim �༭ѡ�е��ļ�"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "��������ʧ��: ���� gvim �Ƿ���·���У�"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ����"
-
-#~ msgid "Path length too long!"
-#~ msgstr "·��̫����"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: δ֪�� Fontset: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: δ֪������: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: ���� \"%s\" ���ǵȿ�����"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �޷����ؿ⺯�� %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �޷�ʹ�� Hebrew: ����ʱû������\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �޷�ʹ�� Farsi: ����ʱû������\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: �޷�ʹ�� Arabic: ����ʱû������\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: û������ \"%s\" ����ע��ķ�����"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �޷��� display"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �յ���Ч�ı���ʽ"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans �������ı�ֻ���ļ�"
-
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-#~ msgstr "%s �� %d �У�ʹ�� PFXPOSTPONE ʱ���ӱ�־������: %s"
-
-#~ msgid "[No file]"
-#~ msgstr "[���]"
-
-#~ msgid "[Error List]"
-#~ msgstr "[�����б�]"
-
-#~ msgid "E106: Unknown variable: \"%s\""
-#~ msgstr "E106: δ����ı���: \"%s\""
-
-#~ msgid "function "
-#~ msgstr "���� "
-
-#~ msgid "E130: Undefined function: %s"
-#~ msgstr "E130: ���� %s �����"
-
-#~ msgid "Run Macro"
-#~ msgstr "ִ�к�"
-
-#~ msgid "E242: Color name not recognized: %s"
-#~ msgstr "E242: %s Ϊ����ʶ�����ɫ����"
-
-#~ msgid "error reading cscope connection %d"
-#~ msgstr "��ȡ cscope ���� %d ʱ����"
-
-#~ msgid "E260: cscope connection not found"
-#~ msgstr "E260: �Ҳ��� cscope ����"
-
-#~ msgid "cscope connection closed"
-#~ msgstr "cscope �����ѹر�"
-
-#~ msgid "couldn't malloc\n"
-#~ msgstr "����ʹ�� malloc\n"
-
-#~ msgid "%2d %-5ld  %-34s  <none>\n"
-#~ msgstr "%2d %-5ld  %-34s  <��>\n"
-
-#~ msgid "E249: couldn't read VIM instance registry property"
-#~ msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
-
-#~ msgid "\"\n"
-#~ msgstr "\"\n"
-
-#~ msgid "--help\t\tShow Gnome arguments"
-#~ msgstr "--help\t\t��ʾ Gnome ��ز���"
-
-#~ msgid "[string too long]"
-#~ msgstr "[�ַ���̫��]"
-
-#~ msgid "Hit ENTER to continue"
-#~ msgstr "�밴 ENTER ����"
-
-#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-#~ msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
-
-#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-#~ msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
-
-#~ msgid "E361: Crash intercepted; regexp too complex?"
-#~ msgstr "E361: ����ִ��; regular expression ̫����?"
-
-#~ msgid "E363: pattern caused out-of-stack error"
-#~ msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
-
-#~ msgid " BLOCK"
-#~ msgstr " ��"
-
-#~ msgid " LINE"
-#~ msgstr " ��"
-
-#~ msgid "Enter nr of choice (<CR> to abort): "
-#~ msgstr "���� nr ��ѡ�� (<CR> �˳�): "
-
-#~ msgid "Linear tag search"
-#~ msgstr "���Բ��ұ�ǩ (Tags)"
-
-#~ msgid "Binary tag search"
-#~ msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
-
-#~ msgid "with BeOS GUI."
-#~ msgstr "ʹ�� BeOS ͼ�ν��档"
diff --git a/src/nvim/po/zh_CN.po b/src/nvim/po/zh_CN.po
deleted file mode 100644
index 254ebbce6b..0000000000
--- a/src/nvim/po/zh_CN.po
+++ /dev/null
@@ -1,7932 +0,0 @@
-# Chinese (simplified) Translation for Vim
-#
-# Do ":help uganda"  in Vim to read copying and usage conditions.
-# Do ":help credits" in Vim to see a list of people who contributed.
-#
-# FIRST AUTHOR  Wang Jun <junw@turbolinux.com.cn>
-#
-# TRANSLATORS
-#   Edyfox <edyfox@gmail.com>
-#   Yuheng Xie <elephant@linux.net.cn>
-#
-# Original translations.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Vim(Simplified Chinese)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2006-04-21 14:00+0800\n"
-"Last-Translator: Yuheng Xie <elephant@linux.net.cn>\n"
-"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "ѡ��������������Ч"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr "[Location �б�]"
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr "[Quickfix �б�]"
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr ""
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: �޷������κλ��������˳�����..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: �޷����仺������ʹ����һ��������..."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: û���ͷ��κλ�����"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: û��ɾ���κλ�����"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: û������κλ�����"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "�ͷ��� 1 ��������"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "�ͷ��� %d ��������"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "ɾ���� 1 ��������"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "ɾ���� %d ��������"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "����� 1 ��������"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "����� %d ��������"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: �޷��ͷ����һ��������"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: û���޸Ĺ��Ļ�����"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: û�п��г��Ļ�����"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: ������ %<PRId64> ������"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �޷��л����������һ��������"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: �޷��л������ǵ�һ��������"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: ������ %<PRId64> ���޸ĵ���δ���� (��� ! ǿ��ִ��)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ����: �ļ�������"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �Ҳ��������� %<PRId64>"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: �ҵ���ֹһ�� %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: û��ƥ��Ļ����� %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "�� %<PRId64> ��"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: ���л�����ʹ�ø�����"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [���޸�]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[δ�༭]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[���ļ�]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[������]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[ֻ��]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[ֻ��]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "1 �� --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �� --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�� %<PRId64> / %<PRId64> --%d%%-- �� "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-msgid "[No Name]"
-msgstr "[���]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "����"
-
-#: ../buffer.c:3225 ../screen.c:4883
-msgid "[Help]"
-msgstr "[����]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[Ԥ��]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "ȫ��"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "�׶�"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "����"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# �������б�:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr ""
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- Signs ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s �� Signs:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  id=%d  ����=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: ȱ��ð��"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: ��Ч��ģʽ"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: �˴���Ҫ����"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: ��Ч�İٷֱ�"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: ���ܱȽ�(diff) %<PRId64> �����ϵĻ�����"
-
-#: ../diff.c:753
-#, fuzzy
-msgid "E810: Cannot read or write temp files"
-msgstr "E557: �޷��� termcap �ļ�"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: �޷����� diff"
-
-#: ../diff.c:966
-#, fuzzy
-msgid "E816: Cannot read patch output"
-msgstr "E98: �޷���ȡ diff �����"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: �޷���ȡ diff �����"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: ��ǰ���������� diff ģʽ"
-
-#: ../diff.c:2100
-#, fuzzy
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E100: û���������� diff ģʽ�Ļ�����"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: û���������� diff ģʽ�Ļ�����"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ���������ϵĻ��������� diff ģʽ�����ܾ�������һ��"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �Ҳ��������� \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: ������ \"%s\" ���� diff ģʽ"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr "E787: ����ظı��˻�����"
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: �����ַ�(digraph)�в���ʹ�� Escape"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: �Ҳ��� Keymap �ļ�"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: �����ڽű��ļ���ʹ�� :loadkeymap "
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr ""
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " �ؼ��ֲ�ȫ (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X ģʽ (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " ���в�ȫ (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " �ļ�����ȫ (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " Tag ��ȫ (^]^N^P)"
-
-#: ../edit.c:88
-#, fuzzy
-msgid " Path pattern completion (^N^P)"
-msgstr " ·��ģʽ��ȫ (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " ���岹ȫ (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " Dictionary ��ȫ (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Thesaurus ��ȫ (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " �����в�ȫ (^V^N^P)"
-
-#: ../edit.c:94
-msgid " User defined completion (^U^N^P)"
-msgstr " �û��Զ��岹ȫ (^U^N^P)"
-
-#: ../edit.c:95
-msgid " Omni completion (^O^N^P)"
-msgstr " ȫ�ܲ�ȫ (^O^N^P)"
-
-#: ../edit.c:96
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ƴд���� (s^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " �ؼ��־ֲ���ȫ (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�ѵ������β"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr ""
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr ""
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "ѡ�� 'dictionary' Ϊ��"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "ѡ�� 'thesaurus' Ϊ��"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "����ɨ�� dictionary: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (����) Scroll (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (�滻) Scroll (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "����ɨ��: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "ɨ���ǩ."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " ����"
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- ������..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "�ص����"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "��һ�еĴ�"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "Ψһƥ��"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "ƥ�� %d / %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "ƥ�� %d"
-
-#: ../eval.c:137
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: :let �г����쳣�ַ�"
-
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: List ����������Χ: %<PRId64>"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: δ����ı���: %s"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: ȱ�� ']'"
-
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �IJ��������� List"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �IJ��������� List ���� Dictionary"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Dictionary �ļ�����Ϊ��"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: ��Ҫ List"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ��Ҫ Dictionary"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Dictionary �в����ڼ�: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: ���� %s �Ѵ��ڣ���� ! ǿ���滻"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Dictionary ���Ѵ���"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: ��Ҫ Funcref"
-
-#: ../eval.c:153
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: %s= �ı������Ͳ���ȷ"
-
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: δ֪�ĺ���: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ��Ч�ı�����: %s"
-
-#: ../eval.c:157
-#, fuzzy
-msgid "E806: using Float as a String"
-msgstr "E730: �� List �� String ʹ��"
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr "E687: Ŀ��� List ������"
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr "E688: Ŀ��� List ������"
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr "������������ ;"
-
-#: ../eval.c:2078
-#, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E738: �޷��г� %s �ı���"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: ֻ������ List �� Dictionary"
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr "E708: [:] ���������"
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr "E709: [:] ��Ҫһ�� List ֵ"
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr "E710: List ֵ�����Ŀ���"
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr "E711: List ֵû���㹻�����"
-
-#: ../eval.c:2867
-msgid "E690: Missing \"in\" after :for"
-msgstr "E690: :for ��ȱ�� \"in\""
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ȱ������: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: �޴˱���: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: (un)lock �ı���Ƕ�׹���"
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: '?' ��ȱ�� ':'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr "E691: ֻ�ܱȽ� List �� List"
-
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: �� List ���IJ���"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr "E735: ֻ�ܱȽ� Dictionary �� Dictionary"
-
-#: ../eval.c:3917
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E736: �� Dictionary ���IJ���"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: ֻ�ܱȽ� Funcref �� Funcref"
-
-#: ../eval.c:3934
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E694: �� Funcrefs ���IJ���"
-
-#: ../eval.c:4277
-#, fuzzy
-msgid "E804: Cannot use '%' with Float"
-msgstr "E719: ���ܶ� Dictionary ʹ�� [:]"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: ȱ�� ')'"
-
-#: ../eval.c:4609
-msgid "E695: Cannot index a Funcref"
-msgstr "E695: ��������һ�� Funcref"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: ȱ��ѡ������: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: δ֪��ѡ��: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: ȱ������: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: ȱ������: %s"
-
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: List ��ȱ�ٶ���: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: List ȱ�ٽ����� ']': %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Dictionary ��ȱ��ð��: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Dictionary �г����ظ��ļ�: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Dictionary ��ȱ�ٶ���: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Dictionary ȱ�ٽ����� '}': %s"
-
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: ����Ƕ�׹����޷���ʾ"
-
-#: ../eval.c:7188
-#, fuzzy, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:7190
-#, fuzzy, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E118: �����IJ�������: %s"
-
-#: ../eval.c:7377
-#, fuzzy, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E130: δ֪�ĺ���: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: ���� %s �IJ���̫��"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ������ script ��������ʹ��: %s"
-
-#: ../eval.c:7391
-#, fuzzy, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E720: Dictionary ��ȱ��ð��: %s"
-
-#: ../eval.c:7453
-#, fuzzy
-msgid "E808: Number or Float required"
-msgstr "E521: = ������Ҫ����"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "-c ����"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ��������"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() ֻ���ڲ���ģʽ��ʹ��"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "ȷ��(&O)"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: ���Ѵ���: %s"
-
-#: ../eval.c:8692
-#, fuzzy
-msgid "extend() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "-c ����"
-
-#: ../eval.c:8916
-#, fuzzy
-msgid "filter() argument"
-msgstr "-c ����"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: δ֪�ĺ���: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() �ĵ��ô������� inputsave()"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "-c ����"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �������ķ�Χ"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() ��������Ч"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ������"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ��ʼֵ����ֵֹ��"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<��>"
-
-#: ../eval.c:12282
-#, fuzzy
-msgid "remove() argument"
-msgstr "--cmd ����"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �������ӹ���(ѭ����)"
-
-#: ../eval.c:12593
-#, fuzzy
-msgid "reverse() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "sort() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "-c ����"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Sort �ȽϺ���ʧ��"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Sort �ȽϺ���ʧ��"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(��Ч)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: д��ʱ�ļ�����"
-
-#: ../eval.c:16159
-#, fuzzy
-msgid "E805: Using a Float as a Number"
-msgstr "E745: �� List ������ʹ��"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: �� Funcref ������ʹ��"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: �� List ������ʹ��"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: �� Dictionary ������ʹ��"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: �� Funcref �� String ʹ��"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: �� List �� String ʹ��"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: �� Dictionary �� String ʹ��"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �������Ͳ�ƥ��: %s"
-
-#: ../eval.c:16705
-#, fuzzy, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E738: �޷��г� %s �ı���"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Funcref �����������Դ�д��ĸ��ͷ: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: �����������к�������ͻ: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: ֵ������: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "δ֪"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: �޷��ı� %s ��ֵ"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: ����Ƕ�׹����޷�����"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ���� %s �����"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: ȱ�� '(': %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: �����趨 IC ֵ"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: ���IJ���: %s"
-
-#: ../eval.c:17323
-#, fuzzy, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E125: ���IJ���: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: ȱ�� :endfunction"
-
-#: ../eval.c:17537
-#, fuzzy, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E746: ��������ű��ļ�����ƥ��: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: ���� %s ����ʹ���У��������¶���"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: ��������ű��ļ�����ƥ��: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: ��Ҫ������"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �����������Դ�д��ĸ��ͷ���߰���ð��: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �޷�ɾ������ %s: ����ʹ����"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: ����������ȳ��� 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "���� %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s ����ֹ"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s ���� #%<PRId64> "
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ���� %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "�� %s ���"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return ���ں�����"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# ȫ�ֱ���:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t����޸��� "
-
-#: ../eval.c:19272
-#, fuzzy
-msgid "No old files"
-msgstr "û�а����ļ�"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  ʮ������ %02x,  �˽��� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, ʮ������ %04x, �˽��� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, ʮ������ %08x, �˽��� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: �����ƶ���������"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "�ƶ��� 1 ��"
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "�ƶ��� %<PRId64> ��"
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "������ %<PRId64> ��"
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[���޸ĵ���δ����]\n"
-
-# bad to translate
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s ���: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: ������࣬�����ļ���ʣ�ಿ��"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "��ȡ viminfo �ļ� \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " ��Ϣ"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " ���"
-
-#: ../ex_cmds.c:1462
-#, fuzzy
-msgid " oldfiles"
-msgstr "û�а����ļ�"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ʧ��"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo �ļ�����д��: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: �޷�д�� viminfo �ļ� %s��"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "д�� viminfo �ļ� \"%s\""
-
-# do not translate to avoid writing Chinese in files
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, fuzzy, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# ��� viminfo �ļ����� Vim %s ���ɵġ�\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:1722
-#, fuzzy
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# ���Ҫ�����޸����ر�С�ģ�\n"
-"\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:1723
-#, fuzzy
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' �ڴ��ļ�����ʱ��ֵ\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "��Ч�������ַ�"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "Ҫд�벿���ļ���"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: ��ʹ�� ! ��д�벿�ֻ�����"
-
-#: ../ex_cmds.c:2281
-#, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "�����Ѵ��ڵ��ļ� \"%s\" ��"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr "�����ļ� \"%s\" �Ѵ��ڣ�ȷʵҪ������"
-
-#: ../ex_cmds.c:2326
-#, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E768: �����ļ��Ѵ���: %s (:silent! ǿ��ִ��)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: ������ %<PRId64> û���ļ���"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: �ļ�δд��: д�뱻 'write' ѡ�����"
-
-#: ../ex_cmds.c:2434
-#, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%s\" ���趨 'readonly' ѡ�\n"
-"ȷʵҪ������"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-
-#: ../ex_cmds.c:2451
-#, fuzzy, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "ֻ�� (��� ! ǿ��ִ��)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: �Զ����������ɾ�����»����� %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z �����ܷ����ֵIJ���"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim �н�ֹʹ�� shell ����"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: �������ʽ��������ĸ���ֽ�"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "�滻Ϊ %s (y/n/a/q/l/^E/^Y)��"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(���ж�) "
-
-#: ../ex_cmds.c:4384
-msgid "1 match"
-msgstr "1 ��ƥ�䣬"
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "1 ���滻��"
-
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> ��ƥ�䣬"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> ���滻��"
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr "�� 1 ��"
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr "�� %<PRId64> ��"
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global ���ܵݹ�ִ��"
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: global ȱ���������ʽ"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "ÿ�ж�ƥ�����ʽ: %s"
-
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
-msgid "Pattern not found: %s"
-msgstr "�Ҳ���ģʽ"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_cmds.c:4587
-#, fuzzy
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# ������滻�ַ���:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: ��Ҫ�ţ�"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ��Ǹ��û�� '%s' �� %s ��˵��"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: ��Ǹ��û�� %s ��˵��"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "��Ǹ���Ҳ��������ļ� \"%s\""
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ����Ŀ¼: %s"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: �޷��򿪲�д�� %s"
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �޷��򿪲���ȡ %s"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: ��һ�������л���˶��ְ����ļ�����: %s"
-
-#: ../ex_cmds.c:5565
-#, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Tag \"%s\" ���ļ� %s/%s ���ظ�����"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: δ֪�� sign ����: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: ȱ�� sign ����"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: Signs �������"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: ���� sign ����: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: δ֪�� sign: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: ȱ�� sign ��"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: ��Ч�Ļ�������: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ���� sign ID: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (��֧��)"
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[��ɾ��]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�������ģʽ������ \"cont\" �������С�"
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�� %<PRId64> ��: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "����: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "�ϵ� \"%s%s\" �� %<PRId64> ��"
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �Ҳ����ϵ�: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "û�ж���ϵ�"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �� %<PRId64> ��"
-
-#: ../ex_cmds2.c:942
-#, fuzzy
-msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: ����ʹ�� :profile start <fname>"
-
-#: ../ex_cmds2.c:1269
-#, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "���ı䱣�浽 \"%s\" ��"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "���"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: ������ \"%s\" ���޸ĵ���δ����"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "����: ����ؽ��������������� (�����Զ�����)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: ֻ��һ���ļ��ɱ༭"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: �޷��л������ǵ�һ���ļ�"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: �޷��л����������һ���ļ�"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: ��֧�ֱ�����: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "���ڲ��� \"%s\"���� \"%s\" ��"
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "���ڲ��� \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "�� 'runtimepath' ���Ҳ��� \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "����ִ��Ŀ¼: \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "����ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�� %<PRId64> ��: ����ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�� %<PRId64> ��: ִ�� \"%s\""
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "����ִ�� %s"
-
-#: ../ex_cmds2.c:2765
-msgid "modeline"
-msgstr "modeline"
-
-#: ../ex_cmds2.c:2767
-msgid "--cmd argument"
-msgstr "--cmd ����"
-
-#: ../ex_cmds2.c:2769
-msgid "-c argument"
-msgstr "-c ����"
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr "��������"
-
-#: ../ex_cmds2.c:2773
-msgid "error handler"
-msgstr ""
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: ����: ������зָ��������������� ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: �ڽű��ļ���ʹ���� :scriptencoding"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: �ڽű��ļ���ʹ���� :finish"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "��ǰ�� %s����: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: �����趨����Ϊ \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "���� Ex ģʽ������ \"visual\" �ص�����ģʽ��"
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: �ѵ��ļ�ĩβ"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: ����ݹ��������"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: �쳣û�б�����: %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "�ű��ļ�����"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "��������"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: ��ȷ�����û��Զ�������"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: ���DZ༭��������"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: ʹ��������ķ�Χ"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "ʹ��������ķ�Χ��ȷ��������"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: ��ʹ�� w �� w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: ��Ǹ�������ڴ˰汾�в�����"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: ֻ����һ���ļ���"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "���� 1 ���ļ�δ�༭��ȷʵҪ�˳���"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "���� %d ���ļ�δ�༭��ȷʵҪ�˳���"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: ���� 1 ���ļ�δ�༭"
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: ���� %<PRId64> ���ļ�δ�༭"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: �����Ѵ���: ��� ! ǿ���滻"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    ����        ���� ��Χ  ��ȫ      ����      "
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "�Ҳ����û��Զ�������"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: û��ָ������"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: ���IJ�������"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ����ָ�����μ���"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: ��Ч�ļ���Ĭ��ֵ"
-
-#: ../ex_docmd.c:4625
-msgid "E179: argument required for -complete"
-msgstr "E179: -complete ��Ҫ����"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: ��������: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: ����������"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �û��Զ�����������Դ�д��ĸ��ͷ"
-
-#: ../ex_docmd.c:4696
-#, fuzzy
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E464: ��ȷ�����û��Զ�������"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: û������û��Զ�������: %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: ��Ч�IJ�ȫ����: %s"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: ֻ�� custom ��ȫ����������"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Custom ��ȫ��Ҫһ����������"
-
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �Ҳ�����ɫ���� %s"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "���ã�Vim �û���"
-
-#: ../ex_docmd.c:5431
-msgid "E784: Cannot close last tab page"
-msgstr "E784: ���ܹر����һ�� tab ҳ"
-
-#: ../ex_docmd.c:5462
-msgid "Already only one tab page"
-msgstr "�Ѿ�ֻʣһ�� tab ҳ��"
-
-#: ../ex_docmd.c:6004
-#, c-format
-msgid "Tab page %d"
-msgstr "Tab ҳ %d"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "�޽����ļ�"
-
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E747: ���ܸı�Ŀ¼�����������޸� (��� ! ǿ��ִ��)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: ǰһ��Ŀ¼������"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: δ֪"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize ��Ҫ�������ֲ���"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: �ڴ�ƽ̨�ϲ��ܻ�ô���λ��"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos ��Ҫ�������ֲ���"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: �޷�����Ŀ¼: %s"
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" �Ѵ��� (��� ! ǿ��ִ��)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �޷��򿪲�д�� \"%s\""
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: ����������һ����ĸ������/������"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal �ݹ��������"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: û�������滻 '#' �Ľ����ļ���"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: û�������滻 \"<afile>\" ���Զ������ļ���"
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: û�������滻 \"<abuf>\" ���Զ����������"
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: û�������滻 \"<amatch>\" ���Զ�����ƥ����"
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
-
-#: ../ex_docmd.c:7876
-#, fuzzy
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E498: û�������滻 \"<sfile>\" �� :source �ļ���"
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: '%' �� '#' Ϊ���ļ�����ֻ������ \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: ���Ϊ���ַ���"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: ���� :throw ǰ׺Ϊ 'Vim' ���쳣"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "�׳��쳣: %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "����쳣: %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "�����쳣: %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s���� %<PRId64> ��"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "�����쳣: %s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr ""
-
-#: ../ex_eval.c:679
-#, fuzzy, c-format
-msgid "%s resumed"
-msgstr " �ѷ���\n"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr ""
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "�쳣"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "������ж�"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "����"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "�ж�"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: :if Ƕ�ײ�������"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif ȱ�ٶ�Ӧ�� :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: ��� :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif �� :else ����"
-
-#: ../ex_eval.c:941
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: :while/:for Ƕ�ײ�������"
-
-#: ../ex_eval.c:1028
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue ȱ�ٶ�Ӧ�� :while �� :for"
-
-#: ../ex_eval.c:1061
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break ȱ�ٶ�Ӧ�� :while �� :for"
-
-#: ../ex_eval.c:1102
-msgid "E732: Using :endfor with :while"
-msgstr "E732: :while �� :endfor ��β"
-
-#: ../ex_eval.c:1104
-msgid "E733: Using :endwhile with :for"
-msgstr "E733: :for �� :endwhile ��β"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: :try Ƕ�ײ�������"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch ȱ�ٶ�Ӧ�� :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch �� :finally ����"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally ȱ�ٶ�Ӧ�� :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: ��� :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endtry ȱ�ٶ�Ӧ�� :try"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction ���ں�����"
-
-#: ../ex_getln.c:1643
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E788: Ŀǰ�������༭��Ļ�����"
-
-#: ../ex_getln.c:1656
-#, fuzzy
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E788: Ŀǰ�������༭��Ļ�����"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "tag ��"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr " ���� �ļ�\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "ѡ�� 'history' Ϊ��"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5046
-#, fuzzy, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ��ʷ��¼ (���µ���):\n"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5047
-#, fuzzy
-msgid "Command Line"
-msgstr "������"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5048
-#, fuzzy
-msgid "Search String"
-msgstr "�����ַ���"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5049
-#, fuzzy
-msgid "Expression"
-msgstr "����ʽ"
-
-# do not translate to avoid writing Chinese in files
-#: ../ex_getln.c:5050
-#, fuzzy
-msgid "Input Line"
-msgstr "������"
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar ���������"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: ����ڻ򻺳����ѱ�ɾ��"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr ""
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr "E343: ��Ч��·��: '**[number]' ������·��ĩβ���ߺ���� '%s'��"
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ���Ҳ���Ŀ¼ \"%s\""
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: ��·�����Ҳ����ļ� \"%s\""
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: ��·�����Ҳ���������ļ� \"%s\""
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: ��·�����Ҳ���������ļ� \"%s\""
-
-#: ../fileio.c:137
-#, fuzzy
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E135: *Filter* �Զ�������Ըı䵱ǰ������"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "��Ч���ļ���"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "��Ŀ¼"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "�����ļ�"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[���ļ�]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr "[��Ŀ¼]"
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr "[�ļ�����]"
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[Ȩ�޲���]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre �Զ�������ļ����ɶ�"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre �Զ���������ı䵱ǰ������"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: �ӱ�׼�����ȡ...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: ת�������ļ����ɶ�"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[socket]"
-
-#. or character special
-#: ../fileio.c:1801
-#, fuzzy
-msgid "[character special]"
-msgstr "1 ���ַ�"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[ȱ�� CR]'"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[���зָ�]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[δת��]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[��ת��]"
-
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[�� %<PRId64> ��ת������]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[�� %<PRId64> ����Ч�ַ�]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[������]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "�Ҳ�������ת������ʱ�ļ�"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "'charconvert' ת��ʧ��"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "�޷���ȡ 'charconvert' �����"
-
-#: ../fileio.c:2437
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "E676: �Ҳ��� acwrite ��������Ӧ���Զ�����"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: �Զ�����ɾ�����ͷ���Ҫд��Ļ�����"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: �Զ���������ظı�������"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "�����ļ����д���豸"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "ֻ�� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �޷�д�뱸���ļ� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: �رձ����ļ����� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �޷���ȡ�ļ��Թ����� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �޷����������ļ� (��� ! ǿ��ִ��)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �޷����ɱ����ļ� (��� ! ǿ��ִ��)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: �޷�ת�� (��� ! ǿ�Ʋ�ת��д��)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �޷��򿪲�д�������ļ�"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �޷��򿪲�д���ļ�"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: ͬ��ʧ��"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: �ر�ʧ��"
-
-#: ../fileio.c:3436
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
-
-#: ../fileio.c:3441
-#, fuzzy, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr "E513: д�����ת��ʧ�� (�뽫 'fenc' �ÿ���ǿ��ִ��)"
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: д����� (�ļ�ϵͳ������)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr " ת������"
-
-#: ../fileio.c:3509
-#, fuzzy, c-format
-msgid " in line %<PRId64>;"
-msgstr "�� %<PRId64> ��"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[�豸]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[��]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr " [a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " ��׷��"
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr " [w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " ���"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patchmode: �޷�����ԭʼ�ļ�"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patchmode: �޷����ɿյ�ԭʼ�ļ�"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: �޷�ɾ�������ļ�"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"����: ԭʼ�ļ������Ѷ�ʧ����\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "���ļ���ȷд��ǰ�����˳��༭����"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[dos ��ʽ]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[mac ��ʽ]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[unix ��ʽ]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 �У�"
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> �У�"
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "1 ���ַ�"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ���ַ�"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[���һ�в�����]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "����: ���ļ��Զ�����ѷ����䶯������"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "ȷʵҪд����"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: д���ļ� \"%s\" ����"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: �ر��ļ� \"%s\" ����"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: ��ȡ�ļ� \"%s\" ����"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell �Զ�����ɾ���˻�����"
-
-#: ../fileio.c:4894
-#, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: �ļ� \"%s\" �Ѿ�������"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr "W12: ����: �ļ� \"%s\" �ѱ䶯�������� Vim �еĻ�����Ҳ�ѱ䶯"
-
-#: ../fileio.c:4907
-msgid "See \":help W12\" for more info."
-msgstr "��һ��˵����� \":help W12\""
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ����: �༭��ʼ���ļ� \"%s\" �ѱ䶯"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "��һ��˵����� \":help W11\""
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ����: �༭��ʼ���ļ� \"%s\" ��ģʽ�ѱ䶯"
-
-#: ../fileio.c:4915
-msgid "See \":help W16\" for more info."
-msgstr "��һ��˵����� \":help W16\""
-
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ����: �༭��ʼ���ļ� \"%s\" �ѱ�����"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "����"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"ȷ��(&O)\n"
-"�����ļ�(&L)"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �޷�Ϊ���¼��� \"%s\" ��׼��"
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: �޷����¼��� \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--��ɾ��--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr ""
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: �޴���: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * ��������Ч�ַ�: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: �޴��¼�: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: �޴�����¼�: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- �Զ����� ---"
-
-#: ../fileio.c:6293
-#, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "E680: <buffer=%d>: ��Ч�Ļ������� "
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: ���ܶ������¼�ִ���Զ�����"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "û��ƥ����Զ�����"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: �Զ�����Ƕ�ײ�������"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s �Զ����� \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "ִ�� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "�Զ����� %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: ȱ�� {��"
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: ȱ�� }��"
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: �Ҳ����۵�"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: �����ڵ�ǰ�� 'foldmethod' �´����۵�"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: �����ڵ�ǰ�� 'foldmethod' ��ɾ���۵�"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--���۵� %3ld ��"
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: ���ӵ��Ѷ���������"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: �ݹ�ӳ��"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: ȫ����д %s �Ѵ���"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: ȫ��ӳ�� %s �Ѵ���"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: ��д %s �Ѵ���"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: ӳ�� %s �Ѵ���"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "�Ҳ�����д"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "�Ҳ���ӳ��"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: ��Ч��ģʽ"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--������������--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: �����ֹ"
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ��Ҫ����"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ ����Ӧ�ø��� /��? �� &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: �������д�������Ч��<CR> ִ�У�CTRL-C �˳�"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: ��ǰĿ¼�е� exrc/vimrc �� tag �����в�����������"
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: ȱ�� :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: ȱ�� :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: ȱ�� :endwhile"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: ȱ�� :endfor"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile ȱ�ٶ�Ӧ�� :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor ȱ�ٶ�Ӧ�� :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ļ��Ѵ��� (��� ! ǿ��ִ��)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ����ִ��ʧ��"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �ڲ�����"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "���ж�"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ��Ч�ĵ�ַ"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ���IJ���"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ���IJ���: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ��Ч�ı���ʽ: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ��Ч�ķ�Χ"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ��������"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" ��Ŀ¼"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ��Ч�Ĺ�����С"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: ���ú����� \"%s()\" ʧ��"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: ��ǵ��к���Ч"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: û���趨���"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: �����޸ģ���Ϊѡ�� 'modifiable' �ǹص�"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: �ű�Ƕ�׹���"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: û�н����ļ�"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: û�������д"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ����ʹ�� \"!\""
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: �޷�ʹ��ͼ�ν���: ����ʱû������"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: û���������Ⱥ����: %s"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: û�в��������"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: û��ǰһ��������"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: û�����ӳ��"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: û��ƥ��"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: û��ƥ��: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: û���ļ���"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: û��ǰһ���滻�������ʽ"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: û��ǰһ������"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: û��ǰһ���������ʽ"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: ����ʹ�÷�Χ"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: û���㹻�Ŀռ�"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �޷������ļ� %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �޷���ȡ��ʱ�ļ���"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �޷����ļ� %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �޷���ȡ�ļ� %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: ���޸ĵ���δ���� (���� ! ǿ��ִ��)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[���޸ĵ���δ����]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: �յIJ���"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: �˴���Ҫ����"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �޷��򿪴����ļ� %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �ڴ治�㣡"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�Ҳ���ģʽ"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �Ҳ���ģʽ: %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: ��������������"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �޷��ص�ǰһ��Ŀ¼"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: û�д���"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: û�� location �б�"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ���𻵵�ƥ���ַ���"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ���𻵵��������ʽ����"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: ���趨ѡ�� 'readonly' (��� ! ǿ��ִ��)"
-
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: ���ܸı�ֻ������ \"%s\""
-
-#: ../globals.h:1075
-#, fuzzy, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E46: ������ sandbox ���趨����: \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ��ȡ�����ļ�ʧ��"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: �������� sandbox ��ʹ��"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �������ڴ�ʹ��"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ��֧���趨��Ļģʽ"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ��Ч�Ĺ�����С"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: ѡ�� 'shell' Ϊ��"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: �޷���ȡ sign ���ݣ�"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: �����ļ��رմ���"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: tag ��ջΪ��"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ���������"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ���ֹ���"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ ����"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �ļ�������"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: �����β���ַ�"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: δ֪�ı��"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �޷���չͨ���"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ������ 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ������ 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: ����"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "������"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: �ڽű�������ʹ���� <SID>"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �ڲ�����: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ����ʽ���ڴ�ʹ�ó��� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �յĻ�����"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: ��Ч����������ʽ��ָ���"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: �ļ�������һ���������б�����"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: û���趨ѡ�� '%s'"
-
-#: ../globals.h:1111
-#, fuzzy
-msgid "E850: Invalid register name"
-msgstr "E354: ��Ч�ļĴ�����: '%s'"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "�Ѳ��ҵ��ļ���ͷ���ٴӽ�β��������"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "�Ѳ��ҵ��ļ���β���ٴӿ�ͷ��������"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: ȱ��ð��"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: ���IJ���"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: Ӧ��Ҫ������"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "�� %d ҳ"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "û��Ҫ��ӡ������"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "���ڴ�ӡ�� %d ҳ (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr "���� %d / %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "�Ѵ�ӡ: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "��ӡ��ֹ"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: д�� PostScript ����ļ�����"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: �޷����ļ� \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �޷���ȡ PostScript ��Դ�ļ� \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: �ļ� \"%s\" ���� PostScript ��Դ�ļ�"
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: �ļ� \"%s\" ������֧�ֵ� PostScript ��Դ�ļ�"
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" ��Դ�ļ��汾����ȷ"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: �����ݵĶ��ֽڱ�����ַ�����"
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset �ڶ��ֽڱ����²���Ϊ�ա�"
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr "E675: û��ָ�����ֽڴ�ӡ��Ĭ�����塣"
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: �޷��� PostScript ����ļ�"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: �޷����ļ� \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"prolog.ps\""
-
-#: ../hardcopy.c:2593
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"cidfont.ps\""
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �Ҳ��� PostScript ��Դ�ļ� \"%s.ps\""
-
-#: ../hardcopy.c:2654
-#, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620: �޷�ת������ӡ���� \"%s\""
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "���͵���ӡ������"
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: �޷���ӡ PostScript �ļ�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "��ӡ�����ѱ����͡�"
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "����һ���µ����ݿ�"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "��ѯһ��ģʽ"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "��ʾ����Ϣ"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "����һ������"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "������������"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "��ʾ����"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �÷�: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "��� cscope ���֧�ַָ�ڡ�\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: �÷�: cstag <ident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �Ҳ��� tag"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) ����: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s ����Ŀ¼����Ч�� cscope ���ݿ�"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "������ cscope ���ݿ� %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: ��ȡ cscope ���� %<PRId64> ����"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: δ֪�� cscope ��������"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: �޷����� cscope �ܵ�"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: �޷��� cscope ���� fork"
-
-#: ../if_cscope.c:849
-#, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection ִ��ʧ��"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection ִ��ʧ��"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen to_fp ʧ��"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen fr_fp ʧ��"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: �޷����� cscope ����"
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: û�� cscope ����"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: cscopequickfix ��־ %c �� %c ��Ч"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: cscope ��ѯ %s %s û���ҵ�ƥ��Ľ��"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "cscope ����:\n"
-
-#: ../if_cscope.c:1150
-#, fuzzy, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %-30s (�÷�: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: �ظ��� cscope ���ݿ�δ������"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: �Ҳ��� cscope ���� %s"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "cscope ���� %s �ѹر�"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: cs_manage_matches ���ش���"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Cscope tag: %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   ��  "
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "�ļ��� / ������ / ��\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: Cscope ����: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "���� cscope ���ݿ��ѱ�����"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "û�� cscope ����\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ���ݿ���                            prepend path\n"
-
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "δ֪��ѡ�����"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�༭��������"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "ȱ�ٱ�Ҫ�IJ���"
-
-#: ../main.c:150
-msgid "Garbage after option argument"
-msgstr "ѡ��������������Ч"
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "\"+command\"��\"-c command\" �� \"--cmd command\" ��������"
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "���IJ���"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "���� %d ���ļ��ȴ��༭\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "��ͼ�ٴδ򿪽ű��ļ�: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�޷��򿪲���ȡ: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "�޷��򿪲�����ű�: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: ����: ������ǵ��ն�(��Ļ)\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: ����: ���벻�������ն�(����)\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "pre-vimrc ������"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �޷���ȡ \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"������Ϣ���: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[�ļ� ..]       �༭ָ�����ļ�"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               �ӱ�׼����(stdin)��ȡ�ı�"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �༭ tag ���崦���ļ�"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �༭��һ�����������ļ�"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"�÷�:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [����] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"  ��:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"����:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t�����Ժ�ֻ���ļ���"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t����չͨ���"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi ģʽ (ͬ \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx ģʽ (ͬ \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t����(������)ģʽ (ֻ���� \"ex\" һ��ʹ��)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff ģʽ (ͬ \"vimdiff\")"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t����ģʽ (ͬ \"evim\"����ģʽ)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tֻ��ģʽ (ͬ \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t����ģʽ (ͬ \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t�����޸�(д���ļ�)"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t�ı������޸�"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t������ģʽ"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tLisp ģʽ"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t���ݴ�ͳ�� Vi: 'compatible'"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t����ȫ���ݴ�ͳ�� Vi: 'nocompatible'"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t����ģʽ"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t��ʹ�ý����ļ���ֻʹ���ڴ�"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�г������ļ����˳�"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (���ļ���)\t\t�ָ������ĻỰ"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tͬ -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t�� Arabic ģʽ����"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t�� Hebrew ģʽ����"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t�� Farsi ģʽ����"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�趨�ն�����Ϊ <terminal>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tʹ�� <vimrc> ����κ� .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t������ plugin �ű�"
-
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-P[N]\t\t�� N ����ǩҳ (Ĭ��ֵ: ÿ���ļ�һ��)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t�� N ������ (Ĭ��ֵ: ÿ���ļ�һ��)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tͬ -o ����ֱ�ָ�"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�����������ļ�ĩβ"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t������������ <lnum> ��"
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t�����κ� vimrc �ļ�ǰִ�� <command>"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <command>\t\t���ص�һ���ļ���ִ�� <command>"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t���ص�һ���ļ���ִ���ļ� <session>"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t���ļ� <scriptin> ��������ģʽ������"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���������������׷�ӵ��ļ� <scriptout>"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���������������д�뵽�ļ� <scriptout>"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tʹ�� <viminfo> ȡ�� .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  ��  --help\t��ӡ����(����Ϣ)���˳�"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t��ӡ�汾��Ϣ���˳�"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "û���趨���"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: û��ƥ�� \"%s\" �ı��"
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"���   ��   �� �ļ�/�ı�"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" ��ת   ��   �� �ļ�/�ı�"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"  �ı�   ��   �� �ı�"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# �ļ����:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# ��ת�б� (���µ���):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# �ļ��ڵı����ʷ��¼ (���µ���):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "ȱ�� '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: �������"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: �����ļ���ȡ��λ����"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: �����ļ���ȡ����"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: �����ļ�д�붨λ����"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: �����ļ�д�����"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �����ļ��Ѵ��� (�������ӹ�����)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �Ҳ����� 0��"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �Ҳ����� 1��"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �Ҳ����� 2��"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: �ޣ������ļ������ˣ�����"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: �޷������������ļ�"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: �޷��� \"%s\" �Ľ����ļ����ָ���������"
-
-#: ../memline.c:666
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_upd_block0(): �Ҳ����� 0��"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: �Ҳ��� %s �Ľ����ļ�"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "������Ҫʹ�õĽ����ļ���� (0 �˳�): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: �޷��� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "�޷���ȡ�� 0: "
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"������û�����κ��޸Ļ��� Vim �����������½����ļ���"
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " �����ڸð汾�� Vim ��ʹ�á�\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "ʹ�� Vim 3.0��\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s ������������ Vim �����ļ�"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " ��������̨������ʹ�á�\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���ļ������� "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-"��\n"
-"���Ǵ��ļ����𻵡�"
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "ʹ�ý����ļ� \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "ԭʼ�ļ� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ����: ԭʼ�ļ������ѱ��޸�"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: �޷��� %s ��ȡ�� 1"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1065
-#, fuzzy
-msgid "???MANY LINES MISSING"
-msgstr "???ȱ����̫����"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1076
-#, fuzzy
-msgid "???LINE COUNT WRONG"
-msgstr "???��������"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1082
-#, fuzzy
-msgid "???EMPTY BLOCK"
-msgstr "???�յĿ�"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1103
-#, fuzzy
-msgid "???LINES MISSING"
-msgstr "???ȱ����һЩ��"
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �� 1 ID ���� (%s ���ǽ����ļ���)"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1133
-#, fuzzy
-msgid "???BLOCK MISSING"
-msgstr "???ȱ�ٿ�"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1147
-#, fuzzy
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �����ﵽ ???END ���п����ѻ���"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1164
-#, fuzzy
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? �����ﵽ ???END ���п����ѱ�����/ɾ����"
-
-# do not translate to avoid writing Chinese in files
-#: ../memline.c:1181
-#, fuzzy
-msgid "???END"
-msgstr "???END"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: �ָ��ѱ��ж�"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: �ָ�ʱ����������ע�⿪ͷΪ ??? ����"
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "������Ϣ��� \":help E312\""
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "�ָ���ϡ���ȷ��һ��������"
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(�������Ҫ������ļ�����Ϊ����ļ���\n"
-
-#: ../memline.c:1252
-#, fuzzy
-msgid "and run diff with the original file to check for changes)"
-msgstr "������ diff ��ԭ�ļ��Ƚ��Լ���Ƿ��иı�)\n"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr ""
-
-#: ../memline.c:1255
-#, fuzzy
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"Ȼ��� .swp �ļ�ɾ����\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "�ҵ������ļ�:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   λ�ڵ�ǰĿ¼:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   ʹ��ָ��������:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   λ��Ŀ¼ "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- �� --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "            ������: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "    ����: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              ����: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "         [���� Vim �汾 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "         [������ Vim �����ļ�]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "            �ļ���: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"            �޸Ĺ�: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "��"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "��"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"            �û���: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "      ������: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"            ������: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"           ���� ID: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (��������)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [�����ڱ�����ʹ��]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�޷���ȡ]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�޷���]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �޷�������û�н����ļ�"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "�ļ��ѱ���"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: ����ʧ��"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ���� lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �Ҳ����� %<PRId64> ��"
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: ָ��� id ���� 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx Ӧ���� 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: ������̫��Ŀ飿"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: ָ��� id ���� 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "ɾ���˿� 1��"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �Ҳ����� %<PRId64> ��"
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: ָ��� id ����"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count ��"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: �кų�����Χ: %<PRId64> ������β"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �� %<PRId64> ��������"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "��ջ��С����"
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: ָ��� id ���� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr "E773: \"%s\" �������ӳ���ѭ��"
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: ע��"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"���ֽ����ļ� \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "���ڴ��ļ� \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      �Ƚ����ļ��£�\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) ��һ���������Ҳ�ڱ༭ͬһ���ļ���\n"
-"    ������������޸�ʱ��ע�����ͬһ���ļ�����������ͬ�İ汾��\n"
-"\n"
-
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    �˳�����С�ĵؼ�����\n"
-
-#: ../memline.c:3246
-#, fuzzy
-msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) �ϴα༭���ļ�ʱ������\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    ��������������� \":recover\" �� \"vim -r "
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    �ָ��޸ĵ����� (��� \":help recovery\")��\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    ������Ѿ������˻ָ�����ɾ�������ļ� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    �Ա����ٿ�������Ϣ��\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "�����ļ� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" �Ѵ��ڣ�"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - ע��"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "�����ļ��Ѵ��ڣ�"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"��ֻ����ʽ��(&O)\n"
-"ֱ�ӱ༭(&E)\n"
-"�ָ�(&R)\n"
-"�˳�(&Q)\n"
-"��ֹ(&A)"
-
-#: ../memline.c:3467
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"��ֻ����ʽ��(&O)\n"
-"ֱ�ӱ༭(&E)\n"
-"�ָ�(&R)\n"
-"ɾ�������ļ�(&D)\n"
-"�˳�(&Q)\n"
-"��ֹ(&A)"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: �ҵ�̫�ཻ���ļ�"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �ڴ治�㣡(���� %<PRIu64> �ֽ�)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: �˵����ij����·�������Ӳ˵�"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: �˵�ֻ������ģʽ�д���"
-
-#: ../menu.c:64
-#, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: û�в˵� \"%s\""
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-#, fuzzy
-msgid "E792: Empty menu name"
-msgstr "E749: �յĻ�����"
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: �˵�·������ָ���Ӳ˵�"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ���ܰѲ˵���ֱ�Ӽӵ��˵�����"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: �ָ��߲����Dz˵�·����һ����"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- �˵� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �˵�·������ָ��˵���"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: �Ҳ����˵�: %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s ģʽ�в˵�δ����"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: �˵�·������ָ���Ӳ˵�"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: �Ҳ����˵� - ����˵�����"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "���� %s ʱ��������:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "�� %4ld ��:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: ��Ч�ļĴ�����: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr "����������Ϣά����: Yuheng Xie <elephant@linux.net.cn>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "���ж�: "
-
-#: ../message.c:988
-msgid "Press ENTER or type command to continue"
-msgstr "�밴 ENTER �������������"
-
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �� %<PRId64> ��"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- ���� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " �ո�/d/j: ��Ļ/ҳ/�� �·���b/u/k: �Ϸ���q: �˳� "
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "����"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"��(&Y)\n"
-"��(&N)"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"��(&N)\n"
-"ȡ��(&C)"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"��(&Y)\n"
-"��(&N)\n"
-"ȫ������(&A)\n"
-"ȫ������(&D)\n"
-"ȡ��(&C)"
-
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: printf() �IJ�������"
-
-#: ../message.c:3119
-#, fuzzy
-msgid "E807: Expected Float argument for printf()"
-msgstr "E766: printf() �IJ�������"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: printf() �IJ�������"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: ����: �����޸�һ��ֻ���ļ�"
-
-#: ../misc1.c:2537
-#, fuzzy
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "���������ֻ������ (<Enter> ȡ��): "
-
-#: ../misc1.c:2539
-#, fuzzy
-msgid "Type number and <Enter> (empty cancels): "
-msgstr "��ѡ������ (<Enter> ȡ��): "
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "���� 1 ��"
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "���� 1 ��"
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "���� %<PRId64> ��"
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "���� %<PRId64> ��"
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (���ж�)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr "Beep!"
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "���� shell ִ��: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: ��괦û��ʶ����"
-
-#: ../normal.c:1866
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: 'operatorfunc' ��"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "����: ����ն˲�����ʾ����"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: ��괦û���ַ���"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: �����ڵ�ǰ�� 'foldmethod' ��ɾ�� fold"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: �ı��б�Ϊ��"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: ���ڸı��б��Ŀ�ʼ��"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: ���ڸı��б���ĩβ��"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "����  :quit<Enter>  �˳� Vim"
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "1 �� %s �� 1 ��"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "1 �� %s �� %d ��"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �� %s �� 1 ��"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �� %s �� %d ��"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "���� %<PRId64> ���� "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "������ 1 �� "
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "������ %<PRId64> �� "
-
-#: ../ops.c:938
-msgid "E748: No previously used register"
-msgstr "E748: û��ǰһ��ʹ�õļĴ���"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "�޷����ƣ���Ϊɾ��"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr "�ı��� 1 ��"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "�ı��� %<PRId64> ��"
-
-#: ../ops.c:2521
-msgid "block of 1 line yanked"
-msgstr "������ 1 �еĿ�"
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "������ 1 ��"
-
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "������ %<PRId64> �еĿ�"
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "������ %<PRId64> ��"
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: �Ĵ��� %s ��û�ж���"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- �Ĵ��� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "��Ч�ļĴ�����"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# �Ĵ���:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: δ֪�ļĴ������� %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"ѡ���� %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> ����; %<PRId64>/"
-"%<PRId64> ���ֽ�"
-
-#: ../ops.c:5105
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"ѡ���� %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> ����; %<PRId64>/"
-"%<PRId64> ���ַ�; %<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s ��; �� %<PRId64>/%<PRId64> ��; �� %<PRId64>/%<PRId64> ����; �� "
-"%<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s ��; �� %<PRId64>/%<PRId64> ��; �� %<PRId64>/%<PRId64> ����; �� "
-"%<PRId64>/%<PRId64> ���ַ�; �� %<PRId64>/%<PRId64> ���ֽ�"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr ""
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr ""
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "��л��ѡ�� Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: δ֪��ѡ��"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: ��֧�ָ�ѡ��"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: �������� modeline ��ʹ��"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr ""
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: = ������Ҫ����"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Termcap �����Ҳ���"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: ��Ч���ַ� <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: �����趨 'term' Ϊ���ַ���"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' �� 'patchmode' ���"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr ""
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr ""
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: ȱ��ð��"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: �ַ�������Ϊ��"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: <%s> ����ȱ������"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: ȱ�ٶ���"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ����ָ��һ�� ' ֵ"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: ����������ʾ�ַ�����ַ�"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: <%c> ��������Ч���ַ�"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: ��Ҫ����"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' ����Ϊ�ջ���� %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: û�н����ı���ʽ����"
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: ��Ŀ����"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ���ҵ���"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: Ԥ�������Ѵ���"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabic ��Ҫ UTF-8����ִ�� ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: ������Ҫ %d ��"
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: ������Ҫ %d ��"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: δ֪��ѡ��: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, fuzzy, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: = ������Ҫ����"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- �ն˱��� ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- ȫ��ѡ��ֵ ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- �ֲ�ѡ��ֵ ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- ѡ�� ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp ����"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': �Ҳ��� %s ��Ӧ���ַ�"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': �ֺź��ж�����ַ�: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"�޷�ִ�� shell"
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell �ѷ���"
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-
-# do not translate
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = \"%s\""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: ��·�����Ҳ����ļ� \"%s\""
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: ��ʽ���ַ�������̫�� %%%c "
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: ��ʽ���ַ�����Ӧ�ó��� %%%c "
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: ��ʽ���ַ��������� ]"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: ��ʽ���ַ������в�֧�ֵ� %%%c "
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: ��ʽ���ַ�����ͷ���в���ȷ�� %%%c "
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: ��ʽ���ַ������в���ȷ�� %%%c "
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' δ�趨"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: �Ҳ���Ŀ¼���ƻ��ǿյ�Ŀ¼����"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: û�и������"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d / %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (����ɾ��)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ��ջ�׶�"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: Quickfix ��ջ����"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "�����б� %d / %d���� %d ������"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: �޷�д�룬���趨ѡ�� 'buftype'"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr "E683: ȱ���ļ�����ģʽ��Ч"
-
-#: ../quickfix.c:2911
-#, c-format
-msgid "Cannot open file \"%s\""
-msgstr "�޷����ļ� \"%s\""
-
-#: ../quickfix.c:3429
-msgid "E681: Buffer is not loaded"
-msgstr "E681: ���������"
-
-#: ../quickfix.c:3487
-msgid "E777: String or List expected"
-msgstr "E777: �˴���Ҫ String ���� List"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: %s%%[] ����������"
-
-#: ../regexp.c:374
-#, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E769: %s[ ��ȱ�� ]"
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: ��ƥ��� %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: ��ƥ��� %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: ��ƥ��� %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: �˴������� \\z("
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: �˴������� \\z1 ��"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ ��ȱ�� ]"
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: �յ� %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: ģʽ̫��"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: ̫�� \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: ̫�� %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: ��ƥ��� \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: %s@ ��������Ч���ַ�"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: ̫�ิ�ӵ� %s{...}s"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: Ƕ�׵� %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: Ƕ�׵� %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: ����ȷ��ʹ�� \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c ǰ��������"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: ��Ч�Ļ���"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: \\z ��������Ч���ַ�"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: %s%%[dxouU] ��������Ч���ַ�"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: %s%% ��������Ч���ַ�"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: %s{...} ���﷨����"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�ⲿ����:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr ""
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
-
-#: ../regexp_nfa.c:2042
-#, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: ̫�� \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
-
-#: ../regexp_nfa.c:6049
-#, fuzzy
-msgid "Could not open temporary log file for writing "
-msgstr "E214: �Ҳ�������д�����ʱ�ļ�"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " V-�滻"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " �滻"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ����"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " ����"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (����)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (�滻)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (V-�滻)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " Hebrew"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " Arabic"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (ճ��)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " ����"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " ���� ��"
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " ���� ��"
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ѡ��"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ѡ�� ��"
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ѡ�� ��"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "��¼��"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: ��Ч�IJ����ַ���: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: �Ѳ��ҵ��ļ���ͷ���Ҳ��� %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: �Ѳ��ҵ��ļ���β���Ҳ��� %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: �� ';' ����Ӧ���� '?' �� '/'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (�����ϴ��г�������)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- �����ļ� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "�Ҳ��� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "��·�� ---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (���г�)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  �Ҳ���"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "���Ұ����ļ�: %s"
-
-#: ../search.c:4216
-#, c-format
-msgid "Searching included file %s"
-msgstr "���Ұ������ļ� %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: ��ǰ��ƥ��"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "���а����ļ������ҵ�"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "û�а����ļ�"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: �Ҳ�������"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: �Ҳ��� pattern"
-
-#: ../search.c:4668
-#, fuzzy
-msgid "Substitute "
-msgstr "1 ���滻��"
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ƴд�ļ���ʽ����"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: �ѽضϵ�ƴд�ļ�"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "%s �� %d �У�����ĺ����ַ�: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "%s �� %d �У�����������̫��: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: �����ļ� FOL��LOW �� UPP �и�ʽ����"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL��LOW �� UPP ���ַ�������Χ"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "ѹ������������"
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: ƴд���δ����"
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "����: �Ҳ��������б� \"%s.%s.spl\" or \"%s.ascii.spl\""
-
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "��ȡƴд�ļ� \"%s\""
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: �⿴����������ƴд�ļ�"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: �ɰ汾��ƴд�ļ�����Ҫ����"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Ϊ���߰汾�� Vim ���õ�ƴд�ļ�"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: ƴд�ļ��д��ڲ�֧�ֵĽ�"
-
-#: ../spell.c:3762
-#, c-format
-msgid "Warning: region %s not supported"
-msgstr "����: ���� %s ��֧��"
-
-#: ../spell.c:4550
-#, c-format
-msgid "Reading affix file %s ..."
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr "���� %s ת��ʧ�ܣ��� %d ��: %s"
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr "��֧�� %s �е�ת��: �� %s �� %s"
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "%s �� %d �У�FLAG ��ֵ��Ч: %s"
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr "%s �� %d �У���ʹ�ñ�־����� FLAG: %s"
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4747
-#, fuzzy, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDMIN ֵ: %s"
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDWORDMAX ֵ: %s"
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDMIN ֵ: %s"
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "%s �� %d �У������ COMPOUNDSYLMAX ֵ: %s"
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "%s �� %d �У������ CHECKCOMPOUNDPATTERN ֵ: %s"
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr "%s �� %d �У��������ĸ��ӿ��г��ֲ�ͬ����ϱ�־: %s"
-
-#: ../spell.c:4850
-#, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��ĸ�����: %s"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-"%s �� %d �У������ BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST ʹ"
-"��: %s"
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr "%s �� %d �У��˴���Ҫ Y �� N: %s"
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr "%s �� %d �����������: %s"
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr "%s �� %d �У��˴���Ҫ REP(SAL) ����"
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr "%s �� %d �У��˴���Ҫ MAP ����"
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr "%s �� %d �У�MAP �д����ظ����ַ�"
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "%s �� %d �У��޷�ʶ����ظ�����: %s"
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%s ��ȱ�� FOL/LOW/UPP ��"
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr "��û�� SYLLABLE �������ʹ���� COMPOUNDSYLMAX"
-
-#: ../spell.c:5236
-msgid "Too many postponed prefixes"
-msgstr "̫���ӳ�ǰ׺"
-
-#: ../spell.c:5238
-msgid "Too many compound flags"
-msgstr "̫����ϱ�־"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr "̫���ӳ�ǰ׺��/����ϱ�־"
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr "%s ��ȱ�� SOFO%s ��"
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr "%s ͬʱ���� SQL �� SOFO ��"
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr "%s �� %d �У���־��������: %s"
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr "%s �� %d �У���Ч�ı�־: %s"
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr "%s ��ֵ����һ�� .aff �ļ���ʹ�õ�ֵ����ͬ"
-
-#: ../spell.c:5602
-#, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "��ȡ�ֵ��ļ� %s ����"
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr "E760: %s ��û�е��ʼ���"
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr "�� %6d ���� %6d ������ - %s"
-
-#: ../spell.c:5691
-#, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��ĵ���: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr "%s �� %d �У��״��ظ��ĵ���: %s"
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr "���� %d ���ظ��ĵ��ʣ��� %s ��"
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr "�����˺��з� ASCII �ַ��� %d �����ʣ��� %s ��"
-
-#: ../spell.c:6115
-#, c-format
-msgid "Reading word file %s ..."
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "%s �� %d �У����ʺ�� /encoding= ���ѱ�����: %s"
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "%s �� %d �У��ظ��� /regions= ���ѱ�����: %s"
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr "%s �� %d �У�̫������: %s"
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr "%s �� %d �У�/ ���ѱ�����: %s"
-
-#: ../spell.c:6224
-#, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "%s �� %d �����������: %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr "%s �� %d �У�����ʶ��ı�־: %s"
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr "�����˺��з� ASCII �ַ��� %d ������"
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "ѹ���� %d/%d ���ڵ㣻ʣ�� %d (%d%%)"
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr "��ȡƴд�ļ�����"
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr "���� soundfolding����"
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "soundfolding ��ĵ�����: %<PRId64>"
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr "��������: %d"
-
-#: ../spell.c:7655
-#, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "д�뽨���ļ� %s ����"
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr "��������ʱ�ڴ�����: %d �ֽ�"
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr "E751: ����ļ������ܺ���������"
-
-#: ../spell.c:7822
-msgid "E754: Only up to 8 regions supported"
-msgstr "E754: ���ֻ֧�� 8 ������"
-
-#: ../spell.c:7846
-#, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E755: %s ������Ч�ķ�Χ"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr "����: ͬʱָ���� compounding �� NOBREAK"
-
-#: ../spell.c:7920
-#, c-format
-msgid "Writing spell file %s ..."
-msgstr "д��ƴд�ļ� %s ����"
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr "��ɣ�"
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' û�� %<PRId64> ��"
-
-#: ../spell.c:8074
-#, fuzzy, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr "�� %s ��ɾ���˵���"
-
-#: ../spell.c:8117
-#, fuzzy, c-format
-msgid "Word '%.*s' added to %s"
-msgstr "�� %s �������˵���"
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr "E763: ƴд�ļ�֮����ַ�����ͬ"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��Ǹ��û�н���"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��Ǹ��ֻ�� %<PRId64> ������"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "�� \"%.*s\" ����"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ֮ǰû��ƴд�滻"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: �Ҳ���: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: ������������ .sug �ļ�: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr ""
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr ""
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr ""
-
-#: ../spell.c:9305
-#, fuzzy, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E47: ��ȡ�����ļ�ʧ��"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr ""
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "���������û�ж����κ��﷨��"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: ���IJ���: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "C���ע��ͬ����"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "û��ͬ��"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "ͬ����ʼ"
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr "�кų�����Χ"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �﷨ͬ����Ŀ (Syntax sync items) ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"ͬ����:"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �﷨��Ŀ ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "��С"
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "���"
-
-#: ../syntax.c:3513
-#, fuzzy
-msgid "; match "
-msgstr "ƥ�� %d"
-
-#: ../syntax.c:3515
-#, fuzzy
-msgid " line breaks"
-msgstr "����һ��"
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: ʹ���˲���ȷ�IJ���"
-
-#: ../syntax.c:4096
-#, fuzzy
-msgid "E844: invalid cchar value"
-msgstr "E474: ���IJ���"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: ʹ���˲���ȷ�IJ���"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �Ҳ��� %s �� region item"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: ��Ҫ�ļ�����"
-
-#: ../syntax.c:4221
-#, fuzzy
-msgid "E847: Too many syntax includes"
-msgstr "E77: �ļ�������"
-
-#: ../syntax.c:4303
-#, fuzzy, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E747: ȱ�� ']': %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: ȱ�� '=': %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: syntax region %s �IJ���̫��"
-
-#: ../syntax.c:4870
-#, fuzzy
-msgid "E848: Too many syntax clusters"
-msgstr "E391: �޴��﷨ cluster: \"%s\""
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: û��ָ��������"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: �Ҳ����ָ�����: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: '%s' ����Ķ�������ʶ��"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: �﷨ͬ��: �����з���ָ��������"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: ���IJ���: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: ȱ�ٵȺ�: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: �յIJ���: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s �����ڴ˳���"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s �������б���ĵ�һ��"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: ����ȷ������: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: ����ȷ�� :syntax ������: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: ���� syncolor.vim ʱ����Ƕ��ѭ��"
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: �Ҳ��� highlight group: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: ����̫��: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: ��������: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: ���趨��, ���� highlight link"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: �����еĵȺ�: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: ȱ�ٵȺ�: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: ȱ�ٲ���: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ���Ϸ���ֵ: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: �����ǰ����ɫ"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: ����ı�����ɫ"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: �������ɫ���ƻ���ֵ: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: �ն˱���̫��: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: ���IJ���: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: ʹ����̫�಻ͬ�ĸ���������"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: �����д��ڲ�����ʾ�ַ�"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: �����к�����Ч�ַ�"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr ""
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: ���� tag ��ջ�ײ�"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: ���� tag ��ջ����"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �ѵ���һ��ƥ��� tag"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �Ҳ��� tag: %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "�ļ�\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: ֻ��һ��ƥ��� tag"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �������һ��ƥ��� tag"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "�ļ� \"%s\" ������"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "�ҵ� tag: %d / %d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " �����"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  �Բ�ͬ��Сд��ʹ�� tag��"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: �ļ� \"%s\" ������"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # �� tag         ��   ��    �� �ļ�/�ı�"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "���� tag �ļ� %s"
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr ""
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Tag �ļ� \"%s\" ��ʽ����"
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "�ڵ� %<PRId64> �ֽ�֮ǰ"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: Tag �ļ�δ����: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: û�� tag �ļ�"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �Ҳ��� tag ģʽ"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �Ҳ��� tag�����Ų£�"
-
-#: ../tag.c:2797
-#, fuzzy, c-format
-msgid "Duplicate field name: %s"
-msgstr "%s �� %d �У��ظ��ĸ�����: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' δ֪�����õ��ڽ��ն���:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "Ĭ��ֵΪ: '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: �޷��� termcap �ļ�"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: �� terminfo ���Ҳ����ն���"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: �� termcap ���Ҳ����ն���"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap ��û�� \"%s\" ��"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �ն���Ҫ���� \"cm\""
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- �ն˰��� ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: �������˳���...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
-msgid "E881: Line count changed unexpectedly"
-msgstr "E787: ����ظı��˻�����"
-
-#: ../undo.c:627
-#, fuzzy, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E212: �޷��򿪲�д���ļ�"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr ""
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr ""
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr ""
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr ""
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr ""
-
-#: ../undo.c:1121
-#, fuzzy, c-format
-msgid "Writing undo file: %s"
-msgstr "д�� viminfo �ļ� \"%s\""
-
-#: ../undo.c:1213
-#, fuzzy, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E297: �����ļ�д�����"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr ""
-
-#: ../undo.c:1292
-#, fuzzy, c-format
-msgid "Reading undo file: %s"
-msgstr "��ȡ�����ļ� %s ����"
-
-#: ../undo.c:1299
-#, fuzzy, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E195: �޷��򿪲���ȡ viminfo �ļ�"
-
-#: ../undo.c:1308
-#, fuzzy, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E753: �Ҳ���: %s"
-
-#: ../undo.c:1313
-#, fuzzy, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E484: �޷����ļ� %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr ""
-
-#: ../undo.c:1497
-#, fuzzy, c-format
-msgid "Finished reading undo file %s"
-msgstr "����ִ�� %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr "��λ����ɵĸı�"
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr "��λ�����µĸı�"
-
-#: ../undo.c:1806
-#, fuzzy, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "�Ҳ��������� %<PRId64>"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: �кŴ���"
-
-#: ../undo.c:2183
-msgid "more line"
-msgstr "�����"
-
-#: ../undo.c:2185
-msgid "more lines"
-msgstr "�����"
-
-#: ../undo.c:2187
-msgid "line less"
-msgstr "�б�ȥ��"
-
-#: ../undo.c:2189
-msgid "fewer lines"
-msgstr "�б�ȥ��"
-
-#: ../undo.c:2193
-msgid "change"
-msgstr "�з����ı�"
-
-#: ../undo.c:2195
-msgid "changes"
-msgstr "�з����ı�"
-
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s��%s #%<PRId64>  %s"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr "before"
-
-#: ../undo.c:2228
-msgid "after"
-msgstr "after"
-
-#: ../undo.c:2325
-msgid "Nothing to undo"
-msgstr "�޿ɳ���"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr ""
-
-#: ../undo.c:2360
-#, fuzzy, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> ��; "
-
-#: ../undo.c:2372
-#, fuzzy
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E407: %s �����ڴ˳���"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: �������"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: �Ҳ���Ҫ��������"
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"��������: "
-
-#: ../version.c:627
-#, fuzzy
-msgid ""
-"\n"
-"Extra patches: "
-msgstr "�ⲿ����:\n"
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "�޸��� "
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"����"
-
-#: ../version.c:649
-msgid "by "
-msgstr "�� "
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"���Ͱ汾 "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "��ͼ�ν��档"
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr "  ��ʹ��(+)�벻��ʹ��(-)�Ĺ���:\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "     ϵͳ vimrc �ļ�: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "     �û� vimrc �ļ�: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " �ڶ��û� vimrc �ļ�: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " �����û� vimrc �ļ�: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "      �û� exrc �ļ�: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  �ڶ��û� exrc �ļ�: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "         $VIM Ԥ��ֵ: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "  $VIMRUNTIME Ԥ��ֵ: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "���뷽ʽ: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "���ӷ�ʽ: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ���԰汾"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMproved"
-
-#: ../version.c:769
-msgid "version "
-msgstr "�汾 "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "���� Bram Moolenaar ��"
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim �ǿ����ɷַ��Ŀ���Դ��������"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "�����ڸɴ�Ŀ�����ͯ��"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "����  :help iccf<Enter>       �鿴˵��        "
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "����  :q<Enter>               �˳�            "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "����  :help<Enter>  ��  <F1>  �鿴���߰���    "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "����  :help version7<Enter>   �鿴�汾��Ϣ    "
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "������ Vi ����ģʽ"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "����  :set nocp<Enter>        �ָ�Ĭ�ϵ� Vim  "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "����  :help cp-default<Enter> �鿴���˵��    "
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "���� Vim �Ŀ�����"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "��Ϊ Vim ��ע���û���"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "����  :help sponsor<Enter>    �鿴˵��        "
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "����  :help register<Enter>   �鿴˵��        "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�˵�  Help->Sponsor/Register  �鿴˵��           "
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�Ѿ�ֻʣһ��������"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: û��Ԥ������"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����ͬʱ���� topleft �� botright �ָ�"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: �������ָ��ʱ������ת"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:1810
-#, fuzzy
-msgid "E813: Cannot close autocmd window"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:1814
-#, fuzzy
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E444: ���ܹر����һ������"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: ���������иı������"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: ��괦û���ļ���"
-
-#~ msgid "Patch file"
-#~ msgstr "Patch �ļ�"
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "ȷ��(&O)\n"
-#~ "ȡ��(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: û�е� Vim ������������"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: �޷����͵� %s"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �޷���ȡ��������Ӧ"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �޷����͵��ͻ���"
-
-#~ msgid "Save As"
-#~ msgstr "����Ϊ"
-
-#~ msgid "Edit File"
-#~ msgstr "�༭�ļ�"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�Ҳ���)"
-
-#~ msgid "Source Vim script"
-#~ msgstr "ִ�� Vim �ű�"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "���´��ڱ༭�ļ�"
-
-#~ msgid "Append File"
-#~ msgstr "׷���ļ�"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "�����: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "�����ض���"
-
-#~ msgid "Save View"
-#~ msgstr "������ͼ"
-
-#~ msgid "Save Session"
-#~ msgstr "����Ự"
-
-#~ msgid "Save Setup"
-#~ msgstr "�����趨"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: �˰汾�޸����ַ�(digraph)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "�ӱ�׼�����ȡ..."
-
-#~ msgid "[NL found]"
-#~ msgstr "[�ҵ� NL]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�Ѽ���]"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans ������δ�޸ĵĻ�����д��"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans �����������������"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork �ᶪʧ (��� ! ǿ��ִ��)"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: �޷�����ͼ�ν���"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: �޷���ȡ�ļ� \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: �޷�����ͼ�ν��棬�Ҳ�����Ч������"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: ���� 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' ��ֵ��Ч"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: �޷�������ɫ %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "�ڹ�괦û��ƥ�䣬������һ��"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<�޷���>"
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �޷���ȡ���� %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: �޷����ص�ǰĿ¼"
-
-#~ msgid "Pathname:"
-#~ msgstr "·��:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: �޷���ȡ��ǰĿ¼"
-
-#~ msgid "OK"
-#~ msgstr "ȷ��"
-
-#~ msgid "Cancel"
-#~ msgstr "ȡ��"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "����������: �޷���ȡ����ͼ��ļ��δ�С"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim �Ի���"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: ����ͬʱʹ����Ϣ�ͻص����������� BalloonEval"
-
-#~ msgid "Vim dialog..."
-#~ msgstr "Vim �Ի���..."
-
-#~ msgid "Input _Methods"
-#~ msgstr "���뷨(_M)"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - ���Һ��滻..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - ����..."
-
-#~ msgid "Find what:"
-#~ msgstr "��������:"
-
-#~ msgid "Replace with:"
-#~ msgstr "�滻Ϊ:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "ƥ�������Ĵ�"
-
-#~ msgid "Match case"
-#~ msgstr "ƥ���Сд"
-
-#~ msgid "Direction"
-#~ msgstr "����"
-
-#~ msgid "Up"
-#~ msgstr "����"
-
-#~ msgid "Down"
-#~ msgstr "����"
-
-#~ msgid "Find Next"
-#~ msgstr "������һ��"
-
-#~ msgid "Replace"
-#~ msgstr "�滻"
-
-#~ msgid "Replace All"
-#~ msgstr "ȫ���滻"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: �ӻỰ�������յ� \"die\" ����\n"
-
-#~ msgid "Close"
-#~ msgstr "�ر�"
-
-#~ msgid "New tab"
-#~ msgstr "�½���ǩ"
-
-#~ msgid "Open Tab..."
-#~ msgstr "�򿪱�ǩ..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �����ڱ�����شݻ�\n"
-
-#~ msgid "Font Selection"
-#~ msgstr "ѡ������"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "ʹ�� CUT_BUFFER0 ��ȡ����ѡ��"
-
-#~ msgid "&Filter"
-#~ msgstr "����(&F)"
-
-#~ msgid "&Cancel"
-#~ msgstr "ȡ��(&C)"
-
-#~ msgid "Directories"
-#~ msgstr "Ŀ¼"
-
-#~ msgid "Filter"
-#~ msgstr "������"
-
-#~ msgid "&Help"
-#~ msgstr "����(&H)"
-
-#~ msgid "Files"
-#~ msgstr "�ļ�"
-
-#~ msgid "&OK"
-#~ msgstr "ȷ��(&O)"
-
-#~ msgid "Selection"
-#~ msgstr "ѡ��"
-
-#~ msgid "Find &Next"
-#~ msgstr "������һ��(&N)"
-
-#~ msgid "&Replace"
-#~ msgstr "�滻(&R)"
-
-#~ msgid "Replace &All"
-#~ msgstr "ȫ���滻(&A)"
-
-#~ msgid "&Undo"
-#~ msgstr "����(&U)"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �Ҳ������ڱ��� \"%s\""
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: ��֧�ֵIJ���: \"-%s\"����ʹ�� OLE �汾��"
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: �޷��� MDI Ӧ�ó����д򿪴���"
-
-#~ msgid "Close tab"
-#~ msgstr "�رձ�ǩ"
-
-#~ msgid "Open tab..."
-#~ msgstr "�򿪱�ǩ..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "�����ַ��� (ʹ�� '\\\\' ������ '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "���Һ��滻�ַ��� (ʹ�� '\\\\' ������ '\\')"
-
-#~ msgid "Not Used"
-#~ msgstr "δʹ��"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Ŀ¼\t*.nothing\n"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �޷�������ɫ���ijЩ��ɫ���ܲ���ȷ"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Fontset %s ȱ�������ַ���������:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Fontset ����: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "'%s' ���ǹ̶����ȵ�����"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Fontset ����: %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "����0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "����1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "����%<PRId64>�Ŀ��Ȳ�������0������\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "����0�Ŀ��ȣ�%<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "����1�Ŀ���: %<PRId64>\n"
-#~ "\n"
-
-#~ msgid "Invalid font specification"
-#~ msgstr "ָ������Ч������"
-
-#~ msgid "&Dismiss"
-#~ msgstr "ȡ��(&D)"
-
-#~ msgid "no specific match"
-#~ msgstr "�Ҳ���ƥ�����"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - ����ѡ����"
-
-#~ msgid "Name:"
-#~ msgstr "����:"
-
-#~ msgid "Encoding:"
-#~ msgstr "����:"
-
-#~ msgid "Font:"
-#~ msgstr "����:"
-
-#~ msgid "Style:"
-#~ msgstr "���:"
-
-#~ msgid "Size:"
-#~ msgstr "�ߴ�:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: Hangul automata ����"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ����"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: �޷��� cscope ���ݿ�: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: �޷���ȡ cscope ���ݿ���Ϣ"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: �Ѵﵽ cscope �����������"
-
-#~ msgid ""
-#~ "???: Sorry, this command is disabled, the MzScheme library could not be "
-#~ "loaded."
-#~ msgstr "???: ��Ǹ����������ã��޷����� MzScheme ��"
-
-#~ msgid "invalid expression"
-#~ msgstr "��Ч�ı���ʽ"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "����ʱû�����ñ���ʽ"
-
-#~ msgid "hidden option"
-#~ msgstr "���ص�ѡ��"
-
-#~ msgid "unknown option"
-#~ msgstr "δ֪��ѡ��"
-
-#~ msgid "window index is out of range"
-#~ msgstr "��������������Χ"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "�޷��򿪻�����"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "�޷����泷����Ϣ"
-
-#~ msgid "cannot delete line"
-#~ msgstr "�޷�ɾ����"
-
-#~ msgid "cannot replace line"
-#~ msgstr "�޷��滻��"
-
-#~ msgid "cannot insert line"
-#~ msgstr "�޷�������"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "�ַ������ܰ�������(NL)"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim ����: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim ����"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "��������Ч"
-
-#~ msgid "window is invalid"
-#~ msgstr "������Ч"
-
-#~ msgid "linenr out of range"
-#~ msgstr "�кų�����Χ"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "�������� sandbox ��ʹ��"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr "E263: ��Ǹ����������ã��޷����� Python �⡣"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: ���ܵݹ���� Python"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "����ɾ�� OutputObject ����"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace ����������"
-
-#~ msgid "invalid attribute"
-#~ msgstr "��������"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() ��Ҫ�ַ����б�������"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: ��ʼ�� I/O �������"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "��ͼ�����ѱ�ɾ���Ļ�����"
-
-#~ msgid "line number out of range"
-#~ msgstr "�кų�����Χ"
-
-#~ msgid "<buffer object (deleted) at %8lX>"
-#~ msgstr "<����������(��ɾ��): %8lX>"
-
-#~ msgid "invalid mark name"
-#~ msgstr "��Ч�ı������"
-
-#~ msgid "no such buffer"
-#~ msgstr "�޴˻�����"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "��ͼ�����ѱ�ɾ���Ĵ���"
-
-#~ msgid "readonly attribute"
-#~ msgstr "ֻ������"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "���λ���ڻ�������"
-
-#~ msgid "<window object (deleted) at %.8lX>"
-#~ msgstr "<���ڶ���(��ɾ��): %.8lX>"
-
-#~ msgid "<window object (unknown) at %.8lX>"
-#~ msgstr "<���ڶ���(δ֪): %.8lX>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<���� %d>"
-
-#~ msgid "no such window"
-#~ msgstr "�޴˴���"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr "E266: ��Ǹ����������ã��޷����� Ruby ��"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: δ֪�� longjmp ״̬ %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "�л�ʵ��/����"
-
-#~ msgid "Show base class of"
-#~ msgstr "��ʾ base class of:"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "��ʾ�����ǵij�Ա����"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "�ָ�: ���ļ�"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "�ָ�: �Ӷ���"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "�ָ�: ��������Ŀ"
-
-#~ msgid "Retrieve"
-#~ msgstr "�ָ�"
-
-#~ msgid "Show source of"
-#~ msgstr "��ʾԴ����: "
-
-#~ msgid "Find symbol"
-#~ msgstr "���� symbol"
-
-#~ msgid "Browse class"
-#~ msgstr "��� class"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "��ʾ��ι�ϵ����"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "��ʾ restricted ��ι�ϵ�� class"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ���"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ��˭�ο�:"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ��"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref ��˭ʹ��:"
-
-#~ msgid "Show docu of"
-#~ msgstr "��ʾ�ļ�: "
-
-#~ msgid "Generate docu for"
-#~ msgstr "�����ļ�: "
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "�������ӵ� SNiFF+�����黷������ ($PATH ���������ҵ� sniffemacs)\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: ��ȡ����. ȡ������"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ Ŀǰ"
-
-#~ msgid "not "
-#~ msgstr "δ"
-
-#~ msgid "connected"
-#~ msgstr "������"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ����ȷ�� SNiff+ ����: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: ���ӵ� SNiFF+ ʧ��"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: δ���ӵ� SNiFF+"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: ���� SNiFF+ �Ļ�����"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: д����󡣽�������"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "��Ч�Ļ�������"
-
-#~ msgid "not implemented yet"
-#~ msgstr "��δʵ��"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "�޷��趨��"
-
-#~ msgid "mark not set"
-#~ msgstr "û���趨���"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�� %d �� �� %d ��"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "�޷�����/׷����"
-
-#~ msgid "unknown flag: "
-#~ msgstr "δ֪�ı�־: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "δ֪�� vim ѡ��"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "�����ж�"
-
-#~ msgid "vim error"
-#~ msgstr "vim ����"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "�޷�����������/��������: ���󽫱�ɾ��"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "�޷�ע��ص�����: ������/�����ѱ�ɾ��"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr "E280: TCL ���ش���: reflist �𻵣����뱨��� vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr "�޷�ע��ص�����: �Ҳ���������/��������"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr "E571: ��Ǹ����������ã��޷����� Tcl ��"
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr "E281: TCL ����: �˳�����ֵ�������������뱨��� vim-dev@vim.org"
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: �˳�����ֵ %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "�޷���ȡ��"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "�޷�ע�������������"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248:  �޷��������Ŀ�ij���"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ʹ������Ч�ķ����� id: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM ʵ��ע������������ɾ����"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "�� Vim ����ʱû�м��� diff ����"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ����: �޷��� NetBeans ������ gvim\n"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tע��� gvim �� OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tȡ�� OLE �е� gvim ע��"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tʹ��ͼ�ν��� (ͬ \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  ��  --nofork\tǰ̨: ����ͼ�ν���ʱ�� fork"
-
-#~ msgid "-V[N]\t\tVerbose level"
-#~ msgstr "-V[N]\t\tVerbose �ȼ�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t��ʹ�� newcli ���򿪴���"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tʹ�� <device> �����������"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tʹ�� <gvimrc> ����κ� .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�༭���ܵ��ļ�"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\t�� vim ��ָ���� X-server ����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t�����ӵ� X Server"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t���п��ܣ��� Vim �������ϱ༭�ļ� <files>"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>  ͬ --remote ����ȴ��ļ���ɱ༭"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-wait-silent <files>  ͬ�ϣ��Ҳ���������ʱ����Թ"
-
-#~ msgid "--remote-tab <files>  As --remote but open tab page for each file"
-#~ msgstr "--remote-tab <files>  ͬ --remote ����ÿ���ļ���һ����ǩҳ"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\t�ͳ� <keys> �� Vim ���������˳�"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�� Vim ���������� <expr> ��ֵ����ӡ���"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\t�г����õ� Vim ���������Ʋ��˳�"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\t���͵����Ϊ Vim ������ <name>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (Motif �汾) ��ʶ��IJ���:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (neXtaw �汾) ��ʶ��IJ���:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (Athena �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t�� <display> ������ vim"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t����������"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <name>\t\t��ȡ Resource ʱ�� vim ��Ϊ <name>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (��δʵ��)\n"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\tʹ�� <color> ��Ϊ����ɫ (Ҳ���� -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\tʹ�� <color> ��Ϊһ��������ɫ (Ҳ���� -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\tʹ�� <font> ��Ϊһ������ (Ҳ���� -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\tʹ�� <font> ��Ϊ��������"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\tʹ�� <font> ��Ϊб������"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\tʹ�� <geom> ��Ϊ��ʼλ�� (Ҳ���� -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t�趨�߿����Ϊ <width> (Ҳ���� -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr "-scrollbarwidth <width> �趨����������Ϊ <width> (Ҳ���� -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <height>\t�趨�˵����߶�Ϊ <height> (Ҳ���� -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tʹ�÷��� (Ҳ���� -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t��ʹ�÷��� (Ҳ���� +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t�趨ָ������Դ"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (RISC OS �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <number>\t���ڳ�ʼ����"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <number>\t���ڳ�ʼ�߶�"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim (GTK+ �汾) ��ʶ��IJ���:\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t�� <display> ������ vim (Ҳ���� --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t�����������������ڵĴ��ڽ�ɫ��"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t����һ�� GTK �����д� Vim"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <parent title>\t�ڸ�Ӧ�ó����д� Vim"
-
-#~ msgid "No display"
-#~ msgstr "û�� display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": ����ʧ�ܡ�\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": ����ʧ�ܡ����Ա���ִ��\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �� %d �ѱ༭"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "û�� display: ���ͱ���ʽʧ�ܡ�\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ���ͱ���ʽʧ�ܡ�\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ��Ч�Ĵ���ҳ"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �޷���������������"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �޷������뷨"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: ����: �޷��趨���뷨���ͷŻص�����"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ���뷨��֧���κη��"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ���뷨��֧���ҵ�Ԥ�༭����"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: over-the-spot �����Ҫ Fontset"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: ��� GTK+ �� 1.2.3 �ɡ�״̬�������á�"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: ���뷨������δ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�����ڸð汾�� Vim ��ʹ��]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "˺�´˲˵�"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "ѡ��Ŀ¼�Ի���"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�����ļ��Ի���"
-
-#~ msgid "Open File dialog"
-#~ msgstr "���ļ��Ի���"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: ��Ǹ������̨ģʽ��û���ļ������"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: ���ڱ����ļ�����\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ������\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "����: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[�ֽ�] �ܹ� alloc-free %<PRIu64>-%<PRIu64>��ʹ���� %<PRIu64>���߷�ʹ�� "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[����] �ܹ� re/malloc(): %<PRIu64>���ܹ� free()': %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: �����"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �ڲ�����: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ��Ч�������״"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "��������: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "��������һ��: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "�������벻ƥ�䣡"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "�޷����ӵ� Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "�޷����ӵ� Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: NetBeans ������Ϣ�ļ��д���ķ���ģʽ: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "�� Netbeans �׽��ֶ�ȡ"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: ������ %<PRId64> ��ʧ NetBeans ����"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ��ֵ���ܲ�����"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "�ͷ��� %<PRId64> ��"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: ��ͼ�ν����в��ܸı��ն�"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: ���� \":gui\" ����ͼ�ν���"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: �� GTK+ 2 ͼ�ν����в��ܸ���"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: ��������"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �޷�ѡ�� Fontset"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ���� Fontset"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �޷�ѡ�������"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ��Ч�Ŀ�����"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ��֧�����"
-
-#~ msgid "cannot open "
-#~ msgstr "���ܴ�"
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ���ܴ򿪴���!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "��Ҫ Amigados �汾 2.04 ����\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "��Ҫ %s �汾 %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "���ܴ� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "���ܴ��� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim ����ֵ: %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�����л�����̨(console)ģʽ !?\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ��������̨(console)??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: ������ -f ѡ��ִ�� shell"
-
-#~ msgid "Cannot execute "
-#~ msgstr "����ִ�� "
-
-#~ msgid "shell "
-#~ msgstr "shell "
-
-#~ msgid " returned\n"
-#~ msgstr " �ѷ���\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE ̫С"
-
-#~ msgid "I/O ERROR"
-#~ msgstr "I/O ����"
-
-#~ msgid "Message"
-#~ msgstr "��Ϣ"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ���� 80, ����ִ���ⲿ����"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: ѡ���ӡ��ʧ��"
-
-#~ msgid "to %s on %s"
-#~ msgstr "�� %s �� %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: δ֪�Ĵ�ӡ������: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: ��ӡ����: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "��ӡ '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: �ַ��� \"%s\" ���ܶ�Ӧ����\"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: ����ȷ���ַ� '%c' �������������� \"%s\" ��"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: ˫���źţ��˳���\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: ���ص������ź�(deadly signal) %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: ���ص������ź�(deadly signal)\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "�� X display ��ʱ %<PRId64> ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X ����\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "���� X display ʧ��"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "�� X display ��ʱ"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷�ִ�� shell sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷������ܵ�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�޷� fork\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�����ѽ���\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ��ʧ�˵� ICE ������"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "�� X display ʧ��"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ���� save-yourself ����"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ������"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE ���Ӽ���ʧ��"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection ����ʧ��: %s"
-
-#~ msgid "At line"
-#~ msgstr "���к� "
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "�޷����� vim32.dll��"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM ����"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "�޷������� DLL �ĺ���ָ��!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "Shell ���� %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: ���ص� %s �¼�\n"
-
-#~ msgid "close"
-#~ msgstr "�ر�"
-
-#~ msgid "logoff"
-#~ msgstr "ע��"
-
-#~ msgid "shutdown"
-#~ msgstr "�ػ�"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: �Ҳ�������"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "����� $PATH ���Ҳ��� VIMRUN.EXE��\n"
-#~ "�ⲿ����ִ����Ϻ󽫲�����ͣ��\n"
-#~ "��һ��˵����� :help win32-vimrun"
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim ����"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "��֧�� %s �е�ת��"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: ʹ���˲���ȷ�IJ���"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Tag �ļ�·�����ض�Ϊ %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "������ shell\n"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "�޷������������"
-
-#~ msgid "number changes  time"
-#~ msgstr "  ���    �ı�  ʱ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 λͼ�ν���汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 λͼ�ν���汾"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " Win32s ģʽ"
-
-#~ msgid " with OLE support"
-#~ msgstr " �� OLE ֧��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 λ����̨�汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 λ����̨�汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 λ MS-DOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 λ MS-DOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "RISC OS �汾"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "���Ͱ汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�����汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "С�Ͱ汾 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "΢�Ͱ汾 "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "�� GTK2-GNOME ͼ�ν��档"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "�� GTK-GNOME ͼ�ν��档"
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "�� GTK2 ͼ�ν��档"
-
-#~ msgid "with GTK GUI."
-#~ msgstr "�� GTK ͼ�ν��档"
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "�� X11-Motif ͼ�ν��档"
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "�� X11-neXtaw ͼ�ν��档"
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "�� X11-Athena ͼ�ν��档"
-
-#~ msgid "with Photon GUI."
-#~ msgstr "�� Photon ͼ�ν��档"
-
-#~ msgid "with GUI."
-#~ msgstr "��ͼ�ν��档"
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "�� Carbon ͼ�ν��档"
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "�� Cocoa ͼ�ν��档"
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "��(��ͳ)ͼ�ν��档"
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "    ϵͳ gvimrc �ļ�: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    �û� gvimrc �ļ�: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "�ڶ��û� gvimrc �ļ�: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "�����û� gvimrc �ļ�: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "        ϵͳ�˵��ļ�: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "������: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�˵�  Help->Orphans           �鿴˵��           "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "��ģʽ���У��������ּ�����"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "�˵�  Edit->Global Settings->Toggle Insert Mode  "
-
-#, fuzzy
-#~ msgid "                              for two modes      "
-#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
-
-#, fuzzy
-#~ msgid "                              for Vim defaults   "
-#~ msgstr " # pid    ���ݿ�����                          prepend path\n"
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "����: ��⵽ Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "����  :help windows95<Enter>  �鿴���˵��    "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: �޷����ؿ� %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr "��Ǹ�����������: �޷����� Perl �⡣"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "�ö�� Vim �༭(&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�õ��� Vim �༭(&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "�� Vim �Ƚ�(diff)"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "�� Vim �༭(&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�õ�ǰ�� Vim �༭ - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�� Vim �༭ѡ�е��ļ�"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "��������ʧ��: ���� gvim �Ƿ���·���У�"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ����"
-
-#~ msgid "Path length too long!"
-#~ msgstr "·��̫����"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: δ֪�� Fontset: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: δ֪������: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: ���� \"%s\" ���ǵȿ�����"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �޷����ؿ⺯�� %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �޷�ʹ�� Hebrew: ����ʱû������\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �޷�ʹ�� Farsi: ����ʱû������\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: �޷�ʹ�� Arabic: ����ʱû������\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: û������ \"%s\" ����ע��ķ�����"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �޷��� display"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: �յ���Ч�ı���ʽ"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans �������ı�ֻ���ļ�"
-
-#~ msgid "Affix flags ignored when PFXPOSTPONE used in %s line %d: %s"
-#~ msgstr "%s �� %d �У�ʹ�� PFXPOSTPONE ʱ���ӱ�־������: %s"
-
-#~ msgid "[No file]"
-#~ msgstr "[���]"
-
-#~ msgid "[Error List]"
-#~ msgstr "[�����б�]"
-
-#~ msgid "E106: Unknown variable: \"%s\""
-#~ msgstr "E106: δ����ı���: \"%s\""
-
-#~ msgid "function "
-#~ msgstr "���� "
-
-#~ msgid "E130: Undefined function: %s"
-#~ msgstr "E130: ���� %s �����"
-
-#~ msgid "Run Macro"
-#~ msgstr "ִ�к�"
-
-#~ msgid "E242: Color name not recognized: %s"
-#~ msgstr "E242: %s Ϊ����ʶ�����ɫ����"
-
-#~ msgid "error reading cscope connection %d"
-#~ msgstr "��ȡ cscope ���� %d ʱ����"
-
-#~ msgid "E260: cscope connection not found"
-#~ msgstr "E260: �Ҳ��� cscope ����"
-
-#~ msgid "cscope connection closed"
-#~ msgstr "cscope �����ѹر�"
-
-#~ msgid "couldn't malloc\n"
-#~ msgstr "����ʹ�� malloc\n"
-
-#~ msgid "%2d %-5ld  %-34s  <none>\n"
-#~ msgstr "%2d %-5ld  %-34s  <��>\n"
-
-#~ msgid "E249: couldn't read VIM instance registry property"
-#~ msgstr "E249: ���ܶ�ȡ VIM �� ע�������"
-
-#~ msgid "\"\n"
-#~ msgstr "\"\n"
-
-#~ msgid "--help\t\tShow Gnome arguments"
-#~ msgstr "--help\t\t��ʾ Gnome ��ز���"
-
-#~ msgid "[string too long]"
-#~ msgstr "[�ַ���̫��]"
-
-#~ msgid "Hit ENTER to continue"
-#~ msgstr "�밴 ENTER ����"
-
-#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-#~ msgstr " (RET/BS: ����/����һ��, �ո�/b: һҳ, d/u: ��ҳ, q: �˳�)"
-
-#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-#~ msgstr " (RET: ����һ��, �հ׼�: һҳ, d: ��ҳ, q: �˳�)"
-
-#~ msgid "E361: Crash intercepted; regexp too complex?"
-#~ msgstr "E361: ����ִ��; regular expression ̫����?"
-
-#~ msgid "E363: pattern caused out-of-stack error"
-#~ msgstr "E363: regular expression ��ɶ�ջ�ù�Ĵ���"
-
-#~ msgid " BLOCK"
-#~ msgstr " ��"
-
-#~ msgid " LINE"
-#~ msgstr " ��"
-
-#~ msgid "Enter nr of choice (<CR> to abort): "
-#~ msgstr "���� nr ��ѡ�� (<CR> �˳�): "
-
-#~ msgid "Linear tag search"
-#~ msgstr "���Բ��ұ�ǩ (Tags)"
-
-#~ msgid "Binary tag search"
-#~ msgstr "�����Ʋ���(Binary search) ��ǩ(Tags)"
-
-#~ msgid "with BeOS GUI."
-#~ msgstr "ʹ�� BeOS ͼ�ν��档"
diff --git a/src/nvim/po/zh_TW.UTF-8.po b/src/nvim/po/zh_TW.UTF-8.po
index 79e09c83d1..af8c3fff48 100644
--- a/src/nvim/po/zh_TW.UTF-8.po
+++ b/src/nvim/po/zh_TW.UTF-8.po
@@ -2725,11 +2725,6 @@ msgstr "E49: 錯誤的捲動大小"
 msgid "E901: Job table is full"
 msgstr ""
 
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
 #: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
@@ -4304,12 +4299,6 @@ msgstr "行 %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 暫存器名稱錯誤: '%s'"
 
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"正體中文訊息維護者: Francis S.Lin <piaip@csie.ntu.edu."
-"tw>,                                 Cecil Sheng   <b7506022@csie.ntu.edu.tw>"
-
 #: ../message.c:986
 msgid "Interrupt: "
 msgstr "已中斷: "
diff --git a/src/nvim/po/zh_TW.po b/src/nvim/po/zh_TW.po
deleted file mode 100644
index 07d510c0c6..0000000000
--- a/src/nvim/po/zh_TW.po
+++ /dev/null
@@ -1,7910 +0,0 @@
-# Traditional Chinese Translation for Vim	vim:set foldmethod=marker:
-#
-# Do ":help uganda"  in Vim to read copying and usage conditions.
-# Do ":help credits" in Vim to see a list of people who contributed.
-#
-# FIRST AUTHOR  Francis S.Lin <piaip@csie.ntu.edu.tw>, 2000
-# FIRST RELEASE Thu Jun 14 14:24:17 CST 2001
-#
-# Last update: 2005/01/27 07:03 (6.3)
-#
-# To update, search pattern:		/fuzzy\|^msgstr ""\(\n"\)\@!
-#
-# DO NOT USE WORDS WITH BACKSLASH ('\') AS SECOND BYTE OF BIG5 CHARS
-# EG: '�\', # �\�\�# [blacklist: �\�\�\�\�\�\�\�\�\�\�\�\�\�\�\�\]
-# [blacklist: �\�\�\�\�\�\�\�\�\�\�\�\�\�\]
-# you can replace these characters with alternative words.
-# THIS WILL CAUSE INCOMPATIBLE ON gettext 0.10.36+
-#
-# Note (2005.01.27):
-#  A bug was found for UTF8 mode.
-#   > msgid "%<PRId64> fewer lines" "on %<PRId64> lines"
-#   If you don't put more (at least 2) spaces after %<PRId64>
-#   gvim/win32 will crash (no reason).
-#   So please change [��"] to [�� "]
-#
-# Q. How to use UTF8 mode on Win32?
-# A. A simple configuration: 
-#   set encoding=utf-8; let $LANG='zh_TW.UTF-8'; 
-#   (set langmenu=none or ..)
-#   set fileencodings=ucs-bom,utf-8,japan,taiwan,prc
-#   set fileencoding=taiwan (or utf-8)
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Vim(Traditional Chinese)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: Mon Feb 19 22:49:21 CST 2001\n"
-"Last-Translator: Hung-Te Lin <piaip@csie.ntu.edu.tw>\n"
-"Language-Team: Hung-Te Lin <piaip@csie.ntu.edu.tw>, Cecil Sheng "
-"<b7506022@csie.ntu.edu.tw>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=big5\n"
-"Content-Transfer-Encoding: 8-bit\n"
-
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "�L�k�ǰe�^���T��"
-
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
-
-#: ../buffer.c:92
-msgid "[Location List]"
-msgstr ""
-
-#: ../buffer.c:93
-msgid "[Quickfix List]"
-msgstr ""
-
-#: ../buffer.c:94
-msgid "E855: Autocommands caused command to abort"
-msgstr ""
-
-#: ../buffer.c:135
-msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: �L�k�t�m����w�İϡA���}�{��..."
-
-#: ../buffer.c:138
-msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: �L�k�t�m�w�İϡA�ϥΥt�@�ӽw�İ�...."
-
-#: ../buffer.c:763
-msgid "E515: No buffers were unloaded"
-msgstr "E515: �S���������w��"
-
-#: ../buffer.c:765
-msgid "E516: No buffers were deleted"
-msgstr "E516: �S���R������w��"
-
-#: ../buffer.c:767
-msgid "E517: No buffers were wiped out"
-msgstr "E517: �S���M������w��"
-
-#: ../buffer.c:772
-msgid "1 buffer unloaded"
-msgstr "�w����@�ӽw�İ�"
-
-#: ../buffer.c:774
-#, c-format
-msgid "%d buffers unloaded"
-msgstr "�w���� %d �ӽw�İ�"
-
-#: ../buffer.c:777
-msgid "1 buffer deleted"
-msgstr "�w�R���@�ӽw�İ�"
-
-#: ../buffer.c:779
-#, c-format
-msgid "%d buffers deleted"
-msgstr "�w�R�� %d �ӽw�İ�"
-
-#: ../buffer.c:782
-msgid "1 buffer wiped out"
-msgstr "�w�R���@�ӽw�İ�"
-
-#: ../buffer.c:784
-#, c-format
-msgid "%d buffers wiped out"
-msgstr "�w�R�� %d �ӽw�İ�"
-
-#: ../buffer.c:806
-msgid "E90: Cannot unload last buffer"
-msgstr "E90: �L�k����̫�@�ӽw�İ�"
-
-#: ../buffer.c:874
-msgid "E84: No modified buffer found"
-msgstr "E84: �S���ק�L���w�İ�"
-
-#. back where we started, didn't find anything.
-#: ../buffer.c:903
-msgid "E85: There is no listed buffer"
-msgstr "E85: �S���C�X���w��"
-
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: �w�� %<PRId64> ���s�b"
-
-#: ../buffer.c:915
-msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: �L�k�������᭱���w�İ�"
-
-#: ../buffer.c:917
-msgid "E88: Cannot go before first buffer"
-msgstr "E88: �L�k�������e�����w��"
-
-#: ../buffer.c:945
-#, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: �w���L�w�� %<PRId64> ���|���s�� (�i�� ! �j�����)"
-
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
-msgid "W14: Warning: List of file names overflow"
-msgstr "W14: ĵ�i: �ɦW�L�h"
-
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �䤣��� %<PRId64> �ӽw�İ�"
-
-#: ../buffer.c:1798
-#, c-format
-msgid "E93: More than one match for %s"
-msgstr "E93: ���@�ӥH�W�� %s"
-
-#: ../buffer.c:1800
-#, c-format
-msgid "E94: No matching buffer for %s"
-msgstr "E94: �䤣�� %s"
-
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "�� %<PRId64>"
-
-#: ../buffer.c:2233
-msgid "E95: Buffer with this name already exists"
-msgstr "E95: �w���w�İϨϥγo�ӦW�r"
-
-#: ../buffer.c:2498
-msgid " [Modified]"
-msgstr " [�w�ק�]"
-
-#: ../buffer.c:2501
-msgid "[Not edited]"
-msgstr "[���s��]"
-
-#: ../buffer.c:2504
-msgid "[New file]"
-msgstr "[�s�ɮ�]"
-
-#: ../buffer.c:2505
-msgid "[Read errors]"
-msgstr "[Ū�����~]"
-
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
-msgid "[RO]"
-msgstr "[��Ū]"
-
-#: ../buffer.c:2507 ../fileio.c:1807
-msgid "[readonly]"
-msgstr "[��Ū]"
-
-#: ../buffer.c:2524
-#, c-format
-msgid "1 line --%d%%--"
-msgstr "��� 1 --%d%%--"
-
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "��� %<PRId64> --%d%%--"
-
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�� %<PRId64>/%<PRId64> --%d%%-- �� "
-
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
-#, fuzzy
-msgid "[No Name]"
-msgstr "[���R�W]"
-
-#. must be a help buffer
-#: ../buffer.c:2667
-msgid "help"
-msgstr "[���U����]"
-
-#: ../buffer.c:3225 ../screen.c:4883
-#, fuzzy
-msgid "[Help]"
-msgstr "[���U����]"
-
-#: ../buffer.c:3254 ../screen.c:4887
-msgid "[Preview]"
-msgstr "[�w��]"
-
-#: ../buffer.c:3528
-msgid "All"
-msgstr "����"
-
-#: ../buffer.c:3528
-msgid "Bot"
-msgstr "����"
-
-#: ../buffer.c:3531
-msgid "Top"
-msgstr "����"
-
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# �w�İϦC��:\n"
-
-#: ../buffer.c:4289
-msgid "[Scratch]"
-msgstr ""
-
-#: ../buffer.c:4529
-msgid ""
-"\n"
-"--- Signs ---"
-msgstr ""
-"\n"
-"--- �Ÿ� ---"
-
-#: ../buffer.c:4538
-#, c-format
-msgid "Signs for %s:"
-msgstr "%s ���Ÿ�:"
-
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  id=%d  �W��=%s"
-
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: �ʤ� colon"
-
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: �����T���Ҧ�"
-
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ���ӭn���Ʀr"
-
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: �����T���ʤ���"
-
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: �L�k���(diff) %<PRId64>�ӥH�W���w�İ�"
-
-#: ../diff.c:753
-#, fuzzy
-msgid "E810: Cannot read or write temp files"
-msgstr "E557: �L�k�}�� termcap �ɮ�"
-
-#: ../diff.c:755
-msgid "E97: Cannot create diffs"
-msgstr "E97: ����إ� "
-
-#: ../diff.c:966
-#, fuzzy
-msgid "E816: Cannot read patch output"
-msgstr "E98: �L�kŪ�� diff ����X"
-
-#: ../diff.c:1220
-msgid "E98: Cannot read diff output"
-msgstr "E98: �L�kŪ�� diff ����X"
-
-#: ../diff.c:2081
-msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: �ثe���w�İϤ��O�b diff �Ҧ�"
-
-#: ../diff.c:2100
-#, fuzzy
-msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E100: �S���w�İϦb diff �Ҧ�"
-
-#: ../diff.c:2102
-msgid "E100: No other buffer in diff mode"
-msgstr "E100: �S���w�İϦb diff �Ҧ�"
-
-#: ../diff.c:2112
-msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: ����ӥH�W���w�İϦb diff �Ҧ��A�L�k�M�w�n�έ��@��"
-
-#: ../diff.c:2141
-#, c-format
-msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: �䤣��w�İ�: \"%s\""
-
-#: ../diff.c:2152
-#, c-format
-msgid "E103: Buffer \"%s\" is not in diff mode"
-msgstr "E103: �w�İ� \"%s\" ���O�b diff �Ҧ�"
-
-#: ../diff.c:2193
-msgid "E787: Buffer changed unexpectedly"
-msgstr ""
-
-#: ../digraph.c:1598
-msgid "E104: Escape not allowed in digraph"
-msgstr "E104: �ƦX�r��(digraph)������ϥ� Escape"
-
-#: ../digraph.c:1760
-msgid "E544: Keymap file not found"
-msgstr "E544: �䤣�� keymap ��"
-
-#: ../digraph.c:1785
-msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: �ϥ� :loadkeymap "
-
-#: ../digraph.c:1821
-msgid "E791: Empty keymap entry"
-msgstr ""
-
-#: ../edit.c:82
-msgid " Keyword completion (^N^P)"
-msgstr " ����r�۰ʧ��� (^N^P)"
-
-#. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
-#, fuzzy
-msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
-msgstr " ^X �Ҧ� (^E^Y^L^]^F^I^K^D^N^P)"
-
-#: ../edit.c:85
-msgid " Whole line completion (^L^N^P)"
-msgstr " ���۰ʧ��� (^L^N^P)"
-
-#: ../edit.c:86
-msgid " File name completion (^F^N^P)"
-msgstr " �ɦW�۰ʧ��� (^F^N^P)"
-
-#: ../edit.c:87
-msgid " Tag completion (^]^N^P)"
-msgstr " ���Ҧ۰ʧ��� (^]^N^P)"
-
-#: ../edit.c:88
-msgid " Path pattern completion (^N^P)"
-msgstr " ���|�۰ʧ��� (^N^P)"
-
-#: ../edit.c:89
-msgid " Definition completion (^D^N^P)"
-msgstr " �w�q�۰ʧ��� (^D^N^P)"
-
-#: ../edit.c:91
-msgid " Dictionary completion (^K^N^P)"
-msgstr " �r��۰ʧ��� (^K^N^P)"
-
-#: ../edit.c:92
-msgid " Thesaurus completion (^T^N^P)"
-msgstr " Thesaurus �۰ʧ��� (^T^N^P)"
-
-#: ../edit.c:93
-msgid " Command-line completion (^V^N^P)"
-msgstr " �R�O�C�۰ʧ��� (^V^N^P)"
-
-#: ../edit.c:94
-#, fuzzy
-msgid " User defined completion (^U^N^P)"
-msgstr " ���۰ʧ��� (^L^N^P)"
-
-#: ../edit.c:95
-#, fuzzy
-msgid " Omni completion (^O^N^P)"
-msgstr " ���Ҧ۰ʧ��� (^]^N^P)"
-
-#: ../edit.c:96
-#, fuzzy
-msgid " Spelling suggestion (s^N^P)"
-msgstr " ���۰ʧ��� (^L^N^P)"
-
-#: ../edit.c:97
-msgid " Keyword Local completion (^N^P)"
-msgstr " �ϰ�����r�۰ʧ��� (^N^P)"
-
-#: ../edit.c:100
-msgid "Hit end of paragraph"
-msgstr "�w��q������"
-
-#: ../edit.c:101
-msgid "E839: Completion function changed window"
-msgstr ""
-
-#: ../edit.c:102
-msgid "E840: Completion function deleted text"
-msgstr ""
-
-#: ../edit.c:1847
-msgid "'dictionary' option is empty"
-msgstr "�ﶵ 'dictionary' ���]�w"
-
-#: ../edit.c:1848
-msgid "'thesaurus' option is empty"
-msgstr "�ﶵ 'thesaurus' ���]�w"
-
-#: ../edit.c:2655
-#, c-format
-msgid "Scanning dictionary: %s"
-msgstr "���˦r��: %s"
-
-#: ../edit.c:3079
-msgid " (insert) Scroll (^E/^Y)"
-msgstr " (���J) Scroll (^E/^Y)"
-
-#: ../edit.c:3081
-msgid " (replace) Scroll (^E/^Y)"
-msgstr " (���N) Scroll (^E/^Y)"
-
-#: ../edit.c:3587
-#, c-format
-msgid "Scanning: %s"
-msgstr "���ˤ�: %s"
-
-#: ../edit.c:3614
-msgid "Scanning tags."
-msgstr "���˼���."
-
-#: ../edit.c:4519
-msgid " Adding"
-msgstr " �W�["
-
-#. showmode might reset the internal line pointers, so it must
-#. * be called before line = ml_get(), or when this address is no
-#. * longer needed.  -- Acevedo.
-#.
-#: ../edit.c:4562
-msgid "-- Searching..."
-msgstr "-- �j�M��..."
-
-#: ../edit.c:4618
-msgid "Back at original"
-msgstr "�^��_�I"
-
-#: ../edit.c:4621
-msgid "Word from other line"
-msgstr "�q�O��}�l���r (?)"
-
-#: ../edit.c:4624
-msgid "The only match"
-msgstr "�u�������ŦX"
-
-#: ../edit.c:4680
-#, c-format
-msgid "match %d of %d"
-msgstr "��� %d / %d"
-
-#: ../edit.c:4684
-#, c-format
-msgid "match %d"
-msgstr "�ŦX %d"
-
-#: ../eval.c:137
-#, fuzzy
-msgid "E18: Unexpected characters in :let"
-msgstr "E18: '=' �e���X�{�F���~���r��"
-
-#: ../eval.c:138
-#, fuzzy, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E322: �渹�W�X�d��: %<PRId64> �W�L����"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: �ܼ� %s �|���w�q"
-
-#: ../eval.c:140
-msgid "E111: Missing ']'"
-msgstr "E111: �ʤֹ����� \"]\""
-
-#: ../eval.c:141
-#, fuzzy, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E487: �Ѽ����ӬO����"
-
-#: ../eval.c:143
-#, fuzzy, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E487: �Ѽ����ӬO����"
-
-#: ../eval.c:144
-#, fuzzy
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E214: �䤣��g�J�Ϊ��Ȧs��"
-
-#: ../eval.c:145
-#, fuzzy
-msgid "E714: List required"
-msgstr "E471: �ݭn���O�Ѽ�"
-
-#: ../eval.c:146
-#, fuzzy
-msgid "E715: Dictionary required"
-msgstr "E129: �ݭn�禡�W��"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �禡 %s ���޼ƹL�h"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr ""
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �禡 %s �w�g�s�b, �Шϥ� ! �j����N"
-
-#: ../eval.c:151
-#, fuzzy
-msgid "E717: Dictionary entry already exists"
-msgstr "E95: �w���w�İϨϥγo�ӦW�r"
-
-#: ../eval.c:152
-#, fuzzy
-msgid "E718: Funcref required"
-msgstr "E129: �ݭn�禡�W��"
-
-#: ../eval.c:153
-#, fuzzy
-msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E360: ����� -f �ﶵ���� shell"
-
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr ""
-
-#: ../eval.c:155
-#, fuzzy, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E117: ���w�q���禡: %s"
-
-#: ../eval.c:156
-#, c-format
-msgid "E461: Illegal variable name: %s"
-msgstr "E461: ���X�k���ܼƦW��: %s"
-
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr ""
-
-#: ../eval.c:1830
-msgid "E687: Less targets than List items"
-msgstr ""
-
-#: ../eval.c:1834
-msgid "E688: More targets than List items"
-msgstr ""
-
-#: ../eval.c:1906
-msgid "Double ; in list of variables"
-msgstr ""
-
-#: ../eval.c:2078
-#, fuzzy, c-format
-msgid "E738: Can't list variables for %s"
-msgstr "E138: �L�k�g�J viminfo �ɮ� %s !"
-
-#: ../eval.c:2391
-msgid "E689: Can only index a List or Dictionary"
-msgstr ""
-
-#: ../eval.c:2396
-msgid "E708: [:] must come last"
-msgstr ""
-
-#: ../eval.c:2439
-msgid "E709: [:] requires a List value"
-msgstr ""
-
-#: ../eval.c:2674
-msgid "E710: List value has more items than target"
-msgstr ""
-
-#: ../eval.c:2678
-msgid "E711: List value has not enough items"
-msgstr ""
-
-#: ../eval.c:2867
-#, fuzzy
-msgid "E690: Missing \"in\" after :for"
-msgstr "E69: %s%%[ ��ʤ� ]"
-
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: �ʤֹ������A��: %s"
-
-#: ../eval.c:3263
-#, c-format
-msgid "E108: No such variable: \"%s\""
-msgstr "E108: �L���ܼ�: \"%s\""
-
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr ""
-
-#: ../eval.c:3630
-msgid "E109: Missing ':' after '?'"
-msgstr "E109: '?' ��ʤ� ':'"
-
-#: ../eval.c:3893
-msgid "E691: Can only compare List with List"
-msgstr ""
-
-#: ../eval.c:3895
-#, fuzzy
-msgid "E692: Invalid operation for Lists"
-msgstr "E449: ���줣���T���B�⦡"
-
-#: ../eval.c:3915
-msgid "E735: Can only compare Dictionary with Dictionary"
-msgstr ""
-
-#: ../eval.c:3917
-#, fuzzy
-msgid "E736: Invalid operation for Dictionary"
-msgstr "E116: �禡 %s ���޼Ƥ����T"
-
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr ""
-
-#: ../eval.c:3934
-#, fuzzy
-msgid "E694: Invalid operation for Funcrefs"
-msgstr "E116: �禡 %s ���޼Ƥ����T"
-
-#: ../eval.c:4277
-#, fuzzy
-msgid "E804: Cannot use '%' with Float"
-msgstr "E360: ����� -f �ﶵ���� shell"
-
-#: ../eval.c:4478
-msgid "E110: Missing ')'"
-msgstr "E110: �ʤֹ����� \")\""
-
-#: ../eval.c:4609
-#, fuzzy
-msgid "E695: Cannot index a Funcref"
-msgstr "E90: �L�k����̫�@�ӽw�İ�"
-
-#: ../eval.c:4839
-#, c-format
-msgid "E112: Option name missing: %s"
-msgstr "E112: �ʤֿﶵ�W��: %s"
-
-#: ../eval.c:4855
-#, c-format
-msgid "E113: Unknown option: %s"
-msgstr "E113: �����T���ﶵ: %s"
-
-#: ../eval.c:4904
-#, c-format
-msgid "E114: Missing quote: %s"
-msgstr "E114: �ʤ֤޸�: %s"
-
-#: ../eval.c:5020
-#, c-format
-msgid "E115: Missing quote: %s"
-msgstr "E115: �ʤ֤޸�: %s"
-
-#: ../eval.c:5084
-#, fuzzy, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E405: �ʤ֬۵��Ÿ�: %s"
-
-#: ../eval.c:5091
-#, fuzzy, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E398: �ʤ� \"=\": %s"
-
-#: ../eval.c:6475
-#, fuzzy, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E242: �䤣���C��: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr ""
-
-#: ../eval.c:6517
-#, fuzzy, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E242: �䤣���C��: %s"
-
-#: ../eval.c:6524
-#, fuzzy, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E126: �ʤ� :endfunction"
-
-#: ../eval.c:6555
-#, fuzzy
-msgid "E724: variable nested too deep for displaying"
-msgstr "E22: �_�����j�I�s�Ӧh�h"
-
-#: ../eval.c:7188
-#, fuzzy, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E118: �禡 %s ���޼ƹL�h"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �禡 %s ���޼Ƥ����T"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ���w�q���禡: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �禡 %s ���޼ƤӤ�"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> ����b script ����~�ϥ�: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr ""
-
-#: ../eval.c:7453
-#, fuzzy
-msgid "E808: Number or Float required"
-msgstr "E521: = ��ݭn���Ʀr"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "�����T���Ѽ�: "
-
-#: ../eval.c:7907
-#, fuzzy
-msgid "E699: Too many arguments"
-msgstr "�Ӧh�s��Ѽ�"
-
-#: ../eval.c:8073
-#, fuzzy
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E328: ���u��b�䥦�Ҧ����ϥ�"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "�T�w(&O)"
-
-#: ../eval.c:8676
-#, fuzzy, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E227: %s �� mapping �w�g�s�b"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr ""
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "vim [�Ѽ�] "
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr ""
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, fuzzy, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E117: ���w�q���禡: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "�I�s inputrestore() �����Ƥ� inputsave() �٦h"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "�Ӧh�s��Ѽ�"
-
-#: ../eval.c:10841
-#, fuzzy
-msgid "E786: Range not allowed"
-msgstr "E481: ���i�ϥνd����O"
-
-#: ../eval.c:11140
-#, fuzzy
-msgid "E701: Invalid type for len()"
-msgstr "E596: �����T���r��"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr ""
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr ""
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr ""
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr ""
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: �Ӧh�h���Ÿ��쵲(symlink) (�`��?)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr ""
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr ""
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "�����T���Ѽ�: "
-
-#: ../eval.c:13776
-#, fuzzy
-msgid "E702: Sort compare function failed"
-msgstr "E237: �L�k��ܦ��L����"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr ""
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(�����T)"
-
-#: ../eval.c:14590
-#, fuzzy
-msgid "E677: Error writing temp file"
-msgstr "E208: �g�J�ɮ� \"%s\" ���~"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr ""
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr ""
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr ""
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr ""
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr ""
-
-#: ../eval.c:16262
-#, fuzzy
-msgid "E730: using List as a String"
-msgstr "E374: �榡�Ʀr��̤֤F ]"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr ""
-
-#: ../eval.c:16619
-#, fuzzy, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E93: ���@�ӥH�W�� %s"
-
-#: ../eval.c:16705
-#, fuzzy, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E46: �L�k�]�w��Ū�ܼ� \"%s\""
-
-#: ../eval.c:16724
-#, fuzzy, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E128: �禡�W�ٲĤ@�Ӧr�������j�g: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr ""
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr ""
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "����"
-
-#: ../eval.c:16768
-#, fuzzy, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E284: ����]�w IC �ƭ�"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr ""
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: �禡 %s �|���w�q"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: �ʤ� \"(\": %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: ����]�w IC �ƭ�"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �ѼƤ����T: %s"
-
-#: ../eval.c:17323
-#, fuzzy, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E154: ����(tag) \"%s\" �b�ɮ� %s �̭��ƥX�{�h��"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: �ʤ� :endfunction"
-
-#: ../eval.c:17537
-#, fuzzy, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E128: �禡�W�ٲĤ@�Ӧr�������j�g: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �禡 %s ���b�ϥΤ��A�L�k���s�w�q"
-
-#: ../eval.c:17604
-#, fuzzy, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E128: �禡�W�ٲĤ@�Ӧr�������j�g: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �ݭn�禡�W��"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �禡�W�ٲĤ@�Ӧr�������j�g: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E128: �禡�W�ٲĤ@�Ӧr�������j�g: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �禡 %s ���b�ϥΤ��A�L�k�R��"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �禡���j�I�s�h�ƶW�L 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "�I�s %s"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s �Q�j��_���� "
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s �Ǧ^�� #%<PRId64> "
-
-#: ../eval.c:18670
-#, fuzzy, c-format
-msgid "%s returning %s"
-msgstr "%s �Ǧ^�� \"%s\""
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "�~��: %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: :return �����b�禡�̨ϥ�"
-
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# �����ܼ�:\n"
-
-#: ../eval.c:19254
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\t�W���]�w: "
-
-#: ../eval.c:19272
-#, fuzzy
-msgid "No old files"
-msgstr "�S���ޤJ�ɮ�"
-
-#: ../ex_cmds.c:122
-#, c-format
-msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
-msgstr "<%s>%s%s  %d,  �Q���i�� %02x,  �K�i�� %03o"
-
-#: ../ex_cmds.c:145
-#, c-format
-msgid "> %d, Hex %04x, Octal %o"
-msgstr "> %d, �Q���i�� %04x, �K�i�� %o"
-
-#: ../ex_cmds.c:146
-#, c-format
-msgid "> %d, Hex %08x, Octal %o"
-msgstr "> %d, �Q���i�� %08x,  �K�i�� %o"
-
-#: ../ex_cmds.c:684
-msgid "E134: Move lines into themselves"
-msgstr "E134: �L�k��沾�쥦�ۤw��"
-
-#: ../ex_cmds.c:747
-msgid "1 line moved"
-msgstr "�w�h�� 1 �� "
-
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "�w�h�� %<PRId64> �� "
-
-#: ../ex_cmds.c:1175
-#, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "�w�B�z %<PRId64> �� "
-
-#: ../ex_cmds.c:1194
-msgid "E135: *Filter* Autocommands must not change current buffer"
-msgstr "E135: *Filter* Autocommand ���i�H���w�İϪ����e"
-
-#: ../ex_cmds.c:1244
-msgid "[No write since last change]\n"
-msgstr "[��s��|���x�s]\n"
-
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s �b�椤: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: �L�h���~, �����ɮר�l����"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Ū�� viminfo �ɮ� \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " �T��"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " �аO"
-
-#: ../ex_cmds.c:1462
-#, fuzzy
-msgid " oldfiles"
-msgstr "�S���ޤJ�ɮ�"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " ����"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo �ɮ׵L�k�g�J: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: �L�k�g�J viminfo �ɮ� %s !"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "�g�J viminfo �ɮ� \"%s\" ��"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# �� viminfo �ɮ׬O�� Vim %s �Ҳ���.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# �p�G�Q�n�ۦ�ק�ЯS�O�p�ߡI\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# 'encoding' �b���ɫإ߮ɪ���\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "�L�Ī��_�l�r��"
-
-#: ../ex_cmds.c:2162
-msgid "Write partial file?"
-msgstr "�n�g�J�����ɮ׶ܡH"
-
-#: ../ex_cmds.c:2166
-msgid "E140: Use ! to write partial buffer"
-msgstr "E140: �Шϥ� ! �H�g�J�����w�İ�"
-
-#: ../ex_cmds.c:2281
-#, fuzzy, c-format
-msgid "Overwrite existing file \"%s\"?"
-msgstr "�n�мg�w�s�b���ɮ� \"%.*s\"�H"
-
-#: ../ex_cmds.c:2317
-#, c-format
-msgid "Swap file \"%s\" exists, overwrite anyway?"
-msgstr ""
-
-#: ../ex_cmds.c:2326
-#, fuzzy, c-format
-msgid "E768: Swap file exists: %s (:silent! overrides)"
-msgstr "E13: �ɮפw�g�s�b (�i�� ! �j����N)"
-
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: �w�İ� %<PRId64> �S���ɮצW��"
-
-#: ../ex_cmds.c:2412
-msgid "E142: File not written: Writing is disabled by 'write' option"
-msgstr "E142: �ɮץ��g�J�A�]�� 'write' �ﶵ�Q����"
-
-#: ../ex_cmds.c:2434
-#, fuzzy, c-format
-msgid ""
-"'readonly' option is set for \"%s\".\n"
-"Do you wish to write anyway?"
-msgstr ""
-"\"%.*s\" �w�]�w 'readonly' �ﶵ.\n"
-"�T�w�n�мg�ܡH"
-
-#: ../ex_cmds.c:2439
-#, c-format
-msgid ""
-"File permissions of \"%s\" are read-only.\n"
-"It may still be possible to write it.\n"
-"Do you wish to try?"
-msgstr ""
-
-#: ../ex_cmds.c:2451
-#, fuzzy, c-format
-msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "�O��Ū�� (�Шϥ� ! �j�����)"
-
-#: ../ex_cmds.c:3120
-#, c-format
-msgid "E143: Autocommands unexpectedly deleted new buffer %s"
-msgstr "E143: Autocommands �N�~�a�R���s�w�� %s"
-
-#: ../ex_cmds.c:3313
-msgid "E144: non-numeric argument to :z"
-msgstr "E144: :z �������D�Ʀr���Ѽ�"
-
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: rvim ���T��ϥ� shell �R�O"
-
-#: ../ex_cmds.c:3498
-msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: Regular expression �L�k�Φr�����j (?)"
-
-#: ../ex_cmds.c:3964
-#, c-format
-msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
-msgstr "���N�� %s (y/n/a/q/^E/^Y)?"
-
-#: ../ex_cmds.c:4379
-msgid "(Interrupted) "
-msgstr "(�w���_) "
-
-#: ../ex_cmds.c:4384
-#, fuzzy
-msgid "1 match"
-msgstr "; �ŦX "
-
-#: ../ex_cmds.c:4384
-msgid "1 substitution"
-msgstr "���N�@�� "
-
-#: ../ex_cmds.c:4387
-#, fuzzy, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> ������"
-
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "���N %<PRId64> �� "
-
-#: ../ex_cmds.c:4392
-msgid " on 1 line"
-msgstr "�A�d��G�@�� "
-
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr "�A�d��G %<PRId64> �� "
-
-#: ../ex_cmds.c:4438
-msgid "E147: Cannot do :global recursive"
-msgstr "E147: :global �L�k���j���� "
-
-#: ../ex_cmds.c:4467
-msgid "E148: Regular expression missing from global"
-msgstr "E148: �S���ϥιL Regular expression (?)"
-
-#: ../ex_cmds.c:4508
-#, c-format
-msgid "Pattern found in every line: %s"
-msgstr "�C�@�泣�䤣��: %s"
-
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
-msgid "Pattern not found: %s"
-msgstr "�䤣��"
-
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# �e�@�մ��N�r��:\n"
-"$"
-
-#: ../ex_cmds.c:4679
-msgid "E478: Don't panic!"
-msgstr "E478: ���n��W!"
-
-#: ../ex_cmds.c:4717
-#, c-format
-msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: ��p, �S������ %s-%s ������"
-
-#: ../ex_cmds.c:4719
-#, c-format
-msgid "E149: Sorry, no help for %s"
-msgstr "E149: ��p, �S�� %s ������"
-
-#: ../ex_cmds.c:4751
-#, c-format
-msgid "Sorry, help file \"%s\" not found"
-msgstr "��p, �䤣�컡���� \"%s\""
-
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: %s ���O�ؿ�"
-
-#: ../ex_cmds.c:5446
-#, c-format
-msgid "E152: Cannot open %s for writing"
-msgstr "E152: �L�k�H�g�J�Ҧ��}�� \"%s\""
-
-#: ../ex_cmds.c:5471
-#, c-format
-msgid "E153: Unable to open %s for reading"
-msgstr "E153: �L�kŪ���ɮ�: %s"
-
-#: ../ex_cmds.c:5500
-#, c-format
-msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: �P�@�y�� (%s) �����V�X���P�r���s�X��������"
-
-#: ../ex_cmds.c:5565
-#, fuzzy, c-format
-msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: ����(tag) \"%s\" �b�ɮ� %s �̭��ƥX�{�h��"
-
-#: ../ex_cmds.c:5687
-#, c-format
-msgid "E160: Unknown sign command: %s"
-msgstr "E160: ���w�q�� sign command: %s"
-
-#: ../ex_cmds.c:5704
-msgid "E156: Missing sign name"
-msgstr "E156: �ʤ� sign �W��"
-
-#: ../ex_cmds.c:5746
-msgid "E612: Too many signs defined"
-msgstr "E612: �w�w�q�Ӧh signs"
-
-#: ../ex_cmds.c:5813
-#, c-format
-msgid "E239: Invalid sign text: %s"
-msgstr "E239: �����T�� sign ��r: %s"
-
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
-#, c-format
-msgid "E155: Unknown sign: %s"
-msgstr "E155: �����T�� sign: %s"
-
-#: ../ex_cmds.c:5877
-msgid "E159: Missing sign number"
-msgstr "E159: �ʤ� sign number"
-
-#: ../ex_cmds.c:5971
-#, c-format
-msgid "E158: Invalid buffer name: %s"
-msgstr "E158: �w�İϦW�ٿ��~: %s"
-
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Sign ID ���~: %<PRId64>"
-
-#: ../ex_cmds.c:6066
-msgid " (not supported)"
-msgstr " (���䴩) "
-
-#: ../ex_cmds.c:6169
-msgid "[Deleted]"
-msgstr "[�w�R��]"
-
-#: ../ex_cmds2.c:139
-msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "�i�J�����Ҧ�. ��J \"cont\" �H�^�쥿�`�Ҧ�."
-
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�� %<PRId64>: %s"
-
-#: ../ex_cmds2.c:145
-#, c-format
-msgid "cmd: %s"
-msgstr "cmd: %s"
-
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "\"%s%s\" ���_�I: �� %<PRId64> �� "
-
-#: ../ex_cmds2.c:581
-#, c-format
-msgid "E161: Breakpoint not found: %s"
-msgstr "E161: �䤣�줤�_�I: %s"
-
-#: ../ex_cmds2.c:611
-msgid "No breakpoints defined"
-msgstr "�S���w�q���_�I"
-
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �� %<PRId64> �� "
-
-#: ../ex_cmds2.c:942
-msgid "E750: First use \":profile start {fname}\""
-msgstr ""
-
-#: ../ex_cmds2.c:1269
-#, fuzzy, c-format
-msgid "Save changes to \"%s\"?"
-msgstr "�N�ܰʦs�x�� \"%.*s\"?"
-
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
-msgid "Untitled"
-msgstr "���R�W"
-
-#: ../ex_cmds2.c:1421
-#, c-format
-msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: �w���L�w�� \"%s\" ���|���s�� (�i�� ! �j�����)"
-
-#: ../ex_cmds2.c:1480
-msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "�`�N: �w������䥦�w�İ� (���ˬd Autocommands ���L���~)"
-
-#: ../ex_cmds2.c:1826
-msgid "E163: There is only one file to edit"
-msgstr "E163: �u���@���ɮץi�s��"
-
-#: ../ex_cmds2.c:1828
-msgid "E164: Cannot go before first file"
-msgstr "E164: �w�g�b�Ĥ@���ɮפF"
-
-#: ../ex_cmds2.c:1830
-msgid "E165: Cannot go beyond last file"
-msgstr "E165: �w�g�b�̫�@���ɮפF"
-
-#: ../ex_cmds2.c:2175
-#, c-format
-msgid "E666: compiler not supported: %s"
-msgstr "E666: �sĶ�����䴩: %s"
-
-#: ../ex_cmds2.c:2257
-#, c-format
-msgid "Searching for \"%s\" in \"%s\""
-msgstr "�j�M��: \"%s\" -- \"%s\""
-
-#: ../ex_cmds2.c:2284
-#, c-format
-msgid "Searching for \"%s\""
-msgstr "�j�M��: \"%s\""
-
-#: ../ex_cmds2.c:2307
-#, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "�b 'runtimepath' �̧䤣�� \"%s\""
-
-#: ../ex_cmds2.c:2472
-#, c-format
-msgid "Cannot source a directory: \"%s\""
-msgstr "�L�k����ؿ��G \"%s\""
-
-#: ../ex_cmds2.c:2518
-#, c-format
-msgid "could not source \"%s\""
-msgstr "�L�k���� \"%s\""
-
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�� %<PRId64> ��: �L�k���� \"%s\""
-
-#: ../ex_cmds2.c:2535
-#, c-format
-msgid "sourcing \"%s\""
-msgstr "���� \"%s\" ��"
-
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�� %<PRId64> ��: �������� %s"
-
-#: ../ex_cmds2.c:2693
-#, c-format
-msgid "finished sourcing %s"
-msgstr "�������� %s"
-
-#: ../ex_cmds2.c:2765
-#, fuzzy
-msgid "modeline"
-msgstr "�٦��@�� "
-
-#: ../ex_cmds2.c:2767
-#, fuzzy
-msgid "--cmd argument"
-msgstr "vim [�Ѽ�] "
-
-#: ../ex_cmds2.c:2769
-#, fuzzy
-msgid "-c argument"
-msgstr "vim [�Ѽ�] "
-
-#: ../ex_cmds2.c:2771
-msgid "environment variable"
-msgstr ""
-
-#: ../ex_cmds2.c:2773
-#, fuzzy
-msgid "error handler"
-msgstr "���~�P���_"
-
-#: ../ex_cmds2.c:3020
-msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: �`�N: ���~������j�r���A�i��O�֤F ^M"
-
-#: ../ex_cmds2.c:3139
-msgid "E167: :scriptencoding used outside of a sourced file"
-msgstr "E167: �b���� script �ɮץ~���i�ϥ� :scriptencoding"
-
-#: ../ex_cmds2.c:3166
-msgid "E168: :finish used outside of a sourced file"
-msgstr "E168: �b���� script �ɮץ~���i�ϥ� :finish"
-
-#: ../ex_cmds2.c:3389
-#, c-format
-msgid "Current %slanguage: \"%s\""
-msgstr "�ثe�� %s�y��: \"%s\""
-
-#: ../ex_cmds2.c:3404
-#, c-format
-msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: ����]�w�y���� \"%s\""
-
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
-msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "�i�J Ex �Ҧ�. ��J \"visua\" �H�^�쥿�`�Ҧ�."
-
-#: ../ex_docmd.c:428
-msgid "E501: At end-of-file"
-msgstr "E501: �w���ɮ׵���"
-
-#: ../ex_docmd.c:513
-msgid "E169: Command too recursive"
-msgstr "E169: �R�O���j�h�ƹL�h"
-
-#: ../ex_docmd.c:1006
-#, c-format
-msgid "E605: Exception not caught: %s"
-msgstr "E605: ���d�I���ҥ~�G %s"
-
-#: ../ex_docmd.c:1085
-msgid "End of sourced file"
-msgstr "�R�O�ɵ���"
-
-#: ../ex_docmd.c:1086
-msgid "End of function"
-msgstr "�禡����"
-
-#: ../ex_docmd.c:1628
-msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: �ϥΪ̩w�q���R�O�|�V�c"
-
-#: ../ex_docmd.c:1638
-msgid "E492: Not an editor command"
-msgstr "E492: ���O�s�边���R�O"
-
-#: ../ex_docmd.c:1729
-msgid "E493: Backwards range given"
-msgstr "E493: ���w�F�V�e�ѦҪ��d��"
-
-#: ../ex_docmd.c:1733
-msgid "Backwards range given, OK to swap"
-msgstr "���w�F�V�e�ѦҪ��d��AOK to swap"
-
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
-msgid "E494: Use w or w>>"
-msgstr "E494: �Шϥ� w �� w>>"
-
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: ��p, ���R�O�b���������S����@"
-
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: �u�঳�@����"
-
-#: ../ex_docmd.c:4238
-msgid "1 more file to edit.  Quit anyway?"
-msgstr "�٦��@���ɮץ��s��. �T�w�n���}�H"
-
-#: ../ex_docmd.c:4242
-#, c-format
-msgid "%d more files to edit.  Quit anyway?"
-msgstr "�٦� %d ���ɮץ��s��. �T�w�n���}�H"
-
-#: ../ex_docmd.c:4248
-msgid "E173: 1 more file to edit"
-msgstr "E173: �٦��@���ɮץ��s�� "
-
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: �٦� %<PRId64> ���ɮץ��s��"
-
-#: ../ex_docmd.c:4320
-msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: �R�O�w�g�s�b, �Шϥ� ! �j��s�w�q"
-
-#: ../ex_docmd.c:4432
-msgid ""
-"\n"
-"    Name        Args Range Complete  Definition"
-msgstr ""
-"\n"
-"    �W��        �Ѽ� �d��  ����      �w�q      "
-
-#: ../ex_docmd.c:4516
-msgid "No user-defined commands found"
-msgstr "�䤣��ϥΪ̩w�q���R�O"
-
-#: ../ex_docmd.c:4538
-msgid "E175: No attribute specified"
-msgstr "E175: �S�����w���ݩ�"
-
-#: ../ex_docmd.c:4583
-msgid "E176: Invalid number of arguments"
-msgstr "E176: �����T���ѼƼƥ�"
-
-#: ../ex_docmd.c:4594
-msgid "E177: Count cannot be specified twice"
-msgstr "E177: ������w�⦸�ƥ�"
-
-#: ../ex_docmd.c:4603
-msgid "E178: Invalid default value for count"
-msgstr "E178: �ƥت��w�]�ѼƤ����T"
-
-#: ../ex_docmd.c:4625
-#, fuzzy
-msgid "E179: argument required for -complete"
-msgstr "E179: ���O�ݭn�ѼƤ~�৹��"
-
-#: ../ex_docmd.c:4635
-#, c-format
-msgid "E181: Invalid attribute: %s"
-msgstr "E181: �����T���ݩ�: %s"
-
-#: ../ex_docmd.c:4678
-msgid "E182: Invalid command name"
-msgstr "E182: ���O�W�٤����T"
-
-#: ../ex_docmd.c:4691
-msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �ϥΪ̦۩w���O�����H�j�g�r���}�l"
-
-#: ../ex_docmd.c:4696
-#, fuzzy
-msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E464: �ϥΪ̩w�q���R�O�|�V�c"
-
-#: ../ex_docmd.c:4751
-#, c-format
-msgid "E184: No such user-defined command: %s"
-msgstr "E184: �S���ϥΪ̦۩w���R�O�G %s"
-
-#: ../ex_docmd.c:5219
-#, c-format
-msgid "E180: Invalid complete value: %s"
-msgstr "E180: �����㪺��: '%s'"
-
-#: ../ex_docmd.c:5225
-msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: �ۭq�ɧ��ɤ~�i�ɧ��Ѽ�"
-
-#: ../ex_docmd.c:5231
-msgid "E467: Custom completion requires a function argument"
-msgstr "E467: �ۭq�ɧ��ݭn�禡���Ѽ�"
-
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: �䤣���C��˦� %s"
-
-#: ../ex_docmd.c:5263
-msgid "Greetings, Vim user!"
-msgstr "��, Vim �ϥΪ̡I"
-
-#: ../ex_docmd.c:5431
-#, fuzzy
-msgid "E784: Cannot close last tab page"
-msgstr "E444: ���������̫�@�ӵ���"
-
-#: ../ex_docmd.c:5462
-#, fuzzy
-msgid "Already only one tab page"
-msgstr "�w�g�u�Ѥ@�ӵ����F"
-
-#: ../ex_docmd.c:6004
-#, fuzzy, c-format
-msgid "Tab page %d"
-msgstr "�� %d ��"
-
-#: ../ex_docmd.c:6295
-msgid "No swap file"
-msgstr "�L�Ȧs��"
-
-#: ../ex_docmd.c:6478
-#, fuzzy
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr "E509: �L�k�إ߳ƥ��� (�Шϥ� ! �j�����)"
-
-#: ../ex_docmd.c:6485
-msgid "E186: No previous directory"
-msgstr "E186: �S���e�@�ӥؿ�"
-
-#: ../ex_docmd.c:6530
-msgid "E187: Unknown"
-msgstr "E187: �L�k���Ѫ��аO"
-
-#: ../ex_docmd.c:6610
-msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize �ݭn��ӰѼ�"
-
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: �b�z�����x�W�L�k��o������m"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos �ݭn��ӰѼ�"
-
-#: ../ex_docmd.c:7241
-#, fuzzy, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "�L�k����ؿ��G \"%s\""
-
-#: ../ex_docmd.c:7268
-#, c-format
-msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: \"%s\" �w�s�b (�� ! �j�����)"
-
-#: ../ex_docmd.c:7273
-#, c-format
-msgid "E190: Cannot open \"%s\" for writing"
-msgstr "E190: �L�k�H�g�J�Ҧ��}�� \"%s\""
-
-#. set mark
-#: ../ex_docmd.c:7294
-msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: �Ѽƥ����O�^��r���ΦV�e/�᪺�޸�"
-
-#: ../ex_docmd.c:7333
-msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normal ���j�h�ƹL�`"
-
-#: ../ex_docmd.c:7807
-msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: �S�� '#' �i���N���ɦW"
-
-#: ../ex_docmd.c:7841
-msgid "E495: no autocommand file name to substitute for \"<afile>\""
-msgstr "E495: �S�� Autocommand �ɦW�H���N \"<afile>\""
-
-#: ../ex_docmd.c:7850
-msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
-msgstr "E496: �S�� Autocommand �w�İϦW�٥H���N \"<abuf>\""
-
-#: ../ex_docmd.c:7861
-msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: �S�� Autocommand �ŦX�W�٥H���N \"<amatch>\""
-
-#: ../ex_docmd.c:7870
-msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: �S�� :source �ɦW�H���N \"<sfile>\""
-
-#: ../ex_docmd.c:7876
-#, fuzzy
-msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E498: �S�� :source �ɦW�H���N \"<sfile>\""
-
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: '%' �� '#' ���V���ɦW�A�u��Ω� \":p:h\""
-
-#: ../ex_docmd.c:7905
-msgid "E500: Evaluates to an empty string"
-msgstr "E500: ��J���Ŧr��"
-
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: �L�kŪ�� viminfo"
-
-#: ../ex_eval.c:464
-msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: ���� :throw �� 'Vim' �}�Y���ҥ~"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:496
-#, c-format
-msgid "Exception thrown: %s"
-msgstr "��X�ҥ~�G %s"
-
-#: ../ex_eval.c:545
-#, c-format
-msgid "Exception finished: %s"
-msgstr "�ҥ~�����G %s"
-
-#: ../ex_eval.c:546
-#, c-format
-msgid "Exception discarded: %s"
-msgstr "�w���ҥ~�G %s"
-
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, �� %<PRId64>"
-
-#. always scroll up, don't overwrite
-#: ../ex_eval.c:608
-#, c-format
-msgid "Exception caught: %s"
-msgstr "�o�ͨҥ~�G%s"
-
-#: ../ex_eval.c:676
-#, c-format
-msgid "%s made pending"
-msgstr "%s �y�� pending"
-
-#: ../ex_eval.c:679
-#, c-format
-msgid "%s resumed"
-msgstr "%s �w�^�_"
-
-#: ../ex_eval.c:683
-#, c-format
-msgid "%s discarded"
-msgstr "%s �w���"
-
-#: ../ex_eval.c:708
-msgid "Exception"
-msgstr "�ҥ~"
-
-#: ../ex_eval.c:713
-msgid "Error and interrupt"
-msgstr "���~�P���_"
-
-#: ../ex_eval.c:715
-msgid "Error"
-msgstr "���~"
-
-#. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
-msgid "Interrupt"
-msgstr "���_"
-
-#: ../ex_eval.c:795
-msgid "E579: :if nesting too deep"
-msgstr "E579: :if �h�ƹL�`"
-
-#: ../ex_eval.c:830
-msgid "E580: :endif without :if"
-msgstr "E580: :endif �ʤֹ����� :if"
-
-#: ../ex_eval.c:873
-msgid "E581: :else without :if"
-msgstr "E581: :else �ʤֹ����� :if"
-
-#: ../ex_eval.c:876
-msgid "E582: :elseif without :if"
-msgstr "E582: :elseif �ʤֹ����� :if"
-
-#: ../ex_eval.c:880
-msgid "E583: multiple :else"
-msgstr "E583: �h�� :else"
-
-#: ../ex_eval.c:883
-msgid "E584: :elseif after :else"
-msgstr "E584: :elseif �b :else ����"
-
-#: ../ex_eval.c:941
-#, fuzzy
-msgid "E585: :while/:for nesting too deep"
-msgstr "E585: :while �h�ƹL�`"
-
-#: ../ex_eval.c:1028
-#, fuzzy
-msgid "E586: :continue without :while or :for"
-msgstr "E586: :continue �ʤֹ����� :while"
-
-#: ../ex_eval.c:1061
-#, fuzzy
-msgid "E587: :break without :while or :for"
-msgstr "E587: :break �ʤֹ����� :while"
-
-#: ../ex_eval.c:1102
-#, fuzzy
-msgid "E732: Using :endfor with :while"
-msgstr "E170: �ʤ� :endwhile"
-
-#: ../ex_eval.c:1104
-#, fuzzy
-msgid "E733: Using :endwhile with :for"
-msgstr "E170: �ʤ� :endwhile"
-
-#: ../ex_eval.c:1247
-msgid "E601: :try nesting too deep"
-msgstr "E601: :if �h�ƹL�`"
-
-#: ../ex_eval.c:1317
-msgid "E603: :catch without :try"
-msgstr "E603: :catch �S�� :try"
-
-#. Give up for a ":catch" after ":finally" and ignore it.
-#. * Just parse.
-#: ../ex_eval.c:1332
-msgid "E604: :catch after :finally"
-msgstr "E604: :catch �b :finally ����"
-
-#: ../ex_eval.c:1451
-msgid "E606: :finally without :try"
-msgstr "E606: :finally �S�� :try"
-
-#. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
-msgid "E607: multiple :finally"
-msgstr "E607: �h�� :finally"
-
-#: ../ex_eval.c:1571
-msgid "E602: :endtry without :try"
-msgstr "E602: :endif �ʤֹ����� :if"
-
-#: ../ex_eval.c:2026
-msgid "E193: :endfunction not inside a function"
-msgstr "E193: :endfunction �����b�禡�����ϥ�"
-
-#: ../ex_getln.c:1643
-#, fuzzy
-msgid "E788: Not allowed to edit another buffer now"
-msgstr "E48: ����b sandbox �̥X�{"
-
-#: ../ex_getln.c:1656
-#, fuzzy
-msgid "E811: Not allowed to change buffer information now"
-msgstr "E94: �䤣�� %s"
-
-#: ../ex_getln.c:3178
-msgid "tagname"
-msgstr "���ҦW��"
-
-#: ../ex_getln.c:3181
-msgid " kind file\n"
-msgstr "���ɮ�\n"
-
-#: ../ex_getln.c:4799
-msgid "'history' option is zero"
-msgstr "�ﶵ 'history' �O�s"
-
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s ���v�O�� (�s����):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "�R�O�C"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "�j�M�r��"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "�B�⦡"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "��J�� "
-
-#: ../ex_getln.c:5117
-msgid "E198: cmd_pchar beyond the command length"
-msgstr "E198: cmd_pchar �W�L�R�O����"
-
-#: ../ex_getln.c:5279
-msgid "E199: Active window or buffer deleted"
-msgstr "E199: �w�R�����@�Τ��������μȦs��"
-
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr ""
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr "E343: �����T�����|: '**[number]' ���ݭn�b���|�����έn���� '%s'"
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath ���S���ؿ� \"%s\""
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: �b���|���䤣���ɮ� \"%s\""
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: �b���|���䤣���h���ɮ� \"%s\""
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: �b���|���䤣���h���ɮ� \"%s\""
-
-#: ../fileio.c:137
-#, fuzzy
-msgid "E812: Autocommands changed buffer or buffer name"
-msgstr "E135: *Filter* Autocommand ���i�H���w�İϪ����e"
-
-#: ../fileio.c:368
-msgid "Illegal file name"
-msgstr "�����T���ɦW"
-
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
-msgid "is a directory"
-msgstr "�O�ؿ�"
-
-#: ../fileio.c:397
-msgid "is not a file"
-msgstr "���O�ɮ�"
-
-#: ../fileio.c:508 ../fileio.c:3522
-msgid "[New File]"
-msgstr "[���R�W]"
-
-#: ../fileio.c:511
-msgid "[New DIRECTORY]"
-msgstr ""
-
-#: ../fileio.c:529 ../fileio.c:532
-msgid "[File too big]"
-msgstr ""
-
-#: ../fileio.c:534
-msgid "[Permission Denied]"
-msgstr "[�v������]"
-
-#: ../fileio.c:653
-msgid "E200: *ReadPre autocommands made the file unreadable"
-msgstr "E200: *ReadPre Autocommand �ϵ{���L�kŪ������"
-
-#: ../fileio.c:655
-msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *Filter* Autocommand ���i�H���w�İϪ����e"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: �q�зǿ�JŪ��...\n"
-
-#. Re-opening the original file failed!
-#: ../fileio.c:909
-msgid "E202: Conversion made file unreadable!"
-msgstr "E202: �ഫ���~"
-
-#. fifo or socket
-#: ../fileio.c:1782
-msgid "[fifo/socket]"
-msgstr "[fifo/socket]"
-
-#. fifo
-#: ../fileio.c:1788
-msgid "[fifo]"
-msgstr "[fifo]"
-
-#. or socket
-#: ../fileio.c:1794
-msgid "[socket]"
-msgstr "[socket]"
-
-#. or character special
-#: ../fileio.c:1801
-#, fuzzy
-msgid "[character special]"
-msgstr "�@�Ӧr��"
-
-#: ../fileio.c:1815
-msgid "[CR missing]"
-msgstr "[�ʤ�CR]'"
-
-#: ../fileio.c:1819
-msgid "[long lines split]"
-msgstr "[���ιL����]"
-
-#: ../fileio.c:1823 ../fileio.c:3512
-msgid "[NOT converted]"
-msgstr "[���ഫ]"
-
-#: ../fileio.c:1826 ../fileio.c:3515
-msgid "[converted]"
-msgstr "[�w�ഫ]"
-
-#: ../fileio.c:1831
-#, fuzzy, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[�� %<PRId64> �������T���줸]"
-
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[�� %<PRId64> �������T���줸]"
-
-#: ../fileio.c:1838
-msgid "[READ ERRORS]"
-msgstr "[Ū�����~]"
-
-#: ../fileio.c:2104
-msgid "Can't find temp file for conversion"
-msgstr "�䤣���ഫ�Ϊ��Ȧs��"
-
-#: ../fileio.c:2110
-msgid "Conversion with 'charconvert' failed"
-msgstr "�r�����ഫ���~"
-
-#: ../fileio.c:2113
-msgid "can't read output of 'charconvert'"
-msgstr "�L�kŪ�� 'charconvert' ����X"
-
-#: ../fileio.c:2437
-#, fuzzy
-msgid "E676: No matching autocommands for acwrite buffer"
-msgstr "�䤣������� autocommand"
-
-#: ../fileio.c:2466
-msgid "E203: Autocommands deleted or unloaded buffer to be written"
-msgstr "E203: Autocommand �R��������F�n�g�J���w��"
-
-#: ../fileio.c:2486
-msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand �N�~�a���ܤF�渹"
-
-#: ../fileio.c:2548 ../fileio.c:2565
-msgid "is not a file or writable device"
-msgstr "���O�ɮשΥi�g�J���˸m"
-
-#: ../fileio.c:2601
-msgid "is read-only (add ! to override)"
-msgstr "�O��Ū�� (�Шϥ� ! �j�����)"
-
-#: ../fileio.c:2886
-msgid "E506: Can't write to backup file (add ! to override)"
-msgstr "E506: �L�k�g�J�ƥ��� (�Шϥ� ! �j�����)"
-
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr "E507: �L�k�����ƥ��� (�Шϥ� ! �j�����)"
-
-#: ../fileio.c:2901
-msgid "E508: Can't read file for backup (add ! to override)"
-msgstr "E508: �L�kŪ���ɮץH�ѳƥ� (�Шϥ� ! �j�����)"
-
-#: ../fileio.c:2923
-msgid "E509: Cannot create backup file (add ! to override)"
-msgstr "E509: �L�k�إ߳ƥ��� (�Шϥ� ! �j�����)"
-
-#: ../fileio.c:3008
-msgid "E510: Can't make backup file (add ! to override)"
-msgstr "E510: �L�k�s�@�ƥ��� (�Шϥ� ! �j�����)"
-
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
-msgid "E214: Can't find temp file for writing"
-msgstr "E214: �䤣��g�J�Ϊ��Ȧs��"
-
-#: ../fileio.c:3134
-msgid "E213: Cannot convert (add ! to write without conversion)"
-msgstr "E213: �L�k�ഫ (�Шϥ� ! �j��ഫ�g�J)"
-
-#: ../fileio.c:3169
-msgid "E166: Can't open linked file for writing"
-msgstr "E166: �L�k�H�g�J�Ҧ��}�ҳs���ɮ�"
-
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: �L�k�H�g�J�Ҧ��}��"
-
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync �R�O���楢��"
-
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: ��������"
-
-#: ../fileio.c:3436
-#, fuzzy
-msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: �L�k�g�J -- �ഫ����"
-
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-
-#: ../fileio.c:3448
-msgid "E514: write error (file system full?)"
-msgstr "E514: �g�J���~ (�ɮרt�Τw���H)"
-
-#: ../fileio.c:3506
-msgid " CONVERSION ERROR"
-msgstr "�ഫ���~"
-
-#: ../fileio.c:3509
-#, fuzzy, c-format
-msgid " in line %<PRId64>;"
-msgstr "�� %<PRId64>"
-
-#: ../fileio.c:3519
-msgid "[Device]"
-msgstr "[�˸m]"
-
-#: ../fileio.c:3522
-msgid "[New]"
-msgstr "[�s]"
-
-#: ../fileio.c:3535
-msgid " [a]"
-msgstr "[a]"
-
-#: ../fileio.c:3535
-msgid " appended"
-msgstr " �w���["
-
-#: ../fileio.c:3537
-msgid " [w]"
-msgstr "[w]"
-
-#: ../fileio.c:3537
-msgid " written"
-msgstr " �w�g�J"
-
-#: ../fileio.c:3579
-msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch �Ҧ�: �L�k�x�s��l�ɮ�"
-
-#: ../fileio.c:3602
-msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: Patch �Ҧ�: �L�k�ܧ�Ū���l�ɮ�"
-
-#: ../fileio.c:3616
-msgid "E207: Can't delete backup file"
-msgstr "E207: �L�k�R���ƥ���"
-
-#: ../fileio.c:3672
-msgid ""
-"\n"
-"WARNING: Original file may be lost or damaged\n"
-msgstr ""
-"\n"
-"ĵ�i: ��l�ɮ׬y���ηl�a\n"
-
-#: ../fileio.c:3675
-msgid "don't quit the editor until the file is successfully written!"
-msgstr "�b�ɮץ��T�g�J�e�Ф����}�s�边!"
-
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
-msgid "[dos format]"
-msgstr "[dos �榡]"
-
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
-
-#: ../fileio.c:3801
-msgid "[mac format]"
-msgstr "[mac �榡]"
-
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
-
-#: ../fileio.c:3807
-msgid "[unix format]"
-msgstr "[unix �榡]"
-
-#: ../fileio.c:3831
-msgid "1 line, "
-msgstr "1 ��, "
-
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> ��, "
-
-#: ../fileio.c:3836
-msgid "1 character"
-msgstr "�@�Ӧr��"
-
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64>�Ӧr��"
-
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[noeol]"
-
-#: ../fileio.c:3849
-msgid "[Incomplete last line]"
-msgstr "[�����椣����]"
-
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "ĵ�i: ���ɮצۤW��Ū�J��w�ܰ�!!!"
-
-#: ../fileio.c:3867
-msgid "Do you really want to write to it"
-msgstr "�T�w�n�g�J��"
-
-#: ../fileio.c:4648
-#, c-format
-msgid "E208: Error writing to \"%s\""
-msgstr "E208: �g�J�ɮ� \"%s\" ���~"
-
-#: ../fileio.c:4655
-#, c-format
-msgid "E209: Error closing \"%s\""
-msgstr "E209: �����ɮ� \"%s\" ���~"
-
-#: ../fileio.c:4657
-#, c-format
-msgid "E210: Error reading \"%s\""
-msgstr "E210: Ū���ɮ� \"%s\" ���~"
-
-#: ../fileio.c:4883
-msgid "E246: FileChangedShell autocommand deleted buffer"
-msgstr "E246: FileChangedShell autocommand �R���w��"
-
-#: ../fileio.c:4894
-#, fuzzy, c-format
-msgid "E211: File \"%s\" no longer available"
-msgstr "E211: ĵ�i: �ɮ� \"%s\" �w�g���s�b"
-
-#: ../fileio.c:4906
-#, c-format
-msgid ""
-"W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
-"well"
-msgstr "W12: ĵ�i: �ɮ� \"%s\" �ۤW��Ū�J��w�ܰ�, �ӥB�s�褤���w�İϤ]��ʤF"
-
-#: ../fileio.c:4907
-#, fuzzy
-msgid "See \":help W12\" for more info."
-msgstr "�i�@�B������ \":help W11\"�C"
-
-#: ../fileio.c:4910
-#, c-format
-msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: ĵ�i: �ɮ� \"%s\" �ۤW��Ū�J��w�ܰ�"
-
-#: ../fileio.c:4911
-msgid "See \":help W11\" for more info."
-msgstr "�i�@�B������ \":help W11\"�C"
-
-#: ../fileio.c:4914
-#, c-format
-msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
-msgstr "W16: ĵ�i: �ɮ� \"%s\" ���v���P�W��Ū�J�ɤ��@�� (���ܰʹL)"
-
-#: ../fileio.c:4915
-#, fuzzy
-msgid "See \":help W16\" for more info."
-msgstr "�i�@�B������ \":help W11\"�C"
-
-# 'mode' seems better as translated to 'permission'?
-#: ../fileio.c:4927
-#, c-format
-msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: ĵ�i: �ɮ� \"%s\" �b�}�l�s���S�Q�إߤF"
-
-#: ../fileio.c:4947
-msgid "Warning"
-msgstr "ĵ�i"
-
-#: ../fileio.c:4948
-msgid ""
-"&OK\n"
-"&Load File"
-msgstr ""
-"�T�w(&O)\n"
-"���J�ɮ�(&L)"
-
-#: ../fileio.c:5065
-#, c-format
-msgid "E462: Could not prepare for reloading \"%s\""
-msgstr "E462: �L�k�dzƭ��s���J \"%s\""
-
-#: ../fileio.c:5078
-#, c-format
-msgid "E321: Could not reload \"%s\""
-msgstr "E321: �L�k���s���J \"%s\""
-
-#: ../fileio.c:5601
-msgid "--Deleted--"
-msgstr "--�w�R��--"
-
-#: ../fileio.c:5732
-#, c-format
-msgid "auto-removing autocommand: %s <buffer=%d>"
-msgstr ""
-
-#. the group doesn't exist
-#: ../fileio.c:5772
-#, c-format
-msgid "E367: No such group: \"%s\""
-msgstr "E367: �L���s��: \"%s\""
-
-#: ../fileio.c:5897
-#, c-format
-msgid "E215: Illegal character after *: %s"
-msgstr "E215: * �᭱�������T���r��: %s"
-
-#: ../fileio.c:5905
-#, c-format
-msgid "E216: No such event: %s"
-msgstr "E216: �L���ƥ�: %s"
-
-#: ../fileio.c:5907
-#, c-format
-msgid "E216: No such group or event: %s"
-msgstr "E216: �L���s�թΨƥ�: %s"
-
-#. Highlight title
-#: ../fileio.c:6090
-msgid ""
-"\n"
-"--- Auto-Commands ---"
-msgstr ""
-"\n"
-"--- Auto-Commands ---"
-
-#: ../fileio.c:6293
-#, fuzzy, c-format
-msgid "E680: <buffer=%d>: invalid buffer number "
-msgstr "�w�İϸ��X���~"
-
-#: ../fileio.c:6370
-msgid "E217: Can't execute autocommands for ALL events"
-msgstr "E217: �L�k��Ҧ��ƥ���� autocommand"
-
-#: ../fileio.c:6393
-msgid "No matching autocommands"
-msgstr "�䤣������� autocommand"
-
-#: ../fileio.c:6831
-msgid "E218: autocommand nesting too deep"
-msgstr "E218: autocommand �h�ƹL�`"
-
-#: ../fileio.c:7143
-#, c-format
-msgid "%s Auto commands for \"%s\""
-msgstr "%s Auto commands: \"%s\""
-
-#: ../fileio.c:7149
-#, c-format
-msgid "Executing %s"
-msgstr "���� %s"
-
-#: ../fileio.c:7211
-#, c-format
-msgid "autocommand %s"
-msgstr "autocommand %s"
-
-#: ../fileio.c:7795
-msgid "E219: Missing {."
-msgstr "E219: �ʤ� {."
-
-#: ../fileio.c:7797
-msgid "E220: Missing }."
-msgstr "E220: �ʤ� }."
-
-#: ../fold.c:93
-msgid "E490: No fold found"
-msgstr "E490: �䤣����� fold"
-
-#: ../fold.c:544
-msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: �L�k�b�ثe�� 'foldmethod' �U�إ� fold"
-
-#: ../fold.c:546
-msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: �L�k�b�ثe�� 'foldmethod' �U�R�� fold"
-
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--�w fold %3ld �� "
-
-#. buffer has already been read
-#: ../getchar.c:273
-msgid "E222: Add to read buffer"
-msgstr "E222: �[�JŪ���w�İϤ�"
-
-#: ../getchar.c:2040
-msgid "E223: recursive mapping"
-msgstr "E223: ���j mapping"
-
-#: ../getchar.c:2849
-#, c-format
-msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: %s �w�g������ abbreviation �F"
-
-#: ../getchar.c:2852
-#, c-format
-msgid "E225: global mapping already exists for %s"
-msgstr "E225: %s �w�g������ mapping �F"
-
-#: ../getchar.c:2952
-#, c-format
-msgid "E226: abbreviation already exists for %s"
-msgstr "E226: %s �w�g�� abbreviation �F"
-
-#: ../getchar.c:2955
-#, c-format
-msgid "E227: mapping already exists for %s"
-msgstr "E227: %s �� mapping �w�g�s�b"
-
-#: ../getchar.c:3008
-msgid "No abbreviation found"
-msgstr "�䤣�� abbreviation"
-
-#: ../getchar.c:3010
-msgid "No mapping found"
-msgstr "�S���o�� mapping ����"
-
-#: ../getchar.c:3974
-msgid "E228: makemap: Illegal mode"
-msgstr "E228: makemap: �����T���Ҧ�"
-
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--�w�İϵL���--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: �R�O�Q�j��_���� "
-
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: �ݭn���O�Ѽ�"
-
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ �᭱���Ӧ� / ? �� &"
-
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ����b�R�O�C�������ϥΡC<CR>����ACTRL-C ���}"
-
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
-msgstr "E12: exrc/vimrc �̪����O�L�k���� "
-
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: �ʤ� :endif"
-
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: �ʤ� :endtry"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: �ʤ� :endwhile"
-
-#: ../globals.h:1006
-#, fuzzy
-msgid "E170: Missing :endfor"
-msgstr "E171: �ʤ� :endif"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile �ʤֹ����� :while"
-
-#: ../globals.h:1008
-#, fuzzy
-msgid "E588: :endfor without :for"
-msgstr "E580: :endif �ʤֹ����� :if"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ɮפw�g�s�b (�i�� ! �j����N)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: �R�O���楢��"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �������~"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "�w���_"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: �����T����}"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: �����T���Ѽ�"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: �����T���Ѽ�: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: �����T���B�⦡: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: �����T���d��"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: �����T���R�O"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" �O�ؿ�"
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ���~�����ʤj�p"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1022
-#, c-format
-msgid "E902: \"%s\" is not an executable"
-msgstr ""
-
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: �I�s�禡�w \"%s\"() ����"
-
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: �аO���渹���~"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: �S���]�w�аO"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: �]�� 'modifiable' �ﶵ�O�������A�ҥH����ק�"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: �_�����j�I�s�Ӧh�h"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: �S�����N���ɮ�"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: �S���o�� abbreviation ����"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ���i�ϥ� '!'"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: �]���sĶ�ɨS���[�J�ϫ��ɭ����{���X�A�ҥH�L�k�ϥιϫ��ɭ�"
-
-#: ../globals.h:1036
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: �S���W�� '%s' �� highlight group"
-
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: �٨S�����J��r�L"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: �S���e�@���R�O"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: �S���o�� mapping ����"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: �䤣��"
-
-#: ../globals.h:1041
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: �䤣��: %s"
-
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: �S���ɦW"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: �S���e�@�ӷj�M/���N���R�O"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: �S���e�@�өR�O"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: �S���e�@�ӷj�M���O"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: ���i�ϥνd����O"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: �S���������Ŷ�"
-
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ����إ��ɮ� %s"
-
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: �L�k�o���Ȧs�ɦW"
-
-#: ../globals.h:1051
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �L�k�}���ɮ� %s"
-
-#: ../globals.h:1052
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �L�kŪ���ɮ� %s"
-
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: �w���L�ɮצ��|���s�� (�i�� ! �j�����)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[��s��|���x�s]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: �Ū� (Null) �Ѽ�"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ���ӭn���Ʀr"
-
-#: ../globals.h:1058
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: �L�k�}�ҿ��~�ɮ� %s"
-
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: �O���餣��!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�䤣��"
-
-#: ../globals.h:1061
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �䤣�� %s"
-
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �Ѽ����ӬO����"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: �L�k�^��e�@�ӥؿ�"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: �S�����~"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr ""
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: �ŦX�r�꦳���D"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: regexp �����D"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: ���]�w 'readonly' �ﶵ(��Ū) (�i�� ! �j�����)"
-
-#: ../globals.h:1073
-#, fuzzy, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: �L�k�]�w��Ū�ܼ� \"%s\""
-
-#: ../globals.h:1075
-#, fuzzy, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E46: �L�k�]�w��Ū�ܼ� \"%s\""
-
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Ū�����~�ɮץ���"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: ����b sandbox �̥X�{"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �o�̤��i�ϥ�"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: ���䴩�]�w�ù��Ҧ�"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ���~�����ʤj�p"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'E71: �ﶵ 'shell' ���]�w"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: �L�kŪ�� sign data!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: �Ȧs���������~"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: ���Ұ��|�w��"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: �R�O�ӽ���"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: �W�r�Ӫ�"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: �Ӧh ["
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �Ӧh�ɦW"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: �A��J�F�h�l���r��"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: �L�k���Ѫ��аO"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �L�k�i�}�U�Φr��"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ����� 'winminheight' ���"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ����� 'winminwidth' ���"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: �g�J���~"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "�ƨ�s (?)"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> ����b script ����~�ϥ�."
-
-#: ../globals.h:1102
-#, fuzzy, c-format
-msgid "E685: Internal error: %s"
-msgstr "E473: �������~"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr ""
-
-#: ../globals.h:1105
-#, fuzzy
-msgid "E749: empty buffer"
-msgstr "E279: ���O SNiFF+ ���w��"
-
-#: ../globals.h:1108
-#, fuzzy
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E383: ���~���j�M�r��: %s"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: �z�b�t�@�ӽw�İϤ]���J�F�o���ɮ�"
-
-#: ../globals.h:1110
-#, fuzzy, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E236: \"%s\" ���O�T�w�e�צr��"
-
-#: ../globals.h:1111
-#, fuzzy
-msgid "E850: Invalid register name"
-msgstr "E354: �Ȧs���W�ٿ��~: '%s'"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "�w�j�M���ɮ׶}�Y�F�A�q�����~��j�M"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "�w�j�M���ɮ׵����F�A�q�}�Y�~��j�M"
-
-#: ../hardcopy.c:240
-msgid "E550: Missing colon"
-msgstr "E550: �ʤ� colon"
-
-#: ../hardcopy.c:252
-msgid "E551: Illegal component"
-msgstr "E551: �����T���Ҧ�"
-
-#: ../hardcopy.c:259
-msgid "E552: digit expected"
-msgstr "E552: ���ӭn���Ʀr"
-
-#: ../hardcopy.c:473
-#, c-format
-msgid "Page %d"
-msgstr "�� %d ��"
-
-#: ../hardcopy.c:597
-msgid "No text to be printed"
-msgstr "�S���n�C�L����r"
-
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "�C�L��: �� %d �� (%d%%)"
-
-#: ../hardcopy.c:680
-#, c-format
-msgid " Copy %d of %d"
-msgstr "�ƻs %d / %d"
-
-#: ../hardcopy.c:733
-#, c-format
-msgid "Printed: %s"
-msgstr "�w�C�L: %s"
-
-#: ../hardcopy.c:740
-msgid "Printing aborted"
-msgstr "�w�����C�L"
-
-#: ../hardcopy.c:1365
-msgid "E455: Error writing to PostScript output file"
-msgstr "E455: �L�k�g�J PostScript ��X��"
-
-#: ../hardcopy.c:1747
-#, c-format
-msgid "E624: Can't open file \"%s\""
-msgstr "E624: �L�k�}���ɮ� \"%s\""
-
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
-#, c-format
-msgid "E457: Can't read PostScript resource file \"%s\""
-msgstr "E457: �L�kŪ�� PostScript �귽�� \"%s\""
-
-#: ../hardcopy.c:1772
-#, c-format
-msgid "E618: file \"%s\" is not a PostScript resource file"
-msgstr "E618: �ɮ� \"%s\" ���O PostScript �귽�� "
-
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
-#, c-format
-msgid "E619: file \"%s\" is not a supported PostScript resource file"
-msgstr "E619: ���䴩 PostScript �귽�� \"%s\""
-
-#: ../hardcopy.c:1856
-#, c-format
-msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: \"%s\" �귽�ɪ������~"
-
-#: ../hardcopy.c:2225
-msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr ""
-
-#: ../hardcopy.c:2238
-msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr ""
-
-#: ../hardcopy.c:2254
-msgid "E675: No default font specified for multi-byte printing."
-msgstr ""
-
-#: ../hardcopy.c:2426
-msgid "E324: Can't open PostScript output file"
-msgstr "E324: �L�k�}�� PostScript ��X��"
-
-#: ../hardcopy.c:2458
-#, c-format
-msgid "E456: Can't open file \"%s\""
-msgstr "E456: �L�k�}���ɮ� \"%s\""
-
-#: ../hardcopy.c:2583
-msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: �L�kŪ�� PostScript �귽�� \"prolog.ps\""
-
-#: ../hardcopy.c:2593
-#, fuzzy
-msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: �L�kŪ�� PostScript �귽�� \"%s.ps\""
-
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
-#, c-format
-msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: �L�kŪ�� PostScript �귽�� \"%s.ps\""
-
-#: ../hardcopy.c:2654
-#, fuzzy, c-format
-msgid "E620: Unable to convert to print encoding \"%s\""
-msgstr "E620:�L�k�ഫ�� \"%s\" �r���s�X"
-
-#: ../hardcopy.c:2877
-msgid "Sending to printer..."
-msgstr "�ǰe��ƨ�L����..."
-
-#: ../hardcopy.c:2881
-msgid "E365: Failed to print PostScript file"
-msgstr "E365: �L�k�C�L PostScript �ɮ�"
-
-#: ../hardcopy.c:2883
-msgid "Print job sent."
-msgstr "�w�e�X�C�L�u�@�C"
-
-#: ../if_cscope.c:85
-msgid "Add a new database"
-msgstr "�s�W��Ʈw"
-
-#: ../if_cscope.c:87
-msgid "Query for a pattern"
-msgstr "��J pattern"
-
-#: ../if_cscope.c:89
-msgid "Show this message"
-msgstr "��ܦ��T��"
-
-#: ../if_cscope.c:91
-msgid "Kill a connection"
-msgstr "�����s�u"
-
-#: ../if_cscope.c:93
-msgid "Reinit all connections"
-msgstr "���]�Ҧ��s�u"
-
-#: ../if_cscope.c:95
-msgid "Show connections"
-msgstr "��ܳs�u"
-
-#: ../if_cscope.c:101
-#, c-format
-msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: �Ϊk: cs[cope] %s"
-
-#: ../if_cscope.c:225
-msgid "This cscope command does not support splitting the window.\n"
-msgstr "�o�� cscope �R�O���䴩���οù�\n"
-
-#: ../if_cscope.c:266
-msgid "E562: Usage: cstag <ident>"
-msgstr "E562: �Ϊk: cstag <�ѧO�rident>"
-
-#: ../if_cscope.c:313
-msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: �䤣�� tag"
-
-#: ../if_cscope.c:461
-#, c-format
-msgid "E563: stat(%s) error: %d"
-msgstr "E563: stat(%s) ���~: %d"
-
-#: ../if_cscope.c:551
-#, c-format
-msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s ���O�ؿ��� cscope ��Ʈw"
-
-#: ../if_cscope.c:566
-#, c-format
-msgid "Added cscope database %s"
-msgstr "�s�W cscope ��Ʈw %s"
-
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: Ū�� cscope �s�u %<PRId64> ���~"
-
-#: ../if_cscope.c:711
-msgid "E561: unknown cscope search type"
-msgstr "E561: ������ cscope �j�M�κA"
-
-#: ../if_cscope.c:752 ../if_cscope.c:789
-msgid "E566: Could not create cscope pipes"
-msgstr "E566: �L�k�إ߻P cscope �� pipe �s�u"
-
-#: ../if_cscope.c:767
-msgid "E622: Could not fork for cscope"
-msgstr "E622: �L�k fork �H���� cscope "
-
-#: ../if_cscope.c:849
-#, fuzzy
-msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection ���楢��"
-
-#: ../if_cscope.c:853 ../if_cscope.c:889
-msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection ���楢��"
-
-#: ../if_cscope.c:863 ../if_cscope.c:902
-msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen ���� (to_fp)"
-
-#: ../if_cscope.c:865 ../if_cscope.c:906
-msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen ���� (fr_fp)"
-
-#: ../if_cscope.c:890
-msgid "E623: Could not spawn cscope process"
-msgstr "E623: �L�k���� cscope "
-
-#: ../if_cscope.c:932
-msgid "E567: no cscope connections"
-msgstr "E567: �S�� cscope �s�u"
-
-#: ../if_cscope.c:1009
-#, c-format
-msgid "E469: invalid cscopequickfix flag %c for %c"
-msgstr "E469: cscopequickfix �� flac %c (%c) �����T"
-
-#: ../if_cscope.c:1058
-#, c-format
-msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: �䤣��ŦX cscope ���j�M %s / %s"
-
-#: ../if_cscope.c:1142
-msgid "cscope commands:\n"
-msgstr "cscope �R�O:\n"
-
-#: ../if_cscope.c:1150
-#, fuzzy, c-format
-msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %-30s (�Ϊk: %s)"
-
-#: ../if_cscope.c:1155
-msgid ""
-"\n"
-"       c: Find functions calling this function\n"
-"       d: Find functions called by this function\n"
-"       e: Find this egrep pattern\n"
-"       f: Find this file\n"
-"       g: Find this definition\n"
-"       i: Find files #including this file\n"
-"       s: Find this C symbol\n"
-"       t: Find this text string\n"
-msgstr ""
-
-#: ../if_cscope.c:1226
-msgid "E568: duplicate cscope database not added"
-msgstr "E568: ���ƪ� cscope ��Ʈw���Q�[�J"
-
-#: ../if_cscope.c:1335
-#, c-format
-msgid "E261: cscope connection %s not found"
-msgstr "E261: �䤣�� cscope �s�u %s"
-
-#: ../if_cscope.c:1364
-#, c-format
-msgid "cscope connection %s closed"
-msgstr "cscope �s�u %s �w����"
-
-#. should not reach here
-#: ../if_cscope.c:1486
-msgid "E570: fatal error in cs_manage_matches"
-msgstr "E570: cs_manage_matches �Y�����~"
-
-#: ../if_cscope.c:1693
-#, c-format
-msgid "Cscope tag: %s"
-msgstr "Cscope ����(tag): %s"
-
-#: ../if_cscope.c:1711
-msgid ""
-"\n"
-"   #   line"
-msgstr ""
-"\n"
-"   #   ��  "
-
-#: ../if_cscope.c:1713
-msgid "filename / context / line\n"
-msgstr "�ɦW     / ����    / �渹\n"
-
-#: ../if_cscope.c:1809
-#, c-format
-msgid "E609: Cscope error: %s"
-msgstr "E609: Csope ���~: %s"
-
-#: ../if_cscope.c:2053
-msgid "All cscope databases reset"
-msgstr "���]�Ҧ� cscope ��Ʈw"
-
-#: ../if_cscope.c:2123
-msgid "no cscope connections\n"
-msgstr "�S�� cscope �s�u\n"
-
-#: ../if_cscope.c:2126
-msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    ��Ʈw�W��                          prepend path\n"
-
-#: ../main.c:144
-#, fuzzy
-msgid "Unknown option argument"
-msgstr "�����T���ﶵ"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "�Ӧh�s��Ѽ�"
-
-#: ../main.c:148
-msgid "Argument missing after"
-msgstr "�ʤ֥��n���Ѽ�:"
-
-#: ../main.c:150
-#, fuzzy
-msgid "Garbage after option argument"
-msgstr "�L�k��{���ﶵ�᪺�R�O: "
-
-#: ../main.c:152
-msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
-msgstr "�Ӧh \"+command\" �B \"-c command\" �� \"--cmd command\" �Ѽ�"
-
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "�����T���Ѽ�: "
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "�٦� %d ���ɮ׵��ݽs��\n"
-
-#: ../main.c:1342
-msgid "Attempt to open script file again: \""
-msgstr "�չϦA���}�� script ��: \""
-
-#: ../main.c:1350
-msgid "Cannot open for reading: \""
-msgstr "�L�k�}�ҥHŪ��: \""
-
-#: ../main.c:1393
-msgid "Cannot open for script output: \""
-msgstr "�L�k�}�Ҭ� script ��X: \""
-
-#: ../main.c:1622
-msgid "Vim: Warning: Output is not to a terminal\n"
-msgstr "Vim: �`�N: ��X���O�׺ݾ�(�ù�)\n"
-
-#: ../main.c:1624
-msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: �`�N: ��J���O�׺ݾ�(��L)\n"
-
-#. just in case..
-#: ../main.c:1891
-msgid "pre-vimrc command line"
-msgstr "vimrc �e�R�O�C"
-
-#: ../main.c:1964
-#, c-format
-msgid "E282: Cannot read from \"%s\""
-msgstr "E282: �L�kŪ���ɮ� \"%s\""
-
-#: ../main.c:2149
-msgid ""
-"\n"
-"More info with: \"vim -h\"\n"
-msgstr ""
-"\n"
-"�d�ߧ�h��T�а���: \"vim -h\"\n"
-
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[�ɮ� ..]       �s����w���ɮ�"
-
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-               �q�зǿ�J(stdin)Ū���ɮ�"
-
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t tag          �s��ɨϥΫ��w�� tag"
-
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [errorfile]  �s��ɸ��J�Ĥ@�ӿ��~"
-
-#: ../main.c:2187
-msgid ""
-"\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-" �Ϊk:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr "vim [�Ѽ�] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   ��:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"\n"
-"�Ѽ�:\n"
-
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\t�u���b�o���᪺�ɮ�"
-
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t���i�}�U�Φr��"
-
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi �Ҧ� (�P \"vi\")"
-
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx �Ҧ� (�P \"ex\")"
-
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
-
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\t�w�R (batch) �Ҧ� (�u��P \"ex\" �@�_�ϥ�)"
-
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff �Ҧ� (�P \"vimdiff\", �i���t������ɮפ��P�B)"
-
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\t²���Ҧ� (�P \"evim\", modeless)"
-
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\t��Ū�Ҧ� (�P \"view\")"
-
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\t����Ҧ� (�P \"rvim\")"
-
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\t���i�ק� (�g�J�ɮ�)"
-
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\t���i�ק��r"
-
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\t�G�i��Ҧ�"
-
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tLisp �Ҧ�"
-
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\t'compatible' �Dz� Vi �ۮe�Ҧ�"
-
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\t'nocompatible' �������P�Dz� Vi �ۮe�A�i�ϥ� Vim �[�j��O"
-
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\t�����Ҧ�"
-
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\t���ϥμȦs��, �u�ϥΰO����"
-
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\t�C�X�Ȧs�ɫ����}"
-
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (�[�ɦW)       \t�״_�W���l�������(Recover crashed session)"
-
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\t�P -r"
-
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\t�Ұʬ� Arabic �Ҧ�"
-
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\t�Ұʬ� Hebrew �Ҧ�"
-
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\t�Ұʬ� Farsi �Ҧ�"
-
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminal>\t�]�w�׺ݾ��� <terminal>"
-
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\t�ϥ� <vimrc> ���N���� .vimrc"
-
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�����J���� plugin"
-
-#: ../main.c:2227
-#, fuzzy
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-o[N]\t\t�}�� N �ӵ��� (�w�]�O�C���ɮפ@��)"
-
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\t�}�� N �ӵ��� (�w�]�O�C���ɮפ@��)"
-
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\t�P -o ���ϥΫ�������"
-
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\t�Ұʫ�����ɮ׵���"
-
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<lnum>\t\t�Ұʫ����� <lnum> �� "
-
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <command>\t���J���� vimrc �e���� <command>"
-
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <command>\t\t���J�Ĥ@���ɮ׫���� <command>"
-
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <session>\t\t���J�Ĥ@���ɮ׫���J Session �� <session>"
-
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <scriptin>\t�q <scriptin> Ū�J�@��Ҧ��R�O"
-
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <scriptout>\t���ɮ� <scriptout> ���[(append)�Ҧ���J���R�O"
-
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <scriptout>\t���ɮ� <scriptout> �g�J�Ҧ���J���R�O"
-
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr ""
-
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\t�ϥ� <viminfo> �ӫD .viminfo"
-
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h  ��  --help\t�L�X����(�]�N�O���T��)�����}"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t�L�X������T�����}"
-
-#: ../mark.c:676
-msgid "No marks set"
-msgstr "�S���]�w�аO (mark)"
-
-#: ../mark.c:678
-#, c-format
-msgid "E283: No marks matching \"%s\""
-msgstr "E283: �䤣��ŦX \"%s\" ���аO(mark)"
-
-#. Highlight title
-#: ../mark.c:687
-msgid ""
-"\n"
-"mark line  col file/text"
-msgstr ""
-"\n"
-"�аO �渹  ��  �ɮ�/��r"
-
-#. Highlight title
-#: ../mark.c:789
-msgid ""
-"\n"
-" jump line  col file/text"
-msgstr ""
-"\n"
-" jump �渹  ��  �ɮ�/��r"
-
-#. Highlight title
-#: ../mark.c:831
-msgid ""
-"\n"
-"change line  col text"
-msgstr ""
-"\n"
-"����   �渹  ��  ��r"
-
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# �ɮ׼аO:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Jumplist (�ѷs����):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# �ɮפ� Mark �O�� (�ѷs����):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "�ʤֹ����� '>'"
-
-#: ../memfile.c:426
-msgid "E293: block was not locked"
-msgstr "E293: �϶����Q��w"
-
-#: ../memfile.c:799
-msgid "E294: Seek error in swap file read"
-msgstr "E294: �Ȧs��Ū�����~"
-
-#: ../memfile.c:803
-msgid "E295: Read error in swap file"
-msgstr "E295: �Ȧs��Ū�����~"
-
-#: ../memfile.c:849
-msgid "E296: Seek error in swap file write"
-msgstr "E296: �Ȧs�ɼg�J���~"
-
-#: ../memfile.c:865
-msgid "E297: Write error in swap file"
-msgstr "E297: �Ȧs�ɼg�J���~"
-
-#: ../memfile.c:1036
-msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: �Ȧs�ɤw�g�s�b! (�p�߲Ÿ��s�����w���|�}!?)"
-
-#: ../memline.c:318
-msgid "E298: Didn't get block nr 0?"
-msgstr "E298: �䤣��϶� 0?"
-
-#: ../memline.c:361
-msgid "E298: Didn't get block nr 1?"
-msgstr "E298: �䤣��϶� 1?"
-
-#: ../memline.c:377
-msgid "E298: Didn't get block nr 2?"
-msgstr "E298: �䤣��϶� 2?"
-
-#. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
-msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: ����, �Ȧs�ɤ����F!!!"
-
-#: ../memline.c:477
-msgid "E302: Could not rename swap file"
-msgstr "E302: �L�k���ܼȦs�ɪ��W��"
-
-#: ../memline.c:554
-#, c-format
-msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
-msgstr "E303: �L�k�}�ҼȦs�� \"%s\", ���i��״_�F"
-
-#: ../memline.c:666
-#, fuzzy
-msgid "E304: ml_upd_block0(): Didn't get block 0??"
-msgstr "E304: ml_timestamp: �䤣��϶� 0??"
-
-#. no swap files found
-#: ../memline.c:830
-#, c-format
-msgid "E305: No swap file found for %s"
-msgstr "E305: �䤣�� %s ���Ȧs��"
-
-#: ../memline.c:839
-msgid "Enter number of swap file to use (0 to quit): "
-msgstr "�п�ܧA�n�ϥΪ��Ȧs�� (��0 ���}): "
-
-#: ../memline.c:879
-#, c-format
-msgid "E306: Cannot open %s"
-msgstr "E306: �L�k�}�� %s"
-
-#: ../memline.c:897
-msgid "Unable to read block 0 from "
-msgstr "�L�kŪ���϶� 0:"
-
-#: ../memline.c:900
-msgid ""
-"\n"
-"Maybe no changes were made or Vim did not update the swap file."
-msgstr ""
-"\n"
-"�i��O�A�S���L����ק�άO Vim �٨Ӥ��Χ�s�Ȧs��."
-
-#: ../memline.c:909
-msgid " cannot be used with this version of Vim.\n"
-msgstr " �L�k�b�������� Vim ���ϥ�.\n"
-
-#: ../memline.c:911
-msgid "Use Vim version 3.0.\n"
-msgstr "�ϥ� Vim 3.0�C\n"
-
-#: ../memline.c:916
-#, c-format
-msgid "E307: %s does not look like a Vim swap file"
-msgstr "E307: %s �ݰ_�Ӥ����O Vim �Ȧs��"
-
-#: ../memline.c:922
-msgid " cannot be used on this computer.\n"
-msgstr " �L�k�b�o�O�q���W�ϥ�.\n"
-
-#: ../memline.c:924
-msgid "The file was created on "
-msgstr "���ɮ׫إߩ� "
-
-#: ../memline.c:928
-msgid ""
-",\n"
-"or the file has been damaged."
-msgstr ""
-",\n"
-"�άO�o�ɮפw�g�l���C"
-
-#: ../memline.c:945
-msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr ""
-
-#: ../memline.c:974
-#, c-format
-msgid "Using swap file \"%s\""
-msgstr "�ϥμȦs�� \"%s\""
-
-#: ../memline.c:980
-#, c-format
-msgid "Original file \"%s\""
-msgstr "��l�� \"%s\""
-
-#: ../memline.c:995
-msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: ĵ�i: ��l�ɮץi��w�g�ק�L�F"
-
-#: ../memline.c:1061
-#, c-format
-msgid "E309: Unable to read block 1 from %s"
-msgstr "E309: �L�k�q %s Ū���϶� 1"
-
-#: ../memline.c:1065
-msgid "???MANY LINES MISSING"
-msgstr "???�ʤ֤Ӧh�� "
-
-#: ../memline.c:1076
-msgid "???LINE COUNT WRONG"
-msgstr "???�渹���~"
-
-#: ../memline.c:1082
-msgid "???EMPTY BLOCK"
-msgstr "???�Ū� BLOCK"
-
-#: ../memline.c:1103
-msgid "???LINES MISSING"
-msgstr "???�䤣��@�Ǧ� "
-
-#: ../memline.c:1128
-#, c-format
-msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: �϶� 1 ID ���~ (%s ���O�Ȧs��?)"
-
-#: ../memline.c:1133
-msgid "???BLOCK MISSING"
-msgstr "???�䤣��BLOCK"
-
-#: ../memline.c:1147
-msgid "??? from here until ???END lines may be messed up"
-msgstr "??? �q�o�̨� ???END �����e�i�঳���D"
-
-#: ../memline.c:1164
-msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? �q�o�̨� ???END �����e�i��Q�R��/���J�L"
-
-# do not translate
-#: ../memline.c:1181
-msgid "???END"
-msgstr "???END"
-
-#: ../memline.c:1238
-msgid "E311: Recovery Interrupted"
-msgstr "E311: �״_�w���_"
-
-#: ../memline.c:1243
-msgid ""
-"E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: �״_�ɵo�Ϳ��~; �Ъ`�N�}�Y�� ??? ���� "
-
-#: ../memline.c:1245
-msgid "See \":help E312\" for more information."
-msgstr "�Բӻ����Ш� \":help E312\""
-
-#: ../memline.c:1249
-msgid "Recovery completed. You should check if everything is OK."
-msgstr "�_�짹��. �нT�w�@�����`."
-
-#: ../memline.c:1251
-msgid ""
-"\n"
-"(You might want to write out this file under another name\n"
-msgstr ""
-"\n"
-"(�A�i��|�Q�n��o���ɮץt�s�O���ɦW�A\n"
-
-#: ../memline.c:1252
-#, fuzzy
-msgid "and run diff with the original file to check for changes)"
-msgstr "�A���� diff �P���ɮפ���H�ˬd�O�_������)\n"
-
-#: ../memline.c:1254
-msgid "Recovery completed. Buffer contents equals file contents."
-msgstr ""
-
-#: ../memline.c:1255
-#, fuzzy
-msgid ""
-"\n"
-"You may want to delete the .swp file now.\n"
-"\n"
-msgstr ""
-"(D)�����R�� .swp �Ȧs��\n"
-"\n"
-
-#. use msg() to start the scrolling properly
-#: ../memline.c:1327
-msgid "Swap files found:"
-msgstr "���H�U���Ȧs��:"
-
-#: ../memline.c:1446
-msgid "   In current directory:\n"
-msgstr "   �b�ثe���ؿ�:\n"
-
-#: ../memline.c:1448
-msgid "   Using specified name:\n"
-msgstr "   Using specified name:\n"
-
-#: ../memline.c:1450
-msgid "   In directory "
-msgstr "   �b�ؿ� "
-
-#: ../memline.c:1465
-msgid "      -- none --\n"
-msgstr "      -- �L --\n"
-
-#: ../memline.c:1527
-msgid "          owned by: "
-msgstr "            �֦���: "
-
-#: ../memline.c:1529
-msgid "   dated: "
-msgstr "    ���: "
-
-#: ../memline.c:1532 ../memline.c:3231
-msgid "             dated: "
-msgstr "              ���: "
-
-#: ../memline.c:1548
-msgid "         [from Vim version 3.0]"
-msgstr "              [�q Vim ���� 3.0]"
-
-#: ../memline.c:1550
-msgid "         [does not look like a Vim swap file]"
-msgstr "                          [���� Vim ���Ȧs��]"
-
-#: ../memline.c:1552
-msgid "         file name: "
-msgstr "              �ɦW: "
-
-#: ../memline.c:1558
-msgid ""
-"\n"
-"          modified: "
-msgstr ""
-"\n"
-"            �ק�L: "
-
-#: ../memline.c:1559
-msgid "YES"
-msgstr "�O"
-
-#: ../memline.c:1559
-msgid "no"
-msgstr "�_"
-
-#: ../memline.c:1562
-msgid ""
-"\n"
-"         user name: "
-msgstr ""
-"\n"
-"            �ϥΪ�: "
-
-#: ../memline.c:1568
-msgid "   host name: "
-msgstr "    �D���W��: "
-
-#: ../memline.c:1570
-msgid ""
-"\n"
-"         host name: "
-msgstr ""
-"\n"
-"          �D���W��: "
-
-#: ../memline.c:1575
-msgid ""
-"\n"
-"        process ID: "
-msgstr ""
-"\n"
-"        process ID: "
-
-#: ../memline.c:1579
-msgid " (still running)"
-msgstr " (���椤)"
-
-#: ../memline.c:1586
-msgid ""
-"\n"
-"         [not usable on this computer]"
-msgstr ""
-"\n"
-"         [�L�k�b���q���W�ϥ�]"
-
-#: ../memline.c:1590
-msgid "         [cannot be read]"
-msgstr "         [�L�kŪ��]"
-
-#: ../memline.c:1593
-msgid "         [cannot be opened]"
-msgstr "         [�L�k�}��]"
-
-#: ../memline.c:1698
-msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: �L�k�O�d, ���ϥμȦs��"
-
-#: ../memline.c:1747
-msgid "File preserved"
-msgstr "�ɮפw�O�d"
-
-#: ../memline.c:1749
-msgid "E314: Preserve failed"
-msgstr "E314: �O�d����"
-
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ���~�� lnum: %<PRId64>"
-
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �䤣��� %<PRId64> �� "
-
-#: ../memline.c:2236
-msgid "E317: pointer block id wrong 3"
-msgstr "E317: ���а϶� id ���~ 3"
-
-#: ../memline.c:2311
-msgid "stack_idx should be 0"
-msgstr "stack_idx ���ӬO 0"
-
-#: ../memline.c:2369
-msgid "E318: Updated too many blocks?"
-msgstr "E318: ��s�Ӧh�϶�?"
-
-#: ../memline.c:2511
-msgid "E317: pointer block id wrong 4"
-msgstr "E317: ���а϶� id ���~ 4"
-
-#: ../memline.c:2536
-msgid "deleted block 1?"
-msgstr "�R���϶� 1?"
-
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �䤣��� %<PRId64> �� "
-
-#: ../memline.c:2916
-msgid "E317: pointer block id wrong"
-msgstr "E317: ���а϶� id ���~"
-
-#: ../memline.c:2930
-msgid "pe_line_count is zero"
-msgstr "pe_line_count ���s"
-
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: �渹�W�X�d��: %<PRId64> �W�L����"
-
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �϶� %<PRId64> ��ƿ��~"
-
-#: ../memline.c:2999
-msgid "Stack size increases"
-msgstr "���|�j�p�W�["
-
-#: ../memline.c:3038
-msgid "E317: pointer block id wrong 2"
-msgstr "E317: ���а϶� id �� 2"
-
-#: ../memline.c:3070
-#, c-format
-msgid "E773: Symlink loop for \"%s\""
-msgstr ""
-
-#: ../memline.c:3221
-msgid "E325: ATTENTION"
-msgstr "E325: �`�N"
-
-#: ../memline.c:3222
-msgid ""
-"\n"
-"Found a swap file by the name \""
-msgstr ""
-"\n"
-"���Ȧs�� \""
-
-#: ../memline.c:3226
-msgid "While opening file \""
-msgstr "�b�}���ɮ� \""
-
-#: ../memline.c:3239
-msgid "      NEWER than swap file!\n"
-msgstr "      ��Ȧs�ɧ�s!\n"
-
-#: ../memline.c:3244
-#, fuzzy
-msgid ""
-"\n"
-"(1) Another program may be editing the same file.  If this is the case,\n"
-"    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
-msgstr ""
-"\n"
-"(1) �i�঳�t�@�ӵ{���]�b�s��P�@���ɮ�.\n"
-"    �p�G�O�o�ˡA�Фp�ߤ��n����@�_�g�J�A���M�A���V�O���|�t�Ѭy���C\n"
-
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    ���}�A�άO�~��s��C\n"
-
-#: ../memline.c:3246
-#, fuzzy
-msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) �e���s�覹�ɮɷ���\n"
-
-#: ../memline.c:3247
-msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    �p�G�O�o��, �� \":recover\" �� \"vim -r"
-
-#: ../memline.c:3249
-msgid ""
-"\"\n"
-"    to recover the changes (see \":help recovery\").\n"
-msgstr ""
-"\"\n"
-"    �ӱϦ^�ק��� (�Բӻ����Ь� \":help recovery\").\n"
-
-#: ../memline.c:3250
-msgid "    If you did this already, delete the swap file \""
-msgstr "    �p�G�ӱϪ����w�g�ϤF, �Ъ����R�����Ȧs�� \""
-
-#: ../memline.c:3252
-msgid ""
-"\"\n"
-"    to avoid this message.\n"
-msgstr ""
-"\"\n"
-"    �H�קK�A�ݨ즹�T��.\n"
-
-#: ../memline.c:3450 ../memline.c:3452
-msgid "Swap file \""
-msgstr "�Ȧs�� \""
-
-#: ../memline.c:3451 ../memline.c:3455
-msgid "\" already exists!"
-msgstr "\" �w�g�s�b�F!"
-
-#: ../memline.c:3457
-msgid "VIM - ATTENTION"
-msgstr "VIM - �`�N"
-
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "�Ȧs�ɤw�g�s�b!"
-
-#: ../memline.c:3464
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�H��Ū�覡�}��(&O)\n"
-"�����s��(&E)\n"
-"�״_(&R)\n"
-"���}(&Q)\n"
-"���X(&A)"
-
-#: ../memline.c:3467
-#, fuzzy
-msgid ""
-"&Open Read-Only\n"
-"&Edit anyway\n"
-"&Recover\n"
-"&Delete it\n"
-"&Quit\n"
-"&Abort"
-msgstr ""
-"�H��Ū�覡�}��(&O)\n"
-"�����s��(&E)\n"
-"�״_(&R)\n"
-"���}(&Q)\n"
-"���X(&A)"
-
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
-msgid "E326: Too many swap files found"
-msgstr "E326: ���Ӧh�Ȧs��"
-
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: �O���餣��! (���հt�m %<PRIu64> �줸��)"
-
-#: ../menu.c:62
-msgid "E327: Part of menu-item path is not sub-menu"
-msgstr "E327: �����ﶵ���|���O�l���"
-
-#: ../menu.c:63
-msgid "E328: Menu only exists in another mode"
-msgstr "E328: ���u��b�䥦�Ҧ����ϥ�"
-
-#: ../menu.c:64
-#, fuzzy, c-format
-msgid "E329: No menu \"%s\""
-msgstr "E329: �S�����˪����"
-
-#. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
-msgid "E792: Empty menu name"
-msgstr ""
-
-#: ../menu.c:340
-msgid "E330: Menu path must not lead to a sub-menu"
-msgstr "E330: �����|������V�l���"
-
-#: ../menu.c:365
-msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: ���ઽ����ﶵ�[����C��"
-
-#: ../menu.c:370
-msgid "E332: Separator cannot be part of a menu path"
-msgstr "E332: ���j�u����O�����|���@����"
-
-#. Now we have found the matching menu, and we list the mappings
-#. Highlight title
-#: ../menu.c:762
-msgid ""
-"\n"
-"--- Menus ---"
-msgstr ""
-"\n"
-"--- ��� ---"
-
-#: ../menu.c:1313
-msgid "E333: Menu path must lead to a menu item"
-msgstr "E333: �����|���ݫ��V�@�ӿﶵ"
-
-#: ../menu.c:1330
-#, c-format
-msgid "E334: Menu not found: %s"
-msgstr "E334: [���] �䤣�� %s"
-
-#: ../menu.c:1396
-#, c-format
-msgid "E335: Menu not defined for %s mode"
-msgstr "E335: %s �Ҧ����w�q���"
-
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: �����|���ݫ��V�l���"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: �䤣���� - ���ˬd���W��"
-
-#: ../message.c:423
-#, c-format
-msgid "Error detected while processing %s:"
-msgstr "�B�z %s �ɵo�Ϳ��~:"
-
-#: ../message.c:445
-#, c-format
-msgid "line %4ld:"
-msgstr "�� %4ld:"
-
-#: ../message.c:617
-#, c-format
-msgid "E354: Invalid register name: '%s'"
-msgstr "E354: �Ȧs���W�ٿ��~: '%s'"
-
-#: ../message.c:745
-msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
-msgstr ""
-"���餤��T�����@��: Francis S.Lin <piaip@csie.ntu.edu."
-"tw>,                                 Cecil Sheng   <b7506022@csie.ntu.edu.tw>"
-
-#: ../message.c:986
-msgid "Interrupt: "
-msgstr "�w���_: "
-
-#: ../message.c:988
-#, fuzzy
-msgid "Press ENTER or type command to continue"
-msgstr "�Ы� ENTER �Ψ䥦�R�O�H�~��"
-
-#: ../message.c:1843
-#, fuzzy, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s, �� %<PRId64>"
-
-#: ../message.c:2392
-msgid "-- More --"
-msgstr "-- �|�� --"
-
-#: ../message.c:2398
-msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr ""
-
-#: ../message.c:3021 ../message.c:3031
-msgid "Question"
-msgstr "���D"
-
-#: ../message.c:3023
-msgid ""
-"&Yes\n"
-"&No"
-msgstr ""
-"&Y�O\n"
-"&N�_"
-
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Y�O\n"
-"&N�_\n"
-"&C����"
-
-#: ../message.c:3045
-msgid ""
-"&Yes\n"
-"&No\n"
-"Save &All\n"
-"&Discard All\n"
-"&Cancel"
-msgstr ""
-"&Y�O\n"
-"&N�_\n"
-"&A�����s��\n"
-"&D�������s\n"
-"&C����"
-
-#: ../message.c:3058
-#, fuzzy
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E116: �禡 %s ���޼Ƥ����T"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr ""
-
-#: ../message.c:3873
-#, fuzzy
-msgid "E767: Too many arguments to printf()"
-msgstr "E118: �禡 %s ���޼ƹL�h"
-
-#: ../misc1.c:2256
-msgid "W10: Warning: Changing a readonly file"
-msgstr "W10: �`�N: �A���b�ק�@�Ӱ�Ū��"
-
-#: ../misc1.c:2537
-msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr ""
-
-#: ../misc1.c:2539
-msgid "Type number and <Enter> (empty cancels): "
-msgstr ""
-
-#: ../misc1.c:2585
-msgid "1 more line"
-msgstr "�٦��@�� "
-
-#: ../misc1.c:2588
-msgid "1 line less"
-msgstr "�֩�@�� "
-
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "�٦� %<PRId64> �� "
-
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "�u�� %<PRId64> �� "
-
-#: ../misc1.c:2599
-msgid " (Interrupted)"
-msgstr " (�w���_)"
-
-#: ../misc1.c:2635
-msgid "Beep!"
-msgstr ""
-
-#: ../misc2.c:738
-#, c-format
-msgid "Calling shell to execute: \"%s\""
-msgstr "�I�s shell ����: \"%s\""
-
-#: ../normal.c:183
-msgid "E349: No identifier under cursor"
-msgstr "E349: ��гB�S���ѧO�r"
-
-#: ../normal.c:1866
-#, fuzzy
-msgid "E774: 'operatorfunc' is empty"
-msgstr "E221: �ﶵ 'commentstring' ���]�w"
-
-#: ../normal.c:2637
-msgid "Warning: terminal cannot highlight"
-msgstr "�`�N: �A���׺ݾ��L�k��ܰ��G��"
-
-#: ../normal.c:2807
-msgid "E348: No string under cursor"
-msgstr "E348: ��гB�S���r��"
-
-#: ../normal.c:3937
-msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: �L�k�b�ثe�� 'foldmethod' �U�R�� fold"
-
-#: ../normal.c:5897
-msgid "E664: changelist is empty"
-msgstr "E664: �ܧ�C���O�Ū�"
-
-#: ../normal.c:5899
-msgid "E662: At start of changelist"
-msgstr "E662: �w�b�ܧ�C�����}�Y"
-
-#: ../normal.c:5901
-msgid "E663: At end of changelist"
-msgstr "E663: �w�b�ܧ�C��������"
-
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "�n���} Vim �п�J :quit<Enter> "
-
-#: ../ops.c:248
-#, c-format
-msgid "1 line %sed 1 time"
-msgstr "�@�� %s �L �@��"
-
-#: ../ops.c:250
-#, c-format
-msgid "1 line %sed %d times"
-msgstr "�@�� %s �L %d ��"
-
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �� %s �L �@��"
-
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �� %s �L %d ��"
-
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "�Y�� %<PRId64> ��... "
-
-#: ../ops.c:634
-msgid "1 line indented "
-msgstr "�@��w�Y��"
-
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "�w�Y�� %<PRId64> �� "
-
-#: ../ops.c:938
-#, fuzzy
-msgid "E748: No previously used register"
-msgstr "E186: �S���e�@�ӥؿ�"
-
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "�L�k�ŤU; �����R��"
-
-#: ../ops.c:1929
-msgid "1 line changed"
-msgstr " 1 �� ~ed"
-
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "�w���� %<PRId64> �� "
-
-#: ../ops.c:2521
-#, fuzzy
-msgid "block of 1 line yanked"
-msgstr "�w�ƻs 1 �� "
-
-#: ../ops.c:2523
-msgid "1 line yanked"
-msgstr "�w�ƻs 1 �� "
-
-#: ../ops.c:2525
-#, fuzzy, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "�w�ƻs %<PRId64> �� "
-
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "�w�ƻs %<PRId64> �� "
-
-#: ../ops.c:2710
-#, c-format
-msgid "E353: Nothing in register %s"
-msgstr "E353: �Ȧs�� %s �̨S���F��"
-
-#. Highlight title
-#: ../ops.c:3185
-msgid ""
-"\n"
-"--- Registers ---"
-msgstr ""
-"\n"
-"--- �Ȧs�� ---"
-
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "�����T���Ȧs���W��"
-
-#: ../ops.c:4533
-msgid ""
-"\n"
-"# Registers:\n"
-msgstr ""
-"\n"
-"# �Ȧs��:\n"
-
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: ���������U���A: %d"
-
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
-
-#: ../ops.c:5097
-#, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"��ܤF %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> �r(Word); %<PRId64>/"
-"%<PRId64> �r��(Bytes)"
-
-#: ../ops.c:5105
-#, fuzzy, c-format
-msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"��ܤF %s%<PRId64>/%<PRId64> ��; %<PRId64>/%<PRId64> �r(Word); %<PRId64>/"
-"%<PRId64> �r��(Bytes)"
-
-#: ../ops.c:5123
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s; �� %<PRId64>/%<PRId64>; �r(Word) %<PRId64>/%<PRId64>; �r��(Byte) "
-"%<PRId64>/%<PRId64>"
-
-#: ../ops.c:5133
-#, fuzzy, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s/%s; �� %<PRId64>/%<PRId64>; �r(Word) %<PRId64>/%<PRId64>; �r��(Byte) "
-"%<PRId64>/%<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=�� %N ��"
-
-# ? what's this for?
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "�P�±z�R�� Vim"
-
-#. found a mismatch: skip
-#: ../option.c:2698
-msgid "E518: Unknown option"
-msgstr "E518: �����T���ﶵ"
-
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: ���䴩�ӿﶵ"
-
-#: ../option.c:2740
-msgid "E520: Not allowed in a modeline"
-msgstr "E520: ����b Modeline �̥X�{"
-
-#: ../option.c:2815
-msgid "E846: Key code not set"
-msgstr ""
-
-#: ../option.c:2924
-msgid "E521: Number required after ="
-msgstr "E521: = ��ݭn���Ʀr"
-
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Termcap �̭��䤣��"
-
-#: ../option.c:3335
-#, c-format
-msgid "E539: Illegal character <%s>"
-msgstr "E539: �����T���r�� <%s>"
-
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: �L�k�]�w 'term' ���Ŧr��"
-
-#: ../option.c:3885
-msgid "E589: 'backupext' and 'patchmode' are equal"
-msgstr "E589: 'backupext' �� 'patchmode' �O�@�˪�"
-
-#: ../option.c:3964
-msgid "E834: Conflicts with value of 'listchars'"
-msgstr ""
-
-#: ../option.c:3966
-msgid "E835: Conflicts with value of 'fillchars'"
-msgstr ""
-
-#: ../option.c:4163
-msgid "E524: Missing colon"
-msgstr "E524: �ʤ� colon"
-
-#: ../option.c:4165
-msgid "E525: Zero length string"
-msgstr "E525: �s���צr��"
-
-#: ../option.c:4220
-#, c-format
-msgid "E526: Missing number after <%s>"
-msgstr "E526: <%s> ��ʤּƦr"
-
-#: ../option.c:4232
-msgid "E527: Missing comma"
-msgstr "E527: �ʤֳr��"
-
-#: ../option.c:4239
-msgid "E528: Must specify a ' value"
-msgstr "E528: ���ݫ��w�@�� ' ��"
-
-#: ../option.c:4271
-msgid "E595: contains unprintable or wide character"
-msgstr "E595: ���t�L�k��ܪ��r��"
-
-#: ../option.c:4469
-#, c-format
-msgid "E535: Illegal character after <%c>"
-msgstr "E535: <%c> �ᦳ�����T���r��"
-
-#: ../option.c:4534
-msgid "E536: comma required"
-msgstr "E536: �ݭn�r��"
-
-#: ../option.c:4543
-#, c-format
-msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: 'commentstring' ���ݬO�ťթΥ]�t %s"
-
-#: ../option.c:4928
-msgid "E540: Unclosed expression sequence"
-msgstr "E540: �S���������B�⦡: "
-
-#: ../option.c:4932
-msgid "E541: too many items"
-msgstr "E541: �Ӧh����"
-
-#: ../option.c:4934
-msgid "E542: unbalanced groups"
-msgstr "E542: ����٪� group"
-
-#: ../option.c:5148
-msgid "E590: A preview window already exists"
-msgstr "E590: �w���������w�g�s�b�F"
-
-#: ../option.c:5311
-msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabic �ݭn UTF-8, �а��� ':set encoding=utf-8'"
-
-#: ../option.c:5623
-#, c-format
-msgid "E593: Need at least %d lines"
-msgstr "E593: �ܤֻݭn %d �� "
-
-#: ../option.c:5631
-#, c-format
-msgid "E594: Need at least %d columns"
-msgstr "E594: �ܤֻݭn %d ��"
-
-#: ../option.c:6011
-#, c-format
-msgid "E355: Unknown option: %s"
-msgstr "E355: �����T���ﶵ: %s"
-
-#. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
-#, fuzzy, c-format
-msgid "E521: Number required: &%s = '%s'"
-msgstr "E521: = ��ݭn���Ʀr"
-
-#: ../option.c:6149
-msgid ""
-"\n"
-"--- Terminal codes ---"
-msgstr ""
-"\n"
-"--- �׺ݾ��X ---"
-
-#: ../option.c:6151
-msgid ""
-"\n"
-"--- Global option values ---"
-msgstr ""
-"\n"
-"--- Global �ﶵ�� ---"
-
-#: ../option.c:6153
-msgid ""
-"\n"
-"--- Local option values ---"
-msgstr ""
-"\n"
-"--- Local �ﶵ�� ---"
-
-#: ../option.c:6155
-msgid ""
-"\n"
-"--- Options ---"
-msgstr ""
-"\n"
-"--- �ﶵ ---"
-
-#: ../option.c:6816
-msgid "E356: get_varp ERROR"
-msgstr "E356: get_varp ���~"
-
-#: ../option.c:7696
-#, c-format
-msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: 'langmap': �䤣�� %s �������r��"
-
-#: ../option.c:7715
-#, c-format
-msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: 'langmap': �����ᦳ�h�l���r��: %s"
-
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"������� shell"
-
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"Shell �w��^"
-
-#: ../os_unix.c:465 ../os_unix.c:471
-msgid ""
-"\n"
-"Could not get security context for "
-msgstr ""
-
-#: ../os_unix.c:479
-msgid ""
-"\n"
-"Could not set security context for "
-msgstr ""
-
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr ""
-
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: �b���|���䤣���ɮ� \"%s\""
-
-#: ../quickfix.c:359
-#, c-format
-msgid "E372: Too many %%%c in format string"
-msgstr "E372: �榡�Ʀr��̦��Ӧh %%%c "
-
-#: ../quickfix.c:371
-#, c-format
-msgid "E373: Unexpected %%%c in format string"
-msgstr "E373: �榡�Ʀr�ꤣ���ӥX�{ %%%c "
-
-#: ../quickfix.c:420
-msgid "E374: Missing ] in format string"
-msgstr "E374: �榡�Ʀr��̤֤F ]"
-
-#: ../quickfix.c:431
-#, c-format
-msgid "E375: Unsupported %%%c in format string"
-msgstr "E375: �榡�Ʀr��̦����䴩�� %%%c "
-
-#: ../quickfix.c:448
-#, c-format
-msgid "E376: Invalid %%%c in format string prefix"
-msgstr "E376: �榡�Ʀr��}�Y�̦������T�� %%%c "
-
-#: ../quickfix.c:454
-#, c-format
-msgid "E377: Invalid %%%c in format string"
-msgstr "E377: �榡�Ʀr��̦������T�� %%%c "
-
-#. nothing found
-#: ../quickfix.c:477
-msgid "E378: 'errorformat' contains no pattern"
-msgstr "E378: 'errorformat' ���]�w"
-
-#: ../quickfix.c:695
-msgid "E379: Missing or empty directory name"
-msgstr "E379: �䤣��ؿ��W�٩άO�Ū��ؿ��W��"
-
-#: ../quickfix.c:1305
-msgid "E553: No more items"
-msgstr "E553: �S���䥦����"
-
-#: ../quickfix.c:1674
-#, c-format
-msgid "(%d of %d)%s%s: "
-msgstr "(%d / %d)%s%s: "
-
-#: ../quickfix.c:1676
-msgid " (line deleted)"
-msgstr " (��w�R��)"
-
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: Quickfix ���|����"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: Quickfix ���|����"
-
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "���~�C�� %d/%d; �@�� %d �����~"
-
-#: ../quickfix.c:2427
-msgid "E382: Cannot write, 'buftype' option is set"
-msgstr "E382: �L�k�g�J�A'buftype' �ﶵ�w�]�w"
-
-#: ../quickfix.c:2812
-msgid "E683: File name missing or invalid pattern"
-msgstr ""
-
-#: ../quickfix.c:2911
-#, fuzzy, c-format
-msgid "Cannot open file \"%s\""
-msgstr "�L�k�}���ɮ� %s"
-
-#: ../quickfix.c:3429
-#, fuzzy
-msgid "E681: Buffer is not loaded"
-msgstr "�w����@�ӽw�İ�"
-
-#: ../quickfix.c:3487
-#, fuzzy
-msgid "E777: String or List expected"
-msgstr "E548: ���ӭn���Ʀr"
-
-#: ../regexp.c:359
-#, c-format
-msgid "E369: invalid item in %s%%[]"
-msgstr "E369: �����T�����ءG %s%%[]"
-
-#: ../regexp.c:374
-#, fuzzy, c-format
-msgid "E769: Missing ] after %s["
-msgstr "E69: %s%%[ ��ʤ� ]"
-
-#: ../regexp.c:375
-#, c-format
-msgid "E53: Unmatched %s%%("
-msgstr "E53: �L������ %s%%("
-
-#: ../regexp.c:376
-#, c-format
-msgid "E54: Unmatched %s("
-msgstr "E54: �L������ %s("
-
-#: ../regexp.c:377
-#, c-format
-msgid "E55: Unmatched %s)"
-msgstr "E55: �L������ %s)"
-
-#: ../regexp.c:378
-msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ����b���X�{"
-
-#: ../regexp.c:379
-msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 et al. ����b���X�{"
-
-#: ../regexp.c:380
-#, c-format
-msgid "E69: Missing ] after %s%%["
-msgstr "E69: %s%%[ ��ʤ� ]"
-
-#: ../regexp.c:381
-#, c-format
-msgid "E70: Empty %s%%[]"
-msgstr "E70: �Ū� %s%%[]"
-
-#: ../regexp.c:1209 ../regexp.c:1224
-msgid "E339: Pattern too long"
-msgstr "E339: �W�r�Ӫ�"
-
-#: ../regexp.c:1371
-msgid "E50: Too many \\z("
-msgstr "E50: �Ӧh \\z("
-
-#: ../regexp.c:1378
-#, c-format
-msgid "E51: Too many %s("
-msgstr "E51: �Ӧh %s("
-
-#: ../regexp.c:1427
-msgid "E52: Unmatched \\z("
-msgstr "E52: �L������ \\z("
-
-#: ../regexp.c:1637
-#, c-format
-msgid "E59: invalid character after %s@"
-msgstr "E59: �᭱�������T���r��: %s@"
-
-#: ../regexp.c:1672
-#, c-format
-msgid "E60: Too many complex %s{...}s"
-msgstr "E60: �Ӧh������ %s{...}s"
-
-#: ../regexp.c:1687
-#, c-format
-msgid "E61: Nested %s*"
-msgstr "E61: �_�� %s*"
-
-#: ../regexp.c:1690
-#, c-format
-msgid "E62: Nested %s%c"
-msgstr "E62: �_�� %s%c"
-
-#: ../regexp.c:1800
-msgid "E63: invalid use of \\_"
-msgstr "E63: �����T���ϥ� \\_"
-
-#: ../regexp.c:1850
-#, c-format
-msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c �S�����F��"
-
-#: ../regexp.c:1902
-msgid "E65: Illegal back reference"
-msgstr "E65: �����T���ϦV�Ѧ�"
-
-#: ../regexp.c:1943
-msgid "E68: Invalid character after \\z"
-msgstr "E68: �᭱�������T���r��: \\z"
-
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
-#, fuzzy, c-format
-msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E71: �᭱�������T���r��: %s%%"
-
-#: ../regexp.c:2107
-#, c-format
-msgid "E71: Invalid character after %s%%"
-msgstr "E71: �᭱�������T���r��: %s%%"
-
-#: ../regexp.c:3017
-#, c-format
-msgid "E554: Syntax error in %s{...}"
-msgstr "E554: �y�k���~: %s{...}"
-
-#: ../regexp.c:3805
-msgid "External submatches:\n"
-msgstr "�~���ŦX:\n"
-
-#: ../regexp.c:7022
-msgid ""
-"E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
-"used "
-msgstr ""
-
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr ""
-
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
-
-#: ../regexp_nfa.c:2042
-#, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: �Ӧh \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
-
-#: ../regexp_nfa.c:6049
-#, fuzzy
-msgid "Could not open temporary log file for writing "
-msgstr "E214: �䤣��g�J�Ϊ��Ȧs��"
-
-#: ../screen.c:7435
-msgid " VREPLACE"
-msgstr " V-���N"
-
-#: ../screen.c:7437
-msgid " REPLACE"
-msgstr " ���N"
-
-#: ../screen.c:7440
-msgid " REVERSE"
-msgstr " ����"
-
-#: ../screen.c:7441
-msgid " INSERT"
-msgstr " ���J"
-
-#: ../screen.c:7443
-msgid " (insert)"
-msgstr " (���J)"
-
-#: ../screen.c:7445
-msgid " (replace)"
-msgstr " (���N)"
-
-#: ../screen.c:7447
-msgid " (vreplace)"
-msgstr " (v-���N)"
-
-#: ../screen.c:7449
-msgid " Hebrew"
-msgstr " Hebrew"
-
-#: ../screen.c:7454
-msgid " Arabic"
-msgstr " Arabic"
-
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (�y��)"
-
-#: ../screen.c:7459
-msgid " (paste)"
-msgstr " (�K�W)"
-
-#: ../screen.c:7469
-msgid " VISUAL"
-msgstr " ���"
-
-#: ../screen.c:7470
-msgid " VISUAL LINE"
-msgstr " [��] "
-
-#: ../screen.c:7471
-msgid " VISUAL BLOCK"
-msgstr " [�϶�] "
-
-#: ../screen.c:7472
-msgid " SELECT"
-msgstr " ���"
-
-#: ../screen.c:7473
-msgid " SELECT LINE"
-msgstr " ����� "
-
-#: ../screen.c:7474
-msgid " SELECT BLOCK"
-msgstr " ����϶�"
-
-#: ../screen.c:7486 ../screen.c:7541
-msgid "recording"
-msgstr "�O����"
-
-#: ../search.c:487
-#, c-format
-msgid "E383: Invalid search string: %s"
-msgstr "E383: ���~���j�M�r��: %s"
-
-#: ../search.c:832
-#, c-format
-msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: �w�j�M���ɮ׶}�Y���䤣�� %s"
-
-#: ../search.c:835
-#, c-format
-msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: �w�j�M���ɮ׵������䤣�� %s"
-
-#: ../search.c:1200
-msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: �b ';' �᭱���Ӧ� '?' �� '/'"
-
-#: ../search.c:4085
-msgid " (includes previously listed match)"
-msgstr " (�]�A�e���C�X�ŦX��)"
-
-#. cursor at status line
-#: ../search.c:4104
-msgid "--- Included files "
-msgstr "--- �ޤJ�ɮ� "
-
-#: ../search.c:4106
-msgid "not found "
-msgstr "�䤣�� "
-
-#: ../search.c:4107
-msgid "in path ---\n"
-msgstr "---\n"
-
-#: ../search.c:4168
-msgid "  (Already listed)"
-msgstr "  (�w�C�X)"
-
-#: ../search.c:4170
-msgid "  NOT FOUND"
-msgstr "  �䤣��"
-
-#: ../search.c:4211
-#, c-format
-msgid "Scanning included file: %s"
-msgstr "�j�M�ޤJ�ɮ�: %s"
-
-#: ../search.c:4216
-#, fuzzy, c-format
-msgid "Searching included file %s"
-msgstr "�j�M�ޤJ�ɮ�: %s"
-
-#: ../search.c:4405
-msgid "E387: Match is on current line"
-msgstr "E387: �ثe�Ҧb�椤���@�ǰt"
-
-#: ../search.c:4517
-msgid "All included files were found"
-msgstr "�Ҧ��ޤJ�ɮ׳��w���"
-
-#: ../search.c:4519
-msgid "No included files"
-msgstr "�S���ޤJ�ɮ�"
-
-#: ../search.c:4527
-msgid "E388: Couldn't find definition"
-msgstr "E388: �䤣��w�q"
-
-#: ../search.c:4529
-msgid "E389: Couldn't find pattern"
-msgstr "E389: �䤣�� pattern"
-
-#: ../search.c:4668
-#, fuzzy
-msgid "Substitute "
-msgstr "���N�@�� "
-
-#: ../search.c:4681
-#, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-
-#: ../spell.c:951
-#, fuzzy
-msgid "E759: Format error in spell file"
-msgstr "E297: �Ȧs�ɼg�J���~"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr ""
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:955
-#, fuzzy
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E431: Tag �� \"%s\" �榡���~"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr ""
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr ""
-
-#: ../spell.c:1951
-msgid "E756: Spell checking is not enabled"
-msgstr ""
-
-#: ../spell.c:2249
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr ""
-
-#: ../spell.c:2473
-#, fuzzy, c-format
-msgid "Reading spell file \"%s\""
-msgstr "�ϥμȦs�� \"%s\""
-
-#: ../spell.c:2496
-#, fuzzy
-msgid "E757: This does not look like a spell file"
-msgstr "E307: %s �ݰ_�Ӥ����O Vim �Ȧs��"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr ""
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr ""
-
-#: ../spell.c:2602
-#, fuzzy
-msgid "E770: Unsupported section in spell file"
-msgstr "E297: �Ȧs�ɼg�J���~"
-
-#: ../spell.c:3762
-#, fuzzy, c-format
-msgid "Warning: region %s not supported"
-msgstr "E519: ���䴩�ӿﶵ"
-
-#: ../spell.c:4550
-#, fuzzy, c-format
-msgid "Reading affix file %s ..."
-msgstr "�j�M tag �ɮ� \"%s\""
-
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
-#, c-format
-msgid "Conversion failure for word in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4630 ../spell.c:6170
-#, c-format
-msgid "Conversion in %s not supported: from %s to %s"
-msgstr ""
-
-#: ../spell.c:4642
-#, c-format
-msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4655
-#, c-format
-msgid "FLAG after using flags in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4723
-#, c-format
-msgid ""
-"Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4731
-#, c-format
-msgid ""
-"Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
-"%d"
-msgstr ""
-
-#: ../spell.c:4747
-#, c-format
-msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4771
-#, c-format
-msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4777
-#, c-format
-msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4783
-#, c-format
-msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4795
-#, c-format
-msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4847
-#, c-format
-msgid "Different combining flag in continued affix block in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4850
-#, fuzzy, c-format
-msgid "Duplicate affix in %s line %d: %s"
-msgstr "E154: ����(tag) \"%s\" �b�ɮ� %s �̭��ƥX�{�h��"
-
-#: ../spell.c:4871
-#, c-format
-msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
-"line %d: %s"
-msgstr ""
-
-#: ../spell.c:4893
-#, c-format
-msgid "Expected Y or N in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:4968
-#, c-format
-msgid "Broken condition in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:5091
-#, c-format
-msgid "Expected REP(SAL) count in %s line %d"
-msgstr ""
-
-#: ../spell.c:5120
-#, c-format
-msgid "Expected MAP count in %s line %d"
-msgstr ""
-
-#: ../spell.c:5132
-#, c-format
-msgid "Duplicate character in MAP in %s line %d"
-msgstr ""
-
-#: ../spell.c:5176
-#, c-format
-msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:5197
-#, c-format
-msgid "Missing FOL/LOW/UPP line in %s"
-msgstr ""
-
-#: ../spell.c:5220
-msgid "COMPOUNDSYLMAX used without SYLLABLE"
-msgstr ""
-
-#: ../spell.c:5236
-#, fuzzy
-msgid "Too many postponed prefixes"
-msgstr "�Ӧh�s��Ѽ�"
-
-#: ../spell.c:5238
-#, fuzzy
-msgid "Too many compound flags"
-msgstr "�Ӧh�s��Ѽ�"
-
-#: ../spell.c:5240
-msgid "Too many postponed prefixes and/or compound flags"
-msgstr ""
-
-#: ../spell.c:5250
-#, c-format
-msgid "Missing SOFO%s line in %s"
-msgstr ""
-
-#: ../spell.c:5253
-#, c-format
-msgid "Both SAL and SOFO lines in %s"
-msgstr ""
-
-#: ../spell.c:5331
-#, c-format
-msgid "Flag is not a number in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:5334
-#, c-format
-msgid "Illegal flag in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:5493 ../spell.c:5501
-#, c-format
-msgid "%s value differs from what is used in another .aff file"
-msgstr ""
-
-#: ../spell.c:5602
-#, fuzzy, c-format
-msgid "Reading dictionary file %s ..."
-msgstr "���˦r��: %s"
-
-#: ../spell.c:5611
-#, c-format
-msgid "E760: No word count in %s"
-msgstr ""
-
-#: ../spell.c:5669
-#, c-format
-msgid "line %6d, word %6d - %s"
-msgstr ""
-
-#: ../spell.c:5691
-#, fuzzy, c-format
-msgid "Duplicate word in %s line %d: %s"
-msgstr "�C�@�泣�䤣��: %s"
-
-#: ../spell.c:5694
-#, c-format
-msgid "First duplicate word in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:5746
-#, c-format
-msgid "%d duplicate word(s) in %s"
-msgstr ""
-
-#: ../spell.c:5748
-#, c-format
-msgid "Ignored %d word(s) with non-ASCII characters in %s"
-msgstr ""
-
-#: ../spell.c:6115
-#, fuzzy, c-format
-msgid "Reading word file %s ..."
-msgstr "�q�зǿ�JŪ��..."
-
-#: ../spell.c:6155
-#, c-format
-msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6159
-#, c-format
-msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6180
-#, c-format
-msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6185
-#, c-format
-msgid "Too many regions in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6198
-#, c-format
-msgid "/ line ignored in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6224
-#, fuzzy, c-format
-msgid "Invalid region nr in %s line %d: %s"
-msgstr "E573: �����T�����A�� id : %s"
-
-#: ../spell.c:6230
-#, c-format
-msgid "Unrecognized flags in %s line %d: %s"
-msgstr ""
-
-#: ../spell.c:6257
-#, c-format
-msgid "Ignored %d words with non-ASCII characters"
-msgstr ""
-
-#: ../spell.c:6656
-#, c-format
-msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr ""
-
-#: ../spell.c:7340
-msgid "Reading back spell file..."
-msgstr ""
-
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
-msgid "Performing soundfolding..."
-msgstr ""
-
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr ""
-
-#: ../spell.c:7476
-#, c-format
-msgid "Total number of words: %d"
-msgstr ""
-
-#: ../spell.c:7655
-#, fuzzy, c-format
-msgid "Writing suggestion file %s ..."
-msgstr "�g�J viminfo �ɮ� \"%s\" ��"
-
-#: ../spell.c:7707 ../spell.c:7927
-#, c-format
-msgid "Estimated runtime memory use: %d bytes"
-msgstr ""
-
-#: ../spell.c:7820
-msgid "E751: Output file name must not have region name"
-msgstr ""
-
-#: ../spell.c:7822
-#, fuzzy
-msgid "E754: Only up to 8 regions supported"
-msgstr "E519: ���䴩�ӿﶵ"
-
-#: ../spell.c:7846
-#, fuzzy, c-format
-msgid "E755: Invalid region in %s"
-msgstr "E15: �����T���B�⦡: %s"
-
-#: ../spell.c:7907
-msgid "Warning: both compounding and NOBREAK specified"
-msgstr ""
-
-#: ../spell.c:7920
-#, fuzzy, c-format
-msgid "Writing spell file %s ..."
-msgstr "�g�J viminfo �ɮ� \"%s\" ��"
-
-#: ../spell.c:7925
-msgid "Done!"
-msgstr ""
-
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr ""
-
-#: ../spell.c:8074
-#, c-format
-msgid "Word '%.*s' removed from %s"
-msgstr ""
-
-#: ../spell.c:8117
-#, c-format
-msgid "Word '%.*s' added to %s"
-msgstr ""
-
-#: ../spell.c:8381
-msgid "E763: Word characters differ between spell files"
-msgstr ""
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr ""
-
-#: ../spell.c:8687
-#, fuzzy, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "�A�d��G %<PRId64> �� "
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, fuzzy, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "�N�ܰʦs�x�� \"%.*s\"?"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr ""
-
-#: ../spell.c:8882
-#, fuzzy
-msgid "E752: No previous spell replacement"
-msgstr "E35: �S���e�@�ӷj�M���O"
-
-#: ../spell.c:8925
-#, fuzzy, c-format
-msgid "E753: Not found: %s"
-msgstr "E334: [���] �䤣�� %s"
-
-#: ../spell.c:9276
-#, fuzzy, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E307: %s �ݰ_�Ӥ����O Vim �Ȧs��"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr ""
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr ""
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr ""
-
-#: ../spell.c:9305
-#, fuzzy, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E47: Ū�����~�ɮץ���"
-
-#. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
-msgid "E783: duplicate char in MAP entry"
-msgstr ""
-
-#: ../syntax.c:266
-msgid "No Syntax items defined for this buffer"
-msgstr "�o�ӽw�İϨS���w�q����y�k"
-
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
-#, c-format
-msgid "E390: Illegal argument: %s"
-msgstr "E390: �ѼƤ����T: %s"
-
-#: ../syntax.c:3299
-#, c-format
-msgid "E391: No such syntax cluster: %s"
-msgstr "E391: �L�� syntax cluster: \"%s\""
-
-#: ../syntax.c:3433
-msgid "syncing on C-style comments"
-msgstr "C�y�������ѦP�B�Ƥ�"
-
-#: ../syntax.c:3439
-msgid "no syncing"
-msgstr "�S���P�B��"
-
-#: ../syntax.c:3441
-msgid "syncing starts "
-msgstr "�P�B�ƶ}�l"
-
-#: ../syntax.c:3443 ../syntax.c:3506
-msgid " lines before top line"
-msgstr "�渹�W�X�d��"
-
-#: ../syntax.c:3448
-msgid ""
-"\n"
-"--- Syntax sync items ---"
-msgstr ""
-"\n"
-"--- �y�k�P�B���� (Syntax sync items) ---"
-
-#: ../syntax.c:3452
-msgid ""
-"\n"
-"syncing on items"
-msgstr ""
-"\n"
-"�P�B�Ƥ�:"
-
-#: ../syntax.c:3457
-msgid ""
-"\n"
-"--- Syntax items ---"
-msgstr ""
-"\n"
-"--- �y�k���� ---"
-
-#: ../syntax.c:3475
-#, c-format
-msgid "E392: No such syntax cluster: %s"
-msgstr "E392: �L�� syntax cluster: \"%s\""
-
-#: ../syntax.c:3497
-msgid "minimal "
-msgstr "�̤p"
-
-#: ../syntax.c:3503
-msgid "maximal "
-msgstr "�̤j"
-
-#: ../syntax.c:3513
-msgid "; match "
-msgstr "; �ŦX "
-
-#: ../syntax.c:3515
-msgid " line breaks"
-msgstr "�_�� "
-
-#: ../syntax.c:4076
-msgid "E395: contains argument not accepted here"
-msgstr "E395: �ϥΤF�����T���Ѽ�"
-
-#: ../syntax.c:4096
-#, fuzzy
-msgid "E844: invalid cchar value"
-msgstr "E474: �����T���Ѽ�"
-
-#: ../syntax.c:4107
-msgid "E393: group[t]here not accepted here"
-msgstr "E393: �ϥΤF�����T���Ѽ�"
-
-#: ../syntax.c:4126
-#, c-format
-msgid "E394: Didn't find region item for %s"
-msgstr "E394: �䤣�� %s �� region item"
-
-#: ../syntax.c:4188
-msgid "E397: Filename required"
-msgstr "E397: �ݭn�ɮצW��"
-
-#: ../syntax.c:4221
-#, fuzzy
-msgid "E847: Too many syntax includes"
-msgstr "E77: �Ӧh�ɦW"
-
-#: ../syntax.c:4303
-#, fuzzy, c-format
-msgid "E789: Missing ']': %s"
-msgstr "E398: �ʤ� \"=\": %s"
-
-#: ../syntax.c:4531
-#, c-format
-msgid "E398: Missing '=': %s"
-msgstr "E398: �ʤ� \"=\": %s"
-
-#: ../syntax.c:4666
-#, c-format
-msgid "E399: Not enough arguments: syntax region %s"
-msgstr "E399: syntax region %s ���޼ƤӤ�"
-
-#: ../syntax.c:4870
-#, fuzzy
-msgid "E848: Too many syntax clusters"
-msgstr "E391: �L�� syntax cluster: \"%s\""
-
-#: ../syntax.c:4954
-msgid "E400: No cluster specified"
-msgstr "E400: �S�����w���ݩ�"
-
-#. end delimiter not found
-#: ../syntax.c:4986
-#, c-format
-msgid "E401: Pattern delimiter not found: %s"
-msgstr "E401: �䤣����j�Ÿ�: %s"
-
-#: ../syntax.c:5049
-#, c-format
-msgid "E402: Garbage after pattern: %s"
-msgstr "E402: '%s' �᭱���F��L�k����"
-
-#: ../syntax.c:5120
-msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: �y�k�P�B: �s����Ÿ��Q���w�F�⦸"
-
-#: ../syntax.c:5169
-#, c-format
-msgid "E404: Illegal arguments: %s"
-msgstr "E404: �ѼƤ����T: %s"
-
-#: ../syntax.c:5217
-#, c-format
-msgid "E405: Missing equal sign: %s"
-msgstr "E405: �ʤ֬۵��Ÿ�: %s"
-
-#: ../syntax.c:5222
-#, c-format
-msgid "E406: Empty argument: %s"
-msgstr "E406: �ťհѼ�: %s"
-
-#: ../syntax.c:5240
-#, c-format
-msgid "E407: %s not allowed here"
-msgstr "E407: %s ����b���X�{"
-
-#: ../syntax.c:5246
-#, c-format
-msgid "E408: %s must be first in contains list"
-msgstr "E408: %s �����O�C���̪��Ĥ@��"
-
-#: ../syntax.c:5304
-#, c-format
-msgid "E409: Unknown group name: %s"
-msgstr "E409: �����T���s�զW��: %s"
-
-#: ../syntax.c:5512
-#, c-format
-msgid "E410: Invalid :syntax subcommand: %s"
-msgstr "E410: �����T�� :syntax �l�R�O: %s"
-
-#: ../syntax.c:5854
-msgid ""
-"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-msgstr ""
-
-#: ../syntax.c:6146
-msgid "E679: recursive loop loading syncolor.vim"
-msgstr ""
-
-#: ../syntax.c:6256
-#, c-format
-msgid "E411: highlight group not found: %s"
-msgstr "E411: �䤣�� highlight group: %s"
-
-#: ../syntax.c:6278
-#, c-format
-msgid "E412: Not enough arguments: \":highlight link %s\""
-msgstr "E412: �ѼƤӤ�: \":highlight link %s\""
-
-#: ../syntax.c:6284
-#, c-format
-msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: �ѼƹL�h: \":highlight link %s\""
-
-#: ../syntax.c:6302
-msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: �w�]�w�s��, ���� highlight link"
-
-#: ../syntax.c:6367
-#, c-format
-msgid "E415: unexpected equal sign: %s"
-msgstr "E415: ���Ӧ�������: %s"
-
-#: ../syntax.c:6395
-#, c-format
-msgid "E416: missing equal sign: %s"
-msgstr "E416: �ʤ֬۵��Ÿ�: %s"
-
-#: ../syntax.c:6418
-#, c-format
-msgid "E417: missing argument: %s"
-msgstr "E417: �ʤְѼ�: %s"
-
-#: ../syntax.c:6446
-#, c-format
-msgid "E418: Illegal value: %s"
-msgstr "E418: ���X�k����: %s"
-
-#: ../syntax.c:6496
-msgid "E419: FG color unknown"
-msgstr "E419: ���~���e���C��"
-
-#: ../syntax.c:6504
-msgid "E420: BG color unknown"
-msgstr "E420: ���~���I���C��"
-
-#: ../syntax.c:6564
-#, c-format
-msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: ���~���C��W�٩μƭ�: %s"
-
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: �׺ݾ��X�Ӫ�: %s"
-
-#: ../syntax.c:6753
-#, c-format
-msgid "E423: Illegal argument: %s"
-msgstr "E423: �ѼƤ����T: %s"
-
-#: ../syntax.c:6925
-msgid "E424: Too many different highlighting attributes in use"
-msgstr "E424: �ϥΤF�L�h�۲������G���ݩ�"
-
-#: ../syntax.c:7427
-msgid "E669: Unprintable character in group name"
-msgstr "E669: �s�զW�٤����L�k�C�L���r��"
-
-#: ../syntax.c:7434
-msgid "W18: Invalid character in group name"
-msgstr "W18: �s�զW�٤��������T���r��"
-
-#: ../syntax.c:7448
-msgid "E849: Too many highlight and syntax groups"
-msgstr ""
-
-#: ../tag.c:104
-msgid "E555: at bottom of tag stack"
-msgstr "E555: ����(tag)���|����"
-
-#: ../tag.c:105
-msgid "E556: at top of tag stack"
-msgstr "E556: ����(tag)���|�}�Y"
-
-#: ../tag.c:380
-msgid "E425: Cannot go before first matching tag"
-msgstr "E425: �w�g�b�̫e��������(tag)�F"
-
-#: ../tag.c:504
-#, c-format
-msgid "E426: tag not found: %s"
-msgstr "E426: �䤣�����(tag): %s"
-
-#: ../tag.c:528
-msgid "  # pri kind tag"
-msgstr "  # pri kind tag"
-
-#: ../tag.c:531
-msgid "file\n"
-msgstr "�ɮ�\n"
-
-#: ../tag.c:829
-msgid "E427: There is only one matching tag"
-msgstr "E427: �u�������ŦX"
-
-#: ../tag.c:831
-msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: �v�g�b�̫�@�ӲŦX�� tag �F"
-
-#: ../tag.c:850
-#, c-format
-msgid "File \"%s\" does not exist"
-msgstr "�ɮ� \"%s\" ���s�b"
-
-#. Give an indication of the number of matching tags
-#: ../tag.c:859
-#, c-format
-msgid "tag %d of %d%s"
-msgstr "��� tag: %d/%d%s"
-
-#: ../tag.c:862
-msgid " or more"
-msgstr " �Χ�h"
-
-#: ../tag.c:864
-msgid "  Using tag with different case!"
-msgstr "  �H���P�j�p�g�Өϥ� tag!"
-
-#: ../tag.c:909
-#, c-format
-msgid "E429: File \"%s\" does not exist"
-msgstr "E429: �ɮ� \"%s\" ���s�b"
-
-#. Highlight title
-#: ../tag.c:960
-msgid ""
-"\n"
-"  # TO tag         FROM line  in file/text"
-msgstr ""
-"\n"
-"  # �� tag         �q   ��    �b �ɮ�/��r"
-
-#: ../tag.c:1303
-#, c-format
-msgid "Searching tags file %s"
-msgstr "�j�M tag �ɮ� \"%s\""
-
-#: ../tag.c:1545
-msgid "Ignoring long line in tags file"
-msgstr ""
-
-#: ../tag.c:1915
-#, c-format
-msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Tag �� \"%s\" �榡���~"
-
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "�b %<PRId64> �줸���e"
-
-#: ../tag.c:1929
-#, c-format
-msgid "E432: Tags file not sorted: %s"
-msgstr "E432: Tag �ɮץ��Ƨ�: %s"
-
-#. never opened any tags file
-#: ../tag.c:1960
-msgid "E433: No tags file"
-msgstr "E433: �S�� tag ��"
-
-#: ../tag.c:2536
-msgid "E434: Can't find tag pattern"
-msgstr "E434: �䤣�� tag"
-
-#: ../tag.c:2544
-msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: �䤣�� tag, �βq��!"
-
-#: ../tag.c:2797
-#, c-format
-msgid "Duplicate field name: %s"
-msgstr ""
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr "' �L�k���J�C�i�Ϊ����ز׺ݾ��Φ���:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "�w�]: '"
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: �L�k�}�� termcap �ɮ�"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: terminfo ���S���׺ݾ���ƶ�"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: termcap ���S���׺ݾ���ƶ�"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: termcap �S�� \"%s\" entry"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: �׺ݾ��ݭn \"cm\" ����O"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- �׺ݾ����� ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: Ū����J���~�A���}��...\n"
-
-#. This happens when the FileChangedRO autocommand changes the
-#. * file in a way it becomes shorter.
-#: ../undo.c:379
-msgid "E881: Line count changed unexpectedly"
-msgstr ""
-
-#: ../undo.c:627
-#, fuzzy, c-format
-msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E212: �L�k�H�g�J�Ҧ��}��"
-
-#: ../undo.c:717
-#, c-format
-msgid "E825: Corrupted undo file (%s): %s"
-msgstr ""
-
-#: ../undo.c:1039
-msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr ""
-
-#: ../undo.c:1074
-#, c-format
-msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr ""
-
-#: ../undo.c:1092
-#, c-format
-msgid "Will not overwrite, this is not an undo file: %s"
-msgstr ""
-
-#: ../undo.c:1108
-msgid "Skipping undo file write, nothing to undo"
-msgstr ""
-
-#: ../undo.c:1121
-#, fuzzy, c-format
-msgid "Writing undo file: %s"
-msgstr "�g�J viminfo �ɮ� \"%s\" ��"
-
-#: ../undo.c:1213
-#, fuzzy, c-format
-msgid "E829: write error in undo file: %s"
-msgstr "E297: �Ȧs�ɼg�J���~"
-
-#: ../undo.c:1280
-#, c-format
-msgid "Not reading undo file, owner differs: %s"
-msgstr ""
-
-#: ../undo.c:1292
-#, fuzzy, c-format
-msgid "Reading undo file: %s"
-msgstr "Ū�� viminfo �ɮ� \"%s\"%s%s%s"
-
-#: ../undo.c:1299
-#, fuzzy, c-format
-msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E195: �L�kŪ�� viminfo"
-
-#: ../undo.c:1308
-#, fuzzy, c-format
-msgid "E823: Not an undo file: %s"
-msgstr "E484: �L�k�}���ɮ� %s"
-
-#: ../undo.c:1313
-#, fuzzy, c-format
-msgid "E824: Incompatible undo file: %s"
-msgstr "E484: �L�k�}���ɮ� %s"
-
-#: ../undo.c:1328
-msgid "File contents changed, cannot use undo info"
-msgstr ""
-
-#: ../undo.c:1497
-#, fuzzy, c-format
-msgid "Finished reading undo file %s"
-msgstr "�������� %s"
-
-#: ../undo.c:1586 ../undo.c:1812
-msgid "Already at oldest change"
-msgstr ""
-
-#: ../undo.c:1597 ../undo.c:1814
-msgid "Already at newest change"
-msgstr ""
-
-#: ../undo.c:1806
-#, fuzzy, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E92: �䤣��� %<PRId64> �ӽw�İ�"
-
-#: ../undo.c:1979
-msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: �渹���~"
-
-#: ../undo.c:2183
-#, fuzzy
-msgid "more line"
-msgstr "�٦��@�� "
-
-#: ../undo.c:2185
-#, fuzzy
-msgid "more lines"
-msgstr "�٦��@�� "
-
-#: ../undo.c:2187
-#, fuzzy
-msgid "line less"
-msgstr "�֩�@�� "
-
-#: ../undo.c:2189
-#, fuzzy
-msgid "fewer lines"
-msgstr "�u�� %<PRId64> �� "
-
-#: ../undo.c:2193
-#, fuzzy
-msgid "change"
-msgstr "�@������"
-
-#: ../undo.c:2195
-#, fuzzy
-msgid "changes"
-msgstr "�@������"
-
-#: ../undo.c:2225
-#, fuzzy, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> �� %s �L %d ��"
-
-#: ../undo.c:2228
-msgid "before"
-msgstr ""
-
-#: ../undo.c:2228
-msgid "after"
-msgstr ""
-
-#: ../undo.c:2325
-#, fuzzy
-msgid "Nothing to undo"
-msgstr "�S���o�� mapping ����"
-
-#: ../undo.c:2330
-msgid "number changes  when               saved"
-msgstr ""
-
-#: ../undo.c:2360
-#, fuzzy, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> ��; "
-
-#: ../undo.c:2372
-#, fuzzy
-msgid "E790: undojoin is not allowed after undo"
-msgstr "E407: %s ����b���X�{"
-
-#: ../undo.c:2466
-msgid "E439: undo list corrupt"
-msgstr "E439: �_��C���l�a"
-
-#: ../undo.c:2495
-msgid "E440: undo line missing"
-msgstr "E440: �䤣��n undo ���� "
-
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"�ޤJ�ץ�: "
-
-#: ../version.c:627
-#, fuzzy
-msgid ""
-"\n"
-"Extra patches: "
-msgstr "�~���ŦX:\n"
-
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "�ק�̬�"
-
-#: ../version.c:646
-msgid ""
-"\n"
-"Compiled "
-msgstr ""
-"\n"
-"�sĶ"
-
-#: ../version.c:649
-msgid "by "
-msgstr "��:"
-
-#: ../version.c:660
-msgid ""
-"\n"
-"Huge version "
-msgstr ""
-"\n"
-"�W�j���� "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "���ϥιϫ��ɭ��C"
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
-msgstr " �ثe�i�ϥ�(+)�P���i�ϥ�(-)���ҲզC��:\n"
-
-#: ../version.c:667
-msgid "   system vimrc file: \""
-msgstr "        �t�� vimrc �]�w��: \""
-
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "  �ϥΪ̭ӤH vimrc �]�w��: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr "    �ĤG�խӤH vimrc �ɮ�: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr "    �ĤT�խӤH vimrc �ɮ�: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "   �ϥΪ̭ӤH exrc �]�w��: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "   �ĤG�ըϥΪ� exrc �ɮ�: \""
-
-#: ../version.c:699
-msgid "  fall-back for $VIM: \""
-msgstr "              $VIM �w�]��: \""
-
-#: ../version.c:705
-msgid " f-b for $VIMRUNTIME: \""
-msgstr "       $VIMRUNTIME �w�]��: \""
-
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "�sĶ�覡: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "�쵲�覡: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  ��������"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMproved"
-
-#: ../version.c:769
-msgid "version "
-msgstr "����   "
-
-#: ../version.c:770
-msgid "by Bram Moolenaar et al."
-msgstr "���@��: Bram Moolenaar et al."
-
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim ���i�ۥѴ��G���}���l�X�n��"
-
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "�����U�Q�z�F���i���ĵ�!"
-
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "�i�@�B�����п�J          :help iccf<Enter>"
-
-#: ../version.c:779
-msgid "type  :q<Enter>               to exit         "
-msgstr "�n���}�п�J                  :q<Enter>            "
-
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "�u�W�����п�J                :help<Enter>         "
-
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�s������T�п�J              :help version7<Enter>"
-
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Vi �ۮe�Ҧ�"
-
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "�p�G�n���������Dz� Vi �п�J :set nocp<Enter>"
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "�p�G�ݭn�� Vi �ۮe�Ҧ����i�@�B�����п�J :help cp-default<Enter>"
-
-#: ../version.c:827
-msgid "Sponsor Vim development!"
-msgstr "�٧U Vim ���}�o�P�����I"
-
-#: ../version.c:828
-msgid "Become a registered Vim user!"
-msgstr "���� Vim �����U�ϥΪ̡I"
-
-#: ../version.c:831
-msgid "type  :help sponsor<Enter>    for information "
-msgstr "�Բӻ����п�J          :help sponsor<Enter>"
-
-#: ../version.c:832
-msgid "type  :help register<Enter>   for information "
-msgstr "�Բӻ����п�J          :help register<Enter> "
-
-#: ../version.c:834
-msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "�Բӻ����п����檺    ���U����->�٧U/���U      "
-
-#: ../window.c:119
-msgid "Already only one window"
-msgstr "�w�g�u�Ѥ@�ӵ����F"
-
-#: ../window.c:224
-msgid "E441: There is no preview window"
-msgstr "E441: �S���w������"
-
-#: ../window.c:559
-msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: ����P�ɤ��ε��������W�M�k�U��"
-
-#: ../window.c:1228
-msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: ���䥦���ε����ɵL�k����"
-
-#: ../window.c:1803
-msgid "E444: Cannot close last window"
-msgstr "E444: ���������̫�@�ӵ���"
-
-#: ../window.c:1810
-#, fuzzy
-msgid "E813: Cannot close autocmd window"
-msgstr "E444: ���������̫�@�ӵ���"
-
-#: ../window.c:1814
-#, fuzzy
-msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E444: ���������̫�@�ӵ���"
-
-#: ../window.c:2717
-msgid "E445: Other window contains changes"
-msgstr "E445: �䥦��������ʸ��"
-
-#: ../window.c:4805
-msgid "E446: No file name under cursor"
-msgstr "E446: ��гB�S���ɦW"
-
-#~ msgid "[Error List]"
-#~ msgstr "[���~�C��]"
-
-#~ msgid "[No File]"
-#~ msgstr "[���R�W]"
-
-#~ msgid "Patch file"
-#~ msgstr "Patch �ɮ�"
-
-#~ msgid "E106: Unknown variable: \"%s\""
-#~ msgstr "E106: ���w�q���ܼ�: \"%s\""
-
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "�T�w(&O)\n"
-#~ "����(&C)"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: �S���P Vim Server �إ߳s�u"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �L�kŪ�����A�����^��"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: �L�k�ǰe�� client"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: �L�k�ǰe�� %s"
-
-#~ msgid "E130: Undefined function: %s"
-#~ msgstr "E130: �禡 %s �|���w�q"
-
-#~ msgid "Save As"
-#~ msgstr "�t�s�s��"
-
-#~ msgid "Edit File"
-#~ msgstr "�s���ɮ�"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (�䤣��) "
-
-#~ msgid "Source Vim script"
-#~ msgstr "���� Vim script"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "�b�s�����s���ɮ�"
-
-#~ msgid "Append File"
-#~ msgstr "���[�ɮ�"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "������m: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "�x�s Redirection"
-
-#~ msgid "Save View"
-#~ msgstr "�x�s View"
-
-#~ msgid "Save Session"
-#~ msgstr "�x�s Session"
-
-#~ msgid "Save Setup"
-#~ msgstr "�x�s�]�w"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: �������L�ƦX�r��(digraph)"
-
-#~ msgid "[NL found]"
-#~ msgstr "[���NL]"
-
-#~ msgid "[crypted]"
-#~ msgstr "[�w�[�K]"
-
-#~ msgid "[CONVERSION ERROR]"
-#~ msgstr "�ഫ���~"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans ����g�X���ק諸�w�İ�"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "�������e�L�k�g�J Netbeans �w��"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Resource fork �|���� (�Шϥ� ! �j�����)"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: �L�k�Ұʹϫ��ɭ�"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: �L�kŪ���ɮ� \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: �L�k�Ұʹϫ��ɭ��A�䤣��i�Ϊ��r��"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: �����T�� 'guifontwide'"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' ���Ȥ����T"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: ����t�m�C�� %s"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<����}��>"
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: ����ϥ� %s �r��"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: �L�k�^��ثe�ؿ�"
-
-#~ msgid "Pathname:"
-#~ msgstr "���|:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: �L�k���o�ثe�ؿ�"
-
-#~ msgid "OK"
-#~ msgstr "�T�w"
-
-#~ msgid "Cancel"
-#~ msgstr "����"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "���ʶb: ����]�w thumb pixmap ����m"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim ��ܲ�"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: �����T���P callback �إ� BallonEval"
-
-#~ msgid "Vim dialog..."
-#~ msgstr "Vim ��ܲ�..."
-
-#~ msgid "Input _Methods"
-#~ msgstr "��J�k"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - �M��P���N..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - �M��..."
-
-#~ msgid "Find what:"
-#~ msgstr "�j�M:"
-
-#~ msgid "Replace with:"
-#~ msgstr "���N��:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "�u�j�M�����ۦP���r"
-
-#~ msgid "Match case"
-#~ msgstr "�ŦX�j�p�g"
-
-#~ msgid "Direction"
-#~ msgstr "��V"
-
-#~ msgid "Up"
-#~ msgstr "�V�W"
-
-#~ msgid "Down"
-#~ msgstr "�V�U"
-
-#~ msgid "Find Next"
-#~ msgstr "��U�@��"
-
-#~ msgid "Replace"
-#~ msgstr "���N"
-
-#~ msgid "Replace All"
-#~ msgstr "���N����"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: �� Session �޲z������ \"die\" �n�D\n"
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �D�����걼\n"
-
-#~ msgid "Font Selection"
-#~ msgstr "�r�����"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "�ϥ� CUT_BUFFER0 �Ө��N�ſ��"
-
-#~ msgid "Filter"
-#~ msgstr "�L�o��"
-
-#~ msgid "Directories"
-#~ msgstr "�ؿ�"
-
-#~ msgid "Help"
-#~ msgstr "���U����"
-
-#~ msgid "Files"
-#~ msgstr "�ɮ�"
-
-#~ msgid "Selection"
-#~ msgstr "���"
-
-#~ msgid "Undo"
-#~ msgstr "�_��"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �䤣����D�� \"%s\" ������"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: ���䴩�Ѽ� \"-%s\"�C�Х� OLE �����C"
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: �L�k�b MDI �{�����}�ҵ���"
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "�j�M�r�� (�ϥ� '\\\\' �Ӫ��� '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "�j�M�Ψ��N�r�� (�ϥ� '\\\\' �Ӫ��� '\\')"
-
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �L�k�t�m color map ���ءA�����C��ݰ_�ӷ|�ǩǪ�"
-
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Fontset %s �S���]�w���T���r���H����ܳo�Ǧr����:"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: �r����(Fontset)�W��: %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "'%s' ���O�T�w�e�צr��"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: �r����(Fontset)�W��: %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "Font0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "Font1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "�r��%<PRId64> �e�פ��O �r��0 ���⭿\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "�r��0���e�סG%<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "�r��1�e��: %<PRId64>\n"
-#~ "\n"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: Hangul automata ���~"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ���~"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: �L�k�}�� cscope ��Ʈw %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: �L�k���o cscope ��Ʈw��T"
-
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: �w�F�� cscope �̤j�s�u�ƥ�"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr "E263: ��p�A�o�өR�O�L�k�ϥΡAPython �{���w�S�����J�C"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: �L�k���j���� Python "
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "�L�k�R�� OutputObject �ݩ�"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspace ���ݬO���"
-
-#~ msgid "invalid attribute"
-#~ msgstr "�����T���ݩ�"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() �ݭn string list ���Ѽ�"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: �L�k��l I/O ����"
-
-#~ msgid "invalid expression"
-#~ msgstr "�����T���B�⦡"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "�]���sĶ�ɨS���[�J�B�⦡(expression)���{���X�A�ҥH�L�k�ϥιB�⦡"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "�չϨϥΤw�Q�R���� buffer"
-
-#~ msgid "line number out of range"
-#~ msgstr "�渹�W�X�d��"
-
-#~ msgid "<buffer object (deleted) at %8lX>"
-#~ msgstr "<buffer ���� (�w�R��): %8lX>"
-
-#~ msgid "invalid mark name"
-#~ msgstr "�аO�W�٤����T"
-
-#~ msgid "no such buffer"
-#~ msgstr "�L�� buffer"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "�չϨϥΤw�Q�R��������"
-
-#~ msgid "readonly attribute"
-#~ msgstr "��Ū�ݩ�"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "��Щw��b�w�İϤ��~"
-
-#~ msgid "<window object (deleted) at %.8lX>"
-#~ msgstr "<��������(�w�R��): %.8lX>"
-
-#~ msgid "<window object (unknown) at %.8lX>"
-#~ msgstr "<��������(����): %.8lX>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<���� %d>"
-
-#~ msgid "no such window"
-#~ msgstr "�L������"
-
-#~ msgid "cannot save undo information"
-#~ msgstr "�L�k�x�s�_���T"
-
-#~ msgid "cannot delete line"
-#~ msgstr "����R������ "
-
-#~ msgid "cannot replace line"
-#~ msgstr "������N���� "
-
-#~ msgid "cannot insert line"
-#~ msgstr "������N���J���� "
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "�r��L�k�]�t�s�� "
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr "E266: ���R�O�L�k�ϥΡA�L�k���J Ruby �{���w(Library)"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: ������ longjmp status %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "������@/�w�q"
-
-#~ msgid "Show base class of"
-#~ msgstr "��� base class of:"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "��ܳQ override �� member function"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "Ū��: �q�ɮ�"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "Ū��: �q����"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Ū��: �q�Ҧ� project"
-
-#~ msgid "Retrieve"
-#~ msgstr "Ū��"
-
-#~ msgid "Show source of"
-#~ msgstr "��ܭ�l�X: "
-
-#~ msgid "Find symbol"
-#~ msgstr "�j�M symbol"
-
-#~ msgid "Browse class"
-#~ msgstr "�s�� class"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "��ܶ��h���� class"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "��� restricted ���h���� class"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref �ѦҨ�"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref �Q�ְѦ�:"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref ��"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref �Q�֨ϥ�:"
-
-#~ msgid "Show docu of"
-#~ msgstr "��ܤ��: "
-
-#~ msgid "Generate docu for"
-#~ msgstr "���ͤ��: "
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "�L�k�s�u�� SNiFF+�C���ˬd�����ܼ� ($PATH �̥��ݥi�H��� sniffemacs)\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: Ū�����~. �����s�u"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ �ثe"
-
-#~ msgid "not "
-#~ msgstr "��"
-
-#~ msgid "connected"
-#~ msgstr "�s�u��"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: �����T�� SNiff+ �I�s: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: �s�u�� SNiFF+ ����"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: ���s�u�� SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: �g�J���~�C�����s�u"
-
-#~ msgid "not implemented yet"
-#~ msgstr "�|����@"
-
-#~ msgid "unknown option"
-#~ msgstr "�����T���ﶵ"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "����]�w�� "
-
-#~ msgid "mark not set"
-#~ msgstr "�S���]�w�аO"
-
-#~ msgid "row %d column %d"
-#~ msgstr "�C %d �� %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "���ഡ�J�Ϊ��[���� "
-
-#~ msgid "unknown flag: "
-#~ msgstr "���~���X��: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "�����T�� VIM �ﶵ"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "��L���_"
-
-#~ msgid "vim error"
-#~ msgstr "vim ���~"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "�L�k�إ߽w�İ�/�����R�O: ����N�|�Q�R��"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "�L�k���U callback �R�O: �w��/�����w�g�Q�R���F"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr "E280: TCL �Y�����~: reflist �걼�F!? �г��i�� to vim-dev@vim.org"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr "�L�k���U callback �R�O: �䤣��w�İ�/����"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr "E571: ���R�O�L�k�ϥ�, �]���L�k���J Tcl �{���w(Library)"
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr "E281: TCL ���~: �����X���O���!? ��i�� to vim-dev@vim.org"
-
-#~ msgid "cannot get line"
-#~ msgstr "������o���� "
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "�L�k���U�R�O���A���W��"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �L�k�e�X�R�O��ت��a�{��"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM �� registry �]�w�����~�C�w�R���C"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "�z�� Vim �sĶ�ɨS���[�J diff ����O"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t���U gvim �� OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\t���� OLE ���� gvim ���U"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\t�ϥιϧάɭ� (�P \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  ��  --nofork\t�e��: �_�l�ϧάɭ��ɤ� fork"
-
-#~ msgid "-V[N]\t\tVerbose level"
-#~ msgstr "-V[N]\t\tVerbose ����"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t���ϥ� newcli �Ӷ}�ҵ���"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\t�ϥ� <device> ����X�J"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t�ϥ� <gvimrc> ���N���� .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�s��s�X�L���ɮ�"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\t�N vim �P���w�� X-server �s�u"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t���n�s�u�� X Server"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t�s�� Vim ���A���W�� <files> �����}"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  �ۦP�A���S�����A���ɤ�ĵ�i"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>  �P --remote, ���|�����ɮק����s��"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-wait-silent <files>  �ۦP�A���S���A���ɤ�ĵ�i"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\t�e�X <keys> �� Vim ���A�������}"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�b���A���W���� <expr> �æL�X���G"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\t�C�X�i�Ϊ� Vim ���A���W�٨����}"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\t�e��/���� Vim ���A�� <name>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim �{�o���Ѽ� (Motif ��):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim �{�o���Ѽ� (neXtaw ��):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim �{�o���Ѽ� (Athena ��):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t�b���� <display> ���� vim"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t�Ұʫ�ϥܤ�(iconified)"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <name>\t\tŪ�� Resource �ɧ� vim ���W�ٵ��� <name>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (�|����@)\n"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t�]�w <color> ���I���� (�]�i�� -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t�]�w <color> ���@���r�C�� (�]�i�� -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t�ϥ� <font> ���@��r�� (�]�i�� -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t�ϥ� <font> ������r��"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <font>\t�ϥ� <font> ������r��"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t�ϥ�<geom>���_�l��m (�]�i�� -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t�ϥμe�׬� <width> ����� (�]�i�� -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr "-scrollbarwidth <width>  �]�w���ʶb�e�׬� <width> (�]�i�� -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <height>\t�]�w���C�����׬� <height> (�]�i�� -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t�ϥΤϬ���� (�]�i�� -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t���ϥΤϬ���� (�]�i�� +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t�]�w���w�� resource"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim �{�o���Ѽ� (RISC OS ��):\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <number>\t������l�Ƽe��"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <number>\t������l�ư���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim �{�o���Ѽ� (GTK+ ��):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t�b <display> ���� vim (�]�i�� --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t�]�w�W�S������(role)�H�Ϥ��D����"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t�b�t�@�� GTK widget ���}�� Vim"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <parent title>\t�b���{�����}�� Vim"
-
-#~ msgid "No display"
-#~ msgstr "�L���"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �ǰe���ѡC\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": �e�X���ѡC�չϦb���a����\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "�w�s�� %d/%d ���ɮ�"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "�L Display: �L�k�ǰe�B�⦡�C\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": �L�k�ǰe�B�⦡�C\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: �����T�� codepage"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �L�k�إ� input context"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �L�k�}�ҿ�J�k"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: ĵ�i: �L�k���� IM �� callback"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ��J�k���䴩���� style"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ��J�k���䴩���� style"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: over-the-spot �ݭn�r����(Fontset)"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: �A�� GTK+ �� 1.2.3 ���¡C�L�k�ϥΪ��A�ϡC"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: �S�����椤����J�k�޲z�{��(Input Method Server)"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [�L�k�b�������� Vim �W�ϥ�]"
-
-#~ msgid ""
-#~ "&Open Read-Only\n"
-#~ "&Edit anyway\n"
-#~ "&Recover\n"
-#~ "&Quit\n"
-#~ "&Abort\n"
-#~ "&Delete it"
-#~ msgstr ""
-#~ "�H��Ū�覡�}��(&O)\n"
-#~ "�����s��(&E)\n"
-#~ "�״_(&R)\n"
-#~ "���}(&Q)\n"
-#~ "���X(&A)\n"
-#~ "�R���Ȧs��(&D)"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "���U�����"
-
-#~ msgid "[string too long]"
-#~ msgstr "[����L��]"
-
-#~ msgid "Hit ENTER to continue"
-#~ msgstr "�� ENTER �~��"
-
-#~ msgid " (RET/BS: line, SPACE/b: page, d/u: half page, q: quit)"
-#~ msgstr " (RET/BS: �V�U/�V�W�@��, �ť���/b: �@��, d/u: �b��, q: ���})"
-
-#~ msgid " (RET: line, SPACE: page, d: half page, q: quit)"
-#~ msgstr " (RET: �V�U�@��, �ť���: �@��, d: �b��, q: ���})"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�s��"
-
-#~ msgid "Open File dialog"
-#~ msgstr "�}��"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: �D���x(Console)�Ҧ��ɨS���ɮ��s����(file browser)"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: �O�d�ɮפ�...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ����.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "���~: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[bytes] ���� alloc-freed %<PRIu64>-%<PRIu64>, �ϥΤ� %<PRIu64>, peak �ϥ� "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[�I�s] ���� re/malloc(): %<PRIu64>, ���� free()': %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: ����L��"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �������~: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: �����T���ƹ��Ϊ�"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "��J�K�X: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "�ЦA��J�@��: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "�⦸��J�K�X���ۦP!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "�L�k�s���� Netbeans #2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "�L�k�s���� Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: NetBeans �s�u��T�ɮ�: \"%s\" �s���Ҧ������T"
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "�� Netbeans socket Ū��"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �w�� %<PRId64> �P NetBeans ���s�u�w���_"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "���� %<PRId64> �椤 "
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: �b�ϫ��ɭ����L�k���� term"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: ��J \":gui\" �ӱҰʹϧάɭ�"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: �b�ϫ��ɭ����L�k���� term"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �L�k�ϥΦr����(Fontset)"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: �����T���r����(Fontset)"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �L�k�ϥγ]�w������r��(Widefont)"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: �����T���r��(Widefont)"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: ���䴩�ƹ�"
-
-#~ msgid "cannot open "
-#~ msgstr "����}��"
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: �L�k�}�ҵ���!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "�ݭn Amigados ���� 2.04 �H�W\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "�ݭn %s ���� %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "�L�k�}�� NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "����إ� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim �����Ǧ^��: %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "�L�k�����D���x(console)�Ҧ� !?\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ���O�D���x(console)??\n"
-
-#~ msgid "Cannot execute "
-#~ msgstr "������� "
-
-#~ msgid "shell "
-#~ msgstr "shell "
-
-#~ msgid " returned\n"
-#~ msgstr " �w��^\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE �Ӥp"
-
-#~ msgid "I/O ERROR"
-#~ msgstr "I/O ���~"
-
-#~ msgid "...(truncated)"
-#~ msgstr "...(�w����)"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ���O 80, �L�k����~���R�O"
-
-#~ msgid "to %s on %s"
-#~ msgstr "�� %s on %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: �����T���L�����r��: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: �C�L���~: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "�C�L��: '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: �r���� \"%s\" �L�k�����r��\"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: �����T���r�� '%c' �X�{�b�r���W�� \"%s\" ��"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: ����signal, ���}��\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: CVim: �d�I��H��(signal) %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: �d�I��P�R���H��(deadly signale)\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "�}�� X Window �Ӯ� %<PRId64> msec"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X ���~\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "���� X Window ����"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "�}�� X Window �O��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "������� shell sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "����إ� pipe �޽u\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���� fork\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�R�O�w�׵�\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ���h ICE �s�u"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "�}�� X Window ����"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ���b�B�z�ۧ��x�s�n�D"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "�}�� XSMP �s�u��"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE �s�u�ʬݥ���"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection ����: %s"
-
-#~ msgid "At line"
-#~ msgstr "�b�渹 "
-
-#~ msgid "Could not allocate memory for command line."
-#~ msgstr "�L�k���R�O�C�t�m�O����C"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM ���~"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "�L�k���J vim32.dll�I"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "����ץ��禡���Ш� DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "Shell �Ǧ^�� %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: �d�I�� %s \n"
-
-#~ msgid "close"
-#~ msgstr "����"
-
-#~ msgid "logoff"
-#~ msgstr "�n�X"
-
-#~ msgid "shutdown"
-#~ msgstr "����"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: �䤣��R�O"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "�b�A�� $PATH ���䤣�� VIMRUN.EXE.\n"
-#~ "�~���R�O���槹����N���|�Ȱ�.\n"
-#~ "�i�@�B������� :help win32-vimrun "
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim ĵ�i"
-
-#~ msgid "E56: %s* operand could be empty"
-#~ msgstr "E56: %s* �B�⤸�i�H�O�Ū�"
-
-#~ msgid "E57: %s+ operand could be empty"
-#~ msgstr "E57: %s+ �B�⤸�i�H�O�Ū�"
-
-#~ msgid "E58: %s{ operand could be empty"
-#~ msgstr "E58: %s{ �B�⤸�i�H�O�Ū�"
-
-#~ msgid "E361: Crash intercepted; regexp too complex?"
-#~ msgstr "E361: �L�k����; regular expression �ӽ���?"
-
-#~ msgid "E363: pattern caused out-of-stack error"
-#~ msgstr "E363: regular expression �y�����|�������~"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: �ϥΤF�����T���Ѽ�"
-
-#~ msgid "Enter nr of choice (<CR> to abort): "
-#~ msgstr "��J nr �� (<CR> ���}): "
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Tag �ɮ׸��|�Q�I�_�� %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�_�ʷs shell\n"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "�L�k�٭�F���~��V�O"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 Bit �ϫ��ɭ�����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 Bit �ϫ��ɭ�����"
-
-#~ msgid " in Win32s mode"
-#~ msgstr "Win32s �Ҧ�"
-
-#~ msgid " with OLE support"
-#~ msgstr "�䴩 OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 Bit console ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 Bit console ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 Bit MS-DOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 Bit MS-DOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "RISC OS ����"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "�j������ "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�@�목�� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "²������ "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "��²���� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "�ϥ� GTK2-GNOME �ϫ��ɭ��C"
-
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "�ϥ� GTK-GNOME �ϫ��ɭ��C"
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "�ϥ� GTK2 �ϫ��ɭ��C"
-
-#~ msgid "with GTK GUI."
-#~ msgstr "�ϥ� GTK �ϫ��ɭ��C"
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "�ϥ� X11-Motif �ϫ��ɭ��C"
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "�ϥ� X11-neXtaw �ϫ��ɭ��C"
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "�ϥ� X11-Athena �ϫ��ɭ��C"
-
-#~ msgid "with BeOS GUI."
-#~ msgstr "�ϥ� BeOS �ϫ��ɭ��C"
-
-#~ msgid "with Photon GUI."
-#~ msgstr "�ϥ�Photon�ϫ��ɭ��C"
-
-#~ msgid "with GUI."
-#~ msgstr "�ϥιϫ��ɭ��C"
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "�ϥ� Carbon �ϫ��ɭ��C"
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "�ϥ� Cocoa �ϫ��ɭ��C"
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "�ϥ� (�Dz�) �ϫ��ɭ��C"
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "         �t�� gvimrc �ɮ�: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "     �ϥΪ̭ӤH gvimrc ��: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "   �ĤG�խӤH gvimrc �ɮ�: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "   �ĤT�խӤH gvimrc �ɮ�: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "           �t��]�w��: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "�sĶ��: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�i�@�B�����п����檺 ���U����->�@�ϩt��"
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "���� Modeless �Ҧ��A��J����r�|�۰ʴ��J"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "�����檺�u�s��v�u����]�w�v�u�������J�Ҧ��v"
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              ��ؼҦ�           "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "�����檺�u�s��v�u����]�w�v�u�����Dz�Vi�ۮe�Ҧ��v"
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              �H�o Vim �w�]��    "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "�`�N: ������ Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "�p�G�ݭn�� Windows 95 �䴩����h��T�п�J :help windows95<Enter>"
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: �L�k���s���J�{���w %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr "��p, ���R�O�L�k�ϥ�. ��]: �L�k���J Perl �{���w(Library)"
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr "E299: �b sandbox ���L Safe �ҲծɵL�k���� Perl"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "�ϥΦh�� Vim session �s��(&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�u�ϥΦP�@�� Vim session �s��(&V)"
-
-#~ msgid "&Diff with Vim"
-#~ msgstr "�ϥ� Vim �Ӥ��(&Diff)"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "�ϥ� Vim �s�覹��(&V)"
-
-#~ msgid "Edit with existing Vim - &"
-#~ msgstr "�ϥΰ��椤�� Vim session �s�� - &"
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�ϥ� Vim �s��w������ɮ�"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "�L�k����{��: ���ˬd gvim ���S���b�A�� PATH �ܼƸ�!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ���~"
-
-#~ msgid "Path length too long!"
-#~ msgstr "���|���פӪ�!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: �����T���r���� (Fontset): %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: �����T���r���W��: %s"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �L�k���J�{���w���禡 %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �]���sĶ�ɨS���[�J Hebrew ���{���X�A�ҥH�L�k�ϥ� Hebrew\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �]���sĶ�ɨS���[�J Farsi ���{���X�A�ҥH�L�k�ϥ� Farsi\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: �]���sĶ�ɨS���[�J Arabic ���{���X�A�ҥH�L�k�ϥ�\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: �S�����U�� \"%s\" �����A��"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: <����}�� X Server DISPLAY>"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: �ϰ�Q�O�@�A�L�k�ק�"
-
-#~ msgid "E565: error reading cscope connection %d"
-#~ msgstr "E565: Ū�� cscope �s�u %d ���~"
-
-#~ msgid "E260: cscope connection not found"
-#~ msgstr "E260: �䤣�� cscope �s�u"
-
-#~ msgid "cscope connection closed"
-#~ msgstr "cscope �s�u�w����"
-
-#~ msgid "couldn't malloc\n"
-#~ msgstr "�L�k�ϥ� malloc\n"
-
-#~ msgid "%2d %-5ld  %-34s  <none>\n"
-#~ msgstr "%2d %-5ld  %-34s  <�L>\n"
-
-#~ msgid "\"\n"
-#~ msgstr "\"\n"
-
-#~ msgid "--help\t\tShow Gnome arguments"
-#~ msgstr "--help\t\t��� Gnome �����Ѽ�"
-
-#~ msgid " BLOCK"
-#~ msgstr " �϶�"
-
-#~ msgid " LINE"
-#~ msgstr " ����"
-
-#~ msgid "Linear tag search"
-#~ msgstr "�u�ʷj�M���� (Tags)"
-
-#~ msgid "Binary tag search"
-#~ msgstr "�G���j�M(Binary search) ����(Tags)"
-
-#~ msgid "function "
-#~ msgstr "�禡 "
-
-#~ msgid "Run Macro"
-#~ msgstr "���楨��"
-
-#~ msgid "E242: Color name not recognized: %s"
-#~ msgstr "E242: %s ���L�k�ѧO���C��W��"
-
-#~ msgid "error reading cscope connection %d"
-#~ msgstr "Ū�� cscope �s�u %d �ɿ��~"
-
-#~ msgid "E249: couldn't read VIM instance registry property"
-#~ msgstr "E249: �L�kŪ�� VIM �� registry �]�w��"
-
-#~ msgid "E241: Unable to send to Vim server"
-#~ msgstr "E241: �L�k�ǰe�� Vim ���A��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Send failed. No command server present ?\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�ǰe���ѡC�S���R�O���A���s�b ?\n"
-
-#~ msgid "PC (32 bits Vim)"
-#~ msgstr "PC (32 �줸 Vim)"
-
-#~ msgid "PC (16 bits Vim)"
-#~ msgstr "PC (16 �줸 Vim)"
-
-#~ msgid "E362: Unsupported screen mode"
-#~ msgstr "E362: �ù��Ҧ����䴩"
-
-#~ msgid "No servers found for this display"
-#~ msgstr "��Display�S�����A��(Servers)"
-
-#~ msgid "E258: no matches found in cscope connections"
-#~ msgstr "E258: cscope �s�u�䤣��ŦX��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS Carbon"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS Carbon"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS 8"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS 8"
-
-#~ msgid "Retrieve next symbol"
-#~ msgstr "Ū��: �q�U�� symbol"
-
-#~ msgid "-- SNiFF+ commands --"
-#~ msgstr "-- SNiFF+ �R�O --"
-
-#~ msgid "E277: Unrecognized sniff request [%s]"
-#~ msgstr "E277: �L�k���� sniff �R�O [%s]"
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 5ad621e666..89180f76de 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -7,12 +7,12 @@
 #include <stdbool.h>
 
 #include "nvim/vim.h"
+#include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
 #include "nvim/popupmnu.h"
 #include "nvim/charset.h"
 #include "nvim/ex_cmds.h"
 #include "nvim/memline.h"
-#include "nvim/misc2.h"
 #include "nvim/move.h"
 #include "nvim/option.h"
 #include "nvim/screen.h"
@@ -21,6 +21,7 @@
 #include "nvim/memory.h"
 #include "nvim/window.h"
 #include "nvim/edit.h"
+#include "nvim/ui.h"
 
 static pumitem_T *pum_array = NULL; // items of displayed pum
 static int pum_size;                // nr of items in "pum_array"
@@ -36,8 +37,10 @@ static int pum_scrollbar;           // TRUE when scrollbar present
 static int pum_row;                 // top row of pum
 static int pum_col;                 // left column of pum
 
-static int pum_do_redraw = FALSE;   // do redraw anyway
+static bool pum_is_visible = false;
 
+static bool pum_external = false;
+static bool pum_wants_external = false;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "popupmnu.c.generated.h"
@@ -53,7 +56,10 @@ static int pum_do_redraw = FALSE;   // do redraw anyway
 /// @param array
 /// @param size
 /// @param selected index of initially selected item, none if out of range
-void pum_display(pumitem_T *array, int size, int selected)
+/// @param array_changed if true, array contains different items since last call
+///                      if false, a new item is selected, but the array
+///                      is the same
+void pum_display(pumitem_T *array, int size, int selected, bool array_changed)
 {
   int w;
   int def_width;
@@ -61,38 +67,77 @@ void pum_display(pumitem_T *array, int size, int selected)
   int kind_width;
   int extra_width;
   int i;
-  int top_clear;
   int row;
   int context_lines;
   int col;
-  int above_row = cmdline_row;
+  int above_row;
+  int below_row;
   int redo_count = 0;
+  win_T *pvwin;
+
+  if (!pum_is_visible) {
+    // To keep the code simple, we only allow changing the
+    // draw mode when the popup menu is not being displayed
+    pum_external = pum_wants_external;
+  }
 
 redo:
+  // Mark the pum as visible already here,
+  // to avoid that must_redraw is set when 'cursorcolumn' is on.
+  pum_is_visible = true;
+  validate_cursor_col();
+  above_row = 0;
+  below_row = cmdline_row;
+
+  // anchor position: the start of the completed word
+  row = curwin->w_wrow + curwin->w_winrow;
+  if (curwin->w_p_rl) {
+    col = curwin->w_wincol + curwin->w_width - curwin->w_wcol - 1;
+  } else {
+    col = curwin->w_wincol + curwin->w_wcol;
+  }
+
+  if (pum_external) {
+    Array args = ARRAY_DICT_INIT;
+    if (array_changed) {
+      Array arr = ARRAY_DICT_INIT;
+      for (i = 0; i < size; i++) {
+        Array item = ARRAY_DICT_INIT;
+        ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_text)));
+        ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_kind)));
+        ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_extra)));
+        ADD(item, STRING_OBJ(cstr_to_string((char *)array[i].pum_info)));
+        ADD(arr, ARRAY_OBJ(item));
+      }
+      ADD(args, ARRAY_OBJ(arr));
+      ADD(args, INTEGER_OBJ(selected));
+      ADD(args, INTEGER_OBJ(row));
+      ADD(args, INTEGER_OBJ(col));
+      ui_event("popupmenu_show", args);
+    } else {
+      ADD(args, INTEGER_OBJ(selected));
+      ui_event("popupmenu_select", args);
+    }
+    return;
+  }
+
   def_width = PUM_DEF_WIDTH;
   max_width = 0;
   kind_width = 0;
   extra_width = 0;
 
-  // Pretend the pum is already there to avoid that must_redraw is set when
-  // 'cuc' is on.
-  pum_array = (pumitem_T *)1;
-  validate_cursor_col();
-  pum_array = NULL;
-
-  row = curwin->w_wrow + curwin->w_winrow;
-
-  if (firstwin->w_p_pvw) {
-    top_clear = firstwin->w_height;
-  } else {
-    top_clear = 0;
+  FOR_ALL_WINDOWS(pvwin) {
+    if (pvwin->w_p_pvw) {
+      break;
+    }
   }
 
-  // When the preview window is at the bottom stop just above it.  Also
-  // avoid drawing over the status line so that it's clear there is a window
-  // boundary.
-  if (lastwin->w_p_pvw) {
-    above_row -= lastwin->w_height + lastwin->w_status_height + 1;
+  if (pvwin != NULL) {
+    if (pvwin->w_wrow < curwin->w_wrow) {
+      above_row = pvwin->w_wrow + pvwin->w_height;
+    } else if (pvwin->w_wrow > pvwin->w_wrow + curwin->w_height) {
+      below_row = pvwin->w_wrow;
+    }
   }
 
   // Figure out the size and position of the pum.
@@ -108,8 +153,8 @@ redo:
 
   // Put the pum below "row" if possible.  If there are few lines decide on
   // where there is more room.
-  if ((row  + 2 >= above_row - pum_height)
-      && (row > (above_row - top_clear) / 2)) {
+  if (row + 2 >= below_row - pum_height
+      && row - above_row > (below_row - above_row) / 2) {
     // pum above "row"
 
     // Leave two lines of context if possible
@@ -143,8 +188,8 @@ redo:
     }
 
     pum_row = row + context_lines;
-    if (size > above_row - pum_row) {
-      pum_height = above_row - pum_row;
+    if (size > below_row - pum_row) {
+      pum_height = below_row - pum_row;
     } else {
       pum_height = size;
     }
@@ -159,12 +204,10 @@ redo:
     return;
   }
 
-  // If there is a preview window at the top avoid drawing over it.
-  if (firstwin->w_p_pvw
-      && (pum_row < firstwin->w_height)
-      && (pum_height > firstwin->w_height + 4)) {
-    pum_row += firstwin->w_height;
-    pum_height -= firstwin->w_height;
+  // If there is a preview window at the above avoid drawing over it.
+  if (pvwin != NULL && pum_row < above_row && pum_height > above_row) {
+    pum_row += above_row;
+    pum_height -= above_row;
   }
 
   // Compute the width of the widest match and the widest extra.
@@ -194,13 +237,6 @@ redo:
   pum_base_width = max_width;
   pum_kind_width = kind_width;
 
-  // Calculate column
-  if (curwin->w_p_rl) {
-    col = curwin->w_wincol + curwin->w_width - curwin->w_wcol - 1;
-  } else {
-    col = curwin->w_wincol + curwin->w_wcol;
-  }
-
   // if there are more items than room we need a scrollbar
   if (pum_height < size) {
     pum_scrollbar = 1;
@@ -554,7 +590,9 @@ static int pum_set_selected(int n, int repeat)
       g_do_tagpreview = 0;
 
       if (curwin->w_p_pvw) {
-        if ((curbuf->b_fname == NULL)
+        if (!resized
+            && (curbuf->b_nwindows == 1)
+            && (curbuf->b_fname == NULL)
             && (curbuf->b_p_bt[0] == 'n')
             && (curbuf->b_p_bt[2] == 'f')
             && (curbuf->b_p_bh[0] == 'w')) {
@@ -641,9 +679,9 @@ static int pum_set_selected(int n, int repeat)
 
             // Update the screen before drawing the popup menu.
             // Enable updating the status lines.
-            pum_do_redraw = TRUE;
+            pum_is_visible = false;
             update_screen(0);
-            pum_do_redraw = FALSE;
+            pum_is_visible = true;
 
             if (!resized && win_valid(curwin_save)) {
               no_u_sync++;
@@ -653,9 +691,9 @@ static int pum_set_selected(int n, int repeat)
 
             // May need to update the screen again when there are
             // autocommands involved.
-            pum_do_redraw = TRUE;
+            pum_is_visible = false;
             update_screen(0);
-            pum_do_redraw = FALSE;
+            pum_is_visible = true;
           }
         }
       }
@@ -672,10 +710,17 @@ static int pum_set_selected(int n, int repeat)
 /// Undisplay the popup menu (later).
 void pum_undisplay(void)
 {
+  pum_is_visible = false;
   pum_array = NULL;
-  redraw_all_later(SOME_VALID);
-  redraw_tabline = TRUE;
-  status_redraw_all();
+
+  if (pum_external) {
+    Array args = ARRAY_DICT_INIT;
+    ui_event("popupmenu_hide", args);
+  } else {
+    redraw_all_later(SOME_VALID);
+    redraw_tabline = true;
+    status_redraw_all();
+  }
 }
 
 /// Clear the popup menu.  Currently only resets the offset to the first
@@ -685,12 +730,16 @@ void pum_clear(void)
   pum_first = 0;
 }
 
-/// Overruled when "pum_do_redraw" is set, used to redraw the status lines.
-///
-/// @return TRUE if the popup menu is displayed.
-int pum_visible(void)
+/// @return true if the popup menu is displayed.
+bool pum_visible(void)
+{
+  return pum_is_visible;
+}
+
+/// @return true if the popup menu is displayed and drawn on the grid.
+bool pum_drawn(void)
 {
-  return !pum_do_redraw && pum_array != NULL;
+  return pum_visible() && !pum_external;
 }
 
 /// Gets the height of the menu.
@@ -701,3 +750,8 @@ int pum_get_height(void)
 {
   return pum_height;
 }
+
+void pum_set_external(bool external)
+{
+  pum_wants_external = external;
+}
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 151b9d3790..cebff5e8b7 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -27,7 +27,6 @@
 #include "nvim/memline.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/memory.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
@@ -49,8 +48,6 @@ struct dir_stack_T {
   char_u              *dirname;
 };
 
-static struct dir_stack_T   *dir_stack = NULL;
-
 /*
  * For each error the next struct is allocated and linked in a list.
  */
@@ -77,13 +74,14 @@ struct qfline_S {
 #define LISTCOUNT   10
 
 typedef struct qf_list_S {
-  qfline_T    *qf_start;        /* pointer to the first error */
-  qfline_T    *qf_ptr;          /* pointer to the current error */
-  int qf_count;                 /* number of errors (0 means no error list) */
-  int qf_index;                 /* current index in the error list */
-  int qf_nonevalid;             /* TRUE if not a single valid entry found */
-  char_u      *qf_title;        /* title derived from the command that created
-                                 * the error list */
+  qfline_T    *qf_start;        // pointer to the first error
+  qfline_T    *qf_last;         // pointer to the last error
+  qfline_T    *qf_ptr;          // pointer to the current error
+  int qf_count;                 // number of errors (0 means no error list)
+  int qf_index;                 // current index in the error list
+  int qf_nonevalid;             // TRUE if not a single valid entry found
+  char_u      *qf_title;        // title derived from the command that created
+                                // the error list
 } qf_list_T;
 
 struct qf_info_S {
@@ -97,6 +95,15 @@ struct qf_info_S {
   int qf_listcount;                 /* current number of lists */
   int qf_curlist;                   /* current error list */
   qf_list_T qf_lists[LISTCOUNT];
+
+  int qf_dir_curlist;  ///< error list for qf_dir_stack
+  struct dir_stack_T *qf_dir_stack;
+  char_u *qf_directory;
+  struct dir_stack_T *qf_file_stack;
+  char_u *qf_currfile;
+  bool qf_multiline;
+  bool qf_multiignore;
+  bool qf_multiscan;
 };
 
 static qf_info_T ql_info;       /* global quickfix list */
@@ -169,17 +176,268 @@ qf_init (
       qf_title);
 }
 
-/*
- * Read the errorfile "efile" into memory, line by line, building the error
- * list.
- * Alternative: when "efile" is null read errors from buffer "buf".
- * Always use 'errorformat' from "buf" if there is a local value.
- * Then "lnumfirst" and "lnumlast" specify the range of lines to use.
- * Set the title of the list to "qf_title".
- * Return -1 for error, number of errors for success.
- */
-static int 
-qf_init_ext (
+// Maximum number of bytes allowed per line while reading an errorfile.
+static const size_t LINE_MAXLEN = 4096;
+
+static char_u *qf_grow_linebuf(char_u **growbuf, size_t *growbufsiz,
+                               size_t newsz, size_t *allocsz)
+{
+  // If the line exceeds LINE_MAXLEN exclude the last
+  // byte since it's not a NL character.
+  *allocsz = newsz > LINE_MAXLEN ? LINE_MAXLEN - 1 : newsz;
+  if (*growbuf == NULL) {
+    *growbuf = xmalloc(*allocsz + 1);
+    *growbufsiz = *allocsz;
+  } else if (*allocsz > *growbufsiz) {
+    *growbuf = xrealloc(*growbuf, *allocsz + 1);
+    *growbufsiz = *allocsz;
+  }
+  return *growbuf;
+}
+
+static struct fmtpattern
+{
+  char_u convchar;
+  char *pattern;
+} fmt_pat[FMT_PATTERNS] =
+{
+  { 'f', ".\\+" },  // only used when at end
+  { 'n', "\\d\\+" },
+  { 'l', "\\d\\+" },
+  { 'c', "\\d\\+" },
+  { 't', "." },
+  { 'm', ".\\+" },
+  { 'r', ".*" },
+  { 'p', "[- 	.]*" },  // NOLINT(whitespace/tab)
+  { 'v', "\\d\\+" },
+  { 's', ".\\+" }
+};
+
+// Converts a 'errorformat' string to regular expression pattern
+static int efm_to_regpat(char_u *efm, int len, efm_T *fmt_ptr,
+                         char_u *regpat, char_u *errmsg)
+{
+  // Build regexp pattern from current 'errorformat' option
+  char_u *ptr = regpat;
+  *ptr++ = '^';
+  int round = 0;
+  for (char_u *efmp = efm; efmp < efm + len; efmp++) {
+    if (*efmp == '%') {
+      efmp++;
+      int idx;
+      for (idx = 0; idx < FMT_PATTERNS; idx++) {
+        if (fmt_pat[idx].convchar == *efmp) {
+          break;
+        }
+      }
+      if (idx < FMT_PATTERNS) {
+        if (fmt_ptr->addr[idx]) {
+          snprintf((char *)errmsg, CMDBUFFSIZE + 1,
+                   _("E372: Too many %%%c in format string"), *efmp);
+          EMSG(errmsg);
+          return -1;
+        }
+        if ((idx
+             && idx < 6
+             && vim_strchr((char_u *)"DXOPQ", fmt_ptr->prefix) != NULL)
+            || (idx == 6
+                && vim_strchr((char_u *)"OPQ", fmt_ptr->prefix) == NULL)) {
+          snprintf((char *)errmsg, CMDBUFFSIZE + 1,
+                   _("E373: Unexpected %%%c in format string"), *efmp);
+          EMSG(errmsg);
+          return -1;
+        }
+        round++;
+        fmt_ptr->addr[idx] = (char_u)round;
+        *ptr++ = '\\';
+        *ptr++ = '(';
+#ifdef BACKSLASH_IN_FILENAME
+        if (*efmp == 'f') {
+          // Also match "c:" in the file name, even when
+          // checking for a colon next: "%f:".
+          // "\%(\a:\)\="
+          STRCPY(ptr, "\\%(\\a:\\)\\=");
+          ptr += 10;
+        }
+#endif
+        if (*efmp == 'f' && efmp[1] != NUL) {
+          if (efmp[1] != '\\' && efmp[1] != '%') {
+            // A file name may contain spaces, but this isn't
+            // in "\f".  For "%f:%l:%m" there may be a ":" in
+            // the file name.  Use ".\{-1,}x" instead (x is
+            // the next character), the requirement that :999:
+            // follows should work.
+            STRCPY(ptr, ".\\{-1,}");
+            ptr += 7;
+          } else {
+            // File name followed by '\\' or '%': include as
+            // many file name chars as possible.
+            STRCPY(ptr, "\\f\\+");
+            ptr += 4;
+          }
+        } else {
+          char_u *srcptr = (char_u *)fmt_pat[idx].pattern;
+          while ((*ptr = *srcptr++) != NUL) {
+            ptr++;
+          }
+        }
+        *ptr++ = '\\';
+        *ptr++ = ')';
+      } else if (*efmp == '*') {
+        if (*++efmp == '[' || *efmp == '\\') {
+          if ((*ptr++ = *efmp) == '[') {  // %*[^a-z0-9] etc.
+            if (efmp[1] == '^') {
+              *ptr++ = *++efmp;
+            }
+            if (efmp < efm + len) {
+              efmp++;
+              *ptr++ = *efmp;    // could be ']'
+              while (efmp < efm + len) {
+                efmp++;
+                if ((*ptr++ = *efmp) == ']') {
+                  break;
+                }
+              }
+              if (efmp == efm + len) {
+                EMSG(_("E374: Missing ] in format string"));
+                return -1;
+              }
+            }
+          } else if (efmp < efm + len) {  // %*\D, %*\s etc.
+            efmp++;
+            *ptr++ = *efmp;
+          }
+          *ptr++ = '\\';
+          *ptr++ = '+';
+        } else {
+          // TODO(vim): scanf()-like: %*ud, %*3c, %*f, ... ?
+          snprintf((char *)errmsg, CMDBUFFSIZE + 1,
+                   _("E375: Unsupported %%%c in format string"), *efmp);
+          EMSG(errmsg);
+          return -1;
+        }
+      } else if (vim_strchr((char_u *)"%\\.^$~[", *efmp) != NULL) {
+        *ptr++ = *efmp;  // regexp magic characters
+      } else if (*efmp == '#') {
+        *ptr++ = '*';
+      } else if (*efmp == '>') {
+        fmt_ptr->conthere = true;
+      } else if (efmp == efm + 1) {             // analyse prefix
+        if (vim_strchr((char_u *)"+-", *efmp) != NULL) {
+          fmt_ptr->flags = *efmp++;
+        }
+        if (vim_strchr((char_u *)"DXAEWICZGOPQ", *efmp) != NULL) {
+          fmt_ptr->prefix = *efmp;
+        } else {
+          snprintf((char *)errmsg, CMDBUFFSIZE + 1,
+                   _("E376: Invalid %%%c in format string prefix"), *efmp);
+          EMSG(errmsg);
+          return -1;
+        }
+      } else {
+        snprintf((char *)errmsg, CMDBUFFSIZE + 1,
+                 _("E377: Invalid %%%c in format string"), *efmp);
+        EMSG(errmsg);
+        return -1;
+      }
+    } else {                    // copy normal character
+      if (*efmp == '\\' && efmp + 1 < efm + len) {
+        efmp++;
+      } else if (vim_strchr((char_u *)".*^$~[", *efmp) != NULL) {
+        *ptr++ = '\\';  // escape regexp atoms
+      }
+      if (*efmp) {
+        *ptr++ = *efmp;
+      }
+    }
+  }
+  *ptr++ = '$';
+  *ptr = NUL;
+
+  return 0;
+}
+
+static void free_efm_list(efm_T **efm_first)
+{
+  for (efm_T *efm_ptr = *efm_first; efm_ptr != NULL; efm_ptr = *efm_first) {
+    *efm_first = efm_ptr->next;
+    vim_regfree(efm_ptr->prog);
+    xfree(efm_ptr);
+  }
+}
+
+// Parse 'errorformat' option
+static efm_T * parse_efm_option(char_u *efm)
+{
+  efm_T *fmt_ptr = NULL;
+  efm_T *fmt_first = NULL;
+  efm_T *fmt_last = NULL;
+  int len;
+
+  size_t errmsglen = CMDBUFFSIZE + 1;
+  char_u *errmsg = xmalloc(errmsglen);
+
+  // Get some space to modify the format string into.
+  size_t i = (FMT_PATTERNS * 3) + (STRLEN(efm) << 2);
+  for (int round = FMT_PATTERNS - 1; round >= 0; ) {
+    i += STRLEN(fmt_pat[round--].pattern);
+  }
+  i += 2;   // "%f" can become two chars longer
+  char_u *fmtstr = xmalloc(i);
+
+  while (efm[0] != NUL) {
+    // Allocate a new eformat structure and put it at the end of the list
+    fmt_ptr = (efm_T *)xcalloc(1, sizeof(efm_T));
+    if (fmt_first == NULL) {        // first one
+      fmt_first = fmt_ptr;
+    } else {
+      fmt_last->next = fmt_ptr;
+    }
+    fmt_last = fmt_ptr;
+
+    // Isolate one part in the 'errorformat' option
+    for (len = 0; efm[len] != NUL && efm[len] != ','; len++) {
+      if (efm[len] == '\\' && efm[len + 1] != NUL) {
+        len++;
+      }
+    }
+
+    if (efm_to_regpat(efm, len, fmt_ptr, fmtstr, errmsg) == -1) {
+      goto parse_efm_error;
+    }
+    if ((fmt_ptr->prog = vim_regcomp(fmtstr, RE_MAGIC + RE_STRING)) == NULL) {
+      goto parse_efm_error;
+    }
+    // Advance to next part
+    efm = skip_to_option_part(efm + len);       // skip comma and spaces
+  }
+
+  if (fmt_first == NULL) {      // nothing found
+    EMSG(_("E378: 'errorformat' contains no pattern"));
+  }
+
+  goto parse_efm_end;
+
+parse_efm_error:
+  free_efm_list(&fmt_first);
+
+parse_efm_end:
+  xfree(fmtstr);
+  xfree(errmsg);
+
+  return fmt_first;
+}
+
+// Read the errorfile "efile" into memory, line by line, building the error
+// list.
+// Alternative: when "efile" is NULL read errors from buffer "buf".
+// Alternative: when "tv" is not NULL get errors from the string or list.
+// Always use 'errorformat' from "buf" if there is a local value.
+// Then "lnumfirst" and "lnumlast" specify the range of lines to use.
+// Set the title of the list to "qf_title".
+// Return -1 for error, number of errors for success.
+static int
+qf_init_ext(
     qf_info_T *qi,
     char_u *efile,
     buf_T *buf,
@@ -193,8 +451,14 @@ qf_init_ext (
 {
   char_u          *namebuf;
   char_u          *errmsg;
+  size_t          errmsglen;
   char_u          *pattern;
-  char_u          *fmtstr = NULL;
+  char_u          *growbuf = NULL;
+  size_t          growbuflen;
+  size_t          growbufsiz = 0;
+  char_u          *linebuf = NULL;
+  size_t          linelen = 0;
+  bool            discard;
   int col = 0;
   bool use_viscol = false;
   char_u type = 0;
@@ -202,49 +466,25 @@ qf_init_ext (
   long lnum = 0L;
   int enr = 0;
   FILE            *fd = NULL;
-  qfline_T        *qfprev = NULL;       /* init to make SASC shut up */
-  char_u          *efmp;
-  efm_T           *fmt_first = NULL;
-  efm_T           *fmt_last = NULL;
+  qfline_T        *old_last = NULL;
+  static efm_T    *fmt_first = NULL;
   efm_T           *fmt_ptr;
   efm_T           *fmt_start = NULL;
   char_u          *efm;
-  char_u          *ptr;
-  char_u          *srcptr;
-  int len;
+  static char_u   *last_efm = NULL;
+  size_t len;
   int i;
-  int round;
   int idx = 0;
-  bool multiline = false;
-  bool multiignore = false;
-  bool multiscan = false;
   int retval = -1;                      // default: return error flag
-  char_u *directory = NULL;
-  char_u *currfile = NULL;
   char_u *tail = NULL;
+  char_u *p_buf = NULL;
   char_u *p_str = NULL;
   listitem_T *p_li = NULL;
-  struct dir_stack_T *file_stack = NULL;
   regmatch_T regmatch;
-  static struct fmtpattern {
-    char_u convchar;
-    char    *pattern;
-  }               fmt_pat[FMT_PATTERNS] =
-  {
-    {'f', ".\\+"},                          /* only used when at end */
-    {'n', "\\d\\+"},
-    {'l', "\\d\\+"},
-    {'c', "\\d\\+"},
-    {'t', "."},
-    {'m', ".\\+"},
-    {'r', ".*"},
-    {'p', "[- 	.]*"},
-    {'v', "\\d\\+"},
-    {'s', ".\\+"}
-  };
 
   namebuf = xmalloc(CMDBUFFSIZE + 1);
-  errmsg = xmalloc(CMDBUFFSIZE + 1);
+  errmsglen = CMDBUFFSIZE + 1;
+  errmsg = xmalloc(errmsglen);
   pattern = xmalloc(CMDBUFFSIZE + 1);
 
   if (efile != NULL && (fd = mch_fopen((char *)efile, "r")) == NULL) {
@@ -252,14 +492,13 @@ qf_init_ext (
     goto qf_init_end;
   }
 
-  if (newlist || qi->qf_curlist == qi->qf_listcount)
-    /* make place for a new list */
+  if (newlist || qi->qf_curlist == qi->qf_listcount) {
+    // make place for a new list
     qf_new_list(qi, qf_title);
-  else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
-    /* Adding to existing list, find last entry. */
-    for (qfprev = qi->qf_lists[qi->qf_curlist].qf_start;
-         qfprev->qf_next != qfprev; qfprev = qfprev->qf_next)
-      ;
+  } else if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
+    // Adding to existing list, use last entry.
+    old_last = qi->qf_lists[qi->qf_curlist].qf_last;
+  }
 
   /*
    * Each part of the format string is copied and modified from errorformat to
@@ -270,172 +509,35 @@ qf_init_ext (
     efm = buf->b_p_efm;
   else
     efm = errorformat;
-  /*
-   * Get some space to modify the format string into.
-   */
-  size_t fmtstr_size = 3 * FMT_PATTERNS + 4 * STRLEN(efm);
-  for (round = FMT_PATTERNS; round > 0; ) {
-    fmtstr_size += STRLEN(fmt_pat[--round].pattern);
-  }
-#ifdef COLON_IN_FILENAME
-  fmtstr_size += 12;  // "%f" can become twelve chars longer
-#else
-  fmtstr_size += 2;   // "%f" can become two chars longer
-#endif
-  fmtstr = xmalloc(fmtstr_size);
 
-  while (efm[0] != NUL) {
-    /*
-     * Allocate a new eformat structure and put it at the end of the list
-     */
-    fmt_ptr = xcalloc(1, sizeof(efm_T));
-    if (fmt_first == NULL)          /* first one */
-      fmt_first = fmt_ptr;
-    else
-      fmt_last->next = fmt_ptr;
-    fmt_last = fmt_ptr;
-
-    /*
-     * Isolate one part in the 'errorformat' option
-     */
-    for (len = 0; efm[len] != NUL && efm[len] != ','; ++len)
-      if (efm[len] == '\\' && efm[len + 1] != NUL)
-        ++len;
+  // If we are not adding or adding to another list: clear the state.
+  if (newlist || qi->qf_curlist != qi->qf_dir_curlist) {
+    qi->qf_dir_curlist = qi->qf_curlist;
+    qf_clean_dir_stack(&qi->qf_dir_stack);
+    qi->qf_directory = NULL;
+    qf_clean_dir_stack(&qi->qf_file_stack);
+    qi->qf_currfile = NULL;
+    qi->qf_multiline = false;
+    qi->qf_multiignore = false;
+    qi->qf_multiscan = false;
+  }
 
-    /*
-     * Build regexp pattern from current 'errorformat' option
-     */
-    ptr = fmtstr;
-    *ptr++ = '^';
-    round = 0;
-    for (efmp = efm; efmp < efm + len; ++efmp) {
-      if (*efmp == '%') {
-        ++efmp;
-        for (idx = 0; idx < FMT_PATTERNS; ++idx)
-          if (fmt_pat[idx].convchar == *efmp)
-            break;
-        if (idx < FMT_PATTERNS) {
-          if (fmt_ptr->addr[idx]) {
-            sprintf((char *)errmsg,
-                _("E372: Too many %%%c in format string"), *efmp);
-            EMSG(errmsg);
-            goto error2;
-          }
-          if ((idx
-               && idx < 6
-               && vim_strchr((char_u *)"DXOPQ",
-                   fmt_ptr->prefix) != NULL)
-              || (idx == 6
-                  && vim_strchr((char_u *)"OPQ",
-                      fmt_ptr->prefix) == NULL)) {
-            sprintf((char *)errmsg,
-                _("E373: Unexpected %%%c in format string"), *efmp);
-            EMSG(errmsg);
-            goto error2;
-          }
-          fmt_ptr->addr[idx] = (char_u)++ round;
-          *ptr++ = '\\';
-          *ptr++ = '(';
-#ifdef BACKSLASH_IN_FILENAME
-          if (*efmp == 'f') {
-            /* Also match "c:" in the file name, even when
-             * checking for a colon next: "%f:".
-             * "\%(\a:\)\=" */
-            STRCPY(ptr, "\\%(\\a:\\)\\=");
-            ptr += 10;
-          }
-#endif
-          if (*efmp == 'f' && efmp[1] != NUL) {
-            if (efmp[1] != '\\' && efmp[1] != '%') {
-              /* A file name may contain spaces, but this isn't
-               * in "\f".  For "%f:%l:%m" there may be a ":" in
-               * the file name.  Use ".\{-1,}x" instead (x is
-               * the next character), the requirement that :999:
-               * follows should work. */
-              STRCPY(ptr, ".\\{-1,}");
-              ptr += 7;
-            } else {
-              /* File name followed by '\\' or '%': include as
-               * many file name chars as possible. */
-              STRCPY(ptr, "\\f\\+");
-              ptr += 4;
-            }
-          } else {
-            srcptr = (char_u *)fmt_pat[idx].pattern;
-            while ((*ptr = *srcptr++) != NUL)
-              ++ptr;
-          }
-          *ptr++ = '\\';
-          *ptr++ = ')';
-        } else if (*efmp == '*') {
-          if (*++efmp == '[' || *efmp == '\\') {
-            if ((*ptr++ = *efmp) == '[') {              /* %*[^a-z0-9] etc. */
-              if (efmp[1] == '^')
-                *ptr++ = *++efmp;
-              if (efmp < efm + len) {
-                *ptr++ = *++efmp;                           /* could be ']' */
-                while (efmp < efm + len
-                       && (*ptr++ = *++efmp) != ']')
-                  /* skip */;
-                if (efmp == efm + len) {
-                  EMSG(_("E374: Missing ] in format string"));
-                  goto error2;
-                }
-              }
-            } else if (efmp < efm + len)                /* %*\D, %*\s etc. */
-              *ptr++ = *++efmp;
-            *ptr++ = '\\';
-            *ptr++ = '+';
-          } else {
-            /* TODO: scanf()-like: %*ud, %*3c, %*f, ... ? */
-            sprintf((char *)errmsg,
-                _("E375: Unsupported %%%c in format string"), *efmp);
-            EMSG(errmsg);
-            goto error2;
-          }
-        } else if (vim_strchr((char_u *)"%\\.^$~[", *efmp) != NULL)
-          *ptr++ = *efmp;                       /* regexp magic characters */
-        else if (*efmp == '#')
-          *ptr++ = '*';
-        else if (*efmp == '>')
-          fmt_ptr->conthere = TRUE;
-        else if (efmp == efm + 1) {                     /* analyse prefix */
-          if (vim_strchr((char_u *)"+-", *efmp) != NULL)
-            fmt_ptr->flags = *efmp++;
-          if (vim_strchr((char_u *)"DXAEWICZGOPQ", *efmp) != NULL)
-            fmt_ptr->prefix = *efmp;
-          else {
-            sprintf((char *)errmsg,
-                _("E376: Invalid %%%c in format string prefix"), *efmp);
-            EMSG(errmsg);
-            goto error2;
-          }
-        } else {
-          sprintf((char *)errmsg,
-              _("E377: Invalid %%%c in format string"), *efmp);
-          EMSG(errmsg);
-          goto error2;
-        }
-      } else {                        /* copy normal character */
-        if (*efmp == '\\' && efmp + 1 < efm + len)
-          ++efmp;
-        else if (vim_strchr((char_u *)".*^$~[", *efmp) != NULL)
-          *ptr++ = '\\';                /* escape regexp atoms */
-        if (*efmp)
-          *ptr++ = *efmp;
-      }
+  // If the errorformat didn't change between calls, then reuse the previously
+  // parsed values.
+  if (last_efm == NULL || (STRCMP(last_efm, efm) != 0)) {
+    // free the previously parsed data
+    xfree(last_efm);
+    last_efm = NULL;
+    free_efm_list(&fmt_first);
+
+    // parse the current 'efm'
+    fmt_first = parse_efm_option(efm);
+    if (fmt_first != NULL) {
+      last_efm = vim_strsave(efm);
     }
-    *ptr++ = '$';
-    *ptr = NUL;
-    if ((fmt_ptr->prog = vim_regcomp(fmtstr, RE_MAGIC + RE_STRING)) == NULL)
-      goto error2;
-    /*
-     * Advance to next part
-     */
-    efm = skip_to_option_part(efm + len);       /* skip comma and spaces */
   }
-  if (fmt_first == NULL) {      /* nothing found */
-    EMSG(_("E378: 'errorformat' contains no pattern"));
+
+  if (fmt_first == NULL) {      // nothing found
     goto error2;
   }
 
@@ -467,34 +569,49 @@ qf_init_ext (
           /* Get the next line from the supplied string */
           char_u *p;
 
-          if (!*p_str)           /* Reached the end of the string */
+          if (*p_str == NUL) {  // Reached the end of the string
             break;
+          }
 
           p = vim_strchr(p_str, '\n');
-          if (p)
-            len = (int)(p - p_str + 1);
-          else
-            len = (int)STRLEN(p_str);
+          if (p != NULL) {
+            len = (size_t)(p - p_str) + 1;
+          } else {
+            len = STRLEN(p_str);
+          }
 
-          if (len > CMDBUFFSIZE - 2)
-            STRLCPY(IObuff, p_str, CMDBUFFSIZE - 1);
-          else
-            STRLCPY(IObuff, p_str, len + 1);
+          if (len > IOSIZE - 2) {
+            linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len, &linelen);
+          } else {
+            linebuf = IObuff;
+            linelen = len;
+          }
+          STRLCPY(linebuf, p_str, linelen + 1);
 
+          // Increment using len in order to discard the rest of the line if it
+          // exceeds LINE_MAXLEN.
           p_str += len;
         } else if (tv->v_type == VAR_LIST) {
-          /* Get the next line from the supplied list */
-          while (p_li && p_li->li_tv.v_type != VAR_STRING)
-            p_li = p_li->li_next;               /* Skip non-string items */
+          // Get the next line from the supplied list
+          while (p_li != NULL
+                 && (p_li->li_tv.v_type != VAR_STRING
+                     || p_li->li_tv.vval.v_string == NULL)) {
+            p_li = p_li->li_next;               // Skip non-string items
+          }
 
-          if (!p_li)                            /* End of the list */
+          if (p_li == NULL) {                   // End of the list
             break;
+          }
 
-          len = (int)STRLEN(p_li->li_tv.vval.v_string);
-          if (len > CMDBUFFSIZE - 2)
-            len = CMDBUFFSIZE - 2;
+          len = STRLEN(p_li->li_tv.vval.v_string);
+          if (len > IOSIZE - 2) {
+            linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len, &linelen);
+          } else {
+            linebuf = IObuff;
+            linelen = len;
+          }
 
-          STRLCPY(IObuff, p_li->li_tv.vval.v_string, len + 1);
+          STRLCPY(linebuf, p_li->li_tv.vval.v_string, linelen + 1);
 
           p_li = p_li->li_next;                 /* next item */
         }
@@ -502,21 +619,94 @@ qf_init_ext (
         /* Get the next line from the supplied buffer */
         if (buflnum > lnumlast)
           break;
-        STRLCPY(IObuff, ml_get_buf(buf, buflnum++, FALSE),
-            CMDBUFFSIZE - 1);
+        p_buf = ml_get_buf(buf, buflnum++, false);
+        len = STRLEN(p_buf);
+        if (len > IOSIZE - 2) {
+            linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len, &linelen);
+        } else {
+          linebuf = IObuff;
+          linelen = len;
+        }
+        STRLCPY(linebuf, p_buf, linelen + 1);
+      }
+    } else {
+      if (fgets((char *)IObuff, IOSIZE, fd) == NULL) {
+        break;
       }
-    } else if (fgets((char *)IObuff, CMDBUFFSIZE - 2, fd) == NULL)
-      break;
 
-    IObuff[CMDBUFFSIZE - 2] = NUL;      /* for very long lines */
-    remove_bom(IObuff);
+      discard = false;
+      linelen = STRLEN(IObuff);
+      if (linelen == IOSIZE - 1 && !(IObuff[linelen - 1] == '\n'
+#ifdef USE_CRNL
+                                     || IObuff[linelen - 1] == '\r'
+#endif
+                                     )) {  // NOLINT(whitespace/parens)
+        // The current line exceeds IObuff, continue reading using growbuf
+        // until EOL or LINE_MAXLEN bytes is read.
+        if (growbuf == NULL) {
+          growbufsiz = 2 * (IOSIZE - 1);
+          growbuf = xmalloc(growbufsiz);
+        }
+
+        // Copy the read part of the line, excluding null-terminator
+        memcpy(growbuf, IObuff, IOSIZE - 1);
+        growbuflen = linelen;
+
+        for (;;) {
+          if (fgets((char *)growbuf + growbuflen,
+                    (int)(growbufsiz - growbuflen), fd) == NULL) {
+            break;
+          }
+          linelen = STRLEN(growbuf + growbuflen);
+          growbuflen += linelen;
+          if (growbuf[growbuflen - 1] == '\n'
+#ifdef USE_CRNL
+              || growbuf[growbuflen - 1] == '\r'
+#endif
+              ) {
+            break;
+          }
+          if (growbufsiz == LINE_MAXLEN) {
+            discard = true;
+            break;
+          }
+
+          growbufsiz = (2 * growbufsiz < LINE_MAXLEN)
+            ? 2 * growbufsiz : LINE_MAXLEN;
+          growbuf = xrealloc(growbuf, 2 * growbufsiz);
+        }
 
-    if ((efmp = vim_strrchr(IObuff, '\n')) != NULL)
-      *efmp = NUL;
+        while (discard) {
+          // The current line is longer than LINE_MAXLEN, continue reading but
+          // discard everything until EOL or EOF is reached.
+          if (fgets((char *)IObuff, IOSIZE, fd) == NULL
+              || STRLEN(IObuff) < IOSIZE - 1
+              || IObuff[IOSIZE - 1] == '\n'
 #ifdef USE_CRNL
-    if ((efmp = vim_strrchr(IObuff, '\r')) != NULL)
-      *efmp = NUL;
+              || IObuff[IOSIZE - 1] == '\r'
 #endif
+              ) {
+            break;
+          }
+        }
+
+        linebuf = growbuf;
+        linelen = growbuflen;
+      } else {
+        linebuf = IObuff;
+      }
+    }
+
+    if (linelen > 0 && linebuf[linelen - 1] == '\n') {
+      linebuf[linelen - 1] = NUL;
+    }
+#ifdef USE_CRNL
+    if (linelen > 0 && linebuf[linelen - 1] == '\r') {
+      linebuf[linelen - 1] = NUL;
+    }
+#endif
+
+    remove_bom(linebuf);
 
     /* If there was no %> item start at the first pattern */
     if (fmt_start == NULL)
@@ -532,12 +722,14 @@ qf_init_ext (
 restofline:
     for (; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) {
       idx = fmt_ptr->prefix;
-      if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
+      if (qi->qf_multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL) {
         continue;
+      }
       namebuf[0] = NUL;
       pattern[0] = NUL;
-      if (!multiscan)
+      if (!qi->qf_multiscan) {
         errmsg[0] = NUL;
+      }
       lnum = 0;
       col = 0;
       use_viscol = false;
@@ -546,10 +738,10 @@ restofline:
       tail = NULL;
 
       regmatch.regprog = fmt_ptr->prog;
-      int r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
+      int r = vim_regexec(&regmatch, linebuf, (colnr_T)0);
       fmt_ptr->prog = regmatch.regprog;
       if (r) {
-        if ((idx == 'C' || idx == 'Z') && !multiline) {
+        if ((idx == 'C' || idx == 'Z') && !qi->qf_multiline) {
           continue;
         }
         if (vim_strchr((char_u *)"EWI", idx) != NULL) {
@@ -571,8 +763,9 @@ restofline:
           *regmatch.endp[i] = c;
 
           if (vim_strchr((char_u *)"OPQ", idx) != NULL
-              && !os_file_exists(namebuf))
+              && !os_path_exists(namebuf)) {
             continue;
+          }
         }
         if ((i = (int)fmt_ptr->addr[1]) > 0) {                  /* %n */
           if (regmatch.startp[i] == NULL)
@@ -594,12 +787,23 @@ restofline:
             continue;
           type = *regmatch.startp[i];
         }
-        if (fmt_ptr->flags == '+' && !multiscan)                /* %+ */
-          STRCPY(errmsg, IObuff);
-        else if ((i = (int)fmt_ptr->addr[5]) > 0) {             /* %m */
-          if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+        if (fmt_ptr->flags == '+' && !qi->qf_multiscan) {       // %+
+          if (linelen > errmsglen) {
+            // linelen + null terminator
+            errmsg = xrealloc(errmsg, linelen + 1);
+            errmsglen = linelen + 1;
+          }
+          STRLCPY(errmsg, linebuf, linelen + 1);
+        } else if ((i = (int)fmt_ptr->addr[5]) > 0) {           // %m
+          if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL) {
             continue;
-          len = (int)(regmatch.endp[i] - regmatch.startp[i]);
+          }
+          len = (size_t)(regmatch.endp[i] - regmatch.startp[i]);
+          if (len > errmsglen) {
+            // len + null terminator
+            errmsg = xrealloc(errmsg, len + 1);
+            errmsglen = len + 1;
+          }
           STRLCPY(errmsg, regmatch.startp[i], len + 1);
         }
         if ((i = (int)fmt_ptr->addr[6]) > 0) {                  /* %r */
@@ -633,9 +837,10 @@ restofline:
         if ((i = (int)fmt_ptr->addr[9]) > 0) {                  /* %s */
           if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
             continue;
-          len = (int)(regmatch.endp[i] - regmatch.startp[i]);
-          if (len > CMDBUFFSIZE - 5)
+          len = (size_t)(regmatch.endp[i] - regmatch.startp[i]);
+          if (len > CMDBUFFSIZE - 5) {
             len = CMDBUFFSIZE - 5;
+          }
           STRCPY(pattern, "^\\V");
           STRNCAT(pattern, regmatch.startp[i], len);
           pattern[len + 3] = '\\';
@@ -645,7 +850,7 @@ restofline:
         break;
       }
     }
-    multiscan = false;
+    qi->qf_multiscan = false;
 
     if (fmt_ptr == NULL || idx == 'D' || idx == 'X') {
       if (fmt_ptr != NULL) {
@@ -654,17 +859,25 @@ restofline:
             EMSG(_("E379: Missing or empty directory name"));
             goto error2;
           }
-          if ((directory = qf_push_dir(namebuf, &dir_stack)) == NULL)
+          qi->qf_directory = qf_push_dir(namebuf, &qi->qf_dir_stack, false);
+          if (qi->qf_directory == NULL) {
             goto error2;
-        } else if (idx == 'X')                          /* leave directory */
-          directory = qf_pop_dir(&dir_stack);
+          }
+        } else if (idx == 'X') {                        // leave directory
+          qi->qf_directory = qf_pop_dir(&qi->qf_dir_stack);
+        }
       }
       namebuf[0] = NUL;                 // no match found, remove file name
       lnum = 0;                         // don't jump to this line
       valid = false;
-      STRCPY(errmsg, IObuff);           // copy whole line to error message
+      if (linelen > errmsglen) {
+        // linelen + null terminator
+        errmsg = xrealloc(errmsg, linelen + 1);
+      }
+      // copy whole line to error message
+      STRLCPY(errmsg, linebuf, linelen + 1);
       if (fmt_ptr == NULL) {
-        multiline = multiignore = false;
+        qi->qf_multiline = qi->qf_multiignore = false;
       }
     } else if (fmt_ptr != NULL) {
       /* honor %> item */
@@ -672,13 +885,15 @@ restofline:
         fmt_start = fmt_ptr;
 
       if (vim_strchr((char_u *)"AEWI", idx) != NULL) {
-        multiline = true;     // start of a multi-line message
-        multiignore = false;  // reset continuation
+        qi->qf_multiline = true;     // start of a multi-line message
+        qi->qf_multiignore = false;  // reset continuation
       } else if (vim_strchr((char_u *)"CZ", idx)
-                 != NULL) { /* continuation of multi-line msg */
-        if (qfprev == NULL)
+                 != NULL) {  // continuation of multi-line msg
+        qfline_T *qfprev = qi->qf_lists[qi->qf_curlist].qf_last;
+        if (qfprev == NULL) {
           goto error2;
-        if (*errmsg && !multiignore) {
+        }
+        if (*errmsg && !qi->qf_multiignore) {
           size_t len = STRLEN(qfprev->qf_text);
           qfprev->qf_text = xrealloc(qfprev->qf_text, len + STRLEN(errmsg) + 2);
           qfprev->qf_text[len] = '\n';
@@ -693,55 +908,60 @@ restofline:
         if (!qfprev->qf_col)
           qfprev->qf_col = col;
         qfprev->qf_viscol = use_viscol;
-        if (!qfprev->qf_fnum)
-          qfprev->qf_fnum = qf_get_fnum(directory,
+        if (!qfprev->qf_fnum) {
+          qfprev->qf_fnum = qf_get_fnum(qi, qi->qf_directory,
                                         *namebuf
-                                        || directory ? namebuf : currfile
-                                        && valid ? currfile : 0);
+                                        || qi->qf_directory
+                                        ? namebuf : qi->qf_currfile
+                                        && valid ? qi->qf_currfile : 0);
+        }
         if (idx == 'Z') {
-          multiline = multiignore = false;
+          qi->qf_multiline = qi->qf_multiignore = false;
         }
         line_breakcheck();
         continue;
       } else if (vim_strchr((char_u *)"OPQ", idx) != NULL) {
         // global file names
         valid = false;
-        if (*namebuf == NUL || os_file_exists(namebuf)) {
-          if (*namebuf && idx == 'P')
-            currfile = qf_push_dir(namebuf, &file_stack);
-          else if (idx == 'Q')
-            currfile = qf_pop_dir(&file_stack);
+        if (*namebuf == NUL || os_path_exists(namebuf)) {
+          if (*namebuf && idx == 'P') {
+            qi->qf_currfile = qf_push_dir(namebuf, &qi->qf_file_stack, true);
+          } else if (idx == 'Q') {
+            qi->qf_currfile = qf_pop_dir(&qi->qf_file_stack);
+          }
           *namebuf = NUL;
           if (tail && *tail) {
             STRMOVE(IObuff, skipwhite(tail));
-            multiscan = true;
+            qi->qf_multiscan = true;
             goto restofline;
           }
         }
       }
       if (fmt_ptr->flags == '-') {  // generally exclude this line
-        if (multiline) {
-          multiignore = true;       // also exclude continuation lines
+        if (qi->qf_multiline) {
+          // also exclude continuation lines
+          qi->qf_multiignore = true;
         }
         continue;
       }
     }
 
-    if (qf_add_entry(qi, &qfprev,
-            directory,
-            (*namebuf || directory)
-            ? namebuf
-            : ((currfile && valid) ? currfile : (char_u *)NULL),
-            0,
-            errmsg,
-            lnum,
-            col,
-            use_viscol,
-            pattern,
-            enr,
-            type,
-            valid) == FAIL)
+    if (qf_add_entry(qi,
+                     qi->qf_directory,
+                     (*namebuf || qi->qf_directory)
+                     ? namebuf : ((qi->qf_currfile && valid)
+                                  ? qi->qf_currfile : (char_u *)NULL),
+                     0,
+                     errmsg,
+                     lnum,
+                     col,
+                     use_viscol,
+                     pattern,
+                     enr,
+                     type,
+                     valid) == FAIL) {
       goto error2;
+    }
     line_breakcheck();
   }
   if (fd == NULL || !ferror(fd)) {
@@ -759,31 +979,25 @@ restofline:
     }
     /* return number of matches */
     retval = qi->qf_lists[qi->qf_curlist].qf_count;
-    goto qf_init_ok;
+    goto qf_init_end;
   }
   EMSG(_(e_readerrf));
 error2:
   qf_free(qi, qi->qf_curlist);
   qi->qf_listcount--;
-  if (qi->qf_curlist > 0)
-    --qi->qf_curlist;
-qf_init_ok:
-  if (fd != NULL)
-    fclose(fd);
-  for (fmt_ptr = fmt_first; fmt_ptr != NULL; fmt_ptr = fmt_first) {
-    fmt_first = fmt_ptr->next;
-    vim_regfree(fmt_ptr->prog);
-    xfree(fmt_ptr);
+  if (qi->qf_curlist > 0) {
+    qi->qf_curlist--;
   }
-  qf_clean_dir_stack(&dir_stack);
-  qf_clean_dir_stack(&file_stack);
 qf_init_end:
+  if (fd != NULL) {
+    fclose(fd);
+  }
   xfree(namebuf);
   xfree(errmsg);
   xfree(pattern);
-  xfree(fmtstr);
+  xfree(growbuf);
 
-  qf_update_buffer(qi);
+  qf_update_buffer(qi, old_last);
 
   return retval;
 }
@@ -866,7 +1080,6 @@ void qf_free_all(win_T *wp)
 /// Add an entry to the end of the list of errors.
 ///
 /// @param  qi       quickfix list
-/// @param  prevp    nonnull pointer (to previously added entry or NULL)
 /// @param  dir      optional directory name
 /// @param  fname    file name or NULL
 /// @param  bufnum   buffer number or zero
@@ -880,17 +1093,24 @@ void qf_free_all(win_T *wp)
 /// @param  valid    valid entry
 ///
 /// @returns OK or FAIL.
-static int qf_add_entry(qf_info_T *qi, qfline_T **prevp, char_u *dir,
-                        char_u *fname, int bufnum, char_u *mesg, long lnum,
-                        int col, char_u vis_col, char_u *pattern, int nr,
-                        char_u type, char_u valid)
+static int qf_add_entry(qf_info_T *qi, char_u *dir, char_u *fname, int bufnum,
+                        char_u *mesg, long lnum, int col, char_u vis_col,
+                        char_u *pattern, int nr, char_u type, char_u valid)
 {
   qfline_T *qfp = xmalloc(sizeof(qfline_T));
+  qfline_T **lastp;  // pointer to qf_last or NULL
+
+  if (bufnum != 0) {
+    buf_T *buf = buflist_findnr(bufnum);
 
-  if (bufnum != 0)
     qfp->qf_fnum = bufnum;
-  else
-    qfp->qf_fnum = qf_get_fnum(dir, fname);
+    if (buf != NULL) {
+      buf->b_has_qf_entry |=
+        (qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
+    }
+  } else {
+    qfp->qf_fnum = qf_get_fnum(qi, dir, fname);
+  }
   qfp->qf_text = vim_strsave(mesg);
   qfp->qf_lnum = lnum;
   qfp->qf_col = col;
@@ -906,19 +1126,22 @@ static int qf_add_entry(qf_info_T *qi, qfline_T **prevp, char_u *dir,
   qfp->qf_type = type;
   qfp->qf_valid = valid;
 
+  lastp = &qi->qf_lists[qi->qf_curlist].qf_last;
   if (qi->qf_lists[qi->qf_curlist].qf_count == 0) {
     /* first element in the list */
     qi->qf_lists[qi->qf_curlist].qf_start = qfp;
-    qfp->qf_prev = qfp;         /* first element points to itself */
+    qi->qf_lists[qi->qf_curlist].qf_ptr = qfp;
+    qi->qf_lists[qi->qf_curlist].qf_index = 0;
+    qfp->qf_prev = NULL;
   } else {
-    assert(*prevp);
-    qfp->qf_prev = *prevp;
-    (*prevp)->qf_next = qfp;
-  }
-  qfp->qf_next = qfp;   /* last element points to itself */
-  qfp->qf_cleared = FALSE;
-  *prevp = qfp;
-  ++qi->qf_lists[qi->qf_curlist].qf_count;
+    assert(*lastp);
+    qfp->qf_prev = *lastp;
+    (*lastp)->qf_next = qfp;
+  }
+  qfp->qf_next = NULL;
+  qfp->qf_cleared = false;
+  *lastp = qfp;
+  qi->qf_lists[qi->qf_curlist].qf_count++;
   if (qi->qf_lists[qi->qf_curlist].qf_index == 0 && qfp->qf_valid) {
     /* first valid entry */
     qi->qf_lists[qi->qf_curlist].qf_index =
@@ -1003,6 +1226,7 @@ void copy_loclist(win_T *from, win_T *to)
     to_qfl->qf_count = 0;
     to_qfl->qf_index = 0;
     to_qfl->qf_start = NULL;
+    to_qfl->qf_last = NULL;
     to_qfl->qf_ptr = NULL;
     if (from_qfl->qf_title != NULL)
       to_qfl->qf_title = vim_strsave(from_qfl->qf_title);
@@ -1011,23 +1235,24 @@ void copy_loclist(win_T *from, win_T *to)
 
     if (from_qfl->qf_count) {
       qfline_T    *from_qfp;
-      qfline_T    *prevp = NULL;
-
-      /* copy all the location entries in this list */
-      for (i = 0, from_qfp = from_qfl->qf_start; i < from_qfl->qf_count;
-           ++i, from_qfp = from_qfp->qf_next) {
-        if (qf_add_entry(to->w_llist, &prevp,
-                NULL,
-                NULL,
-                0,
-                from_qfp->qf_text,
-                from_qfp->qf_lnum,
-                from_qfp->qf_col,
-                from_qfp->qf_viscol,
-                from_qfp->qf_pattern,
-                from_qfp->qf_nr,
-                0,
-                from_qfp->qf_valid) == FAIL) {
+      qfline_T    *prevp;
+
+      // copy all the location entries in this list
+      for (i = 0, from_qfp = from_qfl->qf_start;
+           i < from_qfl->qf_count && from_qfp != NULL;
+           i++, from_qfp = from_qfp->qf_next) {
+        if (qf_add_entry(to->w_llist,
+                         NULL,
+                         NULL,
+                         0,
+                         from_qfp->qf_text,
+                         from_qfp->qf_lnum,
+                         from_qfp->qf_col,
+                         from_qfp->qf_viscol,
+                         from_qfp->qf_pattern,
+                         from_qfp->qf_nr,
+                         0,
+                         from_qfp->qf_valid) == FAIL) {
           qf_free_all(to);
           return;
         }
@@ -1036,10 +1261,12 @@ void copy_loclist(win_T *from, win_T *to)
          * directory and file names are not supplied. So the qf_fnum
          * field is copied here.
          */
-        prevp->qf_fnum = from_qfp->qf_fnum;         /* file number */
-        prevp->qf_type = from_qfp->qf_type;         /* error type */
-        if (from_qfl->qf_ptr == from_qfp)
-          to_qfl->qf_ptr = prevp;                   /* current location */
+        prevp = to->w_llist->qf_lists[to->w_llist->qf_curlist].qf_last;
+        prevp->qf_fnum = from_qfp->qf_fnum;         // file number
+        prevp->qf_type = from_qfp->qf_type;         // error type
+        if (from_qfl->qf_ptr == from_qfp) {
+          to_qfl->qf_ptr = prevp;                   // current location
+        }
       }
     }
 
@@ -1056,52 +1283,55 @@ void copy_loclist(win_T *from, win_T *to)
   to->w_llist->qf_curlist = qi->qf_curlist;     /* current list */
 }
 
-/*
- * get buffer number for file "dir.name"
- */
-static int qf_get_fnum(char_u *directory, char_u *fname)
+// Get buffer number for file "directory.fname".
+// Also sets the b_has_qf_entry flag.
+static int qf_get_fnum(qf_info_T *qi, char_u *directory, char_u *fname)
 {
-  if (fname == NULL || *fname == NUL)           /* no file name */
+  char_u *ptr;
+  buf_T *buf;
+  if (fname == NULL || *fname == NUL) {         // no file name
     return 0;
-  {
-    char_u      *ptr;
-    int fnum;
+  }
 
 #ifdef BACKSLASH_IN_FILENAME
-    if (directory != NULL)
-      slash_adjust(directory);
-    slash_adjust(fname);
+  if (directory != NULL) {
+    slash_adjust(directory);
+  }
+  slash_adjust(fname);
 #endif
-    if (directory != NULL && !vim_isAbsName(fname)) {
-      ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, TRUE);
-      /*
-       * Here we check if the file really exists.
-       * This should normally be true, but if make works without
-       * "leaving directory"-messages we might have missed a
-       * directory change.
-       */
-      if (!os_file_exists(ptr)) {
-        xfree(ptr);
-        directory = qf_guess_filepath(fname);
-        if (directory)
-          ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, TRUE);
-        else
-          ptr = vim_strsave(fname);
-      }
-      /* Use concatenated directory name and file name */
-      fnum = buflist_add(ptr, 0);
+  if (directory != NULL && !vim_isAbsName(fname)) {
+    ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, true);
+    // Here we check if the file really exists.
+    // This should normally be true, but if make works without
+    // "leaving directory"-messages we might have missed a
+    // directory change.
+    if (!os_path_exists(ptr)) {
       xfree(ptr);
-      return fnum;
+      directory = qf_guess_filepath(qi, fname);
+      if (directory) {
+        ptr = (char_u *)concat_fnames((char *)directory, (char *)fname, true);
+      } else {
+        ptr = vim_strsave(fname);
+      }
     }
-    return buflist_add(fname, 0);
+    // Use concatenated directory name and file name
+    buf = buflist_new(ptr, NULL, (linenr_T)0, 0);
+    xfree(ptr);
+  } else {
+    buf = buflist_new(fname, NULL, (linenr_T)0, 0);
   }
+  if (buf == NULL) {
+    return 0;
+  }
+  buf->b_has_qf_entry =
+    (qi == &ql_info) ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
+  return buf->b_fnum;
 }
 
-/*
- * push dirbuf onto the directory stack and return pointer to actual dir or
- * NULL on error
- */
-static char_u *qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr)
+// Push dirbuf onto the directory stack and return pointer to actual dir or
+// NULL on error.
+static char_u *qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr,
+                           bool is_file_stack)
 {
   struct dir_stack_T  *ds_ptr;
 
@@ -1114,7 +1344,7 @@ static char_u *qf_push_dir(char_u *dirbuf, struct dir_stack_T **stackptr)
   /* store directory on the stack */
   if (vim_isAbsName(dirbuf)
       || (*stackptr)->next == NULL
-      || (*stackptr && dir_stack != *stackptr))
+      || (*stackptr && is_file_stack))
     (*stackptr)->dirname = vim_strsave(dirbuf);
   else {
     /* Okay we don't have an absolute path.
@@ -1216,40 +1446,67 @@ static void qf_clean_dir_stack(struct dir_stack_T **stackptr)
  * Then qf_push_dir thinks we are in ./aa/bb, but we are in ./bb.
  * qf_guess_filepath will return NULL.
  */
-static char_u *qf_guess_filepath(char_u *filename)
+static char_u *qf_guess_filepath(qf_info_T *qi, char_u *filename)
 {
   struct dir_stack_T     *ds_ptr;
   struct dir_stack_T     *ds_tmp;
   char_u                 *fullname;
 
-  /* no dirs on the stack - there's nothing we can do */
-  if (dir_stack == NULL)
+  // no dirs on the stack - there's nothing we can do
+  if (qi->qf_dir_stack == NULL) {
     return NULL;
+  }
 
-  ds_ptr = dir_stack->next;
+  ds_ptr = qi->qf_dir_stack->next;
   fullname = NULL;
   while (ds_ptr) {
     xfree(fullname);
     fullname = (char_u *)concat_fnames((char *)ds_ptr->dirname, (char *)filename, TRUE);
 
-    if (os_file_exists(fullname))
+    if (os_path_exists(fullname)) {
       break;
+    }
 
     ds_ptr = ds_ptr->next;
   }
 
   xfree(fullname);
 
-  /* clean up all dirs we already left */
-  while (dir_stack->next != ds_ptr) {
-    ds_tmp = dir_stack->next;
-    dir_stack->next = dir_stack->next->next;
+  // clean up all dirs we already left
+  while (qi->qf_dir_stack->next != ds_ptr) {
+    ds_tmp = qi->qf_dir_stack->next;
+    qi->qf_dir_stack->next = qi->qf_dir_stack->next->next;
     xfree(ds_tmp->dirname);
     xfree(ds_tmp);
   }
 
-  return ds_ptr==NULL ? NULL : ds_ptr->dirname;
+  return ds_ptr == NULL ? NULL : ds_ptr->dirname;
+}
+
+/// When loading a file from the quickfix, the auto commands may modify it.
+/// This may invalidate the current quickfix entry.  This function checks
+/// whether a entry is still present in the quickfix.
+/// Similar to location list.
+static bool is_qf_entry_present(qf_info_T *qi, qfline_T *qf_ptr)
+{
+  qf_list_T *qfl;
+  qfline_T *qfp;
+  int i;
+
+  qfl = &qi->qf_lists[qi->qf_curlist];
 
+  // Search for the entry in the current list
+  for (i = 0, qfp = qfl->qf_start; i < qfl->qf_count; i++, qfp = qfp->qf_next) {
+    if (qfp == NULL || qfp == qf_ptr) {
+      break;
+    }
+  }
+
+  if (i == qfl->qf_count) {  // Entry is not found
+    return false;
+  }
+
+  return true;
 }
 
 /*
@@ -1576,14 +1833,38 @@ win_found:
        * set b_p_ro flag). */
       if (!can_abandon(curbuf, forceit)) {
         EMSG(_(e_nowrtmsg));
-        ok = FALSE;
-      } else
+        ok = false;
+      } else {
         ok = do_ecmd(qf_ptr->qf_fnum, NULL, NULL, NULL, (linenr_T)1,
-            ECMD_HIDE + ECMD_SET_HELP,
-            oldwin == curwin ? curwin : NULL);
-    } else
-      ok = buflist_getfile(qf_ptr->qf_fnum,
-          (linenr_T)1, GETF_SETMARK | GETF_SWITCH, forceit);
+                     ECMD_HIDE + ECMD_SET_HELP,
+                     oldwin == curwin ? curwin : NULL);
+      }
+    } else {
+      int old_qf_curlist = qi->qf_curlist;
+      bool is_abort = false;
+
+      ok = buflist_getfile(qf_ptr->qf_fnum, (linenr_T)1,
+                           GETF_SETMARK | GETF_SWITCH, forceit);
+      if (qi != &ql_info && !win_valid(oldwin)) {
+        EMSG(_("E924: Current window was closed"));
+        is_abort = true;
+        opened_window = false;
+      } else if (old_qf_curlist != qi->qf_curlist
+                 || !is_qf_entry_present(qi, qf_ptr)) {
+        if (qi == &ql_info) {
+          EMSG(_("E925: Current quickfix was changed"));
+        } else {
+          EMSG(_("E926: Current location list was changed"));
+        }
+        is_abort = true;
+      }
+
+      if (is_abort) {
+        ok = false;
+        qi = NULL;
+        qf_ptr = NULL;
+      }
+    }
   }
 
   if (ok == OK) {
@@ -1663,21 +1944,22 @@ win_found:
       msg_scroll = (int)i;
     }
   } else {
-    if (opened_window)
-      win_close(curwin, TRUE);          /* Close opened window */
-    if (qf_ptr->qf_fnum != 0) {
-      /*
-       * Couldn't open file, so put index back where it was.  This could
-       * happen if the file was readonly and we changed something.
-       */
+    if (opened_window) {
+      win_close(curwin, true);          // Close opened window
+    }
+    if (qf_ptr != NULL && qf_ptr->qf_fnum != 0) {
+       // Couldn't open file, so put index back where it was.  This could
+       // happen if the file was readonly and we changed something.
 failed:
       qf_ptr = old_qf_ptr;
       qf_index = old_qf_index;
     }
   }
 theend:
-  qi->qf_lists[qi->qf_curlist].qf_ptr = qf_ptr;
-  qi->qf_lists[qi->qf_curlist].qf_index = qf_index;
+  if (qi != NULL) {
+    qi->qf_lists[qi->qf_curlist].qf_ptr = qf_ptr;
+    qi->qf_lists[qi->qf_curlist].qf_index = qf_index;
+  }
   if (p_swb != old_swb && opened_window) {
     /* Restore old 'switchbuf' value, but not when an autocommand or
      * modeline has changed the value. */
@@ -1719,15 +2001,29 @@ void qf_list(exarg_T *eap)
     EMSG(_(e_quickfix));
     return;
   }
+
+  bool plus = false;
+  if (*arg == '+') {
+    arg++;
+    plus = true;
+  }
   if (!get_list_range(&arg, &idx1, &idx2) || *arg != NUL) {
     EMSG(_(e_trailing));
     return;
   }
-  i = qi->qf_lists[qi->qf_curlist].qf_count;
-  if (idx1 < 0)
-    idx1 = (-idx1 > i) ? 0 : idx1 + i + 1;
-  if (idx2 < 0)
-    idx2 = (-idx2 > i) ? 0 : idx2 + i + 1;
+  if (plus) {
+    i = qi->qf_lists[qi->qf_curlist].qf_index;
+    idx2 = i + idx1;
+    idx1 = i;
+  } else {
+    i = qi->qf_lists[qi->qf_curlist].qf_count;
+    if (idx1 < 0) {
+      idx1 = (-idx1 > i) ? 0 : idx1 + i + 1;
+    }
+    if (idx2 < 0) {
+      idx2 = (-idx2 > i) ? 0 : idx2 + i + 1;
+    }
+  }
 
   if (qi->qf_lists[qi->qf_curlist].qf_nonevalid)
     all = TRUE;
@@ -1751,16 +2047,18 @@ void qf_list(exarg_T *eap)
         vim_snprintf((char *)IObuff, IOSIZE, "%2d %s",
             i, (char *)fname);
       msg_outtrans_attr(IObuff, i == qi->qf_lists[qi->qf_curlist].qf_index
-          ? hl_attr(HLF_L) : hl_attr(HLF_D));
-      if (qfp->qf_lnum == 0)
+                        ? hl_attr(HLF_QFL) : hl_attr(HLF_D));
+      if (qfp->qf_lnum == 0) {
         IObuff[0] = NUL;
-      else if (qfp->qf_col == 0)
-        sprintf((char *)IObuff, ":%" PRId64, (int64_t)qfp->qf_lnum);
-      else
-        sprintf((char *)IObuff, ":%" PRId64 " col %d",
-                (int64_t)qfp->qf_lnum, qfp->qf_col);
-      sprintf((char *)IObuff + STRLEN(IObuff), "%s:",
-          (char *)qf_types(qfp->qf_type, qfp->qf_nr));
+      } else if (qfp->qf_col == 0) {
+        vim_snprintf((char *)IObuff, IOSIZE, ":%" PRId64,
+                     (int64_t)qfp->qf_lnum);
+      } else {
+        vim_snprintf((char *)IObuff, IOSIZE, ":%" PRId64 " col %d",
+                     (int64_t)qfp->qf_lnum, qfp->qf_col);
+      }
+      vim_snprintf((char *)IObuff + STRLEN(IObuff), IOSIZE, "%s:",
+                   (char *)qf_types(qfp->qf_type, qfp->qf_nr));
       msg_puts_attr(IObuff, hl_attr(HLF_N));
       if (qfp->qf_pattern != NULL) {
         qf_fmt_text(qfp->qf_pattern, IObuff, IOSIZE);
@@ -1780,7 +2078,10 @@ void qf_list(exarg_T *eap)
     }
 
     qfp = qfp->qf_next;
-    ++i;
+    if (qfp == NULL) {
+      break;
+    }
+    i++;
     os_breakcheck();
   }
 }
@@ -1806,6 +2107,31 @@ static void qf_fmt_text(char_u *text, char_u *buf, int bufsize)
   buf[i] = NUL;
 }
 
+static void qf_msg(qf_info_T *qi, int which, char *lead)
+{
+  char *title = (char *)qi->qf_lists[which].qf_title;
+  int count = qi->qf_lists[which].qf_count;
+  char_u buf[IOSIZE];
+
+  vim_snprintf((char *)buf, IOSIZE, _("%serror list %d of %d; %d errors "),
+               lead,
+               which + 1,
+               qi->qf_listcount,
+               count);
+
+  if (title != NULL) {
+    size_t len = STRLEN(buf);
+
+    if (len < 34) {
+       memset(buf + len, ' ', 34 - len);
+       buf[34] = NUL;
+    }
+    xstrlcat((char *)buf, title, IOSIZE);
+  }
+  trunc_string(buf, buf, (int)Columns - 1, IOSIZE);
+  msg(buf);
+}
+
 /*
  * ":colder [count]": Up in the quickfix stack.
  * ":cnewer [count]": Down in the quickfix stack.
@@ -1846,15 +2172,26 @@ void qf_age(exarg_T *eap)
       ++qi->qf_curlist;
     }
   }
-  qf_msg(qi);
+  qf_msg(qi, qi->qf_curlist, "");
+  qf_update_buffer(qi, NULL);
 }
 
-static void qf_msg(qf_info_T *qi)
+void qf_history(exarg_T *eap)
 {
-  smsg(_("error list %d of %d; %d errors"),
-      qi->qf_curlist + 1, qi->qf_listcount,
-      qi->qf_lists[qi->qf_curlist].qf_count);
-  qf_update_buffer(qi);
+  qf_info_T *qi = &ql_info;
+  int i;
+
+  if (eap->cmdidx == CMD_lhistory) {
+    qi = GET_LOC_LIST(curwin);
+  }
+  if (qi == NULL || (qi->qf_listcount == 0
+                     && qi->qf_lists[qi->qf_curlist].qf_count == 0)) {
+    MSG(_("No entries"));
+  } else {
+    for (i = 0; i < qi->qf_listcount; i++) {
+      qf_msg(qi, i, i == qi->qf_curlist ? "> " : "  ");
+    }
+  }
 }
 
 /*
@@ -1863,29 +2200,35 @@ static void qf_msg(qf_info_T *qi)
 static void qf_free(qf_info_T *qi, int idx)
 {
   qfline_T    *qfp;
-  int stop = FALSE;
+  qfline_T    *qfpnext;
+  bool stop = false;
 
-  while (qi->qf_lists[idx].qf_count) {
-    qfp = qi->qf_lists[idx].qf_start->qf_next;
+  while (qi->qf_lists[idx].qf_count && qi->qf_lists[idx].qf_start != NULL) {
+    qfp = qi->qf_lists[idx].qf_start;
+    qfpnext = qfp->qf_next;
     if (qi->qf_lists[idx].qf_title != NULL && !stop) {
-      xfree(qi->qf_lists[idx].qf_start->qf_text);
-      stop = (qi->qf_lists[idx].qf_start == qfp);
-      xfree(qi->qf_lists[idx].qf_start->qf_pattern);
-      xfree(qi->qf_lists[idx].qf_start);
-      if (stop)
-        /* Somehow qf_count may have an incorrect value, set it to 1
-         * to avoid crashing when it's wrong.
-         * TODO: Avoid qf_count being incorrect. */
+      xfree(qfp->qf_text);
+      stop = (qfp == qfpnext);
+      xfree(qfp->qf_pattern);
+      xfree(qfp);
+      if (stop) {
+        // Somehow qf_count may have an incorrect value, set it to 1
+        // to avoid crashing when it's wrong.
+        // TODO(vim): Avoid qf_count being incorrect.
         qi->qf_lists[idx].qf_count = 1;
+      }
     }
-    qi->qf_lists[idx].qf_start = qfp;
-    --qi->qf_lists[idx].qf_count;
+    qi->qf_lists[idx].qf_start = qfpnext;
+    qi->qf_lists[idx].qf_count--;
   }
   xfree(qi->qf_lists[idx].qf_title);
   qi->qf_lists[idx].qf_start = NULL;
   qi->qf_lists[idx].qf_ptr = NULL;
   qi->qf_lists[idx].qf_title = NULL;
   qi->qf_lists[idx].qf_index = 0;
+
+  qf_clean_dir_stack(&qi->qf_dir_stack);
+  qf_clean_dir_stack(&qi->qf_file_stack);
 }
 
 /*
@@ -1897,7 +2240,12 @@ void qf_mark_adjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long
   qfline_T    *qfp;
   int idx;
   qf_info_T   *qi = &ql_info;
+  bool found_one = false;
+  int buf_has_flag = wp == NULL ? BUF_HAS_QF_ENTRY : BUF_HAS_LL_ENTRY;
 
+  if (!(curbuf->b_has_qf_entry & buf_has_flag)) {
+    return;
+  }
   if (wp != NULL) {
     if (wp->w_llist == NULL)
       return;
@@ -1907,8 +2255,10 @@ void qf_mark_adjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long
   for (idx = 0; idx < qi->qf_listcount; ++idx)
     if (qi->qf_lists[idx].qf_count)
       for (i = 0, qfp = qi->qf_lists[idx].qf_start;
-           i < qi->qf_lists[idx].qf_count; ++i, qfp = qfp->qf_next)
+           i < qi->qf_lists[idx].qf_count && qfp != NULL;
+           i++, qfp = qfp->qf_next) {
         if (qfp->qf_fnum == curbuf->b_fnum) {
+          found_one = true;
           if (qfp->qf_lnum >= line1 && qfp->qf_lnum <= line2) {
             if (amount == MAXLNUM)
               qfp->qf_cleared = TRUE;
@@ -1917,6 +2267,11 @@ void qf_mark_adjust(win_T *wp, linenr_T line1, linenr_T line2, long amount, long
           } else if (amount_after && qfp->qf_lnum > line2)
             qfp->qf_lnum += amount_after;
         }
+      }
+
+  if (!found_one) {
+    curbuf->b_has_qf_entry &= ~buf_has_flag;
+  }
 }
 
 /*
@@ -2122,7 +2477,7 @@ void ex_copen(exarg_T *eap)
   qf_set_title_var(qi);
 
   // Fill the buffer with the quickfix list.
-  qf_fill_buffer(qi);
+  qf_fill_buffer(qi, curbuf, NULL);
 
   curwin->w_cursor.lnum = qi->qf_lists[qi->qf_curlist].qf_index;
   curwin->w_cursor.col = 0;
@@ -2130,6 +2485,44 @@ void ex_copen(exarg_T *eap)
   update_topline();             /* scroll to show the line */
 }
 
+// Move the cursor in the quickfix window to "lnum".
+static void qf_win_goto(win_T *win, linenr_T lnum)
+{
+  win_T *old_curwin = curwin;
+
+  curwin = win;
+  curbuf = win->w_buffer;
+  curwin->w_cursor.lnum = lnum;
+  curwin->w_cursor.col = 0;
+  curwin->w_cursor.coladd = 0;
+  curwin->w_curswant = 0;
+  update_topline();              // scroll to show the line
+  redraw_later(VALID);
+  curwin->w_redr_status = true;  // update ruler
+  curwin = old_curwin;
+  curbuf = curwin->w_buffer;
+}
+
+// :cbottom/:lbottom command.
+void ex_cbottom(exarg_T *eap)
+{
+  qf_info_T *qi = &ql_info;
+
+  if (eap->cmdidx == CMD_lbottom) {
+    qi = GET_LOC_LIST(curwin);
+    if (qi == NULL) {
+      EMSG(_(e_loclist));
+      return;
+    }
+  }
+
+  win_T *win = qf_find_win(qi);
+
+  if (win != NULL && win->w_cursor.lnum != win->w_buffer->b_ml.ml_line_count) {
+    qf_win_goto(win, win->w_buffer->b_ml.ml_line_count);
+  }
+}
+
 /*
  * Return the number of the current entry (line number in the quickfix
  * window).
@@ -2166,24 +2559,14 @@ qf_win_pos_update (
   if (win != NULL
       && qf_index <= win->w_buffer->b_ml.ml_line_count
       && old_qf_index != qf_index) {
-    win_T   *old_curwin = curwin;
-
-    curwin = win;
-    curbuf = win->w_buffer;
     if (qf_index > old_qf_index) {
-      curwin->w_redraw_top = old_qf_index;
-      curwin->w_redraw_bot = qf_index;
+      win->w_redraw_top = old_qf_index;
+      win->w_redraw_bot = qf_index;
     } else {
-      curwin->w_redraw_top = qf_index;
-      curwin->w_redraw_bot = old_qf_index;
+      win->w_redraw_top = qf_index;
+      win->w_redraw_bot = old_qf_index;
     }
-    curwin->w_cursor.lnum = qf_index;
-    curwin->w_cursor.col = 0;
-    update_topline();                   /* scroll to show the line */
-    redraw_later(VALID);
-    curwin->w_redr_status = TRUE;       /* update ruler */
-    curwin = old_curwin;
-    curbuf = curwin->w_buffer;
+    qf_win_goto(win, qf_index);
   }
   return win != NULL;
 }
@@ -2241,7 +2624,7 @@ static buf_T *qf_find_buf(qf_info_T *qi)
 /*
  * Find the quickfix buffer.  If it exists, update the contents.
  */
-static void qf_update_buffer(qf_info_T *qi)
+static void qf_update_buffer(qf_info_T *qi, qfline_T *old_last)
 {
   buf_T       *buf;
   win_T       *win;
@@ -2251,8 +2634,12 @@ static void qf_update_buffer(qf_info_T *qi)
   /* Check if a buffer for the quickfix list exists.  Update it. */
   buf = qf_find_buf(qi);
   if (buf != NULL) {
-    /* set curwin/curbuf to buf and save a few things */
-    aucmd_prepbuf(&aco, buf);
+    linenr_T old_line_count = buf->b_ml.ml_line_count;
+
+    if (old_last == NULL) {
+      // set curwin/curbuf to buf and save a few things
+      aucmd_prepbuf(&aco, buf);
+    }
 
     if ((win = qf_find_win(qi)) != NULL) {
       curwin_save = curwin;
@@ -2260,12 +2647,21 @@ static void qf_update_buffer(qf_info_T *qi)
       qf_set_title_var(qi);
       curwin = curwin_save;
     }
-    qf_fill_buffer(qi);
 
-    /* restore curwin/curbuf and a few other things */
-    aucmd_restbuf(&aco);
+    qf_fill_buffer(qi, buf, old_last);
+
+    if (old_last == NULL) {
+      (void)qf_win_pos_update(qi, 0);
+
+      // restore curwin/curbuf and a few other things
+      aucmd_restbuf(&aco);
+    }
 
-    (void)qf_win_pos_update(qi, 0);
+    // Only redraw when added lines are visible.  This avoids flickering when
+    // the added lines are not visible.
+    if ((win = qf_find_win(qi)) != NULL && old_line_count < win->w_botline) {
+      redraw_buf_later(buf, NOT_VALID);
+    }
   }
 }
 
@@ -2278,11 +2674,12 @@ static void qf_set_title_var(qf_info_T *qi)
   }
 }
 
-/*
- * Fill current buffer with quickfix errors, replacing any previous contents.
- * curbuf must be the quickfix buffer!
- */
-static void qf_fill_buffer(qf_info_T *qi)
+// Fill current buffer with quickfix errors, replacing any previous contents.
+// curbuf must be the quickfix buffer!
+// If "old_last" is not NULL append the items after this one.
+// When "old_last" is NULL then "buf" must equal "curbuf"!  Because ml_delete()
+// is used and autocommands will be triggered.
+static void qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last)
 {
   linenr_T lnum;
   qfline_T    *qfp;
@@ -2290,15 +2687,29 @@ static void qf_fill_buffer(qf_info_T *qi)
   int len;
   int old_KeyTyped = KeyTyped;
 
-  /* delete all existing lines */
-  while ((curbuf->b_ml.ml_flags & ML_EMPTY) == 0)
-    (void)ml_delete((linenr_T)1, FALSE);
+  if (old_last == NULL) {
+    if (buf != curbuf) {
+      EMSG2(_(e_intern2), "qf_fill_buffer()");
+      return;
+    }
+
+    // delete all existing lines
+    while ((curbuf->b_ml.ml_flags & ML_EMPTY) == 0) {
+      (void)ml_delete((linenr_T)1, false);
+    }
+  }
 
   /* Check if there is anything to display */
   if (qi->qf_curlist < qi->qf_listcount) {
-    /* Add one line for each error */
-    qfp = qi->qf_lists[qi->qf_curlist].qf_start;
-    for (lnum = 0; lnum < qi->qf_lists[qi->qf_curlist].qf_count; ++lnum) {
+    // Add one line for each error
+    if (old_last == NULL) {
+      qfp = qi->qf_lists[qi->qf_curlist].qf_start;
+      lnum = 0;
+    } else {
+      qfp = old_last->qf_next;
+      lnum = buf->b_ml.ml_line_count;
+    }
+    while (lnum < qi->qf_lists[qi->qf_curlist].qf_count) {
       if (qfp->qf_fnum != 0
           && (errbuf = buflist_findnr(qfp->qf_fnum)) != NULL
           && errbuf->b_fname != NULL) {
@@ -2338,33 +2749,42 @@ static void qf_fill_buffer(qf_info_T *qi)
       qf_fmt_text(len > 3 ? skipwhite(qfp->qf_text) : qfp->qf_text,
           IObuff + len, IOSIZE - len);
 
-      if (ml_append(lnum, IObuff, (colnr_T)STRLEN(IObuff) + 1, FALSE)
-          == FAIL)
+      if (ml_append_buf(buf, lnum, IObuff, (colnr_T)STRLEN(IObuff) + 1, false)
+          == FAIL) {
         break;
+      }
+      lnum++;
       qfp = qfp->qf_next;
+      if (qfp == NULL) {
+        break;
+      }
+    }
+    if (old_last == NULL) {
+      // Delete the empty line which is now at the end
+      (void)ml_delete(lnum + 1, false);
     }
-    /* Delete the empty line which is now at the end */
-    (void)ml_delete(lnum + 1, FALSE);
   }
 
   /* correct cursor position */
   check_lnums(TRUE);
 
-  /* Set the 'filetype' to "qf" each time after filling the buffer.  This
-   * resembles reading a file into a buffer, it's more logical when using
-   * autocommands. */
-  set_option_value((char_u *)"ft", 0L, (char_u *)"qf", OPT_LOCAL);
-  curbuf->b_p_ma = FALSE;
-
-  keep_filetype = TRUE;                 /* don't detect 'filetype' */
-  apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
-      FALSE, curbuf);
-  apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
-      FALSE, curbuf);
-  keep_filetype = FALSE;
-
-  /* make sure it will be redrawn */
-  redraw_curbuf_later(NOT_VALID);
+  if (old_last == NULL) {
+    // Set the 'filetype' to "qf" each time after filling the buffer.  This
+    // resembles reading a file into a buffer, it's more logical when using
+    // autocommands.
+    set_option_value((char_u *)"ft", 0L, (char_u *)"qf", OPT_LOCAL);
+    curbuf->b_p_ma = false;
+
+    keep_filetype = true;                 // don't detect 'filetype'
+    apply_autocmds(EVENT_BUFREADPOST, (char_u *)"quickfix", NULL,
+                   false, curbuf);
+    apply_autocmds(EVENT_BUFWINENTER, (char_u *)"quickfix", NULL,
+                   false, curbuf);
+    keep_filetype = false;
+
+    // make sure it will be redrawn
+    redraw_curbuf_later(NOT_VALID);
+  }
 
   /* Restore KeyTyped, setting 'filetype' may reset it. */
   KeyTyped = old_KeyTyped;
@@ -2890,7 +3310,6 @@ void ex_vimgrep(exarg_T *eap)
   int fi;
   qf_info_T   *qi = &ql_info;
   qfline_T    *cur_qf_start;
-  qfline_T    *prevp = NULL;
   long lnum;
   buf_T       *buf;
   int duplicate_name = FALSE;
@@ -2942,6 +3361,7 @@ void ex_vimgrep(exarg_T *eap)
 
   /* Get the search pattern: either white-separated or enclosed in // */
   regmatch.regprog = NULL;
+  char_u *title = vim_strsave(*eap->cmdlinep);
   p = skip_vimgrep_pat(eap->arg, &s, &flags);
   if (p == NULL) {
     EMSG(_(e_invalpat));
@@ -2973,13 +3393,7 @@ void ex_vimgrep(exarg_T *eap)
        && eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
       || qi->qf_curlist == qi->qf_listcount) {
     // make place for a new list
-    qf_new_list(qi, *eap->cmdlinep);
-  } else if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
-    // Adding to existing list, find last entry.
-    for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
-         prevp->qf_next != prevp;
-         prevp = prevp->qf_next) {
-    }
+    qf_new_list(qi, title != NULL ? title : *eap->cmdlinep);
   }
 
   /* parse the list of arguments */
@@ -3075,23 +3489,25 @@ void ex_vimgrep(exarg_T *eap)
            ++lnum) {
         col = 0;
         while (vim_regexec_multi(&regmatch, curwin, buf, lnum,
-                   col, NULL) > 0) {
-          ;
-          if (qf_add_entry(qi, &prevp,
-                  NULL,                     /* dir */
-                  fname,
-                  0,
-                  ml_get_buf(buf,
-                      regmatch.startpos[0].lnum + lnum, FALSE),
-                  regmatch.startpos[0].lnum + lnum,
-                  regmatch.startpos[0].col + 1,
-                  FALSE,                    /* vis_col */
-                  NULL,                     /* search pattern */
-                  0,                        /* nr */
-                  0,                        /* type */
-                  TRUE                      /* valid */
-                  ) == FAIL) {
-            got_int = TRUE;
+                                 col, NULL) > 0) {
+          // Pass the buffer number so that it gets used even for a
+          // dummy buffer, unless duplicate_name is set, then the
+          // buffer will be wiped out below.
+          if (qf_add_entry(qi,
+                           NULL,            // dir
+                           fname,
+                           duplicate_name ? 0 : buf->b_fnum,
+                           ml_get_buf(buf,
+                                      regmatch.startpos[0].lnum + lnum, false),
+                           regmatch.startpos[0].lnum + lnum,
+                           regmatch.startpos[0].col + 1,
+                           false,           // vis_col
+                           NULL,            // search pattern
+                           0,               // nr
+                           0,               // type
+                           true)            // valid
+              == FAIL) {
+            got_int = true;
             break;
           }
           found_match = TRUE;
@@ -3134,17 +3550,23 @@ void ex_vimgrep(exarg_T *eap)
             buf = NULL;
           } else if (buf != first_match_buf || (flags & VGR_NOJUMP)) {
             unload_dummy_buffer(buf, dirname_start);
+            // Keeping the buffer, remove the dummy flag.
+            buf->b_flags &= ~BF_DUMMY;
             buf = NULL;
           }
         }
 
         if (buf != NULL) {
-          /* If the buffer is still loaded we need to use the
-           * directory we jumped to below. */
+          // Keeping the buffer, remove the dummy flag.
+          buf->b_flags &= ~BF_DUMMY;
+
+          // If the buffer is still loaded we need to use the
+          // directory we jumped to below.
           if (buf == first_match_buf
               && target_dir == NULL
-              && STRCMP(dirname_start, dirname_now) != 0)
+              && STRCMP(dirname_start, dirname_now) != 0) {
             target_dir = vim_strsave(dirname_now);
+          }
 
           /* The buffer is still loaded, the Filetype autocommands
            * need to be done now, in that buffer.  And the modelines
@@ -3166,7 +3588,7 @@ void ex_vimgrep(exarg_T *eap)
   qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start;
   qi->qf_lists[qi->qf_curlist].qf_index = 1;
 
-  qf_update_buffer(qi);
+  qf_update_buffer(qi, NULL);
 
   if (au_name != NULL)
     apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
@@ -3201,6 +3623,7 @@ void ex_vimgrep(exarg_T *eap)
   }
 
 theend:
+  xfree(title);
   xfree(dirname_now);
   xfree(dirname_start);
   xfree(target_dir);
@@ -3298,10 +3721,11 @@ load_dummy_buffer (
   int failed = TRUE;
   aco_save_T aco;
 
-  /* Allocate a buffer without putting it in the buffer list. */
+  // Allocate a buffer without putting it in the buffer list.
   newbuf = buflist_new(NULL, NULL, (linenr_T)1, BLN_DUMMY);
-  if (newbuf == NULL)
+  if (newbuf == NULL) {
     return NULL;
+  }
 
   /* Init the options. */
   buf_copy_options(newbuf, BCO_ENTER | BCO_NOHELP);
@@ -3448,19 +3872,21 @@ int get_errorlist(win_T *wp, list_T *list)
       return FAIL;
 
     qfp = qfp->qf_next;
+    if (qfp == NULL) {
+      break;
+    }
   }
   return OK;
 }
 
-/*
- * Populate the quickfix list with the items supplied in the list
- * of dictionaries. "title" will be copied to w:quickfix_title
- */
+// Populate the quickfix list with the items supplied in the list
+// of dictionaries. "title" will be copied to w:quickfix_title
+// "action" is 'a' for add, 'r' for replace.  Otherwise create a new list.
 int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
 {
   listitem_T *li;
   dict_T *d;
-  qfline_T *prevp = NULL;
+  qfline_T *old_last = NULL;
   int retval = OK;
   qf_info_T *qi = &ql_info;
   bool did_bufnr_emsg = false;
@@ -3469,15 +3895,13 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
     qi = ll_get_or_alloc_list(wp);
   }
 
-  if (action == ' ' || qi->qf_curlist == qi->qf_listcount)
-    /* make place for a new list */
+  if (action == ' ' || qi->qf_curlist == qi->qf_listcount) {
+    // make place for a new list
     qf_new_list(qi, title);
-  else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0)
-    /* Adding to existing list, find last entry. */
-    for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
-         prevp->qf_next != prevp; prevp = prevp->qf_next)
-      ;
-  else if (action == 'r') {
+  } else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0) {
+    // Adding to existing list, use last entry.
+    old_last = qi->qf_lists[qi->qf_curlist].qf_last;
+  } else if (action == 'r') {
     qf_free(qi, qi->qf_curlist);
     qf_store_title(qi, title);
   }
@@ -3490,15 +3914,15 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
     if (d == NULL)
       continue;
 
-    char_u *filename = get_dict_string(d, (char_u *)"filename", true);
-    int bufnum = (int)get_dict_number(d, (char_u *)"bufnr");
-    long lnum = get_dict_number(d, (char_u *)"lnum");
-    int col = (int)get_dict_number(d, (char_u *)"col");
-    char_u vcol = (char_u)get_dict_number(d, (char_u *)"vcol");
-    int nr = (int)get_dict_number(d, (char_u *)"nr");
-    char_u *type = get_dict_string(d, (char_u *)"type", true);
-    char_u *pattern = get_dict_string(d, (char_u *)"pattern", true);
-    char_u *text = get_dict_string(d, (char_u *)"text", true);
+    char_u *filename = get_dict_string(d, "filename", true);
+    int bufnum = (int)get_dict_number(d, "bufnr");
+    long lnum = get_dict_number(d, "lnum");
+    int col = (int)get_dict_number(d, "col");
+    char_u vcol = (char_u)get_dict_number(d, "vcol");
+    int nr = (int)get_dict_number(d, "nr");
+    char_u *type = get_dict_string(d, "type", true);
+    char_u *pattern = get_dict_string(d, "pattern", true);
+    char_u *text = get_dict_string(d, "text", true);
     if (text == NULL) {
       text = vim_strsave((char_u *)"");
     }
@@ -3519,7 +3943,6 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
     }
 
     int status = qf_add_entry(qi,
-                              &prevp,
                               NULL,      // dir
                               filename,
                               bufnum,
@@ -3543,15 +3966,21 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title)
     }
   }
 
-  if (qi->qf_lists[qi->qf_curlist].qf_index == 0)
-    /* no valid entry */
-    qi->qf_lists[qi->qf_curlist].qf_nonevalid = TRUE;
-  else
-    qi->qf_lists[qi->qf_curlist].qf_nonevalid = FALSE;
-  qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start;
-  qi->qf_lists[qi->qf_curlist].qf_index = 1;
+  if (qi->qf_lists[qi->qf_curlist].qf_index == 0) {
+    // no valid entry
+    qi->qf_lists[qi->qf_curlist].qf_nonevalid = true;
+  } else {
+    qi->qf_lists[qi->qf_curlist].qf_nonevalid = false;
+  }
+  if (action != 'a') {
+    qi->qf_lists[qi->qf_curlist].qf_ptr = qi->qf_lists[qi->qf_curlist].qf_start;
+    if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
+      qi->qf_lists[qi->qf_curlist].qf_index = 1;
+    }
+  }
 
-  qf_update_buffer(qi);
+  // Don't update the cursor in quickfix window when appending entries
+  qf_update_buffer(qi, old_last);
 
   return retval;
 }
@@ -3656,7 +4085,6 @@ void ex_helpgrep(exarg_T *eap)
   char_u      **fnames;
   FILE        *fd;
   int fi;
-  qfline_T    *prevp = NULL;
   long lnum;
   char_u      *lang;
   qf_info_T   *qi = &ql_info;
@@ -3759,23 +4187,24 @@ void ex_helpgrep(exarg_T *eap)
                 while (l > 0 && line[l - 1] <= ' ')
                   line[--l] = NUL;
 
-                if (qf_add_entry(qi, &prevp,
-                        NULL,                           /* dir */
-                        fnames[fi],
-                        0,
-                        line,
-                        lnum,
-                        (int)(regmatch.startp[0] - line)
-                        + 1,                                         /* col */
-                        FALSE,                          /* vis_col */
-                        NULL,                           /* search pattern */
-                        0,                              /* nr */
-                        1,                              /* type */
-                        TRUE                            /* valid */
-                        ) == FAIL) {
-                  got_int = TRUE;
-                  if (line != IObuff)
+                if (qf_add_entry(qi,
+                                 NULL,                  // dir
+                                 fnames[fi],
+                                 0,
+                                 line,
+                                 lnum,
+                                 (int)(regmatch.startp[0] - line)
+                                 + 1,                   // col
+                                 false,                 // vis_col
+                                 NULL,                  // search pattern
+                                 0,                     // nr
+                                 1,                     // type
+                                 true)                  // valid
+                    == FAIL) {
+                  got_int = true;
+                  if (line != IObuff) {
                     xfree(line);
+                  }
                   break;
                 }
               }
@@ -3807,7 +4236,7 @@ void ex_helpgrep(exarg_T *eap)
     /* Darn, some plugin changed the value. */
     free_string_option(save_cpo);
 
-  qf_update_buffer(qi);
+  qf_update_buffer(qi, NULL);
 
   if (au_name != NULL) {
     apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
diff --git a/src/nvim/rbuffer.c b/src/nvim/rbuffer.c
index b3805a3a28..111af0d0fb 100644
--- a/src/nvim/rbuffer.c
+++ b/src/nvim/rbuffer.c
@@ -15,10 +15,10 @@ RBuffer *rbuffer_new(size_t capacity)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET
 {
   if (!capacity) {
-    capacity = 0xffff;
+    capacity = 0x10000;
   }
 
-  RBuffer *rv = xmalloc(sizeof(RBuffer) + capacity);
+  RBuffer *rv = xcalloc(1, sizeof(RBuffer) + capacity);
   rv->full_cb = rv->nonfull_cb = NULL;
   rv->data = NULL;
   rv->size = 0;
@@ -78,7 +78,7 @@ void rbuffer_reset(RBuffer *buf) FUNC_ATTR_NONNULL_ALL
   size_t temp_size;
   if ((temp_size = rbuffer_size(buf))) {
     if (buf->temp == NULL) {
-      buf->temp = xmalloc(rbuffer_capacity(buf));
+      buf->temp = xcalloc(1, rbuffer_capacity(buf));
     }
     rbuffer_read(buf, buf->temp, buf->size);
   }
@@ -153,7 +153,7 @@ void rbuffer_consumed(RBuffer *buf, size_t count)
 
 // Higher level functions for copying from/to RBuffer instances and data
 // pointers
-size_t rbuffer_write(RBuffer *buf, char *src, size_t src_size)
+size_t rbuffer_write(RBuffer *buf, const char *src, size_t src_size)
   FUNC_ATTR_NONNULL_ALL
 {
   size_t size = src_size;
diff --git a/src/nvim/rbuffer.h b/src/nvim/rbuffer.h
index 35fb16508e..a8dfcac580 100644
--- a/src/nvim/rbuffer.h
+++ b/src/nvim/rbuffer.h
@@ -1,4 +1,4 @@
-// Ring buffer implementation. This is basically an array that wraps read/write
+// Specialized ring buffer. This is basically an array that wraps read/write
 // pointers around the memory region. It should be more efficient than the old
 // RBuffer which required memmove() calls to relocate read/write positions.
 //
@@ -36,30 +36,36 @@
 //
 // Note that the rbuffer_{produced,consumed} calls are necessary or these macros
 // create infinite loops
-#define RBUFFER_UNTIL_EMPTY(buf, rptr, rcnt)                                 \
-  for (size_t rcnt = 0, _r = 1; _r; _r = 0)                                  \
-    for (char *rptr = rbuffer_read_ptr(buf, &rcnt);                          \
-         buf->size;                                                          \
-         rptr = rbuffer_read_ptr(buf, &rcnt))
+#define RBUFFER_UNTIL_EMPTY(buf, rptr, rcnt) \
+  for (size_t rcnt = 0, _r = 1; _r; _r = 0)  /* NOLINT(readability/braces) */ \
+    for (  /* NOLINT(readability/braces) */ \
+        char *rptr = rbuffer_read_ptr(buf, &rcnt); \
+        buf->size; \
+        rptr = rbuffer_read_ptr(buf, &rcnt))
 
-#define RBUFFER_UNTIL_FULL(buf, wptr, wcnt)                                  \
-  for (size_t wcnt = 0, _r = 1; _r; _r = 0)                                  \
-    for (char *wptr = rbuffer_write_ptr(buf, &wcnt);                         \
-         rbuffer_space(buf);                                                 \
-         wptr = rbuffer_write_ptr(buf, &wcnt))
+#define RBUFFER_UNTIL_FULL(buf, wptr, wcnt) \
+  for (size_t wcnt = 0, _r = 1; _r; _r = 0)  /* NOLINT(readability/braces) */ \
+    for (  /* NOLINT(readability/braces) */ \
+        char *wptr = rbuffer_write_ptr(buf, &wcnt); \
+        rbuffer_space(buf); \
+        wptr = rbuffer_write_ptr(buf, &wcnt))
 
 
 // Iteration
-#define RBUFFER_EACH(buf, c, i)                                              \
-  for (size_t i = 0; i < buf->size; i = buf->size)                           \
-      for (char c = 0;                                                       \
-           i < buf->size ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0;       \
+#define RBUFFER_EACH(buf, c, i) \
+  for (size_t i = 0;  /* NOLINT(readability/braces) */ \
+       i < buf->size; \
+       i = buf->size) \
+      for (char c = 0;  /* NOLINT(readability/braces) */ \
+           i < buf->size ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0; \
            i++)
 
-#define RBUFFER_EACH_REVERSE(buf, c, i)                                      \
-  for (size_t i = buf->size; i != SIZE_MAX; i = SIZE_MAX)                    \
-      for (char c = 0;                                                       \
-           i-- > 0 ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0;             \
+#define RBUFFER_EACH_REVERSE(buf, c, i) \
+  for (size_t i = buf->size;  /* NOLINT(readability/braces) */ \
+       i != SIZE_MAX; \
+       i = SIZE_MAX) \
+      for (char c = 0;  /* NOLINT(readability/braces) */ \
+           i-- > 0 ? ((int)(c = *rbuffer_get(buf, i))) || 1 : 0; \
            )
 
 typedef struct rbuffer RBuffer;
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 886a48e7c5..6613d284d7 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -59,7 +59,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/strings.h"
 
@@ -1389,6 +1388,10 @@ int vim_regcomp_had_eol(void)
   return had_eol;
 }
 
+// variables for parsing reginput
+static int at_start;       // True when on the first character
+static int prev_at_start;  // True when on the second character
+
 /*
  * Parse regular expression, i.e. main body or parenthesized thing.
  *
@@ -1768,6 +1771,7 @@ static char_u *regatom(int *flagp)
   int c;
   char_u          *p;
   int extra = 0;
+  int save_prev_at_start = prev_at_start;
 
   *flagp = WORST;               /* Tentatively. */
 
@@ -2143,17 +2147,21 @@ static char_u *regatom(int *flagp)
           }
           break;
         } else if (c == 'l' || c == 'c' || c == 'v') {
-          if (c == 'l')
+          if (c == 'l') {
             ret = regnode(RE_LNUM);
-          else if (c == 'c')
+            if (save_prev_at_start) {
+              at_start = true;
+            }
+          } else if (c == 'c') {
             ret = regnode(RE_COL);
-          else
+          } else {
             ret = regnode(RE_VCOL);
-          if (ret == JUST_CALC_SIZE)
+          }
+          if (ret == JUST_CALC_SIZE) {
             regsize += 5;
-          else {
-            /* put the number and the optional
-             * comparator after the opcode */
+          } else {
+            // put the number and the optional
+            // comparator after the opcode
             regcode = re_put_uint32(regcode, n);
             *regcode++ = cmp;
           }
@@ -2301,48 +2309,64 @@ collection:
               }
               break;
             case CLASS_ALNUM:
-              for (cu = 1; cu <= 255; cu++)
-                if (isalnum(cu))
-                  regc(cu);
+              for (cu = 1; cu < 128; cu++) {
+                if (isalnum(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_ALPHA:
-              for (cu = 1; cu <= 255; cu++)
-                if (isalpha(cu))
-                  regc(cu);
+              for (cu = 1; cu < 128; cu++) {
+                if (isalpha(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_BLANK:
               regc(' ');
               regc('\t');
               break;
             case CLASS_CNTRL:
-              for (cu = 1; cu <= 255; cu++)
-                if (iscntrl(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (iscntrl(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_DIGIT:
-              for (cu = 1; cu <= 255; cu++)
-                if (ascii_isdigit(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (ascii_isdigit(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_GRAPH:
-              for (cu = 1; cu <= 255; cu++)
-                if (isgraph(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (isgraph(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_LOWER:
-              for (cu = 1; cu <= 255; cu++)
-                if (vim_islower(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (vim_islower(cu) && cu != 170 && cu != 186) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_PRINT:
-              for (cu = 1; cu <= 255; cu++)
-                if (vim_isprintc(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (vim_isprintc(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_PUNCT:
-              for (cu = 1; cu <= 255; cu++)
-                if (ispunct(cu))
-                  regc(cu);
+              for (cu = 1; cu < 128; cu++) {
+                if (ispunct(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_SPACE:
               for (cu = 9; cu <= 13; cu++)
@@ -2350,14 +2374,18 @@ collection:
               regc(' ');
               break;
             case CLASS_UPPER:
-              for (cu = 1; cu <= 255; cu++)
-                if (vim_isupper(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (vim_isupper(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_XDIGIT:
-              for (cu = 1; cu <= 255; cu++)
-                if (ascii_isxdigit(cu))
-                  regc(cu);
+              for (cu = 1; cu <= 255; cu++) {
+                if (ascii_isxdigit(cu)) {
+                  regmbc(cu);
+                }
+              }
               break;
             case CLASS_TAB:
               regc('\t');
@@ -2679,9 +2707,6 @@ static void regoptail(char_u *p, char_u *val)
  * Functions for getting characters from the regexp input.
  */
 
-static int at_start;            /* True when on the first character */
-static int prev_at_start;       /* True when on the second character */
-
 /*
  * Start parsing at "str".
  */
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 7e53b2ccd1..474f3df32a 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -11,7 +11,6 @@
 #include <limits.h>
 
 #include "nvim/ascii.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 
 /*
@@ -357,13 +356,14 @@ static int nfa_ll_index = 0;
 # include "regexp_nfa.c.generated.h"
 #endif
 
-/* helper functions used when doing re2post() ... regatom() parsing */
-#define EMIT(c) do {                            \
-    if (post_ptr >= post_end) {                 \
-      realloc_post_list();                      \
-    }                                           \
-    *post_ptr++ = c;                            \
-} while (0)
+// Helper functions used when doing re2post() ... regatom() parsing
+#define EMIT(c) \
+    do { \
+      if (post_ptr >= post_end) { \
+        realloc_post_list(); \
+      } \
+      *post_ptr++ = c; \
+    } while (0)
 
 /*
  * Initialize internal variables before NFA compilation.
@@ -723,13 +723,70 @@ static void nfa_emit_equi_class(int c)
 
   if (enc_utf8 || STRCMP(p_enc, "latin1") == 0
       || STRCMP(p_enc, "iso-8859-15") == 0) {
+#define A_grave 0xc0
+#define A_acute 0xc1
+#define A_circumflex 0xc2
+#define A_virguilla 0xc3
+#define A_diaeresis 0xc4
+#define A_ring 0xc5
+#define C_cedilla 0xc7
+#define E_grave 0xc8
+#define E_acute 0xc9
+#define E_circumflex 0xca
+#define E_diaeresis 0xcb
+#define I_grave 0xcc
+#define I_acute 0xcd
+#define I_circumflex 0xce
+#define I_diaeresis 0xcf
+#define N_virguilla 0xd1
+#define O_grave 0xd2
+#define O_acute 0xd3
+#define O_circumflex 0xd4
+#define O_virguilla 0xd5
+#define O_diaeresis 0xd6
+#define O_slash 0xd8
+#define U_grave 0xd9
+#define U_acute 0xda
+#define U_circumflex 0xdb
+#define U_diaeresis 0xdc
+#define Y_acute 0xdd
+#define a_grave 0xe0
+#define a_acute 0xe1
+#define a_circumflex 0xe2
+#define a_virguilla 0xe3
+#define a_diaeresis 0xe4
+#define a_ring 0xe5
+#define c_cedilla 0xe7
+#define e_grave 0xe8
+#define e_acute 0xe9
+#define e_circumflex 0xea
+#define e_diaeresis 0xeb
+#define i_grave 0xec
+#define i_acute 0xed
+#define i_circumflex 0xee
+#define i_diaeresis 0xef
+#define n_virguilla 0xf1
+#define o_grave 0xf2
+#define o_acute 0xf3
+#define o_circumflex 0xf4
+#define o_virguilla 0xf5
+#define o_diaeresis 0xf6
+#define o_slash 0xf8
+#define u_grave 0xf9
+#define u_acute 0xfa
+#define u_circumflex 0xfb
+#define u_diaeresis 0xfc
+#define y_acute 0xfd
+#define y_diaeresis 0xff
     switch (c) {
-    case 'A': case 0300: case 0301: case 0302:
-    case 0303: case 0304: case 0305:
-      CASEMBC(0x100) CASEMBC(0x102) CASEMBC(0x104) CASEMBC(0x1cd)
-      CASEMBC(0x1de) CASEMBC(0x1e0) CASEMBC(0x1ea2)
-      EMIT2('A'); EMIT2(0300); EMIT2(0301); EMIT2(0302);
-      EMIT2(0303); EMIT2(0304); EMIT2(0305);
+    case 'A': case A_grave: case A_acute: case A_circumflex:
+              case A_virguilla: case A_diaeresis: case A_ring:
+              CASEMBC(0x100) CASEMBC(0x102) CASEMBC(0x104)
+              CASEMBC(0x1cd) CASEMBC(0x1de) CASEMBC(0x1e0)
+              CASEMBC(0x1ea2)
+      EMIT2('A'); EMIT2(A_grave); EMIT2(A_acute);
+      EMIT2(A_circumflex); EMIT2(A_virguilla);
+      EMIT2(A_diaeresis); EMIT2(A_ring);
       EMITMBC(0x100) EMITMBC(0x102) EMITMBC(0x104)
       EMITMBC(0x1cd) EMITMBC(0x1de) EMITMBC(0x1e0)
       EMITMBC(0x1ea2)
@@ -739,23 +796,24 @@ static void nfa_emit_equi_class(int c)
       EMIT2('B'); EMITMBC(0x1e02) EMITMBC(0x1e06)
       return;
 
-    case 'C': case 0307:
-      CASEMBC(0x106) CASEMBC(0x108) CASEMBC(0x10a) CASEMBC(0x10c)
-      EMIT2('C'); EMIT2(0307); EMITMBC(0x106) EMITMBC(0x108)
+    case 'C': case C_cedilla: CASEMBC(0x106) CASEMBC(0x108) CASEMBC(0x10a)
+              CASEMBC(0x10c)
+      EMIT2('C'); EMIT2(C_cedilla); EMITMBC(0x106) EMITMBC(0x108)
       EMITMBC(0x10a) EMITMBC(0x10c)
       return;
 
     case 'D': CASEMBC(0x10e) CASEMBC(0x110) CASEMBC(0x1e0a)
-      CASEMBC(0x1e0e) CASEMBC(0x1e10)
+              CASEMBC(0x1e0e) CASEMBC(0x1e10)
       EMIT2('D'); EMITMBC(0x10e) EMITMBC(0x110) EMITMBC(0x1e0a)
       EMITMBC(0x1e0e) EMITMBC(0x1e10)
       return;
 
-    case 'E': case 0310: case 0311: case 0312: case 0313:
-      CASEMBC(0x112) CASEMBC(0x114) CASEMBC(0x116) CASEMBC(0x118)
-      CASEMBC(0x11a) CASEMBC(0x1eba) CASEMBC(0x1ebc)
-      EMIT2('E'); EMIT2(0310); EMIT2(0311); EMIT2(0312);
-      EMIT2(0313);
+    case 'E': case E_grave: case E_acute: case E_circumflex:
+              case E_diaeresis: CASEMBC(0x112) CASEMBC(0x114)
+              CASEMBC(0x116) CASEMBC(0x118) CASEMBC(0x11a)
+              CASEMBC(0x1eba) CASEMBC(0x1ebc)
+      EMIT2('E'); EMIT2(E_grave); EMIT2(E_acute);
+      EMIT2(E_circumflex); EMIT2(E_diaeresis);
       EMITMBC(0x112) EMITMBC(0x114) EMITMBC(0x116)
       EMITMBC(0x118) EMITMBC(0x11a) EMITMBC(0x1eba)
       EMITMBC(0x1ebc)
@@ -766,24 +824,26 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'G': CASEMBC(0x11c) CASEMBC(0x11e) CASEMBC(0x120)
-      CASEMBC(0x122) CASEMBC(0x1e4) CASEMBC(0x1e6) CASEMBC(0x1f4)
-      CASEMBC(0x1e20)
+              CASEMBC(0x122) CASEMBC(0x1e4) CASEMBC(0x1e6)
+              CASEMBC(0x1f4) CASEMBC(0x1e20)
       EMIT2('G'); EMITMBC(0x11c) EMITMBC(0x11e) EMITMBC(0x120)
       EMITMBC(0x122) EMITMBC(0x1e4) EMITMBC(0x1e6)
       EMITMBC(0x1f4) EMITMBC(0x1e20)
       return;
 
     case 'H': CASEMBC(0x124) CASEMBC(0x126) CASEMBC(0x1e22)
-      CASEMBC(0x1e26) CASEMBC(0x1e28)
+              CASEMBC(0x1e26) CASEMBC(0x1e28)
       EMIT2('H'); EMITMBC(0x124) EMITMBC(0x126) EMITMBC(0x1e22)
       EMITMBC(0x1e26) EMITMBC(0x1e28)
       return;
 
-    case 'I': case 0314: case 0315: case 0316: case 0317:
-      CASEMBC(0x128) CASEMBC(0x12a) CASEMBC(0x12c) CASEMBC(0x12e)
-      CASEMBC(0x130) CASEMBC(0x1cf) CASEMBC(0x1ec8)
-      EMIT2('I'); EMIT2(0314); EMIT2(0315); EMIT2(0316);
-      EMIT2(0317); EMITMBC(0x128) EMITMBC(0x12a)
+    case 'I': case I_grave: case I_acute: case I_circumflex:
+              case I_diaeresis: CASEMBC(0x128) CASEMBC(0x12a)
+              CASEMBC(0x12c) CASEMBC(0x12e) CASEMBC(0x130)
+              CASEMBC(0x1cf) CASEMBC(0x1ec8)
+      EMIT2('I'); EMIT2(I_grave); EMIT2(I_acute);
+      EMIT2(I_circumflex); EMIT2(I_diaeresis);
+      EMITMBC(0x128) EMITMBC(0x12a)
       EMITMBC(0x12c) EMITMBC(0x12e) EMITMBC(0x130)
       EMITMBC(0x1cf) EMITMBC(0x1ec8)
       return;
@@ -793,13 +853,13 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'K': CASEMBC(0x136) CASEMBC(0x1e8) CASEMBC(0x1e30)
-      CASEMBC(0x1e34)
+              CASEMBC(0x1e34)
       EMIT2('K'); EMITMBC(0x136) EMITMBC(0x1e8) EMITMBC(0x1e30)
       EMITMBC(0x1e34)
       return;
 
     case 'L': CASEMBC(0x139) CASEMBC(0x13b) CASEMBC(0x13d)
-      CASEMBC(0x13f) CASEMBC(0x141) CASEMBC(0x1e3a)
+              CASEMBC(0x13f) CASEMBC(0x141) CASEMBC(0x1e3a)
       EMIT2('L'); EMITMBC(0x139) EMITMBC(0x13b) EMITMBC(0x13d)
       EMITMBC(0x13f) EMITMBC(0x141) EMITMBC(0x1e3a)
       return;
@@ -808,19 +868,21 @@ static void nfa_emit_equi_class(int c)
       EMIT2('M'); EMITMBC(0x1e3e) EMITMBC(0x1e40)
       return;
 
-    case 'N': case 0321:
-      CASEMBC(0x143) CASEMBC(0x145) CASEMBC(0x147) CASEMBC(0x1e44)
-      CASEMBC(0x1e48)
-      EMIT2('N'); EMIT2(0321); EMITMBC(0x143) EMITMBC(0x145)
+    case 'N': case N_virguilla: CASEMBC(0x143) CASEMBC(0x145)
+              CASEMBC(0x147) CASEMBC(0x1e44) CASEMBC(0x1e48)
+      EMIT2('N'); EMIT2(N_virguilla);
+      EMITMBC(0x143) EMITMBC(0x145)
       EMITMBC(0x147) EMITMBC(0x1e44) EMITMBC(0x1e48)
       return;
 
-    case 'O': case 0322: case 0323: case 0324: case 0325:
-    case 0326: case 0330:
-      CASEMBC(0x14c) CASEMBC(0x14e) CASEMBC(0x150) CASEMBC(0x1a0)
-      CASEMBC(0x1d1) CASEMBC(0x1ea) CASEMBC(0x1ec) CASEMBC(0x1ece)
-      EMIT2('O'); EMIT2(0322); EMIT2(0323); EMIT2(0324);
-      EMIT2(0325); EMIT2(0326); EMIT2(0330);
+    case 'O': case O_grave: case O_acute: case O_circumflex:
+              case O_virguilla: case O_diaeresis: case O_slash:
+              CASEMBC(0x14c) CASEMBC(0x14e) CASEMBC(0x150)
+              CASEMBC(0x1a0) CASEMBC(0x1d1) CASEMBC(0x1ea)
+              CASEMBC(0x1ec) CASEMBC(0x1ece)
+      EMIT2('O'); EMIT2(O_grave); EMIT2(O_acute);
+      EMIT2(O_circumflex); EMIT2(O_virguilla);
+      EMIT2(O_diaeresis); EMIT2(O_slash);
       EMITMBC(0x14c) EMITMBC(0x14e) EMITMBC(0x150)
       EMITMBC(0x1a0) EMITMBC(0x1d1) EMITMBC(0x1ea)
       EMITMBC(0x1ec) EMITMBC(0x1ece)
@@ -831,29 +893,31 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'R': CASEMBC(0x154) CASEMBC(0x156) CASEMBC(0x158)
-      CASEMBC(0x1e58) CASEMBC(0x1e5e)
+              CASEMBC(0x1e58) CASEMBC(0x1e5e)
       EMIT2('R'); EMITMBC(0x154) EMITMBC(0x156) EMITMBC(0x158)
       EMITMBC(0x1e58) EMITMBC(0x1e5e)
       return;
 
     case 'S': CASEMBC(0x15a) CASEMBC(0x15c) CASEMBC(0x15e)
-      CASEMBC(0x160) CASEMBC(0x1e60)
+              CASEMBC(0x160) CASEMBC(0x1e60)
       EMIT2('S'); EMITMBC(0x15a) EMITMBC(0x15c) EMITMBC(0x15e)
       EMITMBC(0x160) EMITMBC(0x1e60)
       return;
 
     case 'T': CASEMBC(0x162) CASEMBC(0x164) CASEMBC(0x166)
-      CASEMBC(0x1e6a) CASEMBC(0x1e6e)
+              CASEMBC(0x1e6a) CASEMBC(0x1e6e)
       EMIT2('T'); EMITMBC(0x162) EMITMBC(0x164) EMITMBC(0x166)
       EMITMBC(0x1e6a) EMITMBC(0x1e6e)
       return;
 
-    case 'U': case 0331: case 0332: case 0333: case 0334:
-      CASEMBC(0x168) CASEMBC(0x16a) CASEMBC(0x16c) CASEMBC(0x16e)
-      CASEMBC(0x170) CASEMBC(0x172) CASEMBC(0x1af) CASEMBC(0x1d3)
-      CASEMBC(0x1ee6)
-      EMIT2('U'); EMIT2(0331); EMIT2(0332); EMIT2(0333);
-      EMIT2(0334); EMITMBC(0x168) EMITMBC(0x16a)
+    case 'U': case U_grave: case U_acute: case U_diaeresis:
+              case U_circumflex: CASEMBC(0x168) CASEMBC(0x16a)
+              CASEMBC(0x16c) CASEMBC(0x16e) CASEMBC(0x170)
+              CASEMBC(0x172) CASEMBC(0x1af) CASEMBC(0x1d3)
+              CASEMBC(0x1ee6)
+      EMIT2('U'); EMIT2(U_grave); EMIT2(U_acute);
+      EMIT2(U_diaeresis); EMIT2(U_circumflex);
+      EMITMBC(0x168) EMITMBC(0x16a)
       EMITMBC(0x16c) EMITMBC(0x16e) EMITMBC(0x170)
       EMITMBC(0x172) EMITMBC(0x1af) EMITMBC(0x1d3)
       EMITMBC(0x1ee6)
@@ -864,7 +928,7 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'W': CASEMBC(0x174) CASEMBC(0x1e80) CASEMBC(0x1e82)
-      CASEMBC(0x1e84) CASEMBC(0x1e86)
+              CASEMBC(0x1e84) CASEMBC(0x1e86)
       EMIT2('W'); EMITMBC(0x174) EMITMBC(0x1e80) EMITMBC(0x1e82)
       EMITMBC(0x1e84) EMITMBC(0x1e86)
       return;
@@ -873,26 +937,29 @@ static void nfa_emit_equi_class(int c)
       EMIT2('X'); EMITMBC(0x1e8a) EMITMBC(0x1e8c)
       return;
 
-    case 'Y': case 0335:
-      CASEMBC(0x176) CASEMBC(0x178) CASEMBC(0x1e8e) CASEMBC(0x1ef2)
-      CASEMBC(0x1ef6) CASEMBC(0x1ef8)
-      EMIT2('Y'); EMIT2(0335); EMITMBC(0x176) EMITMBC(0x178)
+    case 'Y': case Y_acute: CASEMBC(0x176) CASEMBC(0x178)
+              CASEMBC(0x1e8e) CASEMBC(0x1ef2) CASEMBC(0x1ef6)
+              CASEMBC(0x1ef8)
+      EMIT2('Y'); EMIT2(Y_acute);
+      EMITMBC(0x176) EMITMBC(0x178)
       EMITMBC(0x1e8e) EMITMBC(0x1ef2) EMITMBC(0x1ef6)
       EMITMBC(0x1ef8)
       return;
 
     case 'Z': CASEMBC(0x179) CASEMBC(0x17b) CASEMBC(0x17d)
-      CASEMBC(0x1b5) CASEMBC(0x1e90) CASEMBC(0x1e94)
+              CASEMBC(0x1b5) CASEMBC(0x1e90) CASEMBC(0x1e94)
       EMIT2('Z'); EMITMBC(0x179) EMITMBC(0x17b) EMITMBC(0x17d)
       EMITMBC(0x1b5) EMITMBC(0x1e90) EMITMBC(0x1e94)
       return;
 
-    case 'a': case 0340: case 0341: case 0342:
-    case 0343: case 0344: case 0345:
-      CASEMBC(0x101) CASEMBC(0x103) CASEMBC(0x105) CASEMBC(0x1ce)
-      CASEMBC(0x1df) CASEMBC(0x1e1) CASEMBC(0x1ea3)
-      EMIT2('a'); EMIT2(0340); EMIT2(0341); EMIT2(0342);
-      EMIT2(0343); EMIT2(0344); EMIT2(0345);
+    case 'a': case a_grave: case a_acute: case a_circumflex:
+              case a_virguilla: case a_diaeresis: case a_ring:
+              CASEMBC(0x101) CASEMBC(0x103) CASEMBC(0x105)
+              CASEMBC(0x1ce) CASEMBC(0x1df) CASEMBC(0x1e1)
+              CASEMBC(0x1ea3)
+      EMIT2('a'); EMIT2(a_grave); EMIT2(a_acute);
+      EMIT2(a_circumflex); EMIT2(a_virguilla);
+      EMIT2(a_diaeresis); EMIT2(a_ring);
       EMITMBC(0x101) EMITMBC(0x103) EMITMBC(0x105)
       EMITMBC(0x1ce) EMITMBC(0x1df) EMITMBC(0x1e1)
       EMITMBC(0x1ea3)
@@ -902,23 +969,26 @@ static void nfa_emit_equi_class(int c)
       EMIT2('b'); EMITMBC(0x1e03) EMITMBC(0x1e07)
       return;
 
-    case 'c': case 0347:
-      CASEMBC(0x107) CASEMBC(0x109) CASEMBC(0x10b) CASEMBC(0x10d)
-      EMIT2('c'); EMIT2(0347); EMITMBC(0x107) EMITMBC(0x109)
+    case 'c': case c_cedilla: CASEMBC(0x107) CASEMBC(0x109)
+              CASEMBC(0x10b) CASEMBC(0x10d)
+      EMIT2('c'); EMIT2(c_cedilla);
+      EMITMBC(0x107) EMITMBC(0x109)
       EMITMBC(0x10b) EMITMBC(0x10d)
       return;
 
     case 'd': CASEMBC(0x10f) CASEMBC(0x111) CASEMBC(0x1e0b)
-      CASEMBC(0x1e0f) CASEMBC(0x1e11)
+              CASEMBC(0x1e0f) CASEMBC(0x1e11)
       EMIT2('d'); EMITMBC(0x10f) EMITMBC(0x111) EMITMBC(0x1e0b)
       EMITMBC(0x1e0f) EMITMBC(0x1e11)
       return;
 
-    case 'e': case 0350: case 0351: case 0352: case 0353:
-      CASEMBC(0x113) CASEMBC(0x115) CASEMBC(0x117) CASEMBC(0x119)
-      CASEMBC(0x11b) CASEMBC(0x1ebb) CASEMBC(0x1ebd)
-      EMIT2('e'); EMIT2(0350); EMIT2(0351); EMIT2(0352);
-      EMIT2(0353); EMITMBC(0x113) EMITMBC(0x115)
+    case 'e': case e_grave: case e_acute: case e_circumflex:
+              case e_diaeresis: CASEMBC(0x113) CASEMBC(0x115)
+              CASEMBC(0x117) CASEMBC(0x119) CASEMBC(0x11b)
+              CASEMBC(0x1ebb) CASEMBC(0x1ebd)
+      EMIT2('e'); EMIT2(e_grave); EMIT2(e_acute);
+      EMIT2(e_circumflex); EMIT2(e_diaeresis);
+      EMITMBC(0x113) EMITMBC(0x115)
       EMITMBC(0x117) EMITMBC(0x119) EMITMBC(0x11b)
       EMITMBC(0x1ebb) EMITMBC(0x1ebd)
       return;
@@ -928,24 +998,26 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'g': CASEMBC(0x11d) CASEMBC(0x11f) CASEMBC(0x121)
-      CASEMBC(0x123) CASEMBC(0x1e5) CASEMBC(0x1e7) CASEMBC(0x1f5)
-      CASEMBC(0x1e21)
+              CASEMBC(0x123) CASEMBC(0x1e5) CASEMBC(0x1e7)
+              CASEMBC(0x1f5) CASEMBC(0x1e21)
       EMIT2('g'); EMITMBC(0x11d) EMITMBC(0x11f) EMITMBC(0x121)
       EMITMBC(0x123) EMITMBC(0x1e5) EMITMBC(0x1e7)
       EMITMBC(0x1f5) EMITMBC(0x1e21)
       return;
 
     case 'h': CASEMBC(0x125) CASEMBC(0x127) CASEMBC(0x1e23)
-      CASEMBC(0x1e27) CASEMBC(0x1e29) CASEMBC(0x1e96)
+              CASEMBC(0x1e27) CASEMBC(0x1e29) CASEMBC(0x1e96)
       EMIT2('h'); EMITMBC(0x125) EMITMBC(0x127) EMITMBC(0x1e23)
       EMITMBC(0x1e27) EMITMBC(0x1e29) EMITMBC(0x1e96)
       return;
 
-    case 'i': case 0354: case 0355: case 0356: case 0357:
-      CASEMBC(0x129) CASEMBC(0x12b) CASEMBC(0x12d) CASEMBC(0x12f)
-      CASEMBC(0x1d0) CASEMBC(0x1ec9)
-      EMIT2('i'); EMIT2(0354); EMIT2(0355); EMIT2(0356);
-      EMIT2(0357); EMITMBC(0x129) EMITMBC(0x12b)
+    case 'i': case i_grave: case i_acute: case i_circumflex:
+              case i_diaeresis: CASEMBC(0x129) CASEMBC(0x12b)
+              CASEMBC(0x12d) CASEMBC(0x12f) CASEMBC(0x1d0)
+              CASEMBC(0x1ec9)
+      EMIT2('i'); EMIT2(i_grave); EMIT2(i_acute);
+      EMIT2(i_circumflex); EMIT2(i_diaeresis);
+      EMITMBC(0x129) EMITMBC(0x12b)
       EMITMBC(0x12d) EMITMBC(0x12f) EMITMBC(0x1d0)
       EMITMBC(0x1ec9)
       return;
@@ -955,13 +1027,13 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'k': CASEMBC(0x137) CASEMBC(0x1e9) CASEMBC(0x1e31)
-      CASEMBC(0x1e35)
+              CASEMBC(0x1e35)
       EMIT2('k'); EMITMBC(0x137) EMITMBC(0x1e9) EMITMBC(0x1e31)
       EMITMBC(0x1e35)
       return;
 
     case 'l': CASEMBC(0x13a) CASEMBC(0x13c) CASEMBC(0x13e)
-      CASEMBC(0x140) CASEMBC(0x142) CASEMBC(0x1e3b)
+              CASEMBC(0x140) CASEMBC(0x142) CASEMBC(0x1e3b)
       EMIT2('l'); EMITMBC(0x13a) EMITMBC(0x13c) EMITMBC(0x13e)
       EMITMBC(0x140) EMITMBC(0x142) EMITMBC(0x1e3b)
       return;
@@ -970,20 +1042,23 @@ static void nfa_emit_equi_class(int c)
       EMIT2('m'); EMITMBC(0x1e3f) EMITMBC(0x1e41)
       return;
 
-    case 'n': case 0361:
-      CASEMBC(0x144) CASEMBC(0x146) CASEMBC(0x148) CASEMBC(0x149)
-      CASEMBC(0x1e45) CASEMBC(0x1e49)
-      EMIT2('n'); EMIT2(0361); EMITMBC(0x144) EMITMBC(0x146)
+    case 'n': case n_virguilla: CASEMBC(0x144) CASEMBC(0x146)
+              CASEMBC(0x148) CASEMBC(0x149) CASEMBC(0x1e45)
+              CASEMBC(0x1e49)
+      EMIT2('n'); EMIT2(n_virguilla);
+      EMITMBC(0x144) EMITMBC(0x146)
       EMITMBC(0x148) EMITMBC(0x149) EMITMBC(0x1e45)
       EMITMBC(0x1e49)
       return;
 
-    case 'o': case 0362: case 0363: case 0364: case 0365:
-    case 0366: case 0370:
-      CASEMBC(0x14d) CASEMBC(0x14f) CASEMBC(0x151) CASEMBC(0x1a1)
-      CASEMBC(0x1d2) CASEMBC(0x1eb) CASEMBC(0x1ed) CASEMBC(0x1ecf)
-      EMIT2('o'); EMIT2(0362); EMIT2(0363); EMIT2(0364);
-      EMIT2(0365); EMIT2(0366); EMIT2(0370);
+    case 'o': case o_grave: case o_acute: case o_circumflex:
+              case o_virguilla: case o_diaeresis: case o_slash:
+              CASEMBC(0x14d) CASEMBC(0x14f) CASEMBC(0x151)
+              CASEMBC(0x1a1) CASEMBC(0x1d2) CASEMBC(0x1eb)
+              CASEMBC(0x1ed) CASEMBC(0x1ecf)
+      EMIT2('o'); EMIT2(o_grave); EMIT2(o_acute);
+      EMIT2(o_circumflex); EMIT2(o_virguilla);
+      EMIT2(o_diaeresis); EMIT2(o_slash);
       EMITMBC(0x14d) EMITMBC(0x14f) EMITMBC(0x151)
       EMITMBC(0x1a1) EMITMBC(0x1d2) EMITMBC(0x1eb)
       EMITMBC(0x1ed) EMITMBC(0x1ecf)
@@ -994,29 +1069,31 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'r': CASEMBC(0x155) CASEMBC(0x157) CASEMBC(0x159)
-      CASEMBC(0x1e59) CASEMBC(0x1e5f)
+              CASEMBC(0x1e59) CASEMBC(0x1e5f)
       EMIT2('r'); EMITMBC(0x155) EMITMBC(0x157) EMITMBC(0x159)
       EMITMBC(0x1e59) EMITMBC(0x1e5f)
       return;
 
     case 's': CASEMBC(0x15b) CASEMBC(0x15d) CASEMBC(0x15f)
-      CASEMBC(0x161) CASEMBC(0x1e61)
+              CASEMBC(0x161) CASEMBC(0x1e61)
       EMIT2('s'); EMITMBC(0x15b) EMITMBC(0x15d) EMITMBC(0x15f)
       EMITMBC(0x161) EMITMBC(0x1e61)
       return;
 
     case 't': CASEMBC(0x163) CASEMBC(0x165) CASEMBC(0x167)
-      CASEMBC(0x1e6b) CASEMBC(0x1e6f) CASEMBC(0x1e97)
+              CASEMBC(0x1e6b) CASEMBC(0x1e6f) CASEMBC(0x1e97)
       EMIT2('t'); EMITMBC(0x163) EMITMBC(0x165) EMITMBC(0x167)
       EMITMBC(0x1e6b) EMITMBC(0x1e6f) EMITMBC(0x1e97)
       return;
 
-    case 'u': case 0371: case 0372: case 0373: case 0374:
-      CASEMBC(0x169) CASEMBC(0x16b) CASEMBC(0x16d) CASEMBC(0x16f)
-      CASEMBC(0x171) CASEMBC(0x173) CASEMBC(0x1b0) CASEMBC(0x1d4)
-      CASEMBC(0x1ee7)
-      EMIT2('u'); EMIT2(0371); EMIT2(0372); EMIT2(0373);
-      EMIT2(0374); EMITMBC(0x169) EMITMBC(0x16b)
+    case 'u': case u_grave: case u_acute: case u_circumflex:
+              case u_diaeresis: CASEMBC(0x169) CASEMBC(0x16b)
+              CASEMBC(0x16d) CASEMBC(0x16f) CASEMBC(0x171)
+              CASEMBC(0x173) CASEMBC(0x1b0) CASEMBC(0x1d4)
+              CASEMBC(0x1ee7)
+      EMIT2('u'); EMIT2(u_grave); EMIT2(u_acute);
+      EMIT2(u_circumflex); EMIT2(u_diaeresis);
+      EMITMBC(0x169) EMITMBC(0x16b)
       EMITMBC(0x16d) EMITMBC(0x16f) EMITMBC(0x171)
       EMITMBC(0x173) EMITMBC(0x1b0) EMITMBC(0x1d4)
       EMITMBC(0x1ee7)
@@ -1027,7 +1104,7 @@ static void nfa_emit_equi_class(int c)
       return;
 
     case 'w': CASEMBC(0x175) CASEMBC(0x1e81) CASEMBC(0x1e83)
-      CASEMBC(0x1e85) CASEMBC(0x1e87) CASEMBC(0x1e98)
+              CASEMBC(0x1e85) CASEMBC(0x1e87) CASEMBC(0x1e98)
       EMIT2('w'); EMITMBC(0x175) EMITMBC(0x1e81) EMITMBC(0x1e83)
       EMITMBC(0x1e85) EMITMBC(0x1e87) EMITMBC(0x1e98)
       return;
@@ -1036,16 +1113,17 @@ static void nfa_emit_equi_class(int c)
       EMIT2('x'); EMITMBC(0x1e8b) EMITMBC(0x1e8d)
       return;
 
-    case 'y': case 0375: case 0377:
-      CASEMBC(0x177) CASEMBC(0x1e8f) CASEMBC(0x1e99)
-      CASEMBC(0x1ef3) CASEMBC(0x1ef7) CASEMBC(0x1ef9)
-      EMIT2('y'); EMIT2(0375); EMIT2(0377); EMITMBC(0x177)
+    case 'y': case y_acute: case y_diaeresis: CASEMBC(0x177)
+              CASEMBC(0x1e8f) CASEMBC(0x1e99) CASEMBC(0x1ef3)
+              CASEMBC(0x1ef7) CASEMBC(0x1ef9)
+      EMIT2('y'); EMIT2(y_acute); EMIT2(y_diaeresis);
+      EMITMBC(0x177)
       EMITMBC(0x1e8f) EMITMBC(0x1e99) EMITMBC(0x1ef3)
       EMITMBC(0x1ef7) EMITMBC(0x1ef9)
       return;
 
     case 'z': CASEMBC(0x17a) CASEMBC(0x17c) CASEMBC(0x17e)
-      CASEMBC(0x1b6) CASEMBC(0x1e91) CASEMBC(0x1e95)
+              CASEMBC(0x1b6) CASEMBC(0x1e91) CASEMBC(0x1e95)
       EMIT2('z'); EMITMBC(0x17a) EMITMBC(0x17c) EMITMBC(0x17e)
       EMITMBC(0x1b6) EMITMBC(0x1e91) EMITMBC(0x1e95)
       return;
@@ -1095,6 +1173,7 @@ static int nfa_regatom(void)
   int startc = -1;
   int endc = -1;
   int oldstartc = -1;
+  int save_prev_at_start = prev_at_start;
 
   c = getchr();
   switch (c) {
@@ -1411,18 +1490,22 @@ static int nfa_regatom(void)
         c = getchr();
       }
       if (c == 'l' || c == 'c' || c == 'v') {
-        if (c == 'l')
-          /* \%{n}l  \%{n}<l  \%{n}>l  */
+        if (c == 'l') {
+          // \%{n}l  \%{n}<l  \%{n}>l
           EMIT(cmp == '<' ? NFA_LNUM_LT :
-              cmp == '>' ? NFA_LNUM_GT : NFA_LNUM);
-        else if (c == 'c')
-          /* \%{n}c  \%{n}<c  \%{n}>c  */
+               cmp == '>' ? NFA_LNUM_GT : NFA_LNUM);
+          if (save_prev_at_start) {
+            at_start = true;
+          }
+        } else if (c == 'c') {
+          // \%{n}c  \%{n}<c  \%{n}>c
           EMIT(cmp == '<' ? NFA_COL_LT :
-              cmp == '>' ? NFA_COL_GT : NFA_COL);
-        else
-          /* \%{n}v  \%{n}<v  \%{n}>v  */
+               cmp == '>' ? NFA_COL_GT : NFA_COL);
+        } else {
+          // \%{n}v  \%{n}<v  \%{n}>v
           EMIT(cmp == '<' ? NFA_VCOL_LT :
-              cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
+               cmp == '>' ? NFA_VCOL_GT : NFA_VCOL);
+        }
         EMIT(n);
         break;
       } else if (c == '\'' && n == 0) {
@@ -2892,12 +2975,11 @@ static nfa_state_T *post2nfa(int *postfix, int *end, int nfa_calc_size)
     return NULL;
 
 #define PUSH(s)     st_push((s), &stackp, stack_end)
-#define POP()       st_pop(&stackp, stack);             \
-  if (stackp < stack)                 \
-  {                                   \
-    st_error(postfix, end, p);      \
-    xfree(stack);                    \
-    return NULL;                    \
+#define POP()       st_pop(&stackp, stack); \
+  if (stackp < stack) { \
+    st_error(postfix, end, p); \
+    xfree(stack); \
+    return NULL; \
   }
 
   if (nfa_calc_size == FALSE) {
@@ -4238,12 +4320,14 @@ static int check_char_class(int class, int c)
 {
   switch (class) {
   case NFA_CLASS_ALNUM:
-    if (c >= 1 && c <= 255 && isalnum(c))
+    if (c >= 1 && c < 128 && isalnum(c)) {
       return OK;
+    }
     break;
   case NFA_CLASS_ALPHA:
-    if (c >= 1 && c <= 255 && isalpha(c))
+    if (c >= 1 && c < 128 && isalpha(c)) {
       return OK;
+    }
     break;
   case NFA_CLASS_BLANK:
     if (c == ' ' || c == '\t')
@@ -4262,16 +4346,18 @@ static int check_char_class(int class, int c)
       return OK;
     break;
   case NFA_CLASS_LOWER:
-    if (vim_islower(c))
+    if (vim_islower(c) && c != 170 && c != 186) {
       return OK;
+    }
     break;
   case NFA_CLASS_PRINT:
     if (vim_isprintc(c))
       return OK;
     break;
   case NFA_CLASS_PUNCT:
-    if (c >= 1 && c <= 255 && ispunct(c))
+    if (c >= 1 && c < 128 && ispunct(c)) {
       return OK;
+    }
     break;
   case NFA_CLASS_SPACE:
     if ((c >= 9 && c <= 13) || (c == ' '))
@@ -4556,9 +4642,11 @@ static int recursive_regmatch(nfa_state_T *state, nfa_pim_T *pim, nfa_regprog_T
   if (REG_MULTI)
     regline = reg_getline(reglnum);
   reginput = regline + save_reginput_col;
-  nfa_match = save_nfa_match;
+  if (result != NFA_TOO_EXPENSIVE) {
+    nfa_match = save_nfa_match;
+    nfa_listid = save_nfa_listid;
+  }
   nfa_endp = save_nfa_endp;
-  nfa_listid = save_nfa_listid;
 
 #ifdef REGEXP_DEBUG
   log_fd = fopen(NFA_REGEXP_RUN_LOG, "a");
@@ -4850,9 +4938,15 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
   // recursive_regmatch(). Allow interrupting them with CTRL-C.
   fast_breakcheck();
   if (got_int) {
+#ifdef NFA_REGEXP_DEBUG_LOG
+    fclose(debug);
+#endif
     return false;
   }
   if (nfa_time_limit != NULL && profile_passed_limit(*nfa_time_limit)) {
+#ifdef NFA_REGEXP_DEBUG_LOG
+    fclose(debug);
+#endif
     return false;
   }
 
@@ -4904,10 +4998,10 @@ static int nfa_regmatch(nfa_regprog_T *prog, nfa_state_T *start,
   } else
     addstate(thislist, start, m, NULL, 0);
 
-#define ADD_STATE_IF_MATCH(state)                       \
-  if (result) {                                       \
-    add_state = state->out;                         \
-    add_off = clen;                                 \
+#define ADD_STATE_IF_MATCH(state) \
+  if (result) { \
+    add_state = state->out; \
+    add_off = clen; \
   }
 
   /*
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 34eef83164..c0db076eff 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -108,7 +108,6 @@
 #include "nvim/menu.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
@@ -120,6 +119,7 @@
 #include "nvim/regexp.h"
 #include "nvim/search.h"
 #include "nvim/spell.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
@@ -420,9 +420,10 @@ void update_screen(int type)
     }
   }
   end_search_hl();
-  /* May need to redraw the popup menu. */
-  if (pum_visible())
+  // May need to redraw the popup menu.
+  if (pum_drawn()) {
     pum_redraw();
+  }
 
   /* Reset b_mod_set flags.  Going through all windows is probably faster
    * than going through all buffers (there could be many buffers). */
@@ -485,6 +486,11 @@ void update_single_line(win_T *wp, linenr_T lnum)
   int row;
   int j;
 
+  // Don't do anything if the screen structures are (not yet) valid.
+  if (!screen_valid(true)) {
+    return;
+  }
+
   if (lnum >= wp->w_topline && lnum < wp->w_botline
       && foldedCount(wp, lnum, &win_foldinfo) == 0) {
     row = 0;
@@ -575,15 +581,6 @@ void update_debug_sign(buf_T *buf, linenr_T lnum)
 }
 
 /*
- * Return TRUE when window "wp" has a column to draw signs in.
- */
-static int draw_signcolumn(win_T *wp)
-{
-    return (wp->w_buffer->b_signlist != NULL);
-}
-
-
-/*
  * Update a single window.
  *
  * This may cause the windows below it also to be redrawn (when clearing the
@@ -1400,7 +1397,7 @@ static void win_update(win_T *wp)
                  && wp->w_lines[idx].wl_valid
                  && wp->w_lines[idx].wl_lnum == lnum
                  && lnum > wp->w_topline
-                 && !(dy_flags & DY_LASTLINE)
+                 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE))
                  && srow + wp->w_lines[idx].wl_size > wp->w_height
                  && diff_check_fill(wp, lnum) == 0
                  ) {
@@ -1483,10 +1480,20 @@ static void win_update(win_T *wp)
       /* Window ends in filler lines. */
       wp->w_botline = lnum;
       wp->w_filler_rows = wp->w_height - srow;
-    } else if (dy_flags & DY_LASTLINE) {      /* 'display' has "lastline" */
-      /*
-       * Last line isn't finished: Display "@@@" at the end.
-       */
+    } else if (dy_flags & DY_TRUNCATE) {      // 'display' has "truncate"
+      int scr_row = wp->w_winrow + wp->w_height - 1;
+
+      // Last line isn't finished: Display "@@@" in the last screen line.
+      screen_puts_len((char_u *)"@@", 2, scr_row, wp->w_wincol,
+                      hl_attr(HLF_AT));
+
+      screen_fill(scr_row, scr_row + 1,
+                  (int)wp->w_wincol + 2, (int)W_ENDCOL(wp),
+                  '@', ' ', hl_attr(HLF_AT));
+      set_empty_rows(wp, srow);
+      wp->w_botline = lnum;
+    } else if (dy_flags & DY_LASTLINE) {      // 'display' has "lastline"
+      // Last line isn't finished: Display "@@@" at the end.
       screen_fill(wp->w_winrow + wp->w_height - 1,
                   wp->w_winrow + wp->w_height,
                   W_ENDCOL(wp) - 3, W_ENDCOL(wp),
@@ -1587,7 +1594,7 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
                   ' ', ' ', hl_attr(HLF_FC));
     }
 
-    if (draw_signcolumn(wp)) {
+    if (signcolumn_on(wp)) {
         int nn = n + 2;
 
         /* draw the sign column left of the fold column */
@@ -1628,8 +1635,7 @@ static void win_draw_end(win_T *wp, int c1, int c2, int row, int endrow, hlf_T h
       n = nn;
     }
 
-    if (draw_signcolumn(wp))
-    {
+    if (signcolumn_on(wp)) {
         int nn = n + 2;
 
         /* draw the sign column after the fold column */
@@ -1741,8 +1747,8 @@ static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T
    * text */
   RL_MEMSET(col, hl_attr(HLF_FL), wp->w_width - col);
 
-  /* If signs are being displayed, add two spaces. */
-  if (draw_signcolumn(wp)) {
+  // If signs are being displayed, add two spaces.
+  if (signcolumn_on(wp)) {
       len = wp->w_width - col;
       if (len > 0) {
           if (len > 2) {
@@ -2209,8 +2215,8 @@ win_line (
                                         ///< force wrapping
   int vcol_off        = 0;              ///< offset for concealed characters
   int did_wcol        = false;
-  int match_conc      = false;          ///< cchar for match functions
-  int has_match_conc  = false;          ///< match wants to conceal
+  int match_conc      = 0;              ///< cchar for match functions
+  int has_match_conc  = 0;              ///< match wants to conceal
   int old_boguscols = 0;
 # define VCOL_HLC (vcol - vcol_off)
 # define FIX_FOR_BOGUSCOLS \
@@ -2403,11 +2409,14 @@ win_line (
   if (v != 0)
       line_attr = sign_get_attr((int)v, TRUE);
 
-  /* Highlight the current line in the quickfix window. */
-  if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum)
-    line_attr = hl_attr(HLF_L);
-  if (line_attr != 0)
-    area_highlighting = TRUE;
+  // Highlight the current line in the quickfix window.
+  if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) {
+    line_attr = hl_attr(HLF_QFL);
+  }
+
+  if (line_attr != 0) {
+    area_highlighting = true;
+  }
 
   line = ml_get_buf(wp->w_buffer, lnum, FALSE);
   ptr = line;
@@ -2578,11 +2587,13 @@ win_line (
     shl->startcol = MAXCOL;
     shl->endcol = MAXCOL;
     shl->attr_cur = 0;
+    shl->is_addpos = false;
     v = (long)(ptr - line);
     if (cur != NULL) {
       cur->pos.cur = 0;
     }
-    next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
+    next_search_hl(wp, shl, lnum, (colnr_T)v,
+                   shl == &search_hl ? NULL : cur);
 
     // Need to get the line again, a multi-line regexp may have made it
     // invalid.
@@ -2624,7 +2635,12 @@ win_line (
    * then. */
   if (wp->w_p_cul && lnum == wp->w_cursor.lnum
       && !(wp == curwin && VIsual_active)) {
-    line_attr = hl_attr(HLF_CUL);
+    if (line_attr != 0 && !(State & INSERT) && bt_quickfix(wp->w_buffer)
+        && qf_current_entry(wp) == lnum) {
+      line_attr = hl_combine_attr(hl_attr(HLF_CUL), line_attr);
+    } else {
+      line_attr = hl_attr(HLF_CUL);
+    }
     area_highlighting = true;
   }
 
@@ -2647,7 +2663,7 @@ win_line (
 
   // Repeat for the whole displayed line.
   for (;; ) {
-    has_match_conc = false;
+    has_match_conc = 0;
     // Skip this quickly when working on the text.
     if (draw_state != WL_LINE) {
       if (draw_state == WL_CMDLINE - 1 && n_extra == 0) {
@@ -2680,7 +2696,7 @@ win_line (
           draw_state = WL_SIGN;
           /* Show the sign column when there are any signs in this
            * buffer or when using Netbeans. */
-          if (draw_signcolumn(wp)) {
+          if (signcolumn_on(wp)) {
               int text_sign;
               /* Draw two cells with the sign value or blank. */
               c_extra = ' ';
@@ -2897,16 +2913,17 @@ win_line (
               shl->attr_cur = shl->attr;
               if (cur != NULL && syn_name2id((char_u *)"Conceal")
                   == cur->hlg_id) {
-                has_match_conc = true;
+                has_match_conc = v == (long)shl->startcol ? 2 : 1;
                 match_conc = cur->conceal_char;
               } else {
-                has_match_conc = match_conc = false;
+                has_match_conc = match_conc = 0;
               }
             } else if (v == (long)shl->endcol) {
               shl->attr_cur = 0;
               prev_syntax_id = 0;
 
-              next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
+              next_search_hl(wp, shl, lnum, (colnr_T)v,
+                             shl == &search_hl ? NULL : cur);
               pos_inprogress = !(cur == NULL || cur->pos.cur == 0);
 
               /* Need to get the line again, a multi-line regexp
@@ -3416,12 +3433,10 @@ win_line (
       /*
        * Handling of non-printable characters.
        */
-      if (!(chartab[c & 0xff] & CT_PRINT_CHAR)) {
-        /*
-         * when getting a character from the file, we may have to
-         * turn it into something else on the way to putting it
-         * into "ScreenLines".
-         */
+      if (!vim_isprintc(c)) {
+        // when getting a character from the file, we may have to
+        // turn it into something else on the way to putting it
+        // into "ScreenLines".
         if (c == TAB && (!wp->w_p_list || lcs_tab1)) {
           int tab_len = 0;
           long vcol_adjusted = vcol;  // removed showbreak length
@@ -3626,11 +3641,11 @@ win_line (
       if (wp->w_p_cole > 0
           && (wp != curwin || lnum != wp->w_cursor.lnum
               || conceal_cursor_line(wp))
-          && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc)
+          && ((syntax_flags & HL_CONCEAL) != 0 || has_match_conc > 0)
           && !(lnum_in_visual_area
                && vim_strchr(wp->w_p_cocu, 'v') == NULL)) {
         char_attr = conceal_attr;
-        if (prev_syntax_id != syntax_seqnr
+        if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1)
             && (syn_get_sub_char() != NUL || match_conc
                 || wp->w_p_cole == 1)
             && wp->w_p_cole != 3) {
@@ -3743,18 +3758,18 @@ win_line (
       if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
         ++prevcol;
 
-      /* Invert at least one char, used for Visual and empty line or
-       * highlight match at end of line. If it's beyond the last
-       * char on the screen, just overwrite that one (tricky!)  Not
-       * needed when a '$' was displayed for 'list'. */
-      prevcol_hl_flag = FALSE;
-      if (prevcol == (long)search_hl.startcol)
-        prevcol_hl_flag = TRUE;
-      else {
+      // Invert at least one char, used for Visual and empty line or
+      // highlight match at end of line. If it's beyond the last
+      // char on the screen, just overwrite that one (tricky!)  Not
+      // needed when a '$' was displayed for 'list'.
+      prevcol_hl_flag = false;
+      if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) {
+        prevcol_hl_flag = true;
+      } else {
         cur = wp->w_match_head;
         while (cur != NULL) {
-          if (prevcol == (long)cur->hl.startcol) {
-            prevcol_hl_flag = TRUE;
+          if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) {
+            prevcol_hl_flag = true;
             break;
           }
           cur = cur->next;
@@ -3804,10 +3819,13 @@ win_line (
               shl_flag = TRUE;
             } else
               shl = &cur->hl;
-            if ((ptr - line) - 1 == (long)shl->startcol)
+            if ((ptr - line) - 1 == (long)shl->startcol
+                && (shl == &search_hl || !shl->is_addpos)) {
               char_attr = shl->attr;
-            if (shl != &search_hl && cur != NULL)
+            }
+            if (shl != &search_hl && cur != NULL) {
               cur = cur->next;
+            }
           }
         }
         ScreenAttrs[off] = char_attr;
@@ -4821,15 +4839,12 @@ void win_redr_status(win_T *wp)
 
   wp->w_redr_status = FALSE;
   if (wp->w_status_height == 0) {
-    /* no status line, can only be last window */
-    redraw_cmdline = TRUE;
-  } else if (!redrawing()
-             /* don't update status line when popup menu is visible and may be
-              * drawn over it */
-             || pum_visible()
-             ) {
-    /* Don't redraw right now, do it later. */
-    wp->w_redr_status = TRUE;
+    // no status line, can only be last window
+    redraw_cmdline = true;
+  } else if (!redrawing() || pum_drawn()) {
+    // Don't redraw right now, do it later. Don't update status line when
+    // popup menu is visible and may be drawn over it
+    wp->w_redr_status = true;
   } else if (*p_stl != NUL || *wp->w_p_stl != NUL) {
     /* redraw custom status line */
     redraw_custom_statusline(wp);
@@ -4897,7 +4912,7 @@ void win_redr_status(win_T *wp)
     screen_fill(row, row + 1, len + wp->w_wincol,
         this_ru_col + wp->w_wincol, fillchar, fillchar, attr);
 
-    if (get_keymap_str(wp, NameBuff, MAXPATHL)
+    if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL)
         && this_ru_col - len > (int)(STRLEN(NameBuff) + 1))
       screen_puts(NameBuff, row, (int)(this_ru_col - STRLEN(NameBuff)
                                        - 1 + wp->w_wincol), attr);
@@ -4925,8 +4940,8 @@ void win_redr_status(win_T *wp)
  */
 static void redraw_custom_statusline(win_T *wp)
 {
-  static int entered = FALSE;
-  int save_called_emsg = called_emsg;
+  static int entered = false;
+  int saved_did_emsg = did_emsg;
 
   /* When called recursively return.  This can happen when the statusline
    * contains an expression that triggers a redraw. */
@@ -4934,18 +4949,18 @@ static void redraw_custom_statusline(win_T *wp)
     return;
   entered = TRUE;
 
-  called_emsg = FALSE;
-  win_redr_custom(wp, FALSE);
-  if (called_emsg) {
-    /* When there is an error disable the statusline, otherwise the
-     * display is messed up with errors and a redraw triggers the problem
-     * again and again. */
+  did_emsg = false;
+  win_redr_custom(wp, false);
+  if (did_emsg) {
+    // When there is an error disable the statusline, otherwise the
+    // display is messed up with errors and a redraw triggers the problem
+    // again and again.
     set_string_option_direct((char_u *)"statusline", -1,
         (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL
                                   ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR);
   }
-  called_emsg |= save_called_emsg;
-  entered = FALSE;
+  did_emsg |= saved_did_emsg;
+  entered = false;
 }
 
 /*
@@ -4978,8 +4993,9 @@ int stl_connected(win_T *wp)
 int
 get_keymap_str (
     win_T *wp,
-    char_u *buf,           /* buffer for the result */
-    int len                    /* length of buffer */
+    char_u *fmt,        // format string containing one %s item
+    char_u *buf,        // buffer for the result
+    int len             // length of buffer
 )
 {
   char_u      *p;
@@ -5006,10 +5022,9 @@ get_keymap_str (
       else
         p = (char_u *)"lang";
     }
-    if ((int)(STRLEN(p) + 3) < len)
-      sprintf((char *)buf, "<%s>", p);
-    else
+    if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) {
       buf[0] = NUL;
+    }
     xfree(s);
   }
   return buf[0] != NUL;
@@ -5278,7 +5293,7 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
   int force_redraw_next = FALSE;
   int need_redraw;
 
-  const int l_has_mbyte = has_mbyte;
+  const bool l_has_mbyte = has_mbyte;
   const bool l_enc_utf8 = enc_utf8;
   const int l_enc_dbcs = enc_dbcs;
 
@@ -5445,9 +5460,6 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
   /* If we detected the next character needs to be redrawn, but the text
    * doesn't extend up to there, update the character here. */
   if (force_redraw_next && col < screen_Columns) {
-    if (l_enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1)
-      screen_char_2(off, row, col);
-    else
       screen_char(off, row, col);
   }
 }
@@ -5546,8 +5558,9 @@ static void prepare_search_hl(win_T *wp, linenr_T lnum)
                                   // in progress
       n = 0;
       while (shl->first_lnum < lnum && (shl->rm.regprog != NULL
-                                    || (cur != NULL && pos_inprogress))) {
-        next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n, cur);
+                                        || (cur != NULL && pos_inprogress))) {
+        next_search_hl(wp, shl, shl->first_lnum, (colnr_T)n,
+                       shl == &search_hl ? NULL : cur);
         pos_inprogress = !(cur == NULL ||  cur->pos.cur == 0);
         if (shl->lnum != 0) {
           shl->first_lnum = shl->lnum
@@ -5680,6 +5693,8 @@ next_search_hl (
   }
 }
 
+/// If there is a match fill "shl" and return one.
+/// Return zero otherwise.
 static int
 next_search_hl_pos(
     match_T *shl,         // points to a match
@@ -5689,47 +5704,50 @@ next_search_hl_pos(
 )
 {
   int i;
-  int bot = -1;
+  int found = -1;
 
   shl->lnum = 0;
   for (i = posmatch->cur; i < MAXPOSMATCH; i++) {
-    if (posmatch->pos[i].lnum == 0) {
+    llpos_T *pos = &posmatch->pos[i];
+
+    if (pos->lnum == 0) {
       break;
     }
-    if (posmatch->pos[i].col < mincol) {
+    if (pos->len == 0 && pos->col < mincol) {
       continue;
     }
-    if (posmatch->pos[i].lnum == lnum) {
-      if (bot != -1) {
-        // partially sort positions by column numbers
-        // on the same line
-        if (posmatch->pos[i].col < posmatch->pos[bot].col) {
-          llpos_T tmp = posmatch->pos[i];
+    if (pos->lnum == lnum) {
+      if (found >= 0) {
+        // if this match comes before the one at "found" then swap
+        // them
+        if (pos->col < posmatch->pos[found].col) {
+          llpos_T tmp = *pos;
 
-          posmatch->pos[i] = posmatch->pos[bot];
-          posmatch->pos[bot] = tmp;
+          *pos = posmatch->pos[found];
+          posmatch->pos[found] = tmp;
         }
       } else {
-        bot = i;
-        shl->lnum = lnum;
+        found = i;
       }
     }
   }
   posmatch->cur = 0;
-  if (bot != -1) {
-    colnr_T start = posmatch->pos[bot].col == 0
-                    ? 0: posmatch->pos[bot].col - 1;
-    colnr_T end = posmatch->pos[bot].col == 0
-                  ? MAXCOL : start + posmatch->pos[bot].len;
+  if (found >= 0) {
+    colnr_T start = posmatch->pos[found].col == 0
+                    ? 0: posmatch->pos[found].col - 1;
+    colnr_T end = posmatch->pos[found].col == 0
+                  ? MAXCOL : start + posmatch->pos[found].len;
 
+    shl->lnum = lnum;
     shl->rm.startpos[0].lnum = 0;
     shl->rm.startpos[0].col = start;
     shl->rm.endpos[0].lnum = 0;
     shl->rm.endpos[0].col = end;
-    posmatch->cur = bot + 1;
-    return true;
+    shl->is_addpos = true;
+    posmatch->cur = found + 1;
+    return 1;
   }
-  return false;
+  return 0;
 }
 
 static void screen_start_highlight(int attr)
@@ -6734,10 +6752,12 @@ int showmode(void)
         if (p_fkmap)
           MSG_PUTS_ATTR(farsi_text_5, attr);
         if (State & LANGMAP) {
-          if (curwin->w_p_arab)
+          if (curwin->w_p_arab) {
             MSG_PUTS_ATTR(_(" Arabic"), attr);
-          else
-            MSG_PUTS_ATTR(_(" (lang)"), attr);
+          } else if (get_keymap_str(curwin, (char_u *)" (%s)",
+                                    NameBuff, MAXPATHL)) {
+            MSG_PUTS_ATTR(NameBuff, attr);
+          }
         }
         if ((State & INSERT) && p_paste)
           MSG_PUTS_ATTR(_(" (paste)"), attr);
@@ -6816,12 +6836,18 @@ void unshowmode(bool force)
   if (!redrawing() || (!force && char_avail() && !KeyTyped)) {
     redraw_cmdline = true;  // delete mode later
   } else {
+    clearmode();
+  }
+}
+
+// Clear the mode message.
+void clearmode(void)
+{
     msg_pos_mode();
     if (Recording) {
       recording_mode(hl_attr(HLF_CM));
     }
     msg_clr_eos();
-  }
 }
 
 static void recording_mode(int attr)
@@ -6871,16 +6897,17 @@ static void draw_tabline(void)
 
   /* Use the 'tabline' option if it's set. */
   if (*p_tal != NUL) {
-    int save_called_emsg = called_emsg;
+    int saved_did_emsg = did_emsg;
 
-    /* Check for an error.  If there is one we would loop in redrawing the
-     * screen.  Avoid that by making 'tabline' empty. */
-    called_emsg = FALSE;
-    win_redr_custom(NULL, FALSE);
-    if (called_emsg)
+    // Check for an error.  If there is one we would loop in redrawing the
+    // screen.  Avoid that by making 'tabline' empty.
+    did_emsg = false;
+    win_redr_custom(NULL, false);
+    if (did_emsg) {
       set_string_option_direct((char_u *)"tabline", -1,
-          (char_u *)"", OPT_FREE, SID_ERROR);
-    called_emsg |= save_called_emsg;
+                               (char_u *)"", OPT_FREE, SID_ERROR);
+    }
+    did_emsg |= saved_did_emsg;
   } else {
     FOR_ALL_TABS(tp) {
       ++tabcount;
@@ -7075,9 +7102,9 @@ void showruler(int always)
 {
   if (!always && !redrawing())
     return;
-  if (pum_visible()) {
-    /* Don't redraw right now, do it later. */
-    curwin->w_redr_status = TRUE;
+  if (pum_drawn()) {
+    // Don't redraw right now, do it later.
+    curwin->w_redr_status = true;
     return;
   }
   if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) {
@@ -7113,9 +7140,10 @@ static void win_redr_ruler(win_T *wp, int always)
   if (wp == lastwin && lastwin->w_status_height == 0)
     if (edit_submode != NULL)
       return;
-  /* Don't draw the ruler when the popup menu is visible, it may overlap. */
-  if (pum_visible())
+  // Don't draw the ruler when the popup menu is visible, it may overlap.
+  if (pum_drawn()) {
     return;
+  }
 
   if (*p_ruf) {
     int save_called_emsg = called_emsg;
@@ -7365,7 +7393,7 @@ void screen_resize(int width, int height)
         redrawcmdline();
       } else {
         update_topline();
-        if (pum_visible()) {
+        if (pum_drawn()) {
           redraw_later(NOT_VALID);
           ins_compl_show_pum();           /* This includes the redraw. */
         } else
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 6e2b69fff7..2a087276e7 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -31,7 +31,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/move.h"
 #include "nvim/mouse.h"
 #include "nvim/normal.h"
@@ -3977,12 +3976,10 @@ current_search (
   return OK;
 }
 
-/*
- * Check if the pattern is one character or zero-width.
- * If move is true, check from the beginning of the buffer,
- * else from the current cursor position.
- * Returns TRUE, FALSE or -1 for failure.
- */
+/// Check if the pattern is one character long or zero-width.
+/// If move is true, check from the beginning of the buffer,
+/// else from the current cursor position.
+/// Returns TRUE, FALSE or -1 for failure.
 static int is_one_char(char_u *pattern, bool move)
 {
   regmmatch_T regmatch;
@@ -3992,11 +3989,17 @@ static int is_one_char(char_u *pattern, bool move)
   int save_called_emsg = called_emsg;
   int flag = 0;
 
+  if (pattern == NULL) {
+    pattern = spats[last_idx].pat;
+  }
+
   if (search_regcomp(pattern, RE_SEARCH, RE_SEARCH,
           SEARCH_KEEP, &regmatch) == FAIL)
     return -1;
 
-  /* move to match */
+  // init startcol correctly
+  regmatch.startpos[0].col = -1;
+  // move to match
   if (move) {
     clearpos(&pos);
   } else {
@@ -4004,21 +4007,29 @@ static int is_one_char(char_u *pattern, bool move)
     /* accept a match at the cursor position */
     flag = SEARCH_START;
   }
-  if (searchit(curwin, curbuf, &pos, FORWARD, spats[last_idx].pat, 1,
-          SEARCH_KEEP + flag, RE_SEARCH, 0, NULL) != FAIL) {
-    /* Zero-width pattern should match somewhere, then we can check if
-     * start and end are in the same position. */
-    called_emsg = FALSE;
-    nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
-        pos.lnum, (colnr_T)0, NULL);
-
-    if (!called_emsg)
+  if (searchit(curwin, curbuf, &pos, FORWARD, pattern, 1,
+               SEARCH_KEEP + flag, RE_SEARCH, 0, NULL) != FAIL) {
+    // Zero-width pattern should match somewhere, then we can check if
+    // start and end are in the same position.
+    called_emsg = false;
+    do {
+      regmatch.startpos[0].col++;
+      nmatched = vim_regexec_multi(&regmatch, curwin, curbuf,
+                                   pos.lnum, regmatch.startpos[0].col, NULL);
+      if (!nmatched) {
+        break;
+      }
+    } while (regmatch.startpos[0].col < pos.col);
+
+    if (!called_emsg) {
       result = (nmatched != 0
                 && regmatch.startpos[0].lnum == regmatch.endpos[0].lnum
                 && regmatch.startpos[0].col == regmatch.endpos[0].col);
-
-    if (!result && inc(&pos) >= 0 && pos.col == regmatch.endpos[0].col)
-      result = TRUE;
+      // one char width
+      if (!result && inc(&pos) >= 0 && pos.col == regmatch.endpos[0].col) {
+        result = true;
+      }
+    }
   }
 
   called_emsg |= save_called_emsg;
@@ -4550,7 +4561,7 @@ exit_matched:
     }
     line_breakcheck();
     if (action == ACTION_EXPAND)
-      ins_compl_check_keys(30);
+      ins_compl_check_keys(30, false);
     if (got_int || compl_interrupted)
       break;
 
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index 51c8597d53..197b029591 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <inttypes.h>
 #include <errno.h>
-#include <fcntl.h>
 #include <assert.h>
 
 #include <msgpack.h>
@@ -28,7 +27,6 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/buffer.h"
 #include "nvim/buffer_defs.h"
-#include "nvim/misc2.h"
 #include "nvim/ex_getln.h"
 #include "nvim/search.h"
 #include "nvim/regexp.h"
@@ -36,6 +34,7 @@
 #include "nvim/version.h"
 #include "nvim/path.h"
 #include "nvim/fileio.h"
+#include "nvim/os/fileio.h"
 #include "nvim/strings.h"
 #include "nvim/quickfix.h"
 #include "nvim/eval/encode.h"
@@ -119,9 +118,10 @@ KHASH_SET_INIT_STR(strset)
 //   E576: Missing '>'
 //   E577: Illegal register name
 //   E886: Can't rename viminfo file to %s!
+//   E929: Too many viminfo temp files, like %s!
 // Now only six of them are used:
 //   E137: ShaDa file is not writeable (for pre-open checks)
-//   E138: All %s.tmp.X files exist, cannot write ShaDa file!
+//   E929: All %s.tmp.X files exist, cannot write ShaDa file!
 //   RCERR (E576) for critical read errors.
 //   RNERR (E136) for various errors when renaming.
 //   RERR (E575) for various errors inside read ShaDa file.
@@ -149,6 +149,9 @@ KHASH_SET_INIT_STR(strset)
 /// Common prefix for all ignorable “write” errors
 #define WERR "E574: "
 
+/// Callback function for add_search_pattern
+typedef void (*SearchPatternGetter)(SearchPattern *);
+
 /// Flags for shada_read_file and children
 typedef enum {
   kShaDaWantInfo = 1,       ///< Load non-mark information
@@ -409,7 +412,7 @@ typedef struct sd_read_def {
   ShaDaFileSkipper skip;  ///< Function used to skip some bytes.
   void *cookie;           ///< Data describing object read from.
   bool eof;               ///< True if reader reached end of file.
-  char *error;            ///< Error message in case of error.
+  const char *error;      ///< Error message in case of error.
   uintmax_t fpos;         ///< Current position (amount of bytes read since
                           ///< reader structure initialization). May overflow.
   vimconv_T sd_conv;      ///< Structure used for converting encodings of some
@@ -433,7 +436,7 @@ typedef struct sd_write_def {
   ShaDaFileWriter write;   ///< Writer function.
   ShaDaWriteCloser close;  ///< Close function.
   void *cookie;            ///< Data describing object written to.
-  char *error;             ///< Error message in case of error.
+  const char *error;       ///< Error message in case of error.
   vimconv_T sd_conv;       ///< Structure used for converting encodings of some
                            ///< items.
 } ShaDaWriteDef;
@@ -666,38 +669,14 @@ static ptrdiff_t read_file(ShaDaReadDef *const sd_reader, void *const dest,
                            const size_t size)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  size_t read_bytes = 0;
-  bool did_try_to_free = false;
-  const int fd = (int)(intptr_t) sd_reader->cookie;
-  while (read_bytes != size) {
-    const ptrdiff_t cur_read_bytes = read(fd, ((char *) dest) + read_bytes,
-                                          size - read_bytes);
-    if (cur_read_bytes > 0) {
-      read_bytes += (size_t) cur_read_bytes;
-      sd_reader->fpos += (uintmax_t) cur_read_bytes;
-      assert(read_bytes <= size);
-    }
-    if (cur_read_bytes < 0) {
-      if (errno == EINTR || errno == EAGAIN) {
-        errno = 0;
-        continue;
-      } else if (errno == ENOMEM && !did_try_to_free) {
-        try_to_free_memory();
-        did_try_to_free = true;
-        errno = 0;
-        continue;
-      } else {
-        sd_reader->error = strerror(errno);
-        errno = 0;
-        return -1;
-      }
-    }
-    if (cur_read_bytes == 0) {
-      sd_reader->eof = true;
-      break;
-    }
+  const ptrdiff_t ret = file_read(sd_reader->cookie, dest, size);
+  sd_reader->eof = file_eof(sd_reader->cookie);
+  if (ret < 0) {
+    sd_reader->error = os_strerror((int)ret);
+    return -1;
   }
-  return (ptrdiff_t) read_bytes;
+  sd_reader->fpos += (size_t)ret;
+  return ret;
 }
 
 /// Read one character
@@ -720,50 +699,26 @@ static ptrdiff_t write_file(ShaDaWriteDef *const sd_writer,
                             const size_t size)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  size_t written_bytes = 0;
-  const int fd = (int)(intptr_t) sd_writer->cookie;
-  while (written_bytes != size) {
-    const ptrdiff_t cur_written_bytes = write(fd, (char *) dest + written_bytes,
-                                              size - written_bytes);
-    if (cur_written_bytes > 0) {
-      written_bytes += (size_t) cur_written_bytes;
-    }
-    if (cur_written_bytes < 0) {
-      if (errno == EINTR || errno == EAGAIN) {
-        errno = 0;
-        continue;
-      } else {
-        sd_writer->error = strerror(errno);
-        errno = 0;
-        return -1;
-      }
-    }
-    if (cur_written_bytes == 0) {
-      sd_writer->error = "Zero bytes written.";
-      return -1;
-    }
+  const ptrdiff_t ret = file_write(sd_writer->cookie, dest, size);
+  if (ret < 0) {
+    sd_writer->error = os_strerror((int)ret);
+    return -1;
   }
-  return (ptrdiff_t) written_bytes;
+  return ret;
 }
 
 /// Wrapper for closing file descriptors opened for reading
 static void close_sd_reader(ShaDaReadDef *const sd_reader)
   FUNC_ATTR_NONNULL_ALL
 {
-  close_file((int)(intptr_t) sd_reader->cookie);
+  close_file(sd_reader->cookie);
 }
 
 /// Wrapper for closing file descriptors opened for writing
 static void close_sd_writer(ShaDaWriteDef *const sd_writer)
   FUNC_ATTR_NONNULL_ALL
 {
-  const int fd = (int)(intptr_t) sd_writer->cookie;
-  if (os_fsync(fd) < 0) {
-    emsgf(_(SERR "System error while synchronizing ShaDa file: %s"),
-          os_strerror(errno));
-    errno = 0;
-  }
-  close_file(fd);
+  close_file(sd_writer->cookie);
 }
 
 /// Wrapper for read that reads to IObuff and ignores bytes read
@@ -779,19 +734,20 @@ static int sd_reader_skip_read(ShaDaReadDef *const sd_reader,
                                const size_t offset)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  size_t read_bytes = 0;
-  do {
-    ptrdiff_t new_read_bytes = sd_reader->read(
-        sd_reader, IObuff, (size_t) (offset - read_bytes > IOSIZE
-                                     ? IOSIZE
-                                     : offset - read_bytes));
-    if (new_read_bytes == -1) {
-      return FAIL;
+  const ptrdiff_t skip_bytes = file_skip(sd_reader->cookie, offset);
+  if (skip_bytes < 0) {
+    sd_reader->error = os_strerror((int)skip_bytes);
+    return FAIL;
+  } else if (skip_bytes != (ptrdiff_t)offset) {
+    assert(skip_bytes < (ptrdiff_t)offset);
+    sd_reader->eof = file_eof(sd_reader->cookie);
+    if (!sd_reader->eof) {
+      sd_reader->error = _("too few bytes read");
     }
-    read_bytes += (size_t) new_read_bytes;
-  } while (read_bytes < offset && !sd_reader->eof);
-
-  return (read_bytes == offset ? OK : FAIL);
+    return FAIL;
+  }
+  sd_reader->fpos += (size_t)skip_bytes;
+  return OK;
 }
 
 /// Wrapper for read that can be used when lseek cannot be used
@@ -824,37 +780,6 @@ static ShaDaReadResult sd_reader_skip(ShaDaReadDef *const sd_reader,
   return kSDReadStatusSuccess;
 }
 
-/// Wrapper for opening file descriptors
-///
-/// All arguments are passed to os_open().
-///
-/// @return file descriptor or libuv error on failure.
-static int open_file(const char *const fname, const int flags, const int mode)
-  FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
-{
-  bool did_try_to_free = false;
-  int fd;
-open_file_start:
-  fd = os_open(fname, flags, mode);
-
-  if (fd < 0) {
-    if (fd == UV_ENOENT) {
-      return fd;
-    }
-    if (fd == UV_ENOMEM && !did_try_to_free) {
-      try_to_free_memory();
-      did_try_to_free = true;
-      goto open_file_start;
-    }
-    if (fd != UV_EEXIST) {
-      emsgf(_(SERR "System error while opening ShaDa file %s: %s"),
-            fname, os_strerror(fd));
-    }
-    return fd;
-  }
-  return fd;
-}
-
 /// Open ShaDa file for reading
 ///
 /// @param[in]   fname      File name to open.
@@ -865,11 +790,7 @@ static int open_shada_file_for_reading(const char *const fname,
                                        ShaDaReadDef *sd_reader)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
-  const intptr_t fd = (intptr_t) open_file(fname, O_RDONLY, 0);
-
-  if (fd < 0) {
-    return (int) fd;
-  }
+  int error;
 
   *sd_reader = (ShaDaReadDef) {
     .read = &read_file,
@@ -878,8 +799,11 @@ static int open_shada_file_for_reading(const char *const fname,
     .error = NULL,
     .eof = false,
     .fpos = 0,
-    .cookie = (void *) fd,
+    .cookie = file_open_new(&error, fname, kFileReadOnly, 0),
   };
+  if (sd_reader->cookie == NULL) {
+    return error;
+  }
 
   convert_setup(&sd_reader->sd_conv, "utf-8", p_enc);
 
@@ -887,18 +811,12 @@ static int open_shada_file_for_reading(const char *const fname,
 }
 
 /// Wrapper for closing file descriptors
-static void close_file(int fd)
+static void close_file(void *cookie)
 {
-close_file_start:
-  if (close(fd) == -1) {
-    if (errno == EINTR) {
-      errno = 0;
-      goto close_file_start;
-    } else {
-      emsgf(_(SERR "System error while closing ShaDa file: %s"),
-            strerror(errno));
-      errno = 0;
-    }
+  const int error = file_free(cookie);
+  if (error != 0) {
+    emsgf(_(SERR "System error while closing ShaDa file: %s"),
+          os_strerror(error));
   }
 }
 
@@ -978,7 +896,7 @@ static int shada_read_file(const char *const file, const int flags)
   }
 
   if (of_ret != 0) {
-    if (of_ret == UV_ENOENT && (flags & kShaDaMissingError)) {
+    if (of_ret != UV_ENOENT || (flags & kShaDaMissingError)) {
       emsgf(_(SERR "System error while opening ShaDa file %s for reading: %s"),
             fname, os_strerror(of_ret));
     }
@@ -1421,8 +1339,8 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags)
           }
         }
         if (!op_register_set(cur_entry.data.reg.name, (yankreg_T) {
-          .y_array = (char_u **) cur_entry.data.reg.contents,
-          .y_size = (linenr_T) cur_entry.data.reg.contents_size,
+          .y_array = (char_u **)cur_entry.data.reg.contents,
+          .y_size = cur_entry.data.reg.contents_size,
           .y_type = cur_entry.data.reg.type,
           .y_width = (colnr_T) cur_entry.data.reg.width,
           .timestamp = cur_entry.timestamp,
@@ -1609,7 +1527,7 @@ static const char *shada_get_default_file(void)
   FUNC_ATTR_WARN_UNUSED_RESULT
 {
   if (default_shada_file == NULL) {
-    char *shada_dir = stdpaths_user_data_subpath("shada", 0);
+    char *shada_dir = stdpaths_user_data_subpath("shada", 0, false);
     default_shada_file = concat_fnames_realloc(shada_dir, "main.shada", true);
   }
   return default_shada_file;
@@ -1661,7 +1579,9 @@ static char *shada_filename(const char *file)
     do { \
       const String s_ = (s); \
       msgpack_pack_bin(spacker, s_.size); \
-      msgpack_pack_bin_body(spacker, s_.data, s_.size); \
+      if (s_.size > 0) { \
+        msgpack_pack_bin_body(spacker, s_.data, s_.size); \
+      } \
     } while (0)
 
 /// Write single ShaDa entry
@@ -2066,7 +1986,7 @@ static ShaDaWriteResult shada_pack_encoded_entry(msgpack_packer *const packer,
           entry.data.data.reg.contents =
               xmemdup(entry.data.data.reg.contents,
                       (entry.data.data.reg.contents_size
-                       * sizeof(entry.data.data.reg.contents)));
+                       * sizeof(entry.data.data.reg.contents[0])));
           for (size_t i = 0; i < entry.data.data.reg.contents_size; i++) {
             if (i >= first_non_ascii) {
               entry.data.data.reg.contents[i] = get_converted_string(
@@ -2402,6 +2322,113 @@ static inline ShaDaWriteResult shada_read_when_writing(
   return ret;
 }
 
+/// Get list of buffers to write to the shada file
+///
+/// @param[in]  removable_bufs  Buffers which are ignored
+///
+/// @return  ShadaEntry  List of buffers to save, kSDItemBufferList entry.
+static inline ShadaEntry shada_get_buflist(
+    khash_t(bufset) *const removable_bufs)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_ALWAYS_INLINE
+{
+  int max_bufs = get_shada_parameter('%');
+  size_t buf_count = 0;
+#define IGNORE_BUF(buf)\
+  (buf->b_ffname == NULL || !buf->b_p_bl || bt_quickfix(buf) \
+   || in_bufset(removable_bufs, buf))  // NOLINT(whitespace/indent)
+  FOR_ALL_BUFFERS(buf) {
+    if (!IGNORE_BUF(buf) && (max_bufs < 0 || buf_count < (size_t)max_bufs)) {
+      buf_count++;
+    }
+  }
+
+  ShadaEntry buflist_entry = (ShadaEntry) {
+    .type = kSDItemBufferList,
+      .timestamp = os_time(),
+      .data = {
+        .buffer_list = {
+          .size = buf_count,
+          .buffers = xmalloc(buf_count
+                             * sizeof(*buflist_entry.data.buffer_list.buffers)),
+        },
+      },
+  };
+  size_t i = 0;
+  FOR_ALL_BUFFERS(buf) {
+    if (IGNORE_BUF(buf)) {
+      continue;
+    }
+    if (i >= buf_count) {
+      break;
+    }
+    buflist_entry.data.buffer_list.buffers[i] = (struct buffer_list_buffer) {
+      .pos = buf->b_last_cursor.mark,
+        .fname = (char *)buf->b_ffname,
+        .additional_data = buf->additional_data,
+    };
+    i++;
+  }
+
+#undef IGNORE_BUF
+  return buflist_entry;
+}
+
+/// Save search pattern to PossiblyFreedShadaEntry
+///
+/// @param[out]  ret_pse  Location where result will be saved.
+/// @param[in]  get_pattern  Function used to get pattern.
+/// @param[in]  is_substitute_pattern  True if pattern in question is substitute
+///                                    pattern. Also controls whether some
+///                                    fields should be initialized to default
+///                                    or values from get_pattern.
+/// @param[in]  search_last_used  Result of search_was_last_used().
+/// @param[in]  search_highlighted  True if search pattern was highlighted by
+///                                 &hlsearch and this information should be
+///                                 saved.
+static inline void add_search_pattern(PossiblyFreedShadaEntry *const ret_pse,
+                                      const SearchPatternGetter get_pattern,
+                                      const bool is_substitute_pattern,
+                                      const bool search_last_used,
+                                      const bool search_highlighted)
+  FUNC_ATTR_ALWAYS_INLINE
+{
+  const ShadaEntry defaults = sd_default_values[kSDItemSearchPattern];
+  SearchPattern pat;
+  get_pattern(&pat);
+  if (pat.pat != NULL) {
+    *ret_pse = (PossiblyFreedShadaEntry) {
+      .can_free_entry = false,
+      .data = {
+        .type = kSDItemSearchPattern,
+        .timestamp = pat.timestamp,
+        .data = {
+          .search_pattern = {
+            .magic = pat.magic,
+            .smartcase = !pat.no_scs,
+            .has_line_offset = (is_substitute_pattern
+                                ? defaults.data.search_pattern.has_line_offset
+                                : pat.off.line),
+            .place_cursor_at_end = (
+                is_substitute_pattern
+                ? defaults.data.search_pattern.place_cursor_at_end
+                : pat.off.end),
+            .offset = (is_substitute_pattern
+                       ? defaults.data.search_pattern.offset
+                       : pat.off.off),
+            .is_last_used = (is_substitute_pattern ^ search_last_used),
+            .is_substitute_pattern = is_substitute_pattern,
+            .highlighted = ((is_substitute_pattern ^ search_last_used)
+                            && search_highlighted),
+            .pat = (char *)pat.pat,
+            .additional_data = pat.additional_data,
+            .search_backward = (!is_substitute_pattern && pat.off.dir == '?'),
+          }
+        }
+      }
+    };
+  }
+}
+
 /// Write ShaDa file
 ///
 /// @param[in]  sd_writer  Structure containing file writer definition.
@@ -2508,46 +2535,13 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
 
   // Write buffer list
   if (find_shada_parameter('%') != NULL) {
-    size_t buf_count = 0;
-#define IGNORE_BUF(buf)\
-    (buf->b_ffname == NULL || !buf->b_p_bl || bt_quickfix(buf) \
-     || in_bufset(&removable_bufs, buf))
-    FOR_ALL_BUFFERS(buf) {
-      if (!IGNORE_BUF(buf)) {
-        buf_count++;
-      }
-    }
-
-    ShadaEntry buflist_entry = (ShadaEntry) {
-      .type = kSDItemBufferList,
-      .timestamp = os_time(),
-      .data = {
-        .buffer_list = {
-          .size = buf_count,
-          .buffers = xmalloc(buf_count
-                             * sizeof(*buflist_entry.data.buffer_list.buffers)),
-        },
-      },
-    };
-    size_t i = 0;
-    FOR_ALL_BUFFERS(buf) {
-      if (IGNORE_BUF(buf)) {
-        continue;
-      }
-      buflist_entry.data.buffer_list.buffers[i] = (struct buffer_list_buffer) {
-        .pos = buf->b_last_cursor.mark,
-        .fname = (char *) buf->b_ffname,
-        .additional_data = buf->additional_data,
-      };
-      i++;
-    }
+    ShadaEntry buflist_entry = shada_get_buflist(&removable_bufs);
     if (shada_pack_entry(packer, buflist_entry, 0) == kSDWriteFailed) {
       xfree(buflist_entry.data.buffer_list.buffers);
       ret = kSDWriteFailed;
       goto shada_write_exit;
     }
     xfree(buflist_entry.data.buffer_list.buffers);
-#undef IGNORE_BUF
   }
 
   // Write some of the variables
@@ -2596,45 +2590,14 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
   const bool search_highlighted = !(no_hlsearch
                                     || find_shada_parameter('h') != NULL);
   const bool search_last_used = search_was_last_used();
-#define ADD_SEARCH_PAT(func, wms_attr, hlo, pcae, o, is_sub) \
-  do { \
-    SearchPattern pat; \
-    func(&pat); \
-    if (pat.pat != NULL) { \
-      wms->wms_attr = (PossiblyFreedShadaEntry) { \
-        .can_free_entry = false, \
-        .data = { \
-          .type = kSDItemSearchPattern, \
-          .timestamp = pat.timestamp, \
-          .data = { \
-            .search_pattern = { \
-              .magic = pat.magic, \
-              .smartcase = !pat.no_scs, \
-              .has_line_offset = hlo, \
-              .place_cursor_at_end = pcae, \
-              .offset = o, \
-              .is_last_used = (is_sub ^ search_last_used), \
-              .is_substitute_pattern = is_sub, \
-              .highlighted = ((is_sub ^ search_last_used) \
-                              && search_highlighted), \
-              .pat = (char *) pat.pat, \
-              .additional_data = pat.additional_data, \
-              .search_backward = (!is_sub && pat.off.dir == '?'), \
-            } \
-          } \
-        } \
-      }; \
-    } \
-  } while (0)
 
   // Initialize search pattern
-  ADD_SEARCH_PAT(get_search_pattern, search_pattern, pat.off.line, \
-                 pat.off.end, pat.off.off, false);
+  add_search_pattern(&wms->search_pattern, &get_search_pattern, false,
+                     search_last_used, search_highlighted);
 
   // Initialize substitute search pattern
-  ADD_SEARCH_PAT(get_substitute_pattern, sub_search_pattern, false, false, 0,
-                 true);
-#undef ADD_SEARCH_PAT
+  add_search_pattern(&wms->sub_search_pattern, &get_substitute_pattern, true,
+                     search_last_used, search_highlighted);
 
   // Initialize substitute replacement string
   {
@@ -2657,10 +2620,12 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
 
   // Initialize jump list
   const void *jump_iter = NULL;
+  setpcmark();
+  cleanup_jumplist();
   do {
     xfmark_T fm;
-    cleanup_jumplist();
     jump_iter = mark_jumplist_iter(jump_iter, curwin, &fm);
+
     const buf_T *const buf = (fm.fmark.fnum == 0
                               ? NULL
                               : buflist_findnr(fm.fmark.fnum));
@@ -2745,7 +2710,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer,
       if (name == NUL) {
         break;
       }
-      if (limit_reg_lines && reg.y_size > max_reg_lines) {
+      if (limit_reg_lines && reg.y_size > (size_t)max_reg_lines) {
         continue;
       }
       wms->registers[op_reg_index(name)] = (PossiblyFreedShadaEntry) {
@@ -2968,17 +2933,23 @@ int shada_write_file(const char *const file, bool nomerge)
 
   char *const fname = shada_filename(file);
   char *tempname = NULL;
-  ShaDaWriteDef sd_writer = (ShaDaWriteDef) {
+  ShaDaWriteDef sd_writer = {
     .write = &write_file,
     .close = &close_sd_writer,
     .error = NULL,
   };
-  ShaDaReadDef sd_reader;
-
-  intptr_t fd;
+  ShaDaReadDef sd_reader = { .close = NULL };
 
   if (!nomerge) {
-    if (open_shada_file_for_reading(fname, &sd_reader) != 0) {
+    int error;
+    if ((error = open_shada_file_for_reading(fname, &sd_reader)) != 0) {
+      if (error != UV_ENOENT) {
+        emsgf(_(SERR "System error while opening ShaDa file %s for reading "
+                "to merge before writing it: %s"),
+              fname, os_strerror(error));
+        // Try writing the file even if opening it emerged any issues besides
+        // file not existing: maybe writing will succeed nevertheless.
+      }
       nomerge = true;
       goto shada_write_file_nomerge;
     }
@@ -2996,15 +2967,11 @@ int shada_write_file(const char *const file, bool nomerge)
     // 2: Make sure that user can always read and write the result.
     // 3: If somebody happened to delete the file after it was opened for
     //    reading use u=rw permissions.
-shada_write_file_open:
-    fd = (intptr_t) open_file(tempname, O_CREAT|O_WRONLY|O_NOFOLLOW|O_EXCL,
-                              perm);
-    if (fd < 0) {
-      if (fd == UV_EEXIST
-#ifdef ELOOP
-          || fd == UV_ELOOP
-#endif
-          ) {
+shada_write_file_open: {}
+    sd_writer.cookie = file_open_new(
+        &error, tempname, kFileCreateOnly|kFileNoSymlink, perm);
+    if (sd_writer.cookie == NULL) {
+      if (error == UV_EEXIST || error == UV_ELOOP) {
         // File already exists, try another name
         char *const wp = tempname + strlen(tempname) - 1;
         if (*wp == 'z') {
@@ -3014,11 +2981,16 @@ shada_write_file_open:
                 fname);
           xfree(fname);
           xfree(tempname);
+          assert(sd_reader.close != NULL);
+          sd_reader.close(&sd_reader);
           return FAIL;
         } else {
           (*wp)++;
           goto shada_write_file_open;
         }
+      } else {
+        emsgf(_(SERR "System error while opening temporary ShaDa file %s "
+                "for writing: %s"), tempname, os_strerror(error));
       }
     }
   }
@@ -3042,23 +3014,29 @@ shada_write_file_nomerge: {}
       }
       *tail = tail_save;
     }
-    fd = (intptr_t) open_file(fname, O_CREAT|O_WRONLY|O_TRUNC,
-                              0600);
-  }
-
-  if (p_verbose > 0) {
-    verbose_enter();
-    smsg(_("Writing ShaDa file \"%s\""), fname);
-    verbose_leave();
+    int error;
+    sd_writer.cookie = file_open_new(&error, fname, kFileCreate|kFileTruncate,
+                                     0600);
+    if (sd_writer.cookie == NULL) {
+      emsgf(_(SERR "System error while opening ShaDa file %s for writing: %s"),
+            fname, os_strerror(error));
+    }
   }
 
-  if (fd < 0) {
+  if (sd_writer.cookie == NULL) {
     xfree(fname);
     xfree(tempname);
+    if (sd_reader.cookie != NULL) {
+      sd_reader.close(&sd_reader);
+    }
     return FAIL;
   }
 
-  sd_writer.cookie = (void *) fd;
+  if (p_verbose > 0) {
+    verbose_enter();
+    smsg(_("Writing ShaDa file \"%s\""), fname);
+    verbose_leave();
+  }
 
   convert_setup(&sd_writer.sd_conv, p_enc, "utf-8");
 
@@ -3066,15 +3044,11 @@ shada_write_file_nomerge: {}
                                                            ? NULL
                                                            : &sd_reader));
   assert(sw_ret != kSDWriteIgnError);
-#ifndef UNIX
-  sd_writer.close(&sd_writer);
-#endif
   if (!nomerge) {
     sd_reader.close(&sd_reader);
     bool did_remove = false;
     if (sw_ret == kSDWriteSuccessfull) {
 #ifdef UNIX
-      bool closed = false;
       // For Unix we check the owner of the file.  It's not very nice to
       // overwrite a user’s viminfo file after a "su root", with a
       // viminfo file that the user can't read.
@@ -3083,16 +3057,15 @@ shada_write_file_nomerge: {}
         if (getuid() == ROOT_UID) {
           if (old_info.stat.st_uid != ROOT_UID
               || old_info.stat.st_gid != getgid()) {
-            const uv_uid_t old_uid = (uv_uid_t) old_info.stat.st_uid;
-            const uv_gid_t old_gid = (uv_gid_t) old_info.stat.st_gid;
-            const int fchown_ret = os_fchown((int) fd, old_uid, old_gid);
-            sd_writer.close(&sd_writer);
+            const uv_uid_t old_uid = (uv_uid_t)old_info.stat.st_uid;
+            const uv_gid_t old_gid = (uv_gid_t)old_info.stat.st_gid;
+            const int fchown_ret = os_fchown(file_fd(sd_writer.cookie),
+                                             old_uid, old_gid);
             if (fchown_ret != 0) {
               EMSG3(_(RNERR "Failed setting uid and gid for file %s: %s"),
                     tempname, os_strerror(fchown_ret));
               goto shada_write_file_did_not_remove;
             }
-            closed = true;
           }
         } else if (!(old_info.stat.st_uid == getuid()
                      ? (old_info.stat.st_mode & 0200)
@@ -3100,13 +3073,9 @@ shada_write_file_nomerge: {}
                         ? (old_info.stat.st_mode & 0020)
                         : (old_info.stat.st_mode & 0002)))) {
           EMSG2(_("E137: ShaDa file is not writable: %s"), fname);
-          sd_writer.close(&sd_writer);
           goto shada_write_file_did_not_remove;
         }
       }
-      if (!closed) {
-        sd_writer.close(&sd_writer);
-      }
 #endif
       if (vim_rename(tempname, fname) == -1) {
         EMSG3(_(RNERR "Can't rename ShaDa file from %s to %s!"),
@@ -3133,6 +3102,7 @@ shada_write_file_did_not_remove:
     }
     xfree(tempname);
   }
+  sd_writer.close(&sd_writer);
 
   xfree(fname);
   return OK;
@@ -3262,20 +3232,20 @@ static ShaDaReadResult fread_len(ShaDaReadDef *const sd_reader,
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
   const ptrdiff_t read_bytes = sd_reader->read(sd_reader, buffer, length);
-  (void) read_bytes;
 
-  if (sd_reader->error != NULL) {
-    emsgf(_(SERR "System error while reading ShaDa file: %s"),
-          sd_reader->error);
-    return kSDReadStatusReadError;
-  } else if (sd_reader->eof) {
-    emsgf(_(RCERR "Error while reading ShaDa file: "
-            "last entry specified that it occupies %" PRIu64 " bytes, "
-            "but file ended earlier"),
-          (uint64_t) length);
-    return kSDReadStatusNotShaDa;
+  if (read_bytes != (ptrdiff_t)length) {
+    if (sd_reader->error != NULL) {
+      emsgf(_(SERR "System error while reading ShaDa file: %s"),
+            sd_reader->error);
+      return kSDReadStatusReadError;
+    } else {
+      emsgf(_(RCERR "Error while reading ShaDa file: "
+              "last entry specified that it occupies %" PRIu64 " bytes, "
+              "but file ended earlier"),
+            (uint64_t)length);
+      return kSDReadStatusNotShaDa;
+    }
   }
-  assert(read_bytes >= 0 && (size_t) read_bytes == length);
   return kSDReadStatusSuccess;
 }
 
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 0acaa9ae2b..7e0bbd6ad1 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -45,6 +45,9 @@
 // Use SPELL_PRINTTREE for debugging: dump the word tree after adding a word.
 // Only use it for small word lists!
 
+// Use SPELL_COMPRESS_ALLWAYS for debugging: compress the word tree after
+// adding a word.  Only use it for small word lists!
+
 // Use DEBUG_TRIEWALK to print the changes made in suggest_trie_walk() for a
 // specific word.
 
@@ -156,6 +159,8 @@
 //
 // sectionID == SN_NOSPLITSUGS: nothing
 //
+// sectionID == SN_NOCOMPOUNDSUGS: nothing
+//
 // sectionID == SN_WORDS: <word> ...
 // <word>        N bytes    NUL terminated common word
 //
@@ -287,6 +292,9 @@
 #include <stdlib.h>
 #include <wctype.h>
 
+/* for offsetof() */
+#include <stddef.h>
+
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/spell.h"
@@ -307,7 +315,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/garray.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
@@ -482,7 +489,7 @@ struct slang_S {
   regprog_T   **sl_prefprog;    // table with regprogs for prefixes
 
   garray_T sl_rep;              // list of fromto_T entries from REP lines
-  short sl_rep_first[256];          // indexes where byte first appears, -1 if
+  int16_t sl_rep_first[256];        // indexes where byte first appears, -1 if
                                     // there is none
   garray_T sl_sal;              // list of salitem_T entries from SAL lines
   salfirst_T sl_sal_first[256];     // indexes where byte first appears, -1 if
@@ -494,8 +501,9 @@ struct slang_S {
                                 // "sl_sal_first" maps chars, when has_mbyte
                                 // "sl_sal" is a list of wide char lists.
   garray_T sl_repsal;           // list of fromto_T entries from REPSAL lines
-  short sl_repsal_first[256];   // sl_rep_first for REPSAL lines
-  bool sl_nosplitsugs;           // don't suggest splitting a word
+  int16_t sl_repsal_first[256];    // sl_rep_first for REPSAL lines
+  bool sl_nosplitsugs;          // don't suggest splitting a word
+  bool sl_nocompoundsugs;       // don't suggest compounding
 
   // Info from the .sug file.  Loaded on demand.
   time_t sl_sugtime;            // timestamp for .sug file
@@ -558,6 +566,7 @@ typedef struct langp_S {
 #define SN_WORDS        13      // common words
 #define SN_NOSPLITSUGS  14      // don't split word for suggestions
 #define SN_INFO         15      // info section
+#define SN_NOCOMPOUNDSUGS 16    // don't compound for suggestions
 #define SN_END          255     // end of sections
 
 #define SNF_REQUIRED    1       // <sectionflags>: required section
@@ -577,9 +586,8 @@ typedef struct wordcount_S {
   char_u wc_word[1];                // word, actually longer
 } wordcount_T;
 
-static wordcount_T dumwc;
-#define WC_KEY_OFF  (unsigned)(dumwc.wc_word - (char_u *)&dumwc)
-#define HI2WC(hi)     ((wordcount_T *)((hi)->hi_key - WC_KEY_OFF))
+#define WC_KEY_OFF   offsetof(wordcount_T, wc_word)
+#define HI2WC(hi)    ((wordcount_T *)((hi)->hi_key - WC_KEY_OFF))
 #define MAXWORDCOUNT 0xffff
 
 // Information used when looking for suggestions.
@@ -948,6 +956,7 @@ typedef struct spellinfo_S {
   char_u      *si_sofoto;       // SOFOTO text
   int si_nosugfile;             // NOSUGFILE item found
   int si_nosplitsugs;           // NOSPLITSUGS item found
+  int si_nocompoundsugs;        // NOCOMPOUNDSUGS item found
   int si_followup;              // soundsalike: ?
   int si_collapse;              // soundsalike: ?
   hashtab_T si_commonwords;     // hashtable for common words
@@ -2309,16 +2318,14 @@ static void spell_load_lang(char_u *lang)
   for (round = 1; round <= 2; ++round) {
     // Find the first spell file for "lang" in 'runtimepath' and load it.
     vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
-        "spell/%s.%s.spl",
-        lang, spell_enc());
-    r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+                 "spell/%s.%s.spl", lang, spell_enc());
+    r = do_in_runtimepath(fname_enc, 0, spell_load_cb, &sl);
 
     if (r == FAIL && *sl.sl_lang != NUL) {
       // Try loading the ASCII version.
       vim_snprintf((char *)fname_enc, sizeof(fname_enc) - 5,
-          "spell/%s.ascii.spl",
-          lang);
-      r = do_in_runtimepath(fname_enc, FALSE, spell_load_cb, &sl);
+                   "spell/%s.ascii.spl", lang);
+      r = do_in_runtimepath(fname_enc, 0, spell_load_cb, &sl);
 
       if (r == FAIL && *sl.sl_lang != NUL && round == 1
           && apply_autocmds(EVENT_SPELLFILEMISSING, lang,
@@ -2346,7 +2353,7 @@ static void spell_load_lang(char_u *lang)
   } else if (sl.sl_slang != NULL) {
     // At least one file was loaded, now load ALL the additions.
     STRCPY(fname_enc + STRLEN(fname_enc) - 3, "add.spl");
-    do_in_runtimepath(fname_enc, TRUE, spell_load_cb, &sl);
+    do_in_runtimepath(fname_enc, DIP_ALL, spell_load_cb, &sl);
   }
 }
 
@@ -2666,7 +2673,11 @@ spell_load_file (
       break;
 
     case SN_NOSPLITSUGS:
-      lp->sl_nosplitsugs = true;                        // <timestamp>
+      lp->sl_nosplitsugs = true;
+      break;
+
+    case SN_NOCOMPOUNDSUGS:
+      lp->sl_nocompoundsugs = true;
       break;
 
     case SN_COMPOUND:
@@ -2868,7 +2879,7 @@ static int read_prefcond_section(FILE *fd, slang_T *lp)
 
 // Read REP or REPSAL items section from "fd": <repcount> <rep> ...
 // Return SP_*ERROR flags.
-static int read_rep_section(FILE *fd, garray_T *gap, short *first)
+static int read_rep_section(FILE *fd, garray_T *gap, int16_t *first)
 {
   int cnt;
   fromto_T    *ftp;
@@ -4266,9 +4277,9 @@ static void spell_print_node(wordnode_T *node, int depth)
     PRINTSOME(line1, depth, "(%d)", node->wn_nr, 0);
     PRINTSOME(line2, depth, "    ", 0, 0);
     PRINTSOME(line3, depth, "    ", 0, 0);
-    msg(line1);
-    msg(line2);
-    msg(line3);
+    msg((char_u *)line1);
+    msg((char_u *)line2);
+    msg((char_u *)line3);
   } else {
     node->wn_u1.index = TRUE;
 
@@ -4289,9 +4300,9 @@ static void spell_print_node(wordnode_T *node, int depth)
       PRINTSOME(line3, depth, "      ", 0, 0);
 
     if (node->wn_byte == NUL) {
-      msg(line1);
-      msg(line2);
-      msg(line3);
+      msg((char_u *)line1);
+      msg((char_u *)line2);
+      msg((char_u *)line3);
     }
 
     // do the children
@@ -4633,6 +4644,8 @@ static afffile_T *spell_read_aff(spellinfo_T *spin, char_u *fname)
         spin->si_nobreak = true;
       } else if (is_aff_rule(items, itemcnt, "NOSPLITSUGS", 1))   {
         spin->si_nosplitsugs = true;
+      } else if (is_aff_rule(items, itemcnt, "NOCOMPOUNDSUGS", 1)) {
+        spin->si_nocompoundsugs = true;
       } else if (is_aff_rule(items, itemcnt, "NOSUGFILE", 1))   {
         spin->si_nosugfile = true;
       } else if (is_aff_rule(items, itemcnt, "PFXPOSTPONE", 1))   {
@@ -6289,7 +6302,7 @@ static int tree_add_word(spellinfo_T *spin, char_u *word, wordnode_T *root, int
     node = *prev;
   }
 #ifdef SPELL_PRINTTREE
-  smsg("Added \"%s\"", word);
+  smsg((char_u *)"Added \"%s\"", word);
   spell_print_tree(root->wn_sibling);
 #endif
 
@@ -6312,8 +6325,8 @@ static int tree_add_word(spellinfo_T *spin, char_u *word, wordnode_T *root, int
   // 3. When compressed before, added "compress_added" words
   //    (si_compress_cnt == 1) and the number of free nodes drops below the
   //    maximum word length.
-#ifndef SPELL_PRINTTREE
-  if (spin->si_compress_cnt == 1
+#ifndef SPELL_COMPRESS_ALLWAYS
+  if (spin->si_compress_cnt == 1       // NOLINT(readability/braces)
       ? spin->si_free_count < MAXWLEN
                               : spin->si_blocks_cnt >= compress_start)
 #endif
@@ -6857,6 +6870,15 @@ static int write_vim_spell(spellinfo_T *spin, char_u *fname)
     put_bytes(fd, 0, 4);                                // <sectionlen>
   }
 
+  // SN_NOCOMPUNDSUGS: nothing
+  // This is used to notify that no suggestions with compounds are to be
+  // made.
+  if (spin->si_nocompoundsugs) {
+    putc(SN_NOCOMPOUNDSUGS, fd);                        // <sectionID>
+    putc(0, fd);                                        // <sectionflags>
+    put_bytes(fd, 0, 4);                                // <sectionlen>
+  }
+
   // SN_COMPOUND: compound info.
   // We don't mark it required, when not supported all compound words will
   // be bad words.
@@ -7607,7 +7629,7 @@ mkspell (
   else {
     // Check for overwriting before doing things that may take a lot of
     // time.
-    if (!over_write && os_file_exists(wfname)) {
+    if (!over_write && os_path_exists(wfname)) {
       EMSG(_(e_exists));
       goto theend;
     }
@@ -7663,7 +7685,7 @@ mkspell (
       spin.si_region = 1 << i;
 
       vim_snprintf((char *)fname, MAXPATHL, "%s.aff", innames[i]);
-      if (os_file_exists(fname)) {
+      if (os_path_exists(fname)) {
         // Read the .aff file.  Will init "spin->si_conv" based on the
         // "SET" line.
         afile[i] = spell_read_aff(&spin, fname);
@@ -9246,9 +9268,7 @@ static void allcap_copy(char_u *word, char_u *wcopy)
     else
       c = *s++;
 
-    // We only change 0xdf to SS when we are certain latin1 is used.  It
-    // would cause weird errors in other 8-bit encodings.
-    if (enc_latin1like && c == 0xdf) {
+    if (c == 0xdf) {
       c = 'S';
       if (d - wcopy >= MAXWLEN - 1)
         break;
@@ -9296,7 +9316,56 @@ static void suggest_try_special(suginfo_T *su)
   }
 }
 
+// Measure how much time is spent in each state.
+// Output is dumped in "suggestprof".
+
+#ifdef SUGGEST_PROFILE
+proftime_T current;
+proftime_T total;
+proftime_T times[STATE_FINAL + 1];
+long counts[STATE_FINAL + 1];
+
+  static void
+prof_init(void)
+{
+  for (int i = 0; i <= STATE_FINAL; i++) {
+    profile_zero(&times[i]);
+    counts[i] = 0;
+  }
+  profile_start(&current);
+  profile_start(&total);
+}
+
+// call before changing state
+  static void
+prof_store(state_T state)
+{
+  profile_end(&current);
+  profile_add(&times[state], &current);
+  counts[state]++;
+  profile_start(&current);
+}
+# define PROF_STORE(state) prof_store(state);
+
+  static void
+prof_report(char *name)
+{
+  FILE *fd = fopen("suggestprof", "a");
+
+  profile_end(&total);
+  fprintf(fd, "-----------------------\n");
+  fprintf(fd, "%s: %s\n", name, profile_msg(&total));
+  for (int i = 0; i <= STATE_FINAL; i++) {
+    fprintf(fd, "%d: %s ("%" PRId64)\n", i, profile_msg(&times[i]), counts[i]);
+  }
+  fclose(fd);
+}
+#else
+# define PROF_STORE(state)
+#endif
+
 // Try finding suggestions by adding/removing/swapping letters.
+
 static void suggest_try_change(suginfo_T *su)
 {
   char_u fword[MAXWLEN];            // copy of the bad word, case-folded
@@ -9321,7 +9390,14 @@ static void suggest_try_change(suginfo_T *su)
       continue;
 
     // Try it for this language.  Will add possible suggestions.
+    //
+#ifdef SUGGEST_PROFILE
+    prof_init();
+#endif
     suggest_trie_walk(su, lp, fword, false);
+#ifdef SUGGEST_PROFILE
+    prof_report("try_change");
+#endif
   }
 }
 
@@ -9455,6 +9531,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 
         // Always past NUL bytes now.
         n = (int)sp->ts_state;
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_ENDNUL;
         sp->ts_save_badflags = su->su_badflags;
 
@@ -9494,6 +9571,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 
       if (sp->ts_curi > len || byts[arridx] != 0) {
         // Past bytes in node and/or past NUL bytes.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_ENDNUL;
         sp->ts_save_badflags = su->su_badflags;
         break;
@@ -9771,6 +9849,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
         //    be possible to compound another (short) word.
         try_compound = false;
         if (!soundfold
+            && !slang->sl_nocompoundsugs
             && slang->sl_compprog != NULL
             && ((unsigned)flags >> 24) != 0
             && sp->ts_twordlen - sp->ts_splitoff
@@ -9791,21 +9870,21 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 
         // For NOBREAK we never try splitting, it won't make any word
         // valid.
-        if (slang->sl_nobreak)
+        if (slang->sl_nobreak && !slang->sl_nocompoundsugs) {
           try_compound = true;
-
-        // If we could add a compound word, and it's also possible to
-        // split at this point, do the split first and set
-        // TSF_DIDSPLIT to avoid doing it again.
-        else if (!fword_ends
-                 && try_compound
-                 && (sp->ts_flags & TSF_DIDSPLIT) == 0) {
+        } else if (!fword_ends
+                   && try_compound
+                   && (sp->ts_flags & TSF_DIDSPLIT) == 0) {
+          // If we could add a compound word, and it's also possible to
+          // split at this point, do the split first and set
+          // TSF_DIDSPLIT to avoid doing it again.
           try_compound = false;
           sp->ts_flags |= TSF_DIDSPLIT;
           --sp->ts_curi;                    // do the same NUL again
           compflags[sp->ts_complen] = NUL;
-        } else
+        } else {
           sp->ts_flags &= ~TSF_DIDSPLIT;
+        }
 
         if (try_split || try_compound) {
           if (!try_compound && (!fword_ends || !goodword_ends)) {
@@ -9846,6 +9925,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 #endif
             // Save things to be restored at STATE_SPLITUNDO.
             sp->ts_save_badflags = su->su_badflags;
+            PROF_STORE(sp->ts_state)
             sp->ts_state = STATE_SPLITUNDO;
 
             ++depth;
@@ -9912,6 +9992,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
               byts = pbyts;
               idxs = pidxs;
               sp->ts_prefixdepth = PFD_PREFIXTREE;
+              PROF_STORE(sp->ts_state)
               sp->ts_state = STATE_NOPREFIX;
             }
           }
@@ -9924,6 +10005,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       su->su_badflags = sp->ts_save_badflags;
 
       // Continue looking for NUL bytes.
+      PROF_STORE(sp->ts_state)
       sp->ts_state = STATE_START;
 
       // In case we went into the prefix tree.
@@ -9938,9 +10020,11 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
           && sp->ts_tcharlen == 0
           ) {
         // The badword ends, can't use STATE_PLAIN.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_DEL;
         break;
       }
+      PROF_STORE(sp->ts_state)
       sp->ts_state = STATE_PLAIN;
     // FALLTHROUGH
 
@@ -9951,10 +10035,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       if (sp->ts_curi > byts[arridx]) {
         // Done all bytes at this node, do next state.  When still at
         // already changed bytes skip the other tricks.
-        if (sp->ts_fidx >= sp->ts_fidxtry)
+        PROF_STORE(sp->ts_state)
+        if (sp->ts_fidx >= sp->ts_fidxtry) {
           sp->ts_state = STATE_DEL;
-        else
+        } else {
           sp->ts_state = STATE_FINAL;
+        }
       } else {
         arridx += sp->ts_curi++;
         c = byts[arridx];
@@ -10086,10 +10172,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       // When past the first byte of a multi-byte char don't try
       // delete/insert/swap a character.
       if (has_mbyte && sp->ts_tcharlen > 0) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_FINAL;
         break;
       }
       // Try skipping one character in the bad word (delete it).
+      PROF_STORE(sp->ts_state)
       sp->ts_state = STATE_INS_PREP;
       sp->ts_curi = 1;
       if (soundfold && sp->ts_fidx == 0 && fword[sp->ts_fidx] == '*')
@@ -10137,6 +10225,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       if (sp->ts_flags & TSF_DIDDEL) {
         // If we just deleted a byte then inserting won't make sense,
         // a substitute is always cheaper.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_SWAP;
         break;
       }
@@ -10146,11 +10235,13 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       for (;; ) {
         if (sp->ts_curi > byts[n]) {
           // Only NUL bytes at this node, go to next state.
+          PROF_STORE(sp->ts_state)
           sp->ts_state = STATE_SWAP;
           break;
         }
         if (byts[n + sp->ts_curi] != NUL) {
           // Found a byte to insert.
+          PROF_STORE(sp->ts_state)
           sp->ts_state = STATE_INS;
           break;
         }
@@ -10166,6 +10257,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       n = sp->ts_arridx;
       if (sp->ts_curi > byts[n]) {
         // Done all bytes at this node, go to next state.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_SWAP;
         break;
       }
@@ -10226,6 +10318,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       c = *p;
       if (c == NUL) {
         // End of word, can't swap or replace.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_FINAL;
         break;
       }
@@ -10233,6 +10326,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       // Don't swap if the first character is not a word character.
       // SWAP3 etc. also don't make sense then.
       if (!soundfold && !spell_iswordp(p, curwin)) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
         break;
       }
@@ -10257,6 +10351,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 
       // When the second character is NUL we can't swap.
       if (c2 == NUL) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
         break;
       }
@@ -10264,6 +10359,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       // When characters are identical, swap won't do anything.
       // Also get here if the second char is not a word character.
       if (c == c2) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_SWAP3;
         break;
       }
@@ -10274,6 +10370,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
             sp->ts_twordlen, tword, fword + sp->ts_fidx,
             c, c2);
 #endif
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_UNSWAP;
         ++depth;
         if (has_mbyte) {
@@ -10288,6 +10385,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
         }
       } else
         // If this swap doesn't work then SWAP3 won't either.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
       break;
 
@@ -10335,6 +10433,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       // Also get here when the third character is not a word character.
       // Second character may any char: "a.b" -> "b.a"
       if (c == c3 || c3 == NUL) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
         break;
       }
@@ -10345,6 +10444,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
             sp->ts_twordlen, tword, fword + sp->ts_fidx,
             c, c3);
 #endif
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_UNSWAP3;
         ++depth;
         if (has_mbyte) {
@@ -10358,8 +10458,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
           p[2] = c;
           stack[depth].ts_fidxtry = sp->ts_fidx + 3;
         }
-      } else
+      } else {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
+      }
       break;
 
     case STATE_UNSWAP3:
@@ -10385,6 +10487,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       if (!soundfold && !spell_iswordp(p, curwin)) {
         // Middle char is not a word char, skip the rotate.  First and
         // third char were already checked at swap and swap3.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
         break;
       }
@@ -10399,6 +10502,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
             sp->ts_twordlen, tword, fword + sp->ts_fidx,
             p[0], p[1], p[2]);
 #endif
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_UNROT3L;
         ++depth;
         p = fword + sp->ts_fidx;
@@ -10417,8 +10521,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
           p[2] = c;
           stack[depth].ts_fidxtry = sp->ts_fidx + 3;
         }
-      } else
+      } else {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
+      }
       break;
 
     case STATE_UNROT3L:
@@ -10448,6 +10554,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
             sp->ts_twordlen, tword, fword + sp->ts_fidx,
             p[0], p[1], p[2]);
 #endif
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_UNROT3R;
         ++depth;
         p = fword + sp->ts_fidx;
@@ -10466,8 +10573,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
           *p = c;
           stack[depth].ts_fidxtry = sp->ts_fidx + 3;
         }
-      } else
+      } else {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_REP_INI;
+      }
       break;
 
     case STATE_UNROT3R:
@@ -10497,6 +10606,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
       if ((lp->lp_replang == NULL && !soundfold)
           || sp->ts_score + SCORE_REP >= su->su_maxscore
           || sp->ts_fidx < sp->ts_fidxtry) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_FINAL;
         break;
       }
@@ -10509,10 +10619,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
         sp->ts_curi = lp->lp_replang->sl_rep_first[fword[sp->ts_fidx]];
 
       if (sp->ts_curi < 0) {
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_FINAL;
         break;
       }
 
+      PROF_STORE(sp->ts_state)
       sp->ts_state = STATE_REP;
     // FALLTHROUGH
 
@@ -10542,6 +10654,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
               ftp->ft_from, ftp->ft_to);
 #endif
           // Need to undo this afterwards.
+          PROF_STORE(sp->ts_state)
           sp->ts_state = STATE_REP_UNDO;
 
           // Change the "from" to the "to" string.
@@ -10561,6 +10674,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
 
       if (sp->ts_curi >= gap->ga_len && sp->ts_state == STATE_REP)
         // No (more) matches.
+        PROF_STORE(sp->ts_state)
         sp->ts_state = STATE_FINAL;
 
       break;
@@ -10580,6 +10694,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
         repextra -= tl - fl;
       }
       memmove(p, ftp->ft_from, fl);
+      PROF_STORE(sp->ts_state)
       sp->ts_state = STATE_REP;
       break;
 
@@ -10990,7 +11105,13 @@ static void suggest_try_soundalike(suginfo_T *su)
       // try all kinds of inserts/deletes/swaps/etc.
       // TODO: also soundfold the next words, so that we can try joining
       // and splitting
+#ifdef SUGGEST_PROFILE
+      prof_init();
+#endif
       suggest_trie_walk(su, lp, salword, true);
+#ifdef SUGGEST_PROFILE
+      prof_report("soundalike");
+#endif
     }
   }
 }
@@ -12481,7 +12602,7 @@ static int spell_edit_score(slang_T *slang, char_u *badword, char_u *goodword)
   char_u      *p;
   int wbadword[MAXWLEN];
   int wgoodword[MAXWLEN];
-  const int l_has_mbyte = has_mbyte;
+  const bool l_has_mbyte = has_mbyte;
 
   if (l_has_mbyte) {
     // Get the characters from the multi-byte strings and put them in an
@@ -13041,7 +13162,7 @@ spell_dump_compl (
           // Done all bytes at this node, go up one level.
           --depth;
           line_breakcheck();
-          ins_compl_check_keys(50);
+          ins_compl_check_keys(50, false);
         } else {
           // Do one more byte at this node.
           n = arridx[depth] + curi[depth];
@@ -13340,3 +13461,4 @@ int expand_spelling(linenr_T lnum, char_u *pat, char_u ***matchp)
   return ga.ga_len;
 }
 
+
diff --git a/src/nvim/state.c b/src/nvim/state.c
index b2f3f0bebe..44c6441e40 100644
--- a/src/nvim/state.c
+++ b/src/nvim/state.c
@@ -2,9 +2,12 @@
 
 #include "nvim/lib/kvec.h"
 
+#include "nvim/ascii.h"
 #include "nvim/state.h"
 #include "nvim/vim.h"
+#include "nvim/main.h"
 #include "nvim/getchar.h"
+#include "nvim/option_defs.h"
 #include "nvim/ui.h"
 #include "nvim/os/input.h"
 
@@ -32,8 +35,8 @@ getkey:
       // processing. Characters can come from mappings, scripts and other
       // sources, so this scenario is very common.
       key = safe_vgetc();
-    } else if (!queue_empty(loop.events)) {
-      // Event was made available after the last queue_process_events call
+    } else if (!multiqueue_empty(main_loop.events)) {
+      // Event was made available after the last multiqueue_process_events call
       key = K_EVENT;
     } else {
       input_enable_events();
@@ -45,7 +48,7 @@ getkey:
       // directly.
       (void)os_inchar(NULL, 0, -1, 0);
       input_disable_events();
-      key = !queue_empty(loop.events) ? K_EVENT : safe_vgetc();
+      key = !multiqueue_empty(main_loop.events) ? K_EVENT : safe_vgetc();
     }
 
     if (key == K_EVENT) {
@@ -60,3 +63,35 @@ getkey:
     }
   }
 }
+
+/// Return TRUE if in the current mode we need to use virtual.
+int virtual_active(void)
+{
+  // While an operator is being executed we return "virtual_op", because
+  // VIsual_active has already been reset, thus we can't check for "block"
+  // being used.
+  if (virtual_op != MAYBE) {
+    return virtual_op;
+  }
+  return ve_flags == VE_ALL
+         || ((ve_flags & VE_BLOCK) && VIsual_active && VIsual_mode == Ctrl_V)
+         || ((ve_flags & VE_INSERT) && (State & INSERT));
+}
+
+/// VISUAL, SELECTMODE and OP_PENDING State are never set, they are equal to
+/// NORMAL State with a condition.  This function returns the real State.
+int get_real_state(void)
+{
+  if (State & NORMAL) {
+    if (VIsual_active) {
+      if (VIsual_select) {
+        return SELECTMODE;
+      }
+      return VISUAL;
+    } else if (finish_op) {
+      return OP_PENDING;
+    }
+  }
+  return State;
+}
+
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 37a0fb82da..b38d4f8a58 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -5,7 +5,6 @@
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/strings.h"
-#include "nvim/misc2.h"
 #include "nvim/file_search.h"
 #include "nvim/buffer.h"
 #include "nvim/charset.h"
@@ -52,15 +51,14 @@ char_u *vim_strsave(const char_u *string)
   return (char_u *)xstrdup((char *)string);
 }
 
-/*
- * Copy up to "len" bytes of "string" into newly allocated memory and
- * terminate with a NUL.
- * The allocated memory always has size "len + 1", also when "string" is
- * shorter.
- */
+/// Copy up to `len` bytes of `string` into newly allocated memory and
+/// terminate with a NUL. The allocated memory always has size `len + 1`, even
+/// when `string` is shorter.
 char_u *vim_strnsave(const char_u *string, size_t len)
   FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC FUNC_ATTR_NONNULL_ALL
 {
+  // strncpy is intentional: some parts of Vim use `string` shorter than `len`
+  // and expect the remainder to be zeroed out.
   return (char_u *)strncpy(xmallocz(len), (char *)string, len);
 }
 
@@ -345,24 +343,6 @@ void del_trailing_spaces(char_u *ptr)
     *q = NUL;
 }
 
-/*
- * Like strcat(), but make sure the result fits in "tosize" bytes and is
- * always NUL terminated.
- */
-void vim_strcat(char_u *restrict to, const char_u *restrict from,
-                size_t tosize)
-  FUNC_ATTR_NONNULL_ALL
-{
-  size_t tolen = STRLEN(to);
-  size_t fromlen = STRLEN(from);
-
-  if (tolen + fromlen + 1 > tosize) {
-    memcpy(to + tolen, from, tosize - tolen - 1);
-    to[tosize - 1] = NUL;
-  } else
-    STRCPY(to + tolen, from);
-}
-
 #if (!defined(HAVE_STRCASECMP) && !defined(HAVE_STRICMP))
 /*
  * Compare two strings, ignoring case, using current locale.
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 1f9dbd8228..37e5542dad 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -25,7 +25,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/keymap.h"
 #include "nvim/garray.h"
 #include "nvim/option.h"
@@ -393,7 +392,9 @@ void syntax_start(win_T *wp, linenr_T lnum)
    * Also do this when a change was made, the current state may be invalid
    * then.
    */
-  if (syn_block != wp->w_s || changedtick != syn_buf->b_changedtick) {
+  if (syn_block != wp->w_s
+      || syn_buf != wp->w_buffer
+      || changedtick != syn_buf->b_changedtick) {
     invalidate_current_state();
     syn_buf = wp->w_buffer;
     syn_block = wp->w_s;
@@ -812,19 +813,39 @@ static void syn_sync(win_T *wp, linenr_T start_lnum, synstate_T *last_valid)
   validate_current_state();
 }
 
+static void save_chartab(char_u *chartab)
+{
+  if (syn_block->b_syn_isk != empty_option) {
+    memmove(chartab, syn_buf->b_chartab, (size_t)32);
+    memmove(syn_buf->b_chartab, syn_win->w_s->b_syn_chartab, (size_t)32);
+  }
+}
+
+static void restore_chartab(char_u *chartab)
+{
+  if (syn_win->w_s->b_syn_isk != empty_option) {
+    memmove(syn_buf->b_chartab, chartab, (size_t)32);
+  }
+}
+
 /*
  * Return TRUE if the line-continuation pattern matches in line "lnum".
  */
 static int syn_match_linecont(linenr_T lnum)
 {
-  regmmatch_T regmatch;
-
   if (syn_block->b_syn_linecont_prog != NULL) {
+    regmmatch_T regmatch;
+    // chartab array for syn iskeyword
+    char_u buf_chartab[32];
+    save_chartab(buf_chartab);
+
     regmatch.rmm_ic = syn_block->b_syn_linecont_ic;
     regmatch.regprog = syn_block->b_syn_linecont_prog;
     int r = syn_regexec(&regmatch, lnum, (colnr_T)0,
                         IF_SYN_TIME(&syn_block->b_syn_linecont_time));
     syn_block->b_syn_linecont_prog = regmatch.regprog;
+
+    restore_chartab(buf_chartab);
     return r;
   }
   return FALSE;
@@ -1617,8 +1638,9 @@ syn_current_attr (
   lpos_T pos;
   int lc_col;
   reg_extmatch_T *cur_extmatch = NULL;
-  char_u      *line;            /* current line.  NOTE: becomes invalid after
-                                   looking for a pattern match! */
+  char_u      buf_chartab[32];  // chartab array for syn iskeyword
+  char_u      *line;            // current line.  NOTE: becomes invalid after
+                                // looking for a pattern match!
 
   /* variables for zero-width matches that have a "nextgroup" argument */
   int keep_next_list;
@@ -1668,6 +1690,9 @@ syn_current_attr (
    * avoid matching the same item in the same position twice. */
   ga_init(&zero_width_next_ga, (int)sizeof(int), 10);
 
+  // use syntax iskeyword option
+  save_chartab(buf_chartab);
+
   /*
    * Repeat matching keywords and patterns, to find contained items at the
    * same column.  This stops when there are no extra matches at the current
@@ -1992,6 +2017,8 @@ syn_current_attr (
 
   } while (found_match);
 
+  restore_chartab(buf_chartab);
+
   /*
    * Use attributes from the current state, if within its highlighting.
    * If not, use attributes from the current-but-one state, etc.
@@ -2522,7 +2549,8 @@ find_endpos (
   regmmatch_T best_regmatch;        /* startpos/endpos of best match */
   lpos_T pos;
   char_u      *line;
-  int had_match = FALSE;
+  int had_match = false;
+  char_u buf_chartab[32];  // chartab array for syn option iskeyword
 
   /* just in case we are invoked for a keyword */
   if (idx < 0)
@@ -2562,9 +2590,13 @@ find_endpos (
   unref_extmatch(re_extmatch_in);
   re_extmatch_in = ref_extmatch(start_ext);
 
-  matchcol = startpos->col;     /* start looking for a match at sstart */
-  start_idx = idx;              /* remember the first END pattern. */
-  best_regmatch.startpos[0].col = 0;            /* avoid compiler warning */
+  matchcol = startpos->col;     // start looking for a match at sstart
+  start_idx = idx;              // remember the first END pattern.
+  best_regmatch.startpos[0].col = 0;            // avoid compiler warning
+
+  // use syntax iskeyword option
+  save_chartab(buf_chartab);
+
   for (;; ) {
     /*
      * Find end pattern that matches first after "matchcol".
@@ -2707,6 +2739,8 @@ find_endpos (
   if (!had_match)
     m_endpos->lnum = 0;
 
+  restore_chartab(buf_chartab);
+
   /* Remove external matches. */
   unref_extmatch(re_extmatch_in);
   re_extmatch_in = NULL;
@@ -3027,6 +3061,46 @@ static void syn_cmd_spell(exarg_T *eap, int syncing)
   redraw_win_later(curwin, NOT_VALID);
 }
 
+/// Handle ":syntax iskeyword" command.
+static void syn_cmd_iskeyword(exarg_T *eap, int syncing)
+{
+  char_u *arg = eap->arg;
+  char_u save_chartab[32];
+  char_u *save_isk;
+
+  if (eap->skip) {
+    return;
+  }
+
+  arg = skipwhite(arg);
+  if (*arg == NUL) {
+    MSG_PUTS("\n");
+    MSG_PUTS(_("syntax iskeyword "));
+    if (curwin->w_s->b_syn_isk != empty_option) {
+      msg_outtrans(curwin->w_s->b_syn_isk);
+    } else {
+      msg_outtrans((char_u *)"not set");
+    }
+  } else {
+    if (STRNICMP(arg, "clear", 5) == 0) {
+      memmove(curwin->w_s->b_syn_chartab, curbuf->b_chartab, (size_t)32);
+      clear_string_option(&curwin->w_s->b_syn_isk);
+    } else {
+      memmove(save_chartab, curbuf->b_chartab, (size_t)32);
+      save_isk = curbuf->b_p_isk;
+      curbuf->b_p_isk = vim_strsave(arg);
+
+      buf_init_chartab(curbuf, false);
+      memmove(curwin->w_s->b_syn_chartab, curbuf->b_chartab, (size_t)32);
+      memmove(curbuf->b_chartab, save_chartab, (size_t)32);
+      clear_string_option(&curwin->w_s->b_syn_isk);
+      curwin->w_s->b_syn_isk = curbuf->b_p_isk;
+      curbuf->b_p_isk = save_isk;
+    }
+  }
+  redraw_win_later(curwin, NOT_VALID);
+}
+
 /*
  * Clear all syntax info for one buffer.
  */
@@ -3065,6 +3139,7 @@ void syntax_clear(synblock_T *block)
   xfree(block->b_syn_linecont_pat);
   block->b_syn_linecont_pat = NULL;
   block->b_syn_folditems = 0;
+  clear_string_option(&block->b_syn_isk);
 
   /* free the stored states */
   syn_stack_free_all(block);
@@ -3107,6 +3182,7 @@ static void syntax_sync_clear(void)
   curwin->w_s->b_syn_linecont_prog = NULL;
   xfree(curwin->w_s->b_syn_linecont_pat);
   curwin->w_s->b_syn_linecont_pat = NULL;
+  clear_string_option(&curwin->w_s->b_syn_isk);
 
   syn_stack_free_all(curwin->w_s);              /* Need to recompute all syntax. */
 }
@@ -3266,6 +3342,7 @@ static void syn_cmd_enable(exarg_T *eap, int syncing)
 
 /*
  * Handle ":syntax reset" command.
+ * It actually resets highlighting, not syntax.
  */
 static void syn_cmd_reset(exarg_T *eap, int syncing)
 {
@@ -3300,7 +3377,7 @@ static void syn_cmd_onoff(exarg_T *eap, char *name)
   eap->nextcmd = check_nextcmd(eap->arg);
   if (!eap->skip) {
     char buf[100];
-    strncpy(buf, "so ", 4);
+    memcpy(buf, "so ", 4);
     vim_snprintf(buf + 3, sizeof(buf) - 3, SYNTAX_FNAME, name);
     do_cmdline_cmd(buf);
   }
@@ -4131,9 +4208,10 @@ static void syn_cmd_include(exarg_T *eap, int syncing)
   current_syn_inc_tag = ++running_syn_inc_tag;
   prev_toplvl_grp = curwin->w_s->b_syn_topgrp;
   curwin->w_s->b_syn_topgrp = sgl_id;
-  if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL
-      : source_runtime(eap->arg, TRUE) == FAIL)
+  if (source ? do_source(eap->arg, false, DOSO_NONE) == FAIL
+             : source_runtime(eap->arg, DIP_ALL) == FAIL) {
     EMSG2(_(e_notopen), eap->arg);
+  }
   curwin->w_s->b_syn_topgrp = prev_toplvl_grp;
   current_syn_inc_tag = prev_syn_inc_tag;
 }
@@ -5363,24 +5441,25 @@ struct subcommand {
 
 static struct subcommand subcommands[] =
 {
-  {"case",            syn_cmd_case},
-  {"clear",           syn_cmd_clear},
-  {"cluster",         syn_cmd_cluster},
-  {"conceal",         syn_cmd_conceal},
-  {"enable",          syn_cmd_enable},
-  {"include",         syn_cmd_include},
-  {"keyword",         syn_cmd_keyword},
-  {"list",            syn_cmd_list},
-  {"manual",          syn_cmd_manual},
-  {"match",           syn_cmd_match},
-  {"on",              syn_cmd_on},
-  {"off",             syn_cmd_off},
-  {"region",          syn_cmd_region},
-  {"reset",           syn_cmd_reset},
-  {"spell",           syn_cmd_spell},
-  {"sync",            syn_cmd_sync},
-  {"",                syn_cmd_list},
-  {NULL, NULL}
+  { "case",      syn_cmd_case },
+  { "clear",     syn_cmd_clear },
+  { "cluster",   syn_cmd_cluster },
+  { "conceal",   syn_cmd_conceal },
+  { "enable",    syn_cmd_enable },
+  { "include",   syn_cmd_include },
+  { "iskeyword", syn_cmd_iskeyword },
+  { "keyword",   syn_cmd_keyword },
+  { "list",      syn_cmd_list },
+  { "manual",    syn_cmd_manual },
+  { "match",     syn_cmd_match },
+  { "on",        syn_cmd_on },
+  { "off",       syn_cmd_off },
+  { "region",    syn_cmd_region },
+  { "reset",     syn_cmd_reset },
+  { "spell",     syn_cmd_spell },
+  { "sync",      syn_cmd_sync },
+  { "",          syn_cmd_list },
+  { NULL, NULL }
 };
 
 /*
@@ -5434,6 +5513,7 @@ void ex_ownsyntax(exarg_T *eap)
     clear_string_option(&curwin->w_s->b_p_spc);
     clear_string_option(&curwin->w_s->b_p_spf);
     clear_string_option(&curwin->w_s->b_p_spl);
+    clear_string_option(&curwin->w_s->b_syn_isk);
   }
 
   /* save value of b:current_syntax */
@@ -5459,7 +5539,7 @@ void ex_ownsyntax(exarg_T *eap)
   }
 }
 
-int syntax_present(win_T *win)
+bool syntax_present(win_T *win)
 {
   return win->w_s->b_syn_patterns.ga_len != 0
          || win->w_s->b_syn_clusters.ga_len != 0
@@ -5582,6 +5662,24 @@ int get_syntax_info(int *seqnrp)
   return current_flags;
 }
 
+
+/// Get the sequence number of the concealed file position.
+///
+/// @return seqnr if the file position is concealed, 0 otherwise.
+int syn_get_concealed_id(win_T *wp, linenr_T lnum, colnr_T col)
+{
+  int seqnr;
+  int syntax_flags;
+
+  (void)syn_get_id(wp, lnum, col, false, NULL, false);
+  syntax_flags = get_syntax_info(&seqnr);
+
+  if (syntax_flags & HL_CONCEAL) {
+    return seqnr;
+  }
+  return 0;
+}
+
 /*
  * Return conceal substitution character
  */
@@ -5805,6 +5903,8 @@ static char *highlight_init_both[] =
   "VertSplit    cterm=reverse gui=reverse",
   "WildMenu     ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
   "default link EndOfBuffer NonText",
+  "default link QuickFixLine Search",
+  "default link Substitute Search",
   NULL
 };
 
@@ -5945,12 +6045,12 @@ init_highlight (
   if (get_var_value((char_u *)"g:syntax_on") != NULL) {
     static int recursive = 0;
 
-    if (recursive >= 5)
+    if (recursive >= 5) {
       EMSG(_("E679: recursive loop loading syncolor.vim"));
-    else {
-      ++recursive;
-      (void)source_runtime((char_u *)"syntax/syncolor.vim", TRUE);
-      --recursive;
+    } else {
+      recursive++;
+      (void)source_runtime((char_u *)"syntax/syncolor.vim", DIP_ALL);
+      recursive--;
     }
   }
 }
@@ -5963,22 +6063,24 @@ int load_colors(char_u *name)
 {
   char_u      *buf;
   int retval = FAIL;
-  static int recursive = FALSE;
+  static int recursive = false;
 
-  /* When being called recursively, this is probably because setting
-   * 'background' caused the highlighting to be reloaded.  This means it is
-   * working, thus we should return OK. */
-  if (recursive)
+  // When being called recursively, this is probably because setting
+  // 'background' caused the highlighting to be reloaded.  This means it is
+  // working, thus we should return OK.
+  if (recursive) {
     return OK;
+  }
 
-  recursive = TRUE;
-  buf = xmalloc(STRLEN(name) + 12);
-  sprintf((char *)buf, "colors/%s.vim", name);
-  retval = source_runtime(buf, FALSE);
+  recursive = true;
+  size_t buflen = STRLEN(name) + 12;
+  buf = xmalloc(buflen);
+  snprintf((char *)buf, buflen, "colors/%s.vim", name);
+  retval = source_runtime(buf, DIP_START + DIP_OPT);
   xfree(buf);
   apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf);
 
-  recursive = FALSE;
+  recursive = false;
   ui_refresh();
 
   return retval;
@@ -6498,6 +6600,9 @@ do_highlight (
   else {
     if (is_normal_group) {
       HL_TABLE()[idx].sg_attr = 0;
+      // Need to update all groups, because they might be using "bg" and/or
+      // "fg", which have been changed now.
+      highlight_attr_set_all();
       // If the normal group has changed, it is simpler to refresh every UI
       ui_refresh();
     } else
@@ -6797,8 +6902,8 @@ static int highlight_list_arg(int id, int didh, int type, int iarg, char_u *sarg
       for (i = 0; hl_attr_table[i] != 0; ++i) {
         if (iarg & hl_attr_table[i]) {
           if (buf[0] != NUL)
-            vim_strcat(buf, (char_u *)",", 100);
-          vim_strcat(buf, (char_u *)hl_name_table[i], 100);
+            xstrlcat((char *)buf, ",", 100);
+          xstrlcat((char *)buf, hl_name_table[i], 100);
           iarg &= ~hl_attr_table[i];                /* don't want "inverse" */
         }
       }
@@ -6874,8 +6979,23 @@ highlight_color (
   else if (!(TOLOWER_ASC(what[0]) == 'b' && TOLOWER_ASC(what[1]) == 'g'))
     return NULL;
   if (modec == 'g') {
-    if (fg)
+    if (what[2] == '#' && ui_rgb_attached()) {
+      if (fg) {
+          n = HL_TABLE()[id - 1].sg_rgb_fg;
+      } else if (sp) {
+          n = HL_TABLE()[id - 1].sg_rgb_sp;
+      } else {
+          n = HL_TABLE()[id - 1].sg_rgb_bg;
+      }
+      if (n < 0 || n > 0xffffff) {
+        return NULL;
+      }
+      snprintf((char *)name, sizeof(name), "#%06x", n);
+      return name;
+    }
+    if (fg) {
       return HL_TABLE()[id - 1].sg_rgb_fg_name;
+    }
     if (sp) {
       return HL_TABLE()[id - 1].sg_rgb_sp_name;
     }
@@ -6884,11 +7004,15 @@ highlight_color (
   if (font || sp)
     return NULL;
   if (modec == 'c') {
-    if (fg)
+    if (fg) {
       n = HL_TABLE()[id - 1].sg_cterm_fg - 1;
-    else
+    } else {
       n = HL_TABLE()[id - 1].sg_cterm_bg - 1;
-    sprintf((char *)name, "%d", n);
+    }
+    if (n < 0) {
+      return NULL;
+    }
+    snprintf((char *)name, sizeof(name), "%d", n);
     return name;
   }
   /* term doesn't have color */
@@ -7038,16 +7162,13 @@ int syn_namen2id(char_u *linep, int len)
  */
 int syn_check_group(char_u *pp, int len)
 {
-  int id;
-  char_u  *name;
-
-  name = vim_strnsave(pp, len);
-
-  id = syn_name2id(name);
-  if (id == 0)                          /* doesn't exist yet */
+  char_u  *name = vim_strnsave(pp, len);
+  int id = syn_name2id(name);
+  if (id == 0) {  // doesn't exist yet
     id = syn_add_group(name);
-  else
+  } else {
     xfree(name);
+  }
   return id;
 }
 
@@ -7147,6 +7268,23 @@ int syn_get_final_id(int hl_id)
   return hl_id;
 }
 
+/// Refresh the color attributes of all highlight groups.
+static void highlight_attr_set_all(void)
+{
+  for (int idx = 0; idx < highlight_ga.ga_len; idx++) {
+    struct hl_group *sgp = &HL_TABLE()[idx];
+    if (sgp->sg_rgb_bg_name != NULL) {
+      sgp->sg_rgb_bg = name_to_color(sgp->sg_rgb_bg_name);
+    }
+    if (sgp->sg_rgb_fg_name != NULL) {
+      sgp->sg_rgb_fg = name_to_color(sgp->sg_rgb_fg_name);
+    }
+    if (sgp->sg_rgb_sp_name != NULL) {
+      sgp->sg_rgb_sp = name_to_color(sgp->sg_rgb_sp_name);
+    }
+    set_hl_attr(idx);
+  }
+}
 
 /*
  * Translate the 'highlight' option into attributes in highlight_attr[] and
@@ -7409,175 +7547,687 @@ char_u *get_highlight_name(expand_T *xp, int idx)
 }
 
 color_name_table_T color_name_table[] = {
-  // Color names taken from
-  // http://www.rapidtables.com/web/color/RGB_Color.htm
-  {"Maroon", RGB(0x80, 0x00, 0x00)},
-  {"DarkRed", RGB(0x8b, 0x00, 0x00)},
-  {"Brown", RGB(0xa5, 0x2a, 0x2a)},
-  {"Firebrick", RGB(0xb2, 0x22, 0x22)},
-  {"Crimson", RGB(0xdc, 0x14, 0x3c)},
-  {"Red", RGB(0xff, 0x00, 0x00)},
-  {"Tomato", RGB(0xff, 0x63, 0x47)},
-  {"Coral", RGB(0xff, 0x7f, 0x50)},
-  {"IndianRed", RGB(0xcd, 0x5c, 0x5c)},
-  {"LightCoral", RGB(0xf0, 0x80, 0x80)},
-  {"DarkSalmon", RGB(0xe9, 0x96, 0x7a)},
-  {"Salmon", RGB(0xfa, 0x80, 0x72)},
-  {"LightSalmon", RGB(0xff, 0xa0, 0x7a)},
-  {"OrangeRed", RGB(0xff, 0x45, 0x00)},
-  {"DarkOrange", RGB(0xff, 0x8c, 0x00)},
-  {"Orange", RGB(0xff, 0xa5, 0x00)},
-  {"Gold", RGB(0xff, 0xd7, 0x00)},
-  {"DarkGoldenRod", RGB(0xb8, 0x86, 0x0b)},
-  {"GoldenRod", RGB(0xda, 0xa5, 0x20)},
-  {"PaleGoldenRod", RGB(0xee, 0xe8, 0xaa)},
-  {"DarkKhaki", RGB(0xbd, 0xb7, 0x6b)},
-  {"Khaki", RGB(0xf0, 0xe6, 0x8c)},
-  {"Olive", RGB(0x80, 0x80, 0x00)},
-  {"Yellow", RGB(0xff, 0xff, 0x00)},
-  {"YellowGreen", RGB(0x9a, 0xcd, 0x32)},
-  {"DarkOliveGreen", RGB(0x55, 0x6b, 0x2f)},
-  {"OliveDrab", RGB(0x6b, 0x8e, 0x23)},
-  {"LawnGreen", RGB(0x7c, 0xfc, 0x00)},
-  {"ChartReuse", RGB(0x7f, 0xff, 0x00)},
-  {"GreenYellow", RGB(0xad, 0xff, 0x2f)},
-  {"DarkGreen", RGB(0x00, 0x64, 0x00)},
-  {"Green", RGB(0x00, 0x80, 0x00)},
-  {"ForestGreen", RGB(0x22, 0x8b, 0x22)},
-  {"Lime", RGB(0x00, 0xff, 0x00)},
-  {"LimeGreen", RGB(0x32, 0xcd, 0x32)},
-  {"LightGreen", RGB(0x90, 0xee, 0x90)},
-  {"PaleGreen", RGB(0x98, 0xfb, 0x98)},
-  {"DarkSeaGreen", RGB(0x8f, 0xbc, 0x8f)},
-  {"MediumSpringGreen", RGB(0x00, 0xfa, 0x9a)},
-  {"SpringGreen", RGB(0x00, 0xff, 0x7f)},
-  {"SeaGreen", RGB(0x2e, 0x8b, 0x57)},
-  {"MediumAquamarine", RGB(0x66, 0xcd, 0xaa)},
-  {"MediumSeaGreen", RGB(0x3c, 0xb3, 0x71)},
-  {"LightSeaGreen", RGB(0x20, 0xb2, 0xaa)},
-  {"DarkSlateGray", RGB(0x2f, 0x4f, 0x4f)},
-  {"Teal", RGB(0x00, 0x80, 0x80)},
-  {"DarkCyan", RGB(0x00, 0x8b, 0x8b)},
-  {"Aqua", RGB(0x00, 0xff, 0xff)},
-  {"Cyan", RGB(0x00, 0xff, 0xff)},
-  {"LightCyan", RGB(0xe0, 0xff, 0xff)},
-  {"DarkTurquoise", RGB(0x00, 0xce, 0xd1)},
-  {"Turquoise", RGB(0x40, 0xe0, 0xd0)},
-  {"MediumTurquoise", RGB(0x48, 0xd1, 0xcc)},
-  {"PaleTurquoise", RGB(0xaf, 0xee, 0xee)},
-  {"Aquamarine", RGB(0x7f, 0xff, 0xd4)},
-  {"PowderBlue", RGB(0xb0, 0xe0, 0xe6)},
-  {"CadetBlue", RGB(0x5f, 0x9e, 0xa0)},
-  {"SteelBlue", RGB(0x46, 0x82, 0xb4)},
-  {"CornFlowerBlue", RGB(0x64, 0x95, 0xed)},
-  {"DeepSkyBlue", RGB(0x00, 0xbf, 0xff)},
-  {"DodgerBlue", RGB(0x1e, 0x90, 0xff)},
-  {"LightBlue", RGB(0xad, 0xd8, 0xe6)},
-  {"SkyBlue", RGB(0x87, 0xce, 0xeb)},
-  {"LightSkyBlue", RGB(0x87, 0xce, 0xfa)},
-  {"MidnightBlue", RGB(0x19, 0x19, 0x70)},
-  {"Navy", RGB(0x00, 0x00, 0x80)},
-  {"DarkBlue", RGB(0x00, 0x00, 0x8b)},
-  {"MediumBlue", RGB(0x00, 0x00, 0xcd)},
-  {"Blue", RGB(0x00, 0x00, 0xff)},
-  {"RoyalBlue", RGB(0x41, 0x69, 0xe1)},
-  {"BlueViolet", RGB(0x8a, 0x2b, 0xe2)},
-  {"Indigo", RGB(0x4b, 0x00, 0x82)},
-  {"DarkSlateBlue", RGB(0x48, 0x3d, 0x8b)},
-  {"SlateBlue", RGB(0x6a, 0x5a, 0xcd)},
-  {"MediumSlateBlue", RGB(0x7b, 0x68, 0xee)},
-  {"MediumPurple", RGB(0x93, 0x70, 0xdb)},
-  {"DarkMagenta", RGB(0x8b, 0x00, 0x8b)},
-  {"DarkViolet", RGB(0x94, 0x00, 0xd3)},
-  {"DarkOrchid", RGB(0x99, 0x32, 0xcc)},
-  {"MediumOrchid", RGB(0xba, 0x55, 0xd3)},
-  {"Purple", RGB(0x80, 0x00, 0x80)},
-  {"Thistle", RGB(0xd8, 0xbf, 0xd8)},
-  {"Plum", RGB(0xdd, 0xa0, 0xdd)},
-  {"Violet", RGB(0xee, 0x82, 0xee)},
-  {"Magenta", RGB(0xff, 0x00, 0xff)},
-  {"Fuchsia", RGB(0xff, 0x00, 0xff)},
-  {"Orchid", RGB(0xda, 0x70, 0xd6)},
-  {"MediumVioletRed", RGB(0xc7, 0x15, 0x85)},
-  {"PaleVioletRed", RGB(0xdb, 0x70, 0x93)},
-  {"DeepPink", RGB(0xff, 0x14, 0x93)},
-  {"HotPink", RGB(0xff, 0x69, 0xb4)},
-  {"LightPink", RGB(0xff, 0xb6, 0xc1)},
-  {"Pink", RGB(0xff, 0xc0, 0xcb)},
-  {"AntiqueWhite", RGB(0xfa, 0xeb, 0xd7)},
-  {"Beige", RGB(0xf5, 0xf5, 0xdc)},
-  {"Bisque", RGB(0xff, 0xe4, 0xc4)},
-  {"BlanchedAlmond", RGB(0xff, 0xeb, 0xcd)},
-  {"Wheat", RGB(0xf5, 0xde, 0xb3)},
-  {"Cornsilk", RGB(0xff, 0xf8, 0xdc)},
-  {"LemonChiffon", RGB(0xff, 0xfa, 0xcd)},
-  {"LightGoldenRodYellow", RGB(0xfa, 0xfa, 0xd2)},
-  {"LightYellow", RGB(0xff, 0xff, 0xe0)},
-  {"SaddleBrown", RGB(0x8b, 0x45, 0x13)},
-  {"Sienna", RGB(0xa0, 0x52, 0x2d)},
-  {"Chocolate", RGB(0xd2, 0x69, 0x1e)},
-  {"Peru", RGB(0xcd, 0x85, 0x3f)},
-  {"SandyBrown", RGB(0xf4, 0xa4, 0x60)},
-  {"BurlyWood", RGB(0xde, 0xb8, 0x87)},
-  {"Tan", RGB(0xd2, 0xb4, 0x8c)},
-  {"RosyBrown", RGB(0xbc, 0x8f, 0x8f)},
-  {"Moccasin", RGB(0xff, 0xe4, 0xb5)},
-  {"NavajoWhite", RGB(0xff, 0xde, 0xad)},
-  {"PeachPuff", RGB(0xff, 0xda, 0xb9)},
-  {"MistyRose", RGB(0xff, 0xe4, 0xe1)},
-  {"LavenderBlush", RGB(0xff, 0xf0, 0xf5)},
-  {"Linen", RGB(0xfa, 0xf0, 0xe6)},
-  {"Oldlace", RGB(0xfd, 0xf5, 0xe6)},
-  {"PapayaWhip", RGB(0xff, 0xef, 0xd5)},
-  {"SeaShell", RGB(0xff, 0xf5, 0xee)},
-  {"MintCream", RGB(0xf5, 0xff, 0xfa)},
-  {"SlateGray", RGB(0x70, 0x80, 0x90)},
-  {"LightSlateGray", RGB(0x77, 0x88, 0x99)},
-  {"LightSteelBlue", RGB(0xb0, 0xc4, 0xde)},
-  {"Lavender", RGB(0xe6, 0xe6, 0xfa)},
-  {"FloralWhite", RGB(0xff, 0xfa, 0xf0)},
-  {"AliceBlue", RGB(0xf0, 0xf8, 0xff)},
-  {"GhostWhite", RGB(0xf8, 0xf8, 0xff)},
-  {"Honeydew", RGB(0xf0, 0xff, 0xf0)},
-  {"Ivory", RGB(0xff, 0xff, 0xf0)},
-  {"Azure", RGB(0xf0, 0xff, 0xff)},
-  {"Snow", RGB(0xff, 0xfa, 0xfa)},
-  {"Black", RGB(0x00, 0x00, 0x00)},
-  {"DimGray", RGB(0x69, 0x69, 0x69)},
-  {"DimGrey", RGB(0x69, 0x69, 0x69)},
-  {"Gray", RGB(0x80, 0x80, 0x80)},
-  {"Grey", RGB(0x80, 0x80, 0x80)},
-  {"DarkGray", RGB(0xa9, 0xa9, 0xa9)},
-  {"DarkGrey", RGB(0xa9, 0xa9, 0xa9)},
-  {"Silver", RGB(0xc0, 0xc0, 0xc0)},
-  {"LightGray", RGB(0xd3, 0xd3, 0xd3)},
-  {"LightGrey", RGB(0xd3, 0xd3, 0xd3)},
-  {"Gainsboro", RGB(0xdc, 0xdc, 0xdc)},
-  {"WhiteSmoke", RGB(0xf5, 0xf5, 0xf5)},
-  {"White", RGB(0xff, 0xff, 0xff)},
-  // The color names below were taken from gui_x11.c in vim source 
-  {"LightRed", RGB(0xff, 0xbb, 0xbb)},
-  {"LightMagenta",RGB(0xff, 0xbb, 0xff)},
-  {"DarkYellow", RGB(0xbb, 0xbb, 0x00)},
-  {"Gray10", RGB(0x1a, 0x1a, 0x1a)},
-  {"Grey10", RGB(0x1a, 0x1a, 0x1a)},
-  {"Gray20", RGB(0x33, 0x33, 0x33)},
-  {"Grey20", RGB(0x33, 0x33, 0x33)},
-  {"Gray30", RGB(0x4d, 0x4d, 0x4d)},
-  {"Grey30", RGB(0x4d, 0x4d, 0x4d)},
-  {"Gray40", RGB(0x66, 0x66, 0x66)},
-  {"Grey40", RGB(0x66, 0x66, 0x66)},
-  {"Gray50", RGB(0x7f, 0x7f, 0x7f)},
-  {"Grey50", RGB(0x7f, 0x7f, 0x7f)},
-  {"Gray60", RGB(0x99, 0x99, 0x99)},
-  {"Grey60", RGB(0x99, 0x99, 0x99)},
-  {"Gray70", RGB(0xb3, 0xb3, 0xb3)},
-  {"Grey70", RGB(0xb3, 0xb3, 0xb3)},
-  {"Gray80", RGB(0xcc, 0xcc, 0xcc)},
-  {"Grey80", RGB(0xcc, 0xcc, 0xcc)},
-  {"Gray90", RGB(0xe5, 0xe5, 0xe5)},
-  {"Grey90", RGB(0xe5, 0xe5, 0xe5)},
-  {NULL, 0},
+  // Colors from rgb.txt
+  { "AliceBlue", RGB(0xf0, 0xf8, 0xff) },
+  { "AntiqueWhite", RGB(0xfa, 0xeb, 0xd7) },
+  { "AntiqueWhite1", RGB(0xff, 0xef, 0xdb) },
+  { "AntiqueWhite2", RGB(0xee, 0xdf, 0xcc) },
+  { "AntiqueWhite3", RGB(0xcd, 0xc0, 0xb0) },
+  { "AntiqueWhite4", RGB(0x8b, 0x83, 0x78) },
+  { "Aqua", RGB(0x00, 0xff, 0xff) },
+  { "Aquamarine", RGB(0x7f, 0xff, 0xd4) },
+  { "Aquamarine1", RGB(0x7f, 0xff, 0xd4) },
+  { "Aquamarine2", RGB(0x76, 0xee, 0xc6) },
+  { "Aquamarine3", RGB(0x66, 0xcd, 0xaa) },
+  { "Aquamarine4", RGB(0x45, 0x8b, 0x74) },
+  { "Azure", RGB(0xf0, 0xff, 0xff) },
+  { "Azure1", RGB(0xf0, 0xff, 0xff) },
+  { "Azure2", RGB(0xe0, 0xee, 0xee) },
+  { "Azure3", RGB(0xc1, 0xcd, 0xcd) },
+  { "Azure4", RGB(0x83, 0x8b, 0x8b) },
+  { "Beige", RGB(0xf5, 0xf5, 0xdc) },
+  { "Bisque", RGB(0xff, 0xe4, 0xc4) },
+  { "Bisque1", RGB(0xff, 0xe4, 0xc4) },
+  { "Bisque2", RGB(0xee, 0xd5, 0xb7) },
+  { "Bisque3", RGB(0xcd, 0xb7, 0x9e) },
+  { "Bisque4", RGB(0x8b, 0x7d, 0x6b) },
+  { "Black", RGB(0x00, 0x00, 0x00) },
+  { "BlanchedAlmond", RGB(0xff, 0xeb, 0xcd) },
+  { "Blue", RGB(0x00, 0x00, 0xff) },
+  { "Blue1", RGB(0x0, 0x0, 0xff) },
+  { "Blue2", RGB(0x0, 0x0, 0xee) },
+  { "Blue3", RGB(0x0, 0x0, 0xcd) },
+  { "Blue4", RGB(0x0, 0x0, 0x8b) },
+  { "BlueViolet", RGB(0x8a, 0x2b, 0xe2) },
+  { "Brown", RGB(0xa5, 0x2a, 0x2a) },
+  { "Brown1", RGB(0xff, 0x40, 0x40) },
+  { "Brown2", RGB(0xee, 0x3b, 0x3b) },
+  { "Brown3", RGB(0xcd, 0x33, 0x33) },
+  { "Brown4", RGB(0x8b, 0x23, 0x23) },
+  { "BurlyWood", RGB(0xde, 0xb8, 0x87) },
+  { "Burlywood1", RGB(0xff, 0xd3, 0x9b) },
+  { "Burlywood2", RGB(0xee, 0xc5, 0x91) },
+  { "Burlywood3", RGB(0xcd, 0xaa, 0x7d) },
+  { "Burlywood4", RGB(0x8b, 0x73, 0x55) },
+  { "CadetBlue", RGB(0x5f, 0x9e, 0xa0) },
+  { "CadetBlue1", RGB(0x98, 0xf5, 0xff) },
+  { "CadetBlue2", RGB(0x8e, 0xe5, 0xee) },
+  { "CadetBlue3", RGB(0x7a, 0xc5, 0xcd) },
+  { "CadetBlue4", RGB(0x53, 0x86, 0x8b) },
+  { "ChartReuse", RGB(0x7f, 0xff, 0x00) },
+  { "Chartreuse1", RGB(0x7f, 0xff, 0x0) },
+  { "Chartreuse2", RGB(0x76, 0xee, 0x0) },
+  { "Chartreuse3", RGB(0x66, 0xcd, 0x0) },
+  { "Chartreuse4", RGB(0x45, 0x8b, 0x0) },
+  { "Chocolate", RGB(0xd2, 0x69, 0x1e) },
+  { "Chocolate1", RGB(0xff, 0x7f, 0x24) },
+  { "Chocolate2", RGB(0xee, 0x76, 0x21) },
+  { "Chocolate3", RGB(0xcd, 0x66, 0x1d) },
+  { "Chocolate4", RGB(0x8b, 0x45, 0x13) },
+  { "Coral", RGB(0xff, 0x7f, 0x50) },
+  { "Coral1", RGB(0xff, 0x72, 0x56) },
+  { "Coral2", RGB(0xee, 0x6a, 0x50) },
+  { "Coral3", RGB(0xcd, 0x5b, 0x45) },
+  { "Coral4", RGB(0x8b, 0x3e, 0x2f) },
+  { "CornFlowerBlue", RGB(0x64, 0x95, 0xed) },
+  { "Cornsilk", RGB(0xff, 0xf8, 0xdc) },
+  { "Cornsilk1", RGB(0xff, 0xf8, 0xdc) },
+  { "Cornsilk2", RGB(0xee, 0xe8, 0xcd) },
+  { "Cornsilk3", RGB(0xcd, 0xc8, 0xb1) },
+  { "Cornsilk4", RGB(0x8b, 0x88, 0x78) },
+  { "Crimson", RGB(0xdc, 0x14, 0x3c) },
+  { "Cyan", RGB(0x00, 0xff, 0xff) },
+  { "Cyan1", RGB(0x0, 0xff, 0xff) },
+  { "Cyan2", RGB(0x0, 0xee, 0xee) },
+  { "Cyan3", RGB(0x0, 0xcd, 0xcd) },
+  { "Cyan4", RGB(0x0, 0x8b, 0x8b) },
+  { "DarkBlue", RGB(0x00, 0x00, 0x8b) },
+  { "DarkCyan", RGB(0x00, 0x8b, 0x8b) },
+  { "DarkGoldenRod", RGB(0xb8, 0x86, 0x0b) },
+  { "DarkGoldenrod1", RGB(0xff, 0xb9, 0xf) },
+  { "DarkGoldenrod2", RGB(0xee, 0xad, 0xe) },
+  { "DarkGoldenrod3", RGB(0xcd, 0x95, 0xc) },
+  { "DarkGoldenrod4", RGB(0x8b, 0x65, 0x8) },
+  { "DarkGray", RGB(0xa9, 0xa9, 0xa9) },
+  { "DarkGreen", RGB(0x00, 0x64, 0x00) },
+  { "DarkGrey", RGB(0xa9, 0xa9, 0xa9) },
+  { "DarkKhaki", RGB(0xbd, 0xb7, 0x6b) },
+  { "DarkMagenta", RGB(0x8b, 0x00, 0x8b) },
+  { "DarkOliveGreen", RGB(0x55, 0x6b, 0x2f) },
+  { "DarkOliveGreen1", RGB(0xca, 0xff, 0x70) },
+  { "DarkOliveGreen2", RGB(0xbc, 0xee, 0x68) },
+  { "DarkOliveGreen3", RGB(0xa2, 0xcd, 0x5a) },
+  { "DarkOliveGreen4", RGB(0x6e, 0x8b, 0x3d) },
+  { "DarkOrange", RGB(0xff, 0x8c, 0x00) },
+  { "DarkOrange1", RGB(0xff, 0x7f, 0x0) },
+  { "DarkOrange2", RGB(0xee, 0x76, 0x0) },
+  { "DarkOrange3", RGB(0xcd, 0x66, 0x0) },
+  { "DarkOrange4", RGB(0x8b, 0x45, 0x0) },
+  { "DarkOrchid", RGB(0x99, 0x32, 0xcc) },
+  { "DarkOrchid1", RGB(0xbf, 0x3e, 0xff) },
+  { "DarkOrchid2", RGB(0xb2, 0x3a, 0xee) },
+  { "DarkOrchid3", RGB(0x9a, 0x32, 0xcd) },
+  { "DarkOrchid4", RGB(0x68, 0x22, 0x8b) },
+  { "DarkRed", RGB(0x8b, 0x00, 0x00) },
+  { "DarkSalmon", RGB(0xe9, 0x96, 0x7a) },
+  { "DarkSeaGreen", RGB(0x8f, 0xbc, 0x8f) },
+  { "DarkSeaGreen1", RGB(0xc1, 0xff, 0xc1) },
+  { "DarkSeaGreen2", RGB(0xb4, 0xee, 0xb4) },
+  { "DarkSeaGreen3", RGB(0x9b, 0xcd, 0x9b) },
+  { "DarkSeaGreen4", RGB(0x69, 0x8b, 0x69) },
+  { "DarkSlateBlue", RGB(0x48, 0x3d, 0x8b) },
+  { "DarkSlateGray", RGB(0x2f, 0x4f, 0x4f) },
+  { "DarkSlateGray1", RGB(0x97, 0xff, 0xff) },
+  { "DarkSlateGray2", RGB(0x8d, 0xee, 0xee) },
+  { "DarkSlateGray3", RGB(0x79, 0xcd, 0xcd) },
+  { "DarkSlateGray4", RGB(0x52, 0x8b, 0x8b) },
+  { "DarkSlateGrey", RGB(0x2f, 0x4f, 0x4f) },
+  { "DarkTurquoise", RGB(0x00, 0xce, 0xd1) },
+  { "DarkViolet", RGB(0x94, 0x00, 0xd3) },
+  { "DarkYellow", RGB(0xbb, 0xbb, 0x00) },
+  { "DeepPink", RGB(0xff, 0x14, 0x93) },
+  { "DeepPink1", RGB(0xff, 0x14, 0x93) },
+  { "DeepPink2", RGB(0xee, 0x12, 0x89) },
+  { "DeepPink3", RGB(0xcd, 0x10, 0x76) },
+  { "DeepPink4", RGB(0x8b, 0xa, 0x50) },
+  { "DeepSkyBlue", RGB(0x00, 0xbf, 0xff) },
+  { "DeepSkyBlue1", RGB(0x0, 0xbf, 0xff) },
+  { "DeepSkyBlue2", RGB(0x0, 0xb2, 0xee) },
+  { "DeepSkyBlue3", RGB(0x0, 0x9a, 0xcd) },
+  { "DeepSkyBlue4", RGB(0x0, 0x68, 0x8b) },
+  { "DimGray", RGB(0x69, 0x69, 0x69) },
+  { "DimGrey", RGB(0x69, 0x69, 0x69) },
+  { "DodgerBlue", RGB(0x1e, 0x90, 0xff) },
+  { "DodgerBlue1", RGB(0x1e, 0x90, 0xff) },
+  { "DodgerBlue2", RGB(0x1c, 0x86, 0xee) },
+  { "DodgerBlue3", RGB(0x18, 0x74, 0xcd) },
+  { "DodgerBlue4", RGB(0x10, 0x4e, 0x8b) },
+  { "Firebrick", RGB(0xb2, 0x22, 0x22) },
+  { "Firebrick1", RGB(0xff, 0x30, 0x30) },
+  { "Firebrick2", RGB(0xee, 0x2c, 0x2c) },
+  { "Firebrick3", RGB(0xcd, 0x26, 0x26) },
+  { "Firebrick4", RGB(0x8b, 0x1a, 0x1a) },
+  { "FloralWhite", RGB(0xff, 0xfa, 0xf0) },
+  { "ForestGreen", RGB(0x22, 0x8b, 0x22) },
+  { "Fuchsia", RGB(0xff, 0x00, 0xff) },
+  { "Gainsboro", RGB(0xdc, 0xdc, 0xdc) },
+  { "GhostWhite", RGB(0xf8, 0xf8, 0xff) },
+  { "Gold", RGB(0xff, 0xd7, 0x00) },
+  { "Gold1", RGB(0xff, 0xd7, 0x0) },
+  { "Gold2", RGB(0xee, 0xc9, 0x0) },
+  { "Gold3", RGB(0xcd, 0xad, 0x0) },
+  { "Gold4", RGB(0x8b, 0x75, 0x0) },
+  { "GoldenRod", RGB(0xda, 0xa5, 0x20) },
+  { "Goldenrod1", RGB(0xff, 0xc1, 0x25) },
+  { "Goldenrod2", RGB(0xee, 0xb4, 0x22) },
+  { "Goldenrod3", RGB(0xcd, 0x9b, 0x1d) },
+  { "Goldenrod4", RGB(0x8b, 0x69, 0x14) },
+  { "Gray", RGB(0x80, 0x80, 0x80) },
+  { "Gray0", RGB(0x0, 0x0, 0x0) },
+  { "Gray1", RGB(0x3, 0x3, 0x3) },
+  { "Gray10", RGB(0x1a, 0x1a, 0x1a) },
+  { "Gray100", RGB(0xff, 0xff, 0xff) },
+  { "Gray11", RGB(0x1c, 0x1c, 0x1c) },
+  { "Gray12", RGB(0x1f, 0x1f, 0x1f) },
+  { "Gray13", RGB(0x21, 0x21, 0x21) },
+  { "Gray14", RGB(0x24, 0x24, 0x24) },
+  { "Gray15", RGB(0x26, 0x26, 0x26) },
+  { "Gray16", RGB(0x29, 0x29, 0x29) },
+  { "Gray17", RGB(0x2b, 0x2b, 0x2b) },
+  { "Gray18", RGB(0x2e, 0x2e, 0x2e) },
+  { "Gray19", RGB(0x30, 0x30, 0x30) },
+  { "Gray2", RGB(0x5, 0x5, 0x5) },
+  { "Gray20", RGB(0x33, 0x33, 0x33) },
+  { "Gray21", RGB(0x36, 0x36, 0x36) },
+  { "Gray22", RGB(0x38, 0x38, 0x38) },
+  { "Gray23", RGB(0x3b, 0x3b, 0x3b) },
+  { "Gray24", RGB(0x3d, 0x3d, 0x3d) },
+  { "Gray25", RGB(0x40, 0x40, 0x40) },
+  { "Gray26", RGB(0x42, 0x42, 0x42) },
+  { "Gray27", RGB(0x45, 0x45, 0x45) },
+  { "Gray28", RGB(0x47, 0x47, 0x47) },
+  { "Gray29", RGB(0x4a, 0x4a, 0x4a) },
+  { "Gray3", RGB(0x8, 0x8, 0x8) },
+  { "Gray30", RGB(0x4d, 0x4d, 0x4d) },
+  { "Gray31", RGB(0x4f, 0x4f, 0x4f) },
+  { "Gray32", RGB(0x52, 0x52, 0x52) },
+  { "Gray33", RGB(0x54, 0x54, 0x54) },
+  { "Gray34", RGB(0x57, 0x57, 0x57) },
+  { "Gray35", RGB(0x59, 0x59, 0x59) },
+  { "Gray36", RGB(0x5c, 0x5c, 0x5c) },
+  { "Gray37", RGB(0x5e, 0x5e, 0x5e) },
+  { "Gray38", RGB(0x61, 0x61, 0x61) },
+  { "Gray39", RGB(0x63, 0x63, 0x63) },
+  { "Gray4", RGB(0xa, 0xa, 0xa) },
+  { "Gray40", RGB(0x66, 0x66, 0x66) },
+  { "Gray41", RGB(0x69, 0x69, 0x69) },
+  { "Gray42", RGB(0x6b, 0x6b, 0x6b) },
+  { "Gray43", RGB(0x6e, 0x6e, 0x6e) },
+  { "Gray44", RGB(0x70, 0x70, 0x70) },
+  { "Gray45", RGB(0x73, 0x73, 0x73) },
+  { "Gray46", RGB(0x75, 0x75, 0x75) },
+  { "Gray47", RGB(0x78, 0x78, 0x78) },
+  { "Gray48", RGB(0x7a, 0x7a, 0x7a) },
+  { "Gray49", RGB(0x7d, 0x7d, 0x7d) },
+  { "Gray5", RGB(0xd, 0xd, 0xd) },
+  { "Gray50", RGB(0x7f, 0x7f, 0x7f) },
+  { "Gray51", RGB(0x82, 0x82, 0x82) },
+  { "Gray52", RGB(0x85, 0x85, 0x85) },
+  { "Gray53", RGB(0x87, 0x87, 0x87) },
+  { "Gray54", RGB(0x8a, 0x8a, 0x8a) },
+  { "Gray55", RGB(0x8c, 0x8c, 0x8c) },
+  { "Gray56", RGB(0x8f, 0x8f, 0x8f) },
+  { "Gray57", RGB(0x91, 0x91, 0x91) },
+  { "Gray58", RGB(0x94, 0x94, 0x94) },
+  { "Gray59", RGB(0x96, 0x96, 0x96) },
+  { "Gray6", RGB(0xf, 0xf, 0xf) },
+  { "Gray60", RGB(0x99, 0x99, 0x99) },
+  { "Gray61", RGB(0x9c, 0x9c, 0x9c) },
+  { "Gray62", RGB(0x9e, 0x9e, 0x9e) },
+  { "Gray63", RGB(0xa1, 0xa1, 0xa1) },
+  { "Gray64", RGB(0xa3, 0xa3, 0xa3) },
+  { "Gray65", RGB(0xa6, 0xa6, 0xa6) },
+  { "Gray66", RGB(0xa8, 0xa8, 0xa8) },
+  { "Gray67", RGB(0xab, 0xab, 0xab) },
+  { "Gray68", RGB(0xad, 0xad, 0xad) },
+  { "Gray69", RGB(0xb0, 0xb0, 0xb0) },
+  { "Gray7", RGB(0x12, 0x12, 0x12) },
+  { "Gray70", RGB(0xb3, 0xb3, 0xb3) },
+  { "Gray71", RGB(0xb5, 0xb5, 0xb5) },
+  { "Gray72", RGB(0xb8, 0xb8, 0xb8) },
+  { "Gray73", RGB(0xba, 0xba, 0xba) },
+  { "Gray74", RGB(0xbd, 0xbd, 0xbd) },
+  { "Gray75", RGB(0xbf, 0xbf, 0xbf) },
+  { "Gray76", RGB(0xc2, 0xc2, 0xc2) },
+  { "Gray77", RGB(0xc4, 0xc4, 0xc4) },
+  { "Gray78", RGB(0xc7, 0xc7, 0xc7) },
+  { "Gray79", RGB(0xc9, 0xc9, 0xc9) },
+  { "Gray8", RGB(0x14, 0x14, 0x14) },
+  { "Gray80", RGB(0xcc, 0xcc, 0xcc) },
+  { "Gray81", RGB(0xcf, 0xcf, 0xcf) },
+  { "Gray82", RGB(0xd1, 0xd1, 0xd1) },
+  { "Gray83", RGB(0xd4, 0xd4, 0xd4) },
+  { "Gray84", RGB(0xd6, 0xd6, 0xd6) },
+  { "Gray85", RGB(0xd9, 0xd9, 0xd9) },
+  { "Gray86", RGB(0xdb, 0xdb, 0xdb) },
+  { "Gray87", RGB(0xde, 0xde, 0xde) },
+  { "Gray88", RGB(0xe0, 0xe0, 0xe0) },
+  { "Gray89", RGB(0xe3, 0xe3, 0xe3) },
+  { "Gray9", RGB(0x17, 0x17, 0x17) },
+  { "Gray90", RGB(0xe5, 0xe5, 0xe5) },
+  { "Gray91", RGB(0xe8, 0xe8, 0xe8) },
+  { "Gray92", RGB(0xeb, 0xeb, 0xeb) },
+  { "Gray93", RGB(0xed, 0xed, 0xed) },
+  { "Gray94", RGB(0xf0, 0xf0, 0xf0) },
+  { "Gray95", RGB(0xf2, 0xf2, 0xf2) },
+  { "Gray96", RGB(0xf5, 0xf5, 0xf5) },
+  { "Gray97", RGB(0xf7, 0xf7, 0xf7) },
+  { "Gray98", RGB(0xfa, 0xfa, 0xfa) },
+  { "Gray99", RGB(0xfc, 0xfc, 0xfc) },
+  { "Green", RGB(0x00, 0x80, 0x00) },
+  { "Green1", RGB(0x0, 0xff, 0x0) },
+  { "Green2", RGB(0x0, 0xee, 0x0) },
+  { "Green3", RGB(0x0, 0xcd, 0x0) },
+  { "Green4", RGB(0x0, 0x8b, 0x0) },
+  { "GreenYellow", RGB(0xad, 0xff, 0x2f) },
+  { "Grey", RGB(0x80, 0x80, 0x80) },
+  { "Grey0", RGB(0x0, 0x0, 0x0) },
+  { "Grey1", RGB(0x3, 0x3, 0x3) },
+  { "Grey10", RGB(0x1a, 0x1a, 0x1a) },
+  { "Grey100", RGB(0xff, 0xff, 0xff) },
+  { "Grey11", RGB(0x1c, 0x1c, 0x1c) },
+  { "Grey12", RGB(0x1f, 0x1f, 0x1f) },
+  { "Grey13", RGB(0x21, 0x21, 0x21) },
+  { "Grey14", RGB(0x24, 0x24, 0x24) },
+  { "Grey15", RGB(0x26, 0x26, 0x26) },
+  { "Grey16", RGB(0x29, 0x29, 0x29) },
+  { "Grey17", RGB(0x2b, 0x2b, 0x2b) },
+  { "Grey18", RGB(0x2e, 0x2e, 0x2e) },
+  { "Grey19", RGB(0x30, 0x30, 0x30) },
+  { "Grey2", RGB(0x5, 0x5, 0x5) },
+  { "Grey20", RGB(0x33, 0x33, 0x33) },
+  { "Grey21", RGB(0x36, 0x36, 0x36) },
+  { "Grey22", RGB(0x38, 0x38, 0x38) },
+  { "Grey23", RGB(0x3b, 0x3b, 0x3b) },
+  { "Grey24", RGB(0x3d, 0x3d, 0x3d) },
+  { "Grey25", RGB(0x40, 0x40, 0x40) },
+  { "Grey26", RGB(0x42, 0x42, 0x42) },
+  { "Grey27", RGB(0x45, 0x45, 0x45) },
+  { "Grey28", RGB(0x47, 0x47, 0x47) },
+  { "Grey29", RGB(0x4a, 0x4a, 0x4a) },
+  { "Grey3", RGB(0x8, 0x8, 0x8) },
+  { "Grey30", RGB(0x4d, 0x4d, 0x4d) },
+  { "Grey31", RGB(0x4f, 0x4f, 0x4f) },
+  { "Grey32", RGB(0x52, 0x52, 0x52) },
+  { "Grey33", RGB(0x54, 0x54, 0x54) },
+  { "Grey34", RGB(0x57, 0x57, 0x57) },
+  { "Grey35", RGB(0x59, 0x59, 0x59) },
+  { "Grey36", RGB(0x5c, 0x5c, 0x5c) },
+  { "Grey37", RGB(0x5e, 0x5e, 0x5e) },
+  { "Grey38", RGB(0x61, 0x61, 0x61) },
+  { "Grey39", RGB(0x63, 0x63, 0x63) },
+  { "Grey4", RGB(0xa, 0xa, 0xa) },
+  { "Grey40", RGB(0x66, 0x66, 0x66) },
+  { "Grey41", RGB(0x69, 0x69, 0x69) },
+  { "Grey42", RGB(0x6b, 0x6b, 0x6b) },
+  { "Grey43", RGB(0x6e, 0x6e, 0x6e) },
+  { "Grey44", RGB(0x70, 0x70, 0x70) },
+  { "Grey45", RGB(0x73, 0x73, 0x73) },
+  { "Grey46", RGB(0x75, 0x75, 0x75) },
+  { "Grey47", RGB(0x78, 0x78, 0x78) },
+  { "Grey48", RGB(0x7a, 0x7a, 0x7a) },
+  { "Grey49", RGB(0x7d, 0x7d, 0x7d) },
+  { "Grey5", RGB(0xd, 0xd, 0xd) },
+  { "Grey50", RGB(0x7f, 0x7f, 0x7f) },
+  { "Grey51", RGB(0x82, 0x82, 0x82) },
+  { "Grey52", RGB(0x85, 0x85, 0x85) },
+  { "Grey53", RGB(0x87, 0x87, 0x87) },
+  { "Grey54", RGB(0x8a, 0x8a, 0x8a) },
+  { "Grey55", RGB(0x8c, 0x8c, 0x8c) },
+  { "Grey56", RGB(0x8f, 0x8f, 0x8f) },
+  { "Grey57", RGB(0x91, 0x91, 0x91) },
+  { "Grey58", RGB(0x94, 0x94, 0x94) },
+  { "Grey59", RGB(0x96, 0x96, 0x96) },
+  { "Grey6", RGB(0xf, 0xf, 0xf) },
+  { "Grey60", RGB(0x99, 0x99, 0x99) },
+  { "Grey61", RGB(0x9c, 0x9c, 0x9c) },
+  { "Grey62", RGB(0x9e, 0x9e, 0x9e) },
+  { "Grey63", RGB(0xa1, 0xa1, 0xa1) },
+  { "Grey64", RGB(0xa3, 0xa3, 0xa3) },
+  { "Grey65", RGB(0xa6, 0xa6, 0xa6) },
+  { "Grey66", RGB(0xa8, 0xa8, 0xa8) },
+  { "Grey67", RGB(0xab, 0xab, 0xab) },
+  { "Grey68", RGB(0xad, 0xad, 0xad) },
+  { "Grey69", RGB(0xb0, 0xb0, 0xb0) },
+  { "Grey7", RGB(0x12, 0x12, 0x12) },
+  { "Grey70", RGB(0xb3, 0xb3, 0xb3) },
+  { "Grey71", RGB(0xb5, 0xb5, 0xb5) },
+  { "Grey72", RGB(0xb8, 0xb8, 0xb8) },
+  { "Grey73", RGB(0xba, 0xba, 0xba) },
+  { "Grey74", RGB(0xbd, 0xbd, 0xbd) },
+  { "Grey75", RGB(0xbf, 0xbf, 0xbf) },
+  { "Grey76", RGB(0xc2, 0xc2, 0xc2) },
+  { "Grey77", RGB(0xc4, 0xc4, 0xc4) },
+  { "Grey78", RGB(0xc7, 0xc7, 0xc7) },
+  { "Grey79", RGB(0xc9, 0xc9, 0xc9) },
+  { "Grey8", RGB(0x14, 0x14, 0x14) },
+  { "Grey80", RGB(0xcc, 0xcc, 0xcc) },
+  { "Grey81", RGB(0xcf, 0xcf, 0xcf) },
+  { "Grey82", RGB(0xd1, 0xd1, 0xd1) },
+  { "Grey83", RGB(0xd4, 0xd4, 0xd4) },
+  { "Grey84", RGB(0xd6, 0xd6, 0xd6) },
+  { "Grey85", RGB(0xd9, 0xd9, 0xd9) },
+  { "Grey86", RGB(0xdb, 0xdb, 0xdb) },
+  { "Grey87", RGB(0xde, 0xde, 0xde) },
+  { "Grey88", RGB(0xe0, 0xe0, 0xe0) },
+  { "Grey89", RGB(0xe3, 0xe3, 0xe3) },
+  { "Grey9", RGB(0x17, 0x17, 0x17) },
+  { "Grey90", RGB(0xe5, 0xe5, 0xe5) },
+  { "Grey91", RGB(0xe8, 0xe8, 0xe8) },
+  { "Grey92", RGB(0xeb, 0xeb, 0xeb) },
+  { "Grey93", RGB(0xed, 0xed, 0xed) },
+  { "Grey94", RGB(0xf0, 0xf0, 0xf0) },
+  { "Grey95", RGB(0xf2, 0xf2, 0xf2) },
+  { "Grey96", RGB(0xf5, 0xf5, 0xf5) },
+  { "Grey97", RGB(0xf7, 0xf7, 0xf7) },
+  { "Grey98", RGB(0xfa, 0xfa, 0xfa) },
+  { "Grey99", RGB(0xfc, 0xfc, 0xfc) },
+  { "Honeydew", RGB(0xf0, 0xff, 0xf0) },
+  { "Honeydew1", RGB(0xf0, 0xff, 0xf0) },
+  { "Honeydew2", RGB(0xe0, 0xee, 0xe0) },
+  { "Honeydew3", RGB(0xc1, 0xcd, 0xc1) },
+  { "Honeydew4", RGB(0x83, 0x8b, 0x83) },
+  { "HotPink", RGB(0xff, 0x69, 0xb4) },
+  { "HotPink1", RGB(0xff, 0x6e, 0xb4) },
+  { "HotPink2", RGB(0xee, 0x6a, 0xa7) },
+  { "HotPink3", RGB(0xcd, 0x60, 0x90) },
+  { "HotPink4", RGB(0x8b, 0x3a, 0x62) },
+  { "IndianRed", RGB(0xcd, 0x5c, 0x5c) },
+  { "IndianRed1", RGB(0xff, 0x6a, 0x6a) },
+  { "IndianRed2", RGB(0xee, 0x63, 0x63) },
+  { "IndianRed3", RGB(0xcd, 0x55, 0x55) },
+  { "IndianRed4", RGB(0x8b, 0x3a, 0x3a) },
+  { "Indigo", RGB(0x4b, 0x00, 0x82) },
+  { "Ivory", RGB(0xff, 0xff, 0xf0) },
+  { "Ivory1", RGB(0xff, 0xff, 0xf0) },
+  { "Ivory2", RGB(0xee, 0xee, 0xe0) },
+  { "Ivory3", RGB(0xcd, 0xcd, 0xc1) },
+  { "Ivory4", RGB(0x8b, 0x8b, 0x83) },
+  { "Khaki", RGB(0xf0, 0xe6, 0x8c) },
+  { "Khaki1", RGB(0xff, 0xf6, 0x8f) },
+  { "Khaki2", RGB(0xee, 0xe6, 0x85) },
+  { "Khaki3", RGB(0xcd, 0xc6, 0x73) },
+  { "Khaki4", RGB(0x8b, 0x86, 0x4e) },
+  { "Lavender", RGB(0xe6, 0xe6, 0xfa) },
+  { "LavenderBlush", RGB(0xff, 0xf0, 0xf5) },
+  { "LavenderBlush1", RGB(0xff, 0xf0, 0xf5) },
+  { "LavenderBlush2", RGB(0xee, 0xe0, 0xe5) },
+  { "LavenderBlush3", RGB(0xcd, 0xc1, 0xc5) },
+  { "LavenderBlush4", RGB(0x8b, 0x83, 0x86) },
+  { "LawnGreen", RGB(0x7c, 0xfc, 0x00) },
+  { "LemonChiffon", RGB(0xff, 0xfa, 0xcd) },
+  { "LemonChiffon1", RGB(0xff, 0xfa, 0xcd) },
+  { "LemonChiffon2", RGB(0xee, 0xe9, 0xbf) },
+  { "LemonChiffon3", RGB(0xcd, 0xc9, 0xa5) },
+  { "LemonChiffon4", RGB(0x8b, 0x89, 0x70) },
+  { "LightBlue", RGB(0xad, 0xd8, 0xe6) },
+  { "LightBlue1", RGB(0xbf, 0xef, 0xff) },
+  { "LightBlue2", RGB(0xb2, 0xdf, 0xee) },
+  { "LightBlue3", RGB(0x9a, 0xc0, 0xcd) },
+  { "LightBlue4", RGB(0x68, 0x83, 0x8b) },
+  { "LightCoral", RGB(0xf0, 0x80, 0x80) },
+  { "LightCyan", RGB(0xe0, 0xff, 0xff) },
+  { "LightCyan1", RGB(0xe0, 0xff, 0xff) },
+  { "LightCyan2", RGB(0xd1, 0xee, 0xee) },
+  { "LightCyan3", RGB(0xb4, 0xcd, 0xcd) },
+  { "LightCyan4", RGB(0x7a, 0x8b, 0x8b) },
+  { "LightGoldenrod", RGB(0xee, 0xdd, 0x82) },
+  { "LightGoldenrod1", RGB(0xff, 0xec, 0x8b) },
+  { "LightGoldenrod2", RGB(0xee, 0xdc, 0x82) },
+  { "LightGoldenrod3", RGB(0xcd, 0xbe, 0x70) },
+  { "LightGoldenrod4", RGB(0x8b, 0x81, 0x4c) },
+  { "LightGoldenRodYellow", RGB(0xfa, 0xfa, 0xd2) },
+  { "LightGray", RGB(0xd3, 0xd3, 0xd3) },
+  { "LightGreen", RGB(0x90, 0xee, 0x90) },
+  { "LightGrey", RGB(0xd3, 0xd3, 0xd3) },
+  { "LightMagenta", RGB(0xff, 0xbb, 0xff) },
+  { "LightPink", RGB(0xff, 0xb6, 0xc1) },
+  { "LightPink1", RGB(0xff, 0xae, 0xb9) },
+  { "LightPink2", RGB(0xee, 0xa2, 0xad) },
+  { "LightPink3", RGB(0xcd, 0x8c, 0x95) },
+  { "LightPink4", RGB(0x8b, 0x5f, 0x65) },
+  { "LightRed", RGB(0xff, 0xbb, 0xbb) },
+  { "LightSalmon", RGB(0xff, 0xa0, 0x7a) },
+  { "LightSalmon1", RGB(0xff, 0xa0, 0x7a) },
+  { "LightSalmon2", RGB(0xee, 0x95, 0x72) },
+  { "LightSalmon3", RGB(0xcd, 0x81, 0x62) },
+  { "LightSalmon4", RGB(0x8b, 0x57, 0x42) },
+  { "LightSeaGreen", RGB(0x20, 0xb2, 0xaa) },
+  { "LightSkyBlue", RGB(0x87, 0xce, 0xfa) },
+  { "LightSkyBlue1", RGB(0xb0, 0xe2, 0xff) },
+  { "LightSkyBlue2", RGB(0xa4, 0xd3, 0xee) },
+  { "LightSkyBlue3", RGB(0x8d, 0xb6, 0xcd) },
+  { "LightSkyBlue4", RGB(0x60, 0x7b, 0x8b) },
+  { "LightSlateBlue", RGB(0x84, 0x70, 0xff) },
+  { "LightSlateGray", RGB(0x77, 0x88, 0x99) },
+  { "LightSlateGrey", RGB(0x77, 0x88, 0x99) },
+  { "LightSteelBlue", RGB(0xb0, 0xc4, 0xde) },
+  { "LightSteelBlue1", RGB(0xca, 0xe1, 0xff) },
+  { "LightSteelBlue2", RGB(0xbc, 0xd2, 0xee) },
+  { "LightSteelBlue3", RGB(0xa2, 0xb5, 0xcd) },
+  { "LightSteelBlue4", RGB(0x6e, 0x7b, 0x8b) },
+  { "LightYellow", RGB(0xff, 0xff, 0xe0) },
+  { "LightYellow1", RGB(0xff, 0xff, 0xe0) },
+  { "LightYellow2", RGB(0xee, 0xee, 0xd1) },
+  { "LightYellow3", RGB(0xcd, 0xcd, 0xb4) },
+  { "LightYellow4", RGB(0x8b, 0x8b, 0x7a) },
+  { "Lime", RGB(0x00, 0xff, 0x00) },
+  { "LimeGreen", RGB(0x32, 0xcd, 0x32) },
+  { "Linen", RGB(0xfa, 0xf0, 0xe6) },
+  { "Magenta", RGB(0xff, 0x00, 0xff) },
+  { "Magenta1", RGB(0xff, 0x0, 0xff) },
+  { "Magenta2", RGB(0xee, 0x0, 0xee) },
+  { "Magenta3", RGB(0xcd, 0x0, 0xcd) },
+  { "Magenta4", RGB(0x8b, 0x0, 0x8b) },
+  { "Maroon", RGB(0x80, 0x00, 0x00) },
+  { "Maroon1", RGB(0xff, 0x34, 0xb3) },
+  { "Maroon2", RGB(0xee, 0x30, 0xa7) },
+  { "Maroon3", RGB(0xcd, 0x29, 0x90) },
+  { "Maroon4", RGB(0x8b, 0x1c, 0x62) },
+  { "MediumAquamarine", RGB(0x66, 0xcd, 0xaa) },
+  { "MediumBlue", RGB(0x00, 0x00, 0xcd) },
+  { "MediumOrchid", RGB(0xba, 0x55, 0xd3) },
+  { "MediumOrchid1", RGB(0xe0, 0x66, 0xff) },
+  { "MediumOrchid2", RGB(0xd1, 0x5f, 0xee) },
+  { "MediumOrchid3", RGB(0xb4, 0x52, 0xcd) },
+  { "MediumOrchid4", RGB(0x7a, 0x37, 0x8b) },
+  { "MediumPurple", RGB(0x93, 0x70, 0xdb) },
+  { "MediumPurple1", RGB(0xab, 0x82, 0xff) },
+  { "MediumPurple2", RGB(0x9f, 0x79, 0xee) },
+  { "MediumPurple3", RGB(0x89, 0x68, 0xcd) },
+  { "MediumPurple4", RGB(0x5d, 0x47, 0x8b) },
+  { "MediumSeaGreen", RGB(0x3c, 0xb3, 0x71) },
+  { "MediumSlateBlue", RGB(0x7b, 0x68, 0xee) },
+  { "MediumSpringGreen", RGB(0x00, 0xfa, 0x9a) },
+  { "MediumTurquoise", RGB(0x48, 0xd1, 0xcc) },
+  { "MediumVioletRed", RGB(0xc7, 0x15, 0x85) },
+  { "MidnightBlue", RGB(0x19, 0x19, 0x70) },
+  { "MintCream", RGB(0xf5, 0xff, 0xfa) },
+  { "MistyRose", RGB(0xff, 0xe4, 0xe1) },
+  { "MistyRose1", RGB(0xff, 0xe4, 0xe1) },
+  { "MistyRose2", RGB(0xee, 0xd5, 0xd2) },
+  { "MistyRose3", RGB(0xcd, 0xb7, 0xb5) },
+  { "MistyRose4", RGB(0x8b, 0x7d, 0x7b) },
+  { "Moccasin", RGB(0xff, 0xe4, 0xb5) },
+  { "NavajoWhite", RGB(0xff, 0xde, 0xad) },
+  { "NavajoWhite1", RGB(0xff, 0xde, 0xad) },
+  { "NavajoWhite2", RGB(0xee, 0xcf, 0xa1) },
+  { "NavajoWhite3", RGB(0xcd, 0xb3, 0x8b) },
+  { "NavajoWhite4", RGB(0x8b, 0x79, 0x5e) },
+  { "Navy", RGB(0x00, 0x00, 0x80) },
+  { "NavyBlue", RGB(0x0, 0x0, 0x80) },
+  { "OldLace", RGB(0xfd, 0xf5, 0xe6) },
+  { "Olive", RGB(0x80, 0x80, 0x00) },
+  { "OliveDrab", RGB(0x6b, 0x8e, 0x23) },
+  { "OliveDrab1", RGB(0xc0, 0xff, 0x3e) },
+  { "OliveDrab2", RGB(0xb3, 0xee, 0x3a) },
+  { "OliveDrab3", RGB(0x9a, 0xcd, 0x32) },
+  { "OliveDrab4", RGB(0x69, 0x8b, 0x22) },
+  { "Orange", RGB(0xff, 0xa5, 0x00) },
+  { "Orange1", RGB(0xff, 0xa5, 0x0) },
+  { "Orange2", RGB(0xee, 0x9a, 0x0) },
+  { "Orange3", RGB(0xcd, 0x85, 0x0) },
+  { "Orange4", RGB(0x8b, 0x5a, 0x0) },
+  { "OrangeRed", RGB(0xff, 0x45, 0x00) },
+  { "OrangeRed1", RGB(0xff, 0x45, 0x0) },
+  { "OrangeRed2", RGB(0xee, 0x40, 0x0) },
+  { "OrangeRed3", RGB(0xcd, 0x37, 0x0) },
+  { "OrangeRed4", RGB(0x8b, 0x25, 0x0) },
+  { "Orchid", RGB(0xda, 0x70, 0xd6) },
+  { "Orchid1", RGB(0xff, 0x83, 0xfa) },
+  { "Orchid2", RGB(0xee, 0x7a, 0xe9) },
+  { "Orchid3", RGB(0xcd, 0x69, 0xc9) },
+  { "Orchid4", RGB(0x8b, 0x47, 0x89) },
+  { "PaleGoldenRod", RGB(0xee, 0xe8, 0xaa) },
+  { "PaleGreen", RGB(0x98, 0xfb, 0x98) },
+  { "PaleGreen1", RGB(0x9a, 0xff, 0x9a) },
+  { "PaleGreen2", RGB(0x90, 0xee, 0x90) },
+  { "PaleGreen3", RGB(0x7c, 0xcd, 0x7c) },
+  { "PaleGreen4", RGB(0x54, 0x8b, 0x54) },
+  { "PaleTurquoise", RGB(0xaf, 0xee, 0xee) },
+  { "PaleTurquoise1", RGB(0xbb, 0xff, 0xff) },
+  { "PaleTurquoise2", RGB(0xae, 0xee, 0xee) },
+  { "PaleTurquoise3", RGB(0x96, 0xcd, 0xcd) },
+  { "PaleTurquoise4", RGB(0x66, 0x8b, 0x8b) },
+  { "PaleVioletRed", RGB(0xdb, 0x70, 0x93) },
+  { "PaleVioletRed1", RGB(0xff, 0x82, 0xab) },
+  { "PaleVioletRed2", RGB(0xee, 0x79, 0x9f) },
+  { "PaleVioletRed3", RGB(0xcd, 0x68, 0x89) },
+  { "PaleVioletRed4", RGB(0x8b, 0x47, 0x5d) },
+  { "PapayaWhip", RGB(0xff, 0xef, 0xd5) },
+  { "PeachPuff", RGB(0xff, 0xda, 0xb9) },
+  { "PeachPuff1", RGB(0xff, 0xda, 0xb9) },
+  { "PeachPuff2", RGB(0xee, 0xcb, 0xad) },
+  { "PeachPuff3", RGB(0xcd, 0xaf, 0x95) },
+  { "PeachPuff4", RGB(0x8b, 0x77, 0x65) },
+  { "Peru", RGB(0xcd, 0x85, 0x3f) },
+  { "Pink", RGB(0xff, 0xc0, 0xcb) },
+  { "Pink1", RGB(0xff, 0xb5, 0xc5) },
+  { "Pink2", RGB(0xee, 0xa9, 0xb8) },
+  { "Pink3", RGB(0xcd, 0x91, 0x9e) },
+  { "Pink4", RGB(0x8b, 0x63, 0x6c) },
+  { "Plum", RGB(0xdd, 0xa0, 0xdd) },
+  { "Plum1", RGB(0xff, 0xbb, 0xff) },
+  { "Plum2", RGB(0xee, 0xae, 0xee) },
+  { "Plum3", RGB(0xcd, 0x96, 0xcd) },
+  { "Plum4", RGB(0x8b, 0x66, 0x8b) },
+  { "PowderBlue", RGB(0xb0, 0xe0, 0xe6) },
+  { "Purple", RGB(0x80, 0x00, 0x80) },
+  { "Purple1", RGB(0x9b, 0x30, 0xff) },
+  { "Purple2", RGB(0x91, 0x2c, 0xee) },
+  { "Purple3", RGB(0x7d, 0x26, 0xcd) },
+  { "Purple4", RGB(0x55, 0x1a, 0x8b) },
+  { "RebeccaPurple", RGB(0x66, 0x33, 0x99) },
+  { "Red", RGB(0xff, 0x00, 0x00) },
+  { "Red1", RGB(0xff, 0x0, 0x0) },
+  { "Red2", RGB(0xee, 0x0, 0x0) },
+  { "Red3", RGB(0xcd, 0x0, 0x0) },
+  { "Red4", RGB(0x8b, 0x0, 0x0) },
+  { "RosyBrown", RGB(0xbc, 0x8f, 0x8f) },
+  { "RosyBrown1", RGB(0xff, 0xc1, 0xc1) },
+  { "RosyBrown2", RGB(0xee, 0xb4, 0xb4) },
+  { "RosyBrown3", RGB(0xcd, 0x9b, 0x9b) },
+  { "RosyBrown4", RGB(0x8b, 0x69, 0x69) },
+  { "RoyalBlue", RGB(0x41, 0x69, 0xe1) },
+  { "RoyalBlue1", RGB(0x48, 0x76, 0xff) },
+  { "RoyalBlue2", RGB(0x43, 0x6e, 0xee) },
+  { "RoyalBlue3", RGB(0x3a, 0x5f, 0xcd) },
+  { "RoyalBlue4", RGB(0x27, 0x40, 0x8b) },
+  { "SaddleBrown", RGB(0x8b, 0x45, 0x13) },
+  { "Salmon", RGB(0xfa, 0x80, 0x72) },
+  { "Salmon1", RGB(0xff, 0x8c, 0x69) },
+  { "Salmon2", RGB(0xee, 0x82, 0x62) },
+  { "Salmon3", RGB(0xcd, 0x70, 0x54) },
+  { "Salmon4", RGB(0x8b, 0x4c, 0x39) },
+  { "SandyBrown", RGB(0xf4, 0xa4, 0x60) },
+  { "SeaGreen", RGB(0x2e, 0x8b, 0x57) },
+  { "SeaGreen1", RGB(0x54, 0xff, 0x9f) },
+  { "SeaGreen2", RGB(0x4e, 0xee, 0x94) },
+  { "SeaGreen3", RGB(0x43, 0xcd, 0x80) },
+  { "SeaGreen4", RGB(0x2e, 0x8b, 0x57) },
+  { "SeaShell", RGB(0xff, 0xf5, 0xee) },
+  { "Seashell1", RGB(0xff, 0xf5, 0xee) },
+  { "Seashell2", RGB(0xee, 0xe5, 0xde) },
+  { "Seashell3", RGB(0xcd, 0xc5, 0xbf) },
+  { "Seashell4", RGB(0x8b, 0x86, 0x82) },
+  { "Sienna", RGB(0xa0, 0x52, 0x2d) },
+  { "Sienna1", RGB(0xff, 0x82, 0x47) },
+  { "Sienna2", RGB(0xee, 0x79, 0x42) },
+  { "Sienna3", RGB(0xcd, 0x68, 0x39) },
+  { "Sienna4", RGB(0x8b, 0x47, 0x26) },
+  { "Silver", RGB(0xc0, 0xc0, 0xc0) },
+  { "SkyBlue", RGB(0x87, 0xce, 0xeb) },
+  { "SkyBlue1", RGB(0x87, 0xce, 0xff) },
+  { "SkyBlue2", RGB(0x7e, 0xc0, 0xee) },
+  { "SkyBlue3", RGB(0x6c, 0xa6, 0xcd) },
+  { "SkyBlue4", RGB(0x4a, 0x70, 0x8b) },
+  { "SlateBlue", RGB(0x6a, 0x5a, 0xcd) },
+  { "SlateBlue1", RGB(0x83, 0x6f, 0xff) },
+  { "SlateBlue2", RGB(0x7a, 0x67, 0xee) },
+  { "SlateBlue3", RGB(0x69, 0x59, 0xcd) },
+  { "SlateBlue4", RGB(0x47, 0x3c, 0x8b) },
+  { "SlateGray", RGB(0x70, 0x80, 0x90) },
+  { "SlateGray1", RGB(0xc6, 0xe2, 0xff) },
+  { "SlateGray2", RGB(0xb9, 0xd3, 0xee) },
+  { "SlateGray3", RGB(0x9f, 0xb6, 0xcd) },
+  { "SlateGray4", RGB(0x6c, 0x7b, 0x8b) },
+  { "SlateGrey", RGB(0x70, 0x80, 0x90) },
+  { "Snow", RGB(0xff, 0xfa, 0xfa) },
+  { "Snow1", RGB(0xff, 0xfa, 0xfa) },
+  { "Snow2", RGB(0xee, 0xe9, 0xe9) },
+  { "Snow3", RGB(0xcd, 0xc9, 0xc9) },
+  { "Snow4", RGB(0x8b, 0x89, 0x89) },
+  { "SpringGreen", RGB(0x00, 0xff, 0x7f) },
+  { "SpringGreen1", RGB(0x0, 0xff, 0x7f) },
+  { "SpringGreen2", RGB(0x0, 0xee, 0x76) },
+  { "SpringGreen3", RGB(0x0, 0xcd, 0x66) },
+  { "SpringGreen4", RGB(0x0, 0x8b, 0x45) },
+  { "SteelBlue", RGB(0x46, 0x82, 0xb4) },
+  { "SteelBlue1", RGB(0x63, 0xb8, 0xff) },
+  { "SteelBlue2", RGB(0x5c, 0xac, 0xee) },
+  { "SteelBlue3", RGB(0x4f, 0x94, 0xcd) },
+  { "SteelBlue4", RGB(0x36, 0x64, 0x8b) },
+  { "Tan", RGB(0xd2, 0xb4, 0x8c) },
+  { "Tan1", RGB(0xff, 0xa5, 0x4f) },
+  { "Tan2", RGB(0xee, 0x9a, 0x49) },
+  { "Tan3", RGB(0xcd, 0x85, 0x3f) },
+  { "Tan4", RGB(0x8b, 0x5a, 0x2b) },
+  { "Teal", RGB(0x00, 0x80, 0x80) },
+  { "Thistle", RGB(0xd8, 0xbf, 0xd8) },
+  { "Thistle1", RGB(0xff, 0xe1, 0xff) },
+  { "Thistle2", RGB(0xee, 0xd2, 0xee) },
+  { "Thistle3", RGB(0xcd, 0xb5, 0xcd) },
+  { "Thistle4", RGB(0x8b, 0x7b, 0x8b) },
+  { "Tomato", RGB(0xff, 0x63, 0x47) },
+  { "Tomato1", RGB(0xff, 0x63, 0x47) },
+  { "Tomato2", RGB(0xee, 0x5c, 0x42) },
+  { "Tomato3", RGB(0xcd, 0x4f, 0x39) },
+  { "Tomato4", RGB(0x8b, 0x36, 0x26) },
+  { "Turquoise", RGB(0x40, 0xe0, 0xd0) },
+  { "Turquoise1", RGB(0x0, 0xf5, 0xff) },
+  { "Turquoise2", RGB(0x0, 0xe5, 0xee) },
+  { "Turquoise3", RGB(0x0, 0xc5, 0xcd) },
+  { "Turquoise4", RGB(0x0, 0x86, 0x8b) },
+  { "Violet", RGB(0xee, 0x82, 0xee) },
+  { "VioletRed", RGB(0xd0, 0x20, 0x90) },
+  { "VioletRed1", RGB(0xff, 0x3e, 0x96) },
+  { "VioletRed2", RGB(0xee, 0x3a, 0x8c) },
+  { "VioletRed3", RGB(0xcd, 0x32, 0x78) },
+  { "VioletRed4", RGB(0x8b, 0x22, 0x52) },
+  { "WebGray", RGB(0x80, 0x80, 0x80) },
+  { "WebGreen", RGB(0x0, 0x80, 0x0) },
+  { "WebGrey", RGB(0x80, 0x80, 0x80) },
+  { "WebMaroon", RGB(0x80, 0x0, 0x0) },
+  { "WebPurple", RGB(0x80, 0x0, 0x80) },
+  { "Wheat", RGB(0xf5, 0xde, 0xb3) },
+  { "Wheat1", RGB(0xff, 0xe7, 0xba) },
+  { "Wheat2", RGB(0xee, 0xd8, 0xae) },
+  { "Wheat3", RGB(0xcd, 0xba, 0x96) },
+  { "Wheat4", RGB(0x8b, 0x7e, 0x66) },
+  { "White", RGB(0xff, 0xff, 0xff) },
+  { "WhiteSmoke", RGB(0xf5, 0xf5, 0xf5) },
+  { "X11Gray", RGB(0xbe, 0xbe, 0xbe) },
+  { "X11Green", RGB(0x0, 0xff, 0x0) },
+  { "X11Grey", RGB(0xbe, 0xbe, 0xbe) },
+  { "X11Maroon", RGB(0xb0, 0x30, 0x60) },
+  { "X11Purple", RGB(0xa0, 0x20, 0xf0) },
+  { "Yellow", RGB(0xff, 0xff, 0x00) },
+  { "Yellow1", RGB(0xff, 0xff, 0x0) },
+  { "Yellow2", RGB(0xee, 0xee, 0x0) },
+  { "Yellow3", RGB(0xcd, 0xcd, 0x0) },
+  { "Yellow4", RGB(0x8b, 0x8b, 0x0) },
+  { "YellowGreen", RGB(0x9a, 0xcd, 0x32) },
+  { NULL, 0 },
 };
 
 RgbValue name_to_color(uint8_t *name)
@@ -7588,6 +8238,10 @@ RgbValue name_to_color(uint8_t *name)
       && isxdigit(name[6]) && name[7] == NUL) {
     // rgb hex string
     return strtol((char *)(name + 1), NULL, 16);
+  } else if (!STRICMP(name, "bg") || !STRICMP(name, "background")) {
+    return normal_bg;
+  } else if (!STRICMP(name, "fg") || !STRICMP(name, "foreground")) {
+    return normal_fg;
   }
 
   for (int i = 0; color_name_table[i].name != NULL; i++) {
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 7885d467d8..0b76e36a6b 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -26,7 +26,6 @@
 #include "nvim/mbyte.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/file_search.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
@@ -215,8 +214,12 @@ do_tag (
    * Don't add a tag to the tagstack if 'tagstack' has been reset.
    */
   if (!p_tgst && *tag != NUL) {
-    use_tagstack = FALSE;
-    new_tag = TRUE;
+    use_tagstack = false;
+    new_tag = true;
+    if (g_do_tagpreview != 0) {
+      xfree(ptag_entry.tagname);
+      ptag_entry.tagname = vim_strsave(tag);
+    }
   } else {
     if (g_do_tagpreview != 0)
       use_tagstack = FALSE;
@@ -787,7 +790,7 @@ do_tag (
         vim_snprintf((char *)IObuff, IOSIZE, "ltag %s", tag);
         set_errorlist(curwin, list, ' ', IObuff);
 
-        list_free(list, TRUE);
+        list_free(list);
         xfree(fname);
         xfree(cmd);
 
@@ -1294,9 +1297,14 @@ find_tags (
        * Read and parse the lines in the file one by one
        */
       for (;; ) {
-        line_breakcheck();          /* check for CTRL-C typed */
+        // check for CTRL-C typed, more often when jumping around
+        if (state == TS_BINARY || state == TS_SKIP_BACK) {
+          line_breakcheck();
+        } else {
+          fast_breakcheck();
+        }
         if ((flags & TAG_INS_COMP))     /* Double brackets for gcc */
-          ins_compl_check_keys(30);
+          ins_compl_check_keys(30, false);
         if (got_int || compl_interrupted) {
           stop_searching = TRUE;
           break;
@@ -1859,7 +1867,7 @@ parse_line:
                       && memcmp(mfp2->match, mfp->match,
                           (size_t)mfp->len) == 0)
                     break;
-                  line_breakcheck();
+                  fast_breakcheck();
                 }
               if (i < 0) {
                 ((struct match_found **)(ga_match[mtt].ga_data))
@@ -2023,9 +2031,8 @@ get_tagfname (
     if (first) {
       ga_clear_strings(&tag_fnames);
       ga_init(&tag_fnames, (int)sizeof(char_u *), 10);
-      do_in_runtimepath((char_u *)
-          "doc/tags doc/tags-??"
-          , TRUE, found_tagfile_cb, NULL);
+      do_in_runtimepath((char_u *)"doc/tags doc/tags-??", DIP_ALL,
+                        found_tagfile_cb, NULL);
     }
 
     if (tnp->tn_hf_idx >= tag_fnames.ga_len) {
@@ -2353,7 +2360,7 @@ jumpto_tag (
    * file.  Also accept a file name for which there is a matching BufReadCmd
    * autocommand event (e.g., http://sys/file).
    */
-  if (!os_file_exists(fname)
+  if (!os_path_exists(fname)
       && !has_autocmd(EVENT_BUFREADCMD, fname, NULL)
       ) {
     retval = NOTAGFILE;
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 104cc47cda..bd7b9fc58f 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -63,6 +63,7 @@
 #include "nvim/map.h"
 #include "nvim/misc1.h"
 #include "nvim/move.h"
+#include "nvim/main.h"
 #include "nvim/state.h"
 #include "nvim/ex_docmd.h"
 #include "nvim/ex_cmds.h"
@@ -126,7 +127,7 @@ struct terminal {
   // we can't store a direct reference to the buffer because the
   // refresh_timer_cb may be called after the buffer was freed, and there's
   // no way to know if the memory was reused.
-  uint64_t buf_handle;
+  handle_T buf_handle;
   // program exited
   bool closed, destroy;
   // some vterm properties
@@ -163,9 +164,9 @@ static VTermColor default_vt_bg_rgb;
 void terminal_init(void)
 {
   invalidated_terminals = pmap_new(ptr_t)();
-  time_watcher_init(&loop, &refresh_timer, NULL);
+  time_watcher_init(&main_loop, &refresh_timer, NULL);
   // refresh_timer_cb will redraw the screen which can call vimscript
-  refresh_timer.events = queue_new_child(loop.events);
+  refresh_timer.events = multiqueue_new_child(main_loop.events);
 
   // initialize a rgb->color index map for cterm attributes(VTermScreenCell
   // only has RGB information and we need color indexes for terminal UIs)
@@ -200,7 +201,7 @@ void terminal_init(void)
 void terminal_teardown(void)
 {
   time_watcher_stop(&refresh_timer);
-  queue_free(refresh_timer.events);
+  multiqueue_free(refresh_timer.events);
   time_watcher_close(&refresh_timer, NULL);
   pmap_free(ptr_t)(invalidated_terminals);
   map_free(int, int)(color_indexes);
@@ -240,6 +241,7 @@ Terminal *terminal_open(TerminalOptions opts)
   set_option_value((uint8_t *)"wrap", false, NULL, OPT_LOCAL);
   set_option_value((uint8_t *)"number", false, NULL, OPT_LOCAL);
   set_option_value((uint8_t *)"relativenumber", false, NULL, OPT_LOCAL);
+  buf_set_term_title(curbuf, (char *)curbuf->b_ffname);
   RESET_BINDING(curwin);
   // Apply TermOpen autocmds so the user can configure the terminal
   apply_autocmds(EVENT_TERMOPEN, NULL, NULL, false, curbuf);
@@ -347,15 +349,6 @@ void terminal_resize(Terminal *term, uint16_t width, uint16_t height)
     height = (uint16_t)curheight;
   }
 
-  // The new width/height are the minimum for all windows that display the
-  // terminal in the current tab.
-  FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
-    if (!wp->w_closing && wp->w_buffer->terminal == term) {
-      width = (uint16_t)MIN(width, (uint16_t)(wp->w_width - win_col_off(wp)));
-      height = (uint16_t)MIN(height, (uint16_t)wp->w_height);
-    }
-  }
-
   if (curheight == height && curwidth == width) {
     return;
   }
@@ -373,10 +366,10 @@ void terminal_resize(Terminal *term, uint16_t width, uint16_t height)
 void terminal_enter(void)
 {
   buf_T *buf = curbuf;
+  assert(buf->terminal);  // Should only be called when curbuf has a terminal.
   TerminalState state, *s = &state;
   memset(s, 0, sizeof(TerminalState));
   s->term = buf->terminal;
-  assert(s->term && "should only be called when curbuf has a terminal");
 
   // Ensure the terminal is properly sized.
   terminal_resize(s->term, 0, 0);
@@ -452,7 +445,7 @@ static int terminal_execute(VimState *state, int key)
     case K_EVENT:
       // We cannot let an event free the terminal yet. It is still needed.
       s->term->refcount++;
-      queue_process_events(loop.events);
+      multiqueue_process_events(main_loop.events);
       s->term->refcount--;
       if (s->term->buf_handle == 0) {
         s->close = true;
@@ -626,6 +619,18 @@ static int term_movecursor(VTermPos new, VTermPos old, int visible,
   return 1;
 }
 
+static void buf_set_term_title(buf_T *buf, char *title)
+    FUNC_ATTR_NONNULL_ALL
+{
+  Error err;
+  dict_set_value(buf->b_vars,
+                 cstr_as_string("term_title"),
+                 STRING_OBJ(cstr_as_string(title)),
+                 false,
+                 false,
+                 &err);
+}
+
 static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
 {
   Terminal *term = data;
@@ -641,12 +646,7 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
 
     case VTERM_PROP_TITLE: {
       buf_T *buf = handle_get_buffer(term->buf_handle);
-      Error err;
-      api_free_object(dict_set_value(buf->b_vars,
-                                     cstr_as_string("term_title"),
-                                     STRING_OBJ(cstr_as_string(val->string)),
-                                     false,
-                                     &err));
+      buf_set_term_title(buf, val->string);
       break;
     }
 
@@ -955,7 +955,6 @@ static void invalidate_terminal(Terminal *term, int start_row, int end_row)
 
 static void refresh_terminal(Terminal *term)
 {
-  // TODO(SplinterOfChaos): Find the condition that makes term->buf invalid.
   buf_T *buf = handle_get_buffer(term->buf_handle);
   bool valid = true;
   if (!buf || !(valid = buf_valid(buf))) {
@@ -1082,7 +1081,8 @@ static void redraw(bool restore_cursor)
     restore_cursor = true;
   }
 
-  int save_row, save_col;
+  int save_row = 0;
+  int save_col = 0;
   if (restore_cursor) {
     // save the current row/col to restore after updating screen when not
     // focused
@@ -1158,15 +1158,15 @@ static bool is_focused(Terminal *term)
   return State & TERM_FOCUS && curbuf->terminal == term;
 }
 
-#define GET_CONFIG_VALUE(k, o)                                           \
-  do {                                                                   \
-    Error err;                                                           \
-    /* Only called from terminal_open where curbuf->terminal is the */   \
-    /* context  */                                                       \
-    o = dict_get_value(curbuf->b_vars, cstr_as_string(k), &err);         \
-    if (o.type == kObjectTypeNil) {                                      \
-      o = dict_get_value(&globvardict, cstr_as_string(k), &err);         \
-    }                                                                    \
+#define GET_CONFIG_VALUE(k, o) \
+  do { \
+    Error err; \
+    /* Only called from terminal_open where curbuf->terminal is the */ \
+    /* context  */ \
+    o = dict_get_value(curbuf->b_vars, cstr_as_string(k), &err); \
+    if (o.type == kObjectTypeNil) { \
+      o = dict_get_value(&globvardict, cstr_as_string(k), &err); \
+    } \
   } while (0)
 
 static char *get_config_string(char *key)
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 03e6d213df..13b7da43dd 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -9,37 +9,45 @@ SCRIPTSOURCE := ../../../runtime
 
 SCRIPTS := \
            test8.out              \
-           test10.out             \
-           test12.out             \
            test13.out             \
            test14.out             \
            test17.out             \
            test24.out             \
-           test30.out             \
            test32.out             \
-           test34.out             \
            test37.out             \
            test40.out             \
            test42.out             \
-           test47.out             \
            test48.out             \
            test49.out             \
            test52.out             \
            test53.out             \
-           test55.out             \
            test64.out             \
            test73.out             \
            test79.out             \
-           test_listlbr.out       \
            test_marks.out         \
 
 # Tests using runtest.vim.vim.
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = \
-	    test_cursor_func.res \
+	    test_bufwintabinfo.res \
+	    test_cmdline.res \
+	    test_cscope.res \
+	    test_diffmode.res \
+	    test_gn.res \
+	    test_hardcopy.res \
 	    test_help_tagjump.res \
-	    test_menu.res \
+	    test_history.res \
+	    test_langmap.res \
+	    test_match.res \
+	    test_matchadd_conceal.res \
+	    test_quickfix.res \
+	    test_signs.res \
+	    test_syntax.res \
+	    test_timers.res \
+	    test_usercommands.res \
 	    test_viml.res \
+	    test_visual.res \
+	    test_window_id.res \
 	    test_alot.res
 
 SCRIPTS_GUI := test16.out
@@ -58,7 +66,7 @@ ifdef USE_VALGRIND
 	TOOL := valgrind -q                                     \
 	                 -q                                     \
 	                 $(VALGRIND_TOOL)                       \
-	                 --suppressions=../../../.valgrind.supp \
+	                 --suppressions=../../.valgrind.supp \
 	                 --error-exitcode=123                   \
 	                 --log-file=valgrind.\%p.$*             \
 	                 $(VGDB)                                \
@@ -112,6 +120,7 @@ clean:
 	        valgrind.*     \
 	        .*.swp         \
 	        .*.swo         \
+	        .gdbinit       \
 	        del
 
 test1.out: .gdbinit test1.in
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 5b34b4fc31..eb5912086b 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -2,6 +2,11 @@
 " When the script is successful the .res file will be created.
 " Errors are appended to the test.log file.
 "
+" To execute only specific test functions, add a second argument.  It will be
+" matched against the names of the Test_ function.  E.g.:
+"   ../vim -u NONE -S runtest.vim test_channel.vim open_delay
+" The output can be found in the "messages" file.
+"
 " The test script may contain anything, only functions that start with
 " "Test_" are special.  These will be invoked and should contain assert
 " functions.  See test_assert.vim for an example.
@@ -19,6 +24,10 @@
 "
 " If cleanup after each Test_ function is needed, define a TearDown function.
 " It will be called after each Test_ function.
+"
+" When debugging a test it can be useful to add messages to v:errors:
+" 	call add(v:errors, "this happened")
+
 
 " Check that the screen size is at least 24 x 80 characters.
 if &lines < 24 || &columns < 80 
@@ -30,96 +39,151 @@ if &lines < 24 || &columns < 80
   cquit
 endif
 
+" Common with all tests on all systems.
+source setup.vim
+
 " This also enables use of line continuation.
 set viminfo+=nviminfo
 
+" Use utf-8 or latin1 be default, instead of whatever the system default
+" happens to be.  Individual tests can overrule this at the top of the file.
+if has('multi_byte')
+  set encoding=utf-8
+else
+  set encoding=latin1
+endif
+
 " Avoid stopping at the "hit enter" prompt
 set nomore
 
 " Output all messages in English.
 lang mess C
 
+" Always use forward slashes.
+set shellslash
+
+" Align with vim defaults.
+set directory^=.
+set nohidden
+
+function RunTheTest(test)
+  echo 'Executing ' . a:test
+  if exists("*SetUp")
+    call SetUp()
+  endif
+
+  call add(s:messages, 'Executing ' . a:test)
+  let s:done += 1
+  try
+    exe 'call ' . a:test
+  catch /^\cskipped/
+    call add(s:messages, '    Skipped')
+    call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '',  ''))
+  catch
+    call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
+  endtry
+
+  if exists("*TearDown")
+    call TearDown()
+  endif
+
+  " Close any extra windows and make the current one not modified.
+  while winnr('$') > 1
+    bwipe!
+  endwhile
+  set nomodified
+endfunc
+
 " Source the test script.  First grab the file name, in case the script
-" navigates away.
-let testname = expand('%')
-let done = 0
-let fail = 0
-let errors = []
-let messages = []
+" navigates away.  g:testname can be used by the tests.
+let g:testname = expand('%')
+let s:done = 0
+let s:fail = 0
+let s:errors = []
+let s:messages = []
+let s:skipped = []
 if expand('%') =~ 'test_viml.vim'
-  " this test has intentional errors, don't use try/catch.
+  " this test has intentional s:errors, don't use try/catch.
   source %
 else
   try
     source %
   catch
-    let fail += 1
-    call add(errors, 'Caught exception: ' . v:exception . ' @ ' . v:throwpoint)
+    let s:fail += 1
+    call add(s:errors, 'Caught exception: ' . v:exception . ' @ ' . v:throwpoint)
   endtry
 endif
 
+" Names of flaky tests.
+let s:flaky = []
+
 " Locate Test_ functions and execute them.
 set nomore
 redir @q
-function /^Test_
+silent function /^Test_
 redir END
-let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
+let s:tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
 
-for test in tests
-  if exists("*SetUp")
-    call SetUp()
-  endif
+" If there is an extra argument filter the function names against it.
+if argc() > 1
+  let s:tests = filter(s:tests, 'v:val =~ argv(1)')
+endif
 
-  call add(messages, 'Executing ' . test)
-  let done += 1
-  try
-    exe 'call ' . test
-  catch
-    let fail += 1
-    call add(v:errors, 'Caught exception in ' . test . ': ' . v:exception . ' @ ' . v:throwpoint)
-  endtry
+" Execute the tests in alphabetical order.
+for s:test in sort(s:tests)
+  call RunTheTest(s:test)
+
+  if len(v:errors) > 0 && index(s:flaky, s:test) >= 0
+		call add(s:messages, 'Flaky test failed, running it again')
+		let v:errors = []
+		call RunTheTest(s:test)
+	endif
 
   if len(v:errors) > 0
-    let fail += 1
-    call add(errors, 'Found errors in ' . test . ':')
-    call extend(errors, v:errors)
+    let s:fail += 1
+    call add(s:errors, 'Found errors in ' . s:test . ':')
+    call extend(s:errors, v:errors)
     let v:errors = []
   endif
 
-  if exists("*TearDown")
-    call TearDown()
-  endif
 endfor
 
-if fail == 0
+" Don't write viminfo on exit.
+set viminfo=
+
+if s:fail == 0
   " Success, create the .res file so that make knows it's done.
-  exe 'split ' . fnamemodify(testname, ':r') . '.res'
+  exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
   write
 endif
 
-if len(errors) > 0
+if len(s:errors) > 0
   " Append errors to test.log
   split test.log
   call append(line('$'), '')
-  call append(line('$'), 'From ' . testname . ':')
-  call append(line('$'), errors)
+  call append(line('$'), 'From ' . g:testname . ':')
+  call append(line('$'), s:errors)
   write
 endif
 
-let message = 'Executed ' . done . (done > 1 ? ' tests': ' test')
+let message = 'Executed ' . s:done . (s:done > 1 ? ' tests': ' test')
 echo message
-call add(messages, message)
-if fail > 0
-  let message = fail . ' FAILED'
+call add(s:messages, message)
+if s:fail > 0
+  let message = s:fail . ' FAILED'
   echo message
-  call add(messages, message)
+  call add(s:messages, message)
+  call extend(s:messages, s:errors)
 endif
 
-" Append messages to "messages"
+" Add SKIPPED messages
+call extend(s:messages, s:skipped)
+
+" Append messages to the file "messages"
 split messages
 call append(line('$'), '')
-call append(line('$'), 'From ' . testname . ':')
-call append(line('$'), messages)
+call append(line('$'), 'From ' . g:testname . ':')
+call append(line('$'), s:messages)
 write
 
 qall!
diff --git a/src/nvim/testdir/samples/quickfix.txt b/src/nvim/testdir/samples/quickfix.txt
new file mode 100644
index 0000000000..2de3835473
--- /dev/null
+++ b/src/nvim/testdir/samples/quickfix.txt
@@ -0,0 +1,4 @@
+samples/quickfix.txt:1:1:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+samples/quickfix.txt:2:1:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+samples/quickfix.txt:3:1:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+samples/quickfix.txt:4:1:dddddddddd
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
new file mode 100644
index 0000000000..52876d1e6c
--- /dev/null
+++ b/src/nvim/testdir/setup.vim
@@ -0,0 +1,7 @@
+" Common preparations for running tests.
+
+" Make sure 'runtimepath' does not include $HOME.
+set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
+
+" Make sure $HOME does not get read or written.
+let $HOME = '/does/not/exist'
diff --git a/src/nvim/testdir/test10.in b/src/nvim/testdir/test10.in
deleted file mode 100644
index 2178cf41ce..0000000000
--- a/src/nvim/testdir/test10.in
+++ /dev/null
@@ -1,110 +0,0 @@
-Test for 'errorformat'.  This will fail if the quickfix feature was disabled.
-
-STARTTEST
-:7/start of errorfile/,/end of errorfile/w! Xerrorfile1
-:7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
-:/start of testfile/,/end of testfile/w! Xtestfile
-:set efm+==%f=\\,\ line\ %l%*\\D%v%*[^\ ]\ %m
-:set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m
-:cf Xerrorfile2
-:clast
-:copen
-:let a=w:quickfix_title
-:wincmd p
-lgR=a

-:cf Xerrorfile1
-grA
-:cn
-gRLINE 6, COL 19
-:cn
-gRNO COLUMN SPECIFIED
-:cn
-gRAGAIN NO COLUMN
-:cn
-gRCOL 1
-:cn
-gRCOL 2
-:cn
-gRCOL 10
-:cn
-gRVCOL 10
-:cn
-grI
-:cn
-gR. SPACE POINTER
-:cn
-gR. DOT POINTER
-:cn
-gR. DASH POINTER
-:cn
-gR. TAB-SPACE POINTER
-:clast
-:cprev
-:cprev
-:wincmd w
-:let a=w:quickfix_title
-:wincmd p
-lgR=a

-:w! test.out             " Write contents of this file
-:qa!
-ENDTEST
-
-start of errorfile
-"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.
-"Xtestfile", line 6 col 19; this is an error
-gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include  version.c
-Xtestfile:9: parse error before `asd'
-make: *** [vim] Error 1
-in file "Xtestfile" linenr 10: there is an error
-
-2 returned
-"Xtestfile", line 11 col 1; this is an error
-"Xtestfile", line 12 col 2; this is another error
-"Xtestfile", line 14:10; this is an error in column 10
-=Xtestfile=, line 15:10; this is another error, but in vcol 10 this time
-"Xtestfile", linenr 16: yet another problem
-Error in "Xtestfile" at line 17:
-x should be a dot
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17
-            ^
-Error in "Xtestfile" at line 18:
-x should be a dot
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18
-.............^
-Error in "Xtestfile" at line 19:
-x should be a dot
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19
---------------^
-Error in "Xtestfile" at line 20:
-x should be a dot
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20
-	       ^
-
-Does anyone know what is the problem and how to correction it?
-"Xtestfile", line 21 col 9: What is the title of the quickfix window?
-"Xtestfile", line 22 col 9: What is the title of the quickfix window?
-end of errorfile
-
-start of testfile
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  2
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  3
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  4
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  5
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  6
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  7
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  8
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  9
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 10
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 11
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 12
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 13
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 14
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 15
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 16
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 21
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 22
-end of testfile
diff --git a/src/nvim/testdir/test10.ok b/src/nvim/testdir/test10.ok
deleted file mode 100644
index 76a02f40b4..0000000000
--- a/src/nvim/testdir/test10.ok
+++ /dev/null
@@ -1,23 +0,0 @@
-start of testfile
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  2
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  3
-	xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx    line  4
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  5
-	xxxxxxxxxxxxxxxxxLINE 6, COL 19   line  6
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  7
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  8
-	NO COLUMN SPECIFIEDxxxxxxxxxxx    line  9
-	AGAIN NO COLUMNxxxxxxxxxxxxxxx    line 10
-COL 1	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 11
-	COL 2xxxxxxxxxxxxxxxxxxxxxxxxx    line 12
-	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 13
-	xxxxxxxxCOL 10xxxxxxxxxxxxxxxx    line 14
-	xVCOL 10xxxxxxxxxxxxxxxxxxxxxx    line 15
-	Ixxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 16
-	xxxx. SPACE POINTERxxxxxxxxxxx    line 17
-	xxxxx. DOT POINTERxxxxxxxxxxxx    line 18
-	xxxxxx. DASH POINTERxxxxxxxxxx    line 19
-	xxxxxxx. TAB-SPACE POINTERxxxx    line 20
-	xxxxxxxx:cf Xerrorfile1xxxxxxx    line 21
-	xxxxxxxx:cf Xerrorfile2xxxxxxx    line 22
-end of testfile
diff --git a/src/nvim/testdir/test10a.in b/src/nvim/testdir/test10a.in
deleted file mode 100644
index 99a5a03db8..0000000000
--- a/src/nvim/testdir/test10a.in
+++ /dev/null
@@ -1,72 +0,0 @@
-Test for 'errorformat'.
-
-STARTTEST
-:/start of errorfile/,/end of errorfile/w! Xerrorfile
-:/start of testfile/,/end of testfile/w! Xtestfile
-:cf Xerrorfile
-rA
-:cn
-rB
-:cn
-rC
-:cn
-rD
-:cn
-rE
-:w! test.out             " Write contents of this file
-:qa!
-ENDTEST
-
-start of errorfile
-
-                  printf(" %d \n", (number/other)%10 );
-..................^
-%CC-E-NOSEMI, Missing ";".
-at line number 4 in file SYS$DISK:XTESTFILE
-
-             other=10000000;
-.............^
-%CC-E-UNDECLARED, In this statement, "oszt" is not declared.
-at line number 7 in file SYS$DISK:XTESTFILE
-
-             for (i = 0; i<7 ; i++ ){
-..................^
-%CC-E-UNDECLARED, In this statement, "i" is not declared.
-at line number 16 in file SYS$DISK:XTESTFILE
-
-some other error somewhere here.
-...........................^
-%CC-W-WARRING, Sorry, but no expalnation for such an warring.
-at line number 19 in file SYS$DISK:XTESTFILE
-
-and finally some other error exactly here.
-.....................................^
-%CC-I-INFORMATIONAL, It should be some informational message.
-at line number 20 in file SYS$DISK:XTESTFILE
-
-Does anyone know what is the problem and how to correct ??  :)
-end of errorfile
-
-start of testfile
-01234567890123456789012345678901234567
-line 3  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 4  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 5  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 6  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 7  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 8  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 9  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 16 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 19 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-end of testfile
diff --git a/src/nvim/testdir/test10a.ok b/src/nvim/testdir/test10a.ok
deleted file mode 100644
index 10e78c9239..0000000000
--- a/src/nvim/testdir/test10a.ok
+++ /dev/null
@@ -1,23 +0,0 @@
-start of testfile
-01234567890123456789012345678901234567
-line 3  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 4  xxxxxxxxxxAxxxxxxxxxxxxxxxxxxx
-line 5  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 6  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 7  xxxxxBxxxxxxxxxxxxxxxxxxxxxxxx
-line 8  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 9  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 10 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 11 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 12 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 13 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 14 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 15 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 16 xxxxxxxxxxCxxxxxxxxxxxxxxxxxxx
-line 17 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 18 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 19 xxxxxxxxxxxxxxxxxxxDxxxxxxxxxx
-line 20 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxE
-line 21 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-line 22 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-end of testfile
diff --git a/src/nvim/testdir/test12.in b/src/nvim/testdir/test12.in
deleted file mode 100644
index 0c0623e5d4..0000000000
--- a/src/nvim/testdir/test12.in
+++ /dev/null
@@ -1,50 +0,0 @@
-Tests for 'directory' option.
-- ".", in same dir as file
-- "./dir", in directory relative to file
-- "dir", in directory relative to current dir
-
-STARTTEST
-:set dir=.,~
-:/start of testfile/,/end of testfile/w! Xtest1
-:" do an ls of the current dir to find the swap file (should not be there)
-:if has("unix")
-:  !ls .X*.swp >test.out
-:else
-:  r !ls X*.swp >test.out
-:endif
-:!echo first line >>test.out
-:e Xtest1
-:if has("unix")
-:" Do an ls of the current dir to find the swap file, remove the leading dot
-:" to make the result the same for all systems.
-:  r!ls .X*.swp
-:  s/\.*X/X/
-:  .w >>test.out
-:  undo
-:else
-:  !ls X*.swp >>test.out
-:endif
-:!echo under Xtest1.swp >>test.out
-:!mkdir Xtest2
-:set dir=./Xtest2,.,~
-:e Xtest1
-:!ls X*.swp >>test.out
-:!echo under under >>test.out
-:!ls Xtest2 >>test.out
-:!echo under Xtest1.swp >>test.out
-:!mkdir Xtest.je
-:/start of testfile/,/end of testfile/w! Xtest2/Xtest3
-:set dir=Xtest.je,~
-:e Xtest2/Xtest3
-:swap
-:!ls Xtest2 >>test.out
-:!echo under Xtest3 >>test.out
-:!ls Xtest.je >>test.out
-:!echo under Xtest3.swp >>test.out
-:qa!
-ENDTEST
-
-start of testfile
-line 2 Abcdefghij
-line 3 Abcdefghij
-end of testfile
diff --git a/src/nvim/testdir/test12.ok b/src/nvim/testdir/test12.ok
deleted file mode 100644
index 605623b117..0000000000
--- a/src/nvim/testdir/test12.ok
+++ /dev/null
@@ -1,10 +0,0 @@
-first line
-Xtest1.swp
-under Xtest1.swp
-under under
-Xtest1.swp
-under Xtest1.swp
-Xtest3
-under Xtest3
-Xtest3.swp
-under Xtest3.swp
diff --git a/src/nvim/testdir/test17.in b/src/nvim/testdir/test17.in
index 83abe17770..1a4ac6b6d1 100644
--- a/src/nvim/testdir/test17.in
+++ b/src/nvim/testdir/test17.in
@@ -4,13 +4,7 @@ Tests for:
 
 STARTTEST
 :set isfname=@,48-57,/,.,-,_,+,,,$,:,~,{,}
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-:  exec "silent !rmdir /Q /S " . a:dir
-: else
-:  exec "silent !rm -rf " . a:dir
-: endif
-:endfun
+:"
 :if has("unix")
 :let $CDIR = "."
 /CDIR
@@ -36,7 +30,7 @@ STARTTEST
 :" check for 'include' without \zs or \ze
 :lang C
 :call delete("./Xbase.a")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :e! Xdir1/dir2/foo.a
@@ -61,7 +55,7 @@ ENDTEST
 STARTTEST
 :" check for 'include' with \zs and \ze
 :call delete("./Xbase.b")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :let &include='^\s*%inc\s*/\zs[^/]\+\ze'
@@ -91,7 +85,7 @@ ENDTEST
 STARTTEST
 :" check for 'include' with \zs and no \ze
 :call delete("./Xbase.c")
-:call DeleteDirectory("Xdir1")
+:call delete("Xdir1", "rf")
 :!mkdir Xdir1
 :!mkdir "Xdir1/dir2"
 :let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze'
diff --git a/src/nvim/testdir/test30.in b/src/nvim/testdir/test30.in
deleted file mode 100644
index 56d5d5c6c2..0000000000
--- a/src/nvim/testdir/test30.in
+++ /dev/null
@@ -1,230 +0,0 @@
-Test for a lot of variations of the 'fileformats' option
-
-Note: This test will fail if "cat" is not available.
-
-STARTTEST
-:" first write three test files, one in each format
-:set fileformat=unix
-:set fileformats=
-:/^unix/;/eof/-1w! XXUnix
-:/^dos/;/eof/-1w! XXDos
-:set bin noeol
-:$w! XXMac
-Gonoeol
-:$w! XXEol
-:set nobin eol
-:enew!
-:bwipe XXUnix XXDos XXMac
-:" create mixed format files
-:if has("win32")
-: !copy /b XXUnix+XXDos XXUxDs
-: !copy /b XXUnix+XXMac XXUxMac
-: !copy /b XXDos+XXMac XXDosMac
-: !copy /b XXMac+XXEol XXMacEol
-: !copy /b XXUnix+XXDos+XXMac XXUxDsMc
-:else
-: !cat XXUnix XXDos >XXUxDs
-: !cat XXUnix XXMac >XXUxMac
-: !cat XXDos XXMac >XXDosMac
-: !cat XXMac XXEol >XXMacEol
-: !cat XXUnix XXDos XXMac >XXUxDsMc
-:endif
-:"
-:" try reading and writing with 'fileformats' empty
-:set fileformat=unix
-:e! XXUnix
-:w! test.out
-:e! XXDos
-:w! XXtt01
-:e! XXMac
-:w! XXtt02
-:bwipe XXUnix XXDos XXMac
-:set fileformat=dos
-:e! XXUnix
-:w! XXtt11
-:e! XXDos
-:w! XXtt12
-:e! XXMac
-:w! XXtt13
-:bwipe XXUnix XXDos XXMac
-:set fileformat=mac
-:e! XXUnix
-:w! XXtt21
-:e! XXDos
-:w! XXtt22
-:e! XXMac
-:w! XXtt23
-:bwipe XXUnix XXDos XXMac
-:"
-:" try reading and writing with 'fileformats' set to one format
-:set fileformats=unix
-:e! XXUxDsMc
-:w! XXtt31
-:bwipe XXUxDsMc
-:set fileformats=dos
-:e! XXUxDsMc
-:w! XXtt32
-:bwipe XXUxDsMc
-:set fileformats=mac
-:e! XXUxDsMc
-:w! XXtt33
-:bwipe XXUxDsMc
-:"
-:" try reading and writing with 'fileformats' set to two formats
-:set fileformats=unix,dos
-:e! XXUxDsMc
-:w! XXtt41
-:bwipe XXUxDsMc
-:e! XXUxMac
-:w! XXtt42
-:bwipe XXUxMac
-:e! XXDosMac
-:w! XXtt43
-:bwipe XXDosMac
-:set fileformats=unix,mac
-:e! XXUxDs
-:w! XXtt51
-:bwipe XXUxDs
-:e! XXUxDsMc
-:w! XXtt52
-:bwipe XXUxDsMc
-:e! XXDosMac
-:w! XXtt53
-:bwipe XXDosMac
-:e! XXEol
-ggO=&ffs
-:=&ff
-:w! XXtt54
-:bwipe XXEol
-:set fileformats=dos,mac
-:e! XXUxDs
-:w! XXtt61
-:bwipe XXUxDs
-:e! XXUxMac
-ggO=&ffs
-:=&ff
-:w! XXtt62
-:bwipe XXUxMac
-:e! XXUxDsMc
-:w! XXtt63
-:bwipe XXUxDsMc
-:e! XXMacEol
-ggO=&ffs
-:=&ff
-:w! XXtt64
-:bwipe XXMacEol
-:"
-:" try reading and writing with 'fileformats' set to three formats
-:set fileformats=unix,dos,mac
-:e! XXUxDsMc
-:w! XXtt71
-:bwipe XXUxDsMc
-:e! XXEol
-ggO=&ffs
-:=&ff
-:w! XXtt72
-:bwipe XXEol
-:set fileformats=mac,dos,unix
-:e! XXUxDsMc
-:w! XXtt81
-:bwipe XXUxDsMc
-:e! XXEol
-ggO=&ffs
-:=&ff
-:w! XXtt82
-:bwipe XXEol
-:" try with 'binary' set
-:set fileformats=mac,unix,dos
-:set binary
-:e! XXUxDsMc
-:w! XXtt91
-:bwipe XXUxDsMc
-:set fileformats=mac
-:e! XXUxDsMc
-:w! XXtt92
-:bwipe XXUxDsMc
-:set fileformats=dos
-:e! XXUxDsMc
-:w! XXtt93
-:"
-:" Append "END" to each file so that we can see what the last written char was.
-:set fileformat=unix nobin
-ggdGaEND:w >>XXtt01
-:w >>XXtt02
-:w >>XXtt11
-:w >>XXtt12
-:w >>XXtt13
-:w >>XXtt21
-:w >>XXtt22
-:w >>XXtt23
-:w >>XXtt31
-:w >>XXtt32
-:w >>XXtt33
-:w >>XXtt41
-:w >>XXtt42
-:w >>XXtt43
-:w >>XXtt51
-:w >>XXtt52
-:w >>XXtt53
-:w >>XXtt54
-:w >>XXtt61
-:w >>XXtt62
-:w >>XXtt63
-:w >>XXtt64
-:w >>XXtt71
-:w >>XXtt72
-:w >>XXtt81
-:w >>XXtt82
-:w >>XXtt91
-:w >>XXtt92
-:w >>XXtt93
-:"
-:" Concatenate the results.
-:" Make fileformat of test.out the native fileformat.
-:" Add a newline at the end.
-:set binary
-:e! test.out
-:$r XXtt01
-:$r XXtt02
-Go1:$r XXtt11
-:$r XXtt12
-:$r XXtt13
-Go2:$r XXtt21
-:$r XXtt22
-:$r XXtt23
-Go3:$r XXtt31
-:$r XXtt32
-:$r XXtt33
-Go4:$r XXtt41
-:$r XXtt42
-:$r XXtt43
-Go5:$r XXtt51
-:$r XXtt52
-:$r XXtt53
-:$r XXtt54
-Go6:$r XXtt61
-:$r XXtt62
-:$r XXtt63
-:$r XXtt64
-Go7:$r XXtt71
-:$r XXtt72
-Go8:$r XXtt81
-:$r XXtt82
-Go9:$r XXtt91
-:$r XXtt92
-:$r XXtt93
-Go10:$r XXUnix
-:set nobinary ff&
-:w
-:qa!
-ENDTEST
-
-unix
-unix
-eof
-
-dos

-dos

-eof
-
-mac
mac

diff --git a/src/nvim/testdir/test30.ok b/src/nvim/testdir/test30.ok
deleted file mode 100644
index b35f4f5904..0000000000
--- a/src/nvim/testdir/test30.ok
+++ /dev/null
@@ -1,130 +0,0 @@
-unix
-unix
-dos

-dos

-END
-mac
mac

-END
-1
-unix

-unix

-END
-dos

-dos

-END
-mac
mac


-END
-2
-unix
-unix
-
END
-dos

-dos

-
END
-mac
mac
END
-3
-unix
-unix
-dos

-dos

-mac
mac

-END
-unix

-unix

-dos

-dos

-mac
mac


-END
-unix
-unix
-dos

-dos

-mac
mac
END
-4
-unix
-unix
-dos

-dos

-mac
mac

-END
-unix
-unix
-mac
mac

-END
-dos

-dos

-mac
mac


-END
-5
-unix
-unix
-dos

-dos

-END
-unix
-unix
-dos

-dos

-mac
mac

-END
-dos

-dos

-mac
mac
END
-unix,mac:unix
-noeol
-END
-6
-unix

-unix

-dos

-dos

-END
-dos,mac:dos

-unix

-unix

-mac
mac


-END
-unix

-unix

-dos

-dos

-mac
mac


-END
-dos,mac:mac
mac
mac
noeol
END
-7
-unix
-unix
-dos

-dos

-mac
mac

-END
-unix,dos,mac:unix
-noeol
-END
-8
-unix
-unix
-dos

-dos

-mac
mac

-END
-mac,dos,unix:mac
noeol
END
-9
-unix
-unix
-dos

-dos

-mac
mac
END
-unix
-unix
-dos

-dos

-mac
mac
END
-unix
-unix
-dos

-dos

-mac
mac
END
-10
-unix
-unix
diff --git a/src/nvim/testdir/test34.in b/src/nvim/testdir/test34.in
deleted file mode 100644
index 4cb7e9494a..0000000000
--- a/src/nvim/testdir/test34.in
+++ /dev/null
@@ -1,86 +0,0 @@
-Test for user functions.
-Also test an <expr> mapping calling a function.
-Also test that a builtin function cannot be replaced.
-Also test for regression when calling arbitrary expression.
-
-STARTTEST
-:function Table(title, ...)
-:  let ret = a:title
-:  let idx = 1
-:  while idx <= a:0
-:    exe "let ret = ret . a:" . idx
-:    let idx = idx + 1
-:  endwhile
-:  return ret
-:endfunction
-:function Compute(n1, n2, divname)
-:  if a:n2 == 0
-:    return "fail"
-:  endif
-:  exe "let g:" . a:divname . " = ". a:n1 / a:n2
-:  return "ok"
-:endfunction
-:func Expr1()
-:  normal! v
-:  return "111"
-:endfunc
-:func Expr2()
-:  call search('XX', 'b')
-:  return "222"
-:endfunc
-:func ListItem()
-:  let g:counter += 1
-:  return g:counter . '. '
-:endfunc
-:func ListReset()
-:  let g:counter = 0
-:  return ''
-:endfunc
-:func FuncWithRef(a)
-:  unlet g:FuncRef
-:  return a:a
-:endfunc
-:let g:FuncRef=function("FuncWithRef")
-:let counter = 0
-:inoremap <expr> ( ListItem()
-:inoremap <expr> [ ListReset()
-:imap <expr> + Expr1()
-:imap <expr> * Expr2()
-:let retval = "nop"
-/^here
-C=Table("xxx", 4, "asdf")
- =Compute(45, 0, "retval")
- =retval
- =Compute(45, 5, "retval")
- =retval
- =g:FuncRef(333)
-
-XX+-XX
----*---
-(one
-(two
-[(one again:call append(line('$'), max([1, 2, 3]))
-:call extend(g:, {'max': function('min')})
-:call append(line('$'), max([1, 2, 3]))
-:try
-:    " Regression: the first line below used to throw ?E110: Missing ')'?
-:    " Second is here just to prove that this line is correct when not skipping
-:    " rhs of &&.
-:    $put =(0&&(function('tr'))(1, 2, 3))
-:    $put =(1&&(function('tr'))(1, 2, 3))
-:catch
-:    $put ='!!! Unexpected exception:'
-:    $put =v:exception
-:endtry
-:$-9,$w! test.out
-:delfunc Table
-:delfunc Compute
-:delfunc Expr1
-:delfunc Expr2
-:delfunc ListItem
-:delfunc ListReset
-:unlet retval counter
-:q!
-ENDTEST
-
-here
diff --git a/src/nvim/testdir/test34.ok b/src/nvim/testdir/test34.ok
deleted file mode 100644
index 97995de80e..0000000000
--- a/src/nvim/testdir/test34.ok
+++ /dev/null
@@ -1,10 +0,0 @@
-xxx4asdf fail nop ok 9 333
-XX111-XX
----222---
-1. one
-2. two
-1. one again
-3
-3
-0
-1
diff --git a/src/nvim/testdir/test47.in b/src/nvim/testdir/test47.in
deleted file mode 100644
index c95c6a6850..0000000000
--- a/src/nvim/testdir/test47.in
+++ /dev/null
@@ -1,102 +0,0 @@
-Tests for vertical splits and filler lines in diff mode
-
-Also tests restoration of saved options by :diffoff.
-
-STARTTEST
-:" Disable the title to avoid xterm keeping the wrong one.
-:set notitle noicon
-/^1
-yG:new
-pkdd:w! Xtest
-ddGpkkrXoxxx:w! Xtest2
-:file Nop
-ggoyyyjjjozzzz
-:set foldmethod=marker foldcolumn=4
-:redir => nodiffsettings
-:silent! :set diff? fdm? fdc? scb? crb? wrap?
-:redir END
-:vert diffsplit Xtest
-:vert diffsplit Xtest2
-:redir => diffsettings
-:silent! :set diff? fdm? fdc? scb? crb? wrap?
-:redir END
-:let diff_fdm = &fdm
-:let diff_fdc = &fdc
-:" repeat entering diff mode here to see if this saves the wrong settings
-:diffthis
-:" jump to second window for a moment to have filler line appear at start of
-:" first window
-ggpgg:let one = winline()
-j:let one = one . "-" . winline()
-j:let one = one . "-" . winline()
-j:let one = one . "-" . winline()
-j:let one = one . "-" . winline()
-j:let one = one . "-" . winline()
-gg:let two = winline()
-j:let two = two . "-" . winline()
-j:let two = two . "-" . winline()
-j:let two = two . "-" . winline()
-j:let two = two . "-" . winline()
-gg:let three = winline()
-j:let three = three . "-" . winline()
-j:let three = three . "-" . winline()
-j:let three = three . "-" . winline()
-j:let three = three . "-" . winline()
-j:let three = three . "-" . winline()
-j:let three = three . "-" . winline()
-:call append("$", one)
-:call append("$", two)
-:call append("$", three)
-:$-2,$w! test.out
-:"
-:" Test diffoff
-:diffoff!
-1
-:let &diff = 1
-:let &fdm = diff_fdm
-:let &fdc = diff_fdc
-4
-:diffoff!
-:$put =nodiffsettings
-:$put =diffsettings
-1
-:redir => nd1
-:silent! :set diff? fdm? fdc? scb? crb? wrap?
-:redir END
-
-:redir => nd2
-:silent! :set diff? fdm? fdc? scb? crb? wrap?
-:redir END
-
-:redir => nd3
-:silent! :set diff? fdm? fdc? scb? crb? wrap?
-:redir END
-
-:$put =nd1
-:$put =nd2
-:$put =nd3
-:$-39,$w >> test.out
-:"
-:" Test that diffing shows correct filler lines
-:windo :bw!
-:enew
-:put =range(4,10)
-:1d _
-:vnew
-:put =range(1,10)
-:1d _
-:windo :diffthis
-:wincmd h
-:let w0=line('w0')
-:enew
-:put =w0
-:.w >> test.out
-:unlet! one two three nodiffsettings diffsettings diff_fdm diff_fdc nd1 nd2 nd3 w0
-:qa!
-ENDTEST
-
-1 aa
-2 bb
-3 cc
-4 dd
-5 ee
diff --git a/src/nvim/testdir/test47.ok b/src/nvim/testdir/test47.ok
deleted file mode 100644
index 83e96571ad..0000000000
--- a/src/nvim/testdir/test47.ok
+++ /dev/null
@@ -1,44 +0,0 @@
-2-4-5-6-8-9
-1-2-4-5-8
-2-3-4-5-6-7-8
-
-
-nodiff
-  foldmethod=marker
-  foldcolumn=4
-noscrollbind
-nocursorbind
-  wrap
-
-
-  diff
-  foldmethod=diff
-  foldcolumn=2
-  scrollbind
-  cursorbind
-nowrap
-
-
-nodiff
-  foldmethod=marker
-  foldcolumn=4
-noscrollbind
-nocursorbind
-  wrap
-
-
-nodiff
-  foldmethod=marker
-  foldcolumn=4
-noscrollbind
-nocursorbind
-  wrap
-
-
-nodiff
-  foldmethod=marker
-  foldcolumn=4
-noscrollbind
-nocursorbind
-  wrap
-1
diff --git a/src/nvim/testdir/test53.in b/src/nvim/testdir/test53.in
index f3778c5192..20b5d019af 100644
--- a/src/nvim/testdir/test53.in
+++ b/src/nvim/testdir/test53.in
@@ -4,8 +4,6 @@ Note that the end-of-line moves the cursor to the next test line.
 
 Also test match() and matchstr()
 
-Also test the gn command and repeating it.
-
 STARTTEST
 /^start:/
 da"
@@ -52,35 +50,6 @@ dit
 :put =match('abc', '\zs', 2, 1) " 2
 :put =match('abc', '\zs', 3, 1) " 3
 :put =match('abc', '\zs', 4, 1) " -1
-/^foobar
-gncsearchmatch/one\_s*two\_s
-:1
-gnd
-/[a]bcdx
-:1
-2gnd/join
-/$
-0gnd
-/\>\zs
-0gnd/^
-gnd$h/\zs
-gnd/[u]niquepattern/s
-vlgnd
-/mother
-:set selection=exclusive
-$cgNmongoose/i
-cgnj
-:" Make sure there is no other match y uppercase.
-/x59
-gggnd
-:" test repeating dgn
-/^Johnny
-ggdgn.
-:" test repeating gUgn
-/^Depp
-gggUgn.
-gg/a:0\@!\zs\d\+
-nygnop
 :/^start:/,/^end:/wq! test.out
 ENDTEST
 
@@ -102,32 +71,4 @@ innertext object
 </b>
 </begin>
 SEARCH:
-foobar
-one
-two
-abcdx | abcdx | abcdx
-join 
-lines
-zero width pattern
-delete first and last chars
-uniquepattern uniquepattern
-my very excellent mother just served us nachos
-for (i=0; i<=10; i++)
-a:10
-
-a:1
-
-a:20
-Y
-text
-Y
---1
-Johnny
---2
-Johnny
---3
-Depp
---4
-Depp
---5
 end:
diff --git a/src/nvim/testdir/test53.ok b/src/nvim/testdir/test53.ok
index 05206972a4..d57d86bbb0 100644
--- a/src/nvim/testdir/test53.ok
+++ b/src/nvim/testdir/test53.ok
@@ -42,30 +42,4 @@ a
 3
 -1
 SEARCH:
-searchmatch
-abcdx |  | abcdx
-join lines
-zerowidth pattern
-elete first and last char
- uniquepattern
-my very excellent mongoose just served us nachos
-for (j=0; i<=10; i++)
-a:10
-
-a:1
-1
-
-a:20
-
-text
-Y
---1
-
---2
-
---3
-DEPP
---4
-DEPP
---5
 end:
diff --git a/src/nvim/testdir/test55.in b/src/nvim/testdir/test55.in
deleted file mode 100644
index 9a55eac6f6..0000000000
--- a/src/nvim/testdir/test55.in
+++ /dev/null
@@ -1,600 +0,0 @@
-Tests for List and Dictionary types.     vim: set ft=vim :
-
-STARTTEST
-:fun Test(...)
-:lang C
-:" Creating List directly with different types
-:let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
-:$put =string(l)
-:$put =string(l[-1])
-:$put =string(l[-4])
-:try
-:  $put =string(l[-5])
-:catch
-:  $put =v:exception[:14]
-:endtry
-:" List slices
-:$put =string(l[:])
-:$put =string(l[1:])
-:$put =string(l[:-2])
-:$put =string(l[0:8])
-:$put =string(l[8:-1])
-:"
-:" List identity
-:let ll = l
-:let lx = copy(l)
-:try
-:  $put =(l == ll) . (l isnot ll) . (l is ll) . (l == lx) . (l is lx) . (l isnot lx)
-:catch
-:  $put =v:exception
-:endtry
-:"
-:" Creating Dictionary directly with different types
-:let d = {001: 'asd', 'b': [1, 2, function('strlen')], -1: {'a': 1},}
-:$put =string(d) . d.1
-:$put =string(sort(keys(d)))
-:$put =string (values(d))
-:for [key, val] in items(d)
-:  $put =key . ':' . string(val)
-:  unlet key val
-:endfor
-:call extend  (d, {3:33, 1:99})
-:call extend(d, {'b':'bbb', 'c':'ccc'}, "keep")
-:try
-:  call extend(d, {3:333,4:444}, "error")
-:catch
-:  $put =v:exception[:15] . v:exception[-1:-1]
-:endtry
-:$put =string(d)
-:call filter(d, 'v:key =~ ''[ac391]''')
-:$put =string(d)
-:"
-:" Dictionary identity
-:let dd = d
-:let dx = copy(d)
-:try
-:  $put =(d == dd) . (d isnot dd) . (d is dd) . (d == dx) . (d is dx) . (d isnot dx)
-:catch
-:  $put =v:exception
-:endtry
-:"
-:" Changing var type should fail
-:try
-:  let d = []
-:catch
-:  $put =v:exception[:14] . v:exception[-1:-1]
-:endtry
-:try
-:  let l = {}
-:catch
-:  $put =v:exception[:14] . v:exception[-1:-1]
-:endtry
-:"
-:" removing items with :unlet
-:unlet l[2]
-:$put =string(l)
-:let l = range(8)
-:try
-:unlet l[:3]
-:unlet l[1:]
-:catch
-:$put =v:exception
-:endtry
-:$put =string(l)
-:"
-:unlet d.c
-:unlet d[-1]
-:$put =string(d)
-:"
-:" removing items out of range: silently skip items that don't exist
-let l = [0, 1, 2, 3]
-:unlet l[2:1]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[2:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[2:3]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[2:4]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[2:5]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-1:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-2:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-3:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-4:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-5:2]
-:$put =string(l)
-let l = [0, 1, 2, 3]
-:unlet l[-6:2]
-:$put =string(l)
-:"
-:" assignment to a list
-:let l = [0, 1, 2, 3]
-:let [va, vb] = l[2:3]
-:$put =va
-:$put =vb
-:try
-:  let [va, vb] = l
-:catch
-:  $put =v:exception[:14]
-:endtry
-:try
-:  let [va, vb] = l[1:1]
-:catch
-:  $put =v:exception[:14]
-:endtry
-:"
-:" manipulating a big Dictionary (hashtable.c has a border of 1000 entries)
-:let d = {}
-:for i in range(1500)
-: let d[i] = 3000 - i
-:endfor
-:$put =d[0] . ' ' . d[100] . ' ' . d[999] . ' ' . d[1400] . ' ' . d[1499]
-:try
-:  let n = d[1500]
-:catch
-:  $put =substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '')
-:endtry
-:" lookup each items
-:for i in range(1500)
-: if d[i] != 3000 - i
-:  $put =d[i]
-: endif
-:endfor
-: let i += 1
-:" delete even items
-:while i >= 2
-: let i -= 2
-: unlet d[i]
-:endwhile
-:$put =get(d, 1500 - 100, 'NONE') . ' ' . d[1]
-:" delete odd items, checking value, one intentionally wrong
-:let d[33] = 999
-:let i = 1
-:while i < 1500
-: if d[i] != 3000 - i
-:  $put =i . '=' . d[i]
-: else
-:  unlet d[i]
-: endif
-: let i += 2
-:endwhile
-:$put =string(d)  " must be almost empty now
-:unlet d
-:"
-:" Dictionary function
-:let dict = {}
-:func dict.func(a) dict
-:  $put =a:a . len(self.data)
-:endfunc
-:let dict.data = [1,2,3]
-:call dict.func("len: ")
-:let x = dict.func("again: ")
-:try
-:  let Fn = dict.func
-:  call Fn('xxx')
-:catch
-:  $put =v:exception[:15]
-:endtry
-:" 
-:" Function in script-local List or Dict
-:let g:dict = {}
-:function g:dict.func() dict
-:  $put ='g:dict.func'.self.foo[1].self.foo[0]('asdf')
-:endfunc
-:let g:dict.foo = ['-', 2, 3]
-:call insert(g:dict.foo, function('strlen'))
-:call g:dict.func()
-:" 
-:" Nasty: remove func from Dict that's being called (works)
-:let d = {1:1}
-:func d.func(a)
-:  return "a:". a:a
-:endfunc
-:$put =d.func(string(remove(d, 'func')))
-:"
-:" Nasty: deepcopy() dict that refers to itself (fails when noref used)
-:let d = {1:1, 2:2}
-:let l = [4, d, 6]
-:let d[3] = l
-:let dc = deepcopy(d)
-:try
-:  let dc = deepcopy(d, 1)
-:catch
-:  $put =v:exception[:14]
-:endtry
-:let l2 = [0, l, l, 3]
-:let l[1] = l2
-:let l3 = deepcopy(l2)
-:$put ='same list: ' . (l3[1] is l3[2])
-:"
-:" Locked variables
-:for depth in range(5)
-:  $put ='depth is ' . depth
-:  for u in range(3)
-:    unlet l
-:    let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
-:    exe "lockvar " . depth . " l"
-:    if u == 1
-:      exe "unlockvar l"
-:    elseif u == 2
-:      exe "unlockvar " . depth . " l"
-:    endif
-:    let ps = islocked("l").islocked("l[1]").islocked("l[1][1]").islocked("l[1][1][0]").'-'.islocked("l[2]").islocked("l[2]['6']").islocked("l[2]['6'][7]")
-:    $put =ps
-:    let ps = ''
-:    try
-:      let l[1][1][0] = 99
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l[1][1] = [99]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l[1] = [99]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l[2]['6'][7] = 99
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l[2][6] = {99: 99}
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l[2] = {99: 99}
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      let l = [99]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    $put =ps
-:  endfor
-:endfor
-:"
-:" Unletting locked variables
-:$put ='Unletting:'
-:for depth in range(5)
-:  $put ='depth is ' . depth
-:  for u in range(3)
-:    unlet l
-:    let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
-:    exe "lockvar " . depth . " l"
-:    if u == 1
-:      exe "unlockvar l"
-:    elseif u == 2
-:      exe "unlockvar " . depth . " l"
-:    endif
-:    let ps = islocked("l").islocked("l[1]").islocked("l[1][1]").islocked("l[1][1][0]").'-'.islocked("l[2]").islocked("l[2]['6']").islocked("l[2]['6'][7]")
-:    $put =ps
-:    let ps = ''
-:    try
-:      unlet l[2]['6'][7]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l[2][6]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l[2]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l[1][1][0]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l[1][1]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l[1]
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    try
-:      unlet l
-:      let ps .= 'p'
-:    catch
-:      let ps .= 'F'
-:    endtry
-:    $put =ps
-:  endfor
-:endfor
-:"
-:" Locked variables and :unlet or list / dict functions
-:$put ='Locks and commands or functions:'
-:"
-:$put ='No :unlet after lock on dict:'
-:unlet! d
-:let d = {'a': 99, 'b': 100}
-:lockvar 1 d
-:try
-:  unlet d.a
-:  $put ='did :unlet'
-:catch
-:  $put =v:exception[:16]
-:endtry
-:$put =string(d)
-:"
-:$put =':unlet after lock on dict item:'
-:unlet! d
-:let d = {'a': 99, 'b': 100}
-:lockvar d.a
-:try
-:  unlet d.a
-:  $put ='did :unlet'
-:catch
-:  $put =v:exception[:16]
-:endtry
-:$put =string(d)
-:"
-:$put ='filter() after lock on dict item:'
-:unlet! d
-:let d = {'a': 99, 'b': 100}
-:lockvar d.a
-:try
-:  call filter(d, 'v:key != "a"')
-:  $put ='did filter()'
-:catch
-:  $put =v:exception[:16]
-:endtry
-:$put =string(d)
-:"
-:$put ='map() after lock on dict:'
-:unlet! d
-:let d = {'a': 99, 'b': 100}
-:lockvar 1 d
-:try
-:  call map(d, 'v:val + 200')
-:  $put ='did map()'
-:catch
-:  $put =v:exception[:16]
-:endtry
-:$put =string(d)
-:"
-:$put ='No extend() after lock on dict item:'
-:unlet! d
-:let d = {'a': 99, 'b': 100}
-:lockvar d.a
-:try
-:  $put =string(extend(d, {'a': 123}))
-:  $put ='did extend()'
-:catch
-:  $put =v:exception[:14]
-:endtry
-:$put =string(d)
-:"
-:$put ='No remove() of write-protected scope-level variable:'
-:fun! Tfunc(this_is_a_loooooooooong_parameter_name)
-:  try
-:    $put =string(remove(a:, 'this_is_a_loooooooooong_parameter_name'))
-:    $put ='did remove()'
-:  catch
-:    $put =v:exception[:14]
-:  endtry
-:endfun
-:call Tfunc('testval')
-:"
-:$put ='No extend() of write-protected scope-level variable:'
-:fun! Tfunc(this_is_a_loooooooooong_parameter_name)
-:  try
-:    $put =string(extend(a:, {'this_is_a_loooooooooong_parameter_name': 1234}))
-:    $put ='did extend()'
-:  catch
-:    $put =v:exception[:14]
-:  endtry
-:endfun
-:call Tfunc('testval')
-:"
-:$put ='No :unlet of variable in locked scope:'
-:let b:testvar = 123
-:lockvar 1 b:
-:try
-:  unlet b:testvar
-:  $put ='b:testvar was :unlet: '. (!exists('b:testvar'))
-:catch
-:  $put =v:exception[:16]
-:endtry
-:unlockvar 1 b:
-:unlet! b:testvar
-:"
-:$put ='No :let += of locked list variable:'
-:let l = ['a', 'b', 3]
-:lockvar 1 l
-:try
-:  let l += ['x']
-:  $put ='did :let +='
-:catch
-:  $put =v:exception[:14]
-:endtry
-:$put =string(l)
-:"
-:unlet l
-:let l = [1, 2, 3, 4]
-:lockvar! l
-:$put =string(l)
-:unlockvar l[1]
-:unlet l[0:1]
-:$put =string(l)
-:unlet l[1:2]
-:$put =string(l)
-:unlockvar l[1]
-:let l[0:1] = [0, 1]
-:$put =string(l)
-:let l[1:2] = [0, 1]
-:$put =string(l)
-:unlet l
-:" :lockvar/islocked() triggering script autoloading
-:set rtp+=./sautest
-:lockvar g:footest#x
-:unlockvar g:footest#x
-:$put ='locked g:footest#x:'.islocked('g:footest#x')
-:$put ='exists g:footest#x:'.exists('g:footest#x')
-:$put ='g:footest#x: '.g:footest#x
-:"
-:" a:000 function argument
-:" first the tests that should fail
-:try
-:  let a:000 = [1, 2]
-:catch
-:  $put ='caught a:000'
-:endtry
-:try
-:  let a:000[0] = 9
-:catch
-:  $put ='caught a:000[0]'
-:endtry
-:try
-:  let a:000[2] = [9, 10]
-:catch
-:  $put ='caught a:000[2]'
-:endtry
-:try
-:  let a:000[3] = {9: 10}
-:catch
-:  $put ='caught a:000[3]'
-:endtry
-:" now the tests that should pass
-:try
-:  let a:000[2][1] = 9
-:  call extend(a:000[2], [5, 6])
-:  let a:000[3][5] = 8
-:  let a:000[3]['a'] = 12
-:  $put =string(a:000)
-:catch
-:  $put ='caught ' . v:exception
-:endtry
-:"
-:" reverse(), sort(), uniq()
-:let l = ['-0', 'A11', 2, 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5]
-:$put =string(uniq(copy(l)))
-:$put =string(reverse(l))
-:$put =string(reverse(reverse(l)))
-:$put =string(sort(l))
-:$put =string(reverse(sort(l)))
-:$put =string(sort(reverse(sort(l))))
-:$put =string(uniq(sort(l)))
-:let l=[7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff, 0.22, 'four']
-:$put =string(sort(copy(l), 'n'))
-:let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
-:$put =string(sort(copy(l), 1))
-:$put =string(sort(copy(l), 'i'))
-:$put =string(sort(copy(l)))
-:"
-:" splitting a string to a List
-:$put =string(split('  aa  bb '))
-:$put =string(split('  aa  bb  ', '\W\+', 0))
-:$put =string(split('  aa  bb  ', '\W\+', 1))
-:$put =string(split('  aa  bb  ', '\W', 1))
-:$put =string(split(':aa::bb:', ':', 0))
-:$put =string(split(':aa::bb:', ':', 1))
-:$put =string(split('aa,,bb, cc,', ',\s*', 1))
-:$put =string(split('abc', '\zs'))
-:$put =string(split('abc', '\zs', 1))
-:"
-:" compare recursively linked list and dict
-:let l = [1, 2, 3, 4]
-:let d = {'1': 1, '2': l, '3': 3}
-:let l[1] = d
-:$put =(l == l)
-:$put =(d == d)
-:$put =(l != deepcopy(l))
-:$put =(d != deepcopy(d))
-:"
-:" compare complex recursively linked list and dict
-:let l = []
-:call add(l, l)
-:let dict4 = {"l": l}
-:call add(dict4.l, dict4)
-:let lcopy = deepcopy(l)
-:let dict4copy = deepcopy(dict4)
-:$put =(l == lcopy)
-:$put =(dict4 == dict4copy)
-:"
-:" Pass the same List to extend()
-:let l = [1, 2, 3, 4, 5]
-:call extend(l, l)
-:$put =string(l)
-:"
-:" Pass the same Dict to extend()
-:let d = { 'a': {'b': 'B'}}
-:call extend(d, d)
-:$put =string(d)
-:"
-:" Pass the same Dict to extend() with "error"
-:try
-:  call extend(d, d, "error")
-:catch
-:  $put =v:exception[:15] . v:exception[-1:-1]
-:endtry
-:$put =string(d)
-:"
-:" test for range assign
-:let l = [0]
-:let l[:] = [1, 2]
-:$put =string(l)
-:endfun
-:"
-:call Test(1, 2, [3, 4], {5: 6})  " This may take a while
-:"
-:delfunc Test
-:unlet dict
-:call garbagecollect(1)
-:"
-:" test for patch 7.3.637
-:let a = 'No error caught'
-:try|foldopen|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry
-o=a
:"
-:lang C
-:redir => a
-:try|foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry
-:redir END
-o=a
:"
-:"
-:/^start:/,$wq! test.out
-ENDTEST
-
-start:
diff --git a/src/nvim/testdir/test55.ok b/src/nvim/testdir/test55.ok
deleted file mode 100644
index 607a95ead9..0000000000
--- a/src/nvim/testdir/test55.ok
+++ /dev/null
@@ -1,199 +0,0 @@
-start:
-[1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
-{'a': 1}
-1
-Vim(put):E684: 
-[1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
-['as''d', [1, 2, function('strlen')], {'a': 1}]
-[1, 'as''d', [1, 2, function('strlen')]]
-[1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
-[]
-101101
-{'1': 'asd', 'b': [1, 2, function('strlen')], '-1': {'a': 1}}asd
-['-1', '1', 'b']
-['asd', [1, 2, function('strlen')], {'a': 1}]
-1:'asd'
-b:[1, 2, function('strlen')]
--1:{'a': 1}
-Vim(call):E737: 3
-{'c': 'ccc', '1': 99, 'b': [1, 2, function('strlen')], '3': 33, '-1': {'a': 1}}
-{'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}}
-101101
-Vim(let):E706: d
-Vim(let):E706: l
-[1, 'as''d', {'a': 1}]
-[4]
-{'1': 99, '3': 33}
-[0, 1, 2, 3]
-[0, 1, 3]
-[0, 1]
-[0, 1]
-[0, 1]
-[0, 1, 2, 3]
-[0, 1, 3]
-[0, 3]
-[3]
-[3]
-[3]
-2
-3
-Vim(let):E687: 
-Vim(let):E688: 
-3000 2900 2001 1600 1501
-Vim(let):E716: 1500
-NONE 2999
-33=999
-{'33': 999}
-len: 3
-again: 3
-Vim(call):E725: 
-g:dict.func-4
-a:function('3')
-Vim(let):E698: 
-same list: 1
-depth is 0
-0000-000
-ppppppp
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 1
-1000-000
-ppppppF
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 2
-1100-100
-ppFppFF
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 3
-1110-110
-pFFpFFF
-0010-010
-pFppFpp
-0000-000
-ppppppp
-depth is 4
-1111-111
-FFFFFFF
-0011-011
-FFpFFpp
-0000-000
-ppppppp
-Unletting:
-depth is 0
-0000-000
-ppppppp
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 1
-1000-000
-ppFppFp
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 2
-1100-100
-pFFpFFp
-0000-000
-ppppppp
-0000-000
-ppppppp
-depth is 3
-1110-110
-FFFFFFp
-0010-010
-FppFppp
-0000-000
-ppppppp
-depth is 4
-1111-111
-FFFFFFp
-0011-011
-FppFppp
-0000-000
-ppppppp
-Locks and commands or functions:
-No :unlet after lock on dict:
-Vim(unlet):E741: 
-{'a': 99, 'b': 100}
-:unlet after lock on dict item:
-did :unlet
-{'b': 100}
-filter() after lock on dict item:
-did filter()
-{'b': 100}
-map() after lock on dict:
-did map()
-{'a': 299, 'b': 300}
-No extend() after lock on dict item:
-Vim(put):E741: 
-{'a': 99, 'b': 100}
-No remove() of write-protected scope-level variable:
-Vim(put):E795: 
-No extend() of write-protected scope-level variable:
-Vim(put):E742: 
-No :unlet of variable in locked scope:
-Vim(unlet):E741: 
-No :let += of locked list variable:
-Vim(let):E741: 
-['a', 'b', 3]
-[1, 2, 3, 4]
-[1, 2, 3, 4]
-[1, 2, 3, 4]
-[1, 2, 3, 4]
-[1, 2, 3, 4]
-locked g:footest#x:-1
-exists g:footest#x:0
-g:footest#x: 1
-caught a:000
-caught a:000[0]
-caught a:000[2]
-caught a:000[3]
-[1, 2, [3, 9, 5, 6], {'a': 12, '5': 8}]
-['-0', 'A11', 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5]
-[1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0']
-[1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0']
-['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
-[[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0']
-['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
-['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
-[-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
-['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
-['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
-['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
-['aa', 'bb']
-['aa', 'bb']
-['', 'aa', 'bb', '']
-['', '', 'aa', '', 'bb', '', '']
-['aa', '', 'bb']
-['', 'aa', '', 'bb', '']
-['aa', '', 'bb', 'cc', '']
-['a', 'b', 'c']
-['', 'a', '', 'b', '', 'c', '']
-1
-1
-0
-0
-1
-1
-[1, 2, 3, 4, 5, 1, 2, 3, 4, 5]
-{'a': {'b': 'B'}}
-Vim(call):E737: a
-{'a': {'b': 'B'}}
-[1, 2]
-Vim(foldopen):E490:
-
-
-Error detected while processing :
-E492: Not an editor command: foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry
-
diff --git a/src/nvim/testdir/test64.in b/src/nvim/testdir/test64.in
index c4585ecbce..ec11e15e35 100644
--- a/src/nvim/testdir/test64.in
+++ b/src/nvim/testdir/test64.in
@@ -20,6 +20,7 @@ STARTTEST
 :"""" Previously written tests """"""""""""""""""""""""""""""""
 :""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 :"
+:set noautoindent
 :call add(tl, [2, 'ab', 'aab', 'ab'])
 :call add(tl, [2, 'b', 'abcdef', 'b'])
 :call add(tl, [2, 'bc*', 'abccccdef', 'bcccc'])
@@ -577,7 +578,7 @@ Gop:"
 :" Check patterns matching cursor position.
 :func! Postest()
  new
- call setline(1, ['ffooooo', 'boboooo', 'zoooooo', 'koooooo', 'moooooo', "\t\t\tfoo", 'abababababababfoo', 'bababababababafoo', '********_'])
+ call setline(1, ['ffooooo', 'boboooo', 'zoooooo', 'koooooo', 'moooooo', "\t\t\tfoo", 'abababababababfoo', 'bababababababafoo', '********_', '        xxxxxxxxxxxx    xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx  xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx  xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx'])
  call setpos('.', [0, 1, 0, 0])
  s/\%>3c.//g
  call setpos('.', [0, 2, 4, 0])
@@ -589,6 +590,7 @@ Gop:"
  %s/\%>6l\%3c./!/g
  %s/\%>7l\%12c./?/g
  %s/\%>7l\%<9l\%>5v\%<8v./#/g
+ $s/\%(|\u.*\)\@<=[^|\t]\+$//ge
  1,$yank
  quit!
 endfunc
diff --git a/src/nvim/testdir/test64.ok b/src/nvim/testdir/test64.ok
index 92f06ea9f3..c218f8ea17 100644
--- a/src/nvim/testdir/test64.ok
+++ b/src/nvim/testdir/test64.ok
@@ -1076,6 +1076,7 @@ moooooo
 ab!babababababfoo
 ba!ab##abab?bafoo
 **!*****_
+  !     xxx?xxxxxxxx    xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx  xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx  xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx
 -1-
 ffo
 bob
@@ -1086,6 +1087,7 @@ moooooo
 ab!babababababfoo
 ba!ab##abab?bafoo
 **!*****_
+  !     xxx?xxxxxxxx    xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx  xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx  xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx
 -2-
 ffo
 bob
@@ -1096,6 +1098,7 @@ moooooo
 ab!babababababfoo
 ba!ab##abab?bafoo
 **!*****_
+  !     xxx?xxxxxxxx    xxxx xxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxx xxxxx xxxxxxx xx xxxx xxxxxxxx xxxx xxxxxxxxxxx xxx xxxxxxx xxxxxxxxx xx xxxxxx xx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxx xxxxxxxx xxxxxxxxx xxxx xxx xxxx xxx xxx xxxxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxxxxxxx xx xxxxx xxx xxxxxxxx xxxxxx xxx xxx xxxxxxxxx xxxxxxx x xxxxxxxxx xx xxxxxx xxxxxxx  xxxxxxxxxxxxxxxxxx xxxxxxx xxxxxxx xxx xxx xxxxxxxx xxxxxxx  xxxx xxx xxxxxx xxxxx xxxxx xx xxxxxx xxxxxxx xxx xxxxxxxxxxxx xxxx xxxxxxxxx xxxxxx xxxxxx xxxxx xxx xxxxxxx xxxxxxxxxxxxxxxx xxxxxxxxx  xxxxxxxxxx xxxx xx xxxxxxxx xxx xxxxxxxxxxx xxxxx
 Test
 Test END
 EN
diff --git a/src/nvim/testdir/test73.in b/src/nvim/testdir/test73.in
index 7d6c7287a5..9d50f7a789 100644
--- a/src/nvim/testdir/test73.in
+++ b/src/nvim/testdir/test73.in
@@ -8,16 +8,9 @@ STARTTEST
 :" This will cause a few errors, do it silently.
 :set visualbell
 :"
-:function! DeleteDirectory(dir)
-: if has("win16") || has("win32") || has("win64") || has("dos16") || has("dos32")
-:  exec "silent !rmdir /Q /S " . a:dir
-: else
-:  exec "silent !rm -rf " . a:dir
-: endif
-:endfun
 :" On windows a stale "Xfind" directory may exist, remove it so that
 :" we start from a clean state.
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
 :new
 :let cwd=getcwd()
 :let test_out = cwd . '/test.out'
@@ -169,7 +162,7 @@ SVoyager 2:w
 :exec "w >>" . test_out
 :q
 :exec "cd " . cwd
-:call DeleteDirectory("Xfind")
+:call delete("Xfind", "rf")
 :qa!
 ENDTEST
 
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim
index 1d1da94bac..60248bf430 100644
--- a/src/nvim/testdir/test_alot.vim
+++ b/src/nvim/testdir/test_alot.vim
@@ -1,3 +1,28 @@
 " A series of tests that can run in one Vim invocation.
 " This makes testing go faster, since Vim doesn't need to restart.
 
+source test_assign.vim
+source test_autocmd.vim
+source test_cursor_func.vim
+source test_execute_func.vim
+source test_ex_undo.vim
+source test_expr.vim
+source test_expr_utf8.vim
+source test_feedkeys.vim
+source test_goto.vim
+source test_jumps.vim
+source test_match.vim
+source test_matchadd_conceal_utf8.vim
+source test_menu.vim
+source test_messages.vim
+source test_options.vim
+source test_partial.vim
+source test_popup.vim
+source test_regexp_utf8.vim
+source test_statusline.vim
+source test_syn_attr.vim
+source test_tabline.vim
+source test_tabpage.vim
+source test_tagjump.vim
+source test_unlet.vim
+source test_window_cmd.vim
diff --git a/src/nvim/testdir/test_assign.vim b/src/nvim/testdir/test_assign.vim
new file mode 100644
index 0000000000..3d2e7a8998
--- /dev/null
+++ b/src/nvim/testdir/test_assign.vim
@@ -0,0 +1,9 @@
+" Test for assignment
+
+func Test_no_type_checking()
+  let v = 1
+  let v = [1,2,3]
+  let v = {'a':1, 'b':2}
+  let v = 3.4
+  let v = 'hello'
+endfunc
diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
new file mode 100644
index 0000000000..f05a55f1aa
--- /dev/null
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -0,0 +1,198 @@
+" Tests for autocommands
+
+func Test_vim_did_enter()
+  call assert_false(v:vim_did_enter)
+
+  " This script will never reach the main loop, can't check if v:vim_did_enter
+  " becomes one.
+endfunc
+
+if has('timers')
+  func ExitInsertMode(id)
+    call feedkeys("\<Esc>")
+  endfunc
+
+  func Test_cursorhold_insert()
+    let g:triggered = 0
+    au CursorHoldI * let g:triggered += 1
+    set updatetime=20
+    call timer_start(100, 'ExitInsertMode')
+    call feedkeys('a', 'x!')
+    call assert_equal(1, g:triggered)
+    au! CursorHoldI
+  endfunc
+
+  func Test_cursorhold_insert_ctrl_x()
+    let g:triggered = 0
+    au CursorHoldI * let g:triggered += 1
+    set updatetime=20
+    call timer_start(100, 'ExitInsertMode')
+    " CursorHoldI does not trigger after CTRL-X
+    call feedkeys("a\<C-X>", 'x!')
+    call assert_equal(0, g:triggered)
+    au! CursorHoldI
+  endfunc
+endif
+
+function Test_bufunload()
+  augroup test_bufunload_group
+    autocmd!
+    autocmd BufUnload * call add(s:li, "bufunload")
+    autocmd BufDelete * call add(s:li, "bufdelete")
+    autocmd BufWipeout * call add(s:li, "bufwipeout")
+  augroup END
+
+  let s:li=[]
+  new
+  setlocal bufhidden=
+  bunload
+  call assert_equal(["bufunload", "bufdelete"], s:li)
+
+  let s:li=[]
+  new
+  setlocal bufhidden=delete
+  bunload
+  call assert_equal(["bufunload", "bufdelete"], s:li)
+
+  let s:li=[]
+  new
+  setlocal bufhidden=unload
+  bwipeout
+  call assert_equal(["bufunload", "bufdelete", "bufwipeout"], s:li)
+
+  au! test_bufunload_group
+  augroup! test_bufunload_group
+endfunc
+
+" SEGV occurs in older versions.  (At least 7.4.2005 or older)
+function Test_autocmd_bufunload_with_tabnext()
+  tabedit
+  tabfirst
+
+  augroup test_autocmd_bufunload_with_tabnext_group
+    autocmd!
+    autocmd BufUnload <buffer> tabnext
+  augroup END
+
+  quit
+  call assert_equal(2, tabpagenr('$'))
+
+  augroup! test_autocmd_bufunload_with_tabnext_group
+  tablast
+  quit
+endfunc
+
+func Test_win_tab_autocmd()
+  let g:record = []
+
+  augroup testing
+    au WinNew * call add(g:record, 'WinNew')
+    au WinEnter * call add(g:record, 'WinEnter') 
+    au WinLeave * call add(g:record, 'WinLeave') 
+    au TabNew * call add(g:record, 'TabNew')
+    au TabClosed * call add(g:record, 'TabClosed')
+    au TabEnter * call add(g:record, 'TabEnter')
+    au TabLeave * call add(g:record, 'TabLeave')
+  augroup END
+
+  split
+  tabnew
+  close
+  close
+
+  call assert_equal([
+	\ 'WinLeave', 'WinNew', 'WinEnter',
+	\ 'WinLeave', 'TabLeave', 'WinNew', 'WinEnter', 'TabNew', 'TabEnter',
+	\ 'WinLeave', 'TabLeave', 'TabClosed', 'WinEnter', 'TabEnter',
+	\ 'WinLeave', 'WinEnter'
+	\ ], g:record)
+
+  let g:record = []
+  tabnew somefile
+  tabnext
+  bwipe somefile
+
+  call assert_equal([
+	\ 'WinLeave', 'TabLeave', 'WinNew', 'WinEnter', 'TabNew', 'TabEnter',
+	\ 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter',
+	\ 'TabClosed'
+	\ ], g:record)
+
+  augroup testing
+    au!
+  augroup END
+  unlet g:record
+endfunc
+
+func s:AddAnAutocmd()
+  augroup vimBarTest
+    au BufReadCmd * echo 'hello'
+  augroup END
+  call assert_equal(3, len(split(execute('au vimBarTest'), "\n")))
+endfunc
+
+func Test_early_bar()
+  " test that a bar is recognized before the {event}
+  call s:AddAnAutocmd()
+  augroup vimBarTest | au! | augroup END
+  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+
+  call s:AddAnAutocmd()
+  augroup vimBarTest| au!| augroup END
+  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+
+  " test that a bar is recognized after the {event}
+  call s:AddAnAutocmd()
+  augroup vimBarTest| au!BufReadCmd| augroup END
+  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+
+  " test that a bar is recognized after the {group}
+  call s:AddAnAutocmd()
+  au! vimBarTest|echo 'hello'
+  call assert_equal(1, len(split(execute('au vimBarTest'), "\n")))
+endfunc
+
+func RemoveGroup()
+  autocmd! StartOK
+  augroup! StartOK
+endfunc
+
+func Test_augroup_warning()
+  augroup TheWarning
+    au VimEnter * echo 'entering'
+  augroup END
+  call assert_true(match(execute('au VimEnter'), "TheWarning.*VimEnter") >= 0)
+  redir => res
+  augroup! TheWarning
+  redir END
+  call assert_true(match(res, "W19:") >= 0)
+  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+
+  " check "Another" does not take the pace of the deleted entry
+  augroup Another
+  augroup END
+  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+
+  " no warning for postpone aucmd delete
+  augroup StartOK
+    au VimEnter * call RemoveGroup()
+  augroup END
+  call assert_true(match(execute('au VimEnter'), "StartOK.*VimEnter") >= 0)
+  redir => res
+  doautocmd VimEnter
+  redir END
+  call assert_true(match(res, "W19:") < 0)
+  au! VimEnter
+endfunc
+
+func Test_augroup_deleted()
+  " This caused a crash before E936 was introduced
+  augroup x
+    call assert_fails('augroup! x', 'E936:')
+    au VimEnter * echo
+  augroup end
+  augroup! x
+  call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
+  au! VimEnter
+endfunc
+
diff --git a/src/nvim/testdir/test_bufwintabinfo.vim b/src/nvim/testdir/test_bufwintabinfo.vim
new file mode 100644
index 0000000000..5c916e2dd7
--- /dev/null
+++ b/src/nvim/testdir/test_bufwintabinfo.vim
@@ -0,0 +1,103 @@
+" Tests for the getbufinfo(), getwininfo() and gettabinfo() functions
+
+function Test_getbufwintabinfo()
+    1,$bwipeout
+    edit Xtestfile1
+    edit Xtestfile2
+    let buflist = getbufinfo()
+    call assert_equal(2, len(buflist))
+    call assert_match('Xtestfile1', buflist[0].name)
+    call assert_match('Xtestfile2', getbufinfo('Xtestfile2')[0].name)
+    call assert_equal([], getbufinfo(2016))
+    edit Xtestfile1
+    hide edit Xtestfile2
+    hide enew
+    call assert_equal(3, len(getbufinfo({'bufloaded':1})))
+
+    set tabstop&vim
+    let b:editor = 'vim'
+    let l = getbufinfo('%')
+    call assert_equal(bufnr('%'), l[0].bufnr)
+    call assert_equal('vim', l[0].variables.editor)
+    call assert_notequal(-1, index(l[0].windows, bufwinid('%')))
+
+    if has('signs')
+	call append(0, ['Linux', 'Windows', 'Mac'])
+	sign define Mark text=>> texthl=Search
+	exe "sign place 2 line=3 name=Mark buffer=" . bufnr('%')
+	let l = getbufinfo('%')
+	call assert_equal(2, l[0].signs[0].id)
+	call assert_equal(3, l[0].signs[0].lnum)
+	call assert_equal('Mark', l[0].signs[0].name)
+	sign unplace *
+	sign undefine Mark
+	enew!
+    endif
+
+    only
+    let w1_id = win_getid()
+    new
+    let w2_id = win_getid()
+    tabnew | let w3_id = win_getid()
+    new | let w4_id = win_getid()
+    new | let w5_id = win_getid()
+    call setwinvar(0, 'signal', 'green')
+    tabfirst
+    let winlist = getwininfo()
+    call assert_equal(5, len(winlist))
+    call assert_equal(winbufnr(2), winlist[1].bufnr)
+    call assert_equal(winheight(2), winlist[1].height)
+    call assert_equal(1, winlist[2].winnr)
+    call assert_equal(2, winlist[3].tabnr)
+    call assert_equal('green', winlist[2].variables.signal)
+    call assert_equal(winwidth(1), winlist[0].width)
+    call assert_equal(w4_id, winlist[3].winid)
+    let winfo = getwininfo(w5_id)[0]
+    call assert_equal(2, winfo.tabnr)
+    call assert_equal([], getwininfo(3))
+
+    call settabvar(1, 'space', 'build')
+    let tablist = gettabinfo()
+    call assert_equal(2, len(tablist))
+    call assert_equal(3, len(tablist[1].windows))
+    call assert_equal(2, tablist[1].tabnr)
+    call assert_equal('build', tablist[0].variables.space)
+    call assert_equal(w2_id, tablist[0].windows[0])
+    call assert_equal([], gettabinfo(3))
+
+    tabonly | only
+
+    lexpr ''
+    lopen
+    copen
+    let winlist = getwininfo()
+    call assert_false(winlist[0].quickfix)
+    call assert_false(winlist[0].loclist)
+    call assert_true(winlist[1].quickfix)
+    call assert_true(winlist[1].loclist)
+    call assert_true(winlist[2].quickfix)
+    call assert_false(winlist[2].loclist)
+    wincmd t | only
+endfunction
+
+function Test_get_buf_options()
+  let opts = getbufvar(bufnr('%'), '&')
+  call assert_equal(v:t_dict, type(opts))
+  call assert_equal(8, opts.tabstop)
+endfunc
+
+function Test_get_win_options()
+  let opts = getwinvar(1, '&')
+  call assert_equal(v:t_dict, type(opts))
+  call assert_equal(0, opts.linebreak)
+  if has('signs')
+    call assert_equal('auto', opts.signcolumn)
+  endif
+
+  let opts = gettabwinvar(1, 1, '&')
+  call assert_equal(v:t_dict, type(opts))
+  call assert_equal(0, opts.linebreak)
+  if has('signs')
+    call assert_equal('auto', opts.signcolumn)
+  endif
+endfunc
diff --git a/src/nvim/testdir/test_cmdline.vim b/src/nvim/testdir/test_cmdline.vim
new file mode 100644
index 0000000000..21bb057fe1
--- /dev/null
+++ b/src/nvim/testdir/test_cmdline.vim
@@ -0,0 +1,186 @@
+" Tests for editing the command line.
+
+func Test_complete_tab()
+  call writefile(['testfile'], 'Xtestfile')
+  call feedkeys(":e Xtest\t\r", "tx")
+  call assert_equal('testfile', getline(1))
+  call delete('Xtestfile')
+endfunc
+
+func Test_complete_list()
+  " We can't see the output, but at least we check the code runs properly.
+  call feedkeys(":e test\<C-D>\r", "tx")
+  call assert_equal('test', expand('%:t'))
+endfunc
+
+func Test_complete_wildmenu()
+  call writefile(['testfile1'], 'Xtestfile1')
+  call writefile(['testfile2'], 'Xtestfile2')
+  set wildmenu
+  call feedkeys(":e Xtest\t\t\r", "tx")
+  call assert_equal('testfile2', getline(1))
+
+  call delete('Xtestfile1')
+  call delete('Xtestfile2')
+  set nowildmenu
+endfunc
+
+func Test_getcompletion()
+  if !has('cmdline_compl')
+    return
+  endif
+  let groupcount = len(getcompletion('', 'event'))
+  call assert_true(groupcount > 0)
+  let matchcount = len(getcompletion('File', 'event'))
+  call assert_true(matchcount > 0)
+  call assert_true(groupcount > matchcount)
+
+  if has('menu')
+    source $VIMRUNTIME/menu.vim
+    let matchcount = len(getcompletion('', 'menu'))
+    call assert_true(matchcount > 0)
+    call assert_equal(['File.'], getcompletion('File', 'menu'))
+    call assert_true(matchcount > 0)
+    let matchcount = len(getcompletion('File.', 'menu'))
+    call assert_true(matchcount > 0)
+  endif
+
+  let l = getcompletion('v:n', 'var')
+  call assert_true(index(l, 'v:null') >= 0)
+  let l = getcompletion('v:notexists', 'var')
+  call assert_equal([], l)
+
+  let l = getcompletion('', 'augroup')
+  call assert_true(index(l, 'END') >= 0)
+  let l = getcompletion('blahblah', 'augroup')
+  call assert_equal([], l)
+
+  let l = getcompletion('', 'behave')
+  call assert_true(index(l, 'mswin') >= 0)
+  let l = getcompletion('not', 'behave')
+  call assert_equal([], l)
+
+  let l = getcompletion('', 'color')
+  call assert_true(index(l, 'default') >= 0)
+  let l = getcompletion('dirty', 'color')
+  call assert_equal([], l)
+
+  let l = getcompletion('', 'command')
+  call assert_true(index(l, 'sleep') >= 0)
+  let l = getcompletion('awake', 'command')
+  call assert_equal([], l)
+
+  let l = getcompletion('', 'dir')
+  call assert_true(index(l, 'sautest/') >= 0)
+  let l = getcompletion('NoMatch', 'dir')
+  call assert_equal([], l)
+
+  let l = getcompletion('exe', 'expression')
+  call assert_true(index(l, 'executable(') >= 0)
+  let l = getcompletion('kill', 'expression')
+  call assert_equal([], l)
+
+  let l = getcompletion('tag', 'function')
+  call assert_true(index(l, 'taglist(') >= 0)
+  let l = getcompletion('paint', 'function')
+  call assert_equal([], l)
+
+  let l = getcompletion('run', 'file')
+  call assert_true(index(l, 'runtest.vim') >= 0)
+  let l = getcompletion('walk', 'file')
+  call assert_equal([], l)
+  set wildignore=*.vim
+  let l = getcompletion('run', 'file', 1)
+  call assert_true(index(l, 'runtest.vim') < 0)
+  set wildignore&
+
+  let l = getcompletion('ha', 'filetype')
+  call assert_true(index(l, 'hamster') >= 0)
+  let l = getcompletion('horse', 'filetype')
+  call assert_equal([], l)
+
+  let l = getcompletion('z', 'syntax')
+  call assert_true(index(l, 'zimbu') >= 0)
+  let l = getcompletion('emacs', 'syntax')
+  call assert_equal([], l)
+
+  let l = getcompletion('jikes', 'compiler')
+  call assert_true(index(l, 'jikes') >= 0)
+  let l = getcompletion('break', 'compiler')
+  call assert_equal([], l)
+
+  helptags ALL
+  let l = getcompletion('last', 'help')
+  call assert_true(index(l, ':tablast') >= 0)
+  let l = getcompletion('giveup', 'help')
+  call assert_equal([], l)
+
+  let l = getcompletion('time', 'option')
+  call assert_true(index(l, 'timeoutlen') >= 0)
+  let l = getcompletion('space', 'option')
+  call assert_equal([], l)
+
+  let l = getcompletion('er', 'highlight')
+  call assert_true(index(l, 'ErrorMsg') >= 0)
+  let l = getcompletion('dark', 'highlight')
+  call assert_equal([], l)
+
+  if has('cscope')
+    let l = getcompletion('', 'cscope')
+    let cmds = ['add', 'find', 'help', 'kill', 'reset', 'show']
+    call assert_equal(cmds, l)
+    " using cmdline completion must not change the result
+    call feedkeys(":cscope find \<c-d>\<c-c>", 'xt')
+    let l = getcompletion('', 'cscope')
+    call assert_equal(cmds, l)
+    let keys = ['a', 'c', 'd', 'e', 'f', 'g', 'i', 's', 't']
+    let l = getcompletion('find ', 'cscope')
+    call assert_equal(keys, l)
+  endif
+
+  if has('signs')
+    sign define Testing linehl=Comment
+    let l = getcompletion('', 'sign')
+    let cmds = ['define', 'jump', 'list', 'place', 'undefine', 'unplace']
+    call assert_equal(cmds, l)
+    " using cmdline completion must not change the result
+    call feedkeys(":sign list \<c-d>\<c-c>", 'xt')
+    let l = getcompletion('', 'sign')
+    call assert_equal(cmds, l)
+    let l = getcompletion('list ', 'sign')
+    call assert_equal(['Testing'], l)
+  endif
+
+  " For others test if the name is recognized.
+  let names = ['buffer', 'environment', 'file_in_path',
+	\ 'mapping', 'shellcmd', 'tag', 'tag_listfiles', 'user']
+  if has('cmdline_hist')
+    call add(names, 'history')
+  endif
+  if has('gettext')
+    call add(names, 'locale')
+  endif
+  if has('profile')
+    call add(names, 'syntime')
+  endif
+
+  set tags=Xtags
+  call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//", "word\tfile\tcmd"], 'Xtags')
+
+  for name in names
+    let matchcount = len(getcompletion('', name))
+    call assert_true(matchcount >= 0, 'No matches for ' . name)
+  endfor
+
+  call delete('Xtags')
+
+  call assert_fails('call getcompletion("", "burp")', 'E475:')
+endfunc
+
+func Test_expand_star_star()
+  call mkdir('a/b', 'p')
+  call writefile(['asdfasdf'], 'a/b/fileXname')
+  call feedkeys(":find **/fileXname\<Tab>\<CR>", 'xt')
+  call assert_equal('find a/b/fileXname', getreg(':'))
+  call delete('a', 'rf')
+endfunc
diff --git a/src/nvim/testdir/test_cscope.vim b/src/nvim/testdir/test_cscope.vim
new file mode 100644
index 0000000000..b6d70f0765
--- /dev/null
+++ b/src/nvim/testdir/test_cscope.vim
@@ -0,0 +1,15 @@
+" Test for cscope commands.
+
+if !has('cscope')
+  finish
+endif
+
+func Test_cscopequickfix()
+  set cscopequickfix=s-,g-,d+,c-,t+,e-,f0,i-,a-
+  call assert_equal('s-,g-,d+,c-,t+,e-,f0,i-,a-', &cscopequickfix)
+
+  call assert_fails('set cscopequickfix=x-', 'E474:')
+  call assert_fails('set cscopequickfix=s', 'E474:')
+  call assert_fails('set cscopequickfix=s7', 'E474:')
+  call assert_fails('set cscopequickfix=s-a', 'E474:')
+endfunc
diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim
new file mode 100644
index 0000000000..7666594862
--- /dev/null
+++ b/src/nvim/testdir/test_diffmode.vim
@@ -0,0 +1,204 @@
+" Tests for diff mode
+
+func Test_diff_fold_sync()
+  enew!
+  let l = range(50)
+  call setline(1, l)
+  diffthis
+  let winone = win_getid()
+  new
+  let l[25] = 'diff'
+  call setline(1, l)
+  diffthis
+  let wintwo = win_getid()
+  " line 15 is inside the closed fold
+  call assert_equal(19, foldclosedend(10))
+  call win_gotoid(winone)
+  call assert_equal(19, foldclosedend(10))
+  " open the fold
+  normal zv
+  call assert_equal(-1, foldclosedend(10))
+  " fold in other window must have opened too
+  call win_gotoid(wintwo)
+  call assert_equal(-1, foldclosedend(10))
+
+  " cursor position is in sync
+  normal 23G
+  call win_gotoid(winone)
+  call assert_equal(23, getcurpos()[1])
+
+  windo diffoff
+  close!
+  set nomodified
+endfunc
+
+func Test_vert_split()
+  " Disable the title to avoid xterm keeping the wrong one.
+  set notitle noicon
+  new
+  let l = ['1 aa', '2 bb', '3 cc', '4 dd', '5 ee']
+  call setline(1, l)
+  w! Xtest
+  normal dd
+  $
+  put
+  normal kkrXoxxx
+  w! Xtest2
+  file Nop
+  normal ggoyyyjjjozzzz
+  set foldmethod=marker foldcolumn=4
+  call assert_equal(0, &diff)
+  call assert_equal('marker', &foldmethod)
+  call assert_equal(4, &foldcolumn)
+  call assert_equal(0, &scrollbind)
+  call assert_equal(0, &cursorbind)
+  call assert_equal(1, &wrap)
+
+  vert diffsplit Xtest
+  vert diffsplit Xtest2
+  call assert_equal(1, &diff)
+  call assert_equal('diff', &foldmethod)
+  call assert_equal(2, &foldcolumn)
+  call assert_equal(1, &scrollbind)
+  call assert_equal(1, &cursorbind)
+  call assert_equal(0, &wrap)
+
+  let diff_fdm = &fdm
+  let diff_fdc = &fdc
+  " repeat entering diff mode here to see if this saves the wrong settings
+  diffthis
+  " jump to second window for a moment to have filler line appear at start of
+  " first window
+  wincmd w
+  normal gg
+  wincmd p
+  normal gg
+  call assert_equal(2, winline())
+  normal j
+  call assert_equal(4, winline())
+  normal j
+  call assert_equal(5, winline())
+  normal j
+  call assert_equal(6, winline())
+  normal j
+  call assert_equal(8, winline())
+  normal j
+  call assert_equal(9, winline())
+
+  wincmd w
+  normal gg
+  call assert_equal(1, winline())
+  normal j
+  call assert_equal(2, winline())
+  normal j
+  call assert_equal(4, winline())
+  normal j
+  call assert_equal(5, winline())
+  normal j
+  call assert_equal(8, winline())
+
+  wincmd w
+  normal gg
+  call assert_equal(2, winline())
+  normal j
+  call assert_equal(3, winline())
+  normal j
+  call assert_equal(4, winline())
+  normal j
+  call assert_equal(5, winline())
+  normal j
+  call assert_equal(6, winline())
+  normal j
+  call assert_equal(7, winline())
+  normal j
+  call assert_equal(8, winline())
+
+  " Test diffoff
+  diffoff!
+  1wincmd 2
+  let &diff = 1
+  let &fdm = diff_fdm
+  let &fdc = diff_fdc
+  4wincmd w
+  diffoff!
+  1wincmd w
+  call assert_equal(0, &diff)
+  call assert_equal('marker', &foldmethod)
+  call assert_equal(4, &foldcolumn)
+  call assert_equal(0, &scrollbind)
+  call assert_equal(0, &cursorbind)
+  call assert_equal(1, &wrap)
+
+  wincmd w
+  call assert_equal(0, &diff)
+  call assert_equal('marker', &foldmethod)
+  call assert_equal(4, &foldcolumn)
+  call assert_equal(0, &scrollbind)
+  call assert_equal(0, &cursorbind)
+  call assert_equal(1, &wrap)
+
+  wincmd w
+  call assert_equal(0, &diff)
+  call assert_equal('marker', &foldmethod)
+  call assert_equal(4, &foldcolumn)
+  call assert_equal(0, &scrollbind)
+  call assert_equal(0, &cursorbind)
+  call assert_equal(1, &wrap)
+
+  call delete('Xtest')
+  call delete('Xtest2')
+  windo bw!
+endfunc
+
+func Test_filler_lines()
+  " Test that diffing shows correct filler lines
+  enew!
+  put =range(4,10)
+  1d _
+  vnew
+  put =range(1,10)
+  1d _
+  windo diffthis
+  wincmd h
+  call assert_equal(1, line('w0'))
+  unlet! diff_fdm diff_fdc
+  windo diffoff
+  bwipe!
+  enew!
+endfunc
+
+func Test_diffget_diffput()
+  enew!
+  let l = range(50)
+  call setline(1, l)
+  call assert_fails('diffget', 'E99:')
+  diffthis
+  call assert_fails('diffget', 'E100:')
+  new
+  let l[10] = 'one'
+  let l[20] = 'two'
+  let l[30] = 'three'
+  let l[40] = 'four'
+  call setline(1, l)
+  diffthis
+  call assert_equal('one', getline(11))
+  11diffget
+  call assert_equal('10', getline(11))
+  21diffput
+  wincmd w
+  call assert_equal('two', getline(21))
+  normal 31Gdo
+  call assert_equal('three', getline(31))
+  call assert_equal('40', getline(41))
+  normal 41Gdp
+  wincmd w
+  call assert_equal('40', getline(41))
+  new
+  diffthis
+  call assert_fails('diffget', 'E101:')
+
+  windo diffoff
+  bwipe!
+  bwipe!
+  enew!
+endfunc
diff --git a/src/nvim/testdir/test_ex_undo.vim b/src/nvim/testdir/test_ex_undo.vim
new file mode 100644
index 0000000000..44feb3680a
--- /dev/null
+++ b/src/nvim/testdir/test_ex_undo.vim
@@ -0,0 +1,19 @@
+" Tests for :undo
+
+func Test_ex_undo()
+  new ex-undo
+  setlocal ul=10
+  exe "normal ione\n\<Esc>"
+  setlocal ul=10
+  exe "normal itwo\n\<Esc>"
+  setlocal ul=10
+  exe "normal ithree\n\<Esc>"
+  call assert_equal(4, line('$'))
+  undo
+  call assert_equal(3, line('$'))
+  undo 1
+  call assert_equal(2, line('$'))
+  undo 0
+  call assert_equal(1, line('$'))
+  quit!
+endfunc
diff --git a/src/nvim/testdir/test_execute_func.vim b/src/nvim/testdir/test_execute_func.vim
new file mode 100644
index 0000000000..6f61bede93
--- /dev/null
+++ b/src/nvim/testdir/test_execute_func.vim
@@ -0,0 +1,55 @@
+" test execute()
+
+func NestedEval()
+  let nested = execute('echo "nested\nlines"')
+  echo 'got: "' . nested . '"'
+endfunc
+
+func NestedRedir()
+  redir => var
+  echo 'broken'
+  redir END
+endfunc
+
+func Test_execute_string()
+  call assert_equal("\nnocompatible", execute('set compatible?'))
+  call assert_equal("\nsomething\nnice", execute('echo "something\nnice"'))
+  call assert_equal("noendofline", execute('echon "noendofline"'))
+  call assert_equal("", execute(123))
+
+  call assert_equal("\ngot: \"\nnested\nlines\"", execute('call NestedEval()'))
+  redir => redired
+  echo 'this'
+  let evaled = execute('echo "that"')
+  echo 'theend'
+  redir END
+" Nvim supports execute('... :redir ...'), so this test is intentionally
+" disabled.
+"  call assert_equal("\nthis\ntheend", redired)
+  call assert_equal("\nthat", evaled)
+
+  call assert_fails('call execute("doesnotexist")', 'E492:')
+  call assert_fails('call execute(3.4)', 'E806:')
+" Nvim supports execute('... :redir ...'), so this test is intentionally
+" disabled.
+"  call assert_fails('call execute("call NestedRedir()")', 'E930:')
+
+  call assert_equal("\nsomething", execute('echo "something"', ''))
+  call assert_equal("\nsomething", execute('echo "something"', 'silent'))
+  call assert_equal("\nsomething", execute('echo "something"', 'silent!'))
+  call assert_equal("", execute('burp', 'silent!'))
+  call assert_fails('call execute("echo \"x\"", 3.4)', 'E806:')
+
+  call assert_equal("", execute(""))
+endfunc
+
+func Test_execute_list()
+  call assert_equal("\nsomething\nnice", execute(['echo "something"', 'echo "nice"']))
+  let l = ['for n in range(0, 3)',
+	\  'echo n',
+	\  'endfor']
+  call assert_equal("\n0\n1\n2\n3", execute(l))
+
+  call assert_equal("", execute([]))
+  call assert_equal("", execute(v:_null_list))
+endfunc
diff --git a/src/nvim/testdir/test_expr.vim b/src/nvim/testdir/test_expr.vim
new file mode 100644
index 0000000000..39dcacb55f
--- /dev/null
+++ b/src/nvim/testdir/test_expr.vim
@@ -0,0 +1,108 @@
+" Tests for expressions.
+
+func Test_equal()
+  let base = {}
+  func base.method()
+    return 1
+  endfunc
+  func base.other() dict
+    return 1
+  endfunc
+  let instance = copy(base)
+  call assert_true(base.method == instance.method)
+  call assert_true([base.method] == [instance.method])
+  call assert_true(base.other == instance.other)
+  call assert_true([base.other] == [instance.other])
+
+  call assert_false(base.method == base.other)
+  call assert_false([base.method] == [base.other])
+  call assert_false(base.method == instance.other)
+  call assert_false([base.method] == [instance.other])
+
+  call assert_fails('echo base.method > instance.method')
+endfunc
+
+func Test_version()
+  call assert_true(has('patch-7.4.001'))
+  call assert_true(has('patch-7.4.01'))
+  call assert_true(has('patch-7.4.1'))
+  call assert_true(has('patch-6.9.999'))
+  call assert_true(has('patch-7.1.999'))
+  call assert_true(has('patch-7.4.123'))
+
+  call assert_false(has('patch-7'))
+  call assert_false(has('patch-7.4'))
+  call assert_false(has('patch-7.4.'))
+  call assert_false(has('patch-9.1.0'))
+  call assert_false(has('patch-9.9.1'))
+endfunc
+
+func Test_dict()
+  let d = {'': 'empty', 'a': 'a', 0: 'zero'}
+  call assert_equal('empty', d[''])
+  call assert_equal('a', d['a'])
+  call assert_equal('zero', d[0])
+  call assert_true(has_key(d, ''))
+  call assert_true(has_key(d, 'a'))
+
+  let d[''] = 'none'
+  let d['a'] = 'aaa'
+  call assert_equal('none', d[''])
+  call assert_equal('aaa', d['a'])
+endfunc
+
+func Test_strgetchar()
+  call assert_equal(char2nr('a'), strgetchar('axb', 0))
+  call assert_equal(char2nr('x'), strgetchar('axb', 1))
+  call assert_equal(char2nr('b'), strgetchar('axb', 2))
+
+  call assert_equal(-1, strgetchar('axb', -1))
+  call assert_equal(-1, strgetchar('axb', 3))
+  call assert_equal(-1, strgetchar('', 0))
+endfunc
+
+func Test_strcharpart()
+  call assert_equal('a', strcharpart('axb', 0, 1))
+  call assert_equal('x', strcharpart('axb', 1, 1))
+  call assert_equal('b', strcharpart('axb', 2, 1))
+  call assert_equal('xb', strcharpart('axb', 1))
+
+  call assert_equal('', strcharpart('axb', 1, 0))
+  call assert_equal('', strcharpart('axb', 1, -1))
+  call assert_equal('', strcharpart('axb', -1, 1))
+  call assert_equal('', strcharpart('axb', -2, 2))
+
+  call assert_equal('a', strcharpart('axb', -1, 2))
+endfunc
+
+func Test_loop_over_null_list()
+  let null_list = submatch(1, 1)
+  for i in null_list
+    call assert_true(0, 'should not get here')
+  endfor
+endfunc
+
+func Test_compare_null_dict()
+  call assert_fails('let x = v:_null_dict[10]')
+  call assert_equal({}, {})
+  call assert_equal(v:_null_dict, v:_null_dict)
+  call assert_notequal({}, v:_null_dict)
+endfunc
+
+func Test_set_reg_null_list()
+  call setreg('x', v:_null_list)
+endfunc
+
+func Test_special_char()
+  " The failure is only visible using valgrind.
+  call assert_fails('echo "\<C-">')
+endfunc
+
+func Test_setmatches()
+  hi def link 1 Comment
+  hi def link 2 PreProc
+  let set = [{"group": 1, "pattern": 2, "id": 3, "priority": 4, "conceal": 5}]
+  let exp = [{"group": '1', "pattern": '2', "id": 3, "priority": 4, "conceal": '5'}]
+  call setmatches(set)
+  call assert_equal(exp, getmatches())
+endfunc
diff --git a/src/nvim/testdir/test_expr_utf8.vim b/src/nvim/testdir/test_expr_utf8.vim
new file mode 100644
index 0000000000..097d708329
--- /dev/null
+++ b/src/nvim/testdir/test_expr_utf8.vim
@@ -0,0 +1,94 @@
+" Tests for expressions using utf-8.
+if !has('multi_byte')
+  finish
+endif
+
+func Test_strgetchar_utf8()
+  call assert_equal(char2nr('á'), strgetchar('áxb', 0))
+  call assert_equal(char2nr('x'), strgetchar('áxb', 1))
+
+  call assert_equal(char2nr('a'), strgetchar('àxb', 0))
+  call assert_equal(char2nr('̀'), strgetchar('àxb', 1))
+  call assert_equal(char2nr('x'), strgetchar('àxb', 2))
+
+  call assert_equal(char2nr('あ'), strgetchar('あaい', 0))
+  call assert_equal(char2nr('a'), strgetchar('あaい', 1))
+  call assert_equal(char2nr('い'), strgetchar('あaい', 2))
+endfunc
+
+func Test_strcharpart_utf8()
+  call assert_equal('áxb', strcharpart('áxb', 0))
+  call assert_equal('á', strcharpart('áxb', 0, 1))
+  call assert_equal('x', strcharpart('áxb', 1, 1))
+
+  call assert_equal('いうeお', strcharpart('あいうeお', 1))
+  call assert_equal('い', strcharpart('あいうeお', 1, 1))
+  call assert_equal('いう', strcharpart('あいうeお', 1, 2))
+  call assert_equal('いうe', strcharpart('あいうeお', 1, 3))
+  call assert_equal('いうeお', strcharpart('あいうeお', 1, 4))
+  call assert_equal('eお', strcharpart('あいうeお', 3))
+  call assert_equal('e', strcharpart('あいうeお', 3, 1))
+
+  call assert_equal('あ', strcharpart('あいうeお', -3, 4))
+
+  call assert_equal('a', strcharpart('àxb', 0, 1))
+  call assert_equal('̀', strcharpart('àxb', 1, 1))
+  call assert_equal('x', strcharpart('àxb', 2, 1))
+endfunc
+
+func s:classes_test()
+  set isprint=@,161-255
+  call assert_equal('Motörhead', matchstr('Motörhead', '[[:print:]]\+'))
+
+  let alphachars = ''
+  let lowerchars = ''
+  let upperchars = ''
+  let alnumchars = ''
+  let printchars = ''
+  let punctchars = ''
+  let xdigitchars = ''
+  let i = 1
+  while i <= 255
+    let c = nr2char(i)
+    if c =~ '[[:alpha:]]'
+      let alphachars .= c
+    endif
+    if c =~ '[[:lower:]]'
+      let lowerchars .= c
+    endif
+    if c =~ '[[:upper:]]'
+      let upperchars .= c
+    endif
+    if c =~ '[[:alnum:]]'
+      let alnumchars .= c
+    endif
+    if c =~ '[[:print:]]'
+      let printchars .= c
+    endif
+    if c =~ '[[:punct:]]'
+      let punctchars .= c
+    endif
+    if c =~ '[[:xdigit:]]'
+      let xdigitchars .= c
+    endif
+    let i += 1
+  endwhile
+
+  call assert_equal('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', alphachars)
+  call assert_equal('abcdefghijklmnopqrstuvwxyzµßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ', lowerchars)
+  call assert_equal('ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ', upperchars)
+  call assert_equal('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz', alnumchars)
+  call assert_equal(' !"#$%&''()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ', printchars)
+  call assert_equal('!"#$%&''()*+,-./:;<=>?@[\]^_`{|}~', punctchars)
+  call assert_equal('0123456789ABCDEFabcdef', xdigitchars)
+endfunc
+
+func Test_classes_re1()
+  set re=1
+  call s:classes_test()
+endfunc
+
+func Test_classes_re2()
+  set re=2
+  call s:classes_test()
+endfunc
diff --git a/src/nvim/testdir/test_feedkeys.vim b/src/nvim/testdir/test_feedkeys.vim
new file mode 100644
index 0000000000..70500f2bb5
--- /dev/null
+++ b/src/nvim/testdir/test_feedkeys.vim
@@ -0,0 +1,14 @@
+" Test feedkeys() function.
+
+func Test_feedkeys_x_with_empty_string()
+  new
+  call feedkeys("ifoo\<Esc>")
+  call assert_equal('', getline('.'))
+  call feedkeys('', 'x')
+  call assert_equal('foo', getline('.'))
+
+  " check it goes back to normal mode immediately.
+  call feedkeys('i', 'x')
+  call assert_equal('foo', getline('.'))
+  quit!
+endfunc
diff --git a/src/nvim/testdir/test_gn.vim b/src/nvim/testdir/test_gn.vim
new file mode 100644
index 0000000000..3eca99bd99
--- /dev/null
+++ b/src/nvim/testdir/test_gn.vim
@@ -0,0 +1,93 @@
+" Test for gn command
+
+func Test_gn_command()
+  noa new
+  " replace a single char by itsself quoted:
+  call setline('.', 'abc x def x ghi x jkl')
+  let @/='x'
+  exe "norm! cgn'x'\<esc>.."
+  call assert_equal("abc 'x' def 'x' ghi 'x' jkl", getline('.'))
+  sil! %d_
+  " simple search match
+  call setline('.', 'foobar')
+  let @/='foobar'
+  exe "norm! gncsearchmatch"
+  call assert_equal('searchmatch', getline('.'))
+  sil! %d _
+  " replace a multi-line match
+  call setline('.', ['', 'one', 'two'])
+  let @/='one\_s*two\_s'
+  exe "norm! gnceins\<CR>zwei"
+  call assert_equal(['','eins','zwei'], getline(1,'$'))
+  sil! %d _
+  " test count argument
+  call setline('.', ['', 'abcdx | abcdx | abcdx'])
+  let @/='[a]bcdx'
+  exe "norm! 2gnd"
+  call assert_equal(['','abcdx |  | abcdx'], getline(1,'$'))
+  sil! %d _
+  " join lines
+  call setline('.', ['join ', 'lines'])
+  let @/='$'
+  exe "norm! 0gnd"
+  call assert_equal(['join lines'], getline(1,'$'))
+  sil! %d _
+  " zero-width match
+  call setline('.', ['', 'zero width pattern'])
+  let @/='\>\zs'
+  exe "norm! 0gnd"
+  call assert_equal(['', 'zerowidth pattern'], getline(1,'$'))
+  sil! %d _
+  " delete first and last chars
+  call setline('.', ['delete first and last chars'])
+  let @/='^'
+  exe "norm! 0gnd$"
+  let @/='\zs'
+  exe "norm! gnd"
+  call assert_equal(['elete first and last char'], getline(1,'$'))
+  sil! %d _
+  " using visual mode
+  call setline('.', ['', 'uniquepattern uniquepattern'])
+  exe "norm! /[u]niquepattern/s\<cr>vlgnd"
+  call assert_equal(['', ' uniquepattern'], getline(1,'$'))
+  sil! %d _
+  " backwards search
+  call setline('.', ['my very excellent mother just served us nachos'])
+  let @/='mother'
+  exe "norm! $cgNmongoose"
+  call assert_equal(['my very excellent mongoose just served us nachos'], getline(1,'$'))
+  sil! %d _
+  " search for single char
+  call setline('.', ['','for (i=0; i<=10; i++)'])
+  let @/='i'
+  exe "norm! cgnj"
+  call assert_equal(['','for (j=0; i<=10; i++)'], getline(1,'$'))
+  sil! %d _
+  " search hex char
+  call setline('.', ['','Y'])
+  set noignorecase
+  let @/='\%x59'
+  exe "norm! gnd"
+  call assert_equal(['',''], getline(1,'$'))
+  sil! %d _
+  " test repeating gdn
+  call setline('.', ['', '1', 'Johnny', '2', 'Johnny', '3'])
+  let @/='Johnny'
+  exe "norm! dgn."
+  call assert_equal(['','1', '', '2', '', '3'], getline(1,'$'))
+  sil! %d _
+  " test repeating gUgn
+  call setline('.', ['', '1', 'Depp', '2', 'Depp', '3'])
+  let @/='Depp'
+  exe "norm! gUgn."
+  call assert_equal(['', '1', 'DEPP', '2', 'DEPP', '3'], getline(1,'$'))
+  sil! %d _
+  " test using look-ahead assertions
+  call setline('.', ['a:10', '', 'a:1', '', 'a:20'])
+  let @/='a:0\@!\zs\d\+'
+  exe "norm! 2nygno\<esc>p"
+  call assert_equal(['a:10', '', 'a:1', '1', '', 'a:20'], getline(1,'$'))
+  sil! %d _
+endfu
+
+" vim: tabstop=2 shiftwidth=0 expandtab
diff --git a/src/nvim/testdir/test_goto.vim b/src/nvim/testdir/test_goto.vim
new file mode 100644
index 0000000000..b6ac5720c3
--- /dev/null
+++ b/src/nvim/testdir/test_goto.vim
@@ -0,0 +1,35 @@
+" Test commands that jump somewhere.
+
+func Test_geeDEE()
+  new
+  call setline(1, ["Filename x;", "", "int Filename", "int func() {", "Filename y;"])
+  /y;/
+  normal gD
+  call assert_equal(1, line('.'))
+  quit!
+endfunc
+
+func Test_gee_dee()
+  new
+  call setline(1, ["int x;", "", "int func(int x)", "{", "  return x;", "}"])
+  /return/
+  normal $hgd
+  call assert_equal(3, line('.'))
+  call assert_equal(14, col('.'))
+  quit!
+endfunc
+
+" Check that setting 'cursorline' does not change curswant
+func Test_cursorline_keep_col()
+  new
+  call setline(1, ['long long long line', 'short line'])
+  normal ggfi
+  let pos = getcurpos()
+  normal j
+  set cursorline
+  normal k
+  call assert_equal(pos, getcurpos())
+  bwipe!
+  set nocursorline
+endfunc
+
diff --git a/src/nvim/testdir/test_hardcopy.vim b/src/nvim/testdir/test_hardcopy.vim
new file mode 100644
index 0000000000..ea9790d134
--- /dev/null
+++ b/src/nvim/testdir/test_hardcopy.vim
@@ -0,0 +1,62 @@
+" Test :hardcopy
+
+func Test_printoptions_parsing()
+  " Only test that this doesn't throw an error.
+  set printoptions=left:5in,right:10pt,top:8mm,bottom:2pc
+  set printoptions=left:2in,top:30pt,right:16mm,bottom:3pc
+  set printoptions=header:3,syntax:y,number:7,wrap:n
+  set printoptions=duplex:short,collate:n,jobsplit:y,portrait:n
+  set printoptions=paper:10x14
+  set printoptions=paper:A3
+  set printoptions=paper:A4
+  set printoptions=paper:A5
+  set printoptions=paper:B4
+  set printoptions=paper:B5
+  set printoptions=paper:executive
+  set printoptions=paper:folio
+  set printoptions=paper:ledger
+  set printoptions=paper:legal
+  set printoptions=paper:letter
+  set printoptions=paper:quarto
+  set printoptions=paper:statement
+  set printoptions=paper:tabloid
+  set printoptions=formfeed:y
+  set printoptions=
+  set printoptions&
+
+  call assert_fails('set printoptions=paper', 'E550:')
+  call assert_fails('set printoptions=shredder:on', 'E551:')
+  call assert_fails('set printoptions=left:no', 'E552:')
+endfunc
+
+func Test_printmbfont_parsing()
+  " Only test that this doesn't throw an error.
+  set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no
+  set printmbfont=
+  set printmbfont&
+endfunc
+
+func Test_printheader_parsing()
+  " Only test that this doesn't throw an error.
+  set printheader=%<%f\ %h%m%r%=%-14.(%l,%c%V%)\ %P
+  set printheader=%<%f%h%m%r%=%b\ 0x%B\ \ %l,%c%V\ %P
+  set printheader=%<%f%=\ [%1*%M%*%n%R%H]\ %-19(%3l,%02c%03V%)%O'%02b'
+  set printheader=...%r%{VarExists('b:gzflag','\ [GZ]')}%h...
+  set printheader=
+  set printheader&
+endfunc
+
+" Test that :hardcopy produces a non-empty file.
+" We don't check much of the contents.
+func Test_with_syntax()
+  if has('postscript')
+    set printoptions=syntax:y
+    syn on
+    hardcopy > Xhardcopy
+    let lines = readfile('Xhardcopy')
+    call assert_true(len(lines) > 20)
+    call assert_true(lines[0] =~ 'PS-Adobe')
+    call delete('Xhardcopy')
+    set printoptions&
+  endif
+endfunc
diff --git a/src/nvim/testdir/test_help_tagjump.vim b/src/nvim/testdir/test_help_tagjump.vim
index 9f9207d27d..cc1c81c7f6 100644
--- a/src/nvim/testdir/test_help_tagjump.vim
+++ b/src/nvim/testdir/test_help_tagjump.vim
@@ -37,4 +37,129 @@ func Test_help_tagjump()
   call assert_equal("help", &filetype)
   call assert_true(getline('.') =~ '\*arglistid()\*')
   helpclose
+
+  exec "help! 'autoindent'."
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ "\\*'autoindent'\\*")
+  helpclose
+
+  exec "help! {address}."
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*{address}\*')
+  helpclose
+endfunc
+
+let s:langs = ['en', 'ab', 'ja']
+
+func s:doc_config_setup()
+  let s:helpfile_save = &helpfile
+  let &helpfile="Xdir1/doc-en/doc/testdoc.txt"
+  let s:rtp_save = &rtp
+  let &rtp="Xdir1/doc-en"
+  if has('multi_lang')
+    let s:helplang_save=&helplang
+  endif
+
+  call delete('Xdir1', 'rf')
+
+  for lang in s:langs
+    if lang ==# 'en'
+      let tagfname = 'tags'
+      let docfname = 'testdoc.txt'
+    else
+      let tagfname = 'tags-' . lang
+      let docfname = 'testdoc.' . lang . 'x'
+    endif
+    let docdir = "Xdir1/doc-" . lang . "/doc"
+    call mkdir(docdir, "p")
+    call writefile(["\t*test-char*", "\t*test-col*"], docdir . '/' . docfname)
+    call writefile(["test-char\t" . docfname . "\t/*test-char*",
+          \         "test-col\t" . docfname . "\t/*test-col*"],
+          \         docdir . '/' . tagfname)
+  endfor
+endfunc
+
+func s:doc_config_teardown()
+  call delete('Xdir1', 'rf')
+
+  let &helpfile = s:helpfile_save
+  let &rtp = s:rtp_save
+  if has('multi_lang')
+    let &helplang = s:helplang_save
+  endif
+endfunc
+
+func s:get_cmd_compl_list(cmd)
+  let list = []
+  let str = ''
+  for cnt in range(1, 999)
+    call feedkeys(a:cmd . repeat("\<Tab>", cnt) . "'\<C-B>let str='\<CR>", 'tx')
+    if str ==# a:cmd[1:]
+      break
+    endif
+    call add(list, str)
+  endfor
+  return list
 endfunc
+
+func Test_help_complete()
+  try
+    let list = []
+    call s:doc_config_setup()
+
+    " 'helplang=' and help file lang is 'en'
+    if has('multi_lang')
+      set helplang=
+    endif
+    let list = s:get_cmd_compl_list(":h test")
+    call assert_equal(['h test-col', 'h test-char'], list)
+
+    if has('multi_lang')
+      " 'helplang=ab' and help file lang is 'en'
+      set helplang=ab
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(['h test-col', 'h test-char'], list)
+
+      " 'helplang=' and help file lang is 'en' and 'ab'
+      set rtp+=Xdir1/doc-ab
+      set helplang=
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(sort(['h test-col@en', 'h test-col@ab',
+            \             'h test-char@en', 'h test-char@ab']), sort(list))
+
+      " 'helplang=ab' and help file lang is 'en' and 'ab'
+      set helplang=ab
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(sort(['h test-col', 'h test-col@en',
+            \             'h test-char', 'h test-char@en']), sort(list))
+
+      " 'helplang=' and help file lang is 'en', 'ab' and 'ja'
+      set rtp+=Xdir1/doc-ja
+      set helplang=
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(sort(['h test-col@en', 'h test-col@ab',
+            \             'h test-col@ja', 'h test-char@en',
+            \             'h test-char@ab', 'h test-char@ja']), sort(list))
+
+      " 'helplang=ab' and help file lang is 'en', 'ab' and 'ja'
+      set helplang=ab
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(sort(['h test-col', 'h test-col@en',
+            \             'h test-col@ja', 'h test-char',
+            \             'h test-char@en', 'h test-char@ja']), sort(list))
+
+      " 'helplang=ab,ja' and help file lang is 'en', 'ab' and 'ja'
+      set helplang=ab,ja
+      let list = s:get_cmd_compl_list(":h test")
+      call assert_equal(sort(['h test-col', 'h test-col@ja',
+            \             'h test-col@en', 'h test-char',
+            \             'h test-char@ja', 'h test-char@en']), sort(list))
+    endif
+  catch
+    call assert_exception('X')
+  finally
+    call s:doc_config_teardown()
+  endtry
+endfunc
+
+" vim: et sw=2:
diff --git a/src/nvim/testdir/test_history.vim b/src/nvim/testdir/test_history.vim
new file mode 100644
index 0000000000..ee6acfffc3
--- /dev/null
+++ b/src/nvim/testdir/test_history.vim
@@ -0,0 +1,65 @@
+" Tests for the history functions
+
+if !has('cmdline_hist')
+  finish
+endif
+
+set history=7
+
+function History_Tests(hist)
+  " First clear the history
+  call histadd(a:hist, 'dummy')
+  call assert_true(histdel(a:hist))
+  call assert_equal(-1, histnr(a:hist))
+  call assert_equal('', histget(a:hist))
+
+  call assert_true(histadd(a:hist, 'ls'))
+  call assert_true(histadd(a:hist, 'buffers'))
+  call assert_equal('buffers', histget(a:hist))
+  call assert_equal('ls', histget(a:hist, -2))
+  call assert_equal('ls', histget(a:hist, 1))
+  call assert_equal('', histget(a:hist, 5))
+  call assert_equal('', histget(a:hist, -5))
+  call assert_equal(2, histnr(a:hist))
+  call assert_true(histdel(a:hist, 2))
+  call assert_false(histdel(a:hist, 7))
+  call assert_equal(1, histnr(a:hist))
+  call assert_equal('ls', histget(a:hist, -1))
+
+  call assert_true(histadd(a:hist, 'buffers'))
+  call assert_true(histadd(a:hist, 'ls'))
+  call assert_equal('ls', histget(a:hist, -1))
+  call assert_equal(4, histnr(a:hist))
+
+  " Test for removing entries matching a pattern
+  for i in range(1, 3)
+      call histadd(a:hist, 'text_' . i)
+  endfor
+  call assert_true(histdel(a:hist, 'text_\d\+'))
+  call assert_equal('ls', histget(a:hist, -1))
+
+  " Test for freeing the entire history list
+  for i in range(1, 7)
+      call histadd(a:hist, 'text_' . i)
+  endfor
+  call histdel(a:hist)
+  for i in range(1, 7)
+    call assert_equal('', histget(a:hist, i))
+    call assert_equal('', histget(a:hist, i - 7 - 1))
+  endfor
+endfunction
+
+function Test_History()
+  for h in ['cmd', ':', '', 'search', '/', '?', 'expr', '=', 'input', '@', 'debug', '>']
+    call History_Tests(h)
+  endfor
+
+  " Negative tests
+  call assert_false(histdel('abc'))
+  call assert_equal('', histget('abc'))
+  call assert_fails('call histdel([])', 'E730:')
+  call assert_equal('', histget(10))
+  call assert_fails('call histget([])', 'E730:')
+  call assert_equal(-1, histnr('abc'))
+  call assert_fails('call histnr([])', 'E730:')
+endfunction
diff --git a/src/nvim/testdir/test_jumps.vim b/src/nvim/testdir/test_jumps.vim
new file mode 100644
index 0000000000..5a3717d165
--- /dev/null
+++ b/src/nvim/testdir/test_jumps.vim
@@ -0,0 +1,11 @@
+func Test_empty_buffer()
+  new
+  insert
+a
+b
+c
+d
+.
+  call assert_equal(1, line("''"))
+  bwipe!
+endfunc
diff --git a/src/nvim/testdir/test_langmap.vim b/src/nvim/testdir/test_langmap.vim
new file mode 100644
index 0000000000..066c3bf2bd
--- /dev/null
+++ b/src/nvim/testdir/test_langmap.vim
@@ -0,0 +1,24 @@
+" tests for 'langmap'
+
+func Test_langmap()
+  new
+  set langmap=}l,^x,%v
+
+  call setline(1, ['abc'])
+  call feedkeys('gg0}^', 'tx')
+  call assert_equal('ac', getline(1))
+
+  " in Replace mode
+  " need silent! to avoid a delay when entering Insert mode
+  call setline(1, ['abcde'])
+  silent! call feedkeys("gg0lR%{z\<Esc>00", 'tx')
+  call assert_equal('a%{ze', getline(1))
+
+  " in Select mode
+  " need silent! to avoid a delay when entering Insert mode
+  call setline(1, ['abcde'])
+  silent! call feedkeys("gg0}%}\<C-G>}^\<Esc>00", 'tx')
+  call assert_equal('a}^de', getline(1))
+
+  quit!
+endfunc
diff --git a/src/nvim/testdir/test_listlbr.in b/src/nvim/testdir/test_listlbr.in
deleted file mode 100644
index b5bac080ee..0000000000
--- a/src/nvim/testdir/test_listlbr.in
+++ /dev/null
@@ -1,119 +0,0 @@
-Test for linebreak and list option (non-utf8)
-
-STARTTEST
-:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
-:set wildchar=^E
-:10new|:vsp|:vert resize 20
-:put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
-:norm! zt
-:set ts=4 sw=4 sts=4 linebreak sbr=+ wrap
-:fu! ScreenChar(width)
-:	let c=''
-:	for j in range(1,4)
-:	    for i in range(1,a:width)
-:	    	let c.=nr2char(screenchar(j, i))
-:	    endfor
-:           let c.="\n"
-:	endfor
-:	return c
-:endfu
-:fu! DoRecordScreen()
-:	wincmd l
-:	$put =printf(\"\n%s\", g:test)
-:	$put =g:line
-:	wincmd p
-:endfu
-:"
-:let g:test="Test 1: set linebreak"
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:"
-:let g:test="Test 2: set linebreak + set list"
-:set linebreak list listchars=
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:"
-:let g:test ="Test 3: set linebreak nolist"
-:set nolist linebreak
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:"
-:let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"
-:set nolist linebreak ts=8
-:let line="1\t".repeat('a', winwidth(0)-2)
-:$put =line
-:$
-:norm! zt
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:let line="_S_\t bla"
-:$put =line
-:$
-:norm! zt
-:"
-:let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"
-:set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab
-:syn match ConcealVar contained /_/ conceal
-:syn match All /.*/ contains=ConcealVar
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:set cpo&vim linebreak
-:"
-:let g:test ="Test 6: set linebreak with visual block mode"
-:let line="REMOVE: this not"
-:$put =g:test
-:$put =line
-:let line="REMOVE: aaaaaaaaaaaaa"
-:$put =line
-:1/^REMOVE:
-0jf x:$put
-:set cpo&vim linebreak
-:"
-:let g:test ="Test 7: set linebreak with visual block mode and v_b_A"
-:$put =g:test
-Golong line: 40afoobar aTARGET at end
-:exe "norm! $3B\<C-v>eAx\<Esc>"
-:set cpo&vim linebreak sbr=
-:"
-:let g:test ="Test 8: set linebreak with visual char mode and changing block"
-:$put =g:test
-Go1111-1111-1111-11-1111-1111-11110f-lv3lc2222bgj.
-:"
-:let g:test ="Test 9: using redo after block visual mode"
-:$put =g:test
-Go
-aaa
-aaa
-a2k2j~e.
-:"
-:let g:test ="Test 10: using normal commands after block-visual"
-:$put =g:test
-:set linebreak
-Go
-abcd{ef
-ghijklm
-no}pqrs2k0f{c%
-:"
-:let g:test ="Test 11: using block replace mode after wrapping"
-:$put =g:test
-:set linebreak wrap
-Go150aayypk147|jr0
-:"
-:let g:test ="Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$"
-:set list listchars=space:_,trail:-,tab:>-,eol:$
-:$put =g:test
-:let line="a aaaaaaaaaaaaaaaaaaaaaa\ta "
-:$put =line
-:$
-:norm! zt
-:redraw!
-:let line=ScreenChar(winwidth(0))
-:call DoRecordScreen()
-:%w! test.out
-:qa!
-ENDTEST
-dummy text
diff --git a/src/nvim/testdir/test_listlbr.ok b/src/nvim/testdir/test_listlbr.ok
deleted file mode 100644
index b32a54969e..0000000000
--- a/src/nvim/testdir/test_listlbr.ok
+++ /dev/null
@@ -1,62 +0,0 @@
-
-	abcdef hijklmn	pqrstuvwxyz_1060ABCDEFGHIJKLMNOP 
-
-Test 1: set linebreak
-    abcdef          
-+hijklmn            
-+pqrstuvwxyz_1060ABC
-+DEFGHIJKLMNOP      
-
-Test 2: set linebreak + set list
-^Iabcdef hijklmn^I  
-+pqrstuvwxyz_1060ABC
-+DEFGHIJKLMNOP      
-                    
-
-Test 3: set linebreak nolist
-    abcdef          
-+hijklmn            
-+pqrstuvwxyz_1060ABC
-+DEFGHIJKLMNOP      
-1	aaaaaaaaaaaaaaaaaa
-
-Test 4: set linebreak with tab and 1 line as long as screen: should break!
-1                   
-+aaaaaaaaaaaaaaaaaa 
-~                   
-~                   
-_S_	 bla
-
-Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)
-Sabbbbbb bla        
-~                   
-~                   
-~                   
-Test 6: set linebreak with visual block mode
-this not
-aaaaaaaaaaaaa
-REMOVE: 
-REMOVE: 
-Test 7: set linebreak with visual block mode and v_b_A
-long line: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar TARGETx at end
-Test 8: set linebreak with visual char mode and changing block
-1111-2222-1111-11-1111-2222-1111
-Test 9: using redo after block visual mode
-
-AaA
-AaA
-A
-Test 10: using normal commands after block-visual
-
-abcdpqrs
-Test 11: using block replace mode after wrapping
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
-Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
-a aaaaaaaaaaaaaaaaaaaaaa	a 
-
-Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
-a_                  
-aaaaaaaaaaaaaaaaaaaa
-aa>-----a-$         
-~                   
diff --git a/src/nvim/testdir/test_match.vim b/src/nvim/testdir/test_match.vim
new file mode 100644
index 0000000000..7748dee87f
--- /dev/null
+++ b/src/nvim/testdir/test_match.vim
@@ -0,0 +1,234 @@
+" Test for :match, :2match, :3match, clearmatches(), getmatches(), matchadd(),
+" matchaddpos(), matcharg(), matchdelete(), matchstrpos() and setmatches().
+
+function Test_match()
+  highlight MyGroup1 term=bold ctermbg=red guibg=red
+  highlight MyGroup2 term=italic ctermbg=green guibg=green
+  highlight MyGroup3 term=underline ctermbg=blue guibg=blue
+
+  " --- Check that "matcharg()" returns the correct group and pattern if a match
+  " --- is defined.
+  match MyGroup1 /TODO/
+  2match MyGroup2 /FIXME/
+  3match MyGroup3 /XXX/
+  call assert_equal(['MyGroup1', 'TODO'], matcharg(1))
+  call assert_equal(['MyGroup2', 'FIXME'], matcharg(2))
+  call assert_equal(['MyGroup3', 'XXX'], matcharg(3))
+
+  " --- Check that "matcharg()" returns an empty list if the argument is not 1,
+  " --- 2 or 3 (only 0 and 4 are tested).
+  call assert_equal([], matcharg(0))
+  call assert_equal([], matcharg(4))
+
+  " --- Check that "matcharg()" returns ['', ''] if a match is not defined.
+  match
+  2match
+  3match
+  call assert_equal(['', ''], matcharg(1))
+  call assert_equal(['', ''], matcharg(2))
+  call assert_equal(['', ''], matcharg(3))
+
+  " --- Check that "matchadd()" and "getmatches()" agree on added matches and
+  " --- that default values apply.
+  let m1 = matchadd("MyGroup1", "TODO")
+  let m2 = matchadd("MyGroup2", "FIXME", 42)
+  let m3 = matchadd("MyGroup3", "XXX", 60, 17)
+  let ans = [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 4},
+        \    {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 42, 'id': 5},
+        \    {'group': 'MyGroup3', 'pattern': 'XXX', 'priority': 60, 'id': 17}]
+  call assert_equal(ans, getmatches())
+
+  " --- Check that "matchdelete()" deletes the matches defined in the previous
+  " --- test correctly.
+  call matchdelete(m1)
+  call matchdelete(m2)
+  call matchdelete(m3)
+  call assert_equal([], getmatches())
+
+  " --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
+  let m = matchadd("MyGroup1", "TODO")
+  call assert_equal(0, matchdelete(m))
+  call assert_fails('call matchdelete(42)', 'E803:')
+
+  " --- Check that "clearmatches()" clears all matches defined by ":match" and
+  " --- "matchadd()".
+  let m1 = matchadd("MyGroup1", "TODO")
+  let m2 = matchadd("MyGroup2", "FIXME", 42)
+  let m3 = matchadd("MyGroup3", "XXX", 60, 17)
+  match MyGroup1 /COFFEE/
+  2match MyGroup2 /HUMPPA/
+  3match MyGroup3 /VIM/
+  call clearmatches()
+  call assert_equal([], getmatches())
+
+  " --- Check that "setmatches()" restores a list of matches saved by
+  " --- "getmatches()" without changes. (Matches with equal priority must also
+  " --- remain in the same order.)
+  let m1 = matchadd("MyGroup1", "TODO")
+  let m2 = matchadd("MyGroup2", "FIXME", 42)
+  let m3 = matchadd("MyGroup3", "XXX", 60, 17)
+  match MyGroup1 /COFFEE/
+  2match MyGroup2 /HUMPPA/
+  3match MyGroup3 /VIM/
+  let ml = getmatches()
+  call clearmatches()
+  call setmatches(ml)
+  call assert_equal(ml, getmatches())
+  call clearmatches()
+
+  " --- Check that "setmatches()" will not add two matches with the same ID. The
+  " --- expected behaviour (for now) is to add the first match but not the
+  " --- second and to return 0 (even though it is a matter of debate whether
+  " --- this can be considered successful behaviour).
+  let data = [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1},
+        \    {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}]
+  call assert_fails('call setmatches(data)', 'E801:')
+  call assert_equal([data[0]], getmatches())
+  call clearmatches()
+
+  " --- Check that "setmatches()" returns 0 if successful and otherwise -1.
+  " --- (A range of valid and invalid input values are tried out to generate the
+  " --- return values.)
+  call assert_equal(0, setmatches([]))
+  call assert_equal(0, setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}]))
+  call clearmatches()
+  call assert_fails('call setmatches(0)', 'E714:')
+  call assert_fails('call setmatches([0])', 'E474:')
+  call assert_fails("call setmatches([{'wrong key': 'wrong value'}])", 'E474:')
+
+  call setline(1, 'abcdefghijklmnopq')
+  call matchaddpos("MyGroup1", [[1, 5], [1, 8, 3]], 10, 3)
+  1
+  redraw!
+  let v1 = screenattr(1, 1)
+  let v5 = screenattr(1, 5)
+  let v6 = screenattr(1, 6)
+  let v8 = screenattr(1, 8)
+  let v10 = screenattr(1, 10)
+  let v11 = screenattr(1, 11)
+  call assert_notequal(v1, v5)
+  call assert_equal(v6, v1)
+  call assert_equal(v8, v5)
+  call assert_equal(v10, v5)
+  call assert_equal(v11, v1)
+  call assert_equal([{'group': 'MyGroup1', 'id': 3, 'priority': 10, 'pos1': [1, 5, 1], 'pos2': [1, 8, 3]}], getmatches())
+  call clearmatches()
+
+  "
+  if has('multi_byte')
+    call setline(1, 'abcdΣabcdef')
+    call matchaddpos("MyGroup1", [[1, 4, 2], [1, 9, 2]])
+    1
+    redraw!
+    let v1 = screenattr(1, 1)
+    let v4 = screenattr(1, 4)
+    let v5 = screenattr(1, 5)
+    let v6 = screenattr(1, 6)
+    let v7 = screenattr(1, 7)
+    let v8 = screenattr(1, 8)
+    let v9 = screenattr(1, 9)
+    let v10 = screenattr(1, 10)
+    call assert_equal([{'group': 'MyGroup1', 'id': 11, 'priority': 10, 'pos1': [1, 4, 2], 'pos2': [1, 9, 2]}], getmatches())
+    call assert_notequal(v1, v4)
+    call assert_equal(v5, v4)
+    call assert_equal(v6, v1)
+    call assert_equal(v7, v1)
+    call assert_equal(v8, v4)
+    call assert_equal(v9, v4)
+    call assert_equal(v10, v1)
+
+    " Check, that setmatches() can correctly restore the matches from matchaddpos()
+    call matchadd('MyGroup1', '\%2lmatchadd')
+    let m=getmatches()
+    call clearmatches()
+    call setmatches(m)
+    call assert_equal([{'group': 'MyGroup1', 'id': 11, 'priority': 10, 'pos1': [1, 4, 2], 'pos2': [1,9, 2]}, {'group': 'MyGroup1', 'pattern': '\%2lmatchadd', 'priority': 10, 'id': 12}], getmatches())
+  endif
+
+  highlight MyGroup1 NONE
+  highlight MyGroup2 NONE
+  highlight MyGroup3 NONE
+endfunc
+
+func Test_matchstrpos()
+  call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing'))
+
+  call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing', 2))
+
+  call assert_equal(['', -1, -1], matchstrpos('testing', 'ing', 5))
+
+  call assert_equal(['ing', 1, 4, 7], matchstrpos(['vim', 'testing', 'execute'], 'ing'))
+
+  call assert_equal(['', -1, -1, -1], matchstrpos(['vim', 'testing', 'execute'], 'img'))
+endfunc
+
+func Test_matchaddpos()
+  syntax on
+  set hlsearch
+
+  call setline(1, ['12345', 'NP'])
+  call matchaddpos('Error', [[1,2], [1,6], [2,2]])
+  redraw!
+  call assert_notequal(screenattr(2,2), 0)
+  call assert_equal(screenattr(2,2), screenattr(1,2))
+  call assert_notequal(screenattr(2,2), screenattr(1,6))
+  1
+  call matchadd('Search', 'N\|\n')
+  redraw!
+  call assert_notequal(screenattr(2,1), 0)
+  call assert_equal(screenattr(2,1), screenattr(1,6))
+  exec "norm! i0\<Esc>"
+  redraw!
+  call assert_equal(screenattr(2,2), screenattr(1,6))
+
+  " Check overlapping pos
+  call clearmatches()
+  call setline(1, ['1234567890', 'NH'])
+  call matchaddpos('Error', [[1,1,5], [1,3,5], [2,2]])
+  redraw!
+  call assert_notequal(screenattr(2,2), 0)
+  call assert_equal(screenattr(2,2), screenattr(1,5))
+  call assert_equal(screenattr(2,2), screenattr(1,7))
+  call assert_notequal(screenattr(2,2), screenattr(1,8))
+
+  call clearmatches()
+  call matchaddpos('Error', [[1], [2,2]])
+  redraw!
+  call assert_equal(screenattr(2,2), screenattr(1,1))
+  call assert_equal(screenattr(2,2), screenattr(1,10))
+  call assert_notequal(screenattr(2,2), screenattr(1,11))
+
+  nohl
+  call clearmatches()
+  syntax off
+  set hlsearch&
+endfunc
+
+func Test_matchaddpos_using_negative_priority()
+  set hlsearch
+
+  call clearmatches()
+
+  call setline(1, 'x')
+  let @/='x'
+  redraw!
+  let search_attr = screenattr(1,1)
+
+  let @/=''
+  call matchaddpos('Error', [1], 10)
+  redraw!
+  let error_attr = screenattr(1,1)
+
+  call setline(2, '-1 match priority')
+  call matchaddpos('Error', [2], -1)
+  redraw!
+  let negative_match_priority_attr = screenattr(2,1)
+
+  call assert_notequal(negative_match_priority_attr, search_attr, "Match with negative priority is incorrectly highlighted with Search highlight.")
+  call assert_equal(negative_match_priority_attr, error_attr)
+
+  nohl
+  set hlsearch&
+endfunc
+
+" vim: et ts=2 sw=2
diff --git a/src/nvim/testdir/test_matchadd_conceal.vim b/src/nvim/testdir/test_matchadd_conceal.vim
new file mode 100644
index 0000000000..bc1c28d6e9
--- /dev/null
+++ b/src/nvim/testdir/test_matchadd_conceal.vim
@@ -0,0 +1,262 @@
+" Test for matchadd() and conceal feature
+if !has('conceal')
+  finish
+endif
+
+function! s:screenline(lnum) abort
+  let line = []
+  for c in range(1, winwidth(0))
+    call add(line, nr2char(screenchar(a:lnum, c)))
+  endfor
+  return s:trim(join(line, ''))
+endfunction
+
+function! s:trim(str) abort
+  return matchstr(a:str,'^\s*\zs.\{-}\ze\s*$')
+endfunction
+
+function! Test_simple_matchadd()
+  new
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ')
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction
+
+function! Test_simple_matchadd_and_conceal()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#XThisXisXaXTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction
+
+function! Test_matchadd_and_conceallevel_3()
+  new
+
+  setlocal conceallevel=3
+  " set filetype and :syntax on to change screenattr()
+  setlocal filetype=conf
+  syntax on
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ThisisaTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  " more matchadd()
+  "             1234567890123456
+  let expect = '#Thisisa Test'
+
+  call matchadd('ErrorMsg', '\%2l Test', 20, -1, {'conceal': 'X'})
+  redraw!
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2) , screenattr(lnum, 7))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 10), screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 16))
+  call assert_notequal(screenattr(lnum, 10), screenattr(lnum, 16))
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_default_conceal_char()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {})
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  "             1234567890123456
+  let expect = '#+This+is+a+Test'
+  let listchars_save = &listchars
+  set listchars=conceal:+
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  let &listchars = listchars_save
+  quit!
+endfunction
+
+function! Test_syn_and_match_conceal()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ZThisZisZaZTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
+  syntax match MyConceal /\%2l / conceal containedin=ALL cchar=*
+  redraw!
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  "             1234567890123456
+  let expect = '#*This*is*a*Test'
+  call clearmatches()
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_clearmatches()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '# This is a Test'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
+  let a = getmatches()
+  call clearmatches()
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  " reset match using setmatches()
+  "             1234567890123456
+  let expect = '#ZThisZisZaZTest'
+  call setmatches(a)
+  redraw!
+
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+  call assert_equal({'group': 'Conceal', 'pattern': '\%2l ', 'priority': 10, 'id': a[0].id, 'conceal': 'Z'}, a[0])
+
+  quit!
+endfunction
+
+function! Test_using_matchaddpos()
+  new
+  setlocal concealcursor=n conceallevel=1
+  " set filetype and :syntax on to change screenattr()
+  setlocal filetype=conf
+  syntax on
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#Pis a Test'
+
+  call cursor(1, 1)
+  call matchaddpos('Conceal', [[2,2,6]], 10, -1, {'conceal': 'P'})
+  let a = getmatches()
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 2))
+  call assert_notequal(screenattr(lnum, 2) , screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 1) , screenattr(lnum, 10))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 12))
+  call assert_notequal(screenattr(lnum, 1) , screenattr(lnum, 16))
+  call assert_equal(screenattr(lnum, 12), screenattr(lnum, 16))
+  call assert_equal({'group': 'Conceal', 'id': a[0].id, 'priority': 10, 'pos1': [2, 2, 6], 'conceal': 'P'}, a[0])
+
+  syntax off
+  quit!
+endfunction
+
+function! Test_matchadd_repeat_conceal_with_syntax_off()
+  new
+
+  " To test targets in the same line string is replaced with conceal char
+  " correctly, repeat 'TARGET'
+  1put ='TARGET_TARGETTARGET'
+  call cursor(1, 1)
+  redraw
+  call assert_equal('TARGET_TARGETTARGET', s:screenline(2))
+
+  setlocal conceallevel=2
+  call matchadd('Conceal', 'TARGET', 10, -1, {'conceal': 't'})
+
+  redraw
+  call assert_equal('t_tt', s:screenline(2))
+
+  quit!
+endfunction
diff --git a/src/nvim/testdir/test_matchadd_conceal_utf8.vim b/src/nvim/testdir/test_matchadd_conceal_utf8.vim
new file mode 100644
index 0000000000..24c848a99c
--- /dev/null
+++ b/src/nvim/testdir/test_matchadd_conceal_utf8.vim
@@ -0,0 +1,39 @@
+" Test for matchadd() and conceal feature using utf-8.
+if !has('conceal') || !has('multi_byte')
+  finish
+endif
+
+function! s:screenline(lnum) abort
+  let line = []
+  for c in range(1, winwidth(0))
+    call add(line, nr2char(screenchar(a:lnum, c)))
+  endfor
+  return s:trim(join(line, ''))
+endfunction
+
+function! s:trim(str) abort
+  return matchstr(a:str,'^\s*\zs.\{-}\ze\s*$')
+endfunction
+
+function! Test_match_using_multibyte_conceal_char()
+  new
+  setlocal concealcursor=n conceallevel=1
+
+  1put='# This is a Test'
+  "             1234567890123456
+  let expect = '#ˑThisˑisˑaˑTest'
+
+  call cursor(1, 1)
+  call matchadd('Conceal', '\%2l ', 20, -1, {'conceal': "\u02d1"})
+  redraw!
+
+  let lnum = 2
+  call assert_equal(expect, s:screenline(lnum))
+  call assert_notequal(screenattr(lnum, 1), screenattr(lnum, 2))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 7))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 10))
+  call assert_equal(screenattr(lnum, 2), screenattr(lnum, 12))
+  call assert_equal(screenattr(lnum, 1), screenattr(lnum, 16))
+
+  quit!
+endfunction
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim
new file mode 100644
index 0000000000..188406e440
--- /dev/null
+++ b/src/nvim/testdir/test_messages.vim
@@ -0,0 +1,40 @@
+" Tests for :messages
+
+function Test_messages()
+  let oldmore = &more
+  try
+    set nomore
+    " Avoid the "message maintainer" line.
+    let $LANG = ''
+
+    let arr = map(range(10), '"hello" . v:val')
+    for s in arr
+      echomsg s | redraw
+    endfor
+    let result = ''
+
+    " get last two messages
+    redir => result
+    2messages | redraw
+    redir END
+    let msg_list = split(result, "\n")
+    call assert_equal(["hello8", "hello9"], msg_list)
+
+    " clear messages without last one
+    1messages clear
+    redir => result
+    redraw | messages
+    redir END
+    let msg_list = split(result, "\n")
+    call assert_equal(['hello9'], msg_list)
+
+    " clear all messages
+    messages clear
+    redir => result
+    redraw | messages
+    redir END
+    call assert_equal('', result)
+  finally
+    let &more = oldmore
+  endtry
+endfunction
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
new file mode 100644
index 0000000000..5ee0919e18
--- /dev/null
+++ b/src/nvim/testdir/test_options.vim
@@ -0,0 +1,99 @@
+" Test for options
+
+function! Test_whichwrap()
+  set whichwrap=b,s
+  call assert_equal('b,s', &whichwrap)
+
+  set whichwrap+=h,l
+  call assert_equal('b,s,h,l', &whichwrap)
+
+  set whichwrap+=h,l
+  call assert_equal('b,s,h,l', &whichwrap)
+
+  set whichwrap+=h,l
+  call assert_equal('b,s,h,l', &whichwrap)
+
+  set whichwrap&
+endfunction
+
+function! Test_options()
+  let caught = 'ok'
+  try
+    options
+  catch
+    let caught = v:throwpoint . "\n" . v:exception
+  endtry
+  call assert_equal('ok', caught)
+
+  " close option-window
+  close
+endfunction
+
+function! Test_path_keep_commas()
+  " Test that changing 'path' keeps two commas.
+  set path=foo,,bar
+  set path-=bar
+  set path+=bar
+  call assert_equal('foo,,bar', &path)
+
+  set path&
+endfunction
+
+func Test_filetype_valid()
+  if !has('autocmd')
+    return
+  endif
+  set ft=valid_name
+  call assert_equal("valid_name", &filetype)
+  set ft=valid-name
+  call assert_equal("valid-name", &filetype)
+
+  call assert_fails(":set ft=wrong;name", "E474:")
+  call assert_fails(":set ft=wrong\\\\name", "E474:")
+  call assert_fails(":set ft=wrong\\|name", "E474:")
+  call assert_fails(":set ft=wrong/name", "E474:")
+  call assert_fails(":set ft=wrong\\\nname", "E474:")
+  call assert_equal("valid-name", &filetype)
+
+  exe "set ft=trunc\x00name"
+  call assert_equal("trunc", &filetype)
+endfunc
+
+func Test_syntax_valid()
+  if !has('syntax')
+    return
+  endif
+  set syn=valid_name
+  call assert_equal("valid_name", &syntax)
+  set syn=valid-name
+  call assert_equal("valid-name", &syntax)
+
+  call assert_fails(":set syn=wrong;name", "E474:")
+  call assert_fails(":set syn=wrong\\\\name", "E474:")
+  call assert_fails(":set syn=wrong\\|name", "E474:")
+  call assert_fails(":set syn=wrong/name", "E474:")
+  call assert_fails(":set syn=wrong\\\nname", "E474:")
+  call assert_equal("valid-name", &syntax)
+
+  exe "set syn=trunc\x00name"
+  call assert_equal("trunc", &syntax)
+endfunc
+
+func Test_keymap_valid()
+  if !has('keymap')
+    return
+  endif
+  call assert_fails(":set kmp=valid_name", "E544:")
+  call assert_fails(":set kmp=valid_name", "valid_name")
+  call assert_fails(":set kmp=valid-name", "E544:")
+  call assert_fails(":set kmp=valid-name", "valid-name")
+
+  call assert_fails(":set kmp=wrong;name", "E474:")
+  call assert_fails(":set kmp=wrong\\\\name", "E474:")
+  call assert_fails(":set kmp=wrong\\|name", "E474:")
+  call assert_fails(":set kmp=wrong/name", "E474:")
+  call assert_fails(":set kmp=wrong\\\nname", "E474:")
+
+  call assert_fails(":set kmp=trunc\x00name", "E544:")
+  call assert_fails(":set kmp=trunc\x00name", "trunc")
+endfunc
diff --git a/src/nvim/testdir/test_partial.vim b/src/nvim/testdir/test_partial.vim
new file mode 100644
index 0000000000..3a6e162453
--- /dev/null
+++ b/src/nvim/testdir/test_partial.vim
@@ -0,0 +1,330 @@
+" Test binding arguments to a Funcref.
+
+func MyFunc(arg1, arg2, arg3)
+  return a:arg1 . '/' . a:arg2 . '/' . a:arg3
+endfunc
+
+func MySort(up, one, two)
+  if a:one == a:two
+    return 0
+  endif
+  if a:up
+    return a:one > a:two ? 1 : -1
+  endif
+  return a:one < a:two ? 1 : -1
+endfunc
+
+func Test_partial_args()
+  let Cb = function('MyFunc', ["foo", "bar"])
+
+  call Cb("zzz")
+  call assert_equal("foo/bar/xxx", Cb("xxx"))
+  call assert_equal("foo/bar/yyy", call(Cb, ["yyy"]))
+  let Cb2 = function(Cb)
+  call assert_equal("foo/bar/zzz", Cb2("zzz"))
+  let Cb3 = function(Cb, ["www"])
+  call assert_equal("foo/bar/www", Cb3())
+
+  let Cb = function('MyFunc', [])
+  call assert_equal("a/b/c", Cb("a", "b", "c"))
+  let Cb2 = function(Cb, [])
+  call assert_equal("a/b/d", Cb2("a", "b", "d"))
+  let Cb3 = function(Cb, ["a", "b"])
+  call assert_equal("a/b/e", Cb3("e"))
+
+  let Sort = function('MySort', [1])
+  call assert_equal([1, 2, 3], sort([3, 1, 2], Sort))
+  let Sort = function('MySort', [0])
+  call assert_equal([3, 2, 1], sort([3, 1, 2], Sort))
+endfunc
+
+func MyDictFunc(arg1, arg2) dict
+  return self.name . '/' . a:arg1 . '/' . a:arg2
+endfunc
+
+func Test_partial_dict()
+  let dict = {'name': 'hello'}
+  let Cb = function('MyDictFunc', ["foo", "bar"], dict)
+  call assert_equal("hello/foo/bar", Cb())
+  call assert_fails('Cb("xxx")', 'E492:')
+
+  let Cb = function('MyDictFunc', [], dict)
+  call assert_equal("hello/ttt/xxx", Cb("ttt", "xxx"))
+  call assert_fails('Cb("yyy")', 'E492:')
+
+  let Cb = function('MyDictFunc', ["foo"], dict)
+  call assert_equal("hello/foo/xxx", Cb("xxx"))
+  call assert_fails('Cb()', 'E492:')
+  let Cb = function('MyDictFunc', dict)
+  call assert_equal("hello/xxx/yyy", Cb("xxx", "yyy"))
+  call assert_fails('Cb("fff")', 'E492:')
+
+  let dict = {"tr": function('tr', ['hello', 'h', 'H'])}
+  call assert_equal("Hello", dict.tr())
+endfunc
+
+func Test_partial_implicit()
+  let dict = {'name': 'foo'}
+  func dict.MyFunc(arg) dict
+    return self.name . '/' . a:arg
+  endfunc
+
+  call assert_equal('foo/bar',  dict.MyFunc('bar'))
+
+  call assert_fails('let func = dict.MyFunc', 'E704:')
+  let Func = dict.MyFunc
+  call assert_equal('foo/aaa', Func('aaa'))
+
+  let Func = function(dict.MyFunc, ['bbb'])
+  call assert_equal('foo/bbb', Func())
+endfunc
+
+fun InnerCall(funcref)
+  return a:funcref
+endfu
+
+fun OuterCall()
+  let opt = { 'func' : function('sin') }
+  call InnerCall(opt.func)
+endfu
+
+func Test_function_in_dict()
+  call OuterCall()
+endfunc
+
+function! s:cache_clear() dict
+  return self.name
+endfunction
+
+func Test_script_function_in_dict()
+  let s:obj = {'name': 'foo'}
+  let s:obj2 = {'name': 'bar'}
+
+  let s:obj['clear'] = function('s:cache_clear')
+
+  call assert_equal('foo', s:obj.clear())
+  let F = s:obj.clear
+  call assert_equal('foo', F())
+  call assert_equal('foo', call(s:obj.clear, [], s:obj))
+  call assert_equal('bar', call(s:obj.clear, [], s:obj2))
+
+  let s:obj2['clear'] = function('s:cache_clear')
+  call assert_equal('bar', s:obj2.clear())
+  let B = s:obj2.clear
+  call assert_equal('bar', B())
+endfunc
+
+function! s:cache_arg(arg) dict
+  let s:result = self.name . '/' . a:arg
+  return s:result
+endfunction
+
+func Test_script_function_in_dict_arg()
+  let s:obj = {'name': 'foo'}
+  let s:obj['clear'] = function('s:cache_arg')
+
+  call assert_equal('foo/bar', s:obj.clear('bar'))
+  let F = s:obj.clear
+  let s:result = ''
+  call assert_equal('foo/bar', F('bar'))
+  call assert_equal('foo/bar', s:result)
+
+  let s:obj['clear'] = function('s:cache_arg', ['bar'])
+  call assert_equal('foo/bar', s:obj.clear())
+  let s:result = ''
+  call s:obj.clear()
+  call assert_equal('foo/bar', s:result)
+
+  let F = s:obj.clear
+  call assert_equal('foo/bar', F())
+  let s:result = ''
+  call F()
+  call assert_equal('foo/bar', s:result)
+
+  call assert_equal('foo/bar', call(s:obj.clear, [], s:obj))
+endfunc
+
+func Test_partial_exists()
+  let F = function('MyFunc')
+  call assert_true(exists('*F'))
+  let lF = [F]
+  call assert_true(exists('*lF[0]'))
+
+  let F = function('MyFunc', ['arg'])
+  call assert_true(exists('*F'))
+  let lF = [F]
+  call assert_true(exists('*lF[0]'))
+endfunc
+
+func Test_partial_string()
+  let F = function('MyFunc')
+  call assert_equal("function('MyFunc')", string(F))
+  let F = function('MyFunc', ['foo'])
+  call assert_equal("function('MyFunc', ['foo'])", string(F))
+  let F = function('MyFunc', ['foo', 'bar'])
+  call assert_equal("function('MyFunc', ['foo', 'bar'])", string(F))
+  let d = {'one': 1}
+  let F = function('MyFunc', d)
+  call assert_equal("function('MyFunc', {'one': 1})", string(F))
+  let F = function('MyFunc', ['foo'], d)
+  call assert_equal("function('MyFunc', ['foo'], {'one': 1})", string(F))
+endfunc
+
+func Test_func_unref()
+  let obj = {}
+  function! obj.func() abort
+  endfunction
+  let funcnumber = matchstr(string(obj.func), '^function(''\zs.\{-}\ze''')
+  call assert_true(exists('*{' . funcnumber . '}'))
+  unlet obj
+  call assert_false(exists('*{' . funcnumber . '}'))
+endfunc
+
+func Test_redefine_dict_func()
+  let d = {}
+  function d.test4()
+  endfunction
+  let d.test4 = d.test4
+  try
+    function! d.test4(name)
+    endfunction
+  catch
+    call assert_true(v:errmsg, v:exception)
+  endtry
+endfunc
+
+" This caused double free on exit if EXITFREE is defined.
+func Test_cyclic_list_arg()
+  let l = []
+  let Pt = function('string', [l])
+  call add(l, Pt)
+  unlet l
+  unlet Pt
+endfunc
+
+" This caused double free on exit if EXITFREE is defined.
+func Test_cyclic_dict_arg()
+  let d = {}
+  let Pt = function('string', [d])
+  let d.Pt = Pt
+  unlet d
+  unlet Pt
+endfunc
+
+func Ignored(job1, job2, status)
+endfunc
+
+" func Test_cycle_partial_job()
+"   let job = job_start('echo')
+"   call job_setoptions(job, {'exit_cb': function('Ignored', [job])})
+"   unlet job
+" endfunc
+
+" func Test_ref_job_partial_dict()
+"   let g:ref_job = job_start('echo')
+"   let d = {'a': 'b'}
+"   call job_setoptions(g:ref_job, {'exit_cb': function('string', [], d)})
+" endfunc
+
+func Test_auto_partial_rebind()
+  let dict1 = {'name': 'dict1'}
+  func! dict1.f1()
+    return self.name
+  endfunc
+  let dict1.f2 = function(dict1.f1, dict1)
+
+  call assert_equal('dict1', dict1.f1())
+  call assert_equal('dict1', dict1['f1']())
+  call assert_equal('dict1', dict1.f2())
+  call assert_equal('dict1', dict1['f2']())
+
+  let dict2 = {'name': 'dict2'}
+  let dict2.f1 = dict1.f1
+  let dict2.f2 = dict1.f2
+
+  call assert_equal('dict2', dict2.f1())
+  call assert_equal('dict2', dict2['f1']())
+  call assert_equal('dict1', dict2.f2())
+  call assert_equal('dict1', dict2['f2']())
+endfunc
+
+func Test_get_partial_items()
+  let dict = {'name': 'hello'}
+  let args = ["foo", "bar"]
+  let Func = function('MyDictFunc')
+  let Cb = function('MyDictFunc', args, dict)
+
+  call assert_equal(Func, get(Cb, 'func'))
+  call assert_equal('MyDictFunc', get(Cb, 'name'))
+  call assert_equal(args, get(Cb, 'args'))
+  call assert_equal(dict, get(Cb, 'dict'))
+  call assert_fails('call get(Cb, "xxx")', 'E475:')
+
+  call assert_equal(Func, get(Func, 'func'))
+  call assert_equal('MyDictFunc', get(Func, 'name'))
+  call assert_equal([], get(Func, 'args'))
+  call assert_true(empty( get(Func, 'dict')))
+endfunc
+
+func Test_compare_partials()
+  let d1 = {}
+  let d2 = {}
+
+  function d1.f1() dict
+  endfunction
+
+  function d1.f2() dict
+  endfunction
+
+  let F1 = get(d1, 'f1')
+  let F2 = get(d1, 'f2')
+
+  let F1d1 = function(F1, d1)
+  let F2d1 = function(F2, d2)
+  let F1d1a1 = function(F1d1, [1])
+  let F1d1a12 = function(F1d1, [1, 2])
+  let F1a1 = function(F1, [1])
+  let F1a2 = function(F1, [2])
+  let F1d2 = function(F1, d2)
+  let d3 = {'f1': F1, 'f2': F2}
+  let F1d3 = function(F1, d3)
+  let F1ad1 = function(F1, [d1])
+  let F1ad3 = function(F1, [d3])
+
+  call assert_match('^function(''\d\+'')$', string(F1))  " Not a partial
+  call assert_match('^function(''\d\+'')$', string(F2))  " Not a partial
+  call assert_match('^function(''\d\+'', {.*})$', string(F1d1))  " A partial
+  call assert_match('^function(''\d\+'', {.*})$', string(F2d1))  " A partial
+  call assert_match('^function(''\d\+'', \[.*\])$', string(F1a1))  " No dict
+
+  " !=
+  let X = F1
+  call assert_false(F1 != X)  " same function
+  let X = F1d1
+  call assert_false(F1d1 != X)  " same partial
+  let X = F1d1a1
+  call assert_false(F1d1a1 != X)  " same partial
+  let X = F1a1
+  call assert_false(F1a1 != X)  " same partial
+
+  call assert_true(F1 != F2)  " Different functions
+  call assert_true(F1 != F1d1)  " Partial /= non-partial
+  call assert_true(F1d1a1 != F1d1a12)  " Different number of arguments
+  call assert_true(F1a1 != F1d1a12)  " One has no dict
+  call assert_true(F1a1 != F1a2)  " Different arguments
+  call assert_true(F1d2 != F1d1)  " Different dictionaries
+  call assert_false(F1d1 != F1d3)  " Equal dictionaries, even though d1 isnot d3
+
+  " isnot, option 1
+  call assert_true(F1 isnot# F2)  " Different functions
+  call assert_true(F1 isnot# F1d1)  " Partial /= non-partial
+  call assert_true(F1d1 isnot# F1d3)  " d1 isnot d3, even though d1 == d3
+  call assert_true(F1a1 isnot# F1d1a12)  " One has no dict
+  call assert_true(F1a1 isnot# F1a2)  " Different number of arguments
+  call assert_true(F1ad1 isnot# F1ad3)  " In arguments d1 isnot d3
+
+  " isnot, option 2
+  call assert_true(F1 isnot# F2)  " Different functions
+  call assert_true(F1 isnot# F1d1)  " Partial /= non-partial
+  call assert_true(d1.f1 isnot# d1.f1)  " handle_subscript creates new partial each time
+endfunc
diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim
new file mode 100644
index 0000000000..50110dd622
--- /dev/null
+++ b/src/nvim/testdir/test_popup.vim
@@ -0,0 +1,485 @@
+" Test for completion menu
+
+let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
+let g:setting = ''
+
+func! ListMonths()
+  if g:setting != ''
+    exe ":set" g:setting
+  endif
+  let mth=copy(g:months)
+  let entered = strcharpart(getline('.'),0,col('.'))
+  if !empty(entered)
+    let mth=filter(mth, 'v:val=~"^".entered')
+  endif
+  call complete(1, mth)
+  return ''
+endfunc
+
+func! Test_popup_complete2()
+  " Although the popupmenu is not visible, this does not mean completion mode
+  " has ended. After pressing <f5> to complete the currently typed char, Vim
+  " still stays in the first state of the completion (:h ins-completion-menu),
+  " although the popupmenu wasn't shown <c-e> will remove the inserted
+  " completed text (:h complete_CTRL-E), while the following <c-e> will behave
+  " like expected (:h i_CTRL-E)
+  new
+  inoremap <f5> <c-r>=ListMonths()<cr>
+  call append(1, ["December2015"])
+  :1
+  call feedkeys("aD\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", 'tx')
+  call assert_equal(["Dece", "", "December2015"], getline(1,3))
+  %d
+  bw!
+endfu
+
+func! Test_popup_complete()
+  new
+  inoremap <f5> <c-r>=ListMonths()<cr>
+
+  " <C-E> - select original typed text before the completion started
+  call feedkeys("aJu\<f5>\<down>\<c-e>\<esc>", 'tx')
+  call assert_equal(["Ju"], getline(1,2))
+  %d
+
+  " <C-Y> - accept current match
+  call feedkeys("a\<f5>". repeat("\<down>",7). "\<c-y>\<esc>", 'tx')
+  call assert_equal(["August"], getline(1,2))
+  %d
+
+  " <BS> - Delete one character from the inserted text (state: 1)
+  " TODO: This should not end the completion, but it does.
+  " This should according to the documentation:
+  " January
+  " but instead, this does
+  " Januar
+  " (idea is, C-L inserts the match from the popup menu
+  " but if the menu is closed, it will insert the character <c-l>
+  call feedkeys("aJ\<f5>\<bs>\<c-l>\<esc>", 'tx')
+  call assert_equal(["Januar"], getline(1,2))
+  %d
+
+  " any-non special character: Stop completion without changing the match
+  " and insert the typed character
+  call feedkeys("a\<f5>20", 'tx')
+  call assert_equal(["January20"], getline(1,2))
+  %d
+
+  " any-non printable, non-white character: Add this character and
+  " reduce number of matches
+  call feedkeys("aJu\<f5>\<c-p>l\<c-y>", 'tx')
+  call assert_equal(["Jul"], getline(1,2))
+  %d
+
+  " any-non printable, non-white character: Add this character and
+  " reduce number of matches
+  call feedkeys("aJu\<f5>\<c-p>l\<c-n>\<c-y>", 'tx')
+  call assert_equal(["July"], getline(1,2))
+  %d
+
+  " any-non printable, non-white character: Add this character and
+  " reduce number of matches
+  call feedkeys("aJu\<f5>\<c-p>l\<c-e>", 'tx')
+  call assert_equal(["Jul"], getline(1,2))
+  %d
+
+  " <BS> - Delete one character from the inserted text (state: 2)
+  call feedkeys("a\<f5>\<c-n>\<bs>", 'tx')
+  call assert_equal(["Februar"], getline(1,2))
+  %d
+
+  " <c-l> - Insert one character from the current match
+  call feedkeys("aJ\<f5>".repeat("\<c-n>",3)."\<c-l>\<esc>", 'tx')
+  call assert_equal(["J"], getline(1,2))
+  %d
+
+  " <c-l> - Insert one character from the current match
+  call feedkeys("aJ\<f5>".repeat("\<c-n>",4)."\<c-l>\<esc>", 'tx')
+  call assert_equal(["January"], getline(1,2))
+  %d
+
+  " <c-y> - Accept current selected match
+  call feedkeys("aJ\<f5>\<c-y>\<esc>", 'tx')
+  call assert_equal(["January"], getline(1,2))
+  %d
+
+  " <c-e> - End completion, go back to what was there before selecting a match
+  call feedkeys("aJu\<f5>\<c-e>\<esc>", 'tx')
+  call assert_equal(["Ju"], getline(1,2))
+  %d
+
+  " <PageUp> - Select a match several entries back
+  call feedkeys("a\<f5>\<PageUp>\<c-y>\<esc>", 'tx')
+  call assert_equal([""], getline(1,2))
+  %d
+
+  " <PageUp><PageUp> - Select a match several entries back
+  call feedkeys("a\<f5>\<PageUp>\<PageUp>\<c-y>\<esc>", 'tx')
+  call assert_equal(["December"], getline(1,2))
+  %d
+
+  " <PageUp><PageUp><PageUp> - Select a match several entries back
+  call feedkeys("a\<f5>\<PageUp>\<PageUp>\<PageUp>\<c-y>\<esc>", 'tx')
+  call assert_equal(["February"], getline(1,2))
+  %d
+
+  " <PageDown> - Select a match several entries further
+  call feedkeys("a\<f5>\<PageDown>\<c-y>\<esc>", 'tx')
+  call assert_equal(["November"], getline(1,2))
+  %d
+
+  " <PageDown><PageDown> - Select a match several entries further
+  call feedkeys("a\<f5>\<PageDown>\<PageDown>\<c-y>\<esc>", 'tx')
+  call assert_equal(["December"], getline(1,2))
+  %d
+
+  " <PageDown><PageDown><PageDown> - Select a match several entries further
+  call feedkeys("a\<f5>\<PageDown>\<PageDown>\<PageDown>\<c-y>\<esc>", 'tx')
+  call assert_equal([""], getline(1,2))
+  %d
+
+  " <PageDown><PageDown><PageDown><PageDown> - Select a match several entries further
+  call feedkeys("a\<f5>".repeat("\<PageDown>",4)."\<c-y>\<esc>", 'tx')
+  call assert_equal(["October"], getline(1,2))
+  %d
+
+  " <Up> - Select a match don't insert yet
+  call feedkeys("a\<f5>\<Up>\<c-y>\<esc>", 'tx')
+  call assert_equal([""], getline(1,2))
+  %d
+
+  " <Up><Up> - Select a match don't insert yet
+  call feedkeys("a\<f5>\<Up>\<Up>\<c-y>\<esc>", 'tx')
+  call assert_equal(["December"], getline(1,2))
+  %d
+
+  " <Up><Up><Up> - Select a match don't insert yet
+  call feedkeys("a\<f5>\<Up>\<Up>\<Up>\<c-y>\<esc>", 'tx')
+  call assert_equal(["November"], getline(1,2))
+  %d
+
+  " <Tab> - Stop completion and insert the match
+  call feedkeys("a\<f5>\<Tab>\<c-y>\<esc>", 'tx')
+  call assert_equal(["January	"], getline(1,2))
+  %d
+
+  " <Space> - Stop completion and insert the match
+  call feedkeys("a\<f5>".repeat("\<c-p>",5)." \<esc>", 'tx')
+  call assert_equal(["September "], getline(1,2))
+  %d
+
+  " <Enter> - Use the text and insert line break (state: 1)
+  call feedkeys("a\<f5>\<enter>\<esc>", 'tx')
+  call assert_equal(["January", ''], getline(1,2))
+  %d
+
+  " <Enter> - Insert the current selected text (state: 2)
+  call feedkeys("a\<f5>".repeat("\<Up>",5)."\<enter>\<esc>", 'tx')
+  call assert_equal(["September"], getline(1,2))
+  %d
+
+  " Insert match immediately, if there is only one match
+  " <c-y> selects a character from the line above
+  call append(0, ["December2015"])
+  call feedkeys("aD\<f5>\<C-Y>\<C-Y>\<C-Y>\<C-Y>\<enter>\<esc>", 'tx')
+  call assert_equal(["December2015", "December2015", ""], getline(1,3))
+  %d
+
+  " use menuone for 'completeopt'
+  " Since for the first <c-y> the menu is still shown, will only select
+  " three letters from the line above
+  set completeopt&vim
+  set completeopt+=menuone
+  call append(0, ["December2015"])
+  call feedkeys("aD\<f5>\<C-Y>\<C-Y>\<C-Y>\<C-Y>\<enter>\<esc>", 'tx')
+  call assert_equal(["December2015", "December201", ""], getline(1,3))
+  %d
+
+  " use longest for 'completeopt'
+  set completeopt&vim
+  call feedkeys("aM\<f5>\<C-N>\<C-P>\<c-e>\<enter>\<esc>", 'tx')
+  set completeopt+=longest
+  call feedkeys("aM\<f5>\<C-N>\<C-P>\<c-e>\<enter>\<esc>", 'tx')
+  call assert_equal(["M", "Ma", ""], getline(1,3))
+  %d
+
+  " use noselect/noinsert for 'completeopt'
+  set completeopt&vim
+  call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
+  set completeopt+=noselect
+  call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
+  set completeopt-=noselect completeopt+=noinsert
+  call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
+  call assert_equal(["March", "M", "March"], getline(1,4))
+  %d
+endfu
+
+
+func! Test_popup_completion_insertmode()
+  new
+  inoremap <F5> <C-R>=ListMonths()<CR>
+
+  call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+  call assert_equal('February', getline(1))
+  %d
+  " Set noinsertmode
+  let g:setting = 'noinsertmode'
+  call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx')
+  call assert_equal('February', getline(1))
+  call assert_false(pumvisible())
+  %d
+  " Go through all matches, until none is selected
+  let g:setting = ''
+  call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx')
+  call assert_equal('', getline(1))
+  %d
+  " select previous entry
+  call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx')
+  call assert_equal('', getline(1))
+  %d
+  " select last entry
+  call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
+  call assert_equal('December', getline(1))
+
+  iunmap <F5>
+endfunc
+
+func Test_noinsert_complete()
+  function! s:complTest1() abort
+    call complete(1, ['source', 'soundfold'])
+    return ''
+  endfunction
+
+  function! s:complTest2() abort
+    call complete(1, ['source', 'soundfold'])
+    return ''
+  endfunction
+
+  new
+  set completeopt+=noinsert
+  inoremap <F5>  <C-R>=s:complTest1()<CR>
+  call feedkeys("i\<F5>soun\<CR>\<CR>\<ESC>.", 'tx')
+  call assert_equal('soundfold', getline(1))
+  call assert_equal('soundfold', getline(2))
+  bwipe!
+
+  new
+  inoremap <F5>  <C-R>=s:complTest2()<CR>
+  call feedkeys("i\<F5>\<CR>\<ESC>", 'tx')
+  call assert_equal('source', getline(1))
+  bwipe!
+
+  set completeopt-=noinsert
+  iunmap <F5>
+endfunc
+
+func Test_compl_vim_cmds_after_register_expr()
+  function! s:test_func()
+    return 'autocmd '
+  endfunction
+  augroup AAAAA_Group
+    au!
+  augroup END
+
+  new
+  call feedkeys("i\<c-r>=s:test_func()\<CR>\<C-x>\<C-v>\<Esc>", 'tx')
+  call assert_equal('autocmd AAAAA_Group', getline(1))
+  autocmd! AAAAA_Group
+  augroup! AAAAA_Group
+  bwipe!
+endfunc
+
+func DummyCompleteOne(findstart, base)
+  if a:findstart
+    return 0
+  else
+    wincmd n
+    return ['onedef', 'oneDEF']
+  endif
+endfunc
+
+" Test that nothing happens if the 'completefunc' opens
+" a new window (no completion, no crash)
+func Test_completefunc_opens_new_window_one()
+  new
+  let winid = win_getid()
+  setlocal completefunc=DummyCompleteOne
+  call setline(1, 'one')
+  /^one
+  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E839:')
+  call assert_notequal(winid, win_getid())
+  q!
+  call assert_equal(winid, win_getid())
+  call assert_equal('', getline(1))
+  q!
+endfunc
+
+" Test that nothing happens if the 'completefunc' opens
+" a new window (no completion, no crash)
+func DummyCompleteTwo(findstart, base)
+  if a:findstart
+    wincmd n
+    return 0
+  else
+    return ['twodef', 'twoDEF']
+  endif
+endfunction
+
+" Test that nothing happens if the 'completefunc' opens
+" a new window (no completion, no crash)
+func Test_completefunc_opens_new_window_two()
+  new
+  let winid = win_getid()
+  setlocal completefunc=DummyCompleteTwo
+  call setline(1, 'two')
+  /^two
+  call assert_fails('call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")', 'E764:')
+  call assert_notequal(winid, win_getid())
+  q!
+  call assert_equal(winid, win_getid())
+  call assert_equal('two', getline(1))
+  q!
+endfunc
+
+func DummyCompleteThree(findstart, base)
+  if a:findstart
+    return 0
+  else
+    return ['threedef', 'threeDEF']
+  endif
+endfunc
+
+:"Test that 'completefunc' works when it's OK.
+func Test_completefunc_works()
+  new
+  let winid = win_getid()
+  setlocal completefunc=DummyCompleteThree
+  call setline(1, 'three')
+  /^three
+  call feedkeys("A\<C-X>\<C-U>\<C-N>\<Esc>", "x")
+  call assert_equal(winid, win_getid())
+  call assert_equal('threeDEF', getline(1))
+  q!
+endfunc
+
+func DummyCompleteFour(findstart, base)
+  if a:findstart
+    return 0
+  else
+    call complete_add('four1')
+    call complete_add('four2')
+    call complete_check()
+    call complete_add('four3')
+    call complete_add('four4')
+    call complete_check()
+    call complete_add('four5')
+    call complete_add('four6')
+    return []
+  endif
+endfunc
+
+" Test that 'omnifunc' works when it's OK.
+func Test_omnifunc_with_check()
+  new
+  setlocal omnifunc=DummyCompleteFour
+  call setline(1, 'four')
+  /^four
+  call feedkeys("A\<C-X>\<C-O>\<C-N>\<Esc>", "x")
+  call assert_equal('four2', getline(1))
+
+  call setline(1, 'four')
+  /^four
+  call feedkeys("A\<C-X>\<C-O>\<C-N>\<C-N>\<Esc>", "x")
+  call assert_equal('four3', getline(1))
+
+  call setline(1, 'four')
+  /^four
+  call feedkeys("A\<C-X>\<C-O>\<C-N>\<C-N>\<C-N>\<C-N>\<Esc>", "x")
+  call assert_equal('four5', getline(1))
+
+  q!
+endfunc
+
+function UndoComplete()
+  call complete(1, ['January', 'February', 'March',
+        \ 'April', 'May', 'June', 'July', 'August', 'September',
+        \ 'October', 'November', 'December'])
+  return ''
+endfunc
+
+" Test that no undo item is created when no completion is inserted
+func Test_complete_no_undo()
+  set completeopt=menu,preview,noinsert,noselect
+  inoremap <Right> <C-R>=UndoComplete()<CR>
+  new
+  call feedkeys("ixxx\<CR>\<CR>yyy\<Esc>k", 'xt')
+  call feedkeys("iaaa\<Esc>0", 'xt')
+  call assert_equal('aaa', getline(2))
+  call feedkeys("i\<Right>\<Esc>", 'xt')
+  call assert_equal('aaa', getline(2))
+  call feedkeys("u", 'xt')
+  call assert_equal('', getline(2))
+
+  call feedkeys("ibbb\<Esc>0", 'xt')
+  call assert_equal('bbb', getline(2))
+  call feedkeys("A\<Right>\<Down>\<CR>\<Esc>", 'xt')
+  call assert_equal('January', getline(2))
+  call feedkeys("u", 'xt')
+  call assert_equal('bbb', getline(2))
+
+  call feedkeys("A\<Right>\<C-N>\<Esc>", 'xt')
+  call assert_equal('January', getline(2))
+  call feedkeys("u", 'xt')
+  call assert_equal('bbb', getline(2))
+
+  iunmap <Right>
+  set completeopt&
+  q!
+endfunc
+
+function! DummyCompleteFive(findstart, base)
+  if a:findstart
+    return 0
+  else
+    return [
+          \   { 'word': 'January', 'info': "info1-1\n1-2\n1-3" },
+          \   { 'word': 'February', 'info': "info2-1\n2-2\n2-3" },
+          \   { 'word': 'March', 'info': "info3-1\n3-2\n3-3" },
+          \   { 'word': 'April', 'info': "info4-1\n4-2\n4-3" },
+          \   { 'word': 'May', 'info': "info5-1\n5-2\n5-3" },
+          \ ]
+  endif
+endfunc
+
+" Test that 'completefunc' on Scratch buffer with preview window works when
+" it's OK.
+func Test_completefunc_with_scratch_buffer()
+  new +setlocal\ buftype=nofile\ bufhidden=wipe\ noswapfile
+  set completeopt+=preview
+  setlocal completefunc=DummyCompleteFive
+  call feedkeys("A\<C-X>\<C-U>\<C-N>\<C-N>\<C-N>\<Esc>", "x")
+  call assert_equal(['April'], getline(1, '$'))
+  pclose
+  q!
+  set completeopt&
+endfunc
+
+" <C-E> - select original typed text before the completion started without
+" auto-wrap text.
+func Test_completion_ctrl_e_without_autowrap()
+  new
+  let tw_save=&tw
+  set tw=78
+  let li = [
+        \ '"                                                        zzz',
+        \ '" zzzyyyyyyyyyyyyyyyyyyy']
+  call setline(1, li)
+  0
+  call feedkeys("A\<C-X>\<C-N>\<C-E>\<Esc>", "tx")
+  call assert_equal(li, getline(1, '$'))
+
+  let &tw=tw_save
+  q!
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
new file mode 100644
index 0000000000..7464a11abd
--- /dev/null
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -0,0 +1,1464 @@
+" Test for the quickfix commands.
+
+if !has('quickfix')
+  finish
+endif
+
+set encoding=utf-8
+
+function! s:setup_commands(cchar)
+  if a:cchar == 'c'
+    command! -nargs=* -bang Xlist <mods>clist<bang> <args>
+    command! -nargs=* Xgetexpr <mods>cgetexpr <args>
+    command! -nargs=* Xaddexpr <mods>caddexpr <args>
+    command! -nargs=* Xolder <mods>colder <args>
+    command! -nargs=* Xnewer <mods>cnewer <args>
+    command! -nargs=* Xopen <mods>copen <args>
+    command! -nargs=* Xwindow <mods>cwindow <args>
+    command! -nargs=* Xbottom <mods>cbottom <args>
+    command! -nargs=* Xclose <mods>cclose <args>
+    command! -nargs=* -bang Xfile <mods>cfile<bang> <args>
+    command! -nargs=* Xgetfile <mods>cgetfile <args>
+    command! -nargs=* Xaddfile <mods>caddfile <args>
+    command! -nargs=* -bang Xbuffer <mods>cbuffer<bang> <args>
+    command! -nargs=* Xgetbuffer <mods>cgetbuffer <args>
+    command! -nargs=* Xaddbuffer <mods>caddbuffer <args>
+    command! -nargs=* Xrewind <mods>crewind <args>
+    command! -nargs=* -bang Xnext <mods>cnext<bang> <args>
+    command! -nargs=* -bang Xprev <mods>cprev<bang> <args>
+    command! -nargs=* -bang Xfirst <mods>cfirst<bang> <args>
+    command! -nargs=* -bang Xlast <mods>clast<bang> <args>
+    command! -nargs=* -bang Xnfile <mods>cnfile<bang> <args>
+    command! -nargs=* -bang Xpfile <mods>cpfile<bang> <args>
+    command! -nargs=* Xexpr <mods>cexpr <args>
+    command! -nargs=* Xvimgrep <mods>vimgrep <args>
+    command! -nargs=* Xgrep <mods> grep <args>
+    command! -nargs=* Xgrepadd <mods> grepadd <args>
+    command! -nargs=* Xhelpgrep helpgrep <args>
+    let g:Xgetlist = function('getqflist')
+    let g:Xsetlist = function('setqflist')
+  else
+    command! -nargs=* -bang Xlist <mods>llist<bang> <args>
+    command! -nargs=* Xgetexpr <mods>lgetexpr <args>
+    command! -nargs=* Xaddexpr <mods>laddexpr <args>
+    command! -nargs=* Xolder <mods>lolder <args>
+    command! -nargs=* Xnewer <mods>lnewer <args>
+    command! -nargs=* Xopen <mods>lopen <args>
+    command! -nargs=* Xwindow <mods>lwindow <args>
+    command! -nargs=* Xbottom <mods>lbottom <args>
+    command! -nargs=* Xclose <mods>lclose <args>
+    command! -nargs=* -bang Xfile <mods>lfile<bang> <args>
+    command! -nargs=* Xgetfile <mods>lgetfile <args>
+    command! -nargs=* Xaddfile <mods>laddfile <args>
+    command! -nargs=* -bang Xbuffer <mods>lbuffer<bang> <args>
+    command! -nargs=* Xgetbuffer <mods>lgetbuffer <args>
+    command! -nargs=* Xaddbuffer <mods>laddbuffer <args>
+    command! -nargs=* Xrewind <mods>lrewind <args>
+    command! -nargs=* -bang Xnext <mods>lnext<bang> <args>
+    command! -nargs=* -bang Xprev <mods>lprev<bang> <args>
+    command! -nargs=* -bang Xfirst <mods>lfirst<bang> <args>
+    command! -nargs=* -bang Xlast <mods>llast<bang> <args>
+    command! -nargs=* -bang Xnfile <mods>lnfile<bang> <args>
+    command! -nargs=* -bang Xpfile <mods>lpfile<bang> <args>
+    command! -nargs=* Xexpr <mods>lexpr <args>
+    command! -nargs=* Xvimgrep <mods>lvimgrep <args>
+    command! -nargs=* Xgrep <mods> lgrep <args>
+    command! -nargs=* Xgrepadd <mods> lgrepadd <args>
+    command! -nargs=* Xhelpgrep lhelpgrep <args>
+    let g:Xgetlist = function('getloclist', [0])
+    let g:Xsetlist = function('setloclist', [0])
+  endif
+endfunction
+
+" Tests for the :clist and :llist commands
+function XlistTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  " With an empty list, command should return error
+  Xgetexpr []
+  silent! Xlist
+  call assert_true(v:errmsg ==# 'E42: No Errors')
+
+  " Populate the list and then try
+  Xgetexpr ['non-error 1', 'Xtestfile1:1:3:Line1',
+		  \ 'non-error 2', 'Xtestfile2:2:2:Line2',
+		  \ 'non-error 3', 'Xtestfile3:3:1:Line3']
+
+  " List only valid entries
+  redir => result
+  Xlist
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 2 Xtestfile1:1 col 3: Line1',
+		   \ ' 4 Xtestfile2:2 col 2: Line2',
+		   \ ' 6 Xtestfile3:3 col 1: Line3'], l)
+
+  " List all the entries
+  redir => result
+  Xlist!
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 1: non-error 1', ' 2 Xtestfile1:1 col 3: Line1',
+		   \ ' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2',
+		   \ ' 5: non-error 3', ' 6 Xtestfile3:3 col 1: Line3'], l)
+
+  " List a range of errors
+  redir => result
+  Xlist 3,6
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 4 Xtestfile2:2 col 2: Line2',
+		   \ ' 6 Xtestfile3:3 col 1: Line3'], l)
+
+  redir => result
+  Xlist! 3,4
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2'], l)
+
+  redir => result
+  Xlist -6,-4
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 2 Xtestfile1:1 col 3: Line1'], l)
+
+  redir => result
+  Xlist! -5,-3
+  redir END
+  let l = split(result, "\n")
+  call assert_equal([' 2 Xtestfile1:1 col 3: Line1',
+		   \ ' 3: non-error 2', ' 4 Xtestfile2:2 col 2: Line2'], l)
+endfunction
+
+function Test_clist()
+  call XlistTests('c')
+  call XlistTests('l')
+endfunction
+
+" Tests for the :colder, :cnewer, :lolder and :lnewer commands
+" Note that this test assumes that a quickfix/location list is
+" already set by the caller.
+function XageTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  " Jumping to a non existent list should return error
+  silent! Xolder 99
+  call assert_true(v:errmsg ==# 'E380: At bottom of quickfix stack')
+
+  silent! Xnewer 99
+  call assert_true(v:errmsg ==# 'E381: At top of quickfix stack')
+
+  " Add three quickfix/location lists
+  Xgetexpr ['Xtestfile1:1:3:Line1']
+  Xgetexpr ['Xtestfile2:2:2:Line2']
+  Xgetexpr ['Xtestfile3:3:1:Line3']
+
+  " Go back two lists
+  Xolder
+  let l = g:Xgetlist()
+  call assert_equal('Line2', l[0].text)
+
+  " Go forward two lists
+  Xnewer
+  let l = g:Xgetlist()
+  call assert_equal('Line3', l[0].text)
+
+  " Test for the optional count argument
+  Xolder 2
+  let l = g:Xgetlist()
+  call assert_equal('Line1', l[0].text)
+
+  Xnewer 2
+  let l = g:Xgetlist()
+  call assert_equal('Line3', l[0].text)
+endfunction
+
+function Test_cage()
+  let list = [{'bufnr': 1, 'lnum': 1}]
+  call setqflist(list)
+  call XageTests('c')
+
+  call setloclist(0, list)
+  call XageTests('l')
+endfunction
+
+" Tests for the :cwindow, :lwindow :cclose, :lclose, :copen and :lopen
+" commands
+function XwindowTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  " Create a list with no valid entries
+  Xgetexpr ['non-error 1', 'non-error 2', 'non-error 3']
+
+  " Quickfix/Location window should not open with no valid errors
+  Xwindow
+  call assert_true(winnr('$') == 1)
+
+  " Create a list with valid entries
+  Xgetexpr ['Xtestfile1:1:3:Line1', 'Xtestfile2:2:2:Line2',
+		  \ 'Xtestfile3:3:1:Line3']
+
+  " Open the window
+  Xwindow
+  call assert_true(winnr('$') == 2 && winnr() == 2 &&
+	\ getline('.') ==# 'Xtestfile1|1 col 3| Line1')
+  redraw!
+
+  " Close the window
+  Xclose
+  call assert_true(winnr('$') == 1)
+
+  " Create a list with no valid entries
+  Xgetexpr ['non-error 1', 'non-error 2', 'non-error 3']
+
+  " Open the window
+  Xopen 5
+  call assert_true(winnr('$') == 2 && getline('.') ==# '|| non-error 1'
+		      \  && winheight('.') == 5)
+
+  " Opening the window again, should move the cursor to that window
+  wincmd t
+  Xopen 7
+  call assert_true(winnr('$') == 2 && winnr() == 2 &&
+	\ winheight('.') == 7 &&
+	\ getline('.') ==# '|| non-error 1')
+
+
+  " Calling cwindow should close the quickfix window with no valid errors
+  Xwindow
+  call assert_true(winnr('$') == 1)
+endfunction
+
+function Test_cwindow()
+  call XwindowTests('c')
+  call XwindowTests('l')
+endfunction
+
+" Tests for the :cfile, :lfile, :caddfile, :laddfile, :cgetfile and :lgetfile
+" commands.
+function XfileTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  call writefile(['Xtestfile1:700:10:Line 700',
+	\ 'Xtestfile2:800:15:Line 800'], 'Xqftestfile1')
+
+  enew!
+  Xfile Xqftestfile1
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 2 &&
+	\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
+	\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
+
+  " Test with a non existent file
+  call assert_fails('Xfile non_existent_file', 'E40')
+
+  " Run cfile/lfile from a modified buffer
+  enew!
+  silent! put ='Quickfix'
+  silent! Xfile Xqftestfile1
+  call assert_true(v:errmsg ==# 'E37: No write since last change (add ! to override)')
+
+  call writefile(['Xtestfile3:900:30:Line 900'], 'Xqftestfile1')
+  Xaddfile Xqftestfile1
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 3 &&
+	\ l[2].lnum == 900 && l[2].col == 30 && l[2].text ==# 'Line 900')
+
+  call writefile(['Xtestfile1:222:77:Line 222',
+	\ 'Xtestfile2:333:88:Line 333'], 'Xqftestfile1')
+
+  enew!
+  Xgetfile Xqftestfile1
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 2 &&
+	\ l[0].lnum == 222 && l[0].col == 77 && l[0].text ==# 'Line 222' &&
+	\ l[1].lnum == 333 && l[1].col == 88 && l[1].text ==# 'Line 333')
+
+  call delete('Xqftestfile1')
+endfunction
+
+function Test_cfile()
+  call XfileTests('c')
+  call XfileTests('l')
+endfunction
+
+" Tests for the :cbuffer, :lbuffer, :caddbuffer, :laddbuffer, :cgetbuffer and
+" :lgetbuffer commands.
+function XbufferTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  enew!
+  silent! call setline(1, ['Xtestfile7:700:10:Line 700',
+	\ 'Xtestfile8:800:15:Line 800'])
+  Xbuffer!
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 2 &&
+	\ l[0].lnum == 700 && l[0].col == 10 && l[0].text ==# 'Line 700' &&
+	\ l[1].lnum == 800 && l[1].col == 15 && l[1].text ==# 'Line 800')
+
+  enew!
+  silent! call setline(1, ['Xtestfile9:900:55:Line 900',
+	\ 'Xtestfile10:950:66:Line 950'])
+  Xgetbuffer
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 2 &&
+	\ l[0].lnum == 900 && l[0].col == 55 && l[0].text ==# 'Line 900' &&
+	\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950')
+
+  enew!
+  silent! call setline(1, ['Xtestfile11:700:20:Line 700',
+	\ 'Xtestfile12:750:25:Line 750'])
+  Xaddbuffer
+  let l = g:Xgetlist()
+  call assert_true(len(l) == 4 &&
+	\ l[1].lnum == 950 && l[1].col == 66 && l[1].text ==# 'Line 950' &&
+	\ l[2].lnum == 700 && l[2].col == 20 && l[2].text ==# 'Line 700' &&
+	\ l[3].lnum == 750 && l[3].col == 25 && l[3].text ==# 'Line 750')
+  enew!
+
+endfunction
+
+function Test_cbuffer()
+  call XbufferTests('c')
+  call XbufferTests('l')
+endfunction
+
+function XexprTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  call assert_fails('Xexpr 10', 'E777:')
+endfunction
+
+function Test_cexpr()
+  call XexprTests('c')
+  call XexprTests('l')
+endfunction
+
+" Tests for :cnext, :cprev, :cfirst, :clast commands
+function Xtest_browse(cchar)
+  call s:setup_commands(a:cchar)
+
+  call s:create_test_file('Xqftestfile1')
+  call s:create_test_file('Xqftestfile2')
+
+  Xgetexpr ['Xqftestfile1:5:Line5',
+		\ 'Xqftestfile1:6:Line6',
+		\ 'Xqftestfile2:10:Line10',
+		\ 'Xqftestfile2:11:Line11']
+
+  Xfirst
+  call assert_fails('Xprev', 'E553')
+  call assert_fails('Xpfile', 'E553')
+  Xnfile
+  call assert_equal('Xqftestfile2', bufname('%'))
+  call assert_equal(10, line('.'))
+  Xpfile
+  call assert_equal('Xqftestfile1', bufname('%'))
+  call assert_equal(6, line('.'))
+  Xlast
+  call assert_equal('Xqftestfile2', bufname('%'))
+  call assert_equal(11, line('.'))
+  call assert_fails('Xnext', 'E553')
+  call assert_fails('Xnfile', 'E553')
+  Xrewind
+  call assert_equal('Xqftestfile1', bufname('%'))
+  call assert_equal(5, line('.'))
+
+  call delete('Xqftestfile1')
+  call delete('Xqftestfile2')
+endfunction
+
+function Test_browse()
+  call Xtest_browse('c')
+  call Xtest_browse('l')
+endfunction
+
+function! s:test_xhelpgrep(cchar)
+  call s:setup_commands(a:cchar)
+  Xhelpgrep quickfix
+  Xopen
+  if a:cchar == 'c'
+    let title_text = ':helpgrep quickfix'
+  else
+    let title_text = ':lhelpgrep quickfix'
+  endif
+  call assert_true(w:quickfix_title =~ title_text, w:quickfix_title)
+  " This wipes out the buffer, make sure that doesn't cause trouble.
+  Xclose
+endfunction
+
+function Test_helpgrep()
+  call s:test_xhelpgrep('c')
+  call s:test_xhelpgrep('l')
+endfunc
+
+func Test_errortitle()
+  augroup QfBufWinEnter
+    au!
+    au BufWinEnter * :let g:a=get(w:, 'quickfix_title', 'NONE')
+  augroup END
+  copen
+  let a=[{'lnum': 308, 'bufnr': bufnr(''), 'col': 58, 'valid': 1, 'vcol': 0, 'nr': 0, 'type': '', 'pattern': '', 'text': '    au BufWinEnter * :let g:a=get(w:, ''quickfix_title'', ''NONE'')'}]
+  call setqflist(a)
+  call assert_equal(':setqflist()', g:a)
+  augroup QfBufWinEnter
+    au!
+  augroup END
+  augroup! QfBufWinEnter
+endfunc
+
+func Test_vimgreptitle()
+  augroup QfBufWinEnter
+    au!
+    au BufWinEnter * :let g:a=get(w:, 'quickfix_title', 'NONE')
+  augroup END
+  try
+    vimgrep /pattern/j file
+  catch /E480/
+  endtry
+  copen
+  call assert_equal(':    vimgrep /pattern/j file', g:a)
+  augroup QfBufWinEnter
+    au!
+  augroup END
+  augroup! QfBufWinEnter
+endfunc
+
+function XqfTitleTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  Xgetexpr ['file:1:1:message']
+  let l = g:Xgetlist()
+  if a:cchar == 'c'
+    call setqflist(l, 'r')
+  else
+    call setloclist(0, l, 'r')
+  endif
+
+  Xopen
+  if a:cchar == 'c'
+    let title = ':setqflist()'
+  else
+    let title = ':setloclist()'
+  endif
+  call assert_equal(title, w:quickfix_title)
+  Xclose
+endfunction
+
+" Tests for quickfix window's title
+function Test_qf_title()
+  call XqfTitleTests('c')
+  call XqfTitleTests('l')
+endfunction
+
+" Tests for 'errorformat'
+function Test_efm()
+  let save_efm = &efm
+  set efm=%EEEE%m,%WWWW%m,%+CCCC%.%#,%-GGGG%.%#
+  cgetexpr ['WWWW', 'EEEE', 'CCCC']
+  let l = strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+  call assert_equal("[['W', 1], ['E^@CCCC', 1]]", l)
+  cgetexpr ['WWWW', 'GGGG', 'EEEE', 'CCCC']
+  let l = strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+  call assert_equal("[['W', 1], ['E^@CCCC', 1]]", l)
+  cgetexpr ['WWWW', 'GGGG', 'ZZZZ', 'EEEE', 'CCCC', 'YYYY']
+  let l = strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+  call assert_equal("[['W', 1], ['ZZZZ', 0], ['E^@CCCC', 1], ['YYYY', 0]]", l)
+  let &efm = save_efm
+endfunction
+
+" This will test for problems in quickfix:
+" A. incorrectly copying location lists which caused the location list to show
+"    a different name than the file that was actually being displayed.
+" B. not reusing the window for which the location list window is opened but
+"    instead creating new windows.
+" C. make sure that the location list window is not reused instead of the
+"    window it belongs to.
+"
+" Set up the test environment:
+function! ReadTestProtocol(name)
+  let base = substitute(a:name, '\v^test://(.*)%(\.[^.]+)?', '\1', '')
+  let word = substitute(base, '\v(.*)\..*', '\1', '')
+
+  setl modifiable
+  setl noreadonly
+  setl noswapfile
+  setl bufhidden=delete
+  %del _
+  " For problem 2:
+  " 'buftype' has to be set to reproduce the constant opening of new windows
+  setl buftype=nofile
+
+  call setline(1, word)
+
+  setl nomodified
+  setl nomodifiable
+  setl readonly
+  exe 'doautocmd BufRead ' . substitute(a:name, '\v^test://(.*)', '\1', '')
+endfunction
+
+function Test_locationlist()
+    enew
+
+    augroup testgroup
+      au!
+      autocmd BufReadCmd test://* call ReadTestProtocol(expand("<amatch>"))
+    augroup END
+
+    let words = [ "foo", "bar", "baz", "quux", "shmoo", "spam", "eggs" ]
+
+    let qflist = []
+    for word in words
+      call add(qflist, {'filename': 'test://' . word . '.txt', 'text': 'file ' . word . '.txt', })
+      " NOTE: problem 1:
+      " intentionally not setting 'lnum' so that the quickfix entries are not
+      " valid
+      call setloclist(0, qflist, ' ')
+    endfor
+
+    " Test A
+    lrewind
+    enew
+    lopen
+    lnext
+    lnext
+    lnext
+    lnext
+    vert split
+    wincmd L
+    lopen
+    wincmd p
+    lnext
+    let fileName = expand("%")
+    wincmd p
+    let locationListFileName = substitute(getline(line('.')), '\([^|]*\)|.*', '\1', '')
+    let fileName = substitute(fileName, '\\', '/', 'g')
+    let locationListFileName = substitute(locationListFileName, '\\', '/', 'g')
+    call assert_equal("test://bar.txt", fileName)
+    call assert_equal("test://bar.txt", locationListFileName)
+
+    wincmd n | only
+
+    " Test B:
+    lrewind
+    lopen
+    2
+    exe "normal \<CR>"
+    wincmd p
+    3
+    exe "normal \<CR>"
+    wincmd p
+    4
+    exe "normal \<CR>"
+    call assert_equal(2, winnr('$'))
+    wincmd n | only
+
+    " Test C:
+    lrewind
+    lopen
+    " Let's move the location list window to the top to check whether it (the
+    " first window found) will be reused when we try to open new windows:
+    wincmd K
+    2
+    exe "normal \<CR>"
+    wincmd p
+    3
+    exe "normal \<CR>"
+    wincmd p
+    4
+    exe "normal \<CR>"
+    1wincmd w
+    call assert_equal('quickfix', &buftype)
+    2wincmd w
+    let bufferName = expand("%")
+    let bufferName = substitute(bufferName, '\\', '/', 'g')
+    call assert_equal('test://quux.txt', bufferName)
+
+    wincmd n | only
+
+    augroup! testgroup
+endfunction
+
+function Test_locationlist_curwin_was_closed()
+    augroup testgroup
+      au!
+      autocmd BufReadCmd test_curwin.txt call R(expand("<amatch>"))
+    augroup END
+
+    function! R(n)
+      quit
+    endfunc
+
+    new
+    let q = []
+    call add(q, {'filename': 'test_curwin.txt' })
+    call setloclist(0, q)
+    call assert_fails('lrewind', 'E924:')
+
+    augroup! testgroup
+endfunction
+
+" More tests for 'errorformat'
+function! Test_efm1()
+    if !has('unix')
+	" The 'errorformat' setting is different on non-Unix systems.
+	" This test works only on Unix-like systems.
+	return
+    endif
+
+    let l = [
+      \ '"Xtestfile", line 4.12: 1506-045 (S) Undeclared identifier fd_set.',
+      \ '"Xtestfile", line 6 col 19; this is an error',
+      \ 'gcc -c -DHAVE_CONFIsing-prototypes -I/usr/X11R6/include  version.c',
+      \ 'Xtestfile:9: parse error before `asd''',
+      \ 'make: *** [vim] Error 1',
+      \ 'in file "Xtestfile" linenr 10: there is an error',
+      \ '',
+      \ '2 returned',
+      \ '"Xtestfile", line 11 col 1; this is an error',
+      \ '"Xtestfile", line 12 col 2; this is another error',
+      \ '"Xtestfile", line 14:10; this is an error in column 10',
+      \ '=Xtestfile=, line 15:10; this is another error, but in vcol 10 this time',
+      \ '"Xtestfile", linenr 16: yet another problem',
+      \ 'Error in "Xtestfile" at line 17:',
+      \ 'x should be a dot',
+      \ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17',
+      \ '            ^',
+      \ 'Error in "Xtestfile" at line 18:',
+      \ 'x should be a dot',
+      \ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18',
+      \ '.............^',
+      \ 'Error in "Xtestfile" at line 19:',
+      \ 'x should be a dot',
+      \ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19',
+      \ '--------------^',
+      \ 'Error in "Xtestfile" at line 20:',
+      \ 'x should be a dot',
+      \ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20',
+      \ '	       ^',
+      \ '',
+      \ 'Does anyone know what is the problem and how to correction it?',
+      \ '"Xtestfile", line 21 col 9: What is the title of the quickfix window?',
+      \ '"Xtestfile", line 22 col 9: What is the title of the quickfix window?'
+      \ ]
+
+    call writefile(l, 'Xerrorfile1')
+    call writefile(l[:-2], 'Xerrorfile2')
+
+    let m = [
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  2',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  3',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  4',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  5',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  6',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  7',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  8',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line  9',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 10',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 11',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 12',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 13',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 14',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 15',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 16',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 17',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 18',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 19',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 20',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 21',
+	\ '	xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx    line 22'
+	\ ]
+    call writefile(m, 'Xtestfile')
+
+    let save_efm = &efm
+    set efm+==%f=\\,\ line\ %l%*\\D%v%*[^\ ]\ %m
+    set efm^=%AError\ in\ \"%f\"\ at\ line\ %l:,%Z%p^,%C%m
+
+    exe 'cf Xerrorfile2'
+    clast
+    copen
+    call assert_equal(':cf Xerrorfile2', w:quickfix_title)
+    wincmd p
+
+    exe 'cf Xerrorfile1'
+    call assert_equal([4, 12], [line('.'), col('.')])
+    cn
+    call assert_equal([6, 19], [line('.'), col('.')])
+    cn
+    call assert_equal([9, 2], [line('.'), col('.')])
+    cn
+    call assert_equal([10, 2], [line('.'), col('.')])
+    cn
+    call assert_equal([11, 1], [line('.'), col('.')])
+    cn
+    call assert_equal([12, 2], [line('.'), col('.')])
+    cn
+    call assert_equal([14, 10], [line('.'), col('.')])
+    cn
+    call assert_equal([15, 3, 10], [line('.'), col('.'), virtcol('.')])
+    cn
+    call assert_equal([16, 2], [line('.'), col('.')])
+    cn
+    call assert_equal([17, 6], [line('.'), col('.')])
+    cn
+    call assert_equal([18, 7], [line('.'), col('.')])
+    cn
+    call assert_equal([19, 8], [line('.'), col('.')])
+    cn
+    call assert_equal([20, 9], [line('.'), col('.')])
+    clast
+    cprev
+    cprev
+    wincmd w
+    call assert_equal(':cf Xerrorfile1', w:quickfix_title)
+    wincmd p
+
+    let &efm = save_efm
+    call delete('Xerrorfile1')
+    call delete('Xerrorfile2')
+    call delete('Xtestfile')
+endfunction
+
+" Test for quickfix directory stack support
+function! s:dir_stack_tests(cchar)
+  call s:setup_commands(a:cchar)
+
+  let save_efm=&efm
+  set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
+
+  let lines = ["Entering dir 'dir1/a'",
+		\ 'habits2.txt:1:Nine Healthy Habits',
+		\ "Entering dir 'b'",
+		\ 'habits3.txt:2:0 Hours of television',
+		\ 'habits2.txt:7:5 Small meals',
+		\ "Entering dir 'dir1/c'",
+		\ 'habits4.txt:3:1 Hour of exercise',
+		\ "Leaving dir 'dir1/c'",
+		\ "Leaving dir 'dir1/a'",
+		\ 'habits1.txt:4:2 Liters of water',
+		\ "Entering dir 'dir2'",
+		\ 'habits5.txt:5:3 Cups of hot green tea',
+		\ "Leaving dir 'dir2'"
+		\]
+
+  Xexpr ""
+  for l in lines
+      Xaddexpr l
+  endfor
+
+  let qf = g:Xgetlist()
+
+  call assert_equal('dir1/a/habits2.txt', bufname(qf[1].bufnr))
+  call assert_equal(1, qf[1].lnum)
+  call assert_equal('dir1/a/b/habits3.txt', bufname(qf[3].bufnr))
+  call assert_equal(2, qf[3].lnum)
+  call assert_equal('dir1/a/habits2.txt', bufname(qf[4].bufnr))
+  call assert_equal(7, qf[4].lnum)
+  call assert_equal('dir1/c/habits4.txt', bufname(qf[6].bufnr))
+  call assert_equal(3, qf[6].lnum)
+  call assert_equal('habits1.txt', bufname(qf[9].bufnr))
+  call assert_equal(4, qf[9].lnum)
+  call assert_equal('dir2/habits5.txt', bufname(qf[11].bufnr))
+  call assert_equal(5, qf[11].lnum)
+
+  let &efm=save_efm
+endfunction
+
+" Tests for %D and %X errorformat options
+function! Test_efm_dirstack()
+  " Create the directory stack and files
+  call mkdir('dir1')
+  call mkdir('dir1/a')
+  call mkdir('dir1/a/b')
+  call mkdir('dir1/c')
+  call mkdir('dir2')
+
+  let lines = ["Nine Healthy Habits",
+		\ "0 Hours of television",
+		\ "1 Hour of exercise",
+		\ "2 Liters of water",
+		\ "3 Cups of hot green tea",
+		\ "4 Short mental breaks",
+		\ "5 Small meals",
+		\ "6 AM wake up time",
+		\ "7 Minutes of laughter",
+		\ "8 Hours of sleep (at least)",
+		\ "9 PM end of the day and off to bed"
+		\ ]
+  call writefile(lines, 'habits1.txt')
+  call writefile(lines, 'dir1/a/habits2.txt')
+  call writefile(lines, 'dir1/a/b/habits3.txt')
+  call writefile(lines, 'dir1/c/habits4.txt')
+  call writefile(lines, 'dir2/habits5.txt')
+
+  call s:dir_stack_tests('c')
+  call s:dir_stack_tests('l')
+
+  call delete('dir1', 'rf')
+  call delete('dir2', 'rf')
+  call delete('habits1.txt')
+endfunction
+
+" Tests for invalid error format specifies
+function Xinvalid_efm_Tests(cchar)
+  call s:setup_commands(a:cchar)
+
+  let save_efm = &efm
+
+  set efm=%f:%l:%m,%f:%f:%l:%m
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E372:')
+
+  set efm=%f:%l:%m,%f:%l:%r:%m
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E373:')
+
+  set efm=%f:%l:%m,%O:%f:%l:%m
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E373:')
+
+  set efm=%f:%l:%m,%f:%l:%*[^a-z
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E374:')
+
+  set efm=%f:%l:%m,%f:%l:%*c
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E375:')
+
+  set efm=%f:%l:%m,%L%M%N
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E376:')
+
+  set efm=%f:%l:%m,%f:%l:%m:%R
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E377:')
+
+  set efm=
+  call assert_fails('Xexpr "abc.txt:1:Hello world"', 'E378:')
+
+  set efm=%DEntering\ dir\ abc,%f:%l:%m
+  call assert_fails('Xexpr ["Entering dir abc", "abc.txt:1:Hello world"]', 'E379:')
+
+  let &efm = save_efm
+endfunction
+
+function Test_invalid_efm()
+  call Xinvalid_efm_Tests('c')
+  call Xinvalid_efm_Tests('l')
+endfunction
+
+" TODO:
+" Add tests for the following formats in 'errorformat'
+"	%r  %O
+function! Test_efm2()
+  let save_efm = &efm
+
+  " Test for %s format in efm
+  set efm=%f:%s
+  cexpr 'Xtestfile:Line search text'
+  let l = getqflist()
+  call assert_equal(l[0].pattern, '^\VLine search text\$')
+  call assert_equal(l[0].lnum, 0)
+
+  " Test for %P, %Q and %t format specifiers
+  let lines=["[Xtestfile1]",
+	      \ "(1,17)  error: ';' missing",
+	      \ "(21,2)  warning: variable 'z' not defined",
+	      \ "(67,3)  error: end of file found before string ended",
+	      \ "",
+	      \ "[Xtestfile2]",
+	      \ "",
+	      \ "[Xtestfile3]",
+	      \ "NEW compiler v1.1",
+	      \ "(2,2)   warning: variable 'x' not defined",
+	      \ "(67,3)  warning: 's' already defined"
+	      \]
+  set efm=%+P[%f],(%l\\,%c)%*[\ ]%t%*[^:]:\ %m,%-Q
+  cexpr ""
+  for l in lines
+      caddexpr l
+  endfor
+  let l = getqflist()
+  call assert_equal(9, len(l))
+  call assert_equal(21, l[2].lnum)
+  call assert_equal(2, l[2].col)
+  call assert_equal('w', l[2].type)
+  call assert_equal('e', l[3].type)
+
+  " Tests for %E, %C and %Z format specifiers
+  let lines = ["Error 275",
+	      \ "line 42",
+	      \ "column 3",
+	      \ "' ' expected after '--'"
+	      \]
+  set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m
+  cgetexpr lines
+  let l = getqflist()
+  call assert_equal(275, l[0].nr)
+  call assert_equal(42, l[0].lnum)
+  call assert_equal(3, l[0].col)
+  call assert_equal('E', l[0].type)
+  call assert_equal("\n' ' expected after '--'", l[0].text)
+
+  " Test for %>
+  let lines = ["Error in line 147 of foo.c:",
+	      \"unknown variable 'i'"
+	      \]
+  set efm=unknown\ variable\ %m,%E%>Error\ in\ line\ %l\ of\ %f:,%Z%m
+  cgetexpr lines
+  let l = getqflist()
+  call assert_equal(147, l[0].lnum)
+  call assert_equal('E', l[0].type)
+  call assert_equal("\nunknown variable 'i'", l[0].text)
+
+  let &efm = save_efm
+endfunction
+
+function XquickfixChangedByAutocmd(cchar)
+  call s:setup_commands(a:cchar)
+  if a:cchar == 'c'
+    let ErrorNr = 'E925'
+    function! ReadFunc()
+      colder
+      cgetexpr []
+    endfunc
+  else
+    let ErrorNr = 'E926'
+    function! ReadFunc()
+      lolder
+      lgetexpr []
+    endfunc
+  endif
+
+  augroup testgroup
+    au!
+    autocmd BufReadCmd test_changed.txt call ReadFunc()
+  augroup END
+
+  new | only
+  let words = [ "a", "b" ]
+  let qflist = []
+  for word in words
+    call add(qflist, {'filename': 'test_changed.txt'})
+    call g:Xsetlist(qflist, ' ')
+  endfor
+  call assert_fails('Xrewind', ErrorNr . ':')
+
+  augroup! testgroup
+endfunc
+
+function Test_quickfix_was_changed_by_autocmd()
+  call XquickfixChangedByAutocmd('c')
+  call XquickfixChangedByAutocmd('l')
+endfunction
+
+func Test_caddbuffer_to_empty()
+  helpgr quickfix
+  call setqflist([], 'r')
+  cad
+  try
+    cn
+  catch
+    " number of matches is unknown
+    call assert_true(v:exception =~ 'E553:')
+  endtry
+  quit!
+endfunc
+
+func Test_cgetexpr_works()
+  " this must not crash Vim
+  cgetexpr [$x]
+  lgetexpr [$x]
+endfunc
+
+" Tests for the setqflist() and setloclist() functions
+function SetXlistTests(cchar, bnum)
+  call s:setup_commands(a:cchar)
+
+  call g:Xsetlist([{'bufnr': a:bnum, 'lnum': 1},
+	      \  {'bufnr': a:bnum, 'lnum': 2}])
+  let l = g:Xgetlist()
+  call assert_equal(2, len(l))
+  call assert_equal(2, l[1].lnum)
+
+  Xnext
+  call g:Xsetlist([{'bufnr': a:bnum, 'lnum': 3}], 'a')
+  let l = g:Xgetlist()
+  call assert_equal(3, len(l))
+  Xnext
+  call assert_equal(3, line('.'))
+
+  " Appending entries to the list should not change the cursor position
+  " in the quickfix window
+  Xwindow
+  1
+  call g:Xsetlist([{'bufnr': a:bnum, 'lnum': 4},
+	      \  {'bufnr': a:bnum, 'lnum': 5}], 'a')
+  call assert_equal(1, line('.'))
+  close
+
+  call g:Xsetlist([{'bufnr': a:bnum, 'lnum': 3},
+	      \  {'bufnr': a:bnum, 'lnum': 4},
+	      \  {'bufnr': a:bnum, 'lnum': 5}], 'r')
+  let l = g:Xgetlist()
+  call assert_equal(3, len(l))
+  call assert_equal(5, l[2].lnum)
+
+  call g:Xsetlist([])
+  let l = g:Xgetlist()
+  call assert_equal(0, len(l))
+endfunction
+
+function Test_setqflist()
+  new Xtestfile | only
+  let bnum = bufnr('%')
+  call setline(1, range(1,5))
+
+  call SetXlistTests('c', bnum)
+  call SetXlistTests('l', bnum)
+
+  enew!
+  call delete('Xtestfile')
+endfunction
+
+function Xlist_empty_middle(cchar)
+  call s:setup_commands(a:cchar)
+
+  " create three quickfix lists
+  Xvimgrep Test_ test_quickfix.vim
+  let testlen = len(g:Xgetlist())
+  call assert_true(testlen > 0)
+  Xvimgrep empty test_quickfix.vim
+  call assert_true(len(g:Xgetlist()) > 0)
+  Xvimgrep matches test_quickfix.vim
+  let matchlen = len(g:Xgetlist())
+  call assert_true(matchlen > 0)
+  Xolder
+  " make the middle list empty
+  call g:Xsetlist([], 'r')
+  call assert_true(len(g:Xgetlist()) == 0)
+  Xolder
+  call assert_equal(testlen, len(g:Xgetlist()))
+  Xnewer
+  Xnewer
+  call assert_equal(matchlen, len(g:Xgetlist()))
+endfunc
+
+function Test_setqflist_empty_middle()
+  call Xlist_empty_middle('c')
+  call Xlist_empty_middle('l')
+endfunction
+
+function Xlist_empty_older(cchar)
+  call s:setup_commands(a:cchar)
+
+  " create three quickfix lists
+  Xvimgrep one test_quickfix.vim
+  let onelen = len(g:Xgetlist())
+  call assert_true(onelen > 0)
+  Xvimgrep two test_quickfix.vim
+  let twolen = len(g:Xgetlist())
+  call assert_true(twolen > 0)
+  Xvimgrep three test_quickfix.vim
+  let threelen = len(g:Xgetlist())
+  call assert_true(threelen > 0)
+  Xolder 2
+  " make the first list empty, check the others didn't change
+  call g:Xsetlist([], 'r')
+  call assert_true(len(g:Xgetlist()) == 0)
+  Xnewer
+  call assert_equal(twolen, len(g:Xgetlist()))
+  Xnewer
+  call assert_equal(threelen, len(g:Xgetlist()))
+endfunction
+
+function Test_setqflist_empty_older()
+  call Xlist_empty_older('c')
+  call Xlist_empty_older('l')
+endfunction
+
+function! XquickfixSetListWithAct(cchar)
+  call s:setup_commands(a:cchar)
+
+  let list1 = [{'filename': 'fnameA', 'text': 'A'},
+          \    {'filename': 'fnameB', 'text': 'B'}]
+  let list2 = [{'filename': 'fnameC', 'text': 'C'},
+          \    {'filename': 'fnameD', 'text': 'D'},
+          \    {'filename': 'fnameE', 'text': 'E'}]
+
+  " {action} is unspecified.  Same as specifing ' '.
+  new | only
+  silent! Xnewer 99
+  call g:Xsetlist(list1)
+  call g:Xsetlist(list2)
+  let li = g:Xgetlist()
+  call assert_equal(3, len(li))
+  call assert_equal('C', li[0]['text'])
+  call assert_equal('D', li[1]['text'])
+  call assert_equal('E', li[2]['text'])
+  silent! Xolder
+  let li = g:Xgetlist()
+  call assert_equal(2, len(li))
+  call assert_equal('A', li[0]['text'])
+  call assert_equal('B', li[1]['text'])
+
+  " {action} is specified ' '.
+  new | only
+  silent! Xnewer 99
+  call g:Xsetlist(list1)
+  call g:Xsetlist(list2, ' ')
+  let li = g:Xgetlist()
+  call assert_equal(3, len(li))
+  call assert_equal('C', li[0]['text'])
+  call assert_equal('D', li[1]['text'])
+  call assert_equal('E', li[2]['text'])
+  silent! Xolder
+  let li = g:Xgetlist()
+  call assert_equal(2, len(li))
+  call assert_equal('A', li[0]['text'])
+  call assert_equal('B', li[1]['text'])
+
+  " {action} is specified 'a'.
+  new | only
+  silent! Xnewer 99
+  call g:Xsetlist(list1)
+  call g:Xsetlist(list2, 'a')
+  let li = g:Xgetlist()
+  call assert_equal(5, len(li))
+  call assert_equal('A', li[0]['text'])
+  call assert_equal('B', li[1]['text'])
+  call assert_equal('C', li[2]['text'])
+  call assert_equal('D', li[3]['text'])
+  call assert_equal('E', li[4]['text'])
+
+  " {action} is specified 'r'.
+  new | only
+  silent! Xnewer 99
+  call g:Xsetlist(list1)
+  call g:Xsetlist(list2, 'r')
+  let li = g:Xgetlist()
+  call assert_equal(3, len(li))
+  call assert_equal('C', li[0]['text'])
+  call assert_equal('D', li[1]['text'])
+  call assert_equal('E', li[2]['text'])
+
+  " Test for wrong value.
+  new | only
+  call assert_fails("call g:Xsetlist(0)", 'E714:')
+  call assert_fails("call g:Xsetlist(list1, '')", 'E927:')
+  call assert_fails("call g:Xsetlist(list1, 'aa')", 'E927:')
+  call assert_fails("call g:Xsetlist(list1, ' a')", 'E927:')
+  call assert_fails("call g:Xsetlist(list1, 0)", 'E928:')
+endfunc
+
+function Test_quickfix_set_list_with_act()
+  call XquickfixSetListWithAct('c')
+  call XquickfixSetListWithAct('l')
+endfunction
+
+function XLongLinesTests(cchar)
+  let l = g:Xgetlist()
+
+  call assert_equal(4, len(l))
+  call assert_equal(1, l[0].lnum)
+  call assert_equal(1, l[0].col)
+  call assert_equal(1975, len(l[0].text))
+  call assert_equal(2, l[1].lnum)
+  call assert_equal(1, l[1].col)
+  call assert_equal(4070, len(l[1].text))
+  call assert_equal(3, l[2].lnum)
+  call assert_equal(1, l[2].col)
+  call assert_equal(4070, len(l[2].text))
+  call assert_equal(4, l[3].lnum)
+  call assert_equal(1, l[3].col)
+  call assert_equal(10, len(l[3].text))
+
+  call g:Xsetlist([], 'r')
+endfunction
+
+function s:long_lines_tests(cchar)
+  call s:setup_commands(a:cchar)
+
+  let testfile = 'samples/quickfix.txt'
+
+  " file
+  exe 'Xgetfile' testfile
+  call XLongLinesTests(a:cchar)
+
+  " list
+  Xexpr readfile(testfile)
+  call XLongLinesTests(a:cchar)
+
+  " string
+  Xexpr join(readfile(testfile), "\n")
+  call XLongLinesTests(a:cchar)
+
+  " buffer
+  exe 'edit' testfile
+  exe 'Xbuffer' bufnr('%')
+  call XLongLinesTests(a:cchar)
+endfunction
+
+function Test_long_lines()
+  call s:long_lines_tests('c')
+  call s:long_lines_tests('l')
+endfunction
+
+function! s:create_test_file(filename)
+  let l = []
+  for i in range(1, 20)
+      call add(l, 'Line' . i)
+  endfor
+  call writefile(l, a:filename)
+endfunction
+
+function! Test_switchbuf()
+  call s:create_test_file('Xqftestfile1')
+  call s:create_test_file('Xqftestfile2')
+  call s:create_test_file('Xqftestfile3')
+
+  new | only
+  edit Xqftestfile1
+  let file1_winid = win_getid()
+  new Xqftestfile2
+  let file2_winid = win_getid()
+  cgetexpr ['Xqftestfile1:5:Line5',
+		\ 'Xqftestfile1:6:Line6',
+		\ 'Xqftestfile2:10:Line10',
+		\ 'Xqftestfile2:11:Line11',
+		\ 'Xqftestfile3:15:Line15',
+		\ 'Xqftestfile3:16:Line16']
+
+  new
+  let winid = win_getid()
+  cfirst | cnext
+  call assert_equal(winid, win_getid())
+  cnext | cnext
+  call assert_equal(winid, win_getid())
+  cnext | cnext
+  call assert_equal(winid, win_getid())
+  enew
+
+  set switchbuf=useopen
+  cfirst | cnext
+  call assert_equal(file1_winid, win_getid())
+  cnext | cnext
+  call assert_equal(file2_winid, win_getid())
+  cnext | cnext
+  call assert_equal(file2_winid, win_getid())
+
+  enew | only
+  set switchbuf=usetab
+  tabedit Xqftestfile1
+  tabedit Xqftestfile2
+  tabfirst
+  cfirst | cnext
+  call assert_equal(2, tabpagenr())
+  cnext | cnext
+  call assert_equal(3, tabpagenr())
+  cnext | cnext
+  call assert_equal(3, tabpagenr())
+  tabfirst | tabonly | enew
+
+  set switchbuf=split
+  cfirst | cnext
+  call assert_equal(1, winnr('$'))
+  cnext | cnext
+  call assert_equal(2, winnr('$'))
+  cnext | cnext
+  call assert_equal(3, winnr('$'))
+  enew | only
+
+  set switchbuf=newtab
+  cfirst | cnext
+  call assert_equal(1, tabpagenr('$'))
+  cnext | cnext
+  call assert_equal(2, tabpagenr('$'))
+  cnext | cnext
+  call assert_equal(3, tabpagenr('$'))
+  tabfirst | enew | tabonly | only
+
+  set switchbuf=
+  edit Xqftestfile1
+  let file1_winid = win_getid()
+  new Xqftestfile2
+  let file2_winid = win_getid()
+  copen
+  exe "normal 1G\<CR>"
+  call assert_equal(file1_winid, win_getid())
+  copen
+  exe "normal 3G\<CR>"
+  call assert_equal(file2_winid, win_getid())
+  copen | only
+  exe "normal 5G\<CR>"
+  call assert_equal(2, winnr('$'))
+  call assert_equal(1, bufwinnr('Xqftestfile3'))
+
+  enew | only
+
+  call delete('Xqftestfile1')
+  call delete('Xqftestfile2')
+  call delete('Xqftestfile3')
+endfunction
+
+function! Xadjust_qflnum(cchar)
+  call s:setup_commands(a:cchar)
+
+  enew | only
+
+  let fname = 'Xqftestfile' . a:cchar
+  call s:create_test_file(fname)
+  exe 'edit ' . fname
+
+  Xgetexpr [fname . ':5:Line5',
+	      \ fname . ':10:Line10',
+	      \ fname . ':15:Line15',
+	      \ fname . ':20:Line20']
+
+  6,14delete
+  call append(6, ['Buffer', 'Window'])
+
+  let l = g:Xgetlist()
+
+  call assert_equal(5, l[0].lnum)
+  call assert_equal(6, l[2].lnum)
+  call assert_equal(13, l[3].lnum)
+
+  enew!
+  call delete(fname)
+endfunction
+
+function! Test_adjust_lnum()
+  call setloclist(0, [])
+  call Xadjust_qflnum('c')
+  call setqflist([])
+  call Xadjust_qflnum('l')
+endfunction
+
+" Tests for the :grep/:lgrep and :grepadd/:lgrepadd commands
+function! s:test_xgrep(cchar)
+  call s:setup_commands(a:cchar)
+
+  " The following lines are used for the grep test. Don't remove.
+  " Grep_Test_Text: Match 1
+  " Grep_Test_Text: Match 2
+  " GrepAdd_Test_Text: Match 1
+  " GrepAdd_Test_Text: Match 2
+  enew! | only
+  set makeef&vim
+  silent Xgrep Grep_Test_Text: test_quickfix.vim
+  call assert_true(len(g:Xgetlist()) == 3)
+  Xopen
+  call assert_true(w:quickfix_title =~ '^:grep')
+  Xclose
+  enew
+  set makeef=Temp_File_##
+  silent Xgrepadd GrepAdd_Test_Text: test_quickfix.vim
+  call assert_true(len(g:Xgetlist()) == 6)
+endfunction
+
+function! Test_grep()
+  if !has('unix')
+    " The grepprg may not be set on non-Unix systems
+    return
+  endif
+
+  call s:test_xgrep('c')
+  call s:test_xgrep('l')
+endfunction
+
+function! Test_two_windows()
+  " Use one 'errorformat' for two windows.  Add an expression to each of them,
+  " make sure they each keep their own state.
+  set efm=%DEntering\ dir\ '%f',%f:%l:%m,%XLeaving\ dir\ '%f'
+  call mkdir('Xone/a', 'p')
+  call mkdir('Xtwo/a', 'p')
+  let lines = ['1', '2', 'one one one', '4', 'two two two', '6', '7']
+  call writefile(lines, 'Xone/a/one.txt')
+  call writefile(lines, 'Xtwo/a/two.txt')
+
+  new one
+  let one_id = win_getid()
+  lexpr ""
+  new two
+  let two_id = win_getid()
+  lexpr ""
+
+  laddexpr "Entering dir 'Xtwo/a'"
+  call win_gotoid(one_id)
+  laddexpr "Entering dir 'Xone/a'"
+  call win_gotoid(two_id)
+  laddexpr 'two.txt:5:two two two'
+  call win_gotoid(one_id)
+  laddexpr 'one.txt:3:one one one'
+
+  let loc_one = getloclist(one_id)
+echo string(loc_one)
+  call assert_equal('Xone/a/one.txt', bufname(loc_one[1].bufnr))
+  call assert_equal(3, loc_one[1].lnum)
+
+  let loc_two = getloclist(two_id)
+echo string(loc_two)
+  call assert_equal('Xtwo/a/two.txt', bufname(loc_two[1].bufnr))
+  call assert_equal(5, loc_two[1].lnum)
+
+  call win_gotoid(one_id)
+  bwipe!
+  call win_gotoid(two_id)
+  bwipe!
+  call delete('Xone', 'rf')
+  call delete('Xtwo', 'rf')
+endfunc
+
+function XbottomTests(cchar)
+  call s:setup_commands(a:cchar)
+
+  call g:Xsetlist([{'filename': 'foo', 'lnum': 42}]) 
+  Xopen
+  let wid = win_getid()
+  call assert_equal(1, line('.'))
+  wincmd w
+  call g:Xsetlist([{'filename': 'var', 'lnum': 24}], 'a') 
+  Xbottom
+  call win_gotoid(wid)
+  call assert_equal(2, line('.'))
+  Xclose
+endfunc
+
+" Tests for the :cbottom and :lbottom commands
+function Test_cbottom()
+  call XbottomTests('c')
+  call XbottomTests('l')
+endfunction
+
+function HistoryTest(cchar)
+  call s:setup_commands(a:cchar)
+
+  call assert_fails(a:cchar . 'older 99', 'E380:')
+  " clear all lists after the first one, then replace the first one.
+  call g:Xsetlist([])
+  Xolder
+  let entry = {'filename': 'foo', 'lnum': 42}
+  call g:Xsetlist([entry], 'r')
+  call g:Xsetlist([entry, entry])
+  call g:Xsetlist([entry, entry, entry])
+  let res = split(execute(a:cchar . 'hist'), "\n")
+  call assert_equal(3, len(res))
+  let common = 'errors     :set' . (a:cchar == 'c' ? 'qf' : 'loc') . 'list()'
+  call assert_equal('  error list 1 of 3; 1 ' . common, res[0])
+  call assert_equal('  error list 2 of 3; 2 ' . common, res[1])
+  call assert_equal('> error list 3 of 3; 3 ' . common, res[2])
+endfunc
+
+func Test_history()
+  call HistoryTest('c')
+  call HistoryTest('l')
+endfunc
+
+func Test_duplicate_buf()
+  " make sure we can get the highest buffer number
+  edit DoesNotExist
+  edit DoesNotExist2
+  let last_buffer = bufnr("$")
+
+  " make sure only one buffer is created
+  call writefile(['this one', 'that one'], 'Xgrepthis')
+  vimgrep one Xgrepthis
+  vimgrep one Xgrepthis
+  call assert_equal(last_buffer + 1, bufnr("$"))
+
+  call delete('Xgrepthis')
+endfunc
diff --git a/src/nvim/testdir/test_regexp_utf8.vim b/src/nvim/testdir/test_regexp_utf8.vim
new file mode 100644
index 0000000000..ecb03a0f8c
--- /dev/null
+++ b/src/nvim/testdir/test_regexp_utf8.vim
@@ -0,0 +1,40 @@
+" Tests for regexp in utf8 encoding
+
+func s:equivalence_test()
+  let str = "AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ"
+  let groups = split(str)
+  for group1 in groups
+    for c in split(group1, '\zs')
+      " next statement confirms that equivalence class matches every
+      " character in group
+      call assert_match('^[[=' . c . '=]]*$', group1)
+      for group2 in groups
+        if group2 != group1
+          " next statement converts that equivalence class doesn't match
+          " character in any other group
+          call assert_equal(-1, match(group2, '[[=' . c . '=]]'))
+        endif
+      endfor
+    endfor
+  endfor
+endfunc
+
+func Test_equivalence_re1()
+  set re=1
+  call s:equivalence_test()
+  set re=0
+endfunc
+
+func Test_equivalence_re2()
+  set re=2
+  call s:equivalence_test()
+  set re=0
+endfunc
+
+func Test_recursive_substitute()
+  new
+  s/^/\=execute("s#^##gn")
+  " check we are now not in the sandbox
+  call setwinvar(1, 'myvar', 1)
+  bwipe!
+endfunc
diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim
new file mode 100644
index 0000000000..75dbd74b34
--- /dev/null
+++ b/src/nvim/testdir/test_signs.vim
@@ -0,0 +1,199 @@
+" Test for signs
+
+if !has('signs')
+  finish
+endif
+
+func Test_sign()
+  new
+  call setline(1, ['a', 'b', 'c', 'd'])
+
+  " Define some signs.
+  " We can specify icons even if not all versions of vim support icons as
+  " icon is ignored when not supported.  "(not supported)" is shown after
+  " the icon name when listing signs.
+  sign define Sign1 text=x
+  try
+    sign define Sign2 text=xy texthl=Title linehl=Error icon=../../pixmaps/stock_vim_find_help.png
+  catch /E255:/
+    " ignore error: E255: Couldn't read in sign data!
+    " This error can happen when running in gui.
+    " Some gui like Motif do not support the png icon format.
+  endtry
+
+  " Test listing signs.
+  let a=execute('sign list')
+  call assert_match("^\nsign Sign1 text=x \nsign Sign2 icon=../../pixmaps/stock_vim_find_help.png .*text=xy linehl=Error texthl=Title$", a)
+
+  let a=execute('sign list Sign1')
+  call assert_equal("\nsign Sign1 text=x ", a)
+
+  " Split the window to the bottom to verify sign jump will stay in the current window
+  " if the buffer is displayed there.
+  let bn = bufnr('%')
+  let wn = winnr()
+  exe 'sign place 41 line=3 name=Sign1 buffer=' . bn 
+  1
+  bot split
+  exe 'sign jump 41 buffer=' . bufnr('%')
+  call assert_equal('c', getline('.'))
+  call assert_equal(3, winnr())
+  call assert_equal(bn, bufnr('%'))
+  call assert_notequal(wn, winnr())
+
+  " Create a new buffer and check that ":sign jump" switches to the old buffer.
+  1
+  new foo
+  call assert_notequal(bn, bufnr('%'))
+  exe 'sign jump 41 buffer=' . bn
+  call assert_equal(bn, bufnr('%'))
+  call assert_equal('c', getline('.'))
+
+  " Redraw to make sure that screen redraw with sign gets exercised,
+  " with and without 'rightleft'.
+  if has('rightleft')
+    set rightleft
+    redraw
+    set norightleft
+  endif
+  redraw
+
+  " Check that we can't change sign.
+  call assert_fails("exe 'sign place 40 name=Sign1 buffer=' . bufnr('%')", 'E885:')
+
+  " Check placed signs
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\nSigns for [NULL]:\n    line=3  id=41  name=Sign1\n", a)
+
+  " Unplace the sign and try jumping to it again should fail.
+  sign unplace 41
+  1
+  call assert_fails("exe 'sign jump 41 buffer=' . bufnr('%')", 'E157:')
+  call assert_equal('a', getline('.'))
+
+  " Unplace sign on current line.
+  exe 'sign place 42 line=4 name=Sign2 buffer=' . bufnr('%')
+  4
+  sign unplace
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\n", a)
+  
+  " Try again to unplace sign on current line, it should fail this time.
+  call assert_fails('sign unplace', 'E159:')
+
+  " Unplace all signs.
+  exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%')
+  sign unplace *
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\n", a)
+
+  " Check :jump with file=...
+  edit foo
+  call setline(1, ['A', 'B', 'C', 'D'])
+
+  try
+    sign define Sign3 text=y texthl=DoesNotExist linehl=DoesNotExist icon=doesnotexist.xpm
+  catch /E255:/
+    " ignore error: E255: it can happens for guis.
+  endtry
+
+  let fn = expand('%:p')
+  exe 'sign place 43 line=2 name=Sign3 file=' . fn
+  edit bar
+  call assert_notequal(fn, expand('%:p'))
+  exe 'sign jump 43 file=' . fn
+  call assert_equal('B', getline('.'))
+
+  " After undefining the sign, we should no longer be able to place it.
+  sign undefine Sign1
+  sign undefine Sign2
+  sign undefine Sign3
+  call assert_fails("exe 'sign place 41 line=3 name=Sign1 buffer=' . bufnr('%')", 'E155:')
+endfunc
+
+" Undefining placed sign is not recommended.
+" Quoting :help sign
+"
+" :sign undefine {name}
+"                Deletes a previously defined sign.  If signs with this {name}
+"                are still placed this will cause trouble.
+func Test_sign_undefine_still_placed()
+  new foobar
+  sign define Sign text=x
+  exe 'sign place 41 line=1 name=Sign buffer=' . bufnr('%')
+  sign undefine Sign
+
+  " Listing placed sign should show that sign is deleted.
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\nSigns for foobar:\n    line=1  id=41  name=[Deleted]\n", a)
+
+  sign unplace 41
+  let a=execute('sign place')
+  call assert_equal("\n--- Signs ---\n", a)
+endfunc
+
+func Test_sign_completion()
+  sign define Sign1 text=x
+  sign define Sign2 text=y
+
+  call feedkeys(":sign \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign define jump list place undefine unplace', @:)
+
+  call feedkeys(":sign define Sign \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign define Sign icon= linehl= text= texthl=', @:)
+
+  call feedkeys(":sign define Sign linehl=Spell\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:)
+
+  call writefile(['foo'], 'XsignOne')
+  call writefile(['bar'], 'XsignTwo')
+  call feedkeys(":sign define Sign icon=Xsig\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign define Sign icon=XsignOne XsignTwo', @:)
+  call delete('XsignOne')
+  call delete('XsignTwo')
+
+  call feedkeys(":sign undefine \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign undefine Sign1 Sign2', @:)
+
+  call feedkeys(":sign place 1 \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign place 1 buffer= file= line= name=', @:)
+
+  call feedkeys(":sign place 1 name=\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign place 1 name=Sign1 Sign2', @:)
+
+  call feedkeys(":sign unplace 1 \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign unplace 1 buffer= file=', @:)
+
+  call feedkeys(":sign list \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign list Sign1 Sign2', @:)
+
+  call feedkeys(":sign jump 1 \<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"sign jump 1 buffer= file=', @:)
+
+  sign undefine Sign1
+  sign undefine Sign2
+endfunc
+
+func Test_sign_invalid_commands()
+  call assert_fails('sign', 'E471:')
+  call assert_fails('sign jump', 'E471:')
+  call assert_fails('sign xxx', 'E160:')
+  call assert_fails('sign define', 'E156:')
+  call assert_fails('sign define Sign1 xxx', 'E475:')
+  call assert_fails('sign undefine', 'E156:')
+  call assert_fails('sign list xxx', 'E155:')
+  call assert_fails('sign place 1 buffer=', 'E158:')
+  call assert_fails('sign define Sign2 text=', 'E239:')
+endfunc
+
+func Test_sign_delete_buffer()
+  new
+  sign define Sign text=x
+  let bufnr = bufnr('%')
+  new
+  exe 'bd ' . bufnr
+  exe 'sign place 61 line=3 name=Sign buffer=' . bufnr
+  call assert_fails('sign jump 61 buffer=' . bufnr, 'E934:')
+  sign unplace 61
+  sign undefine Sign
+endfunc
diff --git a/src/nvim/testdir/test_statusline.vim b/src/nvim/testdir/test_statusline.vim
new file mode 100644
index 0000000000..82898df92d
--- /dev/null
+++ b/src/nvim/testdir/test_statusline.vim
@@ -0,0 +1,39 @@
+function! StatuslineWithCaughtError()
+  let s:func_in_statusline_called = 1
+  try
+    call eval('unknown expression')
+  catch
+  endtry
+  return ''
+endfunction
+
+function! StatuslineWithError()
+  let s:func_in_statusline_called = 1
+  call eval('unknown expression')
+  return ''
+endfunction
+
+function! Test_caught_error_in_statusline()
+  let s:func_in_statusline_called = 0
+  set laststatus=2
+  let statusline = '%{StatuslineWithCaughtError()}'
+  let &statusline = statusline
+  redrawstatus
+  call assert_true(s:func_in_statusline_called)
+  call assert_equal(statusline, &statusline)
+  set statusline=
+endfunction
+
+function! Test_statusline_will_be_disabled_with_error()
+  let s:func_in_statusline_called = 0
+  set laststatus=2
+  let statusline = '%{StatuslineWithError()}'
+  try
+    let &statusline = statusline
+    redrawstatus
+  catch
+  endtry
+  call assert_true(s:func_in_statusline_called)
+  call assert_equal('', &statusline)
+  set statusline=
+endfunction
diff --git a/src/nvim/testdir/test_syn_attr.vim b/src/nvim/testdir/test_syn_attr.vim
new file mode 100644
index 0000000000..64aab3411d
--- /dev/null
+++ b/src/nvim/testdir/test_syn_attr.vim
@@ -0,0 +1,28 @@
+" Test syntax highlighting functions.
+
+func Test_missing_attr()
+  hi Mine cterm=italic
+  call assert_equal('Mine', synIDattr(hlID("Mine"), "name"))
+  call assert_equal('1', synIDattr(hlID("Mine"), "italic", 'cterm'))
+  hi Mine cterm=inverse
+  call assert_equal('1', synIDattr(hlID("Mine"), "inverse", 'cterm'))
+  hi Mine cterm=standout gui=undercurl
+  call assert_equal('1', synIDattr(hlID("Mine"), "standout", 'cterm'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "undercurl", 'gui'))
+  hi Mine cterm=NONE gui=NONE
+  call assert_equal('', synIDattr(hlID("Mine"), "italic", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "inverse", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "standout", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "undercurl", 'gui'))
+
+  if has('gui')
+    let fontname = getfontname()
+    if fontname == ''
+      let fontname = 'something'
+    endif
+    exe "hi Mine guifg=blue guibg=red font='" . fontname . "'"
+    call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui'))
+    call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui'))
+    call assert_equal(fontname, synIDattr(hlID("Mine"), "font", 'gui'))
+  endif
+endfunc
diff --git a/src/nvim/testdir/test_syntax.vim b/src/nvim/testdir/test_syntax.vim
new file mode 100644
index 0000000000..af2cbbfe8e
--- /dev/null
+++ b/src/nvim/testdir/test_syntax.vim
@@ -0,0 +1,78 @@
+" Test for syntax and syntax iskeyword option
+
+func GetSyntaxItem(pat)
+  let c = ''
+  let a = ['a', getreg('a'), getregtype('a')]
+  0
+  redraw!
+  call search(a:pat, 'W')
+  let synid = synID(line('.'), col('.'), 1)
+  while synid == synID(line('.'), col('.'), 1)
+    norm! v"ay
+    " stop at whitespace
+    if @a =~# '\s'
+      break
+    endif
+    let c .= @a
+    norm! l
+  endw
+  call call('setreg', a)
+  0
+  return c
+endfunc
+
+func Test_syn_iskeyword()
+  new
+  call setline(1, [
+	\ 'CREATE TABLE FOOBAR(',
+	\ '    DLTD_BY VARCHAR2(100)',
+	\ ');',
+  	\ ''])
+
+  syntax on
+  set ft=sql
+  syn match SYN /C\k\+\>/
+  hi link SYN ErrorMsg
+  call assert_equal('DLTD_BY', GetSyntaxItem('DLTD'))
+  /\<D\k\+\>/:norm! ygn
+  call assert_equal('DLTD_BY', @0)
+  redir @c
+  syn iskeyword
+  redir END
+  call assert_equal("\nsyntax iskeyword not set", @c)
+
+  syn iskeyword @,48-57,_,192-255
+  redir @c
+  syn iskeyword
+  redir END
+  call assert_equal("\nsyntax iskeyword @,48-57,_,192-255", @c)
+
+  setlocal isk-=_
+  call assert_equal('DLTD_BY', GetSyntaxItem('DLTD'))
+  /\<D\k\+\>/:norm! ygn
+  let b2=@0
+  call assert_equal('DLTD', @0)
+
+  syn iskeyword clear
+  redir @c
+  syn iskeyword
+  redir END
+  call assert_equal("\nsyntax iskeyword not set", @c)
+
+  quit!
+endfunc
+
+func Test_syntax_after_reload()
+  split Xsomefile
+  call setline(1, ['hello', 'there'])
+  w!
+  only!
+  setl filetype=hello
+  au FileType hello let g:gotit = 1
+  call assert_false(exists('g:gotit'))
+  edit other
+  buf Xsomefile
+  call assert_equal('hello', &filetype)
+  call assert_true(exists('g:gotit'))
+  call delete('Xsomefile')
+endfunc
diff --git a/src/nvim/testdir/test_tabline.vim b/src/nvim/testdir/test_tabline.vim
new file mode 100644
index 0000000000..6c7a02d650
--- /dev/null
+++ b/src/nvim/testdir/test_tabline.vim
@@ -0,0 +1,43 @@
+function! TablineWithCaughtError()
+  let s:func_in_tabline_called = 1
+  try
+    call eval('unknown expression')
+  catch
+  endtry
+  return ''
+endfunction
+
+function! TablineWithError()
+  let s:func_in_tabline_called = 1
+  call eval('unknown expression')
+  return ''
+endfunction
+
+function! Test_caught_error_in_tabline()
+  let showtabline_save = &showtabline
+  set showtabline=2
+  let s:func_in_tabline_called = 0
+  let tabline = '%{TablineWithCaughtError()}'
+  let &tabline = tabline
+  redraw!
+  call assert_true(s:func_in_tabline_called)
+  call assert_equal(tabline, &tabline)
+  set tabline=
+  let &showtabline = showtabline_save
+endfunction
+
+function! Test_tabline_will_be_disabled_with_error()
+  let showtabline_save = &showtabline
+  set showtabline=2
+  let s:func_in_tabline_called = 0
+  let tabline = '%{TablineWithError()}'
+  try
+    let &tabline = tabline
+    redraw!
+  catch
+  endtry
+  call assert_true(s:func_in_tabline_called)
+  call assert_equal('', &tabline)
+  set tabline=
+  let &showtabline = showtabline_save
+endfunction
diff --git a/src/nvim/testdir/test_tabpage.vim b/src/nvim/testdir/test_tabpage.vim
new file mode 100644
index 0000000000..7c3039ba24
--- /dev/null
+++ b/src/nvim/testdir/test_tabpage.vim
@@ -0,0 +1,256 @@
+" Tests for tabpage
+
+function Test_tabpage()
+  bw!
+  " Simple test for opening and closing a tab page
+  tabnew
+  call assert_equal(2, tabpagenr())
+  quit
+
+  " Open three tab pages and use ":tabdo"
+  0tabnew
+  1tabnew
+  $tabnew
+  tabdo call append(line('$'), tabpagenr())
+  tabclose! 2
+  tabrewind
+  let line1 = getline('$')
+  undo
+  q
+  tablast
+  let line2 = getline('$')
+  q!
+  call append(line('$'), line1)
+  call append(line('$'), line2)
+  unlet line1 line2
+  call assert_equal(['', '3', '1', '4'], getline(1, '$'))
+  "
+  " Test for settabvar() and gettabvar() functions. Open a new tab page and
+  " set 3 variables to a number, string and a list. Verify that the variables
+  " are correctly set.
+  tabnew
+  tabfirst
+  call settabvar(2, 'val_num', 100)
+  call settabvar(2, 'val_str', 'SetTabVar test')
+  call settabvar(2, 'val_list', ['red', 'blue', 'green'])
+  "
+  call assert_true(gettabvar(2, 'val_num') == 100 && gettabvar(2, 'val_str') == 'SetTabVar test' && gettabvar(2, 'val_list') == ['red', 'blue', 'green'])
+
+  tabnext 2
+  call assert_true(t:val_num == 100 && t:val_str == 'SetTabVar test'  && t:val_list == ['red', 'blue', 'green'])
+  tabclose
+
+  if has('nvim') || has('gui') || has('clientserver')
+    " Test for ":tab drop exist-file" to keep current window.
+    sp test1
+    tab drop test1
+    call assert_true(tabpagenr('$') == 1 && winnr('$') == 2 && winnr() == 1)
+    close
+    "
+    "
+    " Test for ":tab drop new-file" to keep current window of tabpage 1.
+    split
+    tab drop newfile
+    call assert_true(tabpagenr('$') == 2 && tabpagewinnr(1, '$') == 2 && tabpagewinnr(1) == 1)
+    tabclose
+    q
+    "
+    "
+    " Test for ":tab drop multi-opend-file" to keep current tabpage and window.
+    new test1
+    tabnew
+    new test1
+    tab drop test1
+    call assert_true(tabpagenr() == 2 && tabpagewinnr(2, '$') == 2 && tabpagewinnr(2) == 1)
+    tabclose
+    q
+    "
+    "
+    " Test for ":tab drop vertical-split-window" to jump test1 buffer
+    tabedit test1
+    vnew
+    tabfirst
+    tab drop test1
+    call assert_equal([2, 2, 2, 2], [tabpagenr('$'), tabpagenr(), tabpagewinnr(2, '$'), tabpagewinnr(2)])
+    1tabonly
+  endif
+  "
+  "
+  for i in range(9) | tabnew | endfor
+  normal! 1gt
+  call assert_equal(1, tabpagenr())
+  tabmove 5
+  call assert_equal(5, tabpagenr())
+  .tabmove
+  call assert_equal(5, tabpagenr())
+  tabmove -
+  call assert_equal(4, tabpagenr())
+  tabmove +
+  call assert_equal(5, tabpagenr())
+  tabmove -2
+  call assert_equal(3, tabpagenr())
+  tabmove +4
+  call assert_equal(7, tabpagenr())
+  tabmove
+  call assert_equal(10, tabpagenr())
+  tabmove -20
+  call assert_equal(1, tabpagenr())
+  tabmove +20
+  call assert_equal(10, tabpagenr())
+  0tabmove
+  call assert_equal(1, tabpagenr())
+  $tabmove
+  call assert_equal(10, tabpagenr())
+  tabmove 0
+  call assert_equal(1, tabpagenr())
+  tabmove $
+  call assert_equal(10, tabpagenr())
+  3tabmove
+  call assert_equal(4, tabpagenr())
+  7tabmove 5
+  call assert_equal(5, tabpagenr())
+  call assert_fails("tabmove foo", 'E474:')
+endfunc
+
+" Test autocommands
+function Test_tabpage_with_autocmd()
+  if !has('autocmd')
+    return
+  endif
+  tabonly!
+  command -nargs=1 -bar C :call add(s:li, '=== ' . <q-args> . ' ===')|<args>
+  augroup TestTabpageGroup
+    au!
+    autocmd TabEnter * call add(s:li, 'TabEnter')
+    autocmd WinEnter * call add(s:li, 'WinEnter')
+    autocmd BufEnter * call add(s:li, 'BufEnter')
+    autocmd TabLeave * call add(s:li, 'TabLeave')
+    autocmd WinLeave * call add(s:li, 'WinLeave')
+    autocmd BufLeave * call add(s:li, 'BufLeave')
+  augroup END
+
+  let s:li = []
+  let t:a='a'
+  C tab split
+  call assert_equal(['=== tab split ===', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter'], s:li)
+  let s:li = []
+  let t:a='b'
+  C tabnew
+  call assert_equal(['=== tabnew ===', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufLeave', 'BufEnter'], s:li)
+  let t:a='c'
+  let s:li = split(join(map(range(1, tabpagenr('$')), 'gettabvar(v:val, "a")')) , '\s\+')
+  call assert_equal(['a', 'b', 'c'], s:li)
+
+  let s:li = []
+  C call map(range(1, tabpagenr('$')), 'settabvar(v:val, ''a'', v:val*2)')
+  call assert_equal(["=== call map(range(1, tabpagenr('$')), 'settabvar(v:val, ''a'', v:val*2)') ==="], s:li)
+  let s:li = split(join(map(range(1, tabpagenr('$')), 'gettabvar(v:val, "a")')) , '\s\+')
+  call assert_equal(['2', '4', '6'], s:li)
+
+  let s:li = []
+  let w:a='a'
+  C vsplit
+  call assert_equal(['=== vsplit ===', 'WinLeave', 'WinEnter'], s:li)
+  let s:li = []
+  let w:a='a'
+  let tabn=tabpagenr()
+  let winr=range(1, winnr('$'))
+  C tabnext 1
+  call assert_equal(['=== tabnext 1 ===', 'BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufEnter'], s:li)
+  let s:li = split(join(map(copy(winr), 'gettabwinvar('.tabn.', v:val, "a")')), '\s\+')
+  call assert_equal(['a', 'a'], s:li)
+  let s:li = []
+  C call map(copy(winr), 'settabwinvar('.tabn.', v:val, ''a'', v:val*2)')
+  let s:li = split(join(map(copy(winr), 'gettabwinvar('.tabn.', v:val, "a")')), '\s\+')
+  call assert_equal(['2', '4'], s:li)
+
+  augroup TabDestructive
+    autocmd TabEnter * :C tabnext 2 | C tabclose 3
+  augroup END
+  let s:li = []
+  C tabnext 3
+  call assert_equal(['=== tabnext 3 ===', 'BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', '=== tabnext 2 ===', '=== tabclose 3 ==='], s:li)
+  call assert_equal(['2/2'], [tabpagenr().'/'.tabpagenr('$')])
+
+  autocmd! TabDestructive TabEnter
+  let s:li = []
+  C tabnew
+  call assert_equal(['=== tabnew ===', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufLeave', 'BufEnter'], s:li)
+  let s:li = []
+  C tabnext 1
+  call assert_equal(['=== tabnext 1 ===', 'BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', 'BufEnter'], s:li)
+
+  autocmd TabDestructive TabEnter * nested :C tabnext 2 | C tabclose 3
+  let s:li = []
+  C tabnext 3
+  call assert_equal(['=== tabnext 3 ===', 'BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', '=== tabnext 2 ===', 'BufLeave', 'WinLeave', 'TabLeave', 'WinEnter', 'TabEnter', '=== tabnext 2 ===', '=== tabclose 3 ===', 'BufEnter', '=== tabclose 3 ==='], s:li)
+  call assert_equal(['2/2'], [tabpagenr().'/'.tabpagenr('$')])
+
+  delcommand C
+  autocmd! TabDestructive
+  augroup! TabDestructive
+  autocmd! TestTabpageGroup
+  augroup! TestTabpageGroup
+  tabonly!
+  bw!
+endfunction
+
+function Test_tabpage_with_tab_modifier()
+  for n in range(4)
+    tabedit
+  endfor
+
+  function s:check_tab(pre_nr, cmd, post_nr)
+    exec 'tabnext ' . a:pre_nr
+    exec a:cmd
+    call assert_equal(a:post_nr, tabpagenr())
+    call assert_equal('help', &filetype)
+    helpclose
+  endfunc
+
+  call s:check_tab(1, 'tab help', 2)
+  call s:check_tab(1, '3tab help', 4)
+  call s:check_tab(1, '.tab help', 2)
+  call s:check_tab(1, '.+1tab help', 3)
+  call s:check_tab(1, '0tab help', 1)
+  call s:check_tab(2, '+tab help', 4)
+  call s:check_tab(2, '+2tab help', 5)
+  call s:check_tab(4, '-tab help', 4)
+  call s:check_tab(4, '-2tab help', 3)
+  call s:check_tab(3, '$tab help', 6)
+  call assert_fails('99tab help', 'E16:')
+  call assert_fails('+99tab help', 'E16:')
+  call assert_fails('-99tab help', 'E16:')
+
+  delfunction s:check_tab
+  tabonly!
+  bw!
+endfunction
+
+func Test_tabnext_on_buf_unload1()
+  " This once caused a crash
+  new
+  tabedit
+  tabfirst
+  au BufUnload <buffer> tabnext
+  q
+
+  while tabpagenr('$') > 1
+    bwipe!
+  endwhile
+endfunc
+
+func Test_tabnext_on_buf_unload2()
+  " This once caused a crash
+  tabedit
+  autocmd BufUnload <buffer> tabnext
+  file x
+  edit y
+
+  while tabpagenr('$') > 1
+    bwipe!
+  endwhile
+endfunc
+
+
+" vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/testdir/test_tagjump.vim b/src/nvim/testdir/test_tagjump.vim
new file mode 100644
index 0000000000..d8a333f44c
--- /dev/null
+++ b/src/nvim/testdir/test_tagjump.vim
@@ -0,0 +1,9 @@
+" Tests for tagjump (tags and special searches)
+
+" SEGV occurs in older versions.  (At least 7.4.1748 or older)
+func Test_ptag_with_notagstack()
+  set notagstack
+  call assert_fails('ptag does_not_exist_tag_name', 'E426')
+  set tagstack&vim
+endfunc
+" vim: sw=2 et
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
new file mode 100644
index 0000000000..d92cbe6897
--- /dev/null
+++ b/src/nvim/testdir/test_timers.vim
@@ -0,0 +1,55 @@
+" Test for timers
+
+if !has('timers')
+  finish
+endif
+
+func MyHandler(timer)
+  let s:val += 1
+endfunc
+
+func MyHandlerWithLists(lists, timer)
+  let x = string(a:lists)
+endfunc
+
+func Test_oneshot()
+  let s:val = 0
+  let timer = timer_start(50, 'MyHandler')
+  sleep 200m
+  call assert_equal(1, s:val)
+endfunc
+
+func Test_repeat_three()
+  let s:val = 0
+  let timer = timer_start(50, 'MyHandler', {'repeat': 3})
+  sleep 500m
+  call assert_equal(3, s:val)
+endfunc
+
+func Test_repeat_many()
+  let s:val = 0
+  let timer = timer_start(50, 'MyHandler', {'repeat': -1})
+  sleep 200m
+  call timer_stop(timer)
+  call assert_true(s:val > 1)
+  call assert_true(s:val < 5)
+endfunc
+
+func Test_with_partial_callback()
+  let s:val = 0
+  let s:meow = {}
+  function s:meow.bite(...)
+    let s:val += 1
+  endfunction
+
+  call timer_start(50, s:meow.bite)
+  sleep 200m
+  call assert_equal(1, s:val)
+endfunc
+
+func Test_retain_partial()
+  call timer_start(100, function('MyHandlerWithLists', [['a']]))
+  call garbagecollect()
+  sleep 200m
+endfunc
+" vim: ts=2 sw=0 et
diff --git a/src/nvim/testdir/test_unlet.vim b/src/nvim/testdir/test_unlet.vim
new file mode 100644
index 0000000000..f6705997a9
--- /dev/null
+++ b/src/nvim/testdir/test_unlet.vim
@@ -0,0 +1,26 @@
+" Tests for :unlet
+
+func Test_read_only()
+  try
+    " this caused a crash
+    unlet count
+  catch
+    call assert_true(v:exception =~ ':E795:')
+  endtry
+endfunc
+
+func Test_existing()
+  let does_exist = 1
+  call assert_true(exists('does_exist'))
+  unlet does_exist
+  call assert_false(exists('does_exist'))
+endfunc
+
+func Test_not_existing()
+  unlet! does_not_exist
+  try
+    unlet does_not_exist
+  catch
+    call assert_true(v:exception =~ ':E108:')
+  endtry
+endfunc
diff --git a/src/nvim/testdir/test_usercommands.vim b/src/nvim/testdir/test_usercommands.vim
new file mode 100644
index 0000000000..d0864ec64c
--- /dev/null
+++ b/src/nvim/testdir/test_usercommands.vim
@@ -0,0 +1,104 @@
+" Tests for user defined commands
+
+" Test for <mods> in user defined commands
+function Test_cmdmods()
+  let g:mods = ''
+
+  command! -nargs=* MyCmd let g:mods .= '<mods> '
+
+  MyCmd
+  aboveleft MyCmd
+  abo MyCmd
+  belowright MyCmd
+  bel MyCmd
+  botright MyCmd
+  bo MyCmd
+  browse MyCmd
+  bro MyCmd
+  confirm MyCmd
+  conf MyCmd
+  hide MyCmd
+  hid MyCmd
+  keepalt MyCmd
+  keepa MyCmd
+  keepjumps MyCmd
+  keepj MyCmd
+  keepmarks MyCmd
+  kee MyCmd
+  keeppatterns MyCmd
+  keepp MyCmd
+  leftabove MyCmd  " results in :aboveleft
+  lefta MyCmd
+  lockmarks MyCmd
+  loc MyCmd
+  " noautocmd MyCmd
+  noswapfile MyCmd
+  nos MyCmd
+  rightbelow MyCmd " results in :belowright
+  rightb MyCmd
+  " sandbox MyCmd
+  silent MyCmd
+  sil MyCmd
+  tab MyCmd
+  topleft MyCmd
+  to MyCmd
+  " unsilent MyCmd
+  verbose MyCmd
+  verb MyCmd
+  vertical MyCmd
+  vert MyCmd
+
+  aboveleft belowright botright browse confirm hide keepalt keepjumps
+        \ keepmarks keeppatterns lockmarks noswapfile silent tab
+        \ topleft verbose vertical MyCmd
+
+  call assert_equal(' aboveleft aboveleft belowright belowright botright ' .
+        \ 'botright browse browse confirm confirm hide hide ' .
+        \ 'keepalt keepalt keepjumps keepjumps keepmarks keepmarks ' .
+        \ 'keeppatterns keeppatterns aboveleft aboveleft lockmarks lockmarks noswapfile ' .
+        \ 'noswapfile belowright belowright silent silent tab topleft topleft verbose verbose ' .
+        \ 'vertical vertical ' .
+        \ 'aboveleft belowright botright browse confirm hide keepalt keepjumps ' .
+        \ 'keepmarks keeppatterns lockmarks noswapfile silent tab topleft ' .
+        \ 'verbose vertical ', g:mods)
+
+  let g:mods = ''
+  command! -nargs=* MyQCmd let g:mods .= '<q-mods> '
+
+  vertical MyQCmd
+  call assert_equal('"vertical" ', g:mods)
+
+  delcommand MyCmd
+  delcommand MyQCmd
+  unlet g:mods
+endfunction
+
+func Test_Ambiguous()
+  command Doit let g:didit = 'yes'
+  command Dothat let g:didthat = 'also'
+  call assert_fails('Do', 'E464:')
+  Doit
+  call assert_equal('yes', g:didit)
+  Dothat
+  call assert_equal('also', g:didthat)
+  unlet g:didit
+  unlet g:didthat
+
+  delcommand Doit
+  Do
+  call assert_equal('also', g:didthat)
+  delcommand Dothat
+endfunc
+
+func Test_CmdUndefined()
+  call assert_fails('Doit', 'E492:')
+  au CmdUndefined Doit :command Doit let g:didit = 'yes'
+  Doit
+  call assert_equal('yes', g:didit)
+  delcommand Doit
+
+  call assert_fails('Dothat', 'E492:')
+  au CmdUndefined * let g:didnot = 'yes'
+  call assert_fails('Dothat', 'E492:')
+  call assert_equal('yes', g:didnot)
+endfunc
diff --git a/src/nvim/testdir/test_viml.vim b/src/nvim/testdir/test_viml.vim
index 9f0618bd45..a2997b6d4d 100644
--- a/src/nvim/testdir/test_viml.vim
+++ b/src/nvim/testdir/test_viml.vim
@@ -55,16 +55,26 @@ endfunction
 " ExecAsScript - Source a temporary script made from a function.	    {{{2
 "
 " Make a temporary script file from the function a:funcname, ":source" it, and
-" delete it afterwards.
+" delete it afterwards.  However, if an exception is thrown the file may remain,
+" the caller should call DeleteTheScript() afterwards.
+let s:script_name = ''
 function! ExecAsScript(funcname)
     " Make a script from the function passed as argument.
-    let script = MakeScript(a:funcname)
+    let s:script_name = MakeScript(a:funcname)
 
     " Source and delete the script.
-    exec "source" script
-    call delete(script)
+    exec "source" s:script_name
+    call delete(s:script_name)
+    let s:script_name = ''
 endfunction
 
+function! DeleteTheScript()
+    if s:script_name
+	call delete(s:script_name)
+	let s:script_name = ''
+    endif
+endfunc
+
 com! -nargs=1 -bar ExecAsScript call ExecAsScript(<f-args>)
 
 
@@ -143,6 +153,7 @@ func Test_endwhile_script()
   XpathINIT
   ExecAsScript T1_F
   Xpath 'F'
+  call DeleteTheScript()
 
   try
     ExecAsScript T1_G
@@ -152,6 +163,7 @@ func Test_endwhile_script()
     Xpath 'x'
   endtry
   Xpath 'G'
+  call DeleteTheScript()
 
   call assert_equal('abcFhijxG', g:Xpath)
 endfunc
@@ -260,6 +272,7 @@ function Test_finish()
     XpathINIT
     ExecAsScript T4_F
     Xpath '5'
+    call DeleteTheScript()
 
     call assert_equal('ab3e3b2c25', g:Xpath)
 endfunction
@@ -922,6 +935,134 @@ func Test_curlies()
     call assert_equal(77, g:a['t'])
 endfunc
 
+"-------------------------------------------------------------------------------
+" Test 91:  using type().					    {{{1
+"-------------------------------------------------------------------------------
+
+func Test_type()
+    call assert_equal(0, type(0))
+    call assert_equal(1, type(""))
+    call assert_equal(2, type(function("tr")))
+    call assert_equal(2, type(function("tr", [8])))
+    call assert_equal(3, type([]))
+    call assert_equal(4, type({}))
+    call assert_equal(5, type(0.0))
+    call assert_equal(6, type(v:false))
+    call assert_equal(6, type(v:true))
+    call assert_equal(7, type(v:null))
+    call assert_equal(v:t_number, type(0))
+    call assert_equal(v:t_string, type(""))
+    call assert_equal(v:t_func, type(function("tr")))
+    call assert_equal(v:t_list, type([]))
+    call assert_equal(v:t_dict, type({}))
+    call assert_equal(v:t_float, type(0.0))
+    call assert_equal(v:t_bool, type(v:false))
+    call assert_equal(v:t_bool, type(v:true))
+endfunc
+
+"-------------------------------------------------------------------------------
+" Test 92:  skipping code                       {{{1
+"-------------------------------------------------------------------------------
+
+func Test_skip()
+    let Fn = function('Test_type')
+    call assert_false(0 && Fn[1])
+    call assert_false(0 && string(Fn))
+    call assert_false(0 && len(Fn))
+    let l = []
+    call assert_false(0 && l[1])
+    call assert_false(0 && string(l))
+    call assert_false(0 && len(l))
+    let f = 1.0
+    call assert_false(0 && f[1])
+    call assert_false(0 && string(f))
+    call assert_false(0 && len(f))
+    let sp = v:null
+    call assert_false(0 && sp[1])
+    call assert_false(0 && string(sp))
+    call assert_false(0 && len(sp))
+
+endfunc
+
+"-------------------------------------------------------------------------------
+" Test 93:  :echo and string()					    {{{1
+"-------------------------------------------------------------------------------
+
+func Test_echo_and_string()
+    " String
+    let a = 'foo bar'
+    redir => result
+    echo a
+    echo string(a)
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["foo bar",
+		     \ "'foo bar'"], l)
+
+    " Float
+    if has('float')
+	let a = -1.2e0
+	redir => result
+	echo a
+	echo string(a)
+	redir END
+	let l = split(result, "\n")
+	call assert_equal(["-1.2",
+			 \ "-1.2"], l)
+    endif
+
+    " Funcref
+    redir => result
+    echo function('string')
+    echo string(function('string'))
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["string",
+		     \ "function('string')"], l)
+
+    " Empty dictionaries in a list
+    let a = {}
+    redir => result
+    echo [a, a, a]
+    echo string([a, a, a])
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["[{}, {}, {}]",
+		     \ "[{}, {}, {}]"], l)
+
+    " Empty dictionaries in a dictionary
+    let a = {}
+    let b = {"a": a, "b": a}
+    redir => result
+    echo b
+    echo string(b)
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["{'a': {}, 'b': {}}",
+		     \ "{'a': {}, 'b': {}}"], l)
+
+    " Empty lists in a list
+    let a = []
+    redir => result
+    echo [a, a, a]
+    echo string([a, a, a])
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["[[], [], []]",
+		     \ "[[], [], []]"], l)
+
+    " Empty lists in a dictionary
+    let a = []
+    let b = {"a": a, "b": a}
+    redir => result
+    echo b
+    echo string(b)
+    redir END
+    let l = split(result, "\n")
+    call assert_equal(["{'a': [], 'b': []}",
+		     \ "{'a': [], 'b': []}"], l)
+
+endfunc
 
 "-------------------------------------------------------------------------------
 " Modelines								    {{{1
diff --git a/src/nvim/testdir/test_visual.vim b/src/nvim/testdir/test_visual.vim
new file mode 100644
index 0000000000..cf0e535937
--- /dev/null
+++ b/src/nvim/testdir/test_visual.vim
@@ -0,0 +1,17 @@
+" Tests for Visual mode
+if !has('multi_byte')
+  finish
+endif
+
+if !has('visual')
+  finish
+endif
+
+func Test_block_shift_multibyte()
+  split
+  call setline(1, ['xヹxxx', 'ヹxxx'])
+  exe "normal 1G0l\<C-V>jl>"
+  call assert_equal('x	 ヹxxx', getline(1))
+  call assert_equal('	ヹxxx', getline(2))
+  q!
+endfunc
diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim
new file mode 100644
index 0000000000..b7f41a711b
--- /dev/null
+++ b/src/nvim/testdir/test_window_cmd.vim
@@ -0,0 +1,70 @@
+" Tests for window cmd (:wincmd, :split, :vsplit, :resize and etc...)
+
+func Test_window_cmd_ls0_with_split()
+  set ls=0
+  set splitbelow
+  split
+  quit
+  call assert_equal(0, &lines - &cmdheight - winheight(0))
+  new | only!
+  "
+  set splitbelow&vim
+  botright split
+  quit
+  call assert_equal(0, &lines - &cmdheight - winheight(0))
+  new | only!
+  set ls&vim
+endfunc
+
+func Test_window_cmd_cmdwin_with_vsp()
+  let efmt='Expected 0 but got %d (in ls=%d, %s window)'
+  for v in range(0, 2)
+    exec "set ls=" . v
+    vsplit
+    call feedkeys("q:\<CR>")
+    let ac = &lines - (&cmdheight + winheight(0) + !!v)
+    let emsg = printf(efmt, ac, v, 'left')
+    call assert_equal(0, ac, emsg)
+    wincmd w
+    let ac = &lines - (&cmdheight + winheight(0) + !!v)
+    let emsg = printf(efmt, ac, v, 'right')
+    call assert_equal(0, ac, emsg)
+    new | only!
+  endfor
+  set ls&vim
+endfunc
+
+function Test_window_cmd_wincmd_gf()
+  let fname = 'test_gf.txt'
+  let swp_fname = '.' . fname . '.swp'
+  call writefile([], fname)
+  call writefile([], swp_fname)
+  function s:swap_exists()
+    let v:swapchoice = s:swap_choice
+  endfunc
+  augroup test_window_cmd_wincmd_gf
+    autocmd!
+    exec "autocmd SwapExists " . fname . " call s:swap_exists()"
+  augroup END
+
+  call setline(1, fname)
+  " (E)dit anyway
+  let s:swap_choice = 'e'
+  wincmd gf
+  call assert_equal(2, tabpagenr())
+  call assert_equal(fname, bufname("%"))
+  quit!
+
+  " (Q)uit
+  let s:swap_choice = 'q'
+  wincmd gf
+  call assert_equal(1, tabpagenr())
+  call assert_notequal(fname, bufname("%"))
+  new | only!
+
+  call delete(fname)
+  call delete(swp_fname)
+  augroup! test_window_cmd_wincmd_gf
+endfunc
+
+" vim: sw=2 et
diff --git a/src/nvim/testdir/test_window_id.vim b/src/nvim/testdir/test_window_id.vim
new file mode 100644
index 0000000000..66656e1d0a
--- /dev/null
+++ b/src/nvim/testdir/test_window_id.vim
@@ -0,0 +1,94 @@
+" Test using the window ID.
+
+func Test_win_getid()
+  edit one
+  let id1 = win_getid()
+  let w:one = 'one'
+  split two
+  let id2 = win_getid()
+  let bufnr2 = bufnr('%')
+  let w:two = 'two'
+  split three
+  let id3 = win_getid()
+  let w:three = 'three'
+  tabnew
+  edit four
+  let id4 = win_getid()
+  let w:four = 'four'
+  split five
+  let id5 = win_getid()
+  let bufnr5 = bufnr('%')
+  let w:five = 'five'
+  tabnext
+
+  wincmd w
+  call assert_equal("two", expand("%"))
+  call assert_equal(id2, win_getid())
+  let nr2 = winnr()
+  wincmd w
+  call assert_equal("one", expand("%"))
+  call assert_equal(id1, win_getid())
+  let nr1 = winnr()
+  wincmd w
+  call assert_equal("three", expand("%"))
+  call assert_equal(id3, win_getid())
+  let nr3 = winnr()
+  call assert_equal('one', getwinvar(id1, 'one'))
+  call assert_equal('two', getwinvar(id2, 'two'))
+  call assert_equal('three', getwinvar(id3, 'three'))
+  tabnext
+  call assert_equal("five", expand("%"))
+  call assert_equal(id5, win_getid())
+  let nr5 = winnr()
+  wincmd w
+  call assert_equal("four", expand("%"))
+  call assert_equal(id4, win_getid())
+  let nr4 = winnr()
+  call assert_equal('four', getwinvar(id4, 'four'))
+  call assert_equal('five', getwinvar(id5, 'five'))
+  call settabwinvar(1, id2, 'two', '2')
+  call setwinvar(id4, 'four', '4')
+  tabnext
+  call assert_equal('4', gettabwinvar(2, id4, 'four'))
+  call assert_equal('five', gettabwinvar(2, id5, 'five'))
+  call assert_equal('2', getwinvar(id2, 'two'))
+
+  exe nr1 . "wincmd w"
+  call assert_equal(id1, win_getid())
+  exe nr2 . "wincmd w"
+  call assert_equal(id2, win_getid())
+  exe nr3 . "wincmd w"
+  call assert_equal(id3, win_getid())
+  tabnext
+  exe nr4 . "wincmd w"
+  call assert_equal(id4, win_getid())
+  exe nr5 . "wincmd w"
+  call assert_equal(id5, win_getid())
+
+  call win_gotoid(id2)
+  call assert_equal("two", expand("%"))
+  call win_gotoid(id4)
+  call assert_equal("four", expand("%"))
+  call win_gotoid(id1)
+  call assert_equal("one", expand("%"))
+  call win_gotoid(id5)
+  call assert_equal("five", expand("%"))
+
+  call assert_equal(0, win_id2win(9999))
+  call assert_equal(nr5, win_id2win(id5))
+  call assert_equal(0, win_id2win(id1))
+  tabnext
+  call assert_equal(nr1, win_id2win(id1))
+
+  call assert_equal([0, 0], win_id2tabwin(9999))
+  call assert_equal([1, nr2], win_id2tabwin(id2))
+  call assert_equal([2, nr4], win_id2tabwin(id4))
+
+  call assert_equal([], win_findbuf(9999))
+  call assert_equal([id2], win_findbuf(bufnr2))
+  call win_gotoid(id5)
+  split
+  call assert_equal(sort([id5, win_getid()]), sort(win_findbuf(bufnr5)))
+
+  only!
+endfunc
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 99eb230a88..8e5adb14f9 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -4,7 +4,7 @@
 #include "nvim/api/vim.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/ascii.h"
-#include "nvim/misc2.h"
+#include "nvim/main.h"
 #include "nvim/os/os.h"
 #include "nvim/os/input.h"
 #include "nvim/event/rstream.h"
@@ -31,13 +31,20 @@ void term_input_init(TermInput *input, Loop *loop)
   if (!term) {
     term = "";  // termkey_new_abstract assumes non-null (#2745)
   }
-  int enc_flag = enc_utf8 ? TERMKEY_FLAG_UTF8 : TERMKEY_FLAG_RAW;
-  input->tk = termkey_new_abstract(term, enc_flag);
+
+#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18
+  input->tk = termkey_new_abstract(term,
+                                   TERMKEY_FLAG_UTF8 | TERMKEY_FLAG_NOSTART);
+  termkey_hook_terminfo_getstr(input->tk, input->tk_ti_hook_fn, NULL);
+  termkey_start(input->tk);
+#else
+  input->tk = termkey_new_abstract(term, TERMKEY_FLAG_UTF8);
+#endif
 
   int curflags = termkey_get_canonflags(input->tk);
   termkey_set_canonflags(input->tk, curflags | TERMKEY_CANON_DELBS);
   // setup input handle
-  rstream_init_fd(loop, &input->read_stream, input->in_fd, 0xfff, input);
+  rstream_init_fd(loop, &input->read_stream, input->in_fd, 0xfff);
   // initialize a timer handle for handling ESC with libtermkey
   time_watcher_init(loop, &input->timer_handle, input);
 }
@@ -48,13 +55,13 @@ void term_input_destroy(TermInput *input)
   uv_mutex_destroy(&input->key_buffer_mutex);
   uv_cond_destroy(&input->key_buffer_cond);
   time_watcher_close(&input->timer_handle, NULL);
-  stream_close(&input->read_stream, NULL);
+  stream_close(&input->read_stream, NULL, NULL);
   termkey_destroy(input->tk);
 }
 
 void term_input_start(TermInput *input)
 {
-  rstream_start(&input->read_stream, read_cb);
+  rstream_start(&input->read_stream, read_cb, input);
 }
 
 void term_input_stop(TermInput *input)
@@ -92,7 +99,7 @@ static void flush_input(TermInput *input, bool wait_until_empty)
   size_t drain_boundary = wait_until_empty ? 0 : 0xff;
   do {
     uv_mutex_lock(&input->key_buffer_mutex);
-    loop_schedule(&loop, event_create(1, wait_input_enqueue, 1, input));
+    loop_schedule(&main_loop, event_create(1, wait_input_enqueue, 1, input));
     input->waiting = true;
     while (input->waiting) {
       uv_cond_wait(&input->key_buffer_cond, &input->key_buffer_mutex);
@@ -138,6 +145,9 @@ static void forward_modified_utf8(TermInput *input, TermKeyKey *key)
   if (key->type == TERMKEY_TYPE_KEYSYM
       && key->code.sym == TERMKEY_SYM_ESCAPE) {
     len = (size_t)snprintf(buf, sizeof(buf), "<Esc>");
+  } else if (key->type == TERMKEY_TYPE_KEYSYM
+      && key->code.sym == TERMKEY_SYM_SUSPEND) {
+    len = (size_t)snprintf(buf, sizeof(buf), "<C-Z>");
   } else {
     len = termkey_strfkey(input->tk, buf, sizeof(buf), key, TERMKEY_FORMAT_VIM);
   }
@@ -153,7 +163,8 @@ static void forward_mouse_event(TermInput *input, TermKeyKey *key)
   TermKeyMouseEvent ev;
   termkey_interpret_mouse(input->tk, key, &ev, &button, &row, &col);
 
-  if (ev != TERMKEY_MOUSE_PRESS && ev != TERMKEY_MOUSE_DRAG) {
+  if (ev != TERMKEY_MOUSE_PRESS && ev != TERMKEY_MOUSE_DRAG
+      && ev != TERMKEY_MOUSE_RELEASE) {
     return;
   }
 
@@ -190,6 +201,8 @@ static void forward_mouse_event(TermInput *input, TermKeyKey *key)
     }
   } else if (ev == TERMKEY_MOUSE_DRAG) {
     len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Drag");
+  } else if (ev == TERMKEY_MOUSE_RELEASE) {
+    len += (size_t)snprintf(buf + len, sizeof(buf) - len, "Release");
   }
 
   len += (size_t)snprintf(buf + len, sizeof(buf) - len, "><%d,%d>", col, row);
@@ -209,8 +222,8 @@ static int get_key_code_timeout(void)
   // Check 'ttimeout' to determine if we should send ESC after 'ttimeoutlen'.
   // See :help 'ttimeout' for more information
   Error err = ERROR_INIT;
-  if (vim_get_option(cstr_as_string("ttimeout"), &err).data.boolean) {
-    ms = vim_get_option(cstr_as_string("ttimeoutlen"), &err).data.integer;
+  if (nvim_get_option(cstr_as_string("ttimeout"), &err).data.boolean) {
+    ms = nvim_get_option(cstr_as_string("ttimeoutlen"), &err).data.integer;
   }
 
   return (int)ms;
@@ -313,8 +326,6 @@ static bool handle_forced_escape(TermInput *input)
   return false;
 }
 
-static void restart_reading(void **argv);
-
 static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data,
     bool eof)
 {
@@ -333,10 +344,10 @@ static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data,
       //
       // ls *.md | xargs nvim
       input->in_fd = 2;
-      stream_close(&input->read_stream, NULL);
-      queue_put(input->loop->fast_events, restart_reading, 1, input);
+      stream_close(&input->read_stream, NULL, NULL);
+      multiqueue_put(input->loop->fast_events, restart_reading, 1, input);
     } else {
-      loop_schedule(&loop, event_create(1, input_done_event, 0));
+      loop_schedule(&main_loop, event_create(1, input_done_event, 0));
     }
     return;
   }
@@ -384,6 +395,6 @@ static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data,
 static void restart_reading(void **argv)
 {
   TermInput *input = argv[0];
-  rstream_init_fd(input->loop, &input->read_stream, input->in_fd, 0xfff, input);
-  rstream_start(&input->read_stream, read_cb);
+  rstream_init_fd(input->loop, &input->read_stream, input->in_fd, 0xfff);
+  rstream_start(&input->read_stream, read_cb, input);
 }
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h
index d7ee2b9e52..7d59cf5c6a 100644
--- a/src/nvim/tui/input.h
+++ b/src/nvim/tui/input.h
@@ -12,6 +12,9 @@ typedef struct term_input {
   bool paste_enabled;
   bool waiting;
   TermKey *tk;
+#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18
+  TermKey_Terminfo_Getstr_Hook *tk_ti_hook_fn;  ///< libtermkey terminfo hook
+#endif
   TimeWatcher timer_handle;
   Loop *loop;
   Stream read_stream;
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 62bc81ba64..8cb8719cfe 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1,3 +1,5 @@
+// Terminal UI functions. Invoked (by ui_bridge.c) on the TUI thread.
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -5,30 +7,38 @@
 
 #include <uv.h>
 #include <unibilium.h>
+#if defined(HAVE_TERMIOS_H)
+# include <termios.h>
+#endif
 
 #include "nvim/lib/kvec.h"
 
+#include "nvim/ascii.h"
 #include "nvim/vim.h"
+#include "nvim/log.h"
 #include "nvim/ui.h"
 #include "nvim/map.h"
+#include "nvim/main.h"
 #include "nvim/memory.h"
 #include "nvim/api/vim.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/signal.h"
-#include "nvim/tui/tui.h"
-#include "nvim/tui/input.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/strings.h"
-#include "nvim/ugrid.h"
 #include "nvim/ui_bridge.h"
+#include "nvim/ugrid.h"
+#include "nvim/tui/input.h"
+#include "nvim/tui/tui.h"
 
 // Space reserved in the output buffer to restore the cursor to normal when
 // flushing. No existing terminal will require 32 bytes to do that.
 #define CNORM_COMMAND_MAX_SIZE 32
 #define OUTBUF_SIZE 0xffff
 
+#define TOO_MANY_EVENTS 1000000
+
 typedef struct {
   int top, bot, left, right;
 } Rect;
@@ -64,7 +74,7 @@ typedef struct {
   struct {
     int enable_mouse, disable_mouse;
     int enable_bracketed_paste, disable_bracketed_paste;
-    int enter_insert_mode, enter_replace_mode, exit_insert_mode;
+    int set_cursor_shape_bar, set_cursor_shape_ul, set_cursor_shape_block;
     int set_rgb_foreground, set_rgb_background;
     int enable_focus_reporting, disable_focus_reporting;
   } unibi_ext;
@@ -82,6 +92,7 @@ UI *tui_start(void)
   UI *ui = xcalloc(1, sizeof(UI));
   ui->stop = tui_stop;
   ui->rgb = p_tgc;
+  ui->pum_external = false;
   ui->resize = tui_resize;
   ui->clear = tui_clear;
   ui->eol_clear = tui_eol_clear;
@@ -105,6 +116,7 @@ UI *tui_start(void)
   ui->suspend = tui_suspend;
   ui->set_title = tui_set_title;
   ui->set_icon = tui_set_icon;
+  ui->event = tui_event;
   return ui_bridge_attach(ui, tui_main, tui_scheduler);
 }
 
@@ -119,9 +131,9 @@ static void terminfo_start(UI *ui)
   data->unibi_ext.disable_mouse = -1;
   data->unibi_ext.enable_bracketed_paste = -1;
   data->unibi_ext.disable_bracketed_paste = -1;
-  data->unibi_ext.enter_insert_mode = -1;
-  data->unibi_ext.enter_replace_mode = -1;
-  data->unibi_ext.exit_insert_mode = -1;
+  data->unibi_ext.set_cursor_shape_bar = -1;
+  data->unibi_ext.set_cursor_shape_ul = -1;
+  data->unibi_ext.set_cursor_shape_block = -1;
   data->unibi_ext.enable_focus_reporting = -1;
   data->unibi_ext.disable_focus_reporting = -1;
   data->out_fd = 1;
@@ -134,6 +146,10 @@ static void terminfo_start(UI *ui)
     data->ut = unibi_dummy();
   }
   fix_terminfo(data);
+  // Initialize the cursor shape.
+  unibi_out(ui, data->unibi_ext.set_cursor_shape_block);
+  // Set 't_Co' from the result of unibilium & fix_terminfo.
+  t_colors = unibi_get_num(data->ut, unibi_max_colors);
   // Enter alternate screen and clear
   unibi_out(ui, unibi_enter_ca_mode);
   unibi_out(ui, unibi_clear_screen);
@@ -165,7 +181,7 @@ static void terminfo_stop(UI *ui)
   unibi_out(ui, data->unibi_ext.disable_bracketed_paste);
   // Disable focus reporting
   unibi_out(ui, data->unibi_ext.disable_focus_reporting);
-  flush_buf(ui);
+  flush_buf(ui, true);
   uv_tty_reset_mode();
   uv_close((uv_handle_t *)&data->output_handle, NULL);
   uv_run(&data->write_loop, UV_RUN_DEFAULT);
@@ -183,6 +199,11 @@ static void tui_terminal_start(UI *ui)
   terminfo_start(ui);
   update_size(ui);
   signal_watcher_start(&data->winch_handle, sigwinch_cb, SIGWINCH);
+
+#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18
+  data->input.tk_ti_hook_fn = tui_tk_ti_getstr;
+#endif
+  term_input_init(&data->input, data->loop);
   term_input_start(&data->input);
 }
 
@@ -215,8 +236,6 @@ static void tui_main(UIBridgeData *bridge, UI *ui)
   signal_watcher_init(data->loop, &data->winch_handle, ui);
   signal_watcher_init(data->loop, &data->cont_handle, data);
   signal_watcher_start(&data->cont_handle, sigcont_cb, SIGCONT);
-  // initialize input reading structures
-  term_input_init(&data->input, &tui_loop);
   tui_terminal_start(ui);
   data->stop = false;
   // allow the main thread to continue, we are ready to start handling UI
@@ -232,7 +251,7 @@ static void tui_main(UIBridgeData *bridge, UI *ui)
   signal_watcher_stop(&data->cont_handle);
   signal_watcher_close(&data->cont_handle, NULL);
   signal_watcher_close(&data->winch_handle, NULL);
-  loop_close(&tui_loop);
+  loop_close(&tui_loop, false);
   kv_destroy(data->invalid_regions);
   xfree(data);
   xfree(ui);
@@ -245,11 +264,6 @@ static void tui_scheduler(Event event, void *d)
   loop_schedule(data->loop, event);
 }
 
-static void refresh_event(void **argv)
-{
-  ui_refresh();
-}
-
 static void sigcont_cb(SignalWatcher *watcher, int signum, void *data)
 {
   ((TUIData *)data)->cont_received = true;
@@ -260,8 +274,7 @@ static void sigwinch_cb(SignalWatcher *watcher, int signum, void *data)
   got_winch = true;
   UI *ui = data;
   update_size(ui);
-  // run refresh_event in nvim main loop
-  loop_schedule(&loop, event_create(1, refresh_event, 0));
+  ui_schedule_refresh();
 }
 
 static bool attrs_differ(HlAttrs a1, HlAttrs a2)
@@ -456,16 +469,20 @@ static void tui_mode_change(UI *ui, int mode)
 
   if (mode == INSERT) {
     if (data->showing_mode != INSERT) {
-      unibi_out(ui, data->unibi_ext.enter_insert_mode);
+      unibi_out(ui, data->unibi_ext.set_cursor_shape_bar);
+    }
+  } else if (mode == CMDLINE) {
+    if (data->showing_mode != CMDLINE) {
+      unibi_out(ui, data->unibi_ext.set_cursor_shape_bar);
     }
   } else if (mode == REPLACE) {
     if (data->showing_mode != REPLACE) {
-      unibi_out(ui, data->unibi_ext.enter_replace_mode);
+      unibi_out(ui, data->unibi_ext.set_cursor_shape_ul);
     }
   } else {
     assert(mode == NORMAL);
     if (data->showing_mode != NORMAL) {
-      unibi_out(ui, data->unibi_ext.exit_insert_mode);
+      unibi_out(ui, data->unibi_ext.set_cursor_shape_block);
     }
   }
   data->showing_mode = mode;
@@ -584,6 +601,18 @@ static void tui_flush(UI *ui)
   TUIData *data = ui->data;
   UGrid *grid = &data->grid;
 
+  size_t nrevents = loop_size(data->loop);
+  if (nrevents > TOO_MANY_EVENTS) {
+    ILOG("TUI event-queue flooded (thread_events=%zu); purging", nrevents);
+    // Back-pressure: UI events may accumulate much faster than the terminal
+    // device can serve them. Even if SIGINT/CTRL-C is received, user must still
+    // wait for the TUI event-queue to drain, and if there are ~millions of
+    // events in the queue, it could take hours. Clearing the queue allows the
+    // UI to recover. #1234 #5396
+    loop_purge(data->loop);
+    tui_busy_stop(ui);  // avoid hidden cursor
+  }
+
   while (kv_size(data->invalid_regions)) {
     Rect r = kv_pop(data->invalid_regions);
     int currow = -1;
@@ -598,7 +627,7 @@ static void tui_flush(UI *ui)
 
   unibi_goto(ui, grid->row, grid->col);
 
-  flush_buf(ui);
+  flush_buf(ui, true);
 }
 
 static void suspend_event(void **argv)
@@ -608,6 +637,7 @@ static void suspend_event(void **argv)
   bool enable_mouse = data->mouse_enabled;
   tui_terminal_stop(ui);
   data->cont_received = false;
+  stream_set_blocking(input_global_fd(), true);   // normalize stream (#2598)
   kill(0, SIGTSTP);
   while (!data->cont_received) {
     // poll the event loop until SIGCONT is received
@@ -617,6 +647,7 @@ static void suspend_event(void **argv)
   if (enable_mouse) {
     tui_mouse_on(ui);
   }
+  stream_set_blocking(input_global_fd(), false);  // libuv expects this
   // resume the main thread
   CONTINUE(data->bridge);
 }
@@ -627,8 +658,8 @@ static void tui_suspend(UI *ui)
   // kill(0, SIGTSTP) won't stop the UI thread, so we must poll for SIGCONT
   // before continuing. This is done in another callback to avoid
   // loop_poll_events recursion
-  queue_put_event(data->loop->fast_events,
-      event_create(1, suspend_event, 1, ui));
+  multiqueue_put_event(data->loop->fast_events,
+                       event_create(1, suspend_event, 1, ui));
 }
 
 static void tui_set_title(UI *ui, char *title)
@@ -647,6 +678,12 @@ static void tui_set_icon(UI *ui, char *icon)
 {
 }
 
+// NB: if we start to use this, the ui_bridge must be updated
+// to make a copy for the tui thread
+static void tui_event(UI *ui, char *name, Array args, bool *args_consumed)
+{
+}
+
 static void invalidate(UI *ui, int top, int bot, int left, int right)
 {
   TUIData *data = ui->data;
@@ -681,7 +718,7 @@ static void invalidate(UI *ui, int top, int bot, int left, int right)
     intersects->right = MAX(right, intersects->right);
   } else {
     // Else just add a new entry;
-    kv_push(Rect, data->invalid_regions, ((Rect){top, bot, left, right}));
+    kv_push(data->invalid_regions, ((Rect) { top, bot, left, right }));
   }
 }
 
@@ -726,8 +763,8 @@ end:
     height = DFLT_ROWS;
   }
 
-  data->bridge->bridge.width = ui->width = width;
-  data->bridge->bridge.height = ui->height = height;
+  data->bridge->bridge.width = width;
+  data->bridge->bridge.height = height;
 }
 
 static void unibi_goto(UI *ui, int row, int col)
@@ -765,7 +802,7 @@ static void out(void *ctx, const char *str, size_t len)
   size_t available = data->bufsize - data->bufpos;
 
   if (len > available) {
-    flush_buf(ui);
+    flush_buf(ui, false);
   }
 
   memcpy(data->buf + data->bufpos, str, len);
@@ -785,6 +822,7 @@ static void fix_terminfo(TUIData *data)
   unibi_term *ut = data->ut;
 
   const char *term = os_getenv("TERM");
+  const char *colorterm = os_getenv("COLORTERM");
   if (!term) {
     goto end;
   }
@@ -806,7 +844,16 @@ static void fix_terminfo(TUIData *data)
   }
 
   if (STARTS_WITH(term, "xterm") || STARTS_WITH(term, "rxvt")) {
-    unibi_set_if_empty(ut, unibi_cursor_normal, "\x1b[?12l\x1b[?25h");
+    const char *normal = unibi_get_str(ut, unibi_cursor_normal);
+    if (!normal) {
+      unibi_set_str(ut, unibi_cursor_normal, "\x1b[?25h");
+    } else if (STARTS_WITH(normal, "\x1b[?12l")) {
+      // terminfo typically includes DECRST 12 as part of setting up the normal
+      // cursor, which interferes with the user's control via
+      // NVIM_TUI_ENABLE_CURSOR_SHAPE.  When DECRST 12 is present, skip over
+      // it, but honor the rest of the TI setting.
+      unibi_set_str(ut, unibi_cursor_normal, normal + strlen("\x1b[?12l"));
+    }
     unibi_set_if_empty(ut, unibi_cursor_invisible, "\x1b[?25l");
     unibi_set_if_empty(ut, unibi_flash_screen, "\x1b[?5h$<100/>\x1b[?5l");
     unibi_set_if_empty(ut, unibi_exit_attribute_mode, "\x1b(B\x1b[m");
@@ -830,18 +877,20 @@ static void fix_terminfo(TUIData *data)
 #define XTERM_SETAB \
   "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m"
 
-  if (os_getenv("COLORTERM") != NULL
-      && (!strcmp(term, "xterm") || !strcmp(term, "screen"))) {
-    // probably every modern terminal that sets TERM=xterm supports 256
-    // colors(eg: gnome-terminal). Also do it when TERM=screen.
+  if ((colorterm && strstr(colorterm, "256"))
+      || strstr(term, "256")
+      || strstr(term, "xterm")) {
+    // Assume TERM~=xterm or COLORTERM~=256 supports 256 colors.
     unibi_set_num(ut, unibi_max_colors, 256);
     unibi_set_str(ut, unibi_set_a_foreground, XTERM_SETAF);
     unibi_set_str(ut, unibi_set_a_background, XTERM_SETAB);
   }
 
-  if (os_getenv("NVIM_TUI_ENABLE_CURSOR_SHAPE") == NULL) {
+  const char * env_cusr_shape = os_getenv("NVIM_TUI_ENABLE_CURSOR_SHAPE");
+  if (env_cusr_shape && strncmp(env_cusr_shape, "0", 1) == 0) {
     goto end;
   }
+  bool cusr_blink = env_cusr_shape && strncmp(env_cusr_shape, "2", 1) == 0;
 
 #define TMUX_WRAP(seq) (inside_tmux ? "\x1bPtmux;\x1b" seq "\x1b\\" : seq)
   // Support changing cursor shape on some popular terminals.
@@ -852,23 +901,23 @@ static void fix_terminfo(TUIData *data)
       || os_getenv("KONSOLE_DBUS_SESSION") != NULL) {
     // Konsole uses a proprietary escape code to set the cursor shape
     // and does not support DECSCUSR.
-    data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL,
-        TMUX_WRAP("\x1b]50;CursorShape=1;BlinkingCursorEnabled=1\x07"));
-    data->unibi_ext.enter_replace_mode = (int)unibi_add_ext_str(ut, NULL,
-        TMUX_WRAP("\x1b]50;CursorShape=2;BlinkingCursorEnabled=1\x07"));
-    data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL,
-        TMUX_WRAP("\x1b]50;CursorShape=0;BlinkingCursorEnabled=0\x07"));
+    data->unibi_ext.set_cursor_shape_bar = (int)unibi_add_ext_str(ut, NULL,
+        TMUX_WRAP("\x1b]50;CursorShape=1\x07"));
+    data->unibi_ext.set_cursor_shape_ul = (int)unibi_add_ext_str(ut, NULL,
+        TMUX_WRAP("\x1b]50;CursorShape=2\x07"));
+    data->unibi_ext.set_cursor_shape_block = (int)unibi_add_ext_str(ut, NULL,
+        TMUX_WRAP("\x1b]50;CursorShape=0\x07"));
   } else if (!vte_version || atoi(vte_version) >= 3900) {
     // Assume that the terminal supports DECSCUSR unless it is an
     // old VTE based terminal.  This should not get wrapped for tmux,
     // which will handle it via its Ss/Se terminfo extension - usually
     // according to its terminal-overrides.
-    data->unibi_ext.enter_insert_mode = (int)unibi_add_ext_str(ut, NULL,
-                                                               "\x1b[5 q");
-    data->unibi_ext.enter_replace_mode = (int)unibi_add_ext_str(ut, NULL,
-                                                                "\x1b[3 q");
-    data->unibi_ext.exit_insert_mode = (int)unibi_add_ext_str(ut, NULL,
-                                                              "\x1b[2 q");
+    data->unibi_ext.set_cursor_shape_bar =
+      (int)unibi_add_ext_str(ut, NULL, cusr_blink ? "\x1b[5 q" : "\x1b[6 q");
+    data->unibi_ext.set_cursor_shape_ul =
+      (int)unibi_add_ext_str(ut, NULL, cusr_blink ? "\x1b[3 q" : "\x1b[4 q");
+    data->unibi_ext.set_cursor_shape_block =
+      (int)unibi_add_ext_str(ut, NULL, cusr_blink ? "\x1b[1 q" : "\x1b[2 q");
   }
 
 end:
@@ -900,13 +949,13 @@ end:
   unibi_set_if_empty(ut, unibi_clr_eos, "\x1b[J");
 }
 
-static void flush_buf(UI *ui)
+static void flush_buf(UI *ui, bool toggle_cursor)
 {
   uv_write_t req;
   uv_buf_t buf;
   TUIData *data = ui->data;
 
-  if (!data->busy) {
+  if (toggle_cursor && !data->busy) {
     // not busy and the cursor is invisible(see below). Append a "cursor
     // normal" command to the end of the buffer.
     data->bufsize += CNORM_COMMAND_MAX_SIZE;
@@ -920,9 +969,56 @@ static void flush_buf(UI *ui)
   uv_run(&data->write_loop, UV_RUN_DEFAULT);
   data->bufpos = 0;
 
-  if (!data->busy) {
+  if (toggle_cursor && !data->busy) {
     // not busy and cursor is visible(see above), append a "cursor invisible"
     // command to the beginning of the buffer for the next flush
     unibi_out(ui, unibi_cursor_invisible);
   }
 }
+
+#if TERMKEY_VERSION_MAJOR > 0 || TERMKEY_VERSION_MINOR > 18
+/// Try to get "kbs" code from stty because "the terminfo kbs entry is extremely
+/// unreliable." (Vim, Bash, and tmux also do this.)
+///
+/// @see tmux/tty-keys.c fe4e9470bb504357d073320f5d305b22663ee3fd
+/// @see https://bugzilla.redhat.com/show_bug.cgi?id=142659
+static const char *tui_get_stty_erase(void)
+{
+  static char stty_erase[2] = { 0 };
+#if defined(ECHOE) && defined(ICANON) && defined(HAVE_TERMIOS_H)
+  struct termios t;
+  if (tcgetattr(input_global_fd(), &t) != -1) {
+    stty_erase[0] = (char)t.c_cc[VERASE];
+    stty_erase[1] = '\0';
+    ILOG("stty/termios:erase=%s", stty_erase);
+  }
+#endif
+  return stty_erase;
+}
+
+/// libtermkey hook to override terminfo entries.
+/// @see TermInput.tk_ti_hook_fn
+static const char *tui_tk_ti_getstr(const char *name, const char *value,
+                                    void *data)
+{
+  static const char *stty_erase = NULL;
+  if (stty_erase == NULL) {
+    stty_erase = tui_get_stty_erase();
+  }
+
+  if (strcmp(name, "key_backspace") == 0) {
+    ILOG("libtermkey:kbs=%s", value);
+    if (stty_erase != NULL && stty_erase[0] != 0) {
+      return stty_erase;
+    }
+  } else if (strcmp(name, "key_dc") == 0) {
+    ILOG("libtermkey:kdch1=%s", value);
+    // Vim: "If <BS> and <DEL> are now the same, redefine <DEL>."
+    if (stty_erase != NULL && strcmp(stty_erase, value) == 0) {
+      return stty_erase[0] == DEL ? (char *)CTRL_H_STR : (char *)DEL_STR;
+    }
+  }
+
+  return value;
+}
+#endif
diff --git a/src/nvim/types.h b/src/nvim/types.h
index bfe8be2091..317bead3bb 100644
--- a/src/nvim/types.h
+++ b/src/nvim/types.h
@@ -13,4 +13,6 @@ typedef unsigned char char_u;
 // Can hold one decoded UTF-8 character.
 typedef uint32_t u8char_T;
 
+typedef struct expand expand_T;
+
 #endif  // NVIM_TYPES_H
diff --git a/src/nvim/ugrid.h b/src/nvim/ugrid.h
index ad6d96a168..268362bf1b 100644
--- a/src/nvim/ugrid.h
+++ b/src/nvim/ugrid.h
@@ -23,16 +23,16 @@ struct ugrid {
 
 #define EMPTY_ATTRS ((HlAttrs){ false, false, false, false, false, -1, -1, -1 })
 
-#define UGRID_FOREACH_CELL(grid, top, bot, left, right, code)           \
-  do {                                                                  \
-    for (int row = top; row <= bot; ++row) {                            \
-      UCell *row_cells = (grid)->cells[row];                            \
-      for (int col = left; col <= right; ++col) {                       \
-        UCell *cell = row_cells + col;                                  \
-        (void)(cell);                                                   \
-        code;                                                           \
-      }                                                                 \
-    }                                                                   \
+#define UGRID_FOREACH_CELL(grid, top, bot, left, right, code) \
+  do { \
+    for (int row = top; row <= bot; row++) { \
+      UCell *row_cells = (grid)->cells[row]; \
+      for (int col = left; col <= right; col++) { \
+        UCell *cell = row_cells + col; \
+        (void)(cell); \
+        code; \
+      } \
+    } \
   } while (0)
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 05322a6f64..d3784b6cd3 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -12,10 +12,8 @@
 #include "nvim/ex_cmds2.h"
 #include "nvim/fold.h"
 #include "nvim/main.h"
-#include "nvim/mbyte.h"
 #include "nvim/ascii.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/mbyte.h"
 #include "nvim/garray.h"
 #include "nvim/memory.h"
@@ -27,10 +25,16 @@
 #include "nvim/os/time.h"
 #include "nvim/os/input.h"
 #include "nvim/os/signal.h"
+#include "nvim/popupmnu.h"
 #include "nvim/screen.h"
 #include "nvim/syntax.h"
 #include "nvim/window.h"
-#include "nvim/tui/tui.h"
+#ifdef FEAT_TUI
+# include "nvim/tui/tui.h"
+#else
+# include "nvim/msgpack_rpc/server.h"
+#endif
+#include "nvim/api/private/helpers.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ui.c.generated.h"
@@ -49,29 +53,27 @@ static bool pending_cursor_update = false;
 static int busy = 0;
 static int height, width;
 
-// This set of macros allow us to use UI_CALL to invoke any function on
-// registered UI instances. The functions can have 0-5 arguments(configurable
-// by SELECT_NTH)
+// UI_CALL invokes a function on all registered UI instances. The functions can
+// have 0-5 arguments (configurable by SELECT_NTH).
 //
-// See http://stackoverflow.com/a/11172679 for a better explanation of how it
-// works.
+// See http://stackoverflow.com/a/11172679 for how it works.
 #ifdef _MSC_VER
-  #define UI_CALL(funname, ...)                                     \
-    do {                                                            \
-      flush_cursor_update();                                        \
-      for (size_t i = 0; i < ui_count; i++) {                       \
-        UI *ui = uis[i];                                            \
-        UI_CALL_MORE(funname, __VA_ARGS__);                         \
-      }                                                             \
+# define UI_CALL(funname, ...) \
+    do { \
+      flush_cursor_update(); \
+      for (size_t i = 0; i < ui_count; i++) { \
+        UI *ui = uis[i]; \
+        UI_CALL_MORE(funname, __VA_ARGS__); \
+      } \
     } while (0)
 #else
-  #define UI_CALL(...)                                              \
-    do {                                                            \
-      flush_cursor_update();                                        \
-      for (size_t i = 0; i < ui_count; i++) {                       \
-        UI *ui = uis[i];                                            \
-        UI_CALL_HELPER(CNT(__VA_ARGS__), __VA_ARGS__);              \
-      }                                                             \
+# define UI_CALL(...) \
+    do { \
+      flush_cursor_update(); \
+      for (size_t i = 0; i < ui_count; i++) { \
+        UI *ui = uis[i]; \
+        UI_CALL_HELPER(CNT(__VA_ARGS__), __VA_ARGS__); \
+      } \
     } while (0)
 #endif
 #define CNT(...) SELECT_NTH(__VA_ARGS__, MORE, MORE, MORE, MORE, ZERO, ignore)
@@ -83,7 +85,21 @@ static int height, width;
 
 void ui_builtin_start(void)
 {
+#ifdef FEAT_TUI
   tui_start();
+#else
+  fprintf(stderr, "Nvim headless-mode started.\n");
+  size_t len;
+  char **addrs = server_address_list(&len);
+  if (addrs != NULL) {
+    fprintf(stderr, "Listening on:\n");
+    for (size_t i = 0; i < len; i++) {
+      fprintf(stderr, "\t%s\n", addrs[i]);
+    }
+    xfree(addrs);
+  }
+  fprintf(stderr, "Press CTRL+C to exit.\n");
+#endif
 }
 
 void ui_builtin_stop(void)
@@ -124,6 +140,15 @@ void ui_set_icon(char *icon)
   UI_CALL(flush);
 }
 
+void ui_event(char *name, Array args)
+{
+  bool args_consumed = false;
+  UI_CALL(event, name, args, &args_consumed);
+  if (!args_consumed) {
+    api_free_array(args);
+  }
+}
+
 // May update the shape of the cursor.
 void ui_cursor_shape(void)
 {
@@ -137,15 +162,28 @@ void ui_refresh(void)
   }
 
   int width = INT_MAX, height = INT_MAX;
+  bool pum_external = true;
 
   for (size_t i = 0; i < ui_count; i++) {
     UI *ui = uis[i];
-    width = ui->width < width ? ui->width : width;
-    height = ui->height < height ? ui->height : height;
+    width = MIN(ui->width, width);
+    height = MIN(ui->height, height);
+    pum_external &= ui->pum_external;
   }
 
   row = col = 0;
   screen_resize(width, height);
+  pum_set_external(pum_external);
+}
+
+static void ui_refresh_event(void **argv)
+{
+  ui_refresh();
+}
+
+void ui_schedule_refresh(void)
+{
+  loop_schedule(&main_loop, event_create(1, ui_refresh_event, 0));
 }
 
 void ui_resize(int new_width, int new_height)
@@ -188,7 +226,7 @@ void ui_mouse_off(void)
   UI_CALL(mouse_off);
 }
 
-void ui_attach(UI *ui)
+void ui_attach_impl(UI *ui)
 {
   if (ui_count == MAX_UI_COUNT) {
     abort();
@@ -198,7 +236,7 @@ void ui_attach(UI *ui)
   ui_refresh();
 }
 
-void ui_detach(UI *ui)
+void ui_detach_impl(UI *ui)
 {
   size_t shift_index = MAX_UI_COUNT;
 
@@ -221,7 +259,7 @@ void ui_detach(UI *ui)
   }
 
   if (--ui_count) {
-    ui_refresh();
+    ui_schedule_refresh();
   }
 }
 
@@ -363,6 +401,9 @@ static void send_output(uint8_t **ptr)
       UI_CALL(put, NULL, 0);
       col++;
     }
+    if (utf_ambiguous_width(utf_ptr2char(p))) {
+      pending_cursor_update = true;
+    }
     if (col >= width) {
       ui_linefeed();
     }
@@ -490,13 +531,17 @@ static void ui_mode_change(void)
   if (!full_screen) {
     return;
   }
-  /* Get a simple UI mode out of State. */
-  if ((State & REPLACE) == REPLACE)
+  // Get a simple UI mode out of State.
+  if ((State & REPLACE) == REPLACE) {
     mode = REPLACE;
-  else if (State & INSERT)
+  } else if (State & INSERT) {
     mode = INSERT;
-  else
+  } else if (State & CMDLINE) {
+    mode = CMDLINE;
+  } else {
     mode = NORMAL;
+  }
   UI_CALL(mode_change, mode);
   conceal_check_cursur_line();
 }
+
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index 5934d2fee9..d14bc5812c 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -5,6 +5,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "api/private/defs.h"
+
 typedef struct {
   bool bold, underline, undercurl, italic, reverse;
   int foreground, background, special;
@@ -13,7 +15,7 @@ typedef struct {
 typedef struct ui_t UI;
 
 struct ui_t {
-  bool rgb;
+  bool rgb, pum_external;
   int width, height;
   void *data;
   void (*resize)(UI *ui, int rows, int columns);
@@ -39,6 +41,7 @@ struct ui_t {
   void (*suspend)(UI *ui);
   void (*set_title)(UI *ui, char *title);
   void (*set_icon)(UI *ui, char *icon);
+  void (*event)(UI *ui, char *name, Array args, bool *args_consumed);
   void (*stop)(UI *ui);
 };
 
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index fd9d4671e3..25861abc1b 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -1,10 +1,13 @@
-// FIXME(tarruda): This module is very repetitive. It might be a good idea to
-// automatically generate it with a lua script during build
+// UI wrapper that sends requests to the UI thread.
+// Used by the built-in TUI and libnvim-based UIs.
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <limits.h>
 
+#include "nvim/log.h"
+#include "nvim/main.h"
 #include "nvim/vim.h"
 #include "nvim/ui.h"
 #include "nvim/memory.h"
@@ -17,10 +20,30 @@
 
 #define UI(b) (((UIBridgeData *)b)->ui)
 
-// Call a function in the UI thread
-#define UI_CALL(ui, name, argc, ...)                                      \
-  ((UIBridgeData *)ui)->scheduler(                                        \
-    event_create(1, ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui))
+#if MIN_LOG_LEVEL <= DEBUG_LOG_LEVEL
+static size_t        uilog_seen = 0;
+static argv_callback uilog_event = NULL;
+#define UI_CALL(ui, name, argc, ...) \
+  do { \
+    if (uilog_event == ui_bridge_##name##_event) { \
+      uilog_seen++; \
+    } else { \
+      if (uilog_seen > 0) { \
+        DLOG("UI bridge: ...%zu times", uilog_seen); \
+      } \
+      DLOG("UI bridge: " STR(name)); \
+      uilog_seen = 0; \
+      uilog_event = ui_bridge_##name##_event; \
+    } \
+    ((UIBridgeData *)ui)->scheduler( \
+        event_create(1, ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui)); \
+  } while (0)
+#else
+// Schedule a function call on the UI bridge thread.
+#define UI_CALL(ui, name, argc, ...) \
+  ((UIBridgeData *)ui)->scheduler( \
+      event_create(1, ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui))
+#endif
 
 #define INT2PTR(i) ((void *)(uintptr_t)i)
 #define PTR2INT(p) ((int)(uintptr_t)p)
@@ -30,6 +53,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   UIBridgeData *rv = xcalloc(1, sizeof(UIBridgeData));
   rv->ui = ui;
   rv->bridge.rgb = ui->rgb;
+  rv->bridge.pum_external = ui->pum_external;
   rv->bridge.stop = ui_bridge_stop;
   rv->bridge.resize = ui_bridge_resize;
   rv->bridge.clear = ui_bridge_clear;
@@ -71,7 +95,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   }
   uv_mutex_unlock(&rv->mutex);
 
-  ui_attach(&rv->bridge);
+  ui_attach_impl(&rv->bridge);
   return &rv->bridge;
 }
 
@@ -100,12 +124,12 @@ static void ui_bridge_stop(UI *b)
     if (stopped) {
       break;
     }
-    loop_poll_events(&loop, 10);
+    loop_poll_events(&main_loop, 10);
   }
   uv_thread_join(&bridge->ui_thread);
   uv_mutex_destroy(&bridge->mutex);
   uv_cond_destroy(&bridge->cond);
-  ui_detach(b);
+  ui_detach_impl(b);
   xfree(b);
 }
 static void ui_bridge_stop_event(void **argv)
@@ -215,16 +239,16 @@ static void ui_bridge_mode_change_event(void **argv)
 }
 
 static void ui_bridge_set_scroll_region(UI *b, int top, int bot, int left,
-    int right)
+                                        int right)
 {
   UI_CALL(b, set_scroll_region, 5, b, INT2PTR(top), INT2PTR(bot),
-      INT2PTR(left), INT2PTR(right));
+          INT2PTR(left), INT2PTR(right));
 }
 static void ui_bridge_set_scroll_region_event(void **argv)
 {
   UI *ui = UI(argv[0]);
   ui->set_scroll_region(ui, PTR2INT(argv[1]), PTR2INT(argv[2]),
-      PTR2INT(argv[3]), PTR2INT(argv[4]));
+                        PTR2INT(argv[3]), PTR2INT(argv[4]));
 }
 
 static void ui_bridge_scroll(UI *b, int count)
diff --git a/src/nvim/ui_bridge.h b/src/nvim/ui_bridge.h
index 31b9a69216..dba461550f 100644
--- a/src/nvim/ui_bridge.h
+++ b/src/nvim/ui_bridge.h
@@ -1,4 +1,5 @@
-// Bridge used for communication between a builtin UI thread and nvim core
+// Bridge for communication between a UI thread and nvim core.
+// Used by the built-in TUI and libnvim-based UIs.
 #ifndef NVIM_UI_BRIDGE_H
 #define NVIM_UI_BRIDGE_H
 
@@ -11,7 +12,7 @@ typedef struct ui_bridge_data UIBridgeData;
 typedef void(*ui_main_fn)(UIBridgeData *bridge, UI *ui);
 struct ui_bridge_data {
   UI bridge;  // actual UI passed to ui_attach
-  UI *ui;     // UI pointer that will have it's callback called in
+  UI *ui;     // UI pointer that will have its callback called in
               // another thread
   event_scheduler scheduler;
   uv_thread_t ui_thread;
@@ -28,13 +29,13 @@ struct ui_bridge_data {
   bool stopped;
 };
 
-#define CONTINUE(b)                                                    \
-  do {                                                                 \
-    UIBridgeData *d = (UIBridgeData *)b;                               \
-    uv_mutex_lock(&d->mutex);                                          \
-    d->ready = true;                                                   \
-    uv_cond_signal(&d->cond);                                          \
-    uv_mutex_unlock(&d->mutex);                                        \
+#define CONTINUE(b) \
+  do { \
+    UIBridgeData *d = (UIBridgeData *)b; \
+    uv_mutex_lock(&d->mutex); \
+    d->ready = true; \
+    uv_cond_signal(&d->cond); \
+    uv_mutex_unlock(&d->mutex); \
   } while (0)
 
 
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index f16b4264d7..4b267a1627 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -99,6 +99,7 @@
 #include "nvim/quickfix.h"
 #include "nvim/screen.h"
 #include "nvim/sha256.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/types.h"
 #include "nvim/os/os.h"
@@ -690,7 +691,7 @@ char *u_get_undo_file_name(const char *const buf_ffname, const bool reading)
         int ret;
         char *failed_dir;
         if ((ret = os_mkdir_recurse(dir_name, 0755, &failed_dir)) != 0) {
-          EMSG3(_("E926: Unable to create directory \"%s\" for undo file: %s"),
+          EMSG3(_("E5003: Unable to create directory \"%s\" for undo file: %s"),
                 failed_dir, os_strerror(ret));
           xfree(failed_dir);
         } else {
@@ -712,7 +713,7 @@ char *u_get_undo_file_name(const char *const buf_ffname, const bool reading)
 
     // When reading check if the file exists.
     if (undo_file_name != NULL
-        && (!reading || os_file_exists((char_u *)undo_file_name))) {
+        && (!reading || os_path_exists((char_u *)undo_file_name))) {
       break;
     }
     xfree(undo_file_name);
@@ -1094,7 +1095,7 @@ void u_write_undo(const char *const name, const bool forceit, buf_T *const buf,
 
   /* If the undo file already exists, verify that it actually is an undo
    * file, and delete it. */
-  if (os_file_exists((char_u *)file_name)) {
+  if (os_path_exists((char_u *)file_name)) {
     if (name == NULL || !forceit) {
       /* Check we can read it and it's an undo file. */
       fd = os_open(file_name, O_RDONLY, 0);
@@ -1668,7 +1669,7 @@ void u_undo(int count)
     undo_undoes = TRUE;
   else
     undo_undoes = !undo_undoes;
-  u_doit(count);
+  u_doit(count, false);
 }
 
 /*
@@ -1677,15 +1678,58 @@ void u_undo(int count)
  */
 void u_redo(int count)
 {
-  if (vim_strchr(p_cpo, CPO_UNDO) == NULL)
-    undo_undoes = FALSE;
-  u_doit(count);
+  if (vim_strchr(p_cpo, CPO_UNDO) == NULL) {
+    undo_undoes = false;
+  }
+
+  u_doit(count, false);
 }
 
-/*
- * Undo or redo, depending on 'undo_undoes', 'count' times.
- */
-static void u_doit(int startcount)
+/// Undo and remove the branch from the undo tree.
+/// Also moves the cursor (as a "normal" undo would).
+bool u_undo_and_forget(int count)
+{
+  if (curbuf->b_u_synced == false) {
+    u_sync(true);
+    count = 1;
+  }
+  undo_undoes = true;
+  u_doit(count, true);
+
+  if (curbuf->b_u_curhead == NULL) {
+    // nothing was undone.
+    return false;
+  }
+
+  // Delete the current redo header
+  // set the redo header to the next alternative branch (if any)
+  // otherwise we will be in the leaf state
+  u_header_T *to_forget = curbuf->b_u_curhead;
+  curbuf->b_u_newhead = to_forget->uh_next.ptr;
+  curbuf->b_u_curhead = to_forget->uh_alt_next.ptr;
+  if (curbuf->b_u_curhead) {
+    to_forget->uh_alt_next.ptr = NULL;
+    curbuf->b_u_curhead->uh_alt_prev.ptr = to_forget->uh_alt_prev.ptr;
+    curbuf->b_u_seq_cur = curbuf->b_u_curhead->uh_next.ptr ?
+        curbuf->b_u_curhead->uh_next.ptr->uh_seq : 0;
+  } else if (curbuf->b_u_newhead) {
+    curbuf->b_u_seq_cur = curbuf->b_u_newhead->uh_seq;
+  }
+  if (to_forget->uh_alt_prev.ptr) {
+    to_forget->uh_alt_prev.ptr->uh_alt_next.ptr = curbuf->b_u_curhead;
+  }
+  if (curbuf->b_u_newhead) {
+    curbuf->b_u_newhead->uh_prev.ptr = curbuf->b_u_curhead;
+  }
+  if (curbuf->b_u_seq_last == to_forget->uh_seq) {
+    curbuf->b_u_seq_last--;
+  }
+  u_freebranch(curbuf, to_forget, NULL);
+  return true;
+}
+
+/// Undo or redo, depending on `undo_undoes`, `count` times.
+static void u_doit(int startcount, bool quiet)
 {
   int count = startcount;
 
@@ -1721,7 +1765,7 @@ static void u_doit(int startcount)
         break;
       }
 
-      u_undoredo(TRUE);
+      u_undoredo(true);
     } else {
       if (curbuf->b_u_curhead == NULL || get_undolevel() <= 0) {
         beep_flush();           /* nothing to redo */
@@ -1741,7 +1785,7 @@ static void u_doit(int startcount)
       curbuf->b_u_curhead = curbuf->b_u_curhead->uh_prev.ptr;
     }
   }
-  u_undo_end(undo_undoes, FALSE);
+  u_undo_end(undo_undoes, false, quiet);
 }
 
 /*
@@ -2054,7 +2098,7 @@ void undo_time(long step, int sec, int file, int absolute)
       }
     }
   }
-  u_undo_end(did_undo, absolute);
+  u_undo_end(did_undo, absolute, false);
 }
 
 /*
@@ -2278,7 +2322,8 @@ static void u_undoredo(int undo)
   if (undo)
     /* We are below the previous undo.  However, to make ":earlier 1s"
      * work we compute this as being just above the just undone change. */
-    --curbuf->b_u_seq_cur;
+    curbuf->b_u_seq_cur = curhead->uh_next.ptr ?
+        curhead->uh_next.ptr->uh_seq : 0;
 
   /* Remember where we are for ":earlier 1f" and ":later 1f". */
   if (curhead->uh_save_nr != 0) {
@@ -2298,16 +2343,13 @@ static void u_undoredo(int undo)
 #endif
 }
 
-/*
- * If we deleted or added lines, report the number of less/more lines.
- * Otherwise, report the number of changes (this may be incorrect
- * in some cases, but it's better than nothing).
- */
-static void 
-u_undo_end (
-    int did_undo,                   /* just did an undo */
-    int absolute                   /* used ":undo N" */
-)
+/// If we deleted or added lines, report the number of less/more lines.
+/// Otherwise, report the number of changes (this may be incorrect
+/// in some cases, but it's better than nothing).
+static void u_undo_end(
+    int did_undo,     ///< just did an undo
+    int absolute,     ///< used ":undo N"
+    bool quiet)
 {
   char        *msgstr;
   u_header_T  *uhp;
@@ -2316,9 +2358,11 @@ u_undo_end (
   if ((fdo_flags & FDO_UNDO) && KeyTyped)
     foldOpenCursor();
 
-  if (global_busy           /* no messages now, wait until global is finished */
-      || !messaging())        /* 'lazyredraw' set, don't do messages now */
+  if (quiet
+      || global_busy        // no messages until global is finished
+      || !messaging()) {    // 'lazyredraw' set, don't do messages now
     return;
+  }
 
   if (curbuf->b_ml.ml_flags & ML_EMPTY)
     --u_newcount;
@@ -2507,20 +2551,20 @@ static void u_add_time(char_u *buf, size_t buflen, time_t tt)
  */
 void ex_undojoin(exarg_T *eap)
 {
-  if (curbuf->b_u_newhead == NULL)
-    return;                 /* nothing changed before */
+  if (curbuf->b_u_newhead == NULL) {
+    return;                 // nothing changed before
+  }
   if (curbuf->b_u_curhead != NULL) {
     EMSG(_("E790: undojoin is not allowed after undo"));
     return;
   }
-  if (!curbuf->b_u_synced)
-    return;                 /* already unsynced */
-  if (get_undolevel() < 0)
-    return;                 /* no entries, nothing to do */
-  else {
-    /* Go back to the last entry */
-    curbuf->b_u_curhead = curbuf->b_u_newhead;
-    curbuf->b_u_synced = false;      /* no entries, nothing to do */
+  if (!curbuf->b_u_synced) {
+    return;                 // already unsynced
+  }
+  if (get_undolevel() < 0) {
+    return;                 // no entries, nothing to do
+  } else {
+    curbuf->b_u_synced = false;  // Append next change to last entry
   }
 }
 
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 23bfca6221..a12621d06f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -7,24 +7,22 @@
 #include <assert.h>
 #include <limits.h>
 
+#include "nvim/api/private/helpers.h"
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/iconv.h"
 #include "nvim/version.h"
 #include "nvim/charset.h"
+#include "nvim/macros.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/message.h"
-#include "nvim/misc2.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 
 // version info generated by the build system
 #include "auto/versiondef.h"
 
-#define STR_(x) #x
-#define STR(x) STR_(x)
-
 // for ":version", ":intro", and "nvim --version"
 #ifndef NVIM_VERSION_MEDIUM
 #define NVIM_VERSION_MEDIUM STR(NVIM_VERSION_MAJOR) "." STR(NVIM_VERSION_MINOR)\
@@ -64,81 +62,840 @@ static char *features[] = {
 #else
   "-jemalloc",
 #endif
+
+#ifdef FEAT_TUI
+  "+tui",
+#else
+  "-tui",
+#endif
   NULL
 };
 
 // clang-format off
 static int included_patches[] = {
+  // 2367,
+  // 2366 NA
+  // 2365 NA
+  // 2364,
+  // 2363 NA
+  // 2362,
+  // 2361 NA
+  // 2360,
+  // 2359 NA
+  // 2358 NA
+  // 2357,
+  // 2356,
+  // 2355,
+  // 2354,
+  // 2353,
+  // 2352 NA
+  // 2351 NA
+  // 2350,
+  // 2349,
+  // 2348,
+  // 2347,
+  // 2346,
+  // 2345 NA
+  // 2344 NA
+  // 2343,
+  // 2342 NA
+  // 2341,
+  // 2340 NA
+  // 2339,
+  // 2338 NA
+  2337,
+  // 2336,
+  2335,
+  // 2334,
+  // 2333,
+  // 2332 NA
+  2331,
+  // 2330,
+  // 2329,
+  // 2328,
+  // 2327 NA
+  // 2326,
+  // 2325 NA
+  // 2324,
+  // 2323,
+  // 2322,
+  2321,
+  // 2320,
+  // 2319 NA
+  // 2318,
+  // 2317,
+  // 2316 NA
+  // 2315,
+  2314,
+  2313,
+  2312,
+  // 2311 NA
+  // 2310 NA
+  2309,
+  // 2308 NA
+  // 2307,
+  // 2306,
+  // 2305,
+  // 2304 NA
+  // 2303,
+  // 2302 NA
+  // 2301 NA
+  2300,
+  // 2299,
+  // 2298 NA
+  // 2297 NA
+  // 2296,
+  // 2295,
+  2294,
+  // 2293,
+  // 2292,
+  // 2291,
+  // 2290 NA
+  // 2289 NA
+  // 2288 NA
+  // 2287 NA
+  // 2286 NA
+  // 2285 NA
+  2284,
+  // 2283,
+  // 2282 NA
+  // 2281 NA
+  // 2280,
+  // 2279,
+  // 2278 NA
+  2277,
+  // 2276,
+  // 2275,
+  2274,
+  2273,
+  2272,
+  // 2271 NA
+  // 2270 NA
+  // 2269,
+  // 2268,
+  // 2267 NA
+  // 2266,
+  // 2265,
+  // 2264,
+  // 2263,
+  // 2262 NA
+  // 2261 NA
+  // 2260 NA
+  // 2259,
+  // 2258 NA
+  // 2257 NA
+  // 2256,
+  // 2255,
+  // 2254 NA
+  // 2253 NA
+  // 2252 NA
+  2251,
+  // 2250,
+  // 2249,
+  // 2248,
+  // 2247 NA
+  // 2246,
+  // 2245,
+  // 2244,
+  // 2243 NA
+  // 2242,
+  // 2241,
+  // 2240,
+  // 2239,
+  // 2238 NA
+  2237,
+  // 2236,
+  // 2235,
+  // 2234 NA
+  // 2233,
+  // 2232 NA
+  // 2231,
+  // 2230,
+  // 2229,
+  // 2228,
+  2227,
+  2226,
+  2225,
+  // 2224,
+  // 2223,
+  // 2222,
+  // 2221,
+  // 2220,
+  2219,
+  // 2218 NA
+  2217,
+  // 2216 NA
+  2215,
+  // 2214 NA
+  2213,
+  2212,
+  // 2211 NA
+  // 2210 NA
+  // 2209,
+  // 2208,
+  // 2207 NA
+  // 2206 NA
+  2205,
+  2204,
+  // 2203 NA
+  // 2202 NA
+  2201,
+  // 2200,
+  // 2199 NA
+  // 2198 NA
+  // 2197,
+  // 2196,
+  // 2195 NA
+  2194,
+  // 2193 NA
+  // 2192 NA
+  // 2191 NA
+  // 2190,
+  // 2189,
+  2188,
+  // 2187,
+  // 2186 NA
+  // 2185,
+  // 2184,
+  2183,
+  // 2182 NA
+  // 2181,
+  // 2180,
+  // 2179,
+  // 2178,
+  // 2177,
+  // 2176 NA
+  // 2175,
+  2174,
+  // 2173,
+  // 2172,
+  // 2171,
+  // 2170,
+  // 2169,
+  // 2168 NA
+  // 2167 NA
+  // 2166 NA
+  // 2165,
+  // 2164,
+  2163,
+  2162,
+  // 2161,
+  2160,
+  // 2159,
+  2158,
+  // 2157 NA
+  // 2156 NA
+  // 2155 NA
+  // 2154 NA
+  // 2153 NA
+  // 2152,
+  // 2151,
+  // 2150 NA
+  2149,
+  // 2148,
+  2147,
+  2146,
+  // 2145 NA
+  // 2144,
+  // 2143,
+  // 2142,
+  // 2141,
+  // 2140 NA
+  // 2139,
+  // 2138 NA
+  // 2137,
+  // 2136,
+  // 2135,
+  // 2134,
+  // 2133 NA
+  // 2132 NA
+  // 2131 NA
+  // 2130 NA
+  // 2129 NA
+  2128,
+  2127,
+  2126,
+  // 2125 NA
+  2124,
+  2123,
+  // 2122 NA
+  // 2121,
+  // 2120,
+  // 2119,
+  // 2118 NA
+  2117,
+  // 2116 NA
+  // 2115 NA
+  // 2114 NA
+  // 2113,
+  2112,
+  // 2111,
+  2110,
+  2109,
+  // 2108 NA
+  // 2107,
+  // 2106,
+  // 2105 NA
+  // 2104,
+  2103,
+  // 2102 NA
+  // 2101,
+  2100,
+  2099,
+  // 2098,
+  // 2097,
+  // 2096,
+  // 2095,
+  // 2094 NA
+  // 2093 NA
+  // 2092 NA
+  // 2091 NA
+  // 2090,
+  // 2089 NA
+  // 2088,
+  // 2087,
+  2086,
+  // 2085,
+  // 2084,
+  // 2083,
+  // 2082,
+  2081,
+  // 2080,
+  // 2079 NA
+  // 2078 NA
+  2077,
+  // 2076,
+  2075,
+  2074,
+  // 2073 NA
+  // 2072,
+  2071,
+  // 2070 NA
+  // 2069,
+  // 2068,
+  2067,
+  2066,
+  2065,
+  2064,
+  // 2063 NA
+  2062,
+  // 2061,
+  // 2060 NA
+  // 2059 NA
+  // 2058,
+  // 2057 NA
+  // 2056 NA
+  // 2055 NA
+  // 2054 NA
+  // 2053 NA
+  // 2052 NA
+  // 2051,
+  2050,
+  2049,
+  // 2048 NA
+  // 2047,
+  // 2046,
+  // 2045 NA
+  // 2044,
+  2043,
+  // 2042 NA
+  // 2041 NA
+  // 2040 NA
+  // 2039 NA
+  // 2038 NA
+  // 2037 NA
+  2036,
+  // 2035 NA
+  // 2034 NA
+  2033,
+  // 2032 NA
+  2031,
+  // 2030 NA
+  // 2029,
+  2028,
+  // 2027 NA
+  // 2026 NA
+  // 2025 NA
+  // 2024,
+  // 2023,
+  // 2022,
+  // 2021,
+  // 2020 NA
+  2019,
+  // 2018,
+  // 2017,
+  // 2016 NA
+  2015,
+  2014,
+  2013,
+  2012,
+  2011,
+  2010,
+  2009,
+  2008,
+  2007,
+  2006,
+  2005,
+  // 2004 NA
+  // 2003 NA
+  // 2002,
+  // 2001 NA
+  2000,
+  1999,
+  // 1998 NA
+  1997,
+  1996,
+  // 1995 NA
+  // 1994,
+  // 1993,
+  // 1992,
+  // 1991,
+  1990,
+  // 1989,
+  // 1988 NA
+  // 1987 NA
+  // 1986,
+  // 1985 NA
+  1984,
+  // 1983 NA
+  // 1982 NA
+  // 1981,
+  1980,
+  // 1979,
+  // 1978,
+  // 1977,
+  // 1976,
+  // 1975,
+  // 1974 NA
+  1973,
+  // 1972 NA
+  1971,
+  1970,
+  // 1969 NA
+  1968,
+  1967,
+  1966,
+  // 1965 NA
+  1964,
+  // 1963 NA
+  // 1962,
+  1961,
+  1960,
+  // 1959 NA
+  // 1958 NA
+  // 1957 NA
+  1956,
+  // 1955 NA
+  // 1954,
+  1953,
+  1952,
+  // 1951 NA
+  1950,
+  1949,
+  // 1948,
+  // 1947 NA
+  // 1946 NA
+  // 1945 NA
+  // 1944 NA
+  // 1943 NA
+  // 1942 NA
+  1941,
+  1940,
+  // 1939 NA
+  // 1938 NA
+  1937,
+  // 1936 NA
+  // 1935 NA
+  // 1934 NA
+  // 1933 NA
+  // 1932 NA
+  // 1931 NA
+  // 1930 NA
+  // 1929 NA
+  1928,
+  // 1927 NA
+  // 1926 NA
+  1925,
+  // 1924 NA
+  1923,
+  // 1922 NA
+  // 1921 NA
+  // 1920 NA
+  // 1919 NA
+  // 1918 NA
+  // 1917 NA
+  // 1916 NA
+  // 1915 NA
+  // 1914 NA
+  1913,
+  1912,
+  // 1911 NA
+  1910,
+  1909,
+  // 1908 NA
+  // 1907 NA
+  // 1906 NA
+  // 1905 NA
+  // 1904 NA
+  // 1903 NA
+  // 1902 NA
+  // 1901 NA
+  1900,
+  // 1899 NA
+  1898,
+  1897,
+  1896,
+  1895,
+  1894,
+  1893,
+  1892,
+  // 1891 NA
+  // 1890 NA
+  1889,
+  // 1888 NA
+  // 1887 NA
+  // 1886 NA
+  // 1885 NA
+  1884,
+  // 1883 NA
+  1882,
+  1881,
+  // 1880 NA
+  // 1879 NA
+  // 1878 NA
+  // 1877 NA
+  1876,
+  1875,
+  // 1874 NA
+  // 1873 NA
+  // 1872 NA
+  1871,
+  // 1870 NA
+  // 1869 NA
+  1868,
+  1867,
+  1866,
+  // 1865 NA
+  // 1864 NA
+  // 1863 NA
+  // 1862 NA
+  1861,
+  1860,
+  // 1859 NA
+  // 1858 NA
+  // 1857 NA
+  // 1856 NA
+  // 1855 NA
+  // 1854 NA
+  // 1853 NA
+  // 1852 NA
+  1851,
+  // 1850 NA
+  // 1849 NA
+  // 1848 NA
+  1847,
+  // 1846 NA
+  // 1845 NA
+  // 1844 NA
+  // 1843 NA
+  1842,
+  1841,
+  1840,
+  1839,
+  1838,
+  1837,
+  1836,
+  1835,
+  1834,
+  1833,
   1832,
+  1831,
+  // 1830 NA
+  // 1829 NA
+  // 1828 NA
+  // 1827 NA
+  // 1826 NA
+  // 1825 NA
+  // 1824 NA
+  1823,
+  // 1822 NA
+  1821,
+  1820,
+  // 1819 NA
+  1818,
+  // 1817 NA
+  1816,
+  1815,
+  // 1814 NA
+  1813,
+  // 1812 NA
+  // 1811 NA
+  // 1810 NA
   1809,
   1808,
+  // 1807 NA
   1806,
+  // 1805 NA
+  // 1804 NA
+  // 1803 NA
+  1802,
+  // 1801 NA
+  // 1800 NA
   1799,
+  // 1798 NA
+  // 1797 NA
+  // 1796 NA
+  // 1795 NA
+  // 1794 NA
+  1793,
+  // 1792 NA
+  // 1791 NA
+  // 1790 NA
+  // 1789 NA
+  // 1789 NA
+  // 1788 NA
+  // 1787 NA
+  // 1786 NA
+  1785,
+  // 1784 NA
+  1783,
+  1782,
+  1781,
+  1780,
+  1779,
+  // 1778 NA
+  // 1777 NA
+  // 1776 NA
+  // 1775 NA
+  // 1774 NA
+  // 1773 NA
+  // 1772 NA
+  // 1771 NA
+  // 1770 NA
+  // 1769 NA
+  1768,
+  // 1767 NA
+  // 1766 NA
+  1765,
+  // 1764 NA
+  1763,
+  // 1762 NA
+  // 1761 NA
+  // 1760 NA
+  1759,
+  1758,
   1757,
+  // 1756 NA
   1755,
+  1754,
   1753,
+  1752,
+  1751,
+  // 1750 NA
+  // 1749 NA
+  1748,
+  // 1747 NA
+  // 1746 NA
+  // 1745 NA
+  // 1744 NA
+  // 1743 NA
+  1742,
+  1741,
+  1740,
+  1739,
+  1738,
+  // 1737 NA
+  // 1736 NA
+  1735,
+  1734,
+  // 1733 NA
+  1732,
+  // 1731 NA
+  1730,
+  // 1729 NA
   1728,
+  // 1727 NA
+  // 1726 NA
+  // 1725 NA
+  // 1724 NA
+  1723,
+  // 1722 NA
+  // 1721 NA
+  // 1720 NA
+  1719,
+  1718,
+  // 1717 NA
+  1716,
+  1715,
+  1714,
+  // 1713 NA
+  1712,
+  1711,
+  // 1710 NA
+  // 1709 NA
+  1708,
+  1707,
+  // 1706 NA
+  // 1705 NA
+  1704,
+  1703,
+  1702,
+  1701,
+  1700,
+  1699,
+  // 1698 NA
+  1697,
+  1696,
+  1695,
+  // 1694 NA
+  // 1693 NA
+  1692,
+  1691,
+  // 1690 NA
+  // 1689 NA
+  // 1688 NA
+  // 1687 NA
+  1686,
+  1685,
+  // 1684 NA
+  // 1683 NA
+  1682,
+  1681,
+  // 1680 NA
+  1679,
+  // 1678 NA
+  // 1677 NA
+  1676,
+  1675,
+  // 1674 NA
+  1673,
+  // 1672 NA
+  1671,
+  1670,
+  // 1669 NA
+  // 1668 NA
+  // 1667 NA
+  // 1666 NA
+  // 1665 NA
+  1664,
+  1663,
+  // 1662 NA
+  // 1661 NA
+  1660,
+  // 1659 NA
+  1658,
+  // 1657 NA
+  1656,
+  // 1655 NA
   1654,
+  // 1653 NA
   1652,
+  // 1651 NA
+  1650,
+  1649,
+  1648,
+  1647,
+  // 1646 NA
+  1645,
+  // 1644 NA
   1643,
+  1642,
   1641,
-
+  1640,
+  1639,
+  1638,
+  // 1637 NA
+  // 1636 NA
+  // 1635 NA
+  1634,
+  // 1633 NA
+  // 1632 NA
+  // 1631 NA
+  1630,
+  1629,
+  // 1628 NA
+  // 1627 NA
+  // 1626 NA
+  // 1625 NA
+  // 1624 NA
+  // 1623 NA
+  // 1622 NA
+  // 1621 NA
+  1620,
+  1619,
+  // 1618 NA
+  // 1617 NA
+  // 1616 NA
+  // 1615 NA
+  1614,
+  // 1613 NA
+  // 1612 NA
+  // 1611 NA
+  // 1610 NA
+  // 1609 NA
+  1608,
+  1607,
+  1606,
+  1605,
+  1604,
+  1603,
+  // 1602 NA
+  // 1601 NA
   // 1600 NA
   // 1599 NA
   // 1598 NA
   // 1597 NA
-  // 1596,
+  1596,
   // 1595 NA
   // 1594 NA
   // 1593 NA
-  // 1592,
-  // 1591,
-  // 1590,
-  // 1589,
-  // 1588,
+  1592,
+  1591,
+  1590,
+  1589,
+  1588,
   // 1587 NA
-  // 1586,
-  // 1585,
+  1586,
+  1585,
   // 1584 NA
   // 1583 NA
-  // 1582,
-
-  // 1581,
-  // 1580,
-  // 1579,
-  // 1578,
-  // 1577,
+  1582,
+  1581,
+  1580,
+  // 1579 NA
+  1578,
+  1577,
   1576,
   // 1575 NA
   1574,
-  // 1573,
+  // 1573 NA
   // 1572 NA
   1571,
   1570,
   1569,
   1568,
-  // 1567,
+  1567,
   // 1566 NA
-  // 1565,
-  // 1564,
-  // 1563,
+  1565,
+  1564,
+  1563,
   // 1562 NA
   // 1561 NA
-  // 1560,
-  // 1559,
-  // 1558,
-  // 1557,
-  // 1556,
-  // 1555,
-  // 1554,
-  // 1553,
-  // 1552,
-  // 1551,
-  // 1550,
-  // 1549,
-  // 1548,
-  // 1547,
-  // 1546,
+  // 1560 NA
+  1559,
+  1558,
+  1557,
+  // 1556 NA
+  // 1555 NA
+  1554,
+  1553,
+  1552,
+  1551,
+  1550,
+  1549,
+  1548,
+  1547,
+  1546,
   // 1545 NA
   // 1544 NA
   // 1543 NA
@@ -149,14 +906,14 @@ static int included_patches[] = {
   // 1538 NA
   // 1537 NA
   // 1536 NA
-  // 1535,
+  1535,
   // 1534 NA
-  // 1533,
+  1533,
   // 1532 NA
   // 1531 NA
   // 1530 NA
   // 1529 NA
-  // 1528,
+  1528,
   // 1527 NA
   // 1526 NA
   // 1525 NA
@@ -185,29 +942,29 @@ static int included_patches[] = {
   // 1502 NA
   // 1501 NA
   1500,
-  // 1499,
+  1499,
   // 1498 NA
   // 1497 NA
   // 1496 NA
   // 1495 NA
-  // 1494,
+  1494,
   // 1493 NA
-  // 1492,
-  // 1491,
+  1492,
+  1491,
   // 1490 NA
   // 1489 NA
   // 1488 NA
   // 1487 NA
-  // 1486,
+  1486,
   // 1485 NA
   // 1484 NA
   // 1483 NA
   // 1482 NA
   // 1481 NA
-  // 1480,
-  // 1479,
-  // 1478,
-  // 1477,
+  1480,
+  1479,
+  1478,
+  1477,
   // 1476 NA
   // 1475 NA
   // 1474 NA
@@ -216,11 +973,11 @@ static int included_patches[] = {
   // 1471 NA
   // 1470 NA
   // 1469 NA
-  // 1468,
+  1468,
   // 1467 NA
   // 1466 NA
   // 1465 NA
-  // 1464,
+  1464,
   // 1463 NA
   // 1462 NA
   // 1461 NA
@@ -228,7 +985,7 @@ static int included_patches[] = {
   // 1459 NA
   // 1458 NA
   // 1457 NA
-  // 1456,
+  // 1456 NA
   // 1455 NA
   // 1454 NA
   // 1453 NA
@@ -287,20 +1044,20 @@ static int included_patches[] = {
   // 1400 NA
   // 1399 NA
   // 1398 NA
-  // 1397,
-  // 1396,
+  1397,
+  1396,
   // 1395 NA
-  // 1394,
+  1394,
   // 1393 NA
   // 1392 NA
   // 1391 NA
   // 1390 NA
   // 1389 NA
-  // 1388,
+  1388,
   // 1387 NA
   // 1386 NA
   // 1385 NA
-  // 1384,
+  1384,
   // 1383 NA
   // 1382 NA
   // 1381 NA
@@ -319,7 +1076,7 @@ static int included_patches[] = {
   // 1368 NA
   // 1367 NA
   1366,
-  // 1365,
+  1365,
   // 1364 NA
   // 1363 NA
   // 1362 NA
@@ -332,7 +1089,7 @@ static int included_patches[] = {
   // 1355 NA
   // 1354 NA
   // 1353 NA
-  // 1352,
+  1352,
   // 1351 NA
   // 1350 NA
   // 1349 NA
@@ -379,7 +1136,7 @@ static int included_patches[] = {
   // 1308 NA
   // 1307 NA
   // 1306 NA
-  // 1305,
+  1305,
   1304,
   // 1303 NA
   // 1302 NA
@@ -403,22 +1160,22 @@ static int included_patches[] = {
   1284,
   // 1283 NA
   1282,
-  // 1281,
+  1281,
   // 1280 NA
   // 1279 NA
   // 1278 NA
   // 1277 NA
-  // 1276,
+  1276,
   // 1275 NA
   // 1274 NA
-  // 1273,
+  // 1273 NA
   // 1272 NA
   1271,
   // 1270 NA
   1269,
   // 1268 NA
   1267,
-  // 1266
+  1266,
   // 1265 NA
   // 1264 NA
   // 1263 NA
@@ -447,7 +1204,7 @@ static int included_patches[] = {
   // 1240 NA
   // 1239 NA
   // 1238 NA
-  // 1237,
+  1237,
   1236,
   // 1235 NA
   // 1234 NA
@@ -461,7 +1218,7 @@ static int included_patches[] = {
   // 1226 NA
   // 1225 NA
   // 1224 NA
-  // 1223,
+  1223,
   // 1222 NA
   // 1221 NA
   // 1220 NA
@@ -498,14 +1255,14 @@ static int included_patches[] = {
   // 1189 NA
   // 1188 NA
   // 1187 NA
-  // 1186,
+  // 1186 NA
   // 1185 NA
   // 1184 NA
   // 1183 NA
   // 1182 NA
   1181,
   1180,
-  // 1179,
+  1179,
   1178,
   // 1177 NA
   // 1176 NA
@@ -523,7 +1280,7 @@ static int included_patches[] = {
   1164,
   1163,
   // 1162 NA
-  // 1161,
+  1161,
   1160,
   // 1159 NA
   // 1158 NA
@@ -531,41 +1288,41 @@ static int included_patches[] = {
   // 1156 NA
   // 1155 NA
   // 1154 NA
-  // 1153,
+  1153,
   // 1152 NA
-  // 1151,
-  // 1150,
+  1151,
+  1150,
   1149,
   // 1148 NA
-  // 1147,
+  1147,
   // 1146 NA
   // 1145 NA
   1144,
   1143,
-  // 1142,
+  1142,
   1141,
-  // 1140,
+  1140,
   // 1139 NA
   // 1138 NA
   1137,
-  // 1136,
+  1136,
   // 1135 NA
   // 1134 NA
   // 1133 NA
-  // 1132,
+  1132,
   // 1131 NA
-  // 1130,
+  // 1130 NA
   // 1129 NA
   // 1128 NA
   // 1127 NA
-  // 1126,
+  1126,
   // 1125 NA
   // 1124 NA
-  // 1123,
+  1123,
   // 1122 NA
-  // 1121,
+  1121,
   1120,
-  // 1119,
+  1119,
   1118,
   1117,
   1116,
@@ -573,10 +1330,10 @@ static int included_patches[] = {
   1114,
   1113,
   1112,
-  // 1111,
+  1111,
   1110,
   // 1109 NA
-  // 1108,
+  1108,
   1107,
   // 1106 NA
   1105,
@@ -587,14 +1344,14 @@ static int included_patches[] = {
   // 1100 NA
   // 1099 NA
   // 1098 NA
-  // 1097,
-  // 1096,
+  // 1097 NA
+  1096,
   // 1095 NA
-  // 1094,
+  1094,
   1093,
   1092,
   1091,
-  // 1090,
+  1090,
   1089,
   1088,
   1087,
@@ -605,35 +1362,35 @@ static int included_patches[] = {
   // 1082 NA
   1081,
   // 1080 NA
-  // 1079,
+  // 1079 NA
   // 1078 NA
   // 1077 NA
   1076,
   1075,
-  // 1074 NA,
-  // 1073,
+  // 1074 NA
+  // 1073 NA
   1072,
-  // 1071,
+  1071,
   // 1070 NA
   // 1069 NA
-  // 1068,
+  1068,
   // 1067 NA
   // 1066 NA
   1065,
-  // 1064,
+  1064,
   // 1063 NA
   // 1062 NA
   1061,
   // 1060 NA
   1059,
-  // 1058,
+  // 1058 NA
   1057,
-  // 1056,
+  1056,
   1055,
   1054,
-  // 1053,
+  1053,
   1052,
-  // 1051,
+  1051,
   1050,
   1049,
   1048,
@@ -645,7 +1402,7 @@ static int included_patches[] = {
   1042,
   1041,
   // 1040 NA
-  // 1039,
+  // 1039 NA
   // 1038 NA
   1037,
   1036,
@@ -653,7 +1410,7 @@ static int included_patches[] = {
   1034,
   // 1033 NA
   1032,
-  // 1031 NA,
+  // 1031 NA
   1030,
   1029,
   // 1028 NA
@@ -674,15 +1431,15 @@ static int included_patches[] = {
   1013,
   // 1012 NA
   // 1011 NA
-  // 1010 NA,
+  // 1010 NA
   // 1009 NA
   // 1008 NA
   1007,
   1006,
-  // 1005 NA,
-  // 1004 NA,
-  // 1003 NA,
-  // 1002 NA,
+  // 1005 NA
+  // 1004 NA
+  // 1003 NA
+  // 1002 NA
   1001,
   1000,
   // 999 NA
@@ -780,7 +1537,7 @@ static int included_patches[] = {
   // 907 NA
   // 906 NA
   // 905 NA
-  // 904 NA
+  904,
   903,
   // 902 NA
   901,
@@ -1698,20 +2455,72 @@ static char *(extra_patches[]) = {
   NULL
 };
 
-/// Checks whether patch `n` has been included.
+/// Compares a version string to the current Nvim version.
 ///
-/// @param n The patch number.
+/// @param version Version string like "1.3.42"
 ///
-/// @return TRUE if patch "n" has been included.
-int has_patch(int n)
+/// @return true if Nvim is at or above the version.
+bool has_nvim_version(char *version_str)
+  FUNC_ATTR_NONNULL_ALL
 {
-  int i;
-  for (i = 0; included_patches[i] != 0; ++i) {
+  char *p   = version_str;
+  int major = 0;
+  int minor = 0;
+  int patch = 0;
+
+  if (!ascii_isdigit(*p)) {
+    return false;
+  }
+  major = atoi(p);
+  p     = strchr(p, '.');  // Find the next dot.
+
+  if (p) {
+    p++;  // Advance past the dot.
+    if (!ascii_isdigit(*p)) {
+      return false;
+    }
+    minor = atoi(p);
+    p     = strchr(p, '.');
+    if (p) {
+      p++;
+      if (!ascii_isdigit(*p)) {
+        return false;
+      }
+      patch = atoi(p);
+    }
+  }
+
+  return (major < NVIM_VERSION_MAJOR
+          || (major == NVIM_VERSION_MAJOR
+              && (minor < NVIM_VERSION_MINOR
+                  || (minor == NVIM_VERSION_MINOR
+                      && patch <= NVIM_VERSION_PATCH))));
+}
+
+/// Checks whether a Vim patch has been included.
+///
+/// @param n Patch number.
+///
+/// @return true if patch `n` has been included.
+bool has_vim_patch(int n)
+{
+  for (int i = 0; included_patches[i] != 0; i++) {
     if (included_patches[i] == n) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
+}
+
+Dictionary version_dict(void) {
+  Dictionary d = ARRAY_DICT_INIT;
+  PUT(d, "major", INTEGER_OBJ(NVIM_VERSION_MAJOR));
+  PUT(d, "minor", INTEGER_OBJ(NVIM_VERSION_MINOR));
+  PUT(d, "patch", INTEGER_OBJ(NVIM_VERSION_PATCH));
+  PUT(d, "api_level", INTEGER_OBJ(NVIM_API_LEVEL));
+  PUT(d, "api_compatible", INTEGER_OBJ(NVIM_API_LEVEL_COMPAT));
+  PUT(d, "api_prerelease", BOOLEAN_OBJ(NVIM_API_PRERELEASE));
+  return d;
 }
 
 void ex_version(exarg_T *eap)
@@ -1770,7 +2579,11 @@ static void list_features(void)
         }
       } else {
         while (msg_col % width) {
+          int old_msg_col = msg_col;
           msg_putchar(' ');
+          if (old_msg_col == msg_col) {
+            break;  // XXX: Avoid infinite loop.
+          }
         }
       }
     } else {
@@ -1893,23 +2706,16 @@ void intro_message(int colon)
     N_(NVIM_VERSION_LONG),
     "",
     N_("by Bram Moolenaar et al."),
-    N_("Vim is open source and freely distributable"),
-    "",
-    N_("First time using a vi-like editor?"),
-    N_("Type :Tutor<Enter> to get started!"),
+    N_("Nvim is open source and freely distributable"),
+    N_("https://neovim.io/community"),
     "",
-    N_("Already know your way around Vim?"),
-    N_("See :help nvim-intro for an introduction to Neovim."),
-    "",
-    N_("Still have questions?"),
-    N_("Reach out to the Neovim community at neovim.io/community."),
+    N_("type  :help nvim<Enter>       if you are new! "),
+    N_("type  :CheckHealth<Enter>     to optimize Nvim"),
+    N_("type  :q<Enter>               to exit         "),
+    N_("type  :help<Enter>            for help        "),
     "",
     N_("Help poor children in Uganda!"),
     N_("type  :help iccf<Enter>       for information "),
-    "",
-    N_("type  :q<Enter>               to exit         "),
-    N_("type  :help<Enter>  or  <F1>  for on-line help"),
-    N_("type  :help nvim<Enter>       for Neovim help "),
   };
 
   // blanklines = screen height - # message lines
@@ -2011,3 +2817,4 @@ void ex_intro(exarg_T *eap)
   intro_message(TRUE);
   wait_return(TRUE);
 }
+
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 165a44a148..458d23fcad 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -104,6 +104,7 @@ Error: configure did not run properly.Check auto/config.log.
 #define CONFIRM         0x800   /* ":confirm" prompt */
 #define SELECTMODE      0x1000  /* Select mode, only for mappings */
 #define TERM_FOCUS      0x2000  // Terminal focus mode
+#define CMDPREVIEW      0x4000  // Showing 'inccommand' command "live" preview.
 
 // all mode bits used for mapping
 #define MAP_ALL_MODES   (0x3f | SELECTMODE | TERM_FOCUS)
@@ -122,6 +123,14 @@ Error: configure did not run properly.Check auto/config.log.
 #define FAIL                    0
 #define NOTDONE                 2   /* not OK or FAIL but skipped */
 
+// Type values for type().
+#define VAR_TYPE_NUMBER     0
+#define VAR_TYPE_STRING     1
+#define VAR_TYPE_FUNC       2
+#define VAR_TYPE_LIST       3
+#define VAR_TYPE_DICT       4
+#define VAR_TYPE_FLOAT      5
+#define VAR_TYPE_BOOL       6
 
 /*
  * values for xp_context when doing command line completion
@@ -174,6 +183,7 @@ enum {
   EXPAND_USER,
   EXPAND_SYNTIME,
   EXPAND_USER_ADDR_TYPE,
+  EXPAND_PACKADD,
 };
 
 
@@ -259,6 +269,7 @@ enum {
 
 #define STRCAT(d, s)        strcat((char *)(d), (char *)(s))
 #define STRNCAT(d, s, n)    strncat((char *)(d), (char *)(s), (size_t)(n))
+#define STRLCAT(d, s, n)    xstrlcat((char *)(d), (char *)(s), (size_t)(n))
 
 # define vim_strpbrk(s, cs) (char_u *)strpbrk((char *)(s), (char *)(cs))
 
@@ -307,4 +318,15 @@ enum {
 # define SET_NO_HLSEARCH(flag) no_hlsearch = (flag); set_vim_var_nr( \
     VV_HLSEARCH, !no_hlsearch && p_hls)
 
+// Used for flags in do_in_path()
+#define DIP_ALL 0x01    // all matches, not just the first one
+#define DIP_DIR 0x02    // find directories instead of files
+#define DIP_ERR 0x04    // give an error message when none found
+#define DIP_START 0x08  // also use "start" directory in 'packpath'
+#define DIP_OPT 0x10    // also use "opt" directory in 'packpath'
+#define DIP_NORTP 0x20  // do not use 'runtimepath'
+
+// Lowest number used for window ID. Cannot have this many windows per tab.
+#define LOWEST_WIN_ID 1000
+
 #endif /* NVIM_VIM_H */
diff --git a/src/nvim/window.c b/src/nvim/window.c
index bea55c465f..801969a594 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -28,7 +28,6 @@
 #include "nvim/memory.h"
 #include "nvim/message.h"
 #include "nvim/misc1.h"
-#include "nvim/misc2.h"
 #include "nvim/file_search.h"
 #include "nvim/garray.h"
 #include "nvim/move.h"
@@ -41,6 +40,7 @@
 #include "nvim/regexp.h"
 #include "nvim/screen.h"
 #include "nvim/search.h"
+#include "nvim/state.h"
 #include "nvim/strings.h"
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
@@ -129,9 +129,10 @@ newwindow:
       vim_snprintf(cbuf, sizeof(cbuf) - 5, "%" PRId64, (int64_t)Prenum);
     else
       cbuf[0] = NUL;
-    if (nchar == 'v' || nchar == Ctrl_V)
-      strcat(cbuf, "v");
-    strcat(cbuf, "new");
+    if (nchar == 'v' || nchar == Ctrl_V) {
+      xstrlcat(cbuf, "v", sizeof(cbuf));
+    }
+    xstrlcat(cbuf, "new", sizeof(cbuf));
     do_cmdline_cmd(cbuf);
     break;
 
@@ -251,11 +252,14 @@ newwindow:
       if (win_new_tabpage((int)Prenum, NULL) == OK
           && valid_tabpage(oldtab)) {
         newtab = curtab;
-        goto_tabpage_tp(oldtab, TRUE, TRUE);
-        if (curwin == wp)
-          win_close(curwin, FALSE);
-        if (valid_tabpage(newtab))
-          goto_tabpage_tp(newtab, TRUE, TRUE);
+        goto_tabpage_tp(oldtab, true, true);
+        if (curwin == wp) {
+          win_close(curwin, false);
+        }
+        if (valid_tabpage(newtab)) {
+          goto_tabpage_tp(newtab, true, true);
+          apply_autocmds(EVENT_TABNEWENTERED, NULL, NULL, false, curbuf);
+        }
       }
     }
     break;
@@ -275,10 +279,11 @@ newwindow:
   /* cursor to last accessed (previous) window */
   case 'p':
   case Ctrl_P:
-    if (prevwin == NULL)
+    if (!win_valid(prevwin)) {
       beep_flush();
-    else
+    } else {
       win_goto(prevwin);
+    }
     break;
 
   /* exchange current and next window */
@@ -381,12 +386,16 @@ wingotofile:
 
     ptr = grab_file_name(Prenum1, &lnum);
     if (ptr != NULL) {
+      tabpage_T *oldtab = curtab;
+      win_T *oldwin = curwin;
       setpcmark();
       if (win_split(0, 0) == OK) {
         RESET_BINDING(curwin);
-        (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL,
-            ECMD_HIDE, NULL);
-        if (nchar == 'F' && lnum >= 0) {
+        if (do_ecmd(0, ptr, NULL, NULL, ECMD_LASTL, ECMD_HIDE, NULL) == FAIL) {
+          // Failed to open the file, close the window opened for it.
+          win_close(curwin, false);
+          goto_tabpage_win(oldtab, oldwin);
+        } else if (nchar == 'F' && lnum >= 0) {
           curwin->w_cursor.lnum = lnum;
           check_cursor_lnum();
           beginline(BL_SOL | BL_FIX);
@@ -479,7 +488,7 @@ wingotofile:
 }
 
 static void cmd_with_count(char *cmd, char_u *bufp, size_t bufsize,
-                           long Prenum)
+                           int64_t Prenum)
 {
   size_t len = xstrlcpy((char *)bufp, cmd, bufsize);
 
@@ -890,31 +899,31 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
     /* "new_size" of the current window goes to the new window, use
      * one row for the status line */
     win_new_height(wp, new_size);
-    if (flags & (WSP_TOP | WSP_BOT))
-      frame_new_height(curfrp, curfrp->fr_height
-          - (new_size + STATUS_HEIGHT), flags & WSP_TOP, FALSE);
-    else
+    if (flags & (WSP_TOP | WSP_BOT)) {
+      int new_fr_height = curfrp->fr_height - new_size;
+
+      if (!((flags & WSP_BOT) && p_ls == 0)) {
+        new_fr_height -= STATUS_HEIGHT;
+      }
+      frame_new_height(curfrp, new_fr_height, flags & WSP_TOP, false);
+    } else {
       win_new_height(oldwin, oldwin_height - (new_size + STATUS_HEIGHT));
-    if (before) {       /* new window above current one */
+    }
+    if (before) {       // new window above current one
       wp->w_winrow = oldwin->w_winrow;
       wp->w_status_height = STATUS_HEIGHT;
       oldwin->w_winrow += wp->w_height + STATUS_HEIGHT;
     } else {          /* new window below current one */
       wp->w_winrow = oldwin->w_winrow + oldwin->w_height + STATUS_HEIGHT;
       wp->w_status_height = oldwin->w_status_height;
-      // Don't set the status_height for oldwin yet, this might break
-      // frame_fix_height(oldwin), therefore will be set below.
+      if (!(flags & WSP_BOT)) {
+        oldwin->w_status_height = STATUS_HEIGHT;
+      }
     }
     if (flags & WSP_BOT)
       frame_add_statusline(curfrp);
     frame_fix_height(wp);
     frame_fix_height(oldwin);
-
-    if (!before) {
-      // New window above current one, set the status_height after
-      // frame_fix_height(oldwin)
-      oldwin->w_status_height = STATUS_HEIGHT;
-    }
   }
 
   if (flags & (WSP_TOP | WSP_BOT))
@@ -965,11 +974,12 @@ int win_split_ins(int size, int flags, win_T *new_wp, int dir)
   /*
    * make the new window the current window
    */
-  win_enter(wp, false);
-  if (flags & WSP_VERT)
+  win_enter_ext(wp, false, false, true, true, true);
+  if (flags & WSP_VERT) {
     p_wiw = i;
-  else
+  } else {
     p_wh = i;
+  }
 
   return OK;
 }
@@ -1061,6 +1071,23 @@ bool win_valid(win_T *win) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
   return false;
 }
 
+/// Check if "win" is a pointer to an existing window in any tabpage.
+///
+/// @param  win  window to check
+bool win_valid_any_tab(win_T *win) FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  if (win == NULL) {
+    return false;
+  }
+
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp == win) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /*
  * Return the number of windows.
  */
@@ -1693,6 +1720,7 @@ close_windows (
 {
   tabpage_T   *tp, *nexttp;
   int h = tabline_height();
+  int count = tabpage_index(NULL);
 
   ++RedrawingDisabled;
 
@@ -1729,9 +1757,14 @@ close_windows (
 
   --RedrawingDisabled;
 
-  redraw_tabline = TRUE;
-  if (h != tabline_height())
+  if (count != tabpage_index(NULL)) {
+    apply_autocmds(EVENT_TABCLOSED, NULL, NULL, false, curbuf);
+  }
+
+  redraw_tabline = true;
+  if (h != tabline_height()) {
     shell_new_rows();
+  }
 }
 
 /// Check that current window is the last one.
@@ -1914,7 +1947,7 @@ int win_close(win_T *win, int free_buf)
   if (win->w_buffer != NULL) {
     win->w_closing = true;
     close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, true);
-    if (win_valid(win)) {
+    if (win_valid_any_tab(win)) {
       win->w_closing = false;
     }
 
@@ -1934,11 +1967,19 @@ int win_close(win_T *win, int free_buf)
       curwin->w_buffer = curbuf;
     getout(0);
   }
-  /* Autocommands may have closed the window already, or closed the only
-   * other window or moved to another tab page. */
-  else if (!win_valid(win) || last_window() || curtab != prev_curtab
-           || close_last_window_tabpage(win, free_buf, prev_curtab))
+  // Autocommands may have moved to another tab page.
+  if (curtab != prev_curtab && win_valid_any_tab(win)
+      && win->w_buffer == NULL) {
+    // Need to close the window anyway, since the buffer is NULL.
+    win_close_othertab(win, false, prev_curtab);
     return FAIL;
+  }
+  // Autocommands may have closed the window already, or closed the only
+  // other window or moved to another tab page.
+  if (!win_valid(win) || last_window()
+      || close_last_window_tabpage(win, free_buf, prev_curtab)) {
+    return FAIL;
+  }
 
   // let terminal buffers know that this window dimensions may be ignored
   win->w_closing = true;
@@ -1981,10 +2022,11 @@ int win_close(win_T *win, int free_buf)
   }
 
   if (close_curwin) {
-    win_enter_ext(wp, false, TRUE, TRUE, TRUE);
-    if (other_buffer)
-      /* careful: after this wp and win may be invalid! */
-      apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+    win_enter_ext(wp, false, true, false, true, true);
+    if (other_buffer) {
+      // careful: after this wp and win may be invalid!
+      apply_autocmds(EVENT_BUFENTER, NULL, NULL, false, curbuf);
+    }
   }
 
   /*
@@ -2015,12 +2057,16 @@ void win_close_othertab(win_T *win, int free_buf, tabpage_T *tp)
   tabpage_T   *ptp = NULL;
   int free_tp = FALSE;
 
-  assert(win->w_buffer);  // to avoid np dereference warning in next line
-  if (win->w_closing || win->w_buffer->b_closing)
-    return;     /* window is already being closed */
+  // Get here with win->w_buffer == NULL when win_close() detects the tab page
+  // changed.
+  if (win->w_closing || (win->w_buffer != NULL && win->w_buffer->b_closing)) {
+    return;  // window is already being closed
+  }
 
-  /* Close the link to the buffer. */
-  close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, FALSE);
+  if (win->w_buffer != NULL) {
+    // Close the link to the buffer.
+    close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0, false);
+  }
 
   /* Careful: Autocommands may have closed the tab page or made it the
    * current tab page.  */
@@ -2871,8 +2917,9 @@ static int win_alloc_firstwin(win_T *oldwin)
     /* Very first window, need to create an empty buffer for it and
      * initialize from scratch. */
     curbuf = buflist_new(NULL, NULL, 1L, BLN_LISTED);
-    if (curbuf == NULL)
+    if (curbuf == NULL) {
       return FAIL;
+    }
     curwin->w_buffer = curbuf;
     curwin->w_s = &(curbuf->b_s);
     curbuf->b_nwindows = 1;     /* there is one window */
@@ -2923,7 +2970,9 @@ void win_init_size(void)
  */
 static tabpage_T *alloc_tabpage(void)
 {
+  static int last_tp_handle = 0;
   tabpage_T *tp = xcalloc(1, sizeof(tabpage_T));
+  tp->handle = ++last_tp_handle;
   handle_register_tabpage(tp);
 
   /* init t: variables */
@@ -2973,6 +3022,9 @@ int win_new_tabpage(int after, char_u *filename)
     xfree(newtp);
     return FAIL;
   }
+
+  newtp->localdir = tp->localdir ? vim_strsave(tp->localdir) : NULL;
+
   curtab = newtp;
 
   /* Create a new empty window. */
@@ -3002,8 +3054,9 @@ int win_new_tabpage(int after, char_u *filename)
 
     redraw_all_later(CLEAR);
 
-    apply_autocmds(EVENT_TABNEW, filename, filename, false, curbuf);
+    apply_autocmds(EVENT_WINNEW, NULL, NULL, false, curbuf);
     apply_autocmds(EVENT_WINENTER, NULL, NULL, false, curbuf);
+    apply_autocmds(EVENT_TABNEW, filename, filename, false, curbuf);
     apply_autocmds(EVENT_TABENTER, NULL, NULL, false, curbuf);
 
     return OK;
@@ -3161,8 +3214,8 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, int trigger_enter_au
   /* We would like doing the TabEnter event first, but we don't have a
    * valid current window yet, which may break some commands.
    * This triggers autocommands, thus may make "tp" invalid. */
-  win_enter_ext(tp->tp_curwin, false, TRUE,
-      trigger_enter_autocmds, trigger_leave_autocmds);
+  win_enter_ext(tp->tp_curwin, false, true, false,
+                trigger_enter_autocmds, trigger_leave_autocmds);
   prevwin = next_prevwin;
 
   last_status(FALSE);           /* status line may appear or disappear */
@@ -3204,11 +3257,8 @@ void goto_tabpage(int n)
   int i;
 
   if (text_locked()) {
-    /* Not allowed when editing the command line. */
-    if (cmdwin_type != 0)
-      EMSG(_(e_cmdwin));
-    else
-      EMSG(_(e_secure));
+    // Not allowed when editing the command line.
+    text_locked_msg();
     return;
   }
 
@@ -3293,8 +3343,11 @@ void tabpage_move(int nr)
   tabpage_T *tp;
   tabpage_T *tp_dst;
 
-  if (first_tabpage->tp_next == NULL)
+  assert(curtab != NULL);
+
+  if (first_tabpage->tp_next == NULL) {
     return;
+  }
 
   for (tp = first_tabpage; tp->tp_next != NULL && n < nr; tp = tp->tp_next) {
     ++n;
@@ -3503,7 +3556,7 @@ end:
  */
 void win_enter(win_T *wp, bool undo_sync)
 {
-  win_enter_ext(wp, undo_sync, FALSE, TRUE, TRUE);
+  win_enter_ext(wp, undo_sync, false, false, true, true);
 }
 
 /*
@@ -3511,7 +3564,9 @@ void win_enter(win_T *wp, bool undo_sync)
  * Can be called with "curwin_invalid" TRUE, which means that curwin has just
  * been closed and isn't valid.
  */
-static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int trigger_enter_autocmds, int trigger_leave_autocmds)
+static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid,
+                          int trigger_new_autocmds, int trigger_enter_autocmds,
+                          int trigger_leave_autocmds)
 {
   int other_buffer = FALSE;
 
@@ -3587,6 +3642,9 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int tri
     shorten_fnames(TRUE);
   }
 
+  if (trigger_new_autocmds) {
+    apply_autocmds(EVENT_WINNEW, NULL, NULL, false, curbuf);
+  }
   if (trigger_enter_autocmds) {
     apply_autocmds(EVENT_WINENTER, NULL, NULL, FALSE, curbuf);
     if (other_buffer)
@@ -3613,6 +3671,10 @@ static void win_enter_ext(win_T *wp, bool undo_sync, int curwin_invalid, int tri
 
   /* Change directories when the 'acd' option is set. */
   do_autochdir();
+
+  if (curbuf->terminal) {
+    terminal_resize(curbuf->terminal, curwin->w_width, curwin->w_height);
+  }
 }
 
 
@@ -3679,13 +3741,15 @@ win_T *buf_jump_open_tab(buf_T *buf)
  */
 static win_T *win_alloc(win_T *after, int hidden)
 {
-  /*
-   * allocate window structure and linesizes arrays
-   */
+  static int last_win_id = LOWEST_WIN_ID - 1;
+
+  // allocate window structure and linesizes arrays
   win_T *new_wp = xcalloc(1, sizeof(win_T));
-  handle_register_window(new_wp);
   win_alloc_lines(new_wp);
 
+  new_wp->handle = ++last_win_id;
+  handle_register_window(new_wp);
+
   /* init w: variables */
   new_wp->w_vars = dict_alloc();
   init_var_dict(new_wp->w_vars, &new_wp->w_winvar, VAR_SCOPE);
@@ -3751,8 +3815,15 @@ win_free (
   hash_init(&wp->w_vars->dv_hashtab);
   unref_var_dict(wp->w_vars);
 
-  if (prevwin == wp)
+  if (prevwin == wp) {
     prevwin = NULL;
+  }
+  FOR_ALL_TABS(ttp) {
+    if (ttp->tp_prevwin == wp) {
+      ttp->tp_prevwin = NULL;
+    }
+  }
+
   win_free_lsize(wp);
 
   for (i = 0; i < wp->w_tagstacklen; ++i)
@@ -5664,3 +5735,121 @@ static bool frame_check_width(frame_T *topfrp, int width)
   }
   return true;
 }
+
+int win_getid(typval_T *argvars)
+{
+  if (argvars[0].v_type == VAR_UNKNOWN) {
+    return curwin->handle;
+  }
+  int winnr = get_tv_number(&argvars[0]);
+  win_T *wp;
+  if (winnr > 0) {
+    if (argvars[1].v_type == VAR_UNKNOWN) {
+      wp = firstwin;
+    } else {
+      tabpage_T *tp;
+      int tabnr = get_tv_number(&argvars[1]);
+      for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+        if (--tabnr == 0) {
+          break;
+        }
+      }
+      if (tp == NULL) {
+        return -1;
+      }
+      wp = tp->tp_firstwin;
+    }
+    for ( ; wp != NULL; wp = wp->w_next) {
+      if (--winnr == 0) {
+        return wp->handle;
+      }
+    }
+  }
+  return 0;
+}
+
+int win_gotoid(typval_T *argvars)
+{
+  int id = get_tv_number(&argvars[0]);
+
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp->handle == id) {
+      goto_tabpage_win(tp, wp);
+      return 1;
+    }
+  }
+  return 0;
+}
+
+void win_get_tabwin(handle_T id, int *tabnr, int *winnr)
+{
+  *tabnr = 0;
+  *winnr = 0;
+
+  int tnum = 1, wnum = 1;
+  FOR_ALL_TABS(tp) {
+    FOR_ALL_WINDOWS_IN_TAB(wp, tp) {
+      if (wp->handle == id) {
+        *winnr = wnum;
+        *tabnr = tnum;
+        return;
+      }
+      wnum++;
+    }
+    tnum++;
+    wnum = 1;
+  }
+}
+
+void win_id2tabwin(typval_T *argvars, list_T *list)
+{
+  int winnr = 1;
+  int tabnr = 1;
+  int id = get_tv_number(&argvars[0]);
+
+  win_get_tabwin(id, &tabnr, &winnr);
+  list_append_number(list, tabnr);
+  list_append_number(list, winnr);
+}
+
+win_T * win_id2wp(typval_T *argvars)
+{
+  int id = get_tv_number(&argvars[0]);
+
+  FOR_ALL_TAB_WINDOWS(tp, wp) {
+    if (wp->handle == id) {
+      return wp;
+    }
+  }
+
+  return NULL;
+}
+
+int win_id2win(typval_T *argvars)
+{
+  win_T   *wp;
+  int nr = 1;
+  int id = get_tv_number(&argvars[0]);
+
+  for (wp = firstwin; wp != NULL; wp = wp->w_next) {
+    if (wp->handle == id) {
+      return nr;
+    }
+    nr++;
+  }
+  return 0;
+}
+
+void win_findbuf(typval_T *argvars, list_T *list)
+{
+  int bufnr = get_tv_number(&argvars[0]);
+
+  for (tabpage_T *tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+    for (win_T *wp = tp == curtab ? firstwin : tp->tp_firstwin;
+         wp != NULL; wp = wp->w_next) {
+      if (wp->w_buffer->b_fnum == bufnr) {
+        list_append_number(list, wp->handle);
+      }
+    }
+  }
+}
diff --git a/test/.luacheckrc b/test/.luacheckrc
index 92e19d40e8..1c98d096a4 100644
--- a/test/.luacheckrc
+++ b/test/.luacheckrc
@@ -11,3 +11,6 @@ self = false
 
 -- Rerun tests only if their modification time changed.
 cache = true
+
+-- Ignore whitespace issues in converted Vim legacy tests.
+files["functional/legacy"] = {ignore = { "611", "612", "613", "621" }}
diff --git a/test/benchmark/bench_re_freeze_spec.lua b/test/benchmark/bench_re_freeze_spec.lua
index a194b5f44c..53041b042b 100644
--- a/test/benchmark/bench_re_freeze_spec.lua
+++ b/test/benchmark/bench_re_freeze_spec.lua
@@ -15,12 +15,12 @@ local measure_cmd =
 local measure_script = [[
     func! Measure(re, file, pattern, arg)
       let sstart=reltime()
-    
+
       execute 'set re=' . a:re
       execute 'split' a:arg a:file
       call search(a:pattern, '', '', 10000)
       q!
-    
+
       $put =printf('file: %s, re: %d, time: %s', a:file, a:re, reltimestr(reltime(sstart)))
     endfunc]]
 
diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index 0eefa25a13..3d3a2bb046 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -1,107 +1,113 @@
--- Sanity checks for buffer_* API calls via msgpack-rpc
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, buffer = helpers.clear, helpers.nvim, helpers.buffer
 local curbuf, curwin, eq = helpers.curbuf, helpers.curwin, helpers.eq
 local curbufmeths, ok = helpers.curbufmeths, helpers.ok
-local funcs = helpers.funcs
+local funcs, request = helpers.funcs, helpers.request
+local NIL = helpers.NIL
 
-describe('buffer_* functions', function()
+describe('api/buf', function()
   before_each(clear)
 
+  -- access deprecated functions
+  local function curbuf_depr(method, ...)
+    return request('buffer_'..method, 0, ...)
+  end
+
+
   describe('line_count, insert and del_line', function()
     it('works', function()
-      eq(1, curbuf('line_count'))
-      curbuf('insert', -1, {'line'})
-      eq(2, curbuf('line_count'))
-      curbuf('insert', -1, {'line'})
-      eq(3, curbuf('line_count'))
-      curbuf('del_line', -1)
-      eq(2, curbuf('line_count'))
-      curbuf('del_line', -1)
-      curbuf('del_line', -1)
+      eq(1, curbuf_depr('line_count'))
+      curbuf_depr('insert', -1, {'line'})
+      eq(2, curbuf_depr('line_count'))
+      curbuf_depr('insert', -1, {'line'})
+      eq(3, curbuf_depr('line_count'))
+      curbuf_depr('del_line', -1)
+      eq(2, curbuf_depr('line_count'))
+      curbuf_depr('del_line', -1)
+      curbuf_depr('del_line', -1)
       -- There's always at least one line
-      eq(1, curbuf('line_count'))
+      eq(1, curbuf_depr('line_count'))
     end)
   end)
 
 
   describe('{get,set,del}_line', function()
     it('works', function()
-      eq('', curbuf('get_line', 0))
-      curbuf('set_line', 0, 'line1')
-      eq('line1', curbuf('get_line', 0))
-      curbuf('set_line', 0, 'line2')
-      eq('line2', curbuf('get_line', 0))
-      curbuf('del_line', 0)
-      eq('', curbuf('get_line', 0))
+      eq('', curbuf_depr('get_line', 0))
+      curbuf_depr('set_line', 0, 'line1')
+      eq('line1', curbuf_depr('get_line', 0))
+      curbuf_depr('set_line', 0, 'line2')
+      eq('line2', curbuf_depr('get_line', 0))
+      curbuf_depr('del_line', 0)
+      eq('', curbuf_depr('get_line', 0))
     end)
 
     it('get_line: out-of-bounds is an error', function()
-      curbuf('set_line', 0, 'line1.a')
-      eq(1, curbuf('line_count')) -- sanity
-      eq(false, pcall(curbuf, 'get_line', 1))
-      eq(false, pcall(curbuf, 'get_line', -2))
+      curbuf_depr('set_line', 0, 'line1.a')
+      eq(1, curbuf_depr('line_count')) -- sanity
+      eq(false, pcall(curbuf_depr, 'get_line', 1))
+      eq(false, pcall(curbuf_depr, 'get_line', -2))
     end)
 
     it('set_line, del_line: out-of-bounds is an error', function()
-      curbuf('set_line', 0, 'line1.a')
-      eq(false, pcall(curbuf, 'set_line', 1, 'line1.b'))
-      eq(false, pcall(curbuf, 'set_line', -2, 'line1.b'))
-      eq(false, pcall(curbuf, 'del_line', 2))
-      eq(false, pcall(curbuf, 'del_line', -3))
+      curbuf_depr('set_line', 0, 'line1.a')
+      eq(false, pcall(curbuf_depr, 'set_line', 1, 'line1.b'))
+      eq(false, pcall(curbuf_depr, 'set_line', -2, 'line1.b'))
+      eq(false, pcall(curbuf_depr, 'del_line', 2))
+      eq(false, pcall(curbuf_depr, 'del_line', -3))
     end)
 
     it('can handle NULs', function()
-      curbuf('set_line', 0, 'ab\0cd')
-      eq('ab\0cd', curbuf('get_line', 0))
+      curbuf_depr('set_line', 0, 'ab\0cd')
+      eq('ab\0cd', curbuf_depr('get_line', 0))
     end)
   end)
 
 
   describe('{get,set}_line_slice', function()
     it('get_line_slice: out-of-bounds returns empty array', function()
-      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
-
-      eq({}, curbuf('get_line_slice', 2, 3, false, true))
-      eq({}, curbuf('get_line_slice', 3, 9, true, true))
-      eq({}, curbuf('get_line_slice', 3, -1, true, true))
-      eq({}, curbuf('get_line_slice', -3, -4, false, true))
-      eq({}, curbuf('get_line_slice', -4, -5, true, true))
+      curbuf_depr('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 2, true, true)) --sanity
+
+      eq({}, curbuf_depr('get_line_slice', 2, 3, false, true))
+      eq({}, curbuf_depr('get_line_slice', 3, 9, true, true))
+      eq({}, curbuf_depr('get_line_slice', 3, -1, true, true))
+      eq({}, curbuf_depr('get_line_slice', -3, -4, false, true))
+      eq({}, curbuf_depr('get_line_slice', -4, -5, true, true))
     end)
 
     it('set_line_slice: out-of-bounds extends past end', function()
-      curbuf('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 2, true, true)) --sanity
-
-      eq({'c'}, curbuf('get_line_slice', -1, 4, true, true))
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, 5, true, true))
-      curbuf('set_line_slice', 4, 5, true, true, {'d'})
-      eq({'a', 'b', 'c', 'd'}, curbuf('get_line_slice', 0, 5, true, true))
-      curbuf('set_line_slice', -4, -5, true, true, {'e'})
-      eq({'e', 'a', 'b', 'c', 'd'}, curbuf('get_line_slice', 0, 5, true, true))
+      curbuf_depr('set_line_slice', 0, 0, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 2, true, true)) --sanity
+
+      eq({'c'}, curbuf_depr('get_line_slice', -1, 4, true, true))
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, 5, true, true))
+      curbuf_depr('set_line_slice', 4, 5, true, true, {'d'})
+      eq({'a', 'b', 'c', 'd'}, curbuf_depr('get_line_slice', 0, 5, true, true))
+      curbuf_depr('set_line_slice', -4, -5, true, true, {'e'})
+      eq({'e', 'a', 'b', 'c', 'd'}, curbuf_depr('get_line_slice', 0, 5, true, true))
     end)
 
     it('works', function()
-      eq({''}, curbuf('get_line_slice', 0, -1, true, true))
+      eq({''}, curbuf_depr('get_line_slice', 0, -1, true, true))
       -- Replace buffer
-      curbuf('set_line_slice', 0, -1, true, true, {'a', 'b', 'c'})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      eq({'b', 'c'}, curbuf('get_line_slice', 1, -1, true, true))
-      eq({'b'}, curbuf('get_line_slice', 1, 2, true, false))
-      eq({}, curbuf('get_line_slice', 1, 1, true, false))
-      eq({'a', 'b'}, curbuf('get_line_slice', 0, -1, true, false))
-      eq({'b'}, curbuf('get_line_slice', 1, -1, true, false))
-      eq({'b', 'c'}, curbuf('get_line_slice', -2, -1, true, true))
-      curbuf('set_line_slice', 1, 2, true, false, {'a', 'b', 'c'})
-      eq({'a', 'a', 'b', 'c', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', -1, -1, true, true, {'a', 'b', 'c'})
+      curbuf_depr('set_line_slice', 0, -1, true, true, {'a', 'b', 'c'})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      eq({'b', 'c'}, curbuf_depr('get_line_slice', 1, -1, true, true))
+      eq({'b'}, curbuf_depr('get_line_slice', 1, 2, true, false))
+      eq({}, curbuf_depr('get_line_slice', 1, 1, true, false))
+      eq({'a', 'b'}, curbuf_depr('get_line_slice', 0, -1, true, false))
+      eq({'b'}, curbuf_depr('get_line_slice', 1, -1, true, false))
+      eq({'b', 'c'}, curbuf_depr('get_line_slice', -2, -1, true, true))
+      curbuf_depr('set_line_slice', 1, 2, true, false, {'a', 'b', 'c'})
+      eq({'a', 'a', 'b', 'c', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', -1, -1, true, true, {'a', 'b', 'c'})
       eq({'a', 'a', 'b', 'c', 'a', 'b', 'c'},
-        curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', 0, -3, true, false, {})
-      eq({'a', 'b', 'c'}, curbuf('get_line_slice', 0, -1, true, true))
-      curbuf('set_line_slice', 0, -1, true, true, {})
-      eq({''}, curbuf('get_line_slice', 0, -1, true, true))
+        curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', 0, -3, true, false, {})
+      eq({'a', 'b', 'c'}, curbuf_depr('get_line_slice', 0, -1, true, true))
+      curbuf_depr('set_line_slice', 0, -1, true, true, {})
+      eq({''}, curbuf_depr('get_line_slice', 0, -1, true, true))
     end)
   end)
 
@@ -244,6 +250,21 @@ describe('buffer_* functions', function()
       curbufmeths.del_var('lua')
       eq(0, funcs.exists('b:lua'))
     end)
+
+    it('buffer_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('buffer_set_var', 0, 'lua', val1))
+      eq(val1, request('buffer_set_var', 0, 'lua', val2))
+    end)
+
+    it('buffer_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('buffer_set_var', 0, 'lua', val1))
+      eq(val1, request('buffer_set_var', 0, 'lua', val2))
+      eq(val2, request('buffer_del_var', 0, 'lua'))
+    end)
   end)
 
   describe('{get,set}_option', function()
@@ -277,7 +298,7 @@ describe('buffer_* functions', function()
   describe('is_valid', function()
     it('works', function()
       nvim('command', 'new')
-      local b = nvim('get_current_buffer')
+      local b = nvim('get_current_buf')
       ok(buffer('is_valid', b))
       nvim('command', 'bw!')
       ok(not buffer('is_valid', b))
@@ -286,7 +307,7 @@ describe('buffer_* functions', function()
 
   describe('get_mark', function()
     it('works', function()
-      curbuf('insert', -1, {'a', 'bit of', 'text'})
+      curbuf('set_lines', -1, -1, true, {'a', 'bit of', 'text'})
       curwin('set_cursor', {3, 4})
       nvim('command', 'mark V')
       eq({3, 0}, curbuf('get_mark', 'V'))
diff --git a/test/functional/api/menu_spec.lua b/test/functional/api/menu_spec.lua
index 5b414fb559..d55b7b118a 100644
--- a/test/functional/api/menu_spec.lua
+++ b/test/functional/api/menu_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
 local clear = helpers.clear
diff --git a/test/functional/api/rpc_fixture.lua b/test/functional/api/rpc_fixture.lua
new file mode 100644
index 0000000000..423864740f
--- /dev/null
+++ b/test/functional/api/rpc_fixture.lua
@@ -0,0 +1,38 @@
+local deps_prefix = './.deps/usr'
+if os.getenv('DEPS_PREFIX') then
+  deps_prefix = os.getenv('DEPS_PREFIX')
+end
+
+package.path = deps_prefix .. '/share/lua/5.1/?.lua;' ..
+               deps_prefix .. '/share/lua/5.1/?/init.lua;' ..
+               package.path
+
+package.cpath = deps_prefix .. '/lib/lua/5.1/?.so;' ..
+                package.cpath
+
+local mpack = require('mpack')
+local StdioStream = require('nvim.stdio_stream')
+local Session = require('nvim.session')
+
+local stdio_stream = StdioStream.open()
+local session = Session.new(stdio_stream)
+
+local function on_request(method, args)
+  if method == 'poll' then
+    return 'ok'
+  elseif method == 'write_stderr' then
+    io.stderr:write(args[1])
+    return "done!"
+  elseif method == "exit" then
+    session:stop()
+    return mpack.NIL
+  end
+end
+
+local function on_notification(event, args)
+  if event == 'ping' and #args == 0 then
+    session:notify("vim_eval", "rpcnotify(g:channel, 'pong')")
+  end
+end
+
+session:run(on_request, on_notification)
diff --git a/test/functional/api/server_notifications_spec.lua b/test/functional/api/server_notifications_spec.lua
index 6791fbb4ba..78639d7ed7 100644
--- a/test/functional/api/server_notifications_spec.lua
+++ b/test/functional/api/server_notifications_spec.lua
@@ -1,8 +1,8 @@
--- Tests for nvim notifications
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eq, clear, eval, execute, nvim, next_message =
   helpers.eq, helpers.clear, helpers.eval, helpers.execute, helpers.nvim,
   helpers.next_message
+local meths = helpers.meths
 
 describe('notify', function()
   local channel
@@ -36,5 +36,33 @@ describe('notify', function()
       eval('rpcnotify(0, "event1", 13, 14, 15)')
       eq({'notification', 'event1', {13, 14, 15}}, next_message())
     end)
+
+    it('does not crash for deeply nested variable', function()
+      meths.set_var('l', {})
+      local nest_level = 1000
+      meths.command(('call map(range(%u), "extend(g:, {\'l\': [g:l]})")'):format(nest_level - 1))
+      eval('rpcnotify('..channel..', "event", g:l)')
+      local msg = next_message()
+      eq('notification', msg[1])
+      eq('event', msg[2])
+      local act_ret = msg[3]
+      local act_nest_level = 0
+      while act_ret do
+        if type(act_ret) == 'table' then
+          local cur_act_ret = nil
+          for k, v in pairs(act_ret) do
+            eq(1, k)
+            cur_act_ret = v
+          end
+          if cur_act_ret then
+            act_nest_level = act_nest_level + 1
+          end
+          act_ret = cur_act_ret
+        else
+          eq(nil, act_ret)
+        end
+      end
+      eq(nest_level, act_nest_level)
+    end)
   end)
 end)
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua
index 1b33275803..76a335a8f4 100644
--- a/test/functional/api/server_requests_spec.lua
+++ b/test/functional/api/server_requests_spec.lua
@@ -1,11 +1,12 @@
--- Tests for some server->client RPC scenarios. Note that unlike with
--- `rpcnotify`, to evaluate `rpcrequest` calls we need the client event loop to
--- be running.
-local helpers = require('test.functional.helpers')
+-- Test server -> client RPC scenarios. Note: unlike `rpcnotify`, to evaluate
+-- `rpcrequest` calls we need the client event loop to be running.
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, eval = helpers.clear, helpers.nvim, helpers.eval
 local eq, neq, run, stop = helpers.eq, helpers.neq, helpers.run, helpers.stop
-local nvim_prog = helpers.nvim_prog
-
+local nvim_prog, command, funcs = helpers.nvim_prog, helpers.command, helpers.funcs
+local source, next_message = helpers.source, helpers.next_message
+local ok = helpers.ok
+local meths = helpers.meths
 
 describe('server -> client', function()
   local cid
@@ -137,12 +138,18 @@ describe('server -> client', function()
   end)
 
   describe('when the client is a recursive vim instance', function()
+    if os.getenv("TRAVIS") and helpers.os_name() == "osx" then
+      -- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86.
+      pending("[Hangs on Travis macOS. #5002]", function() end)
+      return
+    end
+
     before_each(function()
-      nvim('command', "let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--embed'])")
+      command("let vim = rpcstart('"..nvim_prog.."', ['-u', 'NONE', '-i', 'NONE', '--cmd', 'set noswapfile', '--embed'])")
       neq(0, eval('vim'))
     end)
 
-    after_each(function() nvim('command', 'call rpcstop(vim)') end)
+    after_each(function() command('call rpcstop(vim)') end)
 
     it('can send/recieve notifications and make requests', function()
       nvim('command', "call rpcnotify(vim, 'vim_set_current_line', 'SOME TEXT')")
@@ -154,11 +161,12 @@ describe('server -> client', function()
     end)
 
     it('can communicate buffers, tabpages, and windows', function()
-      eq({3}, eval("rpcrequest(vim, 'vim_get_tabpages')"))
-      eq({1}, eval("rpcrequest(vim, 'vim_get_windows')"))
+      eq({1}, eval("rpcrequest(vim, 'nvim_list_tabpages')"))
+      -- Window IDs start at 1000 (LOWEST_WIN_ID in vim.h)
+      eq({1000}, eval("rpcrequest(vim, 'nvim_list_wins')"))
 
-      local buf = eval("rpcrequest(vim, 'vim_get_buffers')")[1]
-      eq(2, buf)
+      local buf = eval("rpcrequest(vim, 'nvim_list_bufs')")[1]
+      eq(1, buf)
 
       eval("rpcnotify(vim, 'buffer_set_line', "..buf..", 0, 'SOME TEXT')")
       nvim('command', "call rpcrequest(vim, 'vim_eval', '0')")  -- wait
@@ -172,7 +180,47 @@ describe('server -> client', function()
     it('returns an error if the request failed', function()
       local status, err = pcall(eval, "rpcrequest(vim, 'does-not-exist')")
       eq(false, status)
-      eq(true, string.match(err, ': (.*)') == 'Failed to evaluate expression')
+      ok(nil ~= string.match(err, 'Failed to evaluate expression'))
+    end)
+  end)
+
+  describe('when using jobstart', function()
+    local jobid
+    before_each(function()
+      local channel = nvim('get_api_info')[1]
+      nvim('set_var', 'channel', channel)
+      source([[
+        function! s:OnEvent(id, data, event)
+          call rpcnotify(g:channel, a:event, 0, a:data)
+        endfunction
+        let g:job_opts = {
+        \ 'on_stderr': function('s:OnEvent'),
+        \ 'on_exit': function('s:OnEvent'),
+        \ 'user': 0,
+        \ 'rpc': v:true
+        \ }
+      ]])
+      local lua_prog = arg[-1]
+      meths.set_var("args", {lua_prog, 'test/functional/api/rpc_fixture.lua'})
+      jobid = eval("jobstart(g:args, g:job_opts)")
+      neq(0, 'jobid')
+    end)
+
+    after_each(function()
+      funcs.jobstop(jobid)
+    end)
+
+    if helpers.pending_win32(pending) then return end
+
+    it('rpc and text stderr can be combined', function()
+      eq("ok",funcs.rpcrequest(jobid, "poll"))
+      funcs.rpcnotify(jobid, "ping")
+      eq({'notification', 'pong', {}}, next_message())
+      eq("done!",funcs.rpcrequest(jobid, "write_stderr", "fluff\n"))
+      eq({'notification', 'stderr', {0, {'fluff', ''}}}, next_message())
+      funcs.rpcrequest(jobid, "exit")
+      eq({'notification', 'exit', {0, 0}}, next_message())
     end)
   end)
+
 end)
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index c782107714..e10f30085f 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -1,25 +1,26 @@
--- Sanity checks for tabpage_* API calls via msgpack-rpc
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, tabpage, curtab, eq, ok =
   helpers.clear, helpers.nvim, helpers.tabpage, helpers.curtab, helpers.eq,
   helpers.ok
 local curtabmeths = helpers.curtabmeths
 local funcs = helpers.funcs
+local request = helpers.request
+local NIL = helpers.NIL
 
-describe('tabpage_* functions', function()
+describe('api/tabpage', function()
   before_each(clear)
 
-  describe('get_windows and get_window', function()
+  describe('list_wins and get_win', function()
     it('works', function()
       nvim('command', 'tabnew')
       nvim('command', 'vsplit')
-      local tab1, tab2 = unpack(nvim('get_tabpages'))
-      local win1, win2, win3 = unpack(nvim('get_windows'))
-      eq({win1},  tabpage('get_windows', tab1))
-      eq({win2, win3},  tabpage('get_windows', tab2))
-      eq(win2, tabpage('get_window', tab2))
-      nvim('set_current_window', win3)
-      eq(win3, tabpage('get_window', tab2))
+      local tab1, tab2 = unpack(nvim('list_tabpages'))
+      local win1, win2, win3 = unpack(nvim('list_wins'))
+      eq({win1},  tabpage('list_wins', tab1))
+      eq({win2, win3},  tabpage('list_wins', tab2))
+      eq(win2, tabpage('get_win', tab2))
+      nvim('set_current_win', win3)
+      eq(win3, tabpage('get_win', tab2))
     end)
   end)
 
@@ -32,12 +33,43 @@ describe('tabpage_* functions', function()
       curtabmeths.del_var('lua')
       eq(0, funcs.exists('t:lua'))
     end)
+
+    it('tabpage_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+    end)
+
+    it('tabpage_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('tabpage_set_var', 0, 'lua', val1))
+      eq(val1, request('tabpage_set_var', 0, 'lua', val2))
+      eq(val2, request('tabpage_del_var', 0, 'lua'))
+    end)
+  end)
+
+  describe('get_number', function()
+    it('works', function()
+      local tabs = nvim('list_tabpages')
+      eq(1, tabpage('get_number', tabs[1]))
+
+      nvim('command', 'tabnew')
+      local tab1, tab2 = unpack(nvim('list_tabpages'))
+      eq(1, tabpage('get_number', tab1))
+      eq(2, tabpage('get_number', tab2))
+
+      nvim('command', '-tabmove')
+      eq(2, tabpage('get_number', tab1))
+      eq(1, tabpage('get_number', tab2))
+    end)
   end)
 
   describe('is_valid', function()
     it('works', function()
       nvim('command', 'tabnew')
-      local tab = nvim('get_tabpages')[2]
+      local tab = nvim('list_tabpages')[2]
       nvim('set_current_tabpage', tab)
       ok(tabpage('is_valid', tab))
       nvim('command', 'tabclose')
diff --git a/test/functional/api/version_spec.lua b/test/functional/api/version_spec.lua
new file mode 100644
index 0000000000..3efd00ddbe
--- /dev/null
+++ b/test/functional/api/version_spec.lua
@@ -0,0 +1,71 @@
+local helpers = require('test.functional.helpers')(after_each)
+local mpack = require('mpack')
+local clear, funcs, eq = helpers.clear, helpers.funcs, helpers.eq
+
+local function read_mpack_file(fname)
+  local fd = io.open(fname, 'rb')
+  local data = fd:read('*a')
+  fd:close()
+  local unpack = mpack.Unpacker()
+  return unpack(data)
+end
+
+-- Remove metadata that is not essential to backwards-compatibility.
+local function remove_function_metadata(fspec)
+  fspec['can_fail'] = nil
+  fspec['async'] = nil
+  fspec['method'] = nil
+  fspec['since'] = nil
+  fspec['deprecated_since'] = nil
+  fspec['receives_channel_id'] = nil
+  for idx, _ in ipairs(fspec['parameters']) do
+    fspec['parameters'][idx][2] = ''  -- Remove parameter name.
+  end
+  return fspec
+end
+
+describe("api_info()['version']", function()
+  before_each(clear)
+
+  it("returns API level", function()
+    local version = helpers.call('api_info')['version']
+    local current = version['api_level']
+    local compat  = version['api_compatible']
+    eq("number", type(current))
+    eq("number", type(compat))
+    assert(current >= compat)
+  end)
+
+  it("returns Nvim version", function()
+    local version = helpers.call('api_info')['version']
+    local major   = version['major']
+    local minor   = version['minor']
+    local patch   = version['patch']
+    eq("number", type(major))
+    eq("number", type(minor))
+    eq("number", type(patch))
+    eq(1, funcs.has("nvim-"..major.."."..minor.."."..patch))
+    eq(0, funcs.has("nvim-"..major.."."..minor.."."..(patch + 1)))
+    eq(0, funcs.has("nvim-"..major.."."..(minor + 1).."."..patch))
+    eq(0, funcs.has("nvim-"..(major + 1).."."..minor.."."..patch))
+  end)
+
+  it("api_compatible level is valid", function()
+    local api     = helpers.call('api_info')
+    local compat  = api['version']['api_compatible']
+    local path    = 'test/functional/fixtures/api_level_'
+                    ..tostring(compat)..'.mpack'
+
+    -- Verify that the current API function signatures match those of the API
+    -- level for which we claim compatibility.
+    local old_api = read_mpack_file(path)
+    for _, fn_old in ipairs(old_api['functions']) do
+      for _, fn_new in ipairs(api['functions']) do
+        if fn_old['name'] == fn_new['name'] then
+          eq(remove_function_metadata(fn_old),
+             remove_function_metadata(fn_new))
+        end
+      end
+    end
+  end)
+end)
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 20de6d0072..ce6c52e334 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -1,5 +1,4 @@
--- Sanity checks for vim_* API calls via msgpack-rpc
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local NIL = helpers.NIL
 local clear, nvim, eq, neq = helpers.clear, helpers.nvim, helpers.eq, helpers.neq
@@ -7,13 +6,14 @@ local ok, nvim_async, feed = helpers.ok, helpers.nvim_async, helpers.feed
 local os_name = helpers.os_name
 local meths = helpers.meths
 local funcs = helpers.funcs
+local request = helpers.request
 
-describe('vim_* functions', function()
+describe('api', function()
   before_each(clear)
 
-  describe('command', function()
+  describe('nvim_command', function()
     it('works', function()
-      local fname = os.tmpname()
+      local fname = helpers.tmpname()
       nvim('command', 'new')
       nvim('command', 'edit '..fname)
       nvim('command', 'normal itesting\napi')
@@ -28,9 +28,18 @@ describe('vim_* functions', function()
       f:close()
       os.remove(fname)
     end)
+
+    it("VimL error: fails (VimL error), does NOT update v:errmsg", function()
+      -- Most API methods return generic errors (or no error) if a VimL
+      -- expression fails; nvim_command returns the VimL error details.
+      local status, rv = pcall(nvim, "command", "bogus_command")
+      eq(false, status)                       -- nvim_command() failed.
+      eq("E492:", string.match(rv, "E%d*:"))  -- VimL error was returned.
+      eq("", nvim("eval", "v:errmsg"))        -- v:errmsg was not updated.
+    end)
   end)
 
-  describe('eval', function()
+  describe('nvim_eval', function()
     it('works', function()
       nvim('command', 'let g:v1 = "a"')
       nvim('command', 'let g:v2 = [1, 2, {"v3": 3}]')
@@ -41,18 +50,45 @@ describe('vim_* functions', function()
       eq(1, nvim('eval',"matcharg(1) == ['', '']"))
       eq({'', ''}, nvim('eval','matcharg(1)'))
     end)
+
+    it('works under deprecated name', function()
+      eq(2, request("vim_eval", "1+1"))
+    end)
+
+    it("VimL error: fails (generic error), does NOT update v:errmsg", function()
+      local status, rv = pcall(nvim, "eval", "bogus expression")
+      eq(false, status)                 -- nvim_eval() failed.
+      ok(nil ~= string.find(rv, "Failed to evaluate expression"))
+      eq("", nvim("eval", "v:errmsg"))  -- v:errmsg was not updated.
+    end)
   end)
 
-  describe('call_function', function()
+  describe('nvim_call_function', function()
     it('works', function()
       nvim('call_function', 'setqflist', {{{ filename = 'something', lnum = 17}}, 'r'})
       eq(17, nvim('call_function', 'getqflist', {})[1].lnum)
       eq(17, nvim('call_function', 'eval', {17}))
       eq('foo', nvim('call_function', 'simplify', {'this/./is//redundant/../../../foo'}))
     end)
+
+    it("VimL error: fails (generic error), does NOT update v:errmsg", function()
+      local status, rv = pcall(nvim, "call_function", "bogus function", {"arg1"})
+      eq(false, status)                 -- nvim_call_function() failed.
+      ok(nil ~= string.find(rv, "Error calling function"))
+      eq("", nvim("eval", "v:errmsg"))  -- v:errmsg was not updated.
+    end)
+  end)
+
+  describe('nvim_input', function()
+    it("VimL error: does NOT fail, updates v:errmsg", function()
+      local status, _ = pcall(nvim, "input", ":call bogus_fn()<CR>")
+      local v_errnum = string.match(nvim("eval", "v:errmsg"), "E%d*:")
+      eq(true, status)        -- nvim_input() did not fail.
+      eq("E117:", v_errnum)   -- v:errmsg was updated.
+    end)
   end)
 
-  describe('strwidth', function()
+  describe('nvim_strwidth', function()
     it('works', function()
       eq(3, nvim('strwidth', 'abc'))
       -- 6 + (neovim)
@@ -65,7 +101,7 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('{get,set}_current_line', function()
+  describe('nvim_get_current_line, nvim_set_current_line', function()
     it('works', function()
       eq('', nvim('get_current_line'))
       nvim('set_current_line', 'abc')
@@ -73,7 +109,7 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('{get,set,del}_var', function()
+  describe('nvim_get_var, nvim_set_var, nvim_del_var', function()
     it('works', function()
       nvim('set_var', 'lua', {1, 2, {['3'] = 1}})
       eq({1, 2, {['3'] = 1}}, nvim('get_var', 'lua'))
@@ -83,19 +119,19 @@ describe('vim_* functions', function()
       eq(0, funcs.exists('g:lua'))
     end)
 
-    it('set_var returns the old value', function()
+    it('vim_set_var returns the old value', function()
       local val1 = {1, 2, {['3'] = 1}}
       local val2 = {4, 7}
-      eq(NIL, nvim('set_var', 'lua', val1))
-      eq(val1, nvim('set_var', 'lua', val2))
+      eq(NIL, request('vim_set_var', 'lua', val1))
+      eq(val1, request('vim_set_var', 'lua', val2))
     end)
 
-    it('del_var returns the old value', function()
+    it('vim_del_var returns the old value', function()
       local val1 = {1, 2, {['3'] = 1}}
       local val2 = {4, 7}
-      eq(NIL, meths.set_var('lua', val1))
-      eq(val1, meths.set_var('lua', val2))
-      eq(val2, meths.del_var('lua'))
+      eq(NIL,  request('vim_set_var', 'lua', val1))
+      eq(val1, request('vim_set_var', 'lua', val2))
+      eq(val2, request('vim_del_var', 'lua'))
     end)
 
     it('truncates values with NULs in them', function()
@@ -104,7 +140,7 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('{get,set}_option', function()
+  describe('nvim_get_option, nvim_set_option', function()
     it('works', function()
       ok(nvim('get_option', 'equalalways'))
       nvim('set_option', 'equalalways', false)
@@ -112,51 +148,51 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('{get,set}_current_buffer and get_buffers', function()
+  describe('nvim_{get,set}_current_buf, nvim_list_bufs', function()
     it('works', function()
-      eq(1, #nvim('get_buffers'))
-      eq(nvim('get_buffers')[1], nvim('get_current_buffer'))
+      eq(1, #nvim('list_bufs'))
+      eq(nvim('list_bufs')[1], nvim('get_current_buf'))
       nvim('command', 'new')
-      eq(2, #nvim('get_buffers'))
-      eq(nvim('get_buffers')[2], nvim('get_current_buffer'))
-      nvim('set_current_buffer', nvim('get_buffers')[1])
-      eq(nvim('get_buffers')[1], nvim('get_current_buffer'))
+      eq(2, #nvim('list_bufs'))
+      eq(nvim('list_bufs')[2], nvim('get_current_buf'))
+      nvim('set_current_buf', nvim('list_bufs')[1])
+      eq(nvim('list_bufs')[1], nvim('get_current_buf'))
     end)
   end)
 
-  describe('{get,set}_current_window and get_windows', function()
+  describe('nvim_{get,set}_current_win, nvim_list_wins', function()
     it('works', function()
-      eq(1, #nvim('get_windows'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
+      eq(1, #nvim('list_wins'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
       nvim('command', 'vsplit')
       nvim('command', 'split')
-      eq(3, #nvim('get_windows'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
-      nvim('set_current_window', nvim('get_windows')[2])
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
+      eq(3, #nvim('list_wins'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
+      nvim('set_current_win', nvim('list_wins')[2])
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
     end)
   end)
 
-  describe('{get,set}_current_tabpage and get_tabpages', function()
+  describe('nvim_{get,set}_current_tabpage, nvim_list_tabpages', function()
     it('works', function()
-      eq(1, #nvim('get_tabpages'))
-      eq(nvim('get_tabpages')[1], nvim('get_current_tabpage'))
+      eq(1, #nvim('list_tabpages'))
+      eq(nvim('list_tabpages')[1], nvim('get_current_tabpage'))
       nvim('command', 'tabnew')
-      eq(2, #nvim('get_tabpages'))
-      eq(2, #nvim('get_windows'))
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
-      eq(nvim('get_tabpages')[2], nvim('get_current_tabpage'))
-      nvim('set_current_window', nvim('get_windows')[1])
+      eq(2, #nvim('list_tabpages'))
+      eq(2, #nvim('list_wins'))
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
+      eq(nvim('list_tabpages')[2], nvim('get_current_tabpage'))
+      nvim('set_current_win', nvim('list_wins')[1])
       -- Switching window also switches tabpages if necessary
-      eq(nvim('get_tabpages')[1], nvim('get_current_tabpage'))
-      eq(nvim('get_windows')[1], nvim('get_current_window'))
-      nvim('set_current_tabpage', nvim('get_tabpages')[2])
-      eq(nvim('get_tabpages')[2], nvim('get_current_tabpage'))
-      eq(nvim('get_windows')[2], nvim('get_current_window'))
+      eq(nvim('list_tabpages')[1], nvim('get_current_tabpage'))
+      eq(nvim('list_wins')[1], nvim('get_current_win'))
+      nvim('set_current_tabpage', nvim('list_tabpages')[2])
+      eq(nvim('list_tabpages')[2], nvim('get_current_tabpage'))
+      eq(nvim('list_wins')[2], nvim('get_current_win'))
     end)
   end)
 
-  describe('replace_termcodes', function()
+  describe('nvim_replace_termcodes', function()
     it('escapes K_SPECIAL as K_SPECIAL KS_SPECIAL KE_FILLER', function()
       eq('\128\254X', helpers.nvim('replace_termcodes', '\128', true, true, true))
     end)
@@ -178,7 +214,7 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('feedkeys', function()
+  describe('nvim_feedkeys', function()
     it('CSI escaping', function()
       local function on_setup()
         -- notice the special char(…) \xe2\80\xa6
@@ -205,7 +241,7 @@ describe('vim_* functions', function()
     end)
   end)
 
-  describe('err_write', function()
+  describe('nvim_err_write', function()
     local screen
 
     before_each(function()
@@ -213,22 +249,22 @@ describe('vim_* functions', function()
       screen = Screen.new(40, 8)
       screen:attach()
       screen:set_default_attr_ids({
+        [0] = {bold=true, foreground=Screen.colors.Blue},
         [1] = {foreground = Screen.colors.White, background = Screen.colors.Red},
         [2] = {bold = true, foreground = Screen.colors.SeaGreen}
       })
-      screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
     end)
 
     it('can show one line', function()
       nvim_async('err_write', 'has bork\n')
       screen:expect([[
         ^                                        |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {1:has bork}                                |
       ]])
     end)
@@ -236,11 +272,11 @@ describe('vim_* functions', function()
     it('shows return prompt when more than &cmdheight lines', function()
       nvim_async('err_write', 'something happened\nvery bad\n')
       screen:expect([[
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {1:something happened}                      |
         {1:very bad}                                |
         {2:Press ENTER or type command to continue}^ |
@@ -250,9 +286,9 @@ describe('vim_* functions', function()
     it('shows return prompt after all lines are shown', function()
       nvim_async('err_write', 'FAILURE\nERROR\nEXCEPTION\nTRACEBACK\n')
       screen:expect([[
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {1:FAILURE}                                 |
         {1:ERROR}                                   |
         {1:EXCEPTION}                               |
@@ -267,12 +303,12 @@ describe('vim_* functions', function()
       nvim_async('err_write', 'fail\n')
       screen:expect([[
         ^                                        |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {1:very fail}                               |
       ]])
       helpers.wait()
@@ -280,11 +316,11 @@ describe('vim_* functions', function()
       -- shows up to &cmdheight lines
       nvim_async('err_write', 'more fail\ntoo fail\n')
       screen:expect([[
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
+        {0:~                                       }|
         {1:more fail}                               |
         {1:too fail}                                |
         {2:Press ENTER or type command to continue}^ |
@@ -293,9 +329,104 @@ describe('vim_* functions', function()
     end)
   end)
 
+  describe('nvim_call_atomic', function()
+    it('works', function()
+      meths.buf_set_lines(0, 0, -1, true, {'first'})
+      local req = {
+        {'nvim_get_current_line', {}},
+        {'nvim_set_current_line', {'second'}},
+      }
+      eq({{'first', NIL}, NIL}, meths.call_atomic(req))
+      eq({'second'}, meths.buf_get_lines(0, 0, -1, true))
+    end)
+
+    it('allows multiple return values', function()
+      local req = {
+        {'nvim_set_var', {'avar', true}},
+        {'nvim_set_var', {'bvar', 'string'}},
+        {'nvim_get_var', {'avar'}},
+        {'nvim_get_var', {'bvar'}},
+      }
+      eq({{NIL, NIL, true, 'string'}, NIL}, meths.call_atomic(req))
+    end)
+
+    it('is aborted by errors in call', function()
+      local error_types = meths.get_api_info()[2].error_types
+      local req = {
+        {'nvim_set_var', {'one', 1}},
+        {'nvim_buf_set_lines', {}},
+        {'nvim_set_var', {'two', 2}},
+      }
+      eq({{NIL}, {1, error_types.Exception.id,
+                  'Wrong number of arguments: expecting 5 but got 0'}},
+         meths.call_atomic(req))
+      eq(1, meths.get_var('one'))
+      eq(false, pcall(meths.get_var, 'two'))
+
+      -- still returns all previous successful calls
+      req = {
+        {'nvim_set_var', {'avar', 5}},
+        {'nvim_set_var', {'bvar', 'string'}},
+        {'nvim_get_var', {'avar'}},
+        {'nvim_buf_get_lines', {0, 10, 20, true}},
+        {'nvim_get_var', {'bvar'}},
+      }
+      eq({{NIL, NIL, 5}, {3, error_types.Validation.id, 'Index out of bounds'}},
+        meths.call_atomic(req))
+
+      req = {
+        {'i_am_not_a_method', {'xx'}},
+        {'nvim_set_var', {'avar', 10}},
+      }
+      eq({{}, {0, error_types.Exception.id, 'Invalid method name'}},
+         meths.call_atomic(req))
+      eq(5, meths.get_var('avar'))
+    end)
+
+    it('throws error on malformated arguments', function()
+      local req = {
+        {'nvim_set_var', {'avar', 1}},
+        {'nvim_set_var'},
+        {'nvim_set_var', {'avar', 2}},
+      }
+      local status, err = pcall(meths.call_atomic, req)
+      eq(false, status)
+      ok(err:match(' All items in calls array must be arrays of size 2') ~= nil)
+      -- call before was done, but not after
+      eq(1, meths.get_var('avar'))
+
+      req = {
+        {'nvim_set_var', {'bvar', {2,3}}},
+        12,
+      }
+      status, err = pcall(meths.call_atomic, req)
+      eq(false, status)
+      ok(err:match('All items in calls array must be arrays') ~= nil)
+      eq({2,3}, meths.get_var('bvar'))
+
+      req = {
+        {'nvim_set_current_line', 'little line'},
+        {'nvim_set_var', {'avar', 3}},
+      }
+      status, err = pcall(meths.call_atomic, req)
+      eq(false, status)
+      ok(err:match('args must be Array') ~= nil)
+      -- call before was done, but not after
+      eq(1, meths.get_var('avar'))
+      eq({''}, meths.buf_get_lines(0, 0, -1, true))
+    end)
+  end)
+
   it('can throw exceptions', function()
     local status, err = pcall(nvim, 'get_option', 'invalid-option')
     eq(false, status)
     ok(err:match('Invalid option name') ~= nil)
   end)
+
+  it("doesn't leak memory on incorrect argument types", function()
+    local status, err = pcall(nvim, 'set_current_dir',{'not', 'a', 'dir'})
+    eq(false, status)
+    ok(err:match(': Wrong type for argument 1, expecting String') ~= nil)
+  end)
+
 end)
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index 92a33b4cdb..465bda6bc9 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -1,5 +1,4 @@
--- Sanity checks for window_* API calls via msgpack-rpc
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, curbuf, curbuf_contents, window, curwin, eq, neq,
   ok, feed, insert, eval = helpers.clear, helpers.nvim, helpers.curbuf,
   helpers.curbuf_contents, helpers.window, helpers.curwin, helpers.eq,
@@ -7,6 +6,8 @@ local clear, nvim, curbuf, curbuf_contents, window, curwin, eq, neq,
 local wait = helpers.wait
 local curwinmeths = helpers.curwinmeths
 local funcs = helpers.funcs
+local request = helpers.request
+local NIL = helpers.NIL
 
 -- check if str is visible at the beginning of some line
 local function is_visible(str)
@@ -27,17 +28,17 @@ local function is_visible(str)
     return false
 end
 
-describe('window_* functions', function()
+describe('api/win', function()
   before_each(clear)
 
-  describe('get_buffer', function()
+  describe('get_buf', function()
     it('works', function()
-      eq(curbuf(), window('get_buffer', nvim('get_windows')[1]))
+      eq(curbuf(), window('get_buf', nvim('list_wins')[1]))
       nvim('command', 'new')
-      nvim('set_current_window', nvim('get_windows')[2])
-      eq(curbuf(), window('get_buffer', nvim('get_windows')[2]))
-      neq(window('get_buffer', nvim('get_windows')[1]),
-        window('get_buffer', nvim('get_windows')[2]))
+      nvim('set_current_win', nvim('list_wins')[2])
+      eq(curbuf(), window('get_buf', nvim('list_wins')[2]))
+      neq(window('get_buf', nvim('list_wins')[1]),
+        window('get_buf', nvim('list_wins')[2]))
     end)
   end)
 
@@ -103,28 +104,28 @@ describe('window_* functions', function()
   describe('{get,set}_height', function()
     it('works', function()
       nvim('command', 'vsplit')
-      eq(window('get_height', nvim('get_windows')[2]),
-        window('get_height', nvim('get_windows')[1]))
-      nvim('set_current_window', nvim('get_windows')[2])
+      eq(window('get_height', nvim('list_wins')[2]),
+        window('get_height', nvim('list_wins')[1]))
+      nvim('set_current_win', nvim('list_wins')[2])
       nvim('command', 'split')
-      eq(window('get_height', nvim('get_windows')[2]),
-        math.floor(window('get_height', nvim('get_windows')[1]) / 2))
-      window('set_height', nvim('get_windows')[2], 2)
-      eq(2, window('get_height', nvim('get_windows')[2]))
+      eq(window('get_height', nvim('list_wins')[2]),
+        math.floor(window('get_height', nvim('list_wins')[1]) / 2))
+      window('set_height', nvim('list_wins')[2], 2)
+      eq(2, window('get_height', nvim('list_wins')[2]))
     end)
   end)
 
   describe('{get,set}_width', function()
     it('works', function()
       nvim('command', 'split')
-      eq(window('get_width', nvim('get_windows')[2]),
-        window('get_width', nvim('get_windows')[1]))
-      nvim('set_current_window', nvim('get_windows')[2])
+      eq(window('get_width', nvim('list_wins')[2]),
+        window('get_width', nvim('list_wins')[1]))
+      nvim('set_current_win', nvim('list_wins')[2])
       nvim('command', 'vsplit')
-      eq(window('get_width', nvim('get_windows')[2]),
-        math.floor(window('get_width', nvim('get_windows')[1]) / 2))
-      window('set_width', nvim('get_windows')[2], 2)
-      eq(2, window('get_width', nvim('get_windows')[2]))
+      eq(window('get_width', nvim('list_wins')[2]),
+        math.floor(window('get_width', nvim('list_wins')[1]) / 2))
+      window('set_width', nvim('list_wins')[2], 2)
+      eq(2, window('get_width', nvim('list_wins')[2]))
     end)
   end)
 
@@ -137,6 +138,21 @@ describe('window_* functions', function()
       curwinmeths.del_var('lua')
       eq(0, funcs.exists('w:lua'))
     end)
+
+    it('window_set_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL, request('window_set_var', 0, 'lua', val1))
+      eq(val1, request('window_set_var', 0, 'lua', val2))
+    end)
+
+    it('window_del_var returns the old value', function()
+      local val1 = {1, 2, {['3'] = 1}}
+      local val2 = {4, 7}
+      eq(NIL,  request('window_set_var', 0, 'lua', val1))
+      eq(val1, request('window_set_var', 0, 'lua', val2))
+      eq(val2, request('window_del_var', 0, 'lua'))
+    end)
   end)
 
   describe('{get,set}_option', function()
@@ -152,17 +168,17 @@ describe('window_* functions', function()
 
   describe('get_position', function()
     it('works', function()
-      local height = window('get_height', nvim('get_windows')[1])
-      local width = window('get_width', nvim('get_windows')[1])
+      local height = window('get_height', nvim('list_wins')[1])
+      local width = window('get_width', nvim('list_wins')[1])
       nvim('command', 'split')
       nvim('command', 'vsplit')
-      eq({0, 0}, window('get_position', nvim('get_windows')[1]))
+      eq({0, 0}, window('get_position', nvim('list_wins')[1]))
       local vsplit_pos = math.floor(width / 2)
       local split_pos = math.floor(height / 2)
       local win2row, win2col =
-        unpack(window('get_position', nvim('get_windows')[2]))
+        unpack(window('get_position', nvim('list_wins')[2]))
       local win3row, win3col =
-        unpack(window('get_position', nvim('get_windows')[3]))
+        unpack(window('get_position', nvim('list_wins')[3]))
       eq(0, win2row)
       eq(0, win3col)
       ok(vsplit_pos - 1 <= win2col and win2col <= vsplit_pos + 1)
@@ -175,19 +191,43 @@ describe('window_* functions', function()
       nvim('command', 'tabnew')
       nvim('command', 'vsplit')
       eq(window('get_tabpage',
-        nvim('get_windows')[1]), nvim('get_tabpages')[1])
+        nvim('list_wins')[1]), nvim('list_tabpages')[1])
       eq(window('get_tabpage',
-        nvim('get_windows')[2]), nvim('get_tabpages')[2])
+        nvim('list_wins')[2]), nvim('list_tabpages')[2])
       eq(window('get_tabpage',
-        nvim('get_windows')[3]), nvim('get_tabpages')[2])
+        nvim('list_wins')[3]), nvim('list_tabpages')[2])
+    end)
+  end)
+
+  describe('get_number', function()
+    it('works', function()
+      local wins = nvim('list_wins')
+      eq(1, window('get_number', wins[1]))
+
+      nvim('command', 'split')
+      local win1, win2 = unpack(nvim('list_wins'))
+      eq(1, window('get_number', win1))
+      eq(2, window('get_number', win2))
+
+      nvim('command', 'wincmd J')
+      eq(2, window('get_number', win1))
+      eq(1, window('get_number', win2))
+
+      nvim('command', 'tabnew')
+      local win3 = nvim('list_wins')[3]
+      -- First tab page
+      eq(2, window('get_number', win1))
+      eq(1, window('get_number', win2))
+      -- Second tab page
+      eq(1, window('get_number', win3))
     end)
   end)
 
   describe('is_valid', function()
     it('works', function()
       nvim('command', 'split')
-      local win = nvim('get_windows')[2]
-      nvim('set_current_window', win)
+      local win = nvim('list_wins')[2]
+      nvim('set_current_win', win)
       ok(window('is_valid', win))
       nvim('command', 'close')
       ok(not window('is_valid', win))
diff --git a/test/functional/autocmd/autocmd_spec.lua b/test/functional/autocmd/autocmd_spec.lua
index 3c813abc2e..c38bd75c69 100644
--- a/test/functional/autocmd/autocmd_spec.lua
+++ b/test/functional/autocmd/autocmd_spec.lua
@@ -1,7 +1,8 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local clear = helpers.clear
 local command = helpers.command
+local eq = helpers.eq
 local eval = helpers.eval
 
 describe('autocmds:', function()
@@ -11,8 +12,8 @@ describe('autocmds:', function()
     local expected = {
       'WinLeave',
       'TabLeave',
-      'TabNew',
       'WinEnter',
+      'TabNew',
       'TabEnter',
       'BufLeave',
       'BufEnter'
@@ -28,4 +29,8 @@ describe('autocmds:', function()
     command('tabnew')
     assert.same(expected, eval('g:foo'))
   end)
+
+  it('v:vim_did_enter is 1 after VimEnter', function()
+    eq(1, eval('v:vim_did_enter'))
+  end)
 end)
diff --git a/test/functional/autocmd/bufenter_spec.lua b/test/functional/autocmd/bufenter_spec.lua
new file mode 100644
index 0000000000..ccbcdf5c5e
--- /dev/null
+++ b/test/functional/autocmd/bufenter_spec.lua
@@ -0,0 +1,35 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local command = helpers.command
+local eq = helpers.eq
+local eval = helpers.eval
+local execute = helpers.execute
+local request = helpers.request
+local source = helpers.source
+
+describe('autocmd BufEnter', function()
+  before_each(clear)
+
+  it("triggered by nvim_command('edit <dir>')", function()
+    command("autocmd BufEnter * if isdirectory(expand('<afile>')) | let g:dir_bufenter = 1 | endif")
+    request("nvim_command", "split .")
+    eq(1, eval("exists('g:dir_bufenter')"))  -- Did BufEnter for the directory.
+    eq(2, eval("bufnr('%')"))                -- Switched to the dir buffer.
+  end)
+
+  it('triggered by "try|:split <dir>|endtry" in a function', function()
+    command("autocmd BufEnter * if isdirectory(expand('<afile>')) | let g:dir_bufenter = 1 | endif")
+    source([[
+      function! Test()
+        try
+          exe 'split .'
+        catch
+        endtry
+      endfunction
+    ]])
+    execute("call Test()")
+    eq(1, eval("exists('g:dir_bufenter')"))  -- Did BufEnter for the directory.
+    eq(2, eval("bufnr('%')"))                -- Switched to the dir buffer.
+  end)
+end)
diff --git a/test/functional/autocmd/dirchanged_spec.lua b/test/functional/autocmd/dirchanged_spec.lua
new file mode 100644
index 0000000000..15196dbd44
--- /dev/null
+++ b/test/functional/autocmd/dirchanged_spec.lua
@@ -0,0 +1,113 @@
+local lfs = require('lfs')
+local h = require('test.functional.helpers')(after_each)
+
+local clear = h.clear
+local command = h.command
+local eq = h.eq
+local eval = h.eval
+local request = h.request
+
+describe('autocmd DirChanged', function()
+  local curdir = string.gsub(lfs.currentdir(), '\\', '/')
+  local dirs = {
+    curdir .. '/Xtest-functional-autocmd-dirchanged.dir1',
+    curdir .. '/Xtest-functional-autocmd-dirchanged.dir2',
+    curdir .. '/Xtest-functional-autocmd-dirchanged.dir3',
+  }
+
+  setup(function()    for _, dir in pairs(dirs) do h.mkdir(dir) end end)
+  teardown(function() for _, dir in pairs(dirs) do h.rmdir(dir) end end)
+
+  before_each(function()
+    clear()
+    command('autocmd DirChanged * let [g:event, g:scope, g:cdcount] = [copy(v:event), expand("<amatch>"), 1 + get(g:, "cdcount", 0)]')
+  end)
+
+  it('sets v:event', function()
+    command('lcd '..dirs[1])
+    eq({cwd=dirs[1], scope='window'}, eval('g:event'))
+    eq(1, eval('g:cdcount'))
+
+    command('tcd '..dirs[2])
+    eq({cwd=dirs[2], scope='tab'}, eval('g:event'))
+    eq(2, eval('g:cdcount'))
+
+    command('cd '..dirs[3])
+    eq({cwd=dirs[3], scope='global'}, eval('g:event'))
+    eq(3, eval('g:cdcount'))
+  end)
+
+  it('disallows recursion', function()
+    command('set shellslash')
+    -- Set up a _nested_ handler.
+    command('autocmd DirChanged * nested lcd '..dirs[3])
+    command('lcd '..dirs[1])
+    eq({cwd=dirs[1], scope='window'}, eval('g:event'))
+    eq(1, eval('g:cdcount'))
+    -- autocmd changed to dirs[3], but did NOT trigger another DirChanged.
+    eq(dirs[3], eval('getcwd()'))
+  end)
+
+  it('sets <amatch> to CWD "scope"', function()
+    command('lcd '..dirs[1])
+    eq('window', eval('g:scope'))
+
+    command('tcd '..dirs[2])
+    eq('tab', eval('g:scope'))
+
+    command('cd '..dirs[3])
+    eq('global', eval('g:scope'))
+  end)
+
+  it('does not trigger if :cd fails', function()
+    command('let g:event = {}')
+
+    local status1, err1 = pcall(function()
+      command('lcd '..dirs[1] .. '/doesnotexist')
+    end)
+    eq({}, eval('g:event'))
+
+    local status2, err2 = pcall(function()
+      command('lcd '..dirs[2] .. '/doesnotexist')
+    end)
+    eq({}, eval('g:event'))
+
+    local status3, err3 = pcall(function()
+      command('lcd '..dirs[3] .. '/doesnotexist')
+    end)
+    eq({}, eval('g:event'))
+
+    eq(false, status1)
+    eq(false, status2)
+    eq(false, status3)
+
+    eq('E344:', string.match(err1, "E%d*:"))
+    eq('E344:', string.match(err2, "E%d*:"))
+    eq('E344:', string.match(err3, "E%d*:"))
+  end)
+
+  it("is triggered by 'autochdir'", function()
+    command('set autochdir')
+
+    command('split '..dirs[1]..'/foo')
+    eq({cwd=dirs[1], scope='window'}, eval('g:event'))
+
+    command('split '..dirs[2]..'/bar')
+    eq({cwd=dirs[2], scope='window'}, eval('g:event'))
+  end)
+
+  it('is triggered by nvim_set_current_dir()', function()
+    request('nvim_set_current_dir', dirs[1])
+    eq({cwd=dirs[1], scope='global'}, eval('g:event'))
+
+    request('nvim_set_current_dir', dirs[2])
+    eq({cwd=dirs[2], scope='global'}, eval('g:event'))
+
+    local status, err = pcall(function()
+      request('nvim_set_current_dir', '/doesnotexist')
+    end)
+    eq(false, status)
+    eq('Failed to change directory', string.match(err, ': (.*)'))
+    eq({cwd=dirs[2], scope='global'}, eval('g:event'))
+  end)
+end)
diff --git a/test/functional/autocmd/tabclose_spec.lua b/test/functional/autocmd/tabclose_spec.lua
index bf609d1846..1431c69589 100644
--- a/test/functional/autocmd/tabclose_spec.lua
+++ b/test/functional/autocmd/tabclose_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, eq = helpers.clear, helpers.nvim, helpers.eq
 
 describe('TabClosed', function()
@@ -7,7 +7,7 @@ describe('TabClosed', function()
             it('matches when  closing any tab', function()
                 clear()
                 nvim('command', 'au! TabClosed * echom "tabclosed:".expand("<afile>").":".expand("<amatch>").":".tabpagenr()')
-                repeat 
+                repeat
                     nvim('command',  'tabnew')
                 until nvim('eval', 'tabpagenr()') == 6 -- current tab is now 6
                 eq("\ntabclosed:6:6:5", nvim('command_output', 'tabclose')) -- close last 6, current tab is now 5
@@ -19,7 +19,7 @@ describe('TabClosed', function()
         describe('with NR as <afile>', function()
             it('matches when  closing a tab whose index is NR', function()
                 nvim('command', 'au! TabClosed 2 echom "tabclosed:match"')
-                repeat 
+                repeat
                     nvim('command',  'tabnew')
                 until nvim('eval', 'tabpagenr()') == 5 -- current tab is now 5
                 -- sanity check, we shouldn't match on tabs with numbers other than 2
diff --git a/test/functional/autocmd/tabnew_spec.lua b/test/functional/autocmd/tabnew_spec.lua
index aaf9db0a99..ad40954f76 100644
--- a/test/functional/autocmd/tabnew_spec.lua
+++ b/test/functional/autocmd/tabnew_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local clear = helpers.clear
 local command = helpers.command
@@ -17,12 +17,11 @@ describe('autocmd TabNew', function()
   end)
 
   it('matches when opening a new tab for FILE', function()
-    local tmp_path = helpers.funcs.tempname()
     command('let g:test = "foo"')
-    command('autocmd! TabNew ' .. tmp_path .. ' let g:test = "bar"')
-    command('tabnew ' .. tmp_path ..'X')
+    command('autocmd! TabNew Xtest-tabnew let g:test = "bar"')
+    command('tabnew Xtest-tabnewX')
     eq('foo', eval('g:test'))
-    command('tabnew ' .. tmp_path)
+    command('tabnew Xtest-tabnew')
     eq('bar', eval('g:test'))
   end)
 end)
diff --git a/test/functional/autocmd/tabnewentered_spec.lua b/test/functional/autocmd/tabnewentered_spec.lua
index 64b9a22f41..bdbe677132 100644
--- a/test/functional/autocmd/tabnewentered_spec.lua
+++ b/test/functional/autocmd/tabnewentered_spec.lua
@@ -1,22 +1,31 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, eq = helpers.clear, helpers.nvim, helpers.eq
 
 describe('TabNewEntered', function()
-    describe('au TabNewEntered', function()
-        describe('with * as <afile>', function()
-            it('matches when entering any new tab', function()
-                clear()
-                nvim('command', 'au! TabNewEntered * echom "tabnewentered:".tabpagenr().":".bufnr("")')
-                eq("\ntabnewentered:2:2", nvim('command_output', 'tabnew'))
-                eq("\n\"test.x2\" [New File]\ntabnewentered:3:3", nvim('command_output', 'tabnew test.x2'))
-           end)
-        end)
-        describe('with FILE as <afile>', function()
-            it('matches when opening a new tab for FILE', function()
-                local tmp_path = nvim('eval', 'tempname()')
-                nvim('command', 'au! TabNewEntered '..tmp_path..' echom "tabnewentered:match"')
-                eq("\n\""..tmp_path.."\" [New File]\ntabnewentered:4:4\ntabnewentered:match", nvim('command_output', 'tabnew '..tmp_path))
-           end)
-        end)
+  describe('au TabNewEntered', function()
+    describe('with * as <afile>', function()
+      it('matches when entering any new tab', function()
+        clear()
+        nvim('command', 'au! TabNewEntered * echom "tabnewentered:".tabpagenr().":".bufnr("")')
+        eq("\ntabnewentered:2:2", nvim('command_output', 'tabnew'))
+        eq("\n\"test.x2\" [New File]\ntabnewentered:3:3", nvim('command_output', 'tabnew test.x2'))
+     end)
     end)
+    describe('with FILE as <afile>', function()
+      it('matches when opening a new tab for FILE', function()
+        nvim('command', 'au! TabNewEntered Xtest-tabnewentered echom "tabnewentered:match"')
+        eq('\n"Xtest-tabnewentered" [New File]\ntabnewentered:4:4\ntabnewentered:match',
+          nvim('command_output', 'tabnew Xtest-tabnewentered'))
+     end)
+    end)
+    describe('with CTRL-W T', function()
+      it('works when opening a new tab with CTRL-W T', function()
+        clear()
+        nvim('command', 'au! TabNewEntered * echom "entered"')
+        nvim('command', 'tabnew test.x2')
+        nvim('command', 'split')
+        eq('\nentered', nvim('command_output', 'execute "normal \\<C-W>T"'))
+      end)
+    end)
+  end)
 end)
diff --git a/test/functional/autocmd/termclose_spec.lua b/test/functional/autocmd/termclose_spec.lua
index 4de3f039c1..6871711058 100644
--- a/test/functional/autocmd/termclose_spec.lua
+++ b/test/functional/autocmd/termclose_spec.lua
@@ -1,10 +1,12 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 
 local clear, execute, feed, nvim, nvim_dir = helpers.clear,
 helpers.execute, helpers.feed, helpers.nvim, helpers.nvim_dir
 local eval, eq = helpers.eval, helpers.eq
 
+if helpers.pending_win32(pending) then return end
+
 describe('TermClose event', function()
   local screen
   before_each(function()
@@ -12,7 +14,7 @@ describe('TermClose event', function()
     nvim('set_option', 'shell', nvim_dir .. '/shell-test')
     nvim('set_option', 'shellcmdflag', 'EXE')
     screen = Screen.new(20, 4)
-    screen:attach(false)
+    screen:attach({rgb=false})
   end)
 
   it('works as expected', function()
diff --git a/test/functional/autocmd/textyankpost_spec.lua b/test/functional/autocmd/textyankpost_spec.lua
index c26ceeaedc..bd5f1912c5 100644
--- a/test/functional/autocmd/textyankpost_spec.lua
+++ b/test/functional/autocmd/textyankpost_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq
 local feed, execute, expect, command = helpers.feed, helpers.execute, helpers.expect, helpers.command
 local curbufmeths, funcs, neq = helpers.curbufmeths, helpers.funcs, helpers.neq
diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua
index 898ec556a2..2b26697b97 100644
--- a/test/functional/clipboard/clipboard_provider_spec.lua
+++ b/test/functional/clipboard/clipboard_provider_spec.lua
@@ -1,6 +1,6 @@
 -- Test clipboard provider support
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect, eq, eval = helpers.execute, helpers.expect, helpers.eq, helpers.eval
@@ -308,6 +308,7 @@ describe('clipboard usage', function()
     end)
 
     it('links the "+ and unnamed registers', function()
+      eq('+', eval('v:register'))
       insert("one two")
       feed('^"+dwdw"+P')
       expect('two')
@@ -335,6 +336,7 @@ describe('clipboard usage', function()
       eq({{'really unnamed', ''}, 'V'}, eval("g:test_clip['*']"))
 
       -- unnamedplus takes predecence when pasting
+      eq('+', eval('v:register'))
       execute("let g:test_clip['+'] = ['the plus','']")
       execute("let g:test_clip['*'] = ['the star','']")
       feed("p")
@@ -436,6 +438,8 @@ describe('clipboard usage', function()
   end)
 
   it('handles middleclick correctly', function()
+    execute('set mouse=a')
+
     local screen = Screen.new(30, 5)
     screen:attach()
     insert([[
diff --git a/test/functional/core/exit_spec.lua b/test/functional/core/exit_spec.lua
new file mode 100644
index 0000000000..3fb39f3e78
--- /dev/null
+++ b/test/functional/core/exit_spec.lua
@@ -0,0 +1,46 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local command = helpers.command
+local eval = helpers.eval
+local eq, neq = helpers.eq, helpers.neq
+local run = helpers.run
+
+describe('v:exiting', function()
+  local cid
+
+  before_each(function()
+    helpers.clear()
+    cid = helpers.nvim('get_api_info')[1]
+  end)
+
+  it('defaults to v:null', function()
+    eq(1, eval('v:exiting is v:null'))
+  end)
+
+  it('is 0 on normal exit', function()
+    local function on_setup()
+      command('autocmd VimLeavePre * call rpcrequest('..cid..', "")')
+      command('autocmd VimLeave    * call rpcrequest('..cid..', "")')
+      command('quit')
+    end
+    local function on_request()
+      eq(0, eval('v:exiting'))
+      return ''
+    end
+    run(on_request, nil, on_setup)
+  end)
+
+  it('is non-zero after :cquit', function()
+    local function on_setup()
+      command('autocmd VimLeavePre * call rpcrequest('..cid..', "")')
+      command('autocmd VimLeave    * call rpcrequest('..cid..', "")')
+      command('cquit')
+    end
+    local function on_request()
+      neq(0, eval('v:exiting'))
+      return ''
+    end
+    run(on_request, nil, on_setup)
+  end)
+
+end)
diff --git a/test/functional/job/job_spec.lua b/test/functional/core/job_spec.lua
index d21b9051e2..6e9633465f 100644
--- a/test/functional/job/job_spec.lua
+++ b/test/functional/core/job_spec.lua
@@ -1,25 +1,36 @@
-
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, eval, execute, feed, insert, neq, next_msg, nvim,
-  nvim_dir, ok, source, write_file = helpers.clear,
+  nvim_dir, ok, source, write_file, mkdir, rmdir = helpers.clear,
   helpers.eq, helpers.eval, helpers.execute, helpers.feed,
   helpers.insert, helpers.neq, helpers.next_message, helpers.nvim,
   helpers.nvim_dir, helpers.ok, helpers.source,
-  helpers.write_file
+  helpers.write_file, helpers.mkdir, helpers.rmdir
+local command = helpers.command
+local wait = helpers.wait
+local iswin = helpers.iswin
 local Screen = require('test.functional.ui.screen')
 
-
 describe('jobs', function()
   local channel
 
   before_each(function()
     clear()
+    if iswin() then
+      helpers.set_shell_powershell()
+    end
     channel = nvim('get_api_info')[1]
     nvim('set_var', 'channel', channel)
     source([[
-    function! s:OnEvent(id, data, event)
+    function! Normalize(data) abort
+      " Windows: remove ^M
+      return type([]) == type(a:data)
+        \ ? map(a:data, 'substitute(v:val, "\r", "", "g")')
+        \ : a:data
+    endfunction
+    function! s:OnEvent(id, data, event) dict
       let userdata = get(self, 'user')
-      call rpcnotify(g:channel, a:event, userdata, a:data)
+      let data     = Normalize(a:data)
+      call rpcnotify(g:channel, a:event, userdata, data)
     endfunction
     let g:job_opts = {
     \ 'on_stdout': function('s:OnEvent'),
@@ -32,24 +43,86 @@ describe('jobs', function()
 
   it('uses &shell and &shellcmdflag if passed a string', function()
     nvim('command', "let $VAR = 'abc'")
-    nvim('command', "let j = jobstart('echo $VAR', g:job_opts)")
+    if iswin() then
+      nvim('command', "let j = jobstart('echo $env:VAR', g:job_opts)")
+    else
+      nvim('command', "let j = jobstart('echo $VAR', g:job_opts)")
+    end
     eq({'notification', 'stdout', {0, {'abc', ''}}}, next_msg())
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
+  it('changes to given / directory', function()
+    nvim('command', "let g:job_opts.cwd = '/'")
+    if iswin() then
+      nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+    else
+      nvim('command', "let j = jobstart('pwd', g:job_opts)")
+    end
+    eq({'notification', 'stdout',
+      {0, {(iswin() and [[C:\]] or '/'), ''}}}, next_msg())
+    eq({'notification', 'exit', {0, 0}}, next_msg())
+  end)
+
+  it('changes to given `cwd` directory', function()
+    local dir = eval('resolve(tempname())')
+    mkdir(dir)
+    nvim('command', "let g:job_opts.cwd = '" .. dir .. "'")
+    if iswin() then
+      nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+    else
+      nvim('command', "let j = jobstart('pwd', g:job_opts)")
+    end
+    eq({'notification', 'stdout', {0, {dir, ''}}}, next_msg())
+    eq({'notification', 'exit', {0, 0}}, next_msg())
+    rmdir(dir)
+  end)
+
+  it('fails to change to invalid `cwd`', function()
+    local dir = eval('resolve(tempname())."-bogus"')
+    local _, err = pcall(function()
+      nvim('command', "let g:job_opts.cwd = '" .. dir .. "'")
+      if iswin() then
+        nvim('command', "let j = jobstart('pwd|%{$_.Path}', g:job_opts)")
+      else
+        nvim('command', "let j = jobstart('pwd', g:job_opts)")
+      end
+    end)
+    ok(string.find(err, "E475: Invalid argument: expected valid directory$") ~= nil)
+  end)
+
   it('returns 0 when it fails to start', function()
-    local status, rv = pcall(eval, "jobstart([])")
-    eq(false, status)
-    ok(rv ~= nil)
+    eq("", eval("v:errmsg"))
+    execute("let g:test_jobid = jobstart([])")
+    eq(0, eval("g:test_jobid"))
+    eq("E474:", string.match(eval("v:errmsg"), "E%d*:"))
+  end)
+
+  it('returns -1 when target is not executable #5465', function()
+    if helpers.pending_win32(pending) then return end
+    local function new_job()
+      return eval([[jobstart('')]])
+    end
+    local executable_jobid = new_job()
+    local nonexecutable_jobid = eval(
+      "jobstart(['./test/functional/fixtures/non_executable.txt'])")
+    eq(-1, nonexecutable_jobid)
+    -- Should _not_ throw an error.
+    eq("", eval("v:errmsg"))
+    -- Non-executable job should not increment the job ids. #5465
+    eq(executable_jobid + 1, new_job())
   end)
 
   it('invokes callbacks when the job writes and exits', function()
-    nvim('command', "call jobstart(['echo'], g:job_opts)")
+    -- TODO: hangs on Windows
+    if helpers.pending_win32(pending) then return end
+    nvim('command', "call jobstart('echo', g:job_opts)")
     eq({'notification', 'stdout', {0, {'', ''}}}, next_msg())
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
   it('allows interactive commands', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     neq(0, eval('j'))
     nvim('command', 'call jobsend(j, "abc\\n")')
@@ -63,8 +136,9 @@ describe('jobs', function()
   end)
 
   it('preserves NULs', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     -- Make a file with NULs in it.
-    local filename = os.tmpname()
+    local filename = helpers.tmpname()
     write_file(filename, "abc\0def\n")
 
     nvim('command', "let j = jobstart(['cat', '"..filename.."'], g:job_opts)")
@@ -80,6 +154,14 @@ describe('jobs', function()
   end)
 
   it("will not buffer data if it doesn't end in newlines", function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
+    if os.getenv("TRAVIS") and os.getenv("CC") == "gcc-4.9"
+      and helpers.os_name() == "osx" then
+      -- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86.
+      pending("[Hangs on Travis macOS. #5002]", function() end)
+      return
+    end
+
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobsend(j, "abc\\nxyz")')
     eq({'notification', 'stdout', {0, {'abc', 'xyz'}}}, next_msg())
@@ -87,14 +169,16 @@ describe('jobs', function()
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
-  it('can preserve newlines', function()
+  it('preserves newlines', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobsend(j, "a\\n\\nc\\n\\n\\n\\nb\\n\\n")')
     eq({'notification', 'stdout',
       {0, {'a', '', 'c', '', '', '', 'b', '', ''}}}, next_msg())
   end)
 
-  it('can preserve nuls', function()
+  it('preserves NULs', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobsend(j, ["\n123\n", "abc\\nxyz\n", ""])')
     eq({'notification', 'stdout', {0, {'\n123\n', 'abc\nxyz\n', ''}}},
@@ -103,7 +187,8 @@ describe('jobs', function()
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
-  it('can avoid sending final newline', function()
+  it('avoids sending final newline', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobsend(j, ["some data", "without\nfinal nl"])')
     eq({'notification', 'stdout', {0, {'some data', 'without\nfinal nl'}}},
@@ -112,13 +197,15 @@ describe('jobs', function()
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
-  it('can close the job streams with jobclose', function()
+  it('closes the job streams with jobclose', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobclose(j, "stdin")')
     eq({'notification', 'exit', {0, 0}}, next_msg())
   end)
 
-  it("won't allow jobsend with a job that closed stdin", function()
+  it("disallows jobsend on a job that closed stdin", function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     nvim('command', 'call jobclose(j, "stdin")')
     eq(false, pcall(function()
@@ -126,23 +213,26 @@ describe('jobs', function()
     end))
   end)
 
-  it('will not allow jobsend/stop on a non-existent job', function()
+  it('disallows jobsend/stop on a non-existent job', function()
     eq(false, pcall(eval, "jobsend(-1, 'lol')"))
     eq(false, pcall(eval, "jobstop(-1)"))
   end)
 
-  it('will not allow jobstop twice on the same job', function()
+  it('disallows jobstop twice on the same job', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j = jobstart(['cat', '-'], g:job_opts)")
     neq(0, eval('j'))
     eq(true, pcall(eval, "jobstop(j)"))
     eq(false, pcall(eval, "jobstop(j)"))
   end)
 
-  it('will not cause a memory leak if we leave a job running', function()
+  it('will not leak memory if we leave a job running', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "call jobstart(['cat', '-'], g:job_opts)")
   end)
 
   it('can get the pid value using getpid', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     nvim('command', "let j =  jobstart(['cat', '-'], g:job_opts)")
     local pid = eval('jobpid(j)')
     eq(0,os.execute('ps -p '..pid..' > /dev/null'))
@@ -151,19 +241,21 @@ describe('jobs', function()
     neq(0,os.execute('ps -p '..pid..' > /dev/null'))
   end)
 
-  it("doesn't survive the exit of nvim", function()
+  it("do not survive the exit of nvim", function()
+    if helpers.pending_win32(pending) then return end
     -- use sleep, which doesn't die on stdin close
-    nvim('command', "let j =  jobstart(['sleep', '1000'], g:job_opts)")
-    local pid = eval('jobpid(j)')
+    nvim('command', "let g:j =  jobstart(['sleep', '1000'], g:job_opts)")
+    local pid = eval('jobpid(g:j)')
     eq(0,os.execute('ps -p '..pid..' > /dev/null'))
     clear()
     neq(0,os.execute('ps -p '..pid..' > /dev/null'))
   end)
 
   it('can survive the exit of nvim with "detach"', function()
+    if helpers.pending_win32(pending) then return end
     nvim('command', 'let g:job_opts.detach = 1')
-    nvim('command', "let j = jobstart(['sleep', '1000'], g:job_opts)")
-    local pid = eval('jobpid(j)')
+    nvim('command', "let g:j = jobstart(['sleep', '1000'], g:job_opts)")
+    local pid = eval('jobpid(g:j)')
     eq(0,os.execute('ps -p '..pid..' > /dev/null'))
     clear()
     eq(0,os.execute('ps -p '..pid..' > /dev/null'))
@@ -173,13 +265,14 @@ describe('jobs', function()
 
   it('can pass user data to the callback', function()
     nvim('command', 'let g:job_opts.user = {"n": 5, "s": "str", "l": [1]}')
-    nvim('command', "call jobstart(['echo'], g:job_opts)")
+    nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
     local data = {n = 5, s = 'str', l = {1}}
-    eq({'notification', 'stdout', {data, {'', ''}}}, next_msg())
+    eq({'notification', 'stdout', {data, {'foo', ''}}}, next_msg())
     eq({'notification', 'exit', {data, 0}}, next_msg())
   end)
 
   it('can omit options', function()
+    if helpers.pending_win32(pending) then return end
     neq(0, nvim('eval', 'delete(".Xtestjob")'))
     nvim('command', "call jobstart(['touch', '.Xtestjob'])")
     nvim('command', "sleep 100m")
@@ -190,20 +283,20 @@ describe('jobs', function()
     nvim('command', 'unlet g:job_opts.on_stdout')
     nvim('command', 'unlet g:job_opts.on_stderr')
     nvim('command', 'let g:job_opts.user = 5')
-    nvim('command', "call jobstart(['echo'], g:job_opts)")
+    nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
     eq({'notification', 'exit', {5, 0}}, next_msg())
   end)
 
   it('can omit exit callback', function()
     nvim('command', 'unlet g:job_opts.on_exit')
     nvim('command', 'let g:job_opts.user = 5')
-    nvim('command', "call jobstart(['echo'], g:job_opts)")
-    eq({'notification', 'stdout', {5, {'', ''}}}, next_msg())
+    nvim('command', [[call jobstart('echo "foo"', g:job_opts)]])
+    eq({'notification', 'stdout', {5, {'foo', ''}}}, next_msg())
   end)
 
   it('will pass return code with the exit event', function()
     nvim('command', 'let g:job_opts.user = 5')
-    nvim('command', "call jobstart([&sh, '-c', 'exit 55'], g:job_opts)")
+    nvim('command', "call jobstart('exit 55', g:job_opts)")
     eq({'notification', 'exit', {5, 55}}, next_msg())
   end)
 
@@ -213,15 +306,19 @@ describe('jobs', function()
     function g:dict.on_exit(id, code, event)
       call rpcnotify(g:channel, a:event, a:code, self.id)
     endfunction
-    call jobstart([&sh, '-c', 'exit 45'], g:dict)
+    call jobstart('exit 45', g:dict)
     ]])
     eq({'notification', 'exit', {45, 10}}, next_msg())
   end)
 
-  it('cant redefine callbacks being used by a job', function()
+  it('can redefine callbacks being used by a job', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
     local screen = Screen.new()
     screen:attach()
-    local script = [[
+    screen:set_default_attr_ids({
+      [1] = {bold=true, foreground=Screen.colors.Blue},
+    })
+    source([[
       function! g:JobHandler(job_id, data, event)
       endfunction
 
@@ -231,36 +328,77 @@ describe('jobs', function()
       \ 'on_exit': function('g:JobHandler')
       \ }
       let job = jobstart('cat -', g:callbacks)
-    ]]
-    source(script)
-    feed(':function! g:JobHandler(job_id, data, event)<cr>')
-    feed(':endfunction<cr>')
-    screen:expect([[
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      :function! g:JobHandler(job_id, data, event)         |
-      :  :endfunction                                      |
-      E127: Cannot redefine function JobHandler: It is in u|
-      se                                                   |
-      Press ENTER or type command to continue^              |
     ]])
+    wait()
+    source([[
+      function! g:JobHandler(job_id, data, event)
+      endfunction
+    ]])
+
+    eq("", eval("v:errmsg"))
+  end)
+
+  it('requires funcrefs for script-local (s:) functions', function()
+    -- Pass job callback names _without_ `function(...)`.
+    source([[
+      function! s:OnEvent(id, data, event) dict
+        let g:job_result = get(self, 'user')
+      endfunction
+      let s:job = jobstart('echo "foo"', {
+        \ 'on_stdout': 's:OnEvent',
+        \ 'on_stderr': 's:OnEvent',
+        \ 'on_exit':   's:OnEvent',
+        \ 'user': 2349
+        \ })
+    ]])
+
+    -- The behavior is asynchronous, retry until a time limit.
+    helpers.retry(nil, 10000, function()
+      eq("E120:", string.match(eval("v:errmsg"), "E%d*:"))
+    end)
+  end)
+
+  it('does not repeat output with slow output handlers', function()
+    if helpers.pending_win32(pending) then return end
+    source([[
+      let d = {'data': []}
+      function! d.on_stdout(job, data, event) dict
+        call add(self.data, a:data)
+        sleep 200m
+      endfunction
+      if has('win32')
+        let cmd = '1,2,3,4,5 | foreach-object -process {echo $_; sleep 0.1}'
+      else
+        let cmd = ['sh', '-c', 'for i in $(seq 1 5); do echo $i; sleep 0.1; done']
+      endif
+      call jobwait([jobstart(cmd, d)])
+      call rpcnotify(g:channel, 'data', d.data)
+    ]])
+    eq({'notification', 'data', {{{'1', ''}, {'2', ''}, {'3', ''}, {'4', ''}, {'5', ''}}}}, next_msg())
+  end)
+
+  it('jobstart() works with partial functions', function()
+    source([[
+    function PrintArgs(a1, a2, id, data, event)
+      " Windows: remove ^M
+      let normalized = map(a:data, 'substitute(v:val, "\r", "", "g")')
+      call rpcnotify(g:channel, '1', a:a1,  a:a2, normalized, a:event)
+    endfunction
+    let Callback = function('PrintArgs', ["foo", "bar"])
+    let g:job_opts = {'on_stdout': Callback}
+    call jobstart('echo "some text"', g:job_opts)
+    ]])
+    eq({'notification', '1', {'foo', 'bar', {'some text', ''}, 'stdout'}}, next_msg())
   end)
 
   describe('jobwait', function()
     it('returns a list of status codes', function()
       source([[
       call rpcnotify(g:channel, 'wait', jobwait([
-      \  jobstart([&sh, '-c', 'sleep 0.10; exit 4']),
-      \  jobstart([&sh, '-c', 'sleep 0.110; exit 5']),
-      \  jobstart([&sh, '-c', 'sleep 0.210; exit 6']),
-      \  jobstart([&sh, '-c', 'sleep 0.310; exit 7'])
+      \  jobstart('sleep 0.10; exit 4'),
+      \  jobstart('sleep 0.110; exit 5'),
+      \  jobstart('sleep 0.210; exit 6'),
+      \  jobstart('sleep 0.310; exit 7')
       \  ]))
       ]])
       eq({'notification', 'wait', {{4, 5, 6, 7}}}, next_msg())
@@ -270,17 +408,17 @@ describe('jobs', function()
       source([[
       let g:dict = {'id': 10}
       let g:exits = 0
-      function g:dict.on_exit(id, code)
+      function g:dict.on_exit(id, code, event)
         if a:code != 5
           throw 'Error!'
         endif
         let g:exits += 1
       endfunction
       call jobwait([
-      \  jobstart([&sh, '-c', 'sleep 0.010; exit 5'], g:dict),
-      \  jobstart([&sh, '-c', 'sleep 0.030; exit 5'], g:dict),
-      \  jobstart([&sh, '-c', 'sleep 0.050; exit 5'], g:dict),
-      \  jobstart([&sh, '-c', 'sleep 0.070; exit 5'], g:dict)
+      \  jobstart('sleep 0.010; exit 5', g:dict),
+      \  jobstart('sleep 0.030; exit 5', g:dict),
+      \  jobstart('sleep 0.050; exit 5', g:dict),
+      \  jobstart('sleep 0.070; exit 5', g:dict)
       \  ])
       call rpcnotify(g:channel, 'wait', g:exits)
       ]])
@@ -290,10 +428,10 @@ describe('jobs', function()
     it('will return status codes in the order of passed ids', function()
       source([[
       call rpcnotify(g:channel, 'wait', jobwait([
-      \  jobstart([&sh, '-c', 'sleep 0.070; exit 4']),
-      \  jobstart([&sh, '-c', 'sleep 0.050; exit 5']),
-      \  jobstart([&sh, '-c', 'sleep 0.030; exit 6']),
-      \  jobstart([&sh, '-c', 'sleep 0.010; exit 7'])
+      \  jobstart('sleep 0.070; exit 4'),
+      \  jobstart('sleep 0.050; exit 5'),
+      \  jobstart('sleep 0.030; exit 6'),
+      \  jobstart('sleep 0.010; exit 7')
       \  ]))
       ]])
       eq({'notification', 'wait', {{4, 5, 6, 7}}}, next_msg())
@@ -303,7 +441,7 @@ describe('jobs', function()
       source([[
       call rpcnotify(g:channel, 'wait', jobwait([
       \  -10,
-      \  jobstart([&sh, '-c', 'sleep 0.01; exit 5']),
+      \  jobstart('sleep 0.01; exit 5'),
       \  ]))
       ]])
       eq({'notification', 'wait', {{-3, 5}}}, next_msg())
@@ -312,17 +450,18 @@ describe('jobs', function()
     it('will return -2 when interrupted', function()
       execute('call rpcnotify(g:channel, "ready") | '..
               'call rpcnotify(g:channel, "wait", '..
-              'jobwait([jobstart([&sh, "-c", "sleep 10; exit 55"])]))')
+              'jobwait([jobstart("sleep 10; exit 55")]))')
       eq({'notification', 'ready', {}}, next_msg())
       feed('<c-c>')
       eq({'notification', 'wait', {{-2}}}, next_msg())
     end)
 
     it('can be called recursively', function()
+      if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
       source([[
       let g:opts = {}
       let g:counter = 0
-      function g:opts.on_stdout(id, msg)
+      function g:opts.on_stdout(id, msg, _event)
         if self.state == 0
           if self.counter < 10
             call Run()
@@ -340,7 +479,7 @@ describe('jobs', function()
           call jobclose(a:id, 'stdin')
         endif
       endfunction
-      function g:opts.on_exit()
+      function g:opts.on_exit(...)
         call rpcnotify(g:channel, 'w', printf('job %d exited', self.counter))
       endfunction
       function Run()
@@ -349,7 +488,7 @@ describe('jobs', function()
         let j.state = 0
         let j.counter = g:counter
         call jobwait([
-        \   jobstart([&sh, '-c', 'echo ready; cat -'], j),
+        \   jobstart('echo ready; cat -', j),
         \ ])
       endfunction
       ]])
@@ -365,11 +504,12 @@ describe('jobs', function()
     end)
 
     describe('with timeout argument', function()
+      if helpers.pending_win32(pending) then return end
       it('will return -1 if the wait timed out', function()
         source([[
         call rpcnotify(g:channel, 'wait', jobwait([
-        \  jobstart([&sh, '-c', 'exit 4']),
-        \  jobstart([&sh, '-c', 'sleep 10; exit 5']),
+        \  jobstart('exit 4'),
+        \  jobstart('sleep 10; exit 5'),
         \  ], 100))
         ]])
         eq({'notification', 'wait', {{4, -1}}}, next_msg())
@@ -378,8 +518,8 @@ describe('jobs', function()
       it('can pass 0 to check if a job exists', function()
         source([[
         call rpcnotify(g:channel, 'wait', jobwait([
-        \  jobstart([&sh, '-c', 'sleep 0.05; exit 4']),
-        \  jobstart([&sh, '-c', 'sleep 0.3; exit 5']),
+        \  jobstart('sleep 0.05; exit 4'),
+        \  jobstart('sleep 0.3; exit 5'),
         \  ], 0))
         ]])
         eq({'notification', 'wait', {{-1, -1}}}, next_msg())
@@ -397,7 +537,16 @@ describe('jobs', function()
     eq({'notification', 'j', {0, {jobid, 'exit'}}}, next_msg())
   end)
 
+  it('cannot have both rpc and pty options', function()
+    if helpers.pending_win32(pending) then return end  -- TODO: Need `cat`.
+    command("let g:job_opts.pty = v:true")
+    command("let g:job_opts.rpc = v:true")
+    local _, err = pcall(command, "let j = jobstart(['cat', '-'], g:job_opts)")
+    ok(string.find(err, "E475: Invalid argument: job cannot have both 'pty' and 'rpc' options set") ~= nil)
+  end)
+
   describe('running tty-test program', function()
+    if helpers.pending_win32(pending) then return end
     local function next_chunk()
       local rv
       while true do
@@ -420,8 +569,14 @@ describe('jobs', function()
     end
 
     before_each(function()
-      -- the full path to tty-test seems to be required when running on travis.
-      insert(nvim_dir .. '/tty-test')
+      -- Redefine Normalize() so that TTY data is not munged.
+      source([[
+      function! Normalize(data) abort
+        return a:data
+      endfunction
+      ]])
+      local ext = iswin() and '.exe' or ''
+      insert(nvim_dir..'/tty-test'..ext)  -- Full path to tty-test.
       nvim('command', 'let g:job_opts.pty = 1')
       nvim('command', 'let exec = [expand("<cfile>:p")]')
       nvim('command', "let j = jobstart(exec, g:job_opts)")
@@ -439,5 +594,51 @@ describe('jobs', function()
       nvim('command', 'call jobresize(j, 10, 40)')
       eq('rows: 40, cols: 10', next_chunk())
     end)
+
+    it('jobclose() sends SIGHUP', function()
+      nvim('command', 'call jobclose(j)')
+      local msg = next_msg()
+      msg = (msg[2] == 'stdout') and next_msg() or msg  -- Skip stdout, if any.
+      eq({'notification', 'exit', {0, 42}}, msg)
+    end)
+  end)
+end)
+
+describe("pty process teardown", function()
+  local screen
+  before_each(function()
+    clear()
+    screen = Screen.new(30, 6)
+    screen:attach()
+    screen:expect([[
+      ^                              |
+      ~                             |
+      ~                             |
+      ~                             |
+      ~                             |
+                                    |
+    ]])
+  end)
+  after_each(function()
+    screen:detach()
+  end)
+
+  it("does not prevent/delay exit. #4798 #4900", function()
+    if helpers.pending_win32(pending) then return end
+    -- Use a nested nvim (in :term) to test without --headless.
+    execute(":terminal '"..helpers.nvim_prog
+      -- Use :term again in the _nested_ nvim to get a PTY process.
+      -- Use `sleep` to simulate a long-running child of the PTY.
+      .."' +terminal +'!(sleep 300 &)' +qa")
+
+    -- Exiting should terminate all descendants (PTY, its children, ...).
+    screen:expect([[
+                                    |
+      [Process exited 0]            |
+                                    |
+                                    |
+                                    |
+      -- TERMINAL --                |
+    ]])
   end)
 end)
diff --git a/test/functional/eval/api_functions_spec.lua b/test/functional/eval/api_functions_spec.lua
new file mode 100644
index 0000000000..21dd228145
--- /dev/null
+++ b/test/functional/eval/api_functions_spec.lua
@@ -0,0 +1,147 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local lfs = require('lfs')
+local neq, eq, execute = helpers.neq, helpers.eq, helpers.execute
+local clear, curbufmeths = helpers.clear, helpers.curbufmeths
+local exc_exec, expect, eval = helpers.exc_exec, helpers.expect, helpers.eval
+local insert = helpers.insert
+
+describe('api functions', function()
+  before_each(clear)
+
+  it("work", function()
+    execute("call nvim_command('let g:test = 1')")
+    eq(1, eval("nvim_get_var('test')"))
+
+    local buf = eval("nvim_get_current_buf()")
+    execute("call nvim_buf_set_lines("..buf..", 0, -1, v:true, ['aa', 'bb'])")
+    expect([[
+      aa
+      bb]])
+
+    execute("call nvim_win_set_cursor(0, [1, 1])")
+    execute("call nvim_input('ax<esc>')")
+    expect([[
+      aax
+      bb]])
+  end)
+
+  it("throw errors for invalid arguments", function()
+    local err = exc_exec('call nvim_get_current_buf("foo")')
+    eq('Vim(call):E118: Too many arguments for function: nvim_get_current_buf', err)
+
+    err = exc_exec('call nvim_set_option("hlsearch")')
+    eq('Vim(call):E119: Not enough arguments for function: nvim_set_option', err)
+
+    err = exc_exec('call nvim_buf_set_lines(1, 0, -1, [], ["list"])')
+    eq('Vim(call):Wrong type for argument 4, expecting Boolean', err)
+
+    err = exc_exec('call nvim_buf_set_lines(0, 0, -1, v:true, "string")')
+    eq('Vim(call):Wrong type for argument 5, expecting ArrayOf(String)', err)
+
+    err = exc_exec('call nvim_buf_get_number("0")')
+    eq('Vim(call):Wrong type for argument 1, expecting Buffer', err)
+
+    err = exc_exec('call nvim_buf_line_count(17)')
+    eq('Vim(call):Invalid buffer id', err)
+  end)
+
+
+  it("use buffer numbers and windows ids as handles", function()
+    local screen = Screen.new(40, 8)
+    screen:attach()
+    local bnr = eval("bufnr('')")
+    local bhnd = eval("nvim_get_current_buf()")
+    local wid = eval("win_getid()")
+    local whnd = eval("nvim_get_current_win()")
+    eq(bnr, bhnd)
+    eq(wid, whnd)
+
+    execute("new") -- creates new buffer and new window
+    local bnr2 = eval("bufnr('')")
+    local bhnd2 = eval("nvim_get_current_buf()")
+    local wid2 = eval("win_getid()")
+    local whnd2 = eval("nvim_get_current_win()")
+    eq(bnr2, bhnd2)
+    eq(wid2, whnd2)
+    neq(bnr, bnr2)
+    neq(wid, wid2)
+    -- 0 is synonymous to the current buffer
+    eq(bnr2, eval("nvim_buf_get_number(0)"))
+
+    execute("bn") -- show old buffer in new window
+    eq(bnr, eval("nvim_get_current_buf()"))
+    eq(bnr, eval("bufnr('')"))
+    eq(bnr, eval("nvim_buf_get_number(0)"))
+    eq(wid2, eval("win_getid()"))
+    eq(whnd2, eval("nvim_get_current_win()"))
+  end)
+
+  it("get_lines and set_lines use NL to represent NUL", function()
+    curbufmeths.set_lines(0, -1, true, {"aa\0", "b\0b"})
+    eq({'aa\n', 'b\nb'}, eval("nvim_buf_get_lines(0, 0, -1, 1)"))
+
+    execute('call nvim_buf_set_lines(0, 1, 2, v:true, ["xx", "\\nyy"])')
+    eq({'aa\0', 'xx', '\0yy'}, curbufmeths.get_lines(0, -1, 1))
+  end)
+
+  it("that are FUNC_ATTR_NOEVAL cannot be called", function()
+    -- Deprecated vim_ prefix is not exported.
+    local err = exc_exec('call vim_get_current_buffer("foo")')
+    eq('Vim(call):E117: Unknown function: vim_get_current_buffer', err)
+
+    -- Deprecated buffer_ prefix is not exported.
+    err = exc_exec('call buffer_line_count(0)')
+    eq('Vim(call):E117: Unknown function: buffer_line_count', err)
+
+    -- Functions deprecated before the api functions became available
+    -- in vimscript are not exported.
+    err = exc_exec('call buffer_get_line(0, 1)')
+    eq('Vim(call):E117: Unknown function: buffer_get_line', err)
+
+    -- some api functions are only useful from a msgpack-rpc channel
+    err = exc_exec('call nvim_subscribe("fancyevent")')
+    eq('Vim(call):E117: Unknown function: nvim_subscribe', err)
+  end)
+
+  it('have metadata accessible with api_info()', function()
+    local api_keys = eval("sort(keys(api_info()))")
+    eq({'error_types', 'functions', 'types', 'version'}, api_keys)
+  end)
+
+  it('are highlighted by vim.vim syntax file', function()
+    if lfs.attributes("build/runtime/syntax/vim/generated.vim",'uid') == nil then
+      pending("runtime was not built, skipping test")
+      return
+    end
+    local screen = Screen.new(40, 8)
+    screen:attach()
+    screen:set_default_attr_ids({
+      [1] = {bold = true, foreground = Screen.colors.Brown},
+      [2] = {foreground = Screen.colors.DarkCyan},
+      [3] = {foreground = Screen.colors.SlateBlue},
+      [4] = {foreground = Screen.colors.Fuchsia},
+      [5] = {bold = true, foreground = Screen.colors.Blue},
+    })
+
+    execute("set ft=vim")
+    execute("let &rtp='build/runtime/,'.&rtp")
+    execute("syntax on")
+    insert([[
+      call bufnr('%')
+      call nvim_input('typing...')
+      call not_a_function(42)]])
+
+    screen:expect([[
+      {1:call} {2:bufnr}{3:(}{4:'%'}{3:)}                         |
+      {1:call} {2:nvim_input}{3:(}{4:'typing...'}{3:)}            |
+      {1:call} not_a_function{3:(}{4:42}{3:^)}                 |
+      {5:~                                       }|
+      {5:~                                       }|
+      {5:~                                       }|
+      {5:~                                       }|
+                                              |
+    ]])
+    screen:detach()
+  end)
+end)
diff --git a/test/functional/eval/execute_spec.lua b/test/functional/eval/execute_spec.lua
new file mode 100644
index 0000000000..91966ed3dd
--- /dev/null
+++ b/test/functional/eval/execute_spec.lua
@@ -0,0 +1,197 @@
+local helpers = require('test.functional.helpers')(after_each)
+local eq = helpers.eq
+local eval = helpers.eval
+local clear = helpers.clear
+local source = helpers.source
+local redir_exec = helpers.redir_exec
+local exc_exec = helpers.exc_exec
+local funcs = helpers.funcs
+local Screen = require('test.functional.ui.screen')
+local command = helpers.command
+local feed = helpers.feed
+
+describe('execute()', function()
+  before_each(clear)
+
+  it('captures the same result as :redir', function()
+    eq(redir_exec('messages'), funcs.execute('messages'))
+  end)
+
+  it('captures the concatenated outputs of a List of commands', function()
+    eq("foobar", funcs.execute({'echon "foo"', 'echon "bar"'}))
+    eq("\nfoo\nbar", funcs.execute({'echo "foo"', 'echo "bar"'}))
+  end)
+
+  it('supports nested execute("execute(...)")', function()
+    eq('42', funcs.execute([[echon execute("echon execute('echon 42')")]]))
+  end)
+
+  it('supports nested :redir to a variable', function()
+    source([[
+    function! g:Foo()
+      let a = ''
+      redir => a
+      silent echon "foo"
+      redir END
+      return a
+    endfunction
+    function! g:Bar()
+      let a = ''
+      redir => a
+      silent echon "bar1"
+      call g:Foo()
+      silent echon "bar2"
+      redir END
+      silent echon "bar3"
+      return a
+    endfunction
+    ]])
+    eq('top1bar1foobar2bar3', funcs.execute('echon "top1"|call g:Bar()'))
+  end)
+
+  it('supports nested :redir to a register', function()
+    source([[
+    let @a = ''
+    function! g:Foo()
+      redir @a>>
+      silent echon "foo"
+      redir END
+      return @a
+    endfunction
+    function! g:Bar()
+      redir @a>>
+      silent echon "bar1"
+      call g:Foo()
+      silent echon "bar2"
+      redir END
+      silent echon "bar3"
+      return @a
+    endfunction
+    ]])
+    eq('top1bar1foobar2bar3', funcs.execute('echon "top1"|call g:Bar()'))
+    -- :redir itself doesn't nest, so the redirection ends in g:Foo
+    eq('bar1foo', eval('@a'))
+  end)
+
+  it('captures a transformed string', function()
+    eq('^A', funcs.execute('echon "\\<C-a>"'))
+  end)
+
+  it('returns empty string if the argument list is empty', function()
+    eq('', funcs.execute({}))
+    eq(0, exc_exec('let g:ret = execute(v:_null_list)'))
+    eq('', eval('g:ret'))
+  end)
+
+  it('captures errors', function()
+    local ret
+    ret = exc_exec('call execute(0.0)')
+    eq('Vim(call):E806: using Float as a String', ret)
+    ret = exc_exec('call execute(v:_null_dict)')
+    eq('Vim(call):E731: using Dictionary as a String', ret)
+    ret = exc_exec('call execute(function("tr"))')
+    eq('Vim(call):E729: using Funcref as a String', ret)
+    ret = exc_exec('call execute(["echo 42", 0.0, "echo 44"])')
+    eq('Vim:E806: using Float as a String', ret)
+    ret = exc_exec('call execute(["echo 42", v:_null_dict, "echo 44"])')
+    eq('Vim:E731: using Dictionary as a String', ret)
+    ret = exc_exec('call execute(["echo 42", function("tr"), "echo 44"])')
+    eq('Vim:E729: using Funcref as a String', ret)
+  end)
+
+  it('captures output with highlights', function()
+    eq('\nErrorMsg       xxx ctermfg=15 ctermbg=1 guifg=White guibg=Red',
+       eval('execute("hi ErrorMsg")'))
+  end)
+
+  it('does not corrupt the command display #5422', function()
+    local screen = Screen.new(70, 5)
+    screen:attach()
+    feed(':echo execute("hi ErrorMsg")<CR>')
+    screen:expect([[
+      ~                                                                     |
+      ~                                                                     |
+      :echo execute("hi ErrorMsg")                                          |
+      ErrorMsg       xxx ctermfg=15 ctermbg=1 guifg=White guibg=Red         |
+      Press ENTER or type command to continue^                               |
+    ]])
+    feed('<CR>')
+  end)
+
+  -- This matches Vim behavior.
+  it('does not capture shell-command output', function()
+    eq('\n:!echo "foo"\13\n', funcs.execute('!echo "foo"'))
+  end)
+
+  describe('{silent} argument', function()
+    it('captures & displays output for ""', function()
+      local screen = Screen.new(40, 5)
+      screen:attach()
+      command('let g:mes = execute("echon 42", "")')
+      screen:expect([[
+      ^                                        |
+      ~                                       |
+      ~                                       |
+      ~                                       |
+      42                                      |
+      ]])
+      eq('42', eval('g:mes'))
+    end)
+
+    it('captures but does not display output for "silent"', function()
+      local screen = Screen.new(40, 5)
+      screen:attach()
+      command('let g:mes = execute("echon 42")')
+      screen:expect([[
+      ^                                        |
+      ~                                       |
+      ~                                       |
+      ~                                       |
+                                              |
+      ]])
+      eq('42', eval('g:mes'))
+
+      command('let g:mes = execute("echon 13", "silent")')
+      screen:expect([[
+      ^                                        |
+      ~                                       |
+      ~                                       |
+      ~                                       |
+                                              |
+      ]])
+      eq('13', eval('g:mes'))
+    end)
+
+    it('suppresses errors for "silent!"', function()
+      eq(0, exc_exec('let g:mes = execute(0.0, "silent!")'))
+      eq('', eval('g:mes'))
+
+      eq(0, exc_exec('let g:mes = execute("echon add(1, 1)", "silent!")'))
+      eq('1', eval('g:mes'))
+
+      eq(0, exc_exec('let g:mes = execute(["echon 42", "echon add(1, 1)"], "silent!")'))
+      eq('421', eval('g:mes'))
+    end)
+
+    it('propagates errors for "" and "silent"', function()
+      local ret
+      ret = exc_exec('call execute(0.0, "")')
+      eq('Vim(call):E806: using Float as a String', ret)
+
+      ret = exc_exec('call execute(v:_null_dict, "silent")')
+      eq('Vim(call):E731: using Dictionary as a String', ret)
+
+      ret = exc_exec('call execute("echo add(1, 1)", "")')
+      eq('Vim(echo):E714: List required', ret)
+
+      ret = exc_exec('call execute(["echon 42", "echo add(1, 1)"], "")')
+      eq('Vim(echo):E714: List required', ret)
+
+      ret = exc_exec('call execute("echo add(1, 1)", "silent")')
+      eq('Vim(echo):E714: List required', ret)
+
+      ret = exc_exec('call execute(["echon 42", "echo add(1, 1)"], "silent")')
+      eq('Vim(echo):E714: List required', ret)
+    end)
+  end)
+end)
diff --git a/test/functional/eval/glob_spec.lua b/test/functional/eval/glob_spec.lua
index c6bba46424..599b3dcdc3 100644
--- a/test/functional/eval/glob_spec.lua
+++ b/test/functional/eval/glob_spec.lua
@@ -1,5 +1,5 @@
 local lfs = require('lfs')
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, eval, eq = helpers.clear, helpers.execute, helpers.eval, helpers.eq
 
 before_each(function()
diff --git a/test/functional/eval/has_spec.lua b/test/functional/eval/has_spec.lua
new file mode 100644
index 0000000000..97b3b0e620
--- /dev/null
+++ b/test/functional/eval/has_spec.lua
@@ -0,0 +1,52 @@
+local helpers = require('test.functional.helpers')(after_each)
+local eq = helpers.eq
+local clear = helpers.clear
+local funcs = helpers.funcs
+
+describe('has()', function()
+  before_each(clear)
+
+  it('"nvim-x.y.z"', function()
+    eq(0, funcs.has("nvim-"))
+    eq(0, funcs.has("nvim-  "))
+    eq(0, funcs.has("nvim- \t "))
+    eq(0, funcs.has("nvim-0. 1. 1"))
+    eq(0, funcs.has("nvim-0. 1.1"))
+    eq(0, funcs.has("nvim-0.1. 1"))
+    eq(0, funcs.has("nvim-a"))
+    eq(0, funcs.has("nvim-a.b.c"))
+    eq(0, funcs.has("nvim-0.b.c"))
+    eq(0, funcs.has("nvim-0.0.c"))
+    eq(0, funcs.has("nvim-0.b.0"))
+    eq(0, funcs.has("nvim-a.b.0"))
+    eq(0, funcs.has("nvim-.0.0.0"))
+    eq(0, funcs.has("nvim-.0"))
+    eq(0, funcs.has("nvim-0."))
+    eq(0, funcs.has("nvim-0.."))
+    eq(0, funcs.has("nvim-."))
+    eq(0, funcs.has("nvim-.."))
+    eq(0, funcs.has("nvim-..."))
+    eq(0, funcs.has("nvim-42"))
+    eq(0, funcs.has("nvim-9999"))
+    eq(0, funcs.has("nvim-99.001.05"))
+
+    eq(1, funcs.has("nvim"))
+    eq(1, funcs.has("nvim-0"))
+    eq(1, funcs.has("nvim-0.1"))
+    eq(1, funcs.has("nvim-0.0.0"))
+    eq(1, funcs.has("nvim-0.1.1."))
+    eq(1, funcs.has("nvim-0.1.1.abc"))
+    eq(1, funcs.has("nvim-0.1.1.."))
+    eq(1, funcs.has("nvim-0.1.1.. .."))
+    eq(1, funcs.has("nvim-0.1.1.... "))
+    eq(1, funcs.has("nvim-0.0.0"))
+    eq(1, funcs.has("nvim-0.0.1"))
+    eq(1, funcs.has("nvim-0.1.0"))
+    eq(1, funcs.has("nvim-0.1.1"))
+    eq(1, funcs.has("nvim-0.1.5"))
+    eq(1, funcs.has("nvim-0000.001.05"))
+    eq(1, funcs.has("nvim-0.01.005"))
+    eq(1, funcs.has("nvim-00.001.05"))
+  end)
+
+end)
diff --git a/test/functional/eval/json_functions_spec.lua b/test/functional/eval/json_functions_spec.lua
index b32688a9d2..fc0a19bdfa 100644
--- a/test/functional/eval/json_functions_spec.lua
+++ b/test/functional/eval/json_functions_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local funcs = helpers.funcs
 local meths = helpers.meths
@@ -10,8 +10,8 @@ local redir_exec = helpers.redir_exec
 local NIL = helpers.NIL
 
 describe('json_decode() function', function()
-  local restart = function(cmd)
-    clear(cmd)
+  local restart = function(...)
+    clear(...)
     execute('language C')
     execute([[
       function Eq(exp, act)
@@ -489,18 +489,6 @@ describe('json_decode() function', function()
                  '{"b": 3, "a": 1, "c": 4, "d": 2, "\\u0000": 4}')
   end)
 
-  it('converts strings to latin1 when &encoding is latin1', function()
-    restart('set encoding=latin1')
-    eq('\171', funcs.json_decode('"\\u00AB"'))
-    sp_decode_eq({_TYPE='string', _VAL={'\n\171\n'}}, '"\\u0000\\u00AB\\u0000"')
-  end)
-
-  it('fails to convert string to latin1 if it is impossible', function()
-    restart('set encoding=latin1')
-    eq('Vim(call):E474: Failed to convert string "ꯍ" from UTF-8',
-       exc_exec('call json_decode(\'"\\uABCD"\')'))
-  end)
-
   it('parses U+00C3 correctly', function()
     eq('\195\131', funcs.json_decode('"\195\131"'))
   end)
@@ -528,14 +516,6 @@ describe('json_decode() function', function()
     eq({key={'val', 'val2'}, key2=1}, funcs.json_decode(str))
   end)
 
-  it('always treats input as UTF-8', function()
-    -- When &encoding is latin1 string "«" is U+00C2 U+00AB U+00C2: «Â. So if
-    -- '"«"' was parsed as latin1 json_decode would return three characters, and
-    -- only one U+00AB when this string is parsed as latin1.
-    restart('set encoding=latin1')
-    eq(('%c'):format(0xAB), funcs.json_decode('"«"'))
-  end)
-
   it('does not overflow when writing error message about decoding ["", ""]',
   function()
     eq('\nE474: Attempt to decode a blank string'
@@ -692,6 +672,12 @@ describe('json_encode() function', function()
        exc_exec('call json_encode(function("tr"))'))
   end)
 
+  it('fails to dump a partial', function()
+    execute('function T() dict\nendfunction')
+    eq('Vim(call):E474: Error while dumping encode_tv2json() argument, itself: attempt to dump function reference',
+       exc_exec('call json_encode(function("T", [1, 2], {}))'))
+  end)
+
   it('fails to dump a function reference in a list', function()
     eq('Vim(call):E474: Error while dumping encode_tv2json() argument, index 0: attempt to dump function reference',
        exc_exec('call json_encode([function("tr")])'))
@@ -762,12 +748,6 @@ describe('json_encode() function', function()
        exc_exec('call json_encode(["", ""], 1)'))
   end)
 
-  it('converts strings from latin1 when &encoding is latin1', function()
-    clear('set encoding=latin1')
-    eq('"\\u00AB"', funcs.json_encode('\171'))
-    eq('"\\u0000\\u00AB\\u0000"', eval('json_encode({"_TYPE": v:msgpack_types.string, "_VAL": ["\\n\171\\n"]})'))
-  end)
-
   it('ignores improper values in &isprint', function()
     meths.set_option('isprint', '1')
     eq(1, eval('"\1" =~# "\\\\p"'))
diff --git a/test/functional/eval/modeline_spec.lua b/test/functional/eval/modeline_spec.lua
new file mode 100644
index 0000000000..0be7210a76
--- /dev/null
+++ b/test/functional/eval/modeline_spec.lua
@@ -0,0 +1,19 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, execute, write_file = helpers.clear, helpers.execute, helpers.write_file
+local eq, eval = helpers.eq, helpers.eval
+
+describe("modeline", function()
+  local tempfile = helpers.tmpname()
+  before_each(clear)
+
+  after_each(function()
+    os.remove(tempfile)
+  end)
+
+  it('does not crash with a large version number', function()
+    write_file(tempfile, 'vim100000000000000000000000')
+    execute('e! ' .. tempfile)
+
+    eq(2, eval('1+1'))  -- Still alive?
+  end)
+end)
diff --git a/test/functional/eval/msgpack_functions_spec.lua b/test/functional/eval/msgpack_functions_spec.lua
index 9e501353a5..44c01d2226 100644
--- a/test/functional/eval/msgpack_functions_spec.lua
+++ b/test/functional/eval/msgpack_functions_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local funcs = helpers.funcs
 local eval, eq = helpers.eval, helpers.eq
@@ -16,18 +16,18 @@ describe('msgpack*() functions', function()
     end)
   end
 
-  -- Regression test: msgpack_list_write was failing to write buffer with zero 
+  -- Regression test: msgpack_list_write was failing to write buffer with zero
   -- length.
   obj_test('are able to dump and restore {"file": ""}', {{file=''}})
-  -- Regression test: msgpack_list_write was failing to write buffer with NL at 
+  -- Regression test: msgpack_list_write was failing to write buffer with NL at
   -- the end.
   obj_test('are able to dump and restore {0, "echo mpack"}', {{0, 'echo mpack'}})
   obj_test('are able to dump and restore "Test\\n"', {'Test\n'})
-  -- Regression test: msgpack_list_write was failing to write buffer with NL 
+  -- Regression test: msgpack_list_write was failing to write buffer with NL
   -- inside.
   obj_test('are able to dump and restore "Test\\nTest 2"', {'Test\nTest 2'})
-  -- Test that big objects (requirement: dump to something that is bigger then 
-  -- IOSIZE) are also fine. This particular object is obtained by concatenating 
+  -- Test that big objects (requirement: dump to something that is bigger then
+  -- IOSIZE) are also fine. This particular object is obtained by concatenating
   -- 5 identical shada files.
   local big_obj = {
     1, 1436711454, 78, {
@@ -460,7 +460,7 @@ describe('msgpackparse() function', function()
     eval(cmd)
     eval(cmd)  -- do it again (try to force segfault)
     local api_info = eval(cmd)  -- do it again
-    eq({'error_types', 'functions', 'types'}, api_info)
+    eq({'error_types', 'functions', 'types', 'version'}, api_info)
   end)
 
   it('fails when called with no arguments', function()
@@ -493,6 +493,12 @@ describe('msgpackparse() function', function()
        exc_exec('call msgpackparse(function("tr"))'))
   end)
 
+  it('fails to parse a partial', function()
+    execute('function T() dict\nendfunction')
+    eq('Vim(call):E686: Argument of msgpackparse() must be a List',
+       exc_exec('call msgpackparse(function("T", [1, 2], {}))'))
+  end)
+
   it('fails to parse a float', function()
     eq('Vim(call):E686: Argument of msgpackparse() must be a List',
        exc_exec('call msgpackparse(0.0)'))
@@ -566,27 +572,34 @@ describe('msgpackdump() function', function()
 
   it('fails to dump a function reference', function()
     execute('let Todump = function("tr")')
-    eq('Vim(call):E951: Error while dumping msgpackdump() argument, index 0, itself: attempt to dump function reference',
+    eq('Vim(call):E5004: Error while dumping msgpackdump() argument, index 0, itself: attempt to dump function reference',
+       exc_exec('call msgpackdump([Todump])'))
+  end)
+
+  it('fails to dump a partial', function()
+    execute('function T() dict\nendfunction')
+    execute('let Todump = function("T", [1, 2], {})')
+    eq('Vim(call):E5004: Error while dumping msgpackdump() argument, index 0, itself: attempt to dump function reference',
        exc_exec('call msgpackdump([Todump])'))
   end)
 
   it('fails to dump a function reference in a list', function()
     execute('let todump = [function("tr")]')
-    eq('Vim(call):E951: Error while dumping msgpackdump() argument, index 0, index 0: attempt to dump function reference',
+    eq('Vim(call):E5004: Error while dumping msgpackdump() argument, index 0, index 0: attempt to dump function reference',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive list', function()
     execute('let todump = [[[]]]')
     execute('call add(todump[0][0], todump)')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in index 0, index 0, index 0',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in index 0, index 0, index 0',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive dict', function()
     execute('let todump = {"d": {"d": {}}}')
     execute('call extend(todump.d.d, {"d": todump})')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in key \'d\', key \'d\', key \'d\'',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in key \'d\', key \'d\', key \'d\'',
        exc_exec('call msgpackdump([todump])'))
   end)
 
@@ -605,35 +618,35 @@ describe('msgpackdump() function', function()
   it('fails to dump a recursive list in a special dict', function()
     execute('let todump = {"_TYPE": v:msgpack_types.array, "_VAL": []}')
     execute('call add(todump._VAL, todump)')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in index 0',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in index 0',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive (key) map in a special dict', function()
     execute('let todump = {"_TYPE": v:msgpack_types.map, "_VAL": []}')
     execute('call add(todump._VAL, [todump, 0])')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in index 1',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in index 1',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive (val) map in a special dict', function()
     execute('let todump = {"_TYPE": v:msgpack_types.map, "_VAL": []}')
     execute('call add(todump._VAL, [0, todump])')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in key 0 at index 0 from special map',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in key 0 at index 0 from special map',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive (key) map in a special dict, _VAL reference', function()
     execute('let todump = {"_TYPE": v:msgpack_types.map, "_VAL": [[[], []]]}')
     execute('call add(todump._VAL[0][0], todump._VAL)')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in key [[[[...@0], []]]] at index 0 from special map, index 0',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in key [[[[...@0], []]]] at index 0 from special map, index 0',
        exc_exec('call msgpackdump([todump])'))
   end)
 
   it('fails to dump a recursive (val) map in a special dict, _VAL reference', function()
     execute('let todump = {"_TYPE": v:msgpack_types.map, "_VAL": [[[], []]]}')
     execute('call add(todump._VAL[0][1], todump._VAL)')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in key [] at index 0 from special map, index 0',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in key [] at index 0 from special map, index 0',
        exc_exec('call msgpackdump([todump])'))
   end)
 
@@ -641,7 +654,7 @@ describe('msgpackdump() function', function()
   function()
     execute('let todump = {"_TYPE": v:msgpack_types.array, "_VAL": []}')
     execute('call add(todump._VAL, [0, todump._VAL])')
-    eq('Vim(call):E952: Unable to dump msgpackdump() argument, index 0: container references itself in index 0, index 1',
+    eq('Vim(call):E5005: Unable to dump msgpackdump() argument, index 0: container references itself in index 0, index 1',
        exc_exec('call msgpackdump([todump])'))
   end)
 
@@ -675,6 +688,12 @@ describe('msgpackdump() function', function()
        exc_exec('call msgpackdump(function("tr"))'))
   end)
 
+  it('fails to dump a partial', function()
+    execute('function T() dict\nendfunction')
+    eq('Vim(call):E686: Argument of msgpackdump() must be a List',
+       exc_exec('call msgpackdump(function("T", [1, 2], {}))'))
+  end)
+
   it('fails to dump a float', function()
     eq('Vim(call):E686: Argument of msgpackdump() must be a List',
        exc_exec('call msgpackdump(0.0)'))
diff --git a/test/functional/eval/operators_spec.lua b/test/functional/eval/operators_spec.lua
index bc9a17935c..4d07bc1b05 100644
--- a/test/functional/eval/operators_spec.lua
+++ b/test/functional/eval/operators_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eq = helpers.eq
 local eval = helpers.eval
 local clear = helpers.clear
diff --git a/test/functional/eval/printf_spec.lua b/test/functional/eval/printf_spec.lua
index 6180f4156a..c84290ceef 100644
--- a/test/functional/eval/printf_spec.lua
+++ b/test/functional/eval/printf_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local funcs = helpers.funcs
diff --git a/test/functional/eval/reltime_spec.lua b/test/functional/eval/reltime_spec.lua
index da55a3fac3..0b19d372ec 100644
--- a/test/functional/eval/reltime_spec.lua
+++ b/test/functional/eval/reltime_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eq, ok = helpers.clear,  helpers.eq, helpers.ok
 local neq, execute, funcs  = helpers.neq, helpers.execute, helpers.funcs
 local reltime, reltimestr, reltimefloat = funcs.reltime, funcs.reltimestr, funcs.reltimefloat
diff --git a/test/functional/eval/server_spec.lua b/test/functional/eval/server_spec.lua
index 7f53522c08..420aea04aa 100644
--- a/test/functional/eval/server_spec.lua
+++ b/test/functional/eval/server_spec.lua
@@ -1,5 +1,5 @@
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim, eq, neq, eval = helpers.nvim, helpers.eq, helpers.neq, helpers.eval
 local clear, funcs, meths = helpers.clear, helpers.funcs, helpers.meths
 local os_name = helpers.os_name
@@ -40,8 +40,8 @@ describe('serverstart(), serverstop()', function()
 
     -- v:servername will take the next available server.
     local servername = (os_name() == 'windows'
-                        and [[\\.\pipe\Xtest-functional-server-server-pipe]]
-                        or 'Xtest-functional-server-server-socket')
+                        and [[\\.\pipe\Xtest-functional-server-pipe]]
+                        or 'Xtest-functional-server-socket')
     funcs.serverstart(servername)
     eq(servername, meths.get_vvar('servername'))
   end)
@@ -61,9 +61,11 @@ describe('serverlist()', function()
     local n = eval('len(serverlist())')
 
     -- Add a few
-    local servs = {'should-not-exist', 'another-one-that-shouldnt'}
+    local servs = (os_name() == 'windows'
+      and { [[\\.\pipe\Xtest-pipe0934]], [[\\.\pipe\Xtest-pipe4324]] }
+      or  { [[Xtest-pipe0934]], [[Xtest-pipe4324]] })
     for _, s in ipairs(servs) do
-      eq(s, eval('serverstart("'..s..'")'))
+      eq(s, eval("serverstart('"..s.."')"))
     end
 
     local new_servs = eval('serverlist()')
@@ -73,10 +75,9 @@ describe('serverlist()', function()
     -- The new servers should be at the end of the list.
     for i = 1, #servs do
       eq(servs[i], new_servs[i + n])
-      nvim('command', 'call serverstop("'..servs[i]..'")')
+      nvim('command', "call serverstop('"..servs[i].."')")
     end
-    -- After calling serverstop() on the new servers, they should no longer be
-    -- in the list.
+    -- After serverstop() the servers should NOT be in the list.
     eq(n, eval('len(serverlist())'))
   end)
 end)
diff --git a/test/functional/eval/setpos_spec.lua b/test/functional/eval/setpos_spec.lua
new file mode 100644
index 0000000000..2e27cd8ac0
--- /dev/null
+++ b/test/functional/eval/setpos_spec.lua
@@ -0,0 +1,64 @@
+local helpers = require('test.functional.helpers')(after_each)
+local setpos = helpers.funcs.setpos
+local getpos = helpers.funcs.getpos
+local insert = helpers.insert
+local clear = helpers.clear
+local execute = helpers.execute
+local eval = helpers.eval
+local eq = helpers.eq
+local exc_exec = helpers.exc_exec
+
+
+describe('setpos() function', function()
+  before_each(function()
+    clear()
+    insert([[
+    First line of text
+    Second line of text
+    Third line of text]])
+    execute('new')
+    insert([[
+    Line of text 1
+    Line of text 2
+    Line of text 3]])
+  end)
+  it('can set the current cursor position', function()
+    setpos(".", {0, 2, 1, 0})
+    eq(getpos("."), {0, 2, 1, 0})
+    setpos(".", {2, 1, 1, 0})
+    eq(getpos("."), {0, 1, 1, 0})
+    -- Ensure get an error attempting to set position to another buffer
+    local ret = exc_exec('call setpos(".", [1, 1, 1, 0])')
+    eq('Vim(call):E474: Invalid argument', ret)
+  end)
+  it('can set lowercase marks in the current buffer', function()
+    setpos("'d", {0, 2, 1, 0})
+    eq(getpos("'d"), {0, 2, 1, 0})
+    execute('undo', 'call setpos("\'d", [2, 3, 1, 0])')
+    eq(getpos("'d"), {0, 3, 1, 0})
+  end)
+  it('can set lowercase marks in other buffers', function()
+    local retval = setpos("'d", {1, 2, 1, 0})
+    eq(0, retval)
+    setpos("'d", {1, 2, 1, 0})
+    eq(getpos("'d"), {0, 0, 0, 0})
+    execute('wincmd w')
+    eq(eval('bufnr("%")'), 1)
+    eq(getpos("'d"), {0, 2, 1, 0})
+  end)
+  it("fails when setting a mark in a buffer that doesn't exist", function()
+    local retval = setpos("'d", {3, 2, 1, 0})
+    eq(-1, retval)
+    eq(getpos("'d"), {0, 0, 0, 0})
+    retval = setpos("'D", {3, 2, 1, 0})
+    eq(-1, retval)
+    eq(getpos("'D"), {0, 0, 0, 0})
+  end)
+  it('can set uppercase marks', function()
+    setpos("'D", {2, 2, 3, 0})
+    eq(getpos("'D"), {2, 2, 3, 0})
+    -- Can set a mark in another buffer
+    setpos("'D", {1, 2, 2, 0})
+    eq(getpos("'D"), {1, 2, 2, 0})
+  end)
+end)
diff --git a/test/functional/eval/special_vars_spec.lua b/test/functional/eval/special_vars_spec.lua
index 2526483830..4c5d63ce23 100644
--- a/test/functional/eval/special_vars_spec.lua
+++ b/test/functional/eval/special_vars_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local exc_exec = helpers.exc_exec
 local execute = helpers.execute
 local funcs = helpers.funcs
diff --git a/test/functional/eval/string_spec.lua b/test/functional/eval/string_spec.lua
index abda2c59cb..f6279e85e8 100644
--- a/test/functional/eval/string_spec.lua
+++ b/test/functional/eval/string_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local command = helpers.command
@@ -9,6 +9,8 @@ local redir_exec = helpers.redir_exec
 local funcs = helpers.funcs
 local write_file = helpers.write_file
 local NIL = helpers.NIL
+local source = helpers.source
+local dedent = helpers.dedent
 
 describe('string() function', function()
   before_each(clear)
@@ -110,10 +112,10 @@ describe('string() function', function()
         function Test1()
         endfunction
 
-        function s:Test2()
+        function s:Test2() dict
         endfunction
 
-        function g:Test3()
+        function g:Test3() dict
         endfunction
 
         let g:Test2_f = function('s:Test2')
@@ -137,6 +139,85 @@ describe('string() function', function()
     it('dumps references to script functions', function()
       eq('function(\'<SNR>1_Test2\')', eval('string(Test2_f)'))
     end)
+
+    it('dumps partials with self referencing a partial', function()
+      source([[
+        function TestDict() dict
+        endfunction
+        let d = {}
+        let TestDictRef = function('TestDict', d)
+        let d.tdr = TestDictRef
+      ]])
+      eq("\nE724: unable to correctly dump variable with self-referencing container\nfunction('TestDict', {'tdr': function('TestDict', {E724@1})})",
+         redir_exec('echo string(d.tdr)'))
+    end)
+
+    it('dumps automatically created partials', function()
+      eq('function(\'<SNR>1_Test2\', {\'f\': function(\'<SNR>1_Test2\')})',
+         eval('string({"f": Test2_f}.f)'))
+      eq('function(\'<SNR>1_Test2\', [1], {\'f\': function(\'<SNR>1_Test2\', [1])})',
+         eval('string({"f": function(Test2_f, [1])}.f)'))
+    end)
+
+    it('dumps manually created partials', function()
+      eq('function(\'Test3\', [1, 2], {})',
+         eval('string(function("Test3", [1, 2], {}))'))
+      eq('function(\'Test3\', {})',
+         eval('string(function("Test3", {}))'))
+      eq('function(\'Test3\', [1, 2])',
+         eval('string(function("Test3", [1, 2]))'))
+    end)
+
+    it('does not crash or halt when dumping partials with reference cycles in self',
+    function()
+      meths.set_var('d', {v=true})
+      eq(dedent([[
+
+          E724: unable to correctly dump variable with self-referencing container
+          {'p': function('<SNR>1_Test2', {E724@0}), 'f': function('<SNR>1_Test2'), 'v': v:true}]]),
+        redir_exec('echo string(extend(extend(g:d, {"f": g:Test2_f}), {"p": g:d.f}))'))
+    end)
+
+    it('does not show errors when dumping partials referencing the same dictionary',
+    function()
+      command('let d = {}')
+      -- Regression for “eval/typval_encode: Dump empty dictionary before
+      -- checking for refcycle”, results in error.
+      eq('[function(\'tr\', {}), function(\'tr\', {})]', eval('string([function("tr", d), function("tr", d)])'))
+      -- Regression for “eval: Work with reference cycles in partials (self)
+      -- properly”, results in crash.
+      eval('extend(d, {"a": 1})')
+      eq('[function(\'tr\', {\'a\': 1}), function(\'tr\', {\'a\': 1})]', eval('string([function("tr", d), function("tr", d)])'))
+    end)
+
+    it('does not crash or halt when dumping partials with reference cycles in arguments',
+    function()
+      meths.set_var('l', {})
+      eval('add(l, l)')
+      -- Regression: the below line used to crash (add returns original list and
+      -- there was error in dumping partials). Tested explicitly in
+      -- test/unit/api/private_helpers_spec.lua.
+      eval('add(l, function("Test1", l))')
+      eq(dedent([=[
+
+          E724: unable to correctly dump variable with self-referencing container
+          function('Test1', [[{E724@2}, function('Test1', [{E724@2}])], function('Test1', [[{E724@4}, function('Test1', [{E724@4}])]])])]=]),
+        redir_exec('echo string(function("Test1", l))'))
+    end)
+
+    it('does not crash or halt when dumping partials with reference cycles in self and arguments',
+    function()
+      meths.set_var('d', {v=true})
+      meths.set_var('l', {})
+      eval('add(l, l)')
+      eval('add(l, function("Test1", l))')
+      eval('add(l, function("Test1", d))')
+      eq(dedent([=[
+
+          E724: unable to correctly dump variable with self-referencing container
+          {'p': function('<SNR>1_Test2', [[{E724@3}, function('Test1', [{E724@3}]), function('Test1', {E724@0})], function('Test1', [[{E724@5}, function('Test1', [{E724@5}]), function('Test1', {E724@0})]]), function('Test1', {E724@0})], {E724@0}), 'f': function('<SNR>1_Test2'), 'v': v:true}]=]),
+        redir_exec('echo string(extend(extend(g:d, {"f": g:Test2_f}), {"p": function(g:d.f, l)}))'))
+    end)
   end)
 
   describe('used to represent lists', function()
@@ -174,6 +255,13 @@ describe('string() function', function()
       eq('{}', eval('string({})'))
     end)
 
+    it('dumps list with two same empty dictionaries, also in partials', function()
+      command('let d = {}')
+      eq('[{}, {}]', eval('string([d, d])'))
+      eq('[function(\'tr\', {}), {}]', eval('string([function("tr", d), d])'))
+      eq('[{}, function(\'tr\', {})]', eval('string([d, function("tr", d)])'))
+    end)
+
     it('dumps non-empty dictionary', function()
       eq('{\'t\'\'est\': 1}', funcs.string({['t\'est']=1}))
     end)
diff --git a/test/functional/shell/viml_system_spec.lua b/test/functional/eval/system_spec.lua
index 00b16e9158..ee75b593ff 100644
--- a/test/functional/shell/viml_system_spec.lua
+++ b/test/functional/eval/system_spec.lua
@@ -1,14 +1,10 @@
--- Specs for
--- - `system()`
--- - `systemlist()`
-
-local helpers = require('test.functional.helpers')
-local eq, clear, eval, feed, nvim =
-  helpers.eq, helpers.clear, helpers.eval, helpers.feed, helpers.nvim
+local helpers = require('test.functional.helpers')(after_each)
+local eq, call, clear, eval, execute, feed, nvim =
+  helpers.eq, helpers.call, helpers.clear, helpers.eval, helpers.execute,
+  helpers.feed, helpers.nvim
 
 local Screen = require('test.functional.ui.screen')
 
-
 local function create_file_with_nuls(name)
   return function()
     feed('ipart1<C-V>000part2<C-V>000part3<ESC>:w '..name..'<CR>')
@@ -33,7 +29,72 @@ end
 describe('system()', function()
   before_each(clear)
 
-  it('sets the v:shell_error variable', function()
+  describe('command passed as a List', function()
+    local function printargs_path()
+      return helpers.nvim_dir..'/printargs-test'
+        .. (helpers.os_name() == 'windows' and '.exe' or '')
+    end
+
+    it('sets v:shell_error if cmd[0] is not executable', function()
+      call('system', { 'this-should-not-exist' })
+      eq(-1, eval('v:shell_error'))
+    end)
+
+    it('parameter validation does NOT modify v:shell_error', function()
+      -- 1. Call system() with invalid parameters.
+      -- 2. Assert that v:shell_error was NOT set.
+      execute('call system({})')
+      eq('E475: Invalid argument: expected String or List', eval('v:errmsg'))
+      eq(0, eval('v:shell_error'))
+      execute('call system([])')
+      eq('E474: Invalid argument', eval('v:errmsg'))
+      eq(0, eval('v:shell_error'))
+
+      -- Provoke a non-zero v:shell_error.
+      call('system', { 'this-should-not-exist' })
+      local old_val = eval('v:shell_error')
+      eq(-1, old_val)
+
+      -- 1. Call system() with invalid parameters.
+      -- 2. Assert that v:shell_error was NOT modified.
+      execute('call system({})')
+      eq(old_val, eval('v:shell_error'))
+      execute('call system([])')
+      eq(old_val, eval('v:shell_error'))
+    end)
+
+    it('quotes arguments correctly #5280', function()
+      local out = call('system',
+        { printargs_path(), [[1]], [[2 "3]], [[4 ' 5]], [[6 ' 7']] })
+
+      eq(0, eval('v:shell_error'))
+      eq([[arg1=1;arg2=2 "3;arg3=4 ' 5;arg4=6 ' 7';]], out)
+
+      out = call('system', { printargs_path(), [['1]], [[2 "3]] })
+      eq(0, eval('v:shell_error'))
+      eq([[arg1='1;arg2=2 "3;]], out)
+
+      out = call('system', { printargs_path(), "A\nB" })
+      eq(0, eval('v:shell_error'))
+      eq("arg1=A\nB;", out)
+    end)
+
+    it('calls executable in $PATH', function()
+      if 0 == eval("executable('python')") then pending("missing `python`") end
+      eq("foo\n", eval([[system(['python', '-c', 'print("foo")'])]]))
+      eq(0, eval('v:shell_error'))
+    end)
+
+    it('does NOT run in shell', function()
+      if helpers.os_name() ~= 'windows' then
+        eq("* $PATH %PATH%\n", eval("system(['echo', '*', '$PATH', '%PATH%'])"))
+      end
+    end)
+  end)
+
+  if helpers.pending_win32(pending) then return end
+
+  it('sets v:shell_error', function()
     eval([[system("sh -c 'exit'")]])
     eq(0, eval('v:shell_error'))
     eval([[system("sh -c 'exit 1'")]])
@@ -119,12 +180,30 @@ describe('system()', function()
     it('returns the program output', function()
       eq("echoed", eval('system("echo -n echoed")'))
     end)
+    it('to backgrounded command does not crash', function()
+      -- This is indeterminate, just exercise the codepath. May get E5677.
+      execute('call system("echo -n echoed &")')
+      local v_errnum = string.match(eval("v:errmsg"), "^E%d*:")
+      if v_errnum then
+        eq("E5677:", v_errnum)
+      end
+      eq(2, eval("1+1"))  -- Still alive?
+    end)
   end)
 
   describe('passing input', function()
     it('returns the program output', function()
       eq("input", eval('system("cat -", "input")'))
     end)
+    it('to backgrounded command does not crash', function()
+      -- This is indeterminate, just exercise the codepath. May get E5677.
+      execute('call system("cat - &")')
+      local v_errnum = string.match(eval("v:errmsg"), "^E%d*:")
+      if v_errnum then
+        eq("E5677:", v_errnum)
+      end
+      eq(2, eval("1+1"))  -- Still alive?
+    end)
   end)
 
   describe('passing a lot of input', function()
@@ -142,7 +221,7 @@ describe('system()', function()
     end)
   end)
 
-  describe('passing number as input', function()
+  describe('input passed as Number', function()
     it('stringifies the input', function()
       eq('1', eval('system("cat", 1)'))
     end)
@@ -151,16 +230,16 @@ describe('system()', function()
   describe('with output containing NULs', function()
     local fname = 'Xtest'
 
-    setup(create_file_with_nuls(fname))
-    teardown(delete_file(fname))
+    before_each(create_file_with_nuls(fname))
+    after_each(delete_file(fname))
 
     it('replaces NULs by SOH characters', function()
       eq('part1\001part2\001part3\n', eval('system("cat '..fname..'")'))
     end)
   end)
 
-  describe('passing list as input', function()
-    it('joins list items with linefeed characters', function()
+  describe('input passed as List', function()
+    it('joins List items with linefeed characters', function()
       eq('line1\nline2\nline3',
         eval("system('cat -', ['line1', 'line2', 'line3'])"))
     end)
@@ -169,7 +248,7 @@ describe('system()', function()
     -- is inconsistent and is a good reason for the existence of the
     -- `systemlist()` function, where input and output map to the same
     -- characters(see the following tests with `systemlist()` below)
-    describe('with linefeed characters inside list items', function()
+    describe('with linefeed characters inside List items', function()
       it('converts linefeed characters to NULs', function()
         eq('l1\001p2\nline2\001a\001b\nl3',
           eval([[system('cat -', ["l1\np2", "line2\na\nb", 'l3'])]]))
@@ -186,26 +265,20 @@ describe('system()', function()
 
   describe("with a program that doesn't close stdout", function()
     if not xclip then
-      pending('skipped (missing xclip)', function() end)
+      pending('missing `xclip`', function() end)
     else
       it('will exit properly after passing input', function()
-        eq('', eval([[system('xclip -i -selection clipboard', 'clip-data')]]))
+        eq('', eval([[system('xclip -i -loops 1 -selection clipboard', 'clip-data')]]))
         eq('clip-data', eval([[system('xclip -o -selection clipboard')]]))
       end)
     end
   end)
-
-  describe('command passed as a list', function()
-    it('does not execute &shell', function()
-      eq('* $NOTHING ~/file',
-         eval("system(['echo', '-n', '*', '$NOTHING', '~/file'])"))
-    end)
-  end)
 end)
 
+if helpers.pending_win32(pending) then return end
+
 describe('systemlist()', function()
-  -- behavior is similar to `system()` but it returns a list instead of a
-  -- string.
+  -- Similar to `system()`, but returns List instead of String.
   before_each(clear)
 
   it('sets the v:shell_error variable', function()
@@ -310,22 +383,22 @@ describe('systemlist()', function()
   describe('with output containing NULs', function()
     local fname = 'Xtest'
 
-    setup(create_file_with_nuls(fname))
-    teardown(delete_file(fname))
+    before_each(create_file_with_nuls(fname))
+    after_each(delete_file(fname))
 
     it('replaces NULs by newline characters', function()
       eq({'part1\npart2\npart3'}, eval('systemlist("cat '..fname..'")'))
     end)
   end)
 
-  describe('passing list as input', function()
+  describe('input passed as List', function()
     it('joins list items with linefeed characters', function()
       eq({'line1', 'line2', 'line3'},
         eval("systemlist('cat -', ['line1', 'line2', 'line3'])"))
     end)
 
     -- Unlike `system()` which uses SOH to represent NULs, with `systemlist()`
-    -- input and ouput are the same
+    -- input and ouput are the same.
     describe('with linefeed characters inside list items', function()
       it('converts linefeed characters to NULs', function()
         eq({'l1\np2', 'line2\na\nb', 'l3'},
@@ -365,11 +438,11 @@ describe('systemlist()', function()
 
   describe("with a program that doesn't close stdout", function()
     if not xclip then
-      pending('skipped (missing xclip)', function() end)
+      pending('missing `xclip`', function() end)
     else
       it('will exit properly after passing input', function()
         eq({}, eval(
-          "systemlist('xclip -i -selection clipboard', ['clip', 'data'])"))
+          "systemlist('xclip -i -loops 1 -selection clipboard', ['clip', 'data'])"))
         eq({'clip', 'data'}, eval(
           "systemlist('xclip -o -selection clipboard')"))
       end)
diff --git a/test/functional/eval/timer_spec.lua b/test/functional/eval/timer_spec.lua
new file mode 100644
index 0000000000..4353619ff0
--- /dev/null
+++ b/test/functional/eval/timer_spec.lua
@@ -0,0 +1,217 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local ok, feed, eq, eval = helpers.ok, helpers.feed, helpers.eq, helpers.eval
+local source, nvim_async, run = helpers.source, helpers.nvim_async, helpers.run
+local clear, execute, funcs = helpers.clear, helpers.execute, helpers.funcs
+local curbufmeths = helpers.curbufmeths
+
+describe('timers', function()
+  before_each(function()
+    clear()
+    source([[
+      let g:val = 0
+      func MyHandler(timer)
+        let g:val += 1
+      endfunc
+    ]])
+  end)
+
+  it('works one-shot', function()
+    execute("call timer_start(50, 'MyHandler')")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 200)
+    eq(1,eval("g:val"))
+  end)
+
+  it('works one-shot when repeat=0', function()
+    execute("call timer_start(50, 'MyHandler', {'repeat': 0})")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 200)
+    eq(1,eval("g:val"))
+  end)
+
+
+  it('works with repeat two', function()
+    execute("call timer_start(50, 'MyHandler', {'repeat': 2})")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 300)
+    eq(2,eval("g:val"))
+  end)
+
+  it('are triggered during sleep', function()
+    execute("call timer_start(50, 'MyHandler', {'repeat': 2})")
+    nvim_async("command", "sleep 10")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 300)
+    eq(2,eval("g:val"))
+  end)
+
+  it('works with zero timeout', function()
+    -- timer_start does still not invoke the callback immediately
+    eq(0,eval("[timer_start(0, 'MyHandler', {'repeat': 1000}), g:val][1]"))
+    run(nil, nil, nil, 300)
+    eq(1000,eval("g:val"))
+  end)
+
+  it('can be started during sleep', function()
+    nvim_async("command", "sleep 10")
+    -- this also tests that remote requests works during sleep
+    eval("timer_start(50, 'MyHandler', {'repeat': 2})")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 300)
+    eq(2,eval("g:val"))
+  end)
+
+  it('are paused when event processing is disabled', function()
+    execute("call timer_start(50, 'MyHandler', {'repeat': -1})")
+    run(nil, nil, nil, 100)
+    local count = eval("g:val")
+    -- shows two line error message and thus invokes the return prompt.
+    -- if we start to allow event processing here, we need to change this test.
+    execute("throw 'fatal error'")
+    run(nil, nil, nil, 300)
+    feed("<cr>")
+    local diff = eval("g:val") - count
+    ok(0 <= diff and diff <= 4)
+  end)
+
+  it('are triggered in blocking getchar() call', function()
+    execute("call timer_start(50, 'MyHandler', {'repeat': -1})")
+    nvim_async("command", "let g:c = getchar()")
+    run(nil, nil, nil, 300)
+    feed("c")
+    local count = eval("g:val")
+    ok(count >= 4)
+    eq(99, eval("g:c"))
+  end)
+
+  it('can invoke redraw in blocking getchar() call', function()
+    local screen = Screen.new(40, 6)
+    screen:attach()
+    screen:set_default_attr_ids({
+        [1] = {bold=true, foreground=Screen.colors.Blue},
+    })
+
+    curbufmeths.set_lines(0, -1, true, {"ITEM 1", "ITEM 2"})
+    source([[
+      func! AddItem(timer)
+        call nvim_buf_set_lines(0, 2, 2, v:true, ['ITEM 3'])
+        redraw
+      endfunc
+      call timer_start(200, 'AddItem')
+    ]])
+    nvim_async("command", "let g:c2 = getchar()")
+
+    screen:expect([[
+      ITEM 1                                  |
+      ITEM 2                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      ^                                        |
+    ]])
+
+    screen:sleep(200)
+    screen:expect([[
+      ITEM 1                                  |
+      ITEM 2                                  |
+      ITEM 3                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+      ^                                        |
+    ]])
+
+    feed("3")
+    eq(51, eval("g:c2"))
+    screen:expect([[
+      ^ITEM 1                                  |
+      ITEM 2                                  |
+      ITEM 3                                  |
+      {1:~                                       }|
+      {1:~                                       }|
+                                              |
+    ]])
+  end)
+
+  it('can be stopped', function()
+    local t = eval("timer_start(50, 'MyHandler', {'repeat': -1})")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 300)
+    funcs.timer_stop(t)
+    local count = eval("g:val")
+    run(nil, nil, nil, 300)
+    local count2 = eval("g:val")
+    ok(4 <= count and count <= 7)
+    -- when count is eval:ed after timer_stop this should be non-racy
+    eq(count, count2)
+  end)
+
+  it('can be stopped from the handler', function()
+    source([[
+      func! MyHandler(timer)
+        let g:val += 1
+        if g:val == 3
+          call timer_stop(a:timer)
+          " check double stop is ignored
+          call timer_stop(a:timer)
+        endif
+      endfunc
+    ]])
+    execute("call timer_start(50, 'MyHandler', {'repeat': -1})")
+    eq(0,eval("g:val"))
+    run(nil, nil, nil, 300)
+    eq(3,eval("g:val"))
+  end)
+
+  it('can have two timers', function()
+    source([[
+      let g:val2 = 0
+      func! MyHandler2(timer)
+        let g:val2 += 1
+      endfunc
+    ]])
+    execute("call timer_start(50,  'MyHandler', {'repeat': 3})")
+    execute("call timer_start(100, 'MyHandler2', {'repeat': 2})")
+    run(nil, nil, nil, 300)
+    eq(3,eval("g:val"))
+    eq(2,eval("g:val2"))
+  end)
+
+  it('do not crash when processing events in the handler', function()
+    source([[
+      let g:val = 0
+      func! MyHandler(timer)
+        call timer_stop(a:timer)
+        sleep 100m
+        let g:val += 1
+      endfunc
+    ]])
+    execute("call timer_start(5, 'MyHandler', {'repeat': 1})")
+    run(nil, nil, nil, 300)
+    eq(1,eval("g:val"))
+  end)
+
+
+  it("doesn't mess up the cmdline", function()
+    local screen = Screen.new(40, 6)
+    screen:attach()
+    screen:set_default_attr_ids( {[0] = {bold=true, foreground=255}} )
+    source([[
+      func! MyHandler(timer)
+        echo "evil"
+      endfunc
+    ]])
+    execute("call timer_start(100,  'MyHandler', {'repeat': 1})")
+    feed(":good")
+    screen:sleep(200)
+    screen:expect([[
+                                              |
+      {0:~                                       }|
+      {0:~                                       }|
+      {0:~                                       }|
+      {0:~                                       }|
+      :good^                                   |
+    ]])
+  end)
+
+end)
diff --git a/test/functional/eval/vvar_event_spec.lua b/test/functional/eval/vvar_event_spec.lua
index bbac86524f..eec8aa917a 100644
--- a/test/functional/eval/vvar_event_spec.lua
+++ b/test/functional/eval/vvar_event_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq
 local command = helpers.command
 describe('v:event', function()
diff --git a/test/functional/ex_cmds/append_spec.lua b/test/functional/ex_cmds/append_spec.lua
index 2d5ab8e8c8..0a4d701794 100644
--- a/test/functional/ex_cmds/append_spec.lua
+++ b/test/functional/ex_cmds/append_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local eq = helpers.eq
 local feed = helpers.feed
@@ -22,8 +22,8 @@ local cmdtest = function(cmd, prep, ret1)
       command(cmd .. '\nabc\ndef\n')
       eq(ret1, buffer_contents())
     end)
-    -- Used to crash because this invokes history processing which uses 
-    -- hist_char2type which after fdb68e35e4c729c7ed097d8ade1da29e5b3f4b31 
+    -- Used to crash because this invokes history processing which uses
+    -- hist_char2type which after fdb68e35e4c729c7ed097d8ade1da29e5b3f4b31
     -- crashed.
     it(cmd .. 's' .. prep .. ' the current line by default when feeding',
     function()
diff --git a/test/functional/ex_cmds/arg_spec.lua b/test/functional/ex_cmds/arg_spec.lua
new file mode 100644
index 0000000000..e11b90532f
--- /dev/null
+++ b/test/functional/ex_cmds/arg_spec.lua
@@ -0,0 +1,30 @@
+local helpers = require("test.functional.helpers")(after_each)
+local eq, execute, funcs = helpers.eq, helpers.execute, helpers.funcs
+local ok = helpers.ok
+local clear = helpers.clear
+
+describe(":argument", function()
+  before_each(function()
+    clear()
+  end)
+
+  it("does not restart :terminal buffer", function()
+      execute("terminal")
+      helpers.feed([[<C-\><C-N>]])
+      execute("argadd")
+      helpers.feed([[<C-\><C-N>]])
+      local bufname_before = funcs.bufname("%")
+      local bufnr_before = funcs.bufnr("%")
+      helpers.ok(nil ~= string.find(bufname_before, "^term://"))  -- sanity
+
+      execute("argument 1")
+      helpers.feed([[<C-\><C-N>]])
+
+      local bufname_after = funcs.bufname("%")
+      local bufnr_after = funcs.bufnr("%")
+      eq("\n["..bufname_before.."] ", helpers.eval('execute("args")'))
+      ok(funcs.line('$') > 1)
+      eq(bufname_before, bufname_after)
+      eq(bufnr_before, bufnr_after)
+  end)
+end)
diff --git a/test/functional/shell/bang_filter_spec.lua b/test/functional/ex_cmds/bang_filter_spec.lua
index 964dbd1029..a320e6d018 100644
--- a/test/functional/shell/bang_filter_spec.lua
+++ b/test/functional/ex_cmds/bang_filter_spec.lua
@@ -1,9 +1,11 @@
 -- Specs for bang/filter commands
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, execute, clear = helpers.feed, helpers.execute, helpers.clear
 local mkdir, write_file, rmdir = helpers.mkdir, helpers.write_file, helpers.rmdir
 
+if helpers.pending_win32(pending) then return end
+
 local Screen = require('test.functional.ui.screen')
 
 
diff --git a/test/functional/ex_cmds/cd_spec.lua b/test/functional/ex_cmds/cd_spec.lua
index 69467632a4..5bf4d22d0f 100644
--- a/test/functional/ex_cmds/cd_spec.lua
+++ b/test/functional/ex_cmds/cd_spec.lua
@@ -1,49 +1,168 @@
 -- Specs for :cd, :tcd, :lcd and getcwd()
 
-local helpers = require('test.functional.helpers')
-local execute, eq, clear, eval, exc_exec =
-  helpers.execute, helpers.eq, helpers.clear, helpers.eval, helpers.exc_exec
 local lfs = require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local call = helpers.call
+local clear = helpers.clear
+local execute = helpers.execute
+local exc_exec = helpers.exc_exec
+
+if helpers.pending_win32(pending) then return end
 
 -- These directories will be created for testing
 local directories = {
-  'Xtest-functional-ex_cmds-cd_spec.1', -- Tab
-  'Xtest-functional-ex_cmds-cd_spec.2', -- Window
-  'Xtest-functional-ex_cmds-cd_spec.3', -- New global
+  tab = 'Xtest-functional-ex_cmds-cd_spec.tab', -- Tab
+  window = 'Xtest-functional-ex_cmds-cd_spec.window', -- Window
+  global = 'Xtest-functional-ex_cmds-cd_spec.global', -- New global
 }
 
 -- Shorthand writing to get the current working directory
-local  cwd = function() return eval('getcwd(      )') end  -- effective working dir
-local wcwd = function() return eval('getcwd( 0    )') end  -- window dir
-local tcwd = function() return eval('getcwd(-1,  0)') end  -- tab dir
---local gcwd = function() return eval('getcwd(-1, -1)') end  -- global dir
+local  cwd = function(...) return call('getcwd', ...) end  -- effective working dir
+local wcwd = function() return cwd(0) end  -- window dir
+local tcwd = function() return cwd(-1, 0) end  -- tab dir
 
 -- Same, except these tell us if there is a working directory at all
---local  lwd = function() return eval('haslocaldir(      )') end  -- effective working dir
-local wlwd = function() return eval('haslocaldir( 0    )') end  -- window dir
-local tlwd = function() return eval('haslocaldir(-1,  0)') end  -- tab dir
+local  lwd = function(...) return call('haslocaldir', ...) end  -- effective working dir
+local wlwd = function() return lwd(0) end  -- window dir
+local tlwd = function() return lwd(-1,  0) end  -- tab dir
 --local glwd = function() return eval('haslocaldir(-1, -1)') end  -- global dir
 
 -- Test both the `cd` and `chdir` variants
 for _, cmd in ipairs {'cd', 'chdir'} do
-  describe(':*' .. cmd, function()
+  describe(':' .. cmd, function()
     before_each(function()
       clear()
-      for _, d in ipairs(directories) do
+      for _, d in pairs(directories) do
         lfs.mkdir(d)
       end
+      directories.start = cwd()
     end)
 
     after_each(function()
-      for _, d in ipairs(directories) do
+      for _, d in pairs(directories) do
         lfs.rmdir(d)
       end
     end)
 
-    it('works', function()
-      -- Store the initial working directory
-      local globalDir = cwd()
+    describe('using explicit scope', function()
+      it('for window', function()
+        local globalDir = directories.start
+        local globalwin = call('winnr')
+        local tabnr = call('tabpagenr')
+
+        -- Everything matches globalDir to start
+        eq(globalDir, cwd(globalwin))
+        eq(globalDir, cwd(globalwin, tabnr))
+        eq(0, lwd(globalwin))
+        eq(0, lwd(globalwin, tabnr))
+
+        execute('bot split')
+        local localwin = call('winnr')
+        -- Initial window is still using globalDir
+        eq(globalDir, cwd(localwin))
+        eq(globalDir, cwd(localwin, tabnr))
+        eq(0, lwd(globalwin))
+        eq(0, lwd(globalwin, tabnr))
+
+        execute('silent l' .. cmd .. ' ' .. directories.window)
+        -- From window with local dir, the original window
+        -- is still reporting the global dir
+        eq(globalDir, cwd(globalwin))
+        eq(globalDir, cwd(globalwin, tabnr))
+        eq(0, lwd(globalwin))
+        eq(0, lwd(globalwin, tabnr))
+
+        -- Window with local dir reports as such
+        eq(globalDir .. '/' .. directories.window, cwd(localwin))
+        eq(globalDir .. '/' .. directories.window, cwd(localwin, tabnr))
+        eq(1, lwd(localwin))
+        eq(1, lwd(localwin, tabnr))
+
+        execute('tabnew')
+        -- From new tab page, original window reports global dir
+        eq(globalDir, cwd(globalwin, tabnr))
+        eq(0, lwd(globalwin, tabnr))
+
+        -- From new tab page, local window reports as such
+        eq(globalDir .. '/' .. directories.window, cwd(localwin, tabnr))
+        eq(1, lwd(localwin, tabnr))
+      end)
+
+      it('for tab page', function()
+        local globalDir = directories.start
+        local globaltab = call('tabpagenr')
+
+        -- Everything matches globalDir to start
+        eq(globalDir, cwd(-1, 0))
+        eq(globalDir, cwd(-1, globaltab))
+        eq(0, lwd(-1, 0))
+        eq(0, lwd(-1, globaltab))
+
+        execute('tabnew')
+        execute('silent t' .. cmd .. ' ' .. directories.tab)
+        local localtab = call('tabpagenr')
+
+        -- From local tab page, original tab reports globalDir
+        eq(globalDir, cwd(-1, globaltab))
+        eq(0, lwd(-1, globaltab))
+
+        -- new tab reports local
+        eq(globalDir .. '/' .. directories.tab, cwd(-1, 0))
+        eq(globalDir .. '/' .. directories.tab, cwd(-1, localtab))
+        eq(1, lwd(-1, 0))
+        eq(1, lwd(-1, localtab))
+
+        execute('tabnext')
+        -- From original tab page, local reports as such
+        eq(globalDir .. '/' .. directories.tab, cwd(-1, localtab))
+        eq(1, lwd(-1, localtab))
+      end)
+    end)
+
+    describe('getcwd(-1, -1)', function()
+      it('works', function()
+        eq(directories.start, cwd(-1, -1))
+        eq(0, lwd(-1, -1))
+      end)
 
+      it('works with tab-local pwd', function()
+        execute('silent t' .. cmd .. ' ' .. directories.tab)
+        eq(directories.start, cwd(-1, -1))
+        eq(0, lwd(-1, -1))
+      end)
+
+      it('works with window-local pwd', function()
+        execute('silent l' .. cmd .. ' ' .. directories.window)
+        eq(directories.start, cwd(-1, -1))
+        eq(0, lwd(-1, -1))
+      end)
+    end)
+
+    describe('Local directory gets inherited', function()
+      it('by tabs', function()
+        local globalDir = directories.start
+
+        -- Create a new tab and change directory
+        execute('tabnew')
+        execute('silent t' .. cmd .. ' ' .. directories.tab)
+        eq(globalDir .. '/' .. directories.tab, tcwd())
+
+        -- Create a new tab and verify it has inherited the directory
+        execute('tabnew')
+        eq(globalDir .. '/' .. directories.tab, tcwd())
+
+        -- Change tab and change back, verify that directories are correct
+        execute('tabnext')
+        eq(globalDir, tcwd())
+        execute('tabprevious')
+        eq(globalDir .. '/' .. directories.tab, tcwd())
+      end)
+    end)
+
+    it('works', function()
+      local globalDir = directories.start
       -- Create a new tab first and verify that is has the same working dir
       execute('tabnew')
       eq(globalDir, cwd())
@@ -53,8 +172,8 @@ for _, cmd in ipairs {'cd', 'chdir'} do
       eq(0, wlwd())
 
       -- Change tab-local working directory and verify it is different
-      execute('silent t' .. cmd .. ' ' .. directories[1])
-      eq(globalDir .. '/' .. directories[1], cwd())
+      execute('silent t' .. cmd .. ' ' .. directories.tab)
+      eq(globalDir .. '/' .. directories.tab, cwd())
       eq(cwd(), tcwd())  -- working directory maches tab directory
       eq(1, tlwd())
       eq(cwd(), wcwd())  -- still no window-directory
@@ -64,16 +183,16 @@ for _, cmd in ipairs {'cd', 'chdir'} do
       execute('new')
       eq(1, tlwd())  -- Still tab-local working directory
       eq(0, wlwd())  -- Still no window-local working directory
-      eq(globalDir .. '/' .. directories[1], cwd())
-      execute('silent l' .. cmd .. ' ../' .. directories[2])
-      eq(globalDir .. '/' .. directories[2], cwd())
-      eq(globalDir .. '/' .. directories[1], tcwd())
+      eq(globalDir .. '/' .. directories.tab, cwd())
+      execute('silent l' .. cmd .. ' ../' .. directories.window)
+      eq(globalDir .. '/' .. directories.window, cwd())
+      eq(globalDir .. '/' .. directories.tab, tcwd())
       eq(1, wlwd())
 
       -- Verify the first window still has the tab local directory
       execute('wincmd w')
-      eq(globalDir .. '/' .. directories[1],  cwd())
-      eq(globalDir .. '/' .. directories[1], tcwd())
+      eq(globalDir .. '/' .. directories.tab,  cwd())
+      eq(globalDir .. '/' .. directories.tab, tcwd())
       eq(0, wlwd())  -- No window-local directory
 
       -- Change back to initial tab and verify working directory has stayed
@@ -83,11 +202,11 @@ for _, cmd in ipairs {'cd', 'chdir'} do
       eq(0, wlwd())
 
       -- Verify global changes don't affect local ones
-      execute('silent ' .. cmd .. ' ' .. directories[3])
-      eq(globalDir .. '/' .. directories[3], cwd())
+      execute('silent ' .. cmd .. ' ' .. directories.global)
+      eq(globalDir .. '/' .. directories.global, cwd())
       execute('tabnext')
-      eq(globalDir .. '/' .. directories[1],  cwd())
-      eq(globalDir .. '/' .. directories[1], tcwd())
+      eq(globalDir .. '/' .. directories.tab,  cwd())
+      eq(globalDir .. '/' .. directories.tab, tcwd())
       eq(0, wlwd())  -- Still no window-local directory in this window
 
       -- Unless the global change happened in a tab with local directory
@@ -101,9 +220,9 @@ for _, cmd in ipairs {'cd', 'chdir'} do
 
       -- But not in a window with its own local directory
       execute('tabnext | wincmd w')
-      eq(globalDir .. '/' .. directories[2], cwd() )
+      eq(globalDir .. '/' .. directories.window, cwd() )
       eq(0 , tlwd())
-      eq(globalDir .. '/' .. directories[2], wcwd())
+      eq(globalDir .. '/' .. directories.window, wcwd())
     end)
   end)
 end
@@ -150,3 +269,21 @@ for _, cmd in ipairs {'getcwd', 'haslocaldir'} do
   end)
 end
 
+describe("getcwd()", function ()
+  before_each(function()
+    clear()
+    lfs.mkdir(directories.global)
+  end)
+
+  after_each(function()
+    helpers.rmdir(directories.global)
+  end)
+
+  it("returns empty string if working directory does not exist", function()
+    execute("cd "..directories.global)
+    execute("call delete('../"..directories.global.."', 'd')")
+    eq("", helpers.eval("getcwd()"))
+  end)
+end)
+
+
diff --git a/test/functional/ex_cmds/ctrl_c_spec.lua b/test/functional/ex_cmds/ctrl_c_spec.lua
new file mode 100644
index 0000000000..072fd2ad10
--- /dev/null
+++ b/test/functional/ex_cmds/ctrl_c_spec.lua
@@ -0,0 +1,60 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, feed, source = helpers.clear, helpers.feed, helpers.source
+local execute = helpers.execute
+
+describe("CTRL-C (mapped)", function()
+  before_each(function()
+    clear()
+  end)
+
+  it("interrupts :global", function()
+    -- Crashes luajit.
+    if helpers.skip_fragile(pending,
+      os.getenv("TRAVIS") or os.getenv("APPVEYOR")) then
+      return
+    end
+
+    source([[
+      set nomore nohlsearch undolevels=-1
+      nnoremap <C-C> <NOP>
+    ]])
+
+    execute("silent edit! test/functional/fixtures/bigfile.txt")
+    local screen = Screen.new(52, 6)
+    screen:attach()
+    screen:set_default_attr_ids({
+      [0] = {foreground = Screen.colors.White,
+             background = Screen.colors.Red},
+      [1] = {bold = true,
+             foreground = Screen.colors.SeaGreen}
+    })
+
+    screen:expect([[
+      ^0000;<control>;Cc;0;BN;;;;;N;NULL;;;;               |
+      0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;   |
+      0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;      |
+      0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;        |
+      0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;|
+                                                          |
+    ]])
+
+    local function test_ctrl_c(ms)
+      feed(":global/^/p<CR>")
+      helpers.sleep(ms)
+      feed("<C-C>")
+      screen:expect([[Interrupt]], nil, nil, nil, true)
+    end
+
+    -- The test is time-sensitive. Try different sleep values.
+    local ms_values = {1, 10, 100}
+    for i, ms in ipairs(ms_values) do
+      if i < #ms_values then
+        local status, _ = pcall(test_ctrl_c, ms)
+        if status then break end
+      else  -- Call the last attempt directly.
+        test_ctrl_c(ms)
+      end
+    end
+  end)
+end)
diff --git a/test/functional/dict_notifications_spec.lua b/test/functional/ex_cmds/dict_notifications_spec.lua
index 2540929126..5e89986c0f 100644
--- a/test/functional/dict_notifications_spec.lua
+++ b/test/functional/ex_cmds/dict_notifications_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, source = helpers.clear, helpers.nvim, helpers.source
 local eq, next_msg = helpers.eq, helpers.next_message
 local exc_exec = helpers.exc_exec
+local command = helpers.command
+local eval = helpers.eval
 
 
 describe('dictionary change notifications', function()
@@ -229,11 +231,9 @@ describe('dictionary change notifications', function()
         exc_exec('call dictwatcherdel(g:, "invalid_key", "g:Watcher2")'))
     end)
 
-    it("fails to add/remove if the callback doesn't exist", function()
-      eq("Vim(call):Function g:InvalidCb doesn't exist",
-        exc_exec('call dictwatcheradd(g:, "key", "g:InvalidCb")'))
-      eq("Vim(call):Function g:InvalidCb doesn't exist",
-        exc_exec('call dictwatcherdel(g:, "key", "g:InvalidCb")'))
+    it("does not fail to add/remove if the callback doesn't exist", function()
+      command('call dictwatcheradd(g:, "key", "g:InvalidCb")')
+      command('call dictwatcherdel(g:, "key", "g:InvalidCb")')
     end)
 
     it('fails with empty keys', function()
@@ -243,15 +243,34 @@ describe('dictionary change notifications', function()
         exc_exec('call dictwatcherdel(g:, "", "g:Watcher1")'))
     end)
 
-    it('fails to replace a watcher function', function()
+    it('does not fail to replace a watcher function', function()
       source([[
       function! g:ReplaceWatcher2()
-        function! g:Watcher2()
+        function! g:Watcher2(dict, key, value)
+          call rpcnotify(g:channel, '2b', a:key, a:value)
         endfunction
       endfunction
       ]])
-      eq("Vim(function):E127: Cannot redefine function Watcher2: It is in use",
-        exc_exec('call g:ReplaceWatcher2()'))
+      command('call g:ReplaceWatcher2()')
+      command('let g:key = "value"')
+      eq({'notification', '2b', {'key', {old = 'v2', new = 'value'}}}, next_msg())
+
+    end)
+
+    it('does not crash when freeing a watched dictionary', function()
+      source([[
+        function! Watcher(dict, key, value)
+          echo a:key string(a:value)
+        endfunction
+
+        function! MakeWatch()
+          let d = {'foo': 'bar'}
+          call dictwatcheradd(d, 'foo', function('Watcher'))
+        endfunction
+      ]])
+
+      command('call MakeWatch()')
+      eq(2, eval('1+1')) -- Still alive?
     end)
   end)
 end)
diff --git a/test/functional/ex_cmds/drop_spec.lua b/test/functional/ex_cmds/drop_spec.lua
new file mode 100644
index 0000000000..99db5ea333
--- /dev/null
+++ b/test/functional/ex_cmds/drop_spec.lua
@@ -0,0 +1,80 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
+
+describe(":drop", function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(35, 10)
+    screen:attach()
+    screen:set_default_attr_ids({
+      [0] = {bold=true, foreground=Screen.colors.Blue},
+      [1] = {bold = true, reverse = true},
+      [2] = {reverse = true},
+      [3] = {bold = true},
+    })
+    execute("set laststatus=2")
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it("works like :e when called with only one window open", function()
+    execute("drop tmp1.vim")
+    screen:expect([[
+      ^                                   |
+      {0:~                                  }|
+      {0:~                                  }|
+      {0:~                                  }|
+      {0:~                                  }|
+      {0:~                                  }|
+      {0:~                                  }|
+      {0:~                                  }|
+      {1:tmp1.vim                           }|
+      "tmp1.vim" [New File]              |
+    ]])
+  end)
+
+  it("switches to an open window showing the buffer", function()
+    execute("edit tmp1")
+    execute("vsplit")
+    execute("edit tmp2")
+    execute("drop tmp1")
+    screen:expect([[
+                    {2:|}^                    |
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {0:~             }{2:|}{0:~                   }|
+      {2:tmp2           }{1:tmp1                }|
+      :drop tmp1                         |
+    ]])
+  end)
+
+  it("splits off a new window when a buffer can't be abandoned", function()
+    execute("edit tmp1")
+    execute("vsplit")
+    execute("edit tmp2")
+    feed("iABC<esc>")
+    execute("drop tmp3")
+    screen:expect([[
+      ^                    {2:|}              |
+      {0:~                   }{2:|}{0:~             }|
+      {0:~                   }{2:|}{0:~             }|
+      {0:~                   }{2:|}{0:~             }|
+      {1:tmp3                }{2:|}{0:~             }|
+      ABC                 {2:|}{0:~             }|
+      {0:~                   }{2:|}{0:~             }|
+      {0:~                   }{2:|}{0:~             }|
+      {2:tmp2 [+]             tmp1          }|
+      "tmp3" [New File]                  |
+    ]])
+  end)
+
+end)
diff --git a/test/functional/ex_cmds/edit_spec.lua b/test/functional/ex_cmds/edit_spec.lua
new file mode 100644
index 0000000000..3cc5f5fb95
--- /dev/null
+++ b/test/functional/ex_cmds/edit_spec.lua
@@ -0,0 +1,26 @@
+local helpers = require("test.functional.helpers")(after_each)
+local eq, execute, funcs = helpers.eq, helpers.execute, helpers.funcs
+local ok = helpers.ok
+local clear = helpers.clear
+
+describe(":edit", function()
+  before_each(function()
+    clear()
+  end)
+
+  it("without arguments does not restart :terminal buffer", function()
+      execute("terminal")
+      helpers.feed([[<C-\><C-N>]])
+      local bufname_before = funcs.bufname("%")
+      local bufnr_before = funcs.bufnr("%")
+      helpers.ok(nil ~= string.find(bufname_before, "^term://"))  -- sanity
+
+      execute("edit")
+
+      local bufname_after = funcs.bufname("%")
+      local bufnr_after = funcs.bufnr("%")
+      ok(funcs.line('$') > 1)
+      eq(bufname_before, bufname_after)
+      eq(bufnr_before, bufnr_after)
+  end)
+end)
diff --git a/test/functional/ex_cmds/encoding_spec.lua b/test/functional/ex_cmds/encoding_spec.lua
index 6d402b7974..87ed7a2d0a 100644
--- a/test/functional/ex_cmds/encoding_spec.lua
+++ b/test/functional/ex_cmds/encoding_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, feed = helpers.clear, helpers.execute, helpers.feed
 local eq, neq, eval = helpers.eq, helpers.neq, helpers.eval
 
@@ -15,27 +15,26 @@ describe('&encoding', function()
     execute('set encoding=latin1')
     -- error message expected
     feed('<cr>')
-    neq(nil, string.find(eval('v:errmsg'), '^E905:'))
+    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
     eq('utf-8', eval('&encoding'))
     -- check nvim is still in utf-8 mode
     eq(3, eval('strwidth("Bär")'))
   end)
 
-  it('can be changed before startup', function()
-    clear('set enc=latin1')
-    execute('set encoding=utf-8')
+  it('cannot be changed before startup', function()
+    clear('--cmd', 'set enc=latin1')
     -- error message expected
     feed('<cr>')
-    eq('latin1', eval('&encoding'))
-    eq(4, eval('strwidth("Bär")'))
+    neq(nil, string.find(eval('v:errmsg'), '^E474:'))
+    eq('utf-8', eval('&encoding'))
+    eq(3, eval('strwidth("Bär")'))
   end)
 
-  it('is not changed by `set all&`', function()
-    -- we need to set &encoding to something non-default. Use 'latin1'
-    clear('set enc=latin1')
-    execute('set all&')
-    eq('latin1', eval('&encoding'))
-    eq(4, eval('strwidth("Bär")'))
-  end)
+  it('can be set to utf-8 without error', function()
+    execute('set encoding=utf-8')
+    eq("", eval('v:errmsg'))
 
+    clear('--cmd', 'set enc=utf-8')
+    eq("", eval('v:errmsg'))
+  end)
 end)
diff --git a/test/functional/ex_cmds/grep_spec.lua b/test/functional/ex_cmds/grep_spec.lua
index f3ff0a3817..13f88b7e03 100644
--- a/test/functional/ex_cmds/grep_spec.lua
+++ b/test/functional/ex_cmds/grep_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, feed, ok, eval =
   helpers.clear, helpers.execute, helpers.feed, helpers.ok, helpers.eval
 
diff --git a/test/functional/ex_cmds/menu_spec.lua b/test/functional/ex_cmds/menu_spec.lua
index f5fd30465d..52df9e1592 100644
--- a/test/functional/ex_cmds/menu_spec.lua
+++ b/test/functional/ex_cmds/menu_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, nvim = helpers.clear, helpers.execute, helpers.nvim
 local expect, feed, command = helpers.expect, helpers.feed, helpers.command
 local eq, eval = helpers.eq, helpers.eval
@@ -39,7 +39,7 @@ describe(':emenu', function()
   end)
 
   it('executes correct bindings in command mode', function()
-      feed('ithis is a sentence<esc>^"+yiwo<esc>')
+      feed('ithis is a sentence<esc>^yiwo<esc>')
 
       -- Invoke "Edit.Paste" in normal-mode.
       nvim('command', 'emenu Edit.Paste')
diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index 5bba1a0e7c..a218bb6633 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -1,5 +1,5 @@
 local Screen = require('test.functional.ui.screen')
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local buf, eq, execute = helpers.curbufmeths, helpers.eq, helpers.execute
 local feed, nvim_prog, wait = helpers.feed, helpers.nvim_prog, helpers.wait
@@ -47,7 +47,7 @@ describe(':oldfiles', function()
   end)
 end)
 
-describe(':oldfiles!', function()
+describe(':browse oldfiles', function()
   local filename
   local filename2
   local oldfiles
@@ -65,7 +65,7 @@ describe(':oldfiles!', function()
 
     -- Ensure nvim is out of "Press ENTER..." screen
     feed('<cr>')
-    
+
     -- Ensure v:oldfiles isn't busted.  Since things happen so fast,
     -- the ordering of v:oldfiles is unstable (it uses qsort() under-the-hood).
     -- Let's verify the contents and the length of v:oldfiles before moving on.
@@ -74,7 +74,7 @@ describe(':oldfiles!', function()
     ok(filename == oldfiles[1] or filename == oldfiles[2])
     ok(filename2 == oldfiles[1] or filename2 == oldfiles[2])
 
-    execute('oldfiles!')
+    execute('browse oldfiles')
   end)
 
   after_each(function()
diff --git a/test/functional/ex_cmds/profile_spec.lua b/test/functional/ex_cmds/profile_spec.lua
index 744b22621f..f185db192a 100644
--- a/test/functional/ex_cmds/profile_spec.lua
+++ b/test/functional/ex_cmds/profile_spec.lua
@@ -1,13 +1,13 @@
 require('os')
 local lfs = require('lfs')
 
-local helpers  = require('test.functional.helpers')
+local helpers  = require('test.functional.helpers')(after_each)
 local eval     = helpers.eval
 local command  = helpers.command
 local eq, neq  = helpers.eq, helpers.neq
-local tempfile = os.tmpname()
+local tempfile = helpers.tmpname()
 
--- os.tmpname() also creates the file on POSIX systems. Remove it again.
+-- tmpname() also creates the file on POSIX systems. Remove it again.
 -- We just need the name, ignoring any race conditions.
 if lfs.attributes(tempfile, 'uid') then
   os.remove(tempfile)
diff --git a/test/functional/ex_cmds/quit_spec.lua b/test/functional/ex_cmds/quit_spec.lua
index a8156228d3..fe138a24c8 100644
--- a/test/functional/ex_cmds/quit_spec.lua
+++ b/test/functional/ex_cmds/quit_spec.lua
@@ -1,9 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 
 describe(':qa', function()
-  before_each(function() 
-    clear('qa')
+  before_each(function()
+    clear('--cmd', 'qa')
   end)
 
   it('verify #3334', function()
diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua
index e1d01f6896..af1296c94c 100644
--- a/test/functional/ex_cmds/recover_spec.lua
+++ b/test/functional/ex_cmds/recover_spec.lua
@@ -1,11 +1,13 @@
 -- Tests for :recover
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local lfs = require('lfs')
 local execute, eq, clear, eval, feed, expect, source =
   helpers.execute, helpers.eq, helpers.clear, helpers.eval, helpers.feed,
   helpers.expect, helpers.source
 
+if helpers.pending_win32(pending) then return end
+
 describe(':recover', function()
   before_each(clear)
 
@@ -30,7 +32,7 @@ describe(':preserve', function()
 
   it("saves to custom 'directory' and (R)ecovers (issue #1836)", function()
     local testfile = 'testfile_recover_spec'
-    -- Note: `set swapfile` *must* go after `set directory`: otherwise it may 
+    -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
     -- attempt to create a swapfile in different directory.
     local init = [[
       set directory^=]]..swapdir..[[//
diff --git a/test/functional/ex_cmds/sign_spec.lua b/test/functional/ex_cmds/sign_spec.lua
index c50704504d..b37e6e8563 100644
--- a/test/functional/ex_cmds/sign_spec.lua
+++ b/test/functional/ex_cmds/sign_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, nvim, eq = helpers.clear, helpers.nvim, helpers.eq
 
 describe('sign', function()
diff --git a/test/functional/ex_cmds/undojoin_spec.lua b/test/functional/ex_cmds/undojoin_spec.lua
new file mode 100644
index 0000000000..ba1e46ceb3
--- /dev/null
+++ b/test/functional/ex_cmds/undojoin_spec.lua
@@ -0,0 +1,38 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local clear = helpers.clear
+local insert = helpers.insert
+local feed = helpers.feed
+local expect = helpers.expect
+local execute = helpers.execute
+local exc_exec = helpers.exc_exec
+
+describe(':undojoin command', function()
+  before_each(function()
+    clear()
+    insert([[
+    Line of text 1
+    Line of text 2]])
+    execute('goto 1')
+  end)
+  it('joins changes in a buffer', function()
+    execute('undojoin | delete')
+    expect([[
+    Line of text 2]])
+    feed('u')
+    expect([[
+    ]])
+  end)
+  it('does not corrupt undolist when connected with redo', function()
+    feed('ixx<esc>')
+    execute('undojoin | redo')
+    expect([[
+    xxLine of text 1
+    Line of text 2]])
+  end)
+  it('does not raise an error when called twice', function()
+    local ret = exc_exec('undojoin | undojoin')
+    eq(0, ret)
+  end)
+end)
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index d90b297ca8..4ac9f312ef 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -1,15 +1,26 @@
--- Specs for :write
+local helpers = require('test.functional.helpers')(after_each)
+local eq, eval, clear, write_file, execute, source, insert =
+  helpers.eq, helpers.eval, helpers.clear, helpers.write_file,
+  helpers.execute, helpers.source, helpers.insert
 
-local helpers = require('test.functional.helpers')
-local eq, eval, clear, write_file, execute, source =
-	helpers.eq, helpers.eval, helpers.clear, helpers.write_file,
-	helpers.execute, helpers.source
+if helpers.pending_win32(pending) then return end
 
 describe(':write', function()
-  it('&backupcopy=auto preserves symlinks', function()
-    clear('set backupcopy=auto')
+  local function cleanup()
     os.remove('test_bkc_file.txt')
     os.remove('test_bkc_link.txt')
+    os.remove('test_fifo')
+  end
+  before_each(function()
+    clear()
+    cleanup()
+  end)
+  after_each(function()
+    cleanup()
+  end)
+
+  it('&backupcopy=auto preserves symlinks', function()
+    execute('set backupcopy=auto')
     write_file('test_bkc_file.txt', 'content0')
     execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt")
     source([[
@@ -22,9 +33,7 @@ describe(':write', function()
   end)
 
   it('&backupcopy=no replaces symlink with new file', function()
-    clear('set backupcopy=no')
-    os.remove('test_bkc_file.txt')
-    os.remove('test_bkc_link.txt')
+    execute('set backupcopy=no')
     write_file('test_bkc_file.txt', 'content0')
     execute("silent !ln -s test_bkc_file.txt test_bkc_link.txt")
     source([[
@@ -35,4 +44,23 @@ describe(':write', function()
     eq(eval("['content0']"), eval("readfile('test_bkc_file.txt')"))
     eq(eval("['content1']"), eval("readfile('test_bkc_link.txt')"))
   end)
+
+  it("appends FIFO file", function()
+    if eval("executable('mkfifo')") == 0 then
+      pending('missing "mkfifo" command', function()end)
+      return
+    end
+
+    local text = "some fifo text from write_spec"
+    assert(os.execute("mkfifo test_fifo"))
+    insert(text)
+
+    -- Blocks until a consumer reads the FIFO.
+    execute("write >> test_fifo")
+
+    -- Read the FIFO, this will unblock the :write above.
+    local fifo = assert(io.open("test_fifo"))
+    eq(text.."\n", fifo:read("*all"))
+    fifo:close()
+  end)
 end)
diff --git a/test/functional/ex_cmds/wundo_spec.lua b/test/functional/ex_cmds/wundo_spec.lua
index 969dfea3d9..e1216fa5d4 100644
--- a/test/functional/ex_cmds/wundo_spec.lua
+++ b/test/functional/ex_cmds/wundo_spec.lua
@@ -1,6 +1,6 @@
 -- Specs for :wundo and underlying functions
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local execute, clear, eval, feed, spawn, nvim_prog, set_session =
   helpers.execute, helpers.clear, helpers.eval, helpers.feed, helpers.spawn,
   helpers.nvim_prog, helpers.set_session
diff --git a/test/functional/ex_cmds/wviminfo_spec.lua b/test/functional/ex_cmds/wviminfo_spec.lua
index 21f14be62c..37f45da2d4 100644
--- a/test/functional/ex_cmds/wviminfo_spec.lua
+++ b/test/functional/ex_cmds/wviminfo_spec.lua
@@ -1,4 +1,5 @@
-local helpers, lfs = require('test.functional.helpers'), require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
 local execute, eq, neq, spawn, nvim_prog, set_session, wait, write_file
   = helpers.execute, helpers.eq, helpers.neq, helpers.spawn,
   helpers.nvim_prog, helpers.set_session, helpers.wait, helpers.write_file
diff --git a/test/functional/ex_getln/history_spec.lua b/test/functional/ex_getln/history_spec.lua
index 532c81dab9..20f9cf06a2 100644
--- a/test/functional/ex_getln/history_spec.lua
+++ b/test/functional/ex_getln/history_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, meths, funcs, eq =
   helpers.clear, helpers.meths, helpers.funcs, helpers.eq
 
@@ -6,7 +6,7 @@ describe('history support code', function()
   before_each(clear)
 
   it('correctly clears start of the history', function()
-    -- Regression test: check absense of the memory leak when clearing start of 
+    -- Regression test: check absense of the memory leak when clearing start of
     -- the history using ex_getln.c/clr_history().
     eq(1, funcs.histadd(':', 'foo'))
     eq(1, funcs.histdel(':'))
@@ -14,7 +14,7 @@ describe('history support code', function()
   end)
 
   it('correctly clears end of the history', function()
-    -- Regression test: check absense of the memory leak when clearing end of 
+    -- Regression test: check absense of the memory leak when clearing end of
     -- the history using ex_getln.c/clr_history().
     meths.set_option('history', 1)
     eq(1, funcs.histadd(':', 'foo'))
@@ -23,8 +23,8 @@ describe('history support code', function()
   end)
 
   it('correctly removes item from history', function()
-    -- Regression test: check that ex_getln.c/del_history_idx() correctly clears 
-    -- history index after removing history entry. If it does not then deleting 
+    -- Regression test: check that ex_getln.c/del_history_idx() correctly clears
+    -- history index after removing history entry. If it does not then deleting
     -- history will result in a double free.
     eq(1, funcs.histadd(':', 'foo'))
     eq(1, funcs.histadd(':', 'bar'))
diff --git a/test/functional/fixtures/CMakeLists.txt b/test/functional/fixtures/CMakeLists.txt
index 70aee6efa9..8537ea390f 100644
--- a/test/functional/fixtures/CMakeLists.txt
+++ b/test/functional/fixtures/CMakeLists.txt
@@ -2,3 +2,4 @@ add_executable(tty-test tty-test.c)
 target_link_libraries(tty-test ${LIBUV_LIBRARIES})
 
 add_executable(shell-test shell-test.c)
+add_executable(printargs-test printargs-test.c)
diff --git a/test/functional/fixtures/api_level_0.mpack b/test/functional/fixtures/api_level_0.mpack
new file mode 100644
index 0000000000..75b236a3c1
--- /dev/null
+++ b/test/functional/fixtures/api_level_0.mpack
diff --git a/test/functional/fixtures/autoload/health/broken.vim b/test/functional/fixtures/autoload/health/broken.vim
new file mode 100644
index 0000000000..a2a595b96f
--- /dev/null
+++ b/test/functional/fixtures/autoload/health/broken.vim
@@ -0,0 +1,3 @@
+function! health#broken#check()
+  throw 'caused an error'
+endfunction
diff --git a/test/functional/fixtures/autoload/health/success1.vim b/test/functional/fixtures/autoload/health/success1.vim
new file mode 100644
index 0000000000..a360347455
--- /dev/null
+++ b/test/functional/fixtures/autoload/health/success1.vim
@@ -0,0 +1,6 @@
+function! health#success1#check()
+  call health#report_start("report 1")
+  call health#report_ok("everything is fine")
+  call health#report_start("report 2")
+  call health#report_ok("nothing to see here")
+endfunction
diff --git a/test/functional/fixtures/autoload/health/success2.vim b/test/functional/fixtures/autoload/health/success2.vim
new file mode 100644
index 0000000000..b742b4879d
--- /dev/null
+++ b/test/functional/fixtures/autoload/health/success2.vim
@@ -0,0 +1,4 @@
+function! health#success2#check()
+  call health#report_start("another 1")
+  call health#report_ok("ok")
+endfunction
diff --git a/test/functional/fixtures/autoload/provider/clipboard.vim b/test/functional/fixtures/autoload/provider/clipboard.vim
index 0935ea45ff..411e095c71 100644
--- a/test/functional/fixtures/autoload/provider/clipboard.vim
+++ b/test/functional/fixtures/autoload/provider/clipboard.vim
@@ -9,13 +9,12 @@ function! s:methods.get(reg)
   if g:cliperror
     return 0
   end
-  let reg = a:reg == '"' ? '+' : a:reg
   if g:cliplossy
     " behave like pure text clipboard
-    return g:test_clip[reg][0]
+    return g:test_clip[a:reg][0]
   else
     " behave like VIMENC clipboard
-    return g:test_clip[reg]
+    return g:test_clip[a:reg]
   end
 endfunction
 
diff --git a/test/functional/fixtures/bigfile.txt b/test/functional/fixtures/bigfile.txt
new file mode 100644
index 0000000000..a756976461
--- /dev/null
+++ b/test/functional/fixtures/bigfile.txt
@@ -0,0 +1,30592 @@
+0000;<control>;Cc;0;BN;;;;;N;NULL;;;;
+0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;
+0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;
+0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;
+0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;
+0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;
+0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;
+0007;<control>;Cc;0;BN;;;;;N;BELL;;;;
+0008;<control>;Cc;0;BN;;;;;N;BACKSPACE;;;;
+0009;<control>;Cc;0;S;;;;;N;CHARACTER TABULATION;;;;
+000A;<control>;Cc;0;B;;;;;N;LINE FEED (LF);;;;
+000B;<control>;Cc;0;S;;;;;N;LINE TABULATION;;;;
+000C;<control>;Cc;0;WS;;;;;N;FORM FEED (FF);;;;
+000D;<control>;Cc;0;B;;;;;N;CARRIAGE RETURN (CR);;;;
+000E;<control>;Cc;0;BN;;;;;N;SHIFT OUT;;;;
+000F;<control>;Cc;0;BN;;;;;N;SHIFT IN;;;;
+0010;<control>;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;;
+0011;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL ONE;;;;
+0012;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL TWO;;;;
+0013;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL THREE;;;;
+0014;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL FOUR;;;;
+0015;<control>;Cc;0;BN;;;;;N;NEGATIVE ACKNOWLEDGE;;;;
+0016;<control>;Cc;0;BN;;;;;N;SYNCHRONOUS IDLE;;;;
+0017;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION BLOCK;;;;
+0018;<control>;Cc;0;BN;;;;;N;CANCEL;;;;
+0019;<control>;Cc;0;BN;;;;;N;END OF MEDIUM;;;;
+001A;<control>;Cc;0;BN;;;;;N;SUBSTITUTE;;;;
+001B;<control>;Cc;0;BN;;;;;N;ESCAPE;;;;
+001C;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR FOUR;;;;
+001D;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR THREE;;;;
+001E;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR TWO;;;;
+001F;<control>;Cc;0;S;;;;;N;INFORMATION SEPARATOR ONE;;;;
+0020;SPACE;Zs;0;WS;;;;;N;;;;;
+0021;EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+0022;QUOTATION MARK;Po;0;ON;;;;;N;;;;;
+0023;NUMBER SIGN;Po;0;ET;;;;;N;;;;;
+0024;DOLLAR SIGN;Sc;0;ET;;;;;N;;;;;
+0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+0026;AMPERSAND;Po;0;ON;;;;;N;;;;;
+0027;APOSTROPHE;Po;0;ON;;;;;N;APOSTROPHE-QUOTE;;;;
+0028;LEFT PARENTHESIS;Ps;0;ON;;;;;Y;OPENING PARENTHESIS;;;;
+0029;RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;CLOSING PARENTHESIS;;;;
+002A;ASTERISK;Po;0;ON;;;;;N;;;;;
+002B;PLUS SIGN;Sm;0;ES;;;;;N;;;;;
+002C;COMMA;Po;0;CS;;;;;N;;;;;
+002D;HYPHEN-MINUS;Pd;0;ES;;;;;N;;;;;
+002E;FULL STOP;Po;0;CS;;;;;N;PERIOD;;;;
+002F;SOLIDUS;Po;0;CS;;;;;N;SLASH;;;;
+0030;DIGIT ZERO;Nd;0;EN;;0;0;0;N;;;;;
+0031;DIGIT ONE;Nd;0;EN;;1;1;1;N;;;;;
+0032;DIGIT TWO;Nd;0;EN;;2;2;2;N;;;;;
+0033;DIGIT THREE;Nd;0;EN;;3;3;3;N;;;;;
+0034;DIGIT FOUR;Nd;0;EN;;4;4;4;N;;;;;
+0035;DIGIT FIVE;Nd;0;EN;;5;5;5;N;;;;;
+0036;DIGIT SIX;Nd;0;EN;;6;6;6;N;;;;;
+0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;;
+0038;DIGIT EIGHT;Nd;0;EN;;8;8;8;N;;;;;
+0039;DIGIT NINE;Nd;0;EN;;9;9;9;N;;;;;
+003A;COLON;Po;0;CS;;;;;N;;;;;
+003B;SEMICOLON;Po;0;ON;;;;;N;;;;;
+003C;LESS-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003D;EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+003E;GREATER-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003F;QUESTION MARK;Po;0;ON;;;;;N;;;;;
+0040;COMMERCIAL AT;Po;0;ON;;;;;N;;;;;
+0041;LATIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0061;
+0042;LATIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;0062;
+0043;LATIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;0063;
+0044;LATIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;0064;
+0045;LATIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;0065;
+0046;LATIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;0066;
+0047;LATIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;0067;
+0048;LATIN CAPITAL LETTER H;Lu;0;L;;;;;N;;;;0068;
+0049;LATIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;0069;
+004A;LATIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;006A;
+004B;LATIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;006B;
+004C;LATIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;006C;
+004D;LATIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;006D;
+004E;LATIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;006E;
+004F;LATIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;006F;
+0050;LATIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;0070;
+0051;LATIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;0071;
+0052;LATIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;0072;
+0053;LATIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;0073;
+0054;LATIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;0074;
+0055;LATIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0075;
+0056;LATIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;0076;
+0057;LATIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;0077;
+0058;LATIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;0078;
+0059;LATIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;0079;
+005A;LATIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;007A;
+005B;LEFT SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING SQUARE BRACKET;;;;
+005C;REVERSE SOLIDUS;Po;0;ON;;;;;N;BACKSLASH;;;;
+005D;RIGHT SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING SQUARE BRACKET;;;;
+005E;CIRCUMFLEX ACCENT;Sk;0;ON;;;;;N;SPACING CIRCUMFLEX;;;;
+005F;LOW LINE;Pc;0;ON;;;;;N;SPACING UNDERSCORE;;;;
+0060;GRAVE ACCENT;Sk;0;ON;;;;;N;SPACING GRAVE;;;;
+0061;LATIN SMALL LETTER A;Ll;0;L;;;;;N;;;0041;;0041
+0062;LATIN SMALL LETTER B;Ll;0;L;;;;;N;;;0042;;0042
+0063;LATIN SMALL LETTER C;Ll;0;L;;;;;N;;;0043;;0043
+0064;LATIN SMALL LETTER D;Ll;0;L;;;;;N;;;0044;;0044
+0065;LATIN SMALL LETTER E;Ll;0;L;;;;;N;;;0045;;0045
+0066;LATIN SMALL LETTER F;Ll;0;L;;;;;N;;;0046;;0046
+0067;LATIN SMALL LETTER G;Ll;0;L;;;;;N;;;0047;;0047
+0068;LATIN SMALL LETTER H;Ll;0;L;;;;;N;;;0048;;0048
+0069;LATIN SMALL LETTER I;Ll;0;L;;;;;N;;;0049;;0049
+006A;LATIN SMALL LETTER J;Ll;0;L;;;;;N;;;004A;;004A
+006B;LATIN SMALL LETTER K;Ll;0;L;;;;;N;;;004B;;004B
+006C;LATIN SMALL LETTER L;Ll;0;L;;;;;N;;;004C;;004C
+006D;LATIN SMALL LETTER M;Ll;0;L;;;;;N;;;004D;;004D
+006E;LATIN SMALL LETTER N;Ll;0;L;;;;;N;;;004E;;004E
+006F;LATIN SMALL LETTER O;Ll;0;L;;;;;N;;;004F;;004F
+0070;LATIN SMALL LETTER P;Ll;0;L;;;;;N;;;0050;;0050
+0071;LATIN SMALL LETTER Q;Ll;0;L;;;;;N;;;0051;;0051
+0072;LATIN SMALL LETTER R;Ll;0;L;;;;;N;;;0052;;0052
+0073;LATIN SMALL LETTER S;Ll;0;L;;;;;N;;;0053;;0053
+0074;LATIN SMALL LETTER T;Ll;0;L;;;;;N;;;0054;;0054
+0075;LATIN SMALL LETTER U;Ll;0;L;;;;;N;;;0055;;0055
+0076;LATIN SMALL LETTER V;Ll;0;L;;;;;N;;;0056;;0056
+0077;LATIN SMALL LETTER W;Ll;0;L;;;;;N;;;0057;;0057
+0078;LATIN SMALL LETTER X;Ll;0;L;;;;;N;;;0058;;0058
+0079;LATIN SMALL LETTER Y;Ll;0;L;;;;;N;;;0059;;0059
+007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A
+007B;LEFT CURLY BRACKET;Ps;0;ON;;;;;Y;OPENING CURLY BRACKET;;;;
+007C;VERTICAL LINE;Sm;0;ON;;;;;N;VERTICAL BAR;;;;
+007D;RIGHT CURLY BRACKET;Pe;0;ON;;;;;Y;CLOSING CURLY BRACKET;;;;
+007E;TILDE;Sm;0;ON;;;;;N;;;;;
+007F;<control>;Cc;0;BN;;;;;N;DELETE;;;;
+0080;<control>;Cc;0;BN;;;;;N;;;;;
+0081;<control>;Cc;0;BN;;;;;N;;;;;
+0082;<control>;Cc;0;BN;;;;;N;BREAK PERMITTED HERE;;;;
+0083;<control>;Cc;0;BN;;;;;N;NO BREAK HERE;;;;
+0084;<control>;Cc;0;BN;;;;;N;;;;;
+0085;<control>;Cc;0;B;;;;;N;NEXT LINE (NEL);;;;
+0086;<control>;Cc;0;BN;;;;;N;START OF SELECTED AREA;;;;
+0087;<control>;Cc;0;BN;;;;;N;END OF SELECTED AREA;;;;
+0088;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION SET;;;;
+0089;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION WITH JUSTIFICATION;;;;
+008A;<control>;Cc;0;BN;;;;;N;LINE TABULATION SET;;;;
+008B;<control>;Cc;0;BN;;;;;N;PARTIAL LINE FORWARD;;;;
+008C;<control>;Cc;0;BN;;;;;N;PARTIAL LINE BACKWARD;;;;
+008D;<control>;Cc;0;BN;;;;;N;REVERSE LINE FEED;;;;
+008E;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT TWO;;;;
+008F;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT THREE;;;;
+0090;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL STRING;;;;
+0091;<control>;Cc;0;BN;;;;;N;PRIVATE USE ONE;;;;
+0092;<control>;Cc;0;BN;;;;;N;PRIVATE USE TWO;;;;
+0093;<control>;Cc;0;BN;;;;;N;SET TRANSMIT STATE;;;;
+0094;<control>;Cc;0;BN;;;;;N;CANCEL CHARACTER;;;;
+0095;<control>;Cc;0;BN;;;;;N;MESSAGE WAITING;;;;
+0096;<control>;Cc;0;BN;;;;;N;START OF GUARDED AREA;;;;
+0097;<control>;Cc;0;BN;;;;;N;END OF GUARDED AREA;;;;
+0098;<control>;Cc;0;BN;;;;;N;START OF STRING;;;;
+0099;<control>;Cc;0;BN;;;;;N;;;;;
+009A;<control>;Cc;0;BN;;;;;N;SINGLE CHARACTER INTRODUCER;;;;
+009B;<control>;Cc;0;BN;;;;;N;CONTROL SEQUENCE INTRODUCER;;;;
+009C;<control>;Cc;0;BN;;;;;N;STRING TERMINATOR;;;;
+009D;<control>;Cc;0;BN;;;;;N;OPERATING SYSTEM COMMAND;;;;
+009E;<control>;Cc;0;BN;;;;;N;PRIVACY MESSAGE;;;;
+009F;<control>;Cc;0;BN;;;;;N;APPLICATION PROGRAM COMMAND;;;;
+00A0;NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
+00A1;INVERTED EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+00A2;CENT SIGN;Sc;0;ET;;;;;N;;;;;
+00A3;POUND SIGN;Sc;0;ET;;;;;N;;;;;
+00A4;CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+00A5;YEN SIGN;Sc;0;ET;;;;;N;;;;;
+00A6;BROKEN BAR;So;0;ON;;;;;N;BROKEN VERTICAL BAR;;;;
+00A7;SECTION SIGN;Po;0;ON;;;;;N;;;;;
+00A8;DIAERESIS;Sk;0;ON;<compat> 0020 0308;;;;N;SPACING DIAERESIS;;;;
+00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;;
+00AA;FEMININE ORDINAL INDICATOR;Lo;0;L;<super> 0061;;;;N;;;;;
+00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;;;;
+00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;;
+00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;;
+00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;;
+00AF;MACRON;Sk;0;ON;<compat> 0020 0304;;;;N;SPACING MACRON;;;;
+00B0;DEGREE SIGN;So;0;ET;;;;;N;;;;;
+00B1;PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;;
+00B2;SUPERSCRIPT TWO;No;0;EN;<super> 0032;;2;2;N;SUPERSCRIPT DIGIT TWO;;;;
+00B3;SUPERSCRIPT THREE;No;0;EN;<super> 0033;;3;3;N;SUPERSCRIPT DIGIT THREE;;;;
+00B4;ACUTE ACCENT;Sk;0;ON;<compat> 0020 0301;;;;N;SPACING ACUTE;;;;
+00B5;MICRO SIGN;Ll;0;L;<compat> 03BC;;;;N;;;039C;;039C
+00B6;PILCROW SIGN;Po;0;ON;;;;;N;PARAGRAPH SIGN;;;;
+00B7;MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+00B8;CEDILLA;Sk;0;ON;<compat> 0020 0327;;;;N;SPACING CEDILLA;;;;
+00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
+00BA;MASCULINE ORDINAL INDICATOR;Lo;0;L;<super> 006F;;;;N;;;;;
+00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;;;;
+00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
+00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
+00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
+00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0;
+00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1;
+00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2;
+00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
+00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
+00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5;
+00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;;;00E6;
+00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7;
+00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8;
+00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9;
+00CA;LATIN CAPITAL LETTER E WITH CIRCUMFLEX;Lu;0;L;0045 0302;;;;N;LATIN CAPITAL LETTER E CIRCUMFLEX;;;00EA;
+00CB;LATIN CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;0045 0308;;;;N;LATIN CAPITAL LETTER E DIAERESIS;;;00EB;
+00CC;LATIN CAPITAL LETTER I WITH GRAVE;Lu;0;L;0049 0300;;;;N;LATIN CAPITAL LETTER I GRAVE;;;00EC;
+00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED;
+00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE;
+00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF;
+00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;00F0;
+00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1;
+00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2;
+00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3;
+00D4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX;Lu;0;L;004F 0302;;;;N;LATIN CAPITAL LETTER O CIRCUMFLEX;;;00F4;
+00D5;LATIN CAPITAL LETTER O WITH TILDE;Lu;0;L;004F 0303;;;;N;LATIN CAPITAL LETTER O TILDE;;;00F5;
+00D6;LATIN CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;004F 0308;;;;N;LATIN CAPITAL LETTER O DIAERESIS;;;00F6;
+00D7;MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;;
+00D8;LATIN CAPITAL LETTER O WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O SLASH;;;00F8;
+00D9;LATIN CAPITAL LETTER U WITH GRAVE;Lu;0;L;0055 0300;;;;N;LATIN CAPITAL LETTER U GRAVE;;;00F9;
+00DA;LATIN CAPITAL LETTER U WITH ACUTE;Lu;0;L;0055 0301;;;;N;LATIN CAPITAL LETTER U ACUTE;;;00FA;
+00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB;
+00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC;
+00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD;
+00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;;;00FE;
+00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;;;;
+00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0
+00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1
+00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2
+00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3
+00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4
+00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5
+00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;;00C6;;00C6
+00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7
+00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8
+00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9
+00EA;LATIN SMALL LETTER E WITH CIRCUMFLEX;Ll;0;L;0065 0302;;;;N;LATIN SMALL LETTER E CIRCUMFLEX;;00CA;;00CA
+00EB;LATIN SMALL LETTER E WITH DIAERESIS;Ll;0;L;0065 0308;;;;N;LATIN SMALL LETTER E DIAERESIS;;00CB;;00CB
+00EC;LATIN SMALL LETTER I WITH GRAVE;Ll;0;L;0069 0300;;;;N;LATIN SMALL LETTER I GRAVE;;00CC;;00CC
+00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD
+00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE
+00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF
+00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;;00D0;;00D0
+00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1
+00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2
+00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3
+00F4;LATIN SMALL LETTER O WITH CIRCUMFLEX;Ll;0;L;006F 0302;;;;N;LATIN SMALL LETTER O CIRCUMFLEX;;00D4;;00D4
+00F5;LATIN SMALL LETTER O WITH TILDE;Ll;0;L;006F 0303;;;;N;LATIN SMALL LETTER O TILDE;;00D5;;00D5
+00F6;LATIN SMALL LETTER O WITH DIAERESIS;Ll;0;L;006F 0308;;;;N;LATIN SMALL LETTER O DIAERESIS;;00D6;;00D6
+00F7;DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+00F8;LATIN SMALL LETTER O WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER O SLASH;;00D8;;00D8
+00F9;LATIN SMALL LETTER U WITH GRAVE;Ll;0;L;0075 0300;;;;N;LATIN SMALL LETTER U GRAVE;;00D9;;00D9
+00FA;LATIN SMALL LETTER U WITH ACUTE;Ll;0;L;0075 0301;;;;N;LATIN SMALL LETTER U ACUTE;;00DA;;00DA
+00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB
+00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC
+00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD
+00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;;00DE;;00DE
+00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178
+0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
+0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100
+0102;LATIN CAPITAL LETTER A WITH BREVE;Lu;0;L;0041 0306;;;;N;LATIN CAPITAL LETTER A BREVE;;;0103;
+0103;LATIN SMALL LETTER A WITH BREVE;Ll;0;L;0061 0306;;;;N;LATIN SMALL LETTER A BREVE;;0102;;0102
+0104;LATIN CAPITAL LETTER A WITH OGONEK;Lu;0;L;0041 0328;;;;N;LATIN CAPITAL LETTER A OGONEK;;;0105;
+0105;LATIN SMALL LETTER A WITH OGONEK;Ll;0;L;0061 0328;;;;N;LATIN SMALL LETTER A OGONEK;;0104;;0104
+0106;LATIN CAPITAL LETTER C WITH ACUTE;Lu;0;L;0043 0301;;;;N;LATIN CAPITAL LETTER C ACUTE;;;0107;
+0107;LATIN SMALL LETTER C WITH ACUTE;Ll;0;L;0063 0301;;;;N;LATIN SMALL LETTER C ACUTE;;0106;;0106
+0108;LATIN CAPITAL LETTER C WITH CIRCUMFLEX;Lu;0;L;0043 0302;;;;N;LATIN CAPITAL LETTER C CIRCUMFLEX;;;0109;
+0109;LATIN SMALL LETTER C WITH CIRCUMFLEX;Ll;0;L;0063 0302;;;;N;LATIN SMALL LETTER C CIRCUMFLEX;;0108;;0108
+010A;LATIN CAPITAL LETTER C WITH DOT ABOVE;Lu;0;L;0043 0307;;;;N;LATIN CAPITAL LETTER C DOT;;;010B;
+010B;LATIN SMALL LETTER C WITH DOT ABOVE;Ll;0;L;0063 0307;;;;N;LATIN SMALL LETTER C DOT;;010A;;010A
+010C;LATIN CAPITAL LETTER C WITH CARON;Lu;0;L;0043 030C;;;;N;LATIN CAPITAL LETTER C HACEK;;;010D;
+010D;LATIN SMALL LETTER C WITH CARON;Ll;0;L;0063 030C;;;;N;LATIN SMALL LETTER C HACEK;;010C;;010C
+010E;LATIN CAPITAL LETTER D WITH CARON;Lu;0;L;0044 030C;;;;N;LATIN CAPITAL LETTER D HACEK;;;010F;
+010F;LATIN SMALL LETTER D WITH CARON;Ll;0;L;0064 030C;;;;N;LATIN SMALL LETTER D HACEK;;010E;;010E
+0110;LATIN CAPITAL LETTER D WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D BAR;;;0111;
+0111;LATIN SMALL LETTER D WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER D BAR;;0110;;0110
+0112;LATIN CAPITAL LETTER E WITH MACRON;Lu;0;L;0045 0304;;;;N;LATIN CAPITAL LETTER E MACRON;;;0113;
+0113;LATIN SMALL LETTER E WITH MACRON;Ll;0;L;0065 0304;;;;N;LATIN SMALL LETTER E MACRON;;0112;;0112
+0114;LATIN CAPITAL LETTER E WITH BREVE;Lu;0;L;0045 0306;;;;N;LATIN CAPITAL LETTER E BREVE;;;0115;
+0115;LATIN SMALL LETTER E WITH BREVE;Ll;0;L;0065 0306;;;;N;LATIN SMALL LETTER E BREVE;;0114;;0114
+0116;LATIN CAPITAL LETTER E WITH DOT ABOVE;Lu;0;L;0045 0307;;;;N;LATIN CAPITAL LETTER E DOT;;;0117;
+0117;LATIN SMALL LETTER E WITH DOT ABOVE;Ll;0;L;0065 0307;;;;N;LATIN SMALL LETTER E DOT;;0116;;0116
+0118;LATIN CAPITAL LETTER E WITH OGONEK;Lu;0;L;0045 0328;;;;N;LATIN CAPITAL LETTER E OGONEK;;;0119;
+0119;LATIN SMALL LETTER E WITH OGONEK;Ll;0;L;0065 0328;;;;N;LATIN SMALL LETTER E OGONEK;;0118;;0118
+011A;LATIN CAPITAL LETTER E WITH CARON;Lu;0;L;0045 030C;;;;N;LATIN CAPITAL LETTER E HACEK;;;011B;
+011B;LATIN SMALL LETTER E WITH CARON;Ll;0;L;0065 030C;;;;N;LATIN SMALL LETTER E HACEK;;011A;;011A
+011C;LATIN CAPITAL LETTER G WITH CIRCUMFLEX;Lu;0;L;0047 0302;;;;N;LATIN CAPITAL LETTER G CIRCUMFLEX;;;011D;
+011D;LATIN SMALL LETTER G WITH CIRCUMFLEX;Ll;0;L;0067 0302;;;;N;LATIN SMALL LETTER G CIRCUMFLEX;;011C;;011C
+011E;LATIN CAPITAL LETTER G WITH BREVE;Lu;0;L;0047 0306;;;;N;LATIN CAPITAL LETTER G BREVE;;;011F;
+011F;LATIN SMALL LETTER G WITH BREVE;Ll;0;L;0067 0306;;;;N;LATIN SMALL LETTER G BREVE;;011E;;011E
+0120;LATIN CAPITAL LETTER G WITH DOT ABOVE;Lu;0;L;0047 0307;;;;N;LATIN CAPITAL LETTER G DOT;;;0121;
+0121;LATIN SMALL LETTER G WITH DOT ABOVE;Ll;0;L;0067 0307;;;;N;LATIN SMALL LETTER G DOT;;0120;;0120
+0122;LATIN CAPITAL LETTER G WITH CEDILLA;Lu;0;L;0047 0327;;;;N;LATIN CAPITAL LETTER G CEDILLA;;;0123;
+0123;LATIN SMALL LETTER G WITH CEDILLA;Ll;0;L;0067 0327;;;;N;LATIN SMALL LETTER G CEDILLA;;0122;;0122
+0124;LATIN CAPITAL LETTER H WITH CIRCUMFLEX;Lu;0;L;0048 0302;;;;N;LATIN CAPITAL LETTER H CIRCUMFLEX;;;0125;
+0125;LATIN SMALL LETTER H WITH CIRCUMFLEX;Ll;0;L;0068 0302;;;;N;LATIN SMALL LETTER H CIRCUMFLEX;;0124;;0124
+0126;LATIN CAPITAL LETTER H WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER H BAR;;;0127;
+0127;LATIN SMALL LETTER H WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER H BAR;;0126;;0126
+0128;LATIN CAPITAL LETTER I WITH TILDE;Lu;0;L;0049 0303;;;;N;LATIN CAPITAL LETTER I TILDE;;;0129;
+0129;LATIN SMALL LETTER I WITH TILDE;Ll;0;L;0069 0303;;;;N;LATIN SMALL LETTER I TILDE;;0128;;0128
+012A;LATIN CAPITAL LETTER I WITH MACRON;Lu;0;L;0049 0304;;;;N;LATIN CAPITAL LETTER I MACRON;;;012B;
+012B;LATIN SMALL LETTER I WITH MACRON;Ll;0;L;0069 0304;;;;N;LATIN SMALL LETTER I MACRON;;012A;;012A
+012C;LATIN CAPITAL LETTER I WITH BREVE;Lu;0;L;0049 0306;;;;N;LATIN CAPITAL LETTER I BREVE;;;012D;
+012D;LATIN SMALL LETTER I WITH BREVE;Ll;0;L;0069 0306;;;;N;LATIN SMALL LETTER I BREVE;;012C;;012C
+012E;LATIN CAPITAL LETTER I WITH OGONEK;Lu;0;L;0049 0328;;;;N;LATIN CAPITAL LETTER I OGONEK;;;012F;
+012F;LATIN SMALL LETTER I WITH OGONEK;Ll;0;L;0069 0328;;;;N;LATIN SMALL LETTER I OGONEK;;012E;;012E
+0130;LATIN CAPITAL LETTER I WITH DOT ABOVE;Lu;0;L;0049 0307;;;;N;LATIN CAPITAL LETTER I DOT;;;0069;
+0131;LATIN SMALL LETTER DOTLESS I;Ll;0;L;;;;;N;;;0049;;0049
+0132;LATIN CAPITAL LIGATURE IJ;Lu;0;L;<compat> 0049 004A;;;;N;LATIN CAPITAL LETTER I J;;;0133;
+0133;LATIN SMALL LIGATURE IJ;Ll;0;L;<compat> 0069 006A;;;;N;LATIN SMALL LETTER I J;;0132;;0132
+0134;LATIN CAPITAL LETTER J WITH CIRCUMFLEX;Lu;0;L;004A 0302;;;;N;LATIN CAPITAL LETTER J CIRCUMFLEX;;;0135;
+0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134
+0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137;
+0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136
+0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;;;;
+0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A;
+013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139
+013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C;
+013C;LATIN SMALL LETTER L WITH CEDILLA;Ll;0;L;006C 0327;;;;N;LATIN SMALL LETTER L CEDILLA;;013B;;013B
+013D;LATIN CAPITAL LETTER L WITH CARON;Lu;0;L;004C 030C;;;;N;LATIN CAPITAL LETTER L HACEK;;;013E;
+013E;LATIN SMALL LETTER L WITH CARON;Ll;0;L;006C 030C;;;;N;LATIN SMALL LETTER L HACEK;;013D;;013D
+013F;LATIN CAPITAL LETTER L WITH MIDDLE DOT;Lu;0;L;<compat> 004C 00B7;;;;N;;;;0140;
+0140;LATIN SMALL LETTER L WITH MIDDLE DOT;Ll;0;L;<compat> 006C 00B7;;;;N;;;013F;;013F
+0141;LATIN CAPITAL LETTER L WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER L SLASH;;;0142;
+0142;LATIN SMALL LETTER L WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER L SLASH;;0141;;0141
+0143;LATIN CAPITAL LETTER N WITH ACUTE;Lu;0;L;004E 0301;;;;N;LATIN CAPITAL LETTER N ACUTE;;;0144;
+0144;LATIN SMALL LETTER N WITH ACUTE;Ll;0;L;006E 0301;;;;N;LATIN SMALL LETTER N ACUTE;;0143;;0143
+0145;LATIN CAPITAL LETTER N WITH CEDILLA;Lu;0;L;004E 0327;;;;N;LATIN CAPITAL LETTER N CEDILLA;;;0146;
+0146;LATIN SMALL LETTER N WITH CEDILLA;Ll;0;L;006E 0327;;;;N;LATIN SMALL LETTER N CEDILLA;;0145;;0145
+0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148;
+0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147
+0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L;<compat> 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;;
+014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;014B;
+014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;;014A;;014A
+014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D;
+014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C
+014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F;
+014F;LATIN SMALL LETTER O WITH BREVE;Ll;0;L;006F 0306;;;;N;LATIN SMALL LETTER O BREVE;;014E;;014E
+0150;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE;Lu;0;L;004F 030B;;;;N;LATIN CAPITAL LETTER O DOUBLE ACUTE;;;0151;
+0151;LATIN SMALL LETTER O WITH DOUBLE ACUTE;Ll;0;L;006F 030B;;;;N;LATIN SMALL LETTER O DOUBLE ACUTE;;0150;;0150
+0152;LATIN CAPITAL LIGATURE OE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O E;;;0153;
+0153;LATIN SMALL LIGATURE OE;Ll;0;L;;;;;N;LATIN SMALL LETTER O E;;0152;;0152
+0154;LATIN CAPITAL LETTER R WITH ACUTE;Lu;0;L;0052 0301;;;;N;LATIN CAPITAL LETTER R ACUTE;;;0155;
+0155;LATIN SMALL LETTER R WITH ACUTE;Ll;0;L;0072 0301;;;;N;LATIN SMALL LETTER R ACUTE;;0154;;0154
+0156;LATIN CAPITAL LETTER R WITH CEDILLA;Lu;0;L;0052 0327;;;;N;LATIN CAPITAL LETTER R CEDILLA;;;0157;
+0157;LATIN SMALL LETTER R WITH CEDILLA;Ll;0;L;0072 0327;;;;N;LATIN SMALL LETTER R CEDILLA;;0156;;0156
+0158;LATIN CAPITAL LETTER R WITH CARON;Lu;0;L;0052 030C;;;;N;LATIN CAPITAL LETTER R HACEK;;;0159;
+0159;LATIN SMALL LETTER R WITH CARON;Ll;0;L;0072 030C;;;;N;LATIN SMALL LETTER R HACEK;;0158;;0158
+015A;LATIN CAPITAL LETTER S WITH ACUTE;Lu;0;L;0053 0301;;;;N;LATIN CAPITAL LETTER S ACUTE;;;015B;
+015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A
+015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D;
+015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C
+015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;;;015F;
+015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;;015E;;015E
+0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161;
+0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160
+0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;;;0163;
+0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;;0162;;0162
+0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165;
+0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164
+0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167;
+0167;LATIN SMALL LETTER T WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER T BAR;;0166;;0166
+0168;LATIN CAPITAL LETTER U WITH TILDE;Lu;0;L;0055 0303;;;;N;LATIN CAPITAL LETTER U TILDE;;;0169;
+0169;LATIN SMALL LETTER U WITH TILDE;Ll;0;L;0075 0303;;;;N;LATIN SMALL LETTER U TILDE;;0168;;0168
+016A;LATIN CAPITAL LETTER U WITH MACRON;Lu;0;L;0055 0304;;;;N;LATIN CAPITAL LETTER U MACRON;;;016B;
+016B;LATIN SMALL LETTER U WITH MACRON;Ll;0;L;0075 0304;;;;N;LATIN SMALL LETTER U MACRON;;016A;;016A
+016C;LATIN CAPITAL LETTER U WITH BREVE;Lu;0;L;0055 0306;;;;N;LATIN CAPITAL LETTER U BREVE;;;016D;
+016D;LATIN SMALL LETTER U WITH BREVE;Ll;0;L;0075 0306;;;;N;LATIN SMALL LETTER U BREVE;;016C;;016C
+016E;LATIN CAPITAL LETTER U WITH RING ABOVE;Lu;0;L;0055 030A;;;;N;LATIN CAPITAL LETTER U RING;;;016F;
+016F;LATIN SMALL LETTER U WITH RING ABOVE;Ll;0;L;0075 030A;;;;N;LATIN SMALL LETTER U RING;;016E;;016E
+0170;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0055 030B;;;;N;LATIN CAPITAL LETTER U DOUBLE ACUTE;;;0171;
+0171;LATIN SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0075 030B;;;;N;LATIN SMALL LETTER U DOUBLE ACUTE;;0170;;0170
+0172;LATIN CAPITAL LETTER U WITH OGONEK;Lu;0;L;0055 0328;;;;N;LATIN CAPITAL LETTER U OGONEK;;;0173;
+0173;LATIN SMALL LETTER U WITH OGONEK;Ll;0;L;0075 0328;;;;N;LATIN SMALL LETTER U OGONEK;;0172;;0172
+0174;LATIN CAPITAL LETTER W WITH CIRCUMFLEX;Lu;0;L;0057 0302;;;;N;LATIN CAPITAL LETTER W CIRCUMFLEX;;;0175;
+0175;LATIN SMALL LETTER W WITH CIRCUMFLEX;Ll;0;L;0077 0302;;;;N;LATIN SMALL LETTER W CIRCUMFLEX;;0174;;0174
+0176;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX;Lu;0;L;0059 0302;;;;N;LATIN CAPITAL LETTER Y CIRCUMFLEX;;;0177;
+0177;LATIN SMALL LETTER Y WITH CIRCUMFLEX;Ll;0;L;0079 0302;;;;N;LATIN SMALL LETTER Y CIRCUMFLEX;;0176;;0176
+0178;LATIN CAPITAL LETTER Y WITH DIAERESIS;Lu;0;L;0059 0308;;;;N;LATIN CAPITAL LETTER Y DIAERESIS;;;00FF;
+0179;LATIN CAPITAL LETTER Z WITH ACUTE;Lu;0;L;005A 0301;;;;N;LATIN CAPITAL LETTER Z ACUTE;;;017A;
+017A;LATIN SMALL LETTER Z WITH ACUTE;Ll;0;L;007A 0301;;;;N;LATIN SMALL LETTER Z ACUTE;;0179;;0179
+017B;LATIN CAPITAL LETTER Z WITH DOT ABOVE;Lu;0;L;005A 0307;;;;N;LATIN CAPITAL LETTER Z DOT;;;017C;
+017C;LATIN SMALL LETTER Z WITH DOT ABOVE;Ll;0;L;007A 0307;;;;N;LATIN SMALL LETTER Z DOT;;017B;;017B
+017D;LATIN CAPITAL LETTER Z WITH CARON;Lu;0;L;005A 030C;;;;N;LATIN CAPITAL LETTER Z HACEK;;;017E;
+017E;LATIN SMALL LETTER Z WITH CARON;Ll;0;L;007A 030C;;;;N;LATIN SMALL LETTER Z HACEK;;017D;;017D
+017F;LATIN SMALL LETTER LONG S;Ll;0;L;<compat> 0073;;;;N;;;0053;;0053
+0180;LATIN SMALL LETTER B WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER B BAR;;0243;;0243
+0181;LATIN CAPITAL LETTER B WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B HOOK;;;0253;
+0182;LATIN CAPITAL LETTER B WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B TOPBAR;;;0183;
+0183;LATIN SMALL LETTER B WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER B TOPBAR;;0182;;0182
+0184;LATIN CAPITAL LETTER TONE SIX;Lu;0;L;;;;;N;;;;0185;
+0185;LATIN SMALL LETTER TONE SIX;Ll;0;L;;;;;N;;;0184;;0184
+0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254;
+0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188;
+0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187
+0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;;;0256;
+018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257;
+018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C;
+018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B
+018D;LATIN SMALL LETTER TURNED DELTA;Ll;0;L;;;;;N;;;;;
+018E;LATIN CAPITAL LETTER REVERSED E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER TURNED E;;;01DD;
+018F;LATIN CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;0259;
+0190;LATIN CAPITAL LETTER OPEN E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER EPSILON;;;025B;
+0191;LATIN CAPITAL LETTER F WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER F HOOK;;;0192;
+0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191
+0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260;
+0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263;
+0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;;01F6;;01F6
+0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269;
+0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268;
+0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199;
+0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198
+019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D
+019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;;
+019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F;
+019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272;
+019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220
+019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;;;0275;
+01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1;
+01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0
+01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;;;01A3;
+01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;;01A2;;01A2
+01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5;
+01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4
+01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;;;0280;
+01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8;
+01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7
+01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283;
+01AA;LATIN LETTER REVERSED ESH LOOP;Ll;0;L;;;;;N;;;;;
+01AB;LATIN SMALL LETTER T WITH PALATAL HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T PALATAL HOOK;;;;
+01AC;LATIN CAPITAL LETTER T WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T HOOK;;;01AD;
+01AD;LATIN SMALL LETTER T WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T HOOK;;01AC;;01AC
+01AE;LATIN CAPITAL LETTER T WITH RETROFLEX HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T RETROFLEX HOOK;;;0288;
+01AF;LATIN CAPITAL LETTER U WITH HORN;Lu;0;L;0055 031B;;;;N;LATIN CAPITAL LETTER U HORN;;;01B0;
+01B0;LATIN SMALL LETTER U WITH HORN;Ll;0;L;0075 031B;;;;N;LATIN SMALL LETTER U HORN;;01AF;;01AF
+01B1;LATIN CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;028A;
+01B2;LATIN CAPITAL LETTER V WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER SCRIPT V;;;028B;
+01B3;LATIN CAPITAL LETTER Y WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Y HOOK;;;01B4;
+01B4;LATIN SMALL LETTER Y WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Y HOOK;;01B3;;01B3
+01B5;LATIN CAPITAL LETTER Z WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Z BAR;;;01B6;
+01B6;LATIN SMALL LETTER Z WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER Z BAR;;01B5;;01B5
+01B7;LATIN CAPITAL LETTER EZH;Lu;0;L;;;;;N;LATIN CAPITAL LETTER YOGH;;;0292;
+01B8;LATIN CAPITAL LETTER EZH REVERSED;Lu;0;L;;;;;N;LATIN CAPITAL LETTER REVERSED YOGH;;;01B9;
+01B9;LATIN SMALL LETTER EZH REVERSED;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED YOGH;;01B8;;01B8
+01BA;LATIN SMALL LETTER EZH WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH WITH TAIL;;;;
+01BB;LATIN LETTER TWO WITH STROKE;Lo;0;L;;;;;N;LATIN LETTER TWO BAR;;;;
+01BC;LATIN CAPITAL LETTER TONE FIVE;Lu;0;L;;;;;N;;;;01BD;
+01BD;LATIN SMALL LETTER TONE FIVE;Ll;0;L;;;;;N;;;01BC;;01BC
+01BE;LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER INVERTED GLOTTAL STOP BAR;;;;
+01BF;LATIN LETTER WYNN;Ll;0;L;;;;;N;;;01F7;;01F7
+01C0;LATIN LETTER DENTAL CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE;;;;
+01C1;LATIN LETTER LATERAL CLICK;Lo;0;L;;;;;N;LATIN LETTER DOUBLE PIPE;;;;
+01C2;LATIN LETTER ALVEOLAR CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE DOUBLE BAR;;;;
+01C3;LATIN LETTER RETROFLEX CLICK;Lo;0;L;;;;;N;LATIN LETTER EXCLAMATION MARK;;;;
+01C4;LATIN CAPITAL LETTER DZ WITH CARON;Lu;0;L;<compat> 0044 017D;;;;N;LATIN CAPITAL LETTER D Z HACEK;;;01C6;01C5
+01C5;LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON;Lt;0;L;<compat> 0044 017E;;;;N;LATIN LETTER CAPITAL D SMALL Z HACEK;;01C4;01C6;01C5
+01C6;LATIN SMALL LETTER DZ WITH CARON;Ll;0;L;<compat> 0064 017E;;;;N;LATIN SMALL LETTER D Z HACEK;;01C4;;01C5
+01C7;LATIN CAPITAL LETTER LJ;Lu;0;L;<compat> 004C 004A;;;;N;LATIN CAPITAL LETTER L J;;;01C9;01C8
+01C8;LATIN CAPITAL LETTER L WITH SMALL LETTER J;Lt;0;L;<compat> 004C 006A;;;;N;LATIN LETTER CAPITAL L SMALL J;;01C7;01C9;01C8
+01C9;LATIN SMALL LETTER LJ;Ll;0;L;<compat> 006C 006A;;;;N;LATIN SMALL LETTER L J;;01C7;;01C8
+01CA;LATIN CAPITAL LETTER NJ;Lu;0;L;<compat> 004E 004A;;;;N;LATIN CAPITAL LETTER N J;;;01CC;01CB
+01CB;LATIN CAPITAL LETTER N WITH SMALL LETTER J;Lt;0;L;<compat> 004E 006A;;;;N;LATIN LETTER CAPITAL N SMALL J;;01CA;01CC;01CB
+01CC;LATIN SMALL LETTER NJ;Ll;0;L;<compat> 006E 006A;;;;N;LATIN SMALL LETTER N J;;01CA;;01CB
+01CD;LATIN CAPITAL LETTER A WITH CARON;Lu;0;L;0041 030C;;;;N;LATIN CAPITAL LETTER A HACEK;;;01CE;
+01CE;LATIN SMALL LETTER A WITH CARON;Ll;0;L;0061 030C;;;;N;LATIN SMALL LETTER A HACEK;;01CD;;01CD
+01CF;LATIN CAPITAL LETTER I WITH CARON;Lu;0;L;0049 030C;;;;N;LATIN CAPITAL LETTER I HACEK;;;01D0;
+01D0;LATIN SMALL LETTER I WITH CARON;Ll;0;L;0069 030C;;;;N;LATIN SMALL LETTER I HACEK;;01CF;;01CF
+01D1;LATIN CAPITAL LETTER O WITH CARON;Lu;0;L;004F 030C;;;;N;LATIN CAPITAL LETTER O HACEK;;;01D2;
+01D2;LATIN SMALL LETTER O WITH CARON;Ll;0;L;006F 030C;;;;N;LATIN SMALL LETTER O HACEK;;01D1;;01D1
+01D3;LATIN CAPITAL LETTER U WITH CARON;Lu;0;L;0055 030C;;;;N;LATIN CAPITAL LETTER U HACEK;;;01D4;
+01D4;LATIN SMALL LETTER U WITH CARON;Ll;0;L;0075 030C;;;;N;LATIN SMALL LETTER U HACEK;;01D3;;01D3
+01D5;LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON;Lu;0;L;00DC 0304;;;;N;LATIN CAPITAL LETTER U DIAERESIS MACRON;;;01D6;
+01D6;LATIN SMALL LETTER U WITH DIAERESIS AND MACRON;Ll;0;L;00FC 0304;;;;N;LATIN SMALL LETTER U DIAERESIS MACRON;;01D5;;01D5
+01D7;LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE;Lu;0;L;00DC 0301;;;;N;LATIN CAPITAL LETTER U DIAERESIS ACUTE;;;01D8;
+01D8;LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE;Ll;0;L;00FC 0301;;;;N;LATIN SMALL LETTER U DIAERESIS ACUTE;;01D7;;01D7
+01D9;LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON;Lu;0;L;00DC 030C;;;;N;LATIN CAPITAL LETTER U DIAERESIS HACEK;;;01DA;
+01DA;LATIN SMALL LETTER U WITH DIAERESIS AND CARON;Ll;0;L;00FC 030C;;;;N;LATIN SMALL LETTER U DIAERESIS HACEK;;01D9;;01D9
+01DB;LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE;Lu;0;L;00DC 0300;;;;N;LATIN CAPITAL LETTER U DIAERESIS GRAVE;;;01DC;
+01DC;LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE;Ll;0;L;00FC 0300;;;;N;LATIN SMALL LETTER U DIAERESIS GRAVE;;01DB;;01DB
+01DD;LATIN SMALL LETTER TURNED E;Ll;0;L;;;;;N;;;018E;;018E
+01DE;LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON;Lu;0;L;00C4 0304;;;;N;LATIN CAPITAL LETTER A DIAERESIS MACRON;;;01DF;
+01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE
+01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1;
+01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0
+01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;;;01E3;
+01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;;01E2;;01E2
+01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5;
+01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4
+01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7;
+01E7;LATIN SMALL LETTER G WITH CARON;Ll;0;L;0067 030C;;;;N;LATIN SMALL LETTER G HACEK;;01E6;;01E6
+01E8;LATIN CAPITAL LETTER K WITH CARON;Lu;0;L;004B 030C;;;;N;LATIN CAPITAL LETTER K HACEK;;;01E9;
+01E9;LATIN SMALL LETTER K WITH CARON;Ll;0;L;006B 030C;;;;N;LATIN SMALL LETTER K HACEK;;01E8;;01E8
+01EA;LATIN CAPITAL LETTER O WITH OGONEK;Lu;0;L;004F 0328;;;;N;LATIN CAPITAL LETTER O OGONEK;;;01EB;
+01EB;LATIN SMALL LETTER O WITH OGONEK;Ll;0;L;006F 0328;;;;N;LATIN SMALL LETTER O OGONEK;;01EA;;01EA
+01EC;LATIN CAPITAL LETTER O WITH OGONEK AND MACRON;Lu;0;L;01EA 0304;;;;N;LATIN CAPITAL LETTER O OGONEK MACRON;;;01ED;
+01ED;LATIN SMALL LETTER O WITH OGONEK AND MACRON;Ll;0;L;01EB 0304;;;;N;LATIN SMALL LETTER O OGONEK MACRON;;01EC;;01EC
+01EE;LATIN CAPITAL LETTER EZH WITH CARON;Lu;0;L;01B7 030C;;;;N;LATIN CAPITAL LETTER YOGH HACEK;;;01EF;
+01EF;LATIN SMALL LETTER EZH WITH CARON;Ll;0;L;0292 030C;;;;N;LATIN SMALL LETTER YOGH HACEK;;01EE;;01EE
+01F0;LATIN SMALL LETTER J WITH CARON;Ll;0;L;006A 030C;;;;N;LATIN SMALL LETTER J HACEK;;;;
+01F1;LATIN CAPITAL LETTER DZ;Lu;0;L;<compat> 0044 005A;;;;N;;;;01F3;01F2
+01F2;LATIN CAPITAL LETTER D WITH SMALL LETTER Z;Lt;0;L;<compat> 0044 007A;;;;N;;;01F1;01F3;01F2
+01F3;LATIN SMALL LETTER DZ;Ll;0;L;<compat> 0064 007A;;;;N;;;01F1;;01F2
+01F4;LATIN CAPITAL LETTER G WITH ACUTE;Lu;0;L;0047 0301;;;;N;;;;01F5;
+01F5;LATIN SMALL LETTER G WITH ACUTE;Ll;0;L;0067 0301;;;;N;;;01F4;;01F4
+01F6;LATIN CAPITAL LETTER HWAIR;Lu;0;L;;;;;N;;;;0195;
+01F7;LATIN CAPITAL LETTER WYNN;Lu;0;L;;;;;N;;;;01BF;
+01F8;LATIN CAPITAL LETTER N WITH GRAVE;Lu;0;L;004E 0300;;;;N;;;;01F9;
+01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8
+01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB;
+01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA
+01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;;;01FD;
+01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;;01FC;;01FC
+01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF;
+01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE
+0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201;
+0201;LATIN SMALL LETTER A WITH DOUBLE GRAVE;Ll;0;L;0061 030F;;;;N;;;0200;;0200
+0202;LATIN CAPITAL LETTER A WITH INVERTED BREVE;Lu;0;L;0041 0311;;;;N;;;;0203;
+0203;LATIN SMALL LETTER A WITH INVERTED BREVE;Ll;0;L;0061 0311;;;;N;;;0202;;0202
+0204;LATIN CAPITAL LETTER E WITH DOUBLE GRAVE;Lu;0;L;0045 030F;;;;N;;;;0205;
+0205;LATIN SMALL LETTER E WITH DOUBLE GRAVE;Ll;0;L;0065 030F;;;;N;;;0204;;0204
+0206;LATIN CAPITAL LETTER E WITH INVERTED BREVE;Lu;0;L;0045 0311;;;;N;;;;0207;
+0207;LATIN SMALL LETTER E WITH INVERTED BREVE;Ll;0;L;0065 0311;;;;N;;;0206;;0206
+0208;LATIN CAPITAL LETTER I WITH DOUBLE GRAVE;Lu;0;L;0049 030F;;;;N;;;;0209;
+0209;LATIN SMALL LETTER I WITH DOUBLE GRAVE;Ll;0;L;0069 030F;;;;N;;;0208;;0208
+020A;LATIN CAPITAL LETTER I WITH INVERTED BREVE;Lu;0;L;0049 0311;;;;N;;;;020B;
+020B;LATIN SMALL LETTER I WITH INVERTED BREVE;Ll;0;L;0069 0311;;;;N;;;020A;;020A
+020C;LATIN CAPITAL LETTER O WITH DOUBLE GRAVE;Lu;0;L;004F 030F;;;;N;;;;020D;
+020D;LATIN SMALL LETTER O WITH DOUBLE GRAVE;Ll;0;L;006F 030F;;;;N;;;020C;;020C
+020E;LATIN CAPITAL LETTER O WITH INVERTED BREVE;Lu;0;L;004F 0311;;;;N;;;;020F;
+020F;LATIN SMALL LETTER O WITH INVERTED BREVE;Ll;0;L;006F 0311;;;;N;;;020E;;020E
+0210;LATIN CAPITAL LETTER R WITH DOUBLE GRAVE;Lu;0;L;0052 030F;;;;N;;;;0211;
+0211;LATIN SMALL LETTER R WITH DOUBLE GRAVE;Ll;0;L;0072 030F;;;;N;;;0210;;0210
+0212;LATIN CAPITAL LETTER R WITH INVERTED BREVE;Lu;0;L;0052 0311;;;;N;;;;0213;
+0213;LATIN SMALL LETTER R WITH INVERTED BREVE;Ll;0;L;0072 0311;;;;N;;;0212;;0212
+0214;LATIN CAPITAL LETTER U WITH DOUBLE GRAVE;Lu;0;L;0055 030F;;;;N;;;;0215;
+0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214
+0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217;
+0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216
+0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;;;0219;
+0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;;0218;;0218
+021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;;;021B;
+021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;;021A;;021A
+021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D;
+021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C
+021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F;
+021F;LATIN SMALL LETTER H WITH CARON;Ll;0;L;0068 030C;;;;N;;;021E;;021E
+0220;LATIN CAPITAL LETTER N WITH LONG RIGHT LEG;Lu;0;L;;;;;N;;;;019E;
+0221;LATIN SMALL LETTER D WITH CURL;Ll;0;L;;;;;N;;;;;
+0222;LATIN CAPITAL LETTER OU;Lu;0;L;;;;;N;;;;0223;
+0223;LATIN SMALL LETTER OU;Ll;0;L;;;;;N;;;0222;;0222
+0224;LATIN CAPITAL LETTER Z WITH HOOK;Lu;0;L;;;;;N;;;;0225;
+0225;LATIN SMALL LETTER Z WITH HOOK;Ll;0;L;;;;;N;;;0224;;0224
+0226;LATIN CAPITAL LETTER A WITH DOT ABOVE;Lu;0;L;0041 0307;;;;N;;;;0227;
+0227;LATIN SMALL LETTER A WITH DOT ABOVE;Ll;0;L;0061 0307;;;;N;;;0226;;0226
+0228;LATIN CAPITAL LETTER E WITH CEDILLA;Lu;0;L;0045 0327;;;;N;;;;0229;
+0229;LATIN SMALL LETTER E WITH CEDILLA;Ll;0;L;0065 0327;;;;N;;;0228;;0228
+022A;LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON;Lu;0;L;00D6 0304;;;;N;;;;022B;
+022B;LATIN SMALL LETTER O WITH DIAERESIS AND MACRON;Ll;0;L;00F6 0304;;;;N;;;022A;;022A
+022C;LATIN CAPITAL LETTER O WITH TILDE AND MACRON;Lu;0;L;00D5 0304;;;;N;;;;022D;
+022D;LATIN SMALL LETTER O WITH TILDE AND MACRON;Ll;0;L;00F5 0304;;;;N;;;022C;;022C
+022E;LATIN CAPITAL LETTER O WITH DOT ABOVE;Lu;0;L;004F 0307;;;;N;;;;022F;
+022F;LATIN SMALL LETTER O WITH DOT ABOVE;Ll;0;L;006F 0307;;;;N;;;022E;;022E
+0230;LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON;Lu;0;L;022E 0304;;;;N;;;;0231;
+0231;LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON;Ll;0;L;022F 0304;;;;N;;;0230;;0230
+0232;LATIN CAPITAL LETTER Y WITH MACRON;Lu;0;L;0059 0304;;;;N;;;;0233;
+0233;LATIN SMALL LETTER Y WITH MACRON;Ll;0;L;0079 0304;;;;N;;;0232;;0232
+0234;LATIN SMALL LETTER L WITH CURL;Ll;0;L;;;;;N;;;;;
+0235;LATIN SMALL LETTER N WITH CURL;Ll;0;L;;;;;N;;;;;
+0236;LATIN SMALL LETTER T WITH CURL;Ll;0;L;;;;;N;;;;;
+0237;LATIN SMALL LETTER DOTLESS J;Ll;0;L;;;;;N;;;;;
+0238;LATIN SMALL LETTER DB DIGRAPH;Ll;0;L;;;;;N;;;;;
+0239;LATIN SMALL LETTER QP DIGRAPH;Ll;0;L;;;;;N;;;;;
+023A;LATIN CAPITAL LETTER A WITH STROKE;Lu;0;L;;;;;N;;;;2C65;
+023B;LATIN CAPITAL LETTER C WITH STROKE;Lu;0;L;;;;;N;;;;023C;
+023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B
+023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A;
+023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66;
+023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7E;;2C7E
+0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7F;;2C7F
+0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242;
+0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241
+0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180;
+0244;LATIN CAPITAL LETTER U BAR;Lu;0;L;;;;;N;;;;0289;
+0245;LATIN CAPITAL LETTER TURNED V;Lu;0;L;;;;;N;;;;028C;
+0246;LATIN CAPITAL LETTER E WITH STROKE;Lu;0;L;;;;;N;;;;0247;
+0247;LATIN SMALL LETTER E WITH STROKE;Ll;0;L;;;;;N;;;0246;;0246
+0248;LATIN CAPITAL LETTER J WITH STROKE;Lu;0;L;;;;;N;;;;0249;
+0249;LATIN SMALL LETTER J WITH STROKE;Ll;0;L;;;;;N;;;0248;;0248
+024A;LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL;Lu;0;L;;;;;N;;;;024B;
+024B;LATIN SMALL LETTER Q WITH HOOK TAIL;Ll;0;L;;;;;N;;;024A;;024A
+024C;LATIN CAPITAL LETTER R WITH STROKE;Lu;0;L;;;;;N;;;;024D;
+024D;LATIN SMALL LETTER R WITH STROKE;Ll;0;L;;;;;N;;;024C;;024C
+024E;LATIN CAPITAL LETTER Y WITH STROKE;Lu;0;L;;;;;N;;;;024F;
+024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E
+0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F
+0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D
+0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;2C70;;2C70
+0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181
+0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186
+0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;;
+0256;LATIN SMALL LETTER D WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER D RETROFLEX HOOK;;0189;;0189
+0257;LATIN SMALL LETTER D WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER D HOOK;;018A;;018A
+0258;LATIN SMALL LETTER REVERSED E;Ll;0;L;;;;;N;;;;;
+0259;LATIN SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;018F;;018F
+025A;LATIN SMALL LETTER SCHWA WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCHWA HOOK;;;;
+025B;LATIN SMALL LETTER OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER EPSILON;;0190;;0190
+025C;LATIN SMALL LETTER REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON;;A7AB;;A7AB
+025D;LATIN SMALL LETTER REVERSED OPEN E WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON HOOK;;;;
+025E;LATIN SMALL LETTER CLOSED REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED REVERSED EPSILON;;;;
+025F;LATIN SMALL LETTER DOTLESS J WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR;;;;
+0260;LATIN SMALL LETTER G WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER G HOOK;;0193;;0193
+0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;A7AC;;A7AC
+0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;;
+0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194
+0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;;
+0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;A78D;;A78D
+0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;A7AA;;A7AA
+0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;;
+0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197
+0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196
+026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;A7AE;;A7AE
+026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62
+026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;A7AD;;A7AD
+026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;;
+026E;LATIN SMALL LETTER LEZH;Ll;0;L;;;;;N;LATIN SMALL LETTER L YOGH;;;;
+026F;LATIN SMALL LETTER TURNED M;Ll;0;L;;;;;N;;;019C;;019C
+0270;LATIN SMALL LETTER TURNED M WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+0271;LATIN SMALL LETTER M WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER M HOOK;;2C6E;;2C6E
+0272;LATIN SMALL LETTER N WITH LEFT HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N HOOK;;019D;;019D
+0273;LATIN SMALL LETTER N WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N RETROFLEX HOOK;;;;
+0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;;
+0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F
+0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;;
+0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;;
+0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;;
+0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;;
+027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;;
+027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64
+027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;;
+027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;;
+0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;;01A6;;01A6
+0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;;
+0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;;;
+0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9
+0284;LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR HOOK;;;;
+0285;LATIN SMALL LETTER SQUAT REVERSED ESH;Ll;0;L;;;;;N;;;;;
+0286;LATIN SMALL LETTER ESH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER ESH CURL;;;;
+0287;LATIN SMALL LETTER TURNED T;Ll;0;L;;;;;N;;;A7B1;;A7B1
+0288;LATIN SMALL LETTER T WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T RETROFLEX HOOK;;01AE;;01AE
+0289;LATIN SMALL LETTER U BAR;Ll;0;L;;;;;N;;;0244;;0244
+028A;LATIN SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;01B1;;01B1
+028B;LATIN SMALL LETTER V WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT V;;01B2;;01B2
+028C;LATIN SMALL LETTER TURNED V;Ll;0;L;;;;;N;;;0245;;0245
+028D;LATIN SMALL LETTER TURNED W;Ll;0;L;;;;;N;;;;;
+028E;LATIN SMALL LETTER TURNED Y;Ll;0;L;;;;;N;;;;;
+028F;LATIN LETTER SMALL CAPITAL Y;Ll;0;L;;;;;N;;;;;
+0290;LATIN SMALL LETTER Z WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Z RETROFLEX HOOK;;;;
+0291;LATIN SMALL LETTER Z WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER Z CURL;;;;
+0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7
+0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;;
+0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
+0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;;
+0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;;
+0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;;
+0299;LATIN LETTER SMALL CAPITAL B;Ll;0;L;;;;;N;;;;;
+029A;LATIN SMALL LETTER CLOSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED EPSILON;;;;
+029B;LATIN LETTER SMALL CAPITAL G WITH HOOK;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL G HOOK;;;;
+029C;LATIN LETTER SMALL CAPITAL H;Ll;0;L;;;;;N;;;;;
+029D;LATIN SMALL LETTER J WITH CROSSED-TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER CROSSED-TAIL J;;A7B2;;A7B2
+029E;LATIN SMALL LETTER TURNED K;Ll;0;L;;;;;N;;;A7B0;;A7B0
+029F;LATIN LETTER SMALL CAPITAL L;Ll;0;L;;;;;N;;;;;
+02A0;LATIN SMALL LETTER Q WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Q HOOK;;;;
+02A1;LATIN LETTER GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER GLOTTAL STOP BAR;;;;
+02A2;LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP BAR;;;;
+02A3;LATIN SMALL LETTER DZ DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z;;;;
+02A4;LATIN SMALL LETTER DEZH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D YOGH;;;;
+02A5;LATIN SMALL LETTER DZ DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z CURL;;;;
+02A6;LATIN SMALL LETTER TS DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T S;;;;
+02A7;LATIN SMALL LETTER TESH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T ESH;;;;
+02A8;LATIN SMALL LETTER TC DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER T C CURL;;;;
+02A9;LATIN SMALL LETTER FENG DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AA;LATIN SMALL LETTER LS DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AB;LATIN SMALL LETTER LZ DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AC;LATIN LETTER BILABIAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AD;LATIN LETTER BIDENTAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AE;LATIN SMALL LETTER TURNED H WITH FISHHOOK;Ll;0;L;;;;;N;;;;;
+02AF;LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+02B0;MODIFIER LETTER SMALL H;Lm;0;L;<super> 0068;;;;N;;;;;
+02B1;MODIFIER LETTER SMALL H WITH HOOK;Lm;0;L;<super> 0266;;;;N;MODIFIER LETTER SMALL H HOOK;;;;
+02B2;MODIFIER LETTER SMALL J;Lm;0;L;<super> 006A;;;;N;;;;;
+02B3;MODIFIER LETTER SMALL R;Lm;0;L;<super> 0072;;;;N;;;;;
+02B4;MODIFIER LETTER SMALL TURNED R;Lm;0;L;<super> 0279;;;;N;;;;;
+02B5;MODIFIER LETTER SMALL TURNED R WITH HOOK;Lm;0;L;<super> 027B;;;;N;MODIFIER LETTER SMALL TURNED R HOOK;;;;
+02B6;MODIFIER LETTER SMALL CAPITAL INVERTED R;Lm;0;L;<super> 0281;;;;N;;;;;
+02B7;MODIFIER LETTER SMALL W;Lm;0;L;<super> 0077;;;;N;;;;;
+02B8;MODIFIER LETTER SMALL Y;Lm;0;L;<super> 0079;;;;N;;;;;
+02B9;MODIFIER LETTER PRIME;Lm;0;ON;;;;;N;;;;;
+02BA;MODIFIER LETTER DOUBLE PRIME;Lm;0;ON;;;;;N;;;;;
+02BB;MODIFIER LETTER TURNED COMMA;Lm;0;L;;;;;N;;;;;
+02BC;MODIFIER LETTER APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02BD;MODIFIER LETTER REVERSED COMMA;Lm;0;L;;;;;N;;;;;
+02BE;MODIFIER LETTER RIGHT HALF RING;Lm;0;L;;;;;N;;;;;
+02BF;MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+02C0;MODIFIER LETTER GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C1;MODIFIER LETTER REVERSED GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C2;MODIFIER LETTER LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C3;MODIFIER LETTER RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;;
+02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;;;;
+02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;;;;
+02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;;;;
+02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;;;;
+02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;;
+02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;;
+02CF;MODIFIER LETTER LOW ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW ACUTE;;;;
+02D0;MODIFIER LETTER TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D1;MODIFIER LETTER HALF TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D2;MODIFIER LETTER CENTRED RIGHT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED RIGHT HALF RING;;;;
+02D3;MODIFIER LETTER CENTRED LEFT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED LEFT HALF RING;;;;
+02D4;MODIFIER LETTER UP TACK;Sk;0;ON;;;;;N;;;;;
+02D5;MODIFIER LETTER DOWN TACK;Sk;0;ON;;;;;N;;;;;
+02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D8;BREVE;Sk;0;ON;<compat> 0020 0306;;;;N;SPACING BREVE;;;;
+02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;;;;
+02DA;RING ABOVE;Sk;0;ON;<compat> 0020 030A;;;;N;SPACING RING ABOVE;;;;
+02DB;OGONEK;Sk;0;ON;<compat> 0020 0328;;;;N;SPACING OGONEK;;;;
+02DC;SMALL TILDE;Sk;0;ON;<compat> 0020 0303;;;;N;SPACING TILDE;;;;
+02DD;DOUBLE ACUTE ACCENT;Sk;0;ON;<compat> 0020 030B;;;;N;SPACING DOUBLE ACUTE;;;;
+02DE;MODIFIER LETTER RHOTIC HOOK;Sk;0;ON;;;;;N;;;;;
+02DF;MODIFIER LETTER CROSS ACCENT;Sk;0;ON;;;;;N;;;;;
+02E0;MODIFIER LETTER SMALL GAMMA;Lm;0;L;<super> 0263;;;;N;;;;;
+02E1;MODIFIER LETTER SMALL L;Lm;0;L;<super> 006C;;;;N;;;;;
+02E2;MODIFIER LETTER SMALL S;Lm;0;L;<super> 0073;;;;N;;;;;
+02E3;MODIFIER LETTER SMALL X;Lm;0;L;<super> 0078;;;;N;;;;;
+02E4;MODIFIER LETTER SMALL REVERSED GLOTTAL STOP;Lm;0;L;<super> 0295;;;;N;;;;;
+02E5;MODIFIER LETTER EXTRA-HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E6;MODIFIER LETTER HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E7;MODIFIER LETTER MID TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E8;MODIFIER LETTER LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E9;MODIFIER LETTER EXTRA-LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02EA;MODIFIER LETTER YIN DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EB;MODIFIER LETTER YANG DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EC;MODIFIER LETTER VOICING;Lm;0;ON;;;;;N;;;;;
+02ED;MODIFIER LETTER UNASPIRATED;Sk;0;ON;;;;;N;;;;;
+02EE;MODIFIER LETTER DOUBLE APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02EF;MODIFIER LETTER LOW DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F0;MODIFIER LETTER LOW UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F1;MODIFIER LETTER LOW LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F2;MODIFIER LETTER LOW RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F3;MODIFIER LETTER LOW RING;Sk;0;ON;;;;;N;;;;;
+02F4;MODIFIER LETTER MIDDLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F5;MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F6;MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F7;MODIFIER LETTER LOW TILDE;Sk;0;ON;;;;;N;;;;;
+02F8;MODIFIER LETTER RAISED COLON;Sk;0;ON;;;;;N;;;;;
+02F9;MODIFIER LETTER BEGIN HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FA;MODIFIER LETTER END HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FB;MODIFIER LETTER BEGIN LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FC;MODIFIER LETTER END LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;;
+02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;;
+02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;;
+0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;;;;
+0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;;;;
+0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;;
+0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;;
+0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;;
+0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;;
+0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;;;;
+0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;;
+0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;;;;
+0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;;
+030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;;
+030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;;
+030C;COMBINING CARON;Mn;230;NSM;;;;;N;NON-SPACING HACEK;;;;
+030D;COMBINING VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL LINE ABOVE;;;;
+030E;COMBINING DOUBLE VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE VERTICAL LINE ABOVE;;;;
+030F;COMBINING DOUBLE GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE GRAVE;;;;
+0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;;
+0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;;
+0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;;
+0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;;;;
+0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;;;;
+0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;;
+0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;;
+0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;;
+0318;COMBINING LEFT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT TACK BELOW;;;;
+0319;COMBINING RIGHT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT TACK BELOW;;;;
+031A;COMBINING LEFT ANGLE ABOVE;Mn;232;NSM;;;;;N;NON-SPACING LEFT ANGLE ABOVE;;;;
+031B;COMBINING HORN;Mn;216;NSM;;;;;N;NON-SPACING HORN;;;;
+031C;COMBINING LEFT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT HALF RING BELOW;;;;
+031D;COMBINING UP TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING UP TACK BELOW;;;;
+031E;COMBINING DOWN TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOWN TACK BELOW;;;;
+031F;COMBINING PLUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING PLUS SIGN BELOW;;;;
+0320;COMBINING MINUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING MINUS SIGN BELOW;;;;
+0321;COMBINING PALATALIZED HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING PALATALIZED HOOK BELOW;;;;
+0322;COMBINING RETROFLEX HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING RETROFLEX HOOK BELOW;;;;
+0323;COMBINING DOT BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOT BELOW;;;;
+0324;COMBINING DIAERESIS BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE DOT BELOW;;;;
+0325;COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;;
+0326;COMBINING COMMA BELOW;Mn;220;NSM;;;;;N;NON-SPACING COMMA BELOW;;;;
+0327;COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;;
+0328;COMBINING OGONEK;Mn;202;NSM;;;;;N;NON-SPACING OGONEK;;;;
+0329;COMBINING VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;NON-SPACING VERTICAL LINE BELOW;;;;
+032A;COMBINING BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BRIDGE BELOW;;;;
+032B;COMBINING INVERTED DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED DOUBLE ARCH BELOW;;;;
+032C;COMBINING CARON BELOW;Mn;220;NSM;;;;;N;NON-SPACING HACEK BELOW;;;;
+032D;COMBINING CIRCUMFLEX ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING CIRCUMFLEX BELOW;;;;
+032E;COMBINING BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BREVE BELOW;;;;
+032F;COMBINING INVERTED BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BREVE BELOW;;;;
+0330;COMBINING TILDE BELOW;Mn;220;NSM;;;;;N;NON-SPACING TILDE BELOW;;;;
+0331;COMBINING MACRON BELOW;Mn;220;NSM;;;;;N;NON-SPACING MACRON BELOW;;;;
+0332;COMBINING LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING UNDERSCORE;;;;
+0333;COMBINING DOUBLE LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE UNDERSCORE;;;;
+0334;COMBINING TILDE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING TILDE OVERLAY;;;;
+0335;COMBINING SHORT STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT BAR OVERLAY;;;;
+0336;COMBINING LONG STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG BAR OVERLAY;;;;
+0337;COMBINING SHORT SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT SLASH OVERLAY;;;;
+0338;COMBINING LONG SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG SLASH OVERLAY;;;;
+0339;COMBINING RIGHT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT HALF RING BELOW;;;;
+033A;COMBINING INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BRIDGE BELOW;;;;
+033B;COMBINING SQUARE BELOW;Mn;220;NSM;;;;;N;NON-SPACING SQUARE BELOW;;;;
+033C;COMBINING SEAGULL BELOW;Mn;220;NSM;;;;;N;NON-SPACING SEAGULL BELOW;;;;
+033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;;
+033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;;
+033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;;
+0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;;;;
+0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;;;;
+0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;;
+0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;;
+0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;;
+0345;COMBINING GREEK YPOGEGRAMMENI;Mn;240;NSM;;;;;N;GREEK NON-SPACING IOTA BELOW;;0399;;0399
+0346;COMBINING BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0347;COMBINING EQUALS SIGN BELOW;Mn;220;NSM;;;;;N;;;;;
+0348;COMBINING DOUBLE VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0349;COMBINING LEFT ANGLE BELOW;Mn;220;NSM;;;;;N;;;;;
+034A;COMBINING NOT TILDE ABOVE;Mn;230;NSM;;;;;N;;;;;
+034B;COMBINING HOMOTHETIC ABOVE;Mn;230;NSM;;;;;N;;;;;
+034C;COMBINING ALMOST EQUAL TO ABOVE;Mn;230;NSM;;;;;N;;;;;
+034D;COMBINING LEFT RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034E;COMBINING UPWARDS ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034F;COMBINING GRAPHEME JOINER;Mn;0;NSM;;;;;N;;;;;
+0350;COMBINING RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+0351;COMBINING LEFT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0352;COMBINING FERMATA;Mn;230;NSM;;;;;N;;;;;
+0353;COMBINING X BELOW;Mn;220;NSM;;;;;N;;;;;
+0354;COMBINING LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0355;COMBINING RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0356;COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0357;COMBINING RIGHT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0358;COMBINING DOT ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+0359;COMBINING ASTERISK BELOW;Mn;220;NSM;;;;;N;;;;;
+035A;COMBINING DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+035B;COMBINING ZIGZAG ABOVE;Mn;230;NSM;;;;;N;;;;;
+035C;COMBINING DOUBLE BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
+035D;COMBINING DOUBLE BREVE;Mn;234;NSM;;;;;N;;;;;
+035E;COMBINING DOUBLE MACRON;Mn;234;NSM;;;;;N;;;;;
+035F;COMBINING DOUBLE MACRON BELOW;Mn;233;NSM;;;;;N;;;;;
+0360;COMBINING DOUBLE TILDE;Mn;234;NSM;;;;;N;;;;;
+0361;COMBINING DOUBLE INVERTED BREVE;Mn;234;NSM;;;;;N;;;;;
+0362;COMBINING DOUBLE RIGHTWARDS ARROW BELOW;Mn;233;NSM;;;;;N;;;;;
+0363;COMBINING LATIN SMALL LETTER A;Mn;230;NSM;;;;;N;;;;;
+0364;COMBINING LATIN SMALL LETTER E;Mn;230;NSM;;;;;N;;;;;
+0365;COMBINING LATIN SMALL LETTER I;Mn;230;NSM;;;;;N;;;;;
+0366;COMBINING LATIN SMALL LETTER O;Mn;230;NSM;;;;;N;;;;;
+0367;COMBINING LATIN SMALL LETTER U;Mn;230;NSM;;;;;N;;;;;
+0368;COMBINING LATIN SMALL LETTER C;Mn;230;NSM;;;;;N;;;;;
+0369;COMBINING LATIN SMALL LETTER D;Mn;230;NSM;;;;;N;;;;;
+036A;COMBINING LATIN SMALL LETTER H;Mn;230;NSM;;;;;N;;;;;
+036B;COMBINING LATIN SMALL LETTER M;Mn;230;NSM;;;;;N;;;;;
+036C;COMBINING LATIN SMALL LETTER R;Mn;230;NSM;;;;;N;;;;;
+036D;COMBINING LATIN SMALL LETTER T;Mn;230;NSM;;;;;N;;;;;
+036E;COMBINING LATIN SMALL LETTER V;Mn;230;NSM;;;;;N;;;;;
+036F;COMBINING LATIN SMALL LETTER X;Mn;230;NSM;;;;;N;;;;;
+0370;GREEK CAPITAL LETTER HETA;Lu;0;L;;;;;N;;;;0371;
+0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370
+0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373;
+0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372
+0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;;;;
+0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;;;;
+0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377;
+0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376
+037A;GREEK YPOGEGRAMMENI;Lm;0;L;<compat> 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;;
+037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD
+037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE
+037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF
+037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;;;;
+037F;GREEK CAPITAL LETTER YOT;Lu;0;L;;;;;N;;;;03F3;
+0384;GREEK TONOS;Sk;0;ON;<compat> 0020 0301;;;;N;GREEK SPACING TONOS;;;;
+0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;;
+0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC;
+0387;GREEK ANO TELEIA;Po;0;ON;00B7;;;;N;;;;;
+0388;GREEK CAPITAL LETTER EPSILON WITH TONOS;Lu;0;L;0395 0301;;;;N;GREEK CAPITAL LETTER EPSILON TONOS;;;03AD;
+0389;GREEK CAPITAL LETTER ETA WITH TONOS;Lu;0;L;0397 0301;;;;N;GREEK CAPITAL LETTER ETA TONOS;;;03AE;
+038A;GREEK CAPITAL LETTER IOTA WITH TONOS;Lu;0;L;0399 0301;;;;N;GREEK CAPITAL LETTER IOTA TONOS;;;03AF;
+038C;GREEK CAPITAL LETTER OMICRON WITH TONOS;Lu;0;L;039F 0301;;;;N;GREEK CAPITAL LETTER OMICRON TONOS;;;03CC;
+038E;GREEK CAPITAL LETTER UPSILON WITH TONOS;Lu;0;L;03A5 0301;;;;N;GREEK CAPITAL LETTER UPSILON TONOS;;;03CD;
+038F;GREEK CAPITAL LETTER OMEGA WITH TONOS;Lu;0;L;03A9 0301;;;;N;GREEK CAPITAL LETTER OMEGA TONOS;;;03CE;
+0390;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS;Ll;0;L;03CA 0301;;;;N;GREEK SMALL LETTER IOTA DIAERESIS TONOS;;;;
+0391;GREEK CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;03B1;
+0392;GREEK CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;03B2;
+0393;GREEK CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;03B3;
+0394;GREEK CAPITAL LETTER DELTA;Lu;0;L;;;;;N;;;;03B4;
+0395;GREEK CAPITAL LETTER EPSILON;Lu;0;L;;;;;N;;;;03B5;
+0396;GREEK CAPITAL LETTER ZETA;Lu;0;L;;;;;N;;;;03B6;
+0397;GREEK CAPITAL LETTER ETA;Lu;0;L;;;;;N;;;;03B7;
+0398;GREEK CAPITAL LETTER THETA;Lu;0;L;;;;;N;;;;03B8;
+0399;GREEK CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;03B9;
+039A;GREEK CAPITAL LETTER KAPPA;Lu;0;L;;;;;N;;;;03BA;
+039B;GREEK CAPITAL LETTER LAMDA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER LAMBDA;;;03BB;
+039C;GREEK CAPITAL LETTER MU;Lu;0;L;;;;;N;;;;03BC;
+039D;GREEK CAPITAL LETTER NU;Lu;0;L;;;;;N;;;;03BD;
+039E;GREEK CAPITAL LETTER XI;Lu;0;L;;;;;N;;;;03BE;
+039F;GREEK CAPITAL LETTER OMICRON;Lu;0;L;;;;;N;;;;03BF;
+03A0;GREEK CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;03C0;
+03A1;GREEK CAPITAL LETTER RHO;Lu;0;L;;;;;N;;;;03C1;
+03A3;GREEK CAPITAL LETTER SIGMA;Lu;0;L;;;;;N;;;;03C3;
+03A4;GREEK CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;03C4;
+03A5;GREEK CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;03C5;
+03A6;GREEK CAPITAL LETTER PHI;Lu;0;L;;;;;N;;;;03C6;
+03A7;GREEK CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;03C7;
+03A8;GREEK CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;03C8;
+03A9;GREEK CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;03C9;
+03AA;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA;Lu;0;L;0399 0308;;;;N;GREEK CAPITAL LETTER IOTA DIAERESIS;;;03CA;
+03AB;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA;Lu;0;L;03A5 0308;;;;N;GREEK CAPITAL LETTER UPSILON DIAERESIS;;;03CB;
+03AC;GREEK SMALL LETTER ALPHA WITH TONOS;Ll;0;L;03B1 0301;;;;N;GREEK SMALL LETTER ALPHA TONOS;;0386;;0386
+03AD;GREEK SMALL LETTER EPSILON WITH TONOS;Ll;0;L;03B5 0301;;;;N;GREEK SMALL LETTER EPSILON TONOS;;0388;;0388
+03AE;GREEK SMALL LETTER ETA WITH TONOS;Ll;0;L;03B7 0301;;;;N;GREEK SMALL LETTER ETA TONOS;;0389;;0389
+03AF;GREEK SMALL LETTER IOTA WITH TONOS;Ll;0;L;03B9 0301;;;;N;GREEK SMALL LETTER IOTA TONOS;;038A;;038A
+03B0;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS;Ll;0;L;03CB 0301;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS TONOS;;;;
+03B1;GREEK SMALL LETTER ALPHA;Ll;0;L;;;;;N;;;0391;;0391
+03B2;GREEK SMALL LETTER BETA;Ll;0;L;;;;;N;;;0392;;0392
+03B3;GREEK SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0393;;0393
+03B4;GREEK SMALL LETTER DELTA;Ll;0;L;;;;;N;;;0394;;0394
+03B5;GREEK SMALL LETTER EPSILON;Ll;0;L;;;;;N;;;0395;;0395
+03B6;GREEK SMALL LETTER ZETA;Ll;0;L;;;;;N;;;0396;;0396
+03B7;GREEK SMALL LETTER ETA;Ll;0;L;;;;;N;;;0397;;0397
+03B8;GREEK SMALL LETTER THETA;Ll;0;L;;;;;N;;;0398;;0398
+03B9;GREEK SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0399;;0399
+03BA;GREEK SMALL LETTER KAPPA;Ll;0;L;;;;;N;;;039A;;039A
+03BB;GREEK SMALL LETTER LAMDA;Ll;0;L;;;;;N;GREEK SMALL LETTER LAMBDA;;039B;;039B
+03BC;GREEK SMALL LETTER MU;Ll;0;L;;;;;N;;;039C;;039C
+03BD;GREEK SMALL LETTER NU;Ll;0;L;;;;;N;;;039D;;039D
+03BE;GREEK SMALL LETTER XI;Ll;0;L;;;;;N;;;039E;;039E
+03BF;GREEK SMALL LETTER OMICRON;Ll;0;L;;;;;N;;;039F;;039F
+03C0;GREEK SMALL LETTER PI;Ll;0;L;;;;;N;;;03A0;;03A0
+03C1;GREEK SMALL LETTER RHO;Ll;0;L;;;;;N;;;03A1;;03A1
+03C2;GREEK SMALL LETTER FINAL SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C3;GREEK SMALL LETTER SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C4;GREEK SMALL LETTER TAU;Ll;0;L;;;;;N;;;03A4;;03A4
+03C5;GREEK SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;03A5;;03A5
+03C6;GREEK SMALL LETTER PHI;Ll;0;L;;;;;N;;;03A6;;03A6
+03C7;GREEK SMALL LETTER CHI;Ll;0;L;;;;;N;;;03A7;;03A7
+03C8;GREEK SMALL LETTER PSI;Ll;0;L;;;;;N;;;03A8;;03A8
+03C9;GREEK SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;03A9;;03A9
+03CA;GREEK SMALL LETTER IOTA WITH DIALYTIKA;Ll;0;L;03B9 0308;;;;N;GREEK SMALL LETTER IOTA DIAERESIS;;03AA;;03AA
+03CB;GREEK SMALL LETTER UPSILON WITH DIALYTIKA;Ll;0;L;03C5 0308;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS;;03AB;;03AB
+03CC;GREEK SMALL LETTER OMICRON WITH TONOS;Ll;0;L;03BF 0301;;;;N;GREEK SMALL LETTER OMICRON TONOS;;038C;;038C
+03CD;GREEK SMALL LETTER UPSILON WITH TONOS;Ll;0;L;03C5 0301;;;;N;GREEK SMALL LETTER UPSILON TONOS;;038E;;038E
+03CE;GREEK SMALL LETTER OMEGA WITH TONOS;Ll;0;L;03C9 0301;;;;N;GREEK SMALL LETTER OMEGA TONOS;;038F;;038F
+03CF;GREEK CAPITAL KAI SYMBOL;Lu;0;L;;;;;N;;;;03D7;
+03D0;GREEK BETA SYMBOL;Ll;0;L;<compat> 03B2;;;;N;GREEK SMALL LETTER CURLED BETA;;0392;;0392
+03D1;GREEK THETA SYMBOL;Ll;0;L;<compat> 03B8;;;;N;GREEK SMALL LETTER SCRIPT THETA;;0398;;0398
+03D2;GREEK UPSILON WITH HOOK SYMBOL;Lu;0;L;<compat> 03A5;;;;N;GREEK CAPITAL LETTER UPSILON HOOK;;;;
+03D3;GREEK UPSILON WITH ACUTE AND HOOK SYMBOL;Lu;0;L;03D2 0301;;;;N;GREEK CAPITAL LETTER UPSILON HOOK TONOS;;;;
+03D4;GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL;Lu;0;L;03D2 0308;;;;N;GREEK CAPITAL LETTER UPSILON HOOK DIAERESIS;;;;
+03D5;GREEK PHI SYMBOL;Ll;0;L;<compat> 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6
+03D6;GREEK PI SYMBOL;Ll;0;L;<compat> 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0
+03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF
+03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;;;03D9;
+03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;;03D8;;03D8
+03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB;
+03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA
+03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD;
+03DD;GREEK SMALL LETTER DIGAMMA;Ll;0;L;;;;;N;;;03DC;;03DC
+03DE;GREEK LETTER KOPPA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KOPPA;;;03DF;
+03DF;GREEK SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;03DE;;03DE
+03E0;GREEK LETTER SAMPI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SAMPI;;;03E1;
+03E1;GREEK SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;03E0;;03E0
+03E2;COPTIC CAPITAL LETTER SHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHEI;;;03E3;
+03E3;COPTIC SMALL LETTER SHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER SHEI;;03E2;;03E2
+03E4;COPTIC CAPITAL LETTER FEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER FEI;;;03E5;
+03E5;COPTIC SMALL LETTER FEI;Ll;0;L;;;;;N;GREEK SMALL LETTER FEI;;03E4;;03E4
+03E6;COPTIC CAPITAL LETTER KHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KHEI;;;03E7;
+03E7;COPTIC SMALL LETTER KHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER KHEI;;03E6;;03E6
+03E8;COPTIC CAPITAL LETTER HORI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER HORI;;;03E9;
+03E9;COPTIC SMALL LETTER HORI;Ll;0;L;;;;;N;GREEK SMALL LETTER HORI;;03E8;;03E8
+03EA;COPTIC CAPITAL LETTER GANGIA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER GANGIA;;;03EB;
+03EB;COPTIC SMALL LETTER GANGIA;Ll;0;L;;;;;N;GREEK SMALL LETTER GANGIA;;03EA;;03EA
+03EC;COPTIC CAPITAL LETTER SHIMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHIMA;;;03ED;
+03ED;COPTIC SMALL LETTER SHIMA;Ll;0;L;;;;;N;GREEK SMALL LETTER SHIMA;;03EC;;03EC
+03EE;COPTIC CAPITAL LETTER DEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DEI;;;03EF;
+03EF;COPTIC SMALL LETTER DEI;Ll;0;L;;;;;N;GREEK SMALL LETTER DEI;;03EE;;03EE
+03F0;GREEK KAPPA SYMBOL;Ll;0;L;<compat> 03BA;;;;N;GREEK SMALL LETTER SCRIPT KAPPA;;039A;;039A
+03F1;GREEK RHO SYMBOL;Ll;0;L;<compat> 03C1;;;;N;GREEK SMALL LETTER TAILED RHO;;03A1;;03A1
+03F2;GREEK LUNATE SIGMA SYMBOL;Ll;0;L;<compat> 03C2;;;;N;GREEK SMALL LETTER LUNATE SIGMA;;03F9;;03F9
+03F3;GREEK LETTER YOT;Ll;0;L;;;;;N;;;037F;;037F
+03F4;GREEK CAPITAL THETA SYMBOL;Lu;0;L;<compat> 0398;;;;N;;;;03B8;
+03F5;GREEK LUNATE EPSILON SYMBOL;Ll;0;L;<compat> 03B5;;;;N;;;0395;;0395
+03F6;GREEK REVERSED LUNATE EPSILON SYMBOL;Sm;0;ON;;;;;N;;;;;
+03F7;GREEK CAPITAL LETTER SHO;Lu;0;L;;;;;N;;;;03F8;
+03F8;GREEK SMALL LETTER SHO;Ll;0;L;;;;;N;;;03F7;;03F7
+03F9;GREEK CAPITAL LUNATE SIGMA SYMBOL;Lu;0;L;<compat> 03A3;;;;N;;;;03F2;
+03FA;GREEK CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;03FB;
+03FB;GREEK SMALL LETTER SAN;Ll;0;L;;;;;N;;;03FA;;03FA
+03FC;GREEK RHO WITH STROKE SYMBOL;Ll;0;L;;;;;N;;;;;
+03FD;GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037B;
+03FE;GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037C;
+03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D;
+0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450;
+0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451;
+0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;;;0452;
+0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453;
+0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454;
+0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455;
+0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456;
+0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;;;0457;
+0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458;
+0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459;
+040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A;
+040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;;;045B;
+040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C;
+040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D;
+040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;;;045E;
+040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F;
+0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430;
+0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431;
+0412;CYRILLIC CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;0432;
+0413;CYRILLIC CAPITAL LETTER GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE;;;0433;
+0414;CYRILLIC CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;0434;
+0415;CYRILLIC CAPITAL LETTER IE;Lu;0;L;;;;;N;;;;0435;
+0416;CYRILLIC CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;0436;
+0417;CYRILLIC CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;0437;
+0418;CYRILLIC CAPITAL LETTER I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER II;;;0438;
+0419;CYRILLIC CAPITAL LETTER SHORT I;Lu;0;L;0418 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT II;;;0439;
+041A;CYRILLIC CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;043A;
+041B;CYRILLIC CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;043B;
+041C;CYRILLIC CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;043C;
+041D;CYRILLIC CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;043D;
+041E;CYRILLIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;043E;
+041F;CYRILLIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;043F;
+0420;CYRILLIC CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;0440;
+0421;CYRILLIC CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;0441;
+0422;CYRILLIC CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;0442;
+0423;CYRILLIC CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0443;
+0424;CYRILLIC CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;0444;
+0425;CYRILLIC CAPITAL LETTER HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA;;;0445;
+0426;CYRILLIC CAPITAL LETTER TSE;Lu;0;L;;;;;N;;;;0446;
+0427;CYRILLIC CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;0447;
+0428;CYRILLIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0448;
+0429;CYRILLIC CAPITAL LETTER SHCHA;Lu;0;L;;;;;N;;;;0449;
+042A;CYRILLIC CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;044A;
+042B;CYRILLIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER YERI;;;044B;
+042C;CYRILLIC CAPITAL LETTER SOFT SIGN;Lu;0;L;;;;;N;;;;044C;
+042D;CYRILLIC CAPITAL LETTER E;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED E;;;044D;
+042E;CYRILLIC CAPITAL LETTER YU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IU;;;044E;
+042F;CYRILLIC CAPITAL LETTER YA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IA;;;044F;
+0430;CYRILLIC SMALL LETTER A;Ll;0;L;;;;;N;;;0410;;0410
+0431;CYRILLIC SMALL LETTER BE;Ll;0;L;;;;;N;;;0411;;0411
+0432;CYRILLIC SMALL LETTER VE;Ll;0;L;;;;;N;;;0412;;0412
+0433;CYRILLIC SMALL LETTER GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE;;0413;;0413
+0434;CYRILLIC SMALL LETTER DE;Ll;0;L;;;;;N;;;0414;;0414
+0435;CYRILLIC SMALL LETTER IE;Ll;0;L;;;;;N;;;0415;;0415
+0436;CYRILLIC SMALL LETTER ZHE;Ll;0;L;;;;;N;;;0416;;0416
+0437;CYRILLIC SMALL LETTER ZE;Ll;0;L;;;;;N;;;0417;;0417
+0438;CYRILLIC SMALL LETTER I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER II;;0418;;0418
+0439;CYRILLIC SMALL LETTER SHORT I;Ll;0;L;0438 0306;;;;N;CYRILLIC SMALL LETTER SHORT II;;0419;;0419
+043A;CYRILLIC SMALL LETTER KA;Ll;0;L;;;;;N;;;041A;;041A
+043B;CYRILLIC SMALL LETTER EL;Ll;0;L;;;;;N;;;041B;;041B
+043C;CYRILLIC SMALL LETTER EM;Ll;0;L;;;;;N;;;041C;;041C
+043D;CYRILLIC SMALL LETTER EN;Ll;0;L;;;;;N;;;041D;;041D
+043E;CYRILLIC SMALL LETTER O;Ll;0;L;;;;;N;;;041E;;041E
+043F;CYRILLIC SMALL LETTER PE;Ll;0;L;;;;;N;;;041F;;041F
+0440;CYRILLIC SMALL LETTER ER;Ll;0;L;;;;;N;;;0420;;0420
+0441;CYRILLIC SMALL LETTER ES;Ll;0;L;;;;;N;;;0421;;0421
+0442;CYRILLIC SMALL LETTER TE;Ll;0;L;;;;;N;;;0422;;0422
+0443;CYRILLIC SMALL LETTER U;Ll;0;L;;;;;N;;;0423;;0423
+0444;CYRILLIC SMALL LETTER EF;Ll;0;L;;;;;N;;;0424;;0424
+0445;CYRILLIC SMALL LETTER HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA;;0425;;0425
+0446;CYRILLIC SMALL LETTER TSE;Ll;0;L;;;;;N;;;0426;;0426
+0447;CYRILLIC SMALL LETTER CHE;Ll;0;L;;;;;N;;;0427;;0427
+0448;CYRILLIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;0428;;0428
+0449;CYRILLIC SMALL LETTER SHCHA;Ll;0;L;;;;;N;;;0429;;0429
+044A;CYRILLIC SMALL LETTER HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+044B;CYRILLIC SMALL LETTER YERU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER YERI;;042B;;042B
+044C;CYRILLIC SMALL LETTER SOFT SIGN;Ll;0;L;;;;;N;;;042C;;042C
+044D;CYRILLIC SMALL LETTER E;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED E;;042D;;042D
+044E;CYRILLIC SMALL LETTER YU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IU;;042E;;042E
+044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F
+0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400
+0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401
+0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;;0402;;0402
+0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403
+0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404
+0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405
+0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406
+0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;;0407;;0407
+0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408
+0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409
+045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A
+045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;;040B;;040B
+045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C
+045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D
+045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;;040E;;040E
+045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F
+0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461;
+0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460
+0462;CYRILLIC CAPITAL LETTER YAT;Lu;0;L;;;;;N;;;;0463;
+0463;CYRILLIC SMALL LETTER YAT;Ll;0;L;;;;;N;;;0462;;0462
+0464;CYRILLIC CAPITAL LETTER IOTIFIED E;Lu;0;L;;;;;N;;;;0465;
+0465;CYRILLIC SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;0464;;0464
+0466;CYRILLIC CAPITAL LETTER LITTLE YUS;Lu;0;L;;;;;N;;;;0467;
+0467;CYRILLIC SMALL LETTER LITTLE YUS;Ll;0;L;;;;;N;;;0466;;0466
+0468;CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS;Lu;0;L;;;;;N;;;;0469;
+0469;CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS;Ll;0;L;;;;;N;;;0468;;0468
+046A;CYRILLIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;046B;
+046B;CYRILLIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;046A;;046A
+046C;CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS;Lu;0;L;;;;;N;;;;046D;
+046D;CYRILLIC SMALL LETTER IOTIFIED BIG YUS;Ll;0;L;;;;;N;;;046C;;046C
+046E;CYRILLIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;046F;
+046F;CYRILLIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;046E;;046E
+0470;CYRILLIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;0471;
+0471;CYRILLIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;0470;;0470
+0472;CYRILLIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;0473;
+0473;CYRILLIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;0472;;0472
+0474;CYRILLIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;0475;
+0475;CYRILLIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;0474;;0474
+0476;CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Lu;0;L;0474 030F;;;;N;CYRILLIC CAPITAL LETTER IZHITSA DOUBLE GRAVE;;;0477;
+0477;CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Ll;0;L;0475 030F;;;;N;CYRILLIC SMALL LETTER IZHITSA DOUBLE GRAVE;;0476;;0476
+0478;CYRILLIC CAPITAL LETTER UK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER UK DIGRAPH;;;0479;
+0479;CYRILLIC SMALL LETTER UK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER UK DIGRAPH;;0478;;0478
+047A;CYRILLIC CAPITAL LETTER ROUND OMEGA;Lu;0;L;;;;;N;;;;047B;
+047B;CYRILLIC SMALL LETTER ROUND OMEGA;Ll;0;L;;;;;N;;;047A;;047A
+047C;CYRILLIC CAPITAL LETTER OMEGA WITH TITLO;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER OMEGA TITLO;;;047D;
+047D;CYRILLIC SMALL LETTER OMEGA WITH TITLO;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER OMEGA TITLO;;047C;;047C
+047E;CYRILLIC CAPITAL LETTER OT;Lu;0;L;;;;;N;;;;047F;
+047F;CYRILLIC SMALL LETTER OT;Ll;0;L;;;;;N;;;047E;;047E
+0480;CYRILLIC CAPITAL LETTER KOPPA;Lu;0;L;;;;;N;;;;0481;
+0481;CYRILLIC SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;0480;;0480
+0482;CYRILLIC THOUSANDS SIGN;So;0;L;;;;;N;;;;;
+0483;COMBINING CYRILLIC TITLO;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING TITLO;;;;
+0484;COMBINING CYRILLIC PALATALIZATION;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PALATALIZATION;;;;
+0485;COMBINING CYRILLIC DASIA PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING DASIA PNEUMATA;;;;
+0486;COMBINING CYRILLIC PSILI PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PSILI PNEUMATA;;;;
+0487;COMBINING CYRILLIC POKRYTIE;Mn;230;NSM;;;;;N;;;;;
+0488;COMBINING CYRILLIC HUNDRED THOUSANDS SIGN;Me;0;NSM;;;;;N;;;;;
+0489;COMBINING CYRILLIC MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+048A;CYRILLIC CAPITAL LETTER SHORT I WITH TAIL;Lu;0;L;;;;;N;;;;048B;
+048B;CYRILLIC SMALL LETTER SHORT I WITH TAIL;Ll;0;L;;;;;N;;;048A;;048A
+048C;CYRILLIC CAPITAL LETTER SEMISOFT SIGN;Lu;0;L;;;;;N;;;;048D;
+048D;CYRILLIC SMALL LETTER SEMISOFT SIGN;Ll;0;L;;;;;N;;;048C;;048C
+048E;CYRILLIC CAPITAL LETTER ER WITH TICK;Lu;0;L;;;;;N;;;;048F;
+048F;CYRILLIC SMALL LETTER ER WITH TICK;Ll;0;L;;;;;N;;;048E;;048E
+0490;CYRILLIC CAPITAL LETTER GHE WITH UPTURN;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE WITH UPTURN;;;0491;
+0491;CYRILLIC SMALL LETTER GHE WITH UPTURN;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE WITH UPTURN;;0490;;0490
+0492;CYRILLIC CAPITAL LETTER GHE WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE BAR;;;0493;
+0493;CYRILLIC SMALL LETTER GHE WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE BAR;;0492;;0492
+0494;CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE HOOK;;;0495;
+0495;CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE HOOK;;0494;;0494
+0496;CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZHE WITH RIGHT DESCENDER;;;0497;
+0497;CYRILLIC SMALL LETTER ZHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZHE WITH RIGHT DESCENDER;;0496;;0496
+0498;CYRILLIC CAPITAL LETTER ZE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZE CEDILLA;;;0499;
+0499;CYRILLIC SMALL LETTER ZE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZE CEDILLA;;0498;;0498
+049A;CYRILLIC CAPITAL LETTER KA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA WITH RIGHT DESCENDER;;;049B;
+049B;CYRILLIC SMALL LETTER KA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA WITH RIGHT DESCENDER;;049A;;049A
+049C;CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA VERTICAL BAR;;;049D;
+049D;CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA VERTICAL BAR;;049C;;049C
+049E;CYRILLIC CAPITAL LETTER KA WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA BAR;;;049F;
+049F;CYRILLIC SMALL LETTER KA WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA BAR;;049E;;049E
+04A0;CYRILLIC CAPITAL LETTER BASHKIR KA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED GE KA;;;04A1;
+04A1;CYRILLIC SMALL LETTER BASHKIR KA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED GE KA;;04A0;;04A0
+04A2;CYRILLIC CAPITAL LETTER EN WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN WITH RIGHT DESCENDER;;;04A3;
+04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2
+04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5;
+04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
+04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;;;04A7;
+04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;;04A6;;04A6
+04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9;
+04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8
+04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB;
+04AB;CYRILLIC SMALL LETTER ES WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ES CEDILLA;;04AA;;04AA
+04AC;CYRILLIC CAPITAL LETTER TE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE WITH RIGHT DESCENDER;;;04AD;
+04AD;CYRILLIC SMALL LETTER TE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE WITH RIGHT DESCENDER;;04AC;;04AC
+04AE;CYRILLIC CAPITAL LETTER STRAIGHT U;Lu;0;L;;;;;N;;;;04AF;
+04AF;CYRILLIC SMALL LETTER STRAIGHT U;Ll;0;L;;;;;N;;;04AE;;04AE
+04B0;CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER STRAIGHT U BAR;;;04B1;
+04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0
+04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3;
+04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2
+04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;;;04B5;
+04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;;04B4;;04B4
+04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7;
+04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6
+04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9;
+04B9;CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE VERTICAL BAR;;04B8;;04B8
+04BA;CYRILLIC CAPITAL LETTER SHHA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER H;;;04BB;
+04BB;CYRILLIC SMALL LETTER SHHA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER H;;04BA;;04BA
+04BC;CYRILLIC CAPITAL LETTER ABKHASIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK;;;04BD;
+04BD;CYRILLIC SMALL LETTER ABKHASIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK;;04BC;;04BC
+04BE;CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK OGONEK;;;04BF;
+04BF;CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK OGONEK;;04BE;;04BE
+04C0;CYRILLIC LETTER PALOCHKA;Lu;0;L;;;;;N;CYRILLIC LETTER I;;;04CF;
+04C1;CYRILLIC CAPITAL LETTER ZHE WITH BREVE;Lu;0;L;0416 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT ZHE;;;04C2;
+04C2;CYRILLIC SMALL LETTER ZHE WITH BREVE;Ll;0;L;0436 0306;;;;N;CYRILLIC SMALL LETTER SHORT ZHE;;04C1;;04C1
+04C3;CYRILLIC CAPITAL LETTER KA WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA HOOK;;;04C4;
+04C4;CYRILLIC SMALL LETTER KA WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA HOOK;;04C3;;04C3
+04C5;CYRILLIC CAPITAL LETTER EL WITH TAIL;Lu;0;L;;;;;N;;;;04C6;
+04C6;CYRILLIC SMALL LETTER EL WITH TAIL;Ll;0;L;;;;;N;;;04C5;;04C5
+04C7;CYRILLIC CAPITAL LETTER EN WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN HOOK;;;04C8;
+04C8;CYRILLIC SMALL LETTER EN WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN HOOK;;04C7;;04C7
+04C9;CYRILLIC CAPITAL LETTER EN WITH TAIL;Lu;0;L;;;;;N;;;;04CA;
+04CA;CYRILLIC SMALL LETTER EN WITH TAIL;Ll;0;L;;;;;N;;;04C9;;04C9
+04CB;CYRILLIC CAPITAL LETTER KHAKASSIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH LEFT DESCENDER;;;04CC;
+04CC;CYRILLIC SMALL LETTER KHAKASSIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH LEFT DESCENDER;;04CB;;04CB
+04CD;CYRILLIC CAPITAL LETTER EM WITH TAIL;Lu;0;L;;;;;N;;;;04CE;
+04CE;CYRILLIC SMALL LETTER EM WITH TAIL;Ll;0;L;;;;;N;;;04CD;;04CD
+04CF;CYRILLIC SMALL LETTER PALOCHKA;Ll;0;L;;;;;N;;;04C0;;04C0
+04D0;CYRILLIC CAPITAL LETTER A WITH BREVE;Lu;0;L;0410 0306;;;;N;;;;04D1;
+04D1;CYRILLIC SMALL LETTER A WITH BREVE;Ll;0;L;0430 0306;;;;N;;;04D0;;04D0
+04D2;CYRILLIC CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0410 0308;;;;N;;;;04D3;
+04D3;CYRILLIC SMALL LETTER A WITH DIAERESIS;Ll;0;L;0430 0308;;;;N;;;04D2;;04D2
+04D4;CYRILLIC CAPITAL LIGATURE A IE;Lu;0;L;;;;;N;;;;04D5;
+04D5;CYRILLIC SMALL LIGATURE A IE;Ll;0;L;;;;;N;;;04D4;;04D4
+04D6;CYRILLIC CAPITAL LETTER IE WITH BREVE;Lu;0;L;0415 0306;;;;N;;;;04D7;
+04D7;CYRILLIC SMALL LETTER IE WITH BREVE;Ll;0;L;0435 0306;;;;N;;;04D6;;04D6
+04D8;CYRILLIC CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;04D9;
+04D9;CYRILLIC SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;04D8;;04D8
+04DA;CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS;Lu;0;L;04D8 0308;;;;N;;;;04DB;
+04DB;CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS;Ll;0;L;04D9 0308;;;;N;;;04DA;;04DA
+04DC;CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS;Lu;0;L;0416 0308;;;;N;;;;04DD;
+04DD;CYRILLIC SMALL LETTER ZHE WITH DIAERESIS;Ll;0;L;0436 0308;;;;N;;;04DC;;04DC
+04DE;CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS;Lu;0;L;0417 0308;;;;N;;;;04DF;
+04DF;CYRILLIC SMALL LETTER ZE WITH DIAERESIS;Ll;0;L;0437 0308;;;;N;;;04DE;;04DE
+04E0;CYRILLIC CAPITAL LETTER ABKHASIAN DZE;Lu;0;L;;;;;N;;;;04E1;
+04E1;CYRILLIC SMALL LETTER ABKHASIAN DZE;Ll;0;L;;;;;N;;;04E0;;04E0
+04E2;CYRILLIC CAPITAL LETTER I WITH MACRON;Lu;0;L;0418 0304;;;;N;;;;04E3;
+04E3;CYRILLIC SMALL LETTER I WITH MACRON;Ll;0;L;0438 0304;;;;N;;;04E2;;04E2
+04E4;CYRILLIC CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0418 0308;;;;N;;;;04E5;
+04E5;CYRILLIC SMALL LETTER I WITH DIAERESIS;Ll;0;L;0438 0308;;;;N;;;04E4;;04E4
+04E6;CYRILLIC CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;041E 0308;;;;N;;;;04E7;
+04E7;CYRILLIC SMALL LETTER O WITH DIAERESIS;Ll;0;L;043E 0308;;;;N;;;04E6;;04E6
+04E8;CYRILLIC CAPITAL LETTER BARRED O;Lu;0;L;;;;;N;;;;04E9;
+04E9;CYRILLIC SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;04E8;;04E8
+04EA;CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS;Lu;0;L;04E8 0308;;;;N;;;;04EB;
+04EB;CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS;Ll;0;L;04E9 0308;;;;N;;;04EA;;04EA
+04EC;CYRILLIC CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;042D 0308;;;;N;;;;04ED;
+04ED;CYRILLIC SMALL LETTER E WITH DIAERESIS;Ll;0;L;044D 0308;;;;N;;;04EC;;04EC
+04EE;CYRILLIC CAPITAL LETTER U WITH MACRON;Lu;0;L;0423 0304;;;;N;;;;04EF;
+04EF;CYRILLIC SMALL LETTER U WITH MACRON;Ll;0;L;0443 0304;;;;N;;;04EE;;04EE
+04F0;CYRILLIC CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0423 0308;;;;N;;;;04F1;
+04F1;CYRILLIC SMALL LETTER U WITH DIAERESIS;Ll;0;L;0443 0308;;;;N;;;04F0;;04F0
+04F2;CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0423 030B;;;;N;;;;04F3;
+04F3;CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0443 030B;;;;N;;;04F2;;04F2
+04F4;CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS;Lu;0;L;0427 0308;;;;N;;;;04F5;
+04F5;CYRILLIC SMALL LETTER CHE WITH DIAERESIS;Ll;0;L;0447 0308;;;;N;;;04F4;;04F4
+04F6;CYRILLIC CAPITAL LETTER GHE WITH DESCENDER;Lu;0;L;;;;;N;;;;04F7;
+04F7;CYRILLIC SMALL LETTER GHE WITH DESCENDER;Ll;0;L;;;;;N;;;04F6;;04F6
+04F8;CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS;Lu;0;L;042B 0308;;;;N;;;;04F9;
+04F9;CYRILLIC SMALL LETTER YERU WITH DIAERESIS;Ll;0;L;044B 0308;;;;N;;;04F8;;04F8
+04FA;CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK;Lu;0;L;;;;;N;;;;04FB;
+04FB;CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK;Ll;0;L;;;;;N;;;04FA;;04FA
+04FC;CYRILLIC CAPITAL LETTER HA WITH HOOK;Lu;0;L;;;;;N;;;;04FD;
+04FD;CYRILLIC SMALL LETTER HA WITH HOOK;Ll;0;L;;;;;N;;;04FC;;04FC
+04FE;CYRILLIC CAPITAL LETTER HA WITH STROKE;Lu;0;L;;;;;N;;;;04FF;
+04FF;CYRILLIC SMALL LETTER HA WITH STROKE;Ll;0;L;;;;;N;;;04FE;;04FE
+0500;CYRILLIC CAPITAL LETTER KOMI DE;Lu;0;L;;;;;N;;;;0501;
+0501;CYRILLIC SMALL LETTER KOMI DE;Ll;0;L;;;;;N;;;0500;;0500
+0502;CYRILLIC CAPITAL LETTER KOMI DJE;Lu;0;L;;;;;N;;;;0503;
+0503;CYRILLIC SMALL LETTER KOMI DJE;Ll;0;L;;;;;N;;;0502;;0502
+0504;CYRILLIC CAPITAL LETTER KOMI ZJE;Lu;0;L;;;;;N;;;;0505;
+0505;CYRILLIC SMALL LETTER KOMI ZJE;Ll;0;L;;;;;N;;;0504;;0504
+0506;CYRILLIC CAPITAL LETTER KOMI DZJE;Lu;0;L;;;;;N;;;;0507;
+0507;CYRILLIC SMALL LETTER KOMI DZJE;Ll;0;L;;;;;N;;;0506;;0506
+0508;CYRILLIC CAPITAL LETTER KOMI LJE;Lu;0;L;;;;;N;;;;0509;
+0509;CYRILLIC SMALL LETTER KOMI LJE;Ll;0;L;;;;;N;;;0508;;0508
+050A;CYRILLIC CAPITAL LETTER KOMI NJE;Lu;0;L;;;;;N;;;;050B;
+050B;CYRILLIC SMALL LETTER KOMI NJE;Ll;0;L;;;;;N;;;050A;;050A
+050C;CYRILLIC CAPITAL LETTER KOMI SJE;Lu;0;L;;;;;N;;;;050D;
+050D;CYRILLIC SMALL LETTER KOMI SJE;Ll;0;L;;;;;N;;;050C;;050C
+050E;CYRILLIC CAPITAL LETTER KOMI TJE;Lu;0;L;;;;;N;;;;050F;
+050F;CYRILLIC SMALL LETTER KOMI TJE;Ll;0;L;;;;;N;;;050E;;050E
+0510;CYRILLIC CAPITAL LETTER REVERSED ZE;Lu;0;L;;;;;N;;;;0511;
+0511;CYRILLIC SMALL LETTER REVERSED ZE;Ll;0;L;;;;;N;;;0510;;0510
+0512;CYRILLIC CAPITAL LETTER EL WITH HOOK;Lu;0;L;;;;;N;;;;0513;
+0513;CYRILLIC SMALL LETTER EL WITH HOOK;Ll;0;L;;;;;N;;;0512;;0512
+0514;CYRILLIC CAPITAL LETTER LHA;Lu;0;L;;;;;N;;;;0515;
+0515;CYRILLIC SMALL LETTER LHA;Ll;0;L;;;;;N;;;0514;;0514
+0516;CYRILLIC CAPITAL LETTER RHA;Lu;0;L;;;;;N;;;;0517;
+0517;CYRILLIC SMALL LETTER RHA;Ll;0;L;;;;;N;;;0516;;0516
+0518;CYRILLIC CAPITAL LETTER YAE;Lu;0;L;;;;;N;;;;0519;
+0519;CYRILLIC SMALL LETTER YAE;Ll;0;L;;;;;N;;;0518;;0518
+051A;CYRILLIC CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;051B;
+051B;CYRILLIC SMALL LETTER QA;Ll;0;L;;;;;N;;;051A;;051A
+051C;CYRILLIC CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;051D;
+051D;CYRILLIC SMALL LETTER WE;Ll;0;L;;;;;N;;;051C;;051C
+051E;CYRILLIC CAPITAL LETTER ALEUT KA;Lu;0;L;;;;;N;;;;051F;
+051F;CYRILLIC SMALL LETTER ALEUT KA;Ll;0;L;;;;;N;;;051E;;051E
+0520;CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0521;
+0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520
+0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523;
+0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522
+0524;CYRILLIC CAPITAL LETTER PE WITH DESCENDER;Lu;0;L;;;;;N;;;;0525;
+0525;CYRILLIC SMALL LETTER PE WITH DESCENDER;Ll;0;L;;;;;N;;;0524;;0524
+0526;CYRILLIC CAPITAL LETTER SHHA WITH DESCENDER;Lu;0;L;;;;;N;;;;0527;
+0527;CYRILLIC SMALL LETTER SHHA WITH DESCENDER;Ll;0;L;;;;;N;;;0526;;0526
+0528;CYRILLIC CAPITAL LETTER EN WITH LEFT HOOK;Lu;0;L;;;;;N;;;;0529;
+0529;CYRILLIC SMALL LETTER EN WITH LEFT HOOK;Ll;0;L;;;;;N;;;0528;;0528
+052A;CYRILLIC CAPITAL LETTER DZZHE;Lu;0;L;;;;;N;;;;052B;
+052B;CYRILLIC SMALL LETTER DZZHE;Ll;0;L;;;;;N;;;052A;;052A
+052C;CYRILLIC CAPITAL LETTER DCHE;Lu;0;L;;;;;N;;;;052D;
+052D;CYRILLIC SMALL LETTER DCHE;Ll;0;L;;;;;N;;;052C;;052C
+052E;CYRILLIC CAPITAL LETTER EL WITH DESCENDER;Lu;0;L;;;;;N;;;;052F;
+052F;CYRILLIC SMALL LETTER EL WITH DESCENDER;Ll;0;L;;;;;N;;;052E;;052E
+0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561;
+0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562;
+0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563;
+0534;ARMENIAN CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;0564;
+0535;ARMENIAN CAPITAL LETTER ECH;Lu;0;L;;;;;N;;;;0565;
+0536;ARMENIAN CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;0566;
+0537;ARMENIAN CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;0567;
+0538;ARMENIAN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;0568;
+0539;ARMENIAN CAPITAL LETTER TO;Lu;0;L;;;;;N;;;;0569;
+053A;ARMENIAN CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;056A;
+053B;ARMENIAN CAPITAL LETTER INI;Lu;0;L;;;;;N;;;;056B;
+053C;ARMENIAN CAPITAL LETTER LIWN;Lu;0;L;;;;;N;;;;056C;
+053D;ARMENIAN CAPITAL LETTER XEH;Lu;0;L;;;;;N;;;;056D;
+053E;ARMENIAN CAPITAL LETTER CA;Lu;0;L;;;;;N;;;;056E;
+053F;ARMENIAN CAPITAL LETTER KEN;Lu;0;L;;;;;N;;;;056F;
+0540;ARMENIAN CAPITAL LETTER HO;Lu;0;L;;;;;N;;;;0570;
+0541;ARMENIAN CAPITAL LETTER JA;Lu;0;L;;;;;N;;;;0571;
+0542;ARMENIAN CAPITAL LETTER GHAD;Lu;0;L;;;;;N;ARMENIAN CAPITAL LETTER LAD;;;0572;
+0543;ARMENIAN CAPITAL LETTER CHEH;Lu;0;L;;;;;N;;;;0573;
+0544;ARMENIAN CAPITAL LETTER MEN;Lu;0;L;;;;;N;;;;0574;
+0545;ARMENIAN CAPITAL LETTER YI;Lu;0;L;;;;;N;;;;0575;
+0546;ARMENIAN CAPITAL LETTER NOW;Lu;0;L;;;;;N;;;;0576;
+0547;ARMENIAN CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0577;
+0548;ARMENIAN CAPITAL LETTER VO;Lu;0;L;;;;;N;;;;0578;
+0549;ARMENIAN CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;0579;
+054A;ARMENIAN CAPITAL LETTER PEH;Lu;0;L;;;;;N;;;;057A;
+054B;ARMENIAN CAPITAL LETTER JHEH;Lu;0;L;;;;;N;;;;057B;
+054C;ARMENIAN CAPITAL LETTER RA;Lu;0;L;;;;;N;;;;057C;
+054D;ARMENIAN CAPITAL LETTER SEH;Lu;0;L;;;;;N;;;;057D;
+054E;ARMENIAN CAPITAL LETTER VEW;Lu;0;L;;;;;N;;;;057E;
+054F;ARMENIAN CAPITAL LETTER TIWN;Lu;0;L;;;;;N;;;;057F;
+0550;ARMENIAN CAPITAL LETTER REH;Lu;0;L;;;;;N;;;;0580;
+0551;ARMENIAN CAPITAL LETTER CO;Lu;0;L;;;;;N;;;;0581;
+0552;ARMENIAN CAPITAL LETTER YIWN;Lu;0;L;;;;;N;;;;0582;
+0553;ARMENIAN CAPITAL LETTER PIWR;Lu;0;L;;;;;N;;;;0583;
+0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584;
+0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585;
+0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586;
+0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;;
+055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;;
+055C;ARMENIAN EXCLAMATION MARK;Po;0;L;;;;;N;;;;;
+055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
+055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
+055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
+0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
+0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
+0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
+0564;ARMENIAN SMALL LETTER DA;Ll;0;L;;;;;N;;;0534;;0534
+0565;ARMENIAN SMALL LETTER ECH;Ll;0;L;;;;;N;;;0535;;0535
+0566;ARMENIAN SMALL LETTER ZA;Ll;0;L;;;;;N;;;0536;;0536
+0567;ARMENIAN SMALL LETTER EH;Ll;0;L;;;;;N;;;0537;;0537
+0568;ARMENIAN SMALL LETTER ET;Ll;0;L;;;;;N;;;0538;;0538
+0569;ARMENIAN SMALL LETTER TO;Ll;0;L;;;;;N;;;0539;;0539
+056A;ARMENIAN SMALL LETTER ZHE;Ll;0;L;;;;;N;;;053A;;053A
+056B;ARMENIAN SMALL LETTER INI;Ll;0;L;;;;;N;;;053B;;053B
+056C;ARMENIAN SMALL LETTER LIWN;Ll;0;L;;;;;N;;;053C;;053C
+056D;ARMENIAN SMALL LETTER XEH;Ll;0;L;;;;;N;;;053D;;053D
+056E;ARMENIAN SMALL LETTER CA;Ll;0;L;;;;;N;;;053E;;053E
+056F;ARMENIAN SMALL LETTER KEN;Ll;0;L;;;;;N;;;053F;;053F
+0570;ARMENIAN SMALL LETTER HO;Ll;0;L;;;;;N;;;0540;;0540
+0571;ARMENIAN SMALL LETTER JA;Ll;0;L;;;;;N;;;0541;;0541
+0572;ARMENIAN SMALL LETTER GHAD;Ll;0;L;;;;;N;ARMENIAN SMALL LETTER LAD;;0542;;0542
+0573;ARMENIAN SMALL LETTER CHEH;Ll;0;L;;;;;N;;;0543;;0543
+0574;ARMENIAN SMALL LETTER MEN;Ll;0;L;;;;;N;;;0544;;0544
+0575;ARMENIAN SMALL LETTER YI;Ll;0;L;;;;;N;;;0545;;0545
+0576;ARMENIAN SMALL LETTER NOW;Ll;0;L;;;;;N;;;0546;;0546
+0577;ARMENIAN SMALL LETTER SHA;Ll;0;L;;;;;N;;;0547;;0547
+0578;ARMENIAN SMALL LETTER VO;Ll;0;L;;;;;N;;;0548;;0548
+0579;ARMENIAN SMALL LETTER CHA;Ll;0;L;;;;;N;;;0549;;0549
+057A;ARMENIAN SMALL LETTER PEH;Ll;0;L;;;;;N;;;054A;;054A
+057B;ARMENIAN SMALL LETTER JHEH;Ll;0;L;;;;;N;;;054B;;054B
+057C;ARMENIAN SMALL LETTER RA;Ll;0;L;;;;;N;;;054C;;054C
+057D;ARMENIAN SMALL LETTER SEH;Ll;0;L;;;;;N;;;054D;;054D
+057E;ARMENIAN SMALL LETTER VEW;Ll;0;L;;;;;N;;;054E;;054E
+057F;ARMENIAN SMALL LETTER TIWN;Ll;0;L;;;;;N;;;054F;;054F
+0580;ARMENIAN SMALL LETTER REH;Ll;0;L;;;;;N;;;0550;;0550
+0581;ARMENIAN SMALL LETTER CO;Ll;0;L;;;;;N;;;0551;;0551
+0582;ARMENIAN SMALL LETTER YIWN;Ll;0;L;;;;;N;;;0552;;0552
+0583;ARMENIAN SMALL LETTER PIWR;Ll;0;L;;;;;N;;;0553;;0553
+0584;ARMENIAN SMALL LETTER KEH;Ll;0;L;;;;;N;;;0554;;0554
+0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
+0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
+0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L;<compat> 0565 0582;;;;N;;;;;
+0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
+058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
+058D;RIGHT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
+058E;LEFT-FACING ARMENIAN ETERNITY SIGN;So;0;ON;;;;;N;;;;;
+058F;ARMENIAN DRAM SIGN;Sc;0;ET;;;;;N;;;;;
+0591;HEBREW ACCENT ETNAHTA;Mn;220;NSM;;;;;N;;;;;
+0592;HEBREW ACCENT SEGOL;Mn;230;NSM;;;;;N;;;;;
+0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;;
+0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;;
+0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;;
+0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;;;;
+0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;;
+0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;;;;
+0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;;
+059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;;
+059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;;
+059C;HEBREW ACCENT GERESH;Mn;230;NSM;;;;;N;;;;;
+059D;HEBREW ACCENT GERESH MUQDAM;Mn;230;NSM;;;;;N;;;;;
+059E;HEBREW ACCENT GERSHAYIM;Mn;230;NSM;;;;;N;;;;;
+059F;HEBREW ACCENT QARNEY PARA;Mn;230;NSM;;;;;N;;;;;
+05A0;HEBREW ACCENT TELISHA GEDOLA;Mn;230;NSM;;;;;N;;;;;
+05A1;HEBREW ACCENT PAZER;Mn;230;NSM;;;;;N;;;;;
+05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;;
+05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;;
+05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;;
+05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;;;;
+05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;;
+05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;;
+05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;;;;
+05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;;
+05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;;;;
+05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;;
+05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;;
+05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;;
+05AE;HEBREW ACCENT ZINOR;Mn;228;NSM;;;;;N;;;;;
+05AF;HEBREW MARK MASORA CIRCLE;Mn;230;NSM;;;;;N;;;;;
+05B0;HEBREW POINT SHEVA;Mn;10;NSM;;;;;N;;;;;
+05B1;HEBREW POINT HATAF SEGOL;Mn;11;NSM;;;;;N;;;;;
+05B2;HEBREW POINT HATAF PATAH;Mn;12;NSM;;;;;N;;;;;
+05B3;HEBREW POINT HATAF QAMATS;Mn;13;NSM;;;;;N;;;;;
+05B4;HEBREW POINT HIRIQ;Mn;14;NSM;;;;;N;;;;;
+05B5;HEBREW POINT TSERE;Mn;15;NSM;;;;;N;;;;;
+05B6;HEBREW POINT SEGOL;Mn;16;NSM;;;;;N;;;;;
+05B7;HEBREW POINT PATAH;Mn;17;NSM;;;;;N;;;;;
+05B8;HEBREW POINT QAMATS;Mn;18;NSM;;;;;N;;;;;
+05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;;
+05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;;
+05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;;
+05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;;;;
+05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;;;;
+05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;;
+05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;;
+05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;;;;
+05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;;
+05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;;
+05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;;;;
+05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;;
+05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;;
+05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;;
+05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;;
+05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;;
+05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;;
+05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+05D3;HEBREW LETTER DALET;Lo;0;R;;;;;N;;;;;
+05D4;HEBREW LETTER HE;Lo;0;R;;;;;N;;;;;
+05D5;HEBREW LETTER VAV;Lo;0;R;;;;;N;;;;;
+05D6;HEBREW LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+05D7;HEBREW LETTER HET;Lo;0;R;;;;;N;;;;;
+05D8;HEBREW LETTER TET;Lo;0;R;;;;;N;;;;;
+05D9;HEBREW LETTER YOD;Lo;0;R;;;;;N;;;;;
+05DA;HEBREW LETTER FINAL KAF;Lo;0;R;;;;;N;;;;;
+05DB;HEBREW LETTER KAF;Lo;0;R;;;;;N;;;;;
+05DC;HEBREW LETTER LAMED;Lo;0;R;;;;;N;;;;;
+05DD;HEBREW LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
+05DE;HEBREW LETTER MEM;Lo;0;R;;;;;N;;;;;
+05DF;HEBREW LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+05E0;HEBREW LETTER NUN;Lo;0;R;;;;;N;;;;;
+05E1;HEBREW LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+05E2;HEBREW LETTER AYIN;Lo;0;R;;;;;N;;;;;
+05E3;HEBREW LETTER FINAL PE;Lo;0;R;;;;;N;;;;;
+05E4;HEBREW LETTER PE;Lo;0;R;;;;;N;;;;;
+05E5;HEBREW LETTER FINAL TSADI;Lo;0;R;;;;;N;;;;;
+05E6;HEBREW LETTER TSADI;Lo;0;R;;;;;N;;;;;
+05E7;HEBREW LETTER QOF;Lo;0;R;;;;;N;;;;;
+05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
+05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
+05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
+05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
+05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
+05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
+05F3;HEBREW PUNCTUATION GERESH;Po;0;R;;;;;N;;;;;
+05F4;HEBREW PUNCTUATION GERSHAYIM;Po;0;R;;;;;N;;;;;
+0600;ARABIC NUMBER SIGN;Cf;0;AN;;;;;N;;;;;
+0601;ARABIC SIGN SANAH;Cf;0;AN;;;;;N;;;;;
+0602;ARABIC FOOTNOTE MARKER;Cf;0;AN;;;;;N;;;;;
+0603;ARABIC SIGN SAFHA;Cf;0;AN;;;;;N;;;;;
+0604;ARABIC SIGN SAMVAT;Cf;0;AN;;;;;N;;;;;
+0605;ARABIC NUMBER MARK ABOVE;Cf;0;AN;;;;;N;;;;;
+0606;ARABIC-INDIC CUBE ROOT;Sm;0;ON;;;;;N;;;;;
+0607;ARABIC-INDIC FOURTH ROOT;Sm;0;ON;;;;;N;;;;;
+0608;ARABIC RAY;Sm;0;AL;;;;;N;;;;;
+0609;ARABIC-INDIC PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+060A;ARABIC-INDIC PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+060B;AFGHANI SIGN;Sc;0;AL;;;;;N;;;;;
+060C;ARABIC COMMA;Po;0;CS;;;;;N;;;;;
+060D;ARABIC DATE SEPARATOR;Po;0;AL;;;;;N;;;;;
+060E;ARABIC POETIC VERSE SIGN;So;0;ON;;;;;N;;;;;
+060F;ARABIC SIGN MISRA;So;0;ON;;;;;N;;;;;
+0610;ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0611;ARABIC SIGN ALAYHE ASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0612;ARABIC SIGN RAHMATULLAH ALAYHE;Mn;230;NSM;;;;;N;;;;;
+0613;ARABIC SIGN RADI ALLAHOU ANHU;Mn;230;NSM;;;;;N;;;;;
+0614;ARABIC SIGN TAKHALLUS;Mn;230;NSM;;;;;N;;;;;
+0615;ARABIC SMALL HIGH TAH;Mn;230;NSM;;;;;N;;;;;
+0616;ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH;Mn;230;NSM;;;;;N;;;;;
+0617;ARABIC SMALL HIGH ZAIN;Mn;230;NSM;;;;;N;;;;;
+0618;ARABIC SMALL FATHA;Mn;30;NSM;;;;;N;;;;;
+0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;;
+061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
+061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
+061C;ARABIC LETTER MARK;Cf;0;AL;;;;;N;;;;;
+061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;;
+061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;;
+0620;ARABIC LETTER KASHMIRI YEH;Lo;0;AL;;;;;N;;;;;
+0621;ARABIC LETTER HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH;;;;
+0622;ARABIC LETTER ALEF WITH MADDA ABOVE;Lo;0;AL;0627 0653;;;;N;ARABIC LETTER MADDAH ON ALEF;;;;
+0623;ARABIC LETTER ALEF WITH HAMZA ABOVE;Lo;0;AL;0627 0654;;;;N;ARABIC LETTER HAMZAH ON ALEF;;;;
+0624;ARABIC LETTER WAW WITH HAMZA ABOVE;Lo;0;AL;0648 0654;;;;N;ARABIC LETTER HAMZAH ON WAW;;;;
+0625;ARABIC LETTER ALEF WITH HAMZA BELOW;Lo;0;AL;0627 0655;;;;N;ARABIC LETTER HAMZAH UNDER ALEF;;;;
+0626;ARABIC LETTER YEH WITH HAMZA ABOVE;Lo;0;AL;064A 0654;;;;N;ARABIC LETTER HAMZAH ON YA;;;;
+0627;ARABIC LETTER ALEF;Lo;0;AL;;;;;N;;;;;
+0628;ARABIC LETTER BEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA;;;;
+0629;ARABIC LETTER TEH MARBUTA;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH;;;;
+062A;ARABIC LETTER TEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA;;;;
+062B;ARABIC LETTER THEH;Lo;0;AL;;;;;N;ARABIC LETTER THAA;;;;
+062C;ARABIC LETTER JEEM;Lo;0;AL;;;;;N;;;;;
+062D;ARABIC LETTER HAH;Lo;0;AL;;;;;N;ARABIC LETTER HAA;;;;
+062E;ARABIC LETTER KHAH;Lo;0;AL;;;;;N;ARABIC LETTER KHAA;;;;
+062F;ARABIC LETTER DAL;Lo;0;AL;;;;;N;;;;;
+0630;ARABIC LETTER THAL;Lo;0;AL;;;;;N;;;;;
+0631;ARABIC LETTER REH;Lo;0;AL;;;;;N;ARABIC LETTER RA;;;;
+0632;ARABIC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+0633;ARABIC LETTER SEEN;Lo;0;AL;;;;;N;;;;;
+0634;ARABIC LETTER SHEEN;Lo;0;AL;;;;;N;;;;;
+0635;ARABIC LETTER SAD;Lo;0;AL;;;;;N;;;;;
+0636;ARABIC LETTER DAD;Lo;0;AL;;;;;N;;;;;
+0637;ARABIC LETTER TAH;Lo;0;AL;;;;;N;;;;;
+0638;ARABIC LETTER ZAH;Lo;0;AL;;;;;N;ARABIC LETTER DHAH;;;;
+0639;ARABIC LETTER AIN;Lo;0;AL;;;;;N;;;;;
+063A;ARABIC LETTER GHAIN;Lo;0;AL;;;;;N;;;;;
+063B;ARABIC LETTER KEHEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063C;ARABIC LETTER KEHEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+063D;ARABIC LETTER FARSI YEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+063E;ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063F;ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0640;ARABIC TATWEEL;Lm;0;AL;;;;;N;;;;;
+0641;ARABIC LETTER FEH;Lo;0;AL;;;;;N;ARABIC LETTER FA;;;;
+0642;ARABIC LETTER QAF;Lo;0;AL;;;;;N;;;;;
+0643;ARABIC LETTER KAF;Lo;0;AL;;;;;N;ARABIC LETTER CAF;;;;
+0644;ARABIC LETTER LAM;Lo;0;AL;;;;;N;;;;;
+0645;ARABIC LETTER MEEM;Lo;0;AL;;;;;N;;;;;
+0646;ARABIC LETTER NOON;Lo;0;AL;;;;;N;;;;;
+0647;ARABIC LETTER HEH;Lo;0;AL;;;;;N;ARABIC LETTER HA;;;;
+0648;ARABIC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0649;ARABIC LETTER ALEF MAKSURA;Lo;0;AL;;;;;N;ARABIC LETTER ALEF MAQSURAH;;;;
+064A;ARABIC LETTER YEH;Lo;0;AL;;;;;N;ARABIC LETTER YA;;;;
+064B;ARABIC FATHATAN;Mn;27;NSM;;;;;N;;;;;
+064C;ARABIC DAMMATAN;Mn;28;NSM;;;;;N;;;;;
+064D;ARABIC KASRATAN;Mn;29;NSM;;;;;N;;;;;
+064E;ARABIC FATHA;Mn;30;NSM;;;;;N;ARABIC FATHAH;;;;
+064F;ARABIC DAMMA;Mn;31;NSM;;;;;N;ARABIC DAMMAH;;;;
+0650;ARABIC KASRA;Mn;32;NSM;;;;;N;ARABIC KASRAH;;;;
+0651;ARABIC SHADDA;Mn;33;NSM;;;;;N;ARABIC SHADDAH;;;;
+0652;ARABIC SUKUN;Mn;34;NSM;;;;;N;;;;;
+0653;ARABIC MADDAH ABOVE;Mn;230;NSM;;;;;N;;;;;
+0654;ARABIC HAMZA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0655;ARABIC HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
+0656;ARABIC SUBSCRIPT ALEF;Mn;220;NSM;;;;;N;;;;;
+0657;ARABIC INVERTED DAMMA;Mn;230;NSM;;;;;N;;;;;
+0658;ARABIC MARK NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
+0659;ARABIC ZWARAKAY;Mn;230;NSM;;;;;N;;;;;
+065A;ARABIC VOWEL SIGN SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065B;ARABIC VOWEL SIGN INVERTED SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065C;ARABIC VOWEL SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+065D;ARABIC REVERSED DAMMA;Mn;230;NSM;;;;;N;;;;;
+065E;ARABIC FATHA WITH TWO DOTS;Mn;230;NSM;;;;;N;;;;;
+065F;ARABIC WAVY HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
+0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+0661;ARABIC-INDIC DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+0662;ARABIC-INDIC DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+0663;ARABIC-INDIC DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+0664;ARABIC-INDIC DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+0665;ARABIC-INDIC DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+0666;ARABIC-INDIC DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+0667;ARABIC-INDIC DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+0668;ARABIC-INDIC DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+0669;ARABIC-INDIC DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
+066A;ARABIC PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+066B;ARABIC DECIMAL SEPARATOR;Po;0;AN;;;;;N;;;;;
+066C;ARABIC THOUSANDS SEPARATOR;Po;0;AN;;;;;N;;;;;
+066D;ARABIC FIVE POINTED STAR;Po;0;AL;;;;;N;;;;;
+066E;ARABIC LETTER DOTLESS BEH;Lo;0;AL;;;;;N;;;;;
+066F;ARABIC LETTER DOTLESS QAF;Lo;0;AL;;;;;N;;;;;
+0670;ARABIC LETTER SUPERSCRIPT ALEF;Mn;35;NSM;;;;;N;ARABIC ALEF ABOVE;;;;
+0671;ARABIC LETTER ALEF WASLA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAT WASL ON ALEF;;;;
+0672;ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH ON ALEF;;;;
+0673;ARABIC LETTER ALEF WITH WAVY HAMZA BELOW;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH UNDER ALEF;;;;
+0674;ARABIC LETTER HIGH HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HIGH HAMZAH;;;;
+0675;ARABIC LETTER HIGH HAMZA ALEF;Lo;0;AL;<compat> 0627 0674;;;;N;ARABIC LETTER HIGH HAMZAH ALEF;;;;
+0676;ARABIC LETTER HIGH HAMZA WAW;Lo;0;AL;<compat> 0648 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW;;;;
+0677;ARABIC LETTER U WITH HAMZA ABOVE;Lo;0;AL;<compat> 06C7 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW WITH DAMMAH;;;;
+0678;ARABIC LETTER HIGH HAMZA YEH;Lo;0;AL;<compat> 064A 0674;;;;N;ARABIC LETTER HIGH HAMZAH YA;;;;
+0679;ARABIC LETTER TTEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH SMALL TAH;;;;
+067A;ARABIC LETTER TTEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH TWO DOTS VERTICAL ABOVE;;;;
+067B;ARABIC LETTER BEEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH TWO DOTS VERTICAL BELOW;;;;
+067C;ARABIC LETTER TEH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH RING;;;;
+067D;ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS ABOVE DOWNWARD;;;;
+067E;ARABIC LETTER PEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS BELOW;;;;
+067F;ARABIC LETTER TEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH FOUR DOTS ABOVE;;;;
+0680;ARABIC LETTER BEHEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH FOUR DOTS BELOW;;;;
+0681;ARABIC LETTER HAH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH ON HAA;;;;
+0682;ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH TWO DOTS VERTICAL ABOVE;;;;
+0683;ARABIC LETTER NYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS;;;;
+0684;ARABIC LETTER DYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS VERTICAL;;;;
+0685;ARABIC LETTER HAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH THREE DOTS ABOVE;;;;
+0686;ARABIC LETTER TCHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE THREE DOTS DOWNWARD;;;;
+0687;ARABIC LETTER TCHEHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE FOUR DOTS;;;;
+0688;ARABIC LETTER DDAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH SMALL TAH;;;;
+0689;ARABIC LETTER DAL WITH RING;Lo;0;AL;;;;;N;;;;;
+068A;ARABIC LETTER DAL WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+068B;ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+068C;ARABIC LETTER DAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS ABOVE;;;;
+068D;ARABIC LETTER DDAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS BELOW;;;;
+068E;ARABIC LETTER DUL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE;;;;
+068F;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARD;;;;
+0690;ARABIC LETTER DAL WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0691;ARABIC LETTER RREH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL TAH;;;;
+0692;ARABIC LETTER REH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V;;;;
+0693;ARABIC LETTER REH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH RING;;;;
+0694;ARABIC LETTER REH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW;;;;
+0695;ARABIC LETTER REH WITH SMALL V BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V BELOW;;;;
+0696;ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW AND DOT ABOVE;;;;
+0697;ARABIC LETTER REH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH TWO DOTS ABOVE;;;;
+0698;ARABIC LETTER JEH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH THREE DOTS ABOVE;;;;
+0699;ARABIC LETTER REH WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH FOUR DOTS ABOVE;;;;
+069A;ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+069B;ARABIC LETTER SEEN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069C;ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069D;ARABIC LETTER SAD WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069E;ARABIC LETTER SAD WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069F;ARABIC LETTER TAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A0;ARABIC LETTER AIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A1;ARABIC LETTER DOTLESS FEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS FA;;;;
+06A2;ARABIC LETTER FEH WITH DOT MOVED BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT MOVED BELOW;;;;
+06A3;ARABIC LETTER FEH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT BELOW;;;;
+06A4;ARABIC LETTER VEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS ABOVE;;;;
+06A5;ARABIC LETTER FEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS BELOW;;;;
+06A6;ARABIC LETTER PEHEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH FOUR DOTS ABOVE;;;;
+06A7;ARABIC LETTER QAF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06A8;ARABIC LETTER QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A9;ARABIC LETTER KEHEH;Lo;0;AL;;;;;N;ARABIC LETTER OPEN CAF;;;;
+06AA;ARABIC LETTER SWASH KAF;Lo;0;AL;;;;;N;ARABIC LETTER SWASH CAF;;;;
+06AB;ARABIC LETTER KAF WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH RING;;;;
+06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;;
+06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;;
+06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;;
+06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;;;;
+06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;;
+06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;;
+06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B3;ARABIC LETTER GUEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS VERTICAL BELOW;;;;
+06B4;ARABIC LETTER GAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B5;ARABIC LETTER LAM WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+06B6;ARABIC LETTER LAM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06B7;ARABIC LETTER LAM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B8;ARABIC LETTER LAM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B9;ARABIC LETTER NOON WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06BA;ARABIC LETTER NOON GHUNNA;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON;;;;
+06BB;ARABIC LETTER RNOON;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON WITH SMALL TAH;;;;
+06BC;ARABIC LETTER NOON WITH RING;Lo;0;AL;;;;;N;;;;;
+06BD;ARABIC LETTER NOON WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06BE;ARABIC LETTER HEH DOACHASHMEE;Lo;0;AL;;;;;N;ARABIC LETTER KNOTTED HA;;;;
+06BF;ARABIC LETTER TCHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06C0;ARABIC LETTER HEH WITH YEH ABOVE;Lo;0;AL;06D5 0654;;;;N;ARABIC LETTER HAMZAH ON HA;;;;
+06C1;ARABIC LETTER HEH GOAL;Lo;0;AL;;;;;N;ARABIC LETTER HA GOAL;;;;
+06C2;ARABIC LETTER HEH GOAL WITH HAMZA ABOVE;Lo;0;AL;06C1 0654;;;;N;ARABIC LETTER HAMZAH ON HA GOAL;;;;
+06C3;ARABIC LETTER TEH MARBUTA GOAL;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH GOAL;;;;
+06C4;ARABIC LETTER WAW WITH RING;Lo;0;AL;;;;;N;;;;;
+06C5;ARABIC LETTER KIRGHIZ OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH BAR;;;;
+06C6;ARABIC LETTER OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH SMALL V;;;;
+06C7;ARABIC LETTER U;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH DAMMAH;;;;
+06C8;ARABIC LETTER YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH ALEF ABOVE;;;;
+06C9;ARABIC LETTER KIRGHIZ YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH INVERTED SMALL V;;;;
+06CA;ARABIC LETTER WAW WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06CB;ARABIC LETTER VE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH THREE DOTS ABOVE;;;;
+06CC;ARABIC LETTER FARSI YEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS YA;;;;
+06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;;
+06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;;
+06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;;;;
+06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;;
+06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;;
+06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;;
+06D4;ARABIC FULL STOP;Po;0;AL;;;;;N;ARABIC PERIOD;;;;
+06D5;ARABIC LETTER AE;Lo;0;AL;;;;;N;;;;;
+06D6;ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D7;ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D8;ARABIC SMALL HIGH MEEM INITIAL FORM;Mn;230;NSM;;;;;N;;;;;
+06D9;ARABIC SMALL HIGH LAM ALEF;Mn;230;NSM;;;;;N;;;;;
+06DA;ARABIC SMALL HIGH JEEM;Mn;230;NSM;;;;;N;;;;;
+06DB;ARABIC SMALL HIGH THREE DOTS;Mn;230;NSM;;;;;N;;;;;
+06DC;ARABIC SMALL HIGH SEEN;Mn;230;NSM;;;;;N;;;;;
+06DD;ARABIC END OF AYAH;Cf;0;AN;;;;;N;;;;;
+06DE;ARABIC START OF RUB EL HIZB;So;0;ON;;;;;N;;;;;
+06DF;ARABIC SMALL HIGH ROUNDED ZERO;Mn;230;NSM;;;;;N;;;;;
+06E0;ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO;Mn;230;NSM;;;;;N;;;;;
+06E1;ARABIC SMALL HIGH DOTLESS HEAD OF KHAH;Mn;230;NSM;;;;;N;;;;;
+06E2;ARABIC SMALL HIGH MEEM ISOLATED FORM;Mn;230;NSM;;;;;N;;;;;
+06E3;ARABIC SMALL LOW SEEN;Mn;220;NSM;;;;;N;;;;;
+06E4;ARABIC SMALL HIGH MADDA;Mn;230;NSM;;;;;N;;;;;
+06E5;ARABIC SMALL WAW;Lm;0;AL;;;;;N;;;;;
+06E6;ARABIC SMALL YEH;Lm;0;AL;;;;;N;;;;;
+06E7;ARABIC SMALL HIGH YEH;Mn;230;NSM;;;;;N;;;;;
+06E8;ARABIC SMALL HIGH NOON;Mn;230;NSM;;;;;N;;;;;
+06E9;ARABIC PLACE OF SAJDAH;So;0;ON;;;;;N;;;;;
+06EA;ARABIC EMPTY CENTRE LOW STOP;Mn;220;NSM;;;;;N;;;;;
+06EB;ARABIC EMPTY CENTRE HIGH STOP;Mn;230;NSM;;;;;N;;;;;
+06EC;ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE;Mn;230;NSM;;;;;N;;;;;
+06ED;ARABIC SMALL LOW MEEM;Mn;220;NSM;;;;;N;;;;;
+06EE;ARABIC LETTER DAL WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06EF;ARABIC LETTER REH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06F0;EXTENDED ARABIC-INDIC DIGIT ZERO;Nd;0;EN;;0;0;0;N;EASTERN ARABIC-INDIC DIGIT ZERO;;;;
+06F1;EXTENDED ARABIC-INDIC DIGIT ONE;Nd;0;EN;;1;1;1;N;EASTERN ARABIC-INDIC DIGIT ONE;;;;
+06F2;EXTENDED ARABIC-INDIC DIGIT TWO;Nd;0;EN;;2;2;2;N;EASTERN ARABIC-INDIC DIGIT TWO;;;;
+06F3;EXTENDED ARABIC-INDIC DIGIT THREE;Nd;0;EN;;3;3;3;N;EASTERN ARABIC-INDIC DIGIT THREE;;;;
+06F4;EXTENDED ARABIC-INDIC DIGIT FOUR;Nd;0;EN;;4;4;4;N;EASTERN ARABIC-INDIC DIGIT FOUR;;;;
+06F5;EXTENDED ARABIC-INDIC DIGIT FIVE;Nd;0;EN;;5;5;5;N;EASTERN ARABIC-INDIC DIGIT FIVE;;;;
+06F6;EXTENDED ARABIC-INDIC DIGIT SIX;Nd;0;EN;;6;6;6;N;EASTERN ARABIC-INDIC DIGIT SIX;;;;
+06F7;EXTENDED ARABIC-INDIC DIGIT SEVEN;Nd;0;EN;;7;7;7;N;EASTERN ARABIC-INDIC DIGIT SEVEN;;;;
+06F8;EXTENDED ARABIC-INDIC DIGIT EIGHT;Nd;0;EN;;8;8;8;N;EASTERN ARABIC-INDIC DIGIT EIGHT;;;;
+06F9;EXTENDED ARABIC-INDIC DIGIT NINE;Nd;0;EN;;9;9;9;N;EASTERN ARABIC-INDIC DIGIT NINE;;;;
+06FA;ARABIC LETTER SHEEN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FB;ARABIC LETTER DAD WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FC;ARABIC LETTER GHAIN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FD;ARABIC SIGN SINDHI AMPERSAND;So;0;AL;;;;;N;;;;;
+06FE;ARABIC SIGN SINDHI POSTPOSITION MEN;So;0;AL;;;;;N;;;;;
+06FF;ARABIC LETTER HEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+0700;SYRIAC END OF PARAGRAPH;Po;0;AL;;;;;N;;;;;
+0701;SYRIAC SUPRALINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0702;SYRIAC SUBLINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0703;SYRIAC SUPRALINEAR COLON;Po;0;AL;;;;;N;;;;;
+0704;SYRIAC SUBLINEAR COLON;Po;0;AL;;;;;N;;;;;
+0705;SYRIAC HORIZONTAL COLON;Po;0;AL;;;;;N;;;;;
+0706;SYRIAC COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0707;SYRIAC COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+0708;SYRIAC SUPRALINEAR COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0709;SYRIAC SUBLINEAR COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+070A;SYRIAC CONTRACTION;Po;0;AL;;;;;N;;;;;
+070B;SYRIAC HARKLEAN OBELUS;Po;0;AL;;;;;N;;;;;
+070C;SYRIAC HARKLEAN METOBELUS;Po;0;AL;;;;;N;;;;;
+070D;SYRIAC HARKLEAN ASTERISCUS;Po;0;AL;;;;;N;;;;;
+070F;SYRIAC ABBREVIATION MARK;Cf;0;AL;;;;;N;;;;;
+0710;SYRIAC LETTER ALAPH;Lo;0;AL;;;;;N;;;;;
+0711;SYRIAC LETTER SUPERSCRIPT ALAPH;Mn;36;NSM;;;;;N;;;;;
+0712;SYRIAC LETTER BETH;Lo;0;AL;;;;;N;;;;;
+0713;SYRIAC LETTER GAMAL;Lo;0;AL;;;;;N;;;;;
+0714;SYRIAC LETTER GAMAL GARSHUNI;Lo;0;AL;;;;;N;;;;;
+0715;SYRIAC LETTER DALATH;Lo;0;AL;;;;;N;;;;;
+0716;SYRIAC LETTER DOTLESS DALATH RISH;Lo;0;AL;;;;;N;;;;;
+0717;SYRIAC LETTER HE;Lo;0;AL;;;;;N;;;;;
+0718;SYRIAC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0719;SYRIAC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+071A;SYRIAC LETTER HETH;Lo;0;AL;;;;;N;;;;;
+071B;SYRIAC LETTER TETH;Lo;0;AL;;;;;N;;;;;
+071C;SYRIAC LETTER TETH GARSHUNI;Lo;0;AL;;;;;N;;;;;
+071D;SYRIAC LETTER YUDH;Lo;0;AL;;;;;N;;;;;
+071E;SYRIAC LETTER YUDH HE;Lo;0;AL;;;;;N;;;;;
+071F;SYRIAC LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+0720;SYRIAC LETTER LAMADH;Lo;0;AL;;;;;N;;;;;
+0721;SYRIAC LETTER MIM;Lo;0;AL;;;;;N;;;;;
+0722;SYRIAC LETTER NUN;Lo;0;AL;;;;;N;;;;;
+0723;SYRIAC LETTER SEMKATH;Lo;0;AL;;;;;N;;;;;
+0724;SYRIAC LETTER FINAL SEMKATH;Lo;0;AL;;;;;N;;;;;
+0725;SYRIAC LETTER E;Lo;0;AL;;;;;N;;;;;
+0726;SYRIAC LETTER PE;Lo;0;AL;;;;;N;;;;;
+0727;SYRIAC LETTER REVERSED PE;Lo;0;AL;;;;;N;;;;;
+0728;SYRIAC LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+0729;SYRIAC LETTER QAPH;Lo;0;AL;;;;;N;;;;;
+072A;SYRIAC LETTER RISH;Lo;0;AL;;;;;N;;;;;
+072B;SYRIAC LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+072C;SYRIAC LETTER TAW;Lo;0;AL;;;;;N;;;;;
+072D;SYRIAC LETTER PERSIAN BHETH;Lo;0;AL;;;;;N;;;;;
+072E;SYRIAC LETTER PERSIAN GHAMAL;Lo;0;AL;;;;;N;;;;;
+072F;SYRIAC LETTER PERSIAN DHALATH;Lo;0;AL;;;;;N;;;;;
+0730;SYRIAC PTHAHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0731;SYRIAC PTHAHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0732;SYRIAC PTHAHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0733;SYRIAC ZQAPHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0734;SYRIAC ZQAPHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0735;SYRIAC ZQAPHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0736;SYRIAC RBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0737;SYRIAC RBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+0738;SYRIAC DOTTED ZLAMA HORIZONTAL;Mn;220;NSM;;;;;N;;;;;
+0739;SYRIAC DOTTED ZLAMA ANGULAR;Mn;220;NSM;;;;;N;;;;;
+073A;SYRIAC HBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073B;SYRIAC HBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073C;SYRIAC HBASA-ESASA DOTTED;Mn;220;NSM;;;;;N;;;;;
+073D;SYRIAC ESASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073E;SYRIAC ESASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073F;SYRIAC RWAHA;Mn;230;NSM;;;;;N;;;;;
+0740;SYRIAC FEMININE DOT;Mn;230;NSM;;;;;N;;;;;
+0741;SYRIAC QUSHSHAYA;Mn;230;NSM;;;;;N;;;;;
+0742;SYRIAC RUKKAKHA;Mn;220;NSM;;;;;N;;;;;
+0743;SYRIAC TWO VERTICAL DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0744;SYRIAC TWO VERTICAL DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0745;SYRIAC THREE DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0746;SYRIAC THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0747;SYRIAC OBLIQUE LINE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0748;SYRIAC OBLIQUE LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0749;SYRIAC MUSIC;Mn;230;NSM;;;;;N;;;;;
+074A;SYRIAC BARREKH;Mn;230;NSM;;;;;N;;;;;
+074D;SYRIAC LETTER SOGDIAN ZHAIN;Lo;0;AL;;;;;N;;;;;
+074E;SYRIAC LETTER SOGDIAN KHAPH;Lo;0;AL;;;;;N;;;;;
+074F;SYRIAC LETTER SOGDIAN FE;Lo;0;AL;;;;;N;;;;;
+0750;ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW;Lo;0;AL;;;;;N;;;;;
+0751;ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0752;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0753;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0754;ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0755;ARABIC LETTER BEH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+0756;ARABIC LETTER BEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+0757;ARABIC LETTER HAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0758;ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0759;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+075A;ARABIC LETTER DAL WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+075B;ARABIC LETTER REH WITH STROKE;Lo;0;AL;;;;;N;;;;;
+075C;ARABIC LETTER SEEN WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075D;ARABIC LETTER AIN WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075E;ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE;Lo;0;AL;;;;;N;;;;;
+075F;ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+0760;ARABIC LETTER FEH WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0761;ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0762;ARABIC LETTER KEHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0763;ARABIC LETTER KEHEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0764;ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0765;ARABIC LETTER MEEM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0766;ARABIC LETTER MEEM WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+0767;ARABIC LETTER NOON WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0768;ARABIC LETTER NOON WITH SMALL TAH;Lo;0;AL;;;;;N;;;;;
+0769;ARABIC LETTER NOON WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+076A;ARABIC LETTER LAM WITH BAR;Lo;0;AL;;;;;N;;;;;
+076B;ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076C;ARABIC LETTER REH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+076D;ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076E;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW;Lo;0;AL;;;;;N;;;;;
+076F;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0770;ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0771;ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0772;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;;
+0773;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0774;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0775;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0776;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0777;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+0778;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0779;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077A;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+077B;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077C;ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+077D;ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE;Lo;0;AL;;;;;N;;;;;
+077E;ARABIC LETTER SEEN WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+077F;ARABIC LETTER KAF WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0780;THAANA LETTER HAA;Lo;0;AL;;;;;N;;;;;
+0781;THAANA LETTER SHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0782;THAANA LETTER NOONU;Lo;0;AL;;;;;N;;;;;
+0783;THAANA LETTER RAA;Lo;0;AL;;;;;N;;;;;
+0784;THAANA LETTER BAA;Lo;0;AL;;;;;N;;;;;
+0785;THAANA LETTER LHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0786;THAANA LETTER KAAFU;Lo;0;AL;;;;;N;;;;;
+0787;THAANA LETTER ALIFU;Lo;0;AL;;;;;N;;;;;
+0788;THAANA LETTER VAAVU;Lo;0;AL;;;;;N;;;;;
+0789;THAANA LETTER MEEMU;Lo;0;AL;;;;;N;;;;;
+078A;THAANA LETTER FAAFU;Lo;0;AL;;;;;N;;;;;
+078B;THAANA LETTER DHAALU;Lo;0;AL;;;;;N;;;;;
+078C;THAANA LETTER THAA;Lo;0;AL;;;;;N;;;;;
+078D;THAANA LETTER LAAMU;Lo;0;AL;;;;;N;;;;;
+078E;THAANA LETTER GAAFU;Lo;0;AL;;;;;N;;;;;
+078F;THAANA LETTER GNAVIYANI;Lo;0;AL;;;;;N;;;;;
+0790;THAANA LETTER SEENU;Lo;0;AL;;;;;N;;;;;
+0791;THAANA LETTER DAVIYANI;Lo;0;AL;;;;;N;;;;;
+0792;THAANA LETTER ZAVIYANI;Lo;0;AL;;;;;N;;;;;
+0793;THAANA LETTER TAVIYANI;Lo;0;AL;;;;;N;;;;;
+0794;THAANA LETTER YAA;Lo;0;AL;;;;;N;;;;;
+0795;THAANA LETTER PAVIYANI;Lo;0;AL;;;;;N;;;;;
+0796;THAANA LETTER JAVIYANI;Lo;0;AL;;;;;N;;;;;
+0797;THAANA LETTER CHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0798;THAANA LETTER TTAA;Lo;0;AL;;;;;N;;;;;
+0799;THAANA LETTER HHAA;Lo;0;AL;;;;;N;;;;;
+079A;THAANA LETTER KHAA;Lo;0;AL;;;;;N;;;;;
+079B;THAANA LETTER THAALU;Lo;0;AL;;;;;N;;;;;
+079C;THAANA LETTER ZAA;Lo;0;AL;;;;;N;;;;;
+079D;THAANA LETTER SHEENU;Lo;0;AL;;;;;N;;;;;
+079E;THAANA LETTER SAADHU;Lo;0;AL;;;;;N;;;;;
+079F;THAANA LETTER DAADHU;Lo;0;AL;;;;;N;;;;;
+07A0;THAANA LETTER TO;Lo;0;AL;;;;;N;;;;;
+07A1;THAANA LETTER ZO;Lo;0;AL;;;;;N;;;;;
+07A2;THAANA LETTER AINU;Lo;0;AL;;;;;N;;;;;
+07A3;THAANA LETTER GHAINU;Lo;0;AL;;;;;N;;;;;
+07A4;THAANA LETTER QAAFU;Lo;0;AL;;;;;N;;;;;
+07A5;THAANA LETTER WAAVU;Lo;0;AL;;;;;N;;;;;
+07A6;THAANA ABAFILI;Mn;0;NSM;;;;;N;;;;;
+07A7;THAANA AABAAFILI;Mn;0;NSM;;;;;N;;;;;
+07A8;THAANA IBIFILI;Mn;0;NSM;;;;;N;;;;;
+07A9;THAANA EEBEEFILI;Mn;0;NSM;;;;;N;;;;;
+07AA;THAANA UBUFILI;Mn;0;NSM;;;;;N;;;;;
+07AB;THAANA OOBOOFILI;Mn;0;NSM;;;;;N;;;;;
+07AC;THAANA EBEFILI;Mn;0;NSM;;;;;N;;;;;
+07AD;THAANA EYBEYFILI;Mn;0;NSM;;;;;N;;;;;
+07AE;THAANA OBOFILI;Mn;0;NSM;;;;;N;;;;;
+07AF;THAANA OABOAFILI;Mn;0;NSM;;;;;N;;;;;
+07B0;THAANA SUKUN;Mn;0;NSM;;;;;N;;;;;
+07B1;THAANA LETTER NAA;Lo;0;AL;;;;;N;;;;;
+07C0;NKO DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+07C1;NKO DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+07C2;NKO DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+07C3;NKO DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+07C4;NKO DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+07C5;NKO DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+07C6;NKO DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+07C7;NKO DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+07C8;NKO DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+07C9;NKO DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+07CA;NKO LETTER A;Lo;0;R;;;;;N;;;;;
+07CB;NKO LETTER EE;Lo;0;R;;;;;N;;;;;
+07CC;NKO LETTER I;Lo;0;R;;;;;N;;;;;
+07CD;NKO LETTER E;Lo;0;R;;;;;N;;;;;
+07CE;NKO LETTER U;Lo;0;R;;;;;N;;;;;
+07CF;NKO LETTER OO;Lo;0;R;;;;;N;;;;;
+07D0;NKO LETTER O;Lo;0;R;;;;;N;;;;;
+07D1;NKO LETTER DAGBASINNA;Lo;0;R;;;;;N;;;;;
+07D2;NKO LETTER N;Lo;0;R;;;;;N;;;;;
+07D3;NKO LETTER BA;Lo;0;R;;;;;N;;;;;
+07D4;NKO LETTER PA;Lo;0;R;;;;;N;;;;;
+07D5;NKO LETTER TA;Lo;0;R;;;;;N;;;;;
+07D6;NKO LETTER JA;Lo;0;R;;;;;N;;;;;
+07D7;NKO LETTER CHA;Lo;0;R;;;;;N;;;;;
+07D8;NKO LETTER DA;Lo;0;R;;;;;N;;;;;
+07D9;NKO LETTER RA;Lo;0;R;;;;;N;;;;;
+07DA;NKO LETTER RRA;Lo;0;R;;;;;N;;;;;
+07DB;NKO LETTER SA;Lo;0;R;;;;;N;;;;;
+07DC;NKO LETTER GBA;Lo;0;R;;;;;N;;;;;
+07DD;NKO LETTER FA;Lo;0;R;;;;;N;;;;;
+07DE;NKO LETTER KA;Lo;0;R;;;;;N;;;;;
+07DF;NKO LETTER LA;Lo;0;R;;;;;N;;;;;
+07E0;NKO LETTER NA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E1;NKO LETTER MA;Lo;0;R;;;;;N;;;;;
+07E2;NKO LETTER NYA;Lo;0;R;;;;;N;;;;;
+07E3;NKO LETTER NA;Lo;0;R;;;;;N;;;;;
+07E4;NKO LETTER HA;Lo;0;R;;;;;N;;;;;
+07E5;NKO LETTER WA;Lo;0;R;;;;;N;;;;;
+07E6;NKO LETTER YA;Lo;0;R;;;;;N;;;;;
+07E7;NKO LETTER NYA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E8;NKO LETTER JONA JA;Lo;0;R;;;;;N;;;;;
+07E9;NKO LETTER JONA CHA;Lo;0;R;;;;;N;;;;;
+07EA;NKO LETTER JONA RA;Lo;0;R;;;;;N;;;;;
+07EB;NKO COMBINING SHORT HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07EC;NKO COMBINING SHORT LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07ED;NKO COMBINING SHORT RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07EE;NKO COMBINING LONG DESCENDING TONE;Mn;230;NSM;;;;;N;;;;;
+07EF;NKO COMBINING LONG HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07F0;NKO COMBINING LONG LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07F1;NKO COMBINING LONG RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07F2;NKO COMBINING NASALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
+07F3;NKO COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+07F4;NKO HIGH TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F5;NKO LOW TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F6;NKO SYMBOL OO DENNEN;So;0;ON;;;;;N;;;;;
+07F7;NKO SYMBOL GBAKURUNEN;Po;0;ON;;;;;N;;;;;
+07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
+07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;;
+0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;;
+0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;;
+0803;SAMARITAN LETTER DALAT;Lo;0;R;;;;;N;;;;;
+0804;SAMARITAN LETTER IY;Lo;0;R;;;;;N;;;;;
+0805;SAMARITAN LETTER BAA;Lo;0;R;;;;;N;;;;;
+0806;SAMARITAN LETTER ZEN;Lo;0;R;;;;;N;;;;;
+0807;SAMARITAN LETTER IT;Lo;0;R;;;;;N;;;;;
+0808;SAMARITAN LETTER TIT;Lo;0;R;;;;;N;;;;;
+0809;SAMARITAN LETTER YUT;Lo;0;R;;;;;N;;;;;
+080A;SAMARITAN LETTER KAAF;Lo;0;R;;;;;N;;;;;
+080B;SAMARITAN LETTER LABAT;Lo;0;R;;;;;N;;;;;
+080C;SAMARITAN LETTER MIM;Lo;0;R;;;;;N;;;;;
+080D;SAMARITAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+080E;SAMARITAN LETTER SINGAAT;Lo;0;R;;;;;N;;;;;
+080F;SAMARITAN LETTER IN;Lo;0;R;;;;;N;;;;;
+0810;SAMARITAN LETTER FI;Lo;0;R;;;;;N;;;;;
+0811;SAMARITAN LETTER TSAADIY;Lo;0;R;;;;;N;;;;;
+0812;SAMARITAN LETTER QUF;Lo;0;R;;;;;N;;;;;
+0813;SAMARITAN LETTER RISH;Lo;0;R;;;;;N;;;;;
+0814;SAMARITAN LETTER SHAN;Lo;0;R;;;;;N;;;;;
+0815;SAMARITAN LETTER TAAF;Lo;0;R;;;;;N;;;;;
+0816;SAMARITAN MARK IN;Mn;230;NSM;;;;;N;;;;;
+0817;SAMARITAN MARK IN-ALAF;Mn;230;NSM;;;;;N;;;;;
+0818;SAMARITAN MARK OCCLUSION;Mn;230;NSM;;;;;N;;;;;
+0819;SAMARITAN MARK DAGESH;Mn;230;NSM;;;;;N;;;;;
+081A;SAMARITAN MODIFIER LETTER EPENTHETIC YUT;Lm;0;R;;;;;N;;;;;
+081B;SAMARITAN MARK EPENTHETIC YUT;Mn;230;NSM;;;;;N;;;;;
+081C;SAMARITAN VOWEL SIGN LONG E;Mn;230;NSM;;;;;N;;;;;
+081D;SAMARITAN VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;;
+081E;SAMARITAN VOWEL SIGN OVERLONG AA;Mn;230;NSM;;;;;N;;;;;
+081F;SAMARITAN VOWEL SIGN LONG AA;Mn;230;NSM;;;;;N;;;;;
+0820;SAMARITAN VOWEL SIGN AA;Mn;230;NSM;;;;;N;;;;;
+0821;SAMARITAN VOWEL SIGN OVERLONG A;Mn;230;NSM;;;;;N;;;;;
+0822;SAMARITAN VOWEL SIGN LONG A;Mn;230;NSM;;;;;N;;;;;
+0823;SAMARITAN VOWEL SIGN A;Mn;230;NSM;;;;;N;;;;;
+0824;SAMARITAN MODIFIER LETTER SHORT A;Lm;0;R;;;;;N;;;;;
+0825;SAMARITAN VOWEL SIGN SHORT A;Mn;230;NSM;;;;;N;;;;;
+0826;SAMARITAN VOWEL SIGN LONG U;Mn;230;NSM;;;;;N;;;;;
+0827;SAMARITAN VOWEL SIGN U;Mn;230;NSM;;;;;N;;;;;
+0828;SAMARITAN MODIFIER LETTER I;Lm;0;R;;;;;N;;;;;
+0829;SAMARITAN VOWEL SIGN LONG I;Mn;230;NSM;;;;;N;;;;;
+082A;SAMARITAN VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+082B;SAMARITAN VOWEL SIGN O;Mn;230;NSM;;;;;N;;;;;
+082C;SAMARITAN VOWEL SIGN SUKUN;Mn;230;NSM;;;;;N;;;;;
+082D;SAMARITAN MARK NEQUDAA;Mn;230;NSM;;;;;N;;;;;
+0830;SAMARITAN PUNCTUATION NEQUDAA;Po;0;R;;;;;N;;;;;
+0831;SAMARITAN PUNCTUATION AFSAAQ;Po;0;R;;;;;N;;;;;
+0832;SAMARITAN PUNCTUATION ANGED;Po;0;R;;;;;N;;;;;
+0833;SAMARITAN PUNCTUATION BAU;Po;0;R;;;;;N;;;;;
+0834;SAMARITAN PUNCTUATION ATMAAU;Po;0;R;;;;;N;;;;;
+0835;SAMARITAN PUNCTUATION SHIYYAALAA;Po;0;R;;;;;N;;;;;
+0836;SAMARITAN ABBREVIATION MARK;Po;0;R;;;;;N;;;;;
+0837;SAMARITAN PUNCTUATION MELODIC QITSA;Po;0;R;;;;;N;;;;;
+0838;SAMARITAN PUNCTUATION ZIQAA;Po;0;R;;;;;N;;;;;
+0839;SAMARITAN PUNCTUATION QITSA;Po;0;R;;;;;N;;;;;
+083A;SAMARITAN PUNCTUATION ZAEF;Po;0;R;;;;;N;;;;;
+083B;SAMARITAN PUNCTUATION TURU;Po;0;R;;;;;N;;;;;
+083C;SAMARITAN PUNCTUATION ARKAANU;Po;0;R;;;;;N;;;;;
+083D;SAMARITAN PUNCTUATION SOF MASHFAAT;Po;0;R;;;;;N;;;;;
+083E;SAMARITAN PUNCTUATION ANNAAU;Po;0;R;;;;;N;;;;;
+0840;MANDAIC LETTER HALQA;Lo;0;R;;;;;N;;;;;
+0841;MANDAIC LETTER AB;Lo;0;R;;;;;N;;;;;
+0842;MANDAIC LETTER AG;Lo;0;R;;;;;N;;;;;
+0843;MANDAIC LETTER AD;Lo;0;R;;;;;N;;;;;
+0844;MANDAIC LETTER AH;Lo;0;R;;;;;N;;;;;
+0845;MANDAIC LETTER USHENNA;Lo;0;R;;;;;N;;;;;
+0846;MANDAIC LETTER AZ;Lo;0;R;;;;;N;;;;;
+0847;MANDAIC LETTER IT;Lo;0;R;;;;;N;;;;;
+0848;MANDAIC LETTER ATT;Lo;0;R;;;;;N;;;;;
+0849;MANDAIC LETTER AKSA;Lo;0;R;;;;;N;;;;;
+084A;MANDAIC LETTER AK;Lo;0;R;;;;;N;;;;;
+084B;MANDAIC LETTER AL;Lo;0;R;;;;;N;;;;;
+084C;MANDAIC LETTER AM;Lo;0;R;;;;;N;;;;;
+084D;MANDAIC LETTER AN;Lo;0;R;;;;;N;;;;;
+084E;MANDAIC LETTER AS;Lo;0;R;;;;;N;;;;;
+084F;MANDAIC LETTER IN;Lo;0;R;;;;;N;;;;;
+0850;MANDAIC LETTER AP;Lo;0;R;;;;;N;;;;;
+0851;MANDAIC LETTER ASZ;Lo;0;R;;;;;N;;;;;
+0852;MANDAIC LETTER AQ;Lo;0;R;;;;;N;;;;;
+0853;MANDAIC LETTER AR;Lo;0;R;;;;;N;;;;;
+0854;MANDAIC LETTER ASH;Lo;0;R;;;;;N;;;;;
+0855;MANDAIC LETTER AT;Lo;0;R;;;;;N;;;;;
+0856;MANDAIC LETTER DUSHENNA;Lo;0;R;;;;;N;;;;;
+0857;MANDAIC LETTER KAD;Lo;0;R;;;;;N;;;;;
+0858;MANDAIC LETTER AIN;Lo;0;R;;;;;N;;;;;
+0859;MANDAIC AFFRICATION MARK;Mn;220;NSM;;;;;N;;;;;
+085A;MANDAIC VOCALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
+085B;MANDAIC GEMINATION MARK;Mn;220;NSM;;;;;N;;;;;
+085E;MANDAIC PUNCTUATION;Po;0;R;;;;;N;;;;;
+08A0;ARABIC LETTER BEH WITH SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+08A1;ARABIC LETTER BEH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+08A2;ARABIC LETTER JEEM WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A3;ARABIC LETTER TAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A4;ARABIC LETTER FEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A5;ARABIC LETTER QAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+08A6;ARABIC LETTER LAM WITH DOUBLE BAR;Lo;0;AL;;;;;N;;;;;
+08A7;ARABIC LETTER MEEM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+08A8;ARABIC LETTER YEH WITH TWO DOTS BELOW AND HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+08A9;ARABIC LETTER YEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+08AA;ARABIC LETTER REH WITH LOOP;Lo;0;AL;;;;;N;;;;;
+08AB;ARABIC LETTER WAW WITH DOT WITHIN;Lo;0;AL;;;;;N;;;;;
+08AC;ARABIC LETTER ROHINGYA YEH;Lo;0;AL;;;;;N;;;;;
+08AD;ARABIC LETTER LOW ALEF;Lo;0;AL;;;;;N;;;;;
+08AE;ARABIC LETTER DAL WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08AF;ARABIC LETTER SAD WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08B0;ARABIC LETTER GAF WITH INVERTED STROKE;Lo;0;AL;;;;;N;;;;;
+08B1;ARABIC LETTER STRAIGHT WAW;Lo;0;AL;;;;;N;;;;;
+08B2;ARABIC LETTER ZAIN WITH INVERTED V ABOVE;Lo;0;AL;;;;;N;;;;;
+08B3;ARABIC LETTER AIN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+08B4;ARABIC LETTER KAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+08B6;ARABIC LETTER BEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B7;ARABIC LETTER PEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B8;ARABIC LETTER TEH WITH SMALL TEH ABOVE;Lo;0;AL;;;;;N;;;;;
+08B9;ARABIC LETTER REH WITH SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BA;ARABIC LETTER YEH WITH TWO DOTS BELOW AND SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;;
+08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;;
+08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;;
+08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;;
+08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;;
+08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;;
+08D7;ARABIC SMALL HIGH QAF;Mn;230;NSM;;;;;N;;;;;
+08D8;ARABIC SMALL HIGH NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08D9;ARABIC SMALL LOW NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08DA;ARABIC SMALL HIGH WORD ATH-THALATHA;Mn;230;NSM;;;;;N;;;;;
+08DB;ARABIC SMALL HIGH WORD AS-SAJDA;Mn;230;NSM;;;;;N;;;;;
+08DC;ARABIC SMALL HIGH WORD AN-NISF;Mn;230;NSM;;;;;N;;;;;
+08DD;ARABIC SMALL HIGH WORD SAKTA;Mn;230;NSM;;;;;N;;;;;
+08DE;ARABIC SMALL HIGH WORD QIF;Mn;230;NSM;;;;;N;;;;;
+08DF;ARABIC SMALL HIGH WORD WAQFA;Mn;230;NSM;;;;;N;;;;;
+08E0;ARABIC SMALL HIGH FOOTNOTE MARKER;Mn;230;NSM;;;;;N;;;;;
+08E1;ARABIC SMALL HIGH SIGN SAFHA;Mn;230;NSM;;;;;N;;;;;
+08E2;ARABIC DISPUTED END OF AYAH;Cf;0;AN;;;;;N;;;;;
+08E3;ARABIC TURNED DAMMA BELOW;Mn;220;NSM;;;;;N;;;;;
+08E4;ARABIC CURLY FATHA;Mn;230;NSM;;;;;N;;;;;
+08E5;ARABIC CURLY DAMMA;Mn;230;NSM;;;;;N;;;;;
+08E6;ARABIC CURLY KASRA;Mn;220;NSM;;;;;N;;;;;
+08E7;ARABIC CURLY FATHATAN;Mn;230;NSM;;;;;N;;;;;
+08E8;ARABIC CURLY DAMMATAN;Mn;230;NSM;;;;;N;;;;;
+08E9;ARABIC CURLY KASRATAN;Mn;220;NSM;;;;;N;;;;;
+08EA;ARABIC TONE ONE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+08EB;ARABIC TONE TWO DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+08EC;ARABIC TONE LOOP ABOVE;Mn;230;NSM;;;;;N;;;;;
+08ED;ARABIC TONE ONE DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+08EE;ARABIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+08EF;ARABIC TONE LOOP BELOW;Mn;220;NSM;;;;;N;;;;;
+08F0;ARABIC OPEN FATHATAN;Mn;27;NSM;;;;;N;;;;;
+08F1;ARABIC OPEN DAMMATAN;Mn;28;NSM;;;;;N;;;;;
+08F2;ARABIC OPEN KASRATAN;Mn;29;NSM;;;;;N;;;;;
+08F3;ARABIC SMALL HIGH WAW;Mn;230;NSM;;;;;N;;;;;
+08F4;ARABIC FATHA WITH RING;Mn;230;NSM;;;;;N;;;;;
+08F5;ARABIC FATHA WITH DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F6;ARABIC KASRA WITH DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+08F7;ARABIC LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F8;ARABIC RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08F9;ARABIC LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+08FA;ARABIC RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+08FB;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+08FC;ARABIC DOUBLE RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FD;ARABIC RIGHT ARROWHEAD ABOVE WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FE;ARABIC DAMMA WITH DOT;Mn;230;NSM;;;;;N;;;;;
+08FF;ARABIC MARK SIDEWAYS NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
+0900;DEVANAGARI SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0904;DEVANAGARI LETTER SHORT A;Lo;0;L;;;;;N;;;;;
+0905;DEVANAGARI LETTER A;Lo;0;L;;;;;N;;;;;
+0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
+0907;DEVANAGARI LETTER I;Lo;0;L;;;;;N;;;;;
+0908;DEVANAGARI LETTER II;Lo;0;L;;;;;N;;;;;
+0909;DEVANAGARI LETTER U;Lo;0;L;;;;;N;;;;;
+090A;DEVANAGARI LETTER UU;Lo;0;L;;;;;N;;;;;
+090B;DEVANAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+090C;DEVANAGARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+090D;DEVANAGARI LETTER CANDRA E;Lo;0;L;;;;;N;;;;;
+090E;DEVANAGARI LETTER SHORT E;Lo;0;L;;;;;N;;;;;
+090F;DEVANAGARI LETTER E;Lo;0;L;;;;;N;;;;;
+0910;DEVANAGARI LETTER AI;Lo;0;L;;;;;N;;;;;
+0911;DEVANAGARI LETTER CANDRA O;Lo;0;L;;;;;N;;;;;
+0912;DEVANAGARI LETTER SHORT O;Lo;0;L;;;;;N;;;;;
+0913;DEVANAGARI LETTER O;Lo;0;L;;;;;N;;;;;
+0914;DEVANAGARI LETTER AU;Lo;0;L;;;;;N;;;;;
+0915;DEVANAGARI LETTER KA;Lo;0;L;;;;;N;;;;;
+0916;DEVANAGARI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0917;DEVANAGARI LETTER GA;Lo;0;L;;;;;N;;;;;
+0918;DEVANAGARI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0919;DEVANAGARI LETTER NGA;Lo;0;L;;;;;N;;;;;
+091A;DEVANAGARI LETTER CA;Lo;0;L;;;;;N;;;;;
+091B;DEVANAGARI LETTER CHA;Lo;0;L;;;;;N;;;;;
+091C;DEVANAGARI LETTER JA;Lo;0;L;;;;;N;;;;;
+091D;DEVANAGARI LETTER JHA;Lo;0;L;;;;;N;;;;;
+091E;DEVANAGARI LETTER NYA;Lo;0;L;;;;;N;;;;;
+091F;DEVANAGARI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0920;DEVANAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0921;DEVANAGARI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0922;DEVANAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0923;DEVANAGARI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0924;DEVANAGARI LETTER TA;Lo;0;L;;;;;N;;;;;
+0925;DEVANAGARI LETTER THA;Lo;0;L;;;;;N;;;;;
+0926;DEVANAGARI LETTER DA;Lo;0;L;;;;;N;;;;;
+0927;DEVANAGARI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0928;DEVANAGARI LETTER NA;Lo;0;L;;;;;N;;;;;
+0929;DEVANAGARI LETTER NNNA;Lo;0;L;0928 093C;;;;N;;;;;
+092A;DEVANAGARI LETTER PA;Lo;0;L;;;;;N;;;;;
+092B;DEVANAGARI LETTER PHA;Lo;0;L;;;;;N;;;;;
+092C;DEVANAGARI LETTER BA;Lo;0;L;;;;;N;;;;;
+092D;DEVANAGARI LETTER BHA;Lo;0;L;;;;;N;;;;;
+092E;DEVANAGARI LETTER MA;Lo;0;L;;;;;N;;;;;
+092F;DEVANAGARI LETTER YA;Lo;0;L;;;;;N;;;;;
+0930;DEVANAGARI LETTER RA;Lo;0;L;;;;;N;;;;;
+0931;DEVANAGARI LETTER RRA;Lo;0;L;0930 093C;;;;N;;;;;
+0932;DEVANAGARI LETTER LA;Lo;0;L;;;;;N;;;;;
+0933;DEVANAGARI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0934;DEVANAGARI LETTER LLLA;Lo;0;L;0933 093C;;;;N;;;;;
+0935;DEVANAGARI LETTER VA;Lo;0;L;;;;;N;;;;;
+0936;DEVANAGARI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0937;DEVANAGARI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0938;DEVANAGARI LETTER SA;Lo;0;L;;;;;N;;;;;
+0939;DEVANAGARI LETTER HA;Lo;0;L;;;;;N;;;;;
+093A;DEVANAGARI VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+093B;DEVANAGARI VOWEL SIGN OOE;Mc;0;L;;;;;N;;;;;
+093C;DEVANAGARI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+093D;DEVANAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+093E;DEVANAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+093F;DEVANAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0940;DEVANAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0941;DEVANAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0942;DEVANAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0943;DEVANAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0944;DEVANAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0945;DEVANAGARI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0946;DEVANAGARI VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+0947;DEVANAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0948;DEVANAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0949;DEVANAGARI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+094A;DEVANAGARI VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+094E;DEVANAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;;
+094F;DEVANAGARI VOWEL SIGN AW;Mc;0;L;;;;;N;;;;;
+0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;;
+0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;;
+0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0955;DEVANAGARI VOWEL SIGN CANDRA LONG E;Mn;0;NSM;;;;;N;;;;;
+0956;DEVANAGARI VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+0957;DEVANAGARI VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;;
+0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;;
+095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;;
+095B;DEVANAGARI LETTER ZA;Lo;0;L;091C 093C;;;;N;;;;;
+095C;DEVANAGARI LETTER DDDHA;Lo;0;L;0921 093C;;;;N;;;;;
+095D;DEVANAGARI LETTER RHA;Lo;0;L;0922 093C;;;;N;;;;;
+095E;DEVANAGARI LETTER FA;Lo;0;L;092B 093C;;;;N;;;;;
+095F;DEVANAGARI LETTER YYA;Lo;0;L;092F 093C;;;;N;;;;;
+0960;DEVANAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0961;DEVANAGARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0962;DEVANAGARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0963;DEVANAGARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0964;DEVANAGARI DANDA;Po;0;L;;;;;N;;;;;
+0965;DEVANAGARI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+0966;DEVANAGARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0967;DEVANAGARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0968;DEVANAGARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0969;DEVANAGARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+096A;DEVANAGARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+096B;DEVANAGARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+096C;DEVANAGARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+096D;DEVANAGARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+096E;DEVANAGARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+096F;DEVANAGARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;;
+0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;;
+0973;DEVANAGARI LETTER OE;Lo;0;L;;;;;N;;;;;
+0974;DEVANAGARI LETTER OOE;Lo;0;L;;;;;N;;;;;
+0975;DEVANAGARI LETTER AW;Lo;0;L;;;;;N;;;;;
+0976;DEVANAGARI LETTER UE;Lo;0;L;;;;;N;;;;;
+0977;DEVANAGARI LETTER UUE;Lo;0;L;;;;;N;;;;;
+0978;DEVANAGARI LETTER MARWARI DDA;Lo;0;L;;;;;N;;;;;
+0979;DEVANAGARI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+097A;DEVANAGARI LETTER HEAVY YA;Lo;0;L;;;;;N;;;;;
+097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;;
+097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;;
+097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+097E;DEVANAGARI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+097F;DEVANAGARI LETTER BBA;Lo;0;L;;;;;N;;;;;
+0980;BENGALI ANJI;Lo;0;L;;;;;N;;;;;
+0981;BENGALI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0982;BENGALI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0983;BENGALI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0985;BENGALI LETTER A;Lo;0;L;;;;;N;;;;;
+0986;BENGALI LETTER AA;Lo;0;L;;;;;N;;;;;
+0987;BENGALI LETTER I;Lo;0;L;;;;;N;;;;;
+0988;BENGALI LETTER II;Lo;0;L;;;;;N;;;;;
+0989;BENGALI LETTER U;Lo;0;L;;;;;N;;;;;
+098A;BENGALI LETTER UU;Lo;0;L;;;;;N;;;;;
+098B;BENGALI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+098C;BENGALI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+098F;BENGALI LETTER E;Lo;0;L;;;;;N;;;;;
+0990;BENGALI LETTER AI;Lo;0;L;;;;;N;;;;;
+0993;BENGALI LETTER O;Lo;0;L;;;;;N;;;;;
+0994;BENGALI LETTER AU;Lo;0;L;;;;;N;;;;;
+0995;BENGALI LETTER KA;Lo;0;L;;;;;N;;;;;
+0996;BENGALI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0997;BENGALI LETTER GA;Lo;0;L;;;;;N;;;;;
+0998;BENGALI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0999;BENGALI LETTER NGA;Lo;0;L;;;;;N;;;;;
+099A;BENGALI LETTER CA;Lo;0;L;;;;;N;;;;;
+099B;BENGALI LETTER CHA;Lo;0;L;;;;;N;;;;;
+099C;BENGALI LETTER JA;Lo;0;L;;;;;N;;;;;
+099D;BENGALI LETTER JHA;Lo;0;L;;;;;N;;;;;
+099E;BENGALI LETTER NYA;Lo;0;L;;;;;N;;;;;
+099F;BENGALI LETTER TTA;Lo;0;L;;;;;N;;;;;
+09A0;BENGALI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+09A1;BENGALI LETTER DDA;Lo;0;L;;;;;N;;;;;
+09A2;BENGALI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+09A3;BENGALI LETTER NNA;Lo;0;L;;;;;N;;;;;
+09A4;BENGALI LETTER TA;Lo;0;L;;;;;N;;;;;
+09A5;BENGALI LETTER THA;Lo;0;L;;;;;N;;;;;
+09A6;BENGALI LETTER DA;Lo;0;L;;;;;N;;;;;
+09A7;BENGALI LETTER DHA;Lo;0;L;;;;;N;;;;;
+09A8;BENGALI LETTER NA;Lo;0;L;;;;;N;;;;;
+09AA;BENGALI LETTER PA;Lo;0;L;;;;;N;;;;;
+09AB;BENGALI LETTER PHA;Lo;0;L;;;;;N;;;;;
+09AC;BENGALI LETTER BA;Lo;0;L;;;;;N;;;;;
+09AD;BENGALI LETTER BHA;Lo;0;L;;;;;N;;;;;
+09AE;BENGALI LETTER MA;Lo;0;L;;;;;N;;;;;
+09AF;BENGALI LETTER YA;Lo;0;L;;;;;N;;;;;
+09B0;BENGALI LETTER RA;Lo;0;L;;;;;N;;;;;
+09B2;BENGALI LETTER LA;Lo;0;L;;;;;N;;;;;
+09B6;BENGALI LETTER SHA;Lo;0;L;;;;;N;;;;;
+09B7;BENGALI LETTER SSA;Lo;0;L;;;;;N;;;;;
+09B8;BENGALI LETTER SA;Lo;0;L;;;;;N;;;;;
+09B9;BENGALI LETTER HA;Lo;0;L;;;;;N;;;;;
+09BC;BENGALI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+09BD;BENGALI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+09BE;BENGALI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+09BF;BENGALI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+09C0;BENGALI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+09C1;BENGALI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+09C2;BENGALI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+09C3;BENGALI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+09C4;BENGALI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+09C7;BENGALI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+09C8;BENGALI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+09CB;BENGALI VOWEL SIGN O;Mc;0;L;09C7 09BE;;;;N;;;;;
+09CC;BENGALI VOWEL SIGN AU;Mc;0;L;09C7 09D7;;;;N;;;;;
+09CD;BENGALI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+09CE;BENGALI LETTER KHANDA TA;Lo;0;L;;;;;N;;;;;
+09D7;BENGALI AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+09DC;BENGALI LETTER RRA;Lo;0;L;09A1 09BC;;;;N;;;;;
+09DD;BENGALI LETTER RHA;Lo;0;L;09A2 09BC;;;;N;;;;;
+09DF;BENGALI LETTER YYA;Lo;0;L;09AF 09BC;;;;N;;;;;
+09E0;BENGALI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+09E1;BENGALI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+09E2;BENGALI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+09E3;BENGALI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+09E6;BENGALI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+09E7;BENGALI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+09E8;BENGALI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+09E9;BENGALI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+09EA;BENGALI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+09EB;BENGALI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+09EC;BENGALI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;;;;
+09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;;;;
+09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1/16;N;;;;;
+09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;1/8;N;;;;;
+09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3/16;N;;;;;
+09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;1/4;N;;;;;
+09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;3/4;N;;;;;
+09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
+09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
+09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
+0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
+0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
+0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A05;GURMUKHI LETTER A;Lo;0;L;;;;;N;;;;;
+0A06;GURMUKHI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A07;GURMUKHI LETTER I;Lo;0;L;;;;;N;;;;;
+0A08;GURMUKHI LETTER II;Lo;0;L;;;;;N;;;;;
+0A09;GURMUKHI LETTER U;Lo;0;L;;;;;N;;;;;
+0A0A;GURMUKHI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A0F;GURMUKHI LETTER EE;Lo;0;L;;;;;N;;;;;
+0A10;GURMUKHI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A13;GURMUKHI LETTER OO;Lo;0;L;;;;;N;;;;;
+0A14;GURMUKHI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A15;GURMUKHI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A16;GURMUKHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A17;GURMUKHI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A18;GURMUKHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A19;GURMUKHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A1A;GURMUKHI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A1B;GURMUKHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A1C;GURMUKHI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A1D;GURMUKHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A1E;GURMUKHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A1F;GURMUKHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0A20;GURMUKHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0A21;GURMUKHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0A22;GURMUKHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0A23;GURMUKHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0A24;GURMUKHI LETTER TA;Lo;0;L;;;;;N;;;;;
+0A25;GURMUKHI LETTER THA;Lo;0;L;;;;;N;;;;;
+0A26;GURMUKHI LETTER DA;Lo;0;L;;;;;N;;;;;
+0A27;GURMUKHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0A28;GURMUKHI LETTER NA;Lo;0;L;;;;;N;;;;;
+0A2A;GURMUKHI LETTER PA;Lo;0;L;;;;;N;;;;;
+0A2B;GURMUKHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0A2C;GURMUKHI LETTER BA;Lo;0;L;;;;;N;;;;;
+0A2D;GURMUKHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0A2E;GURMUKHI LETTER MA;Lo;0;L;;;;;N;;;;;
+0A2F;GURMUKHI LETTER YA;Lo;0;L;;;;;N;;;;;
+0A30;GURMUKHI LETTER RA;Lo;0;L;;;;;N;;;;;
+0A32;GURMUKHI LETTER LA;Lo;0;L;;;;;N;;;;;
+0A33;GURMUKHI LETTER LLA;Lo;0;L;0A32 0A3C;;;;N;;;;;
+0A35;GURMUKHI LETTER VA;Lo;0;L;;;;;N;;;;;
+0A36;GURMUKHI LETTER SHA;Lo;0;L;0A38 0A3C;;;;N;;;;;
+0A38;GURMUKHI LETTER SA;Lo;0;L;;;;;N;;;;;
+0A39;GURMUKHI LETTER HA;Lo;0;L;;;;;N;;;;;
+0A3C;GURMUKHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0A3E;GURMUKHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0A3F;GURMUKHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0A40;GURMUKHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0A41;GURMUKHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0A42;GURMUKHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0A47;GURMUKHI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0A48;GURMUKHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0A4B;GURMUKHI VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0A4C;GURMUKHI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0A4D;GURMUKHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0A51;GURMUKHI SIGN UDAAT;Mn;0;NSM;;;;;N;;;;;
+0A59;GURMUKHI LETTER KHHA;Lo;0;L;0A16 0A3C;;;;N;;;;;
+0A5A;GURMUKHI LETTER GHHA;Lo;0;L;0A17 0A3C;;;;N;;;;;
+0A5B;GURMUKHI LETTER ZA;Lo;0;L;0A1C 0A3C;;;;N;;;;;
+0A5C;GURMUKHI LETTER RRA;Lo;0;L;;;;;N;;;;;
+0A5E;GURMUKHI LETTER FA;Lo;0;L;0A2B 0A3C;;;;N;;;;;
+0A66;GURMUKHI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0A67;GURMUKHI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0A68;GURMUKHI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0A69;GURMUKHI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0A6A;GURMUKHI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0A6B;GURMUKHI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0A6C;GURMUKHI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0A6D;GURMUKHI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0A6E;GURMUKHI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0A6F;GURMUKHI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0A70;GURMUKHI TIPPI;Mn;0;NSM;;;;;N;;;;;
+0A71;GURMUKHI ADDAK;Mn;0;NSM;;;;;N;;;;;
+0A72;GURMUKHI IRI;Lo;0;L;;;;;N;;;;;
+0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
+0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
+0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
+0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A85;GUJARATI LETTER A;Lo;0;L;;;;;N;;;;;
+0A86;GUJARATI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A87;GUJARATI LETTER I;Lo;0;L;;;;;N;;;;;
+0A88;GUJARATI LETTER II;Lo;0;L;;;;;N;;;;;
+0A89;GUJARATI LETTER U;Lo;0;L;;;;;N;;;;;
+0A8A;GUJARATI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A8B;GUJARATI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0A8C;GUJARATI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0A8D;GUJARATI VOWEL CANDRA E;Lo;0;L;;;;;N;;;;;
+0A8F;GUJARATI LETTER E;Lo;0;L;;;;;N;;;;;
+0A90;GUJARATI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A91;GUJARATI VOWEL CANDRA O;Lo;0;L;;;;;N;;;;;
+0A93;GUJARATI LETTER O;Lo;0;L;;;;;N;;;;;
+0A94;GUJARATI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A95;GUJARATI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A96;GUJARATI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A97;GUJARATI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A98;GUJARATI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A99;GUJARATI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A9A;GUJARATI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A9B;GUJARATI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A9C;GUJARATI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A9D;GUJARATI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A9E;GUJARATI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A9F;GUJARATI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0AA0;GUJARATI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0AA1;GUJARATI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0AA2;GUJARATI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0AA3;GUJARATI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0AA4;GUJARATI LETTER TA;Lo;0;L;;;;;N;;;;;
+0AA5;GUJARATI LETTER THA;Lo;0;L;;;;;N;;;;;
+0AA6;GUJARATI LETTER DA;Lo;0;L;;;;;N;;;;;
+0AA7;GUJARATI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0AA8;GUJARATI LETTER NA;Lo;0;L;;;;;N;;;;;
+0AAA;GUJARATI LETTER PA;Lo;0;L;;;;;N;;;;;
+0AAB;GUJARATI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0AAC;GUJARATI LETTER BA;Lo;0;L;;;;;N;;;;;
+0AAD;GUJARATI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0AAE;GUJARATI LETTER MA;Lo;0;L;;;;;N;;;;;
+0AAF;GUJARATI LETTER YA;Lo;0;L;;;;;N;;;;;
+0AB0;GUJARATI LETTER RA;Lo;0;L;;;;;N;;;;;
+0AB2;GUJARATI LETTER LA;Lo;0;L;;;;;N;;;;;
+0AB3;GUJARATI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0AB5;GUJARATI LETTER VA;Lo;0;L;;;;;N;;;;;
+0AB6;GUJARATI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0AB7;GUJARATI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0AB8;GUJARATI LETTER SA;Lo;0;L;;;;;N;;;;;
+0AB9;GUJARATI LETTER HA;Lo;0;L;;;;;N;;;;;
+0ABC;GUJARATI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0ABD;GUJARATI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0ABE;GUJARATI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0ABF;GUJARATI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0AC0;GUJARATI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0AC1;GUJARATI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0AC2;GUJARATI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0AC3;GUJARATI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0AC4;GUJARATI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0AC5;GUJARATI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0AC7;GUJARATI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0AC8;GUJARATI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0AC9;GUJARATI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+0ACB;GUJARATI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+0ACC;GUJARATI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+0ACD;GUJARATI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0AD0;GUJARATI OM;Lo;0;L;;;;;N;;;;;
+0AE0;GUJARATI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0AE1;GUJARATI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0AE2;GUJARATI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0AE3;GUJARATI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0AE6;GUJARATI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0AE7;GUJARATI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0AE8;GUJARATI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0AE9;GUJARATI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0AEA;GUJARATI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0AEB;GUJARATI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0AEC;GUJARATI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0AED;GUJARATI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0AEE;GUJARATI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0AEF;GUJARATI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0AF0;GUJARATI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0AF9;GUJARATI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0B05;ORIYA LETTER A;Lo;0;L;;;;;N;;;;;
+0B06;ORIYA LETTER AA;Lo;0;L;;;;;N;;;;;
+0B07;ORIYA LETTER I;Lo;0;L;;;;;N;;;;;
+0B08;ORIYA LETTER II;Lo;0;L;;;;;N;;;;;
+0B09;ORIYA LETTER U;Lo;0;L;;;;;N;;;;;
+0B0A;ORIYA LETTER UU;Lo;0;L;;;;;N;;;;;
+0B0B;ORIYA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0B0C;ORIYA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0B0F;ORIYA LETTER E;Lo;0;L;;;;;N;;;;;
+0B10;ORIYA LETTER AI;Lo;0;L;;;;;N;;;;;
+0B13;ORIYA LETTER O;Lo;0;L;;;;;N;;;;;
+0B14;ORIYA LETTER AU;Lo;0;L;;;;;N;;;;;
+0B15;ORIYA LETTER KA;Lo;0;L;;;;;N;;;;;
+0B16;ORIYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0B17;ORIYA LETTER GA;Lo;0;L;;;;;N;;;;;
+0B18;ORIYA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0B19;ORIYA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B1A;ORIYA LETTER CA;Lo;0;L;;;;;N;;;;;
+0B1B;ORIYA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0B1C;ORIYA LETTER JA;Lo;0;L;;;;;N;;;;;
+0B1D;ORIYA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0B1E;ORIYA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B1F;ORIYA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0B20;ORIYA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0B21;ORIYA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0B22;ORIYA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0B23;ORIYA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0B24;ORIYA LETTER TA;Lo;0;L;;;;;N;;;;;
+0B25;ORIYA LETTER THA;Lo;0;L;;;;;N;;;;;
+0B26;ORIYA LETTER DA;Lo;0;L;;;;;N;;;;;
+0B27;ORIYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0B28;ORIYA LETTER NA;Lo;0;L;;;;;N;;;;;
+0B2A;ORIYA LETTER PA;Lo;0;L;;;;;N;;;;;
+0B2B;ORIYA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0B2C;ORIYA LETTER BA;Lo;0;L;;;;;N;;;;;
+0B2D;ORIYA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0B2E;ORIYA LETTER MA;Lo;0;L;;;;;N;;;;;
+0B2F;ORIYA LETTER YA;Lo;0;L;;;;;N;;;;;
+0B30;ORIYA LETTER RA;Lo;0;L;;;;;N;;;;;
+0B32;ORIYA LETTER LA;Lo;0;L;;;;;N;;;;;
+0B33;ORIYA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0B35;ORIYA LETTER VA;Lo;0;L;;;;;N;;;;;
+0B36;ORIYA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0B37;ORIYA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0B38;ORIYA LETTER SA;Lo;0;L;;;;;N;;;;;
+0B39;ORIYA LETTER HA;Lo;0;L;;;;;N;;;;;
+0B3C;ORIYA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0B3D;ORIYA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0B3E;ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0B3F;ORIYA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0B40;ORIYA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0B41;ORIYA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0B42;ORIYA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0B43;ORIYA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0B44;ORIYA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0B47;ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0B48;ORIYA VOWEL SIGN AI;Mc;0;L;0B47 0B56;;;;N;;;;;
+0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;;
+0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;;
+0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0B5C;ORIYA LETTER RRA;Lo;0;L;0B21 0B3C;;;;N;;;;;
+0B5D;ORIYA LETTER RHA;Lo;0;L;0B22 0B3C;;;;N;;;;;
+0B5F;ORIYA LETTER YYA;Lo;0;L;;;;;N;;;;;
+0B60;ORIYA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0B61;ORIYA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0B62;ORIYA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0B63;ORIYA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0B66;ORIYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0B67;ORIYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0B68;ORIYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0B69;ORIYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0B6A;ORIYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0B6B;ORIYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0B6C;ORIYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0B6D;ORIYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0B6E;ORIYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0B6F;ORIYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0B70;ORIYA ISSHAR;So;0;L;;;;;N;;;;;
+0B71;ORIYA LETTER WA;Lo;0;L;;;;;N;;;;;
+0B72;ORIYA FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+0B73;ORIYA FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+0B74;ORIYA FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0B75;ORIYA FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+0B76;ORIYA FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+0B77;ORIYA FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+0B82;TAMIL SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0B83;TAMIL SIGN VISARGA;Lo;0;L;;;;;N;;;;;
+0B85;TAMIL LETTER A;Lo;0;L;;;;;N;;;;;
+0B86;TAMIL LETTER AA;Lo;0;L;;;;;N;;;;;
+0B87;TAMIL LETTER I;Lo;0;L;;;;;N;;;;;
+0B88;TAMIL LETTER II;Lo;0;L;;;;;N;;;;;
+0B89;TAMIL LETTER U;Lo;0;L;;;;;N;;;;;
+0B8A;TAMIL LETTER UU;Lo;0;L;;;;;N;;;;;
+0B8E;TAMIL LETTER E;Lo;0;L;;;;;N;;;;;
+0B8F;TAMIL LETTER EE;Lo;0;L;;;;;N;;;;;
+0B90;TAMIL LETTER AI;Lo;0;L;;;;;N;;;;;
+0B92;TAMIL LETTER O;Lo;0;L;;;;;N;;;;;
+0B93;TAMIL LETTER OO;Lo;0;L;;;;;N;;;;;
+0B94;TAMIL LETTER AU;Lo;0;L;0B92 0BD7;;;;N;;;;;
+0B95;TAMIL LETTER KA;Lo;0;L;;;;;N;;;;;
+0B99;TAMIL LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B9A;TAMIL LETTER CA;Lo;0;L;;;;;N;;;;;
+0B9C;TAMIL LETTER JA;Lo;0;L;;;;;N;;;;;
+0B9E;TAMIL LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B9F;TAMIL LETTER TTA;Lo;0;L;;;;;N;;;;;
+0BA3;TAMIL LETTER NNA;Lo;0;L;;;;;N;;;;;
+0BA4;TAMIL LETTER TA;Lo;0;L;;;;;N;;;;;
+0BA8;TAMIL LETTER NA;Lo;0;L;;;;;N;;;;;
+0BA9;TAMIL LETTER NNNA;Lo;0;L;;;;;N;;;;;
+0BAA;TAMIL LETTER PA;Lo;0;L;;;;;N;;;;;
+0BAE;TAMIL LETTER MA;Lo;0;L;;;;;N;;;;;
+0BAF;TAMIL LETTER YA;Lo;0;L;;;;;N;;;;;
+0BB0;TAMIL LETTER RA;Lo;0;L;;;;;N;;;;;
+0BB1;TAMIL LETTER RRA;Lo;0;L;;;;;N;;;;;
+0BB2;TAMIL LETTER LA;Lo;0;L;;;;;N;;;;;
+0BB3;TAMIL LETTER LLA;Lo;0;L;;;;;N;;;;;
+0BB4;TAMIL LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0BB5;TAMIL LETTER VA;Lo;0;L;;;;;N;;;;;
+0BB6;TAMIL LETTER SHA;Lo;0;L;;;;;N;;;;;
+0BB7;TAMIL LETTER SSA;Lo;0;L;;;;;N;;;;;
+0BB8;TAMIL LETTER SA;Lo;0;L;;;;;N;;;;;
+0BB9;TAMIL LETTER HA;Lo;0;L;;;;;N;;;;;
+0BBE;TAMIL VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0BBF;TAMIL VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0BC0;TAMIL VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0BC1;TAMIL VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0BC2;TAMIL VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0BC6;TAMIL VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0BC7;TAMIL VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0BC8;TAMIL VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0BCA;TAMIL VOWEL SIGN O;Mc;0;L;0BC6 0BBE;;;;N;;;;;
+0BCB;TAMIL VOWEL SIGN OO;Mc;0;L;0BC7 0BBE;;;;N;;;;;
+0BCC;TAMIL VOWEL SIGN AU;Mc;0;L;0BC6 0BD7;;;;N;;;;;
+0BCD;TAMIL SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0BD0;TAMIL OM;Lo;0;L;;;;;N;;;;;
+0BD7;TAMIL AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0BE6;TAMIL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0BE7;TAMIL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0BE8;TAMIL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0BE9;TAMIL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0BEA;TAMIL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0BEB;TAMIL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0BEC;TAMIL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0BED;TAMIL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0BEE;TAMIL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0BEF;TAMIL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;;
+0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;;;;
+0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;;;;
+0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;;;;
+0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;;;;
+0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;;;;
+0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;;;;
+0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;;;;
+0C00;TELUGU SIGN COMBINING CANDRABINDU ABOVE;Mn;0;NSM;;;;;N;;;;;
+0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
+0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
+0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
+0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
+0C08;TELUGU LETTER II;Lo;0;L;;;;;N;;;;;
+0C09;TELUGU LETTER U;Lo;0;L;;;;;N;;;;;
+0C0A;TELUGU LETTER UU;Lo;0;L;;;;;N;;;;;
+0C0B;TELUGU LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C0C;TELUGU LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C0E;TELUGU LETTER E;Lo;0;L;;;;;N;;;;;
+0C0F;TELUGU LETTER EE;Lo;0;L;;;;;N;;;;;
+0C10;TELUGU LETTER AI;Lo;0;L;;;;;N;;;;;
+0C12;TELUGU LETTER O;Lo;0;L;;;;;N;;;;;
+0C13;TELUGU LETTER OO;Lo;0;L;;;;;N;;;;;
+0C14;TELUGU LETTER AU;Lo;0;L;;;;;N;;;;;
+0C15;TELUGU LETTER KA;Lo;0;L;;;;;N;;;;;
+0C16;TELUGU LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C17;TELUGU LETTER GA;Lo;0;L;;;;;N;;;;;
+0C18;TELUGU LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C19;TELUGU LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C1A;TELUGU LETTER CA;Lo;0;L;;;;;N;;;;;
+0C1B;TELUGU LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C1C;TELUGU LETTER JA;Lo;0;L;;;;;N;;;;;
+0C1D;TELUGU LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C1E;TELUGU LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C1F;TELUGU LETTER TTA;Lo;0;L;;;;;N;;;;;
+0C20;TELUGU LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0C21;TELUGU LETTER DDA;Lo;0;L;;;;;N;;;;;
+0C22;TELUGU LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0C23;TELUGU LETTER NNA;Lo;0;L;;;;;N;;;;;
+0C24;TELUGU LETTER TA;Lo;0;L;;;;;N;;;;;
+0C25;TELUGU LETTER THA;Lo;0;L;;;;;N;;;;;
+0C26;TELUGU LETTER DA;Lo;0;L;;;;;N;;;;;
+0C27;TELUGU LETTER DHA;Lo;0;L;;;;;N;;;;;
+0C28;TELUGU LETTER NA;Lo;0;L;;;;;N;;;;;
+0C2A;TELUGU LETTER PA;Lo;0;L;;;;;N;;;;;
+0C2B;TELUGU LETTER PHA;Lo;0;L;;;;;N;;;;;
+0C2C;TELUGU LETTER BA;Lo;0;L;;;;;N;;;;;
+0C2D;TELUGU LETTER BHA;Lo;0;L;;;;;N;;;;;
+0C2E;TELUGU LETTER MA;Lo;0;L;;;;;N;;;;;
+0C2F;TELUGU LETTER YA;Lo;0;L;;;;;N;;;;;
+0C30;TELUGU LETTER RA;Lo;0;L;;;;;N;;;;;
+0C31;TELUGU LETTER RRA;Lo;0;L;;;;;N;;;;;
+0C32;TELUGU LETTER LA;Lo;0;L;;;;;N;;;;;
+0C33;TELUGU LETTER LLA;Lo;0;L;;;;;N;;;;;
+0C34;TELUGU LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0C35;TELUGU LETTER VA;Lo;0;L;;;;;N;;;;;
+0C36;TELUGU LETTER SHA;Lo;0;L;;;;;N;;;;;
+0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;;
+0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;;
+0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;;
+0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0C40;TELUGU VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0C41;TELUGU VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0C42;TELUGU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0C43;TELUGU VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0C44;TELUGU VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0C46;TELUGU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0C47;TELUGU VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0C48;TELUGU VOWEL SIGN AI;Mn;0;NSM;0C46 0C56;;;;N;;;;;
+0C4A;TELUGU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+0C4B;TELUGU VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0C4C;TELUGU VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0C4D;TELUGU SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0C55;TELUGU LENGTH MARK;Mn;84;NSM;;;;;N;;;;;
+0C56;TELUGU AI LENGTH MARK;Mn;91;NSM;;;;;N;;;;;
+0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
+0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
+0C5A;TELUGU LETTER RRRA;Lo;0;L;;;;;N;;;;;
+0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0C63;TELUGU VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0C66;TELUGU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0C67;TELUGU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0C68;TELUGU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0C69;TELUGU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0C6A;TELUGU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0C6B;TELUGU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0C6C;TELUGU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0C6D;TELUGU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0C6E;TELUGU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0C6F;TELUGU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0C78;TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR;No;0;ON;;;;0;N;;;;;
+0C79;TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7A;TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7B;TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7C;TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;;
+0C80;KANNADA SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
+0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
+0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
+0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
+0C88;KANNADA LETTER II;Lo;0;L;;;;;N;;;;;
+0C89;KANNADA LETTER U;Lo;0;L;;;;;N;;;;;
+0C8A;KANNADA LETTER UU;Lo;0;L;;;;;N;;;;;
+0C8B;KANNADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C8C;KANNADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C8E;KANNADA LETTER E;Lo;0;L;;;;;N;;;;;
+0C8F;KANNADA LETTER EE;Lo;0;L;;;;;N;;;;;
+0C90;KANNADA LETTER AI;Lo;0;L;;;;;N;;;;;
+0C92;KANNADA LETTER O;Lo;0;L;;;;;N;;;;;
+0C93;KANNADA LETTER OO;Lo;0;L;;;;;N;;;;;
+0C94;KANNADA LETTER AU;Lo;0;L;;;;;N;;;;;
+0C95;KANNADA LETTER KA;Lo;0;L;;;;;N;;;;;
+0C96;KANNADA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C97;KANNADA LETTER GA;Lo;0;L;;;;;N;;;;;
+0C98;KANNADA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C99;KANNADA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C9A;KANNADA LETTER CA;Lo;0;L;;;;;N;;;;;
+0C9B;KANNADA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C9C;KANNADA LETTER JA;Lo;0;L;;;;;N;;;;;
+0C9D;KANNADA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C9E;KANNADA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C9F;KANNADA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0CA0;KANNADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0CA1;KANNADA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0CA2;KANNADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0CA3;KANNADA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0CA4;KANNADA LETTER TA;Lo;0;L;;;;;N;;;;;
+0CA5;KANNADA LETTER THA;Lo;0;L;;;;;N;;;;;
+0CA6;KANNADA LETTER DA;Lo;0;L;;;;;N;;;;;
+0CA7;KANNADA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0CA8;KANNADA LETTER NA;Lo;0;L;;;;;N;;;;;
+0CAA;KANNADA LETTER PA;Lo;0;L;;;;;N;;;;;
+0CAB;KANNADA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0CAC;KANNADA LETTER BA;Lo;0;L;;;;;N;;;;;
+0CAD;KANNADA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0CAE;KANNADA LETTER MA;Lo;0;L;;;;;N;;;;;
+0CAF;KANNADA LETTER YA;Lo;0;L;;;;;N;;;;;
+0CB0;KANNADA LETTER RA;Lo;0;L;;;;;N;;;;;
+0CB1;KANNADA LETTER RRA;Lo;0;L;;;;;N;;;;;
+0CB2;KANNADA LETTER LA;Lo;0;L;;;;;N;;;;;
+0CB3;KANNADA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0CB5;KANNADA LETTER VA;Lo;0;L;;;;;N;;;;;
+0CB6;KANNADA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0CB7;KANNADA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0CB8;KANNADA LETTER SA;Lo;0;L;;;;;N;;;;;
+0CB9;KANNADA LETTER HA;Lo;0;L;;;;;N;;;;;
+0CBC;KANNADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0CBD;KANNADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0CBE;KANNADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0CBF;KANNADA VOWEL SIGN I;Mn;0;L;;;;;N;;;;;
+0CC0;KANNADA VOWEL SIGN II;Mc;0;L;0CBF 0CD5;;;;N;;;;;
+0CC1;KANNADA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0CC2;KANNADA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0CC3;KANNADA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0CC4;KANNADA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0CC6;KANNADA VOWEL SIGN E;Mn;0;L;;;;;N;;;;;
+0CC7;KANNADA VOWEL SIGN EE;Mc;0;L;0CC6 0CD5;;;;N;;;;;
+0CC8;KANNADA VOWEL SIGN AI;Mc;0;L;0CC6 0CD6;;;;N;;;;;
+0CCA;KANNADA VOWEL SIGN O;Mc;0;L;0CC6 0CC2;;;;N;;;;;
+0CCB;KANNADA VOWEL SIGN OO;Mc;0;L;0CCA 0CD5;;;;N;;;;;
+0CCC;KANNADA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;;
+0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0CE2;KANNADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0CE3;KANNADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0CE6;KANNADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0CE7;KANNADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0CE8;KANNADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0CE9;KANNADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0CEA;KANNADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0CEB;KANNADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0CEC;KANNADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0CED;KANNADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0CEE;KANNADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0CF1;KANNADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+0CF2;KANNADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+0D01;MALAYALAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0D05;MALAYALAM LETTER A;Lo;0;L;;;;;N;;;;;
+0D06;MALAYALAM LETTER AA;Lo;0;L;;;;;N;;;;;
+0D07;MALAYALAM LETTER I;Lo;0;L;;;;;N;;;;;
+0D08;MALAYALAM LETTER II;Lo;0;L;;;;;N;;;;;
+0D09;MALAYALAM LETTER U;Lo;0;L;;;;;N;;;;;
+0D0A;MALAYALAM LETTER UU;Lo;0;L;;;;;N;;;;;
+0D0B;MALAYALAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0D0C;MALAYALAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0D0E;MALAYALAM LETTER E;Lo;0;L;;;;;N;;;;;
+0D0F;MALAYALAM LETTER EE;Lo;0;L;;;;;N;;;;;
+0D10;MALAYALAM LETTER AI;Lo;0;L;;;;;N;;;;;
+0D12;MALAYALAM LETTER O;Lo;0;L;;;;;N;;;;;
+0D13;MALAYALAM LETTER OO;Lo;0;L;;;;;N;;;;;
+0D14;MALAYALAM LETTER AU;Lo;0;L;;;;;N;;;;;
+0D15;MALAYALAM LETTER KA;Lo;0;L;;;;;N;;;;;
+0D16;MALAYALAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+0D17;MALAYALAM LETTER GA;Lo;0;L;;;;;N;;;;;
+0D18;MALAYALAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+0D19;MALAYALAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+0D1A;MALAYALAM LETTER CA;Lo;0;L;;;;;N;;;;;
+0D1B;MALAYALAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+0D1C;MALAYALAM LETTER JA;Lo;0;L;;;;;N;;;;;
+0D1D;MALAYALAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+0D1E;MALAYALAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+0D1F;MALAYALAM LETTER TTA;Lo;0;L;;;;;N;;;;;
+0D20;MALAYALAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0D21;MALAYALAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+0D22;MALAYALAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0D23;MALAYALAM LETTER NNA;Lo;0;L;;;;;N;;;;;
+0D24;MALAYALAM LETTER TA;Lo;0;L;;;;;N;;;;;
+0D25;MALAYALAM LETTER THA;Lo;0;L;;;;;N;;;;;
+0D26;MALAYALAM LETTER DA;Lo;0;L;;;;;N;;;;;
+0D27;MALAYALAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+0D28;MALAYALAM LETTER NA;Lo;0;L;;;;;N;;;;;
+0D29;MALAYALAM LETTER NNNA;Lo;0;L;;;;;N;;;;;
+0D2A;MALAYALAM LETTER PA;Lo;0;L;;;;;N;;;;;
+0D2B;MALAYALAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+0D2C;MALAYALAM LETTER BA;Lo;0;L;;;;;N;;;;;
+0D2D;MALAYALAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+0D2E;MALAYALAM LETTER MA;Lo;0;L;;;;;N;;;;;
+0D2F;MALAYALAM LETTER YA;Lo;0;L;;;;;N;;;;;
+0D30;MALAYALAM LETTER RA;Lo;0;L;;;;;N;;;;;
+0D31;MALAYALAM LETTER RRA;Lo;0;L;;;;;N;;;;;
+0D32;MALAYALAM LETTER LA;Lo;0;L;;;;;N;;;;;
+0D33;MALAYALAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+0D34;MALAYALAM LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0D35;MALAYALAM LETTER VA;Lo;0;L;;;;;N;;;;;
+0D36;MALAYALAM LETTER SHA;Lo;0;L;;;;;N;;;;;
+0D37;MALAYALAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
+0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
+0D3A;MALAYALAM LETTER TTTA;Lo;0;L;;;;;N;;;;;
+0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0D40;MALAYALAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0D41;MALAYALAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0D42;MALAYALAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0D43;MALAYALAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0D44;MALAYALAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0D46;MALAYALAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0D47;MALAYALAM VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0D48;MALAYALAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0D4A;MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
+0D4B;MALAYALAM VOWEL SIGN OO;Mc;0;L;0D47 0D3E;;;;N;;;;;
+0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;;
+0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D4E;MALAYALAM LETTER DOT REPH;Lo;0;L;;;;;N;;;;;
+0D4F;MALAYALAM SIGN PARA;So;0;L;;;;;N;;;;;
+0D54;MALAYALAM LETTER CHILLU M;Lo;0;L;;;;;N;;;;;
+0D55;MALAYALAM LETTER CHILLU Y;Lo;0;L;;;;;N;;;;;
+0D56;MALAYALAM LETTER CHILLU LLL;Lo;0;L;;;;;N;;;;;
+0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0D58;MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;;
+0D59;MALAYALAM FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;;
+0D5A;MALAYALAM FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;;
+0D5B;MALAYALAM FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;;
+0D5C;MALAYALAM FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;;
+0D5D;MALAYALAM FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;;
+0D5E;MALAYALAM FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;;
+0D5F;MALAYALAM LETTER ARCHAIC II;Lo;0;L;;;;;N;;;;;
+0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0D62;MALAYALAM VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0D63;MALAYALAM VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0D66;MALAYALAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0D67;MALAYALAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0D68;MALAYALAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0D69;MALAYALAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0D6A;MALAYALAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0D6B;MALAYALAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0D6C;MALAYALAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0D6D;MALAYALAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0D6E;MALAYALAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0D6F;MALAYALAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0D70;MALAYALAM NUMBER TEN;No;0;L;;;;10;N;;;;;
+0D71;MALAYALAM NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0D72;MALAYALAM NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0D76;MALAYALAM FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+0D77;MALAYALAM FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+0D78;MALAYALAM FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;;
+0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;;
+0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;;
+0D7C;MALAYALAM LETTER CHILLU RR;Lo;0;L;;;;;N;;;;;
+0D7D;MALAYALAM LETTER CHILLU L;Lo;0;L;;;;;N;;;;;
+0D7E;MALAYALAM LETTER CHILLU LL;Lo;0;L;;;;;N;;;;;
+0D7F;MALAYALAM LETTER CHILLU K;Lo;0;L;;;;;N;;;;;
+0D82;SINHALA SIGN ANUSVARAYA;Mc;0;L;;;;;N;;;;;
+0D83;SINHALA SIGN VISARGAYA;Mc;0;L;;;;;N;;;;;
+0D85;SINHALA LETTER AYANNA;Lo;0;L;;;;;N;;;;;
+0D86;SINHALA LETTER AAYANNA;Lo;0;L;;;;;N;;;;;
+0D87;SINHALA LETTER AEYANNA;Lo;0;L;;;;;N;;;;;
+0D88;SINHALA LETTER AEEYANNA;Lo;0;L;;;;;N;;;;;
+0D89;SINHALA LETTER IYANNA;Lo;0;L;;;;;N;;;;;
+0D8A;SINHALA LETTER IIYANNA;Lo;0;L;;;;;N;;;;;
+0D8B;SINHALA LETTER UYANNA;Lo;0;L;;;;;N;;;;;
+0D8C;SINHALA LETTER UUYANNA;Lo;0;L;;;;;N;;;;;
+0D8D;SINHALA LETTER IRUYANNA;Lo;0;L;;;;;N;;;;;
+0D8E;SINHALA LETTER IRUUYANNA;Lo;0;L;;;;;N;;;;;
+0D8F;SINHALA LETTER ILUYANNA;Lo;0;L;;;;;N;;;;;
+0D90;SINHALA LETTER ILUUYANNA;Lo;0;L;;;;;N;;;;;
+0D91;SINHALA LETTER EYANNA;Lo;0;L;;;;;N;;;;;
+0D92;SINHALA LETTER EEYANNA;Lo;0;L;;;;;N;;;;;
+0D93;SINHALA LETTER AIYANNA;Lo;0;L;;;;;N;;;;;
+0D94;SINHALA LETTER OYANNA;Lo;0;L;;;;;N;;;;;
+0D95;SINHALA LETTER OOYANNA;Lo;0;L;;;;;N;;;;;
+0D96;SINHALA LETTER AUYANNA;Lo;0;L;;;;;N;;;;;
+0D9A;SINHALA LETTER ALPAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9B;SINHALA LETTER MAHAAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9C;SINHALA LETTER ALPAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9D;SINHALA LETTER MAHAAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9E;SINHALA LETTER KANTAJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0D9F;SINHALA LETTER SANYAKA GAYANNA;Lo;0;L;;;;;N;;;;;
+0DA0;SINHALA LETTER ALPAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA1;SINHALA LETTER MAHAAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA2;SINHALA LETTER ALPAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA3;SINHALA LETTER MAHAAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA4;SINHALA LETTER TAALUJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA5;SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA6;SINHALA LETTER SANYAKA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA7;SINHALA LETTER ALPAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA8;SINHALA LETTER MAHAAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA9;SINHALA LETTER ALPAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAA;SINHALA LETTER MAHAAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAB;SINHALA LETTER MUURDHAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DAC;SINHALA LETTER SANYAKA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAD;SINHALA LETTER ALPAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAE;SINHALA LETTER MAHAAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAF;SINHALA LETTER ALPAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB0;SINHALA LETTER MAHAAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB1;SINHALA LETTER DANTAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DB3;SINHALA LETTER SANYAKA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB4;SINHALA LETTER ALPAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB5;SINHALA LETTER MAHAAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB6;SINHALA LETTER ALPAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB7;SINHALA LETTER MAHAAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB8;SINHALA LETTER MAYANNA;Lo;0;L;;;;;N;;;;;
+0DB9;SINHALA LETTER AMBA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DBA;SINHALA LETTER YAYANNA;Lo;0;L;;;;;N;;;;;
+0DBB;SINHALA LETTER RAYANNA;Lo;0;L;;;;;N;;;;;
+0DBD;SINHALA LETTER DANTAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC0;SINHALA LETTER VAYANNA;Lo;0;L;;;;;N;;;;;
+0DC1;SINHALA LETTER TAALUJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC2;SINHALA LETTER MUURDHAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC3;SINHALA LETTER DANTAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC4;SINHALA LETTER HAYANNA;Lo;0;L;;;;;N;;;;;
+0DC5;SINHALA LETTER MUURDHAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC6;SINHALA LETTER FAYANNA;Lo;0;L;;;;;N;;;;;
+0DCA;SINHALA SIGN AL-LAKUNA;Mn;9;NSM;;;;;N;;;;;
+0DCF;SINHALA VOWEL SIGN AELA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD0;SINHALA VOWEL SIGN KETTI AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD1;SINHALA VOWEL SIGN DIGA AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD2;SINHALA VOWEL SIGN KETTI IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD3;SINHALA VOWEL SIGN DIGA IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD4;SINHALA VOWEL SIGN KETTI PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD6;SINHALA VOWEL SIGN DIGA PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD8;SINHALA VOWEL SIGN GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD9;SINHALA VOWEL SIGN KOMBUVA;Mc;0;L;;;;;N;;;;;
+0DDA;SINHALA VOWEL SIGN DIGA KOMBUVA;Mc;0;L;0DD9 0DCA;;;;N;;;;;
+0DDB;SINHALA VOWEL SIGN KOMBU DEKA;Mc;0;L;;;;;N;;;;;
+0DDC;SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA;Mc;0;L;0DD9 0DCF;;;;N;;;;;
+0DDD;SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA;Mc;0;L;0DDC 0DCA;;;;N;;;;;
+0DDE;SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA;Mc;0;L;0DD9 0DDF;;;;N;;;;;
+0DDF;SINHALA VOWEL SIGN GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DE6;SINHALA LITH DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0DE7;SINHALA LITH DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0DE8;SINHALA LITH DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0DE9;SINHALA LITH DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0DEA;SINHALA LITH DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0DEB;SINHALA LITH DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0DEC;SINHALA LITH DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0DED;SINHALA LITH DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0DEE;SINHALA LITH DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0DEF;SINHALA LITH DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0DF2;SINHALA VOWEL SIGN DIGA GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DF3;SINHALA VOWEL SIGN DIGA GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DF4;SINHALA PUNCTUATION KUNDDALIYA;Po;0;L;;;;;N;;;;;
+0E01;THAI CHARACTER KO KAI;Lo;0;L;;;;;N;THAI LETTER KO KAI;;;;
+0E02;THAI CHARACTER KHO KHAI;Lo;0;L;;;;;N;THAI LETTER KHO KHAI;;;;
+0E03;THAI CHARACTER KHO KHUAT;Lo;0;L;;;;;N;THAI LETTER KHO KHUAT;;;;
+0E04;THAI CHARACTER KHO KHWAI;Lo;0;L;;;;;N;THAI LETTER KHO KHWAI;;;;
+0E05;THAI CHARACTER KHO KHON;Lo;0;L;;;;;N;THAI LETTER KHO KHON;;;;
+0E06;THAI CHARACTER KHO RAKHANG;Lo;0;L;;;;;N;THAI LETTER KHO RAKHANG;;;;
+0E07;THAI CHARACTER NGO NGU;Lo;0;L;;;;;N;THAI LETTER NGO NGU;;;;
+0E08;THAI CHARACTER CHO CHAN;Lo;0;L;;;;;N;THAI LETTER CHO CHAN;;;;
+0E09;THAI CHARACTER CHO CHING;Lo;0;L;;;;;N;THAI LETTER CHO CHING;;;;
+0E0A;THAI CHARACTER CHO CHANG;Lo;0;L;;;;;N;THAI LETTER CHO CHANG;;;;
+0E0B;THAI CHARACTER SO SO;Lo;0;L;;;;;N;THAI LETTER SO SO;;;;
+0E0C;THAI CHARACTER CHO CHOE;Lo;0;L;;;;;N;THAI LETTER CHO CHOE;;;;
+0E0D;THAI CHARACTER YO YING;Lo;0;L;;;;;N;THAI LETTER YO YING;;;;
+0E0E;THAI CHARACTER DO CHADA;Lo;0;L;;;;;N;THAI LETTER DO CHADA;;;;
+0E0F;THAI CHARACTER TO PATAK;Lo;0;L;;;;;N;THAI LETTER TO PATAK;;;;
+0E10;THAI CHARACTER THO THAN;Lo;0;L;;;;;N;THAI LETTER THO THAN;;;;
+0E11;THAI CHARACTER THO NANGMONTHO;Lo;0;L;;;;;N;THAI LETTER THO NANGMONTHO;;;;
+0E12;THAI CHARACTER THO PHUTHAO;Lo;0;L;;;;;N;THAI LETTER THO PHUTHAO;;;;
+0E13;THAI CHARACTER NO NEN;Lo;0;L;;;;;N;THAI LETTER NO NEN;;;;
+0E14;THAI CHARACTER DO DEK;Lo;0;L;;;;;N;THAI LETTER DO DEK;;;;
+0E15;THAI CHARACTER TO TAO;Lo;0;L;;;;;N;THAI LETTER TO TAO;;;;
+0E16;THAI CHARACTER THO THUNG;Lo;0;L;;;;;N;THAI LETTER THO THUNG;;;;
+0E17;THAI CHARACTER THO THAHAN;Lo;0;L;;;;;N;THAI LETTER THO THAHAN;;;;
+0E18;THAI CHARACTER THO THONG;Lo;0;L;;;;;N;THAI LETTER THO THONG;;;;
+0E19;THAI CHARACTER NO NU;Lo;0;L;;;;;N;THAI LETTER NO NU;;;;
+0E1A;THAI CHARACTER BO BAIMAI;Lo;0;L;;;;;N;THAI LETTER BO BAIMAI;;;;
+0E1B;THAI CHARACTER PO PLA;Lo;0;L;;;;;N;THAI LETTER PO PLA;;;;
+0E1C;THAI CHARACTER PHO PHUNG;Lo;0;L;;;;;N;THAI LETTER PHO PHUNG;;;;
+0E1D;THAI CHARACTER FO FA;Lo;0;L;;;;;N;THAI LETTER FO FA;;;;
+0E1E;THAI CHARACTER PHO PHAN;Lo;0;L;;;;;N;THAI LETTER PHO PHAN;;;;
+0E1F;THAI CHARACTER FO FAN;Lo;0;L;;;;;N;THAI LETTER FO FAN;;;;
+0E20;THAI CHARACTER PHO SAMPHAO;Lo;0;L;;;;;N;THAI LETTER PHO SAMPHAO;;;;
+0E21;THAI CHARACTER MO MA;Lo;0;L;;;;;N;THAI LETTER MO MA;;;;
+0E22;THAI CHARACTER YO YAK;Lo;0;L;;;;;N;THAI LETTER YO YAK;;;;
+0E23;THAI CHARACTER RO RUA;Lo;0;L;;;;;N;THAI LETTER RO RUA;;;;
+0E24;THAI CHARACTER RU;Lo;0;L;;;;;N;THAI LETTER RU;;;;
+0E25;THAI CHARACTER LO LING;Lo;0;L;;;;;N;THAI LETTER LO LING;;;;
+0E26;THAI CHARACTER LU;Lo;0;L;;;;;N;THAI LETTER LU;;;;
+0E27;THAI CHARACTER WO WAEN;Lo;0;L;;;;;N;THAI LETTER WO WAEN;;;;
+0E28;THAI CHARACTER SO SALA;Lo;0;L;;;;;N;THAI LETTER SO SALA;;;;
+0E29;THAI CHARACTER SO RUSI;Lo;0;L;;;;;N;THAI LETTER SO RUSI;;;;
+0E2A;THAI CHARACTER SO SUA;Lo;0;L;;;;;N;THAI LETTER SO SUA;;;;
+0E2B;THAI CHARACTER HO HIP;Lo;0;L;;;;;N;THAI LETTER HO HIP;;;;
+0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;;
+0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;;
+0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;;
+0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;;;;
+0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;;
+0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;;
+0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;;
+0E33;THAI CHARACTER SARA AM;Lo;0;L;<compat> 0E4D 0E32;;;;N;THAI VOWEL SIGN SARA AM;;;;
+0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;;
+0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;;
+0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;;
+0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;;;;
+0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;;
+0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;;
+0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;;
+0E3F;THAI CURRENCY SYMBOL BAHT;Sc;0;ET;;;;;N;THAI BAHT SIGN;;;;
+0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;;
+0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;;
+0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;;
+0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;;;;
+0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;;;;
+0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;;;;
+0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;;;;
+0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;;;;
+0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;;
+0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;;
+0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;;
+0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;;
+0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;;
+0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;;;;
+0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;;
+0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;;
+0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0E51;THAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0E52;THAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0E53;THAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0E54;THAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0E55;THAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0E56;THAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0E57;THAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0E58;THAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0E59;THAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0E5A;THAI CHARACTER ANGKHANKHU;Po;0;L;;;;;N;THAI ANGKHANKHU;;;;
+0E5B;THAI CHARACTER KHOMUT;Po;0;L;;;;;N;THAI KHOMUT;;;;
+0E81;LAO LETTER KO;Lo;0;L;;;;;N;;;;;
+0E82;LAO LETTER KHO SUNG;Lo;0;L;;;;;N;;;;;
+0E84;LAO LETTER KHO TAM;Lo;0;L;;;;;N;;;;;
+0E87;LAO LETTER NGO;Lo;0;L;;;;;N;;;;;
+0E88;LAO LETTER CO;Lo;0;L;;;;;N;;;;;
+0E8A;LAO LETTER SO TAM;Lo;0;L;;;;;N;;;;;
+0E8D;LAO LETTER NYO;Lo;0;L;;;;;N;;;;;
+0E94;LAO LETTER DO;Lo;0;L;;;;;N;;;;;
+0E95;LAO LETTER TO;Lo;0;L;;;;;N;;;;;
+0E96;LAO LETTER THO SUNG;Lo;0;L;;;;;N;;;;;
+0E97;LAO LETTER THO TAM;Lo;0;L;;;;;N;;;;;
+0E99;LAO LETTER NO;Lo;0;L;;;;;N;;;;;
+0E9A;LAO LETTER BO;Lo;0;L;;;;;N;;;;;
+0E9B;LAO LETTER PO;Lo;0;L;;;;;N;;;;;
+0E9C;LAO LETTER PHO SUNG;Lo;0;L;;;;;N;;;;;
+0E9D;LAO LETTER FO TAM;Lo;0;L;;;;;N;;;;;
+0E9E;LAO LETTER PHO TAM;Lo;0;L;;;;;N;;;;;
+0E9F;LAO LETTER FO SUNG;Lo;0;L;;;;;N;;;;;
+0EA1;LAO LETTER MO;Lo;0;L;;;;;N;;;;;
+0EA2;LAO LETTER YO;Lo;0;L;;;;;N;;;;;
+0EA3;LAO LETTER LO LING;Lo;0;L;;;;;N;;;;;
+0EA5;LAO LETTER LO LOOT;Lo;0;L;;;;;N;;;;;
+0EA7;LAO LETTER WO;Lo;0;L;;;;;N;;;;;
+0EAA;LAO LETTER SO SUNG;Lo;0;L;;;;;N;;;;;
+0EAB;LAO LETTER HO SUNG;Lo;0;L;;;;;N;;;;;
+0EAD;LAO LETTER O;Lo;0;L;;;;;N;;;;;
+0EAE;LAO LETTER HO TAM;Lo;0;L;;;;;N;;;;;
+0EAF;LAO ELLIPSIS;Lo;0;L;;;;;N;;;;;
+0EB0;LAO VOWEL SIGN A;Lo;0;L;;;;;N;;;;;
+0EB1;LAO VOWEL SIGN MAI KAN;Mn;0;NSM;;;;;N;;;;;
+0EB2;LAO VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
+0EB3;LAO VOWEL SIGN AM;Lo;0;L;<compat> 0ECD 0EB2;;;;N;;;;;
+0EB4;LAO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0EB5;LAO VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0EB6;LAO VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+0EB7;LAO VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+0EB8;LAO VOWEL SIGN U;Mn;118;NSM;;;;;N;;;;;
+0EB9;LAO VOWEL SIGN UU;Mn;118;NSM;;;;;N;;;;;
+0EBB;LAO VOWEL SIGN MAI KON;Mn;0;NSM;;;;;N;;;;;
+0EBC;LAO SEMIVOWEL SIGN LO;Mn;0;NSM;;;;;N;;;;;
+0EBD;LAO SEMIVOWEL SIGN NYO;Lo;0;L;;;;;N;;;;;
+0EC0;LAO VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
+0EC1;LAO VOWEL SIGN EI;Lo;0;L;;;;;N;;;;;
+0EC2;LAO VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
+0EC3;LAO VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
+0EC4;LAO VOWEL SIGN AI;Lo;0;L;;;;;N;;;;;
+0EC6;LAO KO LA;Lm;0;L;;;;;N;;;;;
+0EC8;LAO TONE MAI EK;Mn;122;NSM;;;;;N;;;;;
+0EC9;LAO TONE MAI THO;Mn;122;NSM;;;;;N;;;;;
+0ECA;LAO TONE MAI TI;Mn;122;NSM;;;;;N;;;;;
+0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
+0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
+0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
+0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0ED3;LAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0ED4;LAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0ED5;LAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0ED6;LAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0ED7;LAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0ED8;LAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0ED9;LAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0EDC;LAO HO NO;Lo;0;L;<compat> 0EAB 0E99;;;;N;;;;;
+0EDD;LAO HO MO;Lo;0;L;<compat> 0EAB 0EA1;;;;N;;;;;
+0EDE;LAO LETTER KHMU GO;Lo;0;L;;;;;N;;;;;
+0EDF;LAO LETTER KHMU NYO;Lo;0;L;;;;;N;;;;;
+0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;;
+0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;;;;
+0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;;;;
+0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;;;;
+0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;;;;
+0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;;;;
+0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;;;;
+0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;;;;
+0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;;;;
+0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;;;;
+0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;;;;
+0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;;;;
+0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;;;;
+0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;;;;
+0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;;;;
+0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;;;;
+0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;;;;
+0F14;TIBETAN MARK GTER TSHEG;Po;0;L;;;;;N;TIBETAN COMMA;;;;
+0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;;;;
+0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;;;;
+0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;;;;
+0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;;;;
+0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;;;;
+0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;;;;
+0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;;;;
+0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;;;;
+0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;;;;
+0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;;;;
+0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;;;;
+0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0F23;TIBETAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0F24;TIBETAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0F25;TIBETAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0F26;TIBETAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0F27;TIBETAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0F28;TIBETAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0F29;TIBETAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0F2A;TIBETAN DIGIT HALF ONE;No;0;L;;;;1/2;N;;;;;
+0F2B;TIBETAN DIGIT HALF TWO;No;0;L;;;;3/2;N;;;;;
+0F2C;TIBETAN DIGIT HALF THREE;No;0;L;;;;5/2;N;;;;;
+0F2D;TIBETAN DIGIT HALF FOUR;No;0;L;;;;7/2;N;;;;;
+0F2E;TIBETAN DIGIT HALF FIVE;No;0;L;;;;9/2;N;;;;;
+0F2F;TIBETAN DIGIT HALF SIX;No;0;L;;;;11/2;N;;;;;
+0F30;TIBETAN DIGIT HALF SEVEN;No;0;L;;;;13/2;N;;;;;
+0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;;
+0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;;
+0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;;
+0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;;;;
+0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;;;;
+0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;;;;
+0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;;;;
+0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;;;;
+0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;;;;
+0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;;;;
+0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;;;;
+0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;;;;
+0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;;;;
+0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;;;;
+0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;;;;
+0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;;
+0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;;
+0F43;TIBETAN LETTER GHA;Lo;0;L;0F42 0FB7;;;;N;;;;;
+0F44;TIBETAN LETTER NGA;Lo;0;L;;;;;N;;;;;
+0F45;TIBETAN LETTER CA;Lo;0;L;;;;;N;;;;;
+0F46;TIBETAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+0F47;TIBETAN LETTER JA;Lo;0;L;;;;;N;;;;;
+0F49;TIBETAN LETTER NYA;Lo;0;L;;;;;N;;;;;
+0F4A;TIBETAN LETTER TTA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED TA;;;;
+0F4B;TIBETAN LETTER TTHA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED THA;;;;
+0F4C;TIBETAN LETTER DDA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED DA;;;;
+0F4D;TIBETAN LETTER DDHA;Lo;0;L;0F4C 0FB7;;;;N;;;;;
+0F4E;TIBETAN LETTER NNA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED NA;;;;
+0F4F;TIBETAN LETTER TA;Lo;0;L;;;;;N;;;;;
+0F50;TIBETAN LETTER THA;Lo;0;L;;;;;N;;;;;
+0F51;TIBETAN LETTER DA;Lo;0;L;;;;;N;;;;;
+0F52;TIBETAN LETTER DHA;Lo;0;L;0F51 0FB7;;;;N;;;;;
+0F53;TIBETAN LETTER NA;Lo;0;L;;;;;N;;;;;
+0F54;TIBETAN LETTER PA;Lo;0;L;;;;;N;;;;;
+0F55;TIBETAN LETTER PHA;Lo;0;L;;;;;N;;;;;
+0F56;TIBETAN LETTER BA;Lo;0;L;;;;;N;;;;;
+0F57;TIBETAN LETTER BHA;Lo;0;L;0F56 0FB7;;;;N;;;;;
+0F58;TIBETAN LETTER MA;Lo;0;L;;;;;N;;;;;
+0F59;TIBETAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+0F5A;TIBETAN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+0F5B;TIBETAN LETTER DZA;Lo;0;L;;;;;N;;;;;
+0F5C;TIBETAN LETTER DZHA;Lo;0;L;0F5B 0FB7;;;;N;;;;;
+0F5D;TIBETAN LETTER WA;Lo;0;L;;;;;N;;;;;
+0F5E;TIBETAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;;
+0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;;
+0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;;;;
+0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;;
+0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;;
+0F66;TIBETAN LETTER SA;Lo;0;L;;;;;N;;;;;
+0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;;
+0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;;
+0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;;
+0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;;;;
+0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;;
+0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;;
+0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;;
+0F72;TIBETAN VOWEL SIGN I;Mn;130;NSM;;;;;N;;;;;
+0F73;TIBETAN VOWEL SIGN II;Mn;0;NSM;0F71 0F72;;;;N;;;;;
+0F74;TIBETAN VOWEL SIGN U;Mn;132;NSM;;;;;N;;;;;
+0F75;TIBETAN VOWEL SIGN UU;Mn;0;NSM;0F71 0F74;;;;N;;;;;
+0F76;TIBETAN VOWEL SIGN VOCALIC R;Mn;0;NSM;0FB2 0F80;;;;N;;;;;
+0F77;TIBETAN VOWEL SIGN VOCALIC RR;Mn;0;NSM;<compat> 0FB2 0F81;;;;N;;;;;
+0F78;TIBETAN VOWEL SIGN VOCALIC L;Mn;0;NSM;0FB3 0F80;;;;N;;;;;
+0F79;TIBETAN VOWEL SIGN VOCALIC LL;Mn;0;NSM;<compat> 0FB3 0F81;;;;N;;;;;
+0F7A;TIBETAN VOWEL SIGN E;Mn;130;NSM;;;;;N;;;;;
+0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;;
+0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;;
+0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;;
+0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;;;;
+0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;;;;
+0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;;
+0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;;
+0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;;;;
+0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;;;;
+0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;;
+0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;;
+0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;;;;
+0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;;;;
+0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;;;;
+0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;;;;
+0F8C;TIBETAN SIGN INVERTED MCHU CAN;Lo;0;L;;;;;N;;;;;
+0F8D;TIBETAN SUBJOINED SIGN LCE TSA CAN;Mn;0;NSM;;;;;N;;;;;
+0F8E;TIBETAN SUBJOINED SIGN MCHU CAN;Mn;0;NSM;;;;;N;;;;;
+0F8F;TIBETAN SUBJOINED SIGN INVERTED MCHU CAN;Mn;0;NSM;;;;;N;;;;;
+0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+0F93;TIBETAN SUBJOINED LETTER GHA;Mn;0;NSM;0F92 0FB7;;;;N;;;;;
+0F94;TIBETAN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+0F95;TIBETAN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+0F96;TIBETAN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+0F97;TIBETAN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+0F99;TIBETAN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+0F9A;TIBETAN SUBJOINED LETTER TTA;Mn;0;NSM;;;;;N;;;;;
+0F9B;TIBETAN SUBJOINED LETTER TTHA;Mn;0;NSM;;;;;N;;;;;
+0F9C;TIBETAN SUBJOINED LETTER DDA;Mn;0;NSM;;;;;N;;;;;
+0F9D;TIBETAN SUBJOINED LETTER DDHA;Mn;0;NSM;0F9C 0FB7;;;;N;;;;;
+0F9E;TIBETAN SUBJOINED LETTER NNA;Mn;0;NSM;;;;;N;;;;;
+0F9F;TIBETAN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+0FA0;TIBETAN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+0FA1;TIBETAN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+0FA2;TIBETAN SUBJOINED LETTER DHA;Mn;0;NSM;0FA1 0FB7;;;;N;;;;;
+0FA3;TIBETAN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+0FA4;TIBETAN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+0FA5;TIBETAN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+0FA6;TIBETAN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+0FA7;TIBETAN SUBJOINED LETTER BHA;Mn;0;NSM;0FA6 0FB7;;;;N;;;;;
+0FA8;TIBETAN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+0FA9;TIBETAN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;;
+0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
+0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;;
+0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;;;;
+0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
+0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;;
+0FB6;TIBETAN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;;
+0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;;;;
+0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;;;;
+0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;;;;
+0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;;;;
+0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;;;;
+0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;;
+0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;;
+0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;;;;
+0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;;;;
+0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;;;;
+0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;;;;
+0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;;;;
+0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;;;;
+0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;;;;
+0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;;;;
+0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;;;;
+0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;;;;
+0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;;;;
+0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;;;;
+0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;;;;
+0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;;;;
+0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;;;;
+0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0FD5;RIGHT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD6;LEFT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD7;RIGHT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
+0FD8;LEFT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
+0FD9;TIBETAN MARK LEADING MCHAN RTAGS;Po;0;L;;;;;N;;;;;
+0FDA;TIBETAN MARK TRAILING MCHAN RTAGS;Po;0;L;;;;;N;;;;;
+1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;;
+1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;;
+1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;;
+1003;MYANMAR LETTER GHA;Lo;0;L;;;;;N;;;;;
+1004;MYANMAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+1005;MYANMAR LETTER CA;Lo;0;L;;;;;N;;;;;
+1006;MYANMAR LETTER CHA;Lo;0;L;;;;;N;;;;;
+1007;MYANMAR LETTER JA;Lo;0;L;;;;;N;;;;;
+1008;MYANMAR LETTER JHA;Lo;0;L;;;;;N;;;;;
+1009;MYANMAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+100A;MYANMAR LETTER NNYA;Lo;0;L;;;;;N;;;;;
+100B;MYANMAR LETTER TTA;Lo;0;L;;;;;N;;;;;
+100C;MYANMAR LETTER TTHA;Lo;0;L;;;;;N;;;;;
+100D;MYANMAR LETTER DDA;Lo;0;L;;;;;N;;;;;
+100E;MYANMAR LETTER DDHA;Lo;0;L;;;;;N;;;;;
+100F;MYANMAR LETTER NNA;Lo;0;L;;;;;N;;;;;
+1010;MYANMAR LETTER TA;Lo;0;L;;;;;N;;;;;
+1011;MYANMAR LETTER THA;Lo;0;L;;;;;N;;;;;
+1012;MYANMAR LETTER DA;Lo;0;L;;;;;N;;;;;
+1013;MYANMAR LETTER DHA;Lo;0;L;;;;;N;;;;;
+1014;MYANMAR LETTER NA;Lo;0;L;;;;;N;;;;;
+1015;MYANMAR LETTER PA;Lo;0;L;;;;;N;;;;;
+1016;MYANMAR LETTER PHA;Lo;0;L;;;;;N;;;;;
+1017;MYANMAR LETTER BA;Lo;0;L;;;;;N;;;;;
+1018;MYANMAR LETTER BHA;Lo;0;L;;;;;N;;;;;
+1019;MYANMAR LETTER MA;Lo;0;L;;;;;N;;;;;
+101A;MYANMAR LETTER YA;Lo;0;L;;;;;N;;;;;
+101B;MYANMAR LETTER RA;Lo;0;L;;;;;N;;;;;
+101C;MYANMAR LETTER LA;Lo;0;L;;;;;N;;;;;
+101D;MYANMAR LETTER WA;Lo;0;L;;;;;N;;;;;
+101E;MYANMAR LETTER SA;Lo;0;L;;;;;N;;;;;
+101F;MYANMAR LETTER HA;Lo;0;L;;;;;N;;;;;
+1020;MYANMAR LETTER LLA;Lo;0;L;;;;;N;;;;;
+1021;MYANMAR LETTER A;Lo;0;L;;;;;N;;;;;
+1022;MYANMAR LETTER SHAN A;Lo;0;L;;;;;N;;;;;
+1023;MYANMAR LETTER I;Lo;0;L;;;;;N;;;;;
+1024;MYANMAR LETTER II;Lo;0;L;;;;;N;;;;;
+1025;MYANMAR LETTER U;Lo;0;L;;;;;N;;;;;
+1026;MYANMAR LETTER UU;Lo;0;L;1025 102E;;;;N;;;;;
+1027;MYANMAR LETTER E;Lo;0;L;;;;;N;;;;;
+1028;MYANMAR LETTER MON E;Lo;0;L;;;;;N;;;;;
+1029;MYANMAR LETTER O;Lo;0;L;;;;;N;;;;;
+102A;MYANMAR LETTER AU;Lo;0;L;;;;;N;;;;;
+102B;MYANMAR VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+102C;MYANMAR VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+102D;MYANMAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+102E;MYANMAR VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+102F;MYANMAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1030;MYANMAR VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1031;MYANMAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1032;MYANMAR VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1033;MYANMAR VOWEL SIGN MON II;Mn;0;NSM;;;;;N;;;;;
+1034;MYANMAR VOWEL SIGN MON O;Mn;0;NSM;;;;;N;;;;;
+1035;MYANMAR VOWEL SIGN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1036;MYANMAR SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1037;MYANMAR SIGN DOT BELOW;Mn;7;NSM;;;;;N;;;;;
+1038;MYANMAR SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+1039;MYANMAR SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+103A;MYANMAR SIGN ASAT;Mn;9;NSM;;;;;N;;;;;
+103B;MYANMAR CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;;
+103C;MYANMAR CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+103D;MYANMAR CONSONANT SIGN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+103E;MYANMAR CONSONANT SIGN MEDIAL HA;Mn;0;NSM;;;;;N;;;;;
+103F;MYANMAR LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1040;MYANMAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1041;MYANMAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1042;MYANMAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1043;MYANMAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1044;MYANMAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1045;MYANMAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1046;MYANMAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1047;MYANMAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1048;MYANMAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1049;MYANMAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104A;MYANMAR SIGN LITTLE SECTION;Po;0;L;;;;;N;;;;;
+104B;MYANMAR SIGN SECTION;Po;0;L;;;;;N;;;;;
+104C;MYANMAR SYMBOL LOCATIVE;Po;0;L;;;;;N;;;;;
+104D;MYANMAR SYMBOL COMPLETED;Po;0;L;;;;;N;;;;;
+104E;MYANMAR SYMBOL AFOREMENTIONED;Po;0;L;;;;;N;;;;;
+104F;MYANMAR SYMBOL GENITIVE;Po;0;L;;;;;N;;;;;
+1050;MYANMAR LETTER SHA;Lo;0;L;;;;;N;;;;;
+1051;MYANMAR LETTER SSA;Lo;0;L;;;;;N;;;;;
+1052;MYANMAR LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1053;MYANMAR LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1054;MYANMAR LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1055;MYANMAR LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1056;MYANMAR VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+1057;MYANMAR VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+1058;MYANMAR VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1059;MYANMAR VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+105A;MYANMAR LETTER MON NGA;Lo;0;L;;;;;N;;;;;
+105B;MYANMAR LETTER MON JHA;Lo;0;L;;;;;N;;;;;
+105C;MYANMAR LETTER MON BBA;Lo;0;L;;;;;N;;;;;
+105D;MYANMAR LETTER MON BBE;Lo;0;L;;;;;N;;;;;
+105E;MYANMAR CONSONANT SIGN MON MEDIAL NA;Mn;0;NSM;;;;;N;;;;;
+105F;MYANMAR CONSONANT SIGN MON MEDIAL MA;Mn;0;NSM;;;;;N;;;;;
+1060;MYANMAR CONSONANT SIGN MON MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1061;MYANMAR LETTER SGAW KAREN SHA;Lo;0;L;;;;;N;;;;;
+1062;MYANMAR VOWEL SIGN SGAW KAREN EU;Mc;0;L;;;;;N;;;;;
+1063;MYANMAR TONE MARK SGAW KAREN HATHI;Mc;0;L;;;;;N;;;;;
+1064;MYANMAR TONE MARK SGAW KAREN KE PHO;Mc;0;L;;;;;N;;;;;
+1065;MYANMAR LETTER WESTERN PWO KAREN THA;Lo;0;L;;;;;N;;;;;
+1066;MYANMAR LETTER WESTERN PWO KAREN PWA;Lo;0;L;;;;;N;;;;;
+1067;MYANMAR VOWEL SIGN WESTERN PWO KAREN EU;Mc;0;L;;;;;N;;;;;
+1068;MYANMAR VOWEL SIGN WESTERN PWO KAREN UE;Mc;0;L;;;;;N;;;;;
+1069;MYANMAR SIGN WESTERN PWO KAREN TONE-1;Mc;0;L;;;;;N;;;;;
+106A;MYANMAR SIGN WESTERN PWO KAREN TONE-2;Mc;0;L;;;;;N;;;;;
+106B;MYANMAR SIGN WESTERN PWO KAREN TONE-3;Mc;0;L;;;;;N;;;;;
+106C;MYANMAR SIGN WESTERN PWO KAREN TONE-4;Mc;0;L;;;;;N;;;;;
+106D;MYANMAR SIGN WESTERN PWO KAREN TONE-5;Mc;0;L;;;;;N;;;;;
+106E;MYANMAR LETTER EASTERN PWO KAREN NNA;Lo;0;L;;;;;N;;;;;
+106F;MYANMAR LETTER EASTERN PWO KAREN YWA;Lo;0;L;;;;;N;;;;;
+1070;MYANMAR LETTER EASTERN PWO KAREN GHWA;Lo;0;L;;;;;N;;;;;
+1071;MYANMAR VOWEL SIGN GEBA KAREN I;Mn;0;NSM;;;;;N;;;;;
+1072;MYANMAR VOWEL SIGN KAYAH OE;Mn;0;NSM;;;;;N;;;;;
+1073;MYANMAR VOWEL SIGN KAYAH U;Mn;0;NSM;;;;;N;;;;;
+1074;MYANMAR VOWEL SIGN KAYAH EE;Mn;0;NSM;;;;;N;;;;;
+1075;MYANMAR LETTER SHAN KA;Lo;0;L;;;;;N;;;;;
+1076;MYANMAR LETTER SHAN KHA;Lo;0;L;;;;;N;;;;;
+1077;MYANMAR LETTER SHAN GA;Lo;0;L;;;;;N;;;;;
+1078;MYANMAR LETTER SHAN CA;Lo;0;L;;;;;N;;;;;
+1079;MYANMAR LETTER SHAN ZA;Lo;0;L;;;;;N;;;;;
+107A;MYANMAR LETTER SHAN NYA;Lo;0;L;;;;;N;;;;;
+107B;MYANMAR LETTER SHAN DA;Lo;0;L;;;;;N;;;;;
+107C;MYANMAR LETTER SHAN NA;Lo;0;L;;;;;N;;;;;
+107D;MYANMAR LETTER SHAN PHA;Lo;0;L;;;;;N;;;;;
+107E;MYANMAR LETTER SHAN FA;Lo;0;L;;;;;N;;;;;
+107F;MYANMAR LETTER SHAN BA;Lo;0;L;;;;;N;;;;;
+1080;MYANMAR LETTER SHAN THA;Lo;0;L;;;;;N;;;;;
+1081;MYANMAR LETTER SHAN HA;Lo;0;L;;;;;N;;;;;
+1082;MYANMAR CONSONANT SIGN SHAN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+1083;MYANMAR VOWEL SIGN SHAN AA;Mc;0;L;;;;;N;;;;;
+1084;MYANMAR VOWEL SIGN SHAN E;Mc;0;L;;;;;N;;;;;
+1085;MYANMAR VOWEL SIGN SHAN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1086;MYANMAR VOWEL SIGN SHAN FINAL Y;Mn;0;NSM;;;;;N;;;;;
+1087;MYANMAR SIGN SHAN TONE-2;Mc;0;L;;;;;N;;;;;
+1088;MYANMAR SIGN SHAN TONE-3;Mc;0;L;;;;;N;;;;;
+1089;MYANMAR SIGN SHAN TONE-5;Mc;0;L;;;;;N;;;;;
+108A;MYANMAR SIGN SHAN TONE-6;Mc;0;L;;;;;N;;;;;
+108B;MYANMAR SIGN SHAN COUNCIL TONE-2;Mc;0;L;;;;;N;;;;;
+108C;MYANMAR SIGN SHAN COUNCIL TONE-3;Mc;0;L;;;;;N;;;;;
+108D;MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE;Mn;220;NSM;;;;;N;;;;;
+108E;MYANMAR LETTER RUMAI PALAUNG FA;Lo;0;L;;;;;N;;;;;
+108F;MYANMAR SIGN RUMAI PALAUNG TONE-5;Mc;0;L;;;;;N;;;;;
+1090;MYANMAR SHAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1091;MYANMAR SHAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1092;MYANMAR SHAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1093;MYANMAR SHAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1094;MYANMAR SHAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1095;MYANMAR SHAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1096;MYANMAR SHAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+109A;MYANMAR SIGN KHAMTI TONE-1;Mc;0;L;;;;;N;;;;;
+109B;MYANMAR SIGN KHAMTI TONE-3;Mc;0;L;;;;;N;;;;;
+109C;MYANMAR VOWEL SIGN AITON A;Mc;0;L;;;;;N;;;;;
+109D;MYANMAR VOWEL SIGN AITON AI;Mn;0;NSM;;;;;N;;;;;
+109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;;
+109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;;
+10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;2D00;
+10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;2D01;
+10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;2D02;
+10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;2D03;
+10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;2D04;
+10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;2D05;
+10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;2D06;
+10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;2D07;
+10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;2D08;
+10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;2D09;
+10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;2D0A;
+10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;2D0B;
+10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;2D0C;
+10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;2D0D;
+10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;2D0E;
+10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;2D0F;
+10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;2D10;
+10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;2D11;
+10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;2D12;
+10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;2D13;
+10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;2D14;
+10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;2D15;
+10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;2D16;
+10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;2D17;
+10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;2D18;
+10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;2D19;
+10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;2D1A;
+10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;2D1B;
+10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;2D1C;
+10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;2D1D;
+10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;2D1E;
+10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;2D1F;
+10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;2D20;
+10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;2D21;
+10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;2D22;
+10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;2D23;
+10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;2D24;
+10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25;
+10C7;GEORGIAN CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;2D27;
+10CD;GEORGIAN CAPITAL LETTER AEN;Lu;0;L;;;;;N;;;;2D2D;
+10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
+10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
+10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
+10D3;GEORGIAN LETTER DON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;;;
+10D4;GEORGIAN LETTER EN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;;;
+10D5;GEORGIAN LETTER VIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;;;
+10D6;GEORGIAN LETTER ZEN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;;;
+10D7;GEORGIAN LETTER TAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;;;
+10D8;GEORGIAN LETTER IN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;;;
+10D9;GEORGIAN LETTER KAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;;;
+10DA;GEORGIAN LETTER LAS;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;;;
+10DB;GEORGIAN LETTER MAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;;;
+10DC;GEORGIAN LETTER NAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;;;
+10DD;GEORGIAN LETTER ON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;;;
+10DE;GEORGIAN LETTER PAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;;;
+10DF;GEORGIAN LETTER ZHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;;;
+10E0;GEORGIAN LETTER RAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;;;
+10E1;GEORGIAN LETTER SAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;;;
+10E2;GEORGIAN LETTER TAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;;;
+10E3;GEORGIAN LETTER UN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;;;
+10E4;GEORGIAN LETTER PHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;;;
+10E5;GEORGIAN LETTER KHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;;;
+10E6;GEORGIAN LETTER GHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;;;
+10E7;GEORGIAN LETTER QAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;;;
+10E8;GEORGIAN LETTER SHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;;;
+10E9;GEORGIAN LETTER CHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;;;
+10EA;GEORGIAN LETTER CAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;;;
+10EB;GEORGIAN LETTER JIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;;;
+10EC;GEORGIAN LETTER CIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;;;
+10ED;GEORGIAN LETTER CHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;;;
+10EE;GEORGIAN LETTER XAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;;;
+10EF;GEORGIAN LETTER JHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;;;
+10F0;GEORGIAN LETTER HAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;;;
+10F1;GEORGIAN LETTER HE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;;;
+10F2;GEORGIAN LETTER HIE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;;;
+10F3;GEORGIAN LETTER WE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;;;
+10F4;GEORGIAN LETTER HAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;;;
+10F5;GEORGIAN LETTER HOE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;;;
+10F6;GEORGIAN LETTER FI;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;;;
+10F7;GEORGIAN LETTER YN;Lo;0;L;;;;;N;;;;;
+10F8;GEORGIAN LETTER ELIFI;Lo;0;L;;;;;N;;;;;
+10F9;GEORGIAN LETTER TURNED GAN;Lo;0;L;;;;;N;;;;;
+10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
+10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
+10FD;GEORGIAN LETTER AEN;Lo;0;L;;;;;N;;;;;
+10FE;GEORGIAN LETTER HARD SIGN;Lo;0;L;;;;;N;;;;;
+10FF;GEORGIAN LETTER LABIAL SIGN;Lo;0;L;;;;;N;;;;;
+1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;;;;
+110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
+110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;;;;
+1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+1116;HANGUL CHOSEONG NIEUN-PIEUP;Lo;0;L;;;;;N;;;;;
+1117;HANGUL CHOSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+1118;HANGUL CHOSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+1119;HANGUL CHOSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+111A;HANGUL CHOSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+111B;HANGUL CHOSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+111C;HANGUL CHOSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+111D;HANGUL CHOSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+111E;HANGUL CHOSEONG PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+111F;HANGUL CHOSEONG PIEUP-NIEUN;Lo;0;L;;;;;N;;;;;
+1120;HANGUL CHOSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+1121;HANGUL CHOSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+1122;HANGUL CHOSEONG PIEUP-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+1123;HANGUL CHOSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1124;HANGUL CHOSEONG PIEUP-SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1125;HANGUL CHOSEONG PIEUP-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1126;HANGUL CHOSEONG PIEUP-SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1127;HANGUL CHOSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+1128;HANGUL CHOSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1129;HANGUL CHOSEONG PIEUP-THIEUTH;Lo;0;L;;;;;N;;;;;
+112A;HANGUL CHOSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+112B;HANGUL CHOSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+112C;HANGUL CHOSEONG KAPYEOUNSSANGPIEUP;Lo;0;L;;;;;N;;;;;
+112D;HANGUL CHOSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+112E;HANGUL CHOSEONG SIOS-NIEUN;Lo;0;L;;;;;N;;;;;
+112F;HANGUL CHOSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1130;HANGUL CHOSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+1131;HANGUL CHOSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+1132;HANGUL CHOSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1133;HANGUL CHOSEONG SIOS-PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+1134;HANGUL CHOSEONG SIOS-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1135;HANGUL CHOSEONG SIOS-IEUNG;Lo;0;L;;;;;N;;;;;
+1136;HANGUL CHOSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1137;HANGUL CHOSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1138;HANGUL CHOSEONG SIOS-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1139;HANGUL CHOSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+113A;HANGUL CHOSEONG SIOS-PHIEUPH;Lo;0;L;;;;;N;;;;;
+113B;HANGUL CHOSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+113C;HANGUL CHOSEONG CHITUEUMSIOS;Lo;0;L;;;;;N;;;;;
+113D;HANGUL CHOSEONG CHITUEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+113E;HANGUL CHOSEONG CEONGCHIEUMSIOS;Lo;0;L;;;;;N;;;;;
+113F;HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+1140;HANGUL CHOSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+1141;HANGUL CHOSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+1142;HANGUL CHOSEONG IEUNG-TIKEUT;Lo;0;L;;;;;N;;;;;
+1143;HANGUL CHOSEONG IEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+1144;HANGUL CHOSEONG IEUNG-PIEUP;Lo;0;L;;;;;N;;;;;
+1145;HANGUL CHOSEONG IEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+1146;HANGUL CHOSEONG IEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+1147;HANGUL CHOSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+1148;HANGUL CHOSEONG IEUNG-CIEUC;Lo;0;L;;;;;N;;;;;
+1149;HANGUL CHOSEONG IEUNG-CHIEUCH;Lo;0;L;;;;;N;;;;;
+114A;HANGUL CHOSEONG IEUNG-THIEUTH;Lo;0;L;;;;;N;;;;;
+114B;HANGUL CHOSEONG IEUNG-PHIEUPH;Lo;0;L;;;;;N;;;;;
+114C;HANGUL CHOSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+114D;HANGUL CHOSEONG CIEUC-IEUNG;Lo;0;L;;;;;N;;;;;
+114E;HANGUL CHOSEONG CHITUEUMCIEUC;Lo;0;L;;;;;N;;;;;
+114F;HANGUL CHOSEONG CHITUEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1150;HANGUL CHOSEONG CEONGCHIEUMCIEUC;Lo;0;L;;;;;N;;;;;
+1151;HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1152;HANGUL CHOSEONG CHIEUCH-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1153;HANGUL CHOSEONG CHIEUCH-HIEUH;Lo;0;L;;;;;N;;;;;
+1154;HANGUL CHOSEONG CHITUEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1155;HANGUL CHOSEONG CEONGCHIEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1156;HANGUL CHOSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;;
+1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+115A;HANGUL CHOSEONG KIYEOK-TIKEUT;Lo;0;L;;;;;N;;;;;
+115B;HANGUL CHOSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+115C;HANGUL CHOSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+115D;HANGUL CHOSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+115E;HANGUL CHOSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
+115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
+1162;HANGUL JUNGSEONG AE;Lo;0;L;;;;;N;;;;;
+1163;HANGUL JUNGSEONG YA;Lo;0;L;;;;;N;;;;;
+1164;HANGUL JUNGSEONG YAE;Lo;0;L;;;;;N;;;;;
+1165;HANGUL JUNGSEONG EO;Lo;0;L;;;;;N;;;;;
+1166;HANGUL JUNGSEONG E;Lo;0;L;;;;;N;;;;;
+1167;HANGUL JUNGSEONG YEO;Lo;0;L;;;;;N;;;;;
+1168;HANGUL JUNGSEONG YE;Lo;0;L;;;;;N;;;;;
+1169;HANGUL JUNGSEONG O;Lo;0;L;;;;;N;;;;;
+116A;HANGUL JUNGSEONG WA;Lo;0;L;;;;;N;;;;;
+116B;HANGUL JUNGSEONG WAE;Lo;0;L;;;;;N;;;;;
+116C;HANGUL JUNGSEONG OE;Lo;0;L;;;;;N;;;;;
+116D;HANGUL JUNGSEONG YO;Lo;0;L;;;;;N;;;;;
+116E;HANGUL JUNGSEONG U;Lo;0;L;;;;;N;;;;;
+116F;HANGUL JUNGSEONG WEO;Lo;0;L;;;;;N;;;;;
+1170;HANGUL JUNGSEONG WE;Lo;0;L;;;;;N;;;;;
+1171;HANGUL JUNGSEONG WI;Lo;0;L;;;;;N;;;;;
+1172;HANGUL JUNGSEONG YU;Lo;0;L;;;;;N;;;;;
+1173;HANGUL JUNGSEONG EU;Lo;0;L;;;;;N;;;;;
+1174;HANGUL JUNGSEONG YI;Lo;0;L;;;;;N;;;;;
+1175;HANGUL JUNGSEONG I;Lo;0;L;;;;;N;;;;;
+1176;HANGUL JUNGSEONG A-O;Lo;0;L;;;;;N;;;;;
+1177;HANGUL JUNGSEONG A-U;Lo;0;L;;;;;N;;;;;
+1178;HANGUL JUNGSEONG YA-O;Lo;0;L;;;;;N;;;;;
+1179;HANGUL JUNGSEONG YA-YO;Lo;0;L;;;;;N;;;;;
+117A;HANGUL JUNGSEONG EO-O;Lo;0;L;;;;;N;;;;;
+117B;HANGUL JUNGSEONG EO-U;Lo;0;L;;;;;N;;;;;
+117C;HANGUL JUNGSEONG EO-EU;Lo;0;L;;;;;N;;;;;
+117D;HANGUL JUNGSEONG YEO-O;Lo;0;L;;;;;N;;;;;
+117E;HANGUL JUNGSEONG YEO-U;Lo;0;L;;;;;N;;;;;
+117F;HANGUL JUNGSEONG O-EO;Lo;0;L;;;;;N;;;;;
+1180;HANGUL JUNGSEONG O-E;Lo;0;L;;;;;N;;;;;
+1181;HANGUL JUNGSEONG O-YE;Lo;0;L;;;;;N;;;;;
+1182;HANGUL JUNGSEONG O-O;Lo;0;L;;;;;N;;;;;
+1183;HANGUL JUNGSEONG O-U;Lo;0;L;;;;;N;;;;;
+1184;HANGUL JUNGSEONG YO-YA;Lo;0;L;;;;;N;;;;;
+1185;HANGUL JUNGSEONG YO-YAE;Lo;0;L;;;;;N;;;;;
+1186;HANGUL JUNGSEONG YO-YEO;Lo;0;L;;;;;N;;;;;
+1187;HANGUL JUNGSEONG YO-O;Lo;0;L;;;;;N;;;;;
+1188;HANGUL JUNGSEONG YO-I;Lo;0;L;;;;;N;;;;;
+1189;HANGUL JUNGSEONG U-A;Lo;0;L;;;;;N;;;;;
+118A;HANGUL JUNGSEONG U-AE;Lo;0;L;;;;;N;;;;;
+118B;HANGUL JUNGSEONG U-EO-EU;Lo;0;L;;;;;N;;;;;
+118C;HANGUL JUNGSEONG U-YE;Lo;0;L;;;;;N;;;;;
+118D;HANGUL JUNGSEONG U-U;Lo;0;L;;;;;N;;;;;
+118E;HANGUL JUNGSEONG YU-A;Lo;0;L;;;;;N;;;;;
+118F;HANGUL JUNGSEONG YU-EO;Lo;0;L;;;;;N;;;;;
+1190;HANGUL JUNGSEONG YU-E;Lo;0;L;;;;;N;;;;;
+1191;HANGUL JUNGSEONG YU-YEO;Lo;0;L;;;;;N;;;;;
+1192;HANGUL JUNGSEONG YU-YE;Lo;0;L;;;;;N;;;;;
+1193;HANGUL JUNGSEONG YU-U;Lo;0;L;;;;;N;;;;;
+1194;HANGUL JUNGSEONG YU-I;Lo;0;L;;;;;N;;;;;
+1195;HANGUL JUNGSEONG EU-U;Lo;0;L;;;;;N;;;;;
+1196;HANGUL JUNGSEONG EU-EU;Lo;0;L;;;;;N;;;;;
+1197;HANGUL JUNGSEONG YI-U;Lo;0;L;;;;;N;;;;;
+1198;HANGUL JUNGSEONG I-A;Lo;0;L;;;;;N;;;;;
+1199;HANGUL JUNGSEONG I-YA;Lo;0;L;;;;;N;;;;;
+119A;HANGUL JUNGSEONG I-O;Lo;0;L;;;;;N;;;;;
+119B;HANGUL JUNGSEONG I-U;Lo;0;L;;;;;N;;;;;
+119C;HANGUL JUNGSEONG I-EU;Lo;0;L;;;;;N;;;;;
+119D;HANGUL JUNGSEONG I-ARAEA;Lo;0;L;;;;;N;;;;;
+119E;HANGUL JUNGSEONG ARAEA;Lo;0;L;;;;;N;;;;;
+119F;HANGUL JUNGSEONG ARAEA-EO;Lo;0;L;;;;;N;;;;;
+11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;;
+11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;;
+11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;;
+11A3;HANGUL JUNGSEONG A-EU;Lo;0;L;;;;;N;;;;;
+11A4;HANGUL JUNGSEONG YA-U;Lo;0;L;;;;;N;;;;;
+11A5;HANGUL JUNGSEONG YEO-YA;Lo;0;L;;;;;N;;;;;
+11A6;HANGUL JUNGSEONG O-YA;Lo;0;L;;;;;N;;;;;
+11A7;HANGUL JUNGSEONG O-YAE;Lo;0;L;;;;;N;;;;;
+11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;;;;
+11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;;;;
+11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;;;;
+11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;;
+11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C6;HANGUL JONGSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+11C7;HANGUL JONGSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+11C8;HANGUL JONGSEONG NIEUN-PANSIOS;Lo;0;L;;;;;N;;;;;
+11C9;HANGUL JONGSEONG NIEUN-THIEUTH;Lo;0;L;;;;;N;;;;;
+11CA;HANGUL JONGSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+11CB;HANGUL JONGSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
+11CC;HANGUL JONGSEONG RIEUL-KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11CD;HANGUL JONGSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+11CE;HANGUL JONGSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+11CF;HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH;Lo;0;L;;;;;N;;;;;
+11D0;HANGUL JONGSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+11D1;HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11D2;HANGUL JONGSEONG RIEUL-MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11D3;HANGUL JONGSEONG RIEUL-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11D4;HANGUL JONGSEONG RIEUL-PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11D5;HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11D6;HANGUL JONGSEONG RIEUL-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11D7;HANGUL JONGSEONG RIEUL-PANSIOS;Lo;0;L;;;;;N;;;;;
+11D8;HANGUL JONGSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11D9;HANGUL JONGSEONG RIEUL-YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11DA;HANGUL JONGSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11DB;HANGUL JONGSEONG MIEUM-RIEUL;Lo;0;L;;;;;N;;;;;
+11DC;HANGUL JONGSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+11DD;HANGUL JONGSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11DE;HANGUL JONGSEONG MIEUM-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11DF;HANGUL JONGSEONG MIEUM-PANSIOS;Lo;0;L;;;;;N;;;;;
+11E0;HANGUL JONGSEONG MIEUM-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11E1;HANGUL JONGSEONG MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+11E2;HANGUL JONGSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+11E3;HANGUL JONGSEONG PIEUP-RIEUL;Lo;0;L;;;;;N;;;;;
+11E4;HANGUL JONGSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11E5;HANGUL JONGSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11E6;HANGUL JONGSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11E7;HANGUL JONGSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11E8;HANGUL JONGSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+11E9;HANGUL JONGSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+11EA;HANGUL JONGSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+11EB;HANGUL JONGSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+11EC;HANGUL JONGSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+11ED;HANGUL JONGSEONG IEUNG-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11EE;HANGUL JONGSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+11EF;HANGUL JONGSEONG IEUNG-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11F0;HANGUL JONGSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+11F1;HANGUL JONGSEONG YESIEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+11F2;HANGUL JONGSEONG YESIEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+11F3;HANGUL JONGSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F4;HANGUL JONGSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+11F5;HANGUL JONGSEONG HIEUH-NIEUN;Lo;0;L;;;;;N;;;;;
+11F6;HANGUL JONGSEONG HIEUH-RIEUL;Lo;0;L;;;;;N;;;;;
+11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;;
+11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11FA;HANGUL JONGSEONG KIYEOK-NIEUN;Lo;0;L;;;;;N;;;;;
+11FB;HANGUL JONGSEONG KIYEOK-PIEUP;Lo;0;L;;;;;N;;;;;
+11FC;HANGUL JONGSEONG KIYEOK-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11FD;HANGUL JONGSEONG KIYEOK-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11FE;HANGUL JONGSEONG KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+11FF;HANGUL JONGSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+1203;ETHIOPIC SYLLABLE HAA;Lo;0;L;;;;;N;;;;;
+1204;ETHIOPIC SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+1205;ETHIOPIC SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+1206;ETHIOPIC SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+1207;ETHIOPIC SYLLABLE HOA;Lo;0;L;;;;;N;;;;;
+1208;ETHIOPIC SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+1209;ETHIOPIC SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+120A;ETHIOPIC SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+120B;ETHIOPIC SYLLABLE LAA;Lo;0;L;;;;;N;;;;;
+120C;ETHIOPIC SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+120D;ETHIOPIC SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+120E;ETHIOPIC SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+120F;ETHIOPIC SYLLABLE LWA;Lo;0;L;;;;;N;;;;;
+1210;ETHIOPIC SYLLABLE HHA;Lo;0;L;;;;;N;;;;;
+1211;ETHIOPIC SYLLABLE HHU;Lo;0;L;;;;;N;;;;;
+1212;ETHIOPIC SYLLABLE HHI;Lo;0;L;;;;;N;;;;;
+1213;ETHIOPIC SYLLABLE HHAA;Lo;0;L;;;;;N;;;;;
+1214;ETHIOPIC SYLLABLE HHEE;Lo;0;L;;;;;N;;;;;
+1215;ETHIOPIC SYLLABLE HHE;Lo;0;L;;;;;N;;;;;
+1216;ETHIOPIC SYLLABLE HHO;Lo;0;L;;;;;N;;;;;
+1217;ETHIOPIC SYLLABLE HHWA;Lo;0;L;;;;;N;;;;;
+1218;ETHIOPIC SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+1219;ETHIOPIC SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+121A;ETHIOPIC SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+121B;ETHIOPIC SYLLABLE MAA;Lo;0;L;;;;;N;;;;;
+121C;ETHIOPIC SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+121D;ETHIOPIC SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+121E;ETHIOPIC SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+121F;ETHIOPIC SYLLABLE MWA;Lo;0;L;;;;;N;;;;;
+1220;ETHIOPIC SYLLABLE SZA;Lo;0;L;;;;;N;;;;;
+1221;ETHIOPIC SYLLABLE SZU;Lo;0;L;;;;;N;;;;;
+1222;ETHIOPIC SYLLABLE SZI;Lo;0;L;;;;;N;;;;;
+1223;ETHIOPIC SYLLABLE SZAA;Lo;0;L;;;;;N;;;;;
+1224;ETHIOPIC SYLLABLE SZEE;Lo;0;L;;;;;N;;;;;
+1225;ETHIOPIC SYLLABLE SZE;Lo;0;L;;;;;N;;;;;
+1226;ETHIOPIC SYLLABLE SZO;Lo;0;L;;;;;N;;;;;
+1227;ETHIOPIC SYLLABLE SZWA;Lo;0;L;;;;;N;;;;;
+1228;ETHIOPIC SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+1229;ETHIOPIC SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+122A;ETHIOPIC SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+122B;ETHIOPIC SYLLABLE RAA;Lo;0;L;;;;;N;;;;;
+122C;ETHIOPIC SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+122D;ETHIOPIC SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+122E;ETHIOPIC SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+122F;ETHIOPIC SYLLABLE RWA;Lo;0;L;;;;;N;;;;;
+1230;ETHIOPIC SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+1231;ETHIOPIC SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+1232;ETHIOPIC SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+1233;ETHIOPIC SYLLABLE SAA;Lo;0;L;;;;;N;;;;;
+1234;ETHIOPIC SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+1235;ETHIOPIC SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+1236;ETHIOPIC SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+1237;ETHIOPIC SYLLABLE SWA;Lo;0;L;;;;;N;;;;;
+1238;ETHIOPIC SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+1239;ETHIOPIC SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+123A;ETHIOPIC SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+123B;ETHIOPIC SYLLABLE SHAA;Lo;0;L;;;;;N;;;;;
+123C;ETHIOPIC SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+123D;ETHIOPIC SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+123E;ETHIOPIC SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+123F;ETHIOPIC SYLLABLE SHWA;Lo;0;L;;;;;N;;;;;
+1240;ETHIOPIC SYLLABLE QA;Lo;0;L;;;;;N;;;;;
+1241;ETHIOPIC SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+1242;ETHIOPIC SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+1243;ETHIOPIC SYLLABLE QAA;Lo;0;L;;;;;N;;;;;
+1244;ETHIOPIC SYLLABLE QEE;Lo;0;L;;;;;N;;;;;
+1245;ETHIOPIC SYLLABLE QE;Lo;0;L;;;;;N;;;;;
+1246;ETHIOPIC SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+1247;ETHIOPIC SYLLABLE QOA;Lo;0;L;;;;;N;;;;;
+1248;ETHIOPIC SYLLABLE QWA;Lo;0;L;;;;;N;;;;;
+124A;ETHIOPIC SYLLABLE QWI;Lo;0;L;;;;;N;;;;;
+124B;ETHIOPIC SYLLABLE QWAA;Lo;0;L;;;;;N;;;;;
+124C;ETHIOPIC SYLLABLE QWEE;Lo;0;L;;;;;N;;;;;
+124D;ETHIOPIC SYLLABLE QWE;Lo;0;L;;;;;N;;;;;
+1250;ETHIOPIC SYLLABLE QHA;Lo;0;L;;;;;N;;;;;
+1251;ETHIOPIC SYLLABLE QHU;Lo;0;L;;;;;N;;;;;
+1252;ETHIOPIC SYLLABLE QHI;Lo;0;L;;;;;N;;;;;
+1253;ETHIOPIC SYLLABLE QHAA;Lo;0;L;;;;;N;;;;;
+1254;ETHIOPIC SYLLABLE QHEE;Lo;0;L;;;;;N;;;;;
+1255;ETHIOPIC SYLLABLE QHE;Lo;0;L;;;;;N;;;;;
+1256;ETHIOPIC SYLLABLE QHO;Lo;0;L;;;;;N;;;;;
+1258;ETHIOPIC SYLLABLE QHWA;Lo;0;L;;;;;N;;;;;
+125A;ETHIOPIC SYLLABLE QHWI;Lo;0;L;;;;;N;;;;;
+125B;ETHIOPIC SYLLABLE QHWAA;Lo;0;L;;;;;N;;;;;
+125C;ETHIOPIC SYLLABLE QHWEE;Lo;0;L;;;;;N;;;;;
+125D;ETHIOPIC SYLLABLE QHWE;Lo;0;L;;;;;N;;;;;
+1260;ETHIOPIC SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+1261;ETHIOPIC SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+1262;ETHIOPIC SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+1263;ETHIOPIC SYLLABLE BAA;Lo;0;L;;;;;N;;;;;
+1264;ETHIOPIC SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+1265;ETHIOPIC SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+1266;ETHIOPIC SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+1267;ETHIOPIC SYLLABLE BWA;Lo;0;L;;;;;N;;;;;
+1268;ETHIOPIC SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+1269;ETHIOPIC SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+126A;ETHIOPIC SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+126B;ETHIOPIC SYLLABLE VAA;Lo;0;L;;;;;N;;;;;
+126C;ETHIOPIC SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+126D;ETHIOPIC SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+126E;ETHIOPIC SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+126F;ETHIOPIC SYLLABLE VWA;Lo;0;L;;;;;N;;;;;
+1270;ETHIOPIC SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+1271;ETHIOPIC SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+1272;ETHIOPIC SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+1273;ETHIOPIC SYLLABLE TAA;Lo;0;L;;;;;N;;;;;
+1274;ETHIOPIC SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+1275;ETHIOPIC SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+1276;ETHIOPIC SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+1277;ETHIOPIC SYLLABLE TWA;Lo;0;L;;;;;N;;;;;
+1278;ETHIOPIC SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+1279;ETHIOPIC SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+127A;ETHIOPIC SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+127B;ETHIOPIC SYLLABLE CAA;Lo;0;L;;;;;N;;;;;
+127C;ETHIOPIC SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+127D;ETHIOPIC SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+127E;ETHIOPIC SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+127F;ETHIOPIC SYLLABLE CWA;Lo;0;L;;;;;N;;;;;
+1280;ETHIOPIC SYLLABLE XA;Lo;0;L;;;;;N;;;;;
+1281;ETHIOPIC SYLLABLE XU;Lo;0;L;;;;;N;;;;;
+1282;ETHIOPIC SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+1283;ETHIOPIC SYLLABLE XAA;Lo;0;L;;;;;N;;;;;
+1284;ETHIOPIC SYLLABLE XEE;Lo;0;L;;;;;N;;;;;
+1285;ETHIOPIC SYLLABLE XE;Lo;0;L;;;;;N;;;;;
+1286;ETHIOPIC SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+1287;ETHIOPIC SYLLABLE XOA;Lo;0;L;;;;;N;;;;;
+1288;ETHIOPIC SYLLABLE XWA;Lo;0;L;;;;;N;;;;;
+128A;ETHIOPIC SYLLABLE XWI;Lo;0;L;;;;;N;;;;;
+128B;ETHIOPIC SYLLABLE XWAA;Lo;0;L;;;;;N;;;;;
+128C;ETHIOPIC SYLLABLE XWEE;Lo;0;L;;;;;N;;;;;
+128D;ETHIOPIC SYLLABLE XWE;Lo;0;L;;;;;N;;;;;
+1290;ETHIOPIC SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+1291;ETHIOPIC SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+1292;ETHIOPIC SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+1293;ETHIOPIC SYLLABLE NAA;Lo;0;L;;;;;N;;;;;
+1294;ETHIOPIC SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+1295;ETHIOPIC SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+1296;ETHIOPIC SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+1297;ETHIOPIC SYLLABLE NWA;Lo;0;L;;;;;N;;;;;
+1298;ETHIOPIC SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+1299;ETHIOPIC SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+129A;ETHIOPIC SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+129B;ETHIOPIC SYLLABLE NYAA;Lo;0;L;;;;;N;;;;;
+129C;ETHIOPIC SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+129D;ETHIOPIC SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+129E;ETHIOPIC SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+129F;ETHIOPIC SYLLABLE NYWA;Lo;0;L;;;;;N;;;;;
+12A0;ETHIOPIC SYLLABLE GLOTTAL A;Lo;0;L;;;;;N;;;;;
+12A1;ETHIOPIC SYLLABLE GLOTTAL U;Lo;0;L;;;;;N;;;;;
+12A2;ETHIOPIC SYLLABLE GLOTTAL I;Lo;0;L;;;;;N;;;;;
+12A3;ETHIOPIC SYLLABLE GLOTTAL AA;Lo;0;L;;;;;N;;;;;
+12A4;ETHIOPIC SYLLABLE GLOTTAL EE;Lo;0;L;;;;;N;;;;;
+12A5;ETHIOPIC SYLLABLE GLOTTAL E;Lo;0;L;;;;;N;;;;;
+12A6;ETHIOPIC SYLLABLE GLOTTAL O;Lo;0;L;;;;;N;;;;;
+12A7;ETHIOPIC SYLLABLE GLOTTAL WA;Lo;0;L;;;;;N;;;;;
+12A8;ETHIOPIC SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+12A9;ETHIOPIC SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+12AA;ETHIOPIC SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+12AB;ETHIOPIC SYLLABLE KAA;Lo;0;L;;;;;N;;;;;
+12AC;ETHIOPIC SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+12AD;ETHIOPIC SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+12AE;ETHIOPIC SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+12AF;ETHIOPIC SYLLABLE KOA;Lo;0;L;;;;;N;;;;;
+12B0;ETHIOPIC SYLLABLE KWA;Lo;0;L;;;;;N;;;;;
+12B2;ETHIOPIC SYLLABLE KWI;Lo;0;L;;;;;N;;;;;
+12B3;ETHIOPIC SYLLABLE KWAA;Lo;0;L;;;;;N;;;;;
+12B4;ETHIOPIC SYLLABLE KWEE;Lo;0;L;;;;;N;;;;;
+12B5;ETHIOPIC SYLLABLE KWE;Lo;0;L;;;;;N;;;;;
+12B8;ETHIOPIC SYLLABLE KXA;Lo;0;L;;;;;N;;;;;
+12B9;ETHIOPIC SYLLABLE KXU;Lo;0;L;;;;;N;;;;;
+12BA;ETHIOPIC SYLLABLE KXI;Lo;0;L;;;;;N;;;;;
+12BB;ETHIOPIC SYLLABLE KXAA;Lo;0;L;;;;;N;;;;;
+12BC;ETHIOPIC SYLLABLE KXEE;Lo;0;L;;;;;N;;;;;
+12BD;ETHIOPIC SYLLABLE KXE;Lo;0;L;;;;;N;;;;;
+12BE;ETHIOPIC SYLLABLE KXO;Lo;0;L;;;;;N;;;;;
+12C0;ETHIOPIC SYLLABLE KXWA;Lo;0;L;;;;;N;;;;;
+12C2;ETHIOPIC SYLLABLE KXWI;Lo;0;L;;;;;N;;;;;
+12C3;ETHIOPIC SYLLABLE KXWAA;Lo;0;L;;;;;N;;;;;
+12C4;ETHIOPIC SYLLABLE KXWEE;Lo;0;L;;;;;N;;;;;
+12C5;ETHIOPIC SYLLABLE KXWE;Lo;0;L;;;;;N;;;;;
+12C8;ETHIOPIC SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+12C9;ETHIOPIC SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+12CA;ETHIOPIC SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+12CB;ETHIOPIC SYLLABLE WAA;Lo;0;L;;;;;N;;;;;
+12CC;ETHIOPIC SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+12CD;ETHIOPIC SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+12CE;ETHIOPIC SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+12CF;ETHIOPIC SYLLABLE WOA;Lo;0;L;;;;;N;;;;;
+12D0;ETHIOPIC SYLLABLE PHARYNGEAL A;Lo;0;L;;;;;N;;;;;
+12D1;ETHIOPIC SYLLABLE PHARYNGEAL U;Lo;0;L;;;;;N;;;;;
+12D2;ETHIOPIC SYLLABLE PHARYNGEAL I;Lo;0;L;;;;;N;;;;;
+12D3;ETHIOPIC SYLLABLE PHARYNGEAL AA;Lo;0;L;;;;;N;;;;;
+12D4;ETHIOPIC SYLLABLE PHARYNGEAL EE;Lo;0;L;;;;;N;;;;;
+12D5;ETHIOPIC SYLLABLE PHARYNGEAL E;Lo;0;L;;;;;N;;;;;
+12D6;ETHIOPIC SYLLABLE PHARYNGEAL O;Lo;0;L;;;;;N;;;;;
+12D8;ETHIOPIC SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+12D9;ETHIOPIC SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+12DA;ETHIOPIC SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+12DB;ETHIOPIC SYLLABLE ZAA;Lo;0;L;;;;;N;;;;;
+12DC;ETHIOPIC SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+12DD;ETHIOPIC SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+12DE;ETHIOPIC SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+12DF;ETHIOPIC SYLLABLE ZWA;Lo;0;L;;;;;N;;;;;
+12E0;ETHIOPIC SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+12E1;ETHIOPIC SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+12E2;ETHIOPIC SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+12E3;ETHIOPIC SYLLABLE ZHAA;Lo;0;L;;;;;N;;;;;
+12E4;ETHIOPIC SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+12E5;ETHIOPIC SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+12E6;ETHIOPIC SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+12E7;ETHIOPIC SYLLABLE ZHWA;Lo;0;L;;;;;N;;;;;
+12E8;ETHIOPIC SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+12E9;ETHIOPIC SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+12EA;ETHIOPIC SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+12EB;ETHIOPIC SYLLABLE YAA;Lo;0;L;;;;;N;;;;;
+12EC;ETHIOPIC SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+12ED;ETHIOPIC SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+12EE;ETHIOPIC SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+12EF;ETHIOPIC SYLLABLE YOA;Lo;0;L;;;;;N;;;;;
+12F0;ETHIOPIC SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+12F1;ETHIOPIC SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+12F2;ETHIOPIC SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+12F3;ETHIOPIC SYLLABLE DAA;Lo;0;L;;;;;N;;;;;
+12F4;ETHIOPIC SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+12F5;ETHIOPIC SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+12F6;ETHIOPIC SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+12F7;ETHIOPIC SYLLABLE DWA;Lo;0;L;;;;;N;;;;;
+12F8;ETHIOPIC SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+12F9;ETHIOPIC SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+12FA;ETHIOPIC SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+12FB;ETHIOPIC SYLLABLE DDAA;Lo;0;L;;;;;N;;;;;
+12FC;ETHIOPIC SYLLABLE DDEE;Lo;0;L;;;;;N;;;;;
+12FD;ETHIOPIC SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+12FE;ETHIOPIC SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+12FF;ETHIOPIC SYLLABLE DDWA;Lo;0;L;;;;;N;;;;;
+1300;ETHIOPIC SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+1301;ETHIOPIC SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+1302;ETHIOPIC SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+1303;ETHIOPIC SYLLABLE JAA;Lo;0;L;;;;;N;;;;;
+1304;ETHIOPIC SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+1305;ETHIOPIC SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+1306;ETHIOPIC SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+1307;ETHIOPIC SYLLABLE JWA;Lo;0;L;;;;;N;;;;;
+1308;ETHIOPIC SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+1309;ETHIOPIC SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+130A;ETHIOPIC SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+130B;ETHIOPIC SYLLABLE GAA;Lo;0;L;;;;;N;;;;;
+130C;ETHIOPIC SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+130D;ETHIOPIC SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+130E;ETHIOPIC SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+130F;ETHIOPIC SYLLABLE GOA;Lo;0;L;;;;;N;;;;;
+1310;ETHIOPIC SYLLABLE GWA;Lo;0;L;;;;;N;;;;;
+1312;ETHIOPIC SYLLABLE GWI;Lo;0;L;;;;;N;;;;;
+1313;ETHIOPIC SYLLABLE GWAA;Lo;0;L;;;;;N;;;;;
+1314;ETHIOPIC SYLLABLE GWEE;Lo;0;L;;;;;N;;;;;
+1315;ETHIOPIC SYLLABLE GWE;Lo;0;L;;;;;N;;;;;
+1318;ETHIOPIC SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+1319;ETHIOPIC SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+131A;ETHIOPIC SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+131B;ETHIOPIC SYLLABLE GGAA;Lo;0;L;;;;;N;;;;;
+131C;ETHIOPIC SYLLABLE GGEE;Lo;0;L;;;;;N;;;;;
+131D;ETHIOPIC SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+131E;ETHIOPIC SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+131F;ETHIOPIC SYLLABLE GGWAA;Lo;0;L;;;;;N;;;;;
+1320;ETHIOPIC SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+1321;ETHIOPIC SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+1322;ETHIOPIC SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+1323;ETHIOPIC SYLLABLE THAA;Lo;0;L;;;;;N;;;;;
+1324;ETHIOPIC SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+1325;ETHIOPIC SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+1326;ETHIOPIC SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+1327;ETHIOPIC SYLLABLE THWA;Lo;0;L;;;;;N;;;;;
+1328;ETHIOPIC SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+1329;ETHIOPIC SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+132A;ETHIOPIC SYLLABLE CHI;Lo;0;L;;;;;N;;;;;
+132B;ETHIOPIC SYLLABLE CHAA;Lo;0;L;;;;;N;;;;;
+132C;ETHIOPIC SYLLABLE CHEE;Lo;0;L;;;;;N;;;;;
+132D;ETHIOPIC SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+132E;ETHIOPIC SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+132F;ETHIOPIC SYLLABLE CHWA;Lo;0;L;;;;;N;;;;;
+1330;ETHIOPIC SYLLABLE PHA;Lo;0;L;;;;;N;;;;;
+1331;ETHIOPIC SYLLABLE PHU;Lo;0;L;;;;;N;;;;;
+1332;ETHIOPIC SYLLABLE PHI;Lo;0;L;;;;;N;;;;;
+1333;ETHIOPIC SYLLABLE PHAA;Lo;0;L;;;;;N;;;;;
+1334;ETHIOPIC SYLLABLE PHEE;Lo;0;L;;;;;N;;;;;
+1335;ETHIOPIC SYLLABLE PHE;Lo;0;L;;;;;N;;;;;
+1336;ETHIOPIC SYLLABLE PHO;Lo;0;L;;;;;N;;;;;
+1337;ETHIOPIC SYLLABLE PHWA;Lo;0;L;;;;;N;;;;;
+1338;ETHIOPIC SYLLABLE TSA;Lo;0;L;;;;;N;;;;;
+1339;ETHIOPIC SYLLABLE TSU;Lo;0;L;;;;;N;;;;;
+133A;ETHIOPIC SYLLABLE TSI;Lo;0;L;;;;;N;;;;;
+133B;ETHIOPIC SYLLABLE TSAA;Lo;0;L;;;;;N;;;;;
+133C;ETHIOPIC SYLLABLE TSEE;Lo;0;L;;;;;N;;;;;
+133D;ETHIOPIC SYLLABLE TSE;Lo;0;L;;;;;N;;;;;
+133E;ETHIOPIC SYLLABLE TSO;Lo;0;L;;;;;N;;;;;
+133F;ETHIOPIC SYLLABLE TSWA;Lo;0;L;;;;;N;;;;;
+1340;ETHIOPIC SYLLABLE TZA;Lo;0;L;;;;;N;;;;;
+1341;ETHIOPIC SYLLABLE TZU;Lo;0;L;;;;;N;;;;;
+1342;ETHIOPIC SYLLABLE TZI;Lo;0;L;;;;;N;;;;;
+1343;ETHIOPIC SYLLABLE TZAA;Lo;0;L;;;;;N;;;;;
+1344;ETHIOPIC SYLLABLE TZEE;Lo;0;L;;;;;N;;;;;
+1345;ETHIOPIC SYLLABLE TZE;Lo;0;L;;;;;N;;;;;
+1346;ETHIOPIC SYLLABLE TZO;Lo;0;L;;;;;N;;;;;
+1347;ETHIOPIC SYLLABLE TZOA;Lo;0;L;;;;;N;;;;;
+1348;ETHIOPIC SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+1349;ETHIOPIC SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+134A;ETHIOPIC SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+134B;ETHIOPIC SYLLABLE FAA;Lo;0;L;;;;;N;;;;;
+134C;ETHIOPIC SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+134D;ETHIOPIC SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+134E;ETHIOPIC SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+134F;ETHIOPIC SYLLABLE FWA;Lo;0;L;;;;;N;;;;;
+1350;ETHIOPIC SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+1351;ETHIOPIC SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+1352;ETHIOPIC SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+1353;ETHIOPIC SYLLABLE PAA;Lo;0;L;;;;;N;;;;;
+1354;ETHIOPIC SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+1355;ETHIOPIC SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+1356;ETHIOPIC SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+1357;ETHIOPIC SYLLABLE PWA;Lo;0;L;;;;;N;;;;;
+1358;ETHIOPIC SYLLABLE RYA;Lo;0;L;;;;;N;;;;;
+1359;ETHIOPIC SYLLABLE MYA;Lo;0;L;;;;;N;;;;;
+135A;ETHIOPIC SYLLABLE FYA;Lo;0;L;;;;;N;;;;;
+135D;ETHIOPIC COMBINING GEMINATION AND VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;;
+135E;ETHIOPIC COMBINING VOWEL LENGTH MARK;Mn;230;NSM;;;;;N;;;;;
+135F;ETHIOPIC COMBINING GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1360;ETHIOPIC SECTION MARK;Po;0;L;;;;;N;;;;;
+1361;ETHIOPIC WORDSPACE;Po;0;L;;;;;N;;;;;
+1362;ETHIOPIC FULL STOP;Po;0;L;;;;;N;;;;;
+1363;ETHIOPIC COMMA;Po;0;L;;;;;N;;;;;
+1364;ETHIOPIC SEMICOLON;Po;0;L;;;;;N;;;;;
+1365;ETHIOPIC COLON;Po;0;L;;;;;N;;;;;
+1366;ETHIOPIC PREFACE COLON;Po;0;L;;;;;N;;;;;
+1367;ETHIOPIC QUESTION MARK;Po;0;L;;;;;N;;;;;
+1368;ETHIOPIC PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+1369;ETHIOPIC DIGIT ONE;No;0;L;;;1;1;N;;;;;
+136A;ETHIOPIC DIGIT TWO;No;0;L;;;2;2;N;;;;;
+136B;ETHIOPIC DIGIT THREE;No;0;L;;;3;3;N;;;;;
+136C;ETHIOPIC DIGIT FOUR;No;0;L;;;4;4;N;;;;;
+136D;ETHIOPIC DIGIT FIVE;No;0;L;;;5;5;N;;;;;
+136E;ETHIOPIC DIGIT SIX;No;0;L;;;6;6;N;;;;;
+136F;ETHIOPIC DIGIT SEVEN;No;0;L;;;7;7;N;;;;;
+1370;ETHIOPIC DIGIT EIGHT;No;0;L;;;8;8;N;;;;;
+1371;ETHIOPIC DIGIT NINE;No;0;L;;;9;9;N;;;;;
+1372;ETHIOPIC NUMBER TEN;No;0;L;;;;10;N;;;;;
+1373;ETHIOPIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+1374;ETHIOPIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+1375;ETHIOPIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
+1376;ETHIOPIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+1377;ETHIOPIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+1378;ETHIOPIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+1379;ETHIOPIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+137A;ETHIOPIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
+137B;ETHIOPIC NUMBER HUNDRED;No;0;L;;;;100;N;;;;;
+137C;ETHIOPIC NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1380;ETHIOPIC SYLLABLE SEBATBEIT MWA;Lo;0;L;;;;;N;;;;;
+1381;ETHIOPIC SYLLABLE MWI;Lo;0;L;;;;;N;;;;;
+1382;ETHIOPIC SYLLABLE MWEE;Lo;0;L;;;;;N;;;;;
+1383;ETHIOPIC SYLLABLE MWE;Lo;0;L;;;;;N;;;;;
+1384;ETHIOPIC SYLLABLE SEBATBEIT BWA;Lo;0;L;;;;;N;;;;;
+1385;ETHIOPIC SYLLABLE BWI;Lo;0;L;;;;;N;;;;;
+1386;ETHIOPIC SYLLABLE BWEE;Lo;0;L;;;;;N;;;;;
+1387;ETHIOPIC SYLLABLE BWE;Lo;0;L;;;;;N;;;;;
+1388;ETHIOPIC SYLLABLE SEBATBEIT FWA;Lo;0;L;;;;;N;;;;;
+1389;ETHIOPIC SYLLABLE FWI;Lo;0;L;;;;;N;;;;;
+138A;ETHIOPIC SYLLABLE FWEE;Lo;0;L;;;;;N;;;;;
+138B;ETHIOPIC SYLLABLE FWE;Lo;0;L;;;;;N;;;;;
+138C;ETHIOPIC SYLLABLE SEBATBEIT PWA;Lo;0;L;;;;;N;;;;;
+138D;ETHIOPIC SYLLABLE PWI;Lo;0;L;;;;;N;;;;;
+138E;ETHIOPIC SYLLABLE PWEE;Lo;0;L;;;;;N;;;;;
+138F;ETHIOPIC SYLLABLE PWE;Lo;0;L;;;;;N;;;;;
+1390;ETHIOPIC TONAL MARK YIZET;So;0;ON;;;;;N;;;;;
+1391;ETHIOPIC TONAL MARK DERET;So;0;ON;;;;;N;;;;;
+1392;ETHIOPIC TONAL MARK RIKRIK;So;0;ON;;;;;N;;;;;
+1393;ETHIOPIC TONAL MARK SHORT RIKRIK;So;0;ON;;;;;N;;;;;
+1394;ETHIOPIC TONAL MARK DIFAT;So;0;ON;;;;;N;;;;;
+1395;ETHIOPIC TONAL MARK KENAT;So;0;ON;;;;;N;;;;;
+1396;ETHIOPIC TONAL MARK CHIRET;So;0;ON;;;;;N;;;;;
+1397;ETHIOPIC TONAL MARK HIDET;So;0;ON;;;;;N;;;;;
+1398;ETHIOPIC TONAL MARK DERET-HIDET;So;0;ON;;;;;N;;;;;
+1399;ETHIOPIC TONAL MARK KURT;So;0;ON;;;;;N;;;;;
+13A0;CHEROKEE LETTER A;Lu;0;L;;;;;N;;;;AB70;
+13A1;CHEROKEE LETTER E;Lu;0;L;;;;;N;;;;AB71;
+13A2;CHEROKEE LETTER I;Lu;0;L;;;;;N;;;;AB72;
+13A3;CHEROKEE LETTER O;Lu;0;L;;;;;N;;;;AB73;
+13A4;CHEROKEE LETTER U;Lu;0;L;;;;;N;;;;AB74;
+13A5;CHEROKEE LETTER V;Lu;0;L;;;;;N;;;;AB75;
+13A6;CHEROKEE LETTER GA;Lu;0;L;;;;;N;;;;AB76;
+13A7;CHEROKEE LETTER KA;Lu;0;L;;;;;N;;;;AB77;
+13A8;CHEROKEE LETTER GE;Lu;0;L;;;;;N;;;;AB78;
+13A9;CHEROKEE LETTER GI;Lu;0;L;;;;;N;;;;AB79;
+13AA;CHEROKEE LETTER GO;Lu;0;L;;;;;N;;;;AB7A;
+13AB;CHEROKEE LETTER GU;Lu;0;L;;;;;N;;;;AB7B;
+13AC;CHEROKEE LETTER GV;Lu;0;L;;;;;N;;;;AB7C;
+13AD;CHEROKEE LETTER HA;Lu;0;L;;;;;N;;;;AB7D;
+13AE;CHEROKEE LETTER HE;Lu;0;L;;;;;N;;;;AB7E;
+13AF;CHEROKEE LETTER HI;Lu;0;L;;;;;N;;;;AB7F;
+13B0;CHEROKEE LETTER HO;Lu;0;L;;;;;N;;;;AB80;
+13B1;CHEROKEE LETTER HU;Lu;0;L;;;;;N;;;;AB81;
+13B2;CHEROKEE LETTER HV;Lu;0;L;;;;;N;;;;AB82;
+13B3;CHEROKEE LETTER LA;Lu;0;L;;;;;N;;;;AB83;
+13B4;CHEROKEE LETTER LE;Lu;0;L;;;;;N;;;;AB84;
+13B5;CHEROKEE LETTER LI;Lu;0;L;;;;;N;;;;AB85;
+13B6;CHEROKEE LETTER LO;Lu;0;L;;;;;N;;;;AB86;
+13B7;CHEROKEE LETTER LU;Lu;0;L;;;;;N;;;;AB87;
+13B8;CHEROKEE LETTER LV;Lu;0;L;;;;;N;;;;AB88;
+13B9;CHEROKEE LETTER MA;Lu;0;L;;;;;N;;;;AB89;
+13BA;CHEROKEE LETTER ME;Lu;0;L;;;;;N;;;;AB8A;
+13BB;CHEROKEE LETTER MI;Lu;0;L;;;;;N;;;;AB8B;
+13BC;CHEROKEE LETTER MO;Lu;0;L;;;;;N;;;;AB8C;
+13BD;CHEROKEE LETTER MU;Lu;0;L;;;;;N;;;;AB8D;
+13BE;CHEROKEE LETTER NA;Lu;0;L;;;;;N;;;;AB8E;
+13BF;CHEROKEE LETTER HNA;Lu;0;L;;;;;N;;;;AB8F;
+13C0;CHEROKEE LETTER NAH;Lu;0;L;;;;;N;;;;AB90;
+13C1;CHEROKEE LETTER NE;Lu;0;L;;;;;N;;;;AB91;
+13C2;CHEROKEE LETTER NI;Lu;0;L;;;;;N;;;;AB92;
+13C3;CHEROKEE LETTER NO;Lu;0;L;;;;;N;;;;AB93;
+13C4;CHEROKEE LETTER NU;Lu;0;L;;;;;N;;;;AB94;
+13C5;CHEROKEE LETTER NV;Lu;0;L;;;;;N;;;;AB95;
+13C6;CHEROKEE LETTER QUA;Lu;0;L;;;;;N;;;;AB96;
+13C7;CHEROKEE LETTER QUE;Lu;0;L;;;;;N;;;;AB97;
+13C8;CHEROKEE LETTER QUI;Lu;0;L;;;;;N;;;;AB98;
+13C9;CHEROKEE LETTER QUO;Lu;0;L;;;;;N;;;;AB99;
+13CA;CHEROKEE LETTER QUU;Lu;0;L;;;;;N;;;;AB9A;
+13CB;CHEROKEE LETTER QUV;Lu;0;L;;;;;N;;;;AB9B;
+13CC;CHEROKEE LETTER SA;Lu;0;L;;;;;N;;;;AB9C;
+13CD;CHEROKEE LETTER S;Lu;0;L;;;;;N;;;;AB9D;
+13CE;CHEROKEE LETTER SE;Lu;0;L;;;;;N;;;;AB9E;
+13CF;CHEROKEE LETTER SI;Lu;0;L;;;;;N;;;;AB9F;
+13D0;CHEROKEE LETTER SO;Lu;0;L;;;;;N;;;;ABA0;
+13D1;CHEROKEE LETTER SU;Lu;0;L;;;;;N;;;;ABA1;
+13D2;CHEROKEE LETTER SV;Lu;0;L;;;;;N;;;;ABA2;
+13D3;CHEROKEE LETTER DA;Lu;0;L;;;;;N;;;;ABA3;
+13D4;CHEROKEE LETTER TA;Lu;0;L;;;;;N;;;;ABA4;
+13D5;CHEROKEE LETTER DE;Lu;0;L;;;;;N;;;;ABA5;
+13D6;CHEROKEE LETTER TE;Lu;0;L;;;;;N;;;;ABA6;
+13D7;CHEROKEE LETTER DI;Lu;0;L;;;;;N;;;;ABA7;
+13D8;CHEROKEE LETTER TI;Lu;0;L;;;;;N;;;;ABA8;
+13D9;CHEROKEE LETTER DO;Lu;0;L;;;;;N;;;;ABA9;
+13DA;CHEROKEE LETTER DU;Lu;0;L;;;;;N;;;;ABAA;
+13DB;CHEROKEE LETTER DV;Lu;0;L;;;;;N;;;;ABAB;
+13DC;CHEROKEE LETTER DLA;Lu;0;L;;;;;N;;;;ABAC;
+13DD;CHEROKEE LETTER TLA;Lu;0;L;;;;;N;;;;ABAD;
+13DE;CHEROKEE LETTER TLE;Lu;0;L;;;;;N;;;;ABAE;
+13DF;CHEROKEE LETTER TLI;Lu;0;L;;;;;N;;;;ABAF;
+13E0;CHEROKEE LETTER TLO;Lu;0;L;;;;;N;;;;ABB0;
+13E1;CHEROKEE LETTER TLU;Lu;0;L;;;;;N;;;;ABB1;
+13E2;CHEROKEE LETTER TLV;Lu;0;L;;;;;N;;;;ABB2;
+13E3;CHEROKEE LETTER TSA;Lu;0;L;;;;;N;;;;ABB3;
+13E4;CHEROKEE LETTER TSE;Lu;0;L;;;;;N;;;;ABB4;
+13E5;CHEROKEE LETTER TSI;Lu;0;L;;;;;N;;;;ABB5;
+13E6;CHEROKEE LETTER TSO;Lu;0;L;;;;;N;;;;ABB6;
+13E7;CHEROKEE LETTER TSU;Lu;0;L;;;;;N;;;;ABB7;
+13E8;CHEROKEE LETTER TSV;Lu;0;L;;;;;N;;;;ABB8;
+13E9;CHEROKEE LETTER WA;Lu;0;L;;;;;N;;;;ABB9;
+13EA;CHEROKEE LETTER WE;Lu;0;L;;;;;N;;;;ABBA;
+13EB;CHEROKEE LETTER WI;Lu;0;L;;;;;N;;;;ABBB;
+13EC;CHEROKEE LETTER WO;Lu;0;L;;;;;N;;;;ABBC;
+13ED;CHEROKEE LETTER WU;Lu;0;L;;;;;N;;;;ABBD;
+13EE;CHEROKEE LETTER WV;Lu;0;L;;;;;N;;;;ABBE;
+13EF;CHEROKEE LETTER YA;Lu;0;L;;;;;N;;;;ABBF;
+13F0;CHEROKEE LETTER YE;Lu;0;L;;;;;N;;;;13F8;
+13F1;CHEROKEE LETTER YI;Lu;0;L;;;;;N;;;;13F9;
+13F2;CHEROKEE LETTER YO;Lu;0;L;;;;;N;;;;13FA;
+13F3;CHEROKEE LETTER YU;Lu;0;L;;;;;N;;;;13FB;
+13F4;CHEROKEE LETTER YV;Lu;0;L;;;;;N;;;;13FC;
+13F5;CHEROKEE LETTER MV;Lu;0;L;;;;;N;;;;13FD;
+13F8;CHEROKEE SMALL LETTER YE;Ll;0;L;;;;;N;;;13F0;;13F0
+13F9;CHEROKEE SMALL LETTER YI;Ll;0;L;;;;;N;;;13F1;;13F1
+13FA;CHEROKEE SMALL LETTER YO;Ll;0;L;;;;;N;;;13F2;;13F2
+13FB;CHEROKEE SMALL LETTER YU;Ll;0;L;;;;;N;;;13F3;;13F3
+13FC;CHEROKEE SMALL LETTER YV;Ll;0;L;;;;;N;;;13F4;;13F4
+13FD;CHEROKEE SMALL LETTER MV;Ll;0;L;;;;;N;;;13F5;;13F5
+1400;CANADIAN SYLLABICS HYPHEN;Pd;0;ON;;;;;N;;;;;
+1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;;
+1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;;
+1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;;
+1404;CANADIAN SYLLABICS II;Lo;0;L;;;;;N;;;;;
+1405;CANADIAN SYLLABICS O;Lo;0;L;;;;;N;;;;;
+1406;CANADIAN SYLLABICS OO;Lo;0;L;;;;;N;;;;;
+1407;CANADIAN SYLLABICS Y-CREE OO;Lo;0;L;;;;;N;;;;;
+1408;CANADIAN SYLLABICS CARRIER EE;Lo;0;L;;;;;N;;;;;
+1409;CANADIAN SYLLABICS CARRIER I;Lo;0;L;;;;;N;;;;;
+140A;CANADIAN SYLLABICS A;Lo;0;L;;;;;N;;;;;
+140B;CANADIAN SYLLABICS AA;Lo;0;L;;;;;N;;;;;
+140C;CANADIAN SYLLABICS WE;Lo;0;L;;;;;N;;;;;
+140D;CANADIAN SYLLABICS WEST-CREE WE;Lo;0;L;;;;;N;;;;;
+140E;CANADIAN SYLLABICS WI;Lo;0;L;;;;;N;;;;;
+140F;CANADIAN SYLLABICS WEST-CREE WI;Lo;0;L;;;;;N;;;;;
+1410;CANADIAN SYLLABICS WII;Lo;0;L;;;;;N;;;;;
+1411;CANADIAN SYLLABICS WEST-CREE WII;Lo;0;L;;;;;N;;;;;
+1412;CANADIAN SYLLABICS WO;Lo;0;L;;;;;N;;;;;
+1413;CANADIAN SYLLABICS WEST-CREE WO;Lo;0;L;;;;;N;;;;;
+1414;CANADIAN SYLLABICS WOO;Lo;0;L;;;;;N;;;;;
+1415;CANADIAN SYLLABICS WEST-CREE WOO;Lo;0;L;;;;;N;;;;;
+1416;CANADIAN SYLLABICS NASKAPI WOO;Lo;0;L;;;;;N;;;;;
+1417;CANADIAN SYLLABICS WA;Lo;0;L;;;;;N;;;;;
+1418;CANADIAN SYLLABICS WEST-CREE WA;Lo;0;L;;;;;N;;;;;
+1419;CANADIAN SYLLABICS WAA;Lo;0;L;;;;;N;;;;;
+141A;CANADIAN SYLLABICS WEST-CREE WAA;Lo;0;L;;;;;N;;;;;
+141B;CANADIAN SYLLABICS NASKAPI WAA;Lo;0;L;;;;;N;;;;;
+141C;CANADIAN SYLLABICS AI;Lo;0;L;;;;;N;;;;;
+141D;CANADIAN SYLLABICS Y-CREE W;Lo;0;L;;;;;N;;;;;
+141E;CANADIAN SYLLABICS GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+141F;CANADIAN SYLLABICS FINAL ACUTE;Lo;0;L;;;;;N;;;;;
+1420;CANADIAN SYLLABICS FINAL GRAVE;Lo;0;L;;;;;N;;;;;
+1421;CANADIAN SYLLABICS FINAL BOTTOM HALF RING;Lo;0;L;;;;;N;;;;;
+1422;CANADIAN SYLLABICS FINAL TOP HALF RING;Lo;0;L;;;;;N;;;;;
+1423;CANADIAN SYLLABICS FINAL RIGHT HALF RING;Lo;0;L;;;;;N;;;;;
+1424;CANADIAN SYLLABICS FINAL RING;Lo;0;L;;;;;N;;;;;
+1425;CANADIAN SYLLABICS FINAL DOUBLE ACUTE;Lo;0;L;;;;;N;;;;;
+1426;CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES;Lo;0;L;;;;;N;;;;;
+1427;CANADIAN SYLLABICS FINAL MIDDLE DOT;Lo;0;L;;;;;N;;;;;
+1428;CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE;Lo;0;L;;;;;N;;;;;
+1429;CANADIAN SYLLABICS FINAL PLUS;Lo;0;L;;;;;N;;;;;
+142A;CANADIAN SYLLABICS FINAL DOWN TACK;Lo;0;L;;;;;N;;;;;
+142B;CANADIAN SYLLABICS EN;Lo;0;L;;;;;N;;;;;
+142C;CANADIAN SYLLABICS IN;Lo;0;L;;;;;N;;;;;
+142D;CANADIAN SYLLABICS ON;Lo;0;L;;;;;N;;;;;
+142E;CANADIAN SYLLABICS AN;Lo;0;L;;;;;N;;;;;
+142F;CANADIAN SYLLABICS PE;Lo;0;L;;;;;N;;;;;
+1430;CANADIAN SYLLABICS PAAI;Lo;0;L;;;;;N;;;;;
+1431;CANADIAN SYLLABICS PI;Lo;0;L;;;;;N;;;;;
+1432;CANADIAN SYLLABICS PII;Lo;0;L;;;;;N;;;;;
+1433;CANADIAN SYLLABICS PO;Lo;0;L;;;;;N;;;;;
+1434;CANADIAN SYLLABICS POO;Lo;0;L;;;;;N;;;;;
+1435;CANADIAN SYLLABICS Y-CREE POO;Lo;0;L;;;;;N;;;;;
+1436;CANADIAN SYLLABICS CARRIER HEE;Lo;0;L;;;;;N;;;;;
+1437;CANADIAN SYLLABICS CARRIER HI;Lo;0;L;;;;;N;;;;;
+1438;CANADIAN SYLLABICS PA;Lo;0;L;;;;;N;;;;;
+1439;CANADIAN SYLLABICS PAA;Lo;0;L;;;;;N;;;;;
+143A;CANADIAN SYLLABICS PWE;Lo;0;L;;;;;N;;;;;
+143B;CANADIAN SYLLABICS WEST-CREE PWE;Lo;0;L;;;;;N;;;;;
+143C;CANADIAN SYLLABICS PWI;Lo;0;L;;;;;N;;;;;
+143D;CANADIAN SYLLABICS WEST-CREE PWI;Lo;0;L;;;;;N;;;;;
+143E;CANADIAN SYLLABICS PWII;Lo;0;L;;;;;N;;;;;
+143F;CANADIAN SYLLABICS WEST-CREE PWII;Lo;0;L;;;;;N;;;;;
+1440;CANADIAN SYLLABICS PWO;Lo;0;L;;;;;N;;;;;
+1441;CANADIAN SYLLABICS WEST-CREE PWO;Lo;0;L;;;;;N;;;;;
+1442;CANADIAN SYLLABICS PWOO;Lo;0;L;;;;;N;;;;;
+1443;CANADIAN SYLLABICS WEST-CREE PWOO;Lo;0;L;;;;;N;;;;;
+1444;CANADIAN SYLLABICS PWA;Lo;0;L;;;;;N;;;;;
+1445;CANADIAN SYLLABICS WEST-CREE PWA;Lo;0;L;;;;;N;;;;;
+1446;CANADIAN SYLLABICS PWAA;Lo;0;L;;;;;N;;;;;
+1447;CANADIAN SYLLABICS WEST-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1448;CANADIAN SYLLABICS Y-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1449;CANADIAN SYLLABICS P;Lo;0;L;;;;;N;;;;;
+144A;CANADIAN SYLLABICS WEST-CREE P;Lo;0;L;;;;;N;;;;;
+144B;CANADIAN SYLLABICS CARRIER H;Lo;0;L;;;;;N;;;;;
+144C;CANADIAN SYLLABICS TE;Lo;0;L;;;;;N;;;;;
+144D;CANADIAN SYLLABICS TAAI;Lo;0;L;;;;;N;;;;;
+144E;CANADIAN SYLLABICS TI;Lo;0;L;;;;;N;;;;;
+144F;CANADIAN SYLLABICS TII;Lo;0;L;;;;;N;;;;;
+1450;CANADIAN SYLLABICS TO;Lo;0;L;;;;;N;;;;;
+1451;CANADIAN SYLLABICS TOO;Lo;0;L;;;;;N;;;;;
+1452;CANADIAN SYLLABICS Y-CREE TOO;Lo;0;L;;;;;N;;;;;
+1453;CANADIAN SYLLABICS CARRIER DEE;Lo;0;L;;;;;N;;;;;
+1454;CANADIAN SYLLABICS CARRIER DI;Lo;0;L;;;;;N;;;;;
+1455;CANADIAN SYLLABICS TA;Lo;0;L;;;;;N;;;;;
+1456;CANADIAN SYLLABICS TAA;Lo;0;L;;;;;N;;;;;
+1457;CANADIAN SYLLABICS TWE;Lo;0;L;;;;;N;;;;;
+1458;CANADIAN SYLLABICS WEST-CREE TWE;Lo;0;L;;;;;N;;;;;
+1459;CANADIAN SYLLABICS TWI;Lo;0;L;;;;;N;;;;;
+145A;CANADIAN SYLLABICS WEST-CREE TWI;Lo;0;L;;;;;N;;;;;
+145B;CANADIAN SYLLABICS TWII;Lo;0;L;;;;;N;;;;;
+145C;CANADIAN SYLLABICS WEST-CREE TWII;Lo;0;L;;;;;N;;;;;
+145D;CANADIAN SYLLABICS TWO;Lo;0;L;;;;;N;;;;;
+145E;CANADIAN SYLLABICS WEST-CREE TWO;Lo;0;L;;;;;N;;;;;
+145F;CANADIAN SYLLABICS TWOO;Lo;0;L;;;;;N;;;;;
+1460;CANADIAN SYLLABICS WEST-CREE TWOO;Lo;0;L;;;;;N;;;;;
+1461;CANADIAN SYLLABICS TWA;Lo;0;L;;;;;N;;;;;
+1462;CANADIAN SYLLABICS WEST-CREE TWA;Lo;0;L;;;;;N;;;;;
+1463;CANADIAN SYLLABICS TWAA;Lo;0;L;;;;;N;;;;;
+1464;CANADIAN SYLLABICS WEST-CREE TWAA;Lo;0;L;;;;;N;;;;;
+1465;CANADIAN SYLLABICS NASKAPI TWAA;Lo;0;L;;;;;N;;;;;
+1466;CANADIAN SYLLABICS T;Lo;0;L;;;;;N;;;;;
+1467;CANADIAN SYLLABICS TTE;Lo;0;L;;;;;N;;;;;
+1468;CANADIAN SYLLABICS TTI;Lo;0;L;;;;;N;;;;;
+1469;CANADIAN SYLLABICS TTO;Lo;0;L;;;;;N;;;;;
+146A;CANADIAN SYLLABICS TTA;Lo;0;L;;;;;N;;;;;
+146B;CANADIAN SYLLABICS KE;Lo;0;L;;;;;N;;;;;
+146C;CANADIAN SYLLABICS KAAI;Lo;0;L;;;;;N;;;;;
+146D;CANADIAN SYLLABICS KI;Lo;0;L;;;;;N;;;;;
+146E;CANADIAN SYLLABICS KII;Lo;0;L;;;;;N;;;;;
+146F;CANADIAN SYLLABICS KO;Lo;0;L;;;;;N;;;;;
+1470;CANADIAN SYLLABICS KOO;Lo;0;L;;;;;N;;;;;
+1471;CANADIAN SYLLABICS Y-CREE KOO;Lo;0;L;;;;;N;;;;;
+1472;CANADIAN SYLLABICS KA;Lo;0;L;;;;;N;;;;;
+1473;CANADIAN SYLLABICS KAA;Lo;0;L;;;;;N;;;;;
+1474;CANADIAN SYLLABICS KWE;Lo;0;L;;;;;N;;;;;
+1475;CANADIAN SYLLABICS WEST-CREE KWE;Lo;0;L;;;;;N;;;;;
+1476;CANADIAN SYLLABICS KWI;Lo;0;L;;;;;N;;;;;
+1477;CANADIAN SYLLABICS WEST-CREE KWI;Lo;0;L;;;;;N;;;;;
+1478;CANADIAN SYLLABICS KWII;Lo;0;L;;;;;N;;;;;
+1479;CANADIAN SYLLABICS WEST-CREE KWII;Lo;0;L;;;;;N;;;;;
+147A;CANADIAN SYLLABICS KWO;Lo;0;L;;;;;N;;;;;
+147B;CANADIAN SYLLABICS WEST-CREE KWO;Lo;0;L;;;;;N;;;;;
+147C;CANADIAN SYLLABICS KWOO;Lo;0;L;;;;;N;;;;;
+147D;CANADIAN SYLLABICS WEST-CREE KWOO;Lo;0;L;;;;;N;;;;;
+147E;CANADIAN SYLLABICS KWA;Lo;0;L;;;;;N;;;;;
+147F;CANADIAN SYLLABICS WEST-CREE KWA;Lo;0;L;;;;;N;;;;;
+1480;CANADIAN SYLLABICS KWAA;Lo;0;L;;;;;N;;;;;
+1481;CANADIAN SYLLABICS WEST-CREE KWAA;Lo;0;L;;;;;N;;;;;
+1482;CANADIAN SYLLABICS NASKAPI KWAA;Lo;0;L;;;;;N;;;;;
+1483;CANADIAN SYLLABICS K;Lo;0;L;;;;;N;;;;;
+1484;CANADIAN SYLLABICS KW;Lo;0;L;;;;;N;;;;;
+1485;CANADIAN SYLLABICS SOUTH-SLAVEY KEH;Lo;0;L;;;;;N;;;;;
+1486;CANADIAN SYLLABICS SOUTH-SLAVEY KIH;Lo;0;L;;;;;N;;;;;
+1487;CANADIAN SYLLABICS SOUTH-SLAVEY KOH;Lo;0;L;;;;;N;;;;;
+1488;CANADIAN SYLLABICS SOUTH-SLAVEY KAH;Lo;0;L;;;;;N;;;;;
+1489;CANADIAN SYLLABICS CE;Lo;0;L;;;;;N;;;;;
+148A;CANADIAN SYLLABICS CAAI;Lo;0;L;;;;;N;;;;;
+148B;CANADIAN SYLLABICS CI;Lo;0;L;;;;;N;;;;;
+148C;CANADIAN SYLLABICS CII;Lo;0;L;;;;;N;;;;;
+148D;CANADIAN SYLLABICS CO;Lo;0;L;;;;;N;;;;;
+148E;CANADIAN SYLLABICS COO;Lo;0;L;;;;;N;;;;;
+148F;CANADIAN SYLLABICS Y-CREE COO;Lo;0;L;;;;;N;;;;;
+1490;CANADIAN SYLLABICS CA;Lo;0;L;;;;;N;;;;;
+1491;CANADIAN SYLLABICS CAA;Lo;0;L;;;;;N;;;;;
+1492;CANADIAN SYLLABICS CWE;Lo;0;L;;;;;N;;;;;
+1493;CANADIAN SYLLABICS WEST-CREE CWE;Lo;0;L;;;;;N;;;;;
+1494;CANADIAN SYLLABICS CWI;Lo;0;L;;;;;N;;;;;
+1495;CANADIAN SYLLABICS WEST-CREE CWI;Lo;0;L;;;;;N;;;;;
+1496;CANADIAN SYLLABICS CWII;Lo;0;L;;;;;N;;;;;
+1497;CANADIAN SYLLABICS WEST-CREE CWII;Lo;0;L;;;;;N;;;;;
+1498;CANADIAN SYLLABICS CWO;Lo;0;L;;;;;N;;;;;
+1499;CANADIAN SYLLABICS WEST-CREE CWO;Lo;0;L;;;;;N;;;;;
+149A;CANADIAN SYLLABICS CWOO;Lo;0;L;;;;;N;;;;;
+149B;CANADIAN SYLLABICS WEST-CREE CWOO;Lo;0;L;;;;;N;;;;;
+149C;CANADIAN SYLLABICS CWA;Lo;0;L;;;;;N;;;;;
+149D;CANADIAN SYLLABICS WEST-CREE CWA;Lo;0;L;;;;;N;;;;;
+149E;CANADIAN SYLLABICS CWAA;Lo;0;L;;;;;N;;;;;
+149F;CANADIAN SYLLABICS WEST-CREE CWAA;Lo;0;L;;;;;N;;;;;
+14A0;CANADIAN SYLLABICS NASKAPI CWAA;Lo;0;L;;;;;N;;;;;
+14A1;CANADIAN SYLLABICS C;Lo;0;L;;;;;N;;;;;
+14A2;CANADIAN SYLLABICS SAYISI TH;Lo;0;L;;;;;N;;;;;
+14A3;CANADIAN SYLLABICS ME;Lo;0;L;;;;;N;;;;;
+14A4;CANADIAN SYLLABICS MAAI;Lo;0;L;;;;;N;;;;;
+14A5;CANADIAN SYLLABICS MI;Lo;0;L;;;;;N;;;;;
+14A6;CANADIAN SYLLABICS MII;Lo;0;L;;;;;N;;;;;
+14A7;CANADIAN SYLLABICS MO;Lo;0;L;;;;;N;;;;;
+14A8;CANADIAN SYLLABICS MOO;Lo;0;L;;;;;N;;;;;
+14A9;CANADIAN SYLLABICS Y-CREE MOO;Lo;0;L;;;;;N;;;;;
+14AA;CANADIAN SYLLABICS MA;Lo;0;L;;;;;N;;;;;
+14AB;CANADIAN SYLLABICS MAA;Lo;0;L;;;;;N;;;;;
+14AC;CANADIAN SYLLABICS MWE;Lo;0;L;;;;;N;;;;;
+14AD;CANADIAN SYLLABICS WEST-CREE MWE;Lo;0;L;;;;;N;;;;;
+14AE;CANADIAN SYLLABICS MWI;Lo;0;L;;;;;N;;;;;
+14AF;CANADIAN SYLLABICS WEST-CREE MWI;Lo;0;L;;;;;N;;;;;
+14B0;CANADIAN SYLLABICS MWII;Lo;0;L;;;;;N;;;;;
+14B1;CANADIAN SYLLABICS WEST-CREE MWII;Lo;0;L;;;;;N;;;;;
+14B2;CANADIAN SYLLABICS MWO;Lo;0;L;;;;;N;;;;;
+14B3;CANADIAN SYLLABICS WEST-CREE MWO;Lo;0;L;;;;;N;;;;;
+14B4;CANADIAN SYLLABICS MWOO;Lo;0;L;;;;;N;;;;;
+14B5;CANADIAN SYLLABICS WEST-CREE MWOO;Lo;0;L;;;;;N;;;;;
+14B6;CANADIAN SYLLABICS MWA;Lo;0;L;;;;;N;;;;;
+14B7;CANADIAN SYLLABICS WEST-CREE MWA;Lo;0;L;;;;;N;;;;;
+14B8;CANADIAN SYLLABICS MWAA;Lo;0;L;;;;;N;;;;;
+14B9;CANADIAN SYLLABICS WEST-CREE MWAA;Lo;0;L;;;;;N;;;;;
+14BA;CANADIAN SYLLABICS NASKAPI MWAA;Lo;0;L;;;;;N;;;;;
+14BB;CANADIAN SYLLABICS M;Lo;0;L;;;;;N;;;;;
+14BC;CANADIAN SYLLABICS WEST-CREE M;Lo;0;L;;;;;N;;;;;
+14BD;CANADIAN SYLLABICS MH;Lo;0;L;;;;;N;;;;;
+14BE;CANADIAN SYLLABICS ATHAPASCAN M;Lo;0;L;;;;;N;;;;;
+14BF;CANADIAN SYLLABICS SAYISI M;Lo;0;L;;;;;N;;;;;
+14C0;CANADIAN SYLLABICS NE;Lo;0;L;;;;;N;;;;;
+14C1;CANADIAN SYLLABICS NAAI;Lo;0;L;;;;;N;;;;;
+14C2;CANADIAN SYLLABICS NI;Lo;0;L;;;;;N;;;;;
+14C3;CANADIAN SYLLABICS NII;Lo;0;L;;;;;N;;;;;
+14C4;CANADIAN SYLLABICS NO;Lo;0;L;;;;;N;;;;;
+14C5;CANADIAN SYLLABICS NOO;Lo;0;L;;;;;N;;;;;
+14C6;CANADIAN SYLLABICS Y-CREE NOO;Lo;0;L;;;;;N;;;;;
+14C7;CANADIAN SYLLABICS NA;Lo;0;L;;;;;N;;;;;
+14C8;CANADIAN SYLLABICS NAA;Lo;0;L;;;;;N;;;;;
+14C9;CANADIAN SYLLABICS NWE;Lo;0;L;;;;;N;;;;;
+14CA;CANADIAN SYLLABICS WEST-CREE NWE;Lo;0;L;;;;;N;;;;;
+14CB;CANADIAN SYLLABICS NWA;Lo;0;L;;;;;N;;;;;
+14CC;CANADIAN SYLLABICS WEST-CREE NWA;Lo;0;L;;;;;N;;;;;
+14CD;CANADIAN SYLLABICS NWAA;Lo;0;L;;;;;N;;;;;
+14CE;CANADIAN SYLLABICS WEST-CREE NWAA;Lo;0;L;;;;;N;;;;;
+14CF;CANADIAN SYLLABICS NASKAPI NWAA;Lo;0;L;;;;;N;;;;;
+14D0;CANADIAN SYLLABICS N;Lo;0;L;;;;;N;;;;;
+14D1;CANADIAN SYLLABICS CARRIER NG;Lo;0;L;;;;;N;;;;;
+14D2;CANADIAN SYLLABICS NH;Lo;0;L;;;;;N;;;;;
+14D3;CANADIAN SYLLABICS LE;Lo;0;L;;;;;N;;;;;
+14D4;CANADIAN SYLLABICS LAAI;Lo;0;L;;;;;N;;;;;
+14D5;CANADIAN SYLLABICS LI;Lo;0;L;;;;;N;;;;;
+14D6;CANADIAN SYLLABICS LII;Lo;0;L;;;;;N;;;;;
+14D7;CANADIAN SYLLABICS LO;Lo;0;L;;;;;N;;;;;
+14D8;CANADIAN SYLLABICS LOO;Lo;0;L;;;;;N;;;;;
+14D9;CANADIAN SYLLABICS Y-CREE LOO;Lo;0;L;;;;;N;;;;;
+14DA;CANADIAN SYLLABICS LA;Lo;0;L;;;;;N;;;;;
+14DB;CANADIAN SYLLABICS LAA;Lo;0;L;;;;;N;;;;;
+14DC;CANADIAN SYLLABICS LWE;Lo;0;L;;;;;N;;;;;
+14DD;CANADIAN SYLLABICS WEST-CREE LWE;Lo;0;L;;;;;N;;;;;
+14DE;CANADIAN SYLLABICS LWI;Lo;0;L;;;;;N;;;;;
+14DF;CANADIAN SYLLABICS WEST-CREE LWI;Lo;0;L;;;;;N;;;;;
+14E0;CANADIAN SYLLABICS LWII;Lo;0;L;;;;;N;;;;;
+14E1;CANADIAN SYLLABICS WEST-CREE LWII;Lo;0;L;;;;;N;;;;;
+14E2;CANADIAN SYLLABICS LWO;Lo;0;L;;;;;N;;;;;
+14E3;CANADIAN SYLLABICS WEST-CREE LWO;Lo;0;L;;;;;N;;;;;
+14E4;CANADIAN SYLLABICS LWOO;Lo;0;L;;;;;N;;;;;
+14E5;CANADIAN SYLLABICS WEST-CREE LWOO;Lo;0;L;;;;;N;;;;;
+14E6;CANADIAN SYLLABICS LWA;Lo;0;L;;;;;N;;;;;
+14E7;CANADIAN SYLLABICS WEST-CREE LWA;Lo;0;L;;;;;N;;;;;
+14E8;CANADIAN SYLLABICS LWAA;Lo;0;L;;;;;N;;;;;
+14E9;CANADIAN SYLLABICS WEST-CREE LWAA;Lo;0;L;;;;;N;;;;;
+14EA;CANADIAN SYLLABICS L;Lo;0;L;;;;;N;;;;;
+14EB;CANADIAN SYLLABICS WEST-CREE L;Lo;0;L;;;;;N;;;;;
+14EC;CANADIAN SYLLABICS MEDIAL L;Lo;0;L;;;;;N;;;;;
+14ED;CANADIAN SYLLABICS SE;Lo;0;L;;;;;N;;;;;
+14EE;CANADIAN SYLLABICS SAAI;Lo;0;L;;;;;N;;;;;
+14EF;CANADIAN SYLLABICS SI;Lo;0;L;;;;;N;;;;;
+14F0;CANADIAN SYLLABICS SII;Lo;0;L;;;;;N;;;;;
+14F1;CANADIAN SYLLABICS SO;Lo;0;L;;;;;N;;;;;
+14F2;CANADIAN SYLLABICS SOO;Lo;0;L;;;;;N;;;;;
+14F3;CANADIAN SYLLABICS Y-CREE SOO;Lo;0;L;;;;;N;;;;;
+14F4;CANADIAN SYLLABICS SA;Lo;0;L;;;;;N;;;;;
+14F5;CANADIAN SYLLABICS SAA;Lo;0;L;;;;;N;;;;;
+14F6;CANADIAN SYLLABICS SWE;Lo;0;L;;;;;N;;;;;
+14F7;CANADIAN SYLLABICS WEST-CREE SWE;Lo;0;L;;;;;N;;;;;
+14F8;CANADIAN SYLLABICS SWI;Lo;0;L;;;;;N;;;;;
+14F9;CANADIAN SYLLABICS WEST-CREE SWI;Lo;0;L;;;;;N;;;;;
+14FA;CANADIAN SYLLABICS SWII;Lo;0;L;;;;;N;;;;;
+14FB;CANADIAN SYLLABICS WEST-CREE SWII;Lo;0;L;;;;;N;;;;;
+14FC;CANADIAN SYLLABICS SWO;Lo;0;L;;;;;N;;;;;
+14FD;CANADIAN SYLLABICS WEST-CREE SWO;Lo;0;L;;;;;N;;;;;
+14FE;CANADIAN SYLLABICS SWOO;Lo;0;L;;;;;N;;;;;
+14FF;CANADIAN SYLLABICS WEST-CREE SWOO;Lo;0;L;;;;;N;;;;;
+1500;CANADIAN SYLLABICS SWA;Lo;0;L;;;;;N;;;;;
+1501;CANADIAN SYLLABICS WEST-CREE SWA;Lo;0;L;;;;;N;;;;;
+1502;CANADIAN SYLLABICS SWAA;Lo;0;L;;;;;N;;;;;
+1503;CANADIAN SYLLABICS WEST-CREE SWAA;Lo;0;L;;;;;N;;;;;
+1504;CANADIAN SYLLABICS NASKAPI SWAA;Lo;0;L;;;;;N;;;;;
+1505;CANADIAN SYLLABICS S;Lo;0;L;;;;;N;;;;;
+1506;CANADIAN SYLLABICS ATHAPASCAN S;Lo;0;L;;;;;N;;;;;
+1507;CANADIAN SYLLABICS SW;Lo;0;L;;;;;N;;;;;
+1508;CANADIAN SYLLABICS BLACKFOOT S;Lo;0;L;;;;;N;;;;;
+1509;CANADIAN SYLLABICS MOOSE-CREE SK;Lo;0;L;;;;;N;;;;;
+150A;CANADIAN SYLLABICS NASKAPI SKW;Lo;0;L;;;;;N;;;;;
+150B;CANADIAN SYLLABICS NASKAPI S-W;Lo;0;L;;;;;N;;;;;
+150C;CANADIAN SYLLABICS NASKAPI SPWA;Lo;0;L;;;;;N;;;;;
+150D;CANADIAN SYLLABICS NASKAPI STWA;Lo;0;L;;;;;N;;;;;
+150E;CANADIAN SYLLABICS NASKAPI SKWA;Lo;0;L;;;;;N;;;;;
+150F;CANADIAN SYLLABICS NASKAPI SCWA;Lo;0;L;;;;;N;;;;;
+1510;CANADIAN SYLLABICS SHE;Lo;0;L;;;;;N;;;;;
+1511;CANADIAN SYLLABICS SHI;Lo;0;L;;;;;N;;;;;
+1512;CANADIAN SYLLABICS SHII;Lo;0;L;;;;;N;;;;;
+1513;CANADIAN SYLLABICS SHO;Lo;0;L;;;;;N;;;;;
+1514;CANADIAN SYLLABICS SHOO;Lo;0;L;;;;;N;;;;;
+1515;CANADIAN SYLLABICS SHA;Lo;0;L;;;;;N;;;;;
+1516;CANADIAN SYLLABICS SHAA;Lo;0;L;;;;;N;;;;;
+1517;CANADIAN SYLLABICS SHWE;Lo;0;L;;;;;N;;;;;
+1518;CANADIAN SYLLABICS WEST-CREE SHWE;Lo;0;L;;;;;N;;;;;
+1519;CANADIAN SYLLABICS SHWI;Lo;0;L;;;;;N;;;;;
+151A;CANADIAN SYLLABICS WEST-CREE SHWI;Lo;0;L;;;;;N;;;;;
+151B;CANADIAN SYLLABICS SHWII;Lo;0;L;;;;;N;;;;;
+151C;CANADIAN SYLLABICS WEST-CREE SHWII;Lo;0;L;;;;;N;;;;;
+151D;CANADIAN SYLLABICS SHWO;Lo;0;L;;;;;N;;;;;
+151E;CANADIAN SYLLABICS WEST-CREE SHWO;Lo;0;L;;;;;N;;;;;
+151F;CANADIAN SYLLABICS SHWOO;Lo;0;L;;;;;N;;;;;
+1520;CANADIAN SYLLABICS WEST-CREE SHWOO;Lo;0;L;;;;;N;;;;;
+1521;CANADIAN SYLLABICS SHWA;Lo;0;L;;;;;N;;;;;
+1522;CANADIAN SYLLABICS WEST-CREE SHWA;Lo;0;L;;;;;N;;;;;
+1523;CANADIAN SYLLABICS SHWAA;Lo;0;L;;;;;N;;;;;
+1524;CANADIAN SYLLABICS WEST-CREE SHWAA;Lo;0;L;;;;;N;;;;;
+1525;CANADIAN SYLLABICS SH;Lo;0;L;;;;;N;;;;;
+1526;CANADIAN SYLLABICS YE;Lo;0;L;;;;;N;;;;;
+1527;CANADIAN SYLLABICS YAAI;Lo;0;L;;;;;N;;;;;
+1528;CANADIAN SYLLABICS YI;Lo;0;L;;;;;N;;;;;
+1529;CANADIAN SYLLABICS YII;Lo;0;L;;;;;N;;;;;
+152A;CANADIAN SYLLABICS YO;Lo;0;L;;;;;N;;;;;
+152B;CANADIAN SYLLABICS YOO;Lo;0;L;;;;;N;;;;;
+152C;CANADIAN SYLLABICS Y-CREE YOO;Lo;0;L;;;;;N;;;;;
+152D;CANADIAN SYLLABICS YA;Lo;0;L;;;;;N;;;;;
+152E;CANADIAN SYLLABICS YAA;Lo;0;L;;;;;N;;;;;
+152F;CANADIAN SYLLABICS YWE;Lo;0;L;;;;;N;;;;;
+1530;CANADIAN SYLLABICS WEST-CREE YWE;Lo;0;L;;;;;N;;;;;
+1531;CANADIAN SYLLABICS YWI;Lo;0;L;;;;;N;;;;;
+1532;CANADIAN SYLLABICS WEST-CREE YWI;Lo;0;L;;;;;N;;;;;
+1533;CANADIAN SYLLABICS YWII;Lo;0;L;;;;;N;;;;;
+1534;CANADIAN SYLLABICS WEST-CREE YWII;Lo;0;L;;;;;N;;;;;
+1535;CANADIAN SYLLABICS YWO;Lo;0;L;;;;;N;;;;;
+1536;CANADIAN SYLLABICS WEST-CREE YWO;Lo;0;L;;;;;N;;;;;
+1537;CANADIAN SYLLABICS YWOO;Lo;0;L;;;;;N;;;;;
+1538;CANADIAN SYLLABICS WEST-CREE YWOO;Lo;0;L;;;;;N;;;;;
+1539;CANADIAN SYLLABICS YWA;Lo;0;L;;;;;N;;;;;
+153A;CANADIAN SYLLABICS WEST-CREE YWA;Lo;0;L;;;;;N;;;;;
+153B;CANADIAN SYLLABICS YWAA;Lo;0;L;;;;;N;;;;;
+153C;CANADIAN SYLLABICS WEST-CREE YWAA;Lo;0;L;;;;;N;;;;;
+153D;CANADIAN SYLLABICS NASKAPI YWAA;Lo;0;L;;;;;N;;;;;
+153E;CANADIAN SYLLABICS Y;Lo;0;L;;;;;N;;;;;
+153F;CANADIAN SYLLABICS BIBLE-CREE Y;Lo;0;L;;;;;N;;;;;
+1540;CANADIAN SYLLABICS WEST-CREE Y;Lo;0;L;;;;;N;;;;;
+1541;CANADIAN SYLLABICS SAYISI YI;Lo;0;L;;;;;N;;;;;
+1542;CANADIAN SYLLABICS RE;Lo;0;L;;;;;N;;;;;
+1543;CANADIAN SYLLABICS R-CREE RE;Lo;0;L;;;;;N;;;;;
+1544;CANADIAN SYLLABICS WEST-CREE LE;Lo;0;L;;;;;N;;;;;
+1545;CANADIAN SYLLABICS RAAI;Lo;0;L;;;;;N;;;;;
+1546;CANADIAN SYLLABICS RI;Lo;0;L;;;;;N;;;;;
+1547;CANADIAN SYLLABICS RII;Lo;0;L;;;;;N;;;;;
+1548;CANADIAN SYLLABICS RO;Lo;0;L;;;;;N;;;;;
+1549;CANADIAN SYLLABICS ROO;Lo;0;L;;;;;N;;;;;
+154A;CANADIAN SYLLABICS WEST-CREE LO;Lo;0;L;;;;;N;;;;;
+154B;CANADIAN SYLLABICS RA;Lo;0;L;;;;;N;;;;;
+154C;CANADIAN SYLLABICS RAA;Lo;0;L;;;;;N;;;;;
+154D;CANADIAN SYLLABICS WEST-CREE LA;Lo;0;L;;;;;N;;;;;
+154E;CANADIAN SYLLABICS RWAA;Lo;0;L;;;;;N;;;;;
+154F;CANADIAN SYLLABICS WEST-CREE RWAA;Lo;0;L;;;;;N;;;;;
+1550;CANADIAN SYLLABICS R;Lo;0;L;;;;;N;;;;;
+1551;CANADIAN SYLLABICS WEST-CREE R;Lo;0;L;;;;;N;;;;;
+1552;CANADIAN SYLLABICS MEDIAL R;Lo;0;L;;;;;N;;;;;
+1553;CANADIAN SYLLABICS FE;Lo;0;L;;;;;N;;;;;
+1554;CANADIAN SYLLABICS FAAI;Lo;0;L;;;;;N;;;;;
+1555;CANADIAN SYLLABICS FI;Lo;0;L;;;;;N;;;;;
+1556;CANADIAN SYLLABICS FII;Lo;0;L;;;;;N;;;;;
+1557;CANADIAN SYLLABICS FO;Lo;0;L;;;;;N;;;;;
+1558;CANADIAN SYLLABICS FOO;Lo;0;L;;;;;N;;;;;
+1559;CANADIAN SYLLABICS FA;Lo;0;L;;;;;N;;;;;
+155A;CANADIAN SYLLABICS FAA;Lo;0;L;;;;;N;;;;;
+155B;CANADIAN SYLLABICS FWAA;Lo;0;L;;;;;N;;;;;
+155C;CANADIAN SYLLABICS WEST-CREE FWAA;Lo;0;L;;;;;N;;;;;
+155D;CANADIAN SYLLABICS F;Lo;0;L;;;;;N;;;;;
+155E;CANADIAN SYLLABICS THE;Lo;0;L;;;;;N;;;;;
+155F;CANADIAN SYLLABICS N-CREE THE;Lo;0;L;;;;;N;;;;;
+1560;CANADIAN SYLLABICS THI;Lo;0;L;;;;;N;;;;;
+1561;CANADIAN SYLLABICS N-CREE THI;Lo;0;L;;;;;N;;;;;
+1562;CANADIAN SYLLABICS THII;Lo;0;L;;;;;N;;;;;
+1563;CANADIAN SYLLABICS N-CREE THII;Lo;0;L;;;;;N;;;;;
+1564;CANADIAN SYLLABICS THO;Lo;0;L;;;;;N;;;;;
+1565;CANADIAN SYLLABICS THOO;Lo;0;L;;;;;N;;;;;
+1566;CANADIAN SYLLABICS THA;Lo;0;L;;;;;N;;;;;
+1567;CANADIAN SYLLABICS THAA;Lo;0;L;;;;;N;;;;;
+1568;CANADIAN SYLLABICS THWAA;Lo;0;L;;;;;N;;;;;
+1569;CANADIAN SYLLABICS WEST-CREE THWAA;Lo;0;L;;;;;N;;;;;
+156A;CANADIAN SYLLABICS TH;Lo;0;L;;;;;N;;;;;
+156B;CANADIAN SYLLABICS TTHE;Lo;0;L;;;;;N;;;;;
+156C;CANADIAN SYLLABICS TTHI;Lo;0;L;;;;;N;;;;;
+156D;CANADIAN SYLLABICS TTHO;Lo;0;L;;;;;N;;;;;
+156E;CANADIAN SYLLABICS TTHA;Lo;0;L;;;;;N;;;;;
+156F;CANADIAN SYLLABICS TTH;Lo;0;L;;;;;N;;;;;
+1570;CANADIAN SYLLABICS TYE;Lo;0;L;;;;;N;;;;;
+1571;CANADIAN SYLLABICS TYI;Lo;0;L;;;;;N;;;;;
+1572;CANADIAN SYLLABICS TYO;Lo;0;L;;;;;N;;;;;
+1573;CANADIAN SYLLABICS TYA;Lo;0;L;;;;;N;;;;;
+1574;CANADIAN SYLLABICS NUNAVIK HE;Lo;0;L;;;;;N;;;;;
+1575;CANADIAN SYLLABICS NUNAVIK HI;Lo;0;L;;;;;N;;;;;
+1576;CANADIAN SYLLABICS NUNAVIK HII;Lo;0;L;;;;;N;;;;;
+1577;CANADIAN SYLLABICS NUNAVIK HO;Lo;0;L;;;;;N;;;;;
+1578;CANADIAN SYLLABICS NUNAVIK HOO;Lo;0;L;;;;;N;;;;;
+1579;CANADIAN SYLLABICS NUNAVIK HA;Lo;0;L;;;;;N;;;;;
+157A;CANADIAN SYLLABICS NUNAVIK HAA;Lo;0;L;;;;;N;;;;;
+157B;CANADIAN SYLLABICS NUNAVIK H;Lo;0;L;;;;;N;;;;;
+157C;CANADIAN SYLLABICS NUNAVUT H;Lo;0;L;;;;;N;;;;;
+157D;CANADIAN SYLLABICS HK;Lo;0;L;;;;;N;;;;;
+157E;CANADIAN SYLLABICS QAAI;Lo;0;L;;;;;N;;;;;
+157F;CANADIAN SYLLABICS QI;Lo;0;L;;;;;N;;;;;
+1580;CANADIAN SYLLABICS QII;Lo;0;L;;;;;N;;;;;
+1581;CANADIAN SYLLABICS QO;Lo;0;L;;;;;N;;;;;
+1582;CANADIAN SYLLABICS QOO;Lo;0;L;;;;;N;;;;;
+1583;CANADIAN SYLLABICS QA;Lo;0;L;;;;;N;;;;;
+1584;CANADIAN SYLLABICS QAA;Lo;0;L;;;;;N;;;;;
+1585;CANADIAN SYLLABICS Q;Lo;0;L;;;;;N;;;;;
+1586;CANADIAN SYLLABICS TLHE;Lo;0;L;;;;;N;;;;;
+1587;CANADIAN SYLLABICS TLHI;Lo;0;L;;;;;N;;;;;
+1588;CANADIAN SYLLABICS TLHO;Lo;0;L;;;;;N;;;;;
+1589;CANADIAN SYLLABICS TLHA;Lo;0;L;;;;;N;;;;;
+158A;CANADIAN SYLLABICS WEST-CREE RE;Lo;0;L;;;;;N;;;;;
+158B;CANADIAN SYLLABICS WEST-CREE RI;Lo;0;L;;;;;N;;;;;
+158C;CANADIAN SYLLABICS WEST-CREE RO;Lo;0;L;;;;;N;;;;;
+158D;CANADIAN SYLLABICS WEST-CREE RA;Lo;0;L;;;;;N;;;;;
+158E;CANADIAN SYLLABICS NGAAI;Lo;0;L;;;;;N;;;;;
+158F;CANADIAN SYLLABICS NGI;Lo;0;L;;;;;N;;;;;
+1590;CANADIAN SYLLABICS NGII;Lo;0;L;;;;;N;;;;;
+1591;CANADIAN SYLLABICS NGO;Lo;0;L;;;;;N;;;;;
+1592;CANADIAN SYLLABICS NGOO;Lo;0;L;;;;;N;;;;;
+1593;CANADIAN SYLLABICS NGA;Lo;0;L;;;;;N;;;;;
+1594;CANADIAN SYLLABICS NGAA;Lo;0;L;;;;;N;;;;;
+1595;CANADIAN SYLLABICS NG;Lo;0;L;;;;;N;;;;;
+1596;CANADIAN SYLLABICS NNG;Lo;0;L;;;;;N;;;;;
+1597;CANADIAN SYLLABICS SAYISI SHE;Lo;0;L;;;;;N;;;;;
+1598;CANADIAN SYLLABICS SAYISI SHI;Lo;0;L;;;;;N;;;;;
+1599;CANADIAN SYLLABICS SAYISI SHO;Lo;0;L;;;;;N;;;;;
+159A;CANADIAN SYLLABICS SAYISI SHA;Lo;0;L;;;;;N;;;;;
+159B;CANADIAN SYLLABICS WOODS-CREE THE;Lo;0;L;;;;;N;;;;;
+159C;CANADIAN SYLLABICS WOODS-CREE THI;Lo;0;L;;;;;N;;;;;
+159D;CANADIAN SYLLABICS WOODS-CREE THO;Lo;0;L;;;;;N;;;;;
+159E;CANADIAN SYLLABICS WOODS-CREE THA;Lo;0;L;;;;;N;;;;;
+159F;CANADIAN SYLLABICS WOODS-CREE TH;Lo;0;L;;;;;N;;;;;
+15A0;CANADIAN SYLLABICS LHI;Lo;0;L;;;;;N;;;;;
+15A1;CANADIAN SYLLABICS LHII;Lo;0;L;;;;;N;;;;;
+15A2;CANADIAN SYLLABICS LHO;Lo;0;L;;;;;N;;;;;
+15A3;CANADIAN SYLLABICS LHOO;Lo;0;L;;;;;N;;;;;
+15A4;CANADIAN SYLLABICS LHA;Lo;0;L;;;;;N;;;;;
+15A5;CANADIAN SYLLABICS LHAA;Lo;0;L;;;;;N;;;;;
+15A6;CANADIAN SYLLABICS LH;Lo;0;L;;;;;N;;;;;
+15A7;CANADIAN SYLLABICS TH-CREE THE;Lo;0;L;;;;;N;;;;;
+15A8;CANADIAN SYLLABICS TH-CREE THI;Lo;0;L;;;;;N;;;;;
+15A9;CANADIAN SYLLABICS TH-CREE THII;Lo;0;L;;;;;N;;;;;
+15AA;CANADIAN SYLLABICS TH-CREE THO;Lo;0;L;;;;;N;;;;;
+15AB;CANADIAN SYLLABICS TH-CREE THOO;Lo;0;L;;;;;N;;;;;
+15AC;CANADIAN SYLLABICS TH-CREE THA;Lo;0;L;;;;;N;;;;;
+15AD;CANADIAN SYLLABICS TH-CREE THAA;Lo;0;L;;;;;N;;;;;
+15AE;CANADIAN SYLLABICS TH-CREE TH;Lo;0;L;;;;;N;;;;;
+15AF;CANADIAN SYLLABICS AIVILIK B;Lo;0;L;;;;;N;;;;;
+15B0;CANADIAN SYLLABICS BLACKFOOT E;Lo;0;L;;;;;N;;;;;
+15B1;CANADIAN SYLLABICS BLACKFOOT I;Lo;0;L;;;;;N;;;;;
+15B2;CANADIAN SYLLABICS BLACKFOOT O;Lo;0;L;;;;;N;;;;;
+15B3;CANADIAN SYLLABICS BLACKFOOT A;Lo;0;L;;;;;N;;;;;
+15B4;CANADIAN SYLLABICS BLACKFOOT WE;Lo;0;L;;;;;N;;;;;
+15B5;CANADIAN SYLLABICS BLACKFOOT WI;Lo;0;L;;;;;N;;;;;
+15B6;CANADIAN SYLLABICS BLACKFOOT WO;Lo;0;L;;;;;N;;;;;
+15B7;CANADIAN SYLLABICS BLACKFOOT WA;Lo;0;L;;;;;N;;;;;
+15B8;CANADIAN SYLLABICS BLACKFOOT NE;Lo;0;L;;;;;N;;;;;
+15B9;CANADIAN SYLLABICS BLACKFOOT NI;Lo;0;L;;;;;N;;;;;
+15BA;CANADIAN SYLLABICS BLACKFOOT NO;Lo;0;L;;;;;N;;;;;
+15BB;CANADIAN SYLLABICS BLACKFOOT NA;Lo;0;L;;;;;N;;;;;
+15BC;CANADIAN SYLLABICS BLACKFOOT KE;Lo;0;L;;;;;N;;;;;
+15BD;CANADIAN SYLLABICS BLACKFOOT KI;Lo;0;L;;;;;N;;;;;
+15BE;CANADIAN SYLLABICS BLACKFOOT KO;Lo;0;L;;;;;N;;;;;
+15BF;CANADIAN SYLLABICS BLACKFOOT KA;Lo;0;L;;;;;N;;;;;
+15C0;CANADIAN SYLLABICS SAYISI HE;Lo;0;L;;;;;N;;;;;
+15C1;CANADIAN SYLLABICS SAYISI HI;Lo;0;L;;;;;N;;;;;
+15C2;CANADIAN SYLLABICS SAYISI HO;Lo;0;L;;;;;N;;;;;
+15C3;CANADIAN SYLLABICS SAYISI HA;Lo;0;L;;;;;N;;;;;
+15C4;CANADIAN SYLLABICS CARRIER GHU;Lo;0;L;;;;;N;;;;;
+15C5;CANADIAN SYLLABICS CARRIER GHO;Lo;0;L;;;;;N;;;;;
+15C6;CANADIAN SYLLABICS CARRIER GHE;Lo;0;L;;;;;N;;;;;
+15C7;CANADIAN SYLLABICS CARRIER GHEE;Lo;0;L;;;;;N;;;;;
+15C8;CANADIAN SYLLABICS CARRIER GHI;Lo;0;L;;;;;N;;;;;
+15C9;CANADIAN SYLLABICS CARRIER GHA;Lo;0;L;;;;;N;;;;;
+15CA;CANADIAN SYLLABICS CARRIER RU;Lo;0;L;;;;;N;;;;;
+15CB;CANADIAN SYLLABICS CARRIER RO;Lo;0;L;;;;;N;;;;;
+15CC;CANADIAN SYLLABICS CARRIER RE;Lo;0;L;;;;;N;;;;;
+15CD;CANADIAN SYLLABICS CARRIER REE;Lo;0;L;;;;;N;;;;;
+15CE;CANADIAN SYLLABICS CARRIER RI;Lo;0;L;;;;;N;;;;;
+15CF;CANADIAN SYLLABICS CARRIER RA;Lo;0;L;;;;;N;;;;;
+15D0;CANADIAN SYLLABICS CARRIER WU;Lo;0;L;;;;;N;;;;;
+15D1;CANADIAN SYLLABICS CARRIER WO;Lo;0;L;;;;;N;;;;;
+15D2;CANADIAN SYLLABICS CARRIER WE;Lo;0;L;;;;;N;;;;;
+15D3;CANADIAN SYLLABICS CARRIER WEE;Lo;0;L;;;;;N;;;;;
+15D4;CANADIAN SYLLABICS CARRIER WI;Lo;0;L;;;;;N;;;;;
+15D5;CANADIAN SYLLABICS CARRIER WA;Lo;0;L;;;;;N;;;;;
+15D6;CANADIAN SYLLABICS CARRIER HWU;Lo;0;L;;;;;N;;;;;
+15D7;CANADIAN SYLLABICS CARRIER HWO;Lo;0;L;;;;;N;;;;;
+15D8;CANADIAN SYLLABICS CARRIER HWE;Lo;0;L;;;;;N;;;;;
+15D9;CANADIAN SYLLABICS CARRIER HWEE;Lo;0;L;;;;;N;;;;;
+15DA;CANADIAN SYLLABICS CARRIER HWI;Lo;0;L;;;;;N;;;;;
+15DB;CANADIAN SYLLABICS CARRIER HWA;Lo;0;L;;;;;N;;;;;
+15DC;CANADIAN SYLLABICS CARRIER THU;Lo;0;L;;;;;N;;;;;
+15DD;CANADIAN SYLLABICS CARRIER THO;Lo;0;L;;;;;N;;;;;
+15DE;CANADIAN SYLLABICS CARRIER THE;Lo;0;L;;;;;N;;;;;
+15DF;CANADIAN SYLLABICS CARRIER THEE;Lo;0;L;;;;;N;;;;;
+15E0;CANADIAN SYLLABICS CARRIER THI;Lo;0;L;;;;;N;;;;;
+15E1;CANADIAN SYLLABICS CARRIER THA;Lo;0;L;;;;;N;;;;;
+15E2;CANADIAN SYLLABICS CARRIER TTU;Lo;0;L;;;;;N;;;;;
+15E3;CANADIAN SYLLABICS CARRIER TTO;Lo;0;L;;;;;N;;;;;
+15E4;CANADIAN SYLLABICS CARRIER TTE;Lo;0;L;;;;;N;;;;;
+15E5;CANADIAN SYLLABICS CARRIER TTEE;Lo;0;L;;;;;N;;;;;
+15E6;CANADIAN SYLLABICS CARRIER TTI;Lo;0;L;;;;;N;;;;;
+15E7;CANADIAN SYLLABICS CARRIER TTA;Lo;0;L;;;;;N;;;;;
+15E8;CANADIAN SYLLABICS CARRIER PU;Lo;0;L;;;;;N;;;;;
+15E9;CANADIAN SYLLABICS CARRIER PO;Lo;0;L;;;;;N;;;;;
+15EA;CANADIAN SYLLABICS CARRIER PE;Lo;0;L;;;;;N;;;;;
+15EB;CANADIAN SYLLABICS CARRIER PEE;Lo;0;L;;;;;N;;;;;
+15EC;CANADIAN SYLLABICS CARRIER PI;Lo;0;L;;;;;N;;;;;
+15ED;CANADIAN SYLLABICS CARRIER PA;Lo;0;L;;;;;N;;;;;
+15EE;CANADIAN SYLLABICS CARRIER P;Lo;0;L;;;;;N;;;;;
+15EF;CANADIAN SYLLABICS CARRIER GU;Lo;0;L;;;;;N;;;;;
+15F0;CANADIAN SYLLABICS CARRIER GO;Lo;0;L;;;;;N;;;;;
+15F1;CANADIAN SYLLABICS CARRIER GE;Lo;0;L;;;;;N;;;;;
+15F2;CANADIAN SYLLABICS CARRIER GEE;Lo;0;L;;;;;N;;;;;
+15F3;CANADIAN SYLLABICS CARRIER GI;Lo;0;L;;;;;N;;;;;
+15F4;CANADIAN SYLLABICS CARRIER GA;Lo;0;L;;;;;N;;;;;
+15F5;CANADIAN SYLLABICS CARRIER KHU;Lo;0;L;;;;;N;;;;;
+15F6;CANADIAN SYLLABICS CARRIER KHO;Lo;0;L;;;;;N;;;;;
+15F7;CANADIAN SYLLABICS CARRIER KHE;Lo;0;L;;;;;N;;;;;
+15F8;CANADIAN SYLLABICS CARRIER KHEE;Lo;0;L;;;;;N;;;;;
+15F9;CANADIAN SYLLABICS CARRIER KHI;Lo;0;L;;;;;N;;;;;
+15FA;CANADIAN SYLLABICS CARRIER KHA;Lo;0;L;;;;;N;;;;;
+15FB;CANADIAN SYLLABICS CARRIER KKU;Lo;0;L;;;;;N;;;;;
+15FC;CANADIAN SYLLABICS CARRIER KKO;Lo;0;L;;;;;N;;;;;
+15FD;CANADIAN SYLLABICS CARRIER KKE;Lo;0;L;;;;;N;;;;;
+15FE;CANADIAN SYLLABICS CARRIER KKEE;Lo;0;L;;;;;N;;;;;
+15FF;CANADIAN SYLLABICS CARRIER KKI;Lo;0;L;;;;;N;;;;;
+1600;CANADIAN SYLLABICS CARRIER KKA;Lo;0;L;;;;;N;;;;;
+1601;CANADIAN SYLLABICS CARRIER KK;Lo;0;L;;;;;N;;;;;
+1602;CANADIAN SYLLABICS CARRIER NU;Lo;0;L;;;;;N;;;;;
+1603;CANADIAN SYLLABICS CARRIER NO;Lo;0;L;;;;;N;;;;;
+1604;CANADIAN SYLLABICS CARRIER NE;Lo;0;L;;;;;N;;;;;
+1605;CANADIAN SYLLABICS CARRIER NEE;Lo;0;L;;;;;N;;;;;
+1606;CANADIAN SYLLABICS CARRIER NI;Lo;0;L;;;;;N;;;;;
+1607;CANADIAN SYLLABICS CARRIER NA;Lo;0;L;;;;;N;;;;;
+1608;CANADIAN SYLLABICS CARRIER MU;Lo;0;L;;;;;N;;;;;
+1609;CANADIAN SYLLABICS CARRIER MO;Lo;0;L;;;;;N;;;;;
+160A;CANADIAN SYLLABICS CARRIER ME;Lo;0;L;;;;;N;;;;;
+160B;CANADIAN SYLLABICS CARRIER MEE;Lo;0;L;;;;;N;;;;;
+160C;CANADIAN SYLLABICS CARRIER MI;Lo;0;L;;;;;N;;;;;
+160D;CANADIAN SYLLABICS CARRIER MA;Lo;0;L;;;;;N;;;;;
+160E;CANADIAN SYLLABICS CARRIER YU;Lo;0;L;;;;;N;;;;;
+160F;CANADIAN SYLLABICS CARRIER YO;Lo;0;L;;;;;N;;;;;
+1610;CANADIAN SYLLABICS CARRIER YE;Lo;0;L;;;;;N;;;;;
+1611;CANADIAN SYLLABICS CARRIER YEE;Lo;0;L;;;;;N;;;;;
+1612;CANADIAN SYLLABICS CARRIER YI;Lo;0;L;;;;;N;;;;;
+1613;CANADIAN SYLLABICS CARRIER YA;Lo;0;L;;;;;N;;;;;
+1614;CANADIAN SYLLABICS CARRIER JU;Lo;0;L;;;;;N;;;;;
+1615;CANADIAN SYLLABICS SAYISI JU;Lo;0;L;;;;;N;;;;;
+1616;CANADIAN SYLLABICS CARRIER JO;Lo;0;L;;;;;N;;;;;
+1617;CANADIAN SYLLABICS CARRIER JE;Lo;0;L;;;;;N;;;;;
+1618;CANADIAN SYLLABICS CARRIER JEE;Lo;0;L;;;;;N;;;;;
+1619;CANADIAN SYLLABICS CARRIER JI;Lo;0;L;;;;;N;;;;;
+161A;CANADIAN SYLLABICS SAYISI JI;Lo;0;L;;;;;N;;;;;
+161B;CANADIAN SYLLABICS CARRIER JA;Lo;0;L;;;;;N;;;;;
+161C;CANADIAN SYLLABICS CARRIER JJU;Lo;0;L;;;;;N;;;;;
+161D;CANADIAN SYLLABICS CARRIER JJO;Lo;0;L;;;;;N;;;;;
+161E;CANADIAN SYLLABICS CARRIER JJE;Lo;0;L;;;;;N;;;;;
+161F;CANADIAN SYLLABICS CARRIER JJEE;Lo;0;L;;;;;N;;;;;
+1620;CANADIAN SYLLABICS CARRIER JJI;Lo;0;L;;;;;N;;;;;
+1621;CANADIAN SYLLABICS CARRIER JJA;Lo;0;L;;;;;N;;;;;
+1622;CANADIAN SYLLABICS CARRIER LU;Lo;0;L;;;;;N;;;;;
+1623;CANADIAN SYLLABICS CARRIER LO;Lo;0;L;;;;;N;;;;;
+1624;CANADIAN SYLLABICS CARRIER LE;Lo;0;L;;;;;N;;;;;
+1625;CANADIAN SYLLABICS CARRIER LEE;Lo;0;L;;;;;N;;;;;
+1626;CANADIAN SYLLABICS CARRIER LI;Lo;0;L;;;;;N;;;;;
+1627;CANADIAN SYLLABICS CARRIER LA;Lo;0;L;;;;;N;;;;;
+1628;CANADIAN SYLLABICS CARRIER DLU;Lo;0;L;;;;;N;;;;;
+1629;CANADIAN SYLLABICS CARRIER DLO;Lo;0;L;;;;;N;;;;;
+162A;CANADIAN SYLLABICS CARRIER DLE;Lo;0;L;;;;;N;;;;;
+162B;CANADIAN SYLLABICS CARRIER DLEE;Lo;0;L;;;;;N;;;;;
+162C;CANADIAN SYLLABICS CARRIER DLI;Lo;0;L;;;;;N;;;;;
+162D;CANADIAN SYLLABICS CARRIER DLA;Lo;0;L;;;;;N;;;;;
+162E;CANADIAN SYLLABICS CARRIER LHU;Lo;0;L;;;;;N;;;;;
+162F;CANADIAN SYLLABICS CARRIER LHO;Lo;0;L;;;;;N;;;;;
+1630;CANADIAN SYLLABICS CARRIER LHE;Lo;0;L;;;;;N;;;;;
+1631;CANADIAN SYLLABICS CARRIER LHEE;Lo;0;L;;;;;N;;;;;
+1632;CANADIAN SYLLABICS CARRIER LHI;Lo;0;L;;;;;N;;;;;
+1633;CANADIAN SYLLABICS CARRIER LHA;Lo;0;L;;;;;N;;;;;
+1634;CANADIAN SYLLABICS CARRIER TLHU;Lo;0;L;;;;;N;;;;;
+1635;CANADIAN SYLLABICS CARRIER TLHO;Lo;0;L;;;;;N;;;;;
+1636;CANADIAN SYLLABICS CARRIER TLHE;Lo;0;L;;;;;N;;;;;
+1637;CANADIAN SYLLABICS CARRIER TLHEE;Lo;0;L;;;;;N;;;;;
+1638;CANADIAN SYLLABICS CARRIER TLHI;Lo;0;L;;;;;N;;;;;
+1639;CANADIAN SYLLABICS CARRIER TLHA;Lo;0;L;;;;;N;;;;;
+163A;CANADIAN SYLLABICS CARRIER TLU;Lo;0;L;;;;;N;;;;;
+163B;CANADIAN SYLLABICS CARRIER TLO;Lo;0;L;;;;;N;;;;;
+163C;CANADIAN SYLLABICS CARRIER TLE;Lo;0;L;;;;;N;;;;;
+163D;CANADIAN SYLLABICS CARRIER TLEE;Lo;0;L;;;;;N;;;;;
+163E;CANADIAN SYLLABICS CARRIER TLI;Lo;0;L;;;;;N;;;;;
+163F;CANADIAN SYLLABICS CARRIER TLA;Lo;0;L;;;;;N;;;;;
+1640;CANADIAN SYLLABICS CARRIER ZU;Lo;0;L;;;;;N;;;;;
+1641;CANADIAN SYLLABICS CARRIER ZO;Lo;0;L;;;;;N;;;;;
+1642;CANADIAN SYLLABICS CARRIER ZE;Lo;0;L;;;;;N;;;;;
+1643;CANADIAN SYLLABICS CARRIER ZEE;Lo;0;L;;;;;N;;;;;
+1644;CANADIAN SYLLABICS CARRIER ZI;Lo;0;L;;;;;N;;;;;
+1645;CANADIAN SYLLABICS CARRIER ZA;Lo;0;L;;;;;N;;;;;
+1646;CANADIAN SYLLABICS CARRIER Z;Lo;0;L;;;;;N;;;;;
+1647;CANADIAN SYLLABICS CARRIER INITIAL Z;Lo;0;L;;;;;N;;;;;
+1648;CANADIAN SYLLABICS CARRIER DZU;Lo;0;L;;;;;N;;;;;
+1649;CANADIAN SYLLABICS CARRIER DZO;Lo;0;L;;;;;N;;;;;
+164A;CANADIAN SYLLABICS CARRIER DZE;Lo;0;L;;;;;N;;;;;
+164B;CANADIAN SYLLABICS CARRIER DZEE;Lo;0;L;;;;;N;;;;;
+164C;CANADIAN SYLLABICS CARRIER DZI;Lo;0;L;;;;;N;;;;;
+164D;CANADIAN SYLLABICS CARRIER DZA;Lo;0;L;;;;;N;;;;;
+164E;CANADIAN SYLLABICS CARRIER SU;Lo;0;L;;;;;N;;;;;
+164F;CANADIAN SYLLABICS CARRIER SO;Lo;0;L;;;;;N;;;;;
+1650;CANADIAN SYLLABICS CARRIER SE;Lo;0;L;;;;;N;;;;;
+1651;CANADIAN SYLLABICS CARRIER SEE;Lo;0;L;;;;;N;;;;;
+1652;CANADIAN SYLLABICS CARRIER SI;Lo;0;L;;;;;N;;;;;
+1653;CANADIAN SYLLABICS CARRIER SA;Lo;0;L;;;;;N;;;;;
+1654;CANADIAN SYLLABICS CARRIER SHU;Lo;0;L;;;;;N;;;;;
+1655;CANADIAN SYLLABICS CARRIER SHO;Lo;0;L;;;;;N;;;;;
+1656;CANADIAN SYLLABICS CARRIER SHE;Lo;0;L;;;;;N;;;;;
+1657;CANADIAN SYLLABICS CARRIER SHEE;Lo;0;L;;;;;N;;;;;
+1658;CANADIAN SYLLABICS CARRIER SHI;Lo;0;L;;;;;N;;;;;
+1659;CANADIAN SYLLABICS CARRIER SHA;Lo;0;L;;;;;N;;;;;
+165A;CANADIAN SYLLABICS CARRIER SH;Lo;0;L;;;;;N;;;;;
+165B;CANADIAN SYLLABICS CARRIER TSU;Lo;0;L;;;;;N;;;;;
+165C;CANADIAN SYLLABICS CARRIER TSO;Lo;0;L;;;;;N;;;;;
+165D;CANADIAN SYLLABICS CARRIER TSE;Lo;0;L;;;;;N;;;;;
+165E;CANADIAN SYLLABICS CARRIER TSEE;Lo;0;L;;;;;N;;;;;
+165F;CANADIAN SYLLABICS CARRIER TSI;Lo;0;L;;;;;N;;;;;
+1660;CANADIAN SYLLABICS CARRIER TSA;Lo;0;L;;;;;N;;;;;
+1661;CANADIAN SYLLABICS CARRIER CHU;Lo;0;L;;;;;N;;;;;
+1662;CANADIAN SYLLABICS CARRIER CHO;Lo;0;L;;;;;N;;;;;
+1663;CANADIAN SYLLABICS CARRIER CHE;Lo;0;L;;;;;N;;;;;
+1664;CANADIAN SYLLABICS CARRIER CHEE;Lo;0;L;;;;;N;;;;;
+1665;CANADIAN SYLLABICS CARRIER CHI;Lo;0;L;;;;;N;;;;;
+1666;CANADIAN SYLLABICS CARRIER CHA;Lo;0;L;;;;;N;;;;;
+1667;CANADIAN SYLLABICS CARRIER TTSU;Lo;0;L;;;;;N;;;;;
+1668;CANADIAN SYLLABICS CARRIER TTSO;Lo;0;L;;;;;N;;;;;
+1669;CANADIAN SYLLABICS CARRIER TTSE;Lo;0;L;;;;;N;;;;;
+166A;CANADIAN SYLLABICS CARRIER TTSEE;Lo;0;L;;;;;N;;;;;
+166B;CANADIAN SYLLABICS CARRIER TTSI;Lo;0;L;;;;;N;;;;;
+166C;CANADIAN SYLLABICS CARRIER TTSA;Lo;0;L;;;;;N;;;;;
+166D;CANADIAN SYLLABICS CHI SIGN;Po;0;L;;;;;N;;;;;
+166E;CANADIAN SYLLABICS FULL STOP;Po;0;L;;;;;N;;;;;
+166F;CANADIAN SYLLABICS QAI;Lo;0;L;;;;;N;;;;;
+1670;CANADIAN SYLLABICS NGAI;Lo;0;L;;;;;N;;;;;
+1671;CANADIAN SYLLABICS NNGI;Lo;0;L;;;;;N;;;;;
+1672;CANADIAN SYLLABICS NNGII;Lo;0;L;;;;;N;;;;;
+1673;CANADIAN SYLLABICS NNGO;Lo;0;L;;;;;N;;;;;
+1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;;
+1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;;
+1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;;
+1677;CANADIAN SYLLABICS WOODS-CREE THWEE;Lo;0;L;;;;;N;;;;;
+1678;CANADIAN SYLLABICS WOODS-CREE THWI;Lo;0;L;;;;;N;;;;;
+1679;CANADIAN SYLLABICS WOODS-CREE THWII;Lo;0;L;;;;;N;;;;;
+167A;CANADIAN SYLLABICS WOODS-CREE THWO;Lo;0;L;;;;;N;;;;;
+167B;CANADIAN SYLLABICS WOODS-CREE THWOO;Lo;0;L;;;;;N;;;;;
+167C;CANADIAN SYLLABICS WOODS-CREE THWA;Lo;0;L;;;;;N;;;;;
+167D;CANADIAN SYLLABICS WOODS-CREE THWAA;Lo;0;L;;;;;N;;;;;
+167E;CANADIAN SYLLABICS WOODS-CREE FINAL TH;Lo;0;L;;;;;N;;;;;
+167F;CANADIAN SYLLABICS BLACKFOOT W;Lo;0;L;;;;;N;;;;;
+1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
+1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;;
+1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;;
+1683;OGHAM LETTER FEARN;Lo;0;L;;;;;N;;;;;
+1684;OGHAM LETTER SAIL;Lo;0;L;;;;;N;;;;;
+1685;OGHAM LETTER NION;Lo;0;L;;;;;N;;;;;
+1686;OGHAM LETTER UATH;Lo;0;L;;;;;N;;;;;
+1687;OGHAM LETTER DAIR;Lo;0;L;;;;;N;;;;;
+1688;OGHAM LETTER TINNE;Lo;0;L;;;;;N;;;;;
+1689;OGHAM LETTER COLL;Lo;0;L;;;;;N;;;;;
+168A;OGHAM LETTER CEIRT;Lo;0;L;;;;;N;;;;;
+168B;OGHAM LETTER MUIN;Lo;0;L;;;;;N;;;;;
+168C;OGHAM LETTER GORT;Lo;0;L;;;;;N;;;;;
+168D;OGHAM LETTER NGEADAL;Lo;0;L;;;;;N;;;;;
+168E;OGHAM LETTER STRAIF;Lo;0;L;;;;;N;;;;;
+168F;OGHAM LETTER RUIS;Lo;0;L;;;;;N;;;;;
+1690;OGHAM LETTER AILM;Lo;0;L;;;;;N;;;;;
+1691;OGHAM LETTER ONN;Lo;0;L;;;;;N;;;;;
+1692;OGHAM LETTER UR;Lo;0;L;;;;;N;;;;;
+1693;OGHAM LETTER EADHADH;Lo;0;L;;;;;N;;;;;
+1694;OGHAM LETTER IODHADH;Lo;0;L;;;;;N;;;;;
+1695;OGHAM LETTER EABHADH;Lo;0;L;;;;;N;;;;;
+1696;OGHAM LETTER OR;Lo;0;L;;;;;N;;;;;
+1697;OGHAM LETTER UILLEANN;Lo;0;L;;;;;N;;;;;
+1698;OGHAM LETTER IFIN;Lo;0;L;;;;;N;;;;;
+1699;OGHAM LETTER EAMHANCHOLL;Lo;0;L;;;;;N;;;;;
+169A;OGHAM LETTER PEITH;Lo;0;L;;;;;N;;;;;
+169B;OGHAM FEATHER MARK;Ps;0;ON;;;;;Y;;;;;
+169C;OGHAM REVERSED FEATHER MARK;Pe;0;ON;;;;;Y;;;;;
+16A0;RUNIC LETTER FEHU FEOH FE F;Lo;0;L;;;;;N;;;;;
+16A1;RUNIC LETTER V;Lo;0;L;;;;;N;;;;;
+16A2;RUNIC LETTER URUZ UR U;Lo;0;L;;;;;N;;;;;
+16A3;RUNIC LETTER YR;Lo;0;L;;;;;N;;;;;
+16A4;RUNIC LETTER Y;Lo;0;L;;;;;N;;;;;
+16A5;RUNIC LETTER W;Lo;0;L;;;;;N;;;;;
+16A6;RUNIC LETTER THURISAZ THURS THORN;Lo;0;L;;;;;N;;;;;
+16A7;RUNIC LETTER ETH;Lo;0;L;;;;;N;;;;;
+16A8;RUNIC LETTER ANSUZ A;Lo;0;L;;;;;N;;;;;
+16A9;RUNIC LETTER OS O;Lo;0;L;;;;;N;;;;;
+16AA;RUNIC LETTER AC A;Lo;0;L;;;;;N;;;;;
+16AB;RUNIC LETTER AESC;Lo;0;L;;;;;N;;;;;
+16AC;RUNIC LETTER LONG-BRANCH-OSS O;Lo;0;L;;;;;N;;;;;
+16AD;RUNIC LETTER SHORT-TWIG-OSS O;Lo;0;L;;;;;N;;;;;
+16AE;RUNIC LETTER O;Lo;0;L;;;;;N;;;;;
+16AF;RUNIC LETTER OE;Lo;0;L;;;;;N;;;;;
+16B0;RUNIC LETTER ON;Lo;0;L;;;;;N;;;;;
+16B1;RUNIC LETTER RAIDO RAD REID R;Lo;0;L;;;;;N;;;;;
+16B2;RUNIC LETTER KAUNA;Lo;0;L;;;;;N;;;;;
+16B3;RUNIC LETTER CEN;Lo;0;L;;;;;N;;;;;
+16B4;RUNIC LETTER KAUN K;Lo;0;L;;;;;N;;;;;
+16B5;RUNIC LETTER G;Lo;0;L;;;;;N;;;;;
+16B6;RUNIC LETTER ENG;Lo;0;L;;;;;N;;;;;
+16B7;RUNIC LETTER GEBO GYFU G;Lo;0;L;;;;;N;;;;;
+16B8;RUNIC LETTER GAR;Lo;0;L;;;;;N;;;;;
+16B9;RUNIC LETTER WUNJO WYNN W;Lo;0;L;;;;;N;;;;;
+16BA;RUNIC LETTER HAGLAZ H;Lo;0;L;;;;;N;;;;;
+16BB;RUNIC LETTER HAEGL H;Lo;0;L;;;;;N;;;;;
+16BC;RUNIC LETTER LONG-BRANCH-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BD;RUNIC LETTER SHORT-TWIG-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BE;RUNIC LETTER NAUDIZ NYD NAUD N;Lo;0;L;;;;;N;;;;;
+16BF;RUNIC LETTER SHORT-TWIG-NAUD N;Lo;0;L;;;;;N;;;;;
+16C0;RUNIC LETTER DOTTED-N;Lo;0;L;;;;;N;;;;;
+16C1;RUNIC LETTER ISAZ IS ISS I;Lo;0;L;;;;;N;;;;;
+16C2;RUNIC LETTER E;Lo;0;L;;;;;N;;;;;
+16C3;RUNIC LETTER JERAN J;Lo;0;L;;;;;N;;;;;
+16C4;RUNIC LETTER GER;Lo;0;L;;;;;N;;;;;
+16C5;RUNIC LETTER LONG-BRANCH-AR AE;Lo;0;L;;;;;N;;;;;
+16C6;RUNIC LETTER SHORT-TWIG-AR A;Lo;0;L;;;;;N;;;;;
+16C7;RUNIC LETTER IWAZ EOH;Lo;0;L;;;;;N;;;;;
+16C8;RUNIC LETTER PERTHO PEORTH P;Lo;0;L;;;;;N;;;;;
+16C9;RUNIC LETTER ALGIZ EOLHX;Lo;0;L;;;;;N;;;;;
+16CA;RUNIC LETTER SOWILO S;Lo;0;L;;;;;N;;;;;
+16CB;RUNIC LETTER SIGEL LONG-BRANCH-SOL S;Lo;0;L;;;;;N;;;;;
+16CC;RUNIC LETTER SHORT-TWIG-SOL S;Lo;0;L;;;;;N;;;;;
+16CD;RUNIC LETTER C;Lo;0;L;;;;;N;;;;;
+16CE;RUNIC LETTER Z;Lo;0;L;;;;;N;;;;;
+16CF;RUNIC LETTER TIWAZ TIR TYR T;Lo;0;L;;;;;N;;;;;
+16D0;RUNIC LETTER SHORT-TWIG-TYR T;Lo;0;L;;;;;N;;;;;
+16D1;RUNIC LETTER D;Lo;0;L;;;;;N;;;;;
+16D2;RUNIC LETTER BERKANAN BEORC BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D3;RUNIC LETTER SHORT-TWIG-BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D4;RUNIC LETTER DOTTED-P;Lo;0;L;;;;;N;;;;;
+16D5;RUNIC LETTER OPEN-P;Lo;0;L;;;;;N;;;;;
+16D6;RUNIC LETTER EHWAZ EH E;Lo;0;L;;;;;N;;;;;
+16D7;RUNIC LETTER MANNAZ MAN M;Lo;0;L;;;;;N;;;;;
+16D8;RUNIC LETTER LONG-BRANCH-MADR M;Lo;0;L;;;;;N;;;;;
+16D9;RUNIC LETTER SHORT-TWIG-MADR M;Lo;0;L;;;;;N;;;;;
+16DA;RUNIC LETTER LAUKAZ LAGU LOGR L;Lo;0;L;;;;;N;;;;;
+16DB;RUNIC LETTER DOTTED-L;Lo;0;L;;;;;N;;;;;
+16DC;RUNIC LETTER INGWAZ;Lo;0;L;;;;;N;;;;;
+16DD;RUNIC LETTER ING;Lo;0;L;;;;;N;;;;;
+16DE;RUNIC LETTER DAGAZ DAEG D;Lo;0;L;;;;;N;;;;;
+16DF;RUNIC LETTER OTHALAN ETHEL O;Lo;0;L;;;;;N;;;;;
+16E0;RUNIC LETTER EAR;Lo;0;L;;;;;N;;;;;
+16E1;RUNIC LETTER IOR;Lo;0;L;;;;;N;;;;;
+16E2;RUNIC LETTER CWEORTH;Lo;0;L;;;;;N;;;;;
+16E3;RUNIC LETTER CALC;Lo;0;L;;;;;N;;;;;
+16E4;RUNIC LETTER CEALC;Lo;0;L;;;;;N;;;;;
+16E5;RUNIC LETTER STAN;Lo;0;L;;;;;N;;;;;
+16E6;RUNIC LETTER LONG-BRANCH-YR;Lo;0;L;;;;;N;;;;;
+16E7;RUNIC LETTER SHORT-TWIG-YR;Lo;0;L;;;;;N;;;;;
+16E8;RUNIC LETTER ICELANDIC-YR;Lo;0;L;;;;;N;;;;;
+16E9;RUNIC LETTER Q;Lo;0;L;;;;;N;;;;;
+16EA;RUNIC LETTER X;Lo;0;L;;;;;N;;;;;
+16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;;;;
+16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;;;;
+16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;;;;
+16F1;RUNIC LETTER K;Lo;0;L;;;;;N;;;;;
+16F2;RUNIC LETTER SH;Lo;0;L;;;;;N;;;;;
+16F3;RUNIC LETTER OO;Lo;0;L;;;;;N;;;;;
+16F4;RUNIC LETTER FRANKS CASKET OS;Lo;0;L;;;;;N;;;;;
+16F5;RUNIC LETTER FRANKS CASKET IS;Lo;0;L;;;;;N;;;;;
+16F6;RUNIC LETTER FRANKS CASKET EH;Lo;0;L;;;;;N;;;;;
+16F7;RUNIC LETTER FRANKS CASKET AC;Lo;0;L;;;;;N;;;;;
+16F8;RUNIC LETTER FRANKS CASKET AESC;Lo;0;L;;;;;N;;;;;
+1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;;
+1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;;
+1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;;
+1703;TAGALOG LETTER KA;Lo;0;L;;;;;N;;;;;
+1704;TAGALOG LETTER GA;Lo;0;L;;;;;N;;;;;
+1705;TAGALOG LETTER NGA;Lo;0;L;;;;;N;;;;;
+1706;TAGALOG LETTER TA;Lo;0;L;;;;;N;;;;;
+1707;TAGALOG LETTER DA;Lo;0;L;;;;;N;;;;;
+1708;TAGALOG LETTER NA;Lo;0;L;;;;;N;;;;;
+1709;TAGALOG LETTER PA;Lo;0;L;;;;;N;;;;;
+170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;;
+170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;;
+170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;;
+170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;;
+170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;;
+1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;;
+1711;TAGALOG LETTER HA;Lo;0;L;;;;;N;;;;;
+1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;;
+1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;;
+1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;;
+1723;HANUNOO LETTER KA;Lo;0;L;;;;;N;;;;;
+1724;HANUNOO LETTER GA;Lo;0;L;;;;;N;;;;;
+1725;HANUNOO LETTER NGA;Lo;0;L;;;;;N;;;;;
+1726;HANUNOO LETTER TA;Lo;0;L;;;;;N;;;;;
+1727;HANUNOO LETTER DA;Lo;0;L;;;;;N;;;;;
+1728;HANUNOO LETTER NA;Lo;0;L;;;;;N;;;;;
+1729;HANUNOO LETTER PA;Lo;0;L;;;;;N;;;;;
+172A;HANUNOO LETTER BA;Lo;0;L;;;;;N;;;;;
+172B;HANUNOO LETTER MA;Lo;0;L;;;;;N;;;;;
+172C;HANUNOO LETTER YA;Lo;0;L;;;;;N;;;;;
+172D;HANUNOO LETTER RA;Lo;0;L;;;;;N;;;;;
+172E;HANUNOO LETTER LA;Lo;0;L;;;;;N;;;;;
+172F;HANUNOO LETTER WA;Lo;0;L;;;;;N;;;;;
+1730;HANUNOO LETTER SA;Lo;0;L;;;;;N;;;;;
+1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;;
+1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1734;HANUNOO SIGN PAMUDPOD;Mn;9;NSM;;;;;N;;;;;
+1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;;
+1741;BUHID LETTER I;Lo;0;L;;;;;N;;;;;
+1742;BUHID LETTER U;Lo;0;L;;;;;N;;;;;
+1743;BUHID LETTER KA;Lo;0;L;;;;;N;;;;;
+1744;BUHID LETTER GA;Lo;0;L;;;;;N;;;;;
+1745;BUHID LETTER NGA;Lo;0;L;;;;;N;;;;;
+1746;BUHID LETTER TA;Lo;0;L;;;;;N;;;;;
+1747;BUHID LETTER DA;Lo;0;L;;;;;N;;;;;
+1748;BUHID LETTER NA;Lo;0;L;;;;;N;;;;;
+1749;BUHID LETTER PA;Lo;0;L;;;;;N;;;;;
+174A;BUHID LETTER BA;Lo;0;L;;;;;N;;;;;
+174B;BUHID LETTER MA;Lo;0;L;;;;;N;;;;;
+174C;BUHID LETTER YA;Lo;0;L;;;;;N;;;;;
+174D;BUHID LETTER RA;Lo;0;L;;;;;N;;;;;
+174E;BUHID LETTER LA;Lo;0;L;;;;;N;;;;;
+174F;BUHID LETTER WA;Lo;0;L;;;;;N;;;;;
+1750;BUHID LETTER SA;Lo;0;L;;;;;N;;;;;
+1751;BUHID LETTER HA;Lo;0;L;;;;;N;;;;;
+1752;BUHID VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1753;BUHID VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1760;TAGBANWA LETTER A;Lo;0;L;;;;;N;;;;;
+1761;TAGBANWA LETTER I;Lo;0;L;;;;;N;;;;;
+1762;TAGBANWA LETTER U;Lo;0;L;;;;;N;;;;;
+1763;TAGBANWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1764;TAGBANWA LETTER GA;Lo;0;L;;;;;N;;;;;
+1765;TAGBANWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1766;TAGBANWA LETTER TA;Lo;0;L;;;;;N;;;;;
+1767;TAGBANWA LETTER DA;Lo;0;L;;;;;N;;;;;
+1768;TAGBANWA LETTER NA;Lo;0;L;;;;;N;;;;;
+1769;TAGBANWA LETTER PA;Lo;0;L;;;;;N;;;;;
+176A;TAGBANWA LETTER BA;Lo;0;L;;;;;N;;;;;
+176B;TAGBANWA LETTER MA;Lo;0;L;;;;;N;;;;;
+176C;TAGBANWA LETTER YA;Lo;0;L;;;;;N;;;;;
+176E;TAGBANWA LETTER LA;Lo;0;L;;;;;N;;;;;
+176F;TAGBANWA LETTER WA;Lo;0;L;;;;;N;;;;;
+1770;TAGBANWA LETTER SA;Lo;0;L;;;;;N;;;;;
+1772;TAGBANWA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1773;TAGBANWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1780;KHMER LETTER KA;Lo;0;L;;;;;N;;;;;
+1781;KHMER LETTER KHA;Lo;0;L;;;;;N;;;;;
+1782;KHMER LETTER KO;Lo;0;L;;;;;N;;;;;
+1783;KHMER LETTER KHO;Lo;0;L;;;;;N;;;;;
+1784;KHMER LETTER NGO;Lo;0;L;;;;;N;;;;;
+1785;KHMER LETTER CA;Lo;0;L;;;;;N;;;;;
+1786;KHMER LETTER CHA;Lo;0;L;;;;;N;;;;;
+1787;KHMER LETTER CO;Lo;0;L;;;;;N;;;;;
+1788;KHMER LETTER CHO;Lo;0;L;;;;;N;;;;;
+1789;KHMER LETTER NYO;Lo;0;L;;;;;N;;;;;
+178A;KHMER LETTER DA;Lo;0;L;;;;;N;;;;;
+178B;KHMER LETTER TTHA;Lo;0;L;;;;;N;;;;;
+178C;KHMER LETTER DO;Lo;0;L;;;;;N;;;;;
+178D;KHMER LETTER TTHO;Lo;0;L;;;;;N;;;;;
+178E;KHMER LETTER NNO;Lo;0;L;;;;;N;;;;;
+178F;KHMER LETTER TA;Lo;0;L;;;;;N;;;;;
+1790;KHMER LETTER THA;Lo;0;L;;;;;N;;;;;
+1791;KHMER LETTER TO;Lo;0;L;;;;;N;;;;;
+1792;KHMER LETTER THO;Lo;0;L;;;;;N;;;;;
+1793;KHMER LETTER NO;Lo;0;L;;;;;N;;;;;
+1794;KHMER LETTER BA;Lo;0;L;;;;;N;;;;;
+1795;KHMER LETTER PHA;Lo;0;L;;;;;N;;;;;
+1796;KHMER LETTER PO;Lo;0;L;;;;;N;;;;;
+1797;KHMER LETTER PHO;Lo;0;L;;;;;N;;;;;
+1798;KHMER LETTER MO;Lo;0;L;;;;;N;;;;;
+1799;KHMER LETTER YO;Lo;0;L;;;;;N;;;;;
+179A;KHMER LETTER RO;Lo;0;L;;;;;N;;;;;
+179B;KHMER LETTER LO;Lo;0;L;;;;;N;;;;;
+179C;KHMER LETTER VO;Lo;0;L;;;;;N;;;;;
+179D;KHMER LETTER SHA;Lo;0;L;;;;;N;;;;;
+179E;KHMER LETTER SSO;Lo;0;L;;;;;N;;;;;
+179F;KHMER LETTER SA;Lo;0;L;;;;;N;;;;;
+17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;;
+17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;;
+17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;;
+17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;;;;
+17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;;;;
+17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;;
+17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;;
+17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;;
+17A8;KHMER INDEPENDENT VOWEL QUK;Lo;0;L;;;;;N;;;;;
+17A9;KHMER INDEPENDENT VOWEL QUU;Lo;0;L;;;;;N;;;;;
+17AA;KHMER INDEPENDENT VOWEL QUUV;Lo;0;L;;;;;N;;;;;
+17AB;KHMER INDEPENDENT VOWEL RY;Lo;0;L;;;;;N;;;;;
+17AC;KHMER INDEPENDENT VOWEL RYY;Lo;0;L;;;;;N;;;;;
+17AD;KHMER INDEPENDENT VOWEL LY;Lo;0;L;;;;;N;;;;;
+17AE;KHMER INDEPENDENT VOWEL LYY;Lo;0;L;;;;;N;;;;;
+17AF;KHMER INDEPENDENT VOWEL QE;Lo;0;L;;;;;N;;;;;
+17B0;KHMER INDEPENDENT VOWEL QAI;Lo;0;L;;;;;N;;;;;
+17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;;
+17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;;
+17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;;
+17B4;KHMER VOWEL INHERENT AQ;Mn;0;NSM;;;;;N;;;;;
+17B5;KHMER VOWEL INHERENT AA;Mn;0;NSM;;;;;N;;;;;
+17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+17B9;KHMER VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+17BA;KHMER VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+17BB;KHMER VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+17BC;KHMER VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+17BD;KHMER VOWEL SIGN UA;Mn;0;NSM;;;;;N;;;;;
+17BE;KHMER VOWEL SIGN OE;Mc;0;L;;;;;N;;;;;
+17BF;KHMER VOWEL SIGN YA;Mc;0;L;;;;;N;;;;;
+17C0;KHMER VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
+17C1;KHMER VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+17C2;KHMER VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+17C3;KHMER VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+17C4;KHMER VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+17C5;KHMER VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+17C6;KHMER SIGN NIKAHIT;Mn;0;NSM;;;;;N;;;;;
+17C7;KHMER SIGN REAHMUK;Mc;0;L;;;;;N;;;;;
+17C8;KHMER SIGN YUUKALEAPINTU;Mc;0;L;;;;;N;;;;;
+17C9;KHMER SIGN MUUSIKATOAN;Mn;0;NSM;;;;;N;;;;;
+17CA;KHMER SIGN TRIISAP;Mn;0;NSM;;;;;N;;;;;
+17CB;KHMER SIGN BANTOC;Mn;0;NSM;;;;;N;;;;;
+17CC;KHMER SIGN ROBAT;Mn;0;NSM;;;;;N;;;;;
+17CD;KHMER SIGN TOANDAKHIAT;Mn;0;NSM;;;;;N;;;;;
+17CE;KHMER SIGN KAKABAT;Mn;0;NSM;;;;;N;;;;;
+17CF;KHMER SIGN AHSDA;Mn;0;NSM;;;;;N;;;;;
+17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;;
+17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;;
+17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;;
+17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;;;;
+17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;;
+17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;;
+17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;;
+17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;;
+17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;;;;
+17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;;
+17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;;
+17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;;
+17DC;KHMER SIGN AVAKRAHASANYA;Lo;0;L;;;;;N;;;;;
+17DD;KHMER SIGN ATTHACAN;Mn;230;NSM;;;;;N;;;;;
+17E0;KHMER DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+17E1;KHMER DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+17E2;KHMER DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+17E3;KHMER DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+17E4;KHMER DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+17E5;KHMER DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+17E6;KHMER DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+17E7;KHMER DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+17E8;KHMER DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+17E9;KHMER DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+17F0;KHMER SYMBOL LEK ATTAK SON;No;0;ON;;;;0;N;;;;;
+17F1;KHMER SYMBOL LEK ATTAK MUOY;No;0;ON;;;;1;N;;;;;
+17F2;KHMER SYMBOL LEK ATTAK PII;No;0;ON;;;;2;N;;;;;
+17F3;KHMER SYMBOL LEK ATTAK BEI;No;0;ON;;;;3;N;;;;;
+17F4;KHMER SYMBOL LEK ATTAK BUON;No;0;ON;;;;4;N;;;;;
+17F5;KHMER SYMBOL LEK ATTAK PRAM;No;0;ON;;;;5;N;;;;;
+17F6;KHMER SYMBOL LEK ATTAK PRAM-MUOY;No;0;ON;;;;6;N;;;;;
+17F7;KHMER SYMBOL LEK ATTAK PRAM-PII;No;0;ON;;;;7;N;;;;;
+17F8;KHMER SYMBOL LEK ATTAK PRAM-BEI;No;0;ON;;;;8;N;;;;;
+17F9;KHMER SYMBOL LEK ATTAK PRAM-BUON;No;0;ON;;;;9;N;;;;;
+1800;MONGOLIAN BIRGA;Po;0;ON;;;;;N;;;;;
+1801;MONGOLIAN ELLIPSIS;Po;0;ON;;;;;N;;;;;
+1802;MONGOLIAN COMMA;Po;0;ON;;;;;N;;;;;
+1803;MONGOLIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+1804;MONGOLIAN COLON;Po;0;ON;;;;;N;;;;;
+1805;MONGOLIAN FOUR DOTS;Po;0;ON;;;;;N;;;;;
+1806;MONGOLIAN TODO SOFT HYPHEN;Pd;0;ON;;;;;N;;;;;
+1807;MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER;Po;0;ON;;;;;N;;;;;
+1808;MONGOLIAN MANCHU COMMA;Po;0;ON;;;;;N;;;;;
+1809;MONGOLIAN MANCHU FULL STOP;Po;0;ON;;;;;N;;;;;
+180A;MONGOLIAN NIRUGU;Po;0;ON;;;;;N;;;;;
+180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;;
+180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;;
+180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;;
+180E;MONGOLIAN VOWEL SEPARATOR;Cf;0;BN;;;;;N;;;;;
+1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1813;MONGOLIAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1814;MONGOLIAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1815;MONGOLIAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1816;MONGOLIAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1817;MONGOLIAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1818;MONGOLIAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1819;MONGOLIAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1820;MONGOLIAN LETTER A;Lo;0;L;;;;;N;;;;;
+1821;MONGOLIAN LETTER E;Lo;0;L;;;;;N;;;;;
+1822;MONGOLIAN LETTER I;Lo;0;L;;;;;N;;;;;
+1823;MONGOLIAN LETTER O;Lo;0;L;;;;;N;;;;;
+1824;MONGOLIAN LETTER U;Lo;0;L;;;;;N;;;;;
+1825;MONGOLIAN LETTER OE;Lo;0;L;;;;;N;;;;;
+1826;MONGOLIAN LETTER UE;Lo;0;L;;;;;N;;;;;
+1827;MONGOLIAN LETTER EE;Lo;0;L;;;;;N;;;;;
+1828;MONGOLIAN LETTER NA;Lo;0;L;;;;;N;;;;;
+1829;MONGOLIAN LETTER ANG;Lo;0;L;;;;;N;;;;;
+182A;MONGOLIAN LETTER BA;Lo;0;L;;;;;N;;;;;
+182B;MONGOLIAN LETTER PA;Lo;0;L;;;;;N;;;;;
+182C;MONGOLIAN LETTER QA;Lo;0;L;;;;;N;;;;;
+182D;MONGOLIAN LETTER GA;Lo;0;L;;;;;N;;;;;
+182E;MONGOLIAN LETTER MA;Lo;0;L;;;;;N;;;;;
+182F;MONGOLIAN LETTER LA;Lo;0;L;;;;;N;;;;;
+1830;MONGOLIAN LETTER SA;Lo;0;L;;;;;N;;;;;
+1831;MONGOLIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+1832;MONGOLIAN LETTER TA;Lo;0;L;;;;;N;;;;;
+1833;MONGOLIAN LETTER DA;Lo;0;L;;;;;N;;;;;
+1834;MONGOLIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+1835;MONGOLIAN LETTER JA;Lo;0;L;;;;;N;;;;;
+1836;MONGOLIAN LETTER YA;Lo;0;L;;;;;N;;;;;
+1837;MONGOLIAN LETTER RA;Lo;0;L;;;;;N;;;;;
+1838;MONGOLIAN LETTER WA;Lo;0;L;;;;;N;;;;;
+1839;MONGOLIAN LETTER FA;Lo;0;L;;;;;N;;;;;
+183A;MONGOLIAN LETTER KA;Lo;0;L;;;;;N;;;;;
+183B;MONGOLIAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+183C;MONGOLIAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+183D;MONGOLIAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+183E;MONGOLIAN LETTER HAA;Lo;0;L;;;;;N;;;;;
+183F;MONGOLIAN LETTER ZRA;Lo;0;L;;;;;N;;;;;
+1840;MONGOLIAN LETTER LHA;Lo;0;L;;;;;N;;;;;
+1841;MONGOLIAN LETTER ZHI;Lo;0;L;;;;;N;;;;;
+1842;MONGOLIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
+1843;MONGOLIAN LETTER TODO LONG VOWEL SIGN;Lm;0;L;;;;;N;;;;;
+1844;MONGOLIAN LETTER TODO E;Lo;0;L;;;;;N;;;;;
+1845;MONGOLIAN LETTER TODO I;Lo;0;L;;;;;N;;;;;
+1846;MONGOLIAN LETTER TODO O;Lo;0;L;;;;;N;;;;;
+1847;MONGOLIAN LETTER TODO U;Lo;0;L;;;;;N;;;;;
+1848;MONGOLIAN LETTER TODO OE;Lo;0;L;;;;;N;;;;;
+1849;MONGOLIAN LETTER TODO UE;Lo;0;L;;;;;N;;;;;
+184A;MONGOLIAN LETTER TODO ANG;Lo;0;L;;;;;N;;;;;
+184B;MONGOLIAN LETTER TODO BA;Lo;0;L;;;;;N;;;;;
+184C;MONGOLIAN LETTER TODO PA;Lo;0;L;;;;;N;;;;;
+184D;MONGOLIAN LETTER TODO QA;Lo;0;L;;;;;N;;;;;
+184E;MONGOLIAN LETTER TODO GA;Lo;0;L;;;;;N;;;;;
+184F;MONGOLIAN LETTER TODO MA;Lo;0;L;;;;;N;;;;;
+1850;MONGOLIAN LETTER TODO TA;Lo;0;L;;;;;N;;;;;
+1851;MONGOLIAN LETTER TODO DA;Lo;0;L;;;;;N;;;;;
+1852;MONGOLIAN LETTER TODO CHA;Lo;0;L;;;;;N;;;;;
+1853;MONGOLIAN LETTER TODO JA;Lo;0;L;;;;;N;;;;;
+1854;MONGOLIAN LETTER TODO TSA;Lo;0;L;;;;;N;;;;;
+1855;MONGOLIAN LETTER TODO YA;Lo;0;L;;;;;N;;;;;
+1856;MONGOLIAN LETTER TODO WA;Lo;0;L;;;;;N;;;;;
+1857;MONGOLIAN LETTER TODO KA;Lo;0;L;;;;;N;;;;;
+1858;MONGOLIAN LETTER TODO GAA;Lo;0;L;;;;;N;;;;;
+1859;MONGOLIAN LETTER TODO HAA;Lo;0;L;;;;;N;;;;;
+185A;MONGOLIAN LETTER TODO JIA;Lo;0;L;;;;;N;;;;;
+185B;MONGOLIAN LETTER TODO NIA;Lo;0;L;;;;;N;;;;;
+185C;MONGOLIAN LETTER TODO DZA;Lo;0;L;;;;;N;;;;;
+185D;MONGOLIAN LETTER SIBE E;Lo;0;L;;;;;N;;;;;
+185E;MONGOLIAN LETTER SIBE I;Lo;0;L;;;;;N;;;;;
+185F;MONGOLIAN LETTER SIBE IY;Lo;0;L;;;;;N;;;;;
+1860;MONGOLIAN LETTER SIBE UE;Lo;0;L;;;;;N;;;;;
+1861;MONGOLIAN LETTER SIBE U;Lo;0;L;;;;;N;;;;;
+1862;MONGOLIAN LETTER SIBE ANG;Lo;0;L;;;;;N;;;;;
+1863;MONGOLIAN LETTER SIBE KA;Lo;0;L;;;;;N;;;;;
+1864;MONGOLIAN LETTER SIBE GA;Lo;0;L;;;;;N;;;;;
+1865;MONGOLIAN LETTER SIBE HA;Lo;0;L;;;;;N;;;;;
+1866;MONGOLIAN LETTER SIBE PA;Lo;0;L;;;;;N;;;;;
+1867;MONGOLIAN LETTER SIBE SHA;Lo;0;L;;;;;N;;;;;
+1868;MONGOLIAN LETTER SIBE TA;Lo;0;L;;;;;N;;;;;
+1869;MONGOLIAN LETTER SIBE DA;Lo;0;L;;;;;N;;;;;
+186A;MONGOLIAN LETTER SIBE JA;Lo;0;L;;;;;N;;;;;
+186B;MONGOLIAN LETTER SIBE FA;Lo;0;L;;;;;N;;;;;
+186C;MONGOLIAN LETTER SIBE GAA;Lo;0;L;;;;;N;;;;;
+186D;MONGOLIAN LETTER SIBE HAA;Lo;0;L;;;;;N;;;;;
+186E;MONGOLIAN LETTER SIBE TSA;Lo;0;L;;;;;N;;;;;
+186F;MONGOLIAN LETTER SIBE ZA;Lo;0;L;;;;;N;;;;;
+1870;MONGOLIAN LETTER SIBE RAA;Lo;0;L;;;;;N;;;;;
+1871;MONGOLIAN LETTER SIBE CHA;Lo;0;L;;;;;N;;;;;
+1872;MONGOLIAN LETTER SIBE ZHA;Lo;0;L;;;;;N;;;;;
+1873;MONGOLIAN LETTER MANCHU I;Lo;0;L;;;;;N;;;;;
+1874;MONGOLIAN LETTER MANCHU KA;Lo;0;L;;;;;N;;;;;
+1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
+1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
+1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
+1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
+1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
+1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
+1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;;
+1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;;
+1885;MONGOLIAN LETTER ALI GALI BALUDA;Mn;0;NSM;;;;;N;;;;;
+1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Mn;0;NSM;;;;;N;;;;;
+1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;;
+1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;;
+1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;;
+188A;MONGOLIAN LETTER ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+188B;MONGOLIAN LETTER ALI GALI CA;Lo;0;L;;;;;N;;;;;
+188C;MONGOLIAN LETTER ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+188D;MONGOLIAN LETTER ALI GALI TTHA;Lo;0;L;;;;;N;;;;;
+188E;MONGOLIAN LETTER ALI GALI DDA;Lo;0;L;;;;;N;;;;;
+188F;MONGOLIAN LETTER ALI GALI NNA;Lo;0;L;;;;;N;;;;;
+1890;MONGOLIAN LETTER ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1891;MONGOLIAN LETTER ALI GALI DA;Lo;0;L;;;;;N;;;;;
+1892;MONGOLIAN LETTER ALI GALI PA;Lo;0;L;;;;;N;;;;;
+1893;MONGOLIAN LETTER ALI GALI PHA;Lo;0;L;;;;;N;;;;;
+1894;MONGOLIAN LETTER ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+1895;MONGOLIAN LETTER ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+1896;MONGOLIAN LETTER ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+1897;MONGOLIAN LETTER ALI GALI AH;Lo;0;L;;;;;N;;;;;
+1898;MONGOLIAN LETTER TODO ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1899;MONGOLIAN LETTER TODO ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+189A;MONGOLIAN LETTER MANCHU ALI GALI GHA;Lo;0;L;;;;;N;;;;;
+189B;MONGOLIAN LETTER MANCHU ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+189C;MONGOLIAN LETTER MANCHU ALI GALI CA;Lo;0;L;;;;;N;;;;;
+189D;MONGOLIAN LETTER MANCHU ALI GALI JHA;Lo;0;L;;;;;N;;;;;
+189E;MONGOLIAN LETTER MANCHU ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+189F;MONGOLIAN LETTER MANCHU ALI GALI DDHA;Lo;0;L;;;;;N;;;;;
+18A0;MONGOLIAN LETTER MANCHU ALI GALI TA;Lo;0;L;;;;;N;;;;;
+18A1;MONGOLIAN LETTER MANCHU ALI GALI DHA;Lo;0;L;;;;;N;;;;;
+18A2;MONGOLIAN LETTER MANCHU ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+18A3;MONGOLIAN LETTER MANCHU ALI GALI CYA;Lo;0;L;;;;;N;;;;;
+18A4;MONGOLIAN LETTER MANCHU ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+18A5;MONGOLIAN LETTER MANCHU ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+18A6;MONGOLIAN LETTER ALI GALI HALF U;Lo;0;L;;;;;N;;;;;
+18A7;MONGOLIAN LETTER ALI GALI HALF YA;Lo;0;L;;;;;N;;;;;
+18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;;
+18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;;
+18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;;
+18B0;CANADIAN SYLLABICS OY;Lo;0;L;;;;;N;;;;;
+18B1;CANADIAN SYLLABICS AY;Lo;0;L;;;;;N;;;;;
+18B2;CANADIAN SYLLABICS AAY;Lo;0;L;;;;;N;;;;;
+18B3;CANADIAN SYLLABICS WAY;Lo;0;L;;;;;N;;;;;
+18B4;CANADIAN SYLLABICS POY;Lo;0;L;;;;;N;;;;;
+18B5;CANADIAN SYLLABICS PAY;Lo;0;L;;;;;N;;;;;
+18B6;CANADIAN SYLLABICS PWOY;Lo;0;L;;;;;N;;;;;
+18B7;CANADIAN SYLLABICS TAY;Lo;0;L;;;;;N;;;;;
+18B8;CANADIAN SYLLABICS KAY;Lo;0;L;;;;;N;;;;;
+18B9;CANADIAN SYLLABICS KWAY;Lo;0;L;;;;;N;;;;;
+18BA;CANADIAN SYLLABICS MAY;Lo;0;L;;;;;N;;;;;
+18BB;CANADIAN SYLLABICS NOY;Lo;0;L;;;;;N;;;;;
+18BC;CANADIAN SYLLABICS NAY;Lo;0;L;;;;;N;;;;;
+18BD;CANADIAN SYLLABICS LAY;Lo;0;L;;;;;N;;;;;
+18BE;CANADIAN SYLLABICS SOY;Lo;0;L;;;;;N;;;;;
+18BF;CANADIAN SYLLABICS SAY;Lo;0;L;;;;;N;;;;;
+18C0;CANADIAN SYLLABICS SHOY;Lo;0;L;;;;;N;;;;;
+18C1;CANADIAN SYLLABICS SHAY;Lo;0;L;;;;;N;;;;;
+18C2;CANADIAN SYLLABICS SHWOY;Lo;0;L;;;;;N;;;;;
+18C3;CANADIAN SYLLABICS YOY;Lo;0;L;;;;;N;;;;;
+18C4;CANADIAN SYLLABICS YAY;Lo;0;L;;;;;N;;;;;
+18C5;CANADIAN SYLLABICS RAY;Lo;0;L;;;;;N;;;;;
+18C6;CANADIAN SYLLABICS NWI;Lo;0;L;;;;;N;;;;;
+18C7;CANADIAN SYLLABICS OJIBWAY NWI;Lo;0;L;;;;;N;;;;;
+18C8;CANADIAN SYLLABICS NWII;Lo;0;L;;;;;N;;;;;
+18C9;CANADIAN SYLLABICS OJIBWAY NWII;Lo;0;L;;;;;N;;;;;
+18CA;CANADIAN SYLLABICS NWO;Lo;0;L;;;;;N;;;;;
+18CB;CANADIAN SYLLABICS OJIBWAY NWO;Lo;0;L;;;;;N;;;;;
+18CC;CANADIAN SYLLABICS NWOO;Lo;0;L;;;;;N;;;;;
+18CD;CANADIAN SYLLABICS OJIBWAY NWOO;Lo;0;L;;;;;N;;;;;
+18CE;CANADIAN SYLLABICS RWEE;Lo;0;L;;;;;N;;;;;
+18CF;CANADIAN SYLLABICS RWI;Lo;0;L;;;;;N;;;;;
+18D0;CANADIAN SYLLABICS RWII;Lo;0;L;;;;;N;;;;;
+18D1;CANADIAN SYLLABICS RWO;Lo;0;L;;;;;N;;;;;
+18D2;CANADIAN SYLLABICS RWOO;Lo;0;L;;;;;N;;;;;
+18D3;CANADIAN SYLLABICS RWA;Lo;0;L;;;;;N;;;;;
+18D4;CANADIAN SYLLABICS OJIBWAY P;Lo;0;L;;;;;N;;;;;
+18D5;CANADIAN SYLLABICS OJIBWAY T;Lo;0;L;;;;;N;;;;;
+18D6;CANADIAN SYLLABICS OJIBWAY K;Lo;0;L;;;;;N;;;;;
+18D7;CANADIAN SYLLABICS OJIBWAY C;Lo;0;L;;;;;N;;;;;
+18D8;CANADIAN SYLLABICS OJIBWAY M;Lo;0;L;;;;;N;;;;;
+18D9;CANADIAN SYLLABICS OJIBWAY N;Lo;0;L;;;;;N;;;;;
+18DA;CANADIAN SYLLABICS OJIBWAY S;Lo;0;L;;;;;N;;;;;
+18DB;CANADIAN SYLLABICS OJIBWAY SH;Lo;0;L;;;;;N;;;;;
+18DC;CANADIAN SYLLABICS EASTERN W;Lo;0;L;;;;;N;;;;;
+18DD;CANADIAN SYLLABICS WESTERN W;Lo;0;L;;;;;N;;;;;
+18DE;CANADIAN SYLLABICS FINAL SMALL RING;Lo;0;L;;;;;N;;;;;
+18DF;CANADIAN SYLLABICS FINAL RAISED DOT;Lo;0;L;;;;;N;;;;;
+18E0;CANADIAN SYLLABICS R-CREE RWE;Lo;0;L;;;;;N;;;;;
+18E1;CANADIAN SYLLABICS WEST-CREE LOO;Lo;0;L;;;;;N;;;;;
+18E2;CANADIAN SYLLABICS WEST-CREE LAA;Lo;0;L;;;;;N;;;;;
+18E3;CANADIAN SYLLABICS THWE;Lo;0;L;;;;;N;;;;;
+18E4;CANADIAN SYLLABICS THWA;Lo;0;L;;;;;N;;;;;
+18E5;CANADIAN SYLLABICS TTHWE;Lo;0;L;;;;;N;;;;;
+18E6;CANADIAN SYLLABICS TTHOO;Lo;0;L;;;;;N;;;;;
+18E7;CANADIAN SYLLABICS TTHAA;Lo;0;L;;;;;N;;;;;
+18E8;CANADIAN SYLLABICS TLHWE;Lo;0;L;;;;;N;;;;;
+18E9;CANADIAN SYLLABICS TLHOO;Lo;0;L;;;;;N;;;;;
+18EA;CANADIAN SYLLABICS SAYISI SHWE;Lo;0;L;;;;;N;;;;;
+18EB;CANADIAN SYLLABICS SAYISI SHOO;Lo;0;L;;;;;N;;;;;
+18EC;CANADIAN SYLLABICS SAYISI HOO;Lo;0;L;;;;;N;;;;;
+18ED;CANADIAN SYLLABICS CARRIER GWU;Lo;0;L;;;;;N;;;;;
+18EE;CANADIAN SYLLABICS CARRIER DENE GEE;Lo;0;L;;;;;N;;;;;
+18EF;CANADIAN SYLLABICS CARRIER GAA;Lo;0;L;;;;;N;;;;;
+18F0;CANADIAN SYLLABICS CARRIER GWA;Lo;0;L;;;;;N;;;;;
+18F1;CANADIAN SYLLABICS SAYISI JUU;Lo;0;L;;;;;N;;;;;
+18F2;CANADIAN SYLLABICS CARRIER JWA;Lo;0;L;;;;;N;;;;;
+18F3;CANADIAN SYLLABICS BEAVER DENE L;Lo;0;L;;;;;N;;;;;
+18F4;CANADIAN SYLLABICS BEAVER DENE R;Lo;0;L;;;;;N;;;;;
+18F5;CANADIAN SYLLABICS CARRIER DENTAL S;Lo;0;L;;;;;N;;;;;
+1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;;
+1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;;
+1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;;
+1903;LIMBU LETTER GA;Lo;0;L;;;;;N;;;;;
+1904;LIMBU LETTER GHA;Lo;0;L;;;;;N;;;;;
+1905;LIMBU LETTER NGA;Lo;0;L;;;;;N;;;;;
+1906;LIMBU LETTER CA;Lo;0;L;;;;;N;;;;;
+1907;LIMBU LETTER CHA;Lo;0;L;;;;;N;;;;;
+1908;LIMBU LETTER JA;Lo;0;L;;;;;N;;;;;
+1909;LIMBU LETTER JHA;Lo;0;L;;;;;N;;;;;
+190A;LIMBU LETTER YAN;Lo;0;L;;;;;N;;;;;
+190B;LIMBU LETTER TA;Lo;0;L;;;;;N;;;;;
+190C;LIMBU LETTER THA;Lo;0;L;;;;;N;;;;;
+190D;LIMBU LETTER DA;Lo;0;L;;;;;N;;;;;
+190E;LIMBU LETTER DHA;Lo;0;L;;;;;N;;;;;
+190F;LIMBU LETTER NA;Lo;0;L;;;;;N;;;;;
+1910;LIMBU LETTER PA;Lo;0;L;;;;;N;;;;;
+1911;LIMBU LETTER PHA;Lo;0;L;;;;;N;;;;;
+1912;LIMBU LETTER BA;Lo;0;L;;;;;N;;;;;
+1913;LIMBU LETTER BHA;Lo;0;L;;;;;N;;;;;
+1914;LIMBU LETTER MA;Lo;0;L;;;;;N;;;;;
+1915;LIMBU LETTER YA;Lo;0;L;;;;;N;;;;;
+1916;LIMBU LETTER RA;Lo;0;L;;;;;N;;;;;
+1917;LIMBU LETTER LA;Lo;0;L;;;;;N;;;;;
+1918;LIMBU LETTER WA;Lo;0;L;;;;;N;;;;;
+1919;LIMBU LETTER SHA;Lo;0;L;;;;;N;;;;;
+191A;LIMBU LETTER SSA;Lo;0;L;;;;;N;;;;;
+191B;LIMBU LETTER SA;Lo;0;L;;;;;N;;;;;
+191C;LIMBU LETTER HA;Lo;0;L;;;;;N;;;;;
+191D;LIMBU LETTER GYAN;Lo;0;L;;;;;N;;;;;
+191E;LIMBU LETTER TRA;Lo;0;L;;;;;N;;;;;
+1920;LIMBU VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
+1921;LIMBU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1922;LIMBU VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1923;LIMBU VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+1924;LIMBU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1925;LIMBU VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1926;LIMBU VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+1927;LIMBU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1928;LIMBU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1929;LIMBU SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+192A;LIMBU SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+192B;LIMBU SUBJOINED LETTER WA;Mc;0;L;;;;;N;;;;;
+1930;LIMBU SMALL LETTER KA;Mc;0;L;;;;;N;;;;;
+1931;LIMBU SMALL LETTER NGA;Mc;0;L;;;;;N;;;;;
+1932;LIMBU SMALL LETTER ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1933;LIMBU SMALL LETTER TA;Mc;0;L;;;;;N;;;;;
+1934;LIMBU SMALL LETTER NA;Mc;0;L;;;;;N;;;;;
+1935;LIMBU SMALL LETTER PA;Mc;0;L;;;;;N;;;;;
+1936;LIMBU SMALL LETTER MA;Mc;0;L;;;;;N;;;;;
+1937;LIMBU SMALL LETTER RA;Mc;0;L;;;;;N;;;;;
+1938;LIMBU SMALL LETTER LA;Mc;0;L;;;;;N;;;;;
+1939;LIMBU SIGN MUKPHRENG;Mn;222;NSM;;;;;N;;;;;
+193A;LIMBU SIGN KEMPHRENG;Mn;230;NSM;;;;;N;;;;;
+193B;LIMBU SIGN SA-I;Mn;220;NSM;;;;;N;;;;;
+1940;LIMBU SIGN LOO;So;0;ON;;;;;N;;;;;
+1944;LIMBU EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+1945;LIMBU QUESTION MARK;Po;0;ON;;;;;N;;;;;
+1946;LIMBU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1947;LIMBU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1948;LIMBU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1949;LIMBU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+194A;LIMBU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+194B;LIMBU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+194C;LIMBU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+194D;LIMBU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+194E;LIMBU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+194F;LIMBU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1950;TAI LE LETTER KA;Lo;0;L;;;;;N;;;;;
+1951;TAI LE LETTER XA;Lo;0;L;;;;;N;;;;;
+1952;TAI LE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1953;TAI LE LETTER TSA;Lo;0;L;;;;;N;;;;;
+1954;TAI LE LETTER SA;Lo;0;L;;;;;N;;;;;
+1955;TAI LE LETTER YA;Lo;0;L;;;;;N;;;;;
+1956;TAI LE LETTER TA;Lo;0;L;;;;;N;;;;;
+1957;TAI LE LETTER THA;Lo;0;L;;;;;N;;;;;
+1958;TAI LE LETTER LA;Lo;0;L;;;;;N;;;;;
+1959;TAI LE LETTER PA;Lo;0;L;;;;;N;;;;;
+195A;TAI LE LETTER PHA;Lo;0;L;;;;;N;;;;;
+195B;TAI LE LETTER MA;Lo;0;L;;;;;N;;;;;
+195C;TAI LE LETTER FA;Lo;0;L;;;;;N;;;;;
+195D;TAI LE LETTER VA;Lo;0;L;;;;;N;;;;;
+195E;TAI LE LETTER HA;Lo;0;L;;;;;N;;;;;
+195F;TAI LE LETTER QA;Lo;0;L;;;;;N;;;;;
+1960;TAI LE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1961;TAI LE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1962;TAI LE LETTER NA;Lo;0;L;;;;;N;;;;;
+1963;TAI LE LETTER A;Lo;0;L;;;;;N;;;;;
+1964;TAI LE LETTER I;Lo;0;L;;;;;N;;;;;
+1965;TAI LE LETTER EE;Lo;0;L;;;;;N;;;;;
+1966;TAI LE LETTER EH;Lo;0;L;;;;;N;;;;;
+1967;TAI LE LETTER U;Lo;0;L;;;;;N;;;;;
+1968;TAI LE LETTER OO;Lo;0;L;;;;;N;;;;;
+1969;TAI LE LETTER O;Lo;0;L;;;;;N;;;;;
+196A;TAI LE LETTER UE;Lo;0;L;;;;;N;;;;;
+196B;TAI LE LETTER E;Lo;0;L;;;;;N;;;;;
+196C;TAI LE LETTER AUE;Lo;0;L;;;;;N;;;;;
+196D;TAI LE LETTER AI;Lo;0;L;;;;;N;;;;;
+1970;TAI LE LETTER TONE-2;Lo;0;L;;;;;N;;;;;
+1971;TAI LE LETTER TONE-3;Lo;0;L;;;;;N;;;;;
+1972;TAI LE LETTER TONE-4;Lo;0;L;;;;;N;;;;;
+1973;TAI LE LETTER TONE-5;Lo;0;L;;;;;N;;;;;
+1974;TAI LE LETTER TONE-6;Lo;0;L;;;;;N;;;;;
+1980;NEW TAI LUE LETTER HIGH QA;Lo;0;L;;;;;N;;;;;
+1981;NEW TAI LUE LETTER LOW QA;Lo;0;L;;;;;N;;;;;
+1982;NEW TAI LUE LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1983;NEW TAI LUE LETTER HIGH XA;Lo;0;L;;;;;N;;;;;
+1984;NEW TAI LUE LETTER HIGH NGA;Lo;0;L;;;;;N;;;;;
+1985;NEW TAI LUE LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1986;NEW TAI LUE LETTER LOW XA;Lo;0;L;;;;;N;;;;;
+1987;NEW TAI LUE LETTER LOW NGA;Lo;0;L;;;;;N;;;;;
+1988;NEW TAI LUE LETTER HIGH TSA;Lo;0;L;;;;;N;;;;;
+1989;NEW TAI LUE LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+198A;NEW TAI LUE LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+198B;NEW TAI LUE LETTER LOW TSA;Lo;0;L;;;;;N;;;;;
+198C;NEW TAI LUE LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+198D;NEW TAI LUE LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+198E;NEW TAI LUE LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+198F;NEW TAI LUE LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1990;NEW TAI LUE LETTER HIGH NA;Lo;0;L;;;;;N;;;;;
+1991;NEW TAI LUE LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1992;NEW TAI LUE LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1993;NEW TAI LUE LETTER LOW NA;Lo;0;L;;;;;N;;;;;
+1994;NEW TAI LUE LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1995;NEW TAI LUE LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1996;NEW TAI LUE LETTER HIGH MA;Lo;0;L;;;;;N;;;;;
+1997;NEW TAI LUE LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1998;NEW TAI LUE LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1999;NEW TAI LUE LETTER LOW MA;Lo;0;L;;;;;N;;;;;
+199A;NEW TAI LUE LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+199B;NEW TAI LUE LETTER HIGH VA;Lo;0;L;;;;;N;;;;;
+199C;NEW TAI LUE LETTER HIGH LA;Lo;0;L;;;;;N;;;;;
+199D;NEW TAI LUE LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+199E;NEW TAI LUE LETTER LOW VA;Lo;0;L;;;;;N;;;;;
+199F;NEW TAI LUE LETTER LOW LA;Lo;0;L;;;;;N;;;;;
+19A0;NEW TAI LUE LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+19A1;NEW TAI LUE LETTER HIGH DA;Lo;0;L;;;;;N;;;;;
+19A2;NEW TAI LUE LETTER HIGH BA;Lo;0;L;;;;;N;;;;;
+19A3;NEW TAI LUE LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+19A4;NEW TAI LUE LETTER LOW DA;Lo;0;L;;;;;N;;;;;
+19A5;NEW TAI LUE LETTER LOW BA;Lo;0;L;;;;;N;;;;;
+19A6;NEW TAI LUE LETTER HIGH KVA;Lo;0;L;;;;;N;;;;;
+19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;;
+19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;;
+19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;;
+19AA;NEW TAI LUE LETTER HIGH SUA;Lo;0;L;;;;;N;;;;;
+19AB;NEW TAI LUE LETTER LOW SUA;Lo;0;L;;;;;N;;;;;
+19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Lo;0;L;;;;;N;;;;;
+19B1;NEW TAI LUE VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
+19B2;NEW TAI LUE VOWEL SIGN II;Lo;0;L;;;;;N;;;;;
+19B3;NEW TAI LUE VOWEL SIGN U;Lo;0;L;;;;;N;;;;;
+19B4;NEW TAI LUE VOWEL SIGN UU;Lo;0;L;;;;;N;;;;;
+19B5;NEW TAI LUE VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
+19B6;NEW TAI LUE VOWEL SIGN AE;Lo;0;L;;;;;N;;;;;
+19B7;NEW TAI LUE VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
+19B8;NEW TAI LUE VOWEL SIGN OA;Lo;0;L;;;;;N;;;;;
+19B9;NEW TAI LUE VOWEL SIGN UE;Lo;0;L;;;;;N;;;;;
+19BA;NEW TAI LUE VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
+19BB;NEW TAI LUE VOWEL SIGN AAY;Lo;0;L;;;;;N;;;;;
+19BC;NEW TAI LUE VOWEL SIGN UY;Lo;0;L;;;;;N;;;;;
+19BD;NEW TAI LUE VOWEL SIGN OY;Lo;0;L;;;;;N;;;;;
+19BE;NEW TAI LUE VOWEL SIGN OAY;Lo;0;L;;;;;N;;;;;
+19BF;NEW TAI LUE VOWEL SIGN UEY;Lo;0;L;;;;;N;;;;;
+19C0;NEW TAI LUE VOWEL SIGN IY;Lo;0;L;;;;;N;;;;;
+19C1;NEW TAI LUE LETTER FINAL V;Lo;0;L;;;;;N;;;;;
+19C2;NEW TAI LUE LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+19C3;NEW TAI LUE LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+19C4;NEW TAI LUE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+19C5;NEW TAI LUE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+19C6;NEW TAI LUE LETTER FINAL D;Lo;0;L;;;;;N;;;;;
+19C7;NEW TAI LUE LETTER FINAL B;Lo;0;L;;;;;N;;;;;
+19C8;NEW TAI LUE TONE MARK-1;Lo;0;L;;;;;N;;;;;
+19C9;NEW TAI LUE TONE MARK-2;Lo;0;L;;;;;N;;;;;
+19D0;NEW TAI LUE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+19D1;NEW TAI LUE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+19D2;NEW TAI LUE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+19D3;NEW TAI LUE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+19D4;NEW TAI LUE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+19D5;NEW TAI LUE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+19D6;NEW TAI LUE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+19DA;NEW TAI LUE THAM DIGIT ONE;No;0;L;;;1;1;N;;;;;
+19DE;NEW TAI LUE SIGN LAE;So;0;ON;;;;;N;;;;;
+19DF;NEW TAI LUE SIGN LAEV;So;0;ON;;;;;N;;;;;
+19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;;
+19E1;KHMER SYMBOL MUOY KOET;So;0;ON;;;;;N;;;;;
+19E2;KHMER SYMBOL PII KOET;So;0;ON;;;;;N;;;;;
+19E3;KHMER SYMBOL BEI KOET;So;0;ON;;;;;N;;;;;
+19E4;KHMER SYMBOL BUON KOET;So;0;ON;;;;;N;;;;;
+19E5;KHMER SYMBOL PRAM KOET;So;0;ON;;;;;N;;;;;
+19E6;KHMER SYMBOL PRAM-MUOY KOET;So;0;ON;;;;;N;;;;;
+19E7;KHMER SYMBOL PRAM-PII KOET;So;0;ON;;;;;N;;;;;
+19E8;KHMER SYMBOL PRAM-BEI KOET;So;0;ON;;;;;N;;;;;
+19E9;KHMER SYMBOL PRAM-BUON KOET;So;0;ON;;;;;N;;;;;
+19EA;KHMER SYMBOL DAP KOET;So;0;ON;;;;;N;;;;;
+19EB;KHMER SYMBOL DAP-MUOY KOET;So;0;ON;;;;;N;;;;;
+19EC;KHMER SYMBOL DAP-PII KOET;So;0;ON;;;;;N;;;;;
+19ED;KHMER SYMBOL DAP-BEI KOET;So;0;ON;;;;;N;;;;;
+19EE;KHMER SYMBOL DAP-BUON KOET;So;0;ON;;;;;N;;;;;
+19EF;KHMER SYMBOL DAP-PRAM KOET;So;0;ON;;;;;N;;;;;
+19F0;KHMER SYMBOL TUTEYASAT;So;0;ON;;;;;N;;;;;
+19F1;KHMER SYMBOL MUOY ROC;So;0;ON;;;;;N;;;;;
+19F2;KHMER SYMBOL PII ROC;So;0;ON;;;;;N;;;;;
+19F3;KHMER SYMBOL BEI ROC;So;0;ON;;;;;N;;;;;
+19F4;KHMER SYMBOL BUON ROC;So;0;ON;;;;;N;;;;;
+19F5;KHMER SYMBOL PRAM ROC;So;0;ON;;;;;N;;;;;
+19F6;KHMER SYMBOL PRAM-MUOY ROC;So;0;ON;;;;;N;;;;;
+19F7;KHMER SYMBOL PRAM-PII ROC;So;0;ON;;;;;N;;;;;
+19F8;KHMER SYMBOL PRAM-BEI ROC;So;0;ON;;;;;N;;;;;
+19F9;KHMER SYMBOL PRAM-BUON ROC;So;0;ON;;;;;N;;;;;
+19FA;KHMER SYMBOL DAP ROC;So;0;ON;;;;;N;;;;;
+19FB;KHMER SYMBOL DAP-MUOY ROC;So;0;ON;;;;;N;;;;;
+19FC;KHMER SYMBOL DAP-PII ROC;So;0;ON;;;;;N;;;;;
+19FD;KHMER SYMBOL DAP-BEI ROC;So;0;ON;;;;;N;;;;;
+19FE;KHMER SYMBOL DAP-BUON ROC;So;0;ON;;;;;N;;;;;
+19FF;KHMER SYMBOL DAP-PRAM ROC;So;0;ON;;;;;N;;;;;
+1A00;BUGINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1A01;BUGINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1A02;BUGINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A03;BUGINESE LETTER NGKA;Lo;0;L;;;;;N;;;;;
+1A04;BUGINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1A05;BUGINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1A06;BUGINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1A07;BUGINESE LETTER MPA;Lo;0;L;;;;;N;;;;;
+1A08;BUGINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1A09;BUGINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1A0A;BUGINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1A0B;BUGINESE LETTER NRA;Lo;0;L;;;;;N;;;;;
+1A0C;BUGINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1A0D;BUGINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1A0E;BUGINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A0F;BUGINESE LETTER NYCA;Lo;0;L;;;;;N;;;;;
+1A10;BUGINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1A11;BUGINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1A12;BUGINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1A13;BUGINESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1A14;BUGINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1A15;BUGINESE LETTER A;Lo;0;L;;;;;N;;;;;
+1A16;BUGINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1A17;BUGINESE VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;;
+1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1A1B;BUGINESE VOWEL SIGN AE;Mn;0;NSM;;;;;N;;;;;
+1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
+1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
+1A20;TAI THAM LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1A21;TAI THAM LETTER HIGH KHA;Lo;0;L;;;;;N;;;;;
+1A22;TAI THAM LETTER HIGH KXA;Lo;0;L;;;;;N;;;;;
+1A23;TAI THAM LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1A24;TAI THAM LETTER LOW KXA;Lo;0;L;;;;;N;;;;;
+1A25;TAI THAM LETTER LOW KHA;Lo;0;L;;;;;N;;;;;
+1A26;TAI THAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A27;TAI THAM LETTER HIGH CA;Lo;0;L;;;;;N;;;;;
+1A28;TAI THAM LETTER HIGH CHA;Lo;0;L;;;;;N;;;;;
+1A29;TAI THAM LETTER LOW CA;Lo;0;L;;;;;N;;;;;
+1A2A;TAI THAM LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+1A2B;TAI THAM LETTER LOW CHA;Lo;0;L;;;;;N;;;;;
+1A2C;TAI THAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A2D;TAI THAM LETTER RATA;Lo;0;L;;;;;N;;;;;
+1A2E;TAI THAM LETTER HIGH RATHA;Lo;0;L;;;;;N;;;;;
+1A2F;TAI THAM LETTER DA;Lo;0;L;;;;;N;;;;;
+1A30;TAI THAM LETTER LOW RATHA;Lo;0;L;;;;;N;;;;;
+1A31;TAI THAM LETTER RANA;Lo;0;L;;;;;N;;;;;
+1A32;TAI THAM LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+1A33;TAI THAM LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1A34;TAI THAM LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1A35;TAI THAM LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1A36;TAI THAM LETTER NA;Lo;0;L;;;;;N;;;;;
+1A37;TAI THAM LETTER BA;Lo;0;L;;;;;N;;;;;
+1A38;TAI THAM LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1A39;TAI THAM LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1A3A;TAI THAM LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+1A3B;TAI THAM LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1A3C;TAI THAM LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+1A3D;TAI THAM LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1A3E;TAI THAM LETTER MA;Lo;0;L;;;;;N;;;;;
+1A3F;TAI THAM LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+1A40;TAI THAM LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+1A41;TAI THAM LETTER RA;Lo;0;L;;;;;N;;;;;
+1A42;TAI THAM LETTER RUE;Lo;0;L;;;;;N;;;;;
+1A43;TAI THAM LETTER LA;Lo;0;L;;;;;N;;;;;
+1A44;TAI THAM LETTER LUE;Lo;0;L;;;;;N;;;;;
+1A45;TAI THAM LETTER WA;Lo;0;L;;;;;N;;;;;
+1A46;TAI THAM LETTER HIGH SHA;Lo;0;L;;;;;N;;;;;
+1A47;TAI THAM LETTER HIGH SSA;Lo;0;L;;;;;N;;;;;
+1A48;TAI THAM LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+1A49;TAI THAM LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+1A4A;TAI THAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+1A4B;TAI THAM LETTER A;Lo;0;L;;;;;N;;;;;
+1A4C;TAI THAM LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+1A4D;TAI THAM LETTER I;Lo;0;L;;;;;N;;;;;
+1A4E;TAI THAM LETTER II;Lo;0;L;;;;;N;;;;;
+1A4F;TAI THAM LETTER U;Lo;0;L;;;;;N;;;;;
+1A50;TAI THAM LETTER UU;Lo;0;L;;;;;N;;;;;
+1A51;TAI THAM LETTER EE;Lo;0;L;;;;;N;;;;;
+1A52;TAI THAM LETTER OO;Lo;0;L;;;;;N;;;;;
+1A53;TAI THAM LETTER LAE;Lo;0;L;;;;;N;;;;;
+1A54;TAI THAM LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1A55;TAI THAM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+1A56;TAI THAM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1A57;TAI THAM CONSONANT SIGN LA TANG LAI;Mc;0;L;;;;;N;;;;;
+1A58;TAI THAM SIGN MAI KANG LAI;Mn;0;NSM;;;;;N;;;;;
+1A59;TAI THAM CONSONANT SIGN FINAL NGA;Mn;0;NSM;;;;;N;;;;;
+1A5A;TAI THAM CONSONANT SIGN LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5B;TAI THAM CONSONANT SIGN HIGH RATHA OR LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5C;TAI THAM CONSONANT SIGN MA;Mn;0;NSM;;;;;N;;;;;
+1A5D;TAI THAM CONSONANT SIGN BA;Mn;0;NSM;;;;;N;;;;;
+1A5E;TAI THAM CONSONANT SIGN SA;Mn;0;NSM;;;;;N;;;;;
+1A60;TAI THAM SIGN SAKOT;Mn;9;NSM;;;;;N;;;;;
+1A61;TAI THAM VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+1A62;TAI THAM VOWEL SIGN MAI SAT;Mn;0;NSM;;;;;N;;;;;
+1A63;TAI THAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1A64;TAI THAM VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+1A65;TAI THAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1A66;TAI THAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1A67;TAI THAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+1A68;TAI THAM VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+1A69;TAI THAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1A6A;TAI THAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1A6B;TAI THAM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1A6C;TAI THAM VOWEL SIGN OA BELOW;Mn;0;NSM;;;;;N;;;;;
+1A6D;TAI THAM VOWEL SIGN OY;Mc;0;L;;;;;N;;;;;
+1A6E;TAI THAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A6F;TAI THAM VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+1A70;TAI THAM VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1A71;TAI THAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1A72;TAI THAM VOWEL SIGN THAM AI;Mc;0;L;;;;;N;;;;;
+1A73;TAI THAM VOWEL SIGN OA ABOVE;Mn;0;NSM;;;;;N;;;;;
+1A74;TAI THAM SIGN MAI KANG;Mn;0;NSM;;;;;N;;;;;
+1A75;TAI THAM SIGN TONE-1;Mn;230;NSM;;;;;N;;;;;
+1A76;TAI THAM SIGN TONE-2;Mn;230;NSM;;;;;N;;;;;
+1A77;TAI THAM SIGN KHUEN TONE-3;Mn;230;NSM;;;;;N;;;;;
+1A78;TAI THAM SIGN KHUEN TONE-4;Mn;230;NSM;;;;;N;;;;;
+1A79;TAI THAM SIGN KHUEN TONE-5;Mn;230;NSM;;;;;N;;;;;
+1A7A;TAI THAM SIGN RA HAAM;Mn;230;NSM;;;;;N;;;;;
+1A7B;TAI THAM SIGN MAI SAM;Mn;230;NSM;;;;;N;;;;;
+1A7C;TAI THAM SIGN KHUEN-LUE KARAN;Mn;230;NSM;;;;;N;;;;;
+1A7F;TAI THAM COMBINING CRYPTOGRAMMIC DOT;Mn;220;NSM;;;;;N;;;;;
+1A80;TAI THAM HORA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A81;TAI THAM HORA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A82;TAI THAM HORA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A83;TAI THAM HORA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A84;TAI THAM HORA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A85;TAI THAM HORA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A86;TAI THAM HORA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A87;TAI THAM HORA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A88;TAI THAM HORA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A89;TAI THAM HORA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1A90;TAI THAM THAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A91;TAI THAM THAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A92;TAI THAM THAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A93;TAI THAM THAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A94;TAI THAM THAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A95;TAI THAM THAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A96;TAI THAM THAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A97;TAI THAM THAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A98;TAI THAM THAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A99;TAI THAM THAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1AA0;TAI THAM SIGN WIANG;Po;0;L;;;;;N;;;;;
+1AA1;TAI THAM SIGN WIANGWAAK;Po;0;L;;;;;N;;;;;
+1AA2;TAI THAM SIGN SAWAN;Po;0;L;;;;;N;;;;;
+1AA3;TAI THAM SIGN KEOW;Po;0;L;;;;;N;;;;;
+1AA4;TAI THAM SIGN HOY;Po;0;L;;;;;N;;;;;
+1AA5;TAI THAM SIGN DOKMAI;Po;0;L;;;;;N;;;;;
+1AA6;TAI THAM SIGN REVERSED ROTATED RANA;Po;0;L;;;;;N;;;;;
+1AA7;TAI THAM SIGN MAI YAMOK;Lm;0;L;;;;;N;;;;;
+1AA8;TAI THAM SIGN KAAN;Po;0;L;;;;;N;;;;;
+1AA9;TAI THAM SIGN KAANKUU;Po;0;L;;;;;N;;;;;
+1AAA;TAI THAM SIGN SATKAAN;Po;0;L;;;;;N;;;;;
+1AAB;TAI THAM SIGN SATKAANKUU;Po;0;L;;;;;N;;;;;
+1AAC;TAI THAM SIGN HANG;Po;0;L;;;;;N;;;;;
+1AAD;TAI THAM SIGN CAANG;Po;0;L;;;;;N;;;;;
+1AB0;COMBINING DOUBLED CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;;;;;
+1AB1;COMBINING DIAERESIS-RING;Mn;230;NSM;;;;;N;;;;;
+1AB2;COMBINING INFINITY;Mn;230;NSM;;;;;N;;;;;
+1AB3;COMBINING DOWNWARDS ARROW;Mn;230;NSM;;;;;N;;;;;
+1AB4;COMBINING TRIPLE DOT;Mn;230;NSM;;;;;N;;;;;
+1AB5;COMBINING X-X BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB6;COMBINING WIGGLY LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB7;COMBINING OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB8;COMBINING DOUBLE OPEN MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+1AB9;COMBINING LIGHT CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABA;COMBINING STRONG CENTRALIZATION STROKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABB;COMBINING PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ABC;COMBINING DOUBLE PARENTHESES ABOVE;Mn;230;NSM;;;;;N;;;;;
+1ABD;COMBINING PARENTHESES BELOW;Mn;220;NSM;;;;;N;;;;;
+1ABE;COMBINING PARENTHESES OVERLAY;Me;0;NSM;;;;;N;;;;;
+1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;;
+1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;;
+1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;;
+1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;;;;
+1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;;;;
+1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;;;;
+1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;;;;
+1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;;;;
+1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;;;;
+1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;;;;
+1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;;;;
+1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;;;;
+1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;;;;
+1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;;;;
+1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;;;;
+1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;;;;
+1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;;;;
+1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;;;;
+1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;;;;
+1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;;;;
+1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;;;;
+1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;;;;
+1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;;;;
+1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;;;;
+1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;;;;
+1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;;;;
+1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;;;;
+1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;;;;
+1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;;;;
+1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;;;;
+1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;;;;
+1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;;;;
+1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;;;;
+1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;;;;
+1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;;;;
+1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;;;;
+1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;;;;
+1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;;;;
+1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;;;;
+1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;;;;
+1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;;;;
+1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;;;;
+1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;;;;
+1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;;;;
+1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;;;;
+1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;;
+1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;;
+1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;;
+1B48;BALINESE LETTER EF SASAK;Lo;0;L;;;;;N;;;;;
+1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;;
+1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;;
+1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;;
+1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1B53;BALINESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1B54;BALINESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1B55;BALINESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1B56;BALINESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1B5A;BALINESE PANTI;Po;0;L;;;;;N;;;;;
+1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;;;;
+1B5C;BALINESE WINDU;Po;0;L;;;;;N;;;;;
+1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;;;;
+1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;;;;
+1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;;;;
+1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;;;;
+1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;;
+1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;;
+1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;;
+1B64;BALINESE MUSICAL SYMBOL DANG;So;0;L;;;;;N;;;;;
+1B65;BALINESE MUSICAL SYMBOL DANG SURANG;So;0;L;;;;;N;;;;;
+1B66;BALINESE MUSICAL SYMBOL DING;So;0;L;;;;;N;;;;;
+1B67;BALINESE MUSICAL SYMBOL DAENG;So;0;L;;;;;N;;;;;
+1B68;BALINESE MUSICAL SYMBOL DEUNG;So;0;L;;;;;N;;;;;
+1B69;BALINESE MUSICAL SYMBOL DAING;So;0;L;;;;;N;;;;;
+1B6A;BALINESE MUSICAL SYMBOL DANG GEDE;So;0;L;;;;;N;;;;;
+1B6B;BALINESE MUSICAL SYMBOL COMBINING TEGEH;Mn;230;NSM;;;;;N;;;;;
+1B6C;BALINESE MUSICAL SYMBOL COMBINING ENDEP;Mn;220;NSM;;;;;N;;;;;
+1B6D;BALINESE MUSICAL SYMBOL COMBINING KEMPUL;Mn;230;NSM;;;;;N;;;;;
+1B6E;BALINESE MUSICAL SYMBOL COMBINING KEMPLI;Mn;230;NSM;;;;;N;;;;;
+1B6F;BALINESE MUSICAL SYMBOL COMBINING JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B70;BALINESE MUSICAL SYMBOL COMBINING KEMPUL WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B71;BALINESE MUSICAL SYMBOL COMBINING KEMPLI WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B72;BALINESE MUSICAL SYMBOL COMBINING BENDE;Mn;230;NSM;;;;;N;;;;;
+1B73;BALINESE MUSICAL SYMBOL COMBINING GONG;Mn;230;NSM;;;;;N;;;;;
+1B74;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG;So;0;L;;;;;N;;;;;
+1B75;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DAG;So;0;L;;;;;N;;;;;
+1B76;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TUK;So;0;L;;;;;N;;;;;
+1B77;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TAK;So;0;L;;;;;N;;;;;
+1B78;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PANG;So;0;L;;;;;N;;;;;
+1B79;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PUNG;So;0;L;;;;;N;;;;;
+1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;;
+1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;;
+1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;;
+1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;;
+1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;;
+1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;;
+1B83;SUNDANESE LETTER A;Lo;0;L;;;;;N;;;;;
+1B84;SUNDANESE LETTER I;Lo;0;L;;;;;N;;;;;
+1B85;SUNDANESE LETTER U;Lo;0;L;;;;;N;;;;;
+1B86;SUNDANESE LETTER AE;Lo;0;L;;;;;N;;;;;
+1B87;SUNDANESE LETTER O;Lo;0;L;;;;;N;;;;;
+1B88;SUNDANESE LETTER E;Lo;0;L;;;;;N;;;;;
+1B89;SUNDANESE LETTER EU;Lo;0;L;;;;;N;;;;;
+1B8A;SUNDANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B8B;SUNDANESE LETTER QA;Lo;0;L;;;;;N;;;;;
+1B8C;SUNDANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B8D;SUNDANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B8E;SUNDANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B8F;SUNDANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B90;SUNDANESE LETTER ZA;Lo;0;L;;;;;N;;;;;
+1B91;SUNDANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B92;SUNDANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B93;SUNDANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B94;SUNDANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B95;SUNDANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B96;SUNDANESE LETTER FA;Lo;0;L;;;;;N;;;;;
+1B97;SUNDANESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1B98;SUNDANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B99;SUNDANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B9A;SUNDANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B9B;SUNDANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B9C;SUNDANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B9D;SUNDANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B9E;SUNDANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B9F;SUNDANESE LETTER XA;Lo;0;L;;;;;N;;;;;
+1BA0;SUNDANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1BA1;SUNDANESE CONSONANT SIGN PAMINGKAL;Mc;0;L;;;;;N;;;;;
+1BA2;SUNDANESE CONSONANT SIGN PANYAKRA;Mn;0;NSM;;;;;N;;;;;
+1BA3;SUNDANESE CONSONANT SIGN PANYIKU;Mn;0;NSM;;;;;N;;;;;
+1BA4;SUNDANESE VOWEL SIGN PANGHULU;Mn;0;NSM;;;;;N;;;;;
+1BA5;SUNDANESE VOWEL SIGN PANYUKU;Mn;0;NSM;;;;;N;;;;;
+1BA6;SUNDANESE VOWEL SIGN PANAELAENG;Mc;0;L;;;;;N;;;;;
+1BA7;SUNDANESE VOWEL SIGN PANOLONG;Mc;0;L;;;;;N;;;;;
+1BA8;SUNDANESE VOWEL SIGN PAMEPET;Mn;0;NSM;;;;;N;;;;;
+1BA9;SUNDANESE VOWEL SIGN PANEULEUNG;Mn;0;NSM;;;;;N;;;;;
+1BAA;SUNDANESE SIGN PAMAAEH;Mc;9;L;;;;;N;;;;;
+1BAB;SUNDANESE SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1BAC;SUNDANESE CONSONANT SIGN PASANGAN MA;Mn;0;NSM;;;;;N;;;;;
+1BAD;SUNDANESE CONSONANT SIGN PASANGAN WA;Mn;0;NSM;;;;;N;;;;;
+1BAE;SUNDANESE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1BAF;SUNDANESE LETTER SYA;Lo;0;L;;;;;N;;;;;
+1BB0;SUNDANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1BB1;SUNDANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1BB2;SUNDANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1BB3;SUNDANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1BB4;SUNDANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1BB5;SUNDANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1BB6;SUNDANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1BB7;SUNDANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1BB8;SUNDANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1BB9;SUNDANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1BBA;SUNDANESE AVAGRAHA;Lo;0;L;;;;;N;;;;;
+1BBB;SUNDANESE LETTER REU;Lo;0;L;;;;;N;;;;;
+1BBC;SUNDANESE LETTER LEU;Lo;0;L;;;;;N;;;;;
+1BBD;SUNDANESE LETTER BHA;Lo;0;L;;;;;N;;;;;
+1BBE;SUNDANESE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+1BBF;SUNDANESE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+1BC0;BATAK LETTER A;Lo;0;L;;;;;N;;;;;
+1BC1;BATAK LETTER SIMALUNGUN A;Lo;0;L;;;;;N;;;;;
+1BC2;BATAK LETTER HA;Lo;0;L;;;;;N;;;;;
+1BC3;BATAK LETTER SIMALUNGUN HA;Lo;0;L;;;;;N;;;;;
+1BC4;BATAK LETTER MANDAILING HA;Lo;0;L;;;;;N;;;;;
+1BC5;BATAK LETTER BA;Lo;0;L;;;;;N;;;;;
+1BC6;BATAK LETTER KARO BA;Lo;0;L;;;;;N;;;;;
+1BC7;BATAK LETTER PA;Lo;0;L;;;;;N;;;;;
+1BC8;BATAK LETTER SIMALUNGUN PA;Lo;0;L;;;;;N;;;;;
+1BC9;BATAK LETTER NA;Lo;0;L;;;;;N;;;;;
+1BCA;BATAK LETTER MANDAILING NA;Lo;0;L;;;;;N;;;;;
+1BCB;BATAK LETTER WA;Lo;0;L;;;;;N;;;;;
+1BCC;BATAK LETTER SIMALUNGUN WA;Lo;0;L;;;;;N;;;;;
+1BCD;BATAK LETTER PAKPAK WA;Lo;0;L;;;;;N;;;;;
+1BCE;BATAK LETTER GA;Lo;0;L;;;;;N;;;;;
+1BCF;BATAK LETTER SIMALUNGUN GA;Lo;0;L;;;;;N;;;;;
+1BD0;BATAK LETTER JA;Lo;0;L;;;;;N;;;;;
+1BD1;BATAK LETTER DA;Lo;0;L;;;;;N;;;;;
+1BD2;BATAK LETTER RA;Lo;0;L;;;;;N;;;;;
+1BD3;BATAK LETTER SIMALUNGUN RA;Lo;0;L;;;;;N;;;;;
+1BD4;BATAK LETTER MA;Lo;0;L;;;;;N;;;;;
+1BD5;BATAK LETTER SIMALUNGUN MA;Lo;0;L;;;;;N;;;;;
+1BD6;BATAK LETTER SOUTHERN TA;Lo;0;L;;;;;N;;;;;
+1BD7;BATAK LETTER NORTHERN TA;Lo;0;L;;;;;N;;;;;
+1BD8;BATAK LETTER SA;Lo;0;L;;;;;N;;;;;
+1BD9;BATAK LETTER SIMALUNGUN SA;Lo;0;L;;;;;N;;;;;
+1BDA;BATAK LETTER MANDAILING SA;Lo;0;L;;;;;N;;;;;
+1BDB;BATAK LETTER YA;Lo;0;L;;;;;N;;;;;
+1BDC;BATAK LETTER SIMALUNGUN YA;Lo;0;L;;;;;N;;;;;
+1BDD;BATAK LETTER NGA;Lo;0;L;;;;;N;;;;;
+1BDE;BATAK LETTER LA;Lo;0;L;;;;;N;;;;;
+1BDF;BATAK LETTER SIMALUNGUN LA;Lo;0;L;;;;;N;;;;;
+1BE0;BATAK LETTER NYA;Lo;0;L;;;;;N;;;;;
+1BE1;BATAK LETTER CA;Lo;0;L;;;;;N;;;;;
+1BE2;BATAK LETTER NDA;Lo;0;L;;;;;N;;;;;
+1BE3;BATAK LETTER MBA;Lo;0;L;;;;;N;;;;;
+1BE4;BATAK LETTER I;Lo;0;L;;;;;N;;;;;
+1BE5;BATAK LETTER U;Lo;0;L;;;;;N;;;;;
+1BE6;BATAK SIGN TOMPI;Mn;7;NSM;;;;;N;;;;;
+1BE7;BATAK VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1BE8;BATAK VOWEL SIGN PAKPAK E;Mn;0;NSM;;;;;N;;;;;
+1BE9;BATAK VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+1BEA;BATAK VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1BEB;BATAK VOWEL SIGN KARO I;Mc;0;L;;;;;N;;;;;
+1BEC;BATAK VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1BED;BATAK VOWEL SIGN KARO O;Mn;0;NSM;;;;;N;;;;;
+1BEE;BATAK VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+1BEF;BATAK VOWEL SIGN U FOR SIMALUNGUN SA;Mn;0;NSM;;;;;N;;;;;
+1BF0;BATAK CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+1BF1;BATAK CONSONANT SIGN H;Mn;0;NSM;;;;;N;;;;;
+1BF2;BATAK PANGOLAT;Mc;9;L;;;;;N;;;;;
+1BF3;BATAK PANONGONAN;Mc;9;L;;;;;N;;;;;
+1BFC;BATAK SYMBOL BINDU NA METEK;Po;0;L;;;;;N;;;;;
+1BFD;BATAK SYMBOL BINDU PINARBORAS;Po;0;L;;;;;N;;;;;
+1BFE;BATAK SYMBOL BINDU JUDUL;Po;0;L;;;;;N;;;;;
+1BFF;BATAK SYMBOL BINDU PANGOLAT;Po;0;L;;;;;N;;;;;
+1C00;LEPCHA LETTER KA;Lo;0;L;;;;;N;;;;;
+1C01;LEPCHA LETTER KLA;Lo;0;L;;;;;N;;;;;
+1C02;LEPCHA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1C03;LEPCHA LETTER GA;Lo;0;L;;;;;N;;;;;
+1C04;LEPCHA LETTER GLA;Lo;0;L;;;;;N;;;;;
+1C05;LEPCHA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1C06;LEPCHA LETTER CA;Lo;0;L;;;;;N;;;;;
+1C07;LEPCHA LETTER CHA;Lo;0;L;;;;;N;;;;;
+1C08;LEPCHA LETTER JA;Lo;0;L;;;;;N;;;;;
+1C09;LEPCHA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1C0A;LEPCHA LETTER TA;Lo;0;L;;;;;N;;;;;
+1C0B;LEPCHA LETTER THA;Lo;0;L;;;;;N;;;;;
+1C0C;LEPCHA LETTER DA;Lo;0;L;;;;;N;;;;;
+1C0D;LEPCHA LETTER NA;Lo;0;L;;;;;N;;;;;
+1C0E;LEPCHA LETTER PA;Lo;0;L;;;;;N;;;;;
+1C0F;LEPCHA LETTER PLA;Lo;0;L;;;;;N;;;;;
+1C10;LEPCHA LETTER PHA;Lo;0;L;;;;;N;;;;;
+1C11;LEPCHA LETTER FA;Lo;0;L;;;;;N;;;;;
+1C12;LEPCHA LETTER FLA;Lo;0;L;;;;;N;;;;;
+1C13;LEPCHA LETTER BA;Lo;0;L;;;;;N;;;;;
+1C14;LEPCHA LETTER BLA;Lo;0;L;;;;;N;;;;;
+1C15;LEPCHA LETTER MA;Lo;0;L;;;;;N;;;;;
+1C16;LEPCHA LETTER MLA;Lo;0;L;;;;;N;;;;;
+1C17;LEPCHA LETTER TSA;Lo;0;L;;;;;N;;;;;
+1C18;LEPCHA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1C19;LEPCHA LETTER DZA;Lo;0;L;;;;;N;;;;;
+1C1A;LEPCHA LETTER YA;Lo;0;L;;;;;N;;;;;
+1C1B;LEPCHA LETTER RA;Lo;0;L;;;;;N;;;;;
+1C1C;LEPCHA LETTER LA;Lo;0;L;;;;;N;;;;;
+1C1D;LEPCHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1C1E;LEPCHA LETTER HLA;Lo;0;L;;;;;N;;;;;
+1C1F;LEPCHA LETTER VA;Lo;0;L;;;;;N;;;;;
+1C20;LEPCHA LETTER SA;Lo;0;L;;;;;N;;;;;
+1C21;LEPCHA LETTER SHA;Lo;0;L;;;;;N;;;;;
+1C22;LEPCHA LETTER WA;Lo;0;L;;;;;N;;;;;
+1C23;LEPCHA LETTER A;Lo;0;L;;;;;N;;;;;
+1C24;LEPCHA SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+1C25;LEPCHA SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+1C26;LEPCHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1C27;LEPCHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1C28;LEPCHA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1C29;LEPCHA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1C2A;LEPCHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+1C2B;LEPCHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+1C2C;LEPCHA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1C2D;LEPCHA CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+1C2E;LEPCHA CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+1C2F;LEPCHA CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+1C30;LEPCHA CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+1C31;LEPCHA CONSONANT SIGN P;Mn;0;NSM;;;;;N;;;;;
+1C32;LEPCHA CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+1C33;LEPCHA CONSONANT SIGN T;Mn;0;NSM;;;;;N;;;;;
+1C34;LEPCHA CONSONANT SIGN NYIN-DO;Mc;0;L;;;;;N;;;;;
+1C35;LEPCHA CONSONANT SIGN KANG;Mc;0;L;;;;;N;;;;;
+1C36;LEPCHA SIGN RAN;Mn;0;NSM;;;;;N;;;;;
+1C37;LEPCHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1C3B;LEPCHA PUNCTUATION TA-ROL;Po;0;L;;;;;N;;;;;
+1C3C;LEPCHA PUNCTUATION NYET THYOOM TA-ROL;Po;0;L;;;;;N;;;;;
+1C3D;LEPCHA PUNCTUATION CER-WA;Po;0;L;;;;;N;;;;;
+1C3E;LEPCHA PUNCTUATION TSHOOK CER-WA;Po;0;L;;;;;N;;;;;
+1C3F;LEPCHA PUNCTUATION TSHOOK;Po;0;L;;;;;N;;;;;
+1C40;LEPCHA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C41;LEPCHA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C42;LEPCHA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C43;LEPCHA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C44;LEPCHA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C45;LEPCHA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C46;LEPCHA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C47;LEPCHA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C48;LEPCHA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C49;LEPCHA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C4D;LEPCHA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1C4E;LEPCHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1C4F;LEPCHA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1C50;OL CHIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C51;OL CHIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C52;OL CHIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C53;OL CHIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C54;OL CHIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C55;OL CHIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C56;OL CHIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C57;OL CHIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C58;OL CHIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C59;OL CHIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C5A;OL CHIKI LETTER LA;Lo;0;L;;;;;N;;;;;
+1C5B;OL CHIKI LETTER AT;Lo;0;L;;;;;N;;;;;
+1C5C;OL CHIKI LETTER AG;Lo;0;L;;;;;N;;;;;
+1C5D;OL CHIKI LETTER ANG;Lo;0;L;;;;;N;;;;;
+1C5E;OL CHIKI LETTER AL;Lo;0;L;;;;;N;;;;;
+1C5F;OL CHIKI LETTER LAA;Lo;0;L;;;;;N;;;;;
+1C60;OL CHIKI LETTER AAK;Lo;0;L;;;;;N;;;;;
+1C61;OL CHIKI LETTER AAJ;Lo;0;L;;;;;N;;;;;
+1C62;OL CHIKI LETTER AAM;Lo;0;L;;;;;N;;;;;
+1C63;OL CHIKI LETTER AAW;Lo;0;L;;;;;N;;;;;
+1C64;OL CHIKI LETTER LI;Lo;0;L;;;;;N;;;;;
+1C65;OL CHIKI LETTER IS;Lo;0;L;;;;;N;;;;;
+1C66;OL CHIKI LETTER IH;Lo;0;L;;;;;N;;;;;
+1C67;OL CHIKI LETTER INY;Lo;0;L;;;;;N;;;;;
+1C68;OL CHIKI LETTER IR;Lo;0;L;;;;;N;;;;;
+1C69;OL CHIKI LETTER LU;Lo;0;L;;;;;N;;;;;
+1C6A;OL CHIKI LETTER UC;Lo;0;L;;;;;N;;;;;
+1C6B;OL CHIKI LETTER UD;Lo;0;L;;;;;N;;;;;
+1C6C;OL CHIKI LETTER UNN;Lo;0;L;;;;;N;;;;;
+1C6D;OL CHIKI LETTER UY;Lo;0;L;;;;;N;;;;;
+1C6E;OL CHIKI LETTER LE;Lo;0;L;;;;;N;;;;;
+1C6F;OL CHIKI LETTER EP;Lo;0;L;;;;;N;;;;;
+1C70;OL CHIKI LETTER EDD;Lo;0;L;;;;;N;;;;;
+1C71;OL CHIKI LETTER EN;Lo;0;L;;;;;N;;;;;
+1C72;OL CHIKI LETTER ERR;Lo;0;L;;;;;N;;;;;
+1C73;OL CHIKI LETTER LO;Lo;0;L;;;;;N;;;;;
+1C74;OL CHIKI LETTER OTT;Lo;0;L;;;;;N;;;;;
+1C75;OL CHIKI LETTER OB;Lo;0;L;;;;;N;;;;;
+1C76;OL CHIKI LETTER OV;Lo;0;L;;;;;N;;;;;
+1C77;OL CHIKI LETTER OH;Lo;0;L;;;;;N;;;;;
+1C78;OL CHIKI MU TTUDDAG;Lm;0;L;;;;;N;;;;;
+1C79;OL CHIKI GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7A;OL CHIKI MU-GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7B;OL CHIKI RELAA;Lm;0;L;;;;;N;;;;;
+1C7C;OL CHIKI PHAARKAA;Lm;0;L;;;;;N;;;;;
+1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
+1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
+1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
+1C80;CYRILLIC SMALL LETTER ROUNDED VE;Ll;0;L;;;;;N;;;0412;;0412
+1C81;CYRILLIC SMALL LETTER LONG-LEGGED DE;Ll;0;L;;;;;N;;;0414;;0414
+1C82;CYRILLIC SMALL LETTER NARROW O;Ll;0;L;;;;;N;;;041E;;041E
+1C83;CYRILLIC SMALL LETTER WIDE ES;Ll;0;L;;;;;N;;;0421;;0421
+1C84;CYRILLIC SMALL LETTER TALL TE;Ll;0;L;;;;;N;;;0422;;0422
+1C85;CYRILLIC SMALL LETTER THREE-LEGGED TE;Ll;0;L;;;;;N;;;0422;;0422
+1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462
+1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A
+1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;;
+1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;;
+1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;;
+1CC3;SUNDANESE PUNCTUATION BINDU CAKRA;Po;0;L;;;;;N;;;;;
+1CC4;SUNDANESE PUNCTUATION BINDU LEU SATANGA;Po;0;L;;;;;N;;;;;
+1CC5;SUNDANESE PUNCTUATION BINDU KA SATANGA;Po;0;L;;;;;N;;;;;
+1CC6;SUNDANESE PUNCTUATION BINDU DA SATANGA;Po;0;L;;;;;N;;;;;
+1CC7;SUNDANESE PUNCTUATION BINDU BA SATANGA;Po;0;L;;;;;N;;;;;
+1CD0;VEDIC TONE KARSHANA;Mn;230;NSM;;;;;N;;;;;
+1CD1;VEDIC TONE SHARA;Mn;230;NSM;;;;;N;;;;;
+1CD2;VEDIC TONE PRENKHA;Mn;230;NSM;;;;;N;;;;;
+1CD3;VEDIC SIGN NIHSHVASA;Po;0;L;;;;;N;;;;;
+1CD4;VEDIC SIGN YAJURVEDIC MIDLINE SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CD5;VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD6;VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD7;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD8;VEDIC TONE CANDRA BELOW;Mn;220;NSM;;;;;N;;;;;
+1CD9;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER;Mn;220;NSM;;;;;N;;;;;
+1CDA;VEDIC TONE DOUBLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDB;VEDIC TONE TRIPLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDC;VEDIC TONE KATHAKA ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+1CDD;VEDIC TONE DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDE;VEDIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDF;VEDIC TONE THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CE0;VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CE1;VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA;Mc;0;L;;;;;N;;;;;
+1CE2;VEDIC SIGN VISARGA SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CE3;VEDIC SIGN VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE4;VEDIC SIGN REVERSED VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE5;VEDIC SIGN VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE6;VEDIC SIGN REVERSED VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE7;VEDIC SIGN VISARGA UDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE8;VEDIC SIGN VISARGA ANUDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE9;VEDIC SIGN ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEA;VEDIC SIGN ANUSVARA BAHIRGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEB;VEDIC SIGN ANUSVARA VAMAGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEC;VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL;Lo;0;L;;;;;N;;;;;
+1CED;VEDIC SIGN TIRYAK;Mn;220;NSM;;;;;N;;;;;
+1CEE;VEDIC SIGN HEXIFORM LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CEF;VEDIC SIGN LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF0;VEDIC SIGN RTHANG LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF1;VEDIC SIGN ANUSVARA UBHAYATO MUKHA;Lo;0;L;;;;;N;;;;;
+1CF2;VEDIC SIGN ARDHAVISARGA;Mc;0;L;;;;;N;;;;;
+1CF3;VEDIC SIGN ROTATED ARDHAVISARGA;Mc;0;L;;;;;N;;;;;
+1CF4;VEDIC TONE CANDRA ABOVE;Mn;230;NSM;;;;;N;;;;;
+1CF5;VEDIC SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+1CF6;VEDIC SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+1CF8;VEDIC TONE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+1CF9;VEDIC TONE DOUBLE RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
+1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;;
+1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;;
+1D03;LATIN LETTER SMALL CAPITAL BARRED B;Ll;0;L;;;;;N;;;;;
+1D04;LATIN LETTER SMALL CAPITAL C;Ll;0;L;;;;;N;;;;;
+1D05;LATIN LETTER SMALL CAPITAL D;Ll;0;L;;;;;N;;;;;
+1D06;LATIN LETTER SMALL CAPITAL ETH;Ll;0;L;;;;;N;;;;;
+1D07;LATIN LETTER SMALL CAPITAL E;Ll;0;L;;;;;N;;;;;
+1D08;LATIN SMALL LETTER TURNED OPEN E;Ll;0;L;;;;;N;;;;;
+1D09;LATIN SMALL LETTER TURNED I;Ll;0;L;;;;;N;;;;;
+1D0A;LATIN LETTER SMALL CAPITAL J;Ll;0;L;;;;;N;;;;;
+1D0B;LATIN LETTER SMALL CAPITAL K;Ll;0;L;;;;;N;;;;;
+1D0C;LATIN LETTER SMALL CAPITAL L WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D0D;LATIN LETTER SMALL CAPITAL M;Ll;0;L;;;;;N;;;;;
+1D0E;LATIN LETTER SMALL CAPITAL REVERSED N;Ll;0;L;;;;;N;;;;;
+1D0F;LATIN LETTER SMALL CAPITAL O;Ll;0;L;;;;;N;;;;;
+1D10;LATIN LETTER SMALL CAPITAL OPEN O;Ll;0;L;;;;;N;;;;;
+1D11;LATIN SMALL LETTER SIDEWAYS O;Ll;0;L;;;;;N;;;;;
+1D12;LATIN SMALL LETTER SIDEWAYS OPEN O;Ll;0;L;;;;;N;;;;;
+1D13;LATIN SMALL LETTER SIDEWAYS O WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D14;LATIN SMALL LETTER TURNED OE;Ll;0;L;;;;;N;;;;;
+1D15;LATIN LETTER SMALL CAPITAL OU;Ll;0;L;;;;;N;;;;;
+1D16;LATIN SMALL LETTER TOP HALF O;Ll;0;L;;;;;N;;;;;
+1D17;LATIN SMALL LETTER BOTTOM HALF O;Ll;0;L;;;;;N;;;;;
+1D18;LATIN LETTER SMALL CAPITAL P;Ll;0;L;;;;;N;;;;;
+1D19;LATIN LETTER SMALL CAPITAL REVERSED R;Ll;0;L;;;;;N;;;;;
+1D1A;LATIN LETTER SMALL CAPITAL TURNED R;Ll;0;L;;;;;N;;;;;
+1D1B;LATIN LETTER SMALL CAPITAL T;Ll;0;L;;;;;N;;;;;
+1D1C;LATIN LETTER SMALL CAPITAL U;Ll;0;L;;;;;N;;;;;
+1D1D;LATIN SMALL LETTER SIDEWAYS U;Ll;0;L;;;;;N;;;;;
+1D1E;LATIN SMALL LETTER SIDEWAYS DIAERESIZED U;Ll;0;L;;;;;N;;;;;
+1D1F;LATIN SMALL LETTER SIDEWAYS TURNED M;Ll;0;L;;;;;N;;;;;
+1D20;LATIN LETTER SMALL CAPITAL V;Ll;0;L;;;;;N;;;;;
+1D21;LATIN LETTER SMALL CAPITAL W;Ll;0;L;;;;;N;;;;;
+1D22;LATIN LETTER SMALL CAPITAL Z;Ll;0;L;;;;;N;;;;;
+1D23;LATIN LETTER SMALL CAPITAL EZH;Ll;0;L;;;;;N;;;;;
+1D24;LATIN LETTER VOICED LARYNGEAL SPIRANT;Ll;0;L;;;;;N;;;;;
+1D25;LATIN LETTER AIN;Ll;0;L;;;;;N;;;;;
+1D26;GREEK LETTER SMALL CAPITAL GAMMA;Ll;0;L;;;;;N;;;;;
+1D27;GREEK LETTER SMALL CAPITAL LAMDA;Ll;0;L;;;;;N;;;;;
+1D28;GREEK LETTER SMALL CAPITAL PI;Ll;0;L;;;;;N;;;;;
+1D29;GREEK LETTER SMALL CAPITAL RHO;Ll;0;L;;;;;N;;;;;
+1D2A;GREEK LETTER SMALL CAPITAL PSI;Ll;0;L;;;;;N;;;;;
+1D2B;CYRILLIC LETTER SMALL CAPITAL EL;Ll;0;L;;;;;N;;;;;
+1D2C;MODIFIER LETTER CAPITAL A;Lm;0;L;<super> 0041;;;;N;;;;;
+1D2D;MODIFIER LETTER CAPITAL AE;Lm;0;L;<super> 00C6;;;;N;;;;;
+1D2E;MODIFIER LETTER CAPITAL B;Lm;0;L;<super> 0042;;;;N;;;;;
+1D2F;MODIFIER LETTER CAPITAL BARRED B;Lm;0;L;;;;;N;;;;;
+1D30;MODIFIER LETTER CAPITAL D;Lm;0;L;<super> 0044;;;;N;;;;;
+1D31;MODIFIER LETTER CAPITAL E;Lm;0;L;<super> 0045;;;;N;;;;;
+1D32;MODIFIER LETTER CAPITAL REVERSED E;Lm;0;L;<super> 018E;;;;N;;;;;
+1D33;MODIFIER LETTER CAPITAL G;Lm;0;L;<super> 0047;;;;N;;;;;
+1D34;MODIFIER LETTER CAPITAL H;Lm;0;L;<super> 0048;;;;N;;;;;
+1D35;MODIFIER LETTER CAPITAL I;Lm;0;L;<super> 0049;;;;N;;;;;
+1D36;MODIFIER LETTER CAPITAL J;Lm;0;L;<super> 004A;;;;N;;;;;
+1D37;MODIFIER LETTER CAPITAL K;Lm;0;L;<super> 004B;;;;N;;;;;
+1D38;MODIFIER LETTER CAPITAL L;Lm;0;L;<super> 004C;;;;N;;;;;
+1D39;MODIFIER LETTER CAPITAL M;Lm;0;L;<super> 004D;;;;N;;;;;
+1D3A;MODIFIER LETTER CAPITAL N;Lm;0;L;<super> 004E;;;;N;;;;;
+1D3B;MODIFIER LETTER CAPITAL REVERSED N;Lm;0;L;;;;;N;;;;;
+1D3C;MODIFIER LETTER CAPITAL O;Lm;0;L;<super> 004F;;;;N;;;;;
+1D3D;MODIFIER LETTER CAPITAL OU;Lm;0;L;<super> 0222;;;;N;;;;;
+1D3E;MODIFIER LETTER CAPITAL P;Lm;0;L;<super> 0050;;;;N;;;;;
+1D3F;MODIFIER LETTER CAPITAL R;Lm;0;L;<super> 0052;;;;N;;;;;
+1D40;MODIFIER LETTER CAPITAL T;Lm;0;L;<super> 0054;;;;N;;;;;
+1D41;MODIFIER LETTER CAPITAL U;Lm;0;L;<super> 0055;;;;N;;;;;
+1D42;MODIFIER LETTER CAPITAL W;Lm;0;L;<super> 0057;;;;N;;;;;
+1D43;MODIFIER LETTER SMALL A;Lm;0;L;<super> 0061;;;;N;;;;;
+1D44;MODIFIER LETTER SMALL TURNED A;Lm;0;L;<super> 0250;;;;N;;;;;
+1D45;MODIFIER LETTER SMALL ALPHA;Lm;0;L;<super> 0251;;;;N;;;;;
+1D46;MODIFIER LETTER SMALL TURNED AE;Lm;0;L;<super> 1D02;;;;N;;;;;
+1D47;MODIFIER LETTER SMALL B;Lm;0;L;<super> 0062;;;;N;;;;;
+1D48;MODIFIER LETTER SMALL D;Lm;0;L;<super> 0064;;;;N;;;;;
+1D49;MODIFIER LETTER SMALL E;Lm;0;L;<super> 0065;;;;N;;;;;
+1D4A;MODIFIER LETTER SMALL SCHWA;Lm;0;L;<super> 0259;;;;N;;;;;
+1D4B;MODIFIER LETTER SMALL OPEN E;Lm;0;L;<super> 025B;;;;N;;;;;
+1D4C;MODIFIER LETTER SMALL TURNED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1D4D;MODIFIER LETTER SMALL G;Lm;0;L;<super> 0067;;;;N;;;;;
+1D4E;MODIFIER LETTER SMALL TURNED I;Lm;0;L;;;;;N;;;;;
+1D4F;MODIFIER LETTER SMALL K;Lm;0;L;<super> 006B;;;;N;;;;;
+1D50;MODIFIER LETTER SMALL M;Lm;0;L;<super> 006D;;;;N;;;;;
+1D51;MODIFIER LETTER SMALL ENG;Lm;0;L;<super> 014B;;;;N;;;;;
+1D52;MODIFIER LETTER SMALL O;Lm;0;L;<super> 006F;;;;N;;;;;
+1D53;MODIFIER LETTER SMALL OPEN O;Lm;0;L;<super> 0254;;;;N;;;;;
+1D54;MODIFIER LETTER SMALL TOP HALF O;Lm;0;L;<super> 1D16;;;;N;;;;;
+1D55;MODIFIER LETTER SMALL BOTTOM HALF O;Lm;0;L;<super> 1D17;;;;N;;;;;
+1D56;MODIFIER LETTER SMALL P;Lm;0;L;<super> 0070;;;;N;;;;;
+1D57;MODIFIER LETTER SMALL T;Lm;0;L;<super> 0074;;;;N;;;;;
+1D58;MODIFIER LETTER SMALL U;Lm;0;L;<super> 0075;;;;N;;;;;
+1D59;MODIFIER LETTER SMALL SIDEWAYS U;Lm;0;L;<super> 1D1D;;;;N;;;;;
+1D5A;MODIFIER LETTER SMALL TURNED M;Lm;0;L;<super> 026F;;;;N;;;;;
+1D5B;MODIFIER LETTER SMALL V;Lm;0;L;<super> 0076;;;;N;;;;;
+1D5C;MODIFIER LETTER SMALL AIN;Lm;0;L;<super> 1D25;;;;N;;;;;
+1D5D;MODIFIER LETTER SMALL BETA;Lm;0;L;<super> 03B2;;;;N;;;;;
+1D5E;MODIFIER LETTER SMALL GREEK GAMMA;Lm;0;L;<super> 03B3;;;;N;;;;;
+1D5F;MODIFIER LETTER SMALL DELTA;Lm;0;L;<super> 03B4;;;;N;;;;;
+1D60;MODIFIER LETTER SMALL GREEK PHI;Lm;0;L;<super> 03C6;;;;N;;;;;
+1D61;MODIFIER LETTER SMALL CHI;Lm;0;L;<super> 03C7;;;;N;;;;;
+1D62;LATIN SUBSCRIPT SMALL LETTER I;Lm;0;L;<sub> 0069;;;;N;;;;;
+1D63;LATIN SUBSCRIPT SMALL LETTER R;Lm;0;L;<sub> 0072;;;;N;;;;;
+1D64;LATIN SUBSCRIPT SMALL LETTER U;Lm;0;L;<sub> 0075;;;;N;;;;;
+1D65;LATIN SUBSCRIPT SMALL LETTER V;Lm;0;L;<sub> 0076;;;;N;;;;;
+1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Lm;0;L;<sub> 03B2;;;;N;;;;;
+1D67;GREEK SUBSCRIPT SMALL LETTER GAMMA;Lm;0;L;<sub> 03B3;;;;N;;;;;
+1D68;GREEK SUBSCRIPT SMALL LETTER RHO;Lm;0;L;<sub> 03C1;;;;N;;;;;
+1D69;GREEK SUBSCRIPT SMALL LETTER PHI;Lm;0;L;<sub> 03C6;;;;N;;;;;
+1D6A;GREEK SUBSCRIPT SMALL LETTER CHI;Lm;0;L;<sub> 03C7;;;;N;;;;;
+1D6B;LATIN SMALL LETTER UE;Ll;0;L;;;;;N;;;;;
+1D6C;LATIN SMALL LETTER B WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6D;LATIN SMALL LETTER D WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6E;LATIN SMALL LETTER F WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6F;LATIN SMALL LETTER M WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D70;LATIN SMALL LETTER N WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D71;LATIN SMALL LETTER P WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D72;LATIN SMALL LETTER R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D73;LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D74;LATIN SMALL LETTER S WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D75;LATIN SMALL LETTER T WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D76;LATIN SMALL LETTER Z WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D77;LATIN SMALL LETTER TURNED G;Ll;0;L;;;;;N;;;;;
+1D78;MODIFIER LETTER CYRILLIC EN;Lm;0;L;<super> 043D;;;;N;;;;;
+1D79;LATIN SMALL LETTER INSULAR G;Ll;0;L;;;;;N;;;A77D;;A77D
+1D7A;LATIN SMALL LETTER TH WITH STRIKETHROUGH;Ll;0;L;;;;;N;;;;;
+1D7B;LATIN SMALL CAPITAL LETTER I WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7C;LATIN SMALL LETTER IOTA WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7D;LATIN SMALL LETTER P WITH STROKE;Ll;0;L;;;;;N;;;2C63;;2C63
+1D7E;LATIN SMALL CAPITAL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7F;LATIN SMALL LETTER UPSILON WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D80;LATIN SMALL LETTER B WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D81;LATIN SMALL LETTER D WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D82;LATIN SMALL LETTER F WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D83;LATIN SMALL LETTER G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D84;LATIN SMALL LETTER K WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D85;LATIN SMALL LETTER L WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D86;LATIN SMALL LETTER M WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D87;LATIN SMALL LETTER N WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D88;LATIN SMALL LETTER P WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D89;LATIN SMALL LETTER R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8A;LATIN SMALL LETTER S WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8B;LATIN SMALL LETTER ESH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8C;LATIN SMALL LETTER V WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8D;LATIN SMALL LETTER X WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8E;LATIN SMALL LETTER Z WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8F;LATIN SMALL LETTER A WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D90;LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D91;LATIN SMALL LETTER D WITH HOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+1D92;LATIN SMALL LETTER E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D93;LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D94;LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D95;LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D96;LATIN SMALL LETTER I WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D97;LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D98;LATIN SMALL LETTER ESH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D99;LATIN SMALL LETTER U WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9A;LATIN SMALL LETTER EZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9B;MODIFIER LETTER SMALL TURNED ALPHA;Lm;0;L;<super> 0252;;;;N;;;;;
+1D9C;MODIFIER LETTER SMALL C;Lm;0;L;<super> 0063;;;;N;;;;;
+1D9D;MODIFIER LETTER SMALL C WITH CURL;Lm;0;L;<super> 0255;;;;N;;;;;
+1D9E;MODIFIER LETTER SMALL ETH;Lm;0;L;<super> 00F0;;;;N;;;;;
+1D9F;MODIFIER LETTER SMALL REVERSED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1DA0;MODIFIER LETTER SMALL F;Lm;0;L;<super> 0066;;;;N;;;;;
+1DA1;MODIFIER LETTER SMALL DOTLESS J WITH STROKE;Lm;0;L;<super> 025F;;;;N;;;;;
+1DA2;MODIFIER LETTER SMALL SCRIPT G;Lm;0;L;<super> 0261;;;;N;;;;;
+1DA3;MODIFIER LETTER SMALL TURNED H;Lm;0;L;<super> 0265;;;;N;;;;;
+1DA4;MODIFIER LETTER SMALL I WITH STROKE;Lm;0;L;<super> 0268;;;;N;;;;;
+1DA5;MODIFIER LETTER SMALL IOTA;Lm;0;L;<super> 0269;;;;N;;;;;
+1DA6;MODIFIER LETTER SMALL CAPITAL I;Lm;0;L;<super> 026A;;;;N;;;;;
+1DA7;MODIFIER LETTER SMALL CAPITAL I WITH STROKE;Lm;0;L;<super> 1D7B;;;;N;;;;;
+1DA8;MODIFIER LETTER SMALL J WITH CROSSED-TAIL;Lm;0;L;<super> 029D;;;;N;;;;;
+1DA9;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK;Lm;0;L;<super> 026D;;;;N;;;;;
+1DAA;MODIFIER LETTER SMALL L WITH PALATAL HOOK;Lm;0;L;<super> 1D85;;;;N;;;;;
+1DAB;MODIFIER LETTER SMALL CAPITAL L;Lm;0;L;<super> 029F;;;;N;;;;;
+1DAC;MODIFIER LETTER SMALL M WITH HOOK;Lm;0;L;<super> 0271;;;;N;;;;;
+1DAD;MODIFIER LETTER SMALL TURNED M WITH LONG LEG;Lm;0;L;<super> 0270;;;;N;;;;;
+1DAE;MODIFIER LETTER SMALL N WITH LEFT HOOK;Lm;0;L;<super> 0272;;;;N;;;;;
+1DAF;MODIFIER LETTER SMALL N WITH RETROFLEX HOOK;Lm;0;L;<super> 0273;;;;N;;;;;
+1DB0;MODIFIER LETTER SMALL CAPITAL N;Lm;0;L;<super> 0274;;;;N;;;;;
+1DB1;MODIFIER LETTER SMALL BARRED O;Lm;0;L;<super> 0275;;;;N;;;;;
+1DB2;MODIFIER LETTER SMALL PHI;Lm;0;L;<super> 0278;;;;N;;;;;
+1DB3;MODIFIER LETTER SMALL S WITH HOOK;Lm;0;L;<super> 0282;;;;N;;;;;
+1DB4;MODIFIER LETTER SMALL ESH;Lm;0;L;<super> 0283;;;;N;;;;;
+1DB5;MODIFIER LETTER SMALL T WITH PALATAL HOOK;Lm;0;L;<super> 01AB;;;;N;;;;;
+1DB6;MODIFIER LETTER SMALL U BAR;Lm;0;L;<super> 0289;;;;N;;;;;
+1DB7;MODIFIER LETTER SMALL UPSILON;Lm;0;L;<super> 028A;;;;N;;;;;
+1DB8;MODIFIER LETTER SMALL CAPITAL U;Lm;0;L;<super> 1D1C;;;;N;;;;;
+1DB9;MODIFIER LETTER SMALL V WITH HOOK;Lm;0;L;<super> 028B;;;;N;;;;;
+1DBA;MODIFIER LETTER SMALL TURNED V;Lm;0;L;<super> 028C;;;;N;;;;;
+1DBB;MODIFIER LETTER SMALL Z;Lm;0;L;<super> 007A;;;;N;;;;;
+1DBC;MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK;Lm;0;L;<super> 0290;;;;N;;;;;
+1DBD;MODIFIER LETTER SMALL Z WITH CURL;Lm;0;L;<super> 0291;;;;N;;;;;
+1DBE;MODIFIER LETTER SMALL EZH;Lm;0;L;<super> 0292;;;;N;;;;;
+1DBF;MODIFIER LETTER SMALL THETA;Lm;0;L;<super> 03B8;;;;N;;;;;
+1DC0;COMBINING DOTTED GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC1;COMBINING DOTTED ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC2;COMBINING SNAKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1DC3;COMBINING SUSPENSION MARK;Mn;230;NSM;;;;;N;;;;;
+1DC4;COMBINING MACRON-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DC5;COMBINING GRAVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC6;COMBINING MACRON-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC7;COMBINING ACUTE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC8;COMBINING GRAVE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC9;COMBINING ACUTE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DCA;COMBINING LATIN SMALL LETTER R BELOW;Mn;220;NSM;;;;;N;;;;;
+1DCB;COMBINING BREVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DCC;COMBINING MACRON-BREVE;Mn;230;NSM;;;;;N;;;;;
+1DCD;COMBINING DOUBLE CIRCUMFLEX ABOVE;Mn;234;NSM;;;;;N;;;;;
+1DCE;COMBINING OGONEK ABOVE;Mn;214;NSM;;;;;N;;;;;
+1DCF;COMBINING ZIGZAG BELOW;Mn;220;NSM;;;;;N;;;;;
+1DD0;COMBINING IS BELOW;Mn;202;NSM;;;;;N;;;;;
+1DD1;COMBINING UR ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD2;COMBINING US ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD3;COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD4;COMBINING LATIN SMALL LETTER AE;Mn;230;NSM;;;;;N;;;;;
+1DD5;COMBINING LATIN SMALL LETTER AO;Mn;230;NSM;;;;;N;;;;;
+1DD6;COMBINING LATIN SMALL LETTER AV;Mn;230;NSM;;;;;N;;;;;
+1DD7;COMBINING LATIN SMALL LETTER C CEDILLA;Mn;230;NSM;;;;;N;;;;;
+1DD8;COMBINING LATIN SMALL LETTER INSULAR D;Mn;230;NSM;;;;;N;;;;;
+1DD9;COMBINING LATIN SMALL LETTER ETH;Mn;230;NSM;;;;;N;;;;;
+1DDA;COMBINING LATIN SMALL LETTER G;Mn;230;NSM;;;;;N;;;;;
+1DDB;COMBINING LATIN LETTER SMALL CAPITAL G;Mn;230;NSM;;;;;N;;;;;
+1DDC;COMBINING LATIN SMALL LETTER K;Mn;230;NSM;;;;;N;;;;;
+1DDD;COMBINING LATIN SMALL LETTER L;Mn;230;NSM;;;;;N;;;;;
+1DDE;COMBINING LATIN LETTER SMALL CAPITAL L;Mn;230;NSM;;;;;N;;;;;
+1DDF;COMBINING LATIN LETTER SMALL CAPITAL M;Mn;230;NSM;;;;;N;;;;;
+1DE0;COMBINING LATIN SMALL LETTER N;Mn;230;NSM;;;;;N;;;;;
+1DE1;COMBINING LATIN LETTER SMALL CAPITAL N;Mn;230;NSM;;;;;N;;;;;
+1DE2;COMBINING LATIN LETTER SMALL CAPITAL R;Mn;230;NSM;;;;;N;;;;;
+1DE3;COMBINING LATIN SMALL LETTER R ROTUNDA;Mn;230;NSM;;;;;N;;;;;
+1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;;
+1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;;
+1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;;
+1DE7;COMBINING LATIN SMALL LETTER ALPHA;Mn;230;NSM;;;;;N;;;;;
+1DE8;COMBINING LATIN SMALL LETTER B;Mn;230;NSM;;;;;N;;;;;
+1DE9;COMBINING LATIN SMALL LETTER BETA;Mn;230;NSM;;;;;N;;;;;
+1DEA;COMBINING LATIN SMALL LETTER SCHWA;Mn;230;NSM;;;;;N;;;;;
+1DEB;COMBINING LATIN SMALL LETTER F;Mn;230;NSM;;;;;N;;;;;
+1DEC;COMBINING LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Mn;230;NSM;;;;;N;;;;;
+1DED;COMBINING LATIN SMALL LETTER O WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;;
+1DEE;COMBINING LATIN SMALL LETTER P;Mn;230;NSM;;;;;N;;;;;
+1DEF;COMBINING LATIN SMALL LETTER ESH;Mn;230;NSM;;;;;N;;;;;
+1DF0;COMBINING LATIN SMALL LETTER U WITH LIGHT CENTRALIZATION STROKE;Mn;230;NSM;;;;;N;;;;;
+1DF1;COMBINING LATIN SMALL LETTER W;Mn;230;NSM;;;;;N;;;;;
+1DF2;COMBINING LATIN SMALL LETTER A WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
+1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;;
+1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
+1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
+1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01;
+1E01;LATIN SMALL LETTER A WITH RING BELOW;Ll;0;L;0061 0325;;;;N;;;1E00;;1E00
+1E02;LATIN CAPITAL LETTER B WITH DOT ABOVE;Lu;0;L;0042 0307;;;;N;;;;1E03;
+1E03;LATIN SMALL LETTER B WITH DOT ABOVE;Ll;0;L;0062 0307;;;;N;;;1E02;;1E02
+1E04;LATIN CAPITAL LETTER B WITH DOT BELOW;Lu;0;L;0042 0323;;;;N;;;;1E05;
+1E05;LATIN SMALL LETTER B WITH DOT BELOW;Ll;0;L;0062 0323;;;;N;;;1E04;;1E04
+1E06;LATIN CAPITAL LETTER B WITH LINE BELOW;Lu;0;L;0042 0331;;;;N;;;;1E07;
+1E07;LATIN SMALL LETTER B WITH LINE BELOW;Ll;0;L;0062 0331;;;;N;;;1E06;;1E06
+1E08;LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE;Lu;0;L;00C7 0301;;;;N;;;;1E09;
+1E09;LATIN SMALL LETTER C WITH CEDILLA AND ACUTE;Ll;0;L;00E7 0301;;;;N;;;1E08;;1E08
+1E0A;LATIN CAPITAL LETTER D WITH DOT ABOVE;Lu;0;L;0044 0307;;;;N;;;;1E0B;
+1E0B;LATIN SMALL LETTER D WITH DOT ABOVE;Ll;0;L;0064 0307;;;;N;;;1E0A;;1E0A
+1E0C;LATIN CAPITAL LETTER D WITH DOT BELOW;Lu;0;L;0044 0323;;;;N;;;;1E0D;
+1E0D;LATIN SMALL LETTER D WITH DOT BELOW;Ll;0;L;0064 0323;;;;N;;;1E0C;;1E0C
+1E0E;LATIN CAPITAL LETTER D WITH LINE BELOW;Lu;0;L;0044 0331;;;;N;;;;1E0F;
+1E0F;LATIN SMALL LETTER D WITH LINE BELOW;Ll;0;L;0064 0331;;;;N;;;1E0E;;1E0E
+1E10;LATIN CAPITAL LETTER D WITH CEDILLA;Lu;0;L;0044 0327;;;;N;;;;1E11;
+1E11;LATIN SMALL LETTER D WITH CEDILLA;Ll;0;L;0064 0327;;;;N;;;1E10;;1E10
+1E12;LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW;Lu;0;L;0044 032D;;;;N;;;;1E13;
+1E13;LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW;Ll;0;L;0064 032D;;;;N;;;1E12;;1E12
+1E14;LATIN CAPITAL LETTER E WITH MACRON AND GRAVE;Lu;0;L;0112 0300;;;;N;;;;1E15;
+1E15;LATIN SMALL LETTER E WITH MACRON AND GRAVE;Ll;0;L;0113 0300;;;;N;;;1E14;;1E14
+1E16;LATIN CAPITAL LETTER E WITH MACRON AND ACUTE;Lu;0;L;0112 0301;;;;N;;;;1E17;
+1E17;LATIN SMALL LETTER E WITH MACRON AND ACUTE;Ll;0;L;0113 0301;;;;N;;;1E16;;1E16
+1E18;LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW;Lu;0;L;0045 032D;;;;N;;;;1E19;
+1E19;LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW;Ll;0;L;0065 032D;;;;N;;;1E18;;1E18
+1E1A;LATIN CAPITAL LETTER E WITH TILDE BELOW;Lu;0;L;0045 0330;;;;N;;;;1E1B;
+1E1B;LATIN SMALL LETTER E WITH TILDE BELOW;Ll;0;L;0065 0330;;;;N;;;1E1A;;1E1A
+1E1C;LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE;Lu;0;L;0228 0306;;;;N;;;;1E1D;
+1E1D;LATIN SMALL LETTER E WITH CEDILLA AND BREVE;Ll;0;L;0229 0306;;;;N;;;1E1C;;1E1C
+1E1E;LATIN CAPITAL LETTER F WITH DOT ABOVE;Lu;0;L;0046 0307;;;;N;;;;1E1F;
+1E1F;LATIN SMALL LETTER F WITH DOT ABOVE;Ll;0;L;0066 0307;;;;N;;;1E1E;;1E1E
+1E20;LATIN CAPITAL LETTER G WITH MACRON;Lu;0;L;0047 0304;;;;N;;;;1E21;
+1E21;LATIN SMALL LETTER G WITH MACRON;Ll;0;L;0067 0304;;;;N;;;1E20;;1E20
+1E22;LATIN CAPITAL LETTER H WITH DOT ABOVE;Lu;0;L;0048 0307;;;;N;;;;1E23;
+1E23;LATIN SMALL LETTER H WITH DOT ABOVE;Ll;0;L;0068 0307;;;;N;;;1E22;;1E22
+1E24;LATIN CAPITAL LETTER H WITH DOT BELOW;Lu;0;L;0048 0323;;;;N;;;;1E25;
+1E25;LATIN SMALL LETTER H WITH DOT BELOW;Ll;0;L;0068 0323;;;;N;;;1E24;;1E24
+1E26;LATIN CAPITAL LETTER H WITH DIAERESIS;Lu;0;L;0048 0308;;;;N;;;;1E27;
+1E27;LATIN SMALL LETTER H WITH DIAERESIS;Ll;0;L;0068 0308;;;;N;;;1E26;;1E26
+1E28;LATIN CAPITAL LETTER H WITH CEDILLA;Lu;0;L;0048 0327;;;;N;;;;1E29;
+1E29;LATIN SMALL LETTER H WITH CEDILLA;Ll;0;L;0068 0327;;;;N;;;1E28;;1E28
+1E2A;LATIN CAPITAL LETTER H WITH BREVE BELOW;Lu;0;L;0048 032E;;;;N;;;;1E2B;
+1E2B;LATIN SMALL LETTER H WITH BREVE BELOW;Ll;0;L;0068 032E;;;;N;;;1E2A;;1E2A
+1E2C;LATIN CAPITAL LETTER I WITH TILDE BELOW;Lu;0;L;0049 0330;;;;N;;;;1E2D;
+1E2D;LATIN SMALL LETTER I WITH TILDE BELOW;Ll;0;L;0069 0330;;;;N;;;1E2C;;1E2C
+1E2E;LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE;Lu;0;L;00CF 0301;;;;N;;;;1E2F;
+1E2F;LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE;Ll;0;L;00EF 0301;;;;N;;;1E2E;;1E2E
+1E30;LATIN CAPITAL LETTER K WITH ACUTE;Lu;0;L;004B 0301;;;;N;;;;1E31;
+1E31;LATIN SMALL LETTER K WITH ACUTE;Ll;0;L;006B 0301;;;;N;;;1E30;;1E30
+1E32;LATIN CAPITAL LETTER K WITH DOT BELOW;Lu;0;L;004B 0323;;;;N;;;;1E33;
+1E33;LATIN SMALL LETTER K WITH DOT BELOW;Ll;0;L;006B 0323;;;;N;;;1E32;;1E32
+1E34;LATIN CAPITAL LETTER K WITH LINE BELOW;Lu;0;L;004B 0331;;;;N;;;;1E35;
+1E35;LATIN SMALL LETTER K WITH LINE BELOW;Ll;0;L;006B 0331;;;;N;;;1E34;;1E34
+1E36;LATIN CAPITAL LETTER L WITH DOT BELOW;Lu;0;L;004C 0323;;;;N;;;;1E37;
+1E37;LATIN SMALL LETTER L WITH DOT BELOW;Ll;0;L;006C 0323;;;;N;;;1E36;;1E36
+1E38;LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON;Lu;0;L;1E36 0304;;;;N;;;;1E39;
+1E39;LATIN SMALL LETTER L WITH DOT BELOW AND MACRON;Ll;0;L;1E37 0304;;;;N;;;1E38;;1E38
+1E3A;LATIN CAPITAL LETTER L WITH LINE BELOW;Lu;0;L;004C 0331;;;;N;;;;1E3B;
+1E3B;LATIN SMALL LETTER L WITH LINE BELOW;Ll;0;L;006C 0331;;;;N;;;1E3A;;1E3A
+1E3C;LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW;Lu;0;L;004C 032D;;;;N;;;;1E3D;
+1E3D;LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW;Ll;0;L;006C 032D;;;;N;;;1E3C;;1E3C
+1E3E;LATIN CAPITAL LETTER M WITH ACUTE;Lu;0;L;004D 0301;;;;N;;;;1E3F;
+1E3F;LATIN SMALL LETTER M WITH ACUTE;Ll;0;L;006D 0301;;;;N;;;1E3E;;1E3E
+1E40;LATIN CAPITAL LETTER M WITH DOT ABOVE;Lu;0;L;004D 0307;;;;N;;;;1E41;
+1E41;LATIN SMALL LETTER M WITH DOT ABOVE;Ll;0;L;006D 0307;;;;N;;;1E40;;1E40
+1E42;LATIN CAPITAL LETTER M WITH DOT BELOW;Lu;0;L;004D 0323;;;;N;;;;1E43;
+1E43;LATIN SMALL LETTER M WITH DOT BELOW;Ll;0;L;006D 0323;;;;N;;;1E42;;1E42
+1E44;LATIN CAPITAL LETTER N WITH DOT ABOVE;Lu;0;L;004E 0307;;;;N;;;;1E45;
+1E45;LATIN SMALL LETTER N WITH DOT ABOVE;Ll;0;L;006E 0307;;;;N;;;1E44;;1E44
+1E46;LATIN CAPITAL LETTER N WITH DOT BELOW;Lu;0;L;004E 0323;;;;N;;;;1E47;
+1E47;LATIN SMALL LETTER N WITH DOT BELOW;Ll;0;L;006E 0323;;;;N;;;1E46;;1E46
+1E48;LATIN CAPITAL LETTER N WITH LINE BELOW;Lu;0;L;004E 0331;;;;N;;;;1E49;
+1E49;LATIN SMALL LETTER N WITH LINE BELOW;Ll;0;L;006E 0331;;;;N;;;1E48;;1E48
+1E4A;LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW;Lu;0;L;004E 032D;;;;N;;;;1E4B;
+1E4B;LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW;Ll;0;L;006E 032D;;;;N;;;1E4A;;1E4A
+1E4C;LATIN CAPITAL LETTER O WITH TILDE AND ACUTE;Lu;0;L;00D5 0301;;;;N;;;;1E4D;
+1E4D;LATIN SMALL LETTER O WITH TILDE AND ACUTE;Ll;0;L;00F5 0301;;;;N;;;1E4C;;1E4C
+1E4E;LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS;Lu;0;L;00D5 0308;;;;N;;;;1E4F;
+1E4F;LATIN SMALL LETTER O WITH TILDE AND DIAERESIS;Ll;0;L;00F5 0308;;;;N;;;1E4E;;1E4E
+1E50;LATIN CAPITAL LETTER O WITH MACRON AND GRAVE;Lu;0;L;014C 0300;;;;N;;;;1E51;
+1E51;LATIN SMALL LETTER O WITH MACRON AND GRAVE;Ll;0;L;014D 0300;;;;N;;;1E50;;1E50
+1E52;LATIN CAPITAL LETTER O WITH MACRON AND ACUTE;Lu;0;L;014C 0301;;;;N;;;;1E53;
+1E53;LATIN SMALL LETTER O WITH MACRON AND ACUTE;Ll;0;L;014D 0301;;;;N;;;1E52;;1E52
+1E54;LATIN CAPITAL LETTER P WITH ACUTE;Lu;0;L;0050 0301;;;;N;;;;1E55;
+1E55;LATIN SMALL LETTER P WITH ACUTE;Ll;0;L;0070 0301;;;;N;;;1E54;;1E54
+1E56;LATIN CAPITAL LETTER P WITH DOT ABOVE;Lu;0;L;0050 0307;;;;N;;;;1E57;
+1E57;LATIN SMALL LETTER P WITH DOT ABOVE;Ll;0;L;0070 0307;;;;N;;;1E56;;1E56
+1E58;LATIN CAPITAL LETTER R WITH DOT ABOVE;Lu;0;L;0052 0307;;;;N;;;;1E59;
+1E59;LATIN SMALL LETTER R WITH DOT ABOVE;Ll;0;L;0072 0307;;;;N;;;1E58;;1E58
+1E5A;LATIN CAPITAL LETTER R WITH DOT BELOW;Lu;0;L;0052 0323;;;;N;;;;1E5B;
+1E5B;LATIN SMALL LETTER R WITH DOT BELOW;Ll;0;L;0072 0323;;;;N;;;1E5A;;1E5A
+1E5C;LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON;Lu;0;L;1E5A 0304;;;;N;;;;1E5D;
+1E5D;LATIN SMALL LETTER R WITH DOT BELOW AND MACRON;Ll;0;L;1E5B 0304;;;;N;;;1E5C;;1E5C
+1E5E;LATIN CAPITAL LETTER R WITH LINE BELOW;Lu;0;L;0052 0331;;;;N;;;;1E5F;
+1E5F;LATIN SMALL LETTER R WITH LINE BELOW;Ll;0;L;0072 0331;;;;N;;;1E5E;;1E5E
+1E60;LATIN CAPITAL LETTER S WITH DOT ABOVE;Lu;0;L;0053 0307;;;;N;;;;1E61;
+1E61;LATIN SMALL LETTER S WITH DOT ABOVE;Ll;0;L;0073 0307;;;;N;;;1E60;;1E60
+1E62;LATIN CAPITAL LETTER S WITH DOT BELOW;Lu;0;L;0053 0323;;;;N;;;;1E63;
+1E63;LATIN SMALL LETTER S WITH DOT BELOW;Ll;0;L;0073 0323;;;;N;;;1E62;;1E62
+1E64;LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE;Lu;0;L;015A 0307;;;;N;;;;1E65;
+1E65;LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE;Ll;0;L;015B 0307;;;;N;;;1E64;;1E64
+1E66;LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE;Lu;0;L;0160 0307;;;;N;;;;1E67;
+1E67;LATIN SMALL LETTER S WITH CARON AND DOT ABOVE;Ll;0;L;0161 0307;;;;N;;;1E66;;1E66
+1E68;LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE;Lu;0;L;1E62 0307;;;;N;;;;1E69;
+1E69;LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE;Ll;0;L;1E63 0307;;;;N;;;1E68;;1E68
+1E6A;LATIN CAPITAL LETTER T WITH DOT ABOVE;Lu;0;L;0054 0307;;;;N;;;;1E6B;
+1E6B;LATIN SMALL LETTER T WITH DOT ABOVE;Ll;0;L;0074 0307;;;;N;;;1E6A;;1E6A
+1E6C;LATIN CAPITAL LETTER T WITH DOT BELOW;Lu;0;L;0054 0323;;;;N;;;;1E6D;
+1E6D;LATIN SMALL LETTER T WITH DOT BELOW;Ll;0;L;0074 0323;;;;N;;;1E6C;;1E6C
+1E6E;LATIN CAPITAL LETTER T WITH LINE BELOW;Lu;0;L;0054 0331;;;;N;;;;1E6F;
+1E6F;LATIN SMALL LETTER T WITH LINE BELOW;Ll;0;L;0074 0331;;;;N;;;1E6E;;1E6E
+1E70;LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW;Lu;0;L;0054 032D;;;;N;;;;1E71;
+1E71;LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW;Ll;0;L;0074 032D;;;;N;;;1E70;;1E70
+1E72;LATIN CAPITAL LETTER U WITH DIAERESIS BELOW;Lu;0;L;0055 0324;;;;N;;;;1E73;
+1E73;LATIN SMALL LETTER U WITH DIAERESIS BELOW;Ll;0;L;0075 0324;;;;N;;;1E72;;1E72
+1E74;LATIN CAPITAL LETTER U WITH TILDE BELOW;Lu;0;L;0055 0330;;;;N;;;;1E75;
+1E75;LATIN SMALL LETTER U WITH TILDE BELOW;Ll;0;L;0075 0330;;;;N;;;1E74;;1E74
+1E76;LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW;Lu;0;L;0055 032D;;;;N;;;;1E77;
+1E77;LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW;Ll;0;L;0075 032D;;;;N;;;1E76;;1E76
+1E78;LATIN CAPITAL LETTER U WITH TILDE AND ACUTE;Lu;0;L;0168 0301;;;;N;;;;1E79;
+1E79;LATIN SMALL LETTER U WITH TILDE AND ACUTE;Ll;0;L;0169 0301;;;;N;;;1E78;;1E78
+1E7A;LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS;Lu;0;L;016A 0308;;;;N;;;;1E7B;
+1E7B;LATIN SMALL LETTER U WITH MACRON AND DIAERESIS;Ll;0;L;016B 0308;;;;N;;;1E7A;;1E7A
+1E7C;LATIN CAPITAL LETTER V WITH TILDE;Lu;0;L;0056 0303;;;;N;;;;1E7D;
+1E7D;LATIN SMALL LETTER V WITH TILDE;Ll;0;L;0076 0303;;;;N;;;1E7C;;1E7C
+1E7E;LATIN CAPITAL LETTER V WITH DOT BELOW;Lu;0;L;0056 0323;;;;N;;;;1E7F;
+1E7F;LATIN SMALL LETTER V WITH DOT BELOW;Ll;0;L;0076 0323;;;;N;;;1E7E;;1E7E
+1E80;LATIN CAPITAL LETTER W WITH GRAVE;Lu;0;L;0057 0300;;;;N;;;;1E81;
+1E81;LATIN SMALL LETTER W WITH GRAVE;Ll;0;L;0077 0300;;;;N;;;1E80;;1E80
+1E82;LATIN CAPITAL LETTER W WITH ACUTE;Lu;0;L;0057 0301;;;;N;;;;1E83;
+1E83;LATIN SMALL LETTER W WITH ACUTE;Ll;0;L;0077 0301;;;;N;;;1E82;;1E82
+1E84;LATIN CAPITAL LETTER W WITH DIAERESIS;Lu;0;L;0057 0308;;;;N;;;;1E85;
+1E85;LATIN SMALL LETTER W WITH DIAERESIS;Ll;0;L;0077 0308;;;;N;;;1E84;;1E84
+1E86;LATIN CAPITAL LETTER W WITH DOT ABOVE;Lu;0;L;0057 0307;;;;N;;;;1E87;
+1E87;LATIN SMALL LETTER W WITH DOT ABOVE;Ll;0;L;0077 0307;;;;N;;;1E86;;1E86
+1E88;LATIN CAPITAL LETTER W WITH DOT BELOW;Lu;0;L;0057 0323;;;;N;;;;1E89;
+1E89;LATIN SMALL LETTER W WITH DOT BELOW;Ll;0;L;0077 0323;;;;N;;;1E88;;1E88
+1E8A;LATIN CAPITAL LETTER X WITH DOT ABOVE;Lu;0;L;0058 0307;;;;N;;;;1E8B;
+1E8B;LATIN SMALL LETTER X WITH DOT ABOVE;Ll;0;L;0078 0307;;;;N;;;1E8A;;1E8A
+1E8C;LATIN CAPITAL LETTER X WITH DIAERESIS;Lu;0;L;0058 0308;;;;N;;;;1E8D;
+1E8D;LATIN SMALL LETTER X WITH DIAERESIS;Ll;0;L;0078 0308;;;;N;;;1E8C;;1E8C
+1E8E;LATIN CAPITAL LETTER Y WITH DOT ABOVE;Lu;0;L;0059 0307;;;;N;;;;1E8F;
+1E8F;LATIN SMALL LETTER Y WITH DOT ABOVE;Ll;0;L;0079 0307;;;;N;;;1E8E;;1E8E
+1E90;LATIN CAPITAL LETTER Z WITH CIRCUMFLEX;Lu;0;L;005A 0302;;;;N;;;;1E91;
+1E91;LATIN SMALL LETTER Z WITH CIRCUMFLEX;Ll;0;L;007A 0302;;;;N;;;1E90;;1E90
+1E92;LATIN CAPITAL LETTER Z WITH DOT BELOW;Lu;0;L;005A 0323;;;;N;;;;1E93;
+1E93;LATIN SMALL LETTER Z WITH DOT BELOW;Ll;0;L;007A 0323;;;;N;;;1E92;;1E92
+1E94;LATIN CAPITAL LETTER Z WITH LINE BELOW;Lu;0;L;005A 0331;;;;N;;;;1E95;
+1E95;LATIN SMALL LETTER Z WITH LINE BELOW;Ll;0;L;007A 0331;;;;N;;;1E94;;1E94
+1E96;LATIN SMALL LETTER H WITH LINE BELOW;Ll;0;L;0068 0331;;;;N;;;;;
+1E97;LATIN SMALL LETTER T WITH DIAERESIS;Ll;0;L;0074 0308;;;;N;;;;;
+1E98;LATIN SMALL LETTER W WITH RING ABOVE;Ll;0;L;0077 030A;;;;N;;;;;
+1E99;LATIN SMALL LETTER Y WITH RING ABOVE;Ll;0;L;0079 030A;;;;N;;;;;
+1E9A;LATIN SMALL LETTER A WITH RIGHT HALF RING;Ll;0;L;<compat> 0061 02BE;;;;N;;;;;
+1E9B;LATIN SMALL LETTER LONG S WITH DOT ABOVE;Ll;0;L;017F 0307;;;;N;;;1E60;;1E60
+1E9C;LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;;;
+1E9D;LATIN SMALL LETTER LONG S WITH HIGH STROKE;Ll;0;L;;;;;N;;;;;
+1E9E;LATIN CAPITAL LETTER SHARP S;Lu;0;L;;;;;N;;;;00DF;
+1E9F;LATIN SMALL LETTER DELTA;Ll;0;L;;;;;N;;;;;
+1EA0;LATIN CAPITAL LETTER A WITH DOT BELOW;Lu;0;L;0041 0323;;;;N;;;;1EA1;
+1EA1;LATIN SMALL LETTER A WITH DOT BELOW;Ll;0;L;0061 0323;;;;N;;;1EA0;;1EA0
+1EA2;LATIN CAPITAL LETTER A WITH HOOK ABOVE;Lu;0;L;0041 0309;;;;N;;;;1EA3;
+1EA3;LATIN SMALL LETTER A WITH HOOK ABOVE;Ll;0;L;0061 0309;;;;N;;;1EA2;;1EA2
+1EA4;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00C2 0301;;;;N;;;;1EA5;
+1EA5;LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00E2 0301;;;;N;;;1EA4;;1EA4
+1EA6;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00C2 0300;;;;N;;;;1EA7;
+1EA7;LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00E2 0300;;;;N;;;1EA6;;1EA6
+1EA8;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00C2 0309;;;;N;;;;1EA9;
+1EA9;LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00E2 0309;;;;N;;;1EA8;;1EA8
+1EAA;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE;Lu;0;L;00C2 0303;;;;N;;;;1EAB;
+1EAB;LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE;Ll;0;L;00E2 0303;;;;N;;;1EAA;;1EAA
+1EAC;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EA0 0302;;;;N;;;;1EAD;
+1EAD;LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EA1 0302;;;;N;;;1EAC;;1EAC
+1EAE;LATIN CAPITAL LETTER A WITH BREVE AND ACUTE;Lu;0;L;0102 0301;;;;N;;;;1EAF;
+1EAF;LATIN SMALL LETTER A WITH BREVE AND ACUTE;Ll;0;L;0103 0301;;;;N;;;1EAE;;1EAE
+1EB0;LATIN CAPITAL LETTER A WITH BREVE AND GRAVE;Lu;0;L;0102 0300;;;;N;;;;1EB1;
+1EB1;LATIN SMALL LETTER A WITH BREVE AND GRAVE;Ll;0;L;0103 0300;;;;N;;;1EB0;;1EB0
+1EB2;LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE;Lu;0;L;0102 0309;;;;N;;;;1EB3;
+1EB3;LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE;Ll;0;L;0103 0309;;;;N;;;1EB2;;1EB2
+1EB4;LATIN CAPITAL LETTER A WITH BREVE AND TILDE;Lu;0;L;0102 0303;;;;N;;;;1EB5;
+1EB5;LATIN SMALL LETTER A WITH BREVE AND TILDE;Ll;0;L;0103 0303;;;;N;;;1EB4;;1EB4
+1EB6;LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW;Lu;0;L;1EA0 0306;;;;N;;;;1EB7;
+1EB7;LATIN SMALL LETTER A WITH BREVE AND DOT BELOW;Ll;0;L;1EA1 0306;;;;N;;;1EB6;;1EB6
+1EB8;LATIN CAPITAL LETTER E WITH DOT BELOW;Lu;0;L;0045 0323;;;;N;;;;1EB9;
+1EB9;LATIN SMALL LETTER E WITH DOT BELOW;Ll;0;L;0065 0323;;;;N;;;1EB8;;1EB8
+1EBA;LATIN CAPITAL LETTER E WITH HOOK ABOVE;Lu;0;L;0045 0309;;;;N;;;;1EBB;
+1EBB;LATIN SMALL LETTER E WITH HOOK ABOVE;Ll;0;L;0065 0309;;;;N;;;1EBA;;1EBA
+1EBC;LATIN CAPITAL LETTER E WITH TILDE;Lu;0;L;0045 0303;;;;N;;;;1EBD;
+1EBD;LATIN SMALL LETTER E WITH TILDE;Ll;0;L;0065 0303;;;;N;;;1EBC;;1EBC
+1EBE;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00CA 0301;;;;N;;;;1EBF;
+1EBF;LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00EA 0301;;;;N;;;1EBE;;1EBE
+1EC0;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00CA 0300;;;;N;;;;1EC1;
+1EC1;LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00EA 0300;;;;N;;;1EC0;;1EC0
+1EC2;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00CA 0309;;;;N;;;;1EC3;
+1EC3;LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00EA 0309;;;;N;;;1EC2;;1EC2
+1EC4;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE;Lu;0;L;00CA 0303;;;;N;;;;1EC5;
+1EC5;LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE;Ll;0;L;00EA 0303;;;;N;;;1EC4;;1EC4
+1EC6;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EB8 0302;;;;N;;;;1EC7;
+1EC7;LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EB9 0302;;;;N;;;1EC6;;1EC6
+1EC8;LATIN CAPITAL LETTER I WITH HOOK ABOVE;Lu;0;L;0049 0309;;;;N;;;;1EC9;
+1EC9;LATIN SMALL LETTER I WITH HOOK ABOVE;Ll;0;L;0069 0309;;;;N;;;1EC8;;1EC8
+1ECA;LATIN CAPITAL LETTER I WITH DOT BELOW;Lu;0;L;0049 0323;;;;N;;;;1ECB;
+1ECB;LATIN SMALL LETTER I WITH DOT BELOW;Ll;0;L;0069 0323;;;;N;;;1ECA;;1ECA
+1ECC;LATIN CAPITAL LETTER O WITH DOT BELOW;Lu;0;L;004F 0323;;;;N;;;;1ECD;
+1ECD;LATIN SMALL LETTER O WITH DOT BELOW;Ll;0;L;006F 0323;;;;N;;;1ECC;;1ECC
+1ECE;LATIN CAPITAL LETTER O WITH HOOK ABOVE;Lu;0;L;004F 0309;;;;N;;;;1ECF;
+1ECF;LATIN SMALL LETTER O WITH HOOK ABOVE;Ll;0;L;006F 0309;;;;N;;;1ECE;;1ECE
+1ED0;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00D4 0301;;;;N;;;;1ED1;
+1ED1;LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00F4 0301;;;;N;;;1ED0;;1ED0
+1ED2;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00D4 0300;;;;N;;;;1ED3;
+1ED3;LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00F4 0300;;;;N;;;1ED2;;1ED2
+1ED4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00D4 0309;;;;N;;;;1ED5;
+1ED5;LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00F4 0309;;;;N;;;1ED4;;1ED4
+1ED6;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE;Lu;0;L;00D4 0303;;;;N;;;;1ED7;
+1ED7;LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE;Ll;0;L;00F4 0303;;;;N;;;1ED6;;1ED6
+1ED8;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1ECC 0302;;;;N;;;;1ED9;
+1ED9;LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1ECD 0302;;;;N;;;1ED8;;1ED8
+1EDA;LATIN CAPITAL LETTER O WITH HORN AND ACUTE;Lu;0;L;01A0 0301;;;;N;;;;1EDB;
+1EDB;LATIN SMALL LETTER O WITH HORN AND ACUTE;Ll;0;L;01A1 0301;;;;N;;;1EDA;;1EDA
+1EDC;LATIN CAPITAL LETTER O WITH HORN AND GRAVE;Lu;0;L;01A0 0300;;;;N;;;;1EDD;
+1EDD;LATIN SMALL LETTER O WITH HORN AND GRAVE;Ll;0;L;01A1 0300;;;;N;;;1EDC;;1EDC
+1EDE;LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE;Lu;0;L;01A0 0309;;;;N;;;;1EDF;
+1EDF;LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE;Ll;0;L;01A1 0309;;;;N;;;1EDE;;1EDE
+1EE0;LATIN CAPITAL LETTER O WITH HORN AND TILDE;Lu;0;L;01A0 0303;;;;N;;;;1EE1;
+1EE1;LATIN SMALL LETTER O WITH HORN AND TILDE;Ll;0;L;01A1 0303;;;;N;;;1EE0;;1EE0
+1EE2;LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW;Lu;0;L;01A0 0323;;;;N;;;;1EE3;
+1EE3;LATIN SMALL LETTER O WITH HORN AND DOT BELOW;Ll;0;L;01A1 0323;;;;N;;;1EE2;;1EE2
+1EE4;LATIN CAPITAL LETTER U WITH DOT BELOW;Lu;0;L;0055 0323;;;;N;;;;1EE5;
+1EE5;LATIN SMALL LETTER U WITH DOT BELOW;Ll;0;L;0075 0323;;;;N;;;1EE4;;1EE4
+1EE6;LATIN CAPITAL LETTER U WITH HOOK ABOVE;Lu;0;L;0055 0309;;;;N;;;;1EE7;
+1EE7;LATIN SMALL LETTER U WITH HOOK ABOVE;Ll;0;L;0075 0309;;;;N;;;1EE6;;1EE6
+1EE8;LATIN CAPITAL LETTER U WITH HORN AND ACUTE;Lu;0;L;01AF 0301;;;;N;;;;1EE9;
+1EE9;LATIN SMALL LETTER U WITH HORN AND ACUTE;Ll;0;L;01B0 0301;;;;N;;;1EE8;;1EE8
+1EEA;LATIN CAPITAL LETTER U WITH HORN AND GRAVE;Lu;0;L;01AF 0300;;;;N;;;;1EEB;
+1EEB;LATIN SMALL LETTER U WITH HORN AND GRAVE;Ll;0;L;01B0 0300;;;;N;;;1EEA;;1EEA
+1EEC;LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE;Lu;0;L;01AF 0309;;;;N;;;;1EED;
+1EED;LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE;Ll;0;L;01B0 0309;;;;N;;;1EEC;;1EEC
+1EEE;LATIN CAPITAL LETTER U WITH HORN AND TILDE;Lu;0;L;01AF 0303;;;;N;;;;1EEF;
+1EEF;LATIN SMALL LETTER U WITH HORN AND TILDE;Ll;0;L;01B0 0303;;;;N;;;1EEE;;1EEE
+1EF0;LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW;Lu;0;L;01AF 0323;;;;N;;;;1EF1;
+1EF1;LATIN SMALL LETTER U WITH HORN AND DOT BELOW;Ll;0;L;01B0 0323;;;;N;;;1EF0;;1EF0
+1EF2;LATIN CAPITAL LETTER Y WITH GRAVE;Lu;0;L;0059 0300;;;;N;;;;1EF3;
+1EF3;LATIN SMALL LETTER Y WITH GRAVE;Ll;0;L;0079 0300;;;;N;;;1EF2;;1EF2
+1EF4;LATIN CAPITAL LETTER Y WITH DOT BELOW;Lu;0;L;0059 0323;;;;N;;;;1EF5;
+1EF5;LATIN SMALL LETTER Y WITH DOT BELOW;Ll;0;L;0079 0323;;;;N;;;1EF4;;1EF4
+1EF6;LATIN CAPITAL LETTER Y WITH HOOK ABOVE;Lu;0;L;0059 0309;;;;N;;;;1EF7;
+1EF7;LATIN SMALL LETTER Y WITH HOOK ABOVE;Ll;0;L;0079 0309;;;;N;;;1EF6;;1EF6
+1EF8;LATIN CAPITAL LETTER Y WITH TILDE;Lu;0;L;0059 0303;;;;N;;;;1EF9;
+1EF9;LATIN SMALL LETTER Y WITH TILDE;Ll;0;L;0079 0303;;;;N;;;1EF8;;1EF8
+1EFA;LATIN CAPITAL LETTER MIDDLE-WELSH LL;Lu;0;L;;;;;N;;;;1EFB;
+1EFB;LATIN SMALL LETTER MIDDLE-WELSH LL;Ll;0;L;;;;;N;;;1EFA;;1EFA
+1EFC;LATIN CAPITAL LETTER MIDDLE-WELSH V;Lu;0;L;;;;;N;;;;1EFD;
+1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
+1EFE;LATIN CAPITAL LETTER Y WITH LOOP;Lu;0;L;;;;;N;;;;1EFF;
+1EFF;LATIN SMALL LETTER Y WITH LOOP;Ll;0;L;;;;;N;;;1EFE;;1EFE
+1F00;GREEK SMALL LETTER ALPHA WITH PSILI;Ll;0;L;03B1 0313;;;;N;;;1F08;;1F08
+1F01;GREEK SMALL LETTER ALPHA WITH DASIA;Ll;0;L;03B1 0314;;;;N;;;1F09;;1F09
+1F02;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA;Ll;0;L;1F00 0300;;;;N;;;1F0A;;1F0A
+1F03;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA;Ll;0;L;1F01 0300;;;;N;;;1F0B;;1F0B
+1F04;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA;Ll;0;L;1F00 0301;;;;N;;;1F0C;;1F0C
+1F05;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA;Ll;0;L;1F01 0301;;;;N;;;1F0D;;1F0D
+1F06;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI;Ll;0;L;1F00 0342;;;;N;;;1F0E;;1F0E
+1F07;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI;Ll;0;L;1F01 0342;;;;N;;;1F0F;;1F0F
+1F08;GREEK CAPITAL LETTER ALPHA WITH PSILI;Lu;0;L;0391 0313;;;;N;;;;1F00;
+1F09;GREEK CAPITAL LETTER ALPHA WITH DASIA;Lu;0;L;0391 0314;;;;N;;;;1F01;
+1F0A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA;Lu;0;L;1F08 0300;;;;N;;;;1F02;
+1F0B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA;Lu;0;L;1F09 0300;;;;N;;;;1F03;
+1F0C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA;Lu;0;L;1F08 0301;;;;N;;;;1F04;
+1F0D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA;Lu;0;L;1F09 0301;;;;N;;;;1F05;
+1F0E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI;Lu;0;L;1F08 0342;;;;N;;;;1F06;
+1F0F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI;Lu;0;L;1F09 0342;;;;N;;;;1F07;
+1F10;GREEK SMALL LETTER EPSILON WITH PSILI;Ll;0;L;03B5 0313;;;;N;;;1F18;;1F18
+1F11;GREEK SMALL LETTER EPSILON WITH DASIA;Ll;0;L;03B5 0314;;;;N;;;1F19;;1F19
+1F12;GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA;Ll;0;L;1F10 0300;;;;N;;;1F1A;;1F1A
+1F13;GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA;Ll;0;L;1F11 0300;;;;N;;;1F1B;;1F1B
+1F14;GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA;Ll;0;L;1F10 0301;;;;N;;;1F1C;;1F1C
+1F15;GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA;Ll;0;L;1F11 0301;;;;N;;;1F1D;;1F1D
+1F18;GREEK CAPITAL LETTER EPSILON WITH PSILI;Lu;0;L;0395 0313;;;;N;;;;1F10;
+1F19;GREEK CAPITAL LETTER EPSILON WITH DASIA;Lu;0;L;0395 0314;;;;N;;;;1F11;
+1F1A;GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA;Lu;0;L;1F18 0300;;;;N;;;;1F12;
+1F1B;GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA;Lu;0;L;1F19 0300;;;;N;;;;1F13;
+1F1C;GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA;Lu;0;L;1F18 0301;;;;N;;;;1F14;
+1F1D;GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA;Lu;0;L;1F19 0301;;;;N;;;;1F15;
+1F20;GREEK SMALL LETTER ETA WITH PSILI;Ll;0;L;03B7 0313;;;;N;;;1F28;;1F28
+1F21;GREEK SMALL LETTER ETA WITH DASIA;Ll;0;L;03B7 0314;;;;N;;;1F29;;1F29
+1F22;GREEK SMALL LETTER ETA WITH PSILI AND VARIA;Ll;0;L;1F20 0300;;;;N;;;1F2A;;1F2A
+1F23;GREEK SMALL LETTER ETA WITH DASIA AND VARIA;Ll;0;L;1F21 0300;;;;N;;;1F2B;;1F2B
+1F24;GREEK SMALL LETTER ETA WITH PSILI AND OXIA;Ll;0;L;1F20 0301;;;;N;;;1F2C;;1F2C
+1F25;GREEK SMALL LETTER ETA WITH DASIA AND OXIA;Ll;0;L;1F21 0301;;;;N;;;1F2D;;1F2D
+1F26;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI;Ll;0;L;1F20 0342;;;;N;;;1F2E;;1F2E
+1F27;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI;Ll;0;L;1F21 0342;;;;N;;;1F2F;;1F2F
+1F28;GREEK CAPITAL LETTER ETA WITH PSILI;Lu;0;L;0397 0313;;;;N;;;;1F20;
+1F29;GREEK CAPITAL LETTER ETA WITH DASIA;Lu;0;L;0397 0314;;;;N;;;;1F21;
+1F2A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA;Lu;0;L;1F28 0300;;;;N;;;;1F22;
+1F2B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA;Lu;0;L;1F29 0300;;;;N;;;;1F23;
+1F2C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA;Lu;0;L;1F28 0301;;;;N;;;;1F24;
+1F2D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA;Lu;0;L;1F29 0301;;;;N;;;;1F25;
+1F2E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI;Lu;0;L;1F28 0342;;;;N;;;;1F26;
+1F2F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI;Lu;0;L;1F29 0342;;;;N;;;;1F27;
+1F30;GREEK SMALL LETTER IOTA WITH PSILI;Ll;0;L;03B9 0313;;;;N;;;1F38;;1F38
+1F31;GREEK SMALL LETTER IOTA WITH DASIA;Ll;0;L;03B9 0314;;;;N;;;1F39;;1F39
+1F32;GREEK SMALL LETTER IOTA WITH PSILI AND VARIA;Ll;0;L;1F30 0300;;;;N;;;1F3A;;1F3A
+1F33;GREEK SMALL LETTER IOTA WITH DASIA AND VARIA;Ll;0;L;1F31 0300;;;;N;;;1F3B;;1F3B
+1F34;GREEK SMALL LETTER IOTA WITH PSILI AND OXIA;Ll;0;L;1F30 0301;;;;N;;;1F3C;;1F3C
+1F35;GREEK SMALL LETTER IOTA WITH DASIA AND OXIA;Ll;0;L;1F31 0301;;;;N;;;1F3D;;1F3D
+1F36;GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI;Ll;0;L;1F30 0342;;;;N;;;1F3E;;1F3E
+1F37;GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI;Ll;0;L;1F31 0342;;;;N;;;1F3F;;1F3F
+1F38;GREEK CAPITAL LETTER IOTA WITH PSILI;Lu;0;L;0399 0313;;;;N;;;;1F30;
+1F39;GREEK CAPITAL LETTER IOTA WITH DASIA;Lu;0;L;0399 0314;;;;N;;;;1F31;
+1F3A;GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA;Lu;0;L;1F38 0300;;;;N;;;;1F32;
+1F3B;GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA;Lu;0;L;1F39 0300;;;;N;;;;1F33;
+1F3C;GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA;Lu;0;L;1F38 0301;;;;N;;;;1F34;
+1F3D;GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA;Lu;0;L;1F39 0301;;;;N;;;;1F35;
+1F3E;GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI;Lu;0;L;1F38 0342;;;;N;;;;1F36;
+1F3F;GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI;Lu;0;L;1F39 0342;;;;N;;;;1F37;
+1F40;GREEK SMALL LETTER OMICRON WITH PSILI;Ll;0;L;03BF 0313;;;;N;;;1F48;;1F48
+1F41;GREEK SMALL LETTER OMICRON WITH DASIA;Ll;0;L;03BF 0314;;;;N;;;1F49;;1F49
+1F42;GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA;Ll;0;L;1F40 0300;;;;N;;;1F4A;;1F4A
+1F43;GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA;Ll;0;L;1F41 0300;;;;N;;;1F4B;;1F4B
+1F44;GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA;Ll;0;L;1F40 0301;;;;N;;;1F4C;;1F4C
+1F45;GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA;Ll;0;L;1F41 0301;;;;N;;;1F4D;;1F4D
+1F48;GREEK CAPITAL LETTER OMICRON WITH PSILI;Lu;0;L;039F 0313;;;;N;;;;1F40;
+1F49;GREEK CAPITAL LETTER OMICRON WITH DASIA;Lu;0;L;039F 0314;;;;N;;;;1F41;
+1F4A;GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA;Lu;0;L;1F48 0300;;;;N;;;;1F42;
+1F4B;GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA;Lu;0;L;1F49 0300;;;;N;;;;1F43;
+1F4C;GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA;Lu;0;L;1F48 0301;;;;N;;;;1F44;
+1F4D;GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA;Lu;0;L;1F49 0301;;;;N;;;;1F45;
+1F50;GREEK SMALL LETTER UPSILON WITH PSILI;Ll;0;L;03C5 0313;;;;N;;;;;
+1F51;GREEK SMALL LETTER UPSILON WITH DASIA;Ll;0;L;03C5 0314;;;;N;;;1F59;;1F59
+1F52;GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA;Ll;0;L;1F50 0300;;;;N;;;;;
+1F53;GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA;Ll;0;L;1F51 0300;;;;N;;;1F5B;;1F5B
+1F54;GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA;Ll;0;L;1F50 0301;;;;N;;;;;
+1F55;GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA;Ll;0;L;1F51 0301;;;;N;;;1F5D;;1F5D
+1F56;GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI;Ll;0;L;1F50 0342;;;;N;;;;;
+1F57;GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI;Ll;0;L;1F51 0342;;;;N;;;1F5F;;1F5F
+1F59;GREEK CAPITAL LETTER UPSILON WITH DASIA;Lu;0;L;03A5 0314;;;;N;;;;1F51;
+1F5B;GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA;Lu;0;L;1F59 0300;;;;N;;;;1F53;
+1F5D;GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA;Lu;0;L;1F59 0301;;;;N;;;;1F55;
+1F5F;GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI;Lu;0;L;1F59 0342;;;;N;;;;1F57;
+1F60;GREEK SMALL LETTER OMEGA WITH PSILI;Ll;0;L;03C9 0313;;;;N;;;1F68;;1F68
+1F61;GREEK SMALL LETTER OMEGA WITH DASIA;Ll;0;L;03C9 0314;;;;N;;;1F69;;1F69
+1F62;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA;Ll;0;L;1F60 0300;;;;N;;;1F6A;;1F6A
+1F63;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA;Ll;0;L;1F61 0300;;;;N;;;1F6B;;1F6B
+1F64;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA;Ll;0;L;1F60 0301;;;;N;;;1F6C;;1F6C
+1F65;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA;Ll;0;L;1F61 0301;;;;N;;;1F6D;;1F6D
+1F66;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI;Ll;0;L;1F60 0342;;;;N;;;1F6E;;1F6E
+1F67;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI;Ll;0;L;1F61 0342;;;;N;;;1F6F;;1F6F
+1F68;GREEK CAPITAL LETTER OMEGA WITH PSILI;Lu;0;L;03A9 0313;;;;N;;;;1F60;
+1F69;GREEK CAPITAL LETTER OMEGA WITH DASIA;Lu;0;L;03A9 0314;;;;N;;;;1F61;
+1F6A;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA;Lu;0;L;1F68 0300;;;;N;;;;1F62;
+1F6B;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA;Lu;0;L;1F69 0300;;;;N;;;;1F63;
+1F6C;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA;Lu;0;L;1F68 0301;;;;N;;;;1F64;
+1F6D;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA;Lu;0;L;1F69 0301;;;;N;;;;1F65;
+1F6E;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI;Lu;0;L;1F68 0342;;;;N;;;;1F66;
+1F6F;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI;Lu;0;L;1F69 0342;;;;N;;;;1F67;
+1F70;GREEK SMALL LETTER ALPHA WITH VARIA;Ll;0;L;03B1 0300;;;;N;;;1FBA;;1FBA
+1F71;GREEK SMALL LETTER ALPHA WITH OXIA;Ll;0;L;03AC;;;;N;;;1FBB;;1FBB
+1F72;GREEK SMALL LETTER EPSILON WITH VARIA;Ll;0;L;03B5 0300;;;;N;;;1FC8;;1FC8
+1F73;GREEK SMALL LETTER EPSILON WITH OXIA;Ll;0;L;03AD;;;;N;;;1FC9;;1FC9
+1F74;GREEK SMALL LETTER ETA WITH VARIA;Ll;0;L;03B7 0300;;;;N;;;1FCA;;1FCA
+1F75;GREEK SMALL LETTER ETA WITH OXIA;Ll;0;L;03AE;;;;N;;;1FCB;;1FCB
+1F76;GREEK SMALL LETTER IOTA WITH VARIA;Ll;0;L;03B9 0300;;;;N;;;1FDA;;1FDA
+1F77;GREEK SMALL LETTER IOTA WITH OXIA;Ll;0;L;03AF;;;;N;;;1FDB;;1FDB
+1F78;GREEK SMALL LETTER OMICRON WITH VARIA;Ll;0;L;03BF 0300;;;;N;;;1FF8;;1FF8
+1F79;GREEK SMALL LETTER OMICRON WITH OXIA;Ll;0;L;03CC;;;;N;;;1FF9;;1FF9
+1F7A;GREEK SMALL LETTER UPSILON WITH VARIA;Ll;0;L;03C5 0300;;;;N;;;1FEA;;1FEA
+1F7B;GREEK SMALL LETTER UPSILON WITH OXIA;Ll;0;L;03CD;;;;N;;;1FEB;;1FEB
+1F7C;GREEK SMALL LETTER OMEGA WITH VARIA;Ll;0;L;03C9 0300;;;;N;;;1FFA;;1FFA
+1F7D;GREEK SMALL LETTER OMEGA WITH OXIA;Ll;0;L;03CE;;;;N;;;1FFB;;1FFB
+1F80;GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F00 0345;;;;N;;;1F88;;1F88
+1F81;GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F01 0345;;;;N;;;1F89;;1F89
+1F82;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F02 0345;;;;N;;;1F8A;;1F8A
+1F83;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F03 0345;;;;N;;;1F8B;;1F8B
+1F84;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F04 0345;;;;N;;;1F8C;;1F8C
+1F85;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F05 0345;;;;N;;;1F8D;;1F8D
+1F86;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F06 0345;;;;N;;;1F8E;;1F8E
+1F87;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F07 0345;;;;N;;;1F8F;;1F8F
+1F88;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F08 0345;;;;N;;;;1F80;
+1F89;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F09 0345;;;;N;;;;1F81;
+1F8A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0A 0345;;;;N;;;;1F82;
+1F8B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0B 0345;;;;N;;;;1F83;
+1F8C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0C 0345;;;;N;;;;1F84;
+1F8D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0D 0345;;;;N;;;;1F85;
+1F8E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0E 0345;;;;N;;;;1F86;
+1F8F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0F 0345;;;;N;;;;1F87;
+1F90;GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F20 0345;;;;N;;;1F98;;1F98
+1F91;GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F21 0345;;;;N;;;1F99;;1F99
+1F92;GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F22 0345;;;;N;;;1F9A;;1F9A
+1F93;GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F23 0345;;;;N;;;1F9B;;1F9B
+1F94;GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F24 0345;;;;N;;;1F9C;;1F9C
+1F95;GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F25 0345;;;;N;;;1F9D;;1F9D
+1F96;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F26 0345;;;;N;;;1F9E;;1F9E
+1F97;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F27 0345;;;;N;;;1F9F;;1F9F
+1F98;GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F28 0345;;;;N;;;;1F90;
+1F99;GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F29 0345;;;;N;;;;1F91;
+1F9A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2A 0345;;;;N;;;;1F92;
+1F9B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2B 0345;;;;N;;;;1F93;
+1F9C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2C 0345;;;;N;;;;1F94;
+1F9D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2D 0345;;;;N;;;;1F95;
+1F9E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2E 0345;;;;N;;;;1F96;
+1F9F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2F 0345;;;;N;;;;1F97;
+1FA0;GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F60 0345;;;;N;;;1FA8;;1FA8
+1FA1;GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F61 0345;;;;N;;;1FA9;;1FA9
+1FA2;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F62 0345;;;;N;;;1FAA;;1FAA
+1FA3;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F63 0345;;;;N;;;1FAB;;1FAB
+1FA4;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F64 0345;;;;N;;;1FAC;;1FAC
+1FA5;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F65 0345;;;;N;;;1FAD;;1FAD
+1FA6;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F66 0345;;;;N;;;1FAE;;1FAE
+1FA7;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F67 0345;;;;N;;;1FAF;;1FAF
+1FA8;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F68 0345;;;;N;;;;1FA0;
+1FA9;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F69 0345;;;;N;;;;1FA1;
+1FAA;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6A 0345;;;;N;;;;1FA2;
+1FAB;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6B 0345;;;;N;;;;1FA3;
+1FAC;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6C 0345;;;;N;;;;1FA4;
+1FAD;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6D 0345;;;;N;;;;1FA5;
+1FAE;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6E 0345;;;;N;;;;1FA6;
+1FAF;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6F 0345;;;;N;;;;1FA7;
+1FB0;GREEK SMALL LETTER ALPHA WITH VRACHY;Ll;0;L;03B1 0306;;;;N;;;1FB8;;1FB8
+1FB1;GREEK SMALL LETTER ALPHA WITH MACRON;Ll;0;L;03B1 0304;;;;N;;;1FB9;;1FB9
+1FB2;GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F70 0345;;;;N;;;;;
+1FB3;GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI;Ll;0;L;03B1 0345;;;;N;;;1FBC;;1FBC
+1FB4;GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AC 0345;;;;N;;;;;
+1FB6;GREEK SMALL LETTER ALPHA WITH PERISPOMENI;Ll;0;L;03B1 0342;;;;N;;;;;
+1FB7;GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FB6 0345;;;;N;;;;;
+1FB8;GREEK CAPITAL LETTER ALPHA WITH VRACHY;Lu;0;L;0391 0306;;;;N;;;;1FB0;
+1FB9;GREEK CAPITAL LETTER ALPHA WITH MACRON;Lu;0;L;0391 0304;;;;N;;;;1FB1;
+1FBA;GREEK CAPITAL LETTER ALPHA WITH VARIA;Lu;0;L;0391 0300;;;;N;;;;1F70;
+1FBB;GREEK CAPITAL LETTER ALPHA WITH OXIA;Lu;0;L;0386;;;;N;;;;1F71;
+1FBC;GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI;Lt;0;L;0391 0345;;;;N;;;;1FB3;
+1FBD;GREEK KORONIS;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FBE;GREEK PROSGEGRAMMENI;Ll;0;L;03B9;;;;N;;;0399;;0399
+1FBF;GREEK PSILI;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FC0;GREEK PERISPOMENI;Sk;0;ON;<compat> 0020 0342;;;;N;;;;;
+1FC1;GREEK DIALYTIKA AND PERISPOMENI;Sk;0;ON;00A8 0342;;;;N;;;;;
+1FC2;GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F74 0345;;;;N;;;;;
+1FC3;GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI;Ll;0;L;03B7 0345;;;;N;;;1FCC;;1FCC
+1FC4;GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AE 0345;;;;N;;;;;
+1FC6;GREEK SMALL LETTER ETA WITH PERISPOMENI;Ll;0;L;03B7 0342;;;;N;;;;;
+1FC7;GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FC6 0345;;;;N;;;;;
+1FC8;GREEK CAPITAL LETTER EPSILON WITH VARIA;Lu;0;L;0395 0300;;;;N;;;;1F72;
+1FC9;GREEK CAPITAL LETTER EPSILON WITH OXIA;Lu;0;L;0388;;;;N;;;;1F73;
+1FCA;GREEK CAPITAL LETTER ETA WITH VARIA;Lu;0;L;0397 0300;;;;N;;;;1F74;
+1FCB;GREEK CAPITAL LETTER ETA WITH OXIA;Lu;0;L;0389;;;;N;;;;1F75;
+1FCC;GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI;Lt;0;L;0397 0345;;;;N;;;;1FC3;
+1FCD;GREEK PSILI AND VARIA;Sk;0;ON;1FBF 0300;;;;N;;;;;
+1FCE;GREEK PSILI AND OXIA;Sk;0;ON;1FBF 0301;;;;N;;;;;
+1FCF;GREEK PSILI AND PERISPOMENI;Sk;0;ON;1FBF 0342;;;;N;;;;;
+1FD0;GREEK SMALL LETTER IOTA WITH VRACHY;Ll;0;L;03B9 0306;;;;N;;;1FD8;;1FD8
+1FD1;GREEK SMALL LETTER IOTA WITH MACRON;Ll;0;L;03B9 0304;;;;N;;;1FD9;;1FD9
+1FD2;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA;Ll;0;L;03CA 0300;;;;N;;;;;
+1FD3;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA;Ll;0;L;0390;;;;N;;;;;
+1FD6;GREEK SMALL LETTER IOTA WITH PERISPOMENI;Ll;0;L;03B9 0342;;;;N;;;;;
+1FD7;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CA 0342;;;;N;;;;;
+1FD8;GREEK CAPITAL LETTER IOTA WITH VRACHY;Lu;0;L;0399 0306;;;;N;;;;1FD0;
+1FD9;GREEK CAPITAL LETTER IOTA WITH MACRON;Lu;0;L;0399 0304;;;;N;;;;1FD1;
+1FDA;GREEK CAPITAL LETTER IOTA WITH VARIA;Lu;0;L;0399 0300;;;;N;;;;1F76;
+1FDB;GREEK CAPITAL LETTER IOTA WITH OXIA;Lu;0;L;038A;;;;N;;;;1F77;
+1FDD;GREEK DASIA AND VARIA;Sk;0;ON;1FFE 0300;;;;N;;;;;
+1FDE;GREEK DASIA AND OXIA;Sk;0;ON;1FFE 0301;;;;N;;;;;
+1FDF;GREEK DASIA AND PERISPOMENI;Sk;0;ON;1FFE 0342;;;;N;;;;;
+1FE0;GREEK SMALL LETTER UPSILON WITH VRACHY;Ll;0;L;03C5 0306;;;;N;;;1FE8;;1FE8
+1FE1;GREEK SMALL LETTER UPSILON WITH MACRON;Ll;0;L;03C5 0304;;;;N;;;1FE9;;1FE9
+1FE2;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA;Ll;0;L;03CB 0300;;;;N;;;;;
+1FE3;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA;Ll;0;L;03B0;;;;N;;;;;
+1FE4;GREEK SMALL LETTER RHO WITH PSILI;Ll;0;L;03C1 0313;;;;N;;;;;
+1FE5;GREEK SMALL LETTER RHO WITH DASIA;Ll;0;L;03C1 0314;;;;N;;;1FEC;;1FEC
+1FE6;GREEK SMALL LETTER UPSILON WITH PERISPOMENI;Ll;0;L;03C5 0342;;;;N;;;;;
+1FE7;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CB 0342;;;;N;;;;;
+1FE8;GREEK CAPITAL LETTER UPSILON WITH VRACHY;Lu;0;L;03A5 0306;;;;N;;;;1FE0;
+1FE9;GREEK CAPITAL LETTER UPSILON WITH MACRON;Lu;0;L;03A5 0304;;;;N;;;;1FE1;
+1FEA;GREEK CAPITAL LETTER UPSILON WITH VARIA;Lu;0;L;03A5 0300;;;;N;;;;1F7A;
+1FEB;GREEK CAPITAL LETTER UPSILON WITH OXIA;Lu;0;L;038E;;;;N;;;;1F7B;
+1FEC;GREEK CAPITAL LETTER RHO WITH DASIA;Lu;0;L;03A1 0314;;;;N;;;;1FE5;
+1FED;GREEK DIALYTIKA AND VARIA;Sk;0;ON;00A8 0300;;;;N;;;;;
+1FEE;GREEK DIALYTIKA AND OXIA;Sk;0;ON;0385;;;;N;;;;;
+1FEF;GREEK VARIA;Sk;0;ON;0060;;;;N;;;;;
+1FF2;GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F7C 0345;;;;N;;;;;
+1FF3;GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI;Ll;0;L;03C9 0345;;;;N;;;1FFC;;1FFC
+1FF4;GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03CE 0345;;;;N;;;;;
+1FF6;GREEK SMALL LETTER OMEGA WITH PERISPOMENI;Ll;0;L;03C9 0342;;;;N;;;;;
+1FF7;GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FF6 0345;;;;N;;;;;
+1FF8;GREEK CAPITAL LETTER OMICRON WITH VARIA;Lu;0;L;039F 0300;;;;N;;;;1F78;
+1FF9;GREEK CAPITAL LETTER OMICRON WITH OXIA;Lu;0;L;038C;;;;N;;;;1F79;
+1FFA;GREEK CAPITAL LETTER OMEGA WITH VARIA;Lu;0;L;03A9 0300;;;;N;;;;1F7C;
+1FFB;GREEK CAPITAL LETTER OMEGA WITH OXIA;Lu;0;L;038F;;;;N;;;;1F7D;
+1FFC;GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI;Lt;0;L;03A9 0345;;;;N;;;;1FF3;
+1FFD;GREEK OXIA;Sk;0;ON;00B4;;;;N;;;;;
+1FFE;GREEK DASIA;Sk;0;ON;<compat> 0020 0314;;;;N;;;;;
+2000;EN QUAD;Zs;0;WS;2002;;;;N;;;;;
+2001;EM QUAD;Zs;0;WS;2003;;;;N;;;;;
+2002;EN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2003;EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2004;THREE-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2005;FOUR-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2006;SIX-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2007;FIGURE SPACE;Zs;0;WS;<noBreak> 0020;;;;N;;;;;
+2008;PUNCTUATION SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2009;THIN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200A;HAIR SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200B;ZERO WIDTH SPACE;Cf;0;BN;;;;;N;;;;;
+200C;ZERO WIDTH NON-JOINER;Cf;0;BN;;;;;N;;;;;
+200D;ZERO WIDTH JOINER;Cf;0;BN;;;;;N;;;;;
+200E;LEFT-TO-RIGHT MARK;Cf;0;L;;;;;N;;;;;
+200F;RIGHT-TO-LEFT MARK;Cf;0;R;;;;;N;;;;;
+2010;HYPHEN;Pd;0;ON;;;;;N;;;;;
+2011;NON-BREAKING HYPHEN;Pd;0;ON;<noBreak> 2010;;;;N;;;;;
+2012;FIGURE DASH;Pd;0;ON;;;;;N;;;;;
+2013;EN DASH;Pd;0;ON;;;;;N;;;;;
+2014;EM DASH;Pd;0;ON;;;;;N;;;;;
+2015;HORIZONTAL BAR;Pd;0;ON;;;;;N;QUOTATION DASH;;;;
+2016;DOUBLE VERTICAL LINE;Po;0;ON;;;;;N;DOUBLE VERTICAL BAR;;;;
+2017;DOUBLE LOW LINE;Po;0;ON;<compat> 0020 0333;;;;N;SPACING DOUBLE UNDERSCORE;;;;
+2018;LEFT SINGLE QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE TURNED COMMA QUOTATION MARK;;;;
+2019;RIGHT SINGLE QUOTATION MARK;Pf;0;ON;;;;;N;SINGLE COMMA QUOTATION MARK;;;;
+201A;SINGLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW SINGLE COMMA QUOTATION MARK;;;;
+201B;SINGLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE REVERSED COMMA QUOTATION MARK;;;;
+201C;LEFT DOUBLE QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE TURNED COMMA QUOTATION MARK;;;;
+201D;RIGHT DOUBLE QUOTATION MARK;Pf;0;ON;;;;;N;DOUBLE COMMA QUOTATION MARK;;;;
+201E;DOUBLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW DOUBLE COMMA QUOTATION MARK;;;;
+201F;DOUBLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE REVERSED COMMA QUOTATION MARK;;;;
+2020;DAGGER;Po;0;ON;;;;;N;;;;;
+2021;DOUBLE DAGGER;Po;0;ON;;;;;N;;;;;
+2022;BULLET;Po;0;ON;;;;;N;;;;;
+2023;TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;;
+2024;ONE DOT LEADER;Po;0;ON;<compat> 002E;;;;N;;;;;
+2025;TWO DOT LEADER;Po;0;ON;<compat> 002E 002E;;;;N;;;;;
+2026;HORIZONTAL ELLIPSIS;Po;0;ON;<compat> 002E 002E 002E;;;;N;;;;;
+2027;HYPHENATION POINT;Po;0;ON;;;;;N;;;;;
+2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;;
+2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;;
+202A;LEFT-TO-RIGHT EMBEDDING;Cf;0;LRE;;;;;N;;;;;
+202B;RIGHT-TO-LEFT EMBEDDING;Cf;0;RLE;;;;;N;;;;;
+202C;POP DIRECTIONAL FORMATTING;Cf;0;PDF;;;;;N;;;;;
+202D;LEFT-TO-RIGHT OVERRIDE;Cf;0;LRO;;;;;N;;;;;
+202E;RIGHT-TO-LEFT OVERRIDE;Cf;0;RLO;;;;;N;;;;;
+202F;NARROW NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;;;;;
+2030;PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+2031;PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+2032;PRIME;Po;0;ET;;;;;N;;;;;
+2033;DOUBLE PRIME;Po;0;ET;<compat> 2032 2032;;;;N;;;;;
+2034;TRIPLE PRIME;Po;0;ET;<compat> 2032 2032 2032;;;;N;;;;;
+2035;REVERSED PRIME;Po;0;ON;;;;;N;;;;;
+2036;REVERSED DOUBLE PRIME;Po;0;ON;<compat> 2035 2035;;;;N;;;;;
+2037;REVERSED TRIPLE PRIME;Po;0;ON;<compat> 2035 2035 2035;;;;N;;;;;
+2038;CARET;Po;0;ON;;;;;N;;;;;
+2039;SINGLE LEFT-POINTING ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING SINGLE GUILLEMET;;;;
+203A;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING SINGLE GUILLEMET;;;;
+203B;REFERENCE MARK;Po;0;ON;;;;;N;;;;;
+203C;DOUBLE EXCLAMATION MARK;Po;0;ON;<compat> 0021 0021;;;;N;;;;;
+203D;INTERROBANG;Po;0;ON;;;;;N;;;;;
+203E;OVERLINE;Po;0;ON;<compat> 0020 0305;;;;N;SPACING OVERSCORE;;;;
+203F;UNDERTIE;Pc;0;ON;;;;;N;;;;;
+2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;;
+2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;;
+2042;ASTERISM;Po;0;ON;;;;;N;;;;;
+2043;HYPHEN BULLET;Po;0;ON;;;;;N;;;;;
+2044;FRACTION SLASH;Sm;0;CS;;;;;N;;;;;
+2045;LEFT SQUARE BRACKET WITH QUILL;Ps;0;ON;;;;;Y;;;;;
+2046;RIGHT SQUARE BRACKET WITH QUILL;Pe;0;ON;;;;;Y;;;;;
+2047;DOUBLE QUESTION MARK;Po;0;ON;<compat> 003F 003F;;;;N;;;;;
+2048;QUESTION EXCLAMATION MARK;Po;0;ON;<compat> 003F 0021;;;;N;;;;;
+2049;EXCLAMATION QUESTION MARK;Po;0;ON;<compat> 0021 003F;;;;N;;;;;
+204A;TIRONIAN SIGN ET;Po;0;ON;;;;;N;;;;;
+204B;REVERSED PILCROW SIGN;Po;0;ON;;;;;N;;;;;
+204C;BLACK LEFTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204D;BLACK RIGHTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204E;LOW ASTERISK;Po;0;ON;;;;;N;;;;;
+204F;REVERSED SEMICOLON;Po;0;ON;;;;;N;;;;;
+2050;CLOSE UP;Po;0;ON;;;;;N;;;;;
+2051;TWO ASTERISKS ALIGNED VERTICALLY;Po;0;ON;;;;;N;;;;;
+2052;COMMERCIAL MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2053;SWUNG DASH;Po;0;ON;;;;;N;;;;;
+2054;INVERTED UNDERTIE;Pc;0;ON;;;;;N;;;;;
+2055;FLOWER PUNCTUATION MARK;Po;0;ON;;;;;N;;;;;
+2056;THREE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2057;QUADRUPLE PRIME;Po;0;ON;<compat> 2032 2032 2032 2032;;;;N;;;;;
+2058;FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2059;FIVE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205A;TWO DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205B;FOUR DOT MARK;Po;0;ON;;;;;N;;;;;
+205C;DOTTED CROSS;Po;0;ON;;;;;N;;;;;
+205D;TRICOLON;Po;0;ON;;;;;N;;;;;
+205E;VERTICAL FOUR DOTS;Po;0;ON;;;;;N;;;;;
+205F;MEDIUM MATHEMATICAL SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2060;WORD JOINER;Cf;0;BN;;;;;N;;;;;
+2061;FUNCTION APPLICATION;Cf;0;BN;;;;;N;;;;;
+2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;;
+2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;;
+2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;;
+2066;LEFT-TO-RIGHT ISOLATE;Cf;0;LRI;;;;;N;;;;;
+2067;RIGHT-TO-LEFT ISOLATE;Cf;0;RLI;;;;;N;;;;;
+2068;FIRST STRONG ISOLATE;Cf;0;FSI;;;;;N;;;;;
+2069;POP DIRECTIONAL ISOLATE;Cf;0;PDI;;;;;N;;;;;
+206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206D;ACTIVATE ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+2070;SUPERSCRIPT ZERO;No;0;EN;<super> 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;;
+2071;SUPERSCRIPT LATIN SMALL LETTER I;Lm;0;L;<super> 0069;;;;N;;;;;
+2074;SUPERSCRIPT FOUR;No;0;EN;<super> 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;;
+2075;SUPERSCRIPT FIVE;No;0;EN;<super> 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;;
+2076;SUPERSCRIPT SIX;No;0;EN;<super> 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;;
+2077;SUPERSCRIPT SEVEN;No;0;EN;<super> 0037;;7;7;N;SUPERSCRIPT DIGIT SEVEN;;;;
+2078;SUPERSCRIPT EIGHT;No;0;EN;<super> 0038;;8;8;N;SUPERSCRIPT DIGIT EIGHT;;;;
+2079;SUPERSCRIPT NINE;No;0;EN;<super> 0039;;9;9;N;SUPERSCRIPT DIGIT NINE;;;;
+207A;SUPERSCRIPT PLUS SIGN;Sm;0;ES;<super> 002B;;;;N;;;;;
+207B;SUPERSCRIPT MINUS;Sm;0;ES;<super> 2212;;;;N;SUPERSCRIPT HYPHEN-MINUS;;;;
+207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON;<super> 003D;;;;N;;;;;
+207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON;<super> 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;;
+207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<super> 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;;
+207F;SUPERSCRIPT LATIN SMALL LETTER N;Lm;0;L;<super> 006E;;;;N;;;;;
+2080;SUBSCRIPT ZERO;No;0;EN;<sub> 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;;
+2081;SUBSCRIPT ONE;No;0;EN;<sub> 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;;
+2082;SUBSCRIPT TWO;No;0;EN;<sub> 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;;
+2083;SUBSCRIPT THREE;No;0;EN;<sub> 0033;;3;3;N;SUBSCRIPT DIGIT THREE;;;;
+2084;SUBSCRIPT FOUR;No;0;EN;<sub> 0034;;4;4;N;SUBSCRIPT DIGIT FOUR;;;;
+2085;SUBSCRIPT FIVE;No;0;EN;<sub> 0035;;5;5;N;SUBSCRIPT DIGIT FIVE;;;;
+2086;SUBSCRIPT SIX;No;0;EN;<sub> 0036;;6;6;N;SUBSCRIPT DIGIT SIX;;;;
+2087;SUBSCRIPT SEVEN;No;0;EN;<sub> 0037;;7;7;N;SUBSCRIPT DIGIT SEVEN;;;;
+2088;SUBSCRIPT EIGHT;No;0;EN;<sub> 0038;;8;8;N;SUBSCRIPT DIGIT EIGHT;;;;
+2089;SUBSCRIPT NINE;No;0;EN;<sub> 0039;;9;9;N;SUBSCRIPT DIGIT NINE;;;;
+208A;SUBSCRIPT PLUS SIGN;Sm;0;ES;<sub> 002B;;;;N;;;;;
+208B;SUBSCRIPT MINUS;Sm;0;ES;<sub> 2212;;;;N;SUBSCRIPT HYPHEN-MINUS;;;;
+208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON;<sub> 003D;;;;N;;;;;
+208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON;<sub> 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;;
+208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<sub> 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;;
+2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L;<sub> 0061;;;;N;;;;;
+2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L;<sub> 0065;;;;N;;;;;
+2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L;<sub> 006F;;;;N;;;;;
+2093;LATIN SUBSCRIPT SMALL LETTER X;Lm;0;L;<sub> 0078;;;;N;;;;;
+2094;LATIN SUBSCRIPT SMALL LETTER SCHWA;Lm;0;L;<sub> 0259;;;;N;;;;;
+2095;LATIN SUBSCRIPT SMALL LETTER H;Lm;0;L;<sub> 0068;;;;N;;;;;
+2096;LATIN SUBSCRIPT SMALL LETTER K;Lm;0;L;<sub> 006B;;;;N;;;;;
+2097;LATIN SUBSCRIPT SMALL LETTER L;Lm;0;L;<sub> 006C;;;;N;;;;;
+2098;LATIN SUBSCRIPT SMALL LETTER M;Lm;0;L;<sub> 006D;;;;N;;;;;
+2099;LATIN SUBSCRIPT SMALL LETTER N;Lm;0;L;<sub> 006E;;;;N;;;;;
+209A;LATIN SUBSCRIPT SMALL LETTER P;Lm;0;L;<sub> 0070;;;;N;;;;;
+209B;LATIN SUBSCRIPT SMALL LETTER S;Lm;0;L;<sub> 0073;;;;N;;;;;
+209C;LATIN SUBSCRIPT SMALL LETTER T;Lm;0;L;<sub> 0074;;;;N;;;;;
+20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;;
+20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;;
+20A3;FRENCH FRANC SIGN;Sc;0;ET;;;;;N;;;;;
+20A4;LIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A5;MILL SIGN;Sc;0;ET;;;;;N;;;;;
+20A6;NAIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A7;PESETA SIGN;Sc;0;ET;;;;;N;;;;;
+20A8;RUPEE SIGN;Sc;0;ET;<compat> 0052 0073;;;;N;;;;;
+20A9;WON SIGN;Sc;0;ET;;;;;N;;;;;
+20AA;NEW SHEQEL SIGN;Sc;0;ET;;;;;N;;;;;
+20AB;DONG SIGN;Sc;0;ET;;;;;N;;;;;
+20AC;EURO SIGN;Sc;0;ET;;;;;N;;;;;
+20AD;KIP SIGN;Sc;0;ET;;;;;N;;;;;
+20AE;TUGRIK SIGN;Sc;0;ET;;;;;N;;;;;
+20AF;DRACHMA SIGN;Sc;0;ET;;;;;N;;;;;
+20B0;GERMAN PENNY SIGN;Sc;0;ET;;;;;N;;;;;
+20B1;PESO SIGN;Sc;0;ET;;;;;N;;;;;
+20B2;GUARANI SIGN;Sc;0;ET;;;;;N;;;;;
+20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;;
+20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;;
+20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;;
+20B6;LIVRE TOURNOIS SIGN;Sc;0;ET;;;;;N;;;;;
+20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;;
+20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;;
+20B9;INDIAN RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+20BA;TURKISH LIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20BB;NORDIC MARK SIGN;Sc;0;ET;;;;;N;;;;;
+20BC;MANAT SIGN;Sc;0;ET;;;;;N;;;;;
+20BD;RUBLE SIGN;Sc;0;ET;;;;;N;;;;;
+20BE;LARI SIGN;Sc;0;ET;;;;;N;;;;;
+20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
+20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
+20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
+20D3;COMBINING SHORT VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT VERTICAL BAR OVERLAY;;;;
+20D4;COMBINING ANTICLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING ANTICLOCKWISE ARROW ABOVE;;;;
+20D5;COMBINING CLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING CLOCKWISE ARROW ABOVE;;;;
+20D6;COMBINING LEFT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT ARROW ABOVE;;;;
+20D7;COMBINING RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT ARROW ABOVE;;;;
+20D8;COMBINING RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING RING OVERLAY;;;;
+20D9;COMBINING CLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING CLOCKWISE RING OVERLAY;;;;
+20DA;COMBINING ANTICLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING ANTICLOCKWISE RING OVERLAY;;;;
+20DB;COMBINING THREE DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING THREE DOTS ABOVE;;;;
+20DC;COMBINING FOUR DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING FOUR DOTS ABOVE;;;;
+20DD;COMBINING ENCLOSING CIRCLE;Me;0;NSM;;;;;N;ENCLOSING CIRCLE;;;;
+20DE;COMBINING ENCLOSING SQUARE;Me;0;NSM;;;;;N;ENCLOSING SQUARE;;;;
+20DF;COMBINING ENCLOSING DIAMOND;Me;0;NSM;;;;;N;ENCLOSING DIAMOND;;;;
+20E0;COMBINING ENCLOSING CIRCLE BACKSLASH;Me;0;NSM;;;;;N;ENCLOSING CIRCLE SLASH;;;;
+20E1;COMBINING LEFT RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT RIGHT ARROW ABOVE;;;;
+20E2;COMBINING ENCLOSING SCREEN;Me;0;NSM;;;;;N;;;;;
+20E3;COMBINING ENCLOSING KEYCAP;Me;0;NSM;;;;;N;;;;;
+20E4;COMBINING ENCLOSING UPWARD POINTING TRIANGLE;Me;0;NSM;;;;;N;;;;;
+20E5;COMBINING REVERSE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E6;COMBINING DOUBLE VERTICAL STROKE OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E7;COMBINING ANNUITY SYMBOL;Mn;230;NSM;;;;;N;;;;;
+20E8;COMBINING TRIPLE UNDERDOT;Mn;220;NSM;;;;;N;;;;;
+20E9;COMBINING WIDE BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+20EA;COMBINING LEFTWARDS ARROW OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EB;COMBINING LONG DOUBLE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EC;COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20ED;COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20EE;COMBINING LEFT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20EF;COMBINING RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20F0;COMBINING ASTERISK ABOVE;Mn;230;NSM;;;;;N;;;;;
+2100;ACCOUNT OF;So;0;ON;<compat> 0061 002F 0063;;;;N;;;;;
+2101;ADDRESSED TO THE SUBJECT;So;0;ON;<compat> 0061 002F 0073;;;;N;;;;;
+2102;DOUBLE-STRUCK CAPITAL C;Lu;0;L;<font> 0043;;;;N;DOUBLE-STRUCK C;;;;
+2103;DEGREE CELSIUS;So;0;ON;<compat> 00B0 0043;;;;N;DEGREES CENTIGRADE;;;;
+2104;CENTRE LINE SYMBOL;So;0;ON;;;;;N;C L SYMBOL;;;;
+2105;CARE OF;So;0;ON;<compat> 0063 002F 006F;;;;N;;;;;
+2106;CADA UNA;So;0;ON;<compat> 0063 002F 0075;;;;N;;;;;
+2107;EULER CONSTANT;Lu;0;L;<compat> 0190;;;;N;EULERS;;;;
+2108;SCRUPLE;So;0;ON;;;;;N;;;;;
+2109;DEGREE FAHRENHEIT;So;0;ON;<compat> 00B0 0046;;;;N;DEGREES FAHRENHEIT;;;;
+210A;SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+210B;SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;SCRIPT H;;;;
+210C;BLACK-LETTER CAPITAL H;Lu;0;L;<font> 0048;;;;N;BLACK-LETTER H;;;;
+210D;DOUBLE-STRUCK CAPITAL H;Lu;0;L;<font> 0048;;;;N;DOUBLE-STRUCK H;;;;
+210E;PLANCK CONSTANT;Ll;0;L;<font> 0068;;;;N;;;;;
+210F;PLANCK CONSTANT OVER TWO PI;Ll;0;L;<font> 0127;;;;N;PLANCK CONSTANT OVER 2 PI;;;;
+2110;SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;SCRIPT I;;;;
+2111;BLACK-LETTER CAPITAL I;Lu;0;L;<font> 0049;;;;N;BLACK-LETTER I;;;;
+2112;SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;SCRIPT L;;;;
+2113;SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+2114;L B BAR SYMBOL;So;0;ON;;;;;N;;;;;
+2115;DOUBLE-STRUCK CAPITAL N;Lu;0;L;<font> 004E;;;;N;DOUBLE-STRUCK N;;;;
+2116;NUMERO SIGN;So;0;ON;<compat> 004E 006F;;;;N;NUMERO;;;;
+2117;SOUND RECORDING COPYRIGHT;So;0;ON;;;;;N;;;;;
+2118;SCRIPT CAPITAL P;Sm;0;ON;;;;;N;SCRIPT P;;;;
+2119;DOUBLE-STRUCK CAPITAL P;Lu;0;L;<font> 0050;;;;N;DOUBLE-STRUCK P;;;;
+211A;DOUBLE-STRUCK CAPITAL Q;Lu;0;L;<font> 0051;;;;N;DOUBLE-STRUCK Q;;;;
+211B;SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;SCRIPT R;;;;
+211C;BLACK-LETTER CAPITAL R;Lu;0;L;<font> 0052;;;;N;BLACK-LETTER R;;;;
+211D;DOUBLE-STRUCK CAPITAL R;Lu;0;L;<font> 0052;;;;N;DOUBLE-STRUCK R;;;;
+211E;PRESCRIPTION TAKE;So;0;ON;;;;;N;;;;;
+211F;RESPONSE;So;0;ON;;;;;N;;;;;
+2120;SERVICE MARK;So;0;ON;<super> 0053 004D;;;;N;;;;;
+2121;TELEPHONE SIGN;So;0;ON;<compat> 0054 0045 004C;;;;N;T E L SYMBOL;;;;
+2122;TRADE MARK SIGN;So;0;ON;<super> 0054 004D;;;;N;TRADEMARK;;;;
+2123;VERSICLE;So;0;ON;;;;;N;;;;;
+2124;DOUBLE-STRUCK CAPITAL Z;Lu;0;L;<font> 005A;;;;N;DOUBLE-STRUCK Z;;;;
+2125;OUNCE SIGN;So;0;ON;;;;;N;OUNCE;;;;
+2126;OHM SIGN;Lu;0;L;03A9;;;;N;OHM;;;03C9;
+2127;INVERTED OHM SIGN;So;0;ON;;;;;N;MHO;;;;
+2128;BLACK-LETTER CAPITAL Z;Lu;0;L;<font> 005A;;;;N;BLACK-LETTER Z;;;;
+2129;TURNED GREEK SMALL LETTER IOTA;So;0;ON;;;;;N;;;;;
+212A;KELVIN SIGN;Lu;0;L;004B;;;;N;DEGREES KELVIN;;;006B;
+212B;ANGSTROM SIGN;Lu;0;L;00C5;;;;N;ANGSTROM UNIT;;;00E5;
+212C;SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;SCRIPT B;;;;
+212D;BLACK-LETTER CAPITAL C;Lu;0;L;<font> 0043;;;;N;BLACK-LETTER C;;;;
+212E;ESTIMATED SYMBOL;So;0;ET;;;;;N;;;;;
+212F;SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2130;SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;SCRIPT E;;;;
+2131;SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;SCRIPT F;;;;
+2132;TURNED CAPITAL F;Lu;0;L;;;;;N;TURNED F;;;214E;
+2133;SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;SCRIPT M;;;;
+2134;SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+2135;ALEF SYMBOL;Lo;0;L;<compat> 05D0;;;;N;FIRST TRANSFINITE CARDINAL;;;;
+2136;BET SYMBOL;Lo;0;L;<compat> 05D1;;;;N;SECOND TRANSFINITE CARDINAL;;;;
+2137;GIMEL SYMBOL;Lo;0;L;<compat> 05D2;;;;N;THIRD TRANSFINITE CARDINAL;;;;
+2138;DALET SYMBOL;Lo;0;L;<compat> 05D3;;;;N;FOURTH TRANSFINITE CARDINAL;;;;
+2139;INFORMATION SOURCE;Ll;0;L;<font> 0069;;;;N;;;;;
+213A;ROTATED CAPITAL Q;So;0;ON;;;;;N;;;;;
+213B;FACSIMILE SIGN;So;0;ON;<compat> 0046 0041 0058;;;;N;;;;;
+213C;DOUBLE-STRUCK SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+213D;DOUBLE-STRUCK SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+213E;DOUBLE-STRUCK CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+213F;DOUBLE-STRUCK CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+2140;DOUBLE-STRUCK N-ARY SUMMATION;Sm;0;ON;<font> 2211;;;;Y;;;;;
+2141;TURNED SANS-SERIF CAPITAL G;Sm;0;ON;;;;;N;;;;;
+2142;TURNED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2143;REVERSED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2144;TURNED SANS-SERIF CAPITAL Y;Sm;0;ON;;;;;N;;;;;
+2145;DOUBLE-STRUCK ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+2146;DOUBLE-STRUCK ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+2147;DOUBLE-STRUCK ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2148;DOUBLE-STRUCK ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+2149;DOUBLE-STRUCK ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+214A;PROPERTY LINE;So;0;ON;;;;;N;;;;;
+214B;TURNED AMPERSAND;Sm;0;ON;;;;;N;;;;;
+214C;PER SIGN;So;0;ON;;;;;N;;;;;
+214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;;
+214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132
+214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;;
+2150;VULGAR FRACTION ONE SEVENTH;No;0;ON;<fraction> 0031 2044 0037;;;1/7;N;;;;;
+2151;VULGAR FRACTION ONE NINTH;No;0;ON;<fraction> 0031 2044 0039;;;1/9;N;;;;;
+2152;VULGAR FRACTION ONE TENTH;No;0;ON;<fraction> 0031 2044 0031 0030;;;1/10;N;;;;;
+2153;VULGAR FRACTION ONE THIRD;No;0;ON;<fraction> 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;;
+2154;VULGAR FRACTION TWO THIRDS;No;0;ON;<fraction> 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;;
+2155;VULGAR FRACTION ONE FIFTH;No;0;ON;<fraction> 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;;
+2156;VULGAR FRACTION TWO FIFTHS;No;0;ON;<fraction> 0032 2044 0035;;;2/5;N;FRACTION TWO FIFTHS;;;;
+2157;VULGAR FRACTION THREE FIFTHS;No;0;ON;<fraction> 0033 2044 0035;;;3/5;N;FRACTION THREE FIFTHS;;;;
+2158;VULGAR FRACTION FOUR FIFTHS;No;0;ON;<fraction> 0034 2044 0035;;;4/5;N;FRACTION FOUR FIFTHS;;;;
+2159;VULGAR FRACTION ONE SIXTH;No;0;ON;<fraction> 0031 2044 0036;;;1/6;N;FRACTION ONE SIXTH;;;;
+215A;VULGAR FRACTION FIVE SIXTHS;No;0;ON;<fraction> 0035 2044 0036;;;5/6;N;FRACTION FIVE SIXTHS;;;;
+215B;VULGAR FRACTION ONE EIGHTH;No;0;ON;<fraction> 0031 2044 0038;;;1/8;N;FRACTION ONE EIGHTH;;;;
+215C;VULGAR FRACTION THREE EIGHTHS;No;0;ON;<fraction> 0033 2044 0038;;;3/8;N;FRACTION THREE EIGHTHS;;;;
+215D;VULGAR FRACTION FIVE EIGHTHS;No;0;ON;<fraction> 0035 2044 0038;;;5/8;N;FRACTION FIVE EIGHTHS;;;;
+215E;VULGAR FRACTION SEVEN EIGHTHS;No;0;ON;<fraction> 0037 2044 0038;;;7/8;N;FRACTION SEVEN EIGHTHS;;;;
+215F;FRACTION NUMERATOR ONE;No;0;ON;<fraction> 0031 2044;;;1;N;;;;;
+2160;ROMAN NUMERAL ONE;Nl;0;L;<compat> 0049;;;1;N;;;;2170;
+2161;ROMAN NUMERAL TWO;Nl;0;L;<compat> 0049 0049;;;2;N;;;;2171;
+2162;ROMAN NUMERAL THREE;Nl;0;L;<compat> 0049 0049 0049;;;3;N;;;;2172;
+2163;ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0049 0056;;;4;N;;;;2173;
+2164;ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0056;;;5;N;;;;2174;
+2165;ROMAN NUMERAL SIX;Nl;0;L;<compat> 0056 0049;;;6;N;;;;2175;
+2166;ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0056 0049 0049;;;7;N;;;;2176;
+2167;ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0056 0049 0049 0049;;;8;N;;;;2177;
+2168;ROMAN NUMERAL NINE;Nl;0;L;<compat> 0049 0058;;;9;N;;;;2178;
+2169;ROMAN NUMERAL TEN;Nl;0;L;<compat> 0058;;;10;N;;;;2179;
+216A;ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0058 0049;;;11;N;;;;217A;
+216B;ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0058 0049 0049;;;12;N;;;;217B;
+216C;ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 004C;;;50;N;;;;217C;
+216D;ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0043;;;100;N;;;;217D;
+216E;ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0044;;;500;N;;;;217E;
+216F;ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 004D;;;1000;N;;;;217F;
+2170;SMALL ROMAN NUMERAL ONE;Nl;0;L;<compat> 0069;;;1;N;;;2160;;2160
+2171;SMALL ROMAN NUMERAL TWO;Nl;0;L;<compat> 0069 0069;;;2;N;;;2161;;2161
+2172;SMALL ROMAN NUMERAL THREE;Nl;0;L;<compat> 0069 0069 0069;;;3;N;;;2162;;2162
+2173;SMALL ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0069 0076;;;4;N;;;2163;;2163
+2174;SMALL ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0076;;;5;N;;;2164;;2164
+2175;SMALL ROMAN NUMERAL SIX;Nl;0;L;<compat> 0076 0069;;;6;N;;;2165;;2165
+2176;SMALL ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0076 0069 0069;;;7;N;;;2166;;2166
+2177;SMALL ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0076 0069 0069 0069;;;8;N;;;2167;;2167
+2178;SMALL ROMAN NUMERAL NINE;Nl;0;L;<compat> 0069 0078;;;9;N;;;2168;;2168
+2179;SMALL ROMAN NUMERAL TEN;Nl;0;L;<compat> 0078;;;10;N;;;2169;;2169
+217A;SMALL ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0078 0069;;;11;N;;;216A;;216A
+217B;SMALL ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0078 0069 0069;;;12;N;;;216B;;216B
+217C;SMALL ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 006C;;;50;N;;;216C;;216C
+217D;SMALL ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0063;;;100;N;;;216D;;216D
+217E;SMALL ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0064;;;500;N;;;216E;;216E
+217F;SMALL ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 006D;;;1000;N;;;216F;;216F
+2180;ROMAN NUMERAL ONE THOUSAND C D;Nl;0;L;;;;1000;N;;;;;
+2181;ROMAN NUMERAL FIVE THOUSAND;Nl;0;L;;;;5000;N;;;;;
+2182;ROMAN NUMERAL TEN THOUSAND;Nl;0;L;;;;10000;N;;;;;
+2183;ROMAN NUMERAL REVERSED ONE HUNDRED;Lu;0;L;;;;;N;;;;2184;
+2184;LATIN SMALL LETTER REVERSED C;Ll;0;L;;;;;N;;;2183;;2183
+2185;ROMAN NUMERAL SIX LATE FORM;Nl;0;L;;;;6;N;;;;;
+2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;;
+2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;;
+2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;;
+2189;VULGAR FRACTION ZERO THIRDS;No;0;ON;<fraction> 0030 2044 0033;;;0;N;;;;;
+218A;TURNED DIGIT TWO;So;0;ON;;;;;N;;;;;
+218B;TURNED DIGIT THREE;So;0;ON;;;;;N;;;;;
+2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;;
+2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;;
+2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
+2193;DOWNWARDS ARROW;Sm;0;ON;;;;;N;DOWN ARROW;;;;
+2194;LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+2195;UP DOWN ARROW;So;0;ON;;;;;N;;;;;
+2196;NORTH WEST ARROW;So;0;ON;;;;;N;UPPER LEFT ARROW;;;;
+2197;NORTH EAST ARROW;So;0;ON;;;;;N;UPPER RIGHT ARROW;;;;
+2198;SOUTH EAST ARROW;So;0;ON;;;;;N;LOWER RIGHT ARROW;;;;
+2199;SOUTH WEST ARROW;So;0;ON;;;;;N;LOWER LEFT ARROW;;;;
+219A;LEFTWARDS ARROW WITH STROKE;Sm;0;ON;2190 0338;;;;N;LEFT ARROW WITH STROKE;;;;
+219B;RIGHTWARDS ARROW WITH STROKE;Sm;0;ON;2192 0338;;;;N;RIGHT ARROW WITH STROKE;;;;
+219C;LEFTWARDS WAVE ARROW;So;0;ON;;;;;N;LEFT WAVE ARROW;;;;
+219D;RIGHTWARDS WAVE ARROW;So;0;ON;;;;;N;RIGHT WAVE ARROW;;;;
+219E;LEFTWARDS TWO HEADED ARROW;So;0;ON;;;;;N;LEFT TWO HEADED ARROW;;;;
+219F;UPWARDS TWO HEADED ARROW;So;0;ON;;;;;N;UP TWO HEADED ARROW;;;;
+21A0;RIGHTWARDS TWO HEADED ARROW;Sm;0;ON;;;;;N;RIGHT TWO HEADED ARROW;;;;
+21A1;DOWNWARDS TWO HEADED ARROW;So;0;ON;;;;;N;DOWN TWO HEADED ARROW;;;;
+21A2;LEFTWARDS ARROW WITH TAIL;So;0;ON;;;;;N;LEFT ARROW WITH TAIL;;;;
+21A3;RIGHTWARDS ARROW WITH TAIL;Sm;0;ON;;;;;N;RIGHT ARROW WITH TAIL;;;;
+21A4;LEFTWARDS ARROW FROM BAR;So;0;ON;;;;;N;LEFT ARROW FROM BAR;;;;
+21A5;UPWARDS ARROW FROM BAR;So;0;ON;;;;;N;UP ARROW FROM BAR;;;;
+21A6;RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;RIGHT ARROW FROM BAR;;;;
+21A7;DOWNWARDS ARROW FROM BAR;So;0;ON;;;;;N;DOWN ARROW FROM BAR;;;;
+21A8;UP DOWN ARROW WITH BASE;So;0;ON;;;;;N;;;;;
+21A9;LEFTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;LEFT ARROW WITH HOOK;;;;
+21AA;RIGHTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;RIGHT ARROW WITH HOOK;;;;
+21AB;LEFTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;LEFT ARROW WITH LOOP;;;;
+21AC;RIGHTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;RIGHT ARROW WITH LOOP;;;;
+21AD;LEFT RIGHT WAVE ARROW;So;0;ON;;;;;N;;;;;
+21AE;LEFT RIGHT ARROW WITH STROKE;Sm;0;ON;2194 0338;;;;N;;;;;
+21AF;DOWNWARDS ZIGZAG ARROW;So;0;ON;;;;;N;DOWN ZIGZAG ARROW;;;;
+21B0;UPWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP LEFT;;;;
+21B1;UPWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP RIGHT;;;;
+21B2;DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP LEFT;;;;
+21B3;DOWNWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP RIGHT;;;;
+21B4;RIGHTWARDS ARROW WITH CORNER DOWNWARDS;So;0;ON;;;;;N;RIGHT ARROW WITH CORNER DOWN;;;;
+21B5;DOWNWARDS ARROW WITH CORNER LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH CORNER LEFT;;;;
+21B6;ANTICLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B7;CLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B8;NORTH WEST ARROW TO LONG BAR;So;0;ON;;;;;N;UPPER LEFT ARROW TO LONG BAR;;;;
+21B9;LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR;;;;
+21BA;ANTICLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BB;CLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BC;LEFTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB UP;;;;
+21BD;LEFTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB DOWN;;;;
+21BE;UPWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB RIGHT;;;;
+21BF;UPWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB LEFT;;;;
+21C0;RIGHTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB UP;;;;
+21C1;RIGHTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB DOWN;;;;
+21C2;DOWNWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB RIGHT;;;;
+21C3;DOWNWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB LEFT;;;;
+21C4;RIGHTWARDS ARROW OVER LEFTWARDS ARROW;So;0;ON;;;;;N;RIGHT ARROW OVER LEFT ARROW;;;;
+21C5;UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW;So;0;ON;;;;;N;UP ARROW LEFT OF DOWN ARROW;;;;
+21C6;LEFTWARDS ARROW OVER RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT ARROW OVER RIGHT ARROW;;;;
+21C7;LEFTWARDS PAIRED ARROWS;So;0;ON;;;;;N;LEFT PAIRED ARROWS;;;;
+21C8;UPWARDS PAIRED ARROWS;So;0;ON;;;;;N;UP PAIRED ARROWS;;;;
+21C9;RIGHTWARDS PAIRED ARROWS;So;0;ON;;;;;N;RIGHT PAIRED ARROWS;;;;
+21CA;DOWNWARDS PAIRED ARROWS;So;0;ON;;;;;N;DOWN PAIRED ARROWS;;;;
+21CB;LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON;So;0;ON;;;;;N;LEFT HARPOON OVER RIGHT HARPOON;;;;
+21CC;RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON;So;0;ON;;;;;N;RIGHT HARPOON OVER LEFT HARPOON;;;;
+21CD;LEFTWARDS DOUBLE ARROW WITH STROKE;So;0;ON;21D0 0338;;;;N;LEFT DOUBLE ARROW WITH STROKE;;;;
+21CE;LEFT RIGHT DOUBLE ARROW WITH STROKE;Sm;0;ON;21D4 0338;;;;N;;;;;
+21CF;RIGHTWARDS DOUBLE ARROW WITH STROKE;Sm;0;ON;21D2 0338;;;;N;RIGHT DOUBLE ARROW WITH STROKE;;;;
+21D0;LEFTWARDS DOUBLE ARROW;So;0;ON;;;;;N;LEFT DOUBLE ARROW;;;;
+21D1;UPWARDS DOUBLE ARROW;So;0;ON;;;;;N;UP DOUBLE ARROW;;;;
+21D2;RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;RIGHT DOUBLE ARROW;;;;
+21D3;DOWNWARDS DOUBLE ARROW;So;0;ON;;;;;N;DOWN DOUBLE ARROW;;;;
+21D4;LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+21D5;UP DOWN DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21D6;NORTH WEST DOUBLE ARROW;So;0;ON;;;;;N;UPPER LEFT DOUBLE ARROW;;;;
+21D7;NORTH EAST DOUBLE ARROW;So;0;ON;;;;;N;UPPER RIGHT DOUBLE ARROW;;;;
+21D8;SOUTH EAST DOUBLE ARROW;So;0;ON;;;;;N;LOWER RIGHT DOUBLE ARROW;;;;
+21D9;SOUTH WEST DOUBLE ARROW;So;0;ON;;;;;N;LOWER LEFT DOUBLE ARROW;;;;
+21DA;LEFTWARDS TRIPLE ARROW;So;0;ON;;;;;N;LEFT TRIPLE ARROW;;;;
+21DB;RIGHTWARDS TRIPLE ARROW;So;0;ON;;;;;N;RIGHT TRIPLE ARROW;;;;
+21DC;LEFTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;LEFT SQUIGGLE ARROW;;;;
+21DD;RIGHTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;RIGHT SQUIGGLE ARROW;;;;
+21DE;UPWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;UP ARROW WITH DOUBLE STROKE;;;;
+21DF;DOWNWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;DOWN ARROW WITH DOUBLE STROKE;;;;
+21E0;LEFTWARDS DASHED ARROW;So;0;ON;;;;;N;LEFT DASHED ARROW;;;;
+21E1;UPWARDS DASHED ARROW;So;0;ON;;;;;N;UP DASHED ARROW;;;;
+21E2;RIGHTWARDS DASHED ARROW;So;0;ON;;;;;N;RIGHT DASHED ARROW;;;;
+21E3;DOWNWARDS DASHED ARROW;So;0;ON;;;;;N;DOWN DASHED ARROW;;;;
+21E4;LEFTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR;;;;
+21E5;RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;RIGHT ARROW TO BAR;;;;
+21E6;LEFTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE LEFT ARROW;;;;
+21E7;UPWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE UP ARROW;;;;
+21E8;RIGHTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE RIGHT ARROW;;;;
+21E9;DOWNWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE DOWN ARROW;;;;
+21EA;UPWARDS WHITE ARROW FROM BAR;So;0;ON;;;;;N;WHITE UP ARROW FROM BAR;;;;
+21EB;UPWARDS WHITE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21EC;UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
+21ED;UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+21EE;UPWARDS WHITE DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21EF;UPWARDS WHITE DOUBLE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21F0;RIGHTWARDS WHITE ARROW FROM WALL;So;0;ON;;;;;N;;;;;
+21F1;NORTH WEST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F2;SOUTH EAST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F3;UP DOWN WHITE ARROW;So;0;ON;;;;;N;;;;;
+21F4;RIGHT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+21F5;DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+21F6;THREE RIGHTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+21F7;LEFTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F8;RIGHTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F9;LEFT RIGHT ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FA;LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FB;RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FC;LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FD;LEFTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FE;RIGHTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FF;LEFT RIGHT OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+2200;FOR ALL;Sm;0;ON;;;;;N;;;;;
+2201;COMPLEMENT;Sm;0;ON;;;;;Y;;;;;
+2202;PARTIAL DIFFERENTIAL;Sm;0;ON;;;;;Y;;;;;
+2203;THERE EXISTS;Sm;0;ON;;;;;Y;;;;;
+2204;THERE DOES NOT EXIST;Sm;0;ON;2203 0338;;;;Y;;;;;
+2205;EMPTY SET;Sm;0;ON;;;;;N;;;;;
+2206;INCREMENT;Sm;0;ON;;;;;N;;;;;
+2207;NABLA;Sm;0;ON;;;;;N;;;;;
+2208;ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+2209;NOT AN ELEMENT OF;Sm;0;ON;2208 0338;;;;Y;;;;;
+220A;SMALL ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+220B;CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220C;DOES NOT CONTAIN AS MEMBER;Sm;0;ON;220B 0338;;;;Y;;;;;
+220D;SMALL CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220E;END OF PROOF;Sm;0;ON;;;;;N;;;;;
+220F;N-ARY PRODUCT;Sm;0;ON;;;;;N;;;;;
+2210;N-ARY COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2211;N-ARY SUMMATION;Sm;0;ON;;;;;Y;;;;;
+2212;MINUS SIGN;Sm;0;ES;;;;;N;;;;;
+2213;MINUS-OR-PLUS SIGN;Sm;0;ET;;;;;N;;;;;
+2214;DOT PLUS;Sm;0;ON;;;;;N;;;;;
+2215;DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2216;SET MINUS;Sm;0;ON;;;;;Y;;;;;
+2217;ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+2218;RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+2219;BULLET OPERATOR;Sm;0;ON;;;;;N;;;;;
+221A;SQUARE ROOT;Sm;0;ON;;;;;Y;;;;;
+221B;CUBE ROOT;Sm;0;ON;;;;;Y;;;;;
+221C;FOURTH ROOT;Sm;0;ON;;;;;Y;;;;;
+221D;PROPORTIONAL TO;Sm;0;ON;;;;;Y;;;;;
+221E;INFINITY;Sm;0;ON;;;;;N;;;;;
+221F;RIGHT ANGLE;Sm;0;ON;;;;;Y;;;;;
+2220;ANGLE;Sm;0;ON;;;;;Y;;;;;
+2221;MEASURED ANGLE;Sm;0;ON;;;;;Y;;;;;
+2222;SPHERICAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+2223;DIVIDES;Sm;0;ON;;;;;N;;;;;
+2224;DOES NOT DIVIDE;Sm;0;ON;2223 0338;;;;Y;;;;;
+2225;PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+2226;NOT PARALLEL TO;Sm;0;ON;2225 0338;;;;Y;;;;;
+2227;LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2228;LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2229;INTERSECTION;Sm;0;ON;;;;;N;;;;;
+222A;UNION;Sm;0;ON;;;;;N;;;;;
+222B;INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222C;DOUBLE INTEGRAL;Sm;0;ON;<compat> 222B 222B;;;;Y;;;;;
+222D;TRIPLE INTEGRAL;Sm;0;ON;<compat> 222B 222B 222B;;;;Y;;;;;
+222E;CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222F;SURFACE INTEGRAL;Sm;0;ON;<compat> 222E 222E;;;;Y;;;;;
+2230;VOLUME INTEGRAL;Sm;0;ON;<compat> 222E 222E 222E;;;;Y;;;;;
+2231;CLOCKWISE INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2232;CLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2233;ANTICLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2234;THEREFORE;Sm;0;ON;;;;;N;;;;;
+2235;BECAUSE;Sm;0;ON;;;;;N;;;;;
+2236;RATIO;Sm;0;ON;;;;;N;;;;;
+2237;PROPORTION;Sm;0;ON;;;;;N;;;;;
+2238;DOT MINUS;Sm;0;ON;;;;;N;;;;;
+2239;EXCESS;Sm;0;ON;;;;;Y;;;;;
+223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;;
+223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;;
+223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;;;;
+223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;;
+223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;;
+2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2241;NOT TILDE;Sm;0;ON;223C 0338;;;;Y;;;;;
+2242;MINUS TILDE;Sm;0;ON;;;;;Y;;;;;
+2243;ASYMPTOTICALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2244;NOT ASYMPTOTICALLY EQUAL TO;Sm;0;ON;2243 0338;;;;Y;;;;;
+2245;APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2246;APPROXIMATELY BUT NOT ACTUALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2247;NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO;Sm;0;ON;2245 0338;;;;Y;;;;;
+2248;ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2249;NOT ALMOST EQUAL TO;Sm;0;ON;2248 0338;;;;Y;;;;;
+224A;ALMOST EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224B;TRIPLE TILDE;Sm;0;ON;;;;;Y;;;;;
+224C;ALL EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224D;EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224E;GEOMETRICALLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224F;DIFFERENCE BETWEEN;Sm;0;ON;;;;;N;;;;;
+2250;APPROACHES THE LIMIT;Sm;0;ON;;;;;N;;;;;
+2251;GEOMETRICALLY EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2252;APPROXIMATELY EQUAL TO OR THE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2253;IMAGE OF OR APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2254;COLON EQUALS;Sm;0;ON;;;;;Y;COLON EQUAL;;;;
+2255;EQUALS COLON;Sm;0;ON;;;;;Y;EQUAL COLON;;;;
+2256;RING IN EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2257;RING EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2258;CORRESPONDS TO;Sm;0;ON;;;;;N;;;;;
+2259;ESTIMATES;Sm;0;ON;;;;;N;;;;;
+225A;EQUIANGULAR TO;Sm;0;ON;;;;;N;;;;;
+225B;STAR EQUALS;Sm;0;ON;;;;;N;;;;;
+225C;DELTA EQUAL TO;Sm;0;ON;;;;;N;;;;;
+225D;EQUAL TO BY DEFINITION;Sm;0;ON;;;;;N;;;;;
+225E;MEASURED BY;Sm;0;ON;;;;;N;;;;;
+225F;QUESTIONED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2260;NOT EQUAL TO;Sm;0;ON;003D 0338;;;;Y;;;;;
+2261;IDENTICAL TO;Sm;0;ON;;;;;N;;;;;
+2262;NOT IDENTICAL TO;Sm;0;ON;2261 0338;;;;Y;;;;;
+2263;STRICTLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+2264;LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUAL TO;;;;
+2265;GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUAL TO;;;;
+2266;LESS-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OVER EQUAL TO;;;;
+2267;GREATER-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OVER EQUAL TO;;;;
+2268;LESS-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUAL TO;;;;
+2269;GREATER-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUAL TO;;;;
+226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;;
+226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;;
+226C;BETWEEN;Sm;0;ON;;;;;N;;;;;
+226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;;
+226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;;
+226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;;
+2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;;
+2271;NEITHER GREATER-THAN NOR EQUAL TO;Sm;0;ON;2265 0338;;;;Y;NEITHER GREATER THAN NOR EQUAL TO;;;;
+2272;LESS-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUIVALENT TO;;;;
+2273;GREATER-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUIVALENT TO;;;;
+2274;NEITHER LESS-THAN NOR EQUIVALENT TO;Sm;0;ON;2272 0338;;;;Y;NEITHER LESS THAN NOR EQUIVALENT TO;;;;
+2275;NEITHER GREATER-THAN NOR EQUIVALENT TO;Sm;0;ON;2273 0338;;;;Y;NEITHER GREATER THAN NOR EQUIVALENT TO;;;;
+2276;LESS-THAN OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN OR GREATER THAN;;;;
+2277;GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN OR LESS THAN;;;;
+2278;NEITHER LESS-THAN NOR GREATER-THAN;Sm;0;ON;2276 0338;;;;Y;NEITHER LESS THAN NOR GREATER THAN;;;;
+2279;NEITHER GREATER-THAN NOR LESS-THAN;Sm;0;ON;2277 0338;;;;Y;NEITHER GREATER THAN NOR LESS THAN;;;;
+227A;PRECEDES;Sm;0;ON;;;;;Y;;;;;
+227B;SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+227C;PRECEDES OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227D;SUCCEEDS OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227E;PRECEDES OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+227F;SUCCEEDS OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+2280;DOES NOT PRECEDE;Sm;0;ON;227A 0338;;;;Y;;;;;
+2281;DOES NOT SUCCEED;Sm;0;ON;227B 0338;;;;Y;;;;;
+2282;SUBSET OF;Sm;0;ON;;;;;Y;;;;;
+2283;SUPERSET OF;Sm;0;ON;;;;;Y;;;;;
+2284;NOT A SUBSET OF;Sm;0;ON;2282 0338;;;;Y;;;;;
+2285;NOT A SUPERSET OF;Sm;0;ON;2283 0338;;;;Y;;;;;
+2286;SUBSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2287;SUPERSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2288;NEITHER A SUBSET OF NOR EQUAL TO;Sm;0;ON;2286 0338;;;;Y;;;;;
+2289;NEITHER A SUPERSET OF NOR EQUAL TO;Sm;0;ON;2287 0338;;;;Y;;;;;
+228A;SUBSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUBSET OF OR NOT EQUAL TO;;;;
+228B;SUPERSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUPERSET OF OR NOT EQUAL TO;;;;
+228C;MULTISET;Sm;0;ON;;;;;Y;;;;;
+228D;MULTISET MULTIPLICATION;Sm;0;ON;;;;;N;;;;;
+228E;MULTISET UNION;Sm;0;ON;;;;;N;;;;;
+228F;SQUARE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2290;SQUARE ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+2291;SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2292;SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2293;SQUARE CAP;Sm;0;ON;;;;;N;;;;;
+2294;SQUARE CUP;Sm;0;ON;;;;;N;;;;;
+2295;CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2296;CIRCLED MINUS;Sm;0;ON;;;;;N;;;;;
+2297;CIRCLED TIMES;Sm;0;ON;;;;;N;;;;;
+2298;CIRCLED DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2299;CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+229A;CIRCLED RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+229B;CIRCLED ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+229C;CIRCLED EQUALS;Sm;0;ON;;;;;N;;;;;
+229D;CIRCLED DASH;Sm;0;ON;;;;;N;;;;;
+229E;SQUARED PLUS;Sm;0;ON;;;;;N;;;;;
+229F;SQUARED MINUS;Sm;0;ON;;;;;N;;;;;
+22A0;SQUARED TIMES;Sm;0;ON;;;;;N;;;;;
+22A1;SQUARED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22A2;RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+22A3;LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+22A4;DOWN TACK;Sm;0;ON;;;;;N;;;;;
+22A5;UP TACK;Sm;0;ON;;;;;N;;;;;
+22A6;ASSERTION;Sm;0;ON;;;;;Y;;;;;
+22A7;MODELS;Sm;0;ON;;;;;Y;;;;;
+22A8;TRUE;Sm;0;ON;;;;;Y;;;;;
+22A9;FORCES;Sm;0;ON;;;;;Y;;;;;
+22AA;TRIPLE VERTICAL BAR RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AB;DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AC;DOES NOT PROVE;Sm;0;ON;22A2 0338;;;;Y;;;;;
+22AD;NOT TRUE;Sm;0;ON;22A8 0338;;;;Y;;;;;
+22AE;DOES NOT FORCE;Sm;0;ON;22A9 0338;;;;Y;;;;;
+22AF;NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;22AB 0338;;;;Y;;;;;
+22B0;PRECEDES UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B1;SUCCEEDS UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B2;NORMAL SUBGROUP OF;Sm;0;ON;;;;;Y;;;;;
+22B3;CONTAINS AS NORMAL SUBGROUP;Sm;0;ON;;;;;Y;;;;;
+22B4;NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B5;CONTAINS AS NORMAL SUBGROUP OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B6;ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+22B7;IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+22B8;MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+22B9;HERMITIAN CONJUGATE MATRIX;Sm;0;ON;;;;;N;;;;;
+22BA;INTERCALATE;Sm;0;ON;;;;;N;;;;;
+22BB;XOR;Sm;0;ON;;;;;N;;;;;
+22BC;NAND;Sm;0;ON;;;;;N;;;;;
+22BD;NOR;Sm;0;ON;;;;;N;;;;;
+22BE;RIGHT ANGLE WITH ARC;Sm;0;ON;;;;;Y;;;;;
+22BF;RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+22C0;N-ARY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22C1;N-ARY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22C2;N-ARY INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22C3;N-ARY UNION;Sm;0;ON;;;;;N;;;;;
+22C4;DIAMOND OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C5;DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C6;STAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C7;DIVISION TIMES;Sm;0;ON;;;;;N;;;;;
+22C8;BOWTIE;Sm;0;ON;;;;;N;;;;;
+22C9;LEFT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CA;RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CB;LEFT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CC;RIGHT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CD;REVERSED TILDE EQUALS;Sm;0;ON;;;;;Y;;;;;
+22CE;CURLY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22CF;CURLY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22D0;DOUBLE SUBSET;Sm;0;ON;;;;;Y;;;;;
+22D1;DOUBLE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+22D2;DOUBLE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22D3;DOUBLE UNION;Sm;0;ON;;;;;N;;;;;
+22D4;PITCHFORK;Sm;0;ON;;;;;N;;;;;
+22D5;EQUAL AND PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+22D6;LESS-THAN WITH DOT;Sm;0;ON;;;;;Y;LESS THAN WITH DOT;;;;
+22D7;GREATER-THAN WITH DOT;Sm;0;ON;;;;;Y;GREATER THAN WITH DOT;;;;
+22D8;VERY MUCH LESS-THAN;Sm;0;ON;;;;;Y;VERY MUCH LESS THAN;;;;
+22D9;VERY MUCH GREATER-THAN;Sm;0;ON;;;;;Y;VERY MUCH GREATER THAN;;;;
+22DA;LESS-THAN EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN EQUAL TO OR GREATER THAN;;;;
+22DB;GREATER-THAN EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN EQUAL TO OR LESS THAN;;;;
+22DC;EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR LESS THAN;;;;
+22DD;EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR GREATER THAN;;;;
+22DE;EQUAL TO OR PRECEDES;Sm;0;ON;;;;;Y;;;;;
+22DF;EQUAL TO OR SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+22E0;DOES NOT PRECEDE OR EQUAL;Sm;0;ON;227C 0338;;;;Y;;;;;
+22E1;DOES NOT SUCCEED OR EQUAL;Sm;0;ON;227D 0338;;;;Y;;;;;
+22E2;NOT SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;2291 0338;;;;Y;;;;;
+22E3;NOT SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;2292 0338;;;;Y;;;;;
+22E4;SQUARE IMAGE OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E5;SQUARE ORIGINAL OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E6;LESS-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUIVALENT TO;;;;
+22E7;GREATER-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUIVALENT TO;;;;
+22E8;PRECEDES BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22E9;SUCCEEDS BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22EA;NOT NORMAL SUBGROUP OF;Sm;0;ON;22B2 0338;;;;Y;;;;;
+22EB;DOES NOT CONTAIN AS NORMAL SUBGROUP;Sm;0;ON;22B3 0338;;;;Y;;;;;
+22EC;NOT NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;22B4 0338;;;;Y;;;;;
+22ED;DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL;Sm;0;ON;22B5 0338;;;;Y;;;;;
+22EE;VERTICAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22EF;MIDLINE HORIZONTAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22F0;UP RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F1;DOWN RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F2;ELEMENT OF WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F3;ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F4;SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F5;ELEMENT OF WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+22F6;ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F7;SMALL ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F8;ELEMENT OF WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+22F9;ELEMENT OF WITH TWO HORIZONTAL STROKES;Sm;0;ON;;;;;Y;;;;;
+22FA;CONTAINS WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FB;CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FC;SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FD;CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FE;SMALL CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FF;Z NOTATION BAG MEMBERSHIP;Sm;0;ON;;;;;Y;;;;;
+2300;DIAMETER SIGN;So;0;ON;;;;;N;;;;;
+2301;ELECTRIC ARROW;So;0;ON;;;;;N;;;;;
+2302;HOUSE;So;0;ON;;;;;N;;;;;
+2303;UP ARROWHEAD;So;0;ON;;;;;N;;;;;
+2304;DOWN ARROWHEAD;So;0;ON;;;;;N;;;;;
+2305;PROJECTIVE;So;0;ON;;;;;N;;;;;
+2306;PERSPECTIVE;So;0;ON;;;;;N;;;;;
+2307;WAVY LINE;So;0;ON;;;;;N;;;;;
+2308;LEFT CEILING;Ps;0;ON;;;;;Y;;;;;
+2309;RIGHT CEILING;Pe;0;ON;;;;;Y;;;;;
+230A;LEFT FLOOR;Ps;0;ON;;;;;Y;;;;;
+230B;RIGHT FLOOR;Pe;0;ON;;;;;Y;;;;;
+230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;;
+230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;;
+230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;;
+230F;TOP LEFT CROP;So;0;ON;;;;;N;;;;;
+2310;REVERSED NOT SIGN;So;0;ON;;;;;N;;;;;
+2311;SQUARE LOZENGE;So;0;ON;;;;;N;;;;;
+2312;ARC;So;0;ON;;;;;N;;;;;
+2313;SEGMENT;So;0;ON;;;;;N;;;;;
+2314;SECTOR;So;0;ON;;;;;N;;;;;
+2315;TELEPHONE RECORDER;So;0;ON;;;;;N;;;;;
+2316;POSITION INDICATOR;So;0;ON;;;;;N;;;;;
+2317;VIEWDATA SQUARE;So;0;ON;;;;;N;;;;;
+2318;PLACE OF INTEREST SIGN;So;0;ON;;;;;N;COMMAND KEY;;;;
+2319;TURNED NOT SIGN;So;0;ON;;;;;N;;;;;
+231A;WATCH;So;0;ON;;;;;N;;;;;
+231B;HOURGLASS;So;0;ON;;;;;N;;;;;
+231C;TOP LEFT CORNER;So;0;ON;;;;;N;;;;;
+231D;TOP RIGHT CORNER;So;0;ON;;;;;N;;;;;
+231E;BOTTOM LEFT CORNER;So;0;ON;;;;;N;;;;;
+231F;BOTTOM RIGHT CORNER;So;0;ON;;;;;N;;;;;
+2320;TOP HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2321;BOTTOM HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2322;FROWN;So;0;ON;;;;;N;;;;;
+2323;SMILE;So;0;ON;;;;;N;;;;;
+2324;UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS;So;0;ON;;;;;N;ENTER KEY;;;;
+2325;OPTION KEY;So;0;ON;;;;;N;;;;;
+2326;ERASE TO THE RIGHT;So;0;ON;;;;;N;DELETE TO THE RIGHT KEY;;;;
+2327;X IN A RECTANGLE BOX;So;0;ON;;;;;N;CLEAR KEY;;;;
+2328;KEYBOARD;So;0;ON;;;;;N;;;;;
+2329;LEFT-POINTING ANGLE BRACKET;Ps;0;ON;3008;;;;Y;BRA;;;;
+232A;RIGHT-POINTING ANGLE BRACKET;Pe;0;ON;3009;;;;Y;KET;;;;
+232B;ERASE TO THE LEFT;So;0;ON;;;;;N;DELETE TO THE LEFT KEY;;;;
+232C;BENZENE RING;So;0;ON;;;;;N;;;;;
+232D;CYLINDRICITY;So;0;ON;;;;;N;;;;;
+232E;ALL AROUND-PROFILE;So;0;ON;;;;;N;;;;;
+232F;SYMMETRY;So;0;ON;;;;;N;;;;;
+2330;TOTAL RUNOUT;So;0;ON;;;;;N;;;;;
+2331;DIMENSION ORIGIN;So;0;ON;;;;;N;;;;;
+2332;CONICAL TAPER;So;0;ON;;;;;N;;;;;
+2333;SLOPE;So;0;ON;;;;;N;;;;;
+2334;COUNTERBORE;So;0;ON;;;;;N;;;;;
+2335;COUNTERSINK;So;0;ON;;;;;N;;;;;
+2336;APL FUNCTIONAL SYMBOL I-BEAM;So;0;L;;;;;N;;;;;
+2337;APL FUNCTIONAL SYMBOL SQUISH QUAD;So;0;L;;;;;N;;;;;
+2338;APL FUNCTIONAL SYMBOL QUAD EQUAL;So;0;L;;;;;N;;;;;
+2339;APL FUNCTIONAL SYMBOL QUAD DIVIDE;So;0;L;;;;;N;;;;;
+233A;APL FUNCTIONAL SYMBOL QUAD DIAMOND;So;0;L;;;;;N;;;;;
+233B;APL FUNCTIONAL SYMBOL QUAD JOT;So;0;L;;;;;N;;;;;
+233C;APL FUNCTIONAL SYMBOL QUAD CIRCLE;So;0;L;;;;;N;;;;;
+233D;APL FUNCTIONAL SYMBOL CIRCLE STILE;So;0;L;;;;;N;;;;;
+233E;APL FUNCTIONAL SYMBOL CIRCLE JOT;So;0;L;;;;;N;;;;;
+233F;APL FUNCTIONAL SYMBOL SLASH BAR;So;0;L;;;;;N;;;;;
+2340;APL FUNCTIONAL SYMBOL BACKSLASH BAR;So;0;L;;;;;N;;;;;
+2341;APL FUNCTIONAL SYMBOL QUAD SLASH;So;0;L;;;;;N;;;;;
+2342;APL FUNCTIONAL SYMBOL QUAD BACKSLASH;So;0;L;;;;;N;;;;;
+2343;APL FUNCTIONAL SYMBOL QUAD LESS-THAN;So;0;L;;;;;N;;;;;
+2344;APL FUNCTIONAL SYMBOL QUAD GREATER-THAN;So;0;L;;;;;N;;;;;
+2345;APL FUNCTIONAL SYMBOL LEFTWARDS VANE;So;0;L;;;;;N;;;;;
+2346;APL FUNCTIONAL SYMBOL RIGHTWARDS VANE;So;0;L;;;;;N;;;;;
+2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;;
+2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;;
+2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;;
+234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;;;;
+234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;;
+234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;;
+234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;;
+234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;;;;
+234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;;
+2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;;
+2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;;;;
+2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;;
+2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;;
+2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;;
+2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;;;;
+2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;;
+2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;;
+2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;;
+2359;APL FUNCTIONAL SYMBOL DELTA UNDERBAR;So;0;L;;;;;N;;;;;
+235A;APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR;So;0;L;;;;;N;;;;;
+235B;APL FUNCTIONAL SYMBOL JOT UNDERBAR;So;0;L;;;;;N;;;;;
+235C;APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR;So;0;L;;;;;N;;;;;
+235D;APL FUNCTIONAL SYMBOL UP SHOE JOT;So;0;L;;;;;N;;;;;
+235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;;
+235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;;
+2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;;
+2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;;;;
+2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;;
+2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;;
+2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;;
+2365;APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS;So;0;L;;;;;N;;;;;
+2366;APL FUNCTIONAL SYMBOL DOWN SHOE STILE;So;0;L;;;;;N;;;;;
+2367;APL FUNCTIONAL SYMBOL LEFT SHOE STILE;So;0;L;;;;;N;;;;;
+2368;APL FUNCTIONAL SYMBOL TILDE DIAERESIS;So;0;L;;;;;N;;;;;
+2369;APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS;So;0;L;;;;;N;;;;;
+236A;APL FUNCTIONAL SYMBOL COMMA BAR;So;0;L;;;;;N;;;;;
+236B;APL FUNCTIONAL SYMBOL DEL TILDE;So;0;L;;;;;N;;;;;
+236C;APL FUNCTIONAL SYMBOL ZILDE;So;0;L;;;;;N;;;;;
+236D;APL FUNCTIONAL SYMBOL STILE TILDE;So;0;L;;;;;N;;;;;
+236E;APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR;So;0;L;;;;;N;;;;;
+236F;APL FUNCTIONAL SYMBOL QUAD NOT EQUAL;So;0;L;;;;;N;;;;;
+2370;APL FUNCTIONAL SYMBOL QUAD QUESTION;So;0;L;;;;;N;;;;;
+2371;APL FUNCTIONAL SYMBOL DOWN CARET TILDE;So;0;L;;;;;N;;;;;
+2372;APL FUNCTIONAL SYMBOL UP CARET TILDE;So;0;L;;;;;N;;;;;
+2373;APL FUNCTIONAL SYMBOL IOTA;So;0;L;;;;;N;;;;;
+2374;APL FUNCTIONAL SYMBOL RHO;So;0;L;;;;;N;;;;;
+2375;APL FUNCTIONAL SYMBOL OMEGA;So;0;L;;;;;N;;;;;
+2376;APL FUNCTIONAL SYMBOL ALPHA UNDERBAR;So;0;L;;;;;N;;;;;
+2377;APL FUNCTIONAL SYMBOL EPSILON UNDERBAR;So;0;L;;;;;N;;;;;
+2378;APL FUNCTIONAL SYMBOL IOTA UNDERBAR;So;0;L;;;;;N;;;;;
+2379;APL FUNCTIONAL SYMBOL OMEGA UNDERBAR;So;0;L;;;;;N;;;;;
+237A;APL FUNCTIONAL SYMBOL ALPHA;So;0;L;;;;;N;;;;;
+237B;NOT CHECK MARK;So;0;ON;;;;;N;;;;;
+237C;RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW;Sm;0;ON;;;;;N;;;;;
+237D;SHOULDERED OPEN BOX;So;0;ON;;;;;N;;;;;
+237E;BELL SYMBOL;So;0;ON;;;;;N;;;;;
+237F;VERTICAL LINE WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
+2380;INSERTION SYMBOL;So;0;ON;;;;;N;;;;;
+2381;CONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2382;DISCONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2383;EMPHASIS SYMBOL;So;0;ON;;;;;N;;;;;
+2384;COMPOSITION SYMBOL;So;0;ON;;;;;N;;;;;
+2385;WHITE SQUARE WITH CENTRE VERTICAL LINE;So;0;ON;;;;;N;;;;;
+2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;;
+2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2388;HELM SYMBOL;So;0;ON;;;;;N;;;;;
+2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;;;;
+238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;;;;
+238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;;;;
+238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;;
+238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;;
+238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;;
+238F;OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2390;OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2391;PASSIVE-PULL-DOWN-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2392;PASSIVE-PULL-UP-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2393;DIRECT CURRENT SYMBOL FORM TWO;So;0;ON;;;;;N;;;;;
+2394;SOFTWARE-FUNCTION SYMBOL;So;0;ON;;;;;N;;;;;
+2395;APL FUNCTIONAL SYMBOL QUAD;So;0;L;;;;;N;;;;;
+2396;DECIMAL SEPARATOR KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2397;PREVIOUS PAGE;So;0;ON;;;;;N;;;;;
+2398;NEXT PAGE;So;0;ON;;;;;N;;;;;
+2399;PRINT SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239A;CLEAR SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239B;LEFT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239C;LEFT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+239D;LEFT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+239E;RIGHT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239F;RIGHT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A0;RIGHT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23A1;LEFT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A2;LEFT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A3;LEFT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A4;RIGHT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A5;RIGHT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A6;RIGHT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A7;LEFT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23A8;LEFT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23A9;LEFT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AA;CURLY BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AB;RIGHT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23AC;RIGHT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23AD;RIGHT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AE;INTEGRAL EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AF;HORIZONTAL LINE EXTENSION;Sm;0;ON;;;;;N;;;;;
+23B0;UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B1;UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B2;SUMMATION TOP;Sm;0;ON;;;;;N;;;;;
+23B3;SUMMATION BOTTOM;Sm;0;ON;;;;;N;;;;;
+23B4;TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B5;BOTTOM SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B6;BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B7;RADICAL SYMBOL BOTTOM;So;0;ON;;;;;N;;;;;
+23B8;LEFT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23B9;RIGHT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23BA;HORIZONTAL SCAN LINE-1;So;0;ON;;;;;N;;;;;
+23BB;HORIZONTAL SCAN LINE-3;So;0;ON;;;;;N;;;;;
+23BC;HORIZONTAL SCAN LINE-7;So;0;ON;;;;;N;;;;;
+23BD;HORIZONTAL SCAN LINE-9;So;0;ON;;;;;N;;;;;
+23BE;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;;
+23BF;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;;
+23C0;DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C1;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C2;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C3;DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C4;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C5;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C6;DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE;So;0;ON;;;;;N;;;;;
+23C7;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C8;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C9;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CA;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CB;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;;
+23CC;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;;
+23CD;SQUARE FOOT;So;0;ON;;;;;N;;;;;
+23CE;RETURN SYMBOL;So;0;ON;;;;;N;;;;;
+23CF;EJECT SYMBOL;So;0;ON;;;;;N;;;;;
+23D0;VERTICAL LINE EXTENSION;So;0;ON;;;;;N;;;;;
+23D1;METRICAL BREVE;So;0;ON;;;;;N;;;;;
+23D2;METRICAL LONG OVER SHORT;So;0;ON;;;;;N;;;;;
+23D3;METRICAL SHORT OVER LONG;So;0;ON;;;;;N;;;;;
+23D4;METRICAL LONG OVER TWO SHORTS;So;0;ON;;;;;N;;;;;
+23D5;METRICAL TWO SHORTS OVER LONG;So;0;ON;;;;;N;;;;;
+23D6;METRICAL TWO SHORTS JOINED;So;0;ON;;;;;N;;;;;
+23D7;METRICAL TRISEME;So;0;ON;;;;;N;;;;;
+23D8;METRICAL TETRASEME;So;0;ON;;;;;N;;;;;
+23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;;
+23DA;EARTH GROUND;So;0;ON;;;;;N;;;;;
+23DB;FUSE;So;0;ON;;;;;N;;;;;
+23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
+23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
+23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;;
+23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;;
+23E5;FLATNESS;So;0;ON;;;;;N;;;;;
+23E6;AC CURRENT;So;0;ON;;;;;N;;;;;
+23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;;
+23E8;DECIMAL EXPONENT SYMBOL;So;0;ON;;;;;N;;;;;
+23E9;BLACK RIGHT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EA;BLACK LEFT-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EB;BLACK UP-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23EC;BLACK DOWN-POINTING DOUBLE TRIANGLE;So;0;ON;;;;;N;;;;;
+23ED;BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23EE;BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23EF;BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23F0;ALARM CLOCK;So;0;ON;;;;;N;;;;;
+23F1;STOPWATCH;So;0;ON;;;;;N;;;;;
+23F2;TIMER CLOCK;So;0;ON;;;;;N;;;;;
+23F3;HOURGLASS WITH FLOWING SAND;So;0;ON;;;;;N;;;;;
+23F4;BLACK MEDIUM LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F5;BLACK MEDIUM RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F6;BLACK MEDIUM UP-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F7;BLACK MEDIUM DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+23F8;DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;;
+23F9;BLACK SQUARE FOR STOP;So;0;ON;;;;;N;;;;;
+23FA;BLACK CIRCLE FOR RECORD;So;0;ON;;;;;N;;;;;
+23FB;POWER SYMBOL;So;0;ON;;;;;N;;;;;
+23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;;
+23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;;
+23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;;
+2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
+2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
+2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
+2403;SYMBOL FOR END OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR END OF TEXT;;;;
+2404;SYMBOL FOR END OF TRANSMISSION;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION;;;;
+2405;SYMBOL FOR ENQUIRY;So;0;ON;;;;;N;GRAPHIC FOR ENQUIRY;;;;
+2406;SYMBOL FOR ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR ACKNOWLEDGE;;;;
+2407;SYMBOL FOR BELL;So;0;ON;;;;;N;GRAPHIC FOR BELL;;;;
+2408;SYMBOL FOR BACKSPACE;So;0;ON;;;;;N;GRAPHIC FOR BACKSPACE;;;;
+2409;SYMBOL FOR HORIZONTAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR HORIZONTAL TABULATION;;;;
+240A;SYMBOL FOR LINE FEED;So;0;ON;;;;;N;GRAPHIC FOR LINE FEED;;;;
+240B;SYMBOL FOR VERTICAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR VERTICAL TABULATION;;;;
+240C;SYMBOL FOR FORM FEED;So;0;ON;;;;;N;GRAPHIC FOR FORM FEED;;;;
+240D;SYMBOL FOR CARRIAGE RETURN;So;0;ON;;;;;N;GRAPHIC FOR CARRIAGE RETURN;;;;
+240E;SYMBOL FOR SHIFT OUT;So;0;ON;;;;;N;GRAPHIC FOR SHIFT OUT;;;;
+240F;SYMBOL FOR SHIFT IN;So;0;ON;;;;;N;GRAPHIC FOR SHIFT IN;;;;
+2410;SYMBOL FOR DATA LINK ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR DATA LINK ESCAPE;;;;
+2411;SYMBOL FOR DEVICE CONTROL ONE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL ONE;;;;
+2412;SYMBOL FOR DEVICE CONTROL TWO;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL TWO;;;;
+2413;SYMBOL FOR DEVICE CONTROL THREE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL THREE;;;;
+2414;SYMBOL FOR DEVICE CONTROL FOUR;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL FOUR;;;;
+2415;SYMBOL FOR NEGATIVE ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR NEGATIVE ACKNOWLEDGE;;;;
+2416;SYMBOL FOR SYNCHRONOUS IDLE;So;0;ON;;;;;N;GRAPHIC FOR SYNCHRONOUS IDLE;;;;
+2417;SYMBOL FOR END OF TRANSMISSION BLOCK;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION BLOCK;;;;
+2418;SYMBOL FOR CANCEL;So;0;ON;;;;;N;GRAPHIC FOR CANCEL;;;;
+2419;SYMBOL FOR END OF MEDIUM;So;0;ON;;;;;N;GRAPHIC FOR END OF MEDIUM;;;;
+241A;SYMBOL FOR SUBSTITUTE;So;0;ON;;;;;N;GRAPHIC FOR SUBSTITUTE;;;;
+241B;SYMBOL FOR ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR ESCAPE;;;;
+241C;SYMBOL FOR FILE SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR FILE SEPARATOR;;;;
+241D;SYMBOL FOR GROUP SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR GROUP SEPARATOR;;;;
+241E;SYMBOL FOR RECORD SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR RECORD SEPARATOR;;;;
+241F;SYMBOL FOR UNIT SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR UNIT SEPARATOR;;;;
+2420;SYMBOL FOR SPACE;So;0;ON;;;;;N;GRAPHIC FOR SPACE;;;;
+2421;SYMBOL FOR DELETE;So;0;ON;;;;;N;GRAPHIC FOR DELETE;;;;
+2422;BLANK SYMBOL;So;0;ON;;;;;N;BLANK;;;;
+2423;OPEN BOX;So;0;ON;;;;;N;;;;;
+2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;;
+2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;;
+2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;;
+2440;OCR HOOK;So;0;ON;;;;;N;;;;;
+2441;OCR CHAIR;So;0;ON;;;;;N;;;;;
+2442;OCR FORK;So;0;ON;;;;;N;;;;;
+2443;OCR INVERTED FORK;So;0;ON;;;;;N;;;;;
+2444;OCR BELT BUCKLE;So;0;ON;;;;;N;;;;;
+2445;OCR BOW TIE;So;0;ON;;;;;N;;;;;
+2446;OCR BRANCH BANK IDENTIFICATION;So;0;ON;;;;;N;;;;;
+2447;OCR AMOUNT OF CHECK;So;0;ON;;;;;N;;;;;
+2448;OCR DASH;So;0;ON;;;;;N;;;;;
+2449;OCR CUSTOMER ACCOUNT NUMBER;So;0;ON;;;;;N;;;;;
+244A;OCR DOUBLE BACKSLASH;So;0;ON;;;;;N;;;;;
+2460;CIRCLED DIGIT ONE;No;0;ON;<circle> 0031;;1;1;N;;;;;
+2461;CIRCLED DIGIT TWO;No;0;ON;<circle> 0032;;2;2;N;;;;;
+2462;CIRCLED DIGIT THREE;No;0;ON;<circle> 0033;;3;3;N;;;;;
+2463;CIRCLED DIGIT FOUR;No;0;ON;<circle> 0034;;4;4;N;;;;;
+2464;CIRCLED DIGIT FIVE;No;0;ON;<circle> 0035;;5;5;N;;;;;
+2465;CIRCLED DIGIT SIX;No;0;ON;<circle> 0036;;6;6;N;;;;;
+2466;CIRCLED DIGIT SEVEN;No;0;ON;<circle> 0037;;7;7;N;;;;;
+2467;CIRCLED DIGIT EIGHT;No;0;ON;<circle> 0038;;8;8;N;;;;;
+2468;CIRCLED DIGIT NINE;No;0;ON;<circle> 0039;;9;9;N;;;;;
+2469;CIRCLED NUMBER TEN;No;0;ON;<circle> 0031 0030;;;10;N;;;;;
+246A;CIRCLED NUMBER ELEVEN;No;0;ON;<circle> 0031 0031;;;11;N;;;;;
+246B;CIRCLED NUMBER TWELVE;No;0;ON;<circle> 0031 0032;;;12;N;;;;;
+246C;CIRCLED NUMBER THIRTEEN;No;0;ON;<circle> 0031 0033;;;13;N;;;;;
+246D;CIRCLED NUMBER FOURTEEN;No;0;ON;<circle> 0031 0034;;;14;N;;;;;
+246E;CIRCLED NUMBER FIFTEEN;No;0;ON;<circle> 0031 0035;;;15;N;;;;;
+246F;CIRCLED NUMBER SIXTEEN;No;0;ON;<circle> 0031 0036;;;16;N;;;;;
+2470;CIRCLED NUMBER SEVENTEEN;No;0;ON;<circle> 0031 0037;;;17;N;;;;;
+2471;CIRCLED NUMBER EIGHTEEN;No;0;ON;<circle> 0031 0038;;;18;N;;;;;
+2472;CIRCLED NUMBER NINETEEN;No;0;ON;<circle> 0031 0039;;;19;N;;;;;
+2473;CIRCLED NUMBER TWENTY;No;0;ON;<circle> 0032 0030;;;20;N;;;;;
+2474;PARENTHESIZED DIGIT ONE;No;0;ON;<compat> 0028 0031 0029;;1;1;N;;;;;
+2475;PARENTHESIZED DIGIT TWO;No;0;ON;<compat> 0028 0032 0029;;2;2;N;;;;;
+2476;PARENTHESIZED DIGIT THREE;No;0;ON;<compat> 0028 0033 0029;;3;3;N;;;;;
+2477;PARENTHESIZED DIGIT FOUR;No;0;ON;<compat> 0028 0034 0029;;4;4;N;;;;;
+2478;PARENTHESIZED DIGIT FIVE;No;0;ON;<compat> 0028 0035 0029;;5;5;N;;;;;
+2479;PARENTHESIZED DIGIT SIX;No;0;ON;<compat> 0028 0036 0029;;6;6;N;;;;;
+247A;PARENTHESIZED DIGIT SEVEN;No;0;ON;<compat> 0028 0037 0029;;7;7;N;;;;;
+247B;PARENTHESIZED DIGIT EIGHT;No;0;ON;<compat> 0028 0038 0029;;8;8;N;;;;;
+247C;PARENTHESIZED DIGIT NINE;No;0;ON;<compat> 0028 0039 0029;;9;9;N;;;;;
+247D;PARENTHESIZED NUMBER TEN;No;0;ON;<compat> 0028 0031 0030 0029;;;10;N;;;;;
+247E;PARENTHESIZED NUMBER ELEVEN;No;0;ON;<compat> 0028 0031 0031 0029;;;11;N;;;;;
+247F;PARENTHESIZED NUMBER TWELVE;No;0;ON;<compat> 0028 0031 0032 0029;;;12;N;;;;;
+2480;PARENTHESIZED NUMBER THIRTEEN;No;0;ON;<compat> 0028 0031 0033 0029;;;13;N;;;;;
+2481;PARENTHESIZED NUMBER FOURTEEN;No;0;ON;<compat> 0028 0031 0034 0029;;;14;N;;;;;
+2482;PARENTHESIZED NUMBER FIFTEEN;No;0;ON;<compat> 0028 0031 0035 0029;;;15;N;;;;;
+2483;PARENTHESIZED NUMBER SIXTEEN;No;0;ON;<compat> 0028 0031 0036 0029;;;16;N;;;;;
+2484;PARENTHESIZED NUMBER SEVENTEEN;No;0;ON;<compat> 0028 0031 0037 0029;;;17;N;;;;;
+2485;PARENTHESIZED NUMBER EIGHTEEN;No;0;ON;<compat> 0028 0031 0038 0029;;;18;N;;;;;
+2486;PARENTHESIZED NUMBER NINETEEN;No;0;ON;<compat> 0028 0031 0039 0029;;;19;N;;;;;
+2487;PARENTHESIZED NUMBER TWENTY;No;0;ON;<compat> 0028 0032 0030 0029;;;20;N;;;;;
+2488;DIGIT ONE FULL STOP;No;0;EN;<compat> 0031 002E;;1;1;N;DIGIT ONE PERIOD;;;;
+2489;DIGIT TWO FULL STOP;No;0;EN;<compat> 0032 002E;;2;2;N;DIGIT TWO PERIOD;;;;
+248A;DIGIT THREE FULL STOP;No;0;EN;<compat> 0033 002E;;3;3;N;DIGIT THREE PERIOD;;;;
+248B;DIGIT FOUR FULL STOP;No;0;EN;<compat> 0034 002E;;4;4;N;DIGIT FOUR PERIOD;;;;
+248C;DIGIT FIVE FULL STOP;No;0;EN;<compat> 0035 002E;;5;5;N;DIGIT FIVE PERIOD;;;;
+248D;DIGIT SIX FULL STOP;No;0;EN;<compat> 0036 002E;;6;6;N;DIGIT SIX PERIOD;;;;
+248E;DIGIT SEVEN FULL STOP;No;0;EN;<compat> 0037 002E;;7;7;N;DIGIT SEVEN PERIOD;;;;
+248F;DIGIT EIGHT FULL STOP;No;0;EN;<compat> 0038 002E;;8;8;N;DIGIT EIGHT PERIOD;;;;
+2490;DIGIT NINE FULL STOP;No;0;EN;<compat> 0039 002E;;9;9;N;DIGIT NINE PERIOD;;;;
+2491;NUMBER TEN FULL STOP;No;0;EN;<compat> 0031 0030 002E;;;10;N;NUMBER TEN PERIOD;;;;
+2492;NUMBER ELEVEN FULL STOP;No;0;EN;<compat> 0031 0031 002E;;;11;N;NUMBER ELEVEN PERIOD;;;;
+2493;NUMBER TWELVE FULL STOP;No;0;EN;<compat> 0031 0032 002E;;;12;N;NUMBER TWELVE PERIOD;;;;
+2494;NUMBER THIRTEEN FULL STOP;No;0;EN;<compat> 0031 0033 002E;;;13;N;NUMBER THIRTEEN PERIOD;;;;
+2495;NUMBER FOURTEEN FULL STOP;No;0;EN;<compat> 0031 0034 002E;;;14;N;NUMBER FOURTEEN PERIOD;;;;
+2496;NUMBER FIFTEEN FULL STOP;No;0;EN;<compat> 0031 0035 002E;;;15;N;NUMBER FIFTEEN PERIOD;;;;
+2497;NUMBER SIXTEEN FULL STOP;No;0;EN;<compat> 0031 0036 002E;;;16;N;NUMBER SIXTEEN PERIOD;;;;
+2498;NUMBER SEVENTEEN FULL STOP;No;0;EN;<compat> 0031 0037 002E;;;17;N;NUMBER SEVENTEEN PERIOD;;;;
+2499;NUMBER EIGHTEEN FULL STOP;No;0;EN;<compat> 0031 0038 002E;;;18;N;NUMBER EIGHTEEN PERIOD;;;;
+249A;NUMBER NINETEEN FULL STOP;No;0;EN;<compat> 0031 0039 002E;;;19;N;NUMBER NINETEEN PERIOD;;;;
+249B;NUMBER TWENTY FULL STOP;No;0;EN;<compat> 0032 0030 002E;;;20;N;NUMBER TWENTY PERIOD;;;;
+249C;PARENTHESIZED LATIN SMALL LETTER A;So;0;L;<compat> 0028 0061 0029;;;;N;;;;;
+249D;PARENTHESIZED LATIN SMALL LETTER B;So;0;L;<compat> 0028 0062 0029;;;;N;;;;;
+249E;PARENTHESIZED LATIN SMALL LETTER C;So;0;L;<compat> 0028 0063 0029;;;;N;;;;;
+249F;PARENTHESIZED LATIN SMALL LETTER D;So;0;L;<compat> 0028 0064 0029;;;;N;;;;;
+24A0;PARENTHESIZED LATIN SMALL LETTER E;So;0;L;<compat> 0028 0065 0029;;;;N;;;;;
+24A1;PARENTHESIZED LATIN SMALL LETTER F;So;0;L;<compat> 0028 0066 0029;;;;N;;;;;
+24A2;PARENTHESIZED LATIN SMALL LETTER G;So;0;L;<compat> 0028 0067 0029;;;;N;;;;;
+24A3;PARENTHESIZED LATIN SMALL LETTER H;So;0;L;<compat> 0028 0068 0029;;;;N;;;;;
+24A4;PARENTHESIZED LATIN SMALL LETTER I;So;0;L;<compat> 0028 0069 0029;;;;N;;;;;
+24A5;PARENTHESIZED LATIN SMALL LETTER J;So;0;L;<compat> 0028 006A 0029;;;;N;;;;;
+24A6;PARENTHESIZED LATIN SMALL LETTER K;So;0;L;<compat> 0028 006B 0029;;;;N;;;;;
+24A7;PARENTHESIZED LATIN SMALL LETTER L;So;0;L;<compat> 0028 006C 0029;;;;N;;;;;
+24A8;PARENTHESIZED LATIN SMALL LETTER M;So;0;L;<compat> 0028 006D 0029;;;;N;;;;;
+24A9;PARENTHESIZED LATIN SMALL LETTER N;So;0;L;<compat> 0028 006E 0029;;;;N;;;;;
+24AA;PARENTHESIZED LATIN SMALL LETTER O;So;0;L;<compat> 0028 006F 0029;;;;N;;;;;
+24AB;PARENTHESIZED LATIN SMALL LETTER P;So;0;L;<compat> 0028 0070 0029;;;;N;;;;;
+24AC;PARENTHESIZED LATIN SMALL LETTER Q;So;0;L;<compat> 0028 0071 0029;;;;N;;;;;
+24AD;PARENTHESIZED LATIN SMALL LETTER R;So;0;L;<compat> 0028 0072 0029;;;;N;;;;;
+24AE;PARENTHESIZED LATIN SMALL LETTER S;So;0;L;<compat> 0028 0073 0029;;;;N;;;;;
+24AF;PARENTHESIZED LATIN SMALL LETTER T;So;0;L;<compat> 0028 0074 0029;;;;N;;;;;
+24B0;PARENTHESIZED LATIN SMALL LETTER U;So;0;L;<compat> 0028 0075 0029;;;;N;;;;;
+24B1;PARENTHESIZED LATIN SMALL LETTER V;So;0;L;<compat> 0028 0076 0029;;;;N;;;;;
+24B2;PARENTHESIZED LATIN SMALL LETTER W;So;0;L;<compat> 0028 0077 0029;;;;N;;;;;
+24B3;PARENTHESIZED LATIN SMALL LETTER X;So;0;L;<compat> 0028 0078 0029;;;;N;;;;;
+24B4;PARENTHESIZED LATIN SMALL LETTER Y;So;0;L;<compat> 0028 0079 0029;;;;N;;;;;
+24B5;PARENTHESIZED LATIN SMALL LETTER Z;So;0;L;<compat> 0028 007A 0029;;;;N;;;;;
+24B6;CIRCLED LATIN CAPITAL LETTER A;So;0;L;<circle> 0041;;;;N;;;;24D0;
+24B7;CIRCLED LATIN CAPITAL LETTER B;So;0;L;<circle> 0042;;;;N;;;;24D1;
+24B8;CIRCLED LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;24D2;
+24B9;CIRCLED LATIN CAPITAL LETTER D;So;0;L;<circle> 0044;;;;N;;;;24D3;
+24BA;CIRCLED LATIN CAPITAL LETTER E;So;0;L;<circle> 0045;;;;N;;;;24D4;
+24BB;CIRCLED LATIN CAPITAL LETTER F;So;0;L;<circle> 0046;;;;N;;;;24D5;
+24BC;CIRCLED LATIN CAPITAL LETTER G;So;0;L;<circle> 0047;;;;N;;;;24D6;
+24BD;CIRCLED LATIN CAPITAL LETTER H;So;0;L;<circle> 0048;;;;N;;;;24D7;
+24BE;CIRCLED LATIN CAPITAL LETTER I;So;0;L;<circle> 0049;;;;N;;;;24D8;
+24BF;CIRCLED LATIN CAPITAL LETTER J;So;0;L;<circle> 004A;;;;N;;;;24D9;
+24C0;CIRCLED LATIN CAPITAL LETTER K;So;0;L;<circle> 004B;;;;N;;;;24DA;
+24C1;CIRCLED LATIN CAPITAL LETTER L;So;0;L;<circle> 004C;;;;N;;;;24DB;
+24C2;CIRCLED LATIN CAPITAL LETTER M;So;0;L;<circle> 004D;;;;N;;;;24DC;
+24C3;CIRCLED LATIN CAPITAL LETTER N;So;0;L;<circle> 004E;;;;N;;;;24DD;
+24C4;CIRCLED LATIN CAPITAL LETTER O;So;0;L;<circle> 004F;;;;N;;;;24DE;
+24C5;CIRCLED LATIN CAPITAL LETTER P;So;0;L;<circle> 0050;;;;N;;;;24DF;
+24C6;CIRCLED LATIN CAPITAL LETTER Q;So;0;L;<circle> 0051;;;;N;;;;24E0;
+24C7;CIRCLED LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;24E1;
+24C8;CIRCLED LATIN CAPITAL LETTER S;So;0;L;<circle> 0053;;;;N;;;;24E2;
+24C9;CIRCLED LATIN CAPITAL LETTER T;So;0;L;<circle> 0054;;;;N;;;;24E3;
+24CA;CIRCLED LATIN CAPITAL LETTER U;So;0;L;<circle> 0055;;;;N;;;;24E4;
+24CB;CIRCLED LATIN CAPITAL LETTER V;So;0;L;<circle> 0056;;;;N;;;;24E5;
+24CC;CIRCLED LATIN CAPITAL LETTER W;So;0;L;<circle> 0057;;;;N;;;;24E6;
+24CD;CIRCLED LATIN CAPITAL LETTER X;So;0;L;<circle> 0058;;;;N;;;;24E7;
+24CE;CIRCLED LATIN CAPITAL LETTER Y;So;0;L;<circle> 0059;;;;N;;;;24E8;
+24CF;CIRCLED LATIN CAPITAL LETTER Z;So;0;L;<circle> 005A;;;;N;;;;24E9;
+24D0;CIRCLED LATIN SMALL LETTER A;So;0;L;<circle> 0061;;;;N;;;24B6;;24B6
+24D1;CIRCLED LATIN SMALL LETTER B;So;0;L;<circle> 0062;;;;N;;;24B7;;24B7
+24D2;CIRCLED LATIN SMALL LETTER C;So;0;L;<circle> 0063;;;;N;;;24B8;;24B8
+24D3;CIRCLED LATIN SMALL LETTER D;So;0;L;<circle> 0064;;;;N;;;24B9;;24B9
+24D4;CIRCLED LATIN SMALL LETTER E;So;0;L;<circle> 0065;;;;N;;;24BA;;24BA
+24D5;CIRCLED LATIN SMALL LETTER F;So;0;L;<circle> 0066;;;;N;;;24BB;;24BB
+24D6;CIRCLED LATIN SMALL LETTER G;So;0;L;<circle> 0067;;;;N;;;24BC;;24BC
+24D7;CIRCLED LATIN SMALL LETTER H;So;0;L;<circle> 0068;;;;N;;;24BD;;24BD
+24D8;CIRCLED LATIN SMALL LETTER I;So;0;L;<circle> 0069;;;;N;;;24BE;;24BE
+24D9;CIRCLED LATIN SMALL LETTER J;So;0;L;<circle> 006A;;;;N;;;24BF;;24BF
+24DA;CIRCLED LATIN SMALL LETTER K;So;0;L;<circle> 006B;;;;N;;;24C0;;24C0
+24DB;CIRCLED LATIN SMALL LETTER L;So;0;L;<circle> 006C;;;;N;;;24C1;;24C1
+24DC;CIRCLED LATIN SMALL LETTER M;So;0;L;<circle> 006D;;;;N;;;24C2;;24C2
+24DD;CIRCLED LATIN SMALL LETTER N;So;0;L;<circle> 006E;;;;N;;;24C3;;24C3
+24DE;CIRCLED LATIN SMALL LETTER O;So;0;L;<circle> 006F;;;;N;;;24C4;;24C4
+24DF;CIRCLED LATIN SMALL LETTER P;So;0;L;<circle> 0070;;;;N;;;24C5;;24C5
+24E0;CIRCLED LATIN SMALL LETTER Q;So;0;L;<circle> 0071;;;;N;;;24C6;;24C6
+24E1;CIRCLED LATIN SMALL LETTER R;So;0;L;<circle> 0072;;;;N;;;24C7;;24C7
+24E2;CIRCLED LATIN SMALL LETTER S;So;0;L;<circle> 0073;;;;N;;;24C8;;24C8
+24E3;CIRCLED LATIN SMALL LETTER T;So;0;L;<circle> 0074;;;;N;;;24C9;;24C9
+24E4;CIRCLED LATIN SMALL LETTER U;So;0;L;<circle> 0075;;;;N;;;24CA;;24CA
+24E5;CIRCLED LATIN SMALL LETTER V;So;0;L;<circle> 0076;;;;N;;;24CB;;24CB
+24E6;CIRCLED LATIN SMALL LETTER W;So;0;L;<circle> 0077;;;;N;;;24CC;;24CC
+24E7;CIRCLED LATIN SMALL LETTER X;So;0;L;<circle> 0078;;;;N;;;24CD;;24CD
+24E8;CIRCLED LATIN SMALL LETTER Y;So;0;L;<circle> 0079;;;;N;;;24CE;;24CE
+24E9;CIRCLED LATIN SMALL LETTER Z;So;0;L;<circle> 007A;;;;N;;;24CF;;24CF
+24EA;CIRCLED DIGIT ZERO;No;0;ON;<circle> 0030;;0;0;N;;;;;
+24EB;NEGATIVE CIRCLED NUMBER ELEVEN;No;0;ON;;;;11;N;;;;;
+24EC;NEGATIVE CIRCLED NUMBER TWELVE;No;0;ON;;;;12;N;;;;;
+24ED;NEGATIVE CIRCLED NUMBER THIRTEEN;No;0;ON;;;;13;N;;;;;
+24EE;NEGATIVE CIRCLED NUMBER FOURTEEN;No;0;ON;;;;14;N;;;;;
+24EF;NEGATIVE CIRCLED NUMBER FIFTEEN;No;0;ON;;;;15;N;;;;;
+24F0;NEGATIVE CIRCLED NUMBER SIXTEEN;No;0;ON;;;;16;N;;;;;
+24F1;NEGATIVE CIRCLED NUMBER SEVENTEEN;No;0;ON;;;;17;N;;;;;
+24F2;NEGATIVE CIRCLED NUMBER EIGHTEEN;No;0;ON;;;;18;N;;;;;
+24F3;NEGATIVE CIRCLED NUMBER NINETEEN;No;0;ON;;;;19;N;;;;;
+24F4;NEGATIVE CIRCLED NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
+24F5;DOUBLE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;;;;;
+24F6;DOUBLE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;;;;;
+24F7;DOUBLE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;;;;;
+24F8;DOUBLE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;;;;;
+24F9;DOUBLE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;;;;;
+24FA;DOUBLE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;;;;;
+24FB;DOUBLE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;;;;;
+24FC;DOUBLE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;;;;;
+24FD;DOUBLE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;;;;;
+24FE;DOUBLE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;;;;;
+24FF;NEGATIVE CIRCLED DIGIT ZERO;No;0;ON;;;0;0;N;;;;;
+2500;BOX DRAWINGS LIGHT HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT HORIZONTAL;;;;
+2501;BOX DRAWINGS HEAVY HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY HORIZONTAL;;;;
+2502;BOX DRAWINGS LIGHT VERTICAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL;;;;
+2503;BOX DRAWINGS HEAVY VERTICAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL;;;;
+2504;BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH HORIZONTAL;;;;
+2505;BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH HORIZONTAL;;;;
+2506;BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH VERTICAL;;;;
+2507;BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH VERTICAL;;;;
+2508;BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH HORIZONTAL;;;;
+2509;BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH HORIZONTAL;;;;
+250A;BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH VERTICAL;;;;
+250B;BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH VERTICAL;;;;
+250C;BOX DRAWINGS LIGHT DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND RIGHT;;;;
+250D;BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT HEAVY;;;;
+250E;BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT LIGHT;;;;
+250F;BOX DRAWINGS HEAVY DOWN AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND RIGHT;;;;
+2510;BOX DRAWINGS LIGHT DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND LEFT;;;;
+2511;BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT HEAVY;;;;
+2512;BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT LIGHT;;;;
+2513;BOX DRAWINGS HEAVY DOWN AND LEFT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND LEFT;;;;
+2514;BOX DRAWINGS LIGHT UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT UP AND RIGHT;;;;
+2515;BOX DRAWINGS UP LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT HEAVY;;;;
+2516;BOX DRAWINGS UP HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT LIGHT;;;;
+2517;BOX DRAWINGS HEAVY UP AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY UP AND RIGHT;;;;
+2518;BOX DRAWINGS LIGHT UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT UP AND LEFT;;;;
+2519;BOX DRAWINGS UP LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT HEAVY;;;;
+251A;BOX DRAWINGS UP HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT LIGHT;;;;
+251B;BOX DRAWINGS HEAVY UP AND LEFT;So;0;ON;;;;;N;FORMS HEAVY UP AND LEFT;;;;
+251C;BOX DRAWINGS LIGHT VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND RIGHT;;;;
+251D;BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND RIGHT HEAVY;;;;
+251E;BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT DOWN LIGHT;;;;
+251F;BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2520;BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND RIGHT LIGHT;;;;
+2521;BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT UP HEAVY;;;;
+2522;BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT DOWN HEAVY;;;;
+2523;BOX DRAWINGS HEAVY VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND RIGHT;;;;
+2524;BOX DRAWINGS LIGHT VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND LEFT;;;;
+2525;BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND LEFT HEAVY;;;;
+2526;BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT DOWN LIGHT;;;;
+2527;BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT UP LIGHT;;;;
+2528;BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND LEFT LIGHT;;;;
+2529;BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT UP HEAVY;;;;
+252A;BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT DOWN HEAVY;;;;
+252B;BOX DRAWINGS HEAVY VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND LEFT;;;;
+252C;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOWN AND HORIZONTAL;;;;
+252D;BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT DOWN LIGHT;;;;
+252E;BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT DOWN LIGHT;;;;
+252F;BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND HORIZONTAL HEAVY;;;;
+2530;BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND HORIZONTAL LIGHT;;;;
+2531;BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT DOWN HEAVY;;;;
+2532;BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT DOWN HEAVY;;;;
+2533;BOX DRAWINGS HEAVY DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOWN AND HORIZONTAL;;;;
+2534;BOX DRAWINGS LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT UP AND HORIZONTAL;;;;
+2535;BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT UP LIGHT;;;;
+2536;BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT UP LIGHT;;;;
+2537;BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND HORIZONTAL HEAVY;;;;
+2538;BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND HORIZONTAL LIGHT;;;;
+2539;BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT UP HEAVY;;;;
+253A;BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT UP HEAVY;;;;
+253B;BOX DRAWINGS HEAVY UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY UP AND HORIZONTAL;;;;
+253C;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND HORIZONTAL;;;;
+253D;BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT VERTICAL LIGHT;;;;
+253E;BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT VERTICAL LIGHT;;;;
+253F;BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND HORIZONTAL HEAVY;;;;
+2540;BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND DOWN HORIZONTAL LIGHT;;;;
+2541;BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND UP HORIZONTAL LIGHT;;;;
+2542;BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND HORIZONTAL LIGHT;;;;
+2543;BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT UP HEAVY AND RIGHT DOWN LIGHT;;;;
+2544;BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT UP HEAVY AND LEFT DOWN LIGHT;;;;
+2545;BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2546;BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT DOWN HEAVY AND LEFT UP LIGHT;;;;
+2547;BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND UP HORIZONTAL HEAVY;;;;
+2548;BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND DOWN HORIZONTAL HEAVY;;;;
+2549;BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT VERTICAL HEAVY;;;;
+254A;BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT VERTICAL HEAVY;;;;
+254B;BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND HORIZONTAL;;;;
+254C;BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH HORIZONTAL;;;;
+254D;BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH HORIZONTAL;;;;
+254E;BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH VERTICAL;;;;
+254F;BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH VERTICAL;;;;
+2550;BOX DRAWINGS DOUBLE HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE HORIZONTAL;;;;
+2551;BOX DRAWINGS DOUBLE VERTICAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL;;;;
+2552;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND RIGHT DOUBLE;;;;
+2553;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND RIGHT SINGLE;;;;
+2554;BOX DRAWINGS DOUBLE DOWN AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND RIGHT;;;;
+2555;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND LEFT DOUBLE;;;;
+2556;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND LEFT SINGLE;;;;
+2557;BOX DRAWINGS DOUBLE DOWN AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND LEFT;;;;
+2558;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND RIGHT DOUBLE;;;;
+2559;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND RIGHT SINGLE;;;;
+255A;BOX DRAWINGS DOUBLE UP AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE UP AND RIGHT;;;;
+255B;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND LEFT DOUBLE;;;;
+255C;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND LEFT SINGLE;;;;
+255D;BOX DRAWINGS DOUBLE UP AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE UP AND LEFT;;;;
+255E;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND RIGHT DOUBLE;;;;
+255F;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND RIGHT SINGLE;;;;
+2560;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND RIGHT;;;;
+2561;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND LEFT DOUBLE;;;;
+2562;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND LEFT SINGLE;;;;
+2563;BOX DRAWINGS DOUBLE VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND LEFT;;;;
+2564;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND HORIZONTAL DOUBLE;;;;
+2565;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND HORIZONTAL SINGLE;;;;
+2566;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND HORIZONTAL;;;;
+2567;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND HORIZONTAL DOUBLE;;;;
+2568;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND HORIZONTAL SINGLE;;;;
+2569;BOX DRAWINGS DOUBLE UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE UP AND HORIZONTAL;;;;
+256A;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND HORIZONTAL DOUBLE;;;;
+256B;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND HORIZONTAL SINGLE;;;;
+256C;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND HORIZONTAL;;;;
+256D;BOX DRAWINGS LIGHT ARC DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND RIGHT;;;;
+256E;BOX DRAWINGS LIGHT ARC DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND LEFT;;;;
+256F;BOX DRAWINGS LIGHT ARC UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND LEFT;;;;
+2570;BOX DRAWINGS LIGHT ARC UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND RIGHT;;;;
+2571;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;;;;
+2572;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;;;;
+2573;BOX DRAWINGS LIGHT DIAGONAL CROSS;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL CROSS;;;;
+2574;BOX DRAWINGS LIGHT LEFT;So;0;ON;;;;;N;FORMS LIGHT LEFT;;;;
+2575;BOX DRAWINGS LIGHT UP;So;0;ON;;;;;N;FORMS LIGHT UP;;;;
+2576;BOX DRAWINGS LIGHT RIGHT;So;0;ON;;;;;N;FORMS LIGHT RIGHT;;;;
+2577;BOX DRAWINGS LIGHT DOWN;So;0;ON;;;;;N;FORMS LIGHT DOWN;;;;
+2578;BOX DRAWINGS HEAVY LEFT;So;0;ON;;;;;N;FORMS HEAVY LEFT;;;;
+2579;BOX DRAWINGS HEAVY UP;So;0;ON;;;;;N;FORMS HEAVY UP;;;;
+257A;BOX DRAWINGS HEAVY RIGHT;So;0;ON;;;;;N;FORMS HEAVY RIGHT;;;;
+257B;BOX DRAWINGS HEAVY DOWN;So;0;ON;;;;;N;FORMS HEAVY DOWN;;;;
+257C;BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT;So;0;ON;;;;;N;FORMS LIGHT LEFT AND HEAVY RIGHT;;;;
+257D;BOX DRAWINGS LIGHT UP AND HEAVY DOWN;So;0;ON;;;;;N;FORMS LIGHT UP AND HEAVY DOWN;;;;
+257E;BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT;So;0;ON;;;;;N;FORMS HEAVY LEFT AND LIGHT RIGHT;;;;
+257F;BOX DRAWINGS HEAVY UP AND LIGHT DOWN;So;0;ON;;;;;N;FORMS HEAVY UP AND LIGHT DOWN;;;;
+2580;UPPER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2581;LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2582;LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+2583;LOWER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2584;LOWER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2585;LOWER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2586;LOWER THREE QUARTERS BLOCK;So;0;ON;;;;;N;LOWER THREE QUARTER BLOCK;;;;
+2587;LOWER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2588;FULL BLOCK;So;0;ON;;;;;N;;;;;
+2589;LEFT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258A;LEFT THREE QUARTERS BLOCK;So;0;ON;;;;;N;LEFT THREE QUARTER BLOCK;;;;
+258B;LEFT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258C;LEFT HALF BLOCK;So;0;ON;;;;;N;;;;;
+258D;LEFT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258E;LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+258F;LEFT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2590;RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;;
+2591;LIGHT SHADE;So;0;ON;;;;;N;;;;;
+2592;MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+2593;DARK SHADE;So;0;ON;;;;;N;;;;;
+2594;UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2595;RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2596;QUADRANT LOWER LEFT;So;0;ON;;;;;N;;;;;
+2597;QUADRANT LOWER RIGHT;So;0;ON;;;;;N;;;;;
+2598;QUADRANT UPPER LEFT;So;0;ON;;;;;N;;;;;
+2599;QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259A;QUADRANT UPPER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259B;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259C;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259D;QUADRANT UPPER RIGHT;So;0;ON;;;;;N;;;;;
+259E;QUADRANT UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259F;QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+25A0;BLACK SQUARE;So;0;ON;;;;;N;;;;;
+25A1;WHITE SQUARE;So;0;ON;;;;;N;;;;;
+25A2;WHITE SQUARE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+25A3;WHITE SQUARE CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25A4;SQUARE WITH HORIZONTAL FILL;So;0;ON;;;;;N;;;;;
+25A5;SQUARE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25A6;SQUARE WITH ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25A7;SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;;
+25A8;SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;;
+25A9;SQUARE WITH DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25AA;BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AB;WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AC;BLACK RECTANGLE;So;0;ON;;;;;N;;;;;
+25AD;WHITE RECTANGLE;So;0;ON;;;;;N;;;;;
+25AE;BLACK VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25AF;WHITE VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25B0;BLACK PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B1;WHITE PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B2;BLACK UP-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING TRIANGLE;;;;
+25B3;WHITE UP-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE;;;;
+25B4;BLACK UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING SMALL TRIANGLE;;;;
+25B5;WHITE UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING SMALL TRIANGLE;;;;
+25B6;BLACK RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING TRIANGLE;;;;
+25B7;WHITE RIGHT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE RIGHT POINTING TRIANGLE;;;;
+25B8;BLACK RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING SMALL TRIANGLE;;;;
+25B9;WHITE RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE RIGHT POINTING SMALL TRIANGLE;;;;
+25BA;BLACK RIGHT-POINTING POINTER;So;0;ON;;;;;N;BLACK RIGHT POINTING POINTER;;;;
+25BB;WHITE RIGHT-POINTING POINTER;So;0;ON;;;;;N;WHITE RIGHT POINTING POINTER;;;;
+25BC;BLACK DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING TRIANGLE;;;;
+25BD;WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING TRIANGLE;;;;
+25BE;BLACK DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING SMALL TRIANGLE;;;;
+25BF;WHITE DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING SMALL TRIANGLE;;;;
+25C0;BLACK LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING TRIANGLE;;;;
+25C1;WHITE LEFT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE LEFT POINTING TRIANGLE;;;;
+25C2;BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING SMALL TRIANGLE;;;;
+25C3;WHITE LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE LEFT POINTING SMALL TRIANGLE;;;;
+25C4;BLACK LEFT-POINTING POINTER;So;0;ON;;;;;N;BLACK LEFT POINTING POINTER;;;;
+25C5;WHITE LEFT-POINTING POINTER;So;0;ON;;;;;N;WHITE LEFT POINTING POINTER;;;;
+25C6;BLACK DIAMOND;So;0;ON;;;;;N;;;;;
+25C7;WHITE DIAMOND;So;0;ON;;;;;N;;;;;
+25C8;WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+25C9;FISHEYE;So;0;ON;;;;;N;;;;;
+25CA;LOZENGE;So;0;ON;;;;;N;;;;;
+25CB;WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25CC;DOTTED CIRCLE;So;0;ON;;;;;N;;;;;
+25CD;CIRCLE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25CE;BULLSEYE;So;0;ON;;;;;N;;;;;
+25CF;BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D0;CIRCLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D1;CIRCLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D2;CIRCLE WITH LOWER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D3;CIRCLE WITH UPPER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D4;CIRCLE WITH UPPER RIGHT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D5;CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D6;LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D7;RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D8;INVERSE BULLET;So;0;ON;;;;;N;;;;;
+25D9;INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DA;UPPER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DB;LOWER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DC;UPPER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DD;UPPER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DE;LOWER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DF;LOWER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25E0;UPPER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E1;LOWER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E2;BLACK LOWER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E3;BLACK LOWER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E4;BLACK UPPER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E5;BLACK UPPER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E6;WHITE BULLET;So;0;ON;;;;;N;;;;;
+25E7;SQUARE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E8;SQUARE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E9;SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EA;SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EB;WHITE SQUARE WITH VERTICAL BISECTING LINE;So;0;ON;;;;;N;;;;;
+25EC;WHITE UP-POINTING TRIANGLE WITH DOT;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE WITH DOT;;;;
+25ED;UP-POINTING TRIANGLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH LEFT HALF BLACK;;;;
+25EE;UP-POINTING TRIANGLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH RIGHT HALF BLACK;;;;
+25EF;LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+25F0;WHITE SQUARE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F1;WHITE SQUARE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F2;WHITE SQUARE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F3;WHITE SQUARE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F4;WHITE CIRCLE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F5;WHITE CIRCLE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F6;WHITE CIRCLE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F7;WHITE CIRCLE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F8;UPPER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25F9;UPPER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FA;LOWER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FB;WHITE MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FC;BLACK MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FD;WHITE MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FE;BLACK MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FF;LOWER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2600;BLACK SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+2601;CLOUD;So;0;ON;;;;;N;;;;;
+2602;UMBRELLA;So;0;ON;;;;;N;;;;;
+2603;SNOWMAN;So;0;ON;;;;;N;;;;;
+2604;COMET;So;0;ON;;;;;N;;;;;
+2605;BLACK STAR;So;0;ON;;;;;N;;;;;
+2606;WHITE STAR;So;0;ON;;;;;N;;;;;
+2607;LIGHTNING;So;0;ON;;;;;N;;;;;
+2608;THUNDERSTORM;So;0;ON;;;;;N;;;;;
+2609;SUN;So;0;ON;;;;;N;;;;;
+260A;ASCENDING NODE;So;0;ON;;;;;N;;;;;
+260B;DESCENDING NODE;So;0;ON;;;;;N;;;;;
+260C;CONJUNCTION;So;0;ON;;;;;N;;;;;
+260D;OPPOSITION;So;0;ON;;;;;N;;;;;
+260E;BLACK TELEPHONE;So;0;ON;;;;;N;;;;;
+260F;WHITE TELEPHONE;So;0;ON;;;;;N;;;;;
+2610;BALLOT BOX;So;0;ON;;;;;N;;;;;
+2611;BALLOT BOX WITH CHECK;So;0;ON;;;;;N;;;;;
+2612;BALLOT BOX WITH X;So;0;ON;;;;;N;;;;;
+2613;SALTIRE;So;0;ON;;;;;N;;;;;
+2614;UMBRELLA WITH RAIN DROPS;So;0;ON;;;;;N;;;;;
+2615;HOT BEVERAGE;So;0;ON;;;;;N;;;;;
+2616;WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2617;BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2618;SHAMROCK;So;0;ON;;;;;N;;;;;
+2619;REVERSED ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+261A;BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261B;BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261C;WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261D;WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+261E;WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261F;WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+2620;SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
+2621;CAUTION SIGN;So;0;ON;;;;;N;;;;;
+2622;RADIOACTIVE SIGN;So;0;ON;;;;;N;;;;;
+2623;BIOHAZARD SIGN;So;0;ON;;;;;N;;;;;
+2624;CADUCEUS;So;0;ON;;;;;N;;;;;
+2625;ANKH;So;0;ON;;;;;N;;;;;
+2626;ORTHODOX CROSS;So;0;ON;;;;;N;;;;;
+2627;CHI RHO;So;0;ON;;;;;N;;;;;
+2628;CROSS OF LORRAINE;So;0;ON;;;;;N;;;;;
+2629;CROSS OF JERUSALEM;So;0;ON;;;;;N;;;;;
+262A;STAR AND CRESCENT;So;0;ON;;;;;N;;;;;
+262B;FARSI SYMBOL;So;0;ON;;;;;N;SYMBOL OF IRAN;;;;
+262C;ADI SHAKTI;So;0;ON;;;;;N;;;;;
+262D;HAMMER AND SICKLE;So;0;ON;;;;;N;;;;;
+262E;PEACE SYMBOL;So;0;ON;;;;;N;;;;;
+262F;YIN YANG;So;0;ON;;;;;N;;;;;
+2630;TRIGRAM FOR HEAVEN;So;0;ON;;;;;N;;;;;
+2631;TRIGRAM FOR LAKE;So;0;ON;;;;;N;;;;;
+2632;TRIGRAM FOR FIRE;So;0;ON;;;;;N;;;;;
+2633;TRIGRAM FOR THUNDER;So;0;ON;;;;;N;;;;;
+2634;TRIGRAM FOR WIND;So;0;ON;;;;;N;;;;;
+2635;TRIGRAM FOR WATER;So;0;ON;;;;;N;;;;;
+2636;TRIGRAM FOR MOUNTAIN;So;0;ON;;;;;N;;;;;
+2637;TRIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+2638;WHEEL OF DHARMA;So;0;ON;;;;;N;;;;;
+2639;WHITE FROWNING FACE;So;0;ON;;;;;N;;;;;
+263A;WHITE SMILING FACE;So;0;ON;;;;;N;;;;;
+263B;BLACK SMILING FACE;So;0;ON;;;;;N;;;;;
+263C;WHITE SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+263D;FIRST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263E;LAST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263F;MERCURY;So;0;ON;;;;;N;;;;;
+2640;FEMALE SIGN;So;0;ON;;;;;N;;;;;
+2641;EARTH;So;0;ON;;;;;N;;;;;
+2642;MALE SIGN;So;0;ON;;;;;N;;;;;
+2643;JUPITER;So;0;ON;;;;;N;;;;;
+2644;SATURN;So;0;ON;;;;;N;;;;;
+2645;URANUS;So;0;ON;;;;;N;;;;;
+2646;NEPTUNE;So;0;ON;;;;;N;;;;;
+2647;PLUTO;So;0;ON;;;;;N;;;;;
+2648;ARIES;So;0;ON;;;;;N;;;;;
+2649;TAURUS;So;0;ON;;;;;N;;;;;
+264A;GEMINI;So;0;ON;;;;;N;;;;;
+264B;CANCER;So;0;ON;;;;;N;;;;;
+264C;LEO;So;0;ON;;;;;N;;;;;
+264D;VIRGO;So;0;ON;;;;;N;;;;;
+264E;LIBRA;So;0;ON;;;;;N;;;;;
+264F;SCORPIUS;So;0;ON;;;;;N;;;;;
+2650;SAGITTARIUS;So;0;ON;;;;;N;;;;;
+2651;CAPRICORN;So;0;ON;;;;;N;;;;;
+2652;AQUARIUS;So;0;ON;;;;;N;;;;;
+2653;PISCES;So;0;ON;;;;;N;;;;;
+2654;WHITE CHESS KING;So;0;ON;;;;;N;;;;;
+2655;WHITE CHESS QUEEN;So;0;ON;;;;;N;;;;;
+2656;WHITE CHESS ROOK;So;0;ON;;;;;N;;;;;
+2657;WHITE CHESS BISHOP;So;0;ON;;;;;N;;;;;
+2658;WHITE CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+2659;WHITE CHESS PAWN;So;0;ON;;;;;N;;;;;
+265A;BLACK CHESS KING;So;0;ON;;;;;N;;;;;
+265B;BLACK CHESS QUEEN;So;0;ON;;;;;N;;;;;
+265C;BLACK CHESS ROOK;So;0;ON;;;;;N;;;;;
+265D;BLACK CHESS BISHOP;So;0;ON;;;;;N;;;;;
+265E;BLACK CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+265F;BLACK CHESS PAWN;So;0;ON;;;;;N;;;;;
+2660;BLACK SPADE SUIT;So;0;ON;;;;;N;;;;;
+2661;WHITE HEART SUIT;So;0;ON;;;;;N;;;;;
+2662;WHITE DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2663;BLACK CLUB SUIT;So;0;ON;;;;;N;;;;;
+2664;WHITE SPADE SUIT;So;0;ON;;;;;N;;;;;
+2665;BLACK HEART SUIT;So;0;ON;;;;;N;;;;;
+2666;BLACK DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2667;WHITE CLUB SUIT;So;0;ON;;;;;N;;;;;
+2668;HOT SPRINGS;So;0;ON;;;;;N;;;;;
+2669;QUARTER NOTE;So;0;ON;;;;;N;;;;;
+266A;EIGHTH NOTE;So;0;ON;;;;;N;;;;;
+266B;BEAMED EIGHTH NOTES;So;0;ON;;;;;N;BARRED EIGHTH NOTES;;;;
+266C;BEAMED SIXTEENTH NOTES;So;0;ON;;;;;N;BARRED SIXTEENTH NOTES;;;;
+266D;MUSIC FLAT SIGN;So;0;ON;;;;;N;FLAT;;;;
+266E;MUSIC NATURAL SIGN;So;0;ON;;;;;N;NATURAL;;;;
+266F;MUSIC SHARP SIGN;Sm;0;ON;;;;;N;SHARP;;;;
+2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;;;;
+2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;;;;
+2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;;;;
+2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;;;;
+2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;;;;
+2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;;;;
+2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;;;;
+267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;;
+267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267D;PARTIALLY-RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267E;PERMANENT PAPER SIGN;So;0;ON;;;;;N;;;;;
+267F;WHEELCHAIR SYMBOL;So;0;ON;;;;;N;;;;;
+2680;DIE FACE-1;So;0;ON;;;;;N;;;;;
+2681;DIE FACE-2;So;0;ON;;;;;N;;;;;
+2682;DIE FACE-3;So;0;ON;;;;;N;;;;;
+2683;DIE FACE-4;So;0;ON;;;;;N;;;;;
+2684;DIE FACE-5;So;0;ON;;;;;N;;;;;
+2685;DIE FACE-6;So;0;ON;;;;;N;;;;;
+2686;WHITE CIRCLE WITH DOT RIGHT;So;0;ON;;;;;N;;;;;
+2687;WHITE CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+2688;BLACK CIRCLE WITH WHITE DOT RIGHT;So;0;ON;;;;;N;;;;;
+2689;BLACK CIRCLE WITH TWO WHITE DOTS;So;0;ON;;;;;N;;;;;
+268A;MONOGRAM FOR YANG;So;0;ON;;;;;N;;;;;
+268B;MONOGRAM FOR YIN;So;0;ON;;;;;N;;;;;
+268C;DIGRAM FOR GREATER YANG;So;0;ON;;;;;N;;;;;
+268D;DIGRAM FOR LESSER YIN;So;0;ON;;;;;N;;;;;
+268E;DIGRAM FOR LESSER YANG;So;0;ON;;;;;N;;;;;
+268F;DIGRAM FOR GREATER YIN;So;0;ON;;;;;N;;;;;
+2690;WHITE FLAG;So;0;ON;;;;;N;;;;;
+2691;BLACK FLAG;So;0;ON;;;;;N;;;;;
+2692;HAMMER AND PICK;So;0;ON;;;;;N;;;;;
+2693;ANCHOR;So;0;ON;;;;;N;;;;;
+2694;CROSSED SWORDS;So;0;ON;;;;;N;;;;;
+2695;STAFF OF AESCULAPIUS;So;0;ON;;;;;N;;;;;
+2696;SCALES;So;0;ON;;;;;N;;;;;
+2697;ALEMBIC;So;0;ON;;;;;N;;;;;
+2698;FLOWER;So;0;ON;;;;;N;;;;;
+2699;GEAR;So;0;ON;;;;;N;;;;;
+269A;STAFF OF HERMES;So;0;ON;;;;;N;;;;;
+269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;;
+269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;;
+269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+269E;THREE LINES CONVERGING RIGHT;So;0;ON;;;;;N;;;;;
+269F;THREE LINES CONVERGING LEFT;So;0;ON;;;;;N;;;;;
+26A0;WARNING SIGN;So;0;ON;;;;;N;;;;;
+26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;;
+26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A3;DOUBLED MALE SIGN;So;0;ON;;;;;N;;;;;
+26A4;INTERLOCKED FEMALE AND MALE SIGN;So;0;ON;;;;;N;;;;;
+26A5;MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A6;MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A7;MALE WITH STROKE AND MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A8;VERTICAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A9;HORIZONTAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26AA;MEDIUM WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+26AB;MEDIUM BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+26AC;MEDIUM SMALL WHITE CIRCLE;So;0;L;;;;;N;;;;;
+26AD;MARRIAGE SYMBOL;So;0;ON;;;;;N;;;;;
+26AE;DIVORCE SYMBOL;So;0;ON;;;;;N;;;;;
+26AF;UNMARRIED PARTNERSHIP SYMBOL;So;0;ON;;;;;N;;;;;
+26B0;COFFIN;So;0;ON;;;;;N;;;;;
+26B1;FUNERAL URN;So;0;ON;;;;;N;;;;;
+26B2;NEUTER;So;0;ON;;;;;N;;;;;
+26B3;CERES;So;0;ON;;;;;N;;;;;
+26B4;PALLAS;So;0;ON;;;;;N;;;;;
+26B5;JUNO;So;0;ON;;;;;N;;;;;
+26B6;VESTA;So;0;ON;;;;;N;;;;;
+26B7;CHIRON;So;0;ON;;;;;N;;;;;
+26B8;BLACK MOON LILITH;So;0;ON;;;;;N;;;;;
+26B9;SEXTILE;So;0;ON;;;;;N;;;;;
+26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;;
+26BB;QUINCUNX;So;0;ON;;;;;N;;;;;
+26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;;
+26BD;SOCCER BALL;So;0;ON;;;;;N;;;;;
+26BE;BASEBALL;So;0;ON;;;;;N;;;;;
+26BF;SQUARED KEY;So;0;ON;;;;;N;;;;;
+26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C4;SNOWMAN WITHOUT SNOW;So;0;ON;;;;;N;;;;;
+26C5;SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;;
+26C6;RAIN;So;0;ON;;;;;N;;;;;
+26C7;BLACK SNOWMAN;So;0;ON;;;;;N;;;;;
+26C8;THUNDER CLOUD AND RAIN;So;0;ON;;;;;N;;;;;
+26C9;TURNED WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CA;TURNED BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CB;WHITE DIAMOND IN SQUARE;So;0;ON;;;;;N;;;;;
+26CC;CROSSING LANES;So;0;ON;;;;;N;;;;;
+26CD;DISABLED CAR;So;0;ON;;;;;N;;;;;
+26CE;OPHIUCHUS;So;0;ON;;;;;N;;;;;
+26CF;PICK;So;0;ON;;;;;N;;;;;
+26D0;CAR SLIDING;So;0;ON;;;;;N;;;;;
+26D1;HELMET WITH WHITE CROSS;So;0;ON;;;;;N;;;;;
+26D2;CIRCLED CROSSING LANES;So;0;ON;;;;;N;;;;;
+26D3;CHAINS;So;0;ON;;;;;N;;;;;
+26D4;NO ENTRY;So;0;ON;;;;;N;;;;;
+26D5;ALTERNATE ONE-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D6;BLACK TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D7;WHITE TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D8;BLACK LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26D9;WHITE LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26DA;DRIVE SLOW SIGN;So;0;ON;;;;;N;;;;;
+26DB;HEAVY WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+26DC;LEFT CLOSED ENTRY;So;0;ON;;;;;N;;;;;
+26DD;SQUARED SALTIRE;So;0;ON;;;;;N;;;;;
+26DE;FALLING DIAGONAL IN WHITE CIRCLE IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26DF;BLACK TRUCK;So;0;ON;;;;;N;;;;;
+26E0;RESTRICTED LEFT ENTRY-1;So;0;ON;;;;;N;;;;;
+26E1;RESTRICTED LEFT ENTRY-2;So;0;ON;;;;;N;;;;;
+26E2;ASTRONOMICAL SYMBOL FOR URANUS;So;0;ON;;;;;N;;;;;
+26E3;HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE;So;0;ON;;;;;N;;;;;
+26E4;PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E5;RIGHT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E6;LEFT-HANDED INTERLACED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E7;INVERTED PENTAGRAM;So;0;ON;;;;;N;;;;;
+26E8;BLACK CROSS ON SHIELD;So;0;ON;;;;;N;;;;;
+26E9;SHINTO SHRINE;So;0;ON;;;;;N;;;;;
+26EA;CHURCH;So;0;ON;;;;;N;;;;;
+26EB;CASTLE;So;0;ON;;;;;N;;;;;
+26EC;HISTORIC SITE;So;0;ON;;;;;N;;;;;
+26ED;GEAR WITHOUT HUB;So;0;ON;;;;;N;;;;;
+26EE;GEAR WITH HANDLES;So;0;ON;;;;;N;;;;;
+26EF;MAP SYMBOL FOR LIGHTHOUSE;So;0;ON;;;;;N;;;;;
+26F0;MOUNTAIN;So;0;ON;;;;;N;;;;;
+26F1;UMBRELLA ON GROUND;So;0;ON;;;;;N;;;;;
+26F2;FOUNTAIN;So;0;ON;;;;;N;;;;;
+26F3;FLAG IN HOLE;So;0;ON;;;;;N;;;;;
+26F4;FERRY;So;0;ON;;;;;N;;;;;
+26F5;SAILBOAT;So;0;ON;;;;;N;;;;;
+26F6;SQUARE FOUR CORNERS;So;0;ON;;;;;N;;;;;
+26F7;SKIER;So;0;ON;;;;;N;;;;;
+26F8;ICE SKATE;So;0;ON;;;;;N;;;;;
+26F9;PERSON WITH BALL;So;0;ON;;;;;N;;;;;
+26FA;TENT;So;0;ON;;;;;N;;;;;
+26FB;JAPANESE BANK SYMBOL;So;0;ON;;;;;N;;;;;
+26FC;HEADSTONE GRAVEYARD SYMBOL;So;0;ON;;;;;N;;;;;
+26FD;FUEL PUMP;So;0;ON;;;;;N;;;;;
+26FE;CUP ON BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26FF;WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE;So;0;ON;;;;;N;;;;;
+2700;BLACK SAFETY SCISSORS;So;0;ON;;;;;N;;;;;
+2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;;
+2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;;
+2705;WHITE HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
+2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;;
+2707;TAPE DRIVE;So;0;ON;;;;;N;;;;;
+2708;AIRPLANE;So;0;ON;;;;;N;;;;;
+2709;ENVELOPE;So;0;ON;;;;;N;;;;;
+270A;RAISED FIST;So;0;ON;;;;;N;;;;;
+270B;RAISED HAND;So;0;ON;;;;;N;;;;;
+270C;VICTORY HAND;So;0;ON;;;;;N;;;;;
+270D;WRITING HAND;So;0;ON;;;;;N;;;;;
+270E;LOWER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+270F;PENCIL;So;0;ON;;;;;N;;;;;
+2710;UPPER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+2711;WHITE NIB;So;0;ON;;;;;N;;;;;
+2712;BLACK NIB;So;0;ON;;;;;N;;;;;
+2713;CHECK MARK;So;0;ON;;;;;N;;;;;
+2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
+2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2717;BALLOT X;So;0;ON;;;;;N;;;;;
+2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;;
+2719;OUTLINED GREEK CROSS;So;0;ON;;;;;N;;;;;
+271A;HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+271B;OPEN CENTRE CROSS;So;0;ON;;;;;N;OPEN CENTER CROSS;;;;
+271C;HEAVY OPEN CENTRE CROSS;So;0;ON;;;;;N;HEAVY OPEN CENTER CROSS;;;;
+271D;LATIN CROSS;So;0;ON;;;;;N;;;;;
+271E;SHADOWED WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
+271F;OUTLINED LATIN CROSS;So;0;ON;;;;;N;;;;;
+2720;MALTESE CROSS;So;0;ON;;;;;N;;;;;
+2721;STAR OF DAVID;So;0;ON;;;;;N;;;;;
+2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2724;HEAVY FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2725;FOUR CLUB-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2726;BLACK FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2727;WHITE FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2728;SPARKLES;So;0;ON;;;;;N;;;;;
+2729;STRESS OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+272A;CIRCLED WHITE STAR;So;0;ON;;;;;N;;;;;
+272B;OPEN CENTRE BLACK STAR;So;0;ON;;;;;N;OPEN CENTER BLACK STAR;;;;
+272C;BLACK CENTRE WHITE STAR;So;0;ON;;;;;N;BLACK CENTER WHITE STAR;;;;
+272D;OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272E;HEAVY OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272F;PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2730;SHADOWED WHITE STAR;So;0;ON;;;;;N;;;;;
+2731;HEAVY ASTERISK;So;0;ON;;;;;N;;;;;
+2732;OPEN CENTRE ASTERISK;So;0;ON;;;;;N;OPEN CENTER ASTERISK;;;;
+2733;EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2734;EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2735;EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2736;SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2737;EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2738;HEAVY EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2739;TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+273A;SIXTEEN POINTED ASTERISK;So;0;ON;;;;;N;;;;;
+273B;TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273C;OPEN CENTRE TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;OPEN CENTER TEARDROP-SPOKED ASTERISK;;;;
+273D;HEAVY TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273E;SIX PETALLED BLACK AND WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+273F;BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2740;WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+2741;EIGHT PETALLED OUTLINED BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2742;CIRCLED OPEN CENTRE EIGHT POINTED STAR;So;0;ON;;;;;N;CIRCLED OPEN CENTER EIGHT POINTED STAR;;;;
+2743;HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK;So;0;ON;;;;;N;;;;;
+2744;SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2745;TIGHT TRIFOLIATE SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2746;HEAVY CHEVRON SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2747;SPARKLE;So;0;ON;;;;;N;;;;;
+2748;HEAVY SPARKLE;So;0;ON;;;;;N;;;;;
+2749;BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+274A;EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274C;CROSS MARK;So;0;ON;;;;;N;;;;;
+274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+274E;NEGATIVE SQUARED CROSS MARK;So;0;ON;;;;;N;;;;;
+274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2753;BLACK QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2754;WHITE QUESTION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2755;WHITE EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;;
+2757;HEAVY EXCLAMATION MARK SYMBOL;So;0;ON;;;;;N;;;;;
+2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;;
+2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275F;HEAVY LOW SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2760;HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;;
+2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2763;HEAVY HEART EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2764;HEAVY BLACK HEART;So;0;ON;;;;;N;;;;;
+2765;ROTATED HEAVY BLACK HEART BULLET;So;0;ON;;;;;N;;;;;
+2766;FLORAL HEART;So;0;ON;;;;;N;;;;;
+2767;ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+2768;MEDIUM LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2769;MEDIUM RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276A;MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276B;MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276C;MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276D;MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276E;HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276F;HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2770;HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2771;HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2772;LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2773;LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2774;MEDIUM LEFT CURLY BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;;
+2777;DINGBAT NEGATIVE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED DIGIT TWO;;;;
+2778;DINGBAT NEGATIVE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED DIGIT THREE;;;;
+2779;DINGBAT NEGATIVE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED DIGIT FOUR;;;;
+277A;DINGBAT NEGATIVE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED DIGIT FIVE;;;;
+277B;DINGBAT NEGATIVE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED DIGIT SIX;;;;
+277C;DINGBAT NEGATIVE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED DIGIT SEVEN;;;;
+277D;DINGBAT NEGATIVE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED DIGIT EIGHT;;;;
+277E;DINGBAT NEGATIVE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED DIGIT NINE;;;;
+277F;DINGBAT NEGATIVE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED NUMBER TEN;;;;
+2780;DINGBAT CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;CIRCLED SANS-SERIF DIGIT ONE;;;;
+2781;DINGBAT CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;CIRCLED SANS-SERIF DIGIT TWO;;;;
+2782;DINGBAT CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;CIRCLED SANS-SERIF DIGIT THREE;;;;
+2783;DINGBAT CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;CIRCLED SANS-SERIF DIGIT FOUR;;;;
+2784;DINGBAT CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;CIRCLED SANS-SERIF DIGIT FIVE;;;;
+2785;DINGBAT CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;CIRCLED SANS-SERIF DIGIT SIX;;;;
+2786;DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2787;DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2788;DINGBAT CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;CIRCLED SANS-SERIF DIGIT NINE;;;;
+2789;DINGBAT CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;CIRCLED SANS-SERIF NUMBER TEN;;;;
+278A;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED SANS-SERIF DIGIT ONE;;;;
+278B;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED SANS-SERIF DIGIT TWO;;;;
+278C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED SANS-SERIF DIGIT THREE;;;;
+278D;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED SANS-SERIF DIGIT FOUR;;;;
+278E;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED SANS-SERIF DIGIT FIVE;;;;
+278F;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED SANS-SERIF DIGIT SIX;;;;
+2790;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2791;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2792;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED SANS-SERIF DIGIT NINE;;;;
+2793;DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED SANS-SERIF NUMBER TEN;;;;
+2794;HEAVY WIDE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WIDE-HEADED RIGHT ARROW;;;;
+2795;HEAVY PLUS SIGN;So;0;ON;;;;;N;;;;;
+2796;HEAVY MINUS SIGN;So;0;ON;;;;;N;;;;;
+2797;HEAVY DIVISION SIGN;So;0;ON;;;;;N;;;;;
+2798;HEAVY SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT ARROW;;;;
+2799;HEAVY RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY RIGHT ARROW;;;;
+279A;HEAVY NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT ARROW;;;;
+279B;DRAFTING POINT RIGHTWARDS ARROW;So;0;ON;;;;;N;DRAFTING POINT RIGHT ARROW;;;;
+279C;HEAVY ROUND-TIPPED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY ROUND-TIPPED RIGHT ARROW;;;;
+279D;TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;TRIANGLE-HEADED RIGHT ARROW;;;;
+279E;HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TRIANGLE-HEADED RIGHT ARROW;;;;
+279F;DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A0;HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A1;BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK RIGHT ARROW;;;;
+27A2;THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D TOP-LIGHTED RIGHT ARROWHEAD;;;;
+27A3;THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D BOTTOM-LIGHTED RIGHT ARROWHEAD;;;;
+27A4;BLACK RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;BLACK RIGHT ARROWHEAD;;;;
+27A5;HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED DOWN AND RIGHT ARROW;;;;
+27A6;HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED UP AND RIGHT ARROW;;;;
+27A7;SQUAT BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;SQUAT BLACK RIGHT ARROW;;;;
+27A8;HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY CONCAVE-POINTED BLACK RIGHT ARROW;;;;
+27A9;RIGHT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;RIGHT-SHADED WHITE RIGHT ARROW;;;;
+27AA;LEFT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT-SHADED WHITE RIGHT ARROW;;;;
+27AB;BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;BACK-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AC;FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;FRONT-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AD;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AE;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AF;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B0;CURLY LOOP;So;0;ON;;;;;N;;;;;
+27B1;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B2;CIRCLED HEAVY WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;CIRCLED HEAVY WHITE RIGHT ARROW;;;;
+27B3;WHITE-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;WHITE-FEATHERED RIGHT ARROW;;;;
+27B4;BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B5;BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK-FEATHERED RIGHT ARROW;;;;
+27B6;BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27B7;HEAVY BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B8;HEAVY BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED RIGHT ARROW;;;;
+27B9;HEAVY BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27BA;TEARDROP-BARBED RIGHTWARDS ARROW;So;0;ON;;;;;N;TEARDROP-BARBED RIGHT ARROW;;;;
+27BB;HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TEARDROP-SHANKED RIGHT ARROW;;;;
+27BC;WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;WEDGE-TAILED RIGHT ARROW;;;;
+27BD;HEAVY WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WEDGE-TAILED RIGHT ARROW;;;;
+27BE;OPEN-OUTLINED RIGHTWARDS ARROW;So;0;ON;;;;;N;OPEN-OUTLINED RIGHT ARROW;;;;
+27BF;DOUBLE CURLY LOOP;So;0;ON;;;;;N;;;;;
+27C0;THREE DIMENSIONAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+27C1;WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE;Sm;0;ON;;;;;N;;;;;
+27C2;PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+27C3;OPEN SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C4;OPEN SUPERSET;Sm;0;ON;;;;;Y;;;;;
+27C5;LEFT S-SHAPED BAG DELIMITER;Ps;0;ON;;;;;Y;;;;;
+27C6;RIGHT S-SHAPED BAG DELIMITER;Pe;0;ON;;;;;Y;;;;;
+27C7;OR WITH DOT INSIDE;Sm;0;ON;;;;;N;;;;;
+27C8;REVERSE SOLIDUS PRECEDING SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C9;SUPERSET PRECEDING SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+27CA;VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+27CB;MATHEMATICAL RISING DIAGONAL;Sm;0;ON;;;;;Y;;;;;
+27CC;LONG DIVISION;Sm;0;ON;;;;;Y;;;;;
+27CD;MATHEMATICAL FALLING DIAGONAL;Sm;0;ON;;;;;Y;;;;;
+27CE;SQUARED LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+27CF;SQUARED LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+27D0;WHITE DIAMOND WITH CENTRED DOT;Sm;0;ON;;;;;N;;;;;
+27D1;AND WITH DOT;Sm;0;ON;;;;;N;;;;;
+27D2;ELEMENT OF OPENING UPWARDS;Sm;0;ON;;;;;N;;;;;
+27D3;LOWER RIGHT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D4;UPPER LEFT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D5;LEFT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D6;RIGHT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D7;FULL OUTER JOIN;Sm;0;ON;;;;;N;;;;;
+27D8;LARGE UP TACK;Sm;0;ON;;;;;N;;;;;
+27D9;LARGE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+27DA;LEFT AND RIGHT DOUBLE TURNSTILE;Sm;0;ON;;;;;N;;;;;
+27DB;LEFT AND RIGHT TACK;Sm;0;ON;;;;;N;;;;;
+27DC;LEFT MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+27DD;LONG RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+27DE;LONG LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+27DF;UP TACK WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+27E0;LOZENGE DIVIDED BY HORIZONTAL RULE;Sm;0;ON;;;;;N;;;;;
+27E1;WHITE CONCAVE-SIDED DIAMOND;Sm;0;ON;;;;;N;;;;;
+27E2;WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E3;WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E4;WHITE SQUARE WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E5;WHITE SQUARE WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E6;MATHEMATICAL LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E7;MATHEMATICAL RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27E8;MATHEMATICAL LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E9;MATHEMATICAL RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EA;MATHEMATICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27EB;MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EC;MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+27ED;MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EE;MATHEMATICAL LEFT FLATTENED PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+27EF;MATHEMATICAL RIGHT FLATTENED PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+27F0;UPWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F1;DOWNWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F2;ANTICLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F3;CLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F4;RIGHT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+27F5;LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F6;LONG RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F7;LONG LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+27F8;LONG LEFTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F9;LONG RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FA;LONG LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FB;LONG LEFTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FC;LONG RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FD;LONG LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FE;LONG RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FF;LONG RIGHTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2800;BRAILLE PATTERN BLANK;So;0;L;;;;;N;;;;;
+2801;BRAILLE PATTERN DOTS-1;So;0;L;;;;;N;;;;;
+2802;BRAILLE PATTERN DOTS-2;So;0;L;;;;;N;;;;;
+2803;BRAILLE PATTERN DOTS-12;So;0;L;;;;;N;;;;;
+2804;BRAILLE PATTERN DOTS-3;So;0;L;;;;;N;;;;;
+2805;BRAILLE PATTERN DOTS-13;So;0;L;;;;;N;;;;;
+2806;BRAILLE PATTERN DOTS-23;So;0;L;;;;;N;;;;;
+2807;BRAILLE PATTERN DOTS-123;So;0;L;;;;;N;;;;;
+2808;BRAILLE PATTERN DOTS-4;So;0;L;;;;;N;;;;;
+2809;BRAILLE PATTERN DOTS-14;So;0;L;;;;;N;;;;;
+280A;BRAILLE PATTERN DOTS-24;So;0;L;;;;;N;;;;;
+280B;BRAILLE PATTERN DOTS-124;So;0;L;;;;;N;;;;;
+280C;BRAILLE PATTERN DOTS-34;So;0;L;;;;;N;;;;;
+280D;BRAILLE PATTERN DOTS-134;So;0;L;;;;;N;;;;;
+280E;BRAILLE PATTERN DOTS-234;So;0;L;;;;;N;;;;;
+280F;BRAILLE PATTERN DOTS-1234;So;0;L;;;;;N;;;;;
+2810;BRAILLE PATTERN DOTS-5;So;0;L;;;;;N;;;;;
+2811;BRAILLE PATTERN DOTS-15;So;0;L;;;;;N;;;;;
+2812;BRAILLE PATTERN DOTS-25;So;0;L;;;;;N;;;;;
+2813;BRAILLE PATTERN DOTS-125;So;0;L;;;;;N;;;;;
+2814;BRAILLE PATTERN DOTS-35;So;0;L;;;;;N;;;;;
+2815;BRAILLE PATTERN DOTS-135;So;0;L;;;;;N;;;;;
+2816;BRAILLE PATTERN DOTS-235;So;0;L;;;;;N;;;;;
+2817;BRAILLE PATTERN DOTS-1235;So;0;L;;;;;N;;;;;
+2818;BRAILLE PATTERN DOTS-45;So;0;L;;;;;N;;;;;
+2819;BRAILLE PATTERN DOTS-145;So;0;L;;;;;N;;;;;
+281A;BRAILLE PATTERN DOTS-245;So;0;L;;;;;N;;;;;
+281B;BRAILLE PATTERN DOTS-1245;So;0;L;;;;;N;;;;;
+281C;BRAILLE PATTERN DOTS-345;So;0;L;;;;;N;;;;;
+281D;BRAILLE PATTERN DOTS-1345;So;0;L;;;;;N;;;;;
+281E;BRAILLE PATTERN DOTS-2345;So;0;L;;;;;N;;;;;
+281F;BRAILLE PATTERN DOTS-12345;So;0;L;;;;;N;;;;;
+2820;BRAILLE PATTERN DOTS-6;So;0;L;;;;;N;;;;;
+2821;BRAILLE PATTERN DOTS-16;So;0;L;;;;;N;;;;;
+2822;BRAILLE PATTERN DOTS-26;So;0;L;;;;;N;;;;;
+2823;BRAILLE PATTERN DOTS-126;So;0;L;;;;;N;;;;;
+2824;BRAILLE PATTERN DOTS-36;So;0;L;;;;;N;;;;;
+2825;BRAILLE PATTERN DOTS-136;So;0;L;;;;;N;;;;;
+2826;BRAILLE PATTERN DOTS-236;So;0;L;;;;;N;;;;;
+2827;BRAILLE PATTERN DOTS-1236;So;0;L;;;;;N;;;;;
+2828;BRAILLE PATTERN DOTS-46;So;0;L;;;;;N;;;;;
+2829;BRAILLE PATTERN DOTS-146;So;0;L;;;;;N;;;;;
+282A;BRAILLE PATTERN DOTS-246;So;0;L;;;;;N;;;;;
+282B;BRAILLE PATTERN DOTS-1246;So;0;L;;;;;N;;;;;
+282C;BRAILLE PATTERN DOTS-346;So;0;L;;;;;N;;;;;
+282D;BRAILLE PATTERN DOTS-1346;So;0;L;;;;;N;;;;;
+282E;BRAILLE PATTERN DOTS-2346;So;0;L;;;;;N;;;;;
+282F;BRAILLE PATTERN DOTS-12346;So;0;L;;;;;N;;;;;
+2830;BRAILLE PATTERN DOTS-56;So;0;L;;;;;N;;;;;
+2831;BRAILLE PATTERN DOTS-156;So;0;L;;;;;N;;;;;
+2832;BRAILLE PATTERN DOTS-256;So;0;L;;;;;N;;;;;
+2833;BRAILLE PATTERN DOTS-1256;So;0;L;;;;;N;;;;;
+2834;BRAILLE PATTERN DOTS-356;So;0;L;;;;;N;;;;;
+2835;BRAILLE PATTERN DOTS-1356;So;0;L;;;;;N;;;;;
+2836;BRAILLE PATTERN DOTS-2356;So;0;L;;;;;N;;;;;
+2837;BRAILLE PATTERN DOTS-12356;So;0;L;;;;;N;;;;;
+2838;BRAILLE PATTERN DOTS-456;So;0;L;;;;;N;;;;;
+2839;BRAILLE PATTERN DOTS-1456;So;0;L;;;;;N;;;;;
+283A;BRAILLE PATTERN DOTS-2456;So;0;L;;;;;N;;;;;
+283B;BRAILLE PATTERN DOTS-12456;So;0;L;;;;;N;;;;;
+283C;BRAILLE PATTERN DOTS-3456;So;0;L;;;;;N;;;;;
+283D;BRAILLE PATTERN DOTS-13456;So;0;L;;;;;N;;;;;
+283E;BRAILLE PATTERN DOTS-23456;So;0;L;;;;;N;;;;;
+283F;BRAILLE PATTERN DOTS-123456;So;0;L;;;;;N;;;;;
+2840;BRAILLE PATTERN DOTS-7;So;0;L;;;;;N;;;;;
+2841;BRAILLE PATTERN DOTS-17;So;0;L;;;;;N;;;;;
+2842;BRAILLE PATTERN DOTS-27;So;0;L;;;;;N;;;;;
+2843;BRAILLE PATTERN DOTS-127;So;0;L;;;;;N;;;;;
+2844;BRAILLE PATTERN DOTS-37;So;0;L;;;;;N;;;;;
+2845;BRAILLE PATTERN DOTS-137;So;0;L;;;;;N;;;;;
+2846;BRAILLE PATTERN DOTS-237;So;0;L;;;;;N;;;;;
+2847;BRAILLE PATTERN DOTS-1237;So;0;L;;;;;N;;;;;
+2848;BRAILLE PATTERN DOTS-47;So;0;L;;;;;N;;;;;
+2849;BRAILLE PATTERN DOTS-147;So;0;L;;;;;N;;;;;
+284A;BRAILLE PATTERN DOTS-247;So;0;L;;;;;N;;;;;
+284B;BRAILLE PATTERN DOTS-1247;So;0;L;;;;;N;;;;;
+284C;BRAILLE PATTERN DOTS-347;So;0;L;;;;;N;;;;;
+284D;BRAILLE PATTERN DOTS-1347;So;0;L;;;;;N;;;;;
+284E;BRAILLE PATTERN DOTS-2347;So;0;L;;;;;N;;;;;
+284F;BRAILLE PATTERN DOTS-12347;So;0;L;;;;;N;;;;;
+2850;BRAILLE PATTERN DOTS-57;So;0;L;;;;;N;;;;;
+2851;BRAILLE PATTERN DOTS-157;So;0;L;;;;;N;;;;;
+2852;BRAILLE PATTERN DOTS-257;So;0;L;;;;;N;;;;;
+2853;BRAILLE PATTERN DOTS-1257;So;0;L;;;;;N;;;;;
+2854;BRAILLE PATTERN DOTS-357;So;0;L;;;;;N;;;;;
+2855;BRAILLE PATTERN DOTS-1357;So;0;L;;;;;N;;;;;
+2856;BRAILLE PATTERN DOTS-2357;So;0;L;;;;;N;;;;;
+2857;BRAILLE PATTERN DOTS-12357;So;0;L;;;;;N;;;;;
+2858;BRAILLE PATTERN DOTS-457;So;0;L;;;;;N;;;;;
+2859;BRAILLE PATTERN DOTS-1457;So;0;L;;;;;N;;;;;
+285A;BRAILLE PATTERN DOTS-2457;So;0;L;;;;;N;;;;;
+285B;BRAILLE PATTERN DOTS-12457;So;0;L;;;;;N;;;;;
+285C;BRAILLE PATTERN DOTS-3457;So;0;L;;;;;N;;;;;
+285D;BRAILLE PATTERN DOTS-13457;So;0;L;;;;;N;;;;;
+285E;BRAILLE PATTERN DOTS-23457;So;0;L;;;;;N;;;;;
+285F;BRAILLE PATTERN DOTS-123457;So;0;L;;;;;N;;;;;
+2860;BRAILLE PATTERN DOTS-67;So;0;L;;;;;N;;;;;
+2861;BRAILLE PATTERN DOTS-167;So;0;L;;;;;N;;;;;
+2862;BRAILLE PATTERN DOTS-267;So;0;L;;;;;N;;;;;
+2863;BRAILLE PATTERN DOTS-1267;So;0;L;;;;;N;;;;;
+2864;BRAILLE PATTERN DOTS-367;So;0;L;;;;;N;;;;;
+2865;BRAILLE PATTERN DOTS-1367;So;0;L;;;;;N;;;;;
+2866;BRAILLE PATTERN DOTS-2367;So;0;L;;;;;N;;;;;
+2867;BRAILLE PATTERN DOTS-12367;So;0;L;;;;;N;;;;;
+2868;BRAILLE PATTERN DOTS-467;So;0;L;;;;;N;;;;;
+2869;BRAILLE PATTERN DOTS-1467;So;0;L;;;;;N;;;;;
+286A;BRAILLE PATTERN DOTS-2467;So;0;L;;;;;N;;;;;
+286B;BRAILLE PATTERN DOTS-12467;So;0;L;;;;;N;;;;;
+286C;BRAILLE PATTERN DOTS-3467;So;0;L;;;;;N;;;;;
+286D;BRAILLE PATTERN DOTS-13467;So;0;L;;;;;N;;;;;
+286E;BRAILLE PATTERN DOTS-23467;So;0;L;;;;;N;;;;;
+286F;BRAILLE PATTERN DOTS-123467;So;0;L;;;;;N;;;;;
+2870;BRAILLE PATTERN DOTS-567;So;0;L;;;;;N;;;;;
+2871;BRAILLE PATTERN DOTS-1567;So;0;L;;;;;N;;;;;
+2872;BRAILLE PATTERN DOTS-2567;So;0;L;;;;;N;;;;;
+2873;BRAILLE PATTERN DOTS-12567;So;0;L;;;;;N;;;;;
+2874;BRAILLE PATTERN DOTS-3567;So;0;L;;;;;N;;;;;
+2875;BRAILLE PATTERN DOTS-13567;So;0;L;;;;;N;;;;;
+2876;BRAILLE PATTERN DOTS-23567;So;0;L;;;;;N;;;;;
+2877;BRAILLE PATTERN DOTS-123567;So;0;L;;;;;N;;;;;
+2878;BRAILLE PATTERN DOTS-4567;So;0;L;;;;;N;;;;;
+2879;BRAILLE PATTERN DOTS-14567;So;0;L;;;;;N;;;;;
+287A;BRAILLE PATTERN DOTS-24567;So;0;L;;;;;N;;;;;
+287B;BRAILLE PATTERN DOTS-124567;So;0;L;;;;;N;;;;;
+287C;BRAILLE PATTERN DOTS-34567;So;0;L;;;;;N;;;;;
+287D;BRAILLE PATTERN DOTS-134567;So;0;L;;;;;N;;;;;
+287E;BRAILLE PATTERN DOTS-234567;So;0;L;;;;;N;;;;;
+287F;BRAILLE PATTERN DOTS-1234567;So;0;L;;;;;N;;;;;
+2880;BRAILLE PATTERN DOTS-8;So;0;L;;;;;N;;;;;
+2881;BRAILLE PATTERN DOTS-18;So;0;L;;;;;N;;;;;
+2882;BRAILLE PATTERN DOTS-28;So;0;L;;;;;N;;;;;
+2883;BRAILLE PATTERN DOTS-128;So;0;L;;;;;N;;;;;
+2884;BRAILLE PATTERN DOTS-38;So;0;L;;;;;N;;;;;
+2885;BRAILLE PATTERN DOTS-138;So;0;L;;;;;N;;;;;
+2886;BRAILLE PATTERN DOTS-238;So;0;L;;;;;N;;;;;
+2887;BRAILLE PATTERN DOTS-1238;So;0;L;;;;;N;;;;;
+2888;BRAILLE PATTERN DOTS-48;So;0;L;;;;;N;;;;;
+2889;BRAILLE PATTERN DOTS-148;So;0;L;;;;;N;;;;;
+288A;BRAILLE PATTERN DOTS-248;So;0;L;;;;;N;;;;;
+288B;BRAILLE PATTERN DOTS-1248;So;0;L;;;;;N;;;;;
+288C;BRAILLE PATTERN DOTS-348;So;0;L;;;;;N;;;;;
+288D;BRAILLE PATTERN DOTS-1348;So;0;L;;;;;N;;;;;
+288E;BRAILLE PATTERN DOTS-2348;So;0;L;;;;;N;;;;;
+288F;BRAILLE PATTERN DOTS-12348;So;0;L;;;;;N;;;;;
+2890;BRAILLE PATTERN DOTS-58;So;0;L;;;;;N;;;;;
+2891;BRAILLE PATTERN DOTS-158;So;0;L;;;;;N;;;;;
+2892;BRAILLE PATTERN DOTS-258;So;0;L;;;;;N;;;;;
+2893;BRAILLE PATTERN DOTS-1258;So;0;L;;;;;N;;;;;
+2894;BRAILLE PATTERN DOTS-358;So;0;L;;;;;N;;;;;
+2895;BRAILLE PATTERN DOTS-1358;So;0;L;;;;;N;;;;;
+2896;BRAILLE PATTERN DOTS-2358;So;0;L;;;;;N;;;;;
+2897;BRAILLE PATTERN DOTS-12358;So;0;L;;;;;N;;;;;
+2898;BRAILLE PATTERN DOTS-458;So;0;L;;;;;N;;;;;
+2899;BRAILLE PATTERN DOTS-1458;So;0;L;;;;;N;;;;;
+289A;BRAILLE PATTERN DOTS-2458;So;0;L;;;;;N;;;;;
+289B;BRAILLE PATTERN DOTS-12458;So;0;L;;;;;N;;;;;
+289C;BRAILLE PATTERN DOTS-3458;So;0;L;;;;;N;;;;;
+289D;BRAILLE PATTERN DOTS-13458;So;0;L;;;;;N;;;;;
+289E;BRAILLE PATTERN DOTS-23458;So;0;L;;;;;N;;;;;
+289F;BRAILLE PATTERN DOTS-123458;So;0;L;;;;;N;;;;;
+28A0;BRAILLE PATTERN DOTS-68;So;0;L;;;;;N;;;;;
+28A1;BRAILLE PATTERN DOTS-168;So;0;L;;;;;N;;;;;
+28A2;BRAILLE PATTERN DOTS-268;So;0;L;;;;;N;;;;;
+28A3;BRAILLE PATTERN DOTS-1268;So;0;L;;;;;N;;;;;
+28A4;BRAILLE PATTERN DOTS-368;So;0;L;;;;;N;;;;;
+28A5;BRAILLE PATTERN DOTS-1368;So;0;L;;;;;N;;;;;
+28A6;BRAILLE PATTERN DOTS-2368;So;0;L;;;;;N;;;;;
+28A7;BRAILLE PATTERN DOTS-12368;So;0;L;;;;;N;;;;;
+28A8;BRAILLE PATTERN DOTS-468;So;0;L;;;;;N;;;;;
+28A9;BRAILLE PATTERN DOTS-1468;So;0;L;;;;;N;;;;;
+28AA;BRAILLE PATTERN DOTS-2468;So;0;L;;;;;N;;;;;
+28AB;BRAILLE PATTERN DOTS-12468;So;0;L;;;;;N;;;;;
+28AC;BRAILLE PATTERN DOTS-3468;So;0;L;;;;;N;;;;;
+28AD;BRAILLE PATTERN DOTS-13468;So;0;L;;;;;N;;;;;
+28AE;BRAILLE PATTERN DOTS-23468;So;0;L;;;;;N;;;;;
+28AF;BRAILLE PATTERN DOTS-123468;So;0;L;;;;;N;;;;;
+28B0;BRAILLE PATTERN DOTS-568;So;0;L;;;;;N;;;;;
+28B1;BRAILLE PATTERN DOTS-1568;So;0;L;;;;;N;;;;;
+28B2;BRAILLE PATTERN DOTS-2568;So;0;L;;;;;N;;;;;
+28B3;BRAILLE PATTERN DOTS-12568;So;0;L;;;;;N;;;;;
+28B4;BRAILLE PATTERN DOTS-3568;So;0;L;;;;;N;;;;;
+28B5;BRAILLE PATTERN DOTS-13568;So;0;L;;;;;N;;;;;
+28B6;BRAILLE PATTERN DOTS-23568;So;0;L;;;;;N;;;;;
+28B7;BRAILLE PATTERN DOTS-123568;So;0;L;;;;;N;;;;;
+28B8;BRAILLE PATTERN DOTS-4568;So;0;L;;;;;N;;;;;
+28B9;BRAILLE PATTERN DOTS-14568;So;0;L;;;;;N;;;;;
+28BA;BRAILLE PATTERN DOTS-24568;So;0;L;;;;;N;;;;;
+28BB;BRAILLE PATTERN DOTS-124568;So;0;L;;;;;N;;;;;
+28BC;BRAILLE PATTERN DOTS-34568;So;0;L;;;;;N;;;;;
+28BD;BRAILLE PATTERN DOTS-134568;So;0;L;;;;;N;;;;;
+28BE;BRAILLE PATTERN DOTS-234568;So;0;L;;;;;N;;;;;
+28BF;BRAILLE PATTERN DOTS-1234568;So;0;L;;;;;N;;;;;
+28C0;BRAILLE PATTERN DOTS-78;So;0;L;;;;;N;;;;;
+28C1;BRAILLE PATTERN DOTS-178;So;0;L;;;;;N;;;;;
+28C2;BRAILLE PATTERN DOTS-278;So;0;L;;;;;N;;;;;
+28C3;BRAILLE PATTERN DOTS-1278;So;0;L;;;;;N;;;;;
+28C4;BRAILLE PATTERN DOTS-378;So;0;L;;;;;N;;;;;
+28C5;BRAILLE PATTERN DOTS-1378;So;0;L;;;;;N;;;;;
+28C6;BRAILLE PATTERN DOTS-2378;So;0;L;;;;;N;;;;;
+28C7;BRAILLE PATTERN DOTS-12378;So;0;L;;;;;N;;;;;
+28C8;BRAILLE PATTERN DOTS-478;So;0;L;;;;;N;;;;;
+28C9;BRAILLE PATTERN DOTS-1478;So;0;L;;;;;N;;;;;
+28CA;BRAILLE PATTERN DOTS-2478;So;0;L;;;;;N;;;;;
+28CB;BRAILLE PATTERN DOTS-12478;So;0;L;;;;;N;;;;;
+28CC;BRAILLE PATTERN DOTS-3478;So;0;L;;;;;N;;;;;
+28CD;BRAILLE PATTERN DOTS-13478;So;0;L;;;;;N;;;;;
+28CE;BRAILLE PATTERN DOTS-23478;So;0;L;;;;;N;;;;;
+28CF;BRAILLE PATTERN DOTS-123478;So;0;L;;;;;N;;;;;
+28D0;BRAILLE PATTERN DOTS-578;So;0;L;;;;;N;;;;;
+28D1;BRAILLE PATTERN DOTS-1578;So;0;L;;;;;N;;;;;
+28D2;BRAILLE PATTERN DOTS-2578;So;0;L;;;;;N;;;;;
+28D3;BRAILLE PATTERN DOTS-12578;So;0;L;;;;;N;;;;;
+28D4;BRAILLE PATTERN DOTS-3578;So;0;L;;;;;N;;;;;
+28D5;BRAILLE PATTERN DOTS-13578;So;0;L;;;;;N;;;;;
+28D6;BRAILLE PATTERN DOTS-23578;So;0;L;;;;;N;;;;;
+28D7;BRAILLE PATTERN DOTS-123578;So;0;L;;;;;N;;;;;
+28D8;BRAILLE PATTERN DOTS-4578;So;0;L;;;;;N;;;;;
+28D9;BRAILLE PATTERN DOTS-14578;So;0;L;;;;;N;;;;;
+28DA;BRAILLE PATTERN DOTS-24578;So;0;L;;;;;N;;;;;
+28DB;BRAILLE PATTERN DOTS-124578;So;0;L;;;;;N;;;;;
+28DC;BRAILLE PATTERN DOTS-34578;So;0;L;;;;;N;;;;;
+28DD;BRAILLE PATTERN DOTS-134578;So;0;L;;;;;N;;;;;
+28DE;BRAILLE PATTERN DOTS-234578;So;0;L;;;;;N;;;;;
+28DF;BRAILLE PATTERN DOTS-1234578;So;0;L;;;;;N;;;;;
+28E0;BRAILLE PATTERN DOTS-678;So;0;L;;;;;N;;;;;
+28E1;BRAILLE PATTERN DOTS-1678;So;0;L;;;;;N;;;;;
+28E2;BRAILLE PATTERN DOTS-2678;So;0;L;;;;;N;;;;;
+28E3;BRAILLE PATTERN DOTS-12678;So;0;L;;;;;N;;;;;
+28E4;BRAILLE PATTERN DOTS-3678;So;0;L;;;;;N;;;;;
+28E5;BRAILLE PATTERN DOTS-13678;So;0;L;;;;;N;;;;;
+28E6;BRAILLE PATTERN DOTS-23678;So;0;L;;;;;N;;;;;
+28E7;BRAILLE PATTERN DOTS-123678;So;0;L;;;;;N;;;;;
+28E8;BRAILLE PATTERN DOTS-4678;So;0;L;;;;;N;;;;;
+28E9;BRAILLE PATTERN DOTS-14678;So;0;L;;;;;N;;;;;
+28EA;BRAILLE PATTERN DOTS-24678;So;0;L;;;;;N;;;;;
+28EB;BRAILLE PATTERN DOTS-124678;So;0;L;;;;;N;;;;;
+28EC;BRAILLE PATTERN DOTS-34678;So;0;L;;;;;N;;;;;
+28ED;BRAILLE PATTERN DOTS-134678;So;0;L;;;;;N;;;;;
+28EE;BRAILLE PATTERN DOTS-234678;So;0;L;;;;;N;;;;;
+28EF;BRAILLE PATTERN DOTS-1234678;So;0;L;;;;;N;;;;;
+28F0;BRAILLE PATTERN DOTS-5678;So;0;L;;;;;N;;;;;
+28F1;BRAILLE PATTERN DOTS-15678;So;0;L;;;;;N;;;;;
+28F2;BRAILLE PATTERN DOTS-25678;So;0;L;;;;;N;;;;;
+28F3;BRAILLE PATTERN DOTS-125678;So;0;L;;;;;N;;;;;
+28F4;BRAILLE PATTERN DOTS-35678;So;0;L;;;;;N;;;;;
+28F5;BRAILLE PATTERN DOTS-135678;So;0;L;;;;;N;;;;;
+28F6;BRAILLE PATTERN DOTS-235678;So;0;L;;;;;N;;;;;
+28F7;BRAILLE PATTERN DOTS-1235678;So;0;L;;;;;N;;;;;
+28F8;BRAILLE PATTERN DOTS-45678;So;0;L;;;;;N;;;;;
+28F9;BRAILLE PATTERN DOTS-145678;So;0;L;;;;;N;;;;;
+28FA;BRAILLE PATTERN DOTS-245678;So;0;L;;;;;N;;;;;
+28FB;BRAILLE PATTERN DOTS-1245678;So;0;L;;;;;N;;;;;
+28FC;BRAILLE PATTERN DOTS-345678;So;0;L;;;;;N;;;;;
+28FD;BRAILLE PATTERN DOTS-1345678;So;0;L;;;;;N;;;;;
+28FE;BRAILLE PATTERN DOTS-2345678;So;0;L;;;;;N;;;;;
+28FF;BRAILLE PATTERN DOTS-12345678;So;0;L;;;;;N;;;;;
+2900;RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2901;RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2902;LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2903;RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2904;LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2905;RIGHTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2906;LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2907;RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2908;DOWNWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2909;UPWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+290A;UPWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290B;DOWNWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290C;LEFTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290D;RIGHTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290E;LEFTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290F;RIGHTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2910;RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2911;RIGHTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2912;UPWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2913;DOWNWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2914;RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2915;RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2916;RIGHTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2917;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2918;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2919;LEFTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291A;RIGHTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291B;LEFTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291C;RIGHTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291D;LEFTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291E;RIGHTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291F;LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2920;RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2921;NORTH WEST AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2922;NORTH EAST AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2923;NORTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2924;NORTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2925;SOUTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2926;SOUTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2927;NORTH WEST ARROW AND NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2928;NORTH EAST ARROW AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2929;SOUTH EAST ARROW AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292A;SOUTH WEST ARROW AND NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292B;RISING DIAGONAL CROSSING FALLING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292C;FALLING DIAGONAL CROSSING RISING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292D;SOUTH EAST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292E;NORTH EAST ARROW CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292F;FALLING DIAGONAL CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2930;RISING DIAGONAL CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2931;NORTH EAST ARROW CROSSING NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2932;NORTH WEST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2933;WAVE ARROW POINTING DIRECTLY RIGHT;Sm;0;ON;;;;;N;;;;;
+2934;ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS;Sm;0;ON;;;;;N;;;;;
+2935;ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2936;ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS;Sm;0;ON;;;;;N;;;;;
+2937;ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS;Sm;0;ON;;;;;N;;;;;
+2938;RIGHT-SIDE ARC CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2939;LEFT-SIDE ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293A;TOP ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293B;BOTTOM ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293C;TOP ARC CLOCKWISE ARROW WITH MINUS;Sm;0;ON;;;;;N;;;;;
+293D;TOP ARC ANTICLOCKWISE ARROW WITH PLUS;Sm;0;ON;;;;;N;;;;;
+293E;LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293F;LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2940;ANTICLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2941;CLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2942;RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2943;LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2944;SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2945;RIGHTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2946;LEFTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2947;RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2948;LEFT RIGHT ARROW THROUGH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2949;UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+294A;LEFT BARB UP RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+294B;LEFT BARB DOWN RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294C;UP BARB RIGHT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+294D;UP BARB LEFT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+294E;LEFT BARB UP RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294F;UP BARB RIGHT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+2950;LEFT BARB DOWN RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+2951;UP BARB LEFT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+2952;LEFTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2953;RIGHTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2954;UPWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2955;DOWNWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2956;LEFTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2957;RIGHTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2958;UPWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+2959;DOWNWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+295A;LEFTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295B;RIGHTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295C;UPWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295D;DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295E;LEFTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+295F;RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+2960;UPWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2961;DOWNWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2962;LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2963;UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2964;RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2965;DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2966;LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2967;LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2968;RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2969;RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+296A;LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296B;LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296C;RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296D;RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296E;UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+296F;DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2970;RIGHT DOUBLE ARROW WITH ROUNDED HEAD;Sm;0;ON;;;;;N;;;;;
+2971;EQUALS SIGN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2972;TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2973;LEFTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2974;RIGHTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2975;RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2976;LESS-THAN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2977;LEFTWARDS ARROW THROUGH LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2978;GREATER-THAN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2979;SUBSET ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297A;LEFTWARDS ARROW THROUGH SUBSET;Sm;0;ON;;;;;N;;;;;
+297B;SUPERSET ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297C;LEFT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297D;RIGHT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297E;UP FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297F;DOWN FISH TAIL;Sm;0;ON;;;;;N;;;;;
+2980;TRIPLE VERTICAL BAR DELIMITER;Sm;0;ON;;;;;N;;;;;
+2981;Z NOTATION SPOT;Sm;0;ON;;;;;N;;;;;
+2982;Z NOTATION TYPE COLON;Sm;0;ON;;;;;N;;;;;
+2983;LEFT WHITE CURLY BRACKET;Ps;0;ON;;;;;Y;;;;;
+2984;RIGHT WHITE CURLY BRACKET;Pe;0;ON;;;;;Y;;;;;
+2985;LEFT WHITE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2986;RIGHT WHITE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2987;Z NOTATION LEFT IMAGE BRACKET;Ps;0;ON;;;;;Y;;;;;
+2988;Z NOTATION RIGHT IMAGE BRACKET;Pe;0;ON;;;;;Y;;;;;
+2989;Z NOTATION LEFT BINDING BRACKET;Ps;0;ON;;;;;Y;;;;;
+298A;Z NOTATION RIGHT BINDING BRACKET;Pe;0;ON;;;;;Y;;;;;
+298B;LEFT SQUARE BRACKET WITH UNDERBAR;Ps;0;ON;;;;;Y;;;;;
+298C;RIGHT SQUARE BRACKET WITH UNDERBAR;Pe;0;ON;;;;;Y;;;;;
+298D;LEFT SQUARE BRACKET WITH TICK IN TOP CORNER;Ps;0;ON;;;;;Y;;;;;
+298E;RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Pe;0;ON;;;;;Y;;;;;
+298F;LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Ps;0;ON;;;;;Y;;;;;
+2990;RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER;Pe;0;ON;;;;;Y;;;;;
+2991;LEFT ANGLE BRACKET WITH DOT;Ps;0;ON;;;;;Y;;;;;
+2992;RIGHT ANGLE BRACKET WITH DOT;Pe;0;ON;;;;;Y;;;;;
+2993;LEFT ARC LESS-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2994;RIGHT ARC GREATER-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2995;DOUBLE LEFT ARC GREATER-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2996;DOUBLE RIGHT ARC LESS-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2997;LEFT BLACK TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+2998;RIGHT BLACK TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+2999;DOTTED FENCE;Sm;0;ON;;;;;N;;;;;
+299A;VERTICAL ZIGZAG LINE;Sm;0;ON;;;;;N;;;;;
+299B;MEASURED ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+299C;RIGHT ANGLE VARIANT WITH SQUARE;Sm;0;ON;;;;;Y;;;;;
+299D;MEASURED RIGHT ANGLE WITH DOT;Sm;0;ON;;;;;Y;;;;;
+299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
+299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A5;REVERSED ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A6;OBLIQUE ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A7;OBLIQUE ANGLE OPENING DOWN;Sm;0;ON;;;;;Y;;;;;
+29A8;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29A9;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AA;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29AB;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AC;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AD;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AE;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29AF;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29B0;REVERSED EMPTY SET;Sm;0;ON;;;;;N;;;;;
+29B1;EMPTY SET WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+29B2;EMPTY SET WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+29B3;EMPTY SET WITH RIGHT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B4;EMPTY SET WITH LEFT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B5;CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;;
+29B6;CIRCLED VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29B7;CIRCLED PARALLEL;Sm;0;ON;;;;;N;;;;;
+29B8;CIRCLED REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29B9;CIRCLED PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+29BA;CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29BB;CIRCLE WITH SUPERIMPOSED X;Sm;0;ON;;;;;N;;;;;
+29BC;CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+29BD;UP ARROW THROUGH CIRCLE;Sm;0;ON;;;;;N;;;;;
+29BE;CIRCLED WHITE BULLET;Sm;0;ON;;;;;N;;;;;
+29BF;CIRCLED BULLET;Sm;0;ON;;;;;N;;;;;
+29C0;CIRCLED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+29C1;CIRCLED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+29C2;CIRCLE WITH SMALL CIRCLE TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C3;CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C4;SQUARED RISING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C5;SQUARED FALLING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C6;SQUARED ASTERISK;Sm;0;ON;;;;;N;;;;;
+29C7;SQUARED SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+29C8;SQUARED SQUARE;Sm;0;ON;;;;;N;;;;;
+29C9;TWO JOINED SQUARES;Sm;0;ON;;;;;Y;;;;;
+29CA;TRIANGLE WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+29CB;TRIANGLE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+29CC;S IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+29CD;TRIANGLE WITH SERIFS AT BOTTOM;Sm;0;ON;;;;;N;;;;;
+29CE;RIGHT TRIANGLE ABOVE LEFT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29CF;LEFT TRIANGLE BESIDE VERTICAL BAR;Sm;0;ON;;;;;Y;;;;;
+29D0;VERTICAL BAR BESIDE RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29D1;BOWTIE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D2;BOWTIE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D3;BLACK BOWTIE;Sm;0;ON;;;;;N;;;;;
+29D4;TIMES WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D5;TIMES WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D6;WHITE HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D7;BLACK HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D8;LEFT WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29D9;RIGHT WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DA;LEFT DOUBLE WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29DB;RIGHT DOUBLE WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DC;INCOMPLETE INFINITY;Sm;0;ON;;;;;Y;;;;;
+29DD;TIE OVER INFINITY;Sm;0;ON;;;;;N;;;;;
+29DE;INFINITY NEGATED WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29DF;DOUBLE-ENDED MULTIMAP;Sm;0;ON;;;;;N;;;;;
+29E0;SQUARE WITH CONTOURED OUTLINE;Sm;0;ON;;;;;N;;;;;
+29E1;INCREASES AS;Sm;0;ON;;;;;Y;;;;;
+29E2;SHUFFLE PRODUCT;Sm;0;ON;;;;;N;;;;;
+29E3;EQUALS SIGN AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E4;EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+29E5;IDENTICAL TO AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E6;GLEICH STARK;Sm;0;ON;;;;;N;;;;;
+29E7;THERMODYNAMIC;Sm;0;ON;;;;;N;;;;;
+29E8;DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29E9;DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29EA;BLACK DIAMOND WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EB;BLACK LOZENGE;Sm;0;ON;;;;;N;;;;;
+29EC;WHITE CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29ED;BLACK CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EE;ERROR-BARRED WHITE SQUARE;Sm;0;ON;;;;;N;;;;;
+29EF;ERROR-BARRED BLACK SQUARE;Sm;0;ON;;;;;N;;;;;
+29F0;ERROR-BARRED WHITE DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F1;ERROR-BARRED BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F2;ERROR-BARRED WHITE CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F3;ERROR-BARRED BLACK CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F4;RULE-DELAYED;Sm;0;ON;;;;;Y;;;;;
+29F5;REVERSE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+29F6;SOLIDUS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+29F7;REVERSE SOLIDUS WITH HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+29F8;BIG SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29F9;BIG REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29FA;DOUBLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FB;TRIPLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FC;LEFT-POINTING CURVED ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+29FD;RIGHT-POINTING CURVED ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+29FE;TINY;Sm;0;ON;;;;;N;;;;;
+29FF;MINY;Sm;0;ON;;;;;N;;;;;
+2A00;N-ARY CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A01;N-ARY CIRCLED PLUS OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A02;N-ARY CIRCLED TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A03;N-ARY UNION OPERATOR WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A04;N-ARY UNION OPERATOR WITH PLUS;Sm;0;ON;;;;;N;;;;;
+2A05;N-ARY SQUARE INTERSECTION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A06;N-ARY SQUARE UNION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A07;TWO LOGICAL AND OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A08;TWO LOGICAL OR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A09;N-ARY TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A0A;MODULO TWO SUM;Sm;0;ON;;;;;Y;;;;;
+2A0B;SUMMATION WITH INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0C;QUADRUPLE INTEGRAL OPERATOR;Sm;0;ON;<compat> 222B 222B 222B 222B;;;;Y;;;;;
+2A0D;FINITE PART INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0E;INTEGRAL WITH DOUBLE STROKE;Sm;0;ON;;;;;Y;;;;;
+2A0F;INTEGRAL AVERAGE WITH SLASH;Sm;0;ON;;;;;Y;;;;;
+2A10;CIRCULATION FUNCTION;Sm;0;ON;;;;;Y;;;;;
+2A11;ANTICLOCKWISE INTEGRATION;Sm;0;ON;;;;;Y;;;;;
+2A12;LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A13;LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A14;LINE INTEGRATION NOT INCLUDING THE POLE;Sm;0;ON;;;;;Y;;;;;
+2A15;INTEGRAL AROUND A POINT OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A16;QUATERNION INTEGRAL OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A17;INTEGRAL WITH LEFTWARDS ARROW WITH HOOK;Sm;0;ON;;;;;Y;;;;;
+2A18;INTEGRAL WITH TIMES SIGN;Sm;0;ON;;;;;Y;;;;;
+2A19;INTEGRAL WITH INTERSECTION;Sm;0;ON;;;;;Y;;;;;
+2A1A;INTEGRAL WITH UNION;Sm;0;ON;;;;;Y;;;;;
+2A1B;INTEGRAL WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1C;INTEGRAL WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1D;JOIN;Sm;0;ON;;;;;N;;;;;
+2A1E;LARGE LEFT TRIANGLE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A1F;Z NOTATION SCHEMA COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A20;Z NOTATION SCHEMA PIPING;Sm;0;ON;;;;;Y;;;;;
+2A21;Z NOTATION SCHEMA PROJECTION;Sm;0;ON;;;;;Y;;;;;
+2A22;PLUS SIGN WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2A23;PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A24;PLUS SIGN WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A25;PLUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A26;PLUS SIGN WITH TILDE BELOW;Sm;0;ON;;;;;Y;;;;;
+2A27;PLUS SIGN WITH SUBSCRIPT TWO;Sm;0;ON;;;;;N;;;;;
+2A28;PLUS SIGN WITH BLACK TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A29;MINUS SIGN WITH COMMA ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A2A;MINUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A2B;MINUS SIGN WITH FALLING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2C;MINUS SIGN WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2D;PLUS SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2E;PLUS SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2F;VECTOR OR CROSS PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A30;MULTIPLICATION SIGN WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A31;MULTIPLICATION SIGN WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A32;SEMIDIRECT PRODUCT WITH BOTTOM CLOSED;Sm;0;ON;;;;;N;;;;;
+2A33;SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A34;MULTIPLICATION SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A35;MULTIPLICATION SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A36;CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;N;;;;;
+2A37;MULTIPLICATION SIGN IN DOUBLE CIRCLE;Sm;0;ON;;;;;N;;;;;
+2A38;CIRCLED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+2A39;PLUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3A;MINUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3B;MULTIPLICATION SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3C;INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3D;RIGHTHAND INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3E;Z NOTATION RELATIONAL COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A3F;AMALGAMATION OR COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2A40;INTERSECTION WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A41;UNION WITH MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A42;UNION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A43;INTERSECTION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A44;INTERSECTION WITH LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A45;UNION WITH LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A46;UNION ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A47;INTERSECTION ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A48;UNION ABOVE BAR ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A49;INTERSECTION ABOVE BAR ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A4A;UNION BESIDE AND JOINED WITH UNION;Sm;0;ON;;;;;N;;;;;
+2A4B;INTERSECTION BESIDE AND JOINED WITH INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4C;CLOSED UNION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4D;CLOSED INTERSECTION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4E;DOUBLE SQUARE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4F;DOUBLE SQUARE UNION;Sm;0;ON;;;;;N;;;;;
+2A50;CLOSED UNION WITH SERIFS AND SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A51;LOGICAL AND WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A52;LOGICAL OR WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A53;DOUBLE LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A54;DOUBLE LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A55;TWO INTERSECTING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A56;TWO INTERSECTING LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A57;SLOPING LARGE OR;Sm;0;ON;;;;;Y;;;;;
+2A58;SLOPING LARGE AND;Sm;0;ON;;;;;Y;;;;;
+2A59;LOGICAL OR OVERLAPPING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A5A;LOGICAL AND WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5B;LOGICAL OR WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5C;LOGICAL AND WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5D;LOGICAL OR WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5E;LOGICAL AND WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A5F;LOGICAL AND WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A60;LOGICAL AND WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A61;SMALL VEE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A62;LOGICAL OR WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A63;LOGICAL OR WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A64;Z NOTATION DOMAIN ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A65;Z NOTATION RANGE ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A66;EQUALS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A67;IDENTICAL WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A68;TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A69;TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A6A;TILDE OPERATOR WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6B;TILDE OPERATOR WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A6C;SIMILAR MINUS SIMILAR;Sm;0;ON;;;;;Y;;;;;
+2A6D;CONGRUENT WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6E;EQUALS WITH ASTERISK;Sm;0;ON;;;;;N;;;;;
+2A6F;ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;Y;;;;;
+2A70;APPROXIMATELY EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A71;EQUALS SIGN ABOVE PLUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A72;PLUS SIGN ABOVE EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+2A73;EQUALS SIGN ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A74;DOUBLE COLON EQUAL;Sm;0;ON;<compat> 003A 003A 003D;;;;Y;;;;;
+2A75;TWO CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D;;;;N;;;;;
+2A76;THREE CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D 003D;;;;N;;;;;
+2A77;EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW;Sm;0;ON;;;;;N;;;;;
+2A78;EQUIVALENT WITH FOUR DOTS ABOVE;Sm;0;ON;;;;;N;;;;;
+2A79;LESS-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7A;GREATER-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7B;LESS-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7C;GREATER-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7D;LESS-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7E;GREATER-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7F;LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A80;GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A81;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A82;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A83;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT;Sm;0;ON;;;;;Y;;;;;
+2A84;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT;Sm;0;ON;;;;;Y;;;;;
+2A85;LESS-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A86;GREATER-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A87;LESS-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A88;GREATER-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A89;LESS-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8A;GREATER-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8B;LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8C;GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8D;LESS-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8E;GREATER-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8F;LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A90;GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A91;LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A92;GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A93;LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A94;GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A95;SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A96;SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A97;SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A98;SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A99;DOUBLE-LINE EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9A;DOUBLE-LINE EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9B;DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9C;DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9D;SIMILAR OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9E;SIMILAR OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9F;SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA0;SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA1;DOUBLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA2;DOUBLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA3;DOUBLE NESTED LESS-THAN WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2AA4;GREATER-THAN OVERLAPPING LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA5;GREATER-THAN BESIDE LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA6;LESS-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA7;GREATER-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA8;LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AA9;GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AAA;SMALLER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAB;LARGER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAC;SMALLER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAD;LARGER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAE;EQUALS SIGN WITH BUMPY ABOVE;Sm;0;ON;;;;;N;;;;;
+2AAF;PRECEDES ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB0;SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB1;PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB2;SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB3;PRECEDES ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB4;SUCCEEDS ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB5;PRECEDES ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB6;SUCCEEDS ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB7;PRECEDES ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB8;SUCCEEDS ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB9;PRECEDES ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABA;SUCCEEDS ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABB;DOUBLE PRECEDES;Sm;0;ON;;;;;Y;;;;;
+2ABC;DOUBLE SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+2ABD;SUBSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABE;SUPERSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABF;SUBSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC0;SUPERSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC1;SUBSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC2;SUPERSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC3;SUBSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC4;SUPERSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC5;SUBSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC6;SUPERSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC7;SUBSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC8;SUPERSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC9;SUBSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACA;SUPERSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACB;SUBSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACC;SUPERSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACD;SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACE;SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACF;CLOSED SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD0;CLOSED SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD1;CLOSED SUBSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD2;CLOSED SUPERSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD3;SUBSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD4;SUPERSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD5;SUBSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD6;SUPERSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD7;SUPERSET BESIDE SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD8;SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;;
+2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;;;;
+2ADD;NONFORKING;Sm;0;ON;;;;;N;;;;;
+2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;;
+2AE1;PERPENDICULAR WITH S;Sm;0;ON;;;;;N;;;;;
+2AE2;VERTICAL BAR TRIPLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE3;DOUBLE VERTICAL BAR LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE4;VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE5;DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE6;LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL;Sm;0;ON;;;;;Y;;;;;
+2AE7;SHORT DOWN TACK WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2AE8;SHORT UP TACK WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2AE9;SHORT UP TACK ABOVE SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEA;DOUBLE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEB;DOUBLE UP TACK;Sm;0;ON;;;;;N;;;;;
+2AEC;DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AED;REVERSED DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AEE;DOES NOT DIVIDE WITH REVERSED NEGATION SLASH;Sm;0;ON;;;;;Y;;;;;
+2AEF;VERTICAL LINE WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2AF0;VERTICAL LINE WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF1;DOWN TACK WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF2;PARALLEL WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF3;PARALLEL WITH TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AF4;TRIPLE VERTICAL BAR BINARY RELATION;Sm;0;ON;;;;;N;;;;;
+2AF5;TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF6;TRIPLE COLON OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AF7;TRIPLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF8;TRIPLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF9;DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFA;DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFB;TRIPLE SOLIDUS BINARY RELATION;Sm;0;ON;;;;;Y;;;;;
+2AFC;LARGE TRIPLE VERTICAL BAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AFD;DOUBLE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AFE;WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2AFF;N-ARY WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2B00;NORTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B01;NORTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B02;SOUTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B03;SOUTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B04;LEFT RIGHT WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B05;LEFTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B06;UPWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B07;DOWNWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B08;NORTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B09;NORTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0A;SOUTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0B;SOUTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0C;LEFT RIGHT BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0D;UP DOWN BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0E;RIGHTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B0F;RIGHTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B10;LEFTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B11;LEFTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B12;SQUARE WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B13;SQUARE WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B14;SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B15;SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B16;DIAMOND WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B17;DIAMOND WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B18;DIAMOND WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B19;DIAMOND WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B1A;DOTTED SQUARE;So;0;ON;;;;;N;;;;;
+2B1B;BLACK LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1C;WHITE LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1D;BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1E;WHITE VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1F;BLACK PENTAGON;So;0;ON;;;;;N;;;;;
+2B20;WHITE PENTAGON;So;0;ON;;;;;N;;;;;
+2B21;WHITE HEXAGON;So;0;ON;;;;;N;;;;;
+2B22;BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B23;HORIZONTAL BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B24;BLACK LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B25;BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B26;WHITE MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B27;BLACK MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B28;WHITE MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B29;BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+2B2A;BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2B;WHITE SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2C;BLACK HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2D;WHITE HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2E;BLACK VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2F;WHITE VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B30;LEFT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2B31;THREE LEFTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+2B32;LEFT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2B33;LONG LEFTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2B34;LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B35;LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B36;LEFTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2B37;LEFTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2B38;LEFTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2B39;LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3A;LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3B;LEFTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2B3C;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3D;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3E;LEFTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2B3F;WAVE ARROW POINTING DIRECTLY LEFT;Sm;0;ON;;;;;N;;;;;
+2B40;EQUALS SIGN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B41;REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B42;LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B43;RIGHTWARDS ARROW THROUGH GREATER-THAN;Sm;0;ON;;;;;N;;;;;
+2B44;RIGHTWARDS ARROW THROUGH SUPERSET;Sm;0;ON;;;;;N;;;;;
+2B45;LEFTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B46;RIGHTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B47;REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B48;RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B49;TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B4A;LEFTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B4B;LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B4C;RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B4D;DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW;So;0;ON;;;;;N;;;;;
+2B4E;SHORT SLANTED NORTH ARROW;So;0;ON;;;;;N;;;;;
+2B4F;SHORT BACKSLANTED SOUTH ARROW;So;0;ON;;;;;N;;;;;
+2B50;WHITE MEDIUM STAR;So;0;ON;;;;;N;;;;;
+2B51;BLACK SMALL STAR;So;0;ON;;;;;N;;;;;
+2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;;
+2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B55;HEAVY LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B56;HEAVY OVAL WITH OVAL INSIDE;So;0;ON;;;;;N;;;;;
+2B57;HEAVY CIRCLE WITH CIRCLE INSIDE;So;0;ON;;;;;N;;;;;
+2B58;HEAVY CIRCLE;So;0;ON;;;;;N;;;;;
+2B59;HEAVY CIRCLED SALTIRE;So;0;ON;;;;;N;;;;;
+2B5A;SLANTED NORTH ARROW WITH HOOKED HEAD;So;0;ON;;;;;N;;;;;
+2B5B;BACKSLANTED SOUTH ARROW WITH HOOKED TAIL;So;0;ON;;;;;N;;;;;
+2B5C;SLANTED NORTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;;
+2B5D;BACKSLANTED SOUTH ARROW WITH HORIZONTAL TAIL;So;0;ON;;;;;N;;;;;
+2B5E;BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;;
+2B5F;SHORT BENT ARROW POINTING DOWNWARDS THEN NORTH EAST;So;0;ON;;;;;N;;;;;
+2B60;LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B61;UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B62;RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B63;DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B64;LEFT RIGHT TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B65;UP DOWN TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B66;NORTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B67;NORTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B68;SOUTH EAST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B69;SOUTH WEST TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B6A;LEFTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6B;UPWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6C;RIGHTWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6D;DOWNWARDS TRIANGLE-HEADED DASHED ARROW;So;0;ON;;;;;N;;;;;
+2B6E;CLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+2B6F;ANTICLOCKWISE TRIANGLE-HEADED OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+2B70;LEFTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B71;UPWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B72;RIGHTWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B73;DOWNWARDS TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B76;NORTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B77;NORTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B78;SOUTH EAST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B79;SOUTH WEST TRIANGLE-HEADED ARROW TO BAR;So;0;ON;;;;;N;;;;;
+2B7A;LEFTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7B;UPWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7C;RIGHTWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7D;DOWNWARDS TRIANGLE-HEADED ARROW WITH DOUBLE HORIZONTAL STROKE;So;0;ON;;;;;N;;;;;
+2B7E;HORIZONTAL TAB KEY;So;0;ON;;;;;N;;;;;
+2B7F;VERTICAL TAB KEY;So;0;ON;;;;;N;;;;;
+2B80;LEFTWARDS TRIANGLE-HEADED ARROW OVER RIGHTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B81;UPWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF DOWNWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B82;RIGHTWARDS TRIANGLE-HEADED ARROW OVER LEFTWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B83;DOWNWARDS TRIANGLE-HEADED ARROW LEFTWARDS OF UPWARDS TRIANGLE-HEADED ARROW;So;0;ON;;;;;N;;;;;
+2B84;LEFTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B85;UPWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B86;RIGHTWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B87;DOWNWARDS TRIANGLE-HEADED PAIRED ARROWS;So;0;ON;;;;;N;;;;;
+2B88;LEFTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B89;UPWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8A;RIGHTWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8B;DOWNWARDS BLACK CIRCLED WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B8C;ANTICLOCKWISE TRIANGLE-HEADED RIGHT U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8D;ANTICLOCKWISE TRIANGLE-HEADED BOTTOM U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8E;ANTICLOCKWISE TRIANGLE-HEADED LEFT U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B8F;ANTICLOCKWISE TRIANGLE-HEADED TOP U-SHAPED ARROW;So;0;ON;;;;;N;;;;;
+2B90;RETURN LEFT;So;0;ON;;;;;N;;;;;
+2B91;RETURN RIGHT;So;0;ON;;;;;N;;;;;
+2B92;NEWLINE LEFT;So;0;ON;;;;;N;;;;;
+2B93;NEWLINE RIGHT;So;0;ON;;;;;N;;;;;
+2B94;FOUR CORNER ARROWS CIRCLING ANTICLOCKWISE;So;0;ON;;;;;N;;;;;
+2B95;RIGHTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B98;THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B99;THREE-D RIGHT-LIGHTED UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9A;THREE-D TOP-LIGHTED RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9B;THREE-D LEFT-LIGHTED DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9C;BLACK LEFTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9D;BLACK UPWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9E;BLACK RIGHTWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2B9F;BLACK DOWNWARDS EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+2BA0;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;;
+2BA1;DOWNWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;;
+2BA2;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP LEFTWARDS;So;0;ON;;;;;N;;;;;
+2BA3;UPWARDS TRIANGLE-HEADED ARROW WITH LONG TIP RIGHTWARDS;So;0;ON;;;;;N;;;;;
+2BA4;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2BA5;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2BA6;LEFTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2BA7;RIGHTWARDS TRIANGLE-HEADED ARROW WITH LONG TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2BA8;BLACK CURVED DOWNWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BA9;BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAA;BLACK CURVED UPWARDS AND LEFTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAB;BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAC;BLACK CURVED LEFTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAD;BLACK CURVED RIGHTWARDS AND UPWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAE;BLACK CURVED LEFTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BAF;BLACK CURVED RIGHTWARDS AND DOWNWARDS ARROW;So;0;ON;;;;;N;;;;;
+2BB0;RIBBON ARROW DOWN LEFT;So;0;ON;;;;;N;;;;;
+2BB1;RIBBON ARROW DOWN RIGHT;So;0;ON;;;;;N;;;;;
+2BB2;RIBBON ARROW UP LEFT;So;0;ON;;;;;N;;;;;
+2BB3;RIBBON ARROW UP RIGHT;So;0;ON;;;;;N;;;;;
+2BB4;RIBBON ARROW LEFT UP;So;0;ON;;;;;N;;;;;
+2BB5;RIBBON ARROW RIGHT UP;So;0;ON;;;;;N;;;;;
+2BB6;RIBBON ARROW LEFT DOWN;So;0;ON;;;;;N;;;;;
+2BB7;RIBBON ARROW RIGHT DOWN;So;0;ON;;;;;N;;;;;
+2BB8;UPWARDS WHITE ARROW FROM BAR WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
+2BB9;UP ARROWHEAD IN A RECTANGLE BOX;So;0;ON;;;;;N;;;;;
+2BBD;BALLOT BOX WITH LIGHT X;So;0;ON;;;;;N;;;;;
+2BBE;CIRCLED X;So;0;ON;;;;;N;;;;;
+2BBF;CIRCLED BOLD X;So;0;ON;;;;;N;;;;;
+2BC0;BLACK SQUARE CENTRED;So;0;ON;;;;;N;;;;;
+2BC1;BLACK DIAMOND CENTRED;So;0;ON;;;;;N;;;;;
+2BC2;TURNED BLACK PENTAGON;So;0;ON;;;;;N;;;;;
+2BC3;HORIZONTAL BLACK OCTAGON;So;0;ON;;;;;N;;;;;
+2BC4;BLACK OCTAGON;So;0;ON;;;;;N;;;;;
+2BC5;BLACK MEDIUM UP-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC6;BLACK MEDIUM DOWN-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC7;BLACK MEDIUM LEFT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BC8;BLACK MEDIUM RIGHT-POINTING TRIANGLE CENTRED;So;0;ON;;;;;N;;;;;
+2BCA;TOP HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+2BCB;BOTTOM HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+2BCC;LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;;
+2BCD;ROTATED LIGHT FOUR POINTED BLACK CUSP;So;0;ON;;;;;N;;;;;
+2BCE;WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
+2BCF;ROTATED WHITE FOUR POINTED CUSP;So;0;ON;;;;;N;;;;;
+2BD0;SQUARE POSITION INDICATOR;So;0;ON;;;;;N;;;;;
+2BD1;UNCERTAINTY SIGN;So;0;ON;;;;;N;;;;;
+2BEC;LEFTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BED;UPWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BEE;RIGHTWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2BEF;DOWNWARDS TWO-HEADED ARROW WITH TRIANGLE ARROWHEADS;So;0;ON;;;;;N;;;;;
+2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
+2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
+2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
+2C03;GLAGOLITIC CAPITAL LETTER GLAGOLI;Lu;0;L;;;;;N;;;;2C33;
+2C04;GLAGOLITIC CAPITAL LETTER DOBRO;Lu;0;L;;;;;N;;;;2C34;
+2C05;GLAGOLITIC CAPITAL LETTER YESTU;Lu;0;L;;;;;N;;;;2C35;
+2C06;GLAGOLITIC CAPITAL LETTER ZHIVETE;Lu;0;L;;;;;N;;;;2C36;
+2C07;GLAGOLITIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;2C37;
+2C08;GLAGOLITIC CAPITAL LETTER ZEMLJA;Lu;0;L;;;;;N;;;;2C38;
+2C09;GLAGOLITIC CAPITAL LETTER IZHE;Lu;0;L;;;;;N;;;;2C39;
+2C0A;GLAGOLITIC CAPITAL LETTER INITIAL IZHE;Lu;0;L;;;;;N;;;;2C3A;
+2C0B;GLAGOLITIC CAPITAL LETTER I;Lu;0;L;;;;;N;;;;2C3B;
+2C0C;GLAGOLITIC CAPITAL LETTER DJERVI;Lu;0;L;;;;;N;;;;2C3C;
+2C0D;GLAGOLITIC CAPITAL LETTER KAKO;Lu;0;L;;;;;N;;;;2C3D;
+2C0E;GLAGOLITIC CAPITAL LETTER LJUDIJE;Lu;0;L;;;;;N;;;;2C3E;
+2C0F;GLAGOLITIC CAPITAL LETTER MYSLITE;Lu;0;L;;;;;N;;;;2C3F;
+2C10;GLAGOLITIC CAPITAL LETTER NASHI;Lu;0;L;;;;;N;;;;2C40;
+2C11;GLAGOLITIC CAPITAL LETTER ONU;Lu;0;L;;;;;N;;;;2C41;
+2C12;GLAGOLITIC CAPITAL LETTER POKOJI;Lu;0;L;;;;;N;;;;2C42;
+2C13;GLAGOLITIC CAPITAL LETTER RITSI;Lu;0;L;;;;;N;;;;2C43;
+2C14;GLAGOLITIC CAPITAL LETTER SLOVO;Lu;0;L;;;;;N;;;;2C44;
+2C15;GLAGOLITIC CAPITAL LETTER TVRIDO;Lu;0;L;;;;;N;;;;2C45;
+2C16;GLAGOLITIC CAPITAL LETTER UKU;Lu;0;L;;;;;N;;;;2C46;
+2C17;GLAGOLITIC CAPITAL LETTER FRITU;Lu;0;L;;;;;N;;;;2C47;
+2C18;GLAGOLITIC CAPITAL LETTER HERU;Lu;0;L;;;;;N;;;;2C48;
+2C19;GLAGOLITIC CAPITAL LETTER OTU;Lu;0;L;;;;;N;;;;2C49;
+2C1A;GLAGOLITIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;2C4A;
+2C1B;GLAGOLITIC CAPITAL LETTER SHTA;Lu;0;L;;;;;N;;;;2C4B;
+2C1C;GLAGOLITIC CAPITAL LETTER TSI;Lu;0;L;;;;;N;;;;2C4C;
+2C1D;GLAGOLITIC CAPITAL LETTER CHRIVI;Lu;0;L;;;;;N;;;;2C4D;
+2C1E;GLAGOLITIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;2C4E;
+2C1F;GLAGOLITIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;;;;2C4F;
+2C20;GLAGOLITIC CAPITAL LETTER YERI;Lu;0;L;;;;;N;;;;2C50;
+2C21;GLAGOLITIC CAPITAL LETTER YATI;Lu;0;L;;;;;N;;;;2C51;
+2C22;GLAGOLITIC CAPITAL LETTER SPIDERY HA;Lu;0;L;;;;;N;;;;2C52;
+2C23;GLAGOLITIC CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;2C53;
+2C24;GLAGOLITIC CAPITAL LETTER SMALL YUS;Lu;0;L;;;;;N;;;;2C54;
+2C25;GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL;Lu;0;L;;;;;N;;;;2C55;
+2C26;GLAGOLITIC CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;2C56;
+2C27;GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS;Lu;0;L;;;;;N;;;;2C57;
+2C28;GLAGOLITIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;2C58;
+2C29;GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS;Lu;0;L;;;;;N;;;;2C59;
+2C2A;GLAGOLITIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;2C5A;
+2C2B;GLAGOLITIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;2C5B;
+2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C;
+2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D;
+2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E;
+2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00
+2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01
+2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02
+2C33;GLAGOLITIC SMALL LETTER GLAGOLI;Ll;0;L;;;;;N;;;2C03;;2C03
+2C34;GLAGOLITIC SMALL LETTER DOBRO;Ll;0;L;;;;;N;;;2C04;;2C04
+2C35;GLAGOLITIC SMALL LETTER YESTU;Ll;0;L;;;;;N;;;2C05;;2C05
+2C36;GLAGOLITIC SMALL LETTER ZHIVETE;Ll;0;L;;;;;N;;;2C06;;2C06
+2C37;GLAGOLITIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;2C07;;2C07
+2C38;GLAGOLITIC SMALL LETTER ZEMLJA;Ll;0;L;;;;;N;;;2C08;;2C08
+2C39;GLAGOLITIC SMALL LETTER IZHE;Ll;0;L;;;;;N;;;2C09;;2C09
+2C3A;GLAGOLITIC SMALL LETTER INITIAL IZHE;Ll;0;L;;;;;N;;;2C0A;;2C0A
+2C3B;GLAGOLITIC SMALL LETTER I;Ll;0;L;;;;;N;;;2C0B;;2C0B
+2C3C;GLAGOLITIC SMALL LETTER DJERVI;Ll;0;L;;;;;N;;;2C0C;;2C0C
+2C3D;GLAGOLITIC SMALL LETTER KAKO;Ll;0;L;;;;;N;;;2C0D;;2C0D
+2C3E;GLAGOLITIC SMALL LETTER LJUDIJE;Ll;0;L;;;;;N;;;2C0E;;2C0E
+2C3F;GLAGOLITIC SMALL LETTER MYSLITE;Ll;0;L;;;;;N;;;2C0F;;2C0F
+2C40;GLAGOLITIC SMALL LETTER NASHI;Ll;0;L;;;;;N;;;2C10;;2C10
+2C41;GLAGOLITIC SMALL LETTER ONU;Ll;0;L;;;;;N;;;2C11;;2C11
+2C42;GLAGOLITIC SMALL LETTER POKOJI;Ll;0;L;;;;;N;;;2C12;;2C12
+2C43;GLAGOLITIC SMALL LETTER RITSI;Ll;0;L;;;;;N;;;2C13;;2C13
+2C44;GLAGOLITIC SMALL LETTER SLOVO;Ll;0;L;;;;;N;;;2C14;;2C14
+2C45;GLAGOLITIC SMALL LETTER TVRIDO;Ll;0;L;;;;;N;;;2C15;;2C15
+2C46;GLAGOLITIC SMALL LETTER UKU;Ll;0;L;;;;;N;;;2C16;;2C16
+2C47;GLAGOLITIC SMALL LETTER FRITU;Ll;0;L;;;;;N;;;2C17;;2C17
+2C48;GLAGOLITIC SMALL LETTER HERU;Ll;0;L;;;;;N;;;2C18;;2C18
+2C49;GLAGOLITIC SMALL LETTER OTU;Ll;0;L;;;;;N;;;2C19;;2C19
+2C4A;GLAGOLITIC SMALL LETTER PE;Ll;0;L;;;;;N;;;2C1A;;2C1A
+2C4B;GLAGOLITIC SMALL LETTER SHTA;Ll;0;L;;;;;N;;;2C1B;;2C1B
+2C4C;GLAGOLITIC SMALL LETTER TSI;Ll;0;L;;;;;N;;;2C1C;;2C1C
+2C4D;GLAGOLITIC SMALL LETTER CHRIVI;Ll;0;L;;;;;N;;;2C1D;;2C1D
+2C4E;GLAGOLITIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;2C1E;;2C1E
+2C4F;GLAGOLITIC SMALL LETTER YERU;Ll;0;L;;;;;N;;;2C1F;;2C1F
+2C50;GLAGOLITIC SMALL LETTER YERI;Ll;0;L;;;;;N;;;2C20;;2C20
+2C51;GLAGOLITIC SMALL LETTER YATI;Ll;0;L;;;;;N;;;2C21;;2C21
+2C52;GLAGOLITIC SMALL LETTER SPIDERY HA;Ll;0;L;;;;;N;;;2C22;;2C22
+2C53;GLAGOLITIC SMALL LETTER YU;Ll;0;L;;;;;N;;;2C23;;2C23
+2C54;GLAGOLITIC SMALL LETTER SMALL YUS;Ll;0;L;;;;;N;;;2C24;;2C24
+2C55;GLAGOLITIC SMALL LETTER SMALL YUS WITH TAIL;Ll;0;L;;;;;N;;;2C25;;2C25
+2C56;GLAGOLITIC SMALL LETTER YO;Ll;0;L;;;;;N;;;2C26;;2C26
+2C57;GLAGOLITIC SMALL LETTER IOTATED SMALL YUS;Ll;0;L;;;;;N;;;2C27;;2C27
+2C58;GLAGOLITIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;2C28;;2C28
+2C59;GLAGOLITIC SMALL LETTER IOTATED BIG YUS;Ll;0;L;;;;;N;;;2C29;;2C29
+2C5A;GLAGOLITIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;2C2A;;2C2A
+2C5B;GLAGOLITIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;2C2B;;2C2B
+2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C
+2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D
+2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E
+2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61;
+2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60
+2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B;
+2C63;LATIN CAPITAL LETTER P WITH STROKE;Lu;0;L;;;;;N;;;;1D7D;
+2C64;LATIN CAPITAL LETTER R WITH TAIL;Lu;0;L;;;;;N;;;;027D;
+2C65;LATIN SMALL LETTER A WITH STROKE;Ll;0;L;;;;;N;;;023A;;023A
+2C66;LATIN SMALL LETTER T WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;023E;;023E
+2C67;LATIN CAPITAL LETTER H WITH DESCENDER;Lu;0;L;;;;;N;;;;2C68;
+2C68;LATIN SMALL LETTER H WITH DESCENDER;Ll;0;L;;;;;N;;;2C67;;2C67
+2C69;LATIN CAPITAL LETTER K WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6A;
+2C6A;LATIN SMALL LETTER K WITH DESCENDER;Ll;0;L;;;;;N;;;2C69;;2C69
+2C6B;LATIN CAPITAL LETTER Z WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6C;
+2C6C;LATIN SMALL LETTER Z WITH DESCENDER;Ll;0;L;;;;;N;;;2C6B;;2C6B
+2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251;
+2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271;
+2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250;
+2C70;LATIN CAPITAL LETTER TURNED ALPHA;Lu;0;L;;;;;N;;;;0252;
+2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;;
+2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73;
+2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72
+2C74;LATIN SMALL LETTER V WITH CURL;Ll;0;L;;;;;N;;;;;
+2C75;LATIN CAPITAL LETTER HALF H;Lu;0;L;;;;;N;;;;2C76;
+2C76;LATIN SMALL LETTER HALF H;Ll;0;L;;;;;N;;;2C75;;2C75
+2C77;LATIN SMALL LETTER TAILLESS PHI;Ll;0;L;;;;;N;;;;;
+2C78;LATIN SMALL LETTER E WITH NOTCH;Ll;0;L;;;;;N;;;;;
+2C79;LATIN SMALL LETTER TURNED R WITH TAIL;Ll;0;L;;;;;N;;;;;
+2C7A;LATIN SMALL LETTER O WITH LOW RING INSIDE;Ll;0;L;;;;;N;;;;;
+2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;;
+2C7C;LATIN SUBSCRIPT SMALL LETTER J;Lm;0;L;<sub> 006A;;;;N;;;;;
+2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L;<super> 0056;;;;N;;;;;
+2C7E;LATIN CAPITAL LETTER S WITH SWASH TAIL;Lu;0;L;;;;;N;;;;023F;
+2C7F;LATIN CAPITAL LETTER Z WITH SWASH TAIL;Lu;0;L;;;;;N;;;;0240;
+2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81;
+2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80
+2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83;
+2C83;COPTIC SMALL LETTER VIDA;Ll;0;L;;;;;N;;;2C82;;2C82
+2C84;COPTIC CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;2C85;
+2C85;COPTIC SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;2C84;;2C84
+2C86;COPTIC CAPITAL LETTER DALDA;Lu;0;L;;;;;N;;;;2C87;
+2C87;COPTIC SMALL LETTER DALDA;Ll;0;L;;;;;N;;;2C86;;2C86
+2C88;COPTIC CAPITAL LETTER EIE;Lu;0;L;;;;;N;;;;2C89;
+2C89;COPTIC SMALL LETTER EIE;Ll;0;L;;;;;N;;;2C88;;2C88
+2C8A;COPTIC CAPITAL LETTER SOU;Lu;0;L;;;;;N;;;;2C8B;
+2C8B;COPTIC SMALL LETTER SOU;Ll;0;L;;;;;N;;;2C8A;;2C8A
+2C8C;COPTIC CAPITAL LETTER ZATA;Lu;0;L;;;;;N;;;;2C8D;
+2C8D;COPTIC SMALL LETTER ZATA;Ll;0;L;;;;;N;;;2C8C;;2C8C
+2C8E;COPTIC CAPITAL LETTER HATE;Lu;0;L;;;;;N;;;;2C8F;
+2C8F;COPTIC SMALL LETTER HATE;Ll;0;L;;;;;N;;;2C8E;;2C8E
+2C90;COPTIC CAPITAL LETTER THETHE;Lu;0;L;;;;;N;;;;2C91;
+2C91;COPTIC SMALL LETTER THETHE;Ll;0;L;;;;;N;;;2C90;;2C90
+2C92;COPTIC CAPITAL LETTER IAUDA;Lu;0;L;;;;;N;;;;2C93;
+2C93;COPTIC SMALL LETTER IAUDA;Ll;0;L;;;;;N;;;2C92;;2C92
+2C94;COPTIC CAPITAL LETTER KAPA;Lu;0;L;;;;;N;;;;2C95;
+2C95;COPTIC SMALL LETTER KAPA;Ll;0;L;;;;;N;;;2C94;;2C94
+2C96;COPTIC CAPITAL LETTER LAULA;Lu;0;L;;;;;N;;;;2C97;
+2C97;COPTIC SMALL LETTER LAULA;Ll;0;L;;;;;N;;;2C96;;2C96
+2C98;COPTIC CAPITAL LETTER MI;Lu;0;L;;;;;N;;;;2C99;
+2C99;COPTIC SMALL LETTER MI;Ll;0;L;;;;;N;;;2C98;;2C98
+2C9A;COPTIC CAPITAL LETTER NI;Lu;0;L;;;;;N;;;;2C9B;
+2C9B;COPTIC SMALL LETTER NI;Ll;0;L;;;;;N;;;2C9A;;2C9A
+2C9C;COPTIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;2C9D;
+2C9D;COPTIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;2C9C;;2C9C
+2C9E;COPTIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;2C9F;
+2C9F;COPTIC SMALL LETTER O;Ll;0;L;;;;;N;;;2C9E;;2C9E
+2CA0;COPTIC CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;2CA1;
+2CA1;COPTIC SMALL LETTER PI;Ll;0;L;;;;;N;;;2CA0;;2CA0
+2CA2;COPTIC CAPITAL LETTER RO;Lu;0;L;;;;;N;;;;2CA3;
+2CA3;COPTIC SMALL LETTER RO;Ll;0;L;;;;;N;;;2CA2;;2CA2
+2CA4;COPTIC CAPITAL LETTER SIMA;Lu;0;L;;;;;N;;;;2CA5;
+2CA5;COPTIC SMALL LETTER SIMA;Ll;0;L;;;;;N;;;2CA4;;2CA4
+2CA6;COPTIC CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;2CA7;
+2CA7;COPTIC SMALL LETTER TAU;Ll;0;L;;;;;N;;;2CA6;;2CA6
+2CA8;COPTIC CAPITAL LETTER UA;Lu;0;L;;;;;N;;;;2CA9;
+2CA9;COPTIC SMALL LETTER UA;Ll;0;L;;;;;N;;;2CA8;;2CA8
+2CAA;COPTIC CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;2CAB;
+2CAB;COPTIC SMALL LETTER FI;Ll;0;L;;;;;N;;;2CAA;;2CAA
+2CAC;COPTIC CAPITAL LETTER KHI;Lu;0;L;;;;;N;;;;2CAD;
+2CAD;COPTIC SMALL LETTER KHI;Ll;0;L;;;;;N;;;2CAC;;2CAC
+2CAE;COPTIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;2CAF;
+2CAF;COPTIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;2CAE;;2CAE
+2CB0;COPTIC CAPITAL LETTER OOU;Lu;0;L;;;;;N;;;;2CB1;
+2CB1;COPTIC SMALL LETTER OOU;Ll;0;L;;;;;N;;;2CB0;;2CB0
+2CB2;COPTIC CAPITAL LETTER DIALECT-P ALEF;Lu;0;L;;;;;N;;;;2CB3;
+2CB3;COPTIC SMALL LETTER DIALECT-P ALEF;Ll;0;L;;;;;N;;;2CB2;;2CB2
+2CB4;COPTIC CAPITAL LETTER OLD COPTIC AIN;Lu;0;L;;;;;N;;;;2CB5;
+2CB5;COPTIC SMALL LETTER OLD COPTIC AIN;Ll;0;L;;;;;N;;;2CB4;;2CB4
+2CB6;COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE;Lu;0;L;;;;;N;;;;2CB7;
+2CB7;COPTIC SMALL LETTER CRYPTOGRAMMIC EIE;Ll;0;L;;;;;N;;;2CB6;;2CB6
+2CB8;COPTIC CAPITAL LETTER DIALECT-P KAPA;Lu;0;L;;;;;N;;;;2CB9;
+2CB9;COPTIC SMALL LETTER DIALECT-P KAPA;Ll;0;L;;;;;N;;;2CB8;;2CB8
+2CBA;COPTIC CAPITAL LETTER DIALECT-P NI;Lu;0;L;;;;;N;;;;2CBB;
+2CBB;COPTIC SMALL LETTER DIALECT-P NI;Ll;0;L;;;;;N;;;2CBA;;2CBA
+2CBC;COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI;Lu;0;L;;;;;N;;;;2CBD;
+2CBD;COPTIC SMALL LETTER CRYPTOGRAMMIC NI;Ll;0;L;;;;;N;;;2CBC;;2CBC
+2CBE;COPTIC CAPITAL LETTER OLD COPTIC OOU;Lu;0;L;;;;;N;;;;2CBF;
+2CBF;COPTIC SMALL LETTER OLD COPTIC OOU;Ll;0;L;;;;;N;;;2CBE;;2CBE
+2CC0;COPTIC CAPITAL LETTER SAMPI;Lu;0;L;;;;;N;;;;2CC1;
+2CC1;COPTIC SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;2CC0;;2CC0
+2CC2;COPTIC CAPITAL LETTER CROSSED SHEI;Lu;0;L;;;;;N;;;;2CC3;
+2CC3;COPTIC SMALL LETTER CROSSED SHEI;Ll;0;L;;;;;N;;;2CC2;;2CC2
+2CC4;COPTIC CAPITAL LETTER OLD COPTIC SHEI;Lu;0;L;;;;;N;;;;2CC5;
+2CC5;COPTIC SMALL LETTER OLD COPTIC SHEI;Ll;0;L;;;;;N;;;2CC4;;2CC4
+2CC6;COPTIC CAPITAL LETTER OLD COPTIC ESH;Lu;0;L;;;;;N;;;;2CC7;
+2CC7;COPTIC SMALL LETTER OLD COPTIC ESH;Ll;0;L;;;;;N;;;2CC6;;2CC6
+2CC8;COPTIC CAPITAL LETTER AKHMIMIC KHEI;Lu;0;L;;;;;N;;;;2CC9;
+2CC9;COPTIC SMALL LETTER AKHMIMIC KHEI;Ll;0;L;;;;;N;;;2CC8;;2CC8
+2CCA;COPTIC CAPITAL LETTER DIALECT-P HORI;Lu;0;L;;;;;N;;;;2CCB;
+2CCB;COPTIC SMALL LETTER DIALECT-P HORI;Ll;0;L;;;;;N;;;2CCA;;2CCA
+2CCC;COPTIC CAPITAL LETTER OLD COPTIC HORI;Lu;0;L;;;;;N;;;;2CCD;
+2CCD;COPTIC SMALL LETTER OLD COPTIC HORI;Ll;0;L;;;;;N;;;2CCC;;2CCC
+2CCE;COPTIC CAPITAL LETTER OLD COPTIC HA;Lu;0;L;;;;;N;;;;2CCF;
+2CCF;COPTIC SMALL LETTER OLD COPTIC HA;Ll;0;L;;;;;N;;;2CCE;;2CCE
+2CD0;COPTIC CAPITAL LETTER L-SHAPED HA;Lu;0;L;;;;;N;;;;2CD1;
+2CD1;COPTIC SMALL LETTER L-SHAPED HA;Ll;0;L;;;;;N;;;2CD0;;2CD0
+2CD2;COPTIC CAPITAL LETTER OLD COPTIC HEI;Lu;0;L;;;;;N;;;;2CD3;
+2CD3;COPTIC SMALL LETTER OLD COPTIC HEI;Ll;0;L;;;;;N;;;2CD2;;2CD2
+2CD4;COPTIC CAPITAL LETTER OLD COPTIC HAT;Lu;0;L;;;;;N;;;;2CD5;
+2CD5;COPTIC SMALL LETTER OLD COPTIC HAT;Ll;0;L;;;;;N;;;2CD4;;2CD4
+2CD6;COPTIC CAPITAL LETTER OLD COPTIC GANGIA;Lu;0;L;;;;;N;;;;2CD7;
+2CD7;COPTIC SMALL LETTER OLD COPTIC GANGIA;Ll;0;L;;;;;N;;;2CD6;;2CD6
+2CD8;COPTIC CAPITAL LETTER OLD COPTIC DJA;Lu;0;L;;;;;N;;;;2CD9;
+2CD9;COPTIC SMALL LETTER OLD COPTIC DJA;Ll;0;L;;;;;N;;;2CD8;;2CD8
+2CDA;COPTIC CAPITAL LETTER OLD COPTIC SHIMA;Lu;0;L;;;;;N;;;;2CDB;
+2CDB;COPTIC SMALL LETTER OLD COPTIC SHIMA;Ll;0;L;;;;;N;;;2CDA;;2CDA
+2CDC;COPTIC CAPITAL LETTER OLD NUBIAN SHIMA;Lu;0;L;;;;;N;;;;2CDD;
+2CDD;COPTIC SMALL LETTER OLD NUBIAN SHIMA;Ll;0;L;;;;;N;;;2CDC;;2CDC
+2CDE;COPTIC CAPITAL LETTER OLD NUBIAN NGI;Lu;0;L;;;;;N;;;;2CDF;
+2CDF;COPTIC SMALL LETTER OLD NUBIAN NGI;Ll;0;L;;;;;N;;;2CDE;;2CDE
+2CE0;COPTIC CAPITAL LETTER OLD NUBIAN NYI;Lu;0;L;;;;;N;;;;2CE1;
+2CE1;COPTIC SMALL LETTER OLD NUBIAN NYI;Ll;0;L;;;;;N;;;2CE0;;2CE0
+2CE2;COPTIC CAPITAL LETTER OLD NUBIAN WAU;Lu;0;L;;;;;N;;;;2CE3;
+2CE3;COPTIC SMALL LETTER OLD NUBIAN WAU;Ll;0;L;;;;;N;;;2CE2;;2CE2
+2CE4;COPTIC SYMBOL KAI;Ll;0;L;;;;;N;;;;;
+2CE5;COPTIC SYMBOL MI RO;So;0;ON;;;;;N;;;;;
+2CE6;COPTIC SYMBOL PI RO;So;0;ON;;;;;N;;;;;
+2CE7;COPTIC SYMBOL STAUROS;So;0;ON;;;;;N;;;;;
+2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;;
+2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;;
+2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;;
+2CEB;COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI;Lu;0;L;;;;;N;;;;2CEC;
+2CEC;COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI;Ll;0;L;;;;;N;;;2CEB;;2CEB
+2CED;COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA;Lu;0;L;;;;;N;;;;2CEE;
+2CEE;COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA;Ll;0;L;;;;;N;;;2CED;;2CED
+2CEF;COPTIC COMBINING NI ABOVE;Mn;230;NSM;;;;;N;;;;;
+2CF0;COPTIC COMBINING SPIRITUS ASPER;Mn;230;NSM;;;;;N;;;;;
+2CF1;COPTIC COMBINING SPIRITUS LENIS;Mn;230;NSM;;;;;N;;;;;
+2CF2;COPTIC CAPITAL LETTER BOHAIRIC KHEI;Lu;0;L;;;;;N;;;;2CF3;
+2CF3;COPTIC SMALL LETTER BOHAIRIC KHEI;Ll;0;L;;;;;N;;;2CF2;;2CF2
+2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFC;COPTIC OLD NUBIAN VERSE DIVIDER;Po;0;ON;;;;;N;;;;;
+2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;;
+2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;;
+2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;;10A0;;10A0
+2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;;10A1;;10A1
+2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;;10A2;;10A2
+2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;;10A3;;10A3
+2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;;10A4;;10A4
+2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;;10A5;;10A5
+2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;;10A6;;10A6
+2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;;10A7;;10A7
+2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;;10A8;;10A8
+2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;;10A9;;10A9
+2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;;10AA;;10AA
+2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;;10AB;;10AB
+2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;;10AC;;10AC
+2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;;10AD;;10AD
+2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;;10AE;;10AE
+2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;;10AF;;10AF
+2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;;10B0;;10B0
+2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;;10B1;;10B1
+2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;;10B2;;10B2
+2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;;10B3;;10B3
+2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;;10B4;;10B4
+2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;;10B5;;10B5
+2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;;10B6;;10B6
+2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;;10B7;;10B7
+2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;;10B8;;10B8
+2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;;10B9;;10B9
+2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;;10BA;;10BA
+2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;;10BB;;10BB
+2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;;10BC;;10BC
+2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;;10BD;;10BD
+2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;;10BE;;10BE
+2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;;10BF;;10BF
+2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;;10C0;;10C0
+2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;;10C1;;10C1
+2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;;10C2;;10C2
+2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;;10C3;;10C3
+2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;;10C4;;10C4
+2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;;10C5;;10C5
+2D27;GEORGIAN SMALL LETTER YN;Ll;0;L;;;;;N;;;10C7;;10C7
+2D2D;GEORGIAN SMALL LETTER AEN;Ll;0;L;;;;;N;;;10CD;;10CD
+2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;;
+2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;;
+2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;;
+2D33;TIFINAGH LETTER YAG;Lo;0;L;;;;;N;;;;;
+2D34;TIFINAGH LETTER YAGHH;Lo;0;L;;;;;N;;;;;
+2D35;TIFINAGH LETTER BERBER ACADEMY YAJ;Lo;0;L;;;;;N;;;;;
+2D36;TIFINAGH LETTER YAJ;Lo;0;L;;;;;N;;;;;
+2D37;TIFINAGH LETTER YAD;Lo;0;L;;;;;N;;;;;
+2D38;TIFINAGH LETTER YADH;Lo;0;L;;;;;N;;;;;
+2D39;TIFINAGH LETTER YADD;Lo;0;L;;;;;N;;;;;
+2D3A;TIFINAGH LETTER YADDH;Lo;0;L;;;;;N;;;;;
+2D3B;TIFINAGH LETTER YEY;Lo;0;L;;;;;N;;;;;
+2D3C;TIFINAGH LETTER YAF;Lo;0;L;;;;;N;;;;;
+2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;;
+2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;;
+2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;;
+2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;;;;
+2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;;
+2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;;
+2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;;
+2D44;TIFINAGH LETTER YAA;Lo;0;L;;;;;N;;;;;
+2D45;TIFINAGH LETTER YAKH;Lo;0;L;;;;;N;;;;;
+2D46;TIFINAGH LETTER TUAREG YAKH;Lo;0;L;;;;;N;;;;;
+2D47;TIFINAGH LETTER YAQ;Lo;0;L;;;;;N;;;;;
+2D48;TIFINAGH LETTER TUAREG YAQ;Lo;0;L;;;;;N;;;;;
+2D49;TIFINAGH LETTER YI;Lo;0;L;;;;;N;;;;;
+2D4A;TIFINAGH LETTER YAZH;Lo;0;L;;;;;N;;;;;
+2D4B;TIFINAGH LETTER AHAGGAR YAZH;Lo;0;L;;;;;N;;;;;
+2D4C;TIFINAGH LETTER TUAREG YAZH;Lo;0;L;;;;;N;;;;;
+2D4D;TIFINAGH LETTER YAL;Lo;0;L;;;;;N;;;;;
+2D4E;TIFINAGH LETTER YAM;Lo;0;L;;;;;N;;;;;
+2D4F;TIFINAGH LETTER YAN;Lo;0;L;;;;;N;;;;;
+2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;;
+2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;;
+2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;;
+2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;;;;
+2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;;
+2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;;
+2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;;
+2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;;
+2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;;;;
+2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;;
+2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;;
+2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;;
+2D5C;TIFINAGH LETTER YAT;Lo;0;L;;;;;N;;;;;
+2D5D;TIFINAGH LETTER YATH;Lo;0;L;;;;;N;;;;;
+2D5E;TIFINAGH LETTER YACH;Lo;0;L;;;;;N;;;;;
+2D5F;TIFINAGH LETTER YATT;Lo;0;L;;;;;N;;;;;
+2D60;TIFINAGH LETTER YAV;Lo;0;L;;;;;N;;;;;
+2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;;
+2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;;
+2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;;
+2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;;;;
+2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;;
+2D66;TIFINAGH LETTER YE;Lo;0;L;;;;;N;;;;;
+2D67;TIFINAGH LETTER YO;Lo;0;L;;;;;N;;;;;
+2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;;;;
+2D70;TIFINAGH SEPARATOR MARK;Po;0;L;;;;;N;;;;;
+2D7F;TIFINAGH CONSONANT JOINER;Mn;9;NSM;;;;;N;;;;;
+2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;;
+2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;;
+2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;;
+2D83;ETHIOPIC SYLLABLE SOA;Lo;0;L;;;;;N;;;;;
+2D84;ETHIOPIC SYLLABLE SHOA;Lo;0;L;;;;;N;;;;;
+2D85;ETHIOPIC SYLLABLE BOA;Lo;0;L;;;;;N;;;;;
+2D86;ETHIOPIC SYLLABLE TOA;Lo;0;L;;;;;N;;;;;
+2D87;ETHIOPIC SYLLABLE COA;Lo;0;L;;;;;N;;;;;
+2D88;ETHIOPIC SYLLABLE NOA;Lo;0;L;;;;;N;;;;;
+2D89;ETHIOPIC SYLLABLE NYOA;Lo;0;L;;;;;N;;;;;
+2D8A;ETHIOPIC SYLLABLE GLOTTAL OA;Lo;0;L;;;;;N;;;;;
+2D8B;ETHIOPIC SYLLABLE ZOA;Lo;0;L;;;;;N;;;;;
+2D8C;ETHIOPIC SYLLABLE DOA;Lo;0;L;;;;;N;;;;;
+2D8D;ETHIOPIC SYLLABLE DDOA;Lo;0;L;;;;;N;;;;;
+2D8E;ETHIOPIC SYLLABLE JOA;Lo;0;L;;;;;N;;;;;
+2D8F;ETHIOPIC SYLLABLE THOA;Lo;0;L;;;;;N;;;;;
+2D90;ETHIOPIC SYLLABLE CHOA;Lo;0;L;;;;;N;;;;;
+2D91;ETHIOPIC SYLLABLE PHOA;Lo;0;L;;;;;N;;;;;
+2D92;ETHIOPIC SYLLABLE POA;Lo;0;L;;;;;N;;;;;
+2D93;ETHIOPIC SYLLABLE GGWA;Lo;0;L;;;;;N;;;;;
+2D94;ETHIOPIC SYLLABLE GGWI;Lo;0;L;;;;;N;;;;;
+2D95;ETHIOPIC SYLLABLE GGWEE;Lo;0;L;;;;;N;;;;;
+2D96;ETHIOPIC SYLLABLE GGWE;Lo;0;L;;;;;N;;;;;
+2DA0;ETHIOPIC SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+2DA1;ETHIOPIC SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+2DA2;ETHIOPIC SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+2DA3;ETHIOPIC SYLLABLE SSAA;Lo;0;L;;;;;N;;;;;
+2DA4;ETHIOPIC SYLLABLE SSEE;Lo;0;L;;;;;N;;;;;
+2DA5;ETHIOPIC SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+2DA6;ETHIOPIC SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+2DA8;ETHIOPIC SYLLABLE CCA;Lo;0;L;;;;;N;;;;;
+2DA9;ETHIOPIC SYLLABLE CCU;Lo;0;L;;;;;N;;;;;
+2DAA;ETHIOPIC SYLLABLE CCI;Lo;0;L;;;;;N;;;;;
+2DAB;ETHIOPIC SYLLABLE CCAA;Lo;0;L;;;;;N;;;;;
+2DAC;ETHIOPIC SYLLABLE CCEE;Lo;0;L;;;;;N;;;;;
+2DAD;ETHIOPIC SYLLABLE CCE;Lo;0;L;;;;;N;;;;;
+2DAE;ETHIOPIC SYLLABLE CCO;Lo;0;L;;;;;N;;;;;
+2DB0;ETHIOPIC SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+2DB1;ETHIOPIC SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+2DB2;ETHIOPIC SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+2DB3;ETHIOPIC SYLLABLE ZZAA;Lo;0;L;;;;;N;;;;;
+2DB4;ETHIOPIC SYLLABLE ZZEE;Lo;0;L;;;;;N;;;;;
+2DB5;ETHIOPIC SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+2DB6;ETHIOPIC SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+2DB8;ETHIOPIC SYLLABLE CCHA;Lo;0;L;;;;;N;;;;;
+2DB9;ETHIOPIC SYLLABLE CCHU;Lo;0;L;;;;;N;;;;;
+2DBA;ETHIOPIC SYLLABLE CCHI;Lo;0;L;;;;;N;;;;;
+2DBB;ETHIOPIC SYLLABLE CCHAA;Lo;0;L;;;;;N;;;;;
+2DBC;ETHIOPIC SYLLABLE CCHEE;Lo;0;L;;;;;N;;;;;
+2DBD;ETHIOPIC SYLLABLE CCHE;Lo;0;L;;;;;N;;;;;
+2DBE;ETHIOPIC SYLLABLE CCHO;Lo;0;L;;;;;N;;;;;
+2DC0;ETHIOPIC SYLLABLE QYA;Lo;0;L;;;;;N;;;;;
+2DC1;ETHIOPIC SYLLABLE QYU;Lo;0;L;;;;;N;;;;;
+2DC2;ETHIOPIC SYLLABLE QYI;Lo;0;L;;;;;N;;;;;
+2DC3;ETHIOPIC SYLLABLE QYAA;Lo;0;L;;;;;N;;;;;
+2DC4;ETHIOPIC SYLLABLE QYEE;Lo;0;L;;;;;N;;;;;
+2DC5;ETHIOPIC SYLLABLE QYE;Lo;0;L;;;;;N;;;;;
+2DC6;ETHIOPIC SYLLABLE QYO;Lo;0;L;;;;;N;;;;;
+2DC8;ETHIOPIC SYLLABLE KYA;Lo;0;L;;;;;N;;;;;
+2DC9;ETHIOPIC SYLLABLE KYU;Lo;0;L;;;;;N;;;;;
+2DCA;ETHIOPIC SYLLABLE KYI;Lo;0;L;;;;;N;;;;;
+2DCB;ETHIOPIC SYLLABLE KYAA;Lo;0;L;;;;;N;;;;;
+2DCC;ETHIOPIC SYLLABLE KYEE;Lo;0;L;;;;;N;;;;;
+2DCD;ETHIOPIC SYLLABLE KYE;Lo;0;L;;;;;N;;;;;
+2DCE;ETHIOPIC SYLLABLE KYO;Lo;0;L;;;;;N;;;;;
+2DD0;ETHIOPIC SYLLABLE XYA;Lo;0;L;;;;;N;;;;;
+2DD1;ETHIOPIC SYLLABLE XYU;Lo;0;L;;;;;N;;;;;
+2DD2;ETHIOPIC SYLLABLE XYI;Lo;0;L;;;;;N;;;;;
+2DD3;ETHIOPIC SYLLABLE XYAA;Lo;0;L;;;;;N;;;;;
+2DD4;ETHIOPIC SYLLABLE XYEE;Lo;0;L;;;;;N;;;;;
+2DD5;ETHIOPIC SYLLABLE XYE;Lo;0;L;;;;;N;;;;;
+2DD6;ETHIOPIC SYLLABLE XYO;Lo;0;L;;;;;N;;;;;
+2DD8;ETHIOPIC SYLLABLE GYA;Lo;0;L;;;;;N;;;;;
+2DD9;ETHIOPIC SYLLABLE GYU;Lo;0;L;;;;;N;;;;;
+2DDA;ETHIOPIC SYLLABLE GYI;Lo;0;L;;;;;N;;;;;
+2DDB;ETHIOPIC SYLLABLE GYAA;Lo;0;L;;;;;N;;;;;
+2DDC;ETHIOPIC SYLLABLE GYEE;Lo;0;L;;;;;N;;;;;
+2DDD;ETHIOPIC SYLLABLE GYE;Lo;0;L;;;;;N;;;;;
+2DDE;ETHIOPIC SYLLABLE GYO;Lo;0;L;;;;;N;;;;;
+2DE0;COMBINING CYRILLIC LETTER BE;Mn;230;NSM;;;;;N;;;;;
+2DE1;COMBINING CYRILLIC LETTER VE;Mn;230;NSM;;;;;N;;;;;
+2DE2;COMBINING CYRILLIC LETTER GHE;Mn;230;NSM;;;;;N;;;;;
+2DE3;COMBINING CYRILLIC LETTER DE;Mn;230;NSM;;;;;N;;;;;
+2DE4;COMBINING CYRILLIC LETTER ZHE;Mn;230;NSM;;;;;N;;;;;
+2DE5;COMBINING CYRILLIC LETTER ZE;Mn;230;NSM;;;;;N;;;;;
+2DE6;COMBINING CYRILLIC LETTER KA;Mn;230;NSM;;;;;N;;;;;
+2DE7;COMBINING CYRILLIC LETTER EL;Mn;230;NSM;;;;;N;;;;;
+2DE8;COMBINING CYRILLIC LETTER EM;Mn;230;NSM;;;;;N;;;;;
+2DE9;COMBINING CYRILLIC LETTER EN;Mn;230;NSM;;;;;N;;;;;
+2DEA;COMBINING CYRILLIC LETTER O;Mn;230;NSM;;;;;N;;;;;
+2DEB;COMBINING CYRILLIC LETTER PE;Mn;230;NSM;;;;;N;;;;;
+2DEC;COMBINING CYRILLIC LETTER ER;Mn;230;NSM;;;;;N;;;;;
+2DED;COMBINING CYRILLIC LETTER ES;Mn;230;NSM;;;;;N;;;;;
+2DEE;COMBINING CYRILLIC LETTER TE;Mn;230;NSM;;;;;N;;;;;
+2DEF;COMBINING CYRILLIC LETTER HA;Mn;230;NSM;;;;;N;;;;;
+2DF0;COMBINING CYRILLIC LETTER TSE;Mn;230;NSM;;;;;N;;;;;
+2DF1;COMBINING CYRILLIC LETTER CHE;Mn;230;NSM;;;;;N;;;;;
+2DF2;COMBINING CYRILLIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+2DF3;COMBINING CYRILLIC LETTER SHCHA;Mn;230;NSM;;;;;N;;;;;
+2DF4;COMBINING CYRILLIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
+2DF5;COMBINING CYRILLIC LETTER ES-TE;Mn;230;NSM;;;;;N;;;;;
+2DF6;COMBINING CYRILLIC LETTER A;Mn;230;NSM;;;;;N;;;;;
+2DF7;COMBINING CYRILLIC LETTER IE;Mn;230;NSM;;;;;N;;;;;
+2DF8;COMBINING CYRILLIC LETTER DJERV;Mn;230;NSM;;;;;N;;;;;
+2DF9;COMBINING CYRILLIC LETTER MONOGRAPH UK;Mn;230;NSM;;;;;N;;;;;
+2DFA;COMBINING CYRILLIC LETTER YAT;Mn;230;NSM;;;;;N;;;;;
+2DFB;COMBINING CYRILLIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+2DFC;COMBINING CYRILLIC LETTER IOTIFIED A;Mn;230;NSM;;;;;N;;;;;
+2DFD;COMBINING CYRILLIC LETTER LITTLE YUS;Mn;230;NSM;;;;;N;;;;;
+2DFE;COMBINING CYRILLIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2DFF;COMBINING CYRILLIC LETTER IOTIFIED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2E00;RIGHT ANGLE SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E01;RIGHT ANGLE DOTTED SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E02;LEFT SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E03;RIGHT SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E04;LEFT DOTTED SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E05;RIGHT DOTTED SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E06;RAISED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E07;RAISED DOTTED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E08;DOTTED TRANSPOSITION MARKER;Po;0;ON;;;;;N;;;;;
+2E09;LEFT TRANSPOSITION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0A;RIGHT TRANSPOSITION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0B;RAISED SQUARE;Po;0;ON;;;;;N;;;;;
+2E0C;LEFT RAISED OMISSION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0D;RIGHT RAISED OMISSION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0E;EDITORIAL CORONIS;Po;0;ON;;;;;N;;;;;
+2E0F;PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E10;FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E11;REVERSED FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E12;HYPODIASTOLE;Po;0;ON;;;;;N;;;;;
+2E13;DOTTED OBELOS;Po;0;ON;;;;;N;;;;;
+2E14;DOWNWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E15;UPWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E16;DOTTED RIGHT-POINTING ANGLE;Po;0;ON;;;;;N;;;;;
+2E17;DOUBLE OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;;
+2E18;INVERTED INTERROBANG;Po;0;ON;;;;;N;;;;;
+2E19;PALM BRANCH;Po;0;ON;;;;;N;;;;;
+2E1A;HYPHEN WITH DIAERESIS;Pd;0;ON;;;;;N;;;;;
+2E1B;TILDE WITH RING ABOVE;Po;0;ON;;;;;N;;;;;
+2E1C;LEFT LOW PARAPHRASE BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E1D;RIGHT LOW PARAPHRASE BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E1E;TILDE WITH DOT ABOVE;Po;0;ON;;;;;N;;;;;
+2E1F;TILDE WITH DOT BELOW;Po;0;ON;;;;;N;;;;;
+2E20;LEFT VERTICAL BAR WITH QUILL;Pi;0;ON;;;;;Y;;;;;
+2E21;RIGHT VERTICAL BAR WITH QUILL;Pf;0;ON;;;;;Y;;;;;
+2E22;TOP LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E23;TOP RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E24;BOTTOM LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E25;BOTTOM RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E26;LEFT SIDEWAYS U BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E27;RIGHT SIDEWAYS U BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E28;LEFT DOUBLE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2E29;RIGHT DOUBLE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2E2A;TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2B;ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2C;SQUARED FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2D;FIVE DOT MARK;Po;0;ON;;;;;N;;;;;
+2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;;
+2E30;RING POINT;Po;0;ON;;;;;N;;;;;
+2E31;WORD SEPARATOR MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+2E32;TURNED COMMA;Po;0;ON;;;;;N;;;;;
+2E33;RAISED DOT;Po;0;ON;;;;;N;;;;;
+2E34;RAISED COMMA;Po;0;ON;;;;;N;;;;;
+2E35;TURNED SEMICOLON;Po;0;ON;;;;;N;;;;;
+2E36;DAGGER WITH LEFT GUARD;Po;0;ON;;;;;N;;;;;
+2E37;DAGGER WITH RIGHT GUARD;Po;0;ON;;;;;N;;;;;
+2E38;TURNED DAGGER;Po;0;ON;;;;;N;;;;;
+2E39;TOP HALF SECTION SIGN;Po;0;ON;;;;;N;;;;;
+2E3A;TWO-EM DASH;Pd;0;ON;;;;;N;;;;;
+2E3B;THREE-EM DASH;Pd;0;ON;;;;;N;;;;;
+2E3C;STENOGRAPHIC FULL STOP;Po;0;ON;;;;;N;;;;;
+2E3D;VERTICAL SIX DOTS;Po;0;ON;;;;;N;;;;;
+2E3E;WIGGLY VERTICAL LINE;Po;0;ON;;;;;N;;;;;
+2E3F;CAPITULUM;Po;0;ON;;;;;N;;;;;
+2E40;DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
+2E41;REVERSED COMMA;Po;0;ON;;;;;N;;;;;
+2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;;
+2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;;
+2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
+2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
+2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
+2E83;CJK RADICAL SECOND TWO;So;0;ON;;;;;N;;;;;
+2E84;CJK RADICAL SECOND THREE;So;0;ON;;;;;N;;;;;
+2E85;CJK RADICAL PERSON;So;0;ON;;;;;N;;;;;
+2E86;CJK RADICAL BOX;So;0;ON;;;;;N;;;;;
+2E87;CJK RADICAL TABLE;So;0;ON;;;;;N;;;;;
+2E88;CJK RADICAL KNIFE ONE;So;0;ON;;;;;N;;;;;
+2E89;CJK RADICAL KNIFE TWO;So;0;ON;;;;;N;;;;;
+2E8A;CJK RADICAL DIVINATION;So;0;ON;;;;;N;;;;;
+2E8B;CJK RADICAL SEAL;So;0;ON;;;;;N;;;;;
+2E8C;CJK RADICAL SMALL ONE;So;0;ON;;;;;N;;;;;
+2E8D;CJK RADICAL SMALL TWO;So;0;ON;;;;;N;;;;;
+2E8E;CJK RADICAL LAME ONE;So;0;ON;;;;;N;;;;;
+2E8F;CJK RADICAL LAME TWO;So;0;ON;;;;;N;;;;;
+2E90;CJK RADICAL LAME THREE;So;0;ON;;;;;N;;;;;
+2E91;CJK RADICAL LAME FOUR;So;0;ON;;;;;N;;;;;
+2E92;CJK RADICAL SNAKE;So;0;ON;;;;;N;;;;;
+2E93;CJK RADICAL THREAD;So;0;ON;;;;;N;;;;;
+2E94;CJK RADICAL SNOUT ONE;So;0;ON;;;;;N;;;;;
+2E95;CJK RADICAL SNOUT TWO;So;0;ON;;;;;N;;;;;
+2E96;CJK RADICAL HEART ONE;So;0;ON;;;;;N;;;;;
+2E97;CJK RADICAL HEART TWO;So;0;ON;;;;;N;;;;;
+2E98;CJK RADICAL HAND;So;0;ON;;;;;N;;;;;
+2E99;CJK RADICAL RAP;So;0;ON;;;;;N;;;;;
+2E9B;CJK RADICAL CHOKE;So;0;ON;;;;;N;;;;;
+2E9C;CJK RADICAL SUN;So;0;ON;;;;;N;;;;;
+2E9D;CJK RADICAL MOON;So;0;ON;;;;;N;;;;;
+2E9E;CJK RADICAL DEATH;So;0;ON;;;;;N;;;;;
+2E9F;CJK RADICAL MOTHER;So;0;ON;<compat> 6BCD;;;;N;;;;;
+2EA0;CJK RADICAL CIVILIAN;So;0;ON;;;;;N;;;;;
+2EA1;CJK RADICAL WATER ONE;So;0;ON;;;;;N;;;;;
+2EA2;CJK RADICAL WATER TWO;So;0;ON;;;;;N;;;;;
+2EA3;CJK RADICAL FIRE;So;0;ON;;;;;N;;;;;
+2EA4;CJK RADICAL PAW ONE;So;0;ON;;;;;N;;;;;
+2EA5;CJK RADICAL PAW TWO;So;0;ON;;;;;N;;;;;
+2EA6;CJK RADICAL SIMPLIFIED HALF TREE TRUNK;So;0;ON;;;;;N;;;;;
+2EA7;CJK RADICAL COW;So;0;ON;;;;;N;;;;;
+2EA8;CJK RADICAL DOG;So;0;ON;;;;;N;;;;;
+2EA9;CJK RADICAL JADE;So;0;ON;;;;;N;;;;;
+2EAA;CJK RADICAL BOLT OF CLOTH;So;0;ON;;;;;N;;;;;
+2EAB;CJK RADICAL EYE;So;0;ON;;;;;N;;;;;
+2EAC;CJK RADICAL SPIRIT ONE;So;0;ON;;;;;N;;;;;
+2EAD;CJK RADICAL SPIRIT TWO;So;0;ON;;;;;N;;;;;
+2EAE;CJK RADICAL BAMBOO;So;0;ON;;;;;N;;;;;
+2EAF;CJK RADICAL SILK;So;0;ON;;;;;N;;;;;
+2EB0;CJK RADICAL C-SIMPLIFIED SILK;So;0;ON;;;;;N;;;;;
+2EB1;CJK RADICAL NET ONE;So;0;ON;;;;;N;;;;;
+2EB2;CJK RADICAL NET TWO;So;0;ON;;;;;N;;;;;
+2EB3;CJK RADICAL NET THREE;So;0;ON;;;;;N;;;;;
+2EB4;CJK RADICAL NET FOUR;So;0;ON;;;;;N;;;;;
+2EB5;CJK RADICAL MESH;So;0;ON;;;;;N;;;;;
+2EB6;CJK RADICAL SHEEP;So;0;ON;;;;;N;;;;;
+2EB7;CJK RADICAL RAM;So;0;ON;;;;;N;;;;;
+2EB8;CJK RADICAL EWE;So;0;ON;;;;;N;;;;;
+2EB9;CJK RADICAL OLD;So;0;ON;;;;;N;;;;;
+2EBA;CJK RADICAL BRUSH ONE;So;0;ON;;;;;N;;;;;
+2EBB;CJK RADICAL BRUSH TWO;So;0;ON;;;;;N;;;;;
+2EBC;CJK RADICAL MEAT;So;0;ON;;;;;N;;;;;
+2EBD;CJK RADICAL MORTAR;So;0;ON;;;;;N;;;;;
+2EBE;CJK RADICAL GRASS ONE;So;0;ON;;;;;N;;;;;
+2EBF;CJK RADICAL GRASS TWO;So;0;ON;;;;;N;;;;;
+2EC0;CJK RADICAL GRASS THREE;So;0;ON;;;;;N;;;;;
+2EC1;CJK RADICAL TIGER;So;0;ON;;;;;N;;;;;
+2EC2;CJK RADICAL CLOTHES;So;0;ON;;;;;N;;;;;
+2EC3;CJK RADICAL WEST ONE;So;0;ON;;;;;N;;;;;
+2EC4;CJK RADICAL WEST TWO;So;0;ON;;;;;N;;;;;
+2EC5;CJK RADICAL C-SIMPLIFIED SEE;So;0;ON;;;;;N;;;;;
+2EC6;CJK RADICAL SIMPLIFIED HORN;So;0;ON;;;;;N;;;;;
+2EC7;CJK RADICAL HORN;So;0;ON;;;;;N;;;;;
+2EC8;CJK RADICAL C-SIMPLIFIED SPEECH;So;0;ON;;;;;N;;;;;
+2EC9;CJK RADICAL C-SIMPLIFIED SHELL;So;0;ON;;;;;N;;;;;
+2ECA;CJK RADICAL FOOT;So;0;ON;;;;;N;;;;;
+2ECB;CJK RADICAL C-SIMPLIFIED CART;So;0;ON;;;;;N;;;;;
+2ECC;CJK RADICAL SIMPLIFIED WALK;So;0;ON;;;;;N;;;;;
+2ECD;CJK RADICAL WALK ONE;So;0;ON;;;;;N;;;;;
+2ECE;CJK RADICAL WALK TWO;So;0;ON;;;;;N;;;;;
+2ECF;CJK RADICAL CITY;So;0;ON;;;;;N;;;;;
+2ED0;CJK RADICAL C-SIMPLIFIED GOLD;So;0;ON;;;;;N;;;;;
+2ED1;CJK RADICAL LONG ONE;So;0;ON;;;;;N;;;;;
+2ED2;CJK RADICAL LONG TWO;So;0;ON;;;;;N;;;;;
+2ED3;CJK RADICAL C-SIMPLIFIED LONG;So;0;ON;;;;;N;;;;;
+2ED4;CJK RADICAL C-SIMPLIFIED GATE;So;0;ON;;;;;N;;;;;
+2ED5;CJK RADICAL MOUND ONE;So;0;ON;;;;;N;;;;;
+2ED6;CJK RADICAL MOUND TWO;So;0;ON;;;;;N;;;;;
+2ED7;CJK RADICAL RAIN;So;0;ON;;;;;N;;;;;
+2ED8;CJK RADICAL BLUE;So;0;ON;;;;;N;;;;;
+2ED9;CJK RADICAL C-SIMPLIFIED TANNED LEATHER;So;0;ON;;;;;N;;;;;
+2EDA;CJK RADICAL C-SIMPLIFIED LEAF;So;0;ON;;;;;N;;;;;
+2EDB;CJK RADICAL C-SIMPLIFIED WIND;So;0;ON;;;;;N;;;;;
+2EDC;CJK RADICAL C-SIMPLIFIED FLY;So;0;ON;;;;;N;;;;;
+2EDD;CJK RADICAL EAT ONE;So;0;ON;;;;;N;;;;;
+2EDE;CJK RADICAL EAT TWO;So;0;ON;;;;;N;;;;;
+2EDF;CJK RADICAL EAT THREE;So;0;ON;;;;;N;;;;;
+2EE0;CJK RADICAL C-SIMPLIFIED EAT;So;0;ON;;;;;N;;;;;
+2EE1;CJK RADICAL HEAD;So;0;ON;;;;;N;;;;;
+2EE2;CJK RADICAL C-SIMPLIFIED HORSE;So;0;ON;;;;;N;;;;;
+2EE3;CJK RADICAL BONE;So;0;ON;;;;;N;;;;;
+2EE4;CJK RADICAL GHOST;So;0;ON;;;;;N;;;;;
+2EE5;CJK RADICAL C-SIMPLIFIED FISH;So;0;ON;;;;;N;;;;;
+2EE6;CJK RADICAL C-SIMPLIFIED BIRD;So;0;ON;;;;;N;;;;;
+2EE7;CJK RADICAL C-SIMPLIFIED SALT;So;0;ON;;;;;N;;;;;
+2EE8;CJK RADICAL SIMPLIFIED WHEAT;So;0;ON;;;;;N;;;;;
+2EE9;CJK RADICAL SIMPLIFIED YELLOW;So;0;ON;;;;;N;;;;;
+2EEA;CJK RADICAL C-SIMPLIFIED FROG;So;0;ON;;;;;N;;;;;
+2EEB;CJK RADICAL J-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EEC;CJK RADICAL C-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EED;CJK RADICAL J-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEE;CJK RADICAL C-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEF;CJK RADICAL J-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF0;CJK RADICAL C-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF1;CJK RADICAL TURTLE;So;0;ON;;;;;N;;;;;
+2EF2;CJK RADICAL J-SIMPLIFIED TURTLE;So;0;ON;;;;;N;;;;;
+2EF3;CJK RADICAL C-SIMPLIFIED TURTLE;So;0;ON;<compat> 9F9F;;;;N;;;;;
+2F00;KANGXI RADICAL ONE;So;0;ON;<compat> 4E00;;;;N;;;;;
+2F01;KANGXI RADICAL LINE;So;0;ON;<compat> 4E28;;;;N;;;;;
+2F02;KANGXI RADICAL DOT;So;0;ON;<compat> 4E36;;;;N;;;;;
+2F03;KANGXI RADICAL SLASH;So;0;ON;<compat> 4E3F;;;;N;;;;;
+2F04;KANGXI RADICAL SECOND;So;0;ON;<compat> 4E59;;;;N;;;;;
+2F05;KANGXI RADICAL HOOK;So;0;ON;<compat> 4E85;;;;N;;;;;
+2F06;KANGXI RADICAL TWO;So;0;ON;<compat> 4E8C;;;;N;;;;;
+2F07;KANGXI RADICAL LID;So;0;ON;<compat> 4EA0;;;;N;;;;;
+2F08;KANGXI RADICAL MAN;So;0;ON;<compat> 4EBA;;;;N;;;;;
+2F09;KANGXI RADICAL LEGS;So;0;ON;<compat> 513F;;;;N;;;;;
+2F0A;KANGXI RADICAL ENTER;So;0;ON;<compat> 5165;;;;N;;;;;
+2F0B;KANGXI RADICAL EIGHT;So;0;ON;<compat> 516B;;;;N;;;;;
+2F0C;KANGXI RADICAL DOWN BOX;So;0;ON;<compat> 5182;;;;N;;;;;
+2F0D;KANGXI RADICAL COVER;So;0;ON;<compat> 5196;;;;N;;;;;
+2F0E;KANGXI RADICAL ICE;So;0;ON;<compat> 51AB;;;;N;;;;;
+2F0F;KANGXI RADICAL TABLE;So;0;ON;<compat> 51E0;;;;N;;;;;
+2F10;KANGXI RADICAL OPEN BOX;So;0;ON;<compat> 51F5;;;;N;;;;;
+2F11;KANGXI RADICAL KNIFE;So;0;ON;<compat> 5200;;;;N;;;;;
+2F12;KANGXI RADICAL POWER;So;0;ON;<compat> 529B;;;;N;;;;;
+2F13;KANGXI RADICAL WRAP;So;0;ON;<compat> 52F9;;;;N;;;;;
+2F14;KANGXI RADICAL SPOON;So;0;ON;<compat> 5315;;;;N;;;;;
+2F15;KANGXI RADICAL RIGHT OPEN BOX;So;0;ON;<compat> 531A;;;;N;;;;;
+2F16;KANGXI RADICAL HIDING ENCLOSURE;So;0;ON;<compat> 5338;;;;N;;;;;
+2F17;KANGXI RADICAL TEN;So;0;ON;<compat> 5341;;;;N;;;;;
+2F18;KANGXI RADICAL DIVINATION;So;0;ON;<compat> 535C;;;;N;;;;;
+2F19;KANGXI RADICAL SEAL;So;0;ON;<compat> 5369;;;;N;;;;;
+2F1A;KANGXI RADICAL CLIFF;So;0;ON;<compat> 5382;;;;N;;;;;
+2F1B;KANGXI RADICAL PRIVATE;So;0;ON;<compat> 53B6;;;;N;;;;;
+2F1C;KANGXI RADICAL AGAIN;So;0;ON;<compat> 53C8;;;;N;;;;;
+2F1D;KANGXI RADICAL MOUTH;So;0;ON;<compat> 53E3;;;;N;;;;;
+2F1E;KANGXI RADICAL ENCLOSURE;So;0;ON;<compat> 56D7;;;;N;;;;;
+2F1F;KANGXI RADICAL EARTH;So;0;ON;<compat> 571F;;;;N;;;;;
+2F20;KANGXI RADICAL SCHOLAR;So;0;ON;<compat> 58EB;;;;N;;;;;
+2F21;KANGXI RADICAL GO;So;0;ON;<compat> 5902;;;;N;;;;;
+2F22;KANGXI RADICAL GO SLOWLY;So;0;ON;<compat> 590A;;;;N;;;;;
+2F23;KANGXI RADICAL EVENING;So;0;ON;<compat> 5915;;;;N;;;;;
+2F24;KANGXI RADICAL BIG;So;0;ON;<compat> 5927;;;;N;;;;;
+2F25;KANGXI RADICAL WOMAN;So;0;ON;<compat> 5973;;;;N;;;;;
+2F26;KANGXI RADICAL CHILD;So;0;ON;<compat> 5B50;;;;N;;;;;
+2F27;KANGXI RADICAL ROOF;So;0;ON;<compat> 5B80;;;;N;;;;;
+2F28;KANGXI RADICAL INCH;So;0;ON;<compat> 5BF8;;;;N;;;;;
+2F29;KANGXI RADICAL SMALL;So;0;ON;<compat> 5C0F;;;;N;;;;;
+2F2A;KANGXI RADICAL LAME;So;0;ON;<compat> 5C22;;;;N;;;;;
+2F2B;KANGXI RADICAL CORPSE;So;0;ON;<compat> 5C38;;;;N;;;;;
+2F2C;KANGXI RADICAL SPROUT;So;0;ON;<compat> 5C6E;;;;N;;;;;
+2F2D;KANGXI RADICAL MOUNTAIN;So;0;ON;<compat> 5C71;;;;N;;;;;
+2F2E;KANGXI RADICAL RIVER;So;0;ON;<compat> 5DDB;;;;N;;;;;
+2F2F;KANGXI RADICAL WORK;So;0;ON;<compat> 5DE5;;;;N;;;;;
+2F30;KANGXI RADICAL ONESELF;So;0;ON;<compat> 5DF1;;;;N;;;;;
+2F31;KANGXI RADICAL TURBAN;So;0;ON;<compat> 5DFE;;;;N;;;;;
+2F32;KANGXI RADICAL DRY;So;0;ON;<compat> 5E72;;;;N;;;;;
+2F33;KANGXI RADICAL SHORT THREAD;So;0;ON;<compat> 5E7A;;;;N;;;;;
+2F34;KANGXI RADICAL DOTTED CLIFF;So;0;ON;<compat> 5E7F;;;;N;;;;;
+2F35;KANGXI RADICAL LONG STRIDE;So;0;ON;<compat> 5EF4;;;;N;;;;;
+2F36;KANGXI RADICAL TWO HANDS;So;0;ON;<compat> 5EFE;;;;N;;;;;
+2F37;KANGXI RADICAL SHOOT;So;0;ON;<compat> 5F0B;;;;N;;;;;
+2F38;KANGXI RADICAL BOW;So;0;ON;<compat> 5F13;;;;N;;;;;
+2F39;KANGXI RADICAL SNOUT;So;0;ON;<compat> 5F50;;;;N;;;;;
+2F3A;KANGXI RADICAL BRISTLE;So;0;ON;<compat> 5F61;;;;N;;;;;
+2F3B;KANGXI RADICAL STEP;So;0;ON;<compat> 5F73;;;;N;;;;;
+2F3C;KANGXI RADICAL HEART;So;0;ON;<compat> 5FC3;;;;N;;;;;
+2F3D;KANGXI RADICAL HALBERD;So;0;ON;<compat> 6208;;;;N;;;;;
+2F3E;KANGXI RADICAL DOOR;So;0;ON;<compat> 6236;;;;N;;;;;
+2F3F;KANGXI RADICAL HAND;So;0;ON;<compat> 624B;;;;N;;;;;
+2F40;KANGXI RADICAL BRANCH;So;0;ON;<compat> 652F;;;;N;;;;;
+2F41;KANGXI RADICAL RAP;So;0;ON;<compat> 6534;;;;N;;;;;
+2F42;KANGXI RADICAL SCRIPT;So;0;ON;<compat> 6587;;;;N;;;;;
+2F43;KANGXI RADICAL DIPPER;So;0;ON;<compat> 6597;;;;N;;;;;
+2F44;KANGXI RADICAL AXE;So;0;ON;<compat> 65A4;;;;N;;;;;
+2F45;KANGXI RADICAL SQUARE;So;0;ON;<compat> 65B9;;;;N;;;;;
+2F46;KANGXI RADICAL NOT;So;0;ON;<compat> 65E0;;;;N;;;;;
+2F47;KANGXI RADICAL SUN;So;0;ON;<compat> 65E5;;;;N;;;;;
+2F48;KANGXI RADICAL SAY;So;0;ON;<compat> 66F0;;;;N;;;;;
+2F49;KANGXI RADICAL MOON;So;0;ON;<compat> 6708;;;;N;;;;;
+2F4A;KANGXI RADICAL TREE;So;0;ON;<compat> 6728;;;;N;;;;;
+2F4B;KANGXI RADICAL LACK;So;0;ON;<compat> 6B20;;;;N;;;;;
+2F4C;KANGXI RADICAL STOP;So;0;ON;<compat> 6B62;;;;N;;;;;
+2F4D;KANGXI RADICAL DEATH;So;0;ON;<compat> 6B79;;;;N;;;;;
+2F4E;KANGXI RADICAL WEAPON;So;0;ON;<compat> 6BB3;;;;N;;;;;
+2F4F;KANGXI RADICAL DO NOT;So;0;ON;<compat> 6BCB;;;;N;;;;;
+2F50;KANGXI RADICAL COMPARE;So;0;ON;<compat> 6BD4;;;;N;;;;;
+2F51;KANGXI RADICAL FUR;So;0;ON;<compat> 6BDB;;;;N;;;;;
+2F52;KANGXI RADICAL CLAN;So;0;ON;<compat> 6C0F;;;;N;;;;;
+2F53;KANGXI RADICAL STEAM;So;0;ON;<compat> 6C14;;;;N;;;;;
+2F54;KANGXI RADICAL WATER;So;0;ON;<compat> 6C34;;;;N;;;;;
+2F55;KANGXI RADICAL FIRE;So;0;ON;<compat> 706B;;;;N;;;;;
+2F56;KANGXI RADICAL CLAW;So;0;ON;<compat> 722A;;;;N;;;;;
+2F57;KANGXI RADICAL FATHER;So;0;ON;<compat> 7236;;;;N;;;;;
+2F58;KANGXI RADICAL DOUBLE X;So;0;ON;<compat> 723B;;;;N;;;;;
+2F59;KANGXI RADICAL HALF TREE TRUNK;So;0;ON;<compat> 723F;;;;N;;;;;
+2F5A;KANGXI RADICAL SLICE;So;0;ON;<compat> 7247;;;;N;;;;;
+2F5B;KANGXI RADICAL FANG;So;0;ON;<compat> 7259;;;;N;;;;;
+2F5C;KANGXI RADICAL COW;So;0;ON;<compat> 725B;;;;N;;;;;
+2F5D;KANGXI RADICAL DOG;So;0;ON;<compat> 72AC;;;;N;;;;;
+2F5E;KANGXI RADICAL PROFOUND;So;0;ON;<compat> 7384;;;;N;;;;;
+2F5F;KANGXI RADICAL JADE;So;0;ON;<compat> 7389;;;;N;;;;;
+2F60;KANGXI RADICAL MELON;So;0;ON;<compat> 74DC;;;;N;;;;;
+2F61;KANGXI RADICAL TILE;So;0;ON;<compat> 74E6;;;;N;;;;;
+2F62;KANGXI RADICAL SWEET;So;0;ON;<compat> 7518;;;;N;;;;;
+2F63;KANGXI RADICAL LIFE;So;0;ON;<compat> 751F;;;;N;;;;;
+2F64;KANGXI RADICAL USE;So;0;ON;<compat> 7528;;;;N;;;;;
+2F65;KANGXI RADICAL FIELD;So;0;ON;<compat> 7530;;;;N;;;;;
+2F66;KANGXI RADICAL BOLT OF CLOTH;So;0;ON;<compat> 758B;;;;N;;;;;
+2F67;KANGXI RADICAL SICKNESS;So;0;ON;<compat> 7592;;;;N;;;;;
+2F68;KANGXI RADICAL DOTTED TENT;So;0;ON;<compat> 7676;;;;N;;;;;
+2F69;KANGXI RADICAL WHITE;So;0;ON;<compat> 767D;;;;N;;;;;
+2F6A;KANGXI RADICAL SKIN;So;0;ON;<compat> 76AE;;;;N;;;;;
+2F6B;KANGXI RADICAL DISH;So;0;ON;<compat> 76BF;;;;N;;;;;
+2F6C;KANGXI RADICAL EYE;So;0;ON;<compat> 76EE;;;;N;;;;;
+2F6D;KANGXI RADICAL SPEAR;So;0;ON;<compat> 77DB;;;;N;;;;;
+2F6E;KANGXI RADICAL ARROW;So;0;ON;<compat> 77E2;;;;N;;;;;
+2F6F;KANGXI RADICAL STONE;So;0;ON;<compat> 77F3;;;;N;;;;;
+2F70;KANGXI RADICAL SPIRIT;So;0;ON;<compat> 793A;;;;N;;;;;
+2F71;KANGXI RADICAL TRACK;So;0;ON;<compat> 79B8;;;;N;;;;;
+2F72;KANGXI RADICAL GRAIN;So;0;ON;<compat> 79BE;;;;N;;;;;
+2F73;KANGXI RADICAL CAVE;So;0;ON;<compat> 7A74;;;;N;;;;;
+2F74;KANGXI RADICAL STAND;So;0;ON;<compat> 7ACB;;;;N;;;;;
+2F75;KANGXI RADICAL BAMBOO;So;0;ON;<compat> 7AF9;;;;N;;;;;
+2F76;KANGXI RADICAL RICE;So;0;ON;<compat> 7C73;;;;N;;;;;
+2F77;KANGXI RADICAL SILK;So;0;ON;<compat> 7CF8;;;;N;;;;;
+2F78;KANGXI RADICAL JAR;So;0;ON;<compat> 7F36;;;;N;;;;;
+2F79;KANGXI RADICAL NET;So;0;ON;<compat> 7F51;;;;N;;;;;
+2F7A;KANGXI RADICAL SHEEP;So;0;ON;<compat> 7F8A;;;;N;;;;;
+2F7B;KANGXI RADICAL FEATHER;So;0;ON;<compat> 7FBD;;;;N;;;;;
+2F7C;KANGXI RADICAL OLD;So;0;ON;<compat> 8001;;;;N;;;;;
+2F7D;KANGXI RADICAL AND;So;0;ON;<compat> 800C;;;;N;;;;;
+2F7E;KANGXI RADICAL PLOW;So;0;ON;<compat> 8012;;;;N;;;;;
+2F7F;KANGXI RADICAL EAR;So;0;ON;<compat> 8033;;;;N;;;;;
+2F80;KANGXI RADICAL BRUSH;So;0;ON;<compat> 807F;;;;N;;;;;
+2F81;KANGXI RADICAL MEAT;So;0;ON;<compat> 8089;;;;N;;;;;
+2F82;KANGXI RADICAL MINISTER;So;0;ON;<compat> 81E3;;;;N;;;;;
+2F83;KANGXI RADICAL SELF;So;0;ON;<compat> 81EA;;;;N;;;;;
+2F84;KANGXI RADICAL ARRIVE;So;0;ON;<compat> 81F3;;;;N;;;;;
+2F85;KANGXI RADICAL MORTAR;So;0;ON;<compat> 81FC;;;;N;;;;;
+2F86;KANGXI RADICAL TONGUE;So;0;ON;<compat> 820C;;;;N;;;;;
+2F87;KANGXI RADICAL OPPOSE;So;0;ON;<compat> 821B;;;;N;;;;;
+2F88;KANGXI RADICAL BOAT;So;0;ON;<compat> 821F;;;;N;;;;;
+2F89;KANGXI RADICAL STOPPING;So;0;ON;<compat> 826E;;;;N;;;;;
+2F8A;KANGXI RADICAL COLOR;So;0;ON;<compat> 8272;;;;N;;;;;
+2F8B;KANGXI RADICAL GRASS;So;0;ON;<compat> 8278;;;;N;;;;;
+2F8C;KANGXI RADICAL TIGER;So;0;ON;<compat> 864D;;;;N;;;;;
+2F8D;KANGXI RADICAL INSECT;So;0;ON;<compat> 866B;;;;N;;;;;
+2F8E;KANGXI RADICAL BLOOD;So;0;ON;<compat> 8840;;;;N;;;;;
+2F8F;KANGXI RADICAL WALK ENCLOSURE;So;0;ON;<compat> 884C;;;;N;;;;;
+2F90;KANGXI RADICAL CLOTHES;So;0;ON;<compat> 8863;;;;N;;;;;
+2F91;KANGXI RADICAL WEST;So;0;ON;<compat> 897E;;;;N;;;;;
+2F92;KANGXI RADICAL SEE;So;0;ON;<compat> 898B;;;;N;;;;;
+2F93;KANGXI RADICAL HORN;So;0;ON;<compat> 89D2;;;;N;;;;;
+2F94;KANGXI RADICAL SPEECH;So;0;ON;<compat> 8A00;;;;N;;;;;
+2F95;KANGXI RADICAL VALLEY;So;0;ON;<compat> 8C37;;;;N;;;;;
+2F96;KANGXI RADICAL BEAN;So;0;ON;<compat> 8C46;;;;N;;;;;
+2F97;KANGXI RADICAL PIG;So;0;ON;<compat> 8C55;;;;N;;;;;
+2F98;KANGXI RADICAL BADGER;So;0;ON;<compat> 8C78;;;;N;;;;;
+2F99;KANGXI RADICAL SHELL;So;0;ON;<compat> 8C9D;;;;N;;;;;
+2F9A;KANGXI RADICAL RED;So;0;ON;<compat> 8D64;;;;N;;;;;
+2F9B;KANGXI RADICAL RUN;So;0;ON;<compat> 8D70;;;;N;;;;;
+2F9C;KANGXI RADICAL FOOT;So;0;ON;<compat> 8DB3;;;;N;;;;;
+2F9D;KANGXI RADICAL BODY;So;0;ON;<compat> 8EAB;;;;N;;;;;
+2F9E;KANGXI RADICAL CART;So;0;ON;<compat> 8ECA;;;;N;;;;;
+2F9F;KANGXI RADICAL BITTER;So;0;ON;<compat> 8F9B;;;;N;;;;;
+2FA0;KANGXI RADICAL MORNING;So;0;ON;<compat> 8FB0;;;;N;;;;;
+2FA1;KANGXI RADICAL WALK;So;0;ON;<compat> 8FB5;;;;N;;;;;
+2FA2;KANGXI RADICAL CITY;So;0;ON;<compat> 9091;;;;N;;;;;
+2FA3;KANGXI RADICAL WINE;So;0;ON;<compat> 9149;;;;N;;;;;
+2FA4;KANGXI RADICAL DISTINGUISH;So;0;ON;<compat> 91C6;;;;N;;;;;
+2FA5;KANGXI RADICAL VILLAGE;So;0;ON;<compat> 91CC;;;;N;;;;;
+2FA6;KANGXI RADICAL GOLD;So;0;ON;<compat> 91D1;;;;N;;;;;
+2FA7;KANGXI RADICAL LONG;So;0;ON;<compat> 9577;;;;N;;;;;
+2FA8;KANGXI RADICAL GATE;So;0;ON;<compat> 9580;;;;N;;;;;
+2FA9;KANGXI RADICAL MOUND;So;0;ON;<compat> 961C;;;;N;;;;;
+2FAA;KANGXI RADICAL SLAVE;So;0;ON;<compat> 96B6;;;;N;;;;;
+2FAB;KANGXI RADICAL SHORT TAILED BIRD;So;0;ON;<compat> 96B9;;;;N;;;;;
+2FAC;KANGXI RADICAL RAIN;So;0;ON;<compat> 96E8;;;;N;;;;;
+2FAD;KANGXI RADICAL BLUE;So;0;ON;<compat> 9751;;;;N;;;;;
+2FAE;KANGXI RADICAL WRONG;So;0;ON;<compat> 975E;;;;N;;;;;
+2FAF;KANGXI RADICAL FACE;So;0;ON;<compat> 9762;;;;N;;;;;
+2FB0;KANGXI RADICAL LEATHER;So;0;ON;<compat> 9769;;;;N;;;;;
+2FB1;KANGXI RADICAL TANNED LEATHER;So;0;ON;<compat> 97CB;;;;N;;;;;
+2FB2;KANGXI RADICAL LEEK;So;0;ON;<compat> 97ED;;;;N;;;;;
+2FB3;KANGXI RADICAL SOUND;So;0;ON;<compat> 97F3;;;;N;;;;;
+2FB4;KANGXI RADICAL LEAF;So;0;ON;<compat> 9801;;;;N;;;;;
+2FB5;KANGXI RADICAL WIND;So;0;ON;<compat> 98A8;;;;N;;;;;
+2FB6;KANGXI RADICAL FLY;So;0;ON;<compat> 98DB;;;;N;;;;;
+2FB7;KANGXI RADICAL EAT;So;0;ON;<compat> 98DF;;;;N;;;;;
+2FB8;KANGXI RADICAL HEAD;So;0;ON;<compat> 9996;;;;N;;;;;
+2FB9;KANGXI RADICAL FRAGRANT;So;0;ON;<compat> 9999;;;;N;;;;;
+2FBA;KANGXI RADICAL HORSE;So;0;ON;<compat> 99AC;;;;N;;;;;
+2FBB;KANGXI RADICAL BONE;So;0;ON;<compat> 9AA8;;;;N;;;;;
+2FBC;KANGXI RADICAL TALL;So;0;ON;<compat> 9AD8;;;;N;;;;;
+2FBD;KANGXI RADICAL HAIR;So;0;ON;<compat> 9ADF;;;;N;;;;;
+2FBE;KANGXI RADICAL FIGHT;So;0;ON;<compat> 9B25;;;;N;;;;;
+2FBF;KANGXI RADICAL SACRIFICIAL WINE;So;0;ON;<compat> 9B2F;;;;N;;;;;
+2FC0;KANGXI RADICAL CAULDRON;So;0;ON;<compat> 9B32;;;;N;;;;;
+2FC1;KANGXI RADICAL GHOST;So;0;ON;<compat> 9B3C;;;;N;;;;;
+2FC2;KANGXI RADICAL FISH;So;0;ON;<compat> 9B5A;;;;N;;;;;
+2FC3;KANGXI RADICAL BIRD;So;0;ON;<compat> 9CE5;;;;N;;;;;
+2FC4;KANGXI RADICAL SALT;So;0;ON;<compat> 9E75;;;;N;;;;;
+2FC5;KANGXI RADICAL DEER;So;0;ON;<compat> 9E7F;;;;N;;;;;
+2FC6;KANGXI RADICAL WHEAT;So;0;ON;<compat> 9EA5;;;;N;;;;;
+2FC7;KANGXI RADICAL HEMP;So;0;ON;<compat> 9EBB;;;;N;;;;;
+2FC8;KANGXI RADICAL YELLOW;So;0;ON;<compat> 9EC3;;;;N;;;;;
+2FC9;KANGXI RADICAL MILLET;So;0;ON;<compat> 9ECD;;;;N;;;;;
+2FCA;KANGXI RADICAL BLACK;So;0;ON;<compat> 9ED1;;;;N;;;;;
+2FCB;KANGXI RADICAL EMBROIDERY;So;0;ON;<compat> 9EF9;;;;N;;;;;
+2FCC;KANGXI RADICAL FROG;So;0;ON;<compat> 9EFD;;;;N;;;;;
+2FCD;KANGXI RADICAL TRIPOD;So;0;ON;<compat> 9F0E;;;;N;;;;;
+2FCE;KANGXI RADICAL DRUM;So;0;ON;<compat> 9F13;;;;N;;;;;
+2FCF;KANGXI RADICAL RAT;So;0;ON;<compat> 9F20;;;;N;;;;;
+2FD0;KANGXI RADICAL NOSE;So;0;ON;<compat> 9F3B;;;;N;;;;;
+2FD1;KANGXI RADICAL EVEN;So;0;ON;<compat> 9F4A;;;;N;;;;;
+2FD2;KANGXI RADICAL TOOTH;So;0;ON;<compat> 9F52;;;;N;;;;;
+2FD3;KANGXI RADICAL DRAGON;So;0;ON;<compat> 9F8D;;;;N;;;;;
+2FD4;KANGXI RADICAL TURTLE;So;0;ON;<compat> 9F9C;;;;N;;;;;
+2FD5;KANGXI RADICAL FLUTE;So;0;ON;<compat> 9FA0;;;;N;;;;;
+2FF0;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT;So;0;ON;;;;;N;;;;;
+2FF1;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW;So;0;ON;;;;;N;;;;;
+2FF2;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT;So;0;ON;;;;;N;;;;;
+2FF3;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW;So;0;ON;;;;;N;;;;;
+2FF4;IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND;So;0;ON;;;;;N;;;;;
+2FF5;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE;So;0;ON;;;;;N;;;;;
+2FF6;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW;So;0;ON;;;;;N;;;;;
+2FF7;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT;So;0;ON;;;;;N;;;;;
+2FF8;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT;So;0;ON;;;;;N;;;;;
+2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
+2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
+2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
+3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
+3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
+3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
+3003;DITTO MARK;Po;0;ON;;;;;N;;;;;
+3004;JAPANESE INDUSTRIAL STANDARD SYMBOL;So;0;ON;;;;;N;;;;;
+3005;IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+3006;IDEOGRAPHIC CLOSING MARK;Lo;0;L;;;;;N;;;;;
+3007;IDEOGRAPHIC NUMBER ZERO;Nl;0;L;;;;0;N;;;;;
+3008;LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING ANGLE BRACKET;;;;
+3009;RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING ANGLE BRACKET;;;;
+300A;LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING DOUBLE ANGLE BRACKET;;;;
+300B;RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING DOUBLE ANGLE BRACKET;;;;
+300C;LEFT CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING CORNER BRACKET;;;;
+300D;RIGHT CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING CORNER BRACKET;;;;
+300E;LEFT WHITE CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE CORNER BRACKET;;;;
+300F;RIGHT WHITE CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE CORNER BRACKET;;;;
+3010;LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING BLACK LENTICULAR BRACKET;;;;
+3011;RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING BLACK LENTICULAR BRACKET;;;;
+3012;POSTAL MARK;So;0;ON;;;;;N;;;;;
+3013;GETA MARK;So;0;ON;;;;;N;;;;;
+3014;LEFT TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING TORTOISE SHELL BRACKET;;;;
+3015;RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING TORTOISE SHELL BRACKET;;;;
+3016;LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE LENTICULAR BRACKET;;;;
+3017;RIGHT WHITE LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE LENTICULAR BRACKET;;;;
+3018;LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE TORTOISE SHELL BRACKET;;;;
+3019;RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE TORTOISE SHELL BRACKET;;;;
+301A;LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE SQUARE BRACKET;;;;
+301B;RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE SQUARE BRACKET;;;;
+301C;WAVE DASH;Pd;0;ON;;;;;N;;;;;
+301D;REVERSED DOUBLE PRIME QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+301E;DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+301F;LOW DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+3020;POSTAL MARK FACE;So;0;ON;;;;;N;;;;;
+3021;HANGZHOU NUMERAL ONE;Nl;0;L;;;;1;N;;;;;
+3022;HANGZHOU NUMERAL TWO;Nl;0;L;;;;2;N;;;;;
+3023;HANGZHOU NUMERAL THREE;Nl;0;L;;;;3;N;;;;;
+3024;HANGZHOU NUMERAL FOUR;Nl;0;L;;;;4;N;;;;;
+3025;HANGZHOU NUMERAL FIVE;Nl;0;L;;;;5;N;;;;;
+3026;HANGZHOU NUMERAL SIX;Nl;0;L;;;;6;N;;;;;
+3027;HANGZHOU NUMERAL SEVEN;Nl;0;L;;;;7;N;;;;;
+3028;HANGZHOU NUMERAL EIGHT;Nl;0;L;;;;8;N;;;;;
+3029;HANGZHOU NUMERAL NINE;Nl;0;L;;;;9;N;;;;;
+302A;IDEOGRAPHIC LEVEL TONE MARK;Mn;218;NSM;;;;;N;;;;;
+302B;IDEOGRAPHIC RISING TONE MARK;Mn;228;NSM;;;;;N;;;;;
+302C;IDEOGRAPHIC DEPARTING TONE MARK;Mn;232;NSM;;;;;N;;;;;
+302D;IDEOGRAPHIC ENTERING TONE MARK;Mn;222;NSM;;;;;N;;;;;
+302E;HANGUL SINGLE DOT TONE MARK;Mc;224;L;;;;;N;;;;;
+302F;HANGUL DOUBLE DOT TONE MARK;Mc;224;L;;;;;N;;;;;
+3030;WAVY DASH;Pd;0;ON;;;;;N;;;;;
+3031;VERTICAL KANA REPEAT MARK;Lm;0;L;;;;;N;;;;;
+3032;VERTICAL KANA REPEAT WITH VOICED SOUND MARK;Lm;0;L;;;;;N;;;;;
+3033;VERTICAL KANA REPEAT MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3034;VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3035;VERTICAL KANA REPEAT MARK LOWER HALF;Lm;0;L;;;;;N;;;;;
+3036;CIRCLED POSTAL MARK;So;0;ON;<compat> 3012;;;;N;;;;;
+3037;IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL;So;0;ON;;;;;N;;;;;
+3038;HANGZHOU NUMERAL TEN;Nl;0;L;<compat> 5341;;;10;N;;;;;
+3039;HANGZHOU NUMERAL TWENTY;Nl;0;L;<compat> 5344;;;20;N;;;;;
+303A;HANGZHOU NUMERAL THIRTY;Nl;0;L;<compat> 5345;;;30;N;;;;;
+303B;VERTICAL IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+303C;MASU MARK;Lo;0;L;;;;;N;;;;;
+303D;PART ALTERNATION MARK;Po;0;ON;;;;;N;;;;;
+303E;IDEOGRAPHIC VARIATION INDICATOR;So;0;ON;;;;;N;;;;;
+303F;IDEOGRAPHIC HALF FILL SPACE;So;0;ON;;;;;N;;;;;
+3041;HIRAGANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+3042;HIRAGANA LETTER A;Lo;0;L;;;;;N;;;;;
+3043;HIRAGANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+3044;HIRAGANA LETTER I;Lo;0;L;;;;;N;;;;;
+3045;HIRAGANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+3046;HIRAGANA LETTER U;Lo;0;L;;;;;N;;;;;
+3047;HIRAGANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+3048;HIRAGANA LETTER E;Lo;0;L;;;;;N;;;;;
+3049;HIRAGANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+304A;HIRAGANA LETTER O;Lo;0;L;;;;;N;;;;;
+304B;HIRAGANA LETTER KA;Lo;0;L;;;;;N;;;;;
+304C;HIRAGANA LETTER GA;Lo;0;L;304B 3099;;;;N;;;;;
+304D;HIRAGANA LETTER KI;Lo;0;L;;;;;N;;;;;
+304E;HIRAGANA LETTER GI;Lo;0;L;304D 3099;;;;N;;;;;
+304F;HIRAGANA LETTER KU;Lo;0;L;;;;;N;;;;;
+3050;HIRAGANA LETTER GU;Lo;0;L;304F 3099;;;;N;;;;;
+3051;HIRAGANA LETTER KE;Lo;0;L;;;;;N;;;;;
+3052;HIRAGANA LETTER GE;Lo;0;L;3051 3099;;;;N;;;;;
+3053;HIRAGANA LETTER KO;Lo;0;L;;;;;N;;;;;
+3054;HIRAGANA LETTER GO;Lo;0;L;3053 3099;;;;N;;;;;
+3055;HIRAGANA LETTER SA;Lo;0;L;;;;;N;;;;;
+3056;HIRAGANA LETTER ZA;Lo;0;L;3055 3099;;;;N;;;;;
+3057;HIRAGANA LETTER SI;Lo;0;L;;;;;N;;;;;
+3058;HIRAGANA LETTER ZI;Lo;0;L;3057 3099;;;;N;;;;;
+3059;HIRAGANA LETTER SU;Lo;0;L;;;;;N;;;;;
+305A;HIRAGANA LETTER ZU;Lo;0;L;3059 3099;;;;N;;;;;
+305B;HIRAGANA LETTER SE;Lo;0;L;;;;;N;;;;;
+305C;HIRAGANA LETTER ZE;Lo;0;L;305B 3099;;;;N;;;;;
+305D;HIRAGANA LETTER SO;Lo;0;L;;;;;N;;;;;
+305E;HIRAGANA LETTER ZO;Lo;0;L;305D 3099;;;;N;;;;;
+305F;HIRAGANA LETTER TA;Lo;0;L;;;;;N;;;;;
+3060;HIRAGANA LETTER DA;Lo;0;L;305F 3099;;;;N;;;;;
+3061;HIRAGANA LETTER TI;Lo;0;L;;;;;N;;;;;
+3062;HIRAGANA LETTER DI;Lo;0;L;3061 3099;;;;N;;;;;
+3063;HIRAGANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+3064;HIRAGANA LETTER TU;Lo;0;L;;;;;N;;;;;
+3065;HIRAGANA LETTER DU;Lo;0;L;3064 3099;;;;N;;;;;
+3066;HIRAGANA LETTER TE;Lo;0;L;;;;;N;;;;;
+3067;HIRAGANA LETTER DE;Lo;0;L;3066 3099;;;;N;;;;;
+3068;HIRAGANA LETTER TO;Lo;0;L;;;;;N;;;;;
+3069;HIRAGANA LETTER DO;Lo;0;L;3068 3099;;;;N;;;;;
+306A;HIRAGANA LETTER NA;Lo;0;L;;;;;N;;;;;
+306B;HIRAGANA LETTER NI;Lo;0;L;;;;;N;;;;;
+306C;HIRAGANA LETTER NU;Lo;0;L;;;;;N;;;;;
+306D;HIRAGANA LETTER NE;Lo;0;L;;;;;N;;;;;
+306E;HIRAGANA LETTER NO;Lo;0;L;;;;;N;;;;;
+306F;HIRAGANA LETTER HA;Lo;0;L;;;;;N;;;;;
+3070;HIRAGANA LETTER BA;Lo;0;L;306F 3099;;;;N;;;;;
+3071;HIRAGANA LETTER PA;Lo;0;L;306F 309A;;;;N;;;;;
+3072;HIRAGANA LETTER HI;Lo;0;L;;;;;N;;;;;
+3073;HIRAGANA LETTER BI;Lo;0;L;3072 3099;;;;N;;;;;
+3074;HIRAGANA LETTER PI;Lo;0;L;3072 309A;;;;N;;;;;
+3075;HIRAGANA LETTER HU;Lo;0;L;;;;;N;;;;;
+3076;HIRAGANA LETTER BU;Lo;0;L;3075 3099;;;;N;;;;;
+3077;HIRAGANA LETTER PU;Lo;0;L;3075 309A;;;;N;;;;;
+3078;HIRAGANA LETTER HE;Lo;0;L;;;;;N;;;;;
+3079;HIRAGANA LETTER BE;Lo;0;L;3078 3099;;;;N;;;;;
+307A;HIRAGANA LETTER PE;Lo;0;L;3078 309A;;;;N;;;;;
+307B;HIRAGANA LETTER HO;Lo;0;L;;;;;N;;;;;
+307C;HIRAGANA LETTER BO;Lo;0;L;307B 3099;;;;N;;;;;
+307D;HIRAGANA LETTER PO;Lo;0;L;307B 309A;;;;N;;;;;
+307E;HIRAGANA LETTER MA;Lo;0;L;;;;;N;;;;;
+307F;HIRAGANA LETTER MI;Lo;0;L;;;;;N;;;;;
+3080;HIRAGANA LETTER MU;Lo;0;L;;;;;N;;;;;
+3081;HIRAGANA LETTER ME;Lo;0;L;;;;;N;;;;;
+3082;HIRAGANA LETTER MO;Lo;0;L;;;;;N;;;;;
+3083;HIRAGANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+3084;HIRAGANA LETTER YA;Lo;0;L;;;;;N;;;;;
+3085;HIRAGANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+3086;HIRAGANA LETTER YU;Lo;0;L;;;;;N;;;;;
+3087;HIRAGANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+3088;HIRAGANA LETTER YO;Lo;0;L;;;;;N;;;;;
+3089;HIRAGANA LETTER RA;Lo;0;L;;;;;N;;;;;
+308A;HIRAGANA LETTER RI;Lo;0;L;;;;;N;;;;;
+308B;HIRAGANA LETTER RU;Lo;0;L;;;;;N;;;;;
+308C;HIRAGANA LETTER RE;Lo;0;L;;;;;N;;;;;
+308D;HIRAGANA LETTER RO;Lo;0;L;;;;;N;;;;;
+308E;HIRAGANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+308F;HIRAGANA LETTER WA;Lo;0;L;;;;;N;;;;;
+3090;HIRAGANA LETTER WI;Lo;0;L;;;;;N;;;;;
+3091;HIRAGANA LETTER WE;Lo;0;L;;;;;N;;;;;
+3092;HIRAGANA LETTER WO;Lo;0;L;;;;;N;;;;;
+3093;HIRAGANA LETTER N;Lo;0;L;;;;;N;;;;;
+3094;HIRAGANA LETTER VU;Lo;0;L;3046 3099;;;;N;;;;;
+3095;HIRAGANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+3096;HIRAGANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+3099;COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA VOICED SOUND MARK;;;;
+309A;COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;;;;
+309B;KATAKANA-HIRAGANA VOICED SOUND MARK;Sk;0;ON;<compat> 0020 3099;;;;N;;;;;
+309C;KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Sk;0;ON;<compat> 0020 309A;;;;N;;;;;
+309D;HIRAGANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+309E;HIRAGANA VOICED ITERATION MARK;Lm;0;L;309D 3099;;;;N;;;;;
+309F;HIRAGANA DIGRAPH YORI;Lo;0;L;<vertical> 3088 308A;;;;N;;;;;
+30A0;KATAKANA-HIRAGANA DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
+30A1;KATAKANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+30A2;KATAKANA LETTER A;Lo;0;L;;;;;N;;;;;
+30A3;KATAKANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+30A4;KATAKANA LETTER I;Lo;0;L;;;;;N;;;;;
+30A5;KATAKANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+30A6;KATAKANA LETTER U;Lo;0;L;;;;;N;;;;;
+30A7;KATAKANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+30A8;KATAKANA LETTER E;Lo;0;L;;;;;N;;;;;
+30A9;KATAKANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+30AA;KATAKANA LETTER O;Lo;0;L;;;;;N;;;;;
+30AB;KATAKANA LETTER KA;Lo;0;L;;;;;N;;;;;
+30AC;KATAKANA LETTER GA;Lo;0;L;30AB 3099;;;;N;;;;;
+30AD;KATAKANA LETTER KI;Lo;0;L;;;;;N;;;;;
+30AE;KATAKANA LETTER GI;Lo;0;L;30AD 3099;;;;N;;;;;
+30AF;KATAKANA LETTER KU;Lo;0;L;;;;;N;;;;;
+30B0;KATAKANA LETTER GU;Lo;0;L;30AF 3099;;;;N;;;;;
+30B1;KATAKANA LETTER KE;Lo;0;L;;;;;N;;;;;
+30B2;KATAKANA LETTER GE;Lo;0;L;30B1 3099;;;;N;;;;;
+30B3;KATAKANA LETTER KO;Lo;0;L;;;;;N;;;;;
+30B4;KATAKANA LETTER GO;Lo;0;L;30B3 3099;;;;N;;;;;
+30B5;KATAKANA LETTER SA;Lo;0;L;;;;;N;;;;;
+30B6;KATAKANA LETTER ZA;Lo;0;L;30B5 3099;;;;N;;;;;
+30B7;KATAKANA LETTER SI;Lo;0;L;;;;;N;;;;;
+30B8;KATAKANA LETTER ZI;Lo;0;L;30B7 3099;;;;N;;;;;
+30B9;KATAKANA LETTER SU;Lo;0;L;;;;;N;;;;;
+30BA;KATAKANA LETTER ZU;Lo;0;L;30B9 3099;;;;N;;;;;
+30BB;KATAKANA LETTER SE;Lo;0;L;;;;;N;;;;;
+30BC;KATAKANA LETTER ZE;Lo;0;L;30BB 3099;;;;N;;;;;
+30BD;KATAKANA LETTER SO;Lo;0;L;;;;;N;;;;;
+30BE;KATAKANA LETTER ZO;Lo;0;L;30BD 3099;;;;N;;;;;
+30BF;KATAKANA LETTER TA;Lo;0;L;;;;;N;;;;;
+30C0;KATAKANA LETTER DA;Lo;0;L;30BF 3099;;;;N;;;;;
+30C1;KATAKANA LETTER TI;Lo;0;L;;;;;N;;;;;
+30C2;KATAKANA LETTER DI;Lo;0;L;30C1 3099;;;;N;;;;;
+30C3;KATAKANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+30C4;KATAKANA LETTER TU;Lo;0;L;;;;;N;;;;;
+30C5;KATAKANA LETTER DU;Lo;0;L;30C4 3099;;;;N;;;;;
+30C6;KATAKANA LETTER TE;Lo;0;L;;;;;N;;;;;
+30C7;KATAKANA LETTER DE;Lo;0;L;30C6 3099;;;;N;;;;;
+30C8;KATAKANA LETTER TO;Lo;0;L;;;;;N;;;;;
+30C9;KATAKANA LETTER DO;Lo;0;L;30C8 3099;;;;N;;;;;
+30CA;KATAKANA LETTER NA;Lo;0;L;;;;;N;;;;;
+30CB;KATAKANA LETTER NI;Lo;0;L;;;;;N;;;;;
+30CC;KATAKANA LETTER NU;Lo;0;L;;;;;N;;;;;
+30CD;KATAKANA LETTER NE;Lo;0;L;;;;;N;;;;;
+30CE;KATAKANA LETTER NO;Lo;0;L;;;;;N;;;;;
+30CF;KATAKANA LETTER HA;Lo;0;L;;;;;N;;;;;
+30D0;KATAKANA LETTER BA;Lo;0;L;30CF 3099;;;;N;;;;;
+30D1;KATAKANA LETTER PA;Lo;0;L;30CF 309A;;;;N;;;;;
+30D2;KATAKANA LETTER HI;Lo;0;L;;;;;N;;;;;
+30D3;KATAKANA LETTER BI;Lo;0;L;30D2 3099;;;;N;;;;;
+30D4;KATAKANA LETTER PI;Lo;0;L;30D2 309A;;;;N;;;;;
+30D5;KATAKANA LETTER HU;Lo;0;L;;;;;N;;;;;
+30D6;KATAKANA LETTER BU;Lo;0;L;30D5 3099;;;;N;;;;;
+30D7;KATAKANA LETTER PU;Lo;0;L;30D5 309A;;;;N;;;;;
+30D8;KATAKANA LETTER HE;Lo;0;L;;;;;N;;;;;
+30D9;KATAKANA LETTER BE;Lo;0;L;30D8 3099;;;;N;;;;;
+30DA;KATAKANA LETTER PE;Lo;0;L;30D8 309A;;;;N;;;;;
+30DB;KATAKANA LETTER HO;Lo;0;L;;;;;N;;;;;
+30DC;KATAKANA LETTER BO;Lo;0;L;30DB 3099;;;;N;;;;;
+30DD;KATAKANA LETTER PO;Lo;0;L;30DB 309A;;;;N;;;;;
+30DE;KATAKANA LETTER MA;Lo;0;L;;;;;N;;;;;
+30DF;KATAKANA LETTER MI;Lo;0;L;;;;;N;;;;;
+30E0;KATAKANA LETTER MU;Lo;0;L;;;;;N;;;;;
+30E1;KATAKANA LETTER ME;Lo;0;L;;;;;N;;;;;
+30E2;KATAKANA LETTER MO;Lo;0;L;;;;;N;;;;;
+30E3;KATAKANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+30E4;KATAKANA LETTER YA;Lo;0;L;;;;;N;;;;;
+30E5;KATAKANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+30E6;KATAKANA LETTER YU;Lo;0;L;;;;;N;;;;;
+30E7;KATAKANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+30E8;KATAKANA LETTER YO;Lo;0;L;;;;;N;;;;;
+30E9;KATAKANA LETTER RA;Lo;0;L;;;;;N;;;;;
+30EA;KATAKANA LETTER RI;Lo;0;L;;;;;N;;;;;
+30EB;KATAKANA LETTER RU;Lo;0;L;;;;;N;;;;;
+30EC;KATAKANA LETTER RE;Lo;0;L;;;;;N;;;;;
+30ED;KATAKANA LETTER RO;Lo;0;L;;;;;N;;;;;
+30EE;KATAKANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+30EF;KATAKANA LETTER WA;Lo;0;L;;;;;N;;;;;
+30F0;KATAKANA LETTER WI;Lo;0;L;;;;;N;;;;;
+30F1;KATAKANA LETTER WE;Lo;0;L;;;;;N;;;;;
+30F2;KATAKANA LETTER WO;Lo;0;L;;;;;N;;;;;
+30F3;KATAKANA LETTER N;Lo;0;L;;;;;N;;;;;
+30F4;KATAKANA LETTER VU;Lo;0;L;30A6 3099;;;;N;;;;;
+30F5;KATAKANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+30F6;KATAKANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+30F7;KATAKANA LETTER VA;Lo;0;L;30EF 3099;;;;N;;;;;
+30F8;KATAKANA LETTER VI;Lo;0;L;30F0 3099;;;;N;;;;;
+30F9;KATAKANA LETTER VE;Lo;0;L;30F1 3099;;;;N;;;;;
+30FA;KATAKANA LETTER VO;Lo;0;L;30F2 3099;;;;N;;;;;
+30FB;KATAKANA MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+30FC;KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;;;;;N;;;;;
+30FD;KATAKANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+30FE;KATAKANA VOICED ITERATION MARK;Lm;0;L;30FD 3099;;;;N;;;;;
+30FF;KATAKANA DIGRAPH KOTO;Lo;0;L;<vertical> 30B3 30C8;;;;N;;;;;
+3105;BOPOMOFO LETTER B;Lo;0;L;;;;;N;;;;;
+3106;BOPOMOFO LETTER P;Lo;0;L;;;;;N;;;;;
+3107;BOPOMOFO LETTER M;Lo;0;L;;;;;N;;;;;
+3108;BOPOMOFO LETTER F;Lo;0;L;;;;;N;;;;;
+3109;BOPOMOFO LETTER D;Lo;0;L;;;;;N;;;;;
+310A;BOPOMOFO LETTER T;Lo;0;L;;;;;N;;;;;
+310B;BOPOMOFO LETTER N;Lo;0;L;;;;;N;;;;;
+310C;BOPOMOFO LETTER L;Lo;0;L;;;;;N;;;;;
+310D;BOPOMOFO LETTER G;Lo;0;L;;;;;N;;;;;
+310E;BOPOMOFO LETTER K;Lo;0;L;;;;;N;;;;;
+310F;BOPOMOFO LETTER H;Lo;0;L;;;;;N;;;;;
+3110;BOPOMOFO LETTER J;Lo;0;L;;;;;N;;;;;
+3111;BOPOMOFO LETTER Q;Lo;0;L;;;;;N;;;;;
+3112;BOPOMOFO LETTER X;Lo;0;L;;;;;N;;;;;
+3113;BOPOMOFO LETTER ZH;Lo;0;L;;;;;N;;;;;
+3114;BOPOMOFO LETTER CH;Lo;0;L;;;;;N;;;;;
+3115;BOPOMOFO LETTER SH;Lo;0;L;;;;;N;;;;;
+3116;BOPOMOFO LETTER R;Lo;0;L;;;;;N;;;;;
+3117;BOPOMOFO LETTER Z;Lo;0;L;;;;;N;;;;;
+3118;BOPOMOFO LETTER C;Lo;0;L;;;;;N;;;;;
+3119;BOPOMOFO LETTER S;Lo;0;L;;;;;N;;;;;
+311A;BOPOMOFO LETTER A;Lo;0;L;;;;;N;;;;;
+311B;BOPOMOFO LETTER O;Lo;0;L;;;;;N;;;;;
+311C;BOPOMOFO LETTER E;Lo;0;L;;;;;N;;;;;
+311D;BOPOMOFO LETTER EH;Lo;0;L;;;;;N;;;;;
+311E;BOPOMOFO LETTER AI;Lo;0;L;;;;;N;;;;;
+311F;BOPOMOFO LETTER EI;Lo;0;L;;;;;N;;;;;
+3120;BOPOMOFO LETTER AU;Lo;0;L;;;;;N;;;;;
+3121;BOPOMOFO LETTER OU;Lo;0;L;;;;;N;;;;;
+3122;BOPOMOFO LETTER AN;Lo;0;L;;;;;N;;;;;
+3123;BOPOMOFO LETTER EN;Lo;0;L;;;;;N;;;;;
+3124;BOPOMOFO LETTER ANG;Lo;0;L;;;;;N;;;;;
+3125;BOPOMOFO LETTER ENG;Lo;0;L;;;;;N;;;;;
+3126;BOPOMOFO LETTER ER;Lo;0;L;;;;;N;;;;;
+3127;BOPOMOFO LETTER I;Lo;0;L;;;;;N;;;;;
+3128;BOPOMOFO LETTER U;Lo;0;L;;;;;N;;;;;
+3129;BOPOMOFO LETTER IU;Lo;0;L;;;;;N;;;;;
+312A;BOPOMOFO LETTER V;Lo;0;L;;;;;N;;;;;
+312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
+312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
+312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
+3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
+3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
+3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
+3134;HANGUL LETTER NIEUN;Lo;0;L;<compat> 1102;;;;N;;;;;
+3135;HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<compat> 11AC;;;;N;HANGUL LETTER NIEUN JIEUJ;;;;
+3136;HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<compat> 11AD;;;;N;HANGUL LETTER NIEUN HIEUH;;;;
+3137;HANGUL LETTER TIKEUT;Lo;0;L;<compat> 1103;;;;N;HANGUL LETTER DIGEUD;;;;
+3138;HANGUL LETTER SSANGTIKEUT;Lo;0;L;<compat> 1104;;;;N;HANGUL LETTER SSANG DIGEUD;;;;
+3139;HANGUL LETTER RIEUL;Lo;0;L;<compat> 1105;;;;N;HANGUL LETTER LIEUL;;;;
+313A;HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<compat> 11B0;;;;N;HANGUL LETTER LIEUL GIYEOG;;;;
+313B;HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<compat> 11B1;;;;N;HANGUL LETTER LIEUL MIEUM;;;;
+313C;HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<compat> 11B2;;;;N;HANGUL LETTER LIEUL BIEUB;;;;
+313D;HANGUL LETTER RIEUL-SIOS;Lo;0;L;<compat> 11B3;;;;N;HANGUL LETTER LIEUL SIOS;;;;
+313E;HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<compat> 11B4;;;;N;HANGUL LETTER LIEUL TIEUT;;;;
+313F;HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<compat> 11B5;;;;N;HANGUL LETTER LIEUL PIEUP;;;;
+3140;HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<compat> 111A;;;;N;HANGUL LETTER LIEUL HIEUH;;;;
+3141;HANGUL LETTER MIEUM;Lo;0;L;<compat> 1106;;;;N;;;;;
+3142;HANGUL LETTER PIEUP;Lo;0;L;<compat> 1107;;;;N;HANGUL LETTER BIEUB;;;;
+3143;HANGUL LETTER SSANGPIEUP;Lo;0;L;<compat> 1108;;;;N;HANGUL LETTER SSANG BIEUB;;;;
+3144;HANGUL LETTER PIEUP-SIOS;Lo;0;L;<compat> 1121;;;;N;HANGUL LETTER BIEUB SIOS;;;;
+3145;HANGUL LETTER SIOS;Lo;0;L;<compat> 1109;;;;N;;;;;
+3146;HANGUL LETTER SSANGSIOS;Lo;0;L;<compat> 110A;;;;N;HANGUL LETTER SSANG SIOS;;;;
+3147;HANGUL LETTER IEUNG;Lo;0;L;<compat> 110B;;;;N;;;;;
+3148;HANGUL LETTER CIEUC;Lo;0;L;<compat> 110C;;;;N;HANGUL LETTER JIEUJ;;;;
+3149;HANGUL LETTER SSANGCIEUC;Lo;0;L;<compat> 110D;;;;N;HANGUL LETTER SSANG JIEUJ;;;;
+314A;HANGUL LETTER CHIEUCH;Lo;0;L;<compat> 110E;;;;N;HANGUL LETTER CIEUC;;;;
+314B;HANGUL LETTER KHIEUKH;Lo;0;L;<compat> 110F;;;;N;HANGUL LETTER KIYEOK;;;;
+314C;HANGUL LETTER THIEUTH;Lo;0;L;<compat> 1110;;;;N;HANGUL LETTER TIEUT;;;;
+314D;HANGUL LETTER PHIEUPH;Lo;0;L;<compat> 1111;;;;N;HANGUL LETTER PIEUP;;;;
+314E;HANGUL LETTER HIEUH;Lo;0;L;<compat> 1112;;;;N;;;;;
+314F;HANGUL LETTER A;Lo;0;L;<compat> 1161;;;;N;;;;;
+3150;HANGUL LETTER AE;Lo;0;L;<compat> 1162;;;;N;;;;;
+3151;HANGUL LETTER YA;Lo;0;L;<compat> 1163;;;;N;;;;;
+3152;HANGUL LETTER YAE;Lo;0;L;<compat> 1164;;;;N;;;;;
+3153;HANGUL LETTER EO;Lo;0;L;<compat> 1165;;;;N;;;;;
+3154;HANGUL LETTER E;Lo;0;L;<compat> 1166;;;;N;;;;;
+3155;HANGUL LETTER YEO;Lo;0;L;<compat> 1167;;;;N;;;;;
+3156;HANGUL LETTER YE;Lo;0;L;<compat> 1168;;;;N;;;;;
+3157;HANGUL LETTER O;Lo;0;L;<compat> 1169;;;;N;;;;;
+3158;HANGUL LETTER WA;Lo;0;L;<compat> 116A;;;;N;;;;;
+3159;HANGUL LETTER WAE;Lo;0;L;<compat> 116B;;;;N;;;;;
+315A;HANGUL LETTER OE;Lo;0;L;<compat> 116C;;;;N;;;;;
+315B;HANGUL LETTER YO;Lo;0;L;<compat> 116D;;;;N;;;;;
+315C;HANGUL LETTER U;Lo;0;L;<compat> 116E;;;;N;;;;;
+315D;HANGUL LETTER WEO;Lo;0;L;<compat> 116F;;;;N;;;;;
+315E;HANGUL LETTER WE;Lo;0;L;<compat> 1170;;;;N;;;;;
+315F;HANGUL LETTER WI;Lo;0;L;<compat> 1171;;;;N;;;;;
+3160;HANGUL LETTER YU;Lo;0;L;<compat> 1172;;;;N;;;;;
+3161;HANGUL LETTER EU;Lo;0;L;<compat> 1173;;;;N;;;;;
+3162;HANGUL LETTER YI;Lo;0;L;<compat> 1174;;;;N;;;;;
+3163;HANGUL LETTER I;Lo;0;L;<compat> 1175;;;;N;;;;;
+3164;HANGUL FILLER;Lo;0;L;<compat> 1160;;;;N;HANGUL CAE OM;;;;
+3165;HANGUL LETTER SSANGNIEUN;Lo;0;L;<compat> 1114;;;;N;HANGUL LETTER SSANG NIEUN;;;;
+3166;HANGUL LETTER NIEUN-TIKEUT;Lo;0;L;<compat> 1115;;;;N;HANGUL LETTER NIEUN DIGEUD;;;;
+3167;HANGUL LETTER NIEUN-SIOS;Lo;0;L;<compat> 11C7;;;;N;HANGUL LETTER NIEUN SIOS;;;;
+3168;HANGUL LETTER NIEUN-PANSIOS;Lo;0;L;<compat> 11C8;;;;N;HANGUL LETTER NIEUN BAN CHI EUM;;;;
+3169;HANGUL LETTER RIEUL-KIYEOK-SIOS;Lo;0;L;<compat> 11CC;;;;N;HANGUL LETTER LIEUL GIYEOG SIOS;;;;
+316A;HANGUL LETTER RIEUL-TIKEUT;Lo;0;L;<compat> 11CE;;;;N;HANGUL LETTER LIEUL DIGEUD;;;;
+316B;HANGUL LETTER RIEUL-PIEUP-SIOS;Lo;0;L;<compat> 11D3;;;;N;HANGUL LETTER LIEUL BIEUB SIOS;;;;
+316C;HANGUL LETTER RIEUL-PANSIOS;Lo;0;L;<compat> 11D7;;;;N;HANGUL LETTER LIEUL BAN CHI EUM;;;;
+316D;HANGUL LETTER RIEUL-YEORINHIEUH;Lo;0;L;<compat> 11D9;;;;N;HANGUL LETTER LIEUL YEOLIN HIEUH;;;;
+316E;HANGUL LETTER MIEUM-PIEUP;Lo;0;L;<compat> 111C;;;;N;HANGUL LETTER MIEUM BIEUB;;;;
+316F;HANGUL LETTER MIEUM-SIOS;Lo;0;L;<compat> 11DD;;;;N;HANGUL LETTER MIEUM SIOS;;;;
+3170;HANGUL LETTER MIEUM-PANSIOS;Lo;0;L;<compat> 11DF;;;;N;HANGUL LETTER BIEUB BAN CHI EUM;;;;
+3171;HANGUL LETTER KAPYEOUNMIEUM;Lo;0;L;<compat> 111D;;;;N;HANGUL LETTER MIEUM SUN GYEONG EUM;;;;
+3172;HANGUL LETTER PIEUP-KIYEOK;Lo;0;L;<compat> 111E;;;;N;HANGUL LETTER BIEUB GIYEOG;;;;
+3173;HANGUL LETTER PIEUP-TIKEUT;Lo;0;L;<compat> 1120;;;;N;HANGUL LETTER BIEUB DIGEUD;;;;
+3174;HANGUL LETTER PIEUP-SIOS-KIYEOK;Lo;0;L;<compat> 1122;;;;N;HANGUL LETTER BIEUB SIOS GIYEOG;;;;
+3175;HANGUL LETTER PIEUP-SIOS-TIKEUT;Lo;0;L;<compat> 1123;;;;N;HANGUL LETTER BIEUB SIOS DIGEUD;;;;
+3176;HANGUL LETTER PIEUP-CIEUC;Lo;0;L;<compat> 1127;;;;N;HANGUL LETTER BIEUB JIEUJ;;;;
+3177;HANGUL LETTER PIEUP-THIEUTH;Lo;0;L;<compat> 1129;;;;N;HANGUL LETTER BIEUB TIEUT;;;;
+3178;HANGUL LETTER KAPYEOUNPIEUP;Lo;0;L;<compat> 112B;;;;N;HANGUL LETTER BIEUB SUN GYEONG EUM;;;;
+3179;HANGUL LETTER KAPYEOUNSSANGPIEUP;Lo;0;L;<compat> 112C;;;;N;HANGUL LETTER SSANG BIEUB SUN GYEONG EUM;;;;
+317A;HANGUL LETTER SIOS-KIYEOK;Lo;0;L;<compat> 112D;;;;N;HANGUL LETTER SIOS GIYEOG;;;;
+317B;HANGUL LETTER SIOS-NIEUN;Lo;0;L;<compat> 112E;;;;N;HANGUL LETTER SIOS NIEUN;;;;
+317C;HANGUL LETTER SIOS-TIKEUT;Lo;0;L;<compat> 112F;;;;N;HANGUL LETTER SIOS DIGEUD;;;;
+317D;HANGUL LETTER SIOS-PIEUP;Lo;0;L;<compat> 1132;;;;N;HANGUL LETTER SIOS BIEUB;;;;
+317E;HANGUL LETTER SIOS-CIEUC;Lo;0;L;<compat> 1136;;;;N;HANGUL LETTER SIOS JIEUJ;;;;
+317F;HANGUL LETTER PANSIOS;Lo;0;L;<compat> 1140;;;;N;HANGUL LETTER BAN CHI EUM;;;;
+3180;HANGUL LETTER SSANGIEUNG;Lo;0;L;<compat> 1147;;;;N;HANGUL LETTER SSANG IEUNG;;;;
+3181;HANGUL LETTER YESIEUNG;Lo;0;L;<compat> 114C;;;;N;HANGUL LETTER NGIEUNG;;;;
+3182;HANGUL LETTER YESIEUNG-SIOS;Lo;0;L;<compat> 11F1;;;;N;HANGUL LETTER NGIEUNG SIOS;;;;
+3183;HANGUL LETTER YESIEUNG-PANSIOS;Lo;0;L;<compat> 11F2;;;;N;HANGUL LETTER NGIEUNG BAN CHI EUM;;;;
+3184;HANGUL LETTER KAPYEOUNPHIEUPH;Lo;0;L;<compat> 1157;;;;N;HANGUL LETTER PIEUP SUN GYEONG EUM;;;;
+3185;HANGUL LETTER SSANGHIEUH;Lo;0;L;<compat> 1158;;;;N;HANGUL LETTER SSANG HIEUH;;;;
+3186;HANGUL LETTER YEORINHIEUH;Lo;0;L;<compat> 1159;;;;N;HANGUL LETTER YEOLIN HIEUH;;;;
+3187;HANGUL LETTER YO-YA;Lo;0;L;<compat> 1184;;;;N;HANGUL LETTER YOYA;;;;
+3188;HANGUL LETTER YO-YAE;Lo;0;L;<compat> 1185;;;;N;HANGUL LETTER YOYAE;;;;
+3189;HANGUL LETTER YO-I;Lo;0;L;<compat> 1188;;;;N;HANGUL LETTER YOI;;;;
+318A;HANGUL LETTER YU-YEO;Lo;0;L;<compat> 1191;;;;N;HANGUL LETTER YUYEO;;;;
+318B;HANGUL LETTER YU-YE;Lo;0;L;<compat> 1192;;;;N;HANGUL LETTER YUYE;;;;
+318C;HANGUL LETTER YU-I;Lo;0;L;<compat> 1194;;;;N;HANGUL LETTER YUI;;;;
+318D;HANGUL LETTER ARAEA;Lo;0;L;<compat> 119E;;;;N;HANGUL LETTER ALAE A;;;;
+318E;HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
+3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;;;;
+3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;;;;
+3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;;;;
+3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;;;;
+3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;;;;
+3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;;;;
+3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;;;;
+3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;;;;
+3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;;;;
+3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;;;;
+319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;;;;
+319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;;;;
+319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;;;;
+319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;;;;
+319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;;;;
+319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;;;;
+31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;;
+31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;;
+31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;;
+31A3;BOPOMOFO LETTER GU;Lo;0;L;;;;;N;;;;;
+31A4;BOPOMOFO LETTER EE;Lo;0;L;;;;;N;;;;;
+31A5;BOPOMOFO LETTER ENN;Lo;0;L;;;;;N;;;;;
+31A6;BOPOMOFO LETTER OO;Lo;0;L;;;;;N;;;;;
+31A7;BOPOMOFO LETTER ONN;Lo;0;L;;;;;N;;;;;
+31A8;BOPOMOFO LETTER IR;Lo;0;L;;;;;N;;;;;
+31A9;BOPOMOFO LETTER ANN;Lo;0;L;;;;;N;;;;;
+31AA;BOPOMOFO LETTER INN;Lo;0;L;;;;;N;;;;;
+31AB;BOPOMOFO LETTER UNN;Lo;0;L;;;;;N;;;;;
+31AC;BOPOMOFO LETTER IM;Lo;0;L;;;;;N;;;;;
+31AD;BOPOMOFO LETTER NGG;Lo;0;L;;;;;N;;;;;
+31AE;BOPOMOFO LETTER AINN;Lo;0;L;;;;;N;;;;;
+31AF;BOPOMOFO LETTER AUNN;Lo;0;L;;;;;N;;;;;
+31B0;BOPOMOFO LETTER AM;Lo;0;L;;;;;N;;;;;
+31B1;BOPOMOFO LETTER OM;Lo;0;L;;;;;N;;;;;
+31B2;BOPOMOFO LETTER ONG;Lo;0;L;;;;;N;;;;;
+31B3;BOPOMOFO LETTER INNN;Lo;0;L;;;;;N;;;;;
+31B4;BOPOMOFO FINAL LETTER P;Lo;0;L;;;;;N;;;;;
+31B5;BOPOMOFO FINAL LETTER T;Lo;0;L;;;;;N;;;;;
+31B6;BOPOMOFO FINAL LETTER K;Lo;0;L;;;;;N;;;;;
+31B7;BOPOMOFO FINAL LETTER H;Lo;0;L;;;;;N;;;;;
+31B8;BOPOMOFO LETTER GH;Lo;0;L;;;;;N;;;;;
+31B9;BOPOMOFO LETTER LH;Lo;0;L;;;;;N;;;;;
+31BA;BOPOMOFO LETTER ZY;Lo;0;L;;;;;N;;;;;
+31C0;CJK STROKE T;So;0;ON;;;;;N;;;;;
+31C1;CJK STROKE WG;So;0;ON;;;;;N;;;;;
+31C2;CJK STROKE XG;So;0;ON;;;;;N;;;;;
+31C3;CJK STROKE BXG;So;0;ON;;;;;N;;;;;
+31C4;CJK STROKE SW;So;0;ON;;;;;N;;;;;
+31C5;CJK STROKE HZZ;So;0;ON;;;;;N;;;;;
+31C6;CJK STROKE HZG;So;0;ON;;;;;N;;;;;
+31C7;CJK STROKE HP;So;0;ON;;;;;N;;;;;
+31C8;CJK STROKE HZWG;So;0;ON;;;;;N;;;;;
+31C9;CJK STROKE SZWG;So;0;ON;;;;;N;;;;;
+31CA;CJK STROKE HZT;So;0;ON;;;;;N;;;;;
+31CB;CJK STROKE HZZP;So;0;ON;;;;;N;;;;;
+31CC;CJK STROKE HPWG;So;0;ON;;;;;N;;;;;
+31CD;CJK STROKE HZW;So;0;ON;;;;;N;;;;;
+31CE;CJK STROKE HZZZ;So;0;ON;;;;;N;;;;;
+31CF;CJK STROKE N;So;0;ON;;;;;N;;;;;
+31D0;CJK STROKE H;So;0;ON;;;;;N;;;;;
+31D1;CJK STROKE S;So;0;ON;;;;;N;;;;;
+31D2;CJK STROKE P;So;0;ON;;;;;N;;;;;
+31D3;CJK STROKE SP;So;0;ON;;;;;N;;;;;
+31D4;CJK STROKE D;So;0;ON;;;;;N;;;;;
+31D5;CJK STROKE HZ;So;0;ON;;;;;N;;;;;
+31D6;CJK STROKE HG;So;0;ON;;;;;N;;;;;
+31D7;CJK STROKE SZ;So;0;ON;;;;;N;;;;;
+31D8;CJK STROKE SWZ;So;0;ON;;;;;N;;;;;
+31D9;CJK STROKE ST;So;0;ON;;;;;N;;;;;
+31DA;CJK STROKE SG;So;0;ON;;;;;N;;;;;
+31DB;CJK STROKE PD;So;0;ON;;;;;N;;;;;
+31DC;CJK STROKE PZ;So;0;ON;;;;;N;;;;;
+31DD;CJK STROKE TN;So;0;ON;;;;;N;;;;;
+31DE;CJK STROKE SZZ;So;0;ON;;;;;N;;;;;
+31DF;CJK STROKE SWG;So;0;ON;;;;;N;;;;;
+31E0;CJK STROKE HXWG;So;0;ON;;;;;N;;;;;
+31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
+31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
+31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
+31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
+31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
+31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
+31F3;KATAKANA LETTER SMALL TO;Lo;0;L;;;;;N;;;;;
+31F4;KATAKANA LETTER SMALL NU;Lo;0;L;;;;;N;;;;;
+31F5;KATAKANA LETTER SMALL HA;Lo;0;L;;;;;N;;;;;
+31F6;KATAKANA LETTER SMALL HI;Lo;0;L;;;;;N;;;;;
+31F7;KATAKANA LETTER SMALL HU;Lo;0;L;;;;;N;;;;;
+31F8;KATAKANA LETTER SMALL HE;Lo;0;L;;;;;N;;;;;
+31F9;KATAKANA LETTER SMALL HO;Lo;0;L;;;;;N;;;;;
+31FA;KATAKANA LETTER SMALL MU;Lo;0;L;;;;;N;;;;;
+31FB;KATAKANA LETTER SMALL RA;Lo;0;L;;;;;N;;;;;
+31FC;KATAKANA LETTER SMALL RI;Lo;0;L;;;;;N;;;;;
+31FD;KATAKANA LETTER SMALL RU;Lo;0;L;;;;;N;;;;;
+31FE;KATAKANA LETTER SMALL RE;Lo;0;L;;;;;N;;;;;
+31FF;KATAKANA LETTER SMALL RO;Lo;0;L;;;;;N;;;;;
+3200;PARENTHESIZED HANGUL KIYEOK;So;0;L;<compat> 0028 1100 0029;;;;N;PARENTHESIZED HANGUL GIYEOG;;;;
+3201;PARENTHESIZED HANGUL NIEUN;So;0;L;<compat> 0028 1102 0029;;;;N;;;;;
+3202;PARENTHESIZED HANGUL TIKEUT;So;0;L;<compat> 0028 1103 0029;;;;N;PARENTHESIZED HANGUL DIGEUD;;;;
+3203;PARENTHESIZED HANGUL RIEUL;So;0;L;<compat> 0028 1105 0029;;;;N;PARENTHESIZED HANGUL LIEUL;;;;
+3204;PARENTHESIZED HANGUL MIEUM;So;0;L;<compat> 0028 1106 0029;;;;N;;;;;
+3205;PARENTHESIZED HANGUL PIEUP;So;0;L;<compat> 0028 1107 0029;;;;N;PARENTHESIZED HANGUL BIEUB;;;;
+3206;PARENTHESIZED HANGUL SIOS;So;0;L;<compat> 0028 1109 0029;;;;N;;;;;
+3207;PARENTHESIZED HANGUL IEUNG;So;0;L;<compat> 0028 110B 0029;;;;N;;;;;
+3208;PARENTHESIZED HANGUL CIEUC;So;0;L;<compat> 0028 110C 0029;;;;N;PARENTHESIZED HANGUL JIEUJ;;;;
+3209;PARENTHESIZED HANGUL CHIEUCH;So;0;L;<compat> 0028 110E 0029;;;;N;PARENTHESIZED HANGUL CIEUC;;;;
+320A;PARENTHESIZED HANGUL KHIEUKH;So;0;L;<compat> 0028 110F 0029;;;;N;PARENTHESIZED HANGUL KIYEOK;;;;
+320B;PARENTHESIZED HANGUL THIEUTH;So;0;L;<compat> 0028 1110 0029;;;;N;PARENTHESIZED HANGUL TIEUT;;;;
+320C;PARENTHESIZED HANGUL PHIEUPH;So;0;L;<compat> 0028 1111 0029;;;;N;PARENTHESIZED HANGUL PIEUP;;;;
+320D;PARENTHESIZED HANGUL HIEUH;So;0;L;<compat> 0028 1112 0029;;;;N;;;;;
+320E;PARENTHESIZED HANGUL KIYEOK A;So;0;L;<compat> 0028 1100 1161 0029;;;;N;PARENTHESIZED HANGUL GA;;;;
+320F;PARENTHESIZED HANGUL NIEUN A;So;0;L;<compat> 0028 1102 1161 0029;;;;N;PARENTHESIZED HANGUL NA;;;;
+3210;PARENTHESIZED HANGUL TIKEUT A;So;0;L;<compat> 0028 1103 1161 0029;;;;N;PARENTHESIZED HANGUL DA;;;;
+3211;PARENTHESIZED HANGUL RIEUL A;So;0;L;<compat> 0028 1105 1161 0029;;;;N;PARENTHESIZED HANGUL LA;;;;
+3212;PARENTHESIZED HANGUL MIEUM A;So;0;L;<compat> 0028 1106 1161 0029;;;;N;PARENTHESIZED HANGUL MA;;;;
+3213;PARENTHESIZED HANGUL PIEUP A;So;0;L;<compat> 0028 1107 1161 0029;;;;N;PARENTHESIZED HANGUL BA;;;;
+3214;PARENTHESIZED HANGUL SIOS A;So;0;L;<compat> 0028 1109 1161 0029;;;;N;PARENTHESIZED HANGUL SA;;;;
+3215;PARENTHESIZED HANGUL IEUNG A;So;0;L;<compat> 0028 110B 1161 0029;;;;N;PARENTHESIZED HANGUL A;;;;
+3216;PARENTHESIZED HANGUL CIEUC A;So;0;L;<compat> 0028 110C 1161 0029;;;;N;PARENTHESIZED HANGUL JA;;;;
+3217;PARENTHESIZED HANGUL CHIEUCH A;So;0;L;<compat> 0028 110E 1161 0029;;;;N;PARENTHESIZED HANGUL CA;;;;
+3218;PARENTHESIZED HANGUL KHIEUKH A;So;0;L;<compat> 0028 110F 1161 0029;;;;N;PARENTHESIZED HANGUL KA;;;;
+3219;PARENTHESIZED HANGUL THIEUTH A;So;0;L;<compat> 0028 1110 1161 0029;;;;N;PARENTHESIZED HANGUL TA;;;;
+321A;PARENTHESIZED HANGUL PHIEUPH A;So;0;L;<compat> 0028 1111 1161 0029;;;;N;PARENTHESIZED HANGUL PA;;;;
+321B;PARENTHESIZED HANGUL HIEUH A;So;0;L;<compat> 0028 1112 1161 0029;;;;N;PARENTHESIZED HANGUL HA;;;;
+321C;PARENTHESIZED HANGUL CIEUC U;So;0;L;<compat> 0028 110C 116E 0029;;;;N;PARENTHESIZED HANGUL JU;;;;
+321D;PARENTHESIZED KOREAN CHARACTER OJEON;So;0;ON;<compat> 0028 110B 1169 110C 1165 11AB 0029;;;;N;;;;;
+321E;PARENTHESIZED KOREAN CHARACTER O HU;So;0;ON;<compat> 0028 110B 1169 1112 116E 0029;;;;N;;;;;
+3220;PARENTHESIZED IDEOGRAPH ONE;No;0;L;<compat> 0028 4E00 0029;;;1;N;;;;;
+3221;PARENTHESIZED IDEOGRAPH TWO;No;0;L;<compat> 0028 4E8C 0029;;;2;N;;;;;
+3222;PARENTHESIZED IDEOGRAPH THREE;No;0;L;<compat> 0028 4E09 0029;;;3;N;;;;;
+3223;PARENTHESIZED IDEOGRAPH FOUR;No;0;L;<compat> 0028 56DB 0029;;;4;N;;;;;
+3224;PARENTHESIZED IDEOGRAPH FIVE;No;0;L;<compat> 0028 4E94 0029;;;5;N;;;;;
+3225;PARENTHESIZED IDEOGRAPH SIX;No;0;L;<compat> 0028 516D 0029;;;6;N;;;;;
+3226;PARENTHESIZED IDEOGRAPH SEVEN;No;0;L;<compat> 0028 4E03 0029;;;7;N;;;;;
+3227;PARENTHESIZED IDEOGRAPH EIGHT;No;0;L;<compat> 0028 516B 0029;;;8;N;;;;;
+3228;PARENTHESIZED IDEOGRAPH NINE;No;0;L;<compat> 0028 4E5D 0029;;;9;N;;;;;
+3229;PARENTHESIZED IDEOGRAPH TEN;No;0;L;<compat> 0028 5341 0029;;;10;N;;;;;
+322A;PARENTHESIZED IDEOGRAPH MOON;So;0;L;<compat> 0028 6708 0029;;;;N;;;;;
+322B;PARENTHESIZED IDEOGRAPH FIRE;So;0;L;<compat> 0028 706B 0029;;;;N;;;;;
+322C;PARENTHESIZED IDEOGRAPH WATER;So;0;L;<compat> 0028 6C34 0029;;;;N;;;;;
+322D;PARENTHESIZED IDEOGRAPH WOOD;So;0;L;<compat> 0028 6728 0029;;;;N;;;;;
+322E;PARENTHESIZED IDEOGRAPH METAL;So;0;L;<compat> 0028 91D1 0029;;;;N;;;;;
+322F;PARENTHESIZED IDEOGRAPH EARTH;So;0;L;<compat> 0028 571F 0029;;;;N;;;;;
+3230;PARENTHESIZED IDEOGRAPH SUN;So;0;L;<compat> 0028 65E5 0029;;;;N;;;;;
+3231;PARENTHESIZED IDEOGRAPH STOCK;So;0;L;<compat> 0028 682A 0029;;;;N;;;;;
+3232;PARENTHESIZED IDEOGRAPH HAVE;So;0;L;<compat> 0028 6709 0029;;;;N;;;;;
+3233;PARENTHESIZED IDEOGRAPH SOCIETY;So;0;L;<compat> 0028 793E 0029;;;;N;;;;;
+3234;PARENTHESIZED IDEOGRAPH NAME;So;0;L;<compat> 0028 540D 0029;;;;N;;;;;
+3235;PARENTHESIZED IDEOGRAPH SPECIAL;So;0;L;<compat> 0028 7279 0029;;;;N;;;;;
+3236;PARENTHESIZED IDEOGRAPH FINANCIAL;So;0;L;<compat> 0028 8CA1 0029;;;;N;;;;;
+3237;PARENTHESIZED IDEOGRAPH CONGRATULATION;So;0;L;<compat> 0028 795D 0029;;;;N;;;;;
+3238;PARENTHESIZED IDEOGRAPH LABOR;So;0;L;<compat> 0028 52B4 0029;;;;N;;;;;
+3239;PARENTHESIZED IDEOGRAPH REPRESENT;So;0;L;<compat> 0028 4EE3 0029;;;;N;;;;;
+323A;PARENTHESIZED IDEOGRAPH CALL;So;0;L;<compat> 0028 547C 0029;;;;N;;;;;
+323B;PARENTHESIZED IDEOGRAPH STUDY;So;0;L;<compat> 0028 5B66 0029;;;;N;;;;;
+323C;PARENTHESIZED IDEOGRAPH SUPERVISE;So;0;L;<compat> 0028 76E3 0029;;;;N;;;;;
+323D;PARENTHESIZED IDEOGRAPH ENTERPRISE;So;0;L;<compat> 0028 4F01 0029;;;;N;;;;;
+323E;PARENTHESIZED IDEOGRAPH RESOURCE;So;0;L;<compat> 0028 8CC7 0029;;;;N;;;;;
+323F;PARENTHESIZED IDEOGRAPH ALLIANCE;So;0;L;<compat> 0028 5354 0029;;;;N;;;;;
+3240;PARENTHESIZED IDEOGRAPH FESTIVAL;So;0;L;<compat> 0028 796D 0029;;;;N;;;;;
+3241;PARENTHESIZED IDEOGRAPH REST;So;0;L;<compat> 0028 4F11 0029;;;;N;;;;;
+3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L;<compat> 0028 81EA 0029;;;;N;;;;;
+3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L;<compat> 0028 81F3 0029;;;;N;;;;;
+3244;CIRCLED IDEOGRAPH QUESTION;So;0;L;<circle> 554F;;;;N;;;;;
+3245;CIRCLED IDEOGRAPH KINDERGARTEN;So;0;L;<circle> 5E7C;;;;N;;;;;
+3246;CIRCLED IDEOGRAPH SCHOOL;So;0;L;<circle> 6587;;;;N;;;;;
+3247;CIRCLED IDEOGRAPH KOTO;So;0;L;<circle> 7B8F;;;;N;;;;;
+3248;CIRCLED NUMBER TEN ON BLACK SQUARE;No;0;L;;;;10;N;;;;;
+3249;CIRCLED NUMBER TWENTY ON BLACK SQUARE;No;0;L;;;;20;N;;;;;
+324A;CIRCLED NUMBER THIRTY ON BLACK SQUARE;No;0;L;;;;30;N;;;;;
+324B;CIRCLED NUMBER FORTY ON BLACK SQUARE;No;0;L;;;;40;N;;;;;
+324C;CIRCLED NUMBER FIFTY ON BLACK SQUARE;No;0;L;;;;50;N;;;;;
+324D;CIRCLED NUMBER SIXTY ON BLACK SQUARE;No;0;L;;;;60;N;;;;;
+324E;CIRCLED NUMBER SEVENTY ON BLACK SQUARE;No;0;L;;;;70;N;;;;;
+324F;CIRCLED NUMBER EIGHTY ON BLACK SQUARE;No;0;L;;;;80;N;;;;;
+3250;PARTNERSHIP SIGN;So;0;ON;<square> 0050 0054 0045;;;;N;;;;;
+3251;CIRCLED NUMBER TWENTY ONE;No;0;ON;<circle> 0032 0031;;;21;N;;;;;
+3252;CIRCLED NUMBER TWENTY TWO;No;0;ON;<circle> 0032 0032;;;22;N;;;;;
+3253;CIRCLED NUMBER TWENTY THREE;No;0;ON;<circle> 0032 0033;;;23;N;;;;;
+3254;CIRCLED NUMBER TWENTY FOUR;No;0;ON;<circle> 0032 0034;;;24;N;;;;;
+3255;CIRCLED NUMBER TWENTY FIVE;No;0;ON;<circle> 0032 0035;;;25;N;;;;;
+3256;CIRCLED NUMBER TWENTY SIX;No;0;ON;<circle> 0032 0036;;;26;N;;;;;
+3257;CIRCLED NUMBER TWENTY SEVEN;No;0;ON;<circle> 0032 0037;;;27;N;;;;;
+3258;CIRCLED NUMBER TWENTY EIGHT;No;0;ON;<circle> 0032 0038;;;28;N;;;;;
+3259;CIRCLED NUMBER TWENTY NINE;No;0;ON;<circle> 0032 0039;;;29;N;;;;;
+325A;CIRCLED NUMBER THIRTY;No;0;ON;<circle> 0033 0030;;;30;N;;;;;
+325B;CIRCLED NUMBER THIRTY ONE;No;0;ON;<circle> 0033 0031;;;31;N;;;;;
+325C;CIRCLED NUMBER THIRTY TWO;No;0;ON;<circle> 0033 0032;;;32;N;;;;;
+325D;CIRCLED NUMBER THIRTY THREE;No;0;ON;<circle> 0033 0033;;;33;N;;;;;
+325E;CIRCLED NUMBER THIRTY FOUR;No;0;ON;<circle> 0033 0034;;;34;N;;;;;
+325F;CIRCLED NUMBER THIRTY FIVE;No;0;ON;<circle> 0033 0035;;;35;N;;;;;
+3260;CIRCLED HANGUL KIYEOK;So;0;L;<circle> 1100;;;;N;CIRCLED HANGUL GIYEOG;;;;
+3261;CIRCLED HANGUL NIEUN;So;0;L;<circle> 1102;;;;N;;;;;
+3262;CIRCLED HANGUL TIKEUT;So;0;L;<circle> 1103;;;;N;CIRCLED HANGUL DIGEUD;;;;
+3263;CIRCLED HANGUL RIEUL;So;0;L;<circle> 1105;;;;N;CIRCLED HANGUL LIEUL;;;;
+3264;CIRCLED HANGUL MIEUM;So;0;L;<circle> 1106;;;;N;;;;;
+3265;CIRCLED HANGUL PIEUP;So;0;L;<circle> 1107;;;;N;CIRCLED HANGUL BIEUB;;;;
+3266;CIRCLED HANGUL SIOS;So;0;L;<circle> 1109;;;;N;;;;;
+3267;CIRCLED HANGUL IEUNG;So;0;L;<circle> 110B;;;;N;;;;;
+3268;CIRCLED HANGUL CIEUC;So;0;L;<circle> 110C;;;;N;CIRCLED HANGUL JIEUJ;;;;
+3269;CIRCLED HANGUL CHIEUCH;So;0;L;<circle> 110E;;;;N;CIRCLED HANGUL CIEUC;;;;
+326A;CIRCLED HANGUL KHIEUKH;So;0;L;<circle> 110F;;;;N;CIRCLED HANGUL KIYEOK;;;;
+326B;CIRCLED HANGUL THIEUTH;So;0;L;<circle> 1110;;;;N;CIRCLED HANGUL TIEUT;;;;
+326C;CIRCLED HANGUL PHIEUPH;So;0;L;<circle> 1111;;;;N;CIRCLED HANGUL PIEUP;;;;
+326D;CIRCLED HANGUL HIEUH;So;0;L;<circle> 1112;;;;N;;;;;
+326E;CIRCLED HANGUL KIYEOK A;So;0;L;<circle> 1100 1161;;;;N;CIRCLED HANGUL GA;;;;
+326F;CIRCLED HANGUL NIEUN A;So;0;L;<circle> 1102 1161;;;;N;CIRCLED HANGUL NA;;;;
+3270;CIRCLED HANGUL TIKEUT A;So;0;L;<circle> 1103 1161;;;;N;CIRCLED HANGUL DA;;;;
+3271;CIRCLED HANGUL RIEUL A;So;0;L;<circle> 1105 1161;;;;N;CIRCLED HANGUL LA;;;;
+3272;CIRCLED HANGUL MIEUM A;So;0;L;<circle> 1106 1161;;;;N;CIRCLED HANGUL MA;;;;
+3273;CIRCLED HANGUL PIEUP A;So;0;L;<circle> 1107 1161;;;;N;CIRCLED HANGUL BA;;;;
+3274;CIRCLED HANGUL SIOS A;So;0;L;<circle> 1109 1161;;;;N;CIRCLED HANGUL SA;;;;
+3275;CIRCLED HANGUL IEUNG A;So;0;L;<circle> 110B 1161;;;;N;CIRCLED HANGUL A;;;;
+3276;CIRCLED HANGUL CIEUC A;So;0;L;<circle> 110C 1161;;;;N;CIRCLED HANGUL JA;;;;
+3277;CIRCLED HANGUL CHIEUCH A;So;0;L;<circle> 110E 1161;;;;N;CIRCLED HANGUL CA;;;;
+3278;CIRCLED HANGUL KHIEUKH A;So;0;L;<circle> 110F 1161;;;;N;CIRCLED HANGUL KA;;;;
+3279;CIRCLED HANGUL THIEUTH A;So;0;L;<circle> 1110 1161;;;;N;CIRCLED HANGUL TA;;;;
+327A;CIRCLED HANGUL PHIEUPH A;So;0;L;<circle> 1111 1161;;;;N;CIRCLED HANGUL PA;;;;
+327B;CIRCLED HANGUL HIEUH A;So;0;L;<circle> 1112 1161;;;;N;CIRCLED HANGUL HA;;;;
+327C;CIRCLED KOREAN CHARACTER CHAMKO;So;0;ON;<circle> 110E 1161 11B7 1100 1169;;;;N;;;;;
+327D;CIRCLED KOREAN CHARACTER JUEUI;So;0;ON;<circle> 110C 116E 110B 1174;;;;N;;;;;
+327E;CIRCLED HANGUL IEUNG U;So;0;ON;<circle> 110B 116E;;;;N;;;;;
+327F;KOREAN STANDARD SYMBOL;So;0;L;;;;;N;;;;;
+3280;CIRCLED IDEOGRAPH ONE;No;0;L;<circle> 4E00;;;1;N;;;;;
+3281;CIRCLED IDEOGRAPH TWO;No;0;L;<circle> 4E8C;;;2;N;;;;;
+3282;CIRCLED IDEOGRAPH THREE;No;0;L;<circle> 4E09;;;3;N;;;;;
+3283;CIRCLED IDEOGRAPH FOUR;No;0;L;<circle> 56DB;;;4;N;;;;;
+3284;CIRCLED IDEOGRAPH FIVE;No;0;L;<circle> 4E94;;;5;N;;;;;
+3285;CIRCLED IDEOGRAPH SIX;No;0;L;<circle> 516D;;;6;N;;;;;
+3286;CIRCLED IDEOGRAPH SEVEN;No;0;L;<circle> 4E03;;;7;N;;;;;
+3287;CIRCLED IDEOGRAPH EIGHT;No;0;L;<circle> 516B;;;8;N;;;;;
+3288;CIRCLED IDEOGRAPH NINE;No;0;L;<circle> 4E5D;;;9;N;;;;;
+3289;CIRCLED IDEOGRAPH TEN;No;0;L;<circle> 5341;;;10;N;;;;;
+328A;CIRCLED IDEOGRAPH MOON;So;0;L;<circle> 6708;;;;N;;;;;
+328B;CIRCLED IDEOGRAPH FIRE;So;0;L;<circle> 706B;;;;N;;;;;
+328C;CIRCLED IDEOGRAPH WATER;So;0;L;<circle> 6C34;;;;N;;;;;
+328D;CIRCLED IDEOGRAPH WOOD;So;0;L;<circle> 6728;;;;N;;;;;
+328E;CIRCLED IDEOGRAPH METAL;So;0;L;<circle> 91D1;;;;N;;;;;
+328F;CIRCLED IDEOGRAPH EARTH;So;0;L;<circle> 571F;;;;N;;;;;
+3290;CIRCLED IDEOGRAPH SUN;So;0;L;<circle> 65E5;;;;N;;;;;
+3291;CIRCLED IDEOGRAPH STOCK;So;0;L;<circle> 682A;;;;N;;;;;
+3292;CIRCLED IDEOGRAPH HAVE;So;0;L;<circle> 6709;;;;N;;;;;
+3293;CIRCLED IDEOGRAPH SOCIETY;So;0;L;<circle> 793E;;;;N;;;;;
+3294;CIRCLED IDEOGRAPH NAME;So;0;L;<circle> 540D;;;;N;;;;;
+3295;CIRCLED IDEOGRAPH SPECIAL;So;0;L;<circle> 7279;;;;N;;;;;
+3296;CIRCLED IDEOGRAPH FINANCIAL;So;0;L;<circle> 8CA1;;;;N;;;;;
+3297;CIRCLED IDEOGRAPH CONGRATULATION;So;0;L;<circle> 795D;;;;N;;;;;
+3298;CIRCLED IDEOGRAPH LABOR;So;0;L;<circle> 52B4;;;;N;;;;;
+3299;CIRCLED IDEOGRAPH SECRET;So;0;L;<circle> 79D8;;;;N;;;;;
+329A;CIRCLED IDEOGRAPH MALE;So;0;L;<circle> 7537;;;;N;;;;;
+329B;CIRCLED IDEOGRAPH FEMALE;So;0;L;<circle> 5973;;;;N;;;;;
+329C;CIRCLED IDEOGRAPH SUITABLE;So;0;L;<circle> 9069;;;;N;;;;;
+329D;CIRCLED IDEOGRAPH EXCELLENT;So;0;L;<circle> 512A;;;;N;;;;;
+329E;CIRCLED IDEOGRAPH PRINT;So;0;L;<circle> 5370;;;;N;;;;;
+329F;CIRCLED IDEOGRAPH ATTENTION;So;0;L;<circle> 6CE8;;;;N;;;;;
+32A0;CIRCLED IDEOGRAPH ITEM;So;0;L;<circle> 9805;;;;N;;;;;
+32A1;CIRCLED IDEOGRAPH REST;So;0;L;<circle> 4F11;;;;N;;;;;
+32A2;CIRCLED IDEOGRAPH COPY;So;0;L;<circle> 5199;;;;N;;;;;
+32A3;CIRCLED IDEOGRAPH CORRECT;So;0;L;<circle> 6B63;;;;N;;;;;
+32A4;CIRCLED IDEOGRAPH HIGH;So;0;L;<circle> 4E0A;;;;N;;;;;
+32A5;CIRCLED IDEOGRAPH CENTRE;So;0;L;<circle> 4E2D;;;;N;CIRCLED IDEOGRAPH CENTER;;;;
+32A6;CIRCLED IDEOGRAPH LOW;So;0;L;<circle> 4E0B;;;;N;;;;;
+32A7;CIRCLED IDEOGRAPH LEFT;So;0;L;<circle> 5DE6;;;;N;;;;;
+32A8;CIRCLED IDEOGRAPH RIGHT;So;0;L;<circle> 53F3;;;;N;;;;;
+32A9;CIRCLED IDEOGRAPH MEDICINE;So;0;L;<circle> 533B;;;;N;;;;;
+32AA;CIRCLED IDEOGRAPH RELIGION;So;0;L;<circle> 5B97;;;;N;;;;;
+32AB;CIRCLED IDEOGRAPH STUDY;So;0;L;<circle> 5B66;;;;N;;;;;
+32AC;CIRCLED IDEOGRAPH SUPERVISE;So;0;L;<circle> 76E3;;;;N;;;;;
+32AD;CIRCLED IDEOGRAPH ENTERPRISE;So;0;L;<circle> 4F01;;;;N;;;;;
+32AE;CIRCLED IDEOGRAPH RESOURCE;So;0;L;<circle> 8CC7;;;;N;;;;;
+32AF;CIRCLED IDEOGRAPH ALLIANCE;So;0;L;<circle> 5354;;;;N;;;;;
+32B0;CIRCLED IDEOGRAPH NIGHT;So;0;L;<circle> 591C;;;;N;;;;;
+32B1;CIRCLED NUMBER THIRTY SIX;No;0;ON;<circle> 0033 0036;;;36;N;;;;;
+32B2;CIRCLED NUMBER THIRTY SEVEN;No;0;ON;<circle> 0033 0037;;;37;N;;;;;
+32B3;CIRCLED NUMBER THIRTY EIGHT;No;0;ON;<circle> 0033 0038;;;38;N;;;;;
+32B4;CIRCLED NUMBER THIRTY NINE;No;0;ON;<circle> 0033 0039;;;39;N;;;;;
+32B5;CIRCLED NUMBER FORTY;No;0;ON;<circle> 0034 0030;;;40;N;;;;;
+32B6;CIRCLED NUMBER FORTY ONE;No;0;ON;<circle> 0034 0031;;;41;N;;;;;
+32B7;CIRCLED NUMBER FORTY TWO;No;0;ON;<circle> 0034 0032;;;42;N;;;;;
+32B8;CIRCLED NUMBER FORTY THREE;No;0;ON;<circle> 0034 0033;;;43;N;;;;;
+32B9;CIRCLED NUMBER FORTY FOUR;No;0;ON;<circle> 0034 0034;;;44;N;;;;;
+32BA;CIRCLED NUMBER FORTY FIVE;No;0;ON;<circle> 0034 0035;;;45;N;;;;;
+32BB;CIRCLED NUMBER FORTY SIX;No;0;ON;<circle> 0034 0036;;;46;N;;;;;
+32BC;CIRCLED NUMBER FORTY SEVEN;No;0;ON;<circle> 0034 0037;;;47;N;;;;;
+32BD;CIRCLED NUMBER FORTY EIGHT;No;0;ON;<circle> 0034 0038;;;48;N;;;;;
+32BE;CIRCLED NUMBER FORTY NINE;No;0;ON;<circle> 0034 0039;;;49;N;;;;;
+32BF;CIRCLED NUMBER FIFTY;No;0;ON;<circle> 0035 0030;;;50;N;;;;;
+32C0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY;So;0;L;<compat> 0031 6708;;;;N;;;;;
+32C1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY;So;0;L;<compat> 0032 6708;;;;N;;;;;
+32C2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH;So;0;L;<compat> 0033 6708;;;;N;;;;;
+32C3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL;So;0;L;<compat> 0034 6708;;;;N;;;;;
+32C4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY;So;0;L;<compat> 0035 6708;;;;N;;;;;
+32C5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE;So;0;L;<compat> 0036 6708;;;;N;;;;;
+32C6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY;So;0;L;<compat> 0037 6708;;;;N;;;;;
+32C7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST;So;0;L;<compat> 0038 6708;;;;N;;;;;
+32C8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER;So;0;L;<compat> 0039 6708;;;;N;;;;;
+32C9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER;So;0;L;<compat> 0031 0030 6708;;;;N;;;;;
+32CA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER;So;0;L;<compat> 0031 0031 6708;;;;N;;;;;
+32CB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER;So;0;L;<compat> 0031 0032 6708;;;;N;;;;;
+32CC;SQUARE HG;So;0;ON;<square> 0048 0067;;;;N;;;;;
+32CD;SQUARE ERG;So;0;ON;<square> 0065 0072 0067;;;;N;;;;;
+32CE;SQUARE EV;So;0;ON;<square> 0065 0056;;;;N;;;;;
+32CF;LIMITED LIABILITY SIGN;So;0;ON;<square> 004C 0054 0044;;;;N;;;;;
+32D0;CIRCLED KATAKANA A;So;0;L;<circle> 30A2;;;;N;;;;;
+32D1;CIRCLED KATAKANA I;So;0;L;<circle> 30A4;;;;N;;;;;
+32D2;CIRCLED KATAKANA U;So;0;L;<circle> 30A6;;;;N;;;;;
+32D3;CIRCLED KATAKANA E;So;0;L;<circle> 30A8;;;;N;;;;;
+32D4;CIRCLED KATAKANA O;So;0;L;<circle> 30AA;;;;N;;;;;
+32D5;CIRCLED KATAKANA KA;So;0;L;<circle> 30AB;;;;N;;;;;
+32D6;CIRCLED KATAKANA KI;So;0;L;<circle> 30AD;;;;N;;;;;
+32D7;CIRCLED KATAKANA KU;So;0;L;<circle> 30AF;;;;N;;;;;
+32D8;CIRCLED KATAKANA KE;So;0;L;<circle> 30B1;;;;N;;;;;
+32D9;CIRCLED KATAKANA KO;So;0;L;<circle> 30B3;;;;N;;;;;
+32DA;CIRCLED KATAKANA SA;So;0;L;<circle> 30B5;;;;N;;;;;
+32DB;CIRCLED KATAKANA SI;So;0;L;<circle> 30B7;;;;N;;;;;
+32DC;CIRCLED KATAKANA SU;So;0;L;<circle> 30B9;;;;N;;;;;
+32DD;CIRCLED KATAKANA SE;So;0;L;<circle> 30BB;;;;N;;;;;
+32DE;CIRCLED KATAKANA SO;So;0;L;<circle> 30BD;;;;N;;;;;
+32DF;CIRCLED KATAKANA TA;So;0;L;<circle> 30BF;;;;N;;;;;
+32E0;CIRCLED KATAKANA TI;So;0;L;<circle> 30C1;;;;N;;;;;
+32E1;CIRCLED KATAKANA TU;So;0;L;<circle> 30C4;;;;N;;;;;
+32E2;CIRCLED KATAKANA TE;So;0;L;<circle> 30C6;;;;N;;;;;
+32E3;CIRCLED KATAKANA TO;So;0;L;<circle> 30C8;;;;N;;;;;
+32E4;CIRCLED KATAKANA NA;So;0;L;<circle> 30CA;;;;N;;;;;
+32E5;CIRCLED KATAKANA NI;So;0;L;<circle> 30CB;;;;N;;;;;
+32E6;CIRCLED KATAKANA NU;So;0;L;<circle> 30CC;;;;N;;;;;
+32E7;CIRCLED KATAKANA NE;So;0;L;<circle> 30CD;;;;N;;;;;
+32E8;CIRCLED KATAKANA NO;So;0;L;<circle> 30CE;;;;N;;;;;
+32E9;CIRCLED KATAKANA HA;So;0;L;<circle> 30CF;;;;N;;;;;
+32EA;CIRCLED KATAKANA HI;So;0;L;<circle> 30D2;;;;N;;;;;
+32EB;CIRCLED KATAKANA HU;So;0;L;<circle> 30D5;;;;N;;;;;
+32EC;CIRCLED KATAKANA HE;So;0;L;<circle> 30D8;;;;N;;;;;
+32ED;CIRCLED KATAKANA HO;So;0;L;<circle> 30DB;;;;N;;;;;
+32EE;CIRCLED KATAKANA MA;So;0;L;<circle> 30DE;;;;N;;;;;
+32EF;CIRCLED KATAKANA MI;So;0;L;<circle> 30DF;;;;N;;;;;
+32F0;CIRCLED KATAKANA MU;So;0;L;<circle> 30E0;;;;N;;;;;
+32F1;CIRCLED KATAKANA ME;So;0;L;<circle> 30E1;;;;N;;;;;
+32F2;CIRCLED KATAKANA MO;So;0;L;<circle> 30E2;;;;N;;;;;
+32F3;CIRCLED KATAKANA YA;So;0;L;<circle> 30E4;;;;N;;;;;
+32F4;CIRCLED KATAKANA YU;So;0;L;<circle> 30E6;;;;N;;;;;
+32F5;CIRCLED KATAKANA YO;So;0;L;<circle> 30E8;;;;N;;;;;
+32F6;CIRCLED KATAKANA RA;So;0;L;<circle> 30E9;;;;N;;;;;
+32F7;CIRCLED KATAKANA RI;So;0;L;<circle> 30EA;;;;N;;;;;
+32F8;CIRCLED KATAKANA RU;So;0;L;<circle> 30EB;;;;N;;;;;
+32F9;CIRCLED KATAKANA RE;So;0;L;<circle> 30EC;;;;N;;;;;
+32FA;CIRCLED KATAKANA RO;So;0;L;<circle> 30ED;;;;N;;;;;
+32FB;CIRCLED KATAKANA WA;So;0;L;<circle> 30EF;;;;N;;;;;
+32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
+32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
+32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
+3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
+3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
+3303;SQUARE AARU;So;0;L;<square> 30A2 30FC 30EB;;;;N;SQUARED AARU;;;;
+3304;SQUARE ININGU;So;0;L;<square> 30A4 30CB 30F3 30B0;;;;N;SQUARED ININGU;;;;
+3305;SQUARE INTI;So;0;L;<square> 30A4 30F3 30C1;;;;N;SQUARED INTI;;;;
+3306;SQUARE UON;So;0;L;<square> 30A6 30A9 30F3;;;;N;SQUARED UON;;;;
+3307;SQUARE ESUKUUDO;So;0;L;<square> 30A8 30B9 30AF 30FC 30C9;;;;N;SQUARED ESUKUUDO;;;;
+3308;SQUARE EEKAA;So;0;L;<square> 30A8 30FC 30AB 30FC;;;;N;SQUARED EEKAA;;;;
+3309;SQUARE ONSU;So;0;L;<square> 30AA 30F3 30B9;;;;N;SQUARED ONSU;;;;
+330A;SQUARE OOMU;So;0;L;<square> 30AA 30FC 30E0;;;;N;SQUARED OOMU;;;;
+330B;SQUARE KAIRI;So;0;L;<square> 30AB 30A4 30EA;;;;N;SQUARED KAIRI;;;;
+330C;SQUARE KARATTO;So;0;L;<square> 30AB 30E9 30C3 30C8;;;;N;SQUARED KARATTO;;;;
+330D;SQUARE KARORII;So;0;L;<square> 30AB 30ED 30EA 30FC;;;;N;SQUARED KARORII;;;;
+330E;SQUARE GARON;So;0;L;<square> 30AC 30ED 30F3;;;;N;SQUARED GARON;;;;
+330F;SQUARE GANMA;So;0;L;<square> 30AC 30F3 30DE;;;;N;SQUARED GANMA;;;;
+3310;SQUARE GIGA;So;0;L;<square> 30AE 30AC;;;;N;SQUARED GIGA;;;;
+3311;SQUARE GINII;So;0;L;<square> 30AE 30CB 30FC;;;;N;SQUARED GINII;;;;
+3312;SQUARE KYURII;So;0;L;<square> 30AD 30E5 30EA 30FC;;;;N;SQUARED KYURII;;;;
+3313;SQUARE GIRUDAA;So;0;L;<square> 30AE 30EB 30C0 30FC;;;;N;SQUARED GIRUDAA;;;;
+3314;SQUARE KIRO;So;0;L;<square> 30AD 30ED;;;;N;SQUARED KIRO;;;;
+3315;SQUARE KIROGURAMU;So;0;L;<square> 30AD 30ED 30B0 30E9 30E0;;;;N;SQUARED KIROGURAMU;;;;
+3316;SQUARE KIROMEETORU;So;0;L;<square> 30AD 30ED 30E1 30FC 30C8 30EB;;;;N;SQUARED KIROMEETORU;;;;
+3317;SQUARE KIROWATTO;So;0;L;<square> 30AD 30ED 30EF 30C3 30C8;;;;N;SQUARED KIROWATTO;;;;
+3318;SQUARE GURAMU;So;0;L;<square> 30B0 30E9 30E0;;;;N;SQUARED GURAMU;;;;
+3319;SQUARE GURAMUTON;So;0;L;<square> 30B0 30E9 30E0 30C8 30F3;;;;N;SQUARED GURAMUTON;;;;
+331A;SQUARE KURUZEIRO;So;0;L;<square> 30AF 30EB 30BC 30A4 30ED;;;;N;SQUARED KURUZEIRO;;;;
+331B;SQUARE KUROONE;So;0;L;<square> 30AF 30ED 30FC 30CD;;;;N;SQUARED KUROONE;;;;
+331C;SQUARE KEESU;So;0;L;<square> 30B1 30FC 30B9;;;;N;SQUARED KEESU;;;;
+331D;SQUARE KORUNA;So;0;L;<square> 30B3 30EB 30CA;;;;N;SQUARED KORUNA;;;;
+331E;SQUARE KOOPO;So;0;L;<square> 30B3 30FC 30DD;;;;N;SQUARED KOOPO;;;;
+331F;SQUARE SAIKURU;So;0;L;<square> 30B5 30A4 30AF 30EB;;;;N;SQUARED SAIKURU;;;;
+3320;SQUARE SANTIIMU;So;0;L;<square> 30B5 30F3 30C1 30FC 30E0;;;;N;SQUARED SANTIIMU;;;;
+3321;SQUARE SIRINGU;So;0;L;<square> 30B7 30EA 30F3 30B0;;;;N;SQUARED SIRINGU;;;;
+3322;SQUARE SENTI;So;0;L;<square> 30BB 30F3 30C1;;;;N;SQUARED SENTI;;;;
+3323;SQUARE SENTO;So;0;L;<square> 30BB 30F3 30C8;;;;N;SQUARED SENTO;;;;
+3324;SQUARE DAASU;So;0;L;<square> 30C0 30FC 30B9;;;;N;SQUARED DAASU;;;;
+3325;SQUARE DESI;So;0;L;<square> 30C7 30B7;;;;N;SQUARED DESI;;;;
+3326;SQUARE DORU;So;0;L;<square> 30C9 30EB;;;;N;SQUARED DORU;;;;
+3327;SQUARE TON;So;0;L;<square> 30C8 30F3;;;;N;SQUARED TON;;;;
+3328;SQUARE NANO;So;0;L;<square> 30CA 30CE;;;;N;SQUARED NANO;;;;
+3329;SQUARE NOTTO;So;0;L;<square> 30CE 30C3 30C8;;;;N;SQUARED NOTTO;;;;
+332A;SQUARE HAITU;So;0;L;<square> 30CF 30A4 30C4;;;;N;SQUARED HAITU;;;;
+332B;SQUARE PAASENTO;So;0;L;<square> 30D1 30FC 30BB 30F3 30C8;;;;N;SQUARED PAASENTO;;;;
+332C;SQUARE PAATU;So;0;L;<square> 30D1 30FC 30C4;;;;N;SQUARED PAATU;;;;
+332D;SQUARE BAARERU;So;0;L;<square> 30D0 30FC 30EC 30EB;;;;N;SQUARED BAARERU;;;;
+332E;SQUARE PIASUTORU;So;0;L;<square> 30D4 30A2 30B9 30C8 30EB;;;;N;SQUARED PIASUTORU;;;;
+332F;SQUARE PIKURU;So;0;L;<square> 30D4 30AF 30EB;;;;N;SQUARED PIKURU;;;;
+3330;SQUARE PIKO;So;0;L;<square> 30D4 30B3;;;;N;SQUARED PIKO;;;;
+3331;SQUARE BIRU;So;0;L;<square> 30D3 30EB;;;;N;SQUARED BIRU;;;;
+3332;SQUARE HUARADDO;So;0;L;<square> 30D5 30A1 30E9 30C3 30C9;;;;N;SQUARED HUARADDO;;;;
+3333;SQUARE HUIITO;So;0;L;<square> 30D5 30A3 30FC 30C8;;;;N;SQUARED HUIITO;;;;
+3334;SQUARE BUSSYERU;So;0;L;<square> 30D6 30C3 30B7 30A7 30EB;;;;N;SQUARED BUSSYERU;;;;
+3335;SQUARE HURAN;So;0;L;<square> 30D5 30E9 30F3;;;;N;SQUARED HURAN;;;;
+3336;SQUARE HEKUTAARU;So;0;L;<square> 30D8 30AF 30BF 30FC 30EB;;;;N;SQUARED HEKUTAARU;;;;
+3337;SQUARE PESO;So;0;L;<square> 30DA 30BD;;;;N;SQUARED PESO;;;;
+3338;SQUARE PENIHI;So;0;L;<square> 30DA 30CB 30D2;;;;N;SQUARED PENIHI;;;;
+3339;SQUARE HERUTU;So;0;L;<square> 30D8 30EB 30C4;;;;N;SQUARED HERUTU;;;;
+333A;SQUARE PENSU;So;0;L;<square> 30DA 30F3 30B9;;;;N;SQUARED PENSU;;;;
+333B;SQUARE PEEZI;So;0;L;<square> 30DA 30FC 30B8;;;;N;SQUARED PEEZI;;;;
+333C;SQUARE BEETA;So;0;L;<square> 30D9 30FC 30BF;;;;N;SQUARED BEETA;;;;
+333D;SQUARE POINTO;So;0;L;<square> 30DD 30A4 30F3 30C8;;;;N;SQUARED POINTO;;;;
+333E;SQUARE BORUTO;So;0;L;<square> 30DC 30EB 30C8;;;;N;SQUARED BORUTO;;;;
+333F;SQUARE HON;So;0;L;<square> 30DB 30F3;;;;N;SQUARED HON;;;;
+3340;SQUARE PONDO;So;0;L;<square> 30DD 30F3 30C9;;;;N;SQUARED PONDO;;;;
+3341;SQUARE HOORU;So;0;L;<square> 30DB 30FC 30EB;;;;N;SQUARED HOORU;;;;
+3342;SQUARE HOON;So;0;L;<square> 30DB 30FC 30F3;;;;N;SQUARED HOON;;;;
+3343;SQUARE MAIKURO;So;0;L;<square> 30DE 30A4 30AF 30ED;;;;N;SQUARED MAIKURO;;;;
+3344;SQUARE MAIRU;So;0;L;<square> 30DE 30A4 30EB;;;;N;SQUARED MAIRU;;;;
+3345;SQUARE MAHHA;So;0;L;<square> 30DE 30C3 30CF;;;;N;SQUARED MAHHA;;;;
+3346;SQUARE MARUKU;So;0;L;<square> 30DE 30EB 30AF;;;;N;SQUARED MARUKU;;;;
+3347;SQUARE MANSYON;So;0;L;<square> 30DE 30F3 30B7 30E7 30F3;;;;N;SQUARED MANSYON;;;;
+3348;SQUARE MIKURON;So;0;L;<square> 30DF 30AF 30ED 30F3;;;;N;SQUARED MIKURON;;;;
+3349;SQUARE MIRI;So;0;L;<square> 30DF 30EA;;;;N;SQUARED MIRI;;;;
+334A;SQUARE MIRIBAARU;So;0;L;<square> 30DF 30EA 30D0 30FC 30EB;;;;N;SQUARED MIRIBAARU;;;;
+334B;SQUARE MEGA;So;0;L;<square> 30E1 30AC;;;;N;SQUARED MEGA;;;;
+334C;SQUARE MEGATON;So;0;L;<square> 30E1 30AC 30C8 30F3;;;;N;SQUARED MEGATON;;;;
+334D;SQUARE MEETORU;So;0;L;<square> 30E1 30FC 30C8 30EB;;;;N;SQUARED MEETORU;;;;
+334E;SQUARE YAADO;So;0;L;<square> 30E4 30FC 30C9;;;;N;SQUARED YAADO;;;;
+334F;SQUARE YAARU;So;0;L;<square> 30E4 30FC 30EB;;;;N;SQUARED YAARU;;;;
+3350;SQUARE YUAN;So;0;L;<square> 30E6 30A2 30F3;;;;N;SQUARED YUAN;;;;
+3351;SQUARE RITTORU;So;0;L;<square> 30EA 30C3 30C8 30EB;;;;N;SQUARED RITTORU;;;;
+3352;SQUARE RIRA;So;0;L;<square> 30EA 30E9;;;;N;SQUARED RIRA;;;;
+3353;SQUARE RUPII;So;0;L;<square> 30EB 30D4 30FC;;;;N;SQUARED RUPII;;;;
+3354;SQUARE RUUBURU;So;0;L;<square> 30EB 30FC 30D6 30EB;;;;N;SQUARED RUUBURU;;;;
+3355;SQUARE REMU;So;0;L;<square> 30EC 30E0;;;;N;SQUARED REMU;;;;
+3356;SQUARE RENTOGEN;So;0;L;<square> 30EC 30F3 30C8 30B2 30F3;;;;N;SQUARED RENTOGEN;;;;
+3357;SQUARE WATTO;So;0;L;<square> 30EF 30C3 30C8;;;;N;SQUARED WATTO;;;;
+3358;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO;So;0;L;<compat> 0030 70B9;;;;N;;;;;
+3359;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE;So;0;L;<compat> 0031 70B9;;;;N;;;;;
+335A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO;So;0;L;<compat> 0032 70B9;;;;N;;;;;
+335B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE;So;0;L;<compat> 0033 70B9;;;;N;;;;;
+335C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR;So;0;L;<compat> 0034 70B9;;;;N;;;;;
+335D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE;So;0;L;<compat> 0035 70B9;;;;N;;;;;
+335E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX;So;0;L;<compat> 0036 70B9;;;;N;;;;;
+335F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN;So;0;L;<compat> 0037 70B9;;;;N;;;;;
+3360;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT;So;0;L;<compat> 0038 70B9;;;;N;;;;;
+3361;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE;So;0;L;<compat> 0039 70B9;;;;N;;;;;
+3362;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN;So;0;L;<compat> 0031 0030 70B9;;;;N;;;;;
+3363;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN;So;0;L;<compat> 0031 0031 70B9;;;;N;;;;;
+3364;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE;So;0;L;<compat> 0031 0032 70B9;;;;N;;;;;
+3365;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN;So;0;L;<compat> 0031 0033 70B9;;;;N;;;;;
+3366;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN;So;0;L;<compat> 0031 0034 70B9;;;;N;;;;;
+3367;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN;So;0;L;<compat> 0031 0035 70B9;;;;N;;;;;
+3368;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN;So;0;L;<compat> 0031 0036 70B9;;;;N;;;;;
+3369;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN;So;0;L;<compat> 0031 0037 70B9;;;;N;;;;;
+336A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN;So;0;L;<compat> 0031 0038 70B9;;;;N;;;;;
+336B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN;So;0;L;<compat> 0031 0039 70B9;;;;N;;;;;
+336C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY;So;0;L;<compat> 0032 0030 70B9;;;;N;;;;;
+336D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE;So;0;L;<compat> 0032 0031 70B9;;;;N;;;;;
+336E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO;So;0;L;<compat> 0032 0032 70B9;;;;N;;;;;
+336F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE;So;0;L;<compat> 0032 0033 70B9;;;;N;;;;;
+3370;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR;So;0;L;<compat> 0032 0034 70B9;;;;N;;;;;
+3371;SQUARE HPA;So;0;L;<square> 0068 0050 0061;;;;N;;;;;
+3372;SQUARE DA;So;0;L;<square> 0064 0061;;;;N;;;;;
+3373;SQUARE AU;So;0;L;<square> 0041 0055;;;;N;;;;;
+3374;SQUARE BAR;So;0;L;<square> 0062 0061 0072;;;;N;;;;;
+3375;SQUARE OV;So;0;L;<square> 006F 0056;;;;N;;;;;
+3376;SQUARE PC;So;0;L;<square> 0070 0063;;;;N;;;;;
+3377;SQUARE DM;So;0;ON;<square> 0064 006D;;;;N;;;;;
+3378;SQUARE DM SQUARED;So;0;ON;<square> 0064 006D 00B2;;;;N;;;;;
+3379;SQUARE DM CUBED;So;0;ON;<square> 0064 006D 00B3;;;;N;;;;;
+337A;SQUARE IU;So;0;ON;<square> 0049 0055;;;;N;;;;;
+337B;SQUARE ERA NAME HEISEI;So;0;L;<square> 5E73 6210;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME HEISEI;;;;
+337C;SQUARE ERA NAME SYOUWA;So;0;L;<square> 662D 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME SYOUWA;;;;
+337D;SQUARE ERA NAME TAISYOU;So;0;L;<square> 5927 6B63;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME TAISYOU;;;;
+337E;SQUARE ERA NAME MEIZI;So;0;L;<square> 660E 6CBB;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME MEIZI;;;;
+337F;SQUARE CORPORATION;So;0;L;<square> 682A 5F0F 4F1A 793E;;;;N;SQUARED FOUR IDEOGRAPHS CORPORATION;;;;
+3380;SQUARE PA AMPS;So;0;L;<square> 0070 0041;;;;N;SQUARED PA AMPS;;;;
+3381;SQUARE NA;So;0;L;<square> 006E 0041;;;;N;SQUARED NA;;;;
+3382;SQUARE MU A;So;0;L;<square> 03BC 0041;;;;N;SQUARED MU A;;;;
+3383;SQUARE MA;So;0;L;<square> 006D 0041;;;;N;SQUARED MA;;;;
+3384;SQUARE KA;So;0;L;<square> 006B 0041;;;;N;SQUARED KA;;;;
+3385;SQUARE KB;So;0;L;<square> 004B 0042;;;;N;SQUARED KB;;;;
+3386;SQUARE MB;So;0;L;<square> 004D 0042;;;;N;SQUARED MB;;;;
+3387;SQUARE GB;So;0;L;<square> 0047 0042;;;;N;SQUARED GB;;;;
+3388;SQUARE CAL;So;0;L;<square> 0063 0061 006C;;;;N;SQUARED CAL;;;;
+3389;SQUARE KCAL;So;0;L;<square> 006B 0063 0061 006C;;;;N;SQUARED KCAL;;;;
+338A;SQUARE PF;So;0;L;<square> 0070 0046;;;;N;SQUARED PF;;;;
+338B;SQUARE NF;So;0;L;<square> 006E 0046;;;;N;SQUARED NF;;;;
+338C;SQUARE MU F;So;0;L;<square> 03BC 0046;;;;N;SQUARED MU F;;;;
+338D;SQUARE MU G;So;0;L;<square> 03BC 0067;;;;N;SQUARED MU G;;;;
+338E;SQUARE MG;So;0;L;<square> 006D 0067;;;;N;SQUARED MG;;;;
+338F;SQUARE KG;So;0;L;<square> 006B 0067;;;;N;SQUARED KG;;;;
+3390;SQUARE HZ;So;0;L;<square> 0048 007A;;;;N;SQUARED HZ;;;;
+3391;SQUARE KHZ;So;0;L;<square> 006B 0048 007A;;;;N;SQUARED KHZ;;;;
+3392;SQUARE MHZ;So;0;L;<square> 004D 0048 007A;;;;N;SQUARED MHZ;;;;
+3393;SQUARE GHZ;So;0;L;<square> 0047 0048 007A;;;;N;SQUARED GHZ;;;;
+3394;SQUARE THZ;So;0;L;<square> 0054 0048 007A;;;;N;SQUARED THZ;;;;
+3395;SQUARE MU L;So;0;L;<square> 03BC 2113;;;;N;SQUARED MU L;;;;
+3396;SQUARE ML;So;0;L;<square> 006D 2113;;;;N;SQUARED ML;;;;
+3397;SQUARE DL;So;0;L;<square> 0064 2113;;;;N;SQUARED DL;;;;
+3398;SQUARE KL;So;0;L;<square> 006B 2113;;;;N;SQUARED KL;;;;
+3399;SQUARE FM;So;0;L;<square> 0066 006D;;;;N;SQUARED FM;;;;
+339A;SQUARE NM;So;0;L;<square> 006E 006D;;;;N;SQUARED NM;;;;
+339B;SQUARE MU M;So;0;L;<square> 03BC 006D;;;;N;SQUARED MU M;;;;
+339C;SQUARE MM;So;0;L;<square> 006D 006D;;;;N;SQUARED MM;;;;
+339D;SQUARE CM;So;0;L;<square> 0063 006D;;;;N;SQUARED CM;;;;
+339E;SQUARE KM;So;0;L;<square> 006B 006D;;;;N;SQUARED KM;;;;
+339F;SQUARE MM SQUARED;So;0;L;<square> 006D 006D 00B2;;;;N;SQUARED MM SQUARED;;;;
+33A0;SQUARE CM SQUARED;So;0;L;<square> 0063 006D 00B2;;;;N;SQUARED CM SQUARED;;;;
+33A1;SQUARE M SQUARED;So;0;L;<square> 006D 00B2;;;;N;SQUARED M SQUARED;;;;
+33A2;SQUARE KM SQUARED;So;0;L;<square> 006B 006D 00B2;;;;N;SQUARED KM SQUARED;;;;
+33A3;SQUARE MM CUBED;So;0;L;<square> 006D 006D 00B3;;;;N;SQUARED MM CUBED;;;;
+33A4;SQUARE CM CUBED;So;0;L;<square> 0063 006D 00B3;;;;N;SQUARED CM CUBED;;;;
+33A5;SQUARE M CUBED;So;0;L;<square> 006D 00B3;;;;N;SQUARED M CUBED;;;;
+33A6;SQUARE KM CUBED;So;0;L;<square> 006B 006D 00B3;;;;N;SQUARED KM CUBED;;;;
+33A7;SQUARE M OVER S;So;0;L;<square> 006D 2215 0073;;;;N;SQUARED M OVER S;;;;
+33A8;SQUARE M OVER S SQUARED;So;0;L;<square> 006D 2215 0073 00B2;;;;N;SQUARED M OVER S SQUARED;;;;
+33A9;SQUARE PA;So;0;L;<square> 0050 0061;;;;N;SQUARED PA;;;;
+33AA;SQUARE KPA;So;0;L;<square> 006B 0050 0061;;;;N;SQUARED KPA;;;;
+33AB;SQUARE MPA;So;0;L;<square> 004D 0050 0061;;;;N;SQUARED MPA;;;;
+33AC;SQUARE GPA;So;0;L;<square> 0047 0050 0061;;;;N;SQUARED GPA;;;;
+33AD;SQUARE RAD;So;0;L;<square> 0072 0061 0064;;;;N;SQUARED RAD;;;;
+33AE;SQUARE RAD OVER S;So;0;L;<square> 0072 0061 0064 2215 0073;;;;N;SQUARED RAD OVER S;;;;
+33AF;SQUARE RAD OVER S SQUARED;So;0;L;<square> 0072 0061 0064 2215 0073 00B2;;;;N;SQUARED RAD OVER S SQUARED;;;;
+33B0;SQUARE PS;So;0;L;<square> 0070 0073;;;;N;SQUARED PS;;;;
+33B1;SQUARE NS;So;0;L;<square> 006E 0073;;;;N;SQUARED NS;;;;
+33B2;SQUARE MU S;So;0;L;<square> 03BC 0073;;;;N;SQUARED MU S;;;;
+33B3;SQUARE MS;So;0;L;<square> 006D 0073;;;;N;SQUARED MS;;;;
+33B4;SQUARE PV;So;0;L;<square> 0070 0056;;;;N;SQUARED PV;;;;
+33B5;SQUARE NV;So;0;L;<square> 006E 0056;;;;N;SQUARED NV;;;;
+33B6;SQUARE MU V;So;0;L;<square> 03BC 0056;;;;N;SQUARED MU V;;;;
+33B7;SQUARE MV;So;0;L;<square> 006D 0056;;;;N;SQUARED MV;;;;
+33B8;SQUARE KV;So;0;L;<square> 006B 0056;;;;N;SQUARED KV;;;;
+33B9;SQUARE MV MEGA;So;0;L;<square> 004D 0056;;;;N;SQUARED MV MEGA;;;;
+33BA;SQUARE PW;So;0;L;<square> 0070 0057;;;;N;SQUARED PW;;;;
+33BB;SQUARE NW;So;0;L;<square> 006E 0057;;;;N;SQUARED NW;;;;
+33BC;SQUARE MU W;So;0;L;<square> 03BC 0057;;;;N;SQUARED MU W;;;;
+33BD;SQUARE MW;So;0;L;<square> 006D 0057;;;;N;SQUARED MW;;;;
+33BE;SQUARE KW;So;0;L;<square> 006B 0057;;;;N;SQUARED KW;;;;
+33BF;SQUARE MW MEGA;So;0;L;<square> 004D 0057;;;;N;SQUARED MW MEGA;;;;
+33C0;SQUARE K OHM;So;0;L;<square> 006B 03A9;;;;N;SQUARED K OHM;;;;
+33C1;SQUARE M OHM;So;0;L;<square> 004D 03A9;;;;N;SQUARED M OHM;;;;
+33C2;SQUARE AM;So;0;L;<square> 0061 002E 006D 002E;;;;N;SQUARED AM;;;;
+33C3;SQUARE BQ;So;0;L;<square> 0042 0071;;;;N;SQUARED BQ;;;;
+33C4;SQUARE CC;So;0;L;<square> 0063 0063;;;;N;SQUARED CC;;;;
+33C5;SQUARE CD;So;0;L;<square> 0063 0064;;;;N;SQUARED CD;;;;
+33C6;SQUARE C OVER KG;So;0;L;<square> 0043 2215 006B 0067;;;;N;SQUARED C OVER KG;;;;
+33C7;SQUARE CO;So;0;L;<square> 0043 006F 002E;;;;N;SQUARED CO;;;;
+33C8;SQUARE DB;So;0;L;<square> 0064 0042;;;;N;SQUARED DB;;;;
+33C9;SQUARE GY;So;0;L;<square> 0047 0079;;;;N;SQUARED GY;;;;
+33CA;SQUARE HA;So;0;L;<square> 0068 0061;;;;N;SQUARED HA;;;;
+33CB;SQUARE HP;So;0;L;<square> 0048 0050;;;;N;SQUARED HP;;;;
+33CC;SQUARE IN;So;0;L;<square> 0069 006E;;;;N;SQUARED IN;;;;
+33CD;SQUARE KK;So;0;L;<square> 004B 004B;;;;N;SQUARED KK;;;;
+33CE;SQUARE KM CAPITAL;So;0;L;<square> 004B 004D;;;;N;SQUARED KM CAPITAL;;;;
+33CF;SQUARE KT;So;0;L;<square> 006B 0074;;;;N;SQUARED KT;;;;
+33D0;SQUARE LM;So;0;L;<square> 006C 006D;;;;N;SQUARED LM;;;;
+33D1;SQUARE LN;So;0;L;<square> 006C 006E;;;;N;SQUARED LN;;;;
+33D2;SQUARE LOG;So;0;L;<square> 006C 006F 0067;;;;N;SQUARED LOG;;;;
+33D3;SQUARE LX;So;0;L;<square> 006C 0078;;;;N;SQUARED LX;;;;
+33D4;SQUARE MB SMALL;So;0;L;<square> 006D 0062;;;;N;SQUARED MB SMALL;;;;
+33D5;SQUARE MIL;So;0;L;<square> 006D 0069 006C;;;;N;SQUARED MIL;;;;
+33D6;SQUARE MOL;So;0;L;<square> 006D 006F 006C;;;;N;SQUARED MOL;;;;
+33D7;SQUARE PH;So;0;L;<square> 0050 0048;;;;N;SQUARED PH;;;;
+33D8;SQUARE PM;So;0;L;<square> 0070 002E 006D 002E;;;;N;SQUARED PM;;;;
+33D9;SQUARE PPM;So;0;L;<square> 0050 0050 004D;;;;N;SQUARED PPM;;;;
+33DA;SQUARE PR;So;0;L;<square> 0050 0052;;;;N;SQUARED PR;;;;
+33DB;SQUARE SR;So;0;L;<square> 0073 0072;;;;N;SQUARED SR;;;;
+33DC;SQUARE SV;So;0;L;<square> 0053 0076;;;;N;SQUARED SV;;;;
+33DD;SQUARE WB;So;0;L;<square> 0057 0062;;;;N;SQUARED WB;;;;
+33DE;SQUARE V OVER M;So;0;ON;<square> 0056 2215 006D;;;;N;;;;;
+33DF;SQUARE A OVER M;So;0;ON;<square> 0041 2215 006D;;;;N;;;;;
+33E0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE;So;0;L;<compat> 0031 65E5;;;;N;;;;;
+33E1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO;So;0;L;<compat> 0032 65E5;;;;N;;;;;
+33E2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE;So;0;L;<compat> 0033 65E5;;;;N;;;;;
+33E3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR;So;0;L;<compat> 0034 65E5;;;;N;;;;;
+33E4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE;So;0;L;<compat> 0035 65E5;;;;N;;;;;
+33E5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX;So;0;L;<compat> 0036 65E5;;;;N;;;;;
+33E6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN;So;0;L;<compat> 0037 65E5;;;;N;;;;;
+33E7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT;So;0;L;<compat> 0038 65E5;;;;N;;;;;
+33E8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE;So;0;L;<compat> 0039 65E5;;;;N;;;;;
+33E9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN;So;0;L;<compat> 0031 0030 65E5;;;;N;;;;;
+33EA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN;So;0;L;<compat> 0031 0031 65E5;;;;N;;;;;
+33EB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE;So;0;L;<compat> 0031 0032 65E5;;;;N;;;;;
+33EC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN;So;0;L;<compat> 0031 0033 65E5;;;;N;;;;;
+33ED;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN;So;0;L;<compat> 0031 0034 65E5;;;;N;;;;;
+33EE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN;So;0;L;<compat> 0031 0035 65E5;;;;N;;;;;
+33EF;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN;So;0;L;<compat> 0031 0036 65E5;;;;N;;;;;
+33F0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN;So;0;L;<compat> 0031 0037 65E5;;;;N;;;;;
+33F1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN;So;0;L;<compat> 0031 0038 65E5;;;;N;;;;;
+33F2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN;So;0;L;<compat> 0031 0039 65E5;;;;N;;;;;
+33F3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY;So;0;L;<compat> 0032 0030 65E5;;;;N;;;;;
+33F4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE;So;0;L;<compat> 0032 0031 65E5;;;;N;;;;;
+33F5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO;So;0;L;<compat> 0032 0032 65E5;;;;N;;;;;
+33F6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE;So;0;L;<compat> 0032 0033 65E5;;;;N;;;;;
+33F7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR;So;0;L;<compat> 0032 0034 65E5;;;;N;;;;;
+33F8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE;So;0;L;<compat> 0032 0035 65E5;;;;N;;;;;
+33F9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX;So;0;L;<compat> 0032 0036 65E5;;;;N;;;;;
+33FA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN;So;0;L;<compat> 0032 0037 65E5;;;;N;;;;;
+33FB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT;So;0;L;<compat> 0032 0038 65E5;;;;N;;;;;
+33FC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE;So;0;L;<compat> 0032 0039 65E5;;;;N;;;;;
+33FD;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY;So;0;L;<compat> 0033 0030 65E5;;;;N;;;;;
+33FE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE;So;0;L;<compat> 0033 0031 65E5;;;;N;;;;;
+33FF;SQUARE GAL;So;0;ON;<square> 0067 0061 006C;;;;N;;;;;
+3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
+4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
+4DC0;HEXAGRAM FOR THE CREATIVE HEAVEN;So;0;ON;;;;;N;;;;;
+4DC1;HEXAGRAM FOR THE RECEPTIVE EARTH;So;0;ON;;;;;N;;;;;
+4DC2;HEXAGRAM FOR DIFFICULTY AT THE BEGINNING;So;0;ON;;;;;N;;;;;
+4DC3;HEXAGRAM FOR YOUTHFUL FOLLY;So;0;ON;;;;;N;;;;;
+4DC4;HEXAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+4DC5;HEXAGRAM FOR CONFLICT;So;0;ON;;;;;N;;;;;
+4DC6;HEXAGRAM FOR THE ARMY;So;0;ON;;;;;N;;;;;
+4DC7;HEXAGRAM FOR HOLDING TOGETHER;So;0;ON;;;;;N;;;;;
+4DC8;HEXAGRAM FOR SMALL TAMING;So;0;ON;;;;;N;;;;;
+4DC9;HEXAGRAM FOR TREADING;So;0;ON;;;;;N;;;;;
+4DCA;HEXAGRAM FOR PEACE;So;0;ON;;;;;N;;;;;
+4DCB;HEXAGRAM FOR STANDSTILL;So;0;ON;;;;;N;;;;;
+4DCC;HEXAGRAM FOR FELLOWSHIP;So;0;ON;;;;;N;;;;;
+4DCD;HEXAGRAM FOR GREAT POSSESSION;So;0;ON;;;;;N;;;;;
+4DCE;HEXAGRAM FOR MODESTY;So;0;ON;;;;;N;;;;;
+4DCF;HEXAGRAM FOR ENTHUSIASM;So;0;ON;;;;;N;;;;;
+4DD0;HEXAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+4DD1;HEXAGRAM FOR WORK ON THE DECAYED;So;0;ON;;;;;N;;;;;
+4DD2;HEXAGRAM FOR APPROACH;So;0;ON;;;;;N;;;;;
+4DD3;HEXAGRAM FOR CONTEMPLATION;So;0;ON;;;;;N;;;;;
+4DD4;HEXAGRAM FOR BITING THROUGH;So;0;ON;;;;;N;;;;;
+4DD5;HEXAGRAM FOR GRACE;So;0;ON;;;;;N;;;;;
+4DD6;HEXAGRAM FOR SPLITTING APART;So;0;ON;;;;;N;;;;;
+4DD7;HEXAGRAM FOR RETURN;So;0;ON;;;;;N;;;;;
+4DD8;HEXAGRAM FOR INNOCENCE;So;0;ON;;;;;N;;;;;
+4DD9;HEXAGRAM FOR GREAT TAMING;So;0;ON;;;;;N;;;;;
+4DDA;HEXAGRAM FOR MOUTH CORNERS;So;0;ON;;;;;N;;;;;
+4DDB;HEXAGRAM FOR GREAT PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DDC;HEXAGRAM FOR THE ABYSMAL WATER;So;0;ON;;;;;N;;;;;
+4DDD;HEXAGRAM FOR THE CLINGING FIRE;So;0;ON;;;;;N;;;;;
+4DDE;HEXAGRAM FOR INFLUENCE;So;0;ON;;;;;N;;;;;
+4DDF;HEXAGRAM FOR DURATION;So;0;ON;;;;;N;;;;;
+4DE0;HEXAGRAM FOR RETREAT;So;0;ON;;;;;N;;;;;
+4DE1;HEXAGRAM FOR GREAT POWER;So;0;ON;;;;;N;;;;;
+4DE2;HEXAGRAM FOR PROGRESS;So;0;ON;;;;;N;;;;;
+4DE3;HEXAGRAM FOR DARKENING OF THE LIGHT;So;0;ON;;;;;N;;;;;
+4DE4;HEXAGRAM FOR THE FAMILY;So;0;ON;;;;;N;;;;;
+4DE5;HEXAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+4DE6;HEXAGRAM FOR OBSTRUCTION;So;0;ON;;;;;N;;;;;
+4DE7;HEXAGRAM FOR DELIVERANCE;So;0;ON;;;;;N;;;;;
+4DE8;HEXAGRAM FOR DECREASE;So;0;ON;;;;;N;;;;;
+4DE9;HEXAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+4DEA;HEXAGRAM FOR BREAKTHROUGH;So;0;ON;;;;;N;;;;;
+4DEB;HEXAGRAM FOR COMING TO MEET;So;0;ON;;;;;N;;;;;
+4DEC;HEXAGRAM FOR GATHERING TOGETHER;So;0;ON;;;;;N;;;;;
+4DED;HEXAGRAM FOR PUSHING UPWARD;So;0;ON;;;;;N;;;;;
+4DEE;HEXAGRAM FOR OPPRESSION;So;0;ON;;;;;N;;;;;
+4DEF;HEXAGRAM FOR THE WELL;So;0;ON;;;;;N;;;;;
+4DF0;HEXAGRAM FOR REVOLUTION;So;0;ON;;;;;N;;;;;
+4DF1;HEXAGRAM FOR THE CAULDRON;So;0;ON;;;;;N;;;;;
+4DF2;HEXAGRAM FOR THE AROUSING THUNDER;So;0;ON;;;;;N;;;;;
+4DF3;HEXAGRAM FOR THE KEEPING STILL MOUNTAIN;So;0;ON;;;;;N;;;;;
+4DF4;HEXAGRAM FOR DEVELOPMENT;So;0;ON;;;;;N;;;;;
+4DF5;HEXAGRAM FOR THE MARRYING MAIDEN;So;0;ON;;;;;N;;;;;
+4DF6;HEXAGRAM FOR ABUNDANCE;So;0;ON;;;;;N;;;;;
+4DF7;HEXAGRAM FOR THE WANDERER;So;0;ON;;;;;N;;;;;
+4DF8;HEXAGRAM FOR THE GENTLE WIND;So;0;ON;;;;;N;;;;;
+4DF9;HEXAGRAM FOR THE JOYOUS LAKE;So;0;ON;;;;;N;;;;;
+4DFA;HEXAGRAM FOR DISPERSION;So;0;ON;;;;;N;;;;;
+4DFB;HEXAGRAM FOR LIMITATION;So;0;ON;;;;;N;;;;;
+4DFC;HEXAGRAM FOR INNER TRUTH;So;0;ON;;;;;N;;;;;
+4DFD;HEXAGRAM FOR SMALL PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
+4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
+4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
+9FD5;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
+A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
+A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A003;YI SYLLABLE IP;Lo;0;L;;;;;N;;;;;
+A004;YI SYLLABLE IET;Lo;0;L;;;;;N;;;;;
+A005;YI SYLLABLE IEX;Lo;0;L;;;;;N;;;;;
+A006;YI SYLLABLE IE;Lo;0;L;;;;;N;;;;;
+A007;YI SYLLABLE IEP;Lo;0;L;;;;;N;;;;;
+A008;YI SYLLABLE AT;Lo;0;L;;;;;N;;;;;
+A009;YI SYLLABLE AX;Lo;0;L;;;;;N;;;;;
+A00A;YI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A00B;YI SYLLABLE AP;Lo;0;L;;;;;N;;;;;
+A00C;YI SYLLABLE UOX;Lo;0;L;;;;;N;;;;;
+A00D;YI SYLLABLE UO;Lo;0;L;;;;;N;;;;;
+A00E;YI SYLLABLE UOP;Lo;0;L;;;;;N;;;;;
+A00F;YI SYLLABLE OT;Lo;0;L;;;;;N;;;;;
+A010;YI SYLLABLE OX;Lo;0;L;;;;;N;;;;;
+A011;YI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A012;YI SYLLABLE OP;Lo;0;L;;;;;N;;;;;
+A013;YI SYLLABLE EX;Lo;0;L;;;;;N;;;;;
+A014;YI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A015;YI SYLLABLE WU;Lm;0;L;;;;;N;;;;;
+A016;YI SYLLABLE BIT;Lo;0;L;;;;;N;;;;;
+A017;YI SYLLABLE BIX;Lo;0;L;;;;;N;;;;;
+A018;YI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A019;YI SYLLABLE BIP;Lo;0;L;;;;;N;;;;;
+A01A;YI SYLLABLE BIET;Lo;0;L;;;;;N;;;;;
+A01B;YI SYLLABLE BIEX;Lo;0;L;;;;;N;;;;;
+A01C;YI SYLLABLE BIE;Lo;0;L;;;;;N;;;;;
+A01D;YI SYLLABLE BIEP;Lo;0;L;;;;;N;;;;;
+A01E;YI SYLLABLE BAT;Lo;0;L;;;;;N;;;;;
+A01F;YI SYLLABLE BAX;Lo;0;L;;;;;N;;;;;
+A020;YI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A021;YI SYLLABLE BAP;Lo;0;L;;;;;N;;;;;
+A022;YI SYLLABLE BUOX;Lo;0;L;;;;;N;;;;;
+A023;YI SYLLABLE BUO;Lo;0;L;;;;;N;;;;;
+A024;YI SYLLABLE BUOP;Lo;0;L;;;;;N;;;;;
+A025;YI SYLLABLE BOT;Lo;0;L;;;;;N;;;;;
+A026;YI SYLLABLE BOX;Lo;0;L;;;;;N;;;;;
+A027;YI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A028;YI SYLLABLE BOP;Lo;0;L;;;;;N;;;;;
+A029;YI SYLLABLE BEX;Lo;0;L;;;;;N;;;;;
+A02A;YI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A02B;YI SYLLABLE BEP;Lo;0;L;;;;;N;;;;;
+A02C;YI SYLLABLE BUT;Lo;0;L;;;;;N;;;;;
+A02D;YI SYLLABLE BUX;Lo;0;L;;;;;N;;;;;
+A02E;YI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A02F;YI SYLLABLE BUP;Lo;0;L;;;;;N;;;;;
+A030;YI SYLLABLE BURX;Lo;0;L;;;;;N;;;;;
+A031;YI SYLLABLE BUR;Lo;0;L;;;;;N;;;;;
+A032;YI SYLLABLE BYT;Lo;0;L;;;;;N;;;;;
+A033;YI SYLLABLE BYX;Lo;0;L;;;;;N;;;;;
+A034;YI SYLLABLE BY;Lo;0;L;;;;;N;;;;;
+A035;YI SYLLABLE BYP;Lo;0;L;;;;;N;;;;;
+A036;YI SYLLABLE BYRX;Lo;0;L;;;;;N;;;;;
+A037;YI SYLLABLE BYR;Lo;0;L;;;;;N;;;;;
+A038;YI SYLLABLE PIT;Lo;0;L;;;;;N;;;;;
+A039;YI SYLLABLE PIX;Lo;0;L;;;;;N;;;;;
+A03A;YI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A03B;YI SYLLABLE PIP;Lo;0;L;;;;;N;;;;;
+A03C;YI SYLLABLE PIEX;Lo;0;L;;;;;N;;;;;
+A03D;YI SYLLABLE PIE;Lo;0;L;;;;;N;;;;;
+A03E;YI SYLLABLE PIEP;Lo;0;L;;;;;N;;;;;
+A03F;YI SYLLABLE PAT;Lo;0;L;;;;;N;;;;;
+A040;YI SYLLABLE PAX;Lo;0;L;;;;;N;;;;;
+A041;YI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A042;YI SYLLABLE PAP;Lo;0;L;;;;;N;;;;;
+A043;YI SYLLABLE PUOX;Lo;0;L;;;;;N;;;;;
+A044;YI SYLLABLE PUO;Lo;0;L;;;;;N;;;;;
+A045;YI SYLLABLE PUOP;Lo;0;L;;;;;N;;;;;
+A046;YI SYLLABLE POT;Lo;0;L;;;;;N;;;;;
+A047;YI SYLLABLE POX;Lo;0;L;;;;;N;;;;;
+A048;YI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A049;YI SYLLABLE POP;Lo;0;L;;;;;N;;;;;
+A04A;YI SYLLABLE PUT;Lo;0;L;;;;;N;;;;;
+A04B;YI SYLLABLE PUX;Lo;0;L;;;;;N;;;;;
+A04C;YI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A04D;YI SYLLABLE PUP;Lo;0;L;;;;;N;;;;;
+A04E;YI SYLLABLE PURX;Lo;0;L;;;;;N;;;;;
+A04F;YI SYLLABLE PUR;Lo;0;L;;;;;N;;;;;
+A050;YI SYLLABLE PYT;Lo;0;L;;;;;N;;;;;
+A051;YI SYLLABLE PYX;Lo;0;L;;;;;N;;;;;
+A052;YI SYLLABLE PY;Lo;0;L;;;;;N;;;;;
+A053;YI SYLLABLE PYP;Lo;0;L;;;;;N;;;;;
+A054;YI SYLLABLE PYRX;Lo;0;L;;;;;N;;;;;
+A055;YI SYLLABLE PYR;Lo;0;L;;;;;N;;;;;
+A056;YI SYLLABLE BBIT;Lo;0;L;;;;;N;;;;;
+A057;YI SYLLABLE BBIX;Lo;0;L;;;;;N;;;;;
+A058;YI SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
+A059;YI SYLLABLE BBIP;Lo;0;L;;;;;N;;;;;
+A05A;YI SYLLABLE BBIET;Lo;0;L;;;;;N;;;;;
+A05B;YI SYLLABLE BBIEX;Lo;0;L;;;;;N;;;;;
+A05C;YI SYLLABLE BBIE;Lo;0;L;;;;;N;;;;;
+A05D;YI SYLLABLE BBIEP;Lo;0;L;;;;;N;;;;;
+A05E;YI SYLLABLE BBAT;Lo;0;L;;;;;N;;;;;
+A05F;YI SYLLABLE BBAX;Lo;0;L;;;;;N;;;;;
+A060;YI SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
+A061;YI SYLLABLE BBAP;Lo;0;L;;;;;N;;;;;
+A062;YI SYLLABLE BBUOX;Lo;0;L;;;;;N;;;;;
+A063;YI SYLLABLE BBUO;Lo;0;L;;;;;N;;;;;
+A064;YI SYLLABLE BBUOP;Lo;0;L;;;;;N;;;;;
+A065;YI SYLLABLE BBOT;Lo;0;L;;;;;N;;;;;
+A066;YI SYLLABLE BBOX;Lo;0;L;;;;;N;;;;;
+A067;YI SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
+A068;YI SYLLABLE BBOP;Lo;0;L;;;;;N;;;;;
+A069;YI SYLLABLE BBEX;Lo;0;L;;;;;N;;;;;
+A06A;YI SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
+A06B;YI SYLLABLE BBEP;Lo;0;L;;;;;N;;;;;
+A06C;YI SYLLABLE BBUT;Lo;0;L;;;;;N;;;;;
+A06D;YI SYLLABLE BBUX;Lo;0;L;;;;;N;;;;;
+A06E;YI SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
+A06F;YI SYLLABLE BBUP;Lo;0;L;;;;;N;;;;;
+A070;YI SYLLABLE BBURX;Lo;0;L;;;;;N;;;;;
+A071;YI SYLLABLE BBUR;Lo;0;L;;;;;N;;;;;
+A072;YI SYLLABLE BBYT;Lo;0;L;;;;;N;;;;;
+A073;YI SYLLABLE BBYX;Lo;0;L;;;;;N;;;;;
+A074;YI SYLLABLE BBY;Lo;0;L;;;;;N;;;;;
+A075;YI SYLLABLE BBYP;Lo;0;L;;;;;N;;;;;
+A076;YI SYLLABLE NBIT;Lo;0;L;;;;;N;;;;;
+A077;YI SYLLABLE NBIX;Lo;0;L;;;;;N;;;;;
+A078;YI SYLLABLE NBI;Lo;0;L;;;;;N;;;;;
+A079;YI SYLLABLE NBIP;Lo;0;L;;;;;N;;;;;
+A07A;YI SYLLABLE NBIEX;Lo;0;L;;;;;N;;;;;
+A07B;YI SYLLABLE NBIE;Lo;0;L;;;;;N;;;;;
+A07C;YI SYLLABLE NBIEP;Lo;0;L;;;;;N;;;;;
+A07D;YI SYLLABLE NBAT;Lo;0;L;;;;;N;;;;;
+A07E;YI SYLLABLE NBAX;Lo;0;L;;;;;N;;;;;
+A07F;YI SYLLABLE NBA;Lo;0;L;;;;;N;;;;;
+A080;YI SYLLABLE NBAP;Lo;0;L;;;;;N;;;;;
+A081;YI SYLLABLE NBOT;Lo;0;L;;;;;N;;;;;
+A082;YI SYLLABLE NBOX;Lo;0;L;;;;;N;;;;;
+A083;YI SYLLABLE NBO;Lo;0;L;;;;;N;;;;;
+A084;YI SYLLABLE NBOP;Lo;0;L;;;;;N;;;;;
+A085;YI SYLLABLE NBUT;Lo;0;L;;;;;N;;;;;
+A086;YI SYLLABLE NBUX;Lo;0;L;;;;;N;;;;;
+A087;YI SYLLABLE NBU;Lo;0;L;;;;;N;;;;;
+A088;YI SYLLABLE NBUP;Lo;0;L;;;;;N;;;;;
+A089;YI SYLLABLE NBURX;Lo;0;L;;;;;N;;;;;
+A08A;YI SYLLABLE NBUR;Lo;0;L;;;;;N;;;;;
+A08B;YI SYLLABLE NBYT;Lo;0;L;;;;;N;;;;;
+A08C;YI SYLLABLE NBYX;Lo;0;L;;;;;N;;;;;
+A08D;YI SYLLABLE NBY;Lo;0;L;;;;;N;;;;;
+A08E;YI SYLLABLE NBYP;Lo;0;L;;;;;N;;;;;
+A08F;YI SYLLABLE NBYRX;Lo;0;L;;;;;N;;;;;
+A090;YI SYLLABLE NBYR;Lo;0;L;;;;;N;;;;;
+A091;YI SYLLABLE HMIT;Lo;0;L;;;;;N;;;;;
+A092;YI SYLLABLE HMIX;Lo;0;L;;;;;N;;;;;
+A093;YI SYLLABLE HMI;Lo;0;L;;;;;N;;;;;
+A094;YI SYLLABLE HMIP;Lo;0;L;;;;;N;;;;;
+A095;YI SYLLABLE HMIEX;Lo;0;L;;;;;N;;;;;
+A096;YI SYLLABLE HMIE;Lo;0;L;;;;;N;;;;;
+A097;YI SYLLABLE HMIEP;Lo;0;L;;;;;N;;;;;
+A098;YI SYLLABLE HMAT;Lo;0;L;;;;;N;;;;;
+A099;YI SYLLABLE HMAX;Lo;0;L;;;;;N;;;;;
+A09A;YI SYLLABLE HMA;Lo;0;L;;;;;N;;;;;
+A09B;YI SYLLABLE HMAP;Lo;0;L;;;;;N;;;;;
+A09C;YI SYLLABLE HMUOX;Lo;0;L;;;;;N;;;;;
+A09D;YI SYLLABLE HMUO;Lo;0;L;;;;;N;;;;;
+A09E;YI SYLLABLE HMUOP;Lo;0;L;;;;;N;;;;;
+A09F;YI SYLLABLE HMOT;Lo;0;L;;;;;N;;;;;
+A0A0;YI SYLLABLE HMOX;Lo;0;L;;;;;N;;;;;
+A0A1;YI SYLLABLE HMO;Lo;0;L;;;;;N;;;;;
+A0A2;YI SYLLABLE HMOP;Lo;0;L;;;;;N;;;;;
+A0A3;YI SYLLABLE HMUT;Lo;0;L;;;;;N;;;;;
+A0A4;YI SYLLABLE HMUX;Lo;0;L;;;;;N;;;;;
+A0A5;YI SYLLABLE HMU;Lo;0;L;;;;;N;;;;;
+A0A6;YI SYLLABLE HMUP;Lo;0;L;;;;;N;;;;;
+A0A7;YI SYLLABLE HMURX;Lo;0;L;;;;;N;;;;;
+A0A8;YI SYLLABLE HMUR;Lo;0;L;;;;;N;;;;;
+A0A9;YI SYLLABLE HMYX;Lo;0;L;;;;;N;;;;;
+A0AA;YI SYLLABLE HMY;Lo;0;L;;;;;N;;;;;
+A0AB;YI SYLLABLE HMYP;Lo;0;L;;;;;N;;;;;
+A0AC;YI SYLLABLE HMYRX;Lo;0;L;;;;;N;;;;;
+A0AD;YI SYLLABLE HMYR;Lo;0;L;;;;;N;;;;;
+A0AE;YI SYLLABLE MIT;Lo;0;L;;;;;N;;;;;
+A0AF;YI SYLLABLE MIX;Lo;0;L;;;;;N;;;;;
+A0B0;YI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A0B1;YI SYLLABLE MIP;Lo;0;L;;;;;N;;;;;
+A0B2;YI SYLLABLE MIEX;Lo;0;L;;;;;N;;;;;
+A0B3;YI SYLLABLE MIE;Lo;0;L;;;;;N;;;;;
+A0B4;YI SYLLABLE MIEP;Lo;0;L;;;;;N;;;;;
+A0B5;YI SYLLABLE MAT;Lo;0;L;;;;;N;;;;;
+A0B6;YI SYLLABLE MAX;Lo;0;L;;;;;N;;;;;
+A0B7;YI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A0B8;YI SYLLABLE MAP;Lo;0;L;;;;;N;;;;;
+A0B9;YI SYLLABLE MUOT;Lo;0;L;;;;;N;;;;;
+A0BA;YI SYLLABLE MUOX;Lo;0;L;;;;;N;;;;;
+A0BB;YI SYLLABLE MUO;Lo;0;L;;;;;N;;;;;
+A0BC;YI SYLLABLE MUOP;Lo;0;L;;;;;N;;;;;
+A0BD;YI SYLLABLE MOT;Lo;0;L;;;;;N;;;;;
+A0BE;YI SYLLABLE MOX;Lo;0;L;;;;;N;;;;;
+A0BF;YI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A0C0;YI SYLLABLE MOP;Lo;0;L;;;;;N;;;;;
+A0C1;YI SYLLABLE MEX;Lo;0;L;;;;;N;;;;;
+A0C2;YI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A0C3;YI SYLLABLE MUT;Lo;0;L;;;;;N;;;;;
+A0C4;YI SYLLABLE MUX;Lo;0;L;;;;;N;;;;;
+A0C5;YI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A0C6;YI SYLLABLE MUP;Lo;0;L;;;;;N;;;;;
+A0C7;YI SYLLABLE MURX;Lo;0;L;;;;;N;;;;;
+A0C8;YI SYLLABLE MUR;Lo;0;L;;;;;N;;;;;
+A0C9;YI SYLLABLE MYT;Lo;0;L;;;;;N;;;;;
+A0CA;YI SYLLABLE MYX;Lo;0;L;;;;;N;;;;;
+A0CB;YI SYLLABLE MY;Lo;0;L;;;;;N;;;;;
+A0CC;YI SYLLABLE MYP;Lo;0;L;;;;;N;;;;;
+A0CD;YI SYLLABLE FIT;Lo;0;L;;;;;N;;;;;
+A0CE;YI SYLLABLE FIX;Lo;0;L;;;;;N;;;;;
+A0CF;YI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A0D0;YI SYLLABLE FIP;Lo;0;L;;;;;N;;;;;
+A0D1;YI SYLLABLE FAT;Lo;0;L;;;;;N;;;;;
+A0D2;YI SYLLABLE FAX;Lo;0;L;;;;;N;;;;;
+A0D3;YI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A0D4;YI SYLLABLE FAP;Lo;0;L;;;;;N;;;;;
+A0D5;YI SYLLABLE FOX;Lo;0;L;;;;;N;;;;;
+A0D6;YI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A0D7;YI SYLLABLE FOP;Lo;0;L;;;;;N;;;;;
+A0D8;YI SYLLABLE FUT;Lo;0;L;;;;;N;;;;;
+A0D9;YI SYLLABLE FUX;Lo;0;L;;;;;N;;;;;
+A0DA;YI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A0DB;YI SYLLABLE FUP;Lo;0;L;;;;;N;;;;;
+A0DC;YI SYLLABLE FURX;Lo;0;L;;;;;N;;;;;
+A0DD;YI SYLLABLE FUR;Lo;0;L;;;;;N;;;;;
+A0DE;YI SYLLABLE FYT;Lo;0;L;;;;;N;;;;;
+A0DF;YI SYLLABLE FYX;Lo;0;L;;;;;N;;;;;
+A0E0;YI SYLLABLE FY;Lo;0;L;;;;;N;;;;;
+A0E1;YI SYLLABLE FYP;Lo;0;L;;;;;N;;;;;
+A0E2;YI SYLLABLE VIT;Lo;0;L;;;;;N;;;;;
+A0E3;YI SYLLABLE VIX;Lo;0;L;;;;;N;;;;;
+A0E4;YI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A0E5;YI SYLLABLE VIP;Lo;0;L;;;;;N;;;;;
+A0E6;YI SYLLABLE VIET;Lo;0;L;;;;;N;;;;;
+A0E7;YI SYLLABLE VIEX;Lo;0;L;;;;;N;;;;;
+A0E8;YI SYLLABLE VIE;Lo;0;L;;;;;N;;;;;
+A0E9;YI SYLLABLE VIEP;Lo;0;L;;;;;N;;;;;
+A0EA;YI SYLLABLE VAT;Lo;0;L;;;;;N;;;;;
+A0EB;YI SYLLABLE VAX;Lo;0;L;;;;;N;;;;;
+A0EC;YI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A0ED;YI SYLLABLE VAP;Lo;0;L;;;;;N;;;;;
+A0EE;YI SYLLABLE VOT;Lo;0;L;;;;;N;;;;;
+A0EF;YI SYLLABLE VOX;Lo;0;L;;;;;N;;;;;
+A0F0;YI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A0F1;YI SYLLABLE VOP;Lo;0;L;;;;;N;;;;;
+A0F2;YI SYLLABLE VEX;Lo;0;L;;;;;N;;;;;
+A0F3;YI SYLLABLE VEP;Lo;0;L;;;;;N;;;;;
+A0F4;YI SYLLABLE VUT;Lo;0;L;;;;;N;;;;;
+A0F5;YI SYLLABLE VUX;Lo;0;L;;;;;N;;;;;
+A0F6;YI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A0F7;YI SYLLABLE VUP;Lo;0;L;;;;;N;;;;;
+A0F8;YI SYLLABLE VURX;Lo;0;L;;;;;N;;;;;
+A0F9;YI SYLLABLE VUR;Lo;0;L;;;;;N;;;;;
+A0FA;YI SYLLABLE VYT;Lo;0;L;;;;;N;;;;;
+A0FB;YI SYLLABLE VYX;Lo;0;L;;;;;N;;;;;
+A0FC;YI SYLLABLE VY;Lo;0;L;;;;;N;;;;;
+A0FD;YI SYLLABLE VYP;Lo;0;L;;;;;N;;;;;
+A0FE;YI SYLLABLE VYRX;Lo;0;L;;;;;N;;;;;
+A0FF;YI SYLLABLE VYR;Lo;0;L;;;;;N;;;;;
+A100;YI SYLLABLE DIT;Lo;0;L;;;;;N;;;;;
+A101;YI SYLLABLE DIX;Lo;0;L;;;;;N;;;;;
+A102;YI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A103;YI SYLLABLE DIP;Lo;0;L;;;;;N;;;;;
+A104;YI SYLLABLE DIEX;Lo;0;L;;;;;N;;;;;
+A105;YI SYLLABLE DIE;Lo;0;L;;;;;N;;;;;
+A106;YI SYLLABLE DIEP;Lo;0;L;;;;;N;;;;;
+A107;YI SYLLABLE DAT;Lo;0;L;;;;;N;;;;;
+A108;YI SYLLABLE DAX;Lo;0;L;;;;;N;;;;;
+A109;YI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A10A;YI SYLLABLE DAP;Lo;0;L;;;;;N;;;;;
+A10B;YI SYLLABLE DUOX;Lo;0;L;;;;;N;;;;;
+A10C;YI SYLLABLE DUO;Lo;0;L;;;;;N;;;;;
+A10D;YI SYLLABLE DOT;Lo;0;L;;;;;N;;;;;
+A10E;YI SYLLABLE DOX;Lo;0;L;;;;;N;;;;;
+A10F;YI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A110;YI SYLLABLE DOP;Lo;0;L;;;;;N;;;;;
+A111;YI SYLLABLE DEX;Lo;0;L;;;;;N;;;;;
+A112;YI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A113;YI SYLLABLE DEP;Lo;0;L;;;;;N;;;;;
+A114;YI SYLLABLE DUT;Lo;0;L;;;;;N;;;;;
+A115;YI SYLLABLE DUX;Lo;0;L;;;;;N;;;;;
+A116;YI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A117;YI SYLLABLE DUP;Lo;0;L;;;;;N;;;;;
+A118;YI SYLLABLE DURX;Lo;0;L;;;;;N;;;;;
+A119;YI SYLLABLE DUR;Lo;0;L;;;;;N;;;;;
+A11A;YI SYLLABLE TIT;Lo;0;L;;;;;N;;;;;
+A11B;YI SYLLABLE TIX;Lo;0;L;;;;;N;;;;;
+A11C;YI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A11D;YI SYLLABLE TIP;Lo;0;L;;;;;N;;;;;
+A11E;YI SYLLABLE TIEX;Lo;0;L;;;;;N;;;;;
+A11F;YI SYLLABLE TIE;Lo;0;L;;;;;N;;;;;
+A120;YI SYLLABLE TIEP;Lo;0;L;;;;;N;;;;;
+A121;YI SYLLABLE TAT;Lo;0;L;;;;;N;;;;;
+A122;YI SYLLABLE TAX;Lo;0;L;;;;;N;;;;;
+A123;YI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A124;YI SYLLABLE TAP;Lo;0;L;;;;;N;;;;;
+A125;YI SYLLABLE TUOT;Lo;0;L;;;;;N;;;;;
+A126;YI SYLLABLE TUOX;Lo;0;L;;;;;N;;;;;
+A127;YI SYLLABLE TUO;Lo;0;L;;;;;N;;;;;
+A128;YI SYLLABLE TUOP;Lo;0;L;;;;;N;;;;;
+A129;YI SYLLABLE TOT;Lo;0;L;;;;;N;;;;;
+A12A;YI SYLLABLE TOX;Lo;0;L;;;;;N;;;;;
+A12B;YI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A12C;YI SYLLABLE TOP;Lo;0;L;;;;;N;;;;;
+A12D;YI SYLLABLE TEX;Lo;0;L;;;;;N;;;;;
+A12E;YI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A12F;YI SYLLABLE TEP;Lo;0;L;;;;;N;;;;;
+A130;YI SYLLABLE TUT;Lo;0;L;;;;;N;;;;;
+A131;YI SYLLABLE TUX;Lo;0;L;;;;;N;;;;;
+A132;YI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A133;YI SYLLABLE TUP;Lo;0;L;;;;;N;;;;;
+A134;YI SYLLABLE TURX;Lo;0;L;;;;;N;;;;;
+A135;YI SYLLABLE TUR;Lo;0;L;;;;;N;;;;;
+A136;YI SYLLABLE DDIT;Lo;0;L;;;;;N;;;;;
+A137;YI SYLLABLE DDIX;Lo;0;L;;;;;N;;;;;
+A138;YI SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+A139;YI SYLLABLE DDIP;Lo;0;L;;;;;N;;;;;
+A13A;YI SYLLABLE DDIEX;Lo;0;L;;;;;N;;;;;
+A13B;YI SYLLABLE DDIE;Lo;0;L;;;;;N;;;;;
+A13C;YI SYLLABLE DDIEP;Lo;0;L;;;;;N;;;;;
+A13D;YI SYLLABLE DDAT;Lo;0;L;;;;;N;;;;;
+A13E;YI SYLLABLE DDAX;Lo;0;L;;;;;N;;;;;
+A13F;YI SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+A140;YI SYLLABLE DDAP;Lo;0;L;;;;;N;;;;;
+A141;YI SYLLABLE DDUOX;Lo;0;L;;;;;N;;;;;
+A142;YI SYLLABLE DDUO;Lo;0;L;;;;;N;;;;;
+A143;YI SYLLABLE DDUOP;Lo;0;L;;;;;N;;;;;
+A144;YI SYLLABLE DDOT;Lo;0;L;;;;;N;;;;;
+A145;YI SYLLABLE DDOX;Lo;0;L;;;;;N;;;;;
+A146;YI SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+A147;YI SYLLABLE DDOP;Lo;0;L;;;;;N;;;;;
+A148;YI SYLLABLE DDEX;Lo;0;L;;;;;N;;;;;
+A149;YI SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+A14A;YI SYLLABLE DDEP;Lo;0;L;;;;;N;;;;;
+A14B;YI SYLLABLE DDUT;Lo;0;L;;;;;N;;;;;
+A14C;YI SYLLABLE DDUX;Lo;0;L;;;;;N;;;;;
+A14D;YI SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+A14E;YI SYLLABLE DDUP;Lo;0;L;;;;;N;;;;;
+A14F;YI SYLLABLE DDURX;Lo;0;L;;;;;N;;;;;
+A150;YI SYLLABLE DDUR;Lo;0;L;;;;;N;;;;;
+A151;YI SYLLABLE NDIT;Lo;0;L;;;;;N;;;;;
+A152;YI SYLLABLE NDIX;Lo;0;L;;;;;N;;;;;
+A153;YI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A154;YI SYLLABLE NDIP;Lo;0;L;;;;;N;;;;;
+A155;YI SYLLABLE NDIEX;Lo;0;L;;;;;N;;;;;
+A156;YI SYLLABLE NDIE;Lo;0;L;;;;;N;;;;;
+A157;YI SYLLABLE NDAT;Lo;0;L;;;;;N;;;;;
+A158;YI SYLLABLE NDAX;Lo;0;L;;;;;N;;;;;
+A159;YI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A15A;YI SYLLABLE NDAP;Lo;0;L;;;;;N;;;;;
+A15B;YI SYLLABLE NDOT;Lo;0;L;;;;;N;;;;;
+A15C;YI SYLLABLE NDOX;Lo;0;L;;;;;N;;;;;
+A15D;YI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A15E;YI SYLLABLE NDOP;Lo;0;L;;;;;N;;;;;
+A15F;YI SYLLABLE NDEX;Lo;0;L;;;;;N;;;;;
+A160;YI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A161;YI SYLLABLE NDEP;Lo;0;L;;;;;N;;;;;
+A162;YI SYLLABLE NDUT;Lo;0;L;;;;;N;;;;;
+A163;YI SYLLABLE NDUX;Lo;0;L;;;;;N;;;;;
+A164;YI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A165;YI SYLLABLE NDUP;Lo;0;L;;;;;N;;;;;
+A166;YI SYLLABLE NDURX;Lo;0;L;;;;;N;;;;;
+A167;YI SYLLABLE NDUR;Lo;0;L;;;;;N;;;;;
+A168;YI SYLLABLE HNIT;Lo;0;L;;;;;N;;;;;
+A169;YI SYLLABLE HNIX;Lo;0;L;;;;;N;;;;;
+A16A;YI SYLLABLE HNI;Lo;0;L;;;;;N;;;;;
+A16B;YI SYLLABLE HNIP;Lo;0;L;;;;;N;;;;;
+A16C;YI SYLLABLE HNIET;Lo;0;L;;;;;N;;;;;
+A16D;YI SYLLABLE HNIEX;Lo;0;L;;;;;N;;;;;
+A16E;YI SYLLABLE HNIE;Lo;0;L;;;;;N;;;;;
+A16F;YI SYLLABLE HNIEP;Lo;0;L;;;;;N;;;;;
+A170;YI SYLLABLE HNAT;Lo;0;L;;;;;N;;;;;
+A171;YI SYLLABLE HNAX;Lo;0;L;;;;;N;;;;;
+A172;YI SYLLABLE HNA;Lo;0;L;;;;;N;;;;;
+A173;YI SYLLABLE HNAP;Lo;0;L;;;;;N;;;;;
+A174;YI SYLLABLE HNUOX;Lo;0;L;;;;;N;;;;;
+A175;YI SYLLABLE HNUO;Lo;0;L;;;;;N;;;;;
+A176;YI SYLLABLE HNOT;Lo;0;L;;;;;N;;;;;
+A177;YI SYLLABLE HNOX;Lo;0;L;;;;;N;;;;;
+A178;YI SYLLABLE HNOP;Lo;0;L;;;;;N;;;;;
+A179;YI SYLLABLE HNEX;Lo;0;L;;;;;N;;;;;
+A17A;YI SYLLABLE HNE;Lo;0;L;;;;;N;;;;;
+A17B;YI SYLLABLE HNEP;Lo;0;L;;;;;N;;;;;
+A17C;YI SYLLABLE HNUT;Lo;0;L;;;;;N;;;;;
+A17D;YI SYLLABLE NIT;Lo;0;L;;;;;N;;;;;
+A17E;YI SYLLABLE NIX;Lo;0;L;;;;;N;;;;;
+A17F;YI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A180;YI SYLLABLE NIP;Lo;0;L;;;;;N;;;;;
+A181;YI SYLLABLE NIEX;Lo;0;L;;;;;N;;;;;
+A182;YI SYLLABLE NIE;Lo;0;L;;;;;N;;;;;
+A183;YI SYLLABLE NIEP;Lo;0;L;;;;;N;;;;;
+A184;YI SYLLABLE NAX;Lo;0;L;;;;;N;;;;;
+A185;YI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A186;YI SYLLABLE NAP;Lo;0;L;;;;;N;;;;;
+A187;YI SYLLABLE NUOX;Lo;0;L;;;;;N;;;;;
+A188;YI SYLLABLE NUO;Lo;0;L;;;;;N;;;;;
+A189;YI SYLLABLE NUOP;Lo;0;L;;;;;N;;;;;
+A18A;YI SYLLABLE NOT;Lo;0;L;;;;;N;;;;;
+A18B;YI SYLLABLE NOX;Lo;0;L;;;;;N;;;;;
+A18C;YI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A18D;YI SYLLABLE NOP;Lo;0;L;;;;;N;;;;;
+A18E;YI SYLLABLE NEX;Lo;0;L;;;;;N;;;;;
+A18F;YI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A190;YI SYLLABLE NEP;Lo;0;L;;;;;N;;;;;
+A191;YI SYLLABLE NUT;Lo;0;L;;;;;N;;;;;
+A192;YI SYLLABLE NUX;Lo;0;L;;;;;N;;;;;
+A193;YI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A194;YI SYLLABLE NUP;Lo;0;L;;;;;N;;;;;
+A195;YI SYLLABLE NURX;Lo;0;L;;;;;N;;;;;
+A196;YI SYLLABLE NUR;Lo;0;L;;;;;N;;;;;
+A197;YI SYLLABLE HLIT;Lo;0;L;;;;;N;;;;;
+A198;YI SYLLABLE HLIX;Lo;0;L;;;;;N;;;;;
+A199;YI SYLLABLE HLI;Lo;0;L;;;;;N;;;;;
+A19A;YI SYLLABLE HLIP;Lo;0;L;;;;;N;;;;;
+A19B;YI SYLLABLE HLIEX;Lo;0;L;;;;;N;;;;;
+A19C;YI SYLLABLE HLIE;Lo;0;L;;;;;N;;;;;
+A19D;YI SYLLABLE HLIEP;Lo;0;L;;;;;N;;;;;
+A19E;YI SYLLABLE HLAT;Lo;0;L;;;;;N;;;;;
+A19F;YI SYLLABLE HLAX;Lo;0;L;;;;;N;;;;;
+A1A0;YI SYLLABLE HLA;Lo;0;L;;;;;N;;;;;
+A1A1;YI SYLLABLE HLAP;Lo;0;L;;;;;N;;;;;
+A1A2;YI SYLLABLE HLUOX;Lo;0;L;;;;;N;;;;;
+A1A3;YI SYLLABLE HLUO;Lo;0;L;;;;;N;;;;;
+A1A4;YI SYLLABLE HLUOP;Lo;0;L;;;;;N;;;;;
+A1A5;YI SYLLABLE HLOX;Lo;0;L;;;;;N;;;;;
+A1A6;YI SYLLABLE HLO;Lo;0;L;;;;;N;;;;;
+A1A7;YI SYLLABLE HLOP;Lo;0;L;;;;;N;;;;;
+A1A8;YI SYLLABLE HLEX;Lo;0;L;;;;;N;;;;;
+A1A9;YI SYLLABLE HLE;Lo;0;L;;;;;N;;;;;
+A1AA;YI SYLLABLE HLEP;Lo;0;L;;;;;N;;;;;
+A1AB;YI SYLLABLE HLUT;Lo;0;L;;;;;N;;;;;
+A1AC;YI SYLLABLE HLUX;Lo;0;L;;;;;N;;;;;
+A1AD;YI SYLLABLE HLU;Lo;0;L;;;;;N;;;;;
+A1AE;YI SYLLABLE HLUP;Lo;0;L;;;;;N;;;;;
+A1AF;YI SYLLABLE HLURX;Lo;0;L;;;;;N;;;;;
+A1B0;YI SYLLABLE HLUR;Lo;0;L;;;;;N;;;;;
+A1B1;YI SYLLABLE HLYT;Lo;0;L;;;;;N;;;;;
+A1B2;YI SYLLABLE HLYX;Lo;0;L;;;;;N;;;;;
+A1B3;YI SYLLABLE HLY;Lo;0;L;;;;;N;;;;;
+A1B4;YI SYLLABLE HLYP;Lo;0;L;;;;;N;;;;;
+A1B5;YI SYLLABLE HLYRX;Lo;0;L;;;;;N;;;;;
+A1B6;YI SYLLABLE HLYR;Lo;0;L;;;;;N;;;;;
+A1B7;YI SYLLABLE LIT;Lo;0;L;;;;;N;;;;;
+A1B8;YI SYLLABLE LIX;Lo;0;L;;;;;N;;;;;
+A1B9;YI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A1BA;YI SYLLABLE LIP;Lo;0;L;;;;;N;;;;;
+A1BB;YI SYLLABLE LIET;Lo;0;L;;;;;N;;;;;
+A1BC;YI SYLLABLE LIEX;Lo;0;L;;;;;N;;;;;
+A1BD;YI SYLLABLE LIE;Lo;0;L;;;;;N;;;;;
+A1BE;YI SYLLABLE LIEP;Lo;0;L;;;;;N;;;;;
+A1BF;YI SYLLABLE LAT;Lo;0;L;;;;;N;;;;;
+A1C0;YI SYLLABLE LAX;Lo;0;L;;;;;N;;;;;
+A1C1;YI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A1C2;YI SYLLABLE LAP;Lo;0;L;;;;;N;;;;;
+A1C3;YI SYLLABLE LUOT;Lo;0;L;;;;;N;;;;;
+A1C4;YI SYLLABLE LUOX;Lo;0;L;;;;;N;;;;;
+A1C5;YI SYLLABLE LUO;Lo;0;L;;;;;N;;;;;
+A1C6;YI SYLLABLE LUOP;Lo;0;L;;;;;N;;;;;
+A1C7;YI SYLLABLE LOT;Lo;0;L;;;;;N;;;;;
+A1C8;YI SYLLABLE LOX;Lo;0;L;;;;;N;;;;;
+A1C9;YI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A1CA;YI SYLLABLE LOP;Lo;0;L;;;;;N;;;;;
+A1CB;YI SYLLABLE LEX;Lo;0;L;;;;;N;;;;;
+A1CC;YI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A1CD;YI SYLLABLE LEP;Lo;0;L;;;;;N;;;;;
+A1CE;YI SYLLABLE LUT;Lo;0;L;;;;;N;;;;;
+A1CF;YI SYLLABLE LUX;Lo;0;L;;;;;N;;;;;
+A1D0;YI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A1D1;YI SYLLABLE LUP;Lo;0;L;;;;;N;;;;;
+A1D2;YI SYLLABLE LURX;Lo;0;L;;;;;N;;;;;
+A1D3;YI SYLLABLE LUR;Lo;0;L;;;;;N;;;;;
+A1D4;YI SYLLABLE LYT;Lo;0;L;;;;;N;;;;;
+A1D5;YI SYLLABLE LYX;Lo;0;L;;;;;N;;;;;
+A1D6;YI SYLLABLE LY;Lo;0;L;;;;;N;;;;;
+A1D7;YI SYLLABLE LYP;Lo;0;L;;;;;N;;;;;
+A1D8;YI SYLLABLE LYRX;Lo;0;L;;;;;N;;;;;
+A1D9;YI SYLLABLE LYR;Lo;0;L;;;;;N;;;;;
+A1DA;YI SYLLABLE GIT;Lo;0;L;;;;;N;;;;;
+A1DB;YI SYLLABLE GIX;Lo;0;L;;;;;N;;;;;
+A1DC;YI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A1DD;YI SYLLABLE GIP;Lo;0;L;;;;;N;;;;;
+A1DE;YI SYLLABLE GIET;Lo;0;L;;;;;N;;;;;
+A1DF;YI SYLLABLE GIEX;Lo;0;L;;;;;N;;;;;
+A1E0;YI SYLLABLE GIE;Lo;0;L;;;;;N;;;;;
+A1E1;YI SYLLABLE GIEP;Lo;0;L;;;;;N;;;;;
+A1E2;YI SYLLABLE GAT;Lo;0;L;;;;;N;;;;;
+A1E3;YI SYLLABLE GAX;Lo;0;L;;;;;N;;;;;
+A1E4;YI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A1E5;YI SYLLABLE GAP;Lo;0;L;;;;;N;;;;;
+A1E6;YI SYLLABLE GUOT;Lo;0;L;;;;;N;;;;;
+A1E7;YI SYLLABLE GUOX;Lo;0;L;;;;;N;;;;;
+A1E8;YI SYLLABLE GUO;Lo;0;L;;;;;N;;;;;
+A1E9;YI SYLLABLE GUOP;Lo;0;L;;;;;N;;;;;
+A1EA;YI SYLLABLE GOT;Lo;0;L;;;;;N;;;;;
+A1EB;YI SYLLABLE GOX;Lo;0;L;;;;;N;;;;;
+A1EC;YI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A1ED;YI SYLLABLE GOP;Lo;0;L;;;;;N;;;;;
+A1EE;YI SYLLABLE GET;Lo;0;L;;;;;N;;;;;
+A1EF;YI SYLLABLE GEX;Lo;0;L;;;;;N;;;;;
+A1F0;YI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A1F1;YI SYLLABLE GEP;Lo;0;L;;;;;N;;;;;
+A1F2;YI SYLLABLE GUT;Lo;0;L;;;;;N;;;;;
+A1F3;YI SYLLABLE GUX;Lo;0;L;;;;;N;;;;;
+A1F4;YI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A1F5;YI SYLLABLE GUP;Lo;0;L;;;;;N;;;;;
+A1F6;YI SYLLABLE GURX;Lo;0;L;;;;;N;;;;;
+A1F7;YI SYLLABLE GUR;Lo;0;L;;;;;N;;;;;
+A1F8;YI SYLLABLE KIT;Lo;0;L;;;;;N;;;;;
+A1F9;YI SYLLABLE KIX;Lo;0;L;;;;;N;;;;;
+A1FA;YI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A1FB;YI SYLLABLE KIP;Lo;0;L;;;;;N;;;;;
+A1FC;YI SYLLABLE KIEX;Lo;0;L;;;;;N;;;;;
+A1FD;YI SYLLABLE KIE;Lo;0;L;;;;;N;;;;;
+A1FE;YI SYLLABLE KIEP;Lo;0;L;;;;;N;;;;;
+A1FF;YI SYLLABLE KAT;Lo;0;L;;;;;N;;;;;
+A200;YI SYLLABLE KAX;Lo;0;L;;;;;N;;;;;
+A201;YI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A202;YI SYLLABLE KAP;Lo;0;L;;;;;N;;;;;
+A203;YI SYLLABLE KUOX;Lo;0;L;;;;;N;;;;;
+A204;YI SYLLABLE KUO;Lo;0;L;;;;;N;;;;;
+A205;YI SYLLABLE KUOP;Lo;0;L;;;;;N;;;;;
+A206;YI SYLLABLE KOT;Lo;0;L;;;;;N;;;;;
+A207;YI SYLLABLE KOX;Lo;0;L;;;;;N;;;;;
+A208;YI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A209;YI SYLLABLE KOP;Lo;0;L;;;;;N;;;;;
+A20A;YI SYLLABLE KET;Lo;0;L;;;;;N;;;;;
+A20B;YI SYLLABLE KEX;Lo;0;L;;;;;N;;;;;
+A20C;YI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A20D;YI SYLLABLE KEP;Lo;0;L;;;;;N;;;;;
+A20E;YI SYLLABLE KUT;Lo;0;L;;;;;N;;;;;
+A20F;YI SYLLABLE KUX;Lo;0;L;;;;;N;;;;;
+A210;YI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A211;YI SYLLABLE KUP;Lo;0;L;;;;;N;;;;;
+A212;YI SYLLABLE KURX;Lo;0;L;;;;;N;;;;;
+A213;YI SYLLABLE KUR;Lo;0;L;;;;;N;;;;;
+A214;YI SYLLABLE GGIT;Lo;0;L;;;;;N;;;;;
+A215;YI SYLLABLE GGIX;Lo;0;L;;;;;N;;;;;
+A216;YI SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+A217;YI SYLLABLE GGIEX;Lo;0;L;;;;;N;;;;;
+A218;YI SYLLABLE GGIE;Lo;0;L;;;;;N;;;;;
+A219;YI SYLLABLE GGIEP;Lo;0;L;;;;;N;;;;;
+A21A;YI SYLLABLE GGAT;Lo;0;L;;;;;N;;;;;
+A21B;YI SYLLABLE GGAX;Lo;0;L;;;;;N;;;;;
+A21C;YI SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+A21D;YI SYLLABLE GGAP;Lo;0;L;;;;;N;;;;;
+A21E;YI SYLLABLE GGUOT;Lo;0;L;;;;;N;;;;;
+A21F;YI SYLLABLE GGUOX;Lo;0;L;;;;;N;;;;;
+A220;YI SYLLABLE GGUO;Lo;0;L;;;;;N;;;;;
+A221;YI SYLLABLE GGUOP;Lo;0;L;;;;;N;;;;;
+A222;YI SYLLABLE GGOT;Lo;0;L;;;;;N;;;;;
+A223;YI SYLLABLE GGOX;Lo;0;L;;;;;N;;;;;
+A224;YI SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+A225;YI SYLLABLE GGOP;Lo;0;L;;;;;N;;;;;
+A226;YI SYLLABLE GGET;Lo;0;L;;;;;N;;;;;
+A227;YI SYLLABLE GGEX;Lo;0;L;;;;;N;;;;;
+A228;YI SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+A229;YI SYLLABLE GGEP;Lo;0;L;;;;;N;;;;;
+A22A;YI SYLLABLE GGUT;Lo;0;L;;;;;N;;;;;
+A22B;YI SYLLABLE GGUX;Lo;0;L;;;;;N;;;;;
+A22C;YI SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+A22D;YI SYLLABLE GGUP;Lo;0;L;;;;;N;;;;;
+A22E;YI SYLLABLE GGURX;Lo;0;L;;;;;N;;;;;
+A22F;YI SYLLABLE GGUR;Lo;0;L;;;;;N;;;;;
+A230;YI SYLLABLE MGIEX;Lo;0;L;;;;;N;;;;;
+A231;YI SYLLABLE MGIE;Lo;0;L;;;;;N;;;;;
+A232;YI SYLLABLE MGAT;Lo;0;L;;;;;N;;;;;
+A233;YI SYLLABLE MGAX;Lo;0;L;;;;;N;;;;;
+A234;YI SYLLABLE MGA;Lo;0;L;;;;;N;;;;;
+A235;YI SYLLABLE MGAP;Lo;0;L;;;;;N;;;;;
+A236;YI SYLLABLE MGUOX;Lo;0;L;;;;;N;;;;;
+A237;YI SYLLABLE MGUO;Lo;0;L;;;;;N;;;;;
+A238;YI SYLLABLE MGUOP;Lo;0;L;;;;;N;;;;;
+A239;YI SYLLABLE MGOT;Lo;0;L;;;;;N;;;;;
+A23A;YI SYLLABLE MGOX;Lo;0;L;;;;;N;;;;;
+A23B;YI SYLLABLE MGO;Lo;0;L;;;;;N;;;;;
+A23C;YI SYLLABLE MGOP;Lo;0;L;;;;;N;;;;;
+A23D;YI SYLLABLE MGEX;Lo;0;L;;;;;N;;;;;
+A23E;YI SYLLABLE MGE;Lo;0;L;;;;;N;;;;;
+A23F;YI SYLLABLE MGEP;Lo;0;L;;;;;N;;;;;
+A240;YI SYLLABLE MGUT;Lo;0;L;;;;;N;;;;;
+A241;YI SYLLABLE MGUX;Lo;0;L;;;;;N;;;;;
+A242;YI SYLLABLE MGU;Lo;0;L;;;;;N;;;;;
+A243;YI SYLLABLE MGUP;Lo;0;L;;;;;N;;;;;
+A244;YI SYLLABLE MGURX;Lo;0;L;;;;;N;;;;;
+A245;YI SYLLABLE MGUR;Lo;0;L;;;;;N;;;;;
+A246;YI SYLLABLE HXIT;Lo;0;L;;;;;N;;;;;
+A247;YI SYLLABLE HXIX;Lo;0;L;;;;;N;;;;;
+A248;YI SYLLABLE HXI;Lo;0;L;;;;;N;;;;;
+A249;YI SYLLABLE HXIP;Lo;0;L;;;;;N;;;;;
+A24A;YI SYLLABLE HXIET;Lo;0;L;;;;;N;;;;;
+A24B;YI SYLLABLE HXIEX;Lo;0;L;;;;;N;;;;;
+A24C;YI SYLLABLE HXIE;Lo;0;L;;;;;N;;;;;
+A24D;YI SYLLABLE HXIEP;Lo;0;L;;;;;N;;;;;
+A24E;YI SYLLABLE HXAT;Lo;0;L;;;;;N;;;;;
+A24F;YI SYLLABLE HXAX;Lo;0;L;;;;;N;;;;;
+A250;YI SYLLABLE HXA;Lo;0;L;;;;;N;;;;;
+A251;YI SYLLABLE HXAP;Lo;0;L;;;;;N;;;;;
+A252;YI SYLLABLE HXUOT;Lo;0;L;;;;;N;;;;;
+A253;YI SYLLABLE HXUOX;Lo;0;L;;;;;N;;;;;
+A254;YI SYLLABLE HXUO;Lo;0;L;;;;;N;;;;;
+A255;YI SYLLABLE HXUOP;Lo;0;L;;;;;N;;;;;
+A256;YI SYLLABLE HXOT;Lo;0;L;;;;;N;;;;;
+A257;YI SYLLABLE HXOX;Lo;0;L;;;;;N;;;;;
+A258;YI SYLLABLE HXO;Lo;0;L;;;;;N;;;;;
+A259;YI SYLLABLE HXOP;Lo;0;L;;;;;N;;;;;
+A25A;YI SYLLABLE HXEX;Lo;0;L;;;;;N;;;;;
+A25B;YI SYLLABLE HXE;Lo;0;L;;;;;N;;;;;
+A25C;YI SYLLABLE HXEP;Lo;0;L;;;;;N;;;;;
+A25D;YI SYLLABLE NGIEX;Lo;0;L;;;;;N;;;;;
+A25E;YI SYLLABLE NGIE;Lo;0;L;;;;;N;;;;;
+A25F;YI SYLLABLE NGIEP;Lo;0;L;;;;;N;;;;;
+A260;YI SYLLABLE NGAT;Lo;0;L;;;;;N;;;;;
+A261;YI SYLLABLE NGAX;Lo;0;L;;;;;N;;;;;
+A262;YI SYLLABLE NGA;Lo;0;L;;;;;N;;;;;
+A263;YI SYLLABLE NGAP;Lo;0;L;;;;;N;;;;;
+A264;YI SYLLABLE NGUOT;Lo;0;L;;;;;N;;;;;
+A265;YI SYLLABLE NGUOX;Lo;0;L;;;;;N;;;;;
+A266;YI SYLLABLE NGUO;Lo;0;L;;;;;N;;;;;
+A267;YI SYLLABLE NGOT;Lo;0;L;;;;;N;;;;;
+A268;YI SYLLABLE NGOX;Lo;0;L;;;;;N;;;;;
+A269;YI SYLLABLE NGO;Lo;0;L;;;;;N;;;;;
+A26A;YI SYLLABLE NGOP;Lo;0;L;;;;;N;;;;;
+A26B;YI SYLLABLE NGEX;Lo;0;L;;;;;N;;;;;
+A26C;YI SYLLABLE NGE;Lo;0;L;;;;;N;;;;;
+A26D;YI SYLLABLE NGEP;Lo;0;L;;;;;N;;;;;
+A26E;YI SYLLABLE HIT;Lo;0;L;;;;;N;;;;;
+A26F;YI SYLLABLE HIEX;Lo;0;L;;;;;N;;;;;
+A270;YI SYLLABLE HIE;Lo;0;L;;;;;N;;;;;
+A271;YI SYLLABLE HAT;Lo;0;L;;;;;N;;;;;
+A272;YI SYLLABLE HAX;Lo;0;L;;;;;N;;;;;
+A273;YI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A274;YI SYLLABLE HAP;Lo;0;L;;;;;N;;;;;
+A275;YI SYLLABLE HUOT;Lo;0;L;;;;;N;;;;;
+A276;YI SYLLABLE HUOX;Lo;0;L;;;;;N;;;;;
+A277;YI SYLLABLE HUO;Lo;0;L;;;;;N;;;;;
+A278;YI SYLLABLE HUOP;Lo;0;L;;;;;N;;;;;
+A279;YI SYLLABLE HOT;Lo;0;L;;;;;N;;;;;
+A27A;YI SYLLABLE HOX;Lo;0;L;;;;;N;;;;;
+A27B;YI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A27C;YI SYLLABLE HOP;Lo;0;L;;;;;N;;;;;
+A27D;YI SYLLABLE HEX;Lo;0;L;;;;;N;;;;;
+A27E;YI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A27F;YI SYLLABLE HEP;Lo;0;L;;;;;N;;;;;
+A280;YI SYLLABLE WAT;Lo;0;L;;;;;N;;;;;
+A281;YI SYLLABLE WAX;Lo;0;L;;;;;N;;;;;
+A282;YI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A283;YI SYLLABLE WAP;Lo;0;L;;;;;N;;;;;
+A284;YI SYLLABLE WUOX;Lo;0;L;;;;;N;;;;;
+A285;YI SYLLABLE WUO;Lo;0;L;;;;;N;;;;;
+A286;YI SYLLABLE WUOP;Lo;0;L;;;;;N;;;;;
+A287;YI SYLLABLE WOX;Lo;0;L;;;;;N;;;;;
+A288;YI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A289;YI SYLLABLE WOP;Lo;0;L;;;;;N;;;;;
+A28A;YI SYLLABLE WEX;Lo;0;L;;;;;N;;;;;
+A28B;YI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A28C;YI SYLLABLE WEP;Lo;0;L;;;;;N;;;;;
+A28D;YI SYLLABLE ZIT;Lo;0;L;;;;;N;;;;;
+A28E;YI SYLLABLE ZIX;Lo;0;L;;;;;N;;;;;
+A28F;YI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A290;YI SYLLABLE ZIP;Lo;0;L;;;;;N;;;;;
+A291;YI SYLLABLE ZIEX;Lo;0;L;;;;;N;;;;;
+A292;YI SYLLABLE ZIE;Lo;0;L;;;;;N;;;;;
+A293;YI SYLLABLE ZIEP;Lo;0;L;;;;;N;;;;;
+A294;YI SYLLABLE ZAT;Lo;0;L;;;;;N;;;;;
+A295;YI SYLLABLE ZAX;Lo;0;L;;;;;N;;;;;
+A296;YI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A297;YI SYLLABLE ZAP;Lo;0;L;;;;;N;;;;;
+A298;YI SYLLABLE ZUOX;Lo;0;L;;;;;N;;;;;
+A299;YI SYLLABLE ZUO;Lo;0;L;;;;;N;;;;;
+A29A;YI SYLLABLE ZUOP;Lo;0;L;;;;;N;;;;;
+A29B;YI SYLLABLE ZOT;Lo;0;L;;;;;N;;;;;
+A29C;YI SYLLABLE ZOX;Lo;0;L;;;;;N;;;;;
+A29D;YI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A29E;YI SYLLABLE ZOP;Lo;0;L;;;;;N;;;;;
+A29F;YI SYLLABLE ZEX;Lo;0;L;;;;;N;;;;;
+A2A0;YI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A2A1;YI SYLLABLE ZEP;Lo;0;L;;;;;N;;;;;
+A2A2;YI SYLLABLE ZUT;Lo;0;L;;;;;N;;;;;
+A2A3;YI SYLLABLE ZUX;Lo;0;L;;;;;N;;;;;
+A2A4;YI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A2A5;YI SYLLABLE ZUP;Lo;0;L;;;;;N;;;;;
+A2A6;YI SYLLABLE ZURX;Lo;0;L;;;;;N;;;;;
+A2A7;YI SYLLABLE ZUR;Lo;0;L;;;;;N;;;;;
+A2A8;YI SYLLABLE ZYT;Lo;0;L;;;;;N;;;;;
+A2A9;YI SYLLABLE ZYX;Lo;0;L;;;;;N;;;;;
+A2AA;YI SYLLABLE ZY;Lo;0;L;;;;;N;;;;;
+A2AB;YI SYLLABLE ZYP;Lo;0;L;;;;;N;;;;;
+A2AC;YI SYLLABLE ZYRX;Lo;0;L;;;;;N;;;;;
+A2AD;YI SYLLABLE ZYR;Lo;0;L;;;;;N;;;;;
+A2AE;YI SYLLABLE CIT;Lo;0;L;;;;;N;;;;;
+A2AF;YI SYLLABLE CIX;Lo;0;L;;;;;N;;;;;
+A2B0;YI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A2B1;YI SYLLABLE CIP;Lo;0;L;;;;;N;;;;;
+A2B2;YI SYLLABLE CIET;Lo;0;L;;;;;N;;;;;
+A2B3;YI SYLLABLE CIEX;Lo;0;L;;;;;N;;;;;
+A2B4;YI SYLLABLE CIE;Lo;0;L;;;;;N;;;;;
+A2B5;YI SYLLABLE CIEP;Lo;0;L;;;;;N;;;;;
+A2B6;YI SYLLABLE CAT;Lo;0;L;;;;;N;;;;;
+A2B7;YI SYLLABLE CAX;Lo;0;L;;;;;N;;;;;
+A2B8;YI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A2B9;YI SYLLABLE CAP;Lo;0;L;;;;;N;;;;;
+A2BA;YI SYLLABLE CUOX;Lo;0;L;;;;;N;;;;;
+A2BB;YI SYLLABLE CUO;Lo;0;L;;;;;N;;;;;
+A2BC;YI SYLLABLE CUOP;Lo;0;L;;;;;N;;;;;
+A2BD;YI SYLLABLE COT;Lo;0;L;;;;;N;;;;;
+A2BE;YI SYLLABLE COX;Lo;0;L;;;;;N;;;;;
+A2BF;YI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A2C0;YI SYLLABLE COP;Lo;0;L;;;;;N;;;;;
+A2C1;YI SYLLABLE CEX;Lo;0;L;;;;;N;;;;;
+A2C2;YI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A2C3;YI SYLLABLE CEP;Lo;0;L;;;;;N;;;;;
+A2C4;YI SYLLABLE CUT;Lo;0;L;;;;;N;;;;;
+A2C5;YI SYLLABLE CUX;Lo;0;L;;;;;N;;;;;
+A2C6;YI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A2C7;YI SYLLABLE CUP;Lo;0;L;;;;;N;;;;;
+A2C8;YI SYLLABLE CURX;Lo;0;L;;;;;N;;;;;
+A2C9;YI SYLLABLE CUR;Lo;0;L;;;;;N;;;;;
+A2CA;YI SYLLABLE CYT;Lo;0;L;;;;;N;;;;;
+A2CB;YI SYLLABLE CYX;Lo;0;L;;;;;N;;;;;
+A2CC;YI SYLLABLE CY;Lo;0;L;;;;;N;;;;;
+A2CD;YI SYLLABLE CYP;Lo;0;L;;;;;N;;;;;
+A2CE;YI SYLLABLE CYRX;Lo;0;L;;;;;N;;;;;
+A2CF;YI SYLLABLE CYR;Lo;0;L;;;;;N;;;;;
+A2D0;YI SYLLABLE ZZIT;Lo;0;L;;;;;N;;;;;
+A2D1;YI SYLLABLE ZZIX;Lo;0;L;;;;;N;;;;;
+A2D2;YI SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+A2D3;YI SYLLABLE ZZIP;Lo;0;L;;;;;N;;;;;
+A2D4;YI SYLLABLE ZZIET;Lo;0;L;;;;;N;;;;;
+A2D5;YI SYLLABLE ZZIEX;Lo;0;L;;;;;N;;;;;
+A2D6;YI SYLLABLE ZZIE;Lo;0;L;;;;;N;;;;;
+A2D7;YI SYLLABLE ZZIEP;Lo;0;L;;;;;N;;;;;
+A2D8;YI SYLLABLE ZZAT;Lo;0;L;;;;;N;;;;;
+A2D9;YI SYLLABLE ZZAX;Lo;0;L;;;;;N;;;;;
+A2DA;YI SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+A2DB;YI SYLLABLE ZZAP;Lo;0;L;;;;;N;;;;;
+A2DC;YI SYLLABLE ZZOX;Lo;0;L;;;;;N;;;;;
+A2DD;YI SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+A2DE;YI SYLLABLE ZZOP;Lo;0;L;;;;;N;;;;;
+A2DF;YI SYLLABLE ZZEX;Lo;0;L;;;;;N;;;;;
+A2E0;YI SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+A2E1;YI SYLLABLE ZZEP;Lo;0;L;;;;;N;;;;;
+A2E2;YI SYLLABLE ZZUX;Lo;0;L;;;;;N;;;;;
+A2E3;YI SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+A2E4;YI SYLLABLE ZZUP;Lo;0;L;;;;;N;;;;;
+A2E5;YI SYLLABLE ZZURX;Lo;0;L;;;;;N;;;;;
+A2E6;YI SYLLABLE ZZUR;Lo;0;L;;;;;N;;;;;
+A2E7;YI SYLLABLE ZZYT;Lo;0;L;;;;;N;;;;;
+A2E8;YI SYLLABLE ZZYX;Lo;0;L;;;;;N;;;;;
+A2E9;YI SYLLABLE ZZY;Lo;0;L;;;;;N;;;;;
+A2EA;YI SYLLABLE ZZYP;Lo;0;L;;;;;N;;;;;
+A2EB;YI SYLLABLE ZZYRX;Lo;0;L;;;;;N;;;;;
+A2EC;YI SYLLABLE ZZYR;Lo;0;L;;;;;N;;;;;
+A2ED;YI SYLLABLE NZIT;Lo;0;L;;;;;N;;;;;
+A2EE;YI SYLLABLE NZIX;Lo;0;L;;;;;N;;;;;
+A2EF;YI SYLLABLE NZI;Lo;0;L;;;;;N;;;;;
+A2F0;YI SYLLABLE NZIP;Lo;0;L;;;;;N;;;;;
+A2F1;YI SYLLABLE NZIEX;Lo;0;L;;;;;N;;;;;
+A2F2;YI SYLLABLE NZIE;Lo;0;L;;;;;N;;;;;
+A2F3;YI SYLLABLE NZIEP;Lo;0;L;;;;;N;;;;;
+A2F4;YI SYLLABLE NZAT;Lo;0;L;;;;;N;;;;;
+A2F5;YI SYLLABLE NZAX;Lo;0;L;;;;;N;;;;;
+A2F6;YI SYLLABLE NZA;Lo;0;L;;;;;N;;;;;
+A2F7;YI SYLLABLE NZAP;Lo;0;L;;;;;N;;;;;
+A2F8;YI SYLLABLE NZUOX;Lo;0;L;;;;;N;;;;;
+A2F9;YI SYLLABLE NZUO;Lo;0;L;;;;;N;;;;;
+A2FA;YI SYLLABLE NZOX;Lo;0;L;;;;;N;;;;;
+A2FB;YI SYLLABLE NZOP;Lo;0;L;;;;;N;;;;;
+A2FC;YI SYLLABLE NZEX;Lo;0;L;;;;;N;;;;;
+A2FD;YI SYLLABLE NZE;Lo;0;L;;;;;N;;;;;
+A2FE;YI SYLLABLE NZUX;Lo;0;L;;;;;N;;;;;
+A2FF;YI SYLLABLE NZU;Lo;0;L;;;;;N;;;;;
+A300;YI SYLLABLE NZUP;Lo;0;L;;;;;N;;;;;
+A301;YI SYLLABLE NZURX;Lo;0;L;;;;;N;;;;;
+A302;YI SYLLABLE NZUR;Lo;0;L;;;;;N;;;;;
+A303;YI SYLLABLE NZYT;Lo;0;L;;;;;N;;;;;
+A304;YI SYLLABLE NZYX;Lo;0;L;;;;;N;;;;;
+A305;YI SYLLABLE NZY;Lo;0;L;;;;;N;;;;;
+A306;YI SYLLABLE NZYP;Lo;0;L;;;;;N;;;;;
+A307;YI SYLLABLE NZYRX;Lo;0;L;;;;;N;;;;;
+A308;YI SYLLABLE NZYR;Lo;0;L;;;;;N;;;;;
+A309;YI SYLLABLE SIT;Lo;0;L;;;;;N;;;;;
+A30A;YI SYLLABLE SIX;Lo;0;L;;;;;N;;;;;
+A30B;YI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A30C;YI SYLLABLE SIP;Lo;0;L;;;;;N;;;;;
+A30D;YI SYLLABLE SIEX;Lo;0;L;;;;;N;;;;;
+A30E;YI SYLLABLE SIE;Lo;0;L;;;;;N;;;;;
+A30F;YI SYLLABLE SIEP;Lo;0;L;;;;;N;;;;;
+A310;YI SYLLABLE SAT;Lo;0;L;;;;;N;;;;;
+A311;YI SYLLABLE SAX;Lo;0;L;;;;;N;;;;;
+A312;YI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A313;YI SYLLABLE SAP;Lo;0;L;;;;;N;;;;;
+A314;YI SYLLABLE SUOX;Lo;0;L;;;;;N;;;;;
+A315;YI SYLLABLE SUO;Lo;0;L;;;;;N;;;;;
+A316;YI SYLLABLE SUOP;Lo;0;L;;;;;N;;;;;
+A317;YI SYLLABLE SOT;Lo;0;L;;;;;N;;;;;
+A318;YI SYLLABLE SOX;Lo;0;L;;;;;N;;;;;
+A319;YI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A31A;YI SYLLABLE SOP;Lo;0;L;;;;;N;;;;;
+A31B;YI SYLLABLE SEX;Lo;0;L;;;;;N;;;;;
+A31C;YI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A31D;YI SYLLABLE SEP;Lo;0;L;;;;;N;;;;;
+A31E;YI SYLLABLE SUT;Lo;0;L;;;;;N;;;;;
+A31F;YI SYLLABLE SUX;Lo;0;L;;;;;N;;;;;
+A320;YI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A321;YI SYLLABLE SUP;Lo;0;L;;;;;N;;;;;
+A322;YI SYLLABLE SURX;Lo;0;L;;;;;N;;;;;
+A323;YI SYLLABLE SUR;Lo;0;L;;;;;N;;;;;
+A324;YI SYLLABLE SYT;Lo;0;L;;;;;N;;;;;
+A325;YI SYLLABLE SYX;Lo;0;L;;;;;N;;;;;
+A326;YI SYLLABLE SY;Lo;0;L;;;;;N;;;;;
+A327;YI SYLLABLE SYP;Lo;0;L;;;;;N;;;;;
+A328;YI SYLLABLE SYRX;Lo;0;L;;;;;N;;;;;
+A329;YI SYLLABLE SYR;Lo;0;L;;;;;N;;;;;
+A32A;YI SYLLABLE SSIT;Lo;0;L;;;;;N;;;;;
+A32B;YI SYLLABLE SSIX;Lo;0;L;;;;;N;;;;;
+A32C;YI SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+A32D;YI SYLLABLE SSIP;Lo;0;L;;;;;N;;;;;
+A32E;YI SYLLABLE SSIEX;Lo;0;L;;;;;N;;;;;
+A32F;YI SYLLABLE SSIE;Lo;0;L;;;;;N;;;;;
+A330;YI SYLLABLE SSIEP;Lo;0;L;;;;;N;;;;;
+A331;YI SYLLABLE SSAT;Lo;0;L;;;;;N;;;;;
+A332;YI SYLLABLE SSAX;Lo;0;L;;;;;N;;;;;
+A333;YI SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+A334;YI SYLLABLE SSAP;Lo;0;L;;;;;N;;;;;
+A335;YI SYLLABLE SSOT;Lo;0;L;;;;;N;;;;;
+A336;YI SYLLABLE SSOX;Lo;0;L;;;;;N;;;;;
+A337;YI SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+A338;YI SYLLABLE SSOP;Lo;0;L;;;;;N;;;;;
+A339;YI SYLLABLE SSEX;Lo;0;L;;;;;N;;;;;
+A33A;YI SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+A33B;YI SYLLABLE SSEP;Lo;0;L;;;;;N;;;;;
+A33C;YI SYLLABLE SSUT;Lo;0;L;;;;;N;;;;;
+A33D;YI SYLLABLE SSUX;Lo;0;L;;;;;N;;;;;
+A33E;YI SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+A33F;YI SYLLABLE SSUP;Lo;0;L;;;;;N;;;;;
+A340;YI SYLLABLE SSYT;Lo;0;L;;;;;N;;;;;
+A341;YI SYLLABLE SSYX;Lo;0;L;;;;;N;;;;;
+A342;YI SYLLABLE SSY;Lo;0;L;;;;;N;;;;;
+A343;YI SYLLABLE SSYP;Lo;0;L;;;;;N;;;;;
+A344;YI SYLLABLE SSYRX;Lo;0;L;;;;;N;;;;;
+A345;YI SYLLABLE SSYR;Lo;0;L;;;;;N;;;;;
+A346;YI SYLLABLE ZHAT;Lo;0;L;;;;;N;;;;;
+A347;YI SYLLABLE ZHAX;Lo;0;L;;;;;N;;;;;
+A348;YI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A349;YI SYLLABLE ZHAP;Lo;0;L;;;;;N;;;;;
+A34A;YI SYLLABLE ZHUOX;Lo;0;L;;;;;N;;;;;
+A34B;YI SYLLABLE ZHUO;Lo;0;L;;;;;N;;;;;
+A34C;YI SYLLABLE ZHUOP;Lo;0;L;;;;;N;;;;;
+A34D;YI SYLLABLE ZHOT;Lo;0;L;;;;;N;;;;;
+A34E;YI SYLLABLE ZHOX;Lo;0;L;;;;;N;;;;;
+A34F;YI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A350;YI SYLLABLE ZHOP;Lo;0;L;;;;;N;;;;;
+A351;YI SYLLABLE ZHET;Lo;0;L;;;;;N;;;;;
+A352;YI SYLLABLE ZHEX;Lo;0;L;;;;;N;;;;;
+A353;YI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A354;YI SYLLABLE ZHEP;Lo;0;L;;;;;N;;;;;
+A355;YI SYLLABLE ZHUT;Lo;0;L;;;;;N;;;;;
+A356;YI SYLLABLE ZHUX;Lo;0;L;;;;;N;;;;;
+A357;YI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A358;YI SYLLABLE ZHUP;Lo;0;L;;;;;N;;;;;
+A359;YI SYLLABLE ZHURX;Lo;0;L;;;;;N;;;;;
+A35A;YI SYLLABLE ZHUR;Lo;0;L;;;;;N;;;;;
+A35B;YI SYLLABLE ZHYT;Lo;0;L;;;;;N;;;;;
+A35C;YI SYLLABLE ZHYX;Lo;0;L;;;;;N;;;;;
+A35D;YI SYLLABLE ZHY;Lo;0;L;;;;;N;;;;;
+A35E;YI SYLLABLE ZHYP;Lo;0;L;;;;;N;;;;;
+A35F;YI SYLLABLE ZHYRX;Lo;0;L;;;;;N;;;;;
+A360;YI SYLLABLE ZHYR;Lo;0;L;;;;;N;;;;;
+A361;YI SYLLABLE CHAT;Lo;0;L;;;;;N;;;;;
+A362;YI SYLLABLE CHAX;Lo;0;L;;;;;N;;;;;
+A363;YI SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+A364;YI SYLLABLE CHAP;Lo;0;L;;;;;N;;;;;
+A365;YI SYLLABLE CHUOT;Lo;0;L;;;;;N;;;;;
+A366;YI SYLLABLE CHUOX;Lo;0;L;;;;;N;;;;;
+A367;YI SYLLABLE CHUO;Lo;0;L;;;;;N;;;;;
+A368;YI SYLLABLE CHUOP;Lo;0;L;;;;;N;;;;;
+A369;YI SYLLABLE CHOT;Lo;0;L;;;;;N;;;;;
+A36A;YI SYLLABLE CHOX;Lo;0;L;;;;;N;;;;;
+A36B;YI SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+A36C;YI SYLLABLE CHOP;Lo;0;L;;;;;N;;;;;
+A36D;YI SYLLABLE CHET;Lo;0;L;;;;;N;;;;;
+A36E;YI SYLLABLE CHEX;Lo;0;L;;;;;N;;;;;
+A36F;YI SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+A370;YI SYLLABLE CHEP;Lo;0;L;;;;;N;;;;;
+A371;YI SYLLABLE CHUX;Lo;0;L;;;;;N;;;;;
+A372;YI SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+A373;YI SYLLABLE CHUP;Lo;0;L;;;;;N;;;;;
+A374;YI SYLLABLE CHURX;Lo;0;L;;;;;N;;;;;
+A375;YI SYLLABLE CHUR;Lo;0;L;;;;;N;;;;;
+A376;YI SYLLABLE CHYT;Lo;0;L;;;;;N;;;;;
+A377;YI SYLLABLE CHYX;Lo;0;L;;;;;N;;;;;
+A378;YI SYLLABLE CHY;Lo;0;L;;;;;N;;;;;
+A379;YI SYLLABLE CHYP;Lo;0;L;;;;;N;;;;;
+A37A;YI SYLLABLE CHYRX;Lo;0;L;;;;;N;;;;;
+A37B;YI SYLLABLE CHYR;Lo;0;L;;;;;N;;;;;
+A37C;YI SYLLABLE RRAX;Lo;0;L;;;;;N;;;;;
+A37D;YI SYLLABLE RRA;Lo;0;L;;;;;N;;;;;
+A37E;YI SYLLABLE RRUOX;Lo;0;L;;;;;N;;;;;
+A37F;YI SYLLABLE RRUO;Lo;0;L;;;;;N;;;;;
+A380;YI SYLLABLE RROT;Lo;0;L;;;;;N;;;;;
+A381;YI SYLLABLE RROX;Lo;0;L;;;;;N;;;;;
+A382;YI SYLLABLE RRO;Lo;0;L;;;;;N;;;;;
+A383;YI SYLLABLE RROP;Lo;0;L;;;;;N;;;;;
+A384;YI SYLLABLE RRET;Lo;0;L;;;;;N;;;;;
+A385;YI SYLLABLE RREX;Lo;0;L;;;;;N;;;;;
+A386;YI SYLLABLE RRE;Lo;0;L;;;;;N;;;;;
+A387;YI SYLLABLE RREP;Lo;0;L;;;;;N;;;;;
+A388;YI SYLLABLE RRUT;Lo;0;L;;;;;N;;;;;
+A389;YI SYLLABLE RRUX;Lo;0;L;;;;;N;;;;;
+A38A;YI SYLLABLE RRU;Lo;0;L;;;;;N;;;;;
+A38B;YI SYLLABLE RRUP;Lo;0;L;;;;;N;;;;;
+A38C;YI SYLLABLE RRURX;Lo;0;L;;;;;N;;;;;
+A38D;YI SYLLABLE RRUR;Lo;0;L;;;;;N;;;;;
+A38E;YI SYLLABLE RRYT;Lo;0;L;;;;;N;;;;;
+A38F;YI SYLLABLE RRYX;Lo;0;L;;;;;N;;;;;
+A390;YI SYLLABLE RRY;Lo;0;L;;;;;N;;;;;
+A391;YI SYLLABLE RRYP;Lo;0;L;;;;;N;;;;;
+A392;YI SYLLABLE RRYRX;Lo;0;L;;;;;N;;;;;
+A393;YI SYLLABLE RRYR;Lo;0;L;;;;;N;;;;;
+A394;YI SYLLABLE NRAT;Lo;0;L;;;;;N;;;;;
+A395;YI SYLLABLE NRAX;Lo;0;L;;;;;N;;;;;
+A396;YI SYLLABLE NRA;Lo;0;L;;;;;N;;;;;
+A397;YI SYLLABLE NRAP;Lo;0;L;;;;;N;;;;;
+A398;YI SYLLABLE NROX;Lo;0;L;;;;;N;;;;;
+A399;YI SYLLABLE NRO;Lo;0;L;;;;;N;;;;;
+A39A;YI SYLLABLE NROP;Lo;0;L;;;;;N;;;;;
+A39B;YI SYLLABLE NRET;Lo;0;L;;;;;N;;;;;
+A39C;YI SYLLABLE NREX;Lo;0;L;;;;;N;;;;;
+A39D;YI SYLLABLE NRE;Lo;0;L;;;;;N;;;;;
+A39E;YI SYLLABLE NREP;Lo;0;L;;;;;N;;;;;
+A39F;YI SYLLABLE NRUT;Lo;0;L;;;;;N;;;;;
+A3A0;YI SYLLABLE NRUX;Lo;0;L;;;;;N;;;;;
+A3A1;YI SYLLABLE NRU;Lo;0;L;;;;;N;;;;;
+A3A2;YI SYLLABLE NRUP;Lo;0;L;;;;;N;;;;;
+A3A3;YI SYLLABLE NRURX;Lo;0;L;;;;;N;;;;;
+A3A4;YI SYLLABLE NRUR;Lo;0;L;;;;;N;;;;;
+A3A5;YI SYLLABLE NRYT;Lo;0;L;;;;;N;;;;;
+A3A6;YI SYLLABLE NRYX;Lo;0;L;;;;;N;;;;;
+A3A7;YI SYLLABLE NRY;Lo;0;L;;;;;N;;;;;
+A3A8;YI SYLLABLE NRYP;Lo;0;L;;;;;N;;;;;
+A3A9;YI SYLLABLE NRYRX;Lo;0;L;;;;;N;;;;;
+A3AA;YI SYLLABLE NRYR;Lo;0;L;;;;;N;;;;;
+A3AB;YI SYLLABLE SHAT;Lo;0;L;;;;;N;;;;;
+A3AC;YI SYLLABLE SHAX;Lo;0;L;;;;;N;;;;;
+A3AD;YI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A3AE;YI SYLLABLE SHAP;Lo;0;L;;;;;N;;;;;
+A3AF;YI SYLLABLE SHUOX;Lo;0;L;;;;;N;;;;;
+A3B0;YI SYLLABLE SHUO;Lo;0;L;;;;;N;;;;;
+A3B1;YI SYLLABLE SHUOP;Lo;0;L;;;;;N;;;;;
+A3B2;YI SYLLABLE SHOT;Lo;0;L;;;;;N;;;;;
+A3B3;YI SYLLABLE SHOX;Lo;0;L;;;;;N;;;;;
+A3B4;YI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A3B5;YI SYLLABLE SHOP;Lo;0;L;;;;;N;;;;;
+A3B6;YI SYLLABLE SHET;Lo;0;L;;;;;N;;;;;
+A3B7;YI SYLLABLE SHEX;Lo;0;L;;;;;N;;;;;
+A3B8;YI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A3B9;YI SYLLABLE SHEP;Lo;0;L;;;;;N;;;;;
+A3BA;YI SYLLABLE SHUT;Lo;0;L;;;;;N;;;;;
+A3BB;YI SYLLABLE SHUX;Lo;0;L;;;;;N;;;;;
+A3BC;YI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A3BD;YI SYLLABLE SHUP;Lo;0;L;;;;;N;;;;;
+A3BE;YI SYLLABLE SHURX;Lo;0;L;;;;;N;;;;;
+A3BF;YI SYLLABLE SHUR;Lo;0;L;;;;;N;;;;;
+A3C0;YI SYLLABLE SHYT;Lo;0;L;;;;;N;;;;;
+A3C1;YI SYLLABLE SHYX;Lo;0;L;;;;;N;;;;;
+A3C2;YI SYLLABLE SHY;Lo;0;L;;;;;N;;;;;
+A3C3;YI SYLLABLE SHYP;Lo;0;L;;;;;N;;;;;
+A3C4;YI SYLLABLE SHYRX;Lo;0;L;;;;;N;;;;;
+A3C5;YI SYLLABLE SHYR;Lo;0;L;;;;;N;;;;;
+A3C6;YI SYLLABLE RAT;Lo;0;L;;;;;N;;;;;
+A3C7;YI SYLLABLE RAX;Lo;0;L;;;;;N;;;;;
+A3C8;YI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A3C9;YI SYLLABLE RAP;Lo;0;L;;;;;N;;;;;
+A3CA;YI SYLLABLE RUOX;Lo;0;L;;;;;N;;;;;
+A3CB;YI SYLLABLE RUO;Lo;0;L;;;;;N;;;;;
+A3CC;YI SYLLABLE RUOP;Lo;0;L;;;;;N;;;;;
+A3CD;YI SYLLABLE ROT;Lo;0;L;;;;;N;;;;;
+A3CE;YI SYLLABLE ROX;Lo;0;L;;;;;N;;;;;
+A3CF;YI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A3D0;YI SYLLABLE ROP;Lo;0;L;;;;;N;;;;;
+A3D1;YI SYLLABLE REX;Lo;0;L;;;;;N;;;;;
+A3D2;YI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A3D3;YI SYLLABLE REP;Lo;0;L;;;;;N;;;;;
+A3D4;YI SYLLABLE RUT;Lo;0;L;;;;;N;;;;;
+A3D5;YI SYLLABLE RUX;Lo;0;L;;;;;N;;;;;
+A3D6;YI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A3D7;YI SYLLABLE RUP;Lo;0;L;;;;;N;;;;;
+A3D8;YI SYLLABLE RURX;Lo;0;L;;;;;N;;;;;
+A3D9;YI SYLLABLE RUR;Lo;0;L;;;;;N;;;;;
+A3DA;YI SYLLABLE RYT;Lo;0;L;;;;;N;;;;;
+A3DB;YI SYLLABLE RYX;Lo;0;L;;;;;N;;;;;
+A3DC;YI SYLLABLE RY;Lo;0;L;;;;;N;;;;;
+A3DD;YI SYLLABLE RYP;Lo;0;L;;;;;N;;;;;
+A3DE;YI SYLLABLE RYRX;Lo;0;L;;;;;N;;;;;
+A3DF;YI SYLLABLE RYR;Lo;0;L;;;;;N;;;;;
+A3E0;YI SYLLABLE JIT;Lo;0;L;;;;;N;;;;;
+A3E1;YI SYLLABLE JIX;Lo;0;L;;;;;N;;;;;
+A3E2;YI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A3E3;YI SYLLABLE JIP;Lo;0;L;;;;;N;;;;;
+A3E4;YI SYLLABLE JIET;Lo;0;L;;;;;N;;;;;
+A3E5;YI SYLLABLE JIEX;Lo;0;L;;;;;N;;;;;
+A3E6;YI SYLLABLE JIE;Lo;0;L;;;;;N;;;;;
+A3E7;YI SYLLABLE JIEP;Lo;0;L;;;;;N;;;;;
+A3E8;YI SYLLABLE JUOT;Lo;0;L;;;;;N;;;;;
+A3E9;YI SYLLABLE JUOX;Lo;0;L;;;;;N;;;;;
+A3EA;YI SYLLABLE JUO;Lo;0;L;;;;;N;;;;;
+A3EB;YI SYLLABLE JUOP;Lo;0;L;;;;;N;;;;;
+A3EC;YI SYLLABLE JOT;Lo;0;L;;;;;N;;;;;
+A3ED;YI SYLLABLE JOX;Lo;0;L;;;;;N;;;;;
+A3EE;YI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A3EF;YI SYLLABLE JOP;Lo;0;L;;;;;N;;;;;
+A3F0;YI SYLLABLE JUT;Lo;0;L;;;;;N;;;;;
+A3F1;YI SYLLABLE JUX;Lo;0;L;;;;;N;;;;;
+A3F2;YI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A3F3;YI SYLLABLE JUP;Lo;0;L;;;;;N;;;;;
+A3F4;YI SYLLABLE JURX;Lo;0;L;;;;;N;;;;;
+A3F5;YI SYLLABLE JUR;Lo;0;L;;;;;N;;;;;
+A3F6;YI SYLLABLE JYT;Lo;0;L;;;;;N;;;;;
+A3F7;YI SYLLABLE JYX;Lo;0;L;;;;;N;;;;;
+A3F8;YI SYLLABLE JY;Lo;0;L;;;;;N;;;;;
+A3F9;YI SYLLABLE JYP;Lo;0;L;;;;;N;;;;;
+A3FA;YI SYLLABLE JYRX;Lo;0;L;;;;;N;;;;;
+A3FB;YI SYLLABLE JYR;Lo;0;L;;;;;N;;;;;
+A3FC;YI SYLLABLE QIT;Lo;0;L;;;;;N;;;;;
+A3FD;YI SYLLABLE QIX;Lo;0;L;;;;;N;;;;;
+A3FE;YI SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+A3FF;YI SYLLABLE QIP;Lo;0;L;;;;;N;;;;;
+A400;YI SYLLABLE QIET;Lo;0;L;;;;;N;;;;;
+A401;YI SYLLABLE QIEX;Lo;0;L;;;;;N;;;;;
+A402;YI SYLLABLE QIE;Lo;0;L;;;;;N;;;;;
+A403;YI SYLLABLE QIEP;Lo;0;L;;;;;N;;;;;
+A404;YI SYLLABLE QUOT;Lo;0;L;;;;;N;;;;;
+A405;YI SYLLABLE QUOX;Lo;0;L;;;;;N;;;;;
+A406;YI SYLLABLE QUO;Lo;0;L;;;;;N;;;;;
+A407;YI SYLLABLE QUOP;Lo;0;L;;;;;N;;;;;
+A408;YI SYLLABLE QOT;Lo;0;L;;;;;N;;;;;
+A409;YI SYLLABLE QOX;Lo;0;L;;;;;N;;;;;
+A40A;YI SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+A40B;YI SYLLABLE QOP;Lo;0;L;;;;;N;;;;;
+A40C;YI SYLLABLE QUT;Lo;0;L;;;;;N;;;;;
+A40D;YI SYLLABLE QUX;Lo;0;L;;;;;N;;;;;
+A40E;YI SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+A40F;YI SYLLABLE QUP;Lo;0;L;;;;;N;;;;;
+A410;YI SYLLABLE QURX;Lo;0;L;;;;;N;;;;;
+A411;YI SYLLABLE QUR;Lo;0;L;;;;;N;;;;;
+A412;YI SYLLABLE QYT;Lo;0;L;;;;;N;;;;;
+A413;YI SYLLABLE QYX;Lo;0;L;;;;;N;;;;;
+A414;YI SYLLABLE QY;Lo;0;L;;;;;N;;;;;
+A415;YI SYLLABLE QYP;Lo;0;L;;;;;N;;;;;
+A416;YI SYLLABLE QYRX;Lo;0;L;;;;;N;;;;;
+A417;YI SYLLABLE QYR;Lo;0;L;;;;;N;;;;;
+A418;YI SYLLABLE JJIT;Lo;0;L;;;;;N;;;;;
+A419;YI SYLLABLE JJIX;Lo;0;L;;;;;N;;;;;
+A41A;YI SYLLABLE JJI;Lo;0;L;;;;;N;;;;;
+A41B;YI SYLLABLE JJIP;Lo;0;L;;;;;N;;;;;
+A41C;YI SYLLABLE JJIET;Lo;0;L;;;;;N;;;;;
+A41D;YI SYLLABLE JJIEX;Lo;0;L;;;;;N;;;;;
+A41E;YI SYLLABLE JJIE;Lo;0;L;;;;;N;;;;;
+A41F;YI SYLLABLE JJIEP;Lo;0;L;;;;;N;;;;;
+A420;YI SYLLABLE JJUOX;Lo;0;L;;;;;N;;;;;
+A421;YI SYLLABLE JJUO;Lo;0;L;;;;;N;;;;;
+A422;YI SYLLABLE JJUOP;Lo;0;L;;;;;N;;;;;
+A423;YI SYLLABLE JJOT;Lo;0;L;;;;;N;;;;;
+A424;YI SYLLABLE JJOX;Lo;0;L;;;;;N;;;;;
+A425;YI SYLLABLE JJO;Lo;0;L;;;;;N;;;;;
+A426;YI SYLLABLE JJOP;Lo;0;L;;;;;N;;;;;
+A427;YI SYLLABLE JJUT;Lo;0;L;;;;;N;;;;;
+A428;YI SYLLABLE JJUX;Lo;0;L;;;;;N;;;;;
+A429;YI SYLLABLE JJU;Lo;0;L;;;;;N;;;;;
+A42A;YI SYLLABLE JJUP;Lo;0;L;;;;;N;;;;;
+A42B;YI SYLLABLE JJURX;Lo;0;L;;;;;N;;;;;
+A42C;YI SYLLABLE JJUR;Lo;0;L;;;;;N;;;;;
+A42D;YI SYLLABLE JJYT;Lo;0;L;;;;;N;;;;;
+A42E;YI SYLLABLE JJYX;Lo;0;L;;;;;N;;;;;
+A42F;YI SYLLABLE JJY;Lo;0;L;;;;;N;;;;;
+A430;YI SYLLABLE JJYP;Lo;0;L;;;;;N;;;;;
+A431;YI SYLLABLE NJIT;Lo;0;L;;;;;N;;;;;
+A432;YI SYLLABLE NJIX;Lo;0;L;;;;;N;;;;;
+A433;YI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A434;YI SYLLABLE NJIP;Lo;0;L;;;;;N;;;;;
+A435;YI SYLLABLE NJIET;Lo;0;L;;;;;N;;;;;
+A436;YI SYLLABLE NJIEX;Lo;0;L;;;;;N;;;;;
+A437;YI SYLLABLE NJIE;Lo;0;L;;;;;N;;;;;
+A438;YI SYLLABLE NJIEP;Lo;0;L;;;;;N;;;;;
+A439;YI SYLLABLE NJUOX;Lo;0;L;;;;;N;;;;;
+A43A;YI SYLLABLE NJUO;Lo;0;L;;;;;N;;;;;
+A43B;YI SYLLABLE NJOT;Lo;0;L;;;;;N;;;;;
+A43C;YI SYLLABLE NJOX;Lo;0;L;;;;;N;;;;;
+A43D;YI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A43E;YI SYLLABLE NJOP;Lo;0;L;;;;;N;;;;;
+A43F;YI SYLLABLE NJUX;Lo;0;L;;;;;N;;;;;
+A440;YI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A441;YI SYLLABLE NJUP;Lo;0;L;;;;;N;;;;;
+A442;YI SYLLABLE NJURX;Lo;0;L;;;;;N;;;;;
+A443;YI SYLLABLE NJUR;Lo;0;L;;;;;N;;;;;
+A444;YI SYLLABLE NJYT;Lo;0;L;;;;;N;;;;;
+A445;YI SYLLABLE NJYX;Lo;0;L;;;;;N;;;;;
+A446;YI SYLLABLE NJY;Lo;0;L;;;;;N;;;;;
+A447;YI SYLLABLE NJYP;Lo;0;L;;;;;N;;;;;
+A448;YI SYLLABLE NJYRX;Lo;0;L;;;;;N;;;;;
+A449;YI SYLLABLE NJYR;Lo;0;L;;;;;N;;;;;
+A44A;YI SYLLABLE NYIT;Lo;0;L;;;;;N;;;;;
+A44B;YI SYLLABLE NYIX;Lo;0;L;;;;;N;;;;;
+A44C;YI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A44D;YI SYLLABLE NYIP;Lo;0;L;;;;;N;;;;;
+A44E;YI SYLLABLE NYIET;Lo;0;L;;;;;N;;;;;
+A44F;YI SYLLABLE NYIEX;Lo;0;L;;;;;N;;;;;
+A450;YI SYLLABLE NYIE;Lo;0;L;;;;;N;;;;;
+A451;YI SYLLABLE NYIEP;Lo;0;L;;;;;N;;;;;
+A452;YI SYLLABLE NYUOX;Lo;0;L;;;;;N;;;;;
+A453;YI SYLLABLE NYUO;Lo;0;L;;;;;N;;;;;
+A454;YI SYLLABLE NYUOP;Lo;0;L;;;;;N;;;;;
+A455;YI SYLLABLE NYOT;Lo;0;L;;;;;N;;;;;
+A456;YI SYLLABLE NYOX;Lo;0;L;;;;;N;;;;;
+A457;YI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A458;YI SYLLABLE NYOP;Lo;0;L;;;;;N;;;;;
+A459;YI SYLLABLE NYUT;Lo;0;L;;;;;N;;;;;
+A45A;YI SYLLABLE NYUX;Lo;0;L;;;;;N;;;;;
+A45B;YI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A45C;YI SYLLABLE NYUP;Lo;0;L;;;;;N;;;;;
+A45D;YI SYLLABLE XIT;Lo;0;L;;;;;N;;;;;
+A45E;YI SYLLABLE XIX;Lo;0;L;;;;;N;;;;;
+A45F;YI SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+A460;YI SYLLABLE XIP;Lo;0;L;;;;;N;;;;;
+A461;YI SYLLABLE XIET;Lo;0;L;;;;;N;;;;;
+A462;YI SYLLABLE XIEX;Lo;0;L;;;;;N;;;;;
+A463;YI SYLLABLE XIE;Lo;0;L;;;;;N;;;;;
+A464;YI SYLLABLE XIEP;Lo;0;L;;;;;N;;;;;
+A465;YI SYLLABLE XUOX;Lo;0;L;;;;;N;;;;;
+A466;YI SYLLABLE XUO;Lo;0;L;;;;;N;;;;;
+A467;YI SYLLABLE XOT;Lo;0;L;;;;;N;;;;;
+A468;YI SYLLABLE XOX;Lo;0;L;;;;;N;;;;;
+A469;YI SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+A46A;YI SYLLABLE XOP;Lo;0;L;;;;;N;;;;;
+A46B;YI SYLLABLE XYT;Lo;0;L;;;;;N;;;;;
+A46C;YI SYLLABLE XYX;Lo;0;L;;;;;N;;;;;
+A46D;YI SYLLABLE XY;Lo;0;L;;;;;N;;;;;
+A46E;YI SYLLABLE XYP;Lo;0;L;;;;;N;;;;;
+A46F;YI SYLLABLE XYRX;Lo;0;L;;;;;N;;;;;
+A470;YI SYLLABLE XYR;Lo;0;L;;;;;N;;;;;
+A471;YI SYLLABLE YIT;Lo;0;L;;;;;N;;;;;
+A472;YI SYLLABLE YIX;Lo;0;L;;;;;N;;;;;
+A473;YI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A474;YI SYLLABLE YIP;Lo;0;L;;;;;N;;;;;
+A475;YI SYLLABLE YIET;Lo;0;L;;;;;N;;;;;
+A476;YI SYLLABLE YIEX;Lo;0;L;;;;;N;;;;;
+A477;YI SYLLABLE YIE;Lo;0;L;;;;;N;;;;;
+A478;YI SYLLABLE YIEP;Lo;0;L;;;;;N;;;;;
+A479;YI SYLLABLE YUOT;Lo;0;L;;;;;N;;;;;
+A47A;YI SYLLABLE YUOX;Lo;0;L;;;;;N;;;;;
+A47B;YI SYLLABLE YUO;Lo;0;L;;;;;N;;;;;
+A47C;YI SYLLABLE YUOP;Lo;0;L;;;;;N;;;;;
+A47D;YI SYLLABLE YOT;Lo;0;L;;;;;N;;;;;
+A47E;YI SYLLABLE YOX;Lo;0;L;;;;;N;;;;;
+A47F;YI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A480;YI SYLLABLE YOP;Lo;0;L;;;;;N;;;;;
+A481;YI SYLLABLE YUT;Lo;0;L;;;;;N;;;;;
+A482;YI SYLLABLE YUX;Lo;0;L;;;;;N;;;;;
+A483;YI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A484;YI SYLLABLE YUP;Lo;0;L;;;;;N;;;;;
+A485;YI SYLLABLE YURX;Lo;0;L;;;;;N;;;;;
+A486;YI SYLLABLE YUR;Lo;0;L;;;;;N;;;;;
+A487;YI SYLLABLE YYT;Lo;0;L;;;;;N;;;;;
+A488;YI SYLLABLE YYX;Lo;0;L;;;;;N;;;;;
+A489;YI SYLLABLE YY;Lo;0;L;;;;;N;;;;;
+A48A;YI SYLLABLE YYP;Lo;0;L;;;;;N;;;;;
+A48B;YI SYLLABLE YYRX;Lo;0;L;;;;;N;;;;;
+A48C;YI SYLLABLE YYR;Lo;0;L;;;;;N;;;;;
+A490;YI RADICAL QOT;So;0;ON;;;;;N;;;;;
+A491;YI RADICAL LI;So;0;ON;;;;;N;;;;;
+A492;YI RADICAL KIT;So;0;ON;;;;;N;;;;;
+A493;YI RADICAL NYIP;So;0;ON;;;;;N;;;;;
+A494;YI RADICAL CYP;So;0;ON;;;;;N;;;;;
+A495;YI RADICAL SSI;So;0;ON;;;;;N;;;;;
+A496;YI RADICAL GGOP;So;0;ON;;;;;N;;;;;
+A497;YI RADICAL GEP;So;0;ON;;;;;N;;;;;
+A498;YI RADICAL MI;So;0;ON;;;;;N;;;;;
+A499;YI RADICAL HXIT;So;0;ON;;;;;N;;;;;
+A49A;YI RADICAL LYR;So;0;ON;;;;;N;;;;;
+A49B;YI RADICAL BBUT;So;0;ON;;;;;N;;;;;
+A49C;YI RADICAL MOP;So;0;ON;;;;;N;;;;;
+A49D;YI RADICAL YO;So;0;ON;;;;;N;;;;;
+A49E;YI RADICAL PUT;So;0;ON;;;;;N;;;;;
+A49F;YI RADICAL HXUO;So;0;ON;;;;;N;;;;;
+A4A0;YI RADICAL TAT;So;0;ON;;;;;N;;;;;
+A4A1;YI RADICAL GA;So;0;ON;;;;;N;;;;;
+A4A2;YI RADICAL ZUP;So;0;ON;;;;;N;;;;;
+A4A3;YI RADICAL CYT;So;0;ON;;;;;N;;;;;
+A4A4;YI RADICAL DDUR;So;0;ON;;;;;N;;;;;
+A4A5;YI RADICAL BUR;So;0;ON;;;;;N;;;;;
+A4A6;YI RADICAL GGUO;So;0;ON;;;;;N;;;;;
+A4A7;YI RADICAL NYOP;So;0;ON;;;;;N;;;;;
+A4A8;YI RADICAL TU;So;0;ON;;;;;N;;;;;
+A4A9;YI RADICAL OP;So;0;ON;;;;;N;;;;;
+A4AA;YI RADICAL JJUT;So;0;ON;;;;;N;;;;;
+A4AB;YI RADICAL ZOT;So;0;ON;;;;;N;;;;;
+A4AC;YI RADICAL PYT;So;0;ON;;;;;N;;;;;
+A4AD;YI RADICAL HMO;So;0;ON;;;;;N;;;;;
+A4AE;YI RADICAL YIT;So;0;ON;;;;;N;;;;;
+A4AF;YI RADICAL VUR;So;0;ON;;;;;N;;;;;
+A4B0;YI RADICAL SHY;So;0;ON;;;;;N;;;;;
+A4B1;YI RADICAL VEP;So;0;ON;;;;;N;;;;;
+A4B2;YI RADICAL ZA;So;0;ON;;;;;N;;;;;
+A4B3;YI RADICAL JO;So;0;ON;;;;;N;;;;;
+A4B4;YI RADICAL NZUP;So;0;ON;;;;;N;;;;;
+A4B5;YI RADICAL JJY;So;0;ON;;;;;N;;;;;
+A4B6;YI RADICAL GOT;So;0;ON;;;;;N;;;;;
+A4B7;YI RADICAL JJIE;So;0;ON;;;;;N;;;;;
+A4B8;YI RADICAL WO;So;0;ON;;;;;N;;;;;
+A4B9;YI RADICAL DU;So;0;ON;;;;;N;;;;;
+A4BA;YI RADICAL SHUR;So;0;ON;;;;;N;;;;;
+A4BB;YI RADICAL LIE;So;0;ON;;;;;N;;;;;
+A4BC;YI RADICAL CY;So;0;ON;;;;;N;;;;;
+A4BD;YI RADICAL CUOP;So;0;ON;;;;;N;;;;;
+A4BE;YI RADICAL CIP;So;0;ON;;;;;N;;;;;
+A4BF;YI RADICAL HXOP;So;0;ON;;;;;N;;;;;
+A4C0;YI RADICAL SHAT;So;0;ON;;;;;N;;;;;
+A4C1;YI RADICAL ZUR;So;0;ON;;;;;N;;;;;
+A4C2;YI RADICAL SHOP;So;0;ON;;;;;N;;;;;
+A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;;
+A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;;
+A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;;
+A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;;
+A4D0;LISU LETTER BA;Lo;0;L;;;;;N;;;;;
+A4D1;LISU LETTER PA;Lo;0;L;;;;;N;;;;;
+A4D2;LISU LETTER PHA;Lo;0;L;;;;;N;;;;;
+A4D3;LISU LETTER DA;Lo;0;L;;;;;N;;;;;
+A4D4;LISU LETTER TA;Lo;0;L;;;;;N;;;;;
+A4D5;LISU LETTER THA;Lo;0;L;;;;;N;;;;;
+A4D6;LISU LETTER GA;Lo;0;L;;;;;N;;;;;
+A4D7;LISU LETTER KA;Lo;0;L;;;;;N;;;;;
+A4D8;LISU LETTER KHA;Lo;0;L;;;;;N;;;;;
+A4D9;LISU LETTER JA;Lo;0;L;;;;;N;;;;;
+A4DA;LISU LETTER CA;Lo;0;L;;;;;N;;;;;
+A4DB;LISU LETTER CHA;Lo;0;L;;;;;N;;;;;
+A4DC;LISU LETTER DZA;Lo;0;L;;;;;N;;;;;
+A4DD;LISU LETTER TSA;Lo;0;L;;;;;N;;;;;
+A4DE;LISU LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A4DF;LISU LETTER MA;Lo;0;L;;;;;N;;;;;
+A4E0;LISU LETTER NA;Lo;0;L;;;;;N;;;;;
+A4E1;LISU LETTER LA;Lo;0;L;;;;;N;;;;;
+A4E2;LISU LETTER SA;Lo;0;L;;;;;N;;;;;
+A4E3;LISU LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A4E4;LISU LETTER ZA;Lo;0;L;;;;;N;;;;;
+A4E5;LISU LETTER NGA;Lo;0;L;;;;;N;;;;;
+A4E6;LISU LETTER HA;Lo;0;L;;;;;N;;;;;
+A4E7;LISU LETTER XA;Lo;0;L;;;;;N;;;;;
+A4E8;LISU LETTER HHA;Lo;0;L;;;;;N;;;;;
+A4E9;LISU LETTER FA;Lo;0;L;;;;;N;;;;;
+A4EA;LISU LETTER WA;Lo;0;L;;;;;N;;;;;
+A4EB;LISU LETTER SHA;Lo;0;L;;;;;N;;;;;
+A4EC;LISU LETTER YA;Lo;0;L;;;;;N;;;;;
+A4ED;LISU LETTER GHA;Lo;0;L;;;;;N;;;;;
+A4EE;LISU LETTER A;Lo;0;L;;;;;N;;;;;
+A4EF;LISU LETTER AE;Lo;0;L;;;;;N;;;;;
+A4F0;LISU LETTER E;Lo;0;L;;;;;N;;;;;
+A4F1;LISU LETTER EU;Lo;0;L;;;;;N;;;;;
+A4F2;LISU LETTER I;Lo;0;L;;;;;N;;;;;
+A4F3;LISU LETTER O;Lo;0;L;;;;;N;;;;;
+A4F4;LISU LETTER U;Lo;0;L;;;;;N;;;;;
+A4F5;LISU LETTER UE;Lo;0;L;;;;;N;;;;;
+A4F6;LISU LETTER UH;Lo;0;L;;;;;N;;;;;
+A4F7;LISU LETTER OE;Lo;0;L;;;;;N;;;;;
+A4F8;LISU LETTER TONE MYA TI;Lm;0;L;;;;;N;;;;;
+A4F9;LISU LETTER TONE NA PO;Lm;0;L;;;;;N;;;;;
+A4FA;LISU LETTER TONE MYA CYA;Lm;0;L;;;;;N;;;;;
+A4FB;LISU LETTER TONE MYA BO;Lm;0;L;;;;;N;;;;;
+A4FC;LISU LETTER TONE MYA NA;Lm;0;L;;;;;N;;;;;
+A4FD;LISU LETTER TONE MYA JEU;Lm;0;L;;;;;N;;;;;
+A4FE;LISU PUNCTUATION COMMA;Po;0;L;;;;;N;;;;;
+A4FF;LISU PUNCTUATION FULL STOP;Po;0;L;;;;;N;;;;;
+A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;;
+A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;;
+A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+A503;VAI SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+A504;VAI SYLLABLE WEEN;Lo;0;L;;;;;N;;;;;
+A505;VAI SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+A506;VAI SYLLABLE BHEE;Lo;0;L;;;;;N;;;;;
+A507;VAI SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+A508;VAI SYLLABLE MBEE;Lo;0;L;;;;;N;;;;;
+A509;VAI SYLLABLE KPEE;Lo;0;L;;;;;N;;;;;
+A50A;VAI SYLLABLE MGBEE;Lo;0;L;;;;;N;;;;;
+A50B;VAI SYLLABLE GBEE;Lo;0;L;;;;;N;;;;;
+A50C;VAI SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+A50D;VAI SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+A50E;VAI SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+A50F;VAI SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+A510;VAI SYLLABLE DHEE;Lo;0;L;;;;;N;;;;;
+A511;VAI SYLLABLE DHHEE;Lo;0;L;;;;;N;;;;;
+A512;VAI SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+A513;VAI SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+A514;VAI SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+A515;VAI SYLLABLE NDEE;Lo;0;L;;;;;N;;;;;
+A516;VAI SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+A517;VAI SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+A518;VAI SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+A519;VAI SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+A51A;VAI SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+A51B;VAI SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+A51C;VAI SYLLABLE NJEE;Lo;0;L;;;;;N;;;;;
+A51D;VAI SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+A51E;VAI SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+A51F;VAI SYLLABLE NGGEE;Lo;0;L;;;;;N;;;;;
+A520;VAI SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+A521;VAI SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+A522;VAI SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+A523;VAI SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+A524;VAI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A525;VAI SYLLABLE IN;Lo;0;L;;;;;N;;;;;
+A526;VAI SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+A527;VAI SYLLABLE HIN;Lo;0;L;;;;;N;;;;;
+A528;VAI SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+A529;VAI SYLLABLE WIN;Lo;0;L;;;;;N;;;;;
+A52A;VAI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A52B;VAI SYLLABLE BHI;Lo;0;L;;;;;N;;;;;
+A52C;VAI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A52D;VAI SYLLABLE MBI;Lo;0;L;;;;;N;;;;;
+A52E;VAI SYLLABLE KPI;Lo;0;L;;;;;N;;;;;
+A52F;VAI SYLLABLE MGBI;Lo;0;L;;;;;N;;;;;
+A530;VAI SYLLABLE GBI;Lo;0;L;;;;;N;;;;;
+A531;VAI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A532;VAI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A533;VAI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A534;VAI SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+A535;VAI SYLLABLE DHI;Lo;0;L;;;;;N;;;;;
+A536;VAI SYLLABLE DHHI;Lo;0;L;;;;;N;;;;;
+A537;VAI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A538;VAI SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+A539;VAI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A53A;VAI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A53B;VAI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A53C;VAI SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+A53D;VAI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A53E;VAI SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+A53F;VAI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A540;VAI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A541;VAI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A542;VAI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A543;VAI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A544;VAI SYLLABLE NGGI;Lo;0;L;;;;;N;;;;;
+A545;VAI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A546;VAI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A547;VAI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A548;VAI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A549;VAI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A54A;VAI SYLLABLE AN;Lo;0;L;;;;;N;;;;;
+A54B;VAI SYLLABLE NGAN;Lo;0;L;;;;;N;;;;;
+A54C;VAI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A54D;VAI SYLLABLE HAN;Lo;0;L;;;;;N;;;;;
+A54E;VAI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A54F;VAI SYLLABLE WAN;Lo;0;L;;;;;N;;;;;
+A550;VAI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A551;VAI SYLLABLE BHA;Lo;0;L;;;;;N;;;;;
+A552;VAI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A553;VAI SYLLABLE MBA;Lo;0;L;;;;;N;;;;;
+A554;VAI SYLLABLE KPA;Lo;0;L;;;;;N;;;;;
+A555;VAI SYLLABLE KPAN;Lo;0;L;;;;;N;;;;;
+A556;VAI SYLLABLE MGBA;Lo;0;L;;;;;N;;;;;
+A557;VAI SYLLABLE GBA;Lo;0;L;;;;;N;;;;;
+A558;VAI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A559;VAI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A55A;VAI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A55B;VAI SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+A55C;VAI SYLLABLE DHA;Lo;0;L;;;;;N;;;;;
+A55D;VAI SYLLABLE DHHA;Lo;0;L;;;;;N;;;;;
+A55E;VAI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A55F;VAI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A560;VAI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A561;VAI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A562;VAI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A563;VAI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A564;VAI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A565;VAI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A566;VAI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A567;VAI SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+A568;VAI SYLLABLE NJA;Lo;0;L;;;;;N;;;;;
+A569;VAI SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+A56A;VAI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A56B;VAI SYLLABLE KAN;Lo;0;L;;;;;N;;;;;
+A56C;VAI SYLLABLE NGGA;Lo;0;L;;;;;N;;;;;
+A56D;VAI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A56E;VAI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A56F;VAI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A570;VAI SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+A571;VAI SYLLABLE OO;Lo;0;L;;;;;N;;;;;
+A572;VAI SYLLABLE OON;Lo;0;L;;;;;N;;;;;
+A573;VAI SYLLABLE HOO;Lo;0;L;;;;;N;;;;;
+A574;VAI SYLLABLE WOO;Lo;0;L;;;;;N;;;;;
+A575;VAI SYLLABLE WOON;Lo;0;L;;;;;N;;;;;
+A576;VAI SYLLABLE POO;Lo;0;L;;;;;N;;;;;
+A577;VAI SYLLABLE BHOO;Lo;0;L;;;;;N;;;;;
+A578;VAI SYLLABLE BOO;Lo;0;L;;;;;N;;;;;
+A579;VAI SYLLABLE MBOO;Lo;0;L;;;;;N;;;;;
+A57A;VAI SYLLABLE KPOO;Lo;0;L;;;;;N;;;;;
+A57B;VAI SYLLABLE MGBOO;Lo;0;L;;;;;N;;;;;
+A57C;VAI SYLLABLE GBOO;Lo;0;L;;;;;N;;;;;
+A57D;VAI SYLLABLE FOO;Lo;0;L;;;;;N;;;;;
+A57E;VAI SYLLABLE VOO;Lo;0;L;;;;;N;;;;;
+A57F;VAI SYLLABLE TOO;Lo;0;L;;;;;N;;;;;
+A580;VAI SYLLABLE THOO;Lo;0;L;;;;;N;;;;;
+A581;VAI SYLLABLE DHOO;Lo;0;L;;;;;N;;;;;
+A582;VAI SYLLABLE DHHOO;Lo;0;L;;;;;N;;;;;
+A583;VAI SYLLABLE LOO;Lo;0;L;;;;;N;;;;;
+A584;VAI SYLLABLE ROO;Lo;0;L;;;;;N;;;;;
+A585;VAI SYLLABLE DOO;Lo;0;L;;;;;N;;;;;
+A586;VAI SYLLABLE NDOO;Lo;0;L;;;;;N;;;;;
+A587;VAI SYLLABLE SOO;Lo;0;L;;;;;N;;;;;
+A588;VAI SYLLABLE SHOO;Lo;0;L;;;;;N;;;;;
+A589;VAI SYLLABLE ZOO;Lo;0;L;;;;;N;;;;;
+A58A;VAI SYLLABLE ZHOO;Lo;0;L;;;;;N;;;;;
+A58B;VAI SYLLABLE COO;Lo;0;L;;;;;N;;;;;
+A58C;VAI SYLLABLE JOO;Lo;0;L;;;;;N;;;;;
+A58D;VAI SYLLABLE NJOO;Lo;0;L;;;;;N;;;;;
+A58E;VAI SYLLABLE YOO;Lo;0;L;;;;;N;;;;;
+A58F;VAI SYLLABLE KOO;Lo;0;L;;;;;N;;;;;
+A590;VAI SYLLABLE NGGOO;Lo;0;L;;;;;N;;;;;
+A591;VAI SYLLABLE GOO;Lo;0;L;;;;;N;;;;;
+A592;VAI SYLLABLE MOO;Lo;0;L;;;;;N;;;;;
+A593;VAI SYLLABLE NOO;Lo;0;L;;;;;N;;;;;
+A594;VAI SYLLABLE NYOO;Lo;0;L;;;;;N;;;;;
+A595;VAI SYLLABLE U;Lo;0;L;;;;;N;;;;;
+A596;VAI SYLLABLE UN;Lo;0;L;;;;;N;;;;;
+A597;VAI SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+A598;VAI SYLLABLE HUN;Lo;0;L;;;;;N;;;;;
+A599;VAI SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+A59A;VAI SYLLABLE WUN;Lo;0;L;;;;;N;;;;;
+A59B;VAI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A59C;VAI SYLLABLE BHU;Lo;0;L;;;;;N;;;;;
+A59D;VAI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A59E;VAI SYLLABLE MBU;Lo;0;L;;;;;N;;;;;
+A59F;VAI SYLLABLE KPU;Lo;0;L;;;;;N;;;;;
+A5A0;VAI SYLLABLE MGBU;Lo;0;L;;;;;N;;;;;
+A5A1;VAI SYLLABLE GBU;Lo;0;L;;;;;N;;;;;
+A5A2;VAI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A5A3;VAI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A5A4;VAI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A5A5;VAI SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+A5A6;VAI SYLLABLE DHU;Lo;0;L;;;;;N;;;;;
+A5A7;VAI SYLLABLE DHHU;Lo;0;L;;;;;N;;;;;
+A5A8;VAI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A5A9;VAI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A5AA;VAI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A5AB;VAI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A5AC;VAI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A5AD;VAI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A5AE;VAI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A5AF;VAI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A5B0;VAI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A5B1;VAI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A5B2;VAI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A5B3;VAI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A5B4;VAI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A5B5;VAI SYLLABLE NGGU;Lo;0;L;;;;;N;;;;;
+A5B6;VAI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A5B7;VAI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A5B8;VAI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A5B9;VAI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A5BA;VAI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A5BB;VAI SYLLABLE ON;Lo;0;L;;;;;N;;;;;
+A5BC;VAI SYLLABLE NGON;Lo;0;L;;;;;N;;;;;
+A5BD;VAI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A5BE;VAI SYLLABLE HON;Lo;0;L;;;;;N;;;;;
+A5BF;VAI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A5C0;VAI SYLLABLE WON;Lo;0;L;;;;;N;;;;;
+A5C1;VAI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A5C2;VAI SYLLABLE BHO;Lo;0;L;;;;;N;;;;;
+A5C3;VAI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A5C4;VAI SYLLABLE MBO;Lo;0;L;;;;;N;;;;;
+A5C5;VAI SYLLABLE KPO;Lo;0;L;;;;;N;;;;;
+A5C6;VAI SYLLABLE MGBO;Lo;0;L;;;;;N;;;;;
+A5C7;VAI SYLLABLE GBO;Lo;0;L;;;;;N;;;;;
+A5C8;VAI SYLLABLE GBON;Lo;0;L;;;;;N;;;;;
+A5C9;VAI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A5CA;VAI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A5CB;VAI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A5CC;VAI SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+A5CD;VAI SYLLABLE DHO;Lo;0;L;;;;;N;;;;;
+A5CE;VAI SYLLABLE DHHO;Lo;0;L;;;;;N;;;;;
+A5CF;VAI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A5D0;VAI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A5D1;VAI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A5D2;VAI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A5D3;VAI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A5D4;VAI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A5D5;VAI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A5D6;VAI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A5D7;VAI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A5D8;VAI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A5D9;VAI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A5DA;VAI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A5DB;VAI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A5DC;VAI SYLLABLE NGGO;Lo;0;L;;;;;N;;;;;
+A5DD;VAI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A5DE;VAI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A5DF;VAI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A5E0;VAI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A5E1;VAI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A5E2;VAI SYLLABLE EN;Lo;0;L;;;;;N;;;;;
+A5E3;VAI SYLLABLE NGEN;Lo;0;L;;;;;N;;;;;
+A5E4;VAI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A5E5;VAI SYLLABLE HEN;Lo;0;L;;;;;N;;;;;
+A5E6;VAI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A5E7;VAI SYLLABLE WEN;Lo;0;L;;;;;N;;;;;
+A5E8;VAI SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+A5E9;VAI SYLLABLE BHE;Lo;0;L;;;;;N;;;;;
+A5EA;VAI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A5EB;VAI SYLLABLE MBE;Lo;0;L;;;;;N;;;;;
+A5EC;VAI SYLLABLE KPE;Lo;0;L;;;;;N;;;;;
+A5ED;VAI SYLLABLE KPEN;Lo;0;L;;;;;N;;;;;
+A5EE;VAI SYLLABLE MGBE;Lo;0;L;;;;;N;;;;;
+A5EF;VAI SYLLABLE GBE;Lo;0;L;;;;;N;;;;;
+A5F0;VAI SYLLABLE GBEN;Lo;0;L;;;;;N;;;;;
+A5F1;VAI SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+A5F2;VAI SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+A5F3;VAI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A5F4;VAI SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+A5F5;VAI SYLLABLE DHE;Lo;0;L;;;;;N;;;;;
+A5F6;VAI SYLLABLE DHHE;Lo;0;L;;;;;N;;;;;
+A5F7;VAI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A5F8;VAI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A5F9;VAI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A5FA;VAI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A5FB;VAI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A5FC;VAI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A5FD;VAI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A5FE;VAI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A5FF;VAI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A600;VAI SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+A601;VAI SYLLABLE NJE;Lo;0;L;;;;;N;;;;;
+A602;VAI SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+A603;VAI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A604;VAI SYLLABLE NGGE;Lo;0;L;;;;;N;;;;;
+A605;VAI SYLLABLE NGGEN;Lo;0;L;;;;;N;;;;;
+A606;VAI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A607;VAI SYLLABLE GEN;Lo;0;L;;;;;N;;;;;
+A608;VAI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A609;VAI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A60A;VAI SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+A60B;VAI SYLLABLE NG;Lo;0;L;;;;;N;;;;;
+A60C;VAI SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;;
+A60D;VAI COMMA;Po;0;ON;;;;;N;;;;;
+A60E;VAI FULL STOP;Po;0;ON;;;;;N;;;;;
+A60F;VAI QUESTION MARK;Po;0;ON;;;;;N;;;;;
+A610;VAI SYLLABLE NDOLE FA;Lo;0;L;;;;;N;;;;;
+A611;VAI SYLLABLE NDOLE KA;Lo;0;L;;;;;N;;;;;
+A612;VAI SYLLABLE NDOLE SOO;Lo;0;L;;;;;N;;;;;
+A613;VAI SYMBOL FEENG;Lo;0;L;;;;;N;;;;;
+A614;VAI SYMBOL KEENG;Lo;0;L;;;;;N;;;;;
+A615;VAI SYMBOL TING;Lo;0;L;;;;;N;;;;;
+A616;VAI SYMBOL NII;Lo;0;L;;;;;N;;;;;
+A617;VAI SYMBOL BANG;Lo;0;L;;;;;N;;;;;
+A618;VAI SYMBOL FAA;Lo;0;L;;;;;N;;;;;
+A619;VAI SYMBOL TAA;Lo;0;L;;;;;N;;;;;
+A61A;VAI SYMBOL DANG;Lo;0;L;;;;;N;;;;;
+A61B;VAI SYMBOL DOONG;Lo;0;L;;;;;N;;;;;
+A61C;VAI SYMBOL KUNG;Lo;0;L;;;;;N;;;;;
+A61D;VAI SYMBOL TONG;Lo;0;L;;;;;N;;;;;
+A61E;VAI SYMBOL DO-O;Lo;0;L;;;;;N;;;;;
+A61F;VAI SYMBOL JONG;Lo;0;L;;;;;N;;;;;
+A620;VAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A621;VAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A622;VAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A623;VAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A624;VAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A625;VAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A626;VAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A627;VAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A628;VAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A629;VAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A62A;VAI SYLLABLE NDOLE MA;Lo;0;L;;;;;N;;;;;
+A62B;VAI SYLLABLE NDOLE DO;Lo;0;L;;;;;N;;;;;
+A640;CYRILLIC CAPITAL LETTER ZEMLYA;Lu;0;L;;;;;N;;;;A641;
+A641;CYRILLIC SMALL LETTER ZEMLYA;Ll;0;L;;;;;N;;;A640;;A640
+A642;CYRILLIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;A643;
+A643;CYRILLIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;A642;;A642
+A644;CYRILLIC CAPITAL LETTER REVERSED DZE;Lu;0;L;;;;;N;;;;A645;
+A645;CYRILLIC SMALL LETTER REVERSED DZE;Ll;0;L;;;;;N;;;A644;;A644
+A646;CYRILLIC CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;A647;
+A647;CYRILLIC SMALL LETTER IOTA;Ll;0;L;;;;;N;;;A646;;A646
+A648;CYRILLIC CAPITAL LETTER DJERV;Lu;0;L;;;;;N;;;;A649;
+A649;CYRILLIC SMALL LETTER DJERV;Ll;0;L;;;;;N;;;A648;;A648
+A64A;CYRILLIC CAPITAL LETTER MONOGRAPH UK;Lu;0;L;;;;;N;;;;A64B;
+A64B;CYRILLIC SMALL LETTER MONOGRAPH UK;Ll;0;L;;;;;N;;;A64A;;A64A
+A64C;CYRILLIC CAPITAL LETTER BROAD OMEGA;Lu;0;L;;;;;N;;;;A64D;
+A64D;CYRILLIC SMALL LETTER BROAD OMEGA;Ll;0;L;;;;;N;;;A64C;;A64C
+A64E;CYRILLIC CAPITAL LETTER NEUTRAL YER;Lu;0;L;;;;;N;;;;A64F;
+A64F;CYRILLIC SMALL LETTER NEUTRAL YER;Ll;0;L;;;;;N;;;A64E;;A64E
+A650;CYRILLIC CAPITAL LETTER YERU WITH BACK YER;Lu;0;L;;;;;N;;;;A651;
+A651;CYRILLIC SMALL LETTER YERU WITH BACK YER;Ll;0;L;;;;;N;;;A650;;A650
+A652;CYRILLIC CAPITAL LETTER IOTIFIED YAT;Lu;0;L;;;;;N;;;;A653;
+A653;CYRILLIC SMALL LETTER IOTIFIED YAT;Ll;0;L;;;;;N;;;A652;;A652
+A654;CYRILLIC CAPITAL LETTER REVERSED YU;Lu;0;L;;;;;N;;;;A655;
+A655;CYRILLIC SMALL LETTER REVERSED YU;Ll;0;L;;;;;N;;;A654;;A654
+A656;CYRILLIC CAPITAL LETTER IOTIFIED A;Lu;0;L;;;;;N;;;;A657;
+A657;CYRILLIC SMALL LETTER IOTIFIED A;Ll;0;L;;;;;N;;;A656;;A656
+A658;CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A659;
+A659;CYRILLIC SMALL LETTER CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A658;;A658
+A65A;CYRILLIC CAPITAL LETTER BLENDED YUS;Lu;0;L;;;;;N;;;;A65B;
+A65B;CYRILLIC SMALL LETTER BLENDED YUS;Ll;0;L;;;;;N;;;A65A;;A65A
+A65C;CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A65D;
+A65D;CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A65C;;A65C
+A65E;CYRILLIC CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;A65F;
+A65F;CYRILLIC SMALL LETTER YN;Ll;0;L;;;;;N;;;A65E;;A65E
+A660;CYRILLIC CAPITAL LETTER REVERSED TSE;Lu;0;L;;;;;N;;;;A661;
+A661;CYRILLIC SMALL LETTER REVERSED TSE;Ll;0;L;;;;;N;;;A660;;A660
+A662;CYRILLIC CAPITAL LETTER SOFT DE;Lu;0;L;;;;;N;;;;A663;
+A663;CYRILLIC SMALL LETTER SOFT DE;Ll;0;L;;;;;N;;;A662;;A662
+A664;CYRILLIC CAPITAL LETTER SOFT EL;Lu;0;L;;;;;N;;;;A665;
+A665;CYRILLIC SMALL LETTER SOFT EL;Ll;0;L;;;;;N;;;A664;;A664
+A666;CYRILLIC CAPITAL LETTER SOFT EM;Lu;0;L;;;;;N;;;;A667;
+A667;CYRILLIC SMALL LETTER SOFT EM;Ll;0;L;;;;;N;;;A666;;A666
+A668;CYRILLIC CAPITAL LETTER MONOCULAR O;Lu;0;L;;;;;N;;;;A669;
+A669;CYRILLIC SMALL LETTER MONOCULAR O;Ll;0;L;;;;;N;;;A668;;A668
+A66A;CYRILLIC CAPITAL LETTER BINOCULAR O;Lu;0;L;;;;;N;;;;A66B;
+A66B;CYRILLIC SMALL LETTER BINOCULAR O;Ll;0;L;;;;;N;;;A66A;;A66A
+A66C;CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O;Lu;0;L;;;;;N;;;;A66D;
+A66D;CYRILLIC SMALL LETTER DOUBLE MONOCULAR O;Ll;0;L;;;;;N;;;A66C;;A66C
+A66E;CYRILLIC LETTER MULTIOCULAR O;Lo;0;L;;;;;N;;;;;
+A66F;COMBINING CYRILLIC VZMET;Mn;230;NSM;;;;;N;;;;;
+A670;COMBINING CYRILLIC TEN MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A671;COMBINING CYRILLIC HUNDRED MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A672;COMBINING CYRILLIC THOUSAND MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A673;SLAVONIC ASTERISK;Po;0;ON;;;;;N;;;;;
+A674;COMBINING CYRILLIC LETTER UKRAINIAN IE;Mn;230;NSM;;;;;N;;;;;
+A675;COMBINING CYRILLIC LETTER I;Mn;230;NSM;;;;;N;;;;;
+A676;COMBINING CYRILLIC LETTER YI;Mn;230;NSM;;;;;N;;;;;
+A677;COMBINING CYRILLIC LETTER U;Mn;230;NSM;;;;;N;;;;;
+A678;COMBINING CYRILLIC LETTER HARD SIGN;Mn;230;NSM;;;;;N;;;;;
+A679;COMBINING CYRILLIC LETTER YERU;Mn;230;NSM;;;;;N;;;;;
+A67A;COMBINING CYRILLIC LETTER SOFT SIGN;Mn;230;NSM;;;;;N;;;;;
+A67B;COMBINING CYRILLIC LETTER OMEGA;Mn;230;NSM;;;;;N;;;;;
+A67C;COMBINING CYRILLIC KAVYKA;Mn;230;NSM;;;;;N;;;;;
+A67D;COMBINING CYRILLIC PAYEROK;Mn;230;NSM;;;;;N;;;;;
+A67E;CYRILLIC KAVYKA;Po;0;ON;;;;;N;;;;;
+A67F;CYRILLIC PAYEROK;Lm;0;ON;;;;;N;;;;;
+A680;CYRILLIC CAPITAL LETTER DWE;Lu;0;L;;;;;N;;;;A681;
+A681;CYRILLIC SMALL LETTER DWE;Ll;0;L;;;;;N;;;A680;;A680
+A682;CYRILLIC CAPITAL LETTER DZWE;Lu;0;L;;;;;N;;;;A683;
+A683;CYRILLIC SMALL LETTER DZWE;Ll;0;L;;;;;N;;;A682;;A682
+A684;CYRILLIC CAPITAL LETTER ZHWE;Lu;0;L;;;;;N;;;;A685;
+A685;CYRILLIC SMALL LETTER ZHWE;Ll;0;L;;;;;N;;;A684;;A684
+A686;CYRILLIC CAPITAL LETTER CCHE;Lu;0;L;;;;;N;;;;A687;
+A687;CYRILLIC SMALL LETTER CCHE;Ll;0;L;;;;;N;;;A686;;A686
+A688;CYRILLIC CAPITAL LETTER DZZE;Lu;0;L;;;;;N;;;;A689;
+A689;CYRILLIC SMALL LETTER DZZE;Ll;0;L;;;;;N;;;A688;;A688
+A68A;CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;A68B;
+A68B;CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;A68A;;A68A
+A68C;CYRILLIC CAPITAL LETTER TWE;Lu;0;L;;;;;N;;;;A68D;
+A68D;CYRILLIC SMALL LETTER TWE;Ll;0;L;;;;;N;;;A68C;;A68C
+A68E;CYRILLIC CAPITAL LETTER TSWE;Lu;0;L;;;;;N;;;;A68F;
+A68F;CYRILLIC SMALL LETTER TSWE;Ll;0;L;;;;;N;;;A68E;;A68E
+A690;CYRILLIC CAPITAL LETTER TSSE;Lu;0;L;;;;;N;;;;A691;
+A691;CYRILLIC SMALL LETTER TSSE;Ll;0;L;;;;;N;;;A690;;A690
+A692;CYRILLIC CAPITAL LETTER TCHE;Lu;0;L;;;;;N;;;;A693;
+A693;CYRILLIC SMALL LETTER TCHE;Ll;0;L;;;;;N;;;A692;;A692
+A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695;
+A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694
+A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697;
+A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696
+A698;CYRILLIC CAPITAL LETTER DOUBLE O;Lu;0;L;;;;;N;;;;A699;
+A699;CYRILLIC SMALL LETTER DOUBLE O;Ll;0;L;;;;;N;;;A698;;A698
+A69A;CYRILLIC CAPITAL LETTER CROSSED O;Lu;0;L;;;;;N;;;;A69B;
+A69B;CYRILLIC SMALL LETTER CROSSED O;Ll;0;L;;;;;N;;;A69A;;A69A
+A69C;MODIFIER LETTER CYRILLIC HARD SIGN;Lm;0;L;<super> 044A;;;;N;;;;;
+A69D;MODIFIER LETTER CYRILLIC SOFT SIGN;Lm;0;L;<super> 044C;;;;N;;;;;
+A69E;COMBINING CYRILLIC LETTER EF;Mn;230;NSM;;;;;N;;;;;
+A69F;COMBINING CYRILLIC LETTER IOTIFIED E;Mn;230;NSM;;;;;N;;;;;
+A6A0;BAMUM LETTER A;Lo;0;L;;;;;N;;;;;
+A6A1;BAMUM LETTER KA;Lo;0;L;;;;;N;;;;;
+A6A2;BAMUM LETTER U;Lo;0;L;;;;;N;;;;;
+A6A3;BAMUM LETTER KU;Lo;0;L;;;;;N;;;;;
+A6A4;BAMUM LETTER EE;Lo;0;L;;;;;N;;;;;
+A6A5;BAMUM LETTER REE;Lo;0;L;;;;;N;;;;;
+A6A6;BAMUM LETTER TAE;Lo;0;L;;;;;N;;;;;
+A6A7;BAMUM LETTER O;Lo;0;L;;;;;N;;;;;
+A6A8;BAMUM LETTER NYI;Lo;0;L;;;;;N;;;;;
+A6A9;BAMUM LETTER I;Lo;0;L;;;;;N;;;;;
+A6AA;BAMUM LETTER LA;Lo;0;L;;;;;N;;;;;
+A6AB;BAMUM LETTER PA;Lo;0;L;;;;;N;;;;;
+A6AC;BAMUM LETTER RII;Lo;0;L;;;;;N;;;;;
+A6AD;BAMUM LETTER RIEE;Lo;0;L;;;;;N;;;;;
+A6AE;BAMUM LETTER LEEEE;Lo;0;L;;;;;N;;;;;
+A6AF;BAMUM LETTER MEEEE;Lo;0;L;;;;;N;;;;;
+A6B0;BAMUM LETTER TAA;Lo;0;L;;;;;N;;;;;
+A6B1;BAMUM LETTER NDAA;Lo;0;L;;;;;N;;;;;
+A6B2;BAMUM LETTER NJAEM;Lo;0;L;;;;;N;;;;;
+A6B3;BAMUM LETTER M;Lo;0;L;;;;;N;;;;;
+A6B4;BAMUM LETTER SUU;Lo;0;L;;;;;N;;;;;
+A6B5;BAMUM LETTER MU;Lo;0;L;;;;;N;;;;;
+A6B6;BAMUM LETTER SHII;Lo;0;L;;;;;N;;;;;
+A6B7;BAMUM LETTER SI;Lo;0;L;;;;;N;;;;;
+A6B8;BAMUM LETTER SHEUX;Lo;0;L;;;;;N;;;;;
+A6B9;BAMUM LETTER SEUX;Lo;0;L;;;;;N;;;;;
+A6BA;BAMUM LETTER KYEE;Lo;0;L;;;;;N;;;;;
+A6BB;BAMUM LETTER KET;Lo;0;L;;;;;N;;;;;
+A6BC;BAMUM LETTER NUAE;Lo;0;L;;;;;N;;;;;
+A6BD;BAMUM LETTER NU;Lo;0;L;;;;;N;;;;;
+A6BE;BAMUM LETTER NJUAE;Lo;0;L;;;;;N;;;;;
+A6BF;BAMUM LETTER YOQ;Lo;0;L;;;;;N;;;;;
+A6C0;BAMUM LETTER SHU;Lo;0;L;;;;;N;;;;;
+A6C1;BAMUM LETTER YUQ;Lo;0;L;;;;;N;;;;;
+A6C2;BAMUM LETTER YA;Lo;0;L;;;;;N;;;;;
+A6C3;BAMUM LETTER NSHA;Lo;0;L;;;;;N;;;;;
+A6C4;BAMUM LETTER KEUX;Lo;0;L;;;;;N;;;;;
+A6C5;BAMUM LETTER PEUX;Lo;0;L;;;;;N;;;;;
+A6C6;BAMUM LETTER NJEE;Lo;0;L;;;;;N;;;;;
+A6C7;BAMUM LETTER NTEE;Lo;0;L;;;;;N;;;;;
+A6C8;BAMUM LETTER PUE;Lo;0;L;;;;;N;;;;;
+A6C9;BAMUM LETTER WUE;Lo;0;L;;;;;N;;;;;
+A6CA;BAMUM LETTER PEE;Lo;0;L;;;;;N;;;;;
+A6CB;BAMUM LETTER FEE;Lo;0;L;;;;;N;;;;;
+A6CC;BAMUM LETTER RU;Lo;0;L;;;;;N;;;;;
+A6CD;BAMUM LETTER LU;Lo;0;L;;;;;N;;;;;
+A6CE;BAMUM LETTER MI;Lo;0;L;;;;;N;;;;;
+A6CF;BAMUM LETTER NI;Lo;0;L;;;;;N;;;;;
+A6D0;BAMUM LETTER REUX;Lo;0;L;;;;;N;;;;;
+A6D1;BAMUM LETTER RAE;Lo;0;L;;;;;N;;;;;
+A6D2;BAMUM LETTER KEN;Lo;0;L;;;;;N;;;;;
+A6D3;BAMUM LETTER NGKWAEN;Lo;0;L;;;;;N;;;;;
+A6D4;BAMUM LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A6D5;BAMUM LETTER NGA;Lo;0;L;;;;;N;;;;;
+A6D6;BAMUM LETTER SHO;Lo;0;L;;;;;N;;;;;
+A6D7;BAMUM LETTER PUAE;Lo;0;L;;;;;N;;;;;
+A6D8;BAMUM LETTER FU;Lo;0;L;;;;;N;;;;;
+A6D9;BAMUM LETTER FOM;Lo;0;L;;;;;N;;;;;
+A6DA;BAMUM LETTER WA;Lo;0;L;;;;;N;;;;;
+A6DB;BAMUM LETTER NA;Lo;0;L;;;;;N;;;;;
+A6DC;BAMUM LETTER LI;Lo;0;L;;;;;N;;;;;
+A6DD;BAMUM LETTER PI;Lo;0;L;;;;;N;;;;;
+A6DE;BAMUM LETTER LOQ;Lo;0;L;;;;;N;;;;;
+A6DF;BAMUM LETTER KO;Lo;0;L;;;;;N;;;;;
+A6E0;BAMUM LETTER MBEN;Lo;0;L;;;;;N;;;;;
+A6E1;BAMUM LETTER REN;Lo;0;L;;;;;N;;;;;
+A6E2;BAMUM LETTER MEN;Lo;0;L;;;;;N;;;;;
+A6E3;BAMUM LETTER MA;Lo;0;L;;;;;N;;;;;
+A6E4;BAMUM LETTER TI;Lo;0;L;;;;;N;;;;;
+A6E5;BAMUM LETTER KI;Lo;0;L;;;;;N;;;;;
+A6E6;BAMUM LETTER MO;Nl;0;L;;;;1;N;;;;;
+A6E7;BAMUM LETTER MBAA;Nl;0;L;;;;2;N;;;;;
+A6E8;BAMUM LETTER TET;Nl;0;L;;;;3;N;;;;;
+A6E9;BAMUM LETTER KPA;Nl;0;L;;;;4;N;;;;;
+A6EA;BAMUM LETTER TEN;Nl;0;L;;;;5;N;;;;;
+A6EB;BAMUM LETTER NTUU;Nl;0;L;;;;6;N;;;;;
+A6EC;BAMUM LETTER SAMBA;Nl;0;L;;;;7;N;;;;;
+A6ED;BAMUM LETTER FAAMAE;Nl;0;L;;;;8;N;;;;;
+A6EE;BAMUM LETTER KOVUU;Nl;0;L;;;;9;N;;;;;
+A6EF;BAMUM LETTER KOGHOM;Nl;0;L;;;;0;N;;;;;
+A6F0;BAMUM COMBINING MARK KOQNDON;Mn;230;NSM;;;;;N;;;;;
+A6F1;BAMUM COMBINING MARK TUKWENTIS;Mn;230;NSM;;;;;N;;;;;
+A6F2;BAMUM NJAEMLI;Po;0;L;;;;;N;;;;;
+A6F3;BAMUM FULL STOP;Po;0;L;;;;;N;;;;;
+A6F4;BAMUM COLON;Po;0;L;;;;;N;;;;;
+A6F5;BAMUM COMMA;Po;0;L;;;;;N;;;;;
+A6F6;BAMUM SEMICOLON;Po;0;L;;;;;N;;;;;
+A6F7;BAMUM QUESTION MARK;Po;0;L;;;;;N;;;;;
+A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;;
+A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;;
+A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;;
+A703;MODIFIER LETTER CHINESE TONE YANG SHANG;Sk;0;ON;;;;;N;;;;;
+A704;MODIFIER LETTER CHINESE TONE YIN QU;Sk;0;ON;;;;;N;;;;;
+A705;MODIFIER LETTER CHINESE TONE YANG QU;Sk;0;ON;;;;;N;;;;;
+A706;MODIFIER LETTER CHINESE TONE YIN RU;Sk;0;ON;;;;;N;;;;;
+A707;MODIFIER LETTER CHINESE TONE YANG RU;Sk;0;ON;;;;;N;;;;;
+A708;MODIFIER LETTER EXTRA-HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A709;MODIFIER LETTER HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70A;MODIFIER LETTER MID DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70B;MODIFIER LETTER LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70C;MODIFIER LETTER EXTRA-LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70D;MODIFIER LETTER EXTRA-HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70E;MODIFIER LETTER HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70F;MODIFIER LETTER MID DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A710;MODIFIER LETTER LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A711;MODIFIER LETTER EXTRA-LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A712;MODIFIER LETTER EXTRA-HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A713;MODIFIER LETTER HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A714;MODIFIER LETTER MID LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A715;MODIFIER LETTER LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A716;MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A717;MODIFIER LETTER DOT VERTICAL BAR;Lm;0;ON;;;;;N;;;;;
+A718;MODIFIER LETTER DOT SLASH;Lm;0;ON;;;;;N;;;;;
+A719;MODIFIER LETTER DOT HORIZONTAL BAR;Lm;0;ON;;;;;N;;;;;
+A71A;MODIFIER LETTER LOWER RIGHT CORNER ANGLE;Lm;0;ON;;;;;N;;;;;
+A71B;MODIFIER LETTER RAISED UP ARROW;Lm;0;ON;;;;;N;;;;;
+A71C;MODIFIER LETTER RAISED DOWN ARROW;Lm;0;ON;;;;;N;;;;;
+A71D;MODIFIER LETTER RAISED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71E;MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71F;MODIFIER LETTER LOW INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A720;MODIFIER LETTER STRESS AND HIGH TONE;Sk;0;ON;;;;;N;;;;;
+A721;MODIFIER LETTER STRESS AND LOW TONE;Sk;0;ON;;;;;N;;;;;
+A722;LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF;Lu;0;L;;;;;N;;;;A723;
+A723;LATIN SMALL LETTER EGYPTOLOGICAL ALEF;Ll;0;L;;;;;N;;;A722;;A722
+A724;LATIN CAPITAL LETTER EGYPTOLOGICAL AIN;Lu;0;L;;;;;N;;;;A725;
+A725;LATIN SMALL LETTER EGYPTOLOGICAL AIN;Ll;0;L;;;;;N;;;A724;;A724
+A726;LATIN CAPITAL LETTER HENG;Lu;0;L;;;;;N;;;;A727;
+A727;LATIN SMALL LETTER HENG;Ll;0;L;;;;;N;;;A726;;A726
+A728;LATIN CAPITAL LETTER TZ;Lu;0;L;;;;;N;;;;A729;
+A729;LATIN SMALL LETTER TZ;Ll;0;L;;;;;N;;;A728;;A728
+A72A;LATIN CAPITAL LETTER TRESILLO;Lu;0;L;;;;;N;;;;A72B;
+A72B;LATIN SMALL LETTER TRESILLO;Ll;0;L;;;;;N;;;A72A;;A72A
+A72C;LATIN CAPITAL LETTER CUATRILLO;Lu;0;L;;;;;N;;;;A72D;
+A72D;LATIN SMALL LETTER CUATRILLO;Ll;0;L;;;;;N;;;A72C;;A72C
+A72E;LATIN CAPITAL LETTER CUATRILLO WITH COMMA;Lu;0;L;;;;;N;;;;A72F;
+A72F;LATIN SMALL LETTER CUATRILLO WITH COMMA;Ll;0;L;;;;;N;;;A72E;;A72E
+A730;LATIN LETTER SMALL CAPITAL F;Ll;0;L;;;;;N;;;;;
+A731;LATIN LETTER SMALL CAPITAL S;Ll;0;L;;;;;N;;;;;
+A732;LATIN CAPITAL LETTER AA;Lu;0;L;;;;;N;;;;A733;
+A733;LATIN SMALL LETTER AA;Ll;0;L;;;;;N;;;A732;;A732
+A734;LATIN CAPITAL LETTER AO;Lu;0;L;;;;;N;;;;A735;
+A735;LATIN SMALL LETTER AO;Ll;0;L;;;;;N;;;A734;;A734
+A736;LATIN CAPITAL LETTER AU;Lu;0;L;;;;;N;;;;A737;
+A737;LATIN SMALL LETTER AU;Ll;0;L;;;;;N;;;A736;;A736
+A738;LATIN CAPITAL LETTER AV;Lu;0;L;;;;;N;;;;A739;
+A739;LATIN SMALL LETTER AV;Ll;0;L;;;;;N;;;A738;;A738
+A73A;LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR;Lu;0;L;;;;;N;;;;A73B;
+A73B;LATIN SMALL LETTER AV WITH HORIZONTAL BAR;Ll;0;L;;;;;N;;;A73A;;A73A
+A73C;LATIN CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;A73D;
+A73D;LATIN SMALL LETTER AY;Ll;0;L;;;;;N;;;A73C;;A73C
+A73E;LATIN CAPITAL LETTER REVERSED C WITH DOT;Lu;0;L;;;;;N;;;;A73F;
+A73F;LATIN SMALL LETTER REVERSED C WITH DOT;Ll;0;L;;;;;N;;;A73E;;A73E
+A740;LATIN CAPITAL LETTER K WITH STROKE;Lu;0;L;;;;;N;;;;A741;
+A741;LATIN SMALL LETTER K WITH STROKE;Ll;0;L;;;;;N;;;A740;;A740
+A742;LATIN CAPITAL LETTER K WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A743;
+A743;LATIN SMALL LETTER K WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A742;;A742
+A744;LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A745;
+A745;LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE;Ll;0;L;;;;;N;;;A744;;A744
+A746;LATIN CAPITAL LETTER BROKEN L;Lu;0;L;;;;;N;;;;A747;
+A747;LATIN SMALL LETTER BROKEN L;Ll;0;L;;;;;N;;;A746;;A746
+A748;LATIN CAPITAL LETTER L WITH HIGH STROKE;Lu;0;L;;;;;N;;;;A749;
+A749;LATIN SMALL LETTER L WITH HIGH STROKE;Ll;0;L;;;;;N;;;A748;;A748
+A74A;LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY;Lu;0;L;;;;;N;;;;A74B;
+A74B;LATIN SMALL LETTER O WITH LONG STROKE OVERLAY;Ll;0;L;;;;;N;;;A74A;;A74A
+A74C;LATIN CAPITAL LETTER O WITH LOOP;Lu;0;L;;;;;N;;;;A74D;
+A74D;LATIN SMALL LETTER O WITH LOOP;Ll;0;L;;;;;N;;;A74C;;A74C
+A74E;LATIN CAPITAL LETTER OO;Lu;0;L;;;;;N;;;;A74F;
+A74F;LATIN SMALL LETTER OO;Ll;0;L;;;;;N;;;A74E;;A74E
+A750;LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A751;
+A751;LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A750;;A750
+A752;LATIN CAPITAL LETTER P WITH FLOURISH;Lu;0;L;;;;;N;;;;A753;
+A753;LATIN SMALL LETTER P WITH FLOURISH;Ll;0;L;;;;;N;;;A752;;A752
+A754;LATIN CAPITAL LETTER P WITH SQUIRREL TAIL;Lu;0;L;;;;;N;;;;A755;
+A755;LATIN SMALL LETTER P WITH SQUIRREL TAIL;Ll;0;L;;;;;N;;;A754;;A754
+A756;LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A757;
+A757;LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A756;;A756
+A758;LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A759;
+A759;LATIN SMALL LETTER Q WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A758;;A758
+A75A;LATIN CAPITAL LETTER R ROTUNDA;Lu;0;L;;;;;N;;;;A75B;
+A75B;LATIN SMALL LETTER R ROTUNDA;Ll;0;L;;;;;N;;;A75A;;A75A
+A75C;LATIN CAPITAL LETTER RUM ROTUNDA;Lu;0;L;;;;;N;;;;A75D;
+A75D;LATIN SMALL LETTER RUM ROTUNDA;Ll;0;L;;;;;N;;;A75C;;A75C
+A75E;LATIN CAPITAL LETTER V WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A75F;
+A75F;LATIN SMALL LETTER V WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A75E;;A75E
+A760;LATIN CAPITAL LETTER VY;Lu;0;L;;;;;N;;;;A761;
+A761;LATIN SMALL LETTER VY;Ll;0;L;;;;;N;;;A760;;A760
+A762;LATIN CAPITAL LETTER VISIGOTHIC Z;Lu;0;L;;;;;N;;;;A763;
+A763;LATIN SMALL LETTER VISIGOTHIC Z;Ll;0;L;;;;;N;;;A762;;A762
+A764;LATIN CAPITAL LETTER THORN WITH STROKE;Lu;0;L;;;;;N;;;;A765;
+A765;LATIN SMALL LETTER THORN WITH STROKE;Ll;0;L;;;;;N;;;A764;;A764
+A766;LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A767;
+A767;LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A766;;A766
+A768;LATIN CAPITAL LETTER VEND;Lu;0;L;;;;;N;;;;A769;
+A769;LATIN SMALL LETTER VEND;Ll;0;L;;;;;N;;;A768;;A768
+A76A;LATIN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;A76B;
+A76B;LATIN SMALL LETTER ET;Ll;0;L;;;;;N;;;A76A;;A76A
+A76C;LATIN CAPITAL LETTER IS;Lu;0;L;;;;;N;;;;A76D;
+A76D;LATIN SMALL LETTER IS;Ll;0;L;;;;;N;;;A76C;;A76C
+A76E;LATIN CAPITAL LETTER CON;Lu;0;L;;;;;N;;;;A76F;
+A76F;LATIN SMALL LETTER CON;Ll;0;L;;;;;N;;;A76E;;A76E
+A770;MODIFIER LETTER US;Lm;0;L;<super> A76F;;;;N;;;;;
+A771;LATIN SMALL LETTER DUM;Ll;0;L;;;;;N;;;;;
+A772;LATIN SMALL LETTER LUM;Ll;0;L;;;;;N;;;;;
+A773;LATIN SMALL LETTER MUM;Ll;0;L;;;;;N;;;;;
+A774;LATIN SMALL LETTER NUM;Ll;0;L;;;;;N;;;;;
+A775;LATIN SMALL LETTER RUM;Ll;0;L;;;;;N;;;;;
+A776;LATIN LETTER SMALL CAPITAL RUM;Ll;0;L;;;;;N;;;;;
+A777;LATIN SMALL LETTER TUM;Ll;0;L;;;;;N;;;;;
+A778;LATIN SMALL LETTER UM;Ll;0;L;;;;;N;;;;;
+A779;LATIN CAPITAL LETTER INSULAR D;Lu;0;L;;;;;N;;;;A77A;
+A77A;LATIN SMALL LETTER INSULAR D;Ll;0;L;;;;;N;;;A779;;A779
+A77B;LATIN CAPITAL LETTER INSULAR F;Lu;0;L;;;;;N;;;;A77C;
+A77C;LATIN SMALL LETTER INSULAR F;Ll;0;L;;;;;N;;;A77B;;A77B
+A77D;LATIN CAPITAL LETTER INSULAR G;Lu;0;L;;;;;N;;;;1D79;
+A77E;LATIN CAPITAL LETTER TURNED INSULAR G;Lu;0;L;;;;;N;;;;A77F;
+A77F;LATIN SMALL LETTER TURNED INSULAR G;Ll;0;L;;;;;N;;;A77E;;A77E
+A780;LATIN CAPITAL LETTER TURNED L;Lu;0;L;;;;;N;;;;A781;
+A781;LATIN SMALL LETTER TURNED L;Ll;0;L;;;;;N;;;A780;;A780
+A782;LATIN CAPITAL LETTER INSULAR R;Lu;0;L;;;;;N;;;;A783;
+A783;LATIN SMALL LETTER INSULAR R;Ll;0;L;;;;;N;;;A782;;A782
+A784;LATIN CAPITAL LETTER INSULAR S;Lu;0;L;;;;;N;;;;A785;
+A785;LATIN SMALL LETTER INSULAR S;Ll;0;L;;;;;N;;;A784;;A784
+A786;LATIN CAPITAL LETTER INSULAR T;Lu;0;L;;;;;N;;;;A787;
+A787;LATIN SMALL LETTER INSULAR T;Ll;0;L;;;;;N;;;A786;;A786
+A788;MODIFIER LETTER LOW CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;;;;;
+A789;MODIFIER LETTER COLON;Sk;0;L;;;;;N;;;;;
+A78A;MODIFIER LETTER SHORT EQUALS SIGN;Sk;0;L;;;;;N;;;;;
+A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
+A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
+A78D;LATIN CAPITAL LETTER TURNED H;Lu;0;L;;;;;N;;;;0265;
+A78E;LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT;Ll;0;L;;;;;N;;;;;
+A78F;LATIN LETTER SINOLOGICAL DOT;Lo;0;L;;;;;N;;;;;
+A790;LATIN CAPITAL LETTER N WITH DESCENDER;Lu;0;L;;;;;N;;;;A791;
+A791;LATIN SMALL LETTER N WITH DESCENDER;Ll;0;L;;;;;N;;;A790;;A790
+A792;LATIN CAPITAL LETTER C WITH BAR;Lu;0;L;;;;;N;;;;A793;
+A793;LATIN SMALL LETTER C WITH BAR;Ll;0;L;;;;;N;;;A792;;A792
+A794;LATIN SMALL LETTER C WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+A795;LATIN SMALL LETTER H WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+A796;LATIN CAPITAL LETTER B WITH FLOURISH;Lu;0;L;;;;;N;;;;A797;
+A797;LATIN SMALL LETTER B WITH FLOURISH;Ll;0;L;;;;;N;;;A796;;A796
+A798;LATIN CAPITAL LETTER F WITH STROKE;Lu;0;L;;;;;N;;;;A799;
+A799;LATIN SMALL LETTER F WITH STROKE;Ll;0;L;;;;;N;;;A798;;A798
+A79A;LATIN CAPITAL LETTER VOLAPUK AE;Lu;0;L;;;;;N;;;;A79B;
+A79B;LATIN SMALL LETTER VOLAPUK AE;Ll;0;L;;;;;N;;;A79A;;A79A
+A79C;LATIN CAPITAL LETTER VOLAPUK OE;Lu;0;L;;;;;N;;;;A79D;
+A79D;LATIN SMALL LETTER VOLAPUK OE;Ll;0;L;;;;;N;;;A79C;;A79C
+A79E;LATIN CAPITAL LETTER VOLAPUK UE;Lu;0;L;;;;;N;;;;A79F;
+A79F;LATIN SMALL LETTER VOLAPUK UE;Ll;0;L;;;;;N;;;A79E;;A79E
+A7A0;LATIN CAPITAL LETTER G WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A1;
+A7A1;LATIN SMALL LETTER G WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A0;;A7A0
+A7A2;LATIN CAPITAL LETTER K WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A3;
+A7A3;LATIN SMALL LETTER K WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A2;;A7A2
+A7A4;LATIN CAPITAL LETTER N WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A5;
+A7A5;LATIN SMALL LETTER N WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A4;;A7A4
+A7A6;LATIN CAPITAL LETTER R WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A7;
+A7A7;LATIN SMALL LETTER R WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A6;;A7A6
+A7A8;LATIN CAPITAL LETTER S WITH OBLIQUE STROKE;Lu;0;L;;;;;N;;;;A7A9;
+A7A9;LATIN SMALL LETTER S WITH OBLIQUE STROKE;Ll;0;L;;;;;N;;;A7A8;;A7A8
+A7AA;LATIN CAPITAL LETTER H WITH HOOK;Lu;0;L;;;;;N;;;;0266;
+A7AB;LATIN CAPITAL LETTER REVERSED OPEN E;Lu;0;L;;;;;N;;;;025C;
+A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261;
+A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C;
+A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A;
+A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E;
+A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287;
+A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D;
+A7B3;LATIN CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;AB53;
+A7B4;LATIN CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;A7B5;
+A7B5;LATIN SMALL LETTER BETA;Ll;0;L;;;;;N;;;A7B4;;A7B4
+A7B6;LATIN CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;A7B7;
+A7B7;LATIN SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;A7B6;;A7B6
+A7F7;LATIN EPIGRAPHIC LETTER SIDEWAYS I;Lo;0;L;;;;;N;;;;;
+A7F8;MODIFIER LETTER CAPITAL H WITH STROKE;Lm;0;L;<super> 0126;;;;N;;;;;
+A7F9;MODIFIER LETTER SMALL LIGATURE OE;Lm;0;L;<super> 0153;;;;N;;;;;
+A7FA;LATIN LETTER SMALL CAPITAL TURNED M;Ll;0;L;;;;;N;;;;;
+A7FB;LATIN EPIGRAPHIC LETTER REVERSED F;Lo;0;L;;;;;N;;;;;
+A7FC;LATIN EPIGRAPHIC LETTER REVERSED P;Lo;0;L;;;;;N;;;;;
+A7FD;LATIN EPIGRAPHIC LETTER INVERTED M;Lo;0;L;;;;;N;;;;;
+A7FE;LATIN EPIGRAPHIC LETTER I LONGA;Lo;0;L;;;;;N;;;;;
+A7FF;LATIN EPIGRAPHIC LETTER ARCHAIC M;Lo;0;L;;;;;N;;;;;
+A800;SYLOTI NAGRI LETTER A;Lo;0;L;;;;;N;;;;;
+A801;SYLOTI NAGRI LETTER I;Lo;0;L;;;;;N;;;;;
+A802;SYLOTI NAGRI SIGN DVISVARA;Mn;0;NSM;;;;;N;;;;;
+A803;SYLOTI NAGRI LETTER U;Lo;0;L;;;;;N;;;;;
+A804;SYLOTI NAGRI LETTER E;Lo;0;L;;;;;N;;;;;
+A805;SYLOTI NAGRI LETTER O;Lo;0;L;;;;;N;;;;;
+A806;SYLOTI NAGRI SIGN HASANTA;Mn;9;NSM;;;;;N;;;;;
+A807;SYLOTI NAGRI LETTER KO;Lo;0;L;;;;;N;;;;;
+A808;SYLOTI NAGRI LETTER KHO;Lo;0;L;;;;;N;;;;;
+A809;SYLOTI NAGRI LETTER GO;Lo;0;L;;;;;N;;;;;
+A80A;SYLOTI NAGRI LETTER GHO;Lo;0;L;;;;;N;;;;;
+A80B;SYLOTI NAGRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+A80C;SYLOTI NAGRI LETTER CO;Lo;0;L;;;;;N;;;;;
+A80D;SYLOTI NAGRI LETTER CHO;Lo;0;L;;;;;N;;;;;
+A80E;SYLOTI NAGRI LETTER JO;Lo;0;L;;;;;N;;;;;
+A80F;SYLOTI NAGRI LETTER JHO;Lo;0;L;;;;;N;;;;;
+A810;SYLOTI NAGRI LETTER TTO;Lo;0;L;;;;;N;;;;;
+A811;SYLOTI NAGRI LETTER TTHO;Lo;0;L;;;;;N;;;;;
+A812;SYLOTI NAGRI LETTER DDO;Lo;0;L;;;;;N;;;;;
+A813;SYLOTI NAGRI LETTER DDHO;Lo;0;L;;;;;N;;;;;
+A814;SYLOTI NAGRI LETTER TO;Lo;0;L;;;;;N;;;;;
+A815;SYLOTI NAGRI LETTER THO;Lo;0;L;;;;;N;;;;;
+A816;SYLOTI NAGRI LETTER DO;Lo;0;L;;;;;N;;;;;
+A817;SYLOTI NAGRI LETTER DHO;Lo;0;L;;;;;N;;;;;
+A818;SYLOTI NAGRI LETTER NO;Lo;0;L;;;;;N;;;;;
+A819;SYLOTI NAGRI LETTER PO;Lo;0;L;;;;;N;;;;;
+A81A;SYLOTI NAGRI LETTER PHO;Lo;0;L;;;;;N;;;;;
+A81B;SYLOTI NAGRI LETTER BO;Lo;0;L;;;;;N;;;;;
+A81C;SYLOTI NAGRI LETTER BHO;Lo;0;L;;;;;N;;;;;
+A81D;SYLOTI NAGRI LETTER MO;Lo;0;L;;;;;N;;;;;
+A81E;SYLOTI NAGRI LETTER RO;Lo;0;L;;;;;N;;;;;
+A81F;SYLOTI NAGRI LETTER LO;Lo;0;L;;;;;N;;;;;
+A820;SYLOTI NAGRI LETTER RRO;Lo;0;L;;;;;N;;;;;
+A821;SYLOTI NAGRI LETTER SO;Lo;0;L;;;;;N;;;;;
+A822;SYLOTI NAGRI LETTER HO;Lo;0;L;;;;;N;;;;;
+A823;SYLOTI NAGRI VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+A824;SYLOTI NAGRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A825;SYLOTI NAGRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A826;SYLOTI NAGRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A827;SYLOTI NAGRI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;;
+A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;;
+A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;;
+A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;;
+A830;NORTH INDIC FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+A831;NORTH INDIC FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+A832;NORTH INDIC FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+A833;NORTH INDIC FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+A834;NORTH INDIC FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+A835;NORTH INDIC FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+A836;NORTH INDIC QUARTER MARK;So;0;L;;;;;N;;;;;
+A837;NORTH INDIC PLACEHOLDER MARK;So;0;L;;;;;N;;;;;
+A838;NORTH INDIC RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+A839;NORTH INDIC QUANTITY MARK;So;0;ET;;;;;N;;;;;
+A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;;
+A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;;
+A843;PHAGS-PA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A844;PHAGS-PA LETTER CA;Lo;0;L;;;;;N;;;;;
+A845;PHAGS-PA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A846;PHAGS-PA LETTER JA;Lo;0;L;;;;;N;;;;;
+A847;PHAGS-PA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A848;PHAGS-PA LETTER TA;Lo;0;L;;;;;N;;;;;
+A849;PHAGS-PA LETTER THA;Lo;0;L;;;;;N;;;;;
+A84A;PHAGS-PA LETTER DA;Lo;0;L;;;;;N;;;;;
+A84B;PHAGS-PA LETTER NA;Lo;0;L;;;;;N;;;;;
+A84C;PHAGS-PA LETTER PA;Lo;0;L;;;;;N;;;;;
+A84D;PHAGS-PA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A84E;PHAGS-PA LETTER BA;Lo;0;L;;;;;N;;;;;
+A84F;PHAGS-PA LETTER MA;Lo;0;L;;;;;N;;;;;
+A850;PHAGS-PA LETTER TSA;Lo;0;L;;;;;N;;;;;
+A851;PHAGS-PA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A852;PHAGS-PA LETTER DZA;Lo;0;L;;;;;N;;;;;
+A853;PHAGS-PA LETTER WA;Lo;0;L;;;;;N;;;;;
+A854;PHAGS-PA LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A855;PHAGS-PA LETTER ZA;Lo;0;L;;;;;N;;;;;
+A856;PHAGS-PA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+A857;PHAGS-PA LETTER YA;Lo;0;L;;;;;N;;;;;
+A858;PHAGS-PA LETTER RA;Lo;0;L;;;;;N;;;;;
+A859;PHAGS-PA LETTER LA;Lo;0;L;;;;;N;;;;;
+A85A;PHAGS-PA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A85B;PHAGS-PA LETTER SA;Lo;0;L;;;;;N;;;;;
+A85C;PHAGS-PA LETTER HA;Lo;0;L;;;;;N;;;;;
+A85D;PHAGS-PA LETTER A;Lo;0;L;;;;;N;;;;;
+A85E;PHAGS-PA LETTER I;Lo;0;L;;;;;N;;;;;
+A85F;PHAGS-PA LETTER U;Lo;0;L;;;;;N;;;;;
+A860;PHAGS-PA LETTER E;Lo;0;L;;;;;N;;;;;
+A861;PHAGS-PA LETTER O;Lo;0;L;;;;;N;;;;;
+A862;PHAGS-PA LETTER QA;Lo;0;L;;;;;N;;;;;
+A863;PHAGS-PA LETTER XA;Lo;0;L;;;;;N;;;;;
+A864;PHAGS-PA LETTER FA;Lo;0;L;;;;;N;;;;;
+A865;PHAGS-PA LETTER GGA;Lo;0;L;;;;;N;;;;;
+A866;PHAGS-PA LETTER EE;Lo;0;L;;;;;N;;;;;
+A867;PHAGS-PA SUBJOINED LETTER WA;Lo;0;L;;;;;N;;;;;
+A868;PHAGS-PA SUBJOINED LETTER YA;Lo;0;L;;;;;N;;;;;
+A869;PHAGS-PA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A86A;PHAGS-PA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A86B;PHAGS-PA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A86C;PHAGS-PA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A86D;PHAGS-PA LETTER ALTERNATE YA;Lo;0;L;;;;;N;;;;;
+A86E;PHAGS-PA LETTER VOICELESS SHA;Lo;0;L;;;;;N;;;;;
+A86F;PHAGS-PA LETTER VOICED HA;Lo;0;L;;;;;N;;;;;
+A870;PHAGS-PA LETTER ASPIRATED FA;Lo;0;L;;;;;N;;;;;
+A871;PHAGS-PA SUBJOINED LETTER RA;Lo;0;L;;;;;N;;;;;
+A872;PHAGS-PA SUPERFIXED LETTER RA;Lo;0;L;;;;;N;;;;;
+A873;PHAGS-PA LETTER CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A874;PHAGS-PA SINGLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A875;PHAGS-PA DOUBLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A876;PHAGS-PA MARK SHAD;Po;0;ON;;;;;N;;;;;
+A877;PHAGS-PA MARK DOUBLE SHAD;Po;0;ON;;;;;N;;;;;
+A880;SAURASHTRA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+A881;SAURASHTRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+A882;SAURASHTRA LETTER A;Lo;0;L;;;;;N;;;;;
+A883;SAURASHTRA LETTER AA;Lo;0;L;;;;;N;;;;;
+A884;SAURASHTRA LETTER I;Lo;0;L;;;;;N;;;;;
+A885;SAURASHTRA LETTER II;Lo;0;L;;;;;N;;;;;
+A886;SAURASHTRA LETTER U;Lo;0;L;;;;;N;;;;;
+A887;SAURASHTRA LETTER UU;Lo;0;L;;;;;N;;;;;
+A888;SAURASHTRA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+A889;SAURASHTRA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+A88A;SAURASHTRA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+A88B;SAURASHTRA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+A88C;SAURASHTRA LETTER E;Lo;0;L;;;;;N;;;;;
+A88D;SAURASHTRA LETTER EE;Lo;0;L;;;;;N;;;;;
+A88E;SAURASHTRA LETTER AI;Lo;0;L;;;;;N;;;;;
+A88F;SAURASHTRA LETTER O;Lo;0;L;;;;;N;;;;;
+A890;SAURASHTRA LETTER OO;Lo;0;L;;;;;N;;;;;
+A891;SAURASHTRA LETTER AU;Lo;0;L;;;;;N;;;;;
+A892;SAURASHTRA LETTER KA;Lo;0;L;;;;;N;;;;;
+A893;SAURASHTRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A894;SAURASHTRA LETTER GA;Lo;0;L;;;;;N;;;;;
+A895;SAURASHTRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+A896;SAURASHTRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A897;SAURASHTRA LETTER CA;Lo;0;L;;;;;N;;;;;
+A898;SAURASHTRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A899;SAURASHTRA LETTER JA;Lo;0;L;;;;;N;;;;;
+A89A;SAURASHTRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+A89B;SAURASHTRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A89C;SAURASHTRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A89D;SAURASHTRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A89E;SAURASHTRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A89F;SAURASHTRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+A8A0;SAURASHTRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A8A1;SAURASHTRA LETTER TA;Lo;0;L;;;;;N;;;;;
+A8A2;SAURASHTRA LETTER THA;Lo;0;L;;;;;N;;;;;
+A8A3;SAURASHTRA LETTER DA;Lo;0;L;;;;;N;;;;;
+A8A4;SAURASHTRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+A8A5;SAURASHTRA LETTER NA;Lo;0;L;;;;;N;;;;;
+A8A6;SAURASHTRA LETTER PA;Lo;0;L;;;;;N;;;;;
+A8A7;SAURASHTRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A8A8;SAURASHTRA LETTER BA;Lo;0;L;;;;;N;;;;;
+A8A9;SAURASHTRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+A8AA;SAURASHTRA LETTER MA;Lo;0;L;;;;;N;;;;;
+A8AB;SAURASHTRA LETTER YA;Lo;0;L;;;;;N;;;;;
+A8AC;SAURASHTRA LETTER RA;Lo;0;L;;;;;N;;;;;
+A8AD;SAURASHTRA LETTER LA;Lo;0;L;;;;;N;;;;;
+A8AE;SAURASHTRA LETTER VA;Lo;0;L;;;;;N;;;;;
+A8AF;SAURASHTRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A8B0;SAURASHTRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+A8B1;SAURASHTRA LETTER SA;Lo;0;L;;;;;N;;;;;
+A8B2;SAURASHTRA LETTER HA;Lo;0;L;;;;;N;;;;;
+A8B3;SAURASHTRA LETTER LLA;Lo;0;L;;;;;N;;;;;
+A8B4;SAURASHTRA CONSONANT SIGN HAARU;Mc;0;L;;;;;N;;;;;
+A8B5;SAURASHTRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+A8B6;SAURASHTRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A8B7;SAURASHTRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+A8B8;SAURASHTRA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+A8B9;SAURASHTRA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+A8BA;SAURASHTRA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+A8BB;SAURASHTRA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+A8BC;SAURASHTRA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
+A8BD;SAURASHTRA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
+A8BE;SAURASHTRA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+A8BF;SAURASHTRA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+A8C0;SAURASHTRA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+A8C5;SAURASHTRA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;;
+A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A8D1;SAURASHTRA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A8D2;SAURASHTRA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A8D3;SAURASHTRA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A8D4;SAURASHTRA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A8D5;SAURASHTRA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A8E0;COMBINING DEVANAGARI DIGIT ZERO;Mn;230;NSM;;;;;N;;;;;
+A8E1;COMBINING DEVANAGARI DIGIT ONE;Mn;230;NSM;;;;;N;;;;;
+A8E2;COMBINING DEVANAGARI DIGIT TWO;Mn;230;NSM;;;;;N;;;;;
+A8E3;COMBINING DEVANAGARI DIGIT THREE;Mn;230;NSM;;;;;N;;;;;
+A8E4;COMBINING DEVANAGARI DIGIT FOUR;Mn;230;NSM;;;;;N;;;;;
+A8E5;COMBINING DEVANAGARI DIGIT FIVE;Mn;230;NSM;;;;;N;;;;;
+A8E6;COMBINING DEVANAGARI DIGIT SIX;Mn;230;NSM;;;;;N;;;;;
+A8E7;COMBINING DEVANAGARI DIGIT SEVEN;Mn;230;NSM;;;;;N;;;;;
+A8E8;COMBINING DEVANAGARI DIGIT EIGHT;Mn;230;NSM;;;;;N;;;;;
+A8E9;COMBINING DEVANAGARI DIGIT NINE;Mn;230;NSM;;;;;N;;;;;
+A8EA;COMBINING DEVANAGARI LETTER A;Mn;230;NSM;;;;;N;;;;;
+A8EB;COMBINING DEVANAGARI LETTER U;Mn;230;NSM;;;;;N;;;;;
+A8EC;COMBINING DEVANAGARI LETTER KA;Mn;230;NSM;;;;;N;;;;;
+A8ED;COMBINING DEVANAGARI LETTER NA;Mn;230;NSM;;;;;N;;;;;
+A8EE;COMBINING DEVANAGARI LETTER PA;Mn;230;NSM;;;;;N;;;;;
+A8EF;COMBINING DEVANAGARI LETTER RA;Mn;230;NSM;;;;;N;;;;;
+A8F0;COMBINING DEVANAGARI LETTER VI;Mn;230;NSM;;;;;N;;;;;
+A8F1;COMBINING DEVANAGARI SIGN AVAGRAHA;Mn;230;NSM;;;;;N;;;;;
+A8F2;DEVANAGARI SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A8F3;DEVANAGARI SIGN CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F4;DEVANAGARI SIGN DOUBLE CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F5;DEVANAGARI SIGN CANDRABINDU TWO;Lo;0;L;;;;;N;;;;;
+A8F6;DEVANAGARI SIGN CANDRABINDU THREE;Lo;0;L;;;;;N;;;;;
+A8F7;DEVANAGARI SIGN CANDRABINDU AVAGRAHA;Lo;0;L;;;;;N;;;;;
+A8F8;DEVANAGARI SIGN PUSHPIKA;Po;0;L;;;;;N;;;;;
+A8F9;DEVANAGARI GAP FILLER;Po;0;L;;;;;N;;;;;
+A8FA;DEVANAGARI CARET;Po;0;L;;;;;N;;;;;
+A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
+A8FC;DEVANAGARI SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+A8FD;DEVANAGARI JAIN OM;Lo;0;L;;;;;N;;;;;
+A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A903;KAYAH LI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A904;KAYAH LI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A905;KAYAH LI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A906;KAYAH LI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A907;KAYAH LI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A908;KAYAH LI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A909;KAYAH LI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A90A;KAYAH LI LETTER KA;Lo;0;L;;;;;N;;;;;
+A90B;KAYAH LI LETTER KHA;Lo;0;L;;;;;N;;;;;
+A90C;KAYAH LI LETTER GA;Lo;0;L;;;;;N;;;;;
+A90D;KAYAH LI LETTER NGA;Lo;0;L;;;;;N;;;;;
+A90E;KAYAH LI LETTER SA;Lo;0;L;;;;;N;;;;;
+A90F;KAYAH LI LETTER SHA;Lo;0;L;;;;;N;;;;;
+A910;KAYAH LI LETTER ZA;Lo;0;L;;;;;N;;;;;
+A911;KAYAH LI LETTER NYA;Lo;0;L;;;;;N;;;;;
+A912;KAYAH LI LETTER TA;Lo;0;L;;;;;N;;;;;
+A913;KAYAH LI LETTER HTA;Lo;0;L;;;;;N;;;;;
+A914;KAYAH LI LETTER NA;Lo;0;L;;;;;N;;;;;
+A915;KAYAH LI LETTER PA;Lo;0;L;;;;;N;;;;;
+A916;KAYAH LI LETTER PHA;Lo;0;L;;;;;N;;;;;
+A917;KAYAH LI LETTER MA;Lo;0;L;;;;;N;;;;;
+A918;KAYAH LI LETTER DA;Lo;0;L;;;;;N;;;;;
+A919;KAYAH LI LETTER BA;Lo;0;L;;;;;N;;;;;
+A91A;KAYAH LI LETTER RA;Lo;0;L;;;;;N;;;;;
+A91B;KAYAH LI LETTER YA;Lo;0;L;;;;;N;;;;;
+A91C;KAYAH LI LETTER LA;Lo;0;L;;;;;N;;;;;
+A91D;KAYAH LI LETTER WA;Lo;0;L;;;;;N;;;;;
+A91E;KAYAH LI LETTER THA;Lo;0;L;;;;;N;;;;;
+A91F;KAYAH LI LETTER HA;Lo;0;L;;;;;N;;;;;
+A920;KAYAH LI LETTER VA;Lo;0;L;;;;;N;;;;;
+A921;KAYAH LI LETTER CA;Lo;0;L;;;;;N;;;;;
+A922;KAYAH LI LETTER A;Lo;0;L;;;;;N;;;;;
+A923;KAYAH LI LETTER OE;Lo;0;L;;;;;N;;;;;
+A924;KAYAH LI LETTER I;Lo;0;L;;;;;N;;;;;
+A925;KAYAH LI LETTER OO;Lo;0;L;;;;;N;;;;;
+A926;KAYAH LI VOWEL UE;Mn;0;NSM;;;;;N;;;;;
+A927;KAYAH LI VOWEL E;Mn;0;NSM;;;;;N;;;;;
+A928;KAYAH LI VOWEL U;Mn;0;NSM;;;;;N;;;;;
+A929;KAYAH LI VOWEL EE;Mn;0;NSM;;;;;N;;;;;
+A92A;KAYAH LI VOWEL O;Mn;0;NSM;;;;;N;;;;;
+A92B;KAYAH LI TONE PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92C;KAYAH LI TONE CALYA;Mn;220;NSM;;;;;N;;;;;
+A92D;KAYAH LI TONE CALYA PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92E;KAYAH LI SIGN CWI;Po;0;L;;;;;N;;;;;
+A92F;KAYAH LI SIGN SHYA;Po;0;L;;;;;N;;;;;
+A930;REJANG LETTER KA;Lo;0;L;;;;;N;;;;;
+A931;REJANG LETTER GA;Lo;0;L;;;;;N;;;;;
+A932;REJANG LETTER NGA;Lo;0;L;;;;;N;;;;;
+A933;REJANG LETTER TA;Lo;0;L;;;;;N;;;;;
+A934;REJANG LETTER DA;Lo;0;L;;;;;N;;;;;
+A935;REJANG LETTER NA;Lo;0;L;;;;;N;;;;;
+A936;REJANG LETTER PA;Lo;0;L;;;;;N;;;;;
+A937;REJANG LETTER BA;Lo;0;L;;;;;N;;;;;
+A938;REJANG LETTER MA;Lo;0;L;;;;;N;;;;;
+A939;REJANG LETTER CA;Lo;0;L;;;;;N;;;;;
+A93A;REJANG LETTER JA;Lo;0;L;;;;;N;;;;;
+A93B;REJANG LETTER NYA;Lo;0;L;;;;;N;;;;;
+A93C;REJANG LETTER SA;Lo;0;L;;;;;N;;;;;
+A93D;REJANG LETTER RA;Lo;0;L;;;;;N;;;;;
+A93E;REJANG LETTER LA;Lo;0;L;;;;;N;;;;;
+A93F;REJANG LETTER YA;Lo;0;L;;;;;N;;;;;
+A940;REJANG LETTER WA;Lo;0;L;;;;;N;;;;;
+A941;REJANG LETTER HA;Lo;0;L;;;;;N;;;;;
+A942;REJANG LETTER MBA;Lo;0;L;;;;;N;;;;;
+A943;REJANG LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A944;REJANG LETTER NDA;Lo;0;L;;;;;N;;;;;
+A945;REJANG LETTER NYJA;Lo;0;L;;;;;N;;;;;
+A946;REJANG LETTER A;Lo;0;L;;;;;N;;;;;
+A947;REJANG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+A948;REJANG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A949;REJANG VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A94A;REJANG VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+A94B;REJANG VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+A94C;REJANG VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+A94D;REJANG VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
+A94E;REJANG VOWEL SIGN EA;Mn;0;NSM;;;;;N;;;;;
+A94F;REJANG CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+A950;REJANG CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;;
+A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;;
+A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;;
+A960;HANGUL CHOSEONG TIKEUT-MIEUM;Lo;0;L;;;;;N;;;;;
+A961;HANGUL CHOSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+A962;HANGUL CHOSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+A963;HANGUL CHOSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+A964;HANGUL CHOSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+A965;HANGUL CHOSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+A966;HANGUL CHOSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+A967;HANGUL CHOSEONG RIEUL-SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+A968;HANGUL CHOSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+A969;HANGUL CHOSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+A96A;HANGUL CHOSEONG RIEUL-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+A96B;HANGUL CHOSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+A96C;HANGUL CHOSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+A96D;HANGUL CHOSEONG RIEUL-CIEUC;Lo;0;L;;;;;N;;;;;
+A96E;HANGUL CHOSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A96F;HANGUL CHOSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+A970;HANGUL CHOSEONG MIEUM-TIKEUT;Lo;0;L;;;;;N;;;;;
+A971;HANGUL CHOSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+A972;HANGUL CHOSEONG PIEUP-SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+A973;HANGUL CHOSEONG PIEUP-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A974;HANGUL CHOSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+A975;HANGUL CHOSEONG SSANGSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+A976;HANGUL CHOSEONG IEUNG-RIEUL;Lo;0;L;;;;;N;;;;;
+A977;HANGUL CHOSEONG IEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+A978;HANGUL CHOSEONG SSANGCIEUC-HIEUH;Lo;0;L;;;;;N;;;;;
+A979;HANGUL CHOSEONG SSANGTHIEUTH;Lo;0;L;;;;;N;;;;;
+A97A;HANGUL CHOSEONG PHIEUPH-HIEUH;Lo;0;L;;;;;N;;;;;
+A97B;HANGUL CHOSEONG HIEUH-SIOS;Lo;0;L;;;;;N;;;;;
+A97C;HANGUL CHOSEONG SSANGYEORINHIEUH;Lo;0;L;;;;;N;;;;;
+A980;JAVANESE SIGN PANYANGGA;Mn;0;NSM;;;;;N;;;;;
+A981;JAVANESE SIGN CECAK;Mn;0;NSM;;;;;N;;;;;
+A982;JAVANESE SIGN LAYAR;Mn;0;NSM;;;;;N;;;;;
+A983;JAVANESE SIGN WIGNYAN;Mc;0;L;;;;;N;;;;;
+A984;JAVANESE LETTER A;Lo;0;L;;;;;N;;;;;
+A985;JAVANESE LETTER I KAWI;Lo;0;L;;;;;N;;;;;
+A986;JAVANESE LETTER I;Lo;0;L;;;;;N;;;;;
+A987;JAVANESE LETTER II;Lo;0;L;;;;;N;;;;;
+A988;JAVANESE LETTER U;Lo;0;L;;;;;N;;;;;
+A989;JAVANESE LETTER PA CEREK;Lo;0;L;;;;;N;;;;;
+A98A;JAVANESE LETTER NGA LELET;Lo;0;L;;;;;N;;;;;
+A98B;JAVANESE LETTER NGA LELET RASWADI;Lo;0;L;;;;;N;;;;;
+A98C;JAVANESE LETTER E;Lo;0;L;;;;;N;;;;;
+A98D;JAVANESE LETTER AI;Lo;0;L;;;;;N;;;;;
+A98E;JAVANESE LETTER O;Lo;0;L;;;;;N;;;;;
+A98F;JAVANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+A990;JAVANESE LETTER KA SASAK;Lo;0;L;;;;;N;;;;;
+A991;JAVANESE LETTER KA MURDA;Lo;0;L;;;;;N;;;;;
+A992;JAVANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+A993;JAVANESE LETTER GA MURDA;Lo;0;L;;;;;N;;;;;
+A994;JAVANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+A995;JAVANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+A996;JAVANESE LETTER CA MURDA;Lo;0;L;;;;;N;;;;;
+A997;JAVANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+A998;JAVANESE LETTER NYA MURDA;Lo;0;L;;;;;N;;;;;
+A999;JAVANESE LETTER JA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99A;JAVANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+A99B;JAVANESE LETTER TTA;Lo;0;L;;;;;N;;;;;
+A99C;JAVANESE LETTER TTA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99D;JAVANESE LETTER DDA;Lo;0;L;;;;;N;;;;;
+A99E;JAVANESE LETTER DDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99F;JAVANESE LETTER NA MURDA;Lo;0;L;;;;;N;;;;;
+A9A0;JAVANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+A9A1;JAVANESE LETTER TA MURDA;Lo;0;L;;;;;N;;;;;
+A9A2;JAVANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+A9A3;JAVANESE LETTER DA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9A4;JAVANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+A9A5;JAVANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+A9A6;JAVANESE LETTER PA MURDA;Lo;0;L;;;;;N;;;;;
+A9A7;JAVANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+A9A8;JAVANESE LETTER BA MURDA;Lo;0;L;;;;;N;;;;;
+A9A9;JAVANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+A9AA;JAVANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+A9AB;JAVANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+A9AC;JAVANESE LETTER RA AGUNG;Lo;0;L;;;;;N;;;;;
+A9AD;JAVANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+A9AE;JAVANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+A9AF;JAVANESE LETTER SA MURDA;Lo;0;L;;;;;N;;;;;
+A9B0;JAVANESE LETTER SA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9B1;JAVANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+A9B2;JAVANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+A9B3;JAVANESE SIGN CECAK TELU;Mn;7;NSM;;;;;N;;;;;
+A9B4;JAVANESE VOWEL SIGN TARUNG;Mc;0;L;;;;;N;;;;;
+A9B5;JAVANESE VOWEL SIGN TOLONG;Mc;0;L;;;;;N;;;;;
+A9B6;JAVANESE VOWEL SIGN WULU;Mn;0;NSM;;;;;N;;;;;
+A9B7;JAVANESE VOWEL SIGN WULU MELIK;Mn;0;NSM;;;;;N;;;;;
+A9B8;JAVANESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+A9B9;JAVANESE VOWEL SIGN SUKU MENDUT;Mn;0;NSM;;;;;N;;;;;
+A9BA;JAVANESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+A9BB;JAVANESE VOWEL SIGN DIRGA MURE;Mc;0;L;;;;;N;;;;;
+A9BC;JAVANESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+A9BD;JAVANESE CONSONANT SIGN KERET;Mc;0;L;;;;;N;;;;;
+A9BE;JAVANESE CONSONANT SIGN PENGKAL;Mc;0;L;;;;;N;;;;;
+A9BF;JAVANESE CONSONANT SIGN CAKRA;Mc;0;L;;;;;N;;;;;
+A9C0;JAVANESE PANGKON;Mc;9;L;;;;;N;;;;;
+A9C1;JAVANESE LEFT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C2;JAVANESE RIGHT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C3;JAVANESE PADA ANDAP;Po;0;L;;;;;N;;;;;
+A9C4;JAVANESE PADA MADYA;Po;0;L;;;;;N;;;;;
+A9C5;JAVANESE PADA LUHUR;Po;0;L;;;;;N;;;;;
+A9C6;JAVANESE PADA WINDU;Po;0;L;;;;;N;;;;;
+A9C7;JAVANESE PADA PANGKAT;Po;0;L;;;;;N;;;;;
+A9C8;JAVANESE PADA LINGSA;Po;0;L;;;;;N;;;;;
+A9C9;JAVANESE PADA LUNGSI;Po;0;L;;;;;N;;;;;
+A9CA;JAVANESE PADA ADEG;Po;0;L;;;;;N;;;;;
+A9CB;JAVANESE PADA ADEG ADEG;Po;0;L;;;;;N;;;;;
+A9CC;JAVANESE PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CD;JAVANESE TURNED PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CF;JAVANESE PANGRANGKEP;Lm;0;L;;;;;N;;;;;
+A9D0;JAVANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A9D1;JAVANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A9D2;JAVANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A9D3;JAVANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A9D4;JAVANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A9D5;JAVANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A9D6;JAVANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A9D7;JAVANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A9D8;JAVANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A9D9;JAVANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A9DE;JAVANESE PADA TIRTA TUMETES;Po;0;L;;;;;N;;;;;
+A9DF;JAVANESE PADA ISEN-ISEN;Po;0;L;;;;;N;;;;;
+A9E0;MYANMAR LETTER SHAN GHA;Lo;0;L;;;;;N;;;;;
+A9E1;MYANMAR LETTER SHAN CHA;Lo;0;L;;;;;N;;;;;
+A9E2;MYANMAR LETTER SHAN JHA;Lo;0;L;;;;;N;;;;;
+A9E3;MYANMAR LETTER SHAN NNA;Lo;0;L;;;;;N;;;;;
+A9E4;MYANMAR LETTER SHAN BHA;Lo;0;L;;;;;N;;;;;
+A9E5;MYANMAR SIGN SHAN SAW;Mn;0;NSM;;;;;N;;;;;
+A9E6;MYANMAR MODIFIER LETTER SHAN REDUPLICATION;Lm;0;L;;;;;N;;;;;
+A9E7;MYANMAR LETTER TAI LAING NYA;Lo;0;L;;;;;N;;;;;
+A9E8;MYANMAR LETTER TAI LAING FA;Lo;0;L;;;;;N;;;;;
+A9E9;MYANMAR LETTER TAI LAING GA;Lo;0;L;;;;;N;;;;;
+A9EA;MYANMAR LETTER TAI LAING GHA;Lo;0;L;;;;;N;;;;;
+A9EB;MYANMAR LETTER TAI LAING JA;Lo;0;L;;;;;N;;;;;
+A9EC;MYANMAR LETTER TAI LAING JHA;Lo;0;L;;;;;N;;;;;
+A9ED;MYANMAR LETTER TAI LAING DDA;Lo;0;L;;;;;N;;;;;
+A9EE;MYANMAR LETTER TAI LAING DDHA;Lo;0;L;;;;;N;;;;;
+A9EF;MYANMAR LETTER TAI LAING NNA;Lo;0;L;;;;;N;;;;;
+A9F0;MYANMAR TAI LAING DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A9F1;MYANMAR TAI LAING DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A9F2;MYANMAR TAI LAING DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A9F3;MYANMAR TAI LAING DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A9F4;MYANMAR TAI LAING DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A9F5;MYANMAR TAI LAING DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A9F6;MYANMAR TAI LAING DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A9F7;MYANMAR TAI LAING DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A9F8;MYANMAR TAI LAING DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A9F9;MYANMAR TAI LAING DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A9FA;MYANMAR LETTER TAI LAING LLA;Lo;0;L;;;;;N;;;;;
+A9FB;MYANMAR LETTER TAI LAING DA;Lo;0;L;;;;;N;;;;;
+A9FC;MYANMAR LETTER TAI LAING DHA;Lo;0;L;;;;;N;;;;;
+A9FD;MYANMAR LETTER TAI LAING BA;Lo;0;L;;;;;N;;;;;
+A9FE;MYANMAR LETTER TAI LAING BHA;Lo;0;L;;;;;N;;;;;
+AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;;
+AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;;
+AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;;
+AA03;CHAM LETTER E;Lo;0;L;;;;;N;;;;;
+AA04;CHAM LETTER AI;Lo;0;L;;;;;N;;;;;
+AA05;CHAM LETTER O;Lo;0;L;;;;;N;;;;;
+AA06;CHAM LETTER KA;Lo;0;L;;;;;N;;;;;
+AA07;CHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+AA08;CHAM LETTER GA;Lo;0;L;;;;;N;;;;;
+AA09;CHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+AA0A;CHAM LETTER NGUE;Lo;0;L;;;;;N;;;;;
+AA0B;CHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+AA0C;CHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+AA0D;CHAM LETTER CHHA;Lo;0;L;;;;;N;;;;;
+AA0E;CHAM LETTER JA;Lo;0;L;;;;;N;;;;;
+AA0F;CHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+AA10;CHAM LETTER NHUE;Lo;0;L;;;;;N;;;;;
+AA11;CHAM LETTER NHA;Lo;0;L;;;;;N;;;;;
+AA12;CHAM LETTER NHJA;Lo;0;L;;;;;N;;;;;
+AA13;CHAM LETTER TA;Lo;0;L;;;;;N;;;;;
+AA14;CHAM LETTER THA;Lo;0;L;;;;;N;;;;;
+AA15;CHAM LETTER DA;Lo;0;L;;;;;N;;;;;
+AA16;CHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+AA17;CHAM LETTER NUE;Lo;0;L;;;;;N;;;;;
+AA18;CHAM LETTER NA;Lo;0;L;;;;;N;;;;;
+AA19;CHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+AA1A;CHAM LETTER PA;Lo;0;L;;;;;N;;;;;
+AA1B;CHAM LETTER PPA;Lo;0;L;;;;;N;;;;;
+AA1C;CHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+AA1D;CHAM LETTER BA;Lo;0;L;;;;;N;;;;;
+AA1E;CHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+AA1F;CHAM LETTER MUE;Lo;0;L;;;;;N;;;;;
+AA20;CHAM LETTER MA;Lo;0;L;;;;;N;;;;;
+AA21;CHAM LETTER BBA;Lo;0;L;;;;;N;;;;;
+AA22;CHAM LETTER YA;Lo;0;L;;;;;N;;;;;
+AA23;CHAM LETTER RA;Lo;0;L;;;;;N;;;;;
+AA24;CHAM LETTER LA;Lo;0;L;;;;;N;;;;;
+AA25;CHAM LETTER VA;Lo;0;L;;;;;N;;;;;
+AA26;CHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+AA27;CHAM LETTER SA;Lo;0;L;;;;;N;;;;;
+AA28;CHAM LETTER HA;Lo;0;L;;;;;N;;;;;
+AA29;CHAM VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+AA2A;CHAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+AA2B;CHAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+AA2C;CHAM VOWEL SIGN EI;Mn;0;NSM;;;;;N;;;;;
+AA2D;CHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+AA2E;CHAM VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+AA2F;CHAM VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+AA30;CHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+AA31;CHAM VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+AA32;CHAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+AA33;CHAM CONSONANT SIGN YA;Mc;0;L;;;;;N;;;;;
+AA34;CHAM CONSONANT SIGN RA;Mc;0;L;;;;;N;;;;;
+AA35;CHAM CONSONANT SIGN LA;Mn;0;NSM;;;;;N;;;;;
+AA36;CHAM CONSONANT SIGN WA;Mn;0;NSM;;;;;N;;;;;
+AA40;CHAM LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+AA41;CHAM LETTER FINAL G;Lo;0;L;;;;;N;;;;;
+AA42;CHAM LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+AA43;CHAM CONSONANT SIGN FINAL NG;Mn;0;NSM;;;;;N;;;;;
+AA44;CHAM LETTER FINAL CH;Lo;0;L;;;;;N;;;;;
+AA45;CHAM LETTER FINAL T;Lo;0;L;;;;;N;;;;;
+AA46;CHAM LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+AA47;CHAM LETTER FINAL P;Lo;0;L;;;;;N;;;;;
+AA48;CHAM LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
+AA49;CHAM LETTER FINAL R;Lo;0;L;;;;;N;;;;;
+AA4A;CHAM LETTER FINAL L;Lo;0;L;;;;;N;;;;;
+AA4B;CHAM LETTER FINAL SS;Lo;0;L;;;;;N;;;;;
+AA4C;CHAM CONSONANT SIGN FINAL M;Mn;0;NSM;;;;;N;;;;;
+AA4D;CHAM CONSONANT SIGN FINAL H;Mc;0;L;;;;;N;;;;;
+AA50;CHAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+AA51;CHAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+AA52;CHAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+AA53;CHAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+AA54;CHAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+AA55;CHAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+AA56;CHAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+AA57;CHAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+AA58;CHAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+AA59;CHAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
+AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;;
+AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;;
+AA60;MYANMAR LETTER KHAMTI GA;Lo;0;L;;;;;N;;;;;
+AA61;MYANMAR LETTER KHAMTI CA;Lo;0;L;;;;;N;;;;;
+AA62;MYANMAR LETTER KHAMTI CHA;Lo;0;L;;;;;N;;;;;
+AA63;MYANMAR LETTER KHAMTI JA;Lo;0;L;;;;;N;;;;;
+AA64;MYANMAR LETTER KHAMTI JHA;Lo;0;L;;;;;N;;;;;
+AA65;MYANMAR LETTER KHAMTI NYA;Lo;0;L;;;;;N;;;;;
+AA66;MYANMAR LETTER KHAMTI TTA;Lo;0;L;;;;;N;;;;;
+AA67;MYANMAR LETTER KHAMTI TTHA;Lo;0;L;;;;;N;;;;;
+AA68;MYANMAR LETTER KHAMTI DDA;Lo;0;L;;;;;N;;;;;
+AA69;MYANMAR LETTER KHAMTI DDHA;Lo;0;L;;;;;N;;;;;
+AA6A;MYANMAR LETTER KHAMTI DHA;Lo;0;L;;;;;N;;;;;
+AA6B;MYANMAR LETTER KHAMTI NA;Lo;0;L;;;;;N;;;;;
+AA6C;MYANMAR LETTER KHAMTI SA;Lo;0;L;;;;;N;;;;;
+AA6D;MYANMAR LETTER KHAMTI HA;Lo;0;L;;;;;N;;;;;
+AA6E;MYANMAR LETTER KHAMTI HHA;Lo;0;L;;;;;N;;;;;
+AA6F;MYANMAR LETTER KHAMTI FA;Lo;0;L;;;;;N;;;;;
+AA70;MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION;Lm;0;L;;;;;N;;;;;
+AA71;MYANMAR LETTER KHAMTI XA;Lo;0;L;;;;;N;;;;;
+AA72;MYANMAR LETTER KHAMTI ZA;Lo;0;L;;;;;N;;;;;
+AA73;MYANMAR LETTER KHAMTI RA;Lo;0;L;;;;;N;;;;;
+AA74;MYANMAR LOGOGRAM KHAMTI OAY;Lo;0;L;;;;;N;;;;;
+AA75;MYANMAR LOGOGRAM KHAMTI QN;Lo;0;L;;;;;N;;;;;
+AA76;MYANMAR LOGOGRAM KHAMTI HM;Lo;0;L;;;;;N;;;;;
+AA77;MYANMAR SYMBOL AITON EXCLAMATION;So;0;L;;;;;N;;;;;
+AA78;MYANMAR SYMBOL AITON ONE;So;0;L;;;;;N;;;;;
+AA79;MYANMAR SYMBOL AITON TWO;So;0;L;;;;;N;;;;;
+AA7A;MYANMAR LETTER AITON RA;Lo;0;L;;;;;N;;;;;
+AA7B;MYANMAR SIGN PAO KAREN TONE;Mc;0;L;;;;;N;;;;;
+AA7C;MYANMAR SIGN TAI LAING TONE-2;Mn;0;NSM;;;;;N;;;;;
+AA7D;MYANMAR SIGN TAI LAING TONE-5;Mc;0;L;;;;;N;;;;;
+AA7E;MYANMAR LETTER SHWE PALAUNG CHA;Lo;0;L;;;;;N;;;;;
+AA7F;MYANMAR LETTER SHWE PALAUNG SHA;Lo;0;L;;;;;N;;;;;
+AA80;TAI VIET LETTER LOW KO;Lo;0;L;;;;;N;;;;;
+AA81;TAI VIET LETTER HIGH KO;Lo;0;L;;;;;N;;;;;
+AA82;TAI VIET LETTER LOW KHO;Lo;0;L;;;;;N;;;;;
+AA83;TAI VIET LETTER HIGH KHO;Lo;0;L;;;;;N;;;;;
+AA84;TAI VIET LETTER LOW KHHO;Lo;0;L;;;;;N;;;;;
+AA85;TAI VIET LETTER HIGH KHHO;Lo;0;L;;;;;N;;;;;
+AA86;TAI VIET LETTER LOW GO;Lo;0;L;;;;;N;;;;;
+AA87;TAI VIET LETTER HIGH GO;Lo;0;L;;;;;N;;;;;
+AA88;TAI VIET LETTER LOW NGO;Lo;0;L;;;;;N;;;;;
+AA89;TAI VIET LETTER HIGH NGO;Lo;0;L;;;;;N;;;;;
+AA8A;TAI VIET LETTER LOW CO;Lo;0;L;;;;;N;;;;;
+AA8B;TAI VIET LETTER HIGH CO;Lo;0;L;;;;;N;;;;;
+AA8C;TAI VIET LETTER LOW CHO;Lo;0;L;;;;;N;;;;;
+AA8D;TAI VIET LETTER HIGH CHO;Lo;0;L;;;;;N;;;;;
+AA8E;TAI VIET LETTER LOW SO;Lo;0;L;;;;;N;;;;;
+AA8F;TAI VIET LETTER HIGH SO;Lo;0;L;;;;;N;;;;;
+AA90;TAI VIET LETTER LOW NYO;Lo;0;L;;;;;N;;;;;
+AA91;TAI VIET LETTER HIGH NYO;Lo;0;L;;;;;N;;;;;
+AA92;TAI VIET LETTER LOW DO;Lo;0;L;;;;;N;;;;;
+AA93;TAI VIET LETTER HIGH DO;Lo;0;L;;;;;N;;;;;
+AA94;TAI VIET LETTER LOW TO;Lo;0;L;;;;;N;;;;;
+AA95;TAI VIET LETTER HIGH TO;Lo;0;L;;;;;N;;;;;
+AA96;TAI VIET LETTER LOW THO;Lo;0;L;;;;;N;;;;;
+AA97;TAI VIET LETTER HIGH THO;Lo;0;L;;;;;N;;;;;
+AA98;TAI VIET LETTER LOW NO;Lo;0;L;;;;;N;;;;;
+AA99;TAI VIET LETTER HIGH NO;Lo;0;L;;;;;N;;;;;
+AA9A;TAI VIET LETTER LOW BO;Lo;0;L;;;;;N;;;;;
+AA9B;TAI VIET LETTER HIGH BO;Lo;0;L;;;;;N;;;;;
+AA9C;TAI VIET LETTER LOW PO;Lo;0;L;;;;;N;;;;;
+AA9D;TAI VIET LETTER HIGH PO;Lo;0;L;;;;;N;;;;;
+AA9E;TAI VIET LETTER LOW PHO;Lo;0;L;;;;;N;;;;;
+AA9F;TAI VIET LETTER HIGH PHO;Lo;0;L;;;;;N;;;;;
+AAA0;TAI VIET LETTER LOW FO;Lo;0;L;;;;;N;;;;;
+AAA1;TAI VIET LETTER HIGH FO;Lo;0;L;;;;;N;;;;;
+AAA2;TAI VIET LETTER LOW MO;Lo;0;L;;;;;N;;;;;
+AAA3;TAI VIET LETTER HIGH MO;Lo;0;L;;;;;N;;;;;
+AAA4;TAI VIET LETTER LOW YO;Lo;0;L;;;;;N;;;;;
+AAA5;TAI VIET LETTER HIGH YO;Lo;0;L;;;;;N;;;;;
+AAA6;TAI VIET LETTER LOW RO;Lo;0;L;;;;;N;;;;;
+AAA7;TAI VIET LETTER HIGH RO;Lo;0;L;;;;;N;;;;;
+AAA8;TAI VIET LETTER LOW LO;Lo;0;L;;;;;N;;;;;
+AAA9;TAI VIET LETTER HIGH LO;Lo;0;L;;;;;N;;;;;
+AAAA;TAI VIET LETTER LOW VO;Lo;0;L;;;;;N;;;;;
+AAAB;TAI VIET LETTER HIGH VO;Lo;0;L;;;;;N;;;;;
+AAAC;TAI VIET LETTER LOW HO;Lo;0;L;;;;;N;;;;;
+AAAD;TAI VIET LETTER HIGH HO;Lo;0;L;;;;;N;;;;;
+AAAE;TAI VIET LETTER LOW O;Lo;0;L;;;;;N;;;;;
+AAAF;TAI VIET LETTER HIGH O;Lo;0;L;;;;;N;;;;;
+AAB0;TAI VIET MAI KANG;Mn;230;NSM;;;;;N;;;;;
+AAB1;TAI VIET VOWEL AA;Lo;0;L;;;;;N;;;;;
+AAB2;TAI VIET VOWEL I;Mn;230;NSM;;;;;N;;;;;
+AAB3;TAI VIET VOWEL UE;Mn;230;NSM;;;;;N;;;;;
+AAB4;TAI VIET VOWEL U;Mn;220;NSM;;;;;N;;;;;
+AAB5;TAI VIET VOWEL E;Lo;0;L;;;;;N;;;;;
+AAB6;TAI VIET VOWEL O;Lo;0;L;;;;;N;;;;;
+AAB7;TAI VIET MAI KHIT;Mn;230;NSM;;;;;N;;;;;
+AAB8;TAI VIET VOWEL IA;Mn;230;NSM;;;;;N;;;;;
+AAB9;TAI VIET VOWEL UEA;Lo;0;L;;;;;N;;;;;
+AABA;TAI VIET VOWEL UA;Lo;0;L;;;;;N;;;;;
+AABB;TAI VIET VOWEL AUE;Lo;0;L;;;;;N;;;;;
+AABC;TAI VIET VOWEL AY;Lo;0;L;;;;;N;;;;;
+AABD;TAI VIET VOWEL AN;Lo;0;L;;;;;N;;;;;
+AABE;TAI VIET VOWEL AM;Mn;230;NSM;;;;;N;;;;;
+AABF;TAI VIET TONE MAI EK;Mn;230;NSM;;;;;N;;;;;
+AAC0;TAI VIET TONE MAI NUENG;Lo;0;L;;;;;N;;;;;
+AAC1;TAI VIET TONE MAI THO;Mn;230;NSM;;;;;N;;;;;
+AAC2;TAI VIET TONE MAI SONG;Lo;0;L;;;;;N;;;;;
+AADB;TAI VIET SYMBOL KON;Lo;0;L;;;;;N;;;;;
+AADC;TAI VIET SYMBOL NUENG;Lo;0;L;;;;;N;;;;;
+AADD;TAI VIET SYMBOL SAM;Lm;0;L;;;;;N;;;;;
+AADE;TAI VIET SYMBOL HO HOI;Po;0;L;;;;;N;;;;;
+AADF;TAI VIET SYMBOL KOI KOI;Po;0;L;;;;;N;;;;;
+AAE0;MEETEI MAYEK LETTER E;Lo;0;L;;;;;N;;;;;
+AAE1;MEETEI MAYEK LETTER O;Lo;0;L;;;;;N;;;;;
+AAE2;MEETEI MAYEK LETTER CHA;Lo;0;L;;;;;N;;;;;
+AAE3;MEETEI MAYEK LETTER NYA;Lo;0;L;;;;;N;;;;;
+AAE4;MEETEI MAYEK LETTER TTA;Lo;0;L;;;;;N;;;;;
+AAE5;MEETEI MAYEK LETTER TTHA;Lo;0;L;;;;;N;;;;;
+AAE6;MEETEI MAYEK LETTER DDA;Lo;0;L;;;;;N;;;;;
+AAE7;MEETEI MAYEK LETTER DDHA;Lo;0;L;;;;;N;;;;;
+AAE8;MEETEI MAYEK LETTER NNA;Lo;0;L;;;;;N;;;;;
+AAE9;MEETEI MAYEK LETTER SHA;Lo;0;L;;;;;N;;;;;
+AAEA;MEETEI MAYEK LETTER SSA;Lo;0;L;;;;;N;;;;;
+AAEB;MEETEI MAYEK VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+AAEC;MEETEI MAYEK VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+AAED;MEETEI MAYEK VOWEL SIGN AAI;Mn;0;NSM;;;;;N;;;;;
+AAEE;MEETEI MAYEK VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+AAEF;MEETEI MAYEK VOWEL SIGN AAU;Mc;0;L;;;;;N;;;;;
+AAF0;MEETEI MAYEK CHEIKHAN;Po;0;L;;;;;N;;;;;
+AAF1;MEETEI MAYEK AHANG KHUDAM;Po;0;L;;;;;N;;;;;
+AAF2;MEETEI MAYEK ANJI;Lo;0;L;;;;;N;;;;;
+AAF3;MEETEI MAYEK SYLLABLE REPETITION MARK;Lm;0;L;;;;;N;;;;;
+AAF4;MEETEI MAYEK WORD REPETITION MARK;Lm;0;L;;;;;N;;;;;
+AAF5;MEETEI MAYEK VOWEL SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+AAF6;MEETEI MAYEK VIRAMA;Mn;9;NSM;;;;;N;;;;;
+AB01;ETHIOPIC SYLLABLE TTHU;Lo;0;L;;;;;N;;;;;
+AB02;ETHIOPIC SYLLABLE TTHI;Lo;0;L;;;;;N;;;;;
+AB03;ETHIOPIC SYLLABLE TTHAA;Lo;0;L;;;;;N;;;;;
+AB04;ETHIOPIC SYLLABLE TTHEE;Lo;0;L;;;;;N;;;;;
+AB05;ETHIOPIC SYLLABLE TTHE;Lo;0;L;;;;;N;;;;;
+AB06;ETHIOPIC SYLLABLE TTHO;Lo;0;L;;;;;N;;;;;
+AB09;ETHIOPIC SYLLABLE DDHU;Lo;0;L;;;;;N;;;;;
+AB0A;ETHIOPIC SYLLABLE DDHI;Lo;0;L;;;;;N;;;;;
+AB0B;ETHIOPIC SYLLABLE DDHAA;Lo;0;L;;;;;N;;;;;
+AB0C;ETHIOPIC SYLLABLE DDHEE;Lo;0;L;;;;;N;;;;;
+AB0D;ETHIOPIC SYLLABLE DDHE;Lo;0;L;;;;;N;;;;;
+AB0E;ETHIOPIC SYLLABLE DDHO;Lo;0;L;;;;;N;;;;;
+AB11;ETHIOPIC SYLLABLE DZU;Lo;0;L;;;;;N;;;;;
+AB12;ETHIOPIC SYLLABLE DZI;Lo;0;L;;;;;N;;;;;
+AB13;ETHIOPIC SYLLABLE DZAA;Lo;0;L;;;;;N;;;;;
+AB14;ETHIOPIC SYLLABLE DZEE;Lo;0;L;;;;;N;;;;;
+AB15;ETHIOPIC SYLLABLE DZE;Lo;0;L;;;;;N;;;;;
+AB16;ETHIOPIC SYLLABLE DZO;Lo;0;L;;;;;N;;;;;
+AB20;ETHIOPIC SYLLABLE CCHHA;Lo;0;L;;;;;N;;;;;
+AB21;ETHIOPIC SYLLABLE CCHHU;Lo;0;L;;;;;N;;;;;
+AB22;ETHIOPIC SYLLABLE CCHHI;Lo;0;L;;;;;N;;;;;
+AB23;ETHIOPIC SYLLABLE CCHHAA;Lo;0;L;;;;;N;;;;;
+AB24;ETHIOPIC SYLLABLE CCHHEE;Lo;0;L;;;;;N;;;;;
+AB25;ETHIOPIC SYLLABLE CCHHE;Lo;0;L;;;;;N;;;;;
+AB26;ETHIOPIC SYLLABLE CCHHO;Lo;0;L;;;;;N;;;;;
+AB28;ETHIOPIC SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
+AB29;ETHIOPIC SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
+AB2A;ETHIOPIC SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
+AB2B;ETHIOPIC SYLLABLE BBAA;Lo;0;L;;;;;N;;;;;
+AB2C;ETHIOPIC SYLLABLE BBEE;Lo;0;L;;;;;N;;;;;
+AB2D;ETHIOPIC SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
+AB2E;ETHIOPIC SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
+AB30;LATIN SMALL LETTER BARRED ALPHA;Ll;0;L;;;;;N;;;;;
+AB31;LATIN SMALL LETTER A REVERSED-SCHWA;Ll;0;L;;;;;N;;;;;
+AB32;LATIN SMALL LETTER BLACKLETTER E;Ll;0;L;;;;;N;;;;;
+AB33;LATIN SMALL LETTER BARRED E;Ll;0;L;;;;;N;;;;;
+AB34;LATIN SMALL LETTER E WITH FLOURISH;Ll;0;L;;;;;N;;;;;
+AB35;LATIN SMALL LETTER LENIS F;Ll;0;L;;;;;N;;;;;
+AB36;LATIN SMALL LETTER SCRIPT G WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB37;LATIN SMALL LETTER L WITH INVERTED LAZY S;Ll;0;L;;;;;N;;;;;
+AB38;LATIN SMALL LETTER L WITH DOUBLE MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+AB39;LATIN SMALL LETTER L WITH MIDDLE RING;Ll;0;L;;;;;N;;;;;
+AB3A;LATIN SMALL LETTER M WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3B;LATIN SMALL LETTER N WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3C;LATIN SMALL LETTER ENG WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB3D;LATIN SMALL LETTER BLACKLETTER O;Ll;0;L;;;;;N;;;;;
+AB3E;LATIN SMALL LETTER BLACKLETTER O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB3F;LATIN SMALL LETTER OPEN O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB40;LATIN SMALL LETTER INVERTED OE;Ll;0;L;;;;;N;;;;;
+AB41;LATIN SMALL LETTER TURNED OE WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB42;LATIN SMALL LETTER TURNED OE WITH HORIZONTAL STROKE;Ll;0;L;;;;;N;;;;;
+AB43;LATIN SMALL LETTER TURNED O OPEN-O;Ll;0;L;;;;;N;;;;;
+AB44;LATIN SMALL LETTER TURNED O OPEN-O WITH STROKE;Ll;0;L;;;;;N;;;;;
+AB45;LATIN SMALL LETTER STIRRUP R;Ll;0;L;;;;;N;;;;;
+AB46;LATIN LETTER SMALL CAPITAL R WITH RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB47;LATIN SMALL LETTER R WITHOUT HANDLE;Ll;0;L;;;;;N;;;;;
+AB48;LATIN SMALL LETTER DOUBLE R;Ll;0;L;;;;;N;;;;;
+AB49;LATIN SMALL LETTER R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB4A;LATIN SMALL LETTER DOUBLE R WITH CROSSED-TAIL;Ll;0;L;;;;;N;;;;;
+AB4B;LATIN SMALL LETTER SCRIPT R;Ll;0;L;;;;;N;;;;;
+AB4C;LATIN SMALL LETTER SCRIPT R WITH RING;Ll;0;L;;;;;N;;;;;
+AB4D;LATIN SMALL LETTER BASELINE ESH;Ll;0;L;;;;;N;;;;;
+AB4E;LATIN SMALL LETTER U WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB4F;LATIN SMALL LETTER U BAR WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB50;LATIN SMALL LETTER UI;Ll;0;L;;;;;N;;;;;
+AB51;LATIN SMALL LETTER TURNED UI;Ll;0;L;;;;;N;;;;;
+AB52;LATIN SMALL LETTER U WITH LEFT HOOK;Ll;0;L;;;;;N;;;;;
+AB53;LATIN SMALL LETTER CHI;Ll;0;L;;;;;N;;;A7B3;;A7B3
+AB54;LATIN SMALL LETTER CHI WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB55;LATIN SMALL LETTER CHI WITH LOW LEFT SERIF;Ll;0;L;;;;;N;;;;;
+AB56;LATIN SMALL LETTER X WITH LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB57;LATIN SMALL LETTER X WITH LONG LEFT LEG;Ll;0;L;;;;;N;;;;;
+AB58;LATIN SMALL LETTER X WITH LONG LEFT LEG AND LOW RIGHT RING;Ll;0;L;;;;;N;;;;;
+AB59;LATIN SMALL LETTER X WITH LONG LEFT LEG WITH SERIF;Ll;0;L;;;;;N;;;;;
+AB5A;LATIN SMALL LETTER Y WITH SHORT RIGHT LEG;Ll;0;L;;;;;N;;;;;
+AB5B;MODIFIER BREVE WITH INVERTED BREVE;Sk;0;L;;;;;N;;;;;
+AB5C;MODIFIER LETTER SMALL HENG;Lm;0;L;<super> A727;;;;N;;;;;
+AB5D;MODIFIER LETTER SMALL L WITH INVERTED LAZY S;Lm;0;L;<super> AB37;;;;N;;;;;
+AB5E;MODIFIER LETTER SMALL L WITH MIDDLE TILDE;Lm;0;L;<super> 026B;;;;N;;;;;
+AB5F;MODIFIER LETTER SMALL U WITH LEFT HOOK;Lm;0;L;<super> AB52;;;;N;;;;;
+AB60;LATIN SMALL LETTER SAKHA YAT;Ll;0;L;;;;;N;;;;;
+AB61;LATIN SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;;;
+AB62;LATIN SMALL LETTER OPEN OE;Ll;0;L;;;;;N;;;;;
+AB63;LATIN SMALL LETTER UO;Ll;0;L;;;;;N;;;;;
+AB64;LATIN SMALL LETTER INVERTED ALPHA;Ll;0;L;;;;;N;;;;;
+AB65;GREEK LETTER SMALL CAPITAL OMEGA;Ll;0;L;;;;;N;;;;;
+AB70;CHEROKEE SMALL LETTER A;Ll;0;L;;;;;N;;;13A0;;13A0
+AB71;CHEROKEE SMALL LETTER E;Ll;0;L;;;;;N;;;13A1;;13A1
+AB72;CHEROKEE SMALL LETTER I;Ll;0;L;;;;;N;;;13A2;;13A2
+AB73;CHEROKEE SMALL LETTER O;Ll;0;L;;;;;N;;;13A3;;13A3
+AB74;CHEROKEE SMALL LETTER U;Ll;0;L;;;;;N;;;13A4;;13A4
+AB75;CHEROKEE SMALL LETTER V;Ll;0;L;;;;;N;;;13A5;;13A5
+AB76;CHEROKEE SMALL LETTER GA;Ll;0;L;;;;;N;;;13A6;;13A6
+AB77;CHEROKEE SMALL LETTER KA;Ll;0;L;;;;;N;;;13A7;;13A7
+AB78;CHEROKEE SMALL LETTER GE;Ll;0;L;;;;;N;;;13A8;;13A8
+AB79;CHEROKEE SMALL LETTER GI;Ll;0;L;;;;;N;;;13A9;;13A9
+AB7A;CHEROKEE SMALL LETTER GO;Ll;0;L;;;;;N;;;13AA;;13AA
+AB7B;CHEROKEE SMALL LETTER GU;Ll;0;L;;;;;N;;;13AB;;13AB
+AB7C;CHEROKEE SMALL LETTER GV;Ll;0;L;;;;;N;;;13AC;;13AC
+AB7D;CHEROKEE SMALL LETTER HA;Ll;0;L;;;;;N;;;13AD;;13AD
+AB7E;CHEROKEE SMALL LETTER HE;Ll;0;L;;;;;N;;;13AE;;13AE
+AB7F;CHEROKEE SMALL LETTER HI;Ll;0;L;;;;;N;;;13AF;;13AF
+AB80;CHEROKEE SMALL LETTER HO;Ll;0;L;;;;;N;;;13B0;;13B0
+AB81;CHEROKEE SMALL LETTER HU;Ll;0;L;;;;;N;;;13B1;;13B1
+AB82;CHEROKEE SMALL LETTER HV;Ll;0;L;;;;;N;;;13B2;;13B2
+AB83;CHEROKEE SMALL LETTER LA;Ll;0;L;;;;;N;;;13B3;;13B3
+AB84;CHEROKEE SMALL LETTER LE;Ll;0;L;;;;;N;;;13B4;;13B4
+AB85;CHEROKEE SMALL LETTER LI;Ll;0;L;;;;;N;;;13B5;;13B5
+AB86;CHEROKEE SMALL LETTER LO;Ll;0;L;;;;;N;;;13B6;;13B6
+AB87;CHEROKEE SMALL LETTER LU;Ll;0;L;;;;;N;;;13B7;;13B7
+AB88;CHEROKEE SMALL LETTER LV;Ll;0;L;;;;;N;;;13B8;;13B8
+AB89;CHEROKEE SMALL LETTER MA;Ll;0;L;;;;;N;;;13B9;;13B9
+AB8A;CHEROKEE SMALL LETTER ME;Ll;0;L;;;;;N;;;13BA;;13BA
+AB8B;CHEROKEE SMALL LETTER MI;Ll;0;L;;;;;N;;;13BB;;13BB
+AB8C;CHEROKEE SMALL LETTER MO;Ll;0;L;;;;;N;;;13BC;;13BC
+AB8D;CHEROKEE SMALL LETTER MU;Ll;0;L;;;;;N;;;13BD;;13BD
+AB8E;CHEROKEE SMALL LETTER NA;Ll;0;L;;;;;N;;;13BE;;13BE
+AB8F;CHEROKEE SMALL LETTER HNA;Ll;0;L;;;;;N;;;13BF;;13BF
+AB90;CHEROKEE SMALL LETTER NAH;Ll;0;L;;;;;N;;;13C0;;13C0
+AB91;CHEROKEE SMALL LETTER NE;Ll;0;L;;;;;N;;;13C1;;13C1
+AB92;CHEROKEE SMALL LETTER NI;Ll;0;L;;;;;N;;;13C2;;13C2
+AB93;CHEROKEE SMALL LETTER NO;Ll;0;L;;;;;N;;;13C3;;13C3
+AB94;CHEROKEE SMALL LETTER NU;Ll;0;L;;;;;N;;;13C4;;13C4
+AB95;CHEROKEE SMALL LETTER NV;Ll;0;L;;;;;N;;;13C5;;13C5
+AB96;CHEROKEE SMALL LETTER QUA;Ll;0;L;;;;;N;;;13C6;;13C6
+AB97;CHEROKEE SMALL LETTER QUE;Ll;0;L;;;;;N;;;13C7;;13C7
+AB98;CHEROKEE SMALL LETTER QUI;Ll;0;L;;;;;N;;;13C8;;13C8
+AB99;CHEROKEE SMALL LETTER QUO;Ll;0;L;;;;;N;;;13C9;;13C9
+AB9A;CHEROKEE SMALL LETTER QUU;Ll;0;L;;;;;N;;;13CA;;13CA
+AB9B;CHEROKEE SMALL LETTER QUV;Ll;0;L;;;;;N;;;13CB;;13CB
+AB9C;CHEROKEE SMALL LETTER SA;Ll;0;L;;;;;N;;;13CC;;13CC
+AB9D;CHEROKEE SMALL LETTER S;Ll;0;L;;;;;N;;;13CD;;13CD
+AB9E;CHEROKEE SMALL LETTER SE;Ll;0;L;;;;;N;;;13CE;;13CE
+AB9F;CHEROKEE SMALL LETTER SI;Ll;0;L;;;;;N;;;13CF;;13CF
+ABA0;CHEROKEE SMALL LETTER SO;Ll;0;L;;;;;N;;;13D0;;13D0
+ABA1;CHEROKEE SMALL LETTER SU;Ll;0;L;;;;;N;;;13D1;;13D1
+ABA2;CHEROKEE SMALL LETTER SV;Ll;0;L;;;;;N;;;13D2;;13D2
+ABA3;CHEROKEE SMALL LETTER DA;Ll;0;L;;;;;N;;;13D3;;13D3
+ABA4;CHEROKEE SMALL LETTER TA;Ll;0;L;;;;;N;;;13D4;;13D4
+ABA5;CHEROKEE SMALL LETTER DE;Ll;0;L;;;;;N;;;13D5;;13D5
+ABA6;CHEROKEE SMALL LETTER TE;Ll;0;L;;;;;N;;;13D6;;13D6
+ABA7;CHEROKEE SMALL LETTER DI;Ll;0;L;;;;;N;;;13D7;;13D7
+ABA8;CHEROKEE SMALL LETTER TI;Ll;0;L;;;;;N;;;13D8;;13D8
+ABA9;CHEROKEE SMALL LETTER DO;Ll;0;L;;;;;N;;;13D9;;13D9
+ABAA;CHEROKEE SMALL LETTER DU;Ll;0;L;;;;;N;;;13DA;;13DA
+ABAB;CHEROKEE SMALL LETTER DV;Ll;0;L;;;;;N;;;13DB;;13DB
+ABAC;CHEROKEE SMALL LETTER DLA;Ll;0;L;;;;;N;;;13DC;;13DC
+ABAD;CHEROKEE SMALL LETTER TLA;Ll;0;L;;;;;N;;;13DD;;13DD
+ABAE;CHEROKEE SMALL LETTER TLE;Ll;0;L;;;;;N;;;13DE;;13DE
+ABAF;CHEROKEE SMALL LETTER TLI;Ll;0;L;;;;;N;;;13DF;;13DF
+ABB0;CHEROKEE SMALL LETTER TLO;Ll;0;L;;;;;N;;;13E0;;13E0
+ABB1;CHEROKEE SMALL LETTER TLU;Ll;0;L;;;;;N;;;13E1;;13E1
+ABB2;CHEROKEE SMALL LETTER TLV;Ll;0;L;;;;;N;;;13E2;;13E2
+ABB3;CHEROKEE SMALL LETTER TSA;Ll;0;L;;;;;N;;;13E3;;13E3
+ABB4;CHEROKEE SMALL LETTER TSE;Ll;0;L;;;;;N;;;13E4;;13E4
+ABB5;CHEROKEE SMALL LETTER TSI;Ll;0;L;;;;;N;;;13E5;;13E5
+ABB6;CHEROKEE SMALL LETTER TSO;Ll;0;L;;;;;N;;;13E6;;13E6
+ABB7;CHEROKEE SMALL LETTER TSU;Ll;0;L;;;;;N;;;13E7;;13E7
+ABB8;CHEROKEE SMALL LETTER TSV;Ll;0;L;;;;;N;;;13E8;;13E8
+ABB9;CHEROKEE SMALL LETTER WA;Ll;0;L;;;;;N;;;13E9;;13E9
+ABBA;CHEROKEE SMALL LETTER WE;Ll;0;L;;;;;N;;;13EA;;13EA
+ABBB;CHEROKEE SMALL LETTER WI;Ll;0;L;;;;;N;;;13EB;;13EB
+ABBC;CHEROKEE SMALL LETTER WO;Ll;0;L;;;;;N;;;13EC;;13EC
+ABBD;CHEROKEE SMALL LETTER WU;Ll;0;L;;;;;N;;;13ED;;13ED
+ABBE;CHEROKEE SMALL LETTER WV;Ll;0;L;;;;;N;;;13EE;;13EE
+ABBF;CHEROKEE SMALL LETTER YA;Ll;0;L;;;;;N;;;13EF;;13EF
+ABC0;MEETEI MAYEK LETTER KOK;Lo;0;L;;;;;N;;;;;
+ABC1;MEETEI MAYEK LETTER SAM;Lo;0;L;;;;;N;;;;;
+ABC2;MEETEI MAYEK LETTER LAI;Lo;0;L;;;;;N;;;;;
+ABC3;MEETEI MAYEK LETTER MIT;Lo;0;L;;;;;N;;;;;
+ABC4;MEETEI MAYEK LETTER PA;Lo;0;L;;;;;N;;;;;
+ABC5;MEETEI MAYEK LETTER NA;Lo;0;L;;;;;N;;;;;
+ABC6;MEETEI MAYEK LETTER CHIL;Lo;0;L;;;;;N;;;;;
+ABC7;MEETEI MAYEK LETTER TIL;Lo;0;L;;;;;N;;;;;
+ABC8;MEETEI MAYEK LETTER KHOU;Lo;0;L;;;;;N;;;;;
+ABC9;MEETEI MAYEK LETTER NGOU;Lo;0;L;;;;;N;;;;;
+ABCA;MEETEI MAYEK LETTER THOU;Lo;0;L;;;;;N;;;;;
+ABCB;MEETEI MAYEK LETTER WAI;Lo;0;L;;;;;N;;;;;
+ABCC;MEETEI MAYEK LETTER YANG;Lo;0;L;;;;;N;;;;;
+ABCD;MEETEI MAYEK LETTER HUK;Lo;0;L;;;;;N;;;;;
+ABCE;MEETEI MAYEK LETTER UN;Lo;0;L;;;;;N;;;;;
+ABCF;MEETEI MAYEK LETTER I;Lo;0;L;;;;;N;;;;;
+ABD0;MEETEI MAYEK LETTER PHAM;Lo;0;L;;;;;N;;;;;
+ABD1;MEETEI MAYEK LETTER ATIYA;Lo;0;L;;;;;N;;;;;
+ABD2;MEETEI MAYEK LETTER GOK;Lo;0;L;;;;;N;;;;;
+ABD3;MEETEI MAYEK LETTER JHAM;Lo;0;L;;;;;N;;;;;
+ABD4;MEETEI MAYEK LETTER RAI;Lo;0;L;;;;;N;;;;;
+ABD5;MEETEI MAYEK LETTER BA;Lo;0;L;;;;;N;;;;;
+ABD6;MEETEI MAYEK LETTER JIL;Lo;0;L;;;;;N;;;;;
+ABD7;MEETEI MAYEK LETTER DIL;Lo;0;L;;;;;N;;;;;
+ABD8;MEETEI MAYEK LETTER GHOU;Lo;0;L;;;;;N;;;;;
+ABD9;MEETEI MAYEK LETTER DHOU;Lo;0;L;;;;;N;;;;;
+ABDA;MEETEI MAYEK LETTER BHAM;Lo;0;L;;;;;N;;;;;
+ABDB;MEETEI MAYEK LETTER KOK LONSUM;Lo;0;L;;;;;N;;;;;
+ABDC;MEETEI MAYEK LETTER LAI LONSUM;Lo;0;L;;;;;N;;;;;
+ABDD;MEETEI MAYEK LETTER MIT LONSUM;Lo;0;L;;;;;N;;;;;
+ABDE;MEETEI MAYEK LETTER PA LONSUM;Lo;0;L;;;;;N;;;;;
+ABDF;MEETEI MAYEK LETTER NA LONSUM;Lo;0;L;;;;;N;;;;;
+ABE0;MEETEI MAYEK LETTER TIL LONSUM;Lo;0;L;;;;;N;;;;;
+ABE1;MEETEI MAYEK LETTER NGOU LONSUM;Lo;0;L;;;;;N;;;;;
+ABE2;MEETEI MAYEK LETTER I LONSUM;Lo;0;L;;;;;N;;;;;
+ABE3;MEETEI MAYEK VOWEL SIGN ONAP;Mc;0;L;;;;;N;;;;;
+ABE4;MEETEI MAYEK VOWEL SIGN INAP;Mc;0;L;;;;;N;;;;;
+ABE5;MEETEI MAYEK VOWEL SIGN ANAP;Mn;0;NSM;;;;;N;;;;;
+ABE6;MEETEI MAYEK VOWEL SIGN YENAP;Mc;0;L;;;;;N;;;;;
+ABE7;MEETEI MAYEK VOWEL SIGN SOUNAP;Mc;0;L;;;;;N;;;;;
+ABE8;MEETEI MAYEK VOWEL SIGN UNAP;Mn;0;NSM;;;;;N;;;;;
+ABE9;MEETEI MAYEK VOWEL SIGN CHEINAP;Mc;0;L;;;;;N;;;;;
+ABEA;MEETEI MAYEK VOWEL SIGN NUNG;Mc;0;L;;;;;N;;;;;
+ABEB;MEETEI MAYEK CHEIKHEI;Po;0;L;;;;;N;;;;;
+ABEC;MEETEI MAYEK LUM IYEK;Mc;0;L;;;;;N;;;;;
+ABED;MEETEI MAYEK APUN IYEK;Mn;9;NSM;;;;;N;;;;;
+ABF0;MEETEI MAYEK DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+ABF1;MEETEI MAYEK DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+ABF2;MEETEI MAYEK DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+ABF3;MEETEI MAYEK DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+ABF4;MEETEI MAYEK DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+ABF5;MEETEI MAYEK DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+ABF6;MEETEI MAYEK DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+ABF7;MEETEI MAYEK DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+ABF8;MEETEI MAYEK DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+ABF9;MEETEI MAYEK DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+AC00;<Hangul Syllable, First>;Lo;0;L;;;;;N;;;;;
+D7A3;<Hangul Syllable, Last>;Lo;0;L;;;;;N;;;;;
+D7B0;HANGUL JUNGSEONG O-YEO;Lo;0;L;;;;;N;;;;;
+D7B1;HANGUL JUNGSEONG O-O-I;Lo;0;L;;;;;N;;;;;
+D7B2;HANGUL JUNGSEONG YO-A;Lo;0;L;;;;;N;;;;;
+D7B3;HANGUL JUNGSEONG YO-AE;Lo;0;L;;;;;N;;;;;
+D7B4;HANGUL JUNGSEONG YO-EO;Lo;0;L;;;;;N;;;;;
+D7B5;HANGUL JUNGSEONG U-YEO;Lo;0;L;;;;;N;;;;;
+D7B6;HANGUL JUNGSEONG U-I-I;Lo;0;L;;;;;N;;;;;
+D7B7;HANGUL JUNGSEONG YU-AE;Lo;0;L;;;;;N;;;;;
+D7B8;HANGUL JUNGSEONG YU-O;Lo;0;L;;;;;N;;;;;
+D7B9;HANGUL JUNGSEONG EU-A;Lo;0;L;;;;;N;;;;;
+D7BA;HANGUL JUNGSEONG EU-EO;Lo;0;L;;;;;N;;;;;
+D7BB;HANGUL JUNGSEONG EU-E;Lo;0;L;;;;;N;;;;;
+D7BC;HANGUL JUNGSEONG EU-O;Lo;0;L;;;;;N;;;;;
+D7BD;HANGUL JUNGSEONG I-YA-O;Lo;0;L;;;;;N;;;;;
+D7BE;HANGUL JUNGSEONG I-YAE;Lo;0;L;;;;;N;;;;;
+D7BF;HANGUL JUNGSEONG I-YEO;Lo;0;L;;;;;N;;;;;
+D7C0;HANGUL JUNGSEONG I-YE;Lo;0;L;;;;;N;;;;;
+D7C1;HANGUL JUNGSEONG I-O-I;Lo;0;L;;;;;N;;;;;
+D7C2;HANGUL JUNGSEONG I-YO;Lo;0;L;;;;;N;;;;;
+D7C3;HANGUL JUNGSEONG I-YU;Lo;0;L;;;;;N;;;;;
+D7C4;HANGUL JUNGSEONG I-I;Lo;0;L;;;;;N;;;;;
+D7C5;HANGUL JUNGSEONG ARAEA-A;Lo;0;L;;;;;N;;;;;
+D7C6;HANGUL JUNGSEONG ARAEA-E;Lo;0;L;;;;;N;;;;;
+D7CB;HANGUL JONGSEONG NIEUN-RIEUL;Lo;0;L;;;;;N;;;;;
+D7CC;HANGUL JONGSEONG NIEUN-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7CD;HANGUL JONGSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+D7CE;HANGUL JONGSEONG SSANGTIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7CF;HANGUL JONGSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7D0;HANGUL JONGSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+D7D1;HANGUL JONGSEONG TIKEUT-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7D2;HANGUL JONGSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+D7D3;HANGUL JONGSEONG TIKEUT-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7D4;HANGUL JONGSEONG TIKEUT-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7D5;HANGUL JONGSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+D7D6;HANGUL JONGSEONG RIEUL-KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D7;HANGUL JONGSEONG SSANGRIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+D7D8;HANGUL JONGSEONG RIEUL-MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D9;HANGUL JONGSEONG RIEUL-PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7DA;HANGUL JONGSEONG RIEUL-PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7DB;HANGUL JONGSEONG RIEUL-YESIEUNG;Lo;0;L;;;;;N;;;;;
+D7DC;HANGUL JONGSEONG RIEUL-YEORINHIEUH-HIEUH;Lo;0;L;;;;;N;;;;;
+D7DD;HANGUL JONGSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+D7DE;HANGUL JONGSEONG MIEUM-NIEUN;Lo;0;L;;;;;N;;;;;
+D7DF;HANGUL JONGSEONG MIEUM-SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+D7E0;HANGUL JONGSEONG SSANGMIEUM;Lo;0;L;;;;;N;;;;;
+D7E1;HANGUL JONGSEONG MIEUM-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+D7E2;HANGUL JONGSEONG MIEUM-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E3;HANGUL JONGSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E4;HANGUL JONGSEONG PIEUP-RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7E5;HANGUL JONGSEONG PIEUP-MIEUM;Lo;0;L;;;;;N;;;;;
+D7E6;HANGUL JONGSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7E7;HANGUL JONGSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E8;HANGUL JONGSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E9;HANGUL JONGSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7EA;HANGUL JONGSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+D7EB;HANGUL JONGSEONG SIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7EC;HANGUL JONGSEONG SSANGSIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7ED;HANGUL JONGSEONG SSANGSIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7EE;HANGUL JONGSEONG SIOS-PANSIOS;Lo;0;L;;;;;N;;;;;
+D7EF;HANGUL JONGSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+D7F0;HANGUL JONGSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7F1;HANGUL JONGSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7F2;HANGUL JONGSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F3;HANGUL JONGSEONG PANSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F4;HANGUL JONGSEONG PANSIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7F5;HANGUL JONGSEONG YESIEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+D7F6;HANGUL JONGSEONG YESIEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F7;HANGUL JONGSEONG CIEUC-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F8;HANGUL JONGSEONG CIEUC-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7F9;HANGUL JONGSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+D7FA;HANGUL JONGSEONG PHIEUPH-SIOS;Lo;0;L;;;;;N;;;;;
+D7FB;HANGUL JONGSEONG PHIEUPH-THIEUTH;Lo;0;L;;;;;N;;;;;
+D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DB80;<Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DBFF;<Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DC00;<Low Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DFFF;<Low Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+E000;<Private Use, First>;Co;0;L;;;;;N;;;;;
+F8FF;<Private Use, Last>;Co;0;L;;;;;N;;;;;
+F900;CJK COMPATIBILITY IDEOGRAPH-F900;Lo;0;L;8C48;;;;N;;;;;
+F901;CJK COMPATIBILITY IDEOGRAPH-F901;Lo;0;L;66F4;;;;N;;;;;
+F902;CJK COMPATIBILITY IDEOGRAPH-F902;Lo;0;L;8ECA;;;;N;;;;;
+F903;CJK COMPATIBILITY IDEOGRAPH-F903;Lo;0;L;8CC8;;;;N;;;;;
+F904;CJK COMPATIBILITY IDEOGRAPH-F904;Lo;0;L;6ED1;;;;N;;;;;
+F905;CJK COMPATIBILITY IDEOGRAPH-F905;Lo;0;L;4E32;;;;N;;;;;
+F906;CJK COMPATIBILITY IDEOGRAPH-F906;Lo;0;L;53E5;;;;N;;;;;
+F907;CJK COMPATIBILITY IDEOGRAPH-F907;Lo;0;L;9F9C;;;;N;;;;;
+F908;CJK COMPATIBILITY IDEOGRAPH-F908;Lo;0;L;9F9C;;;;N;;;;;
+F909;CJK COMPATIBILITY IDEOGRAPH-F909;Lo;0;L;5951;;;;N;;;;;
+F90A;CJK COMPATIBILITY IDEOGRAPH-F90A;Lo;0;L;91D1;;;;N;;;;;
+F90B;CJK COMPATIBILITY IDEOGRAPH-F90B;Lo;0;L;5587;;;;N;;;;;
+F90C;CJK COMPATIBILITY IDEOGRAPH-F90C;Lo;0;L;5948;;;;N;;;;;
+F90D;CJK COMPATIBILITY IDEOGRAPH-F90D;Lo;0;L;61F6;;;;N;;;;;
+F90E;CJK COMPATIBILITY IDEOGRAPH-F90E;Lo;0;L;7669;;;;N;;;;;
+F90F;CJK COMPATIBILITY IDEOGRAPH-F90F;Lo;0;L;7F85;;;;N;;;;;
+F910;CJK COMPATIBILITY IDEOGRAPH-F910;Lo;0;L;863F;;;;N;;;;;
+F911;CJK COMPATIBILITY IDEOGRAPH-F911;Lo;0;L;87BA;;;;N;;;;;
+F912;CJK COMPATIBILITY IDEOGRAPH-F912;Lo;0;L;88F8;;;;N;;;;;
+F913;CJK COMPATIBILITY IDEOGRAPH-F913;Lo;0;L;908F;;;;N;;;;;
+F914;CJK COMPATIBILITY IDEOGRAPH-F914;Lo;0;L;6A02;;;;N;;;;;
+F915;CJK COMPATIBILITY IDEOGRAPH-F915;Lo;0;L;6D1B;;;;N;;;;;
+F916;CJK COMPATIBILITY IDEOGRAPH-F916;Lo;0;L;70D9;;;;N;;;;;
+F917;CJK COMPATIBILITY IDEOGRAPH-F917;Lo;0;L;73DE;;;;N;;;;;
+F918;CJK COMPATIBILITY IDEOGRAPH-F918;Lo;0;L;843D;;;;N;;;;;
+F919;CJK COMPATIBILITY IDEOGRAPH-F919;Lo;0;L;916A;;;;N;;;;;
+F91A;CJK COMPATIBILITY IDEOGRAPH-F91A;Lo;0;L;99F1;;;;N;;;;;
+F91B;CJK COMPATIBILITY IDEOGRAPH-F91B;Lo;0;L;4E82;;;;N;;;;;
+F91C;CJK COMPATIBILITY IDEOGRAPH-F91C;Lo;0;L;5375;;;;N;;;;;
+F91D;CJK COMPATIBILITY IDEOGRAPH-F91D;Lo;0;L;6B04;;;;N;;;;;
+F91E;CJK COMPATIBILITY IDEOGRAPH-F91E;Lo;0;L;721B;;;;N;;;;;
+F91F;CJK COMPATIBILITY IDEOGRAPH-F91F;Lo;0;L;862D;;;;N;;;;;
+F920;CJK COMPATIBILITY IDEOGRAPH-F920;Lo;0;L;9E1E;;;;N;;;;;
+F921;CJK COMPATIBILITY IDEOGRAPH-F921;Lo;0;L;5D50;;;;N;;;;;
+F922;CJK COMPATIBILITY IDEOGRAPH-F922;Lo;0;L;6FEB;;;;N;;;;;
+F923;CJK COMPATIBILITY IDEOGRAPH-F923;Lo;0;L;85CD;;;;N;;;;;
+F924;CJK COMPATIBILITY IDEOGRAPH-F924;Lo;0;L;8964;;;;N;;;;;
+F925;CJK COMPATIBILITY IDEOGRAPH-F925;Lo;0;L;62C9;;;;N;;;;;
+F926;CJK COMPATIBILITY IDEOGRAPH-F926;Lo;0;L;81D8;;;;N;;;;;
+F927;CJK COMPATIBILITY IDEOGRAPH-F927;Lo;0;L;881F;;;;N;;;;;
+F928;CJK COMPATIBILITY IDEOGRAPH-F928;Lo;0;L;5ECA;;;;N;;;;;
+F929;CJK COMPATIBILITY IDEOGRAPH-F929;Lo;0;L;6717;;;;N;;;;;
+F92A;CJK COMPATIBILITY IDEOGRAPH-F92A;Lo;0;L;6D6A;;;;N;;;;;
+F92B;CJK COMPATIBILITY IDEOGRAPH-F92B;Lo;0;L;72FC;;;;N;;;;;
+F92C;CJK COMPATIBILITY IDEOGRAPH-F92C;Lo;0;L;90CE;;;;N;;;;;
+F92D;CJK COMPATIBILITY IDEOGRAPH-F92D;Lo;0;L;4F86;;;;N;;;;;
+F92E;CJK COMPATIBILITY IDEOGRAPH-F92E;Lo;0;L;51B7;;;;N;;;;;
+F92F;CJK COMPATIBILITY IDEOGRAPH-F92F;Lo;0;L;52DE;;;;N;;;;;
+F930;CJK COMPATIBILITY IDEOGRAPH-F930;Lo;0;L;64C4;;;;N;;;;;
+F931;CJK COMPATIBILITY IDEOGRAPH-F931;Lo;0;L;6AD3;;;;N;;;;;
+F932;CJK COMPATIBILITY IDEOGRAPH-F932;Lo;0;L;7210;;;;N;;;;;
+F933;CJK COMPATIBILITY IDEOGRAPH-F933;Lo;0;L;76E7;;;;N;;;;;
+F934;CJK COMPATIBILITY IDEOGRAPH-F934;Lo;0;L;8001;;;;N;;;;;
+F935;CJK COMPATIBILITY IDEOGRAPH-F935;Lo;0;L;8606;;;;N;;;;;
+F936;CJK COMPATIBILITY IDEOGRAPH-F936;Lo;0;L;865C;;;;N;;;;;
+F937;CJK COMPATIBILITY IDEOGRAPH-F937;Lo;0;L;8DEF;;;;N;;;;;
+F938;CJK COMPATIBILITY IDEOGRAPH-F938;Lo;0;L;9732;;;;N;;;;;
+F939;CJK COMPATIBILITY IDEOGRAPH-F939;Lo;0;L;9B6F;;;;N;;;;;
+F93A;CJK COMPATIBILITY IDEOGRAPH-F93A;Lo;0;L;9DFA;;;;N;;;;;
+F93B;CJK COMPATIBILITY IDEOGRAPH-F93B;Lo;0;L;788C;;;;N;;;;;
+F93C;CJK COMPATIBILITY IDEOGRAPH-F93C;Lo;0;L;797F;;;;N;;;;;
+F93D;CJK COMPATIBILITY IDEOGRAPH-F93D;Lo;0;L;7DA0;;;;N;;;;;
+F93E;CJK COMPATIBILITY IDEOGRAPH-F93E;Lo;0;L;83C9;;;;N;;;;;
+F93F;CJK COMPATIBILITY IDEOGRAPH-F93F;Lo;0;L;9304;;;;N;;;;;
+F940;CJK COMPATIBILITY IDEOGRAPH-F940;Lo;0;L;9E7F;;;;N;;;;;
+F941;CJK COMPATIBILITY IDEOGRAPH-F941;Lo;0;L;8AD6;;;;N;;;;;
+F942;CJK COMPATIBILITY IDEOGRAPH-F942;Lo;0;L;58DF;;;;N;;;;;
+F943;CJK COMPATIBILITY IDEOGRAPH-F943;Lo;0;L;5F04;;;;N;;;;;
+F944;CJK COMPATIBILITY IDEOGRAPH-F944;Lo;0;L;7C60;;;;N;;;;;
+F945;CJK COMPATIBILITY IDEOGRAPH-F945;Lo;0;L;807E;;;;N;;;;;
+F946;CJK COMPATIBILITY IDEOGRAPH-F946;Lo;0;L;7262;;;;N;;;;;
+F947;CJK COMPATIBILITY IDEOGRAPH-F947;Lo;0;L;78CA;;;;N;;;;;
+F948;CJK COMPATIBILITY IDEOGRAPH-F948;Lo;0;L;8CC2;;;;N;;;;;
+F949;CJK COMPATIBILITY IDEOGRAPH-F949;Lo;0;L;96F7;;;;N;;;;;
+F94A;CJK COMPATIBILITY IDEOGRAPH-F94A;Lo;0;L;58D8;;;;N;;;;;
+F94B;CJK COMPATIBILITY IDEOGRAPH-F94B;Lo;0;L;5C62;;;;N;;;;;
+F94C;CJK COMPATIBILITY IDEOGRAPH-F94C;Lo;0;L;6A13;;;;N;;;;;
+F94D;CJK COMPATIBILITY IDEOGRAPH-F94D;Lo;0;L;6DDA;;;;N;;;;;
+F94E;CJK COMPATIBILITY IDEOGRAPH-F94E;Lo;0;L;6F0F;;;;N;;;;;
+F94F;CJK COMPATIBILITY IDEOGRAPH-F94F;Lo;0;L;7D2F;;;;N;;;;;
+F950;CJK COMPATIBILITY IDEOGRAPH-F950;Lo;0;L;7E37;;;;N;;;;;
+F951;CJK COMPATIBILITY IDEOGRAPH-F951;Lo;0;L;964B;;;;N;;;;;
+F952;CJK COMPATIBILITY IDEOGRAPH-F952;Lo;0;L;52D2;;;;N;;;;;
+F953;CJK COMPATIBILITY IDEOGRAPH-F953;Lo;0;L;808B;;;;N;;;;;
+F954;CJK COMPATIBILITY IDEOGRAPH-F954;Lo;0;L;51DC;;;;N;;;;;
+F955;CJK COMPATIBILITY IDEOGRAPH-F955;Lo;0;L;51CC;;;;N;;;;;
+F956;CJK COMPATIBILITY IDEOGRAPH-F956;Lo;0;L;7A1C;;;;N;;;;;
+F957;CJK COMPATIBILITY IDEOGRAPH-F957;Lo;0;L;7DBE;;;;N;;;;;
+F958;CJK COMPATIBILITY IDEOGRAPH-F958;Lo;0;L;83F1;;;;N;;;;;
+F959;CJK COMPATIBILITY IDEOGRAPH-F959;Lo;0;L;9675;;;;N;;;;;
+F95A;CJK COMPATIBILITY IDEOGRAPH-F95A;Lo;0;L;8B80;;;;N;;;;;
+F95B;CJK COMPATIBILITY IDEOGRAPH-F95B;Lo;0;L;62CF;;;;N;;;;;
+F95C;CJK COMPATIBILITY IDEOGRAPH-F95C;Lo;0;L;6A02;;;;N;;;;;
+F95D;CJK COMPATIBILITY IDEOGRAPH-F95D;Lo;0;L;8AFE;;;;N;;;;;
+F95E;CJK COMPATIBILITY IDEOGRAPH-F95E;Lo;0;L;4E39;;;;N;;;;;
+F95F;CJK COMPATIBILITY IDEOGRAPH-F95F;Lo;0;L;5BE7;;;;N;;;;;
+F960;CJK COMPATIBILITY IDEOGRAPH-F960;Lo;0;L;6012;;;;N;;;;;
+F961;CJK COMPATIBILITY IDEOGRAPH-F961;Lo;0;L;7387;;;;N;;;;;
+F962;CJK COMPATIBILITY IDEOGRAPH-F962;Lo;0;L;7570;;;;N;;;;;
+F963;CJK COMPATIBILITY IDEOGRAPH-F963;Lo;0;L;5317;;;;N;;;;;
+F964;CJK COMPATIBILITY IDEOGRAPH-F964;Lo;0;L;78FB;;;;N;;;;;
+F965;CJK COMPATIBILITY IDEOGRAPH-F965;Lo;0;L;4FBF;;;;N;;;;;
+F966;CJK COMPATIBILITY IDEOGRAPH-F966;Lo;0;L;5FA9;;;;N;;;;;
+F967;CJK COMPATIBILITY IDEOGRAPH-F967;Lo;0;L;4E0D;;;;N;;;;;
+F968;CJK COMPATIBILITY IDEOGRAPH-F968;Lo;0;L;6CCC;;;;N;;;;;
+F969;CJK COMPATIBILITY IDEOGRAPH-F969;Lo;0;L;6578;;;;N;;;;;
+F96A;CJK COMPATIBILITY IDEOGRAPH-F96A;Lo;0;L;7D22;;;;N;;;;;
+F96B;CJK COMPATIBILITY IDEOGRAPH-F96B;Lo;0;L;53C3;;;3;N;;;;;
+F96C;CJK COMPATIBILITY IDEOGRAPH-F96C;Lo;0;L;585E;;;;N;;;;;
+F96D;CJK COMPATIBILITY IDEOGRAPH-F96D;Lo;0;L;7701;;;;N;;;;;
+F96E;CJK COMPATIBILITY IDEOGRAPH-F96E;Lo;0;L;8449;;;;N;;;;;
+F96F;CJK COMPATIBILITY IDEOGRAPH-F96F;Lo;0;L;8AAA;;;;N;;;;;
+F970;CJK COMPATIBILITY IDEOGRAPH-F970;Lo;0;L;6BBA;;;;N;;;;;
+F971;CJK COMPATIBILITY IDEOGRAPH-F971;Lo;0;L;8FB0;;;;N;;;;;
+F972;CJK COMPATIBILITY IDEOGRAPH-F972;Lo;0;L;6C88;;;;N;;;;;
+F973;CJK COMPATIBILITY IDEOGRAPH-F973;Lo;0;L;62FE;;;10;N;;;;;
+F974;CJK COMPATIBILITY IDEOGRAPH-F974;Lo;0;L;82E5;;;;N;;;;;
+F975;CJK COMPATIBILITY IDEOGRAPH-F975;Lo;0;L;63A0;;;;N;;;;;
+F976;CJK COMPATIBILITY IDEOGRAPH-F976;Lo;0;L;7565;;;;N;;;;;
+F977;CJK COMPATIBILITY IDEOGRAPH-F977;Lo;0;L;4EAE;;;;N;;;;;
+F978;CJK COMPATIBILITY IDEOGRAPH-F978;Lo;0;L;5169;;;2;N;;;;;
+F979;CJK COMPATIBILITY IDEOGRAPH-F979;Lo;0;L;51C9;;;;N;;;;;
+F97A;CJK COMPATIBILITY IDEOGRAPH-F97A;Lo;0;L;6881;;;;N;;;;;
+F97B;CJK COMPATIBILITY IDEOGRAPH-F97B;Lo;0;L;7CE7;;;;N;;;;;
+F97C;CJK COMPATIBILITY IDEOGRAPH-F97C;Lo;0;L;826F;;;;N;;;;;
+F97D;CJK COMPATIBILITY IDEOGRAPH-F97D;Lo;0;L;8AD2;;;;N;;;;;
+F97E;CJK COMPATIBILITY IDEOGRAPH-F97E;Lo;0;L;91CF;;;;N;;;;;
+F97F;CJK COMPATIBILITY IDEOGRAPH-F97F;Lo;0;L;52F5;;;;N;;;;;
+F980;CJK COMPATIBILITY IDEOGRAPH-F980;Lo;0;L;5442;;;;N;;;;;
+F981;CJK COMPATIBILITY IDEOGRAPH-F981;Lo;0;L;5973;;;;N;;;;;
+F982;CJK COMPATIBILITY IDEOGRAPH-F982;Lo;0;L;5EEC;;;;N;;;;;
+F983;CJK COMPATIBILITY IDEOGRAPH-F983;Lo;0;L;65C5;;;;N;;;;;
+F984;CJK COMPATIBILITY IDEOGRAPH-F984;Lo;0;L;6FFE;;;;N;;;;;
+F985;CJK COMPATIBILITY IDEOGRAPH-F985;Lo;0;L;792A;;;;N;;;;;
+F986;CJK COMPATIBILITY IDEOGRAPH-F986;Lo;0;L;95AD;;;;N;;;;;
+F987;CJK COMPATIBILITY IDEOGRAPH-F987;Lo;0;L;9A6A;;;;N;;;;;
+F988;CJK COMPATIBILITY IDEOGRAPH-F988;Lo;0;L;9E97;;;;N;;;;;
+F989;CJK COMPATIBILITY IDEOGRAPH-F989;Lo;0;L;9ECE;;;;N;;;;;
+F98A;CJK COMPATIBILITY IDEOGRAPH-F98A;Lo;0;L;529B;;;;N;;;;;
+F98B;CJK COMPATIBILITY IDEOGRAPH-F98B;Lo;0;L;66C6;;;;N;;;;;
+F98C;CJK COMPATIBILITY IDEOGRAPH-F98C;Lo;0;L;6B77;;;;N;;;;;
+F98D;CJK COMPATIBILITY IDEOGRAPH-F98D;Lo;0;L;8F62;;;;N;;;;;
+F98E;CJK COMPATIBILITY IDEOGRAPH-F98E;Lo;0;L;5E74;;;;N;;;;;
+F98F;CJK COMPATIBILITY IDEOGRAPH-F98F;Lo;0;L;6190;;;;N;;;;;
+F990;CJK COMPATIBILITY IDEOGRAPH-F990;Lo;0;L;6200;;;;N;;;;;
+F991;CJK COMPATIBILITY IDEOGRAPH-F991;Lo;0;L;649A;;;;N;;;;;
+F992;CJK COMPATIBILITY IDEOGRAPH-F992;Lo;0;L;6F23;;;;N;;;;;
+F993;CJK COMPATIBILITY IDEOGRAPH-F993;Lo;0;L;7149;;;;N;;;;;
+F994;CJK COMPATIBILITY IDEOGRAPH-F994;Lo;0;L;7489;;;;N;;;;;
+F995;CJK COMPATIBILITY IDEOGRAPH-F995;Lo;0;L;79CA;;;;N;;;;;
+F996;CJK COMPATIBILITY IDEOGRAPH-F996;Lo;0;L;7DF4;;;;N;;;;;
+F997;CJK COMPATIBILITY IDEOGRAPH-F997;Lo;0;L;806F;;;;N;;;;;
+F998;CJK COMPATIBILITY IDEOGRAPH-F998;Lo;0;L;8F26;;;;N;;;;;
+F999;CJK COMPATIBILITY IDEOGRAPH-F999;Lo;0;L;84EE;;;;N;;;;;
+F99A;CJK COMPATIBILITY IDEOGRAPH-F99A;Lo;0;L;9023;;;;N;;;;;
+F99B;CJK COMPATIBILITY IDEOGRAPH-F99B;Lo;0;L;934A;;;;N;;;;;
+F99C;CJK COMPATIBILITY IDEOGRAPH-F99C;Lo;0;L;5217;;;;N;;;;;
+F99D;CJK COMPATIBILITY IDEOGRAPH-F99D;Lo;0;L;52A3;;;;N;;;;;
+F99E;CJK COMPATIBILITY IDEOGRAPH-F99E;Lo;0;L;54BD;;;;N;;;;;
+F99F;CJK COMPATIBILITY IDEOGRAPH-F99F;Lo;0;L;70C8;;;;N;;;;;
+F9A0;CJK COMPATIBILITY IDEOGRAPH-F9A0;Lo;0;L;88C2;;;;N;;;;;
+F9A1;CJK COMPATIBILITY IDEOGRAPH-F9A1;Lo;0;L;8AAA;;;;N;;;;;
+F9A2;CJK COMPATIBILITY IDEOGRAPH-F9A2;Lo;0;L;5EC9;;;;N;;;;;
+F9A3;CJK COMPATIBILITY IDEOGRAPH-F9A3;Lo;0;L;5FF5;;;;N;;;;;
+F9A4;CJK COMPATIBILITY IDEOGRAPH-F9A4;Lo;0;L;637B;;;;N;;;;;
+F9A5;CJK COMPATIBILITY IDEOGRAPH-F9A5;Lo;0;L;6BAE;;;;N;;;;;
+F9A6;CJK COMPATIBILITY IDEOGRAPH-F9A6;Lo;0;L;7C3E;;;;N;;;;;
+F9A7;CJK COMPATIBILITY IDEOGRAPH-F9A7;Lo;0;L;7375;;;;N;;;;;
+F9A8;CJK COMPATIBILITY IDEOGRAPH-F9A8;Lo;0;L;4EE4;;;;N;;;;;
+F9A9;CJK COMPATIBILITY IDEOGRAPH-F9A9;Lo;0;L;56F9;;;;N;;;;;
+F9AA;CJK COMPATIBILITY IDEOGRAPH-F9AA;Lo;0;L;5BE7;;;;N;;;;;
+F9AB;CJK COMPATIBILITY IDEOGRAPH-F9AB;Lo;0;L;5DBA;;;;N;;;;;
+F9AC;CJK COMPATIBILITY IDEOGRAPH-F9AC;Lo;0;L;601C;;;;N;;;;;
+F9AD;CJK COMPATIBILITY IDEOGRAPH-F9AD;Lo;0;L;73B2;;;;N;;;;;
+F9AE;CJK COMPATIBILITY IDEOGRAPH-F9AE;Lo;0;L;7469;;;;N;;;;;
+F9AF;CJK COMPATIBILITY IDEOGRAPH-F9AF;Lo;0;L;7F9A;;;;N;;;;;
+F9B0;CJK COMPATIBILITY IDEOGRAPH-F9B0;Lo;0;L;8046;;;;N;;;;;
+F9B1;CJK COMPATIBILITY IDEOGRAPH-F9B1;Lo;0;L;9234;;;;N;;;;;
+F9B2;CJK COMPATIBILITY IDEOGRAPH-F9B2;Lo;0;L;96F6;;;0;N;;;;;
+F9B3;CJK COMPATIBILITY IDEOGRAPH-F9B3;Lo;0;L;9748;;;;N;;;;;
+F9B4;CJK COMPATIBILITY IDEOGRAPH-F9B4;Lo;0;L;9818;;;;N;;;;;
+F9B5;CJK COMPATIBILITY IDEOGRAPH-F9B5;Lo;0;L;4F8B;;;;N;;;;;
+F9B6;CJK COMPATIBILITY IDEOGRAPH-F9B6;Lo;0;L;79AE;;;;N;;;;;
+F9B7;CJK COMPATIBILITY IDEOGRAPH-F9B7;Lo;0;L;91B4;;;;N;;;;;
+F9B8;CJK COMPATIBILITY IDEOGRAPH-F9B8;Lo;0;L;96B8;;;;N;;;;;
+F9B9;CJK COMPATIBILITY IDEOGRAPH-F9B9;Lo;0;L;60E1;;;;N;;;;;
+F9BA;CJK COMPATIBILITY IDEOGRAPH-F9BA;Lo;0;L;4E86;;;;N;;;;;
+F9BB;CJK COMPATIBILITY IDEOGRAPH-F9BB;Lo;0;L;50DA;;;;N;;;;;
+F9BC;CJK COMPATIBILITY IDEOGRAPH-F9BC;Lo;0;L;5BEE;;;;N;;;;;
+F9BD;CJK COMPATIBILITY IDEOGRAPH-F9BD;Lo;0;L;5C3F;;;;N;;;;;
+F9BE;CJK COMPATIBILITY IDEOGRAPH-F9BE;Lo;0;L;6599;;;;N;;;;;
+F9BF;CJK COMPATIBILITY IDEOGRAPH-F9BF;Lo;0;L;6A02;;;;N;;;;;
+F9C0;CJK COMPATIBILITY IDEOGRAPH-F9C0;Lo;0;L;71CE;;;;N;;;;;
+F9C1;CJK COMPATIBILITY IDEOGRAPH-F9C1;Lo;0;L;7642;;;;N;;;;;
+F9C2;CJK COMPATIBILITY IDEOGRAPH-F9C2;Lo;0;L;84FC;;;;N;;;;;
+F9C3;CJK COMPATIBILITY IDEOGRAPH-F9C3;Lo;0;L;907C;;;;N;;;;;
+F9C4;CJK COMPATIBILITY IDEOGRAPH-F9C4;Lo;0;L;9F8D;;;;N;;;;;
+F9C5;CJK COMPATIBILITY IDEOGRAPH-F9C5;Lo;0;L;6688;;;;N;;;;;
+F9C6;CJK COMPATIBILITY IDEOGRAPH-F9C6;Lo;0;L;962E;;;;N;;;;;
+F9C7;CJK COMPATIBILITY IDEOGRAPH-F9C7;Lo;0;L;5289;;;;N;;;;;
+F9C8;CJK COMPATIBILITY IDEOGRAPH-F9C8;Lo;0;L;677B;;;;N;;;;;
+F9C9;CJK COMPATIBILITY IDEOGRAPH-F9C9;Lo;0;L;67F3;;;;N;;;;;
+F9CA;CJK COMPATIBILITY IDEOGRAPH-F9CA;Lo;0;L;6D41;;;;N;;;;;
+F9CB;CJK COMPATIBILITY IDEOGRAPH-F9CB;Lo;0;L;6E9C;;;;N;;;;;
+F9CC;CJK COMPATIBILITY IDEOGRAPH-F9CC;Lo;0;L;7409;;;;N;;;;;
+F9CD;CJK COMPATIBILITY IDEOGRAPH-F9CD;Lo;0;L;7559;;;;N;;;;;
+F9CE;CJK COMPATIBILITY IDEOGRAPH-F9CE;Lo;0;L;786B;;;;N;;;;;
+F9CF;CJK COMPATIBILITY IDEOGRAPH-F9CF;Lo;0;L;7D10;;;;N;;;;;
+F9D0;CJK COMPATIBILITY IDEOGRAPH-F9D0;Lo;0;L;985E;;;;N;;;;;
+F9D1;CJK COMPATIBILITY IDEOGRAPH-F9D1;Lo;0;L;516D;;;6;N;;;;;
+F9D2;CJK COMPATIBILITY IDEOGRAPH-F9D2;Lo;0;L;622E;;;;N;;;;;
+F9D3;CJK COMPATIBILITY IDEOGRAPH-F9D3;Lo;0;L;9678;;;6;N;;;;;
+F9D4;CJK COMPATIBILITY IDEOGRAPH-F9D4;Lo;0;L;502B;;;;N;;;;;
+F9D5;CJK COMPATIBILITY IDEOGRAPH-F9D5;Lo;0;L;5D19;;;;N;;;;;
+F9D6;CJK COMPATIBILITY IDEOGRAPH-F9D6;Lo;0;L;6DEA;;;;N;;;;;
+F9D7;CJK COMPATIBILITY IDEOGRAPH-F9D7;Lo;0;L;8F2A;;;;N;;;;;
+F9D8;CJK COMPATIBILITY IDEOGRAPH-F9D8;Lo;0;L;5F8B;;;;N;;;;;
+F9D9;CJK COMPATIBILITY IDEOGRAPH-F9D9;Lo;0;L;6144;;;;N;;;;;
+F9DA;CJK COMPATIBILITY IDEOGRAPH-F9DA;Lo;0;L;6817;;;;N;;;;;
+F9DB;CJK COMPATIBILITY IDEOGRAPH-F9DB;Lo;0;L;7387;;;;N;;;;;
+F9DC;CJK COMPATIBILITY IDEOGRAPH-F9DC;Lo;0;L;9686;;;;N;;;;;
+F9DD;CJK COMPATIBILITY IDEOGRAPH-F9DD;Lo;0;L;5229;;;;N;;;;;
+F9DE;CJK COMPATIBILITY IDEOGRAPH-F9DE;Lo;0;L;540F;;;;N;;;;;
+F9DF;CJK COMPATIBILITY IDEOGRAPH-F9DF;Lo;0;L;5C65;;;;N;;;;;
+F9E0;CJK COMPATIBILITY IDEOGRAPH-F9E0;Lo;0;L;6613;;;;N;;;;;
+F9E1;CJK COMPATIBILITY IDEOGRAPH-F9E1;Lo;0;L;674E;;;;N;;;;;
+F9E2;CJK COMPATIBILITY IDEOGRAPH-F9E2;Lo;0;L;68A8;;;;N;;;;;
+F9E3;CJK COMPATIBILITY IDEOGRAPH-F9E3;Lo;0;L;6CE5;;;;N;;;;;
+F9E4;CJK COMPATIBILITY IDEOGRAPH-F9E4;Lo;0;L;7406;;;;N;;;;;
+F9E5;CJK COMPATIBILITY IDEOGRAPH-F9E5;Lo;0;L;75E2;;;;N;;;;;
+F9E6;CJK COMPATIBILITY IDEOGRAPH-F9E6;Lo;0;L;7F79;;;;N;;;;;
+F9E7;CJK COMPATIBILITY IDEOGRAPH-F9E7;Lo;0;L;88CF;;;;N;;;;;
+F9E8;CJK COMPATIBILITY IDEOGRAPH-F9E8;Lo;0;L;88E1;;;;N;;;;;
+F9E9;CJK COMPATIBILITY IDEOGRAPH-F9E9;Lo;0;L;91CC;;;;N;;;;;
+F9EA;CJK COMPATIBILITY IDEOGRAPH-F9EA;Lo;0;L;96E2;;;;N;;;;;
+F9EB;CJK COMPATIBILITY IDEOGRAPH-F9EB;Lo;0;L;533F;;;;N;;;;;
+F9EC;CJK COMPATIBILITY IDEOGRAPH-F9EC;Lo;0;L;6EBA;;;;N;;;;;
+F9ED;CJK COMPATIBILITY IDEOGRAPH-F9ED;Lo;0;L;541D;;;;N;;;;;
+F9EE;CJK COMPATIBILITY IDEOGRAPH-F9EE;Lo;0;L;71D0;;;;N;;;;;
+F9EF;CJK COMPATIBILITY IDEOGRAPH-F9EF;Lo;0;L;7498;;;;N;;;;;
+F9F0;CJK COMPATIBILITY IDEOGRAPH-F9F0;Lo;0;L;85FA;;;;N;;;;;
+F9F1;CJK COMPATIBILITY IDEOGRAPH-F9F1;Lo;0;L;96A3;;;;N;;;;;
+F9F2;CJK COMPATIBILITY IDEOGRAPH-F9F2;Lo;0;L;9C57;;;;N;;;;;
+F9F3;CJK COMPATIBILITY IDEOGRAPH-F9F3;Lo;0;L;9E9F;;;;N;;;;;
+F9F4;CJK COMPATIBILITY IDEOGRAPH-F9F4;Lo;0;L;6797;;;;N;;;;;
+F9F5;CJK COMPATIBILITY IDEOGRAPH-F9F5;Lo;0;L;6DCB;;;;N;;;;;
+F9F6;CJK COMPATIBILITY IDEOGRAPH-F9F6;Lo;0;L;81E8;;;;N;;;;;
+F9F7;CJK COMPATIBILITY IDEOGRAPH-F9F7;Lo;0;L;7ACB;;;;N;;;;;
+F9F8;CJK COMPATIBILITY IDEOGRAPH-F9F8;Lo;0;L;7B20;;;;N;;;;;
+F9F9;CJK COMPATIBILITY IDEOGRAPH-F9F9;Lo;0;L;7C92;;;;N;;;;;
+F9FA;CJK COMPATIBILITY IDEOGRAPH-F9FA;Lo;0;L;72C0;;;;N;;;;;
+F9FB;CJK COMPATIBILITY IDEOGRAPH-F9FB;Lo;0;L;7099;;;;N;;;;;
+F9FC;CJK COMPATIBILITY IDEOGRAPH-F9FC;Lo;0;L;8B58;;;;N;;;;;
+F9FD;CJK COMPATIBILITY IDEOGRAPH-F9FD;Lo;0;L;4EC0;;;10;N;;;;;
+F9FE;CJK COMPATIBILITY IDEOGRAPH-F9FE;Lo;0;L;8336;;;;N;;;;;
+F9FF;CJK COMPATIBILITY IDEOGRAPH-F9FF;Lo;0;L;523A;;;;N;;;;;
+FA00;CJK COMPATIBILITY IDEOGRAPH-FA00;Lo;0;L;5207;;;;N;;;;;
+FA01;CJK COMPATIBILITY IDEOGRAPH-FA01;Lo;0;L;5EA6;;;;N;;;;;
+FA02;CJK COMPATIBILITY IDEOGRAPH-FA02;Lo;0;L;62D3;;;;N;;;;;
+FA03;CJK COMPATIBILITY IDEOGRAPH-FA03;Lo;0;L;7CD6;;;;N;;;;;
+FA04;CJK COMPATIBILITY IDEOGRAPH-FA04;Lo;0;L;5B85;;;;N;;;;;
+FA05;CJK COMPATIBILITY IDEOGRAPH-FA05;Lo;0;L;6D1E;;;;N;;;;;
+FA06;CJK COMPATIBILITY IDEOGRAPH-FA06;Lo;0;L;66B4;;;;N;;;;;
+FA07;CJK COMPATIBILITY IDEOGRAPH-FA07;Lo;0;L;8F3B;;;;N;;;;;
+FA08;CJK COMPATIBILITY IDEOGRAPH-FA08;Lo;0;L;884C;;;;N;;;;;
+FA09;CJK COMPATIBILITY IDEOGRAPH-FA09;Lo;0;L;964D;;;;N;;;;;
+FA0A;CJK COMPATIBILITY IDEOGRAPH-FA0A;Lo;0;L;898B;;;;N;;;;;
+FA0B;CJK COMPATIBILITY IDEOGRAPH-FA0B;Lo;0;L;5ED3;;;;N;;;;;
+FA0C;CJK COMPATIBILITY IDEOGRAPH-FA0C;Lo;0;L;5140;;;;N;;;;;
+FA0D;CJK COMPATIBILITY IDEOGRAPH-FA0D;Lo;0;L;55C0;;;;N;;;;;
+FA0E;CJK COMPATIBILITY IDEOGRAPH-FA0E;Lo;0;L;;;;;N;;;;;
+FA0F;CJK COMPATIBILITY IDEOGRAPH-FA0F;Lo;0;L;;;;;N;;;;;
+FA10;CJK COMPATIBILITY IDEOGRAPH-FA10;Lo;0;L;585A;;;;N;;;;;
+FA11;CJK COMPATIBILITY IDEOGRAPH-FA11;Lo;0;L;;;;;N;;;;;
+FA12;CJK COMPATIBILITY IDEOGRAPH-FA12;Lo;0;L;6674;;;;N;;;;;
+FA13;CJK COMPATIBILITY IDEOGRAPH-FA13;Lo;0;L;;;;;N;;;;;
+FA14;CJK COMPATIBILITY IDEOGRAPH-FA14;Lo;0;L;;;;;N;;;;;
+FA15;CJK COMPATIBILITY IDEOGRAPH-FA15;Lo;0;L;51DE;;;;N;;;;;
+FA16;CJK COMPATIBILITY IDEOGRAPH-FA16;Lo;0;L;732A;;;;N;;;;;
+FA17;CJK COMPATIBILITY IDEOGRAPH-FA17;Lo;0;L;76CA;;;;N;;;;;
+FA18;CJK COMPATIBILITY IDEOGRAPH-FA18;Lo;0;L;793C;;;;N;;;;;
+FA19;CJK COMPATIBILITY IDEOGRAPH-FA19;Lo;0;L;795E;;;;N;;;;;
+FA1A;CJK COMPATIBILITY IDEOGRAPH-FA1A;Lo;0;L;7965;;;;N;;;;;
+FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;;
+FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;;
+FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;;
+FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;;
+FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;;;;
+FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;;
+FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;;
+FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;;
+FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;;;;
+FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;;
+FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;;
+FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;;
+FA27;CJK COMPATIBILITY IDEOGRAPH-FA27;Lo;0;L;;;;;N;;;;;
+FA28;CJK COMPATIBILITY IDEOGRAPH-FA28;Lo;0;L;;;;;N;;;;;
+FA29;CJK COMPATIBILITY IDEOGRAPH-FA29;Lo;0;L;;;;;N;;;;;
+FA2A;CJK COMPATIBILITY IDEOGRAPH-FA2A;Lo;0;L;98EF;;;;N;;;;;
+FA2B;CJK COMPATIBILITY IDEOGRAPH-FA2B;Lo;0;L;98FC;;;;N;;;;;
+FA2C;CJK COMPATIBILITY IDEOGRAPH-FA2C;Lo;0;L;9928;;;;N;;;;;
+FA2D;CJK COMPATIBILITY IDEOGRAPH-FA2D;Lo;0;L;9DB4;;;;N;;;;;
+FA2E;CJK COMPATIBILITY IDEOGRAPH-FA2E;Lo;0;L;90DE;;;;N;;;;;
+FA2F;CJK COMPATIBILITY IDEOGRAPH-FA2F;Lo;0;L;96B7;;;;N;;;;;
+FA30;CJK COMPATIBILITY IDEOGRAPH-FA30;Lo;0;L;4FAE;;;;N;;;;;
+FA31;CJK COMPATIBILITY IDEOGRAPH-FA31;Lo;0;L;50E7;;;;N;;;;;
+FA32;CJK COMPATIBILITY IDEOGRAPH-FA32;Lo;0;L;514D;;;;N;;;;;
+FA33;CJK COMPATIBILITY IDEOGRAPH-FA33;Lo;0;L;52C9;;;;N;;;;;
+FA34;CJK COMPATIBILITY IDEOGRAPH-FA34;Lo;0;L;52E4;;;;N;;;;;
+FA35;CJK COMPATIBILITY IDEOGRAPH-FA35;Lo;0;L;5351;;;;N;;;;;
+FA36;CJK COMPATIBILITY IDEOGRAPH-FA36;Lo;0;L;559D;;;;N;;;;;
+FA37;CJK COMPATIBILITY IDEOGRAPH-FA37;Lo;0;L;5606;;;;N;;;;;
+FA38;CJK COMPATIBILITY IDEOGRAPH-FA38;Lo;0;L;5668;;;;N;;;;;
+FA39;CJK COMPATIBILITY IDEOGRAPH-FA39;Lo;0;L;5840;;;;N;;;;;
+FA3A;CJK COMPATIBILITY IDEOGRAPH-FA3A;Lo;0;L;58A8;;;;N;;;;;
+FA3B;CJK COMPATIBILITY IDEOGRAPH-FA3B;Lo;0;L;5C64;;;;N;;;;;
+FA3C;CJK COMPATIBILITY IDEOGRAPH-FA3C;Lo;0;L;5C6E;;;;N;;;;;
+FA3D;CJK COMPATIBILITY IDEOGRAPH-FA3D;Lo;0;L;6094;;;;N;;;;;
+FA3E;CJK COMPATIBILITY IDEOGRAPH-FA3E;Lo;0;L;6168;;;;N;;;;;
+FA3F;CJK COMPATIBILITY IDEOGRAPH-FA3F;Lo;0;L;618E;;;;N;;;;;
+FA40;CJK COMPATIBILITY IDEOGRAPH-FA40;Lo;0;L;61F2;;;;N;;;;;
+FA41;CJK COMPATIBILITY IDEOGRAPH-FA41;Lo;0;L;654F;;;;N;;;;;
+FA42;CJK COMPATIBILITY IDEOGRAPH-FA42;Lo;0;L;65E2;;;;N;;;;;
+FA43;CJK COMPATIBILITY IDEOGRAPH-FA43;Lo;0;L;6691;;;;N;;;;;
+FA44;CJK COMPATIBILITY IDEOGRAPH-FA44;Lo;0;L;6885;;;;N;;;;;
+FA45;CJK COMPATIBILITY IDEOGRAPH-FA45;Lo;0;L;6D77;;;;N;;;;;
+FA46;CJK COMPATIBILITY IDEOGRAPH-FA46;Lo;0;L;6E1A;;;;N;;;;;
+FA47;CJK COMPATIBILITY IDEOGRAPH-FA47;Lo;0;L;6F22;;;;N;;;;;
+FA48;CJK COMPATIBILITY IDEOGRAPH-FA48;Lo;0;L;716E;;;;N;;;;;
+FA49;CJK COMPATIBILITY IDEOGRAPH-FA49;Lo;0;L;722B;;;;N;;;;;
+FA4A;CJK COMPATIBILITY IDEOGRAPH-FA4A;Lo;0;L;7422;;;;N;;;;;
+FA4B;CJK COMPATIBILITY IDEOGRAPH-FA4B;Lo;0;L;7891;;;;N;;;;;
+FA4C;CJK COMPATIBILITY IDEOGRAPH-FA4C;Lo;0;L;793E;;;;N;;;;;
+FA4D;CJK COMPATIBILITY IDEOGRAPH-FA4D;Lo;0;L;7949;;;;N;;;;;
+FA4E;CJK COMPATIBILITY IDEOGRAPH-FA4E;Lo;0;L;7948;;;;N;;;;;
+FA4F;CJK COMPATIBILITY IDEOGRAPH-FA4F;Lo;0;L;7950;;;;N;;;;;
+FA50;CJK COMPATIBILITY IDEOGRAPH-FA50;Lo;0;L;7956;;;;N;;;;;
+FA51;CJK COMPATIBILITY IDEOGRAPH-FA51;Lo;0;L;795D;;;;N;;;;;
+FA52;CJK COMPATIBILITY IDEOGRAPH-FA52;Lo;0;L;798D;;;;N;;;;;
+FA53;CJK COMPATIBILITY IDEOGRAPH-FA53;Lo;0;L;798E;;;;N;;;;;
+FA54;CJK COMPATIBILITY IDEOGRAPH-FA54;Lo;0;L;7A40;;;;N;;;;;
+FA55;CJK COMPATIBILITY IDEOGRAPH-FA55;Lo;0;L;7A81;;;;N;;;;;
+FA56;CJK COMPATIBILITY IDEOGRAPH-FA56;Lo;0;L;7BC0;;;;N;;;;;
+FA57;CJK COMPATIBILITY IDEOGRAPH-FA57;Lo;0;L;7DF4;;;;N;;;;;
+FA58;CJK COMPATIBILITY IDEOGRAPH-FA58;Lo;0;L;7E09;;;;N;;;;;
+FA59;CJK COMPATIBILITY IDEOGRAPH-FA59;Lo;0;L;7E41;;;;N;;;;;
+FA5A;CJK COMPATIBILITY IDEOGRAPH-FA5A;Lo;0;L;7F72;;;;N;;;;;
+FA5B;CJK COMPATIBILITY IDEOGRAPH-FA5B;Lo;0;L;8005;;;;N;;;;;
+FA5C;CJK COMPATIBILITY IDEOGRAPH-FA5C;Lo;0;L;81ED;;;;N;;;;;
+FA5D;CJK COMPATIBILITY IDEOGRAPH-FA5D;Lo;0;L;8279;;;;N;;;;;
+FA5E;CJK COMPATIBILITY IDEOGRAPH-FA5E;Lo;0;L;8279;;;;N;;;;;
+FA5F;CJK COMPATIBILITY IDEOGRAPH-FA5F;Lo;0;L;8457;;;;N;;;;;
+FA60;CJK COMPATIBILITY IDEOGRAPH-FA60;Lo;0;L;8910;;;;N;;;;;
+FA61;CJK COMPATIBILITY IDEOGRAPH-FA61;Lo;0;L;8996;;;;N;;;;;
+FA62;CJK COMPATIBILITY IDEOGRAPH-FA62;Lo;0;L;8B01;;;;N;;;;;
+FA63;CJK COMPATIBILITY IDEOGRAPH-FA63;Lo;0;L;8B39;;;;N;;;;;
+FA64;CJK COMPATIBILITY IDEOGRAPH-FA64;Lo;0;L;8CD3;;;;N;;;;;
+FA65;CJK COMPATIBILITY IDEOGRAPH-FA65;Lo;0;L;8D08;;;;N;;;;;
+FA66;CJK COMPATIBILITY IDEOGRAPH-FA66;Lo;0;L;8FB6;;;;N;;;;;
+FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;;
+FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;;
+FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;;
+FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;;
+FA6B;CJK COMPATIBILITY IDEOGRAPH-FA6B;Lo;0;L;6075;;;;N;;;;;
+FA6C;CJK COMPATIBILITY IDEOGRAPH-FA6C;Lo;0;L;242EE;;;;N;;;;;
+FA6D;CJK COMPATIBILITY IDEOGRAPH-FA6D;Lo;0;L;8218;;;;N;;;;;
+FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;;
+FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;;
+FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;;
+FA73;CJK COMPATIBILITY IDEOGRAPH-FA73;Lo;0;L;4F80;;;;N;;;;;
+FA74;CJK COMPATIBILITY IDEOGRAPH-FA74;Lo;0;L;5145;;;;N;;;;;
+FA75;CJK COMPATIBILITY IDEOGRAPH-FA75;Lo;0;L;5180;;;;N;;;;;
+FA76;CJK COMPATIBILITY IDEOGRAPH-FA76;Lo;0;L;52C7;;;;N;;;;;
+FA77;CJK COMPATIBILITY IDEOGRAPH-FA77;Lo;0;L;52FA;;;;N;;;;;
+FA78;CJK COMPATIBILITY IDEOGRAPH-FA78;Lo;0;L;559D;;;;N;;;;;
+FA79;CJK COMPATIBILITY IDEOGRAPH-FA79;Lo;0;L;5555;;;;N;;;;;
+FA7A;CJK COMPATIBILITY IDEOGRAPH-FA7A;Lo;0;L;5599;;;;N;;;;;
+FA7B;CJK COMPATIBILITY IDEOGRAPH-FA7B;Lo;0;L;55E2;;;;N;;;;;
+FA7C;CJK COMPATIBILITY IDEOGRAPH-FA7C;Lo;0;L;585A;;;;N;;;;;
+FA7D;CJK COMPATIBILITY IDEOGRAPH-FA7D;Lo;0;L;58B3;;;;N;;;;;
+FA7E;CJK COMPATIBILITY IDEOGRAPH-FA7E;Lo;0;L;5944;;;;N;;;;;
+FA7F;CJK COMPATIBILITY IDEOGRAPH-FA7F;Lo;0;L;5954;;;;N;;;;;
+FA80;CJK COMPATIBILITY IDEOGRAPH-FA80;Lo;0;L;5A62;;;;N;;;;;
+FA81;CJK COMPATIBILITY IDEOGRAPH-FA81;Lo;0;L;5B28;;;;N;;;;;
+FA82;CJK COMPATIBILITY IDEOGRAPH-FA82;Lo;0;L;5ED2;;;;N;;;;;
+FA83;CJK COMPATIBILITY IDEOGRAPH-FA83;Lo;0;L;5ED9;;;;N;;;;;
+FA84;CJK COMPATIBILITY IDEOGRAPH-FA84;Lo;0;L;5F69;;;;N;;;;;
+FA85;CJK COMPATIBILITY IDEOGRAPH-FA85;Lo;0;L;5FAD;;;;N;;;;;
+FA86;CJK COMPATIBILITY IDEOGRAPH-FA86;Lo;0;L;60D8;;;;N;;;;;
+FA87;CJK COMPATIBILITY IDEOGRAPH-FA87;Lo;0;L;614E;;;;N;;;;;
+FA88;CJK COMPATIBILITY IDEOGRAPH-FA88;Lo;0;L;6108;;;;N;;;;;
+FA89;CJK COMPATIBILITY IDEOGRAPH-FA89;Lo;0;L;618E;;;;N;;;;;
+FA8A;CJK COMPATIBILITY IDEOGRAPH-FA8A;Lo;0;L;6160;;;;N;;;;;
+FA8B;CJK COMPATIBILITY IDEOGRAPH-FA8B;Lo;0;L;61F2;;;;N;;;;;
+FA8C;CJK COMPATIBILITY IDEOGRAPH-FA8C;Lo;0;L;6234;;;;N;;;;;
+FA8D;CJK COMPATIBILITY IDEOGRAPH-FA8D;Lo;0;L;63C4;;;;N;;;;;
+FA8E;CJK COMPATIBILITY IDEOGRAPH-FA8E;Lo;0;L;641C;;;;N;;;;;
+FA8F;CJK COMPATIBILITY IDEOGRAPH-FA8F;Lo;0;L;6452;;;;N;;;;;
+FA90;CJK COMPATIBILITY IDEOGRAPH-FA90;Lo;0;L;6556;;;;N;;;;;
+FA91;CJK COMPATIBILITY IDEOGRAPH-FA91;Lo;0;L;6674;;;;N;;;;;
+FA92;CJK COMPATIBILITY IDEOGRAPH-FA92;Lo;0;L;6717;;;;N;;;;;
+FA93;CJK COMPATIBILITY IDEOGRAPH-FA93;Lo;0;L;671B;;;;N;;;;;
+FA94;CJK COMPATIBILITY IDEOGRAPH-FA94;Lo;0;L;6756;;;;N;;;;;
+FA95;CJK COMPATIBILITY IDEOGRAPH-FA95;Lo;0;L;6B79;;;;N;;;;;
+FA96;CJK COMPATIBILITY IDEOGRAPH-FA96;Lo;0;L;6BBA;;;;N;;;;;
+FA97;CJK COMPATIBILITY IDEOGRAPH-FA97;Lo;0;L;6D41;;;;N;;;;;
+FA98;CJK COMPATIBILITY IDEOGRAPH-FA98;Lo;0;L;6EDB;;;;N;;;;;
+FA99;CJK COMPATIBILITY IDEOGRAPH-FA99;Lo;0;L;6ECB;;;;N;;;;;
+FA9A;CJK COMPATIBILITY IDEOGRAPH-FA9A;Lo;0;L;6F22;;;;N;;;;;
+FA9B;CJK COMPATIBILITY IDEOGRAPH-FA9B;Lo;0;L;701E;;;;N;;;;;
+FA9C;CJK COMPATIBILITY IDEOGRAPH-FA9C;Lo;0;L;716E;;;;N;;;;;
+FA9D;CJK COMPATIBILITY IDEOGRAPH-FA9D;Lo;0;L;77A7;;;;N;;;;;
+FA9E;CJK COMPATIBILITY IDEOGRAPH-FA9E;Lo;0;L;7235;;;;N;;;;;
+FA9F;CJK COMPATIBILITY IDEOGRAPH-FA9F;Lo;0;L;72AF;;;;N;;;;;
+FAA0;CJK COMPATIBILITY IDEOGRAPH-FAA0;Lo;0;L;732A;;;;N;;;;;
+FAA1;CJK COMPATIBILITY IDEOGRAPH-FAA1;Lo;0;L;7471;;;;N;;;;;
+FAA2;CJK COMPATIBILITY IDEOGRAPH-FAA2;Lo;0;L;7506;;;;N;;;;;
+FAA3;CJK COMPATIBILITY IDEOGRAPH-FAA3;Lo;0;L;753B;;;;N;;;;;
+FAA4;CJK COMPATIBILITY IDEOGRAPH-FAA4;Lo;0;L;761D;;;;N;;;;;
+FAA5;CJK COMPATIBILITY IDEOGRAPH-FAA5;Lo;0;L;761F;;;;N;;;;;
+FAA6;CJK COMPATIBILITY IDEOGRAPH-FAA6;Lo;0;L;76CA;;;;N;;;;;
+FAA7;CJK COMPATIBILITY IDEOGRAPH-FAA7;Lo;0;L;76DB;;;;N;;;;;
+FAA8;CJK COMPATIBILITY IDEOGRAPH-FAA8;Lo;0;L;76F4;;;;N;;;;;
+FAA9;CJK COMPATIBILITY IDEOGRAPH-FAA9;Lo;0;L;774A;;;;N;;;;;
+FAAA;CJK COMPATIBILITY IDEOGRAPH-FAAA;Lo;0;L;7740;;;;N;;;;;
+FAAB;CJK COMPATIBILITY IDEOGRAPH-FAAB;Lo;0;L;78CC;;;;N;;;;;
+FAAC;CJK COMPATIBILITY IDEOGRAPH-FAAC;Lo;0;L;7AB1;;;;N;;;;;
+FAAD;CJK COMPATIBILITY IDEOGRAPH-FAAD;Lo;0;L;7BC0;;;;N;;;;;
+FAAE;CJK COMPATIBILITY IDEOGRAPH-FAAE;Lo;0;L;7C7B;;;;N;;;;;
+FAAF;CJK COMPATIBILITY IDEOGRAPH-FAAF;Lo;0;L;7D5B;;;;N;;;;;
+FAB0;CJK COMPATIBILITY IDEOGRAPH-FAB0;Lo;0;L;7DF4;;;;N;;;;;
+FAB1;CJK COMPATIBILITY IDEOGRAPH-FAB1;Lo;0;L;7F3E;;;;N;;;;;
+FAB2;CJK COMPATIBILITY IDEOGRAPH-FAB2;Lo;0;L;8005;;;;N;;;;;
+FAB3;CJK COMPATIBILITY IDEOGRAPH-FAB3;Lo;0;L;8352;;;;N;;;;;
+FAB4;CJK COMPATIBILITY IDEOGRAPH-FAB4;Lo;0;L;83EF;;;;N;;;;;
+FAB5;CJK COMPATIBILITY IDEOGRAPH-FAB5;Lo;0;L;8779;;;;N;;;;;
+FAB6;CJK COMPATIBILITY IDEOGRAPH-FAB6;Lo;0;L;8941;;;;N;;;;;
+FAB7;CJK COMPATIBILITY IDEOGRAPH-FAB7;Lo;0;L;8986;;;;N;;;;;
+FAB8;CJK COMPATIBILITY IDEOGRAPH-FAB8;Lo;0;L;8996;;;;N;;;;;
+FAB9;CJK COMPATIBILITY IDEOGRAPH-FAB9;Lo;0;L;8ABF;;;;N;;;;;
+FABA;CJK COMPATIBILITY IDEOGRAPH-FABA;Lo;0;L;8AF8;;;;N;;;;;
+FABB;CJK COMPATIBILITY IDEOGRAPH-FABB;Lo;0;L;8ACB;;;;N;;;;;
+FABC;CJK COMPATIBILITY IDEOGRAPH-FABC;Lo;0;L;8B01;;;;N;;;;;
+FABD;CJK COMPATIBILITY IDEOGRAPH-FABD;Lo;0;L;8AFE;;;;N;;;;;
+FABE;CJK COMPATIBILITY IDEOGRAPH-FABE;Lo;0;L;8AED;;;;N;;;;;
+FABF;CJK COMPATIBILITY IDEOGRAPH-FABF;Lo;0;L;8B39;;;;N;;;;;
+FAC0;CJK COMPATIBILITY IDEOGRAPH-FAC0;Lo;0;L;8B8A;;;;N;;;;;
+FAC1;CJK COMPATIBILITY IDEOGRAPH-FAC1;Lo;0;L;8D08;;;;N;;;;;
+FAC2;CJK COMPATIBILITY IDEOGRAPH-FAC2;Lo;0;L;8F38;;;;N;;;;;
+FAC3;CJK COMPATIBILITY IDEOGRAPH-FAC3;Lo;0;L;9072;;;;N;;;;;
+FAC4;CJK COMPATIBILITY IDEOGRAPH-FAC4;Lo;0;L;9199;;;;N;;;;;
+FAC5;CJK COMPATIBILITY IDEOGRAPH-FAC5;Lo;0;L;9276;;;;N;;;;;
+FAC6;CJK COMPATIBILITY IDEOGRAPH-FAC6;Lo;0;L;967C;;;;N;;;;;
+FAC7;CJK COMPATIBILITY IDEOGRAPH-FAC7;Lo;0;L;96E3;;;;N;;;;;
+FAC8;CJK COMPATIBILITY IDEOGRAPH-FAC8;Lo;0;L;9756;;;;N;;;;;
+FAC9;CJK COMPATIBILITY IDEOGRAPH-FAC9;Lo;0;L;97DB;;;;N;;;;;
+FACA;CJK COMPATIBILITY IDEOGRAPH-FACA;Lo;0;L;97FF;;;;N;;;;;
+FACB;CJK COMPATIBILITY IDEOGRAPH-FACB;Lo;0;L;980B;;;;N;;;;;
+FACC;CJK COMPATIBILITY IDEOGRAPH-FACC;Lo;0;L;983B;;;;N;;;;;
+FACD;CJK COMPATIBILITY IDEOGRAPH-FACD;Lo;0;L;9B12;;;;N;;;;;
+FACE;CJK COMPATIBILITY IDEOGRAPH-FACE;Lo;0;L;9F9C;;;;N;;;;;
+FACF;CJK COMPATIBILITY IDEOGRAPH-FACF;Lo;0;L;2284A;;;;N;;;;;
+FAD0;CJK COMPATIBILITY IDEOGRAPH-FAD0;Lo;0;L;22844;;;;N;;;;;
+FAD1;CJK COMPATIBILITY IDEOGRAPH-FAD1;Lo;0;L;233D5;;;;N;;;;;
+FAD2;CJK COMPATIBILITY IDEOGRAPH-FAD2;Lo;0;L;3B9D;;;;N;;;;;
+FAD3;CJK COMPATIBILITY IDEOGRAPH-FAD3;Lo;0;L;4018;;;;N;;;;;
+FAD4;CJK COMPATIBILITY IDEOGRAPH-FAD4;Lo;0;L;4039;;;;N;;;;;
+FAD5;CJK COMPATIBILITY IDEOGRAPH-FAD5;Lo;0;L;25249;;;;N;;;;;
+FAD6;CJK COMPATIBILITY IDEOGRAPH-FAD6;Lo;0;L;25CD0;;;;N;;;;;
+FAD7;CJK COMPATIBILITY IDEOGRAPH-FAD7;Lo;0;L;27ED3;;;;N;;;;;
+FAD8;CJK COMPATIBILITY IDEOGRAPH-FAD8;Lo;0;L;9F43;;;;N;;;;;
+FAD9;CJK COMPATIBILITY IDEOGRAPH-FAD9;Lo;0;L;9F8E;;;;N;;;;;
+FB00;LATIN SMALL LIGATURE FF;Ll;0;L;<compat> 0066 0066;;;;N;;;;;
+FB01;LATIN SMALL LIGATURE FI;Ll;0;L;<compat> 0066 0069;;;;N;;;;;
+FB02;LATIN SMALL LIGATURE FL;Ll;0;L;<compat> 0066 006C;;;;N;;;;;
+FB03;LATIN SMALL LIGATURE FFI;Ll;0;L;<compat> 0066 0066 0069;;;;N;;;;;
+FB04;LATIN SMALL LIGATURE FFL;Ll;0;L;<compat> 0066 0066 006C;;;;N;;;;;
+FB05;LATIN SMALL LIGATURE LONG S T;Ll;0;L;<compat> 017F 0074;;;;N;;;;;
+FB06;LATIN SMALL LIGATURE ST;Ll;0;L;<compat> 0073 0074;;;;N;;;;;
+FB13;ARMENIAN SMALL LIGATURE MEN NOW;Ll;0;L;<compat> 0574 0576;;;;N;;;;;
+FB14;ARMENIAN SMALL LIGATURE MEN ECH;Ll;0;L;<compat> 0574 0565;;;;N;;;;;
+FB15;ARMENIAN SMALL LIGATURE MEN INI;Ll;0;L;<compat> 0574 056B;;;;N;;;;;
+FB16;ARMENIAN SMALL LIGATURE VEW NOW;Ll;0;L;<compat> 057E 0576;;;;N;;;;;
+FB17;ARMENIAN SMALL LIGATURE MEN XEH;Ll;0;L;<compat> 0574 056D;;;;N;;;;;
+FB1D;HEBREW LETTER YOD WITH HIRIQ;Lo;0;R;05D9 05B4;;;;N;;;;;
+FB1E;HEBREW POINT JUDEO-SPANISH VARIKA;Mn;26;NSM;;;;;N;HEBREW POINT VARIKA;;;;
+FB1F;HEBREW LIGATURE YIDDISH YOD YOD PATAH;Lo;0;R;05F2 05B7;;;;N;;;;;
+FB20;HEBREW LETTER ALTERNATIVE AYIN;Lo;0;R;<font> 05E2;;;;N;;;;;
+FB21;HEBREW LETTER WIDE ALEF;Lo;0;R;<font> 05D0;;;;N;;;;;
+FB22;HEBREW LETTER WIDE DALET;Lo;0;R;<font> 05D3;;;;N;;;;;
+FB23;HEBREW LETTER WIDE HE;Lo;0;R;<font> 05D4;;;;N;;;;;
+FB24;HEBREW LETTER WIDE KAF;Lo;0;R;<font> 05DB;;;;N;;;;;
+FB25;HEBREW LETTER WIDE LAMED;Lo;0;R;<font> 05DC;;;;N;;;;;
+FB26;HEBREW LETTER WIDE FINAL MEM;Lo;0;R;<font> 05DD;;;;N;;;;;
+FB27;HEBREW LETTER WIDE RESH;Lo;0;R;<font> 05E8;;;;N;;;;;
+FB28;HEBREW LETTER WIDE TAV;Lo;0;R;<font> 05EA;;;;N;;;;;
+FB29;HEBREW LETTER ALTERNATIVE PLUS SIGN;Sm;0;ES;<font> 002B;;;;N;;;;;
+FB2A;HEBREW LETTER SHIN WITH SHIN DOT;Lo;0;R;05E9 05C1;;;;N;;;;;
+FB2B;HEBREW LETTER SHIN WITH SIN DOT;Lo;0;R;05E9 05C2;;;;N;;;;;
+FB2C;HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT;Lo;0;R;FB49 05C1;;;;N;;;;;
+FB2D;HEBREW LETTER SHIN WITH DAGESH AND SIN DOT;Lo;0;R;FB49 05C2;;;;N;;;;;
+FB2E;HEBREW LETTER ALEF WITH PATAH;Lo;0;R;05D0 05B7;;;;N;;;;;
+FB2F;HEBREW LETTER ALEF WITH QAMATS;Lo;0;R;05D0 05B8;;;;N;;;;;
+FB30;HEBREW LETTER ALEF WITH MAPIQ;Lo;0;R;05D0 05BC;;;;N;;;;;
+FB31;HEBREW LETTER BET WITH DAGESH;Lo;0;R;05D1 05BC;;;;N;;;;;
+FB32;HEBREW LETTER GIMEL WITH DAGESH;Lo;0;R;05D2 05BC;;;;N;;;;;
+FB33;HEBREW LETTER DALET WITH DAGESH;Lo;0;R;05D3 05BC;;;;N;;;;;
+FB34;HEBREW LETTER HE WITH MAPIQ;Lo;0;R;05D4 05BC;;;;N;;;;;
+FB35;HEBREW LETTER VAV WITH DAGESH;Lo;0;R;05D5 05BC;;;;N;;;;;
+FB36;HEBREW LETTER ZAYIN WITH DAGESH;Lo;0;R;05D6 05BC;;;;N;;;;;
+FB38;HEBREW LETTER TET WITH DAGESH;Lo;0;R;05D8 05BC;;;;N;;;;;
+FB39;HEBREW LETTER YOD WITH DAGESH;Lo;0;R;05D9 05BC;;;;N;;;;;
+FB3A;HEBREW LETTER FINAL KAF WITH DAGESH;Lo;0;R;05DA 05BC;;;;N;;;;;
+FB3B;HEBREW LETTER KAF WITH DAGESH;Lo;0;R;05DB 05BC;;;;N;;;;;
+FB3C;HEBREW LETTER LAMED WITH DAGESH;Lo;0;R;05DC 05BC;;;;N;;;;;
+FB3E;HEBREW LETTER MEM WITH DAGESH;Lo;0;R;05DE 05BC;;;;N;;;;;
+FB40;HEBREW LETTER NUN WITH DAGESH;Lo;0;R;05E0 05BC;;;;N;;;;;
+FB41;HEBREW LETTER SAMEKH WITH DAGESH;Lo;0;R;05E1 05BC;;;;N;;;;;
+FB43;HEBREW LETTER FINAL PE WITH DAGESH;Lo;0;R;05E3 05BC;;;;N;;;;;
+FB44;HEBREW LETTER PE WITH DAGESH;Lo;0;R;05E4 05BC;;;;N;;;;;
+FB46;HEBREW LETTER TSADI WITH DAGESH;Lo;0;R;05E6 05BC;;;;N;;;;;
+FB47;HEBREW LETTER QOF WITH DAGESH;Lo;0;R;05E7 05BC;;;;N;;;;;
+FB48;HEBREW LETTER RESH WITH DAGESH;Lo;0;R;05E8 05BC;;;;N;;;;;
+FB49;HEBREW LETTER SHIN WITH DAGESH;Lo;0;R;05E9 05BC;;;;N;;;;;
+FB4A;HEBREW LETTER TAV WITH DAGESH;Lo;0;R;05EA 05BC;;;;N;;;;;
+FB4B;HEBREW LETTER VAV WITH HOLAM;Lo;0;R;05D5 05B9;;;;N;;;;;
+FB4C;HEBREW LETTER BET WITH RAFE;Lo;0;R;05D1 05BF;;;;N;;;;;
+FB4D;HEBREW LETTER KAF WITH RAFE;Lo;0;R;05DB 05BF;;;;N;;;;;
+FB4E;HEBREW LETTER PE WITH RAFE;Lo;0;R;05E4 05BF;;;;N;;;;;
+FB4F;HEBREW LIGATURE ALEF LAMED;Lo;0;R;<compat> 05D0 05DC;;;;N;;;;;
+FB50;ARABIC LETTER ALEF WASLA ISOLATED FORM;Lo;0;AL;<isolated> 0671;;;;N;;;;;
+FB51;ARABIC LETTER ALEF WASLA FINAL FORM;Lo;0;AL;<final> 0671;;;;N;;;;;
+FB52;ARABIC LETTER BEEH ISOLATED FORM;Lo;0;AL;<isolated> 067B;;;;N;;;;;
+FB53;ARABIC LETTER BEEH FINAL FORM;Lo;0;AL;<final> 067B;;;;N;;;;;
+FB54;ARABIC LETTER BEEH INITIAL FORM;Lo;0;AL;<initial> 067B;;;;N;;;;;
+FB55;ARABIC LETTER BEEH MEDIAL FORM;Lo;0;AL;<medial> 067B;;;;N;;;;;
+FB56;ARABIC LETTER PEH ISOLATED FORM;Lo;0;AL;<isolated> 067E;;;;N;;;;;
+FB57;ARABIC LETTER PEH FINAL FORM;Lo;0;AL;<final> 067E;;;;N;;;;;
+FB58;ARABIC LETTER PEH INITIAL FORM;Lo;0;AL;<initial> 067E;;;;N;;;;;
+FB59;ARABIC LETTER PEH MEDIAL FORM;Lo;0;AL;<medial> 067E;;;;N;;;;;
+FB5A;ARABIC LETTER BEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0680;;;;N;;;;;
+FB5B;ARABIC LETTER BEHEH FINAL FORM;Lo;0;AL;<final> 0680;;;;N;;;;;
+FB5C;ARABIC LETTER BEHEH INITIAL FORM;Lo;0;AL;<initial> 0680;;;;N;;;;;
+FB5D;ARABIC LETTER BEHEH MEDIAL FORM;Lo;0;AL;<medial> 0680;;;;N;;;;;
+FB5E;ARABIC LETTER TTEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067A;;;;N;;;;;
+FB5F;ARABIC LETTER TTEHEH FINAL FORM;Lo;0;AL;<final> 067A;;;;N;;;;;
+FB60;ARABIC LETTER TTEHEH INITIAL FORM;Lo;0;AL;<initial> 067A;;;;N;;;;;
+FB61;ARABIC LETTER TTEHEH MEDIAL FORM;Lo;0;AL;<medial> 067A;;;;N;;;;;
+FB62;ARABIC LETTER TEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067F;;;;N;;;;;
+FB63;ARABIC LETTER TEHEH FINAL FORM;Lo;0;AL;<final> 067F;;;;N;;;;;
+FB64;ARABIC LETTER TEHEH INITIAL FORM;Lo;0;AL;<initial> 067F;;;;N;;;;;
+FB65;ARABIC LETTER TEHEH MEDIAL FORM;Lo;0;AL;<medial> 067F;;;;N;;;;;
+FB66;ARABIC LETTER TTEH ISOLATED FORM;Lo;0;AL;<isolated> 0679;;;;N;;;;;
+FB67;ARABIC LETTER TTEH FINAL FORM;Lo;0;AL;<final> 0679;;;;N;;;;;
+FB68;ARABIC LETTER TTEH INITIAL FORM;Lo;0;AL;<initial> 0679;;;;N;;;;;
+FB69;ARABIC LETTER TTEH MEDIAL FORM;Lo;0;AL;<medial> 0679;;;;N;;;;;
+FB6A;ARABIC LETTER VEH ISOLATED FORM;Lo;0;AL;<isolated> 06A4;;;;N;;;;;
+FB6B;ARABIC LETTER VEH FINAL FORM;Lo;0;AL;<final> 06A4;;;;N;;;;;
+FB6C;ARABIC LETTER VEH INITIAL FORM;Lo;0;AL;<initial> 06A4;;;;N;;;;;
+FB6D;ARABIC LETTER VEH MEDIAL FORM;Lo;0;AL;<medial> 06A4;;;;N;;;;;
+FB6E;ARABIC LETTER PEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A6;;;;N;;;;;
+FB6F;ARABIC LETTER PEHEH FINAL FORM;Lo;0;AL;<final> 06A6;;;;N;;;;;
+FB70;ARABIC LETTER PEHEH INITIAL FORM;Lo;0;AL;<initial> 06A6;;;;N;;;;;
+FB71;ARABIC LETTER PEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A6;;;;N;;;;;
+FB72;ARABIC LETTER DYEH ISOLATED FORM;Lo;0;AL;<isolated> 0684;;;;N;;;;;
+FB73;ARABIC LETTER DYEH FINAL FORM;Lo;0;AL;<final> 0684;;;;N;;;;;
+FB74;ARABIC LETTER DYEH INITIAL FORM;Lo;0;AL;<initial> 0684;;;;N;;;;;
+FB75;ARABIC LETTER DYEH MEDIAL FORM;Lo;0;AL;<medial> 0684;;;;N;;;;;
+FB76;ARABIC LETTER NYEH ISOLATED FORM;Lo;0;AL;<isolated> 0683;;;;N;;;;;
+FB77;ARABIC LETTER NYEH FINAL FORM;Lo;0;AL;<final> 0683;;;;N;;;;;
+FB78;ARABIC LETTER NYEH INITIAL FORM;Lo;0;AL;<initial> 0683;;;;N;;;;;
+FB79;ARABIC LETTER NYEH MEDIAL FORM;Lo;0;AL;<medial> 0683;;;;N;;;;;
+FB7A;ARABIC LETTER TCHEH ISOLATED FORM;Lo;0;AL;<isolated> 0686;;;;N;;;;;
+FB7B;ARABIC LETTER TCHEH FINAL FORM;Lo;0;AL;<final> 0686;;;;N;;;;;
+FB7C;ARABIC LETTER TCHEH INITIAL FORM;Lo;0;AL;<initial> 0686;;;;N;;;;;
+FB7D;ARABIC LETTER TCHEH MEDIAL FORM;Lo;0;AL;<medial> 0686;;;;N;;;;;
+FB7E;ARABIC LETTER TCHEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0687;;;;N;;;;;
+FB7F;ARABIC LETTER TCHEHEH FINAL FORM;Lo;0;AL;<final> 0687;;;;N;;;;;
+FB80;ARABIC LETTER TCHEHEH INITIAL FORM;Lo;0;AL;<initial> 0687;;;;N;;;;;
+FB81;ARABIC LETTER TCHEHEH MEDIAL FORM;Lo;0;AL;<medial> 0687;;;;N;;;;;
+FB82;ARABIC LETTER DDAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068D;;;;N;;;;;
+FB83;ARABIC LETTER DDAHAL FINAL FORM;Lo;0;AL;<final> 068D;;;;N;;;;;
+FB84;ARABIC LETTER DAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068C;;;;N;;;;;
+FB85;ARABIC LETTER DAHAL FINAL FORM;Lo;0;AL;<final> 068C;;;;N;;;;;
+FB86;ARABIC LETTER DUL ISOLATED FORM;Lo;0;AL;<isolated> 068E;;;;N;;;;;
+FB87;ARABIC LETTER DUL FINAL FORM;Lo;0;AL;<final> 068E;;;;N;;;;;
+FB88;ARABIC LETTER DDAL ISOLATED FORM;Lo;0;AL;<isolated> 0688;;;;N;;;;;
+FB89;ARABIC LETTER DDAL FINAL FORM;Lo;0;AL;<final> 0688;;;;N;;;;;
+FB8A;ARABIC LETTER JEH ISOLATED FORM;Lo;0;AL;<isolated> 0698;;;;N;;;;;
+FB8B;ARABIC LETTER JEH FINAL FORM;Lo;0;AL;<final> 0698;;;;N;;;;;
+FB8C;ARABIC LETTER RREH ISOLATED FORM;Lo;0;AL;<isolated> 0691;;;;N;;;;;
+FB8D;ARABIC LETTER RREH FINAL FORM;Lo;0;AL;<final> 0691;;;;N;;;;;
+FB8E;ARABIC LETTER KEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A9;;;;N;;;;;
+FB8F;ARABIC LETTER KEHEH FINAL FORM;Lo;0;AL;<final> 06A9;;;;N;;;;;
+FB90;ARABIC LETTER KEHEH INITIAL FORM;Lo;0;AL;<initial> 06A9;;;;N;;;;;
+FB91;ARABIC LETTER KEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A9;;;;N;;;;;
+FB92;ARABIC LETTER GAF ISOLATED FORM;Lo;0;AL;<isolated> 06AF;;;;N;;;;;
+FB93;ARABIC LETTER GAF FINAL FORM;Lo;0;AL;<final> 06AF;;;;N;;;;;
+FB94;ARABIC LETTER GAF INITIAL FORM;Lo;0;AL;<initial> 06AF;;;;N;;;;;
+FB95;ARABIC LETTER GAF MEDIAL FORM;Lo;0;AL;<medial> 06AF;;;;N;;;;;
+FB96;ARABIC LETTER GUEH ISOLATED FORM;Lo;0;AL;<isolated> 06B3;;;;N;;;;;
+FB97;ARABIC LETTER GUEH FINAL FORM;Lo;0;AL;<final> 06B3;;;;N;;;;;
+FB98;ARABIC LETTER GUEH INITIAL FORM;Lo;0;AL;<initial> 06B3;;;;N;;;;;
+FB99;ARABIC LETTER GUEH MEDIAL FORM;Lo;0;AL;<medial> 06B3;;;;N;;;;;
+FB9A;ARABIC LETTER NGOEH ISOLATED FORM;Lo;0;AL;<isolated> 06B1;;;;N;;;;;
+FB9B;ARABIC LETTER NGOEH FINAL FORM;Lo;0;AL;<final> 06B1;;;;N;;;;;
+FB9C;ARABIC LETTER NGOEH INITIAL FORM;Lo;0;AL;<initial> 06B1;;;;N;;;;;
+FB9D;ARABIC LETTER NGOEH MEDIAL FORM;Lo;0;AL;<medial> 06B1;;;;N;;;;;
+FB9E;ARABIC LETTER NOON GHUNNA ISOLATED FORM;Lo;0;AL;<isolated> 06BA;;;;N;;;;;
+FB9F;ARABIC LETTER NOON GHUNNA FINAL FORM;Lo;0;AL;<final> 06BA;;;;N;;;;;
+FBA0;ARABIC LETTER RNOON ISOLATED FORM;Lo;0;AL;<isolated> 06BB;;;;N;;;;;
+FBA1;ARABIC LETTER RNOON FINAL FORM;Lo;0;AL;<final> 06BB;;;;N;;;;;
+FBA2;ARABIC LETTER RNOON INITIAL FORM;Lo;0;AL;<initial> 06BB;;;;N;;;;;
+FBA3;ARABIC LETTER RNOON MEDIAL FORM;Lo;0;AL;<medial> 06BB;;;;N;;;;;
+FBA4;ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06C0;;;;N;;;;;
+FBA5;ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM;Lo;0;AL;<final> 06C0;;;;N;;;;;
+FBA6;ARABIC LETTER HEH GOAL ISOLATED FORM;Lo;0;AL;<isolated> 06C1;;;;N;;;;;
+FBA7;ARABIC LETTER HEH GOAL FINAL FORM;Lo;0;AL;<final> 06C1;;;;N;;;;;
+FBA8;ARABIC LETTER HEH GOAL INITIAL FORM;Lo;0;AL;<initial> 06C1;;;;N;;;;;
+FBA9;ARABIC LETTER HEH GOAL MEDIAL FORM;Lo;0;AL;<medial> 06C1;;;;N;;;;;
+FBAA;ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM;Lo;0;AL;<isolated> 06BE;;;;N;;;;;
+FBAB;ARABIC LETTER HEH DOACHASHMEE FINAL FORM;Lo;0;AL;<final> 06BE;;;;N;;;;;
+FBAC;ARABIC LETTER HEH DOACHASHMEE INITIAL FORM;Lo;0;AL;<initial> 06BE;;;;N;;;;;
+FBAD;ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM;Lo;0;AL;<medial> 06BE;;;;N;;;;;
+FBAE;ARABIC LETTER YEH BARREE ISOLATED FORM;Lo;0;AL;<isolated> 06D2;;;;N;;;;;
+FBAF;ARABIC LETTER YEH BARREE FINAL FORM;Lo;0;AL;<final> 06D2;;;;N;;;;;
+FBB0;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06D3;;;;N;;;;;
+FBB1;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 06D3;;;;N;;;;;
+FBB2;ARABIC SYMBOL DOT ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB3;ARABIC SYMBOL DOT BELOW;Sk;0;AL;;;;;N;;;;;
+FBB4;ARABIC SYMBOL TWO DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB5;ARABIC SYMBOL TWO DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBB6;ARABIC SYMBOL THREE DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB7;ARABIC SYMBOL THREE DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBB8;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBB9;ARABIC SYMBOL THREE DOTS POINTING DOWNWARDS BELOW;Sk;0;AL;;;;;N;;;;;
+FBBA;ARABIC SYMBOL FOUR DOTS ABOVE;Sk;0;AL;;;;;N;;;;;
+FBBB;ARABIC SYMBOL FOUR DOTS BELOW;Sk;0;AL;;;;;N;;;;;
+FBBC;ARABIC SYMBOL DOUBLE VERTICAL BAR BELOW;Sk;0;AL;;;;;N;;;;;
+FBBD;ARABIC SYMBOL TWO DOTS VERTICALLY ABOVE;Sk;0;AL;;;;;N;;;;;
+FBBE;ARABIC SYMBOL TWO DOTS VERTICALLY BELOW;Sk;0;AL;;;;;N;;;;;
+FBBF;ARABIC SYMBOL RING;Sk;0;AL;;;;;N;;;;;
+FBC0;ARABIC SYMBOL SMALL TAH ABOVE;Sk;0;AL;;;;;N;;;;;
+FBC1;ARABIC SYMBOL SMALL TAH BELOW;Sk;0;AL;;;;;N;;;;;
+FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL;<isolated> 06AD;;;;N;;;;;
+FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL;<final> 06AD;;;;N;;;;;
+FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL;<initial> 06AD;;;;N;;;;;
+FBD6;ARABIC LETTER NG MEDIAL FORM;Lo;0;AL;<medial> 06AD;;;;N;;;;;
+FBD7;ARABIC LETTER U ISOLATED FORM;Lo;0;AL;<isolated> 06C7;;;;N;;;;;
+FBD8;ARABIC LETTER U FINAL FORM;Lo;0;AL;<final> 06C7;;;;N;;;;;
+FBD9;ARABIC LETTER OE ISOLATED FORM;Lo;0;AL;<isolated> 06C6;;;;N;;;;;
+FBDA;ARABIC LETTER OE FINAL FORM;Lo;0;AL;<final> 06C6;;;;N;;;;;
+FBDB;ARABIC LETTER YU ISOLATED FORM;Lo;0;AL;<isolated> 06C8;;;;N;;;;;
+FBDC;ARABIC LETTER YU FINAL FORM;Lo;0;AL;<final> 06C8;;;;N;;;;;
+FBDD;ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0677;;;;N;;;;;
+FBDE;ARABIC LETTER VE ISOLATED FORM;Lo;0;AL;<isolated> 06CB;;;;N;;;;;
+FBDF;ARABIC LETTER VE FINAL FORM;Lo;0;AL;<final> 06CB;;;;N;;;;;
+FBE0;ARABIC LETTER KIRGHIZ OE ISOLATED FORM;Lo;0;AL;<isolated> 06C5;;;;N;;;;;
+FBE1;ARABIC LETTER KIRGHIZ OE FINAL FORM;Lo;0;AL;<final> 06C5;;;;N;;;;;
+FBE2;ARABIC LETTER KIRGHIZ YU ISOLATED FORM;Lo;0;AL;<isolated> 06C9;;;;N;;;;;
+FBE3;ARABIC LETTER KIRGHIZ YU FINAL FORM;Lo;0;AL;<final> 06C9;;;;N;;;;;
+FBE4;ARABIC LETTER E ISOLATED FORM;Lo;0;AL;<isolated> 06D0;;;;N;;;;;
+FBE5;ARABIC LETTER E FINAL FORM;Lo;0;AL;<final> 06D0;;;;N;;;;;
+FBE6;ARABIC LETTER E INITIAL FORM;Lo;0;AL;<initial> 06D0;;;;N;;;;;
+FBE7;ARABIC LETTER E MEDIAL FORM;Lo;0;AL;<medial> 06D0;;;;N;;;;;
+FBE8;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0649;;;;N;;;;;
+FBE9;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM;Lo;0;AL;<medial> 0649;;;;N;;;;;
+FBEA;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0626 0627;;;;N;;;;;
+FBEB;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM;Lo;0;AL;<final> 0626 0627;;;;N;;;;;
+FBEC;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D5;;;;N;;;;;
+FBED;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM;Lo;0;AL;<final> 0626 06D5;;;;N;;;;;
+FBEE;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM;Lo;0;AL;<isolated> 0626 0648;;;;N;;;;;
+FBEF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM;Lo;0;AL;<final> 0626 0648;;;;N;;;;;
+FBF0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C7;;;;N;;;;;
+FBF1;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM;Lo;0;AL;<final> 0626 06C7;;;;N;;;;;
+FBF2;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C6;;;;N;;;;;
+FBF3;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM;Lo;0;AL;<final> 0626 06C6;;;;N;;;;;
+FBF4;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C8;;;;N;;;;;
+FBF5;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM;Lo;0;AL;<final> 0626 06C8;;;;N;;;;;
+FBF6;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D0;;;;N;;;;;
+FBF7;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM;Lo;0;AL;<final> 0626 06D0;;;;N;;;;;
+FBF8;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM;Lo;0;AL;<initial> 0626 06D0;;;;N;;;;;
+FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0626 0649;;;;N;;;;;
+FBFC;ARABIC LETTER FARSI YEH ISOLATED FORM;Lo;0;AL;<isolated> 06CC;;;;N;;;;;
+FBFD;ARABIC LETTER FARSI YEH FINAL FORM;Lo;0;AL;<final> 06CC;;;;N;;;;;
+FBFE;ARABIC LETTER FARSI YEH INITIAL FORM;Lo;0;AL;<initial> 06CC;;;;N;;;;;
+FBFF;ARABIC LETTER FARSI YEH MEDIAL FORM;Lo;0;AL;<medial> 06CC;;;;N;;;;;
+FC00;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 062C;;;;N;;;;;
+FC01;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0626 062D;;;;N;;;;;
+FC02;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 0645;;;;N;;;;;
+FC03;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FC04;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0626 064A;;;;N;;;;;
+FC05;ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 062C;;;;N;;;;;
+FC06;ARABIC LIGATURE BEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062D;;;;N;;;;;
+FC07;ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062E;;;;N;;;;;
+FC08;ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 0645;;;;N;;;;;
+FC09;ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0628 0649;;;;N;;;;;
+FC0A;ARABIC LIGATURE BEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0628 064A;;;;N;;;;;
+FC0B;ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 062C;;;;N;;;;;
+FC0C;ARABIC LIGATURE TEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062D;;;;N;;;;;
+FC0D;ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062E;;;;N;;;;;
+FC0E;ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 0645;;;;N;;;;;
+FC0F;ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062A 0649;;;;N;;;;;
+FC10;ARABIC LIGATURE TEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062A 064A;;;;N;;;;;
+FC11;ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 062C;;;;N;;;;;
+FC12;ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 0645;;;;N;;;;;
+FC13;ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062B 0649;;;;N;;;;;
+FC14;ARABIC LIGATURE THEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062B 064A;;;;N;;;;;
+FC15;ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062C 062D;;;;N;;;;;
+FC16;ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C 0645;;;;N;;;;;
+FC17;ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 062C;;;;N;;;;;
+FC18;ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 0645;;;;N;;;;;
+FC19;ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 062C;;;;N;;;;;
+FC1A;ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062E 062D;;;;N;;;;;
+FC1B;ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 0645;;;;N;;;;;
+FC1C;ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 062C;;;;N;;;;;
+FC1D;ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062D;;;;N;;;;;
+FC1E;ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062E;;;;N;;;;;
+FC1F;ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 0645;;;;N;;;;;
+FC20;ARABIC LIGATURE SAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0635 062D;;;;N;;;;;
+FC21;ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0645;;;;N;;;;;
+FC22;ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 062C;;;;N;;;;;
+FC23;ARABIC LIGATURE DAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062D;;;;N;;;;;
+FC24;ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062E;;;;N;;;;;
+FC25;ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 0645;;;;N;;;;;
+FC26;ARABIC LIGATURE TAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0637 062D;;;;N;;;;;
+FC27;ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0637 0645;;;;N;;;;;
+FC28;ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0638 0645;;;;N;;;;;
+FC29;ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 062C;;;;N;;;;;
+FC2A;ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 0645;;;;N;;;;;
+FC2B;ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 062C;;;;N;;;;;
+FC2C;ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 0645;;;;N;;;;;
+FC2D;ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 062C;;;;N;;;;;
+FC2E;ARABIC LIGATURE FEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062D;;;;N;;;;;
+FC2F;ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062E;;;;N;;;;;
+FC30;ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 0645;;;;N;;;;;
+FC31;ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0641 0649;;;;N;;;;;
+FC32;ARABIC LIGATURE FEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0641 064A;;;;N;;;;;
+FC33;ARABIC LIGATURE QAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0642 062D;;;;N;;;;;
+FC34;ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0642 0645;;;;N;;;;;
+FC35;ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0642 0649;;;;N;;;;;
+FC36;ARABIC LIGATURE QAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0642 064A;;;;N;;;;;
+FC37;ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0643 0627;;;;N;;;;;
+FC38;ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 062C;;;;N;;;;;
+FC39;ARABIC LIGATURE KAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062D;;;;N;;;;;
+FC3A;ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062E;;;;N;;;;;
+FC3B;ARABIC LIGATURE KAF WITH LAM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0644;;;;N;;;;;
+FC3C;ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0645;;;;N;;;;;
+FC3D;ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0643 0649;;;;N;;;;;
+FC3E;ARABIC LIGATURE KAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0643 064A;;;;N;;;;;
+FC3F;ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 062C;;;;N;;;;;
+FC40;ARABIC LIGATURE LAM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062D;;;;N;;;;;
+FC41;ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062E;;;;N;;;;;
+FC42;ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 0645;;;;N;;;;;
+FC43;ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0644 0649;;;;N;;;;;
+FC44;ARABIC LIGATURE LAM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0644 064A;;;;N;;;;;
+FC45;ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 062C;;;;N;;;;;
+FC46;ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D;;;;N;;;;;
+FC47;ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062E;;;;N;;;;;
+FC48;ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 0645;;;;N;;;;;
+FC49;ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0645 0649;;;;N;;;;;
+FC4A;ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0645 064A;;;;N;;;;;
+FC4B;ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 062C;;;;N;;;;;
+FC4C;ARABIC LIGATURE NOON WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062D;;;;N;;;;;
+FC4D;ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062E;;;;N;;;;;
+FC4E;ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 0645;;;;N;;;;;
+FC4F;ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0646 0649;;;;N;;;;;
+FC50;ARABIC LIGATURE NOON WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0646 064A;;;;N;;;;;
+FC51;ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 062C;;;;N;;;;;
+FC52;ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 0645;;;;N;;;;;
+FC53;ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0647 0649;;;;N;;;;;
+FC54;ARABIC LIGATURE HEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0647 064A;;;;N;;;;;
+FC55;ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 062C;;;;N;;;;;
+FC56;ARABIC LIGATURE YEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062D;;;;N;;;;;
+FC57;ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062E;;;;N;;;;;
+FC58;ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 0645;;;;N;;;;;
+FC59;ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 064A 0649;;;;N;;;;;
+FC5A;ARABIC LIGATURE YEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A 064A;;;;N;;;;;
+FC5B;ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0630 0670;;;;N;;;;;
+FC5C;ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0631 0670;;;;N;;;;;
+FC5D;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0649 0670;;;;N;;;;;
+FC5E;ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C 0651;;;;N;;;;;
+FC5F;ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D 0651;;;;N;;;;;
+FC60;ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E 0651;;;;N;;;;;
+FC61;ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F 0651;;;;N;;;;;
+FC62;ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650 0651;;;;N;;;;;
+FC63;ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651 0670;;;;N;;;;;
+FC64;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM;Lo;0;AL;<final> 0626 0631;;;;N;;;;;
+FC65;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0626 0632;;;;N;;;;;
+FC66;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM;Lo;0;AL;<final> 0626 0645;;;;N;;;;;
+FC67;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM;Lo;0;AL;<final> 0626 0646;;;;N;;;;;
+FC68;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FC69;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM;Lo;0;AL;<final> 0626 064A;;;;N;;;;;
+FC6A;ARABIC LIGATURE BEH WITH REH FINAL FORM;Lo;0;AL;<final> 0628 0631;;;;N;;;;;
+FC6B;ARABIC LIGATURE BEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0628 0632;;;;N;;;;;
+FC6C;ARABIC LIGATURE BEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0628 0645;;;;N;;;;;
+FC6D;ARABIC LIGATURE BEH WITH NOON FINAL FORM;Lo;0;AL;<final> 0628 0646;;;;N;;;;;
+FC6E;ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0628 0649;;;;N;;;;;
+FC6F;ARABIC LIGATURE BEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 064A;;;;N;;;;;
+FC70;ARABIC LIGATURE TEH WITH REH FINAL FORM;Lo;0;AL;<final> 062A 0631;;;;N;;;;;
+FC71;ARABIC LIGATURE TEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062A 0632;;;;N;;;;;
+FC72;ARABIC LIGATURE TEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062A 0645;;;;N;;;;;
+FC73;ARABIC LIGATURE TEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062A 0646;;;;N;;;;;
+FC74;ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0649;;;;N;;;;;
+FC75;ARABIC LIGATURE TEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 064A;;;;N;;;;;
+FC76;ARABIC LIGATURE THEH WITH REH FINAL FORM;Lo;0;AL;<final> 062B 0631;;;;N;;;;;
+FC77;ARABIC LIGATURE THEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062B 0632;;;;N;;;;;
+FC78;ARABIC LIGATURE THEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062B 0645;;;;N;;;;;
+FC79;ARABIC LIGATURE THEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062B 0646;;;;N;;;;;
+FC7A;ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062B 0649;;;;N;;;;;
+FC7B;ARABIC LIGATURE THEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062B 064A;;;;N;;;;;
+FC7C;ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0641 0649;;;;N;;;;;
+FC7D;ARABIC LIGATURE FEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 064A;;;;N;;;;;
+FC7E;ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0642 0649;;;;N;;;;;
+FC7F;ARABIC LIGATURE QAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 064A;;;;N;;;;;
+FC80;ARABIC LIGATURE KAF WITH ALEF FINAL FORM;Lo;0;AL;<final> 0643 0627;;;;N;;;;;
+FC81;ARABIC LIGATURE KAF WITH LAM FINAL FORM;Lo;0;AL;<final> 0643 0644;;;;N;;;;;
+FC82;ARABIC LIGATURE KAF WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645;;;;N;;;;;
+FC83;ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0643 0649;;;;N;;;;;
+FC84;ARABIC LIGATURE KAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 064A;;;;N;;;;;
+FC85;ARABIC LIGATURE LAM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 0645;;;;N;;;;;
+FC86;ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 0649;;;;N;;;;;
+FC87;ARABIC LIGATURE LAM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 064A;;;;N;;;;;
+FC88;ARABIC LIGATURE MEEM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0645 0627;;;;N;;;;;
+FC89;ARABIC LIGATURE MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0645 0645;;;;N;;;;;
+FC8A;ARABIC LIGATURE NOON WITH REH FINAL FORM;Lo;0;AL;<final> 0646 0631;;;;N;;;;;
+FC8B;ARABIC LIGATURE NOON WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0646 0632;;;;N;;;;;
+FC8C;ARABIC LIGATURE NOON WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 0645;;;;N;;;;;
+FC8D;ARABIC LIGATURE NOON WITH NOON FINAL FORM;Lo;0;AL;<final> 0646 0646;;;;N;;;;;
+FC8E;ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0649;;;;N;;;;;
+FC8F;ARABIC LIGATURE NOON WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 064A;;;;N;;;;;
+FC90;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM;Lo;0;AL;<final> 0649 0670;;;;N;;;;;
+FC91;ARABIC LIGATURE YEH WITH REH FINAL FORM;Lo;0;AL;<final> 064A 0631;;;;N;;;;;
+FC92;ARABIC LIGATURE YEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 064A 0632;;;;N;;;;;
+FC93;ARABIC LIGATURE YEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645;;;;N;;;;;
+FC94;ARABIC LIGATURE YEH WITH NOON FINAL FORM;Lo;0;AL;<final> 064A 0646;;;;N;;;;;
+FC95;ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 064A 0649;;;;N;;;;;
+FC96;ARABIC LIGATURE YEH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 064A;;;;N;;;;;
+FC97;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0626 062C;;;;N;;;;;
+FC98;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0626 062D;;;;N;;;;;
+FC99;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0626 062E;;;;N;;;;;
+FC9A;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0626 0645;;;;N;;;;;
+FC9B;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0626 0647;;;;N;;;;;
+FC9C;ARABIC LIGATURE BEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0628 062C;;;;N;;;;;
+FC9D;ARABIC LIGATURE BEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0628 062D;;;;N;;;;;
+FC9E;ARABIC LIGATURE BEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0628 062E;;;;N;;;;;
+FC9F;ARABIC LIGATURE BEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0628 0645;;;;N;;;;;
+FCA0;ARABIC LIGATURE BEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0628 0647;;;;N;;;;;
+FCA1;ARABIC LIGATURE TEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C;;;;N;;;;;
+FCA2;ARABIC LIGATURE TEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 062D;;;;N;;;;;
+FCA3;ARABIC LIGATURE TEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 062E;;;;N;;;;;
+FCA4;ARABIC LIGATURE TEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645;;;;N;;;;;
+FCA5;ARABIC LIGATURE TEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 062A 0647;;;;N;;;;;
+FCA6;ARABIC LIGATURE THEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062B 0645;;;;N;;;;;
+FCA7;ARABIC LIGATURE JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 062D;;;;N;;;;;
+FCA8;ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062C 0645;;;;N;;;;;
+FCA9;ARABIC LIGATURE HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062D 062C;;;;N;;;;;
+FCAA;ARABIC LIGATURE HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062D 0645;;;;N;;;;;
+FCAB;ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062E 062C;;;;N;;;;;
+FCAC;ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062E 0645;;;;N;;;;;
+FCAD;ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062C;;;;N;;;;;
+FCAE;ARABIC LIGATURE SEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062D;;;;N;;;;;
+FCAF;ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0633 062E;;;;N;;;;;
+FCB0;ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645;;;;N;;;;;
+FCB1;ARABIC LIGATURE SAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D;;;;N;;;;;
+FCB2;ARABIC LIGATURE SAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0635 062E;;;;N;;;;;
+FCB3;ARABIC LIGATURE SAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645;;;;N;;;;;
+FCB4;ARABIC LIGATURE DAD WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062C;;;;N;;;;;
+FCB5;ARABIC LIGATURE DAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0636 062D;;;;N;;;;;
+FCB6;ARABIC LIGATURE DAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0636 062E;;;;N;;;;;
+FCB7;ARABIC LIGATURE DAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 0645;;;;N;;;;;
+FCB8;ARABIC LIGATURE TAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 062D;;;;N;;;;;
+FCB9;ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0638 0645;;;;N;;;;;
+FCBA;ARABIC LIGATURE AIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C;;;;N;;;;;
+FCBB;ARABIC LIGATURE AIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645;;;;N;;;;;
+FCBC;ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 063A 062C;;;;N;;;;;
+FCBD;ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 063A 0645;;;;N;;;;;
+FCBE;ARABIC LIGATURE FEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062C;;;;N;;;;;
+FCBF;ARABIC LIGATURE FEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0641 062D;;;;N;;;;;
+FCC0;ARABIC LIGATURE FEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0641 062E;;;;N;;;;;
+FCC1;ARABIC LIGATURE FEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 0645;;;;N;;;;;
+FCC2;ARABIC LIGATURE QAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 062D;;;;N;;;;;
+FCC3;ARABIC LIGATURE QAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0642 0645;;;;N;;;;;
+FCC4;ARABIC LIGATURE KAF WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0643 062C;;;;N;;;;;
+FCC5;ARABIC LIGATURE KAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0643 062D;;;;N;;;;;
+FCC6;ARABIC LIGATURE KAF WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0643 062E;;;;N;;;;;
+FCC7;ARABIC LIGATURE KAF WITH LAM INITIAL FORM;Lo;0;AL;<initial> 0643 0644;;;;N;;;;;
+FCC8;ARABIC LIGATURE KAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645;;;;N;;;;;
+FCC9;ARABIC LIGATURE LAM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C;;;;N;;;;;
+FCCA;ARABIC LIGATURE LAM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 062D;;;;N;;;;;
+FCCB;ARABIC LIGATURE LAM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0644 062E;;;;N;;;;;
+FCCC;ARABIC LIGATURE LAM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 0645;;;;N;;;;;
+FCCD;ARABIC LIGATURE LAM WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0644 0647;;;;N;;;;;
+FCCE;ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C;;;;N;;;;;
+FCCF;ARABIC LIGATURE MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062D;;;;N;;;;;
+FCD0;ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062E;;;;N;;;;;
+FCD1;ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 0645;;;;N;;;;;
+FCD2;ARABIC LIGATURE NOON WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C;;;;N;;;;;
+FCD3;ARABIC LIGATURE NOON WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062D;;;;N;;;;;
+FCD4;ARABIC LIGATURE NOON WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0646 062E;;;;N;;;;;
+FCD5;ARABIC LIGATURE NOON WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 0645;;;;N;;;;;
+FCD6;ARABIC LIGATURE NOON WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0646 0647;;;;N;;;;;
+FCD7;ARABIC LIGATURE HEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 062C;;;;N;;;;;
+FCD8;ARABIC LIGATURE HEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645;;;;N;;;;;
+FCD9;ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM;Lo;0;AL;<initial> 0647 0670;;;;N;;;;;
+FCDA;ARABIC LIGATURE YEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 064A 062C;;;;N;;;;;
+FCDB;ARABIC LIGATURE YEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 064A 062D;;;;N;;;;;
+FCDC;ARABIC LIGATURE YEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 064A 062E;;;;N;;;;;
+FCDD;ARABIC LIGATURE YEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645;;;;N;;;;;
+FCDE;ARABIC LIGATURE YEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 064A 0647;;;;N;;;;;
+FCDF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0626 0645;;;;N;;;;;
+FCE0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0626 0647;;;;N;;;;;
+FCE1;ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0628 0645;;;;N;;;;;
+FCE2;ARABIC LIGATURE BEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0628 0647;;;;N;;;;;
+FCE3;ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062A 0645;;;;N;;;;;
+FCE4;ARABIC LIGATURE TEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062A 0647;;;;N;;;;;
+FCE5;ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062B 0645;;;;N;;;;;
+FCE6;ARABIC LIGATURE THEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062B 0647;;;;N;;;;;
+FCE7;ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 0645;;;;N;;;;;
+FCE8;ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0633 0647;;;;N;;;;;
+FCE9;ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 0645;;;;N;;;;;
+FCEA;ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0634 0647;;;;N;;;;;
+FCEB;ARABIC LIGATURE KAF WITH LAM MEDIAL FORM;Lo;0;AL;<medial> 0643 0644;;;;N;;;;;
+FCEC;ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0643 0645;;;;N;;;;;
+FCED;ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0644 0645;;;;N;;;;;
+FCEE;ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0646 0645;;;;N;;;;;
+FCEF;ARABIC LIGATURE NOON WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0646 0647;;;;N;;;;;
+FCF0;ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 064A 0645;;;;N;;;;;
+FCF1;ARABIC LIGATURE YEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 064A 0647;;;;N;;;;;
+FCF2;ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E 0651;;;;N;;;;;
+FCF3;ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F 0651;;;;N;;;;;
+FCF4;ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650 0651;;;;N;;;;;
+FCF5;ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0637 0649;;;;N;;;;;
+FCF6;ARABIC LIGATURE TAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0637 064A;;;;N;;;;;
+FCF7;ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0639 0649;;;;N;;;;;
+FCF8;ARABIC LIGATURE AIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0639 064A;;;;N;;;;;
+FCF9;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 063A 0649;;;;N;;;;;
+FCFA;ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 063A 064A;;;;N;;;;;
+FCFB;ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0633 0649;;;;N;;;;;
+FCFC;ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0633 064A;;;;N;;;;;
+FCFD;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0634 0649;;;;N;;;;;
+FCFE;ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0634 064A;;;;N;;;;;
+FCFF;ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062D 0649;;;;N;;;;;
+FD00;ARABIC LIGATURE HAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062D 064A;;;;N;;;;;
+FD01;ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062C 0649;;;;N;;;;;
+FD02;ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062C 064A;;;;N;;;;;
+FD03;ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062E 0649;;;;N;;;;;
+FD04;ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062E 064A;;;;N;;;;;
+FD05;ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0649;;;;N;;;;;
+FD06;ARABIC LIGATURE SAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0635 064A;;;;N;;;;;
+FD07;ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0636 0649;;;;N;;;;;
+FD08;ARABIC LIGATURE DAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0636 064A;;;;N;;;;;
+FD09;ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 062C;;;;N;;;;;
+FD0A;ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062D;;;;N;;;;;
+FD0B;ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062E;;;;N;;;;;
+FD0C;ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 0645;;;;N;;;;;
+FD0D;ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0634 0631;;;;N;;;;;
+FD0E;ARABIC LIGATURE SEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0633 0631;;;;N;;;;;
+FD0F;ARABIC LIGATURE SAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0635 0631;;;;N;;;;;
+FD10;ARABIC LIGATURE DAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0636 0631;;;;N;;;;;
+FD11;ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0637 0649;;;;N;;;;;
+FD12;ARABIC LIGATURE TAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 064A;;;;N;;;;;
+FD13;ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0649;;;;N;;;;;
+FD14;ARABIC LIGATURE AIN WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 064A;;;;N;;;;;
+FD15;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0649;;;;N;;;;;
+FD16;ARABIC LIGATURE GHAIN WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 064A;;;;N;;;;;
+FD17;ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 0649;;;;N;;;;;
+FD18;ARABIC LIGATURE SEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 064A;;;;N;;;;;
+FD19;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0634 0649;;;;N;;;;;
+FD1A;ARABIC LIGATURE SHEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 064A;;;;N;;;;;
+FD1B;ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0649;;;;N;;;;;
+FD1C;ARABIC LIGATURE HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 064A;;;;N;;;;;
+FD1D;ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0649;;;;N;;;;;
+FD1E;ARABIC LIGATURE JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 064A;;;;N;;;;;
+FD1F;ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062E 0649;;;;N;;;;;
+FD20;ARABIC LIGATURE KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062E 064A;;;;N;;;;;
+FD21;ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0635 0649;;;;N;;;;;
+FD22;ARABIC LIGATURE SAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 064A;;;;N;;;;;
+FD23;ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 0649;;;;N;;;;;
+FD24;ARABIC LIGATURE DAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 064A;;;;N;;;;;
+FD25;ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM;Lo;0;AL;<final> 0634 062C;;;;N;;;;;
+FD26;ARABIC LIGATURE SHEEN WITH HAH FINAL FORM;Lo;0;AL;<final> 0634 062D;;;;N;;;;;
+FD27;ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 062E;;;;N;;;;;
+FD28;ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645;;;;N;;;;;
+FD29;ARABIC LIGATURE SHEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0634 0631;;;;N;;;;;
+FD2A;ARABIC LIGATURE SEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0633 0631;;;;N;;;;;
+FD2B;ARABIC LIGATURE SAD WITH REH FINAL FORM;Lo;0;AL;<final> 0635 0631;;;;N;;;;;
+FD2C;ARABIC LIGATURE DAD WITH REH FINAL FORM;Lo;0;AL;<final> 0636 0631;;;;N;;;;;
+FD2D;ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062C;;;;N;;;;;
+FD2E;ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0634 062D;;;;N;;;;;
+FD2F;ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 062E;;;;N;;;;;
+FD30;ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645;;;;N;;;;;
+FD31;ARABIC LIGATURE SEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0633 0647;;;;N;;;;;
+FD32;ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0634 0647;;;;N;;;;;
+FD33;ARABIC LIGATURE TAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645;;;;N;;;;;
+FD34;ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 062C;;;;N;;;;;
+FD35;ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062D;;;;N;;;;;
+FD36;ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062E;;;;N;;;;;
+FD37;ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 062C;;;;N;;;;;
+FD38;ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062D;;;;N;;;;;
+FD39;ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062E;;;;N;;;;;
+FD3A;ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0637 0645;;;;N;;;;;
+FD3B;ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0638 0645;;;;N;;;;;
+FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL;<final> 0627 064B;;;;N;;;;;
+FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0627 064B;;;;N;;;;;
+FD3E;ORNATE LEFT PARENTHESIS;Pe;0;ON;;;;;N;;;;;
+FD3F;ORNATE RIGHT PARENTHESIS;Ps;0;ON;;;;;N;;;;;
+FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C 0645;;;;N;;;;;
+FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL;<final> 062A 062D 062C;;;;N;;;;;
+FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 062C;;;;N;;;;;
+FD53;ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 0645;;;;N;;;;;
+FD54;ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062E 0645;;;;N;;;;;
+FD55;ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062C;;;;N;;;;;
+FD56;ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062D;;;;N;;;;;
+FD57;ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062E;;;;N;;;;;
+FD58;ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 062C 0645 062D;;;;N;;;;;
+FD59;ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 0645 062D;;;;N;;;;;
+FD5A;ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 0645 064A;;;;N;;;;;
+FD5B;ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0645 0649;;;;N;;;;;
+FD5C;ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062D 062C;;;;N;;;;;
+FD5D;ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062C 062D;;;;N;;;;;
+FD5E;ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062C 0649;;;;N;;;;;
+FD5F;ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0633 0645 062D;;;;N;;;;;
+FD60;ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062D;;;;N;;;;;
+FD61;ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062C;;;;N;;;;;
+FD62;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0633 0645 0645;;;;N;;;;;
+FD63;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 0645;;;;N;;;;;
+FD64;ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM;Lo;0;AL;<final> 0635 062D 062D;;;;N;;;;;
+FD65;ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D 062D;;;;N;;;;;
+FD66;ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0635 0645 0645;;;;N;;;;;
+FD67;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 062D 0645;;;;N;;;;;
+FD68;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062D 0645;;;;N;;;;;
+FD69;ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062C 064A;;;;N;;;;;
+FD6A;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 0645 062E;;;;N;;;;;
+FD6B;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 0645 062E;;;;N;;;;;
+FD6C;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645 0645;;;;N;;;;;
+FD6D;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645 0645;;;;N;;;;;
+FD6E;ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 062D 0649;;;;N;;;;;
+FD6F;ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0636 062E 0645;;;;N;;;;;
+FD70;ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062E 0645;;;;N;;;;;
+FD71;ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0637 0645 062D;;;;N;;;;;
+FD72;ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 0645 062D;;;;N;;;;;
+FD73;ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645 0645;;;;N;;;;;
+FD74;ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 0645 064A;;;;N;;;;;
+FD75;ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 062C 0645;;;;N;;;;;
+FD76;ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 0645 0645;;;;N;;;;;
+FD77;ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645 0645;;;;N;;;;;
+FD78;ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0645 0649;;;;N;;;;;
+FD79;ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 063A 0645 0645;;;;N;;;;;
+FD7A;ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 0645 064A;;;;N;;;;;
+FD7B;ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0645 0649;;;;N;;;;;
+FD7C;ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0641 062E 0645;;;;N;;;;;
+FD7D;ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062E 0645;;;;N;;;;;
+FD7E;ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0642 0645 062D;;;;N;;;;;
+FD7F;ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0642 0645 0645;;;;N;;;;;
+FD80;ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062D 0645;;;;N;;;;;
+FD81;ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062D 064A;;;;N;;;;;
+FD82;ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 062D 0649;;;;N;;;;;
+FD83;ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 062C;;;;N;;;;;
+FD84;ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 062C;;;;N;;;;;
+FD85;ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062E 0645;;;;N;;;;;
+FD86;ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062E 0645;;;;N;;;;;
+FD87;ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0644 0645 062D;;;;N;;;;;
+FD88;ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 0645 062D;;;;N;;;;;
+FD89;ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 062C;;;;N;;;;;
+FD8A;ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 0645;;;;N;;;;;
+FD8B;ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062D 064A;;;;N;;;;;
+FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062D;;;;N;;;;;
+FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C 0645;;;;N;;;;;
+FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 062C;;;;N;;;;;
+FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 0645;;;;N;;;;;
+FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062E;;;;N;;;;;
+FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 062C;;;;N;;;;;
+FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 0645;;;;N;;;;;
+FD95;ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062D 0645;;;;N;;;;;
+FD96;ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062D 0649;;;;N;;;;;
+FD97;ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 062C 0645;;;;N;;;;;
+FD98;ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C 0645;;;;N;;;;;
+FD99;ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062C 0649;;;;N;;;;;
+FD9A;ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 0645 064A;;;;N;;;;;
+FD9B;ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0645 0649;;;;N;;;;;
+FD9C;ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645 0645;;;;N;;;;;
+FD9D;ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645 0645;;;;N;;;;;
+FD9E;ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062E 064A;;;;N;;;;;
+FD9F;ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062C 064A;;;;N;;;;;
+FDA0;ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062C 0649;;;;N;;;;;
+FDA1;ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062E 064A;;;;N;;;;;
+FDA2;ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062E 0649;;;;N;;;;;
+FDA3;ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 0645 064A;;;;N;;;;;
+FDA4;ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0645 0649;;;;N;;;;;
+FDA5;ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 0645 064A;;;;N;;;;;
+FDA6;ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 062D 0649;;;;N;;;;;
+FDA7;ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0645 0649;;;;N;;;;;
+FDA8;ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062E 0649;;;;N;;;;;
+FDA9;ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 062D 064A;;;;N;;;;;
+FDAA;ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062D 064A;;;;N;;;;;
+FDAB;ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 062D 064A;;;;N;;;;;
+FDAC;ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062C 064A;;;;N;;;;;
+FDAD;ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 0645 064A;;;;N;;;;;
+FDAE;ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062D 064A;;;;N;;;;;
+FDAF;ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062C 064A;;;;N;;;;;
+FDB0;ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 0645 064A;;;;N;;;;;
+FDB1;ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 0645 064A;;;;N;;;;;
+FDB2;ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 0645 064A;;;;N;;;;;
+FDB3;ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062D 064A;;;;N;;;;;
+FDB4;ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 0645 062D;;;;N;;;;;
+FDB5;ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062D 0645;;;;N;;;;;
+FDB6;ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 0645 064A;;;;N;;;;;
+FDB7;ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 0645 064A;;;;N;;;;;
+FDB8;ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062C 062D;;;;N;;;;;
+FDB9;ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062E 064A;;;;N;;;;;
+FDBA;ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 0645;;;;N;;;;;
+FDBB;ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645 0645;;;;N;;;;;
+FDBC;ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 0645;;;;N;;;;;
+FDBD;ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0646 062C 062D;;;;N;;;;;
+FDBE;ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 062D 064A;;;;N;;;;;
+FDBF;ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 062C 064A;;;;N;;;;;
+FDC0;ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062C 064A;;;;N;;;;;
+FDC1;ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 0645 064A;;;;N;;;;;
+FDC2;ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062D 064A;;;;N;;;;;
+FDC3;ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645 0645;;;;N;;;;;
+FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C 0645;;;;N;;;;;
+FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645 0645;;;;N;;;;;
+FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 062E 064A;;;;N;;;;;
+FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062C 064A;;;;N;;;;;
+FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 06D2;;;;N;;;;;
+FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0642 0644 06D2;;;;N;;;;;
+FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL;<isolated> 0627 0644 0644 0647;;;;N;;;;;
+FDF3;ARABIC LIGATURE AKBAR ISOLATED FORM;Lo;0;AL;<isolated> 0627 0643 0628 0631;;;;N;;;;;
+FDF4;ARABIC LIGATURE MOHAMMAD ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D 0645 062F;;;;N;;;;;
+FDF5;ARABIC LIGATURE SALAM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0639 0645;;;;N;;;;;
+FDF6;ARABIC LIGATURE RASOUL ISOLATED FORM;Lo;0;AL;<isolated> 0631 0633 0648 0644;;;;N;;;;;
+FDF7;ARABIC LIGATURE ALAYHE ISOLATED FORM;Lo;0;AL;<isolated> 0639 0644 064A 0647;;;;N;;;;;
+FDF8;ARABIC LIGATURE WASALLAM ISOLATED FORM;Lo;0;AL;<isolated> 0648 0633 0644 0645;;;;N;;;;;
+FDF9;ARABIC LIGATURE SALLA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0649;;;;N;;;;;
+FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL;<isolated> 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645;;;;N;ARABIC LETTER SALLALLAHOU ALAYHE WASALLAM;;;;
+FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL;<isolated> 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;;
+FDFC;RIAL SIGN;Sc;0;AL;<isolated> 0631 06CC 0627 0644;;;;N;;;;;
+FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;;
+FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;;
+FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;;
+FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;;
+FE03;VARIATION SELECTOR-4;Mn;0;NSM;;;;;N;;;;;
+FE04;VARIATION SELECTOR-5;Mn;0;NSM;;;;;N;;;;;
+FE05;VARIATION SELECTOR-6;Mn;0;NSM;;;;;N;;;;;
+FE06;VARIATION SELECTOR-7;Mn;0;NSM;;;;;N;;;;;
+FE07;VARIATION SELECTOR-8;Mn;0;NSM;;;;;N;;;;;
+FE08;VARIATION SELECTOR-9;Mn;0;NSM;;;;;N;;;;;
+FE09;VARIATION SELECTOR-10;Mn;0;NSM;;;;;N;;;;;
+FE0A;VARIATION SELECTOR-11;Mn;0;NSM;;;;;N;;;;;
+FE0B;VARIATION SELECTOR-12;Mn;0;NSM;;;;;N;;;;;
+FE0C;VARIATION SELECTOR-13;Mn;0;NSM;;;;;N;;;;;
+FE0D;VARIATION SELECTOR-14;Mn;0;NSM;;;;;N;;;;;
+FE0E;VARIATION SELECTOR-15;Mn;0;NSM;;;;;N;;;;;
+FE0F;VARIATION SELECTOR-16;Mn;0;NSM;;;;;N;;;;;
+FE10;PRESENTATION FORM FOR VERTICAL COMMA;Po;0;ON;<vertical> 002C;;;;N;;;;;
+FE11;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA;Po;0;ON;<vertical> 3001;;;;N;;;;;
+FE12;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP;Po;0;ON;<vertical> 3002;;;;N;;;;;
+FE13;PRESENTATION FORM FOR VERTICAL COLON;Po;0;ON;<vertical> 003A;;;;N;;;;;
+FE14;PRESENTATION FORM FOR VERTICAL SEMICOLON;Po;0;ON;<vertical> 003B;;;;N;;;;;
+FE15;PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK;Po;0;ON;<vertical> 0021;;;;N;;;;;
+FE16;PRESENTATION FORM FOR VERTICAL QUESTION MARK;Po;0;ON;<vertical> 003F;;;;N;;;;;
+FE17;PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;<vertical> 3016;;;;N;;;;;
+FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET;Pe;0;ON;<vertical> 3017;;;;N;;;;;
+FE19;PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS;Po;0;ON;<vertical> 2026;;;;N;;;;;
+FE20;COMBINING LIGATURE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE21;COMBINING LIGATURE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE22;COMBINING DOUBLE TILDE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE23;COMBINING DOUBLE TILDE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE24;COMBINING MACRON LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE25;COMBINING MACRON RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE26;COMBINING CONJOINING MACRON;Mn;230;NSM;;;;;N;;;;;
+FE27;COMBINING LIGATURE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE28;COMBINING LIGATURE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE29;COMBINING TILDE LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2A;COMBINING TILDE RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2B;COMBINING MACRON LEFT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2C;COMBINING MACRON RIGHT HALF BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2D;COMBINING CONJOINING MACRON BELOW;Mn;220;NSM;;;;;N;;;;;
+FE2E;COMBINING CYRILLIC TITLO LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE2F;COMBINING CYRILLIC TITLO RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE30;PRESENTATION FORM FOR VERTICAL TWO DOT LEADER;Po;0;ON;<vertical> 2025;;;;N;GLYPH FOR VERTICAL TWO DOT LEADER;;;;
+FE31;PRESENTATION FORM FOR VERTICAL EM DASH;Pd;0;ON;<vertical> 2014;;;;N;GLYPH FOR VERTICAL EM DASH;;;;
+FE32;PRESENTATION FORM FOR VERTICAL EN DASH;Pd;0;ON;<vertical> 2013;;;;N;GLYPH FOR VERTICAL EN DASH;;;;
+FE33;PRESENTATION FORM FOR VERTICAL LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING UNDERSCORE;;;;
+FE34;PRESENTATION FORM FOR VERTICAL WAVY LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING WAVY UNDERSCORE;;;;
+FE35;PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS;Ps;0;ON;<vertical> 0028;;;;N;GLYPH FOR VERTICAL OPENING PARENTHESIS;;;;
+FE36;PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS;Pe;0;ON;<vertical> 0029;;;;N;GLYPH FOR VERTICAL CLOSING PARENTHESIS;;;;
+FE37;PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET;Ps;0;ON;<vertical> 007B;;;;N;GLYPH FOR VERTICAL OPENING CURLY BRACKET;;;;
+FE38;PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET;Pe;0;ON;<vertical> 007D;;;;N;GLYPH FOR VERTICAL CLOSING CURLY BRACKET;;;;
+FE39;PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<vertical> 3014;;;;N;GLYPH FOR VERTICAL OPENING TORTOISE SHELL BRACKET;;;;
+FE3A;PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<vertical> 3015;;;;N;GLYPH FOR VERTICAL CLOSING TORTOISE SHELL BRACKET;;;;
+FE3B;PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;<vertical> 3010;;;;N;GLYPH FOR VERTICAL OPENING BLACK LENTICULAR BRACKET;;;;
+FE3C;PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;<vertical> 3011;;;;N;GLYPH FOR VERTICAL CLOSING BLACK LENTICULAR BRACKET;;;;
+FE3D;PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;<vertical> 300A;;;;N;GLYPH FOR VERTICAL OPENING DOUBLE ANGLE BRACKET;;;;
+FE3E;PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;<vertical> 300B;;;;N;GLYPH FOR VERTICAL CLOSING DOUBLE ANGLE BRACKET;;;;
+FE3F;PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET;Ps;0;ON;<vertical> 3008;;;;N;GLYPH FOR VERTICAL OPENING ANGLE BRACKET;;;;
+FE40;PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET;Pe;0;ON;<vertical> 3009;;;;N;GLYPH FOR VERTICAL CLOSING ANGLE BRACKET;;;;
+FE41;PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET;Ps;0;ON;<vertical> 300C;;;;N;GLYPH FOR VERTICAL OPENING CORNER BRACKET;;;;
+FE42;PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET;Pe;0;ON;<vertical> 300D;;;;N;GLYPH FOR VERTICAL CLOSING CORNER BRACKET;;;;
+FE43;PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET;Ps;0;ON;<vertical> 300E;;;;N;GLYPH FOR VERTICAL OPENING WHITE CORNER BRACKET;;;;
+FE44;PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET;Pe;0;ON;<vertical> 300F;;;;N;GLYPH FOR VERTICAL CLOSING WHITE CORNER BRACKET;;;;
+FE45;SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE46;WHITE SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE47;PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET;Ps;0;ON;<vertical> 005B;;;;N;;;;;
+FE48;PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET;Pe;0;ON;<vertical> 005D;;;;N;;;;;
+FE49;DASHED OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DASHED OVERSCORE;;;;
+FE4A;CENTRELINE OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING CENTERLINE OVERSCORE;;;;
+FE4B;WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING WAVY OVERSCORE;;;;
+FE4C;DOUBLE WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DOUBLE WAVY OVERSCORE;;;;
+FE4D;DASHED LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING DASHED UNDERSCORE;;;;
+FE4E;CENTRELINE LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING CENTERLINE UNDERSCORE;;;;
+FE4F;WAVY LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING WAVY UNDERSCORE;;;;
+FE50;SMALL COMMA;Po;0;CS;<small> 002C;;;;N;;;;;
+FE51;SMALL IDEOGRAPHIC COMMA;Po;0;ON;<small> 3001;;;;N;;;;;
+FE52;SMALL FULL STOP;Po;0;CS;<small> 002E;;;;N;SMALL PERIOD;;;;
+FE54;SMALL SEMICOLON;Po;0;ON;<small> 003B;;;;N;;;;;
+FE55;SMALL COLON;Po;0;CS;<small> 003A;;;;N;;;;;
+FE56;SMALL QUESTION MARK;Po;0;ON;<small> 003F;;;;N;;;;;
+FE57;SMALL EXCLAMATION MARK;Po;0;ON;<small> 0021;;;;N;;;;;
+FE58;SMALL EM DASH;Pd;0;ON;<small> 2014;;;;N;;;;;
+FE59;SMALL LEFT PARENTHESIS;Ps;0;ON;<small> 0028;;;;Y;SMALL OPENING PARENTHESIS;;;;
+FE5A;SMALL RIGHT PARENTHESIS;Pe;0;ON;<small> 0029;;;;Y;SMALL CLOSING PARENTHESIS;;;;
+FE5B;SMALL LEFT CURLY BRACKET;Ps;0;ON;<small> 007B;;;;Y;SMALL OPENING CURLY BRACKET;;;;
+FE5C;SMALL RIGHT CURLY BRACKET;Pe;0;ON;<small> 007D;;;;Y;SMALL CLOSING CURLY BRACKET;;;;
+FE5D;SMALL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<small> 3014;;;;Y;SMALL OPENING TORTOISE SHELL BRACKET;;;;
+FE5E;SMALL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<small> 3015;;;;Y;SMALL CLOSING TORTOISE SHELL BRACKET;;;;
+FE5F;SMALL NUMBER SIGN;Po;0;ET;<small> 0023;;;;N;;;;;
+FE60;SMALL AMPERSAND;Po;0;ON;<small> 0026;;;;N;;;;;
+FE61;SMALL ASTERISK;Po;0;ON;<small> 002A;;;;N;;;;;
+FE62;SMALL PLUS SIGN;Sm;0;ES;<small> 002B;;;;N;;;;;
+FE63;SMALL HYPHEN-MINUS;Pd;0;ES;<small> 002D;;;;N;;;;;
+FE64;SMALL LESS-THAN SIGN;Sm;0;ON;<small> 003C;;;;Y;;;;;
+FE65;SMALL GREATER-THAN SIGN;Sm;0;ON;<small> 003E;;;;Y;;;;;
+FE66;SMALL EQUALS SIGN;Sm;0;ON;<small> 003D;;;;N;;;;;
+FE68;SMALL REVERSE SOLIDUS;Po;0;ON;<small> 005C;;;;N;SMALL BACKSLASH;;;;
+FE69;SMALL DOLLAR SIGN;Sc;0;ET;<small> 0024;;;;N;;;;;
+FE6A;SMALL PERCENT SIGN;Po;0;ET;<small> 0025;;;;N;;;;;
+FE6B;SMALL COMMERCIAL AT;Po;0;ON;<small> 0040;;;;N;;;;;
+FE70;ARABIC FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064B;;;;N;ARABIC SPACING FATHATAN;;;;
+FE71;ARABIC TATWEEL WITH FATHATAN ABOVE;Lo;0;AL;<medial> 0640 064B;;;;N;ARABIC FATHATAN ON TATWEEL;;;;
+FE72;ARABIC DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C;;;;N;ARABIC SPACING DAMMATAN;;;;
+FE73;ARABIC TAIL FRAGMENT;Lo;0;AL;;;;;N;;;;;
+FE74;ARABIC KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D;;;;N;ARABIC SPACING KASRATAN;;;;
+FE76;ARABIC FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E;;;;N;ARABIC SPACING FATHAH;;;;
+FE77;ARABIC FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E;;;;N;ARABIC FATHAH ON TATWEEL;;;;
+FE78;ARABIC DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F;;;;N;ARABIC SPACING DAMMAH;;;;
+FE79;ARABIC DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F;;;;N;ARABIC DAMMAH ON TATWEEL;;;;
+FE7A;ARABIC KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650;;;;N;ARABIC SPACING KASRAH;;;;
+FE7B;ARABIC KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650;;;;N;ARABIC KASRAH ON TATWEEL;;;;
+FE7C;ARABIC SHADDA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651;;;;N;ARABIC SPACING SHADDAH;;;;
+FE7D;ARABIC SHADDA MEDIAL FORM;Lo;0;AL;<medial> 0640 0651;;;;N;ARABIC SHADDAH ON TATWEEL;;;;
+FE7E;ARABIC SUKUN ISOLATED FORM;Lo;0;AL;<isolated> 0020 0652;;;;N;ARABIC SPACING SUKUN;;;;
+FE7F;ARABIC SUKUN MEDIAL FORM;Lo;0;AL;<medial> 0640 0652;;;;N;ARABIC SUKUN ON TATWEEL;;;;
+FE80;ARABIC LETTER HAMZA ISOLATED FORM;Lo;0;AL;<isolated> 0621;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH;;;;
+FE81;ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON ALEF;;;;
+FE82;ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON ALEF;;;;
+FE83;ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON ALEF;;;;
+FE84;ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON ALEF;;;;
+FE85;ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0624;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON WAW;;;;
+FE86;ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0624;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON WAW;;;;
+FE87;ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER ALEF;;;;
+FE88;ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER ALEF;;;;
+FE89;ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0626;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON YA;;;;
+FE8A;ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0626;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON YA;;;;
+FE8B;ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM;Lo;0;AL;<initial> 0626;;;;N;GLYPH FOR INITIAL ARABIC HAMZAH ON YA;;;;
+FE8C;ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM;Lo;0;AL;<medial> 0626;;;;N;GLYPH FOR MEDIAL ARABIC HAMZAH ON YA;;;;
+FE8D;ARABIC LETTER ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0627;;;;N;GLYPH FOR ISOLATE ARABIC ALEF;;;;
+FE8E;ARABIC LETTER ALEF FINAL FORM;Lo;0;AL;<final> 0627;;;;N;GLYPH FOR FINAL ARABIC ALEF;;;;
+FE8F;ARABIC LETTER BEH ISOLATED FORM;Lo;0;AL;<isolated> 0628;;;;N;GLYPH FOR ISOLATE ARABIC BAA;;;;
+FE90;ARABIC LETTER BEH FINAL FORM;Lo;0;AL;<final> 0628;;;;N;GLYPH FOR FINAL ARABIC BAA;;;;
+FE91;ARABIC LETTER BEH INITIAL FORM;Lo;0;AL;<initial> 0628;;;;N;GLYPH FOR INITIAL ARABIC BAA;;;;
+FE92;ARABIC LETTER BEH MEDIAL FORM;Lo;0;AL;<medial> 0628;;;;N;GLYPH FOR MEDIAL ARABIC BAA;;;;
+FE93;ARABIC LETTER TEH MARBUTA ISOLATED FORM;Lo;0;AL;<isolated> 0629;;;;N;GLYPH FOR ISOLATE ARABIC TAA MARBUTAH;;;;
+FE94;ARABIC LETTER TEH MARBUTA FINAL FORM;Lo;0;AL;<final> 0629;;;;N;GLYPH FOR FINAL ARABIC TAA MARBUTAH;;;;
+FE95;ARABIC LETTER TEH ISOLATED FORM;Lo;0;AL;<isolated> 062A;;;;N;GLYPH FOR ISOLATE ARABIC TAA;;;;
+FE96;ARABIC LETTER TEH FINAL FORM;Lo;0;AL;<final> 062A;;;;N;GLYPH FOR FINAL ARABIC TAA;;;;
+FE97;ARABIC LETTER TEH INITIAL FORM;Lo;0;AL;<initial> 062A;;;;N;GLYPH FOR INITIAL ARABIC TAA;;;;
+FE98;ARABIC LETTER TEH MEDIAL FORM;Lo;0;AL;<medial> 062A;;;;N;GLYPH FOR MEDIAL ARABIC TAA;;;;
+FE99;ARABIC LETTER THEH ISOLATED FORM;Lo;0;AL;<isolated> 062B;;;;N;GLYPH FOR ISOLATE ARABIC THAA;;;;
+FE9A;ARABIC LETTER THEH FINAL FORM;Lo;0;AL;<final> 062B;;;;N;GLYPH FOR FINAL ARABIC THAA;;;;
+FE9B;ARABIC LETTER THEH INITIAL FORM;Lo;0;AL;<initial> 062B;;;;N;GLYPH FOR INITIAL ARABIC THAA;;;;
+FE9C;ARABIC LETTER THEH MEDIAL FORM;Lo;0;AL;<medial> 062B;;;;N;GLYPH FOR MEDIAL ARABIC THAA;;;;
+FE9D;ARABIC LETTER JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C;;;;N;GLYPH FOR ISOLATE ARABIC JEEM;;;;
+FE9E;ARABIC LETTER JEEM FINAL FORM;Lo;0;AL;<final> 062C;;;;N;GLYPH FOR FINAL ARABIC JEEM;;;;
+FE9F;ARABIC LETTER JEEM INITIAL FORM;Lo;0;AL;<initial> 062C;;;;N;GLYPH FOR INITIAL ARABIC JEEM;;;;
+FEA0;ARABIC LETTER JEEM MEDIAL FORM;Lo;0;AL;<medial> 062C;;;;N;GLYPH FOR MEDIAL ARABIC JEEM;;;;
+FEA1;ARABIC LETTER HAH ISOLATED FORM;Lo;0;AL;<isolated> 062D;;;;N;GLYPH FOR ISOLATE ARABIC HAA;;;;
+FEA2;ARABIC LETTER HAH FINAL FORM;Lo;0;AL;<final> 062D;;;;N;GLYPH FOR FINAL ARABIC HAA;;;;
+FEA3;ARABIC LETTER HAH INITIAL FORM;Lo;0;AL;<initial> 062D;;;;N;GLYPH FOR INITIAL ARABIC HAA;;;;
+FEA4;ARABIC LETTER HAH MEDIAL FORM;Lo;0;AL;<medial> 062D;;;;N;GLYPH FOR MEDIAL ARABIC HAA;;;;
+FEA5;ARABIC LETTER KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062E;;;;N;GLYPH FOR ISOLATE ARABIC KHAA;;;;
+FEA6;ARABIC LETTER KHAH FINAL FORM;Lo;0;AL;<final> 062E;;;;N;GLYPH FOR FINAL ARABIC KHAA;;;;
+FEA7;ARABIC LETTER KHAH INITIAL FORM;Lo;0;AL;<initial> 062E;;;;N;GLYPH FOR INITIAL ARABIC KHAA;;;;
+FEA8;ARABIC LETTER KHAH MEDIAL FORM;Lo;0;AL;<medial> 062E;;;;N;GLYPH FOR MEDIAL ARABIC KHAA;;;;
+FEA9;ARABIC LETTER DAL ISOLATED FORM;Lo;0;AL;<isolated> 062F;;;;N;GLYPH FOR ISOLATE ARABIC DAL;;;;
+FEAA;ARABIC LETTER DAL FINAL FORM;Lo;0;AL;<final> 062F;;;;N;GLYPH FOR FINAL ARABIC DAL;;;;
+FEAB;ARABIC LETTER THAL ISOLATED FORM;Lo;0;AL;<isolated> 0630;;;;N;GLYPH FOR ISOLATE ARABIC THAL;;;;
+FEAC;ARABIC LETTER THAL FINAL FORM;Lo;0;AL;<final> 0630;;;;N;GLYPH FOR FINAL ARABIC THAL;;;;
+FEAD;ARABIC LETTER REH ISOLATED FORM;Lo;0;AL;<isolated> 0631;;;;N;GLYPH FOR ISOLATE ARABIC RA;;;;
+FEAE;ARABIC LETTER REH FINAL FORM;Lo;0;AL;<final> 0631;;;;N;GLYPH FOR FINAL ARABIC RA;;;;
+FEAF;ARABIC LETTER ZAIN ISOLATED FORM;Lo;0;AL;<isolated> 0632;;;;N;GLYPH FOR ISOLATE ARABIC ZAIN;;;;
+FEB0;ARABIC LETTER ZAIN FINAL FORM;Lo;0;AL;<final> 0632;;;;N;GLYPH FOR FINAL ARABIC ZAIN;;;;
+FEB1;ARABIC LETTER SEEN ISOLATED FORM;Lo;0;AL;<isolated> 0633;;;;N;GLYPH FOR ISOLATE ARABIC SEEN;;;;
+FEB2;ARABIC LETTER SEEN FINAL FORM;Lo;0;AL;<final> 0633;;;;N;GLYPH FOR FINAL ARABIC SEEN;;;;
+FEB3;ARABIC LETTER SEEN INITIAL FORM;Lo;0;AL;<initial> 0633;;;;N;GLYPH FOR INITIAL ARABIC SEEN;;;;
+FEB4;ARABIC LETTER SEEN MEDIAL FORM;Lo;0;AL;<medial> 0633;;;;N;GLYPH FOR MEDIAL ARABIC SEEN;;;;
+FEB5;ARABIC LETTER SHEEN ISOLATED FORM;Lo;0;AL;<isolated> 0634;;;;N;GLYPH FOR ISOLATE ARABIC SHEEN;;;;
+FEB6;ARABIC LETTER SHEEN FINAL FORM;Lo;0;AL;<final> 0634;;;;N;GLYPH FOR FINAL ARABIC SHEEN;;;;
+FEB7;ARABIC LETTER SHEEN INITIAL FORM;Lo;0;AL;<initial> 0634;;;;N;GLYPH FOR INITIAL ARABIC SHEEN;;;;
+FEB8;ARABIC LETTER SHEEN MEDIAL FORM;Lo;0;AL;<medial> 0634;;;;N;GLYPH FOR MEDIAL ARABIC SHEEN;;;;
+FEB9;ARABIC LETTER SAD ISOLATED FORM;Lo;0;AL;<isolated> 0635;;;;N;GLYPH FOR ISOLATE ARABIC SAD;;;;
+FEBA;ARABIC LETTER SAD FINAL FORM;Lo;0;AL;<final> 0635;;;;N;GLYPH FOR FINAL ARABIC SAD;;;;
+FEBB;ARABIC LETTER SAD INITIAL FORM;Lo;0;AL;<initial> 0635;;;;N;GLYPH FOR INITIAL ARABIC SAD;;;;
+FEBC;ARABIC LETTER SAD MEDIAL FORM;Lo;0;AL;<medial> 0635;;;;N;GLYPH FOR MEDIAL ARABIC SAD;;;;
+FEBD;ARABIC LETTER DAD ISOLATED FORM;Lo;0;AL;<isolated> 0636;;;;N;GLYPH FOR ISOLATE ARABIC DAD;;;;
+FEBE;ARABIC LETTER DAD FINAL FORM;Lo;0;AL;<final> 0636;;;;N;GLYPH FOR FINAL ARABIC DAD;;;;
+FEBF;ARABIC LETTER DAD INITIAL FORM;Lo;0;AL;<initial> 0636;;;;N;GLYPH FOR INITIAL ARABIC DAD;;;;
+FEC0;ARABIC LETTER DAD MEDIAL FORM;Lo;0;AL;<medial> 0636;;;;N;GLYPH FOR MEDIAL ARABIC DAD;;;;
+FEC1;ARABIC LETTER TAH ISOLATED FORM;Lo;0;AL;<isolated> 0637;;;;N;GLYPH FOR ISOLATE ARABIC TAH;;;;
+FEC2;ARABIC LETTER TAH FINAL FORM;Lo;0;AL;<final> 0637;;;;N;GLYPH FOR FINAL ARABIC TAH;;;;
+FEC3;ARABIC LETTER TAH INITIAL FORM;Lo;0;AL;<initial> 0637;;;;N;GLYPH FOR INITIAL ARABIC TAH;;;;
+FEC4;ARABIC LETTER TAH MEDIAL FORM;Lo;0;AL;<medial> 0637;;;;N;GLYPH FOR MEDIAL ARABIC TAH;;;;
+FEC5;ARABIC LETTER ZAH ISOLATED FORM;Lo;0;AL;<isolated> 0638;;;;N;GLYPH FOR ISOLATE ARABIC DHAH;;;;
+FEC6;ARABIC LETTER ZAH FINAL FORM;Lo;0;AL;<final> 0638;;;;N;GLYPH FOR FINAL ARABIC DHAH;;;;
+FEC7;ARABIC LETTER ZAH INITIAL FORM;Lo;0;AL;<initial> 0638;;;;N;GLYPH FOR INITIAL ARABIC DHAH;;;;
+FEC8;ARABIC LETTER ZAH MEDIAL FORM;Lo;0;AL;<medial> 0638;;;;N;GLYPH FOR MEDIAL ARABIC DHAH;;;;
+FEC9;ARABIC LETTER AIN ISOLATED FORM;Lo;0;AL;<isolated> 0639;;;;N;GLYPH FOR ISOLATE ARABIC AIN;;;;
+FECA;ARABIC LETTER AIN FINAL FORM;Lo;0;AL;<final> 0639;;;;N;GLYPH FOR FINAL ARABIC AIN;;;;
+FECB;ARABIC LETTER AIN INITIAL FORM;Lo;0;AL;<initial> 0639;;;;N;GLYPH FOR INITIAL ARABIC AIN;;;;
+FECC;ARABIC LETTER AIN MEDIAL FORM;Lo;0;AL;<medial> 0639;;;;N;GLYPH FOR MEDIAL ARABIC AIN;;;;
+FECD;ARABIC LETTER GHAIN ISOLATED FORM;Lo;0;AL;<isolated> 063A;;;;N;GLYPH FOR ISOLATE ARABIC GHAIN;;;;
+FECE;ARABIC LETTER GHAIN FINAL FORM;Lo;0;AL;<final> 063A;;;;N;GLYPH FOR FINAL ARABIC GHAIN;;;;
+FECF;ARABIC LETTER GHAIN INITIAL FORM;Lo;0;AL;<initial> 063A;;;;N;GLYPH FOR INITIAL ARABIC GHAIN;;;;
+FED0;ARABIC LETTER GHAIN MEDIAL FORM;Lo;0;AL;<medial> 063A;;;;N;GLYPH FOR MEDIAL ARABIC GHAIN;;;;
+FED1;ARABIC LETTER FEH ISOLATED FORM;Lo;0;AL;<isolated> 0641;;;;N;GLYPH FOR ISOLATE ARABIC FA;;;;
+FED2;ARABIC LETTER FEH FINAL FORM;Lo;0;AL;<final> 0641;;;;N;GLYPH FOR FINAL ARABIC FA;;;;
+FED3;ARABIC LETTER FEH INITIAL FORM;Lo;0;AL;<initial> 0641;;;;N;GLYPH FOR INITIAL ARABIC FA;;;;
+FED4;ARABIC LETTER FEH MEDIAL FORM;Lo;0;AL;<medial> 0641;;;;N;GLYPH FOR MEDIAL ARABIC FA;;;;
+FED5;ARABIC LETTER QAF ISOLATED FORM;Lo;0;AL;<isolated> 0642;;;;N;GLYPH FOR ISOLATE ARABIC QAF;;;;
+FED6;ARABIC LETTER QAF FINAL FORM;Lo;0;AL;<final> 0642;;;;N;GLYPH FOR FINAL ARABIC QAF;;;;
+FED7;ARABIC LETTER QAF INITIAL FORM;Lo;0;AL;<initial> 0642;;;;N;GLYPH FOR INITIAL ARABIC QAF;;;;
+FED8;ARABIC LETTER QAF MEDIAL FORM;Lo;0;AL;<medial> 0642;;;;N;GLYPH FOR MEDIAL ARABIC QAF;;;;
+FED9;ARABIC LETTER KAF ISOLATED FORM;Lo;0;AL;<isolated> 0643;;;;N;GLYPH FOR ISOLATE ARABIC CAF;;;;
+FEDA;ARABIC LETTER KAF FINAL FORM;Lo;0;AL;<final> 0643;;;;N;GLYPH FOR FINAL ARABIC CAF;;;;
+FEDB;ARABIC LETTER KAF INITIAL FORM;Lo;0;AL;<initial> 0643;;;;N;GLYPH FOR INITIAL ARABIC CAF;;;;
+FEDC;ARABIC LETTER KAF MEDIAL FORM;Lo;0;AL;<medial> 0643;;;;N;GLYPH FOR MEDIAL ARABIC CAF;;;;
+FEDD;ARABIC LETTER LAM ISOLATED FORM;Lo;0;AL;<isolated> 0644;;;;N;GLYPH FOR ISOLATE ARABIC LAM;;;;
+FEDE;ARABIC LETTER LAM FINAL FORM;Lo;0;AL;<final> 0644;;;;N;GLYPH FOR FINAL ARABIC LAM;;;;
+FEDF;ARABIC LETTER LAM INITIAL FORM;Lo;0;AL;<initial> 0644;;;;N;GLYPH FOR INITIAL ARABIC LAM;;;;
+FEE0;ARABIC LETTER LAM MEDIAL FORM;Lo;0;AL;<medial> 0644;;;;N;GLYPH FOR MEDIAL ARABIC LAM;;;;
+FEE1;ARABIC LETTER MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645;;;;N;GLYPH FOR ISOLATE ARABIC MEEM;;;;
+FEE2;ARABIC LETTER MEEM FINAL FORM;Lo;0;AL;<final> 0645;;;;N;GLYPH FOR FINAL ARABIC MEEM;;;;
+FEE3;ARABIC LETTER MEEM INITIAL FORM;Lo;0;AL;<initial> 0645;;;;N;GLYPH FOR INITIAL ARABIC MEEM;;;;
+FEE4;ARABIC LETTER MEEM MEDIAL FORM;Lo;0;AL;<medial> 0645;;;;N;GLYPH FOR MEDIAL ARABIC MEEM;;;;
+FEE5;ARABIC LETTER NOON ISOLATED FORM;Lo;0;AL;<isolated> 0646;;;;N;GLYPH FOR ISOLATE ARABIC NOON;;;;
+FEE6;ARABIC LETTER NOON FINAL FORM;Lo;0;AL;<final> 0646;;;;N;GLYPH FOR FINAL ARABIC NOON;;;;
+FEE7;ARABIC LETTER NOON INITIAL FORM;Lo;0;AL;<initial> 0646;;;;N;GLYPH FOR INITIAL ARABIC NOON;;;;
+FEE8;ARABIC LETTER NOON MEDIAL FORM;Lo;0;AL;<medial> 0646;;;;N;GLYPH FOR MEDIAL ARABIC NOON;;;;
+FEE9;ARABIC LETTER HEH ISOLATED FORM;Lo;0;AL;<isolated> 0647;;;;N;GLYPH FOR ISOLATE ARABIC HA;;;;
+FEEA;ARABIC LETTER HEH FINAL FORM;Lo;0;AL;<final> 0647;;;;N;GLYPH FOR FINAL ARABIC HA;;;;
+FEEB;ARABIC LETTER HEH INITIAL FORM;Lo;0;AL;<initial> 0647;;;;N;GLYPH FOR INITIAL ARABIC HA;;;;
+FEEC;ARABIC LETTER HEH MEDIAL FORM;Lo;0;AL;<medial> 0647;;;;N;GLYPH FOR MEDIAL ARABIC HA;;;;
+FEED;ARABIC LETTER WAW ISOLATED FORM;Lo;0;AL;<isolated> 0648;;;;N;GLYPH FOR ISOLATE ARABIC WAW;;;;
+FEEE;ARABIC LETTER WAW FINAL FORM;Lo;0;AL;<final> 0648;;;;N;GLYPH FOR FINAL ARABIC WAW;;;;
+FEEF;ARABIC LETTER ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0649;;;;N;GLYPH FOR ISOLATE ARABIC ALEF MAQSURAH;;;;
+FEF0;ARABIC LETTER ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0649;;;;N;GLYPH FOR FINAL ARABIC ALEF MAQSURAH;;;;
+FEF1;ARABIC LETTER YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A;;;;N;GLYPH FOR ISOLATE ARABIC YA;;;;
+FEF2;ARABIC LETTER YEH FINAL FORM;Lo;0;AL;<final> 064A;;;;N;GLYPH FOR FINAL ARABIC YA;;;;
+FEF3;ARABIC LETTER YEH INITIAL FORM;Lo;0;AL;<initial> 064A;;;;N;GLYPH FOR INITIAL ARABIC YA;;;;
+FEF4;ARABIC LETTER YEH MEDIAL FORM;Lo;0;AL;<medial> 064A;;;;N;GLYPH FOR MEDIAL ARABIC YA;;;;
+FEF5;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF6;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF7;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF8;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF9;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0644 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFA;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0644 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFB;ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0644 0627;;;;N;GLYPH FOR ISOLATE ARABIC LIGATURE LAM ALEF;;;;
+FEFC;ARABIC LIGATURE LAM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0644 0627;;;;N;GLYPH FOR FINAL ARABIC LIGATURE LAM ALEF;;;;
+FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;;
+FF01;FULLWIDTH EXCLAMATION MARK;Po;0;ON;<wide> 0021;;;;N;;;;;
+FF02;FULLWIDTH QUOTATION MARK;Po;0;ON;<wide> 0022;;;;N;;;;;
+FF03;FULLWIDTH NUMBER SIGN;Po;0;ET;<wide> 0023;;;;N;;;;;
+FF04;FULLWIDTH DOLLAR SIGN;Sc;0;ET;<wide> 0024;;;;N;;;;;
+FF05;FULLWIDTH PERCENT SIGN;Po;0;ET;<wide> 0025;;;;N;;;;;
+FF06;FULLWIDTH AMPERSAND;Po;0;ON;<wide> 0026;;;;N;;;;;
+FF07;FULLWIDTH APOSTROPHE;Po;0;ON;<wide> 0027;;;;N;;;;;
+FF08;FULLWIDTH LEFT PARENTHESIS;Ps;0;ON;<wide> 0028;;;;Y;FULLWIDTH OPENING PARENTHESIS;;;;
+FF09;FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON;<wide> 0029;;;;Y;FULLWIDTH CLOSING PARENTHESIS;;;;
+FF0A;FULLWIDTH ASTERISK;Po;0;ON;<wide> 002A;;;;N;;;;;
+FF0B;FULLWIDTH PLUS SIGN;Sm;0;ES;<wide> 002B;;;;N;;;;;
+FF0C;FULLWIDTH COMMA;Po;0;CS;<wide> 002C;;;;N;;;;;
+FF0D;FULLWIDTH HYPHEN-MINUS;Pd;0;ES;<wide> 002D;;;;N;;;;;
+FF0E;FULLWIDTH FULL STOP;Po;0;CS;<wide> 002E;;;;N;FULLWIDTH PERIOD;;;;
+FF0F;FULLWIDTH SOLIDUS;Po;0;CS;<wide> 002F;;;;N;FULLWIDTH SLASH;;;;
+FF10;FULLWIDTH DIGIT ZERO;Nd;0;EN;<wide> 0030;0;0;0;N;;;;;
+FF11;FULLWIDTH DIGIT ONE;Nd;0;EN;<wide> 0031;1;1;1;N;;;;;
+FF12;FULLWIDTH DIGIT TWO;Nd;0;EN;<wide> 0032;2;2;2;N;;;;;
+FF13;FULLWIDTH DIGIT THREE;Nd;0;EN;<wide> 0033;3;3;3;N;;;;;
+FF14;FULLWIDTH DIGIT FOUR;Nd;0;EN;<wide> 0034;4;4;4;N;;;;;
+FF15;FULLWIDTH DIGIT FIVE;Nd;0;EN;<wide> 0035;5;5;5;N;;;;;
+FF16;FULLWIDTH DIGIT SIX;Nd;0;EN;<wide> 0036;6;6;6;N;;;;;
+FF17;FULLWIDTH DIGIT SEVEN;Nd;0;EN;<wide> 0037;7;7;7;N;;;;;
+FF18;FULLWIDTH DIGIT EIGHT;Nd;0;EN;<wide> 0038;8;8;8;N;;;;;
+FF19;FULLWIDTH DIGIT NINE;Nd;0;EN;<wide> 0039;9;9;9;N;;;;;
+FF1A;FULLWIDTH COLON;Po;0;CS;<wide> 003A;;;;N;;;;;
+FF1B;FULLWIDTH SEMICOLON;Po;0;ON;<wide> 003B;;;;N;;;;;
+FF1C;FULLWIDTH LESS-THAN SIGN;Sm;0;ON;<wide> 003C;;;;Y;;;;;
+FF1D;FULLWIDTH EQUALS SIGN;Sm;0;ON;<wide> 003D;;;;N;;;;;
+FF1E;FULLWIDTH GREATER-THAN SIGN;Sm;0;ON;<wide> 003E;;;;Y;;;;;
+FF1F;FULLWIDTH QUESTION MARK;Po;0;ON;<wide> 003F;;;;N;;;;;
+FF20;FULLWIDTH COMMERCIAL AT;Po;0;ON;<wide> 0040;;;;N;;;;;
+FF21;FULLWIDTH LATIN CAPITAL LETTER A;Lu;0;L;<wide> 0041;;;;N;;;;FF41;
+FF22;FULLWIDTH LATIN CAPITAL LETTER B;Lu;0;L;<wide> 0042;;;;N;;;;FF42;
+FF23;FULLWIDTH LATIN CAPITAL LETTER C;Lu;0;L;<wide> 0043;;;;N;;;;FF43;
+FF24;FULLWIDTH LATIN CAPITAL LETTER D;Lu;0;L;<wide> 0044;;;;N;;;;FF44;
+FF25;FULLWIDTH LATIN CAPITAL LETTER E;Lu;0;L;<wide> 0045;;;;N;;;;FF45;
+FF26;FULLWIDTH LATIN CAPITAL LETTER F;Lu;0;L;<wide> 0046;;;;N;;;;FF46;
+FF27;FULLWIDTH LATIN CAPITAL LETTER G;Lu;0;L;<wide> 0047;;;;N;;;;FF47;
+FF28;FULLWIDTH LATIN CAPITAL LETTER H;Lu;0;L;<wide> 0048;;;;N;;;;FF48;
+FF29;FULLWIDTH LATIN CAPITAL LETTER I;Lu;0;L;<wide> 0049;;;;N;;;;FF49;
+FF2A;FULLWIDTH LATIN CAPITAL LETTER J;Lu;0;L;<wide> 004A;;;;N;;;;FF4A;
+FF2B;FULLWIDTH LATIN CAPITAL LETTER K;Lu;0;L;<wide> 004B;;;;N;;;;FF4B;
+FF2C;FULLWIDTH LATIN CAPITAL LETTER L;Lu;0;L;<wide> 004C;;;;N;;;;FF4C;
+FF2D;FULLWIDTH LATIN CAPITAL LETTER M;Lu;0;L;<wide> 004D;;;;N;;;;FF4D;
+FF2E;FULLWIDTH LATIN CAPITAL LETTER N;Lu;0;L;<wide> 004E;;;;N;;;;FF4E;
+FF2F;FULLWIDTH LATIN CAPITAL LETTER O;Lu;0;L;<wide> 004F;;;;N;;;;FF4F;
+FF30;FULLWIDTH LATIN CAPITAL LETTER P;Lu;0;L;<wide> 0050;;;;N;;;;FF50;
+FF31;FULLWIDTH LATIN CAPITAL LETTER Q;Lu;0;L;<wide> 0051;;;;N;;;;FF51;
+FF32;FULLWIDTH LATIN CAPITAL LETTER R;Lu;0;L;<wide> 0052;;;;N;;;;FF52;
+FF33;FULLWIDTH LATIN CAPITAL LETTER S;Lu;0;L;<wide> 0053;;;;N;;;;FF53;
+FF34;FULLWIDTH LATIN CAPITAL LETTER T;Lu;0;L;<wide> 0054;;;;N;;;;FF54;
+FF35;FULLWIDTH LATIN CAPITAL LETTER U;Lu;0;L;<wide> 0055;;;;N;;;;FF55;
+FF36;FULLWIDTH LATIN CAPITAL LETTER V;Lu;0;L;<wide> 0056;;;;N;;;;FF56;
+FF37;FULLWIDTH LATIN CAPITAL LETTER W;Lu;0;L;<wide> 0057;;;;N;;;;FF57;
+FF38;FULLWIDTH LATIN CAPITAL LETTER X;Lu;0;L;<wide> 0058;;;;N;;;;FF58;
+FF39;FULLWIDTH LATIN CAPITAL LETTER Y;Lu;0;L;<wide> 0059;;;;N;;;;FF59;
+FF3A;FULLWIDTH LATIN CAPITAL LETTER Z;Lu;0;L;<wide> 005A;;;;N;;;;FF5A;
+FF3B;FULLWIDTH LEFT SQUARE BRACKET;Ps;0;ON;<wide> 005B;;;;Y;FULLWIDTH OPENING SQUARE BRACKET;;;;
+FF3C;FULLWIDTH REVERSE SOLIDUS;Po;0;ON;<wide> 005C;;;;N;FULLWIDTH BACKSLASH;;;;
+FF3D;FULLWIDTH RIGHT SQUARE BRACKET;Pe;0;ON;<wide> 005D;;;;Y;FULLWIDTH CLOSING SQUARE BRACKET;;;;
+FF3E;FULLWIDTH CIRCUMFLEX ACCENT;Sk;0;ON;<wide> 005E;;;;N;FULLWIDTH SPACING CIRCUMFLEX;;;;
+FF3F;FULLWIDTH LOW LINE;Pc;0;ON;<wide> 005F;;;;N;FULLWIDTH SPACING UNDERSCORE;;;;
+FF40;FULLWIDTH GRAVE ACCENT;Sk;0;ON;<wide> 0060;;;;N;FULLWIDTH SPACING GRAVE;;;;
+FF41;FULLWIDTH LATIN SMALL LETTER A;Ll;0;L;<wide> 0061;;;;N;;;FF21;;FF21
+FF42;FULLWIDTH LATIN SMALL LETTER B;Ll;0;L;<wide> 0062;;;;N;;;FF22;;FF22
+FF43;FULLWIDTH LATIN SMALL LETTER C;Ll;0;L;<wide> 0063;;;;N;;;FF23;;FF23
+FF44;FULLWIDTH LATIN SMALL LETTER D;Ll;0;L;<wide> 0064;;;;N;;;FF24;;FF24
+FF45;FULLWIDTH LATIN SMALL LETTER E;Ll;0;L;<wide> 0065;;;;N;;;FF25;;FF25
+FF46;FULLWIDTH LATIN SMALL LETTER F;Ll;0;L;<wide> 0066;;;;N;;;FF26;;FF26
+FF47;FULLWIDTH LATIN SMALL LETTER G;Ll;0;L;<wide> 0067;;;;N;;;FF27;;FF27
+FF48;FULLWIDTH LATIN SMALL LETTER H;Ll;0;L;<wide> 0068;;;;N;;;FF28;;FF28
+FF49;FULLWIDTH LATIN SMALL LETTER I;Ll;0;L;<wide> 0069;;;;N;;;FF29;;FF29
+FF4A;FULLWIDTH LATIN SMALL LETTER J;Ll;0;L;<wide> 006A;;;;N;;;FF2A;;FF2A
+FF4B;FULLWIDTH LATIN SMALL LETTER K;Ll;0;L;<wide> 006B;;;;N;;;FF2B;;FF2B
+FF4C;FULLWIDTH LATIN SMALL LETTER L;Ll;0;L;<wide> 006C;;;;N;;;FF2C;;FF2C
+FF4D;FULLWIDTH LATIN SMALL LETTER M;Ll;0;L;<wide> 006D;;;;N;;;FF2D;;FF2D
+FF4E;FULLWIDTH LATIN SMALL LETTER N;Ll;0;L;<wide> 006E;;;;N;;;FF2E;;FF2E
+FF4F;FULLWIDTH LATIN SMALL LETTER O;Ll;0;L;<wide> 006F;;;;N;;;FF2F;;FF2F
+FF50;FULLWIDTH LATIN SMALL LETTER P;Ll;0;L;<wide> 0070;;;;N;;;FF30;;FF30
+FF51;FULLWIDTH LATIN SMALL LETTER Q;Ll;0;L;<wide> 0071;;;;N;;;FF31;;FF31
+FF52;FULLWIDTH LATIN SMALL LETTER R;Ll;0;L;<wide> 0072;;;;N;;;FF32;;FF32
+FF53;FULLWIDTH LATIN SMALL LETTER S;Ll;0;L;<wide> 0073;;;;N;;;FF33;;FF33
+FF54;FULLWIDTH LATIN SMALL LETTER T;Ll;0;L;<wide> 0074;;;;N;;;FF34;;FF34
+FF55;FULLWIDTH LATIN SMALL LETTER U;Ll;0;L;<wide> 0075;;;;N;;;FF35;;FF35
+FF56;FULLWIDTH LATIN SMALL LETTER V;Ll;0;L;<wide> 0076;;;;N;;;FF36;;FF36
+FF57;FULLWIDTH LATIN SMALL LETTER W;Ll;0;L;<wide> 0077;;;;N;;;FF37;;FF37
+FF58;FULLWIDTH LATIN SMALL LETTER X;Ll;0;L;<wide> 0078;;;;N;;;FF38;;FF38
+FF59;FULLWIDTH LATIN SMALL LETTER Y;Ll;0;L;<wide> 0079;;;;N;;;FF39;;FF39
+FF5A;FULLWIDTH LATIN SMALL LETTER Z;Ll;0;L;<wide> 007A;;;;N;;;FF3A;;FF3A
+FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON;<wide> 007B;;;;Y;FULLWIDTH OPENING CURLY BRACKET;;;;
+FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON;<wide> 007C;;;;N;FULLWIDTH VERTICAL BAR;;;;
+FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON;<wide> 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;;
+FF5E;FULLWIDTH TILDE;Sm;0;ON;<wide> 007E;;;;N;FULLWIDTH SPACING TILDE;;;;
+FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;;;;
+FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;;;;
+FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON;<narrow> 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;;
+FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON;<narrow> 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;;
+FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON;<narrow> 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;;
+FF64;HALFWIDTH IDEOGRAPHIC COMMA;Po;0;ON;<narrow> 3001;;;;N;;;;;
+FF65;HALFWIDTH KATAKANA MIDDLE DOT;Po;0;ON;<narrow> 30FB;;;;N;;;;;
+FF66;HALFWIDTH KATAKANA LETTER WO;Lo;0;L;<narrow> 30F2;;;;N;;;;;
+FF67;HALFWIDTH KATAKANA LETTER SMALL A;Lo;0;L;<narrow> 30A1;;;;N;;;;;
+FF68;HALFWIDTH KATAKANA LETTER SMALL I;Lo;0;L;<narrow> 30A3;;;;N;;;;;
+FF69;HALFWIDTH KATAKANA LETTER SMALL U;Lo;0;L;<narrow> 30A5;;;;N;;;;;
+FF6A;HALFWIDTH KATAKANA LETTER SMALL E;Lo;0;L;<narrow> 30A7;;;;N;;;;;
+FF6B;HALFWIDTH KATAKANA LETTER SMALL O;Lo;0;L;<narrow> 30A9;;;;N;;;;;
+FF6C;HALFWIDTH KATAKANA LETTER SMALL YA;Lo;0;L;<narrow> 30E3;;;;N;;;;;
+FF6D;HALFWIDTH KATAKANA LETTER SMALL YU;Lo;0;L;<narrow> 30E5;;;;N;;;;;
+FF6E;HALFWIDTH KATAKANA LETTER SMALL YO;Lo;0;L;<narrow> 30E7;;;;N;;;;;
+FF6F;HALFWIDTH KATAKANA LETTER SMALL TU;Lo;0;L;<narrow> 30C3;;;;N;;;;;
+FF70;HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;<narrow> 30FC;;;;N;;;;;
+FF71;HALFWIDTH KATAKANA LETTER A;Lo;0;L;<narrow> 30A2;;;;N;;;;;
+FF72;HALFWIDTH KATAKANA LETTER I;Lo;0;L;<narrow> 30A4;;;;N;;;;;
+FF73;HALFWIDTH KATAKANA LETTER U;Lo;0;L;<narrow> 30A6;;;;N;;;;;
+FF74;HALFWIDTH KATAKANA LETTER E;Lo;0;L;<narrow> 30A8;;;;N;;;;;
+FF75;HALFWIDTH KATAKANA LETTER O;Lo;0;L;<narrow> 30AA;;;;N;;;;;
+FF76;HALFWIDTH KATAKANA LETTER KA;Lo;0;L;<narrow> 30AB;;;;N;;;;;
+FF77;HALFWIDTH KATAKANA LETTER KI;Lo;0;L;<narrow> 30AD;;;;N;;;;;
+FF78;HALFWIDTH KATAKANA LETTER KU;Lo;0;L;<narrow> 30AF;;;;N;;;;;
+FF79;HALFWIDTH KATAKANA LETTER KE;Lo;0;L;<narrow> 30B1;;;;N;;;;;
+FF7A;HALFWIDTH KATAKANA LETTER KO;Lo;0;L;<narrow> 30B3;;;;N;;;;;
+FF7B;HALFWIDTH KATAKANA LETTER SA;Lo;0;L;<narrow> 30B5;;;;N;;;;;
+FF7C;HALFWIDTH KATAKANA LETTER SI;Lo;0;L;<narrow> 30B7;;;;N;;;;;
+FF7D;HALFWIDTH KATAKANA LETTER SU;Lo;0;L;<narrow> 30B9;;;;N;;;;;
+FF7E;HALFWIDTH KATAKANA LETTER SE;Lo;0;L;<narrow> 30BB;;;;N;;;;;
+FF7F;HALFWIDTH KATAKANA LETTER SO;Lo;0;L;<narrow> 30BD;;;;N;;;;;
+FF80;HALFWIDTH KATAKANA LETTER TA;Lo;0;L;<narrow> 30BF;;;;N;;;;;
+FF81;HALFWIDTH KATAKANA LETTER TI;Lo;0;L;<narrow> 30C1;;;;N;;;;;
+FF82;HALFWIDTH KATAKANA LETTER TU;Lo;0;L;<narrow> 30C4;;;;N;;;;;
+FF83;HALFWIDTH KATAKANA LETTER TE;Lo;0;L;<narrow> 30C6;;;;N;;;;;
+FF84;HALFWIDTH KATAKANA LETTER TO;Lo;0;L;<narrow> 30C8;;;;N;;;;;
+FF85;HALFWIDTH KATAKANA LETTER NA;Lo;0;L;<narrow> 30CA;;;;N;;;;;
+FF86;HALFWIDTH KATAKANA LETTER NI;Lo;0;L;<narrow> 30CB;;;;N;;;;;
+FF87;HALFWIDTH KATAKANA LETTER NU;Lo;0;L;<narrow> 30CC;;;;N;;;;;
+FF88;HALFWIDTH KATAKANA LETTER NE;Lo;0;L;<narrow> 30CD;;;;N;;;;;
+FF89;HALFWIDTH KATAKANA LETTER NO;Lo;0;L;<narrow> 30CE;;;;N;;;;;
+FF8A;HALFWIDTH KATAKANA LETTER HA;Lo;0;L;<narrow> 30CF;;;;N;;;;;
+FF8B;HALFWIDTH KATAKANA LETTER HI;Lo;0;L;<narrow> 30D2;;;;N;;;;;
+FF8C;HALFWIDTH KATAKANA LETTER HU;Lo;0;L;<narrow> 30D5;;;;N;;;;;
+FF8D;HALFWIDTH KATAKANA LETTER HE;Lo;0;L;<narrow> 30D8;;;;N;;;;;
+FF8E;HALFWIDTH KATAKANA LETTER HO;Lo;0;L;<narrow> 30DB;;;;N;;;;;
+FF8F;HALFWIDTH KATAKANA LETTER MA;Lo;0;L;<narrow> 30DE;;;;N;;;;;
+FF90;HALFWIDTH KATAKANA LETTER MI;Lo;0;L;<narrow> 30DF;;;;N;;;;;
+FF91;HALFWIDTH KATAKANA LETTER MU;Lo;0;L;<narrow> 30E0;;;;N;;;;;
+FF92;HALFWIDTH KATAKANA LETTER ME;Lo;0;L;<narrow> 30E1;;;;N;;;;;
+FF93;HALFWIDTH KATAKANA LETTER MO;Lo;0;L;<narrow> 30E2;;;;N;;;;;
+FF94;HALFWIDTH KATAKANA LETTER YA;Lo;0;L;<narrow> 30E4;;;;N;;;;;
+FF95;HALFWIDTH KATAKANA LETTER YU;Lo;0;L;<narrow> 30E6;;;;N;;;;;
+FF96;HALFWIDTH KATAKANA LETTER YO;Lo;0;L;<narrow> 30E8;;;;N;;;;;
+FF97;HALFWIDTH KATAKANA LETTER RA;Lo;0;L;<narrow> 30E9;;;;N;;;;;
+FF98;HALFWIDTH KATAKANA LETTER RI;Lo;0;L;<narrow> 30EA;;;;N;;;;;
+FF99;HALFWIDTH KATAKANA LETTER RU;Lo;0;L;<narrow> 30EB;;;;N;;;;;
+FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L;<narrow> 30EC;;;;N;;;;;
+FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L;<narrow> 30ED;;;;N;;;;;
+FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L;<narrow> 30EF;;;;N;;;;;
+FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L;<narrow> 30F3;;;;N;;;;;
+FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;;;;
+FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;;;;
+FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L;<narrow> 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;;
+FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L;<narrow> 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;;
+FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L;<narrow> 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;;
+FFA3;HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<narrow> 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;;
+FFA4;HALFWIDTH HANGUL LETTER NIEUN;Lo;0;L;<narrow> 3134;;;;N;;;;;
+FFA5;HALFWIDTH HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<narrow> 3135;;;;N;HALFWIDTH HANGUL LETTER NIEUN JIEUJ;;;;
+FFA6;HALFWIDTH HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<narrow> 3136;;;;N;HALFWIDTH HANGUL LETTER NIEUN HIEUH;;;;
+FFA7;HALFWIDTH HANGUL LETTER TIKEUT;Lo;0;L;<narrow> 3137;;;;N;HALFWIDTH HANGUL LETTER DIGEUD;;;;
+FFA8;HALFWIDTH HANGUL LETTER SSANGTIKEUT;Lo;0;L;<narrow> 3138;;;;N;HALFWIDTH HANGUL LETTER SSANG DIGEUD;;;;
+FFA9;HALFWIDTH HANGUL LETTER RIEUL;Lo;0;L;<narrow> 3139;;;;N;HALFWIDTH HANGUL LETTER LIEUL;;;;
+FFAA;HALFWIDTH HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<narrow> 313A;;;;N;HALFWIDTH HANGUL LETTER LIEUL GIYEOG;;;;
+FFAB;HALFWIDTH HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<narrow> 313B;;;;N;HALFWIDTH HANGUL LETTER LIEUL MIEUM;;;;
+FFAC;HALFWIDTH HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<narrow> 313C;;;;N;HALFWIDTH HANGUL LETTER LIEUL BIEUB;;;;
+FFAD;HALFWIDTH HANGUL LETTER RIEUL-SIOS;Lo;0;L;<narrow> 313D;;;;N;HALFWIDTH HANGUL LETTER LIEUL SIOS;;;;
+FFAE;HALFWIDTH HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<narrow> 313E;;;;N;HALFWIDTH HANGUL LETTER LIEUL TIEUT;;;;
+FFAF;HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<narrow> 313F;;;;N;HALFWIDTH HANGUL LETTER LIEUL PIEUP;;;;
+FFB0;HALFWIDTH HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<narrow> 3140;;;;N;HALFWIDTH HANGUL LETTER LIEUL HIEUH;;;;
+FFB1;HALFWIDTH HANGUL LETTER MIEUM;Lo;0;L;<narrow> 3141;;;;N;;;;;
+FFB2;HALFWIDTH HANGUL LETTER PIEUP;Lo;0;L;<narrow> 3142;;;;N;HALFWIDTH HANGUL LETTER BIEUB;;;;
+FFB3;HALFWIDTH HANGUL LETTER SSANGPIEUP;Lo;0;L;<narrow> 3143;;;;N;HALFWIDTH HANGUL LETTER SSANG BIEUB;;;;
+FFB4;HALFWIDTH HANGUL LETTER PIEUP-SIOS;Lo;0;L;<narrow> 3144;;;;N;HALFWIDTH HANGUL LETTER BIEUB SIOS;;;;
+FFB5;HALFWIDTH HANGUL LETTER SIOS;Lo;0;L;<narrow> 3145;;;;N;;;;;
+FFB6;HALFWIDTH HANGUL LETTER SSANGSIOS;Lo;0;L;<narrow> 3146;;;;N;HALFWIDTH HANGUL LETTER SSANG SIOS;;;;
+FFB7;HALFWIDTH HANGUL LETTER IEUNG;Lo;0;L;<narrow> 3147;;;;N;;;;;
+FFB8;HALFWIDTH HANGUL LETTER CIEUC;Lo;0;L;<narrow> 3148;;;;N;HALFWIDTH HANGUL LETTER JIEUJ;;;;
+FFB9;HALFWIDTH HANGUL LETTER SSANGCIEUC;Lo;0;L;<narrow> 3149;;;;N;HALFWIDTH HANGUL LETTER SSANG JIEUJ;;;;
+FFBA;HALFWIDTH HANGUL LETTER CHIEUCH;Lo;0;L;<narrow> 314A;;;;N;HALFWIDTH HANGUL LETTER CIEUC;;;;
+FFBB;HALFWIDTH HANGUL LETTER KHIEUKH;Lo;0;L;<narrow> 314B;;;;N;HALFWIDTH HANGUL LETTER KIYEOK;;;;
+FFBC;HALFWIDTH HANGUL LETTER THIEUTH;Lo;0;L;<narrow> 314C;;;;N;HALFWIDTH HANGUL LETTER TIEUT;;;;
+FFBD;HALFWIDTH HANGUL LETTER PHIEUPH;Lo;0;L;<narrow> 314D;;;;N;HALFWIDTH HANGUL LETTER PIEUP;;;;
+FFBE;HALFWIDTH HANGUL LETTER HIEUH;Lo;0;L;<narrow> 314E;;;;N;;;;;
+FFC2;HALFWIDTH HANGUL LETTER A;Lo;0;L;<narrow> 314F;;;;N;;;;;
+FFC3;HALFWIDTH HANGUL LETTER AE;Lo;0;L;<narrow> 3150;;;;N;;;;;
+FFC4;HALFWIDTH HANGUL LETTER YA;Lo;0;L;<narrow> 3151;;;;N;;;;;
+FFC5;HALFWIDTH HANGUL LETTER YAE;Lo;0;L;<narrow> 3152;;;;N;;;;;
+FFC6;HALFWIDTH HANGUL LETTER EO;Lo;0;L;<narrow> 3153;;;;N;;;;;
+FFC7;HALFWIDTH HANGUL LETTER E;Lo;0;L;<narrow> 3154;;;;N;;;;;
+FFCA;HALFWIDTH HANGUL LETTER YEO;Lo;0;L;<narrow> 3155;;;;N;;;;;
+FFCB;HALFWIDTH HANGUL LETTER YE;Lo;0;L;<narrow> 3156;;;;N;;;;;
+FFCC;HALFWIDTH HANGUL LETTER O;Lo;0;L;<narrow> 3157;;;;N;;;;;
+FFCD;HALFWIDTH HANGUL LETTER WA;Lo;0;L;<narrow> 3158;;;;N;;;;;
+FFCE;HALFWIDTH HANGUL LETTER WAE;Lo;0;L;<narrow> 3159;;;;N;;;;;
+FFCF;HALFWIDTH HANGUL LETTER OE;Lo;0;L;<narrow> 315A;;;;N;;;;;
+FFD2;HALFWIDTH HANGUL LETTER YO;Lo;0;L;<narrow> 315B;;;;N;;;;;
+FFD3;HALFWIDTH HANGUL LETTER U;Lo;0;L;<narrow> 315C;;;;N;;;;;
+FFD4;HALFWIDTH HANGUL LETTER WEO;Lo;0;L;<narrow> 315D;;;;N;;;;;
+FFD5;HALFWIDTH HANGUL LETTER WE;Lo;0;L;<narrow> 315E;;;;N;;;;;
+FFD6;HALFWIDTH HANGUL LETTER WI;Lo;0;L;<narrow> 315F;;;;N;;;;;
+FFD7;HALFWIDTH HANGUL LETTER YU;Lo;0;L;<narrow> 3160;;;;N;;;;;
+FFDA;HALFWIDTH HANGUL LETTER EU;Lo;0;L;<narrow> 3161;;;;N;;;;;
+FFDB;HALFWIDTH HANGUL LETTER YI;Lo;0;L;<narrow> 3162;;;;N;;;;;
+FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
+FFE0;FULLWIDTH CENT SIGN;Sc;0;ET;<wide> 00A2;;;;N;;;;;
+FFE1;FULLWIDTH POUND SIGN;Sc;0;ET;<wide> 00A3;;;;N;;;;;
+FFE2;FULLWIDTH NOT SIGN;Sm;0;ON;<wide> 00AC;;;;N;;;;;
+FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;;;;
+FFE4;FULLWIDTH BROKEN BAR;So;0;ON;<wide> 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;;
+FFE5;FULLWIDTH YEN SIGN;Sc;0;ET;<wide> 00A5;;;;N;;;;;
+FFE6;FULLWIDTH WON SIGN;Sc;0;ET;<wide> 20A9;;;;N;;;;;
+FFE8;HALFWIDTH FORMS LIGHT VERTICAL;So;0;ON;<narrow> 2502;;;;N;;;;;
+FFE9;HALFWIDTH LEFTWARDS ARROW;Sm;0;ON;<narrow> 2190;;;;N;;;;;
+FFEA;HALFWIDTH UPWARDS ARROW;Sm;0;ON;<narrow> 2191;;;;N;;;;;
+FFEB;HALFWIDTH RIGHTWARDS ARROW;Sm;0;ON;<narrow> 2192;;;;N;;;;;
+FFEC;HALFWIDTH DOWNWARDS ARROW;Sm;0;ON;<narrow> 2193;;;;N;;;;;
+FFED;HALFWIDTH BLACK SQUARE;So;0;ON;<narrow> 25A0;;;;N;;;;;
+FFEE;HALFWIDTH WHITE CIRCLE;So;0;ON;<narrow> 25CB;;;;N;;;;;
+FFF9;INTERLINEAR ANNOTATION ANCHOR;Cf;0;ON;;;;;N;;;;;
+FFFA;INTERLINEAR ANNOTATION SEPARATOR;Cf;0;ON;;;;;N;;;;;
+FFFB;INTERLINEAR ANNOTATION TERMINATOR;Cf;0;ON;;;;;N;;;;;
+FFFC;OBJECT REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+10000;LINEAR B SYLLABLE B008 A;Lo;0;L;;;;;N;;;;;
+10001;LINEAR B SYLLABLE B038 E;Lo;0;L;;;;;N;;;;;
+10002;LINEAR B SYLLABLE B028 I;Lo;0;L;;;;;N;;;;;
+10003;LINEAR B SYLLABLE B061 O;Lo;0;L;;;;;N;;;;;
+10004;LINEAR B SYLLABLE B010 U;Lo;0;L;;;;;N;;;;;
+10005;LINEAR B SYLLABLE B001 DA;Lo;0;L;;;;;N;;;;;
+10006;LINEAR B SYLLABLE B045 DE;Lo;0;L;;;;;N;;;;;
+10007;LINEAR B SYLLABLE B007 DI;Lo;0;L;;;;;N;;;;;
+10008;LINEAR B SYLLABLE B014 DO;Lo;0;L;;;;;N;;;;;
+10009;LINEAR B SYLLABLE B051 DU;Lo;0;L;;;;;N;;;;;
+1000A;LINEAR B SYLLABLE B057 JA;Lo;0;L;;;;;N;;;;;
+1000B;LINEAR B SYLLABLE B046 JE;Lo;0;L;;;;;N;;;;;
+1000D;LINEAR B SYLLABLE B036 JO;Lo;0;L;;;;;N;;;;;
+1000E;LINEAR B SYLLABLE B065 JU;Lo;0;L;;;;;N;;;;;
+1000F;LINEAR B SYLLABLE B077 KA;Lo;0;L;;;;;N;;;;;
+10010;LINEAR B SYLLABLE B044 KE;Lo;0;L;;;;;N;;;;;
+10011;LINEAR B SYLLABLE B067 KI;Lo;0;L;;;;;N;;;;;
+10012;LINEAR B SYLLABLE B070 KO;Lo;0;L;;;;;N;;;;;
+10013;LINEAR B SYLLABLE B081 KU;Lo;0;L;;;;;N;;;;;
+10014;LINEAR B SYLLABLE B080 MA;Lo;0;L;;;;;N;;;;;
+10015;LINEAR B SYLLABLE B013 ME;Lo;0;L;;;;;N;;;;;
+10016;LINEAR B SYLLABLE B073 MI;Lo;0;L;;;;;N;;;;;
+10017;LINEAR B SYLLABLE B015 MO;Lo;0;L;;;;;N;;;;;
+10018;LINEAR B SYLLABLE B023 MU;Lo;0;L;;;;;N;;;;;
+10019;LINEAR B SYLLABLE B006 NA;Lo;0;L;;;;;N;;;;;
+1001A;LINEAR B SYLLABLE B024 NE;Lo;0;L;;;;;N;;;;;
+1001B;LINEAR B SYLLABLE B030 NI;Lo;0;L;;;;;N;;;;;
+1001C;LINEAR B SYLLABLE B052 NO;Lo;0;L;;;;;N;;;;;
+1001D;LINEAR B SYLLABLE B055 NU;Lo;0;L;;;;;N;;;;;
+1001E;LINEAR B SYLLABLE B003 PA;Lo;0;L;;;;;N;;;;;
+1001F;LINEAR B SYLLABLE B072 PE;Lo;0;L;;;;;N;;;;;
+10020;LINEAR B SYLLABLE B039 PI;Lo;0;L;;;;;N;;;;;
+10021;LINEAR B SYLLABLE B011 PO;Lo;0;L;;;;;N;;;;;
+10022;LINEAR B SYLLABLE B050 PU;Lo;0;L;;;;;N;;;;;
+10023;LINEAR B SYLLABLE B016 QA;Lo;0;L;;;;;N;;;;;
+10024;LINEAR B SYLLABLE B078 QE;Lo;0;L;;;;;N;;;;;
+10025;LINEAR B SYLLABLE B021 QI;Lo;0;L;;;;;N;;;;;
+10026;LINEAR B SYLLABLE B032 QO;Lo;0;L;;;;;N;;;;;
+10028;LINEAR B SYLLABLE B060 RA;Lo;0;L;;;;;N;;;;;
+10029;LINEAR B SYLLABLE B027 RE;Lo;0;L;;;;;N;;;;;
+1002A;LINEAR B SYLLABLE B053 RI;Lo;0;L;;;;;N;;;;;
+1002B;LINEAR B SYLLABLE B002 RO;Lo;0;L;;;;;N;;;;;
+1002C;LINEAR B SYLLABLE B026 RU;Lo;0;L;;;;;N;;;;;
+1002D;LINEAR B SYLLABLE B031 SA;Lo;0;L;;;;;N;;;;;
+1002E;LINEAR B SYLLABLE B009 SE;Lo;0;L;;;;;N;;;;;
+1002F;LINEAR B SYLLABLE B041 SI;Lo;0;L;;;;;N;;;;;
+10030;LINEAR B SYLLABLE B012 SO;Lo;0;L;;;;;N;;;;;
+10031;LINEAR B SYLLABLE B058 SU;Lo;0;L;;;;;N;;;;;
+10032;LINEAR B SYLLABLE B059 TA;Lo;0;L;;;;;N;;;;;
+10033;LINEAR B SYLLABLE B004 TE;Lo;0;L;;;;;N;;;;;
+10034;LINEAR B SYLLABLE B037 TI;Lo;0;L;;;;;N;;;;;
+10035;LINEAR B SYLLABLE B005 TO;Lo;0;L;;;;;N;;;;;
+10036;LINEAR B SYLLABLE B069 TU;Lo;0;L;;;;;N;;;;;
+10037;LINEAR B SYLLABLE B054 WA;Lo;0;L;;;;;N;;;;;
+10038;LINEAR B SYLLABLE B075 WE;Lo;0;L;;;;;N;;;;;
+10039;LINEAR B SYLLABLE B040 WI;Lo;0;L;;;;;N;;;;;
+1003A;LINEAR B SYLLABLE B042 WO;Lo;0;L;;;;;N;;;;;
+1003C;LINEAR B SYLLABLE B017 ZA;Lo;0;L;;;;;N;;;;;
+1003D;LINEAR B SYLLABLE B074 ZE;Lo;0;L;;;;;N;;;;;
+1003F;LINEAR B SYLLABLE B020 ZO;Lo;0;L;;;;;N;;;;;
+10040;LINEAR B SYLLABLE B025 A2;Lo;0;L;;;;;N;;;;;
+10041;LINEAR B SYLLABLE B043 A3;Lo;0;L;;;;;N;;;;;
+10042;LINEAR B SYLLABLE B085 AU;Lo;0;L;;;;;N;;;;;
+10043;LINEAR B SYLLABLE B071 DWE;Lo;0;L;;;;;N;;;;;
+10044;LINEAR B SYLLABLE B090 DWO;Lo;0;L;;;;;N;;;;;
+10045;LINEAR B SYLLABLE B048 NWA;Lo;0;L;;;;;N;;;;;
+10046;LINEAR B SYLLABLE B029 PU2;Lo;0;L;;;;;N;;;;;
+10047;LINEAR B SYLLABLE B062 PTE;Lo;0;L;;;;;N;;;;;
+10048;LINEAR B SYLLABLE B076 RA2;Lo;0;L;;;;;N;;;;;
+10049;LINEAR B SYLLABLE B033 RA3;Lo;0;L;;;;;N;;;;;
+1004A;LINEAR B SYLLABLE B068 RO2;Lo;0;L;;;;;N;;;;;
+1004B;LINEAR B SYLLABLE B066 TA2;Lo;0;L;;;;;N;;;;;
+1004C;LINEAR B SYLLABLE B087 TWE;Lo;0;L;;;;;N;;;;;
+1004D;LINEAR B SYLLABLE B091 TWO;Lo;0;L;;;;;N;;;;;
+10050;LINEAR B SYMBOL B018;Lo;0;L;;;;;N;;;;;
+10051;LINEAR B SYMBOL B019;Lo;0;L;;;;;N;;;;;
+10052;LINEAR B SYMBOL B022;Lo;0;L;;;;;N;;;;;
+10053;LINEAR B SYMBOL B034;Lo;0;L;;;;;N;;;;;
+10054;LINEAR B SYMBOL B047;Lo;0;L;;;;;N;;;;;
+10055;LINEAR B SYMBOL B049;Lo;0;L;;;;;N;;;;;
+10056;LINEAR B SYMBOL B056;Lo;0;L;;;;;N;;;;;
+10057;LINEAR B SYMBOL B063;Lo;0;L;;;;;N;;;;;
+10058;LINEAR B SYMBOL B064;Lo;0;L;;;;;N;;;;;
+10059;LINEAR B SYMBOL B079;Lo;0;L;;;;;N;;;;;
+1005A;LINEAR B SYMBOL B082;Lo;0;L;;;;;N;;;;;
+1005B;LINEAR B SYMBOL B083;Lo;0;L;;;;;N;;;;;
+1005C;LINEAR B SYMBOL B086;Lo;0;L;;;;;N;;;;;
+1005D;LINEAR B SYMBOL B089;Lo;0;L;;;;;N;;;;;
+10080;LINEAR B IDEOGRAM B100 MAN;Lo;0;L;;;;;N;;;;;
+10081;LINEAR B IDEOGRAM B102 WOMAN;Lo;0;L;;;;;N;;;;;
+10082;LINEAR B IDEOGRAM B104 DEER;Lo;0;L;;;;;N;;;;;
+10083;LINEAR B IDEOGRAM B105 EQUID;Lo;0;L;;;;;N;;;;;
+10084;LINEAR B IDEOGRAM B105F MARE;Lo;0;L;;;;;N;;;;;
+10085;LINEAR B IDEOGRAM B105M STALLION;Lo;0;L;;;;;N;;;;;
+10086;LINEAR B IDEOGRAM B106F EWE;Lo;0;L;;;;;N;;;;;
+10087;LINEAR B IDEOGRAM B106M RAM;Lo;0;L;;;;;N;;;;;
+10088;LINEAR B IDEOGRAM B107F SHE-GOAT;Lo;0;L;;;;;N;;;;;
+10089;LINEAR B IDEOGRAM B107M HE-GOAT;Lo;0;L;;;;;N;;;;;
+1008A;LINEAR B IDEOGRAM B108F SOW;Lo;0;L;;;;;N;;;;;
+1008B;LINEAR B IDEOGRAM B108M BOAR;Lo;0;L;;;;;N;;;;;
+1008C;LINEAR B IDEOGRAM B109F COW;Lo;0;L;;;;;N;;;;;
+1008D;LINEAR B IDEOGRAM B109M BULL;Lo;0;L;;;;;N;;;;;
+1008E;LINEAR B IDEOGRAM B120 WHEAT;Lo;0;L;;;;;N;;;;;
+1008F;LINEAR B IDEOGRAM B121 BARLEY;Lo;0;L;;;;;N;;;;;
+10090;LINEAR B IDEOGRAM B122 OLIVE;Lo;0;L;;;;;N;;;;;
+10091;LINEAR B IDEOGRAM B123 SPICE;Lo;0;L;;;;;N;;;;;
+10092;LINEAR B IDEOGRAM B125 CYPERUS;Lo;0;L;;;;;N;;;;;
+10093;LINEAR B MONOGRAM B127 KAPO;Lo;0;L;;;;;N;;;;;
+10094;LINEAR B MONOGRAM B128 KANAKO;Lo;0;L;;;;;N;;;;;
+10095;LINEAR B IDEOGRAM B130 OIL;Lo;0;L;;;;;N;;;;;
+10096;LINEAR B IDEOGRAM B131 WINE;Lo;0;L;;;;;N;;;;;
+10097;LINEAR B IDEOGRAM B132;Lo;0;L;;;;;N;;;;;
+10098;LINEAR B MONOGRAM B133 AREPA;Lo;0;L;;;;;N;;;;;
+10099;LINEAR B MONOGRAM B135 MERI;Lo;0;L;;;;;N;;;;;
+1009A;LINEAR B IDEOGRAM B140 BRONZE;Lo;0;L;;;;;N;;;;;
+1009B;LINEAR B IDEOGRAM B141 GOLD;Lo;0;L;;;;;N;;;;;
+1009C;LINEAR B IDEOGRAM B142;Lo;0;L;;;;;N;;;;;
+1009D;LINEAR B IDEOGRAM B145 WOOL;Lo;0;L;;;;;N;;;;;
+1009E;LINEAR B IDEOGRAM B146;Lo;0;L;;;;;N;;;;;
+1009F;LINEAR B IDEOGRAM B150;Lo;0;L;;;;;N;;;;;
+100A0;LINEAR B IDEOGRAM B151 HORN;Lo;0;L;;;;;N;;;;;
+100A1;LINEAR B IDEOGRAM B152;Lo;0;L;;;;;N;;;;;
+100A2;LINEAR B IDEOGRAM B153;Lo;0;L;;;;;N;;;;;
+100A3;LINEAR B IDEOGRAM B154;Lo;0;L;;;;;N;;;;;
+100A4;LINEAR B MONOGRAM B156 TURO2;Lo;0;L;;;;;N;;;;;
+100A5;LINEAR B IDEOGRAM B157;Lo;0;L;;;;;N;;;;;
+100A6;LINEAR B IDEOGRAM B158;Lo;0;L;;;;;N;;;;;
+100A7;LINEAR B IDEOGRAM B159 CLOTH;Lo;0;L;;;;;N;;;;;
+100A8;LINEAR B IDEOGRAM B160;Lo;0;L;;;;;N;;;;;
+100A9;LINEAR B IDEOGRAM B161;Lo;0;L;;;;;N;;;;;
+100AA;LINEAR B IDEOGRAM B162 GARMENT;Lo;0;L;;;;;N;;;;;
+100AB;LINEAR B IDEOGRAM B163 ARMOUR;Lo;0;L;;;;;N;;;;;
+100AC;LINEAR B IDEOGRAM B164;Lo;0;L;;;;;N;;;;;
+100AD;LINEAR B IDEOGRAM B165;Lo;0;L;;;;;N;;;;;
+100AE;LINEAR B IDEOGRAM B166;Lo;0;L;;;;;N;;;;;
+100AF;LINEAR B IDEOGRAM B167;Lo;0;L;;;;;N;;;;;
+100B0;LINEAR B IDEOGRAM B168;Lo;0;L;;;;;N;;;;;
+100B1;LINEAR B IDEOGRAM B169;Lo;0;L;;;;;N;;;;;
+100B2;LINEAR B IDEOGRAM B170;Lo;0;L;;;;;N;;;;;
+100B3;LINEAR B IDEOGRAM B171;Lo;0;L;;;;;N;;;;;
+100B4;LINEAR B IDEOGRAM B172;Lo;0;L;;;;;N;;;;;
+100B5;LINEAR B IDEOGRAM B173 MONTH;Lo;0;L;;;;;N;;;;;
+100B6;LINEAR B IDEOGRAM B174;Lo;0;L;;;;;N;;;;;
+100B7;LINEAR B IDEOGRAM B176 TREE;Lo;0;L;;;;;N;;;;;
+100B8;LINEAR B IDEOGRAM B177;Lo;0;L;;;;;N;;;;;
+100B9;LINEAR B IDEOGRAM B178;Lo;0;L;;;;;N;;;;;
+100BA;LINEAR B IDEOGRAM B179;Lo;0;L;;;;;N;;;;;
+100BB;LINEAR B IDEOGRAM B180;Lo;0;L;;;;;N;;;;;
+100BC;LINEAR B IDEOGRAM B181;Lo;0;L;;;;;N;;;;;
+100BD;LINEAR B IDEOGRAM B182;Lo;0;L;;;;;N;;;;;
+100BE;LINEAR B IDEOGRAM B183;Lo;0;L;;;;;N;;;;;
+100BF;LINEAR B IDEOGRAM B184;Lo;0;L;;;;;N;;;;;
+100C0;LINEAR B IDEOGRAM B185;Lo;0;L;;;;;N;;;;;
+100C1;LINEAR B IDEOGRAM B189;Lo;0;L;;;;;N;;;;;
+100C2;LINEAR B IDEOGRAM B190;Lo;0;L;;;;;N;;;;;
+100C3;LINEAR B IDEOGRAM B191 HELMET;Lo;0;L;;;;;N;;;;;
+100C4;LINEAR B IDEOGRAM B220 FOOTSTOOL;Lo;0;L;;;;;N;;;;;
+100C5;LINEAR B IDEOGRAM B225 BATHTUB;Lo;0;L;;;;;N;;;;;
+100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;;
+100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;;
+100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;;
+100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;;;;
+100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;;
+100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;;;;
+100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;;
+100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;;
+100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;;
+100CF;LINEAR B IDEOGRAM B243 WHEEL;Lo;0;L;;;;;N;;;;;
+100D0;LINEAR B IDEOGRAM B245;Lo;0;L;;;;;N;;;;;
+100D1;LINEAR B IDEOGRAM B246;Lo;0;L;;;;;N;;;;;
+100D2;LINEAR B MONOGRAM B247 DIPTE;Lo;0;L;;;;;N;;;;;
+100D3;LINEAR B IDEOGRAM B248;Lo;0;L;;;;;N;;;;;
+100D4;LINEAR B IDEOGRAM B249;Lo;0;L;;;;;N;;;;;
+100D5;LINEAR B IDEOGRAM B251;Lo;0;L;;;;;N;;;;;
+100D6;LINEAR B IDEOGRAM B252;Lo;0;L;;;;;N;;;;;
+100D7;LINEAR B IDEOGRAM B253;Lo;0;L;;;;;N;;;;;
+100D8;LINEAR B IDEOGRAM B254 DART;Lo;0;L;;;;;N;;;;;
+100D9;LINEAR B IDEOGRAM B255;Lo;0;L;;;;;N;;;;;
+100DA;LINEAR B IDEOGRAM B256;Lo;0;L;;;;;N;;;;;
+100DB;LINEAR B IDEOGRAM B257;Lo;0;L;;;;;N;;;;;
+100DC;LINEAR B IDEOGRAM B258;Lo;0;L;;;;;N;;;;;
+100DD;LINEAR B IDEOGRAM B259;Lo;0;L;;;;;N;;;;;
+100DE;LINEAR B IDEOGRAM VESSEL B155;Lo;0;L;;;;;N;;;;;
+100DF;LINEAR B IDEOGRAM VESSEL B200;Lo;0;L;;;;;N;;;;;
+100E0;LINEAR B IDEOGRAM VESSEL B201;Lo;0;L;;;;;N;;;;;
+100E1;LINEAR B IDEOGRAM VESSEL B202;Lo;0;L;;;;;N;;;;;
+100E2;LINEAR B IDEOGRAM VESSEL B203;Lo;0;L;;;;;N;;;;;
+100E3;LINEAR B IDEOGRAM VESSEL B204;Lo;0;L;;;;;N;;;;;
+100E4;LINEAR B IDEOGRAM VESSEL B205;Lo;0;L;;;;;N;;;;;
+100E5;LINEAR B IDEOGRAM VESSEL B206;Lo;0;L;;;;;N;;;;;
+100E6;LINEAR B IDEOGRAM VESSEL B207;Lo;0;L;;;;;N;;;;;
+100E7;LINEAR B IDEOGRAM VESSEL B208;Lo;0;L;;;;;N;;;;;
+100E8;LINEAR B IDEOGRAM VESSEL B209;Lo;0;L;;;;;N;;;;;
+100E9;LINEAR B IDEOGRAM VESSEL B210;Lo;0;L;;;;;N;;;;;
+100EA;LINEAR B IDEOGRAM VESSEL B211;Lo;0;L;;;;;N;;;;;
+100EB;LINEAR B IDEOGRAM VESSEL B212;Lo;0;L;;;;;N;;;;;
+100EC;LINEAR B IDEOGRAM VESSEL B213;Lo;0;L;;;;;N;;;;;
+100ED;LINEAR B IDEOGRAM VESSEL B214;Lo;0;L;;;;;N;;;;;
+100EE;LINEAR B IDEOGRAM VESSEL B215;Lo;0;L;;;;;N;;;;;
+100EF;LINEAR B IDEOGRAM VESSEL B216;Lo;0;L;;;;;N;;;;;
+100F0;LINEAR B IDEOGRAM VESSEL B217;Lo;0;L;;;;;N;;;;;
+100F1;LINEAR B IDEOGRAM VESSEL B218;Lo;0;L;;;;;N;;;;;
+100F2;LINEAR B IDEOGRAM VESSEL B219;Lo;0;L;;;;;N;;;;;
+100F3;LINEAR B IDEOGRAM VESSEL B221;Lo;0;L;;;;;N;;;;;
+100F4;LINEAR B IDEOGRAM VESSEL B222;Lo;0;L;;;;;N;;;;;
+100F5;LINEAR B IDEOGRAM VESSEL B226;Lo;0;L;;;;;N;;;;;
+100F6;LINEAR B IDEOGRAM VESSEL B227;Lo;0;L;;;;;N;;;;;
+100F7;LINEAR B IDEOGRAM VESSEL B228;Lo;0;L;;;;;N;;;;;
+100F8;LINEAR B IDEOGRAM VESSEL B229;Lo;0;L;;;;;N;;;;;
+100F9;LINEAR B IDEOGRAM VESSEL B250;Lo;0;L;;;;;N;;;;;
+100FA;LINEAR B IDEOGRAM VESSEL B305;Lo;0;L;;;;;N;;;;;
+10100;AEGEAN WORD SEPARATOR LINE;Po;0;L;;;;;N;;;;;
+10101;AEGEAN WORD SEPARATOR DOT;Po;0;ON;;;;;N;;;;;
+10102;AEGEAN CHECK MARK;Po;0;L;;;;;N;;;;;
+10107;AEGEAN NUMBER ONE;No;0;L;;;;1;N;;;;;
+10108;AEGEAN NUMBER TWO;No;0;L;;;;2;N;;;;;
+10109;AEGEAN NUMBER THREE;No;0;L;;;;3;N;;;;;
+1010A;AEGEAN NUMBER FOUR;No;0;L;;;;4;N;;;;;
+1010B;AEGEAN NUMBER FIVE;No;0;L;;;;5;N;;;;;
+1010C;AEGEAN NUMBER SIX;No;0;L;;;;6;N;;;;;
+1010D;AEGEAN NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+1010E;AEGEAN NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+1010F;AEGEAN NUMBER NINE;No;0;L;;;;9;N;;;;;
+10110;AEGEAN NUMBER TEN;No;0;L;;;;10;N;;;;;
+10111;AEGEAN NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+10112;AEGEAN NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+10113;AEGEAN NUMBER FORTY;No;0;L;;;;40;N;;;;;
+10114;AEGEAN NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+10115;AEGEAN NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+10116;AEGEAN NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+10117;AEGEAN NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+10118;AEGEAN NUMBER NINETY;No;0;L;;;;90;N;;;;;
+10119;AEGEAN NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+1011A;AEGEAN NUMBER TWO HUNDRED;No;0;L;;;;200;N;;;;;
+1011B;AEGEAN NUMBER THREE HUNDRED;No;0;L;;;;300;N;;;;;
+1011C;AEGEAN NUMBER FOUR HUNDRED;No;0;L;;;;400;N;;;;;
+1011D;AEGEAN NUMBER FIVE HUNDRED;No;0;L;;;;500;N;;;;;
+1011E;AEGEAN NUMBER SIX HUNDRED;No;0;L;;;;600;N;;;;;
+1011F;AEGEAN NUMBER SEVEN HUNDRED;No;0;L;;;;700;N;;;;;
+10120;AEGEAN NUMBER EIGHT HUNDRED;No;0;L;;;;800;N;;;;;
+10121;AEGEAN NUMBER NINE HUNDRED;No;0;L;;;;900;N;;;;;
+10122;AEGEAN NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+10123;AEGEAN NUMBER TWO THOUSAND;No;0;L;;;;2000;N;;;;;
+10124;AEGEAN NUMBER THREE THOUSAND;No;0;L;;;;3000;N;;;;;
+10125;AEGEAN NUMBER FOUR THOUSAND;No;0;L;;;;4000;N;;;;;
+10126;AEGEAN NUMBER FIVE THOUSAND;No;0;L;;;;5000;N;;;;;
+10127;AEGEAN NUMBER SIX THOUSAND;No;0;L;;;;6000;N;;;;;
+10128;AEGEAN NUMBER SEVEN THOUSAND;No;0;L;;;;7000;N;;;;;
+10129;AEGEAN NUMBER EIGHT THOUSAND;No;0;L;;;;8000;N;;;;;
+1012A;AEGEAN NUMBER NINE THOUSAND;No;0;L;;;;9000;N;;;;;
+1012B;AEGEAN NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1012C;AEGEAN NUMBER TWENTY THOUSAND;No;0;L;;;;20000;N;;;;;
+1012D;AEGEAN NUMBER THIRTY THOUSAND;No;0;L;;;;30000;N;;;;;
+1012E;AEGEAN NUMBER FORTY THOUSAND;No;0;L;;;;40000;N;;;;;
+1012F;AEGEAN NUMBER FIFTY THOUSAND;No;0;L;;;;50000;N;;;;;
+10130;AEGEAN NUMBER SIXTY THOUSAND;No;0;L;;;;60000;N;;;;;
+10131;AEGEAN NUMBER SEVENTY THOUSAND;No;0;L;;;;70000;N;;;;;
+10132;AEGEAN NUMBER EIGHTY THOUSAND;No;0;L;;;;80000;N;;;;;
+10133;AEGEAN NUMBER NINETY THOUSAND;No;0;L;;;;90000;N;;;;;
+10137;AEGEAN WEIGHT BASE UNIT;So;0;L;;;;;N;;;;;
+10138;AEGEAN WEIGHT FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+10139;AEGEAN WEIGHT SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013A;AEGEAN WEIGHT THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+1013B;AEGEAN WEIGHT FOURTH SUBUNIT;So;0;L;;;;;N;;;;;
+1013C;AEGEAN DRY MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013D;AEGEAN LIQUID MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013E;AEGEAN MEASURE SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013F;AEGEAN MEASURE THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+10140;GREEK ACROPHONIC ATTIC ONE QUARTER;Nl;0;ON;;;;1/4;N;;;;;
+10141;GREEK ACROPHONIC ATTIC ONE HALF;Nl;0;ON;;;;1/2;N;;;;;
+10142;GREEK ACROPHONIC ATTIC ONE DRACHMA;Nl;0;ON;;;;1;N;;;;;
+10143;GREEK ACROPHONIC ATTIC FIVE;Nl;0;ON;;;;5;N;;;;;
+10144;GREEK ACROPHONIC ATTIC FIFTY;Nl;0;ON;;;;50;N;;;;;
+10145;GREEK ACROPHONIC ATTIC FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10146;GREEK ACROPHONIC ATTIC FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10147;GREEK ACROPHONIC ATTIC FIFTY THOUSAND;Nl;0;ON;;;;50000;N;;;;;
+10148;GREEK ACROPHONIC ATTIC FIVE TALENTS;Nl;0;ON;;;;5;N;;;;;
+10149;GREEK ACROPHONIC ATTIC TEN TALENTS;Nl;0;ON;;;;10;N;;;;;
+1014A;GREEK ACROPHONIC ATTIC FIFTY TALENTS;Nl;0;ON;;;;50;N;;;;;
+1014B;GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS;Nl;0;ON;;;;100;N;;;;;
+1014C;GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS;Nl;0;ON;;;;500;N;;;;;
+1014D;GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS;Nl;0;ON;;;;1000;N;;;;;
+1014E;GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS;Nl;0;ON;;;;5000;N;;;;;
+1014F;GREEK ACROPHONIC ATTIC FIVE STATERS;Nl;0;ON;;;;5;N;;;;;
+10150;GREEK ACROPHONIC ATTIC TEN STATERS;Nl;0;ON;;;;10;N;;;;;
+10151;GREEK ACROPHONIC ATTIC FIFTY STATERS;Nl;0;ON;;;;50;N;;;;;
+10152;GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS;Nl;0;ON;;;;100;N;;;;;
+10153;GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS;Nl;0;ON;;;;500;N;;;;;
+10154;GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS;Nl;0;ON;;;;1000;N;;;;;
+10155;GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS;Nl;0;ON;;;;10000;N;;;;;
+10156;GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS;Nl;0;ON;;;;50000;N;;;;;
+10157;GREEK ACROPHONIC ATTIC TEN MNAS;Nl;0;ON;;;;10;N;;;;;
+10158;GREEK ACROPHONIC HERAEUM ONE PLETHRON;Nl;0;ON;;;;1;N;;;;;
+10159;GREEK ACROPHONIC THESPIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015A;GREEK ACROPHONIC HERMIONIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015B;GREEK ACROPHONIC EPIDAUREAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015C;GREEK ACROPHONIC THESPIAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015D;GREEK ACROPHONIC CYRENAIC TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015E;GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015F;GREEK ACROPHONIC TROEZENIAN FIVE;Nl;0;ON;;;;5;N;;;;;
+10160;GREEK ACROPHONIC TROEZENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10161;GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM;Nl;0;ON;;;;10;N;;;;;
+10162;GREEK ACROPHONIC HERMIONIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10163;GREEK ACROPHONIC MESSENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10164;GREEK ACROPHONIC THESPIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10165;GREEK ACROPHONIC THESPIAN THIRTY;Nl;0;ON;;;;30;N;;;;;
+10166;GREEK ACROPHONIC TROEZENIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10167;GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM;Nl;0;ON;;;;50;N;;;;;
+10168;GREEK ACROPHONIC HERMIONIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10169;GREEK ACROPHONIC THESPIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+1016A;GREEK ACROPHONIC THESPIAN ONE HUNDRED;Nl;0;ON;;;;100;N;;;;;
+1016B;GREEK ACROPHONIC THESPIAN THREE HUNDRED;Nl;0;ON;;;;300;N;;;;;
+1016C;GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016D;GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016E;GREEK ACROPHONIC THESPIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016F;GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10170;GREEK ACROPHONIC NAXIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10171;GREEK ACROPHONIC THESPIAN ONE THOUSAND;Nl;0;ON;;;;1000;N;;;;;
+10172;GREEK ACROPHONIC THESPIAN FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10173;GREEK ACROPHONIC DELPHIC FIVE MNAS;Nl;0;ON;;;;5;N;;;;;
+10174;GREEK ACROPHONIC STRATIAN FIFTY MNAS;Nl;0;ON;;;;50;N;;;;;
+10175;GREEK ONE HALF SIGN;No;0;ON;;;;1/2;N;;;;;
+10176;GREEK ONE HALF SIGN ALTERNATE FORM;No;0;ON;;;;1/2;N;;;;;
+10177;GREEK TWO THIRDS SIGN;No;0;ON;;;;2/3;N;;;;;
+10178;GREEK THREE QUARTERS SIGN;No;0;ON;;;;3/4;N;;;;;
+10179;GREEK YEAR SIGN;So;0;ON;;;;;N;;;;;
+1017A;GREEK TALENT SIGN;So;0;ON;;;;;N;;;;;
+1017B;GREEK DRACHMA SIGN;So;0;ON;;;;;N;;;;;
+1017C;GREEK OBOL SIGN;So;0;ON;;;;;N;;;;;
+1017D;GREEK TWO OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017E;GREEK THREE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017F;GREEK FOUR OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10180;GREEK FIVE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10181;GREEK METRETES SIGN;So;0;ON;;;;;N;;;;;
+10182;GREEK KYATHOS BASE SIGN;So;0;ON;;;;;N;;;;;
+10183;GREEK LITRA SIGN;So;0;ON;;;;;N;;;;;
+10184;GREEK OUNKIA SIGN;So;0;ON;;;;;N;;;;;
+10185;GREEK XESTES SIGN;So;0;ON;;;;;N;;;;;
+10186;GREEK ARTABE SIGN;So;0;ON;;;;;N;;;;;
+10187;GREEK AROURA SIGN;So;0;ON;;;;;N;;;;;
+10188;GREEK GRAMMA SIGN;So;0;ON;;;;;N;;;;;
+10189;GREEK TRYBLION BASE SIGN;So;0;ON;;;;;N;;;;;
+1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;;
+1018B;GREEK ONE QUARTER SIGN;No;0;ON;;;;1/4;N;;;;;
+1018C;GREEK SINUSOID SIGN;So;0;ON;;;;;N;;;;;
+1018D;GREEK INDICTION SIGN;So;0;L;;;;;N;;;;;
+1018E;NOMISMA SIGN;So;0;L;;;;;N;;;;;
+10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;;
+10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;;
+10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;;
+10193;ROMAN SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10194;ROMAN DIMIDIA SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10195;ROMAN SILIQUA SIGN;So;0;ON;;;;;N;;;;;
+10196;ROMAN DENARIUS SIGN;So;0;ON;;;;;N;;;;;
+10197;ROMAN QUINARIUS SIGN;So;0;ON;;;;;N;;;;;
+10198;ROMAN SESTERTIUS SIGN;So;0;ON;;;;;N;;;;;
+10199;ROMAN DUPONDIUS SIGN;So;0;ON;;;;;N;;;;;
+1019A;ROMAN AS SIGN;So;0;ON;;;;;N;;;;;
+1019B;ROMAN CENTURIAL SIGN;So;0;ON;;;;;N;;;;;
+101A0;GREEK SYMBOL TAU RHO;So;0;ON;;;;;N;;;;;
+101D0;PHAISTOS DISC SIGN PEDESTRIAN;So;0;L;;;;;N;;;;;
+101D1;PHAISTOS DISC SIGN PLUMED HEAD;So;0;L;;;;;N;;;;;
+101D2;PHAISTOS DISC SIGN TATTOOED HEAD;So;0;L;;;;;N;;;;;
+101D3;PHAISTOS DISC SIGN CAPTIVE;So;0;L;;;;;N;;;;;
+101D4;PHAISTOS DISC SIGN CHILD;So;0;L;;;;;N;;;;;
+101D5;PHAISTOS DISC SIGN WOMAN;So;0;L;;;;;N;;;;;
+101D6;PHAISTOS DISC SIGN HELMET;So;0;L;;;;;N;;;;;
+101D7;PHAISTOS DISC SIGN GAUNTLET;So;0;L;;;;;N;;;;;
+101D8;PHAISTOS DISC SIGN TIARA;So;0;L;;;;;N;;;;;
+101D9;PHAISTOS DISC SIGN ARROW;So;0;L;;;;;N;;;;;
+101DA;PHAISTOS DISC SIGN BOW;So;0;L;;;;;N;;;;;
+101DB;PHAISTOS DISC SIGN SHIELD;So;0;L;;;;;N;;;;;
+101DC;PHAISTOS DISC SIGN CLUB;So;0;L;;;;;N;;;;;
+101DD;PHAISTOS DISC SIGN MANACLES;So;0;L;;;;;N;;;;;
+101DE;PHAISTOS DISC SIGN MATTOCK;So;0;L;;;;;N;;;;;
+101DF;PHAISTOS DISC SIGN SAW;So;0;L;;;;;N;;;;;
+101E0;PHAISTOS DISC SIGN LID;So;0;L;;;;;N;;;;;
+101E1;PHAISTOS DISC SIGN BOOMERANG;So;0;L;;;;;N;;;;;
+101E2;PHAISTOS DISC SIGN CARPENTRY PLANE;So;0;L;;;;;N;;;;;
+101E3;PHAISTOS DISC SIGN DOLIUM;So;0;L;;;;;N;;;;;
+101E4;PHAISTOS DISC SIGN COMB;So;0;L;;;;;N;;;;;
+101E5;PHAISTOS DISC SIGN SLING;So;0;L;;;;;N;;;;;
+101E6;PHAISTOS DISC SIGN COLUMN;So;0;L;;;;;N;;;;;
+101E7;PHAISTOS DISC SIGN BEEHIVE;So;0;L;;;;;N;;;;;
+101E8;PHAISTOS DISC SIGN SHIP;So;0;L;;;;;N;;;;;
+101E9;PHAISTOS DISC SIGN HORN;So;0;L;;;;;N;;;;;
+101EA;PHAISTOS DISC SIGN HIDE;So;0;L;;;;;N;;;;;
+101EB;PHAISTOS DISC SIGN BULLS LEG;So;0;L;;;;;N;;;;;
+101EC;PHAISTOS DISC SIGN CAT;So;0;L;;;;;N;;;;;
+101ED;PHAISTOS DISC SIGN RAM;So;0;L;;;;;N;;;;;
+101EE;PHAISTOS DISC SIGN EAGLE;So;0;L;;;;;N;;;;;
+101EF;PHAISTOS DISC SIGN DOVE;So;0;L;;;;;N;;;;;
+101F0;PHAISTOS DISC SIGN TUNNY;So;0;L;;;;;N;;;;;
+101F1;PHAISTOS DISC SIGN BEE;So;0;L;;;;;N;;;;;
+101F2;PHAISTOS DISC SIGN PLANE TREE;So;0;L;;;;;N;;;;;
+101F3;PHAISTOS DISC SIGN VINE;So;0;L;;;;;N;;;;;
+101F4;PHAISTOS DISC SIGN PAPYRUS;So;0;L;;;;;N;;;;;
+101F5;PHAISTOS DISC SIGN ROSETTE;So;0;L;;;;;N;;;;;
+101F6;PHAISTOS DISC SIGN LILY;So;0;L;;;;;N;;;;;
+101F7;PHAISTOS DISC SIGN OX BACK;So;0;L;;;;;N;;;;;
+101F8;PHAISTOS DISC SIGN FLUTE;So;0;L;;;;;N;;;;;
+101F9;PHAISTOS DISC SIGN GRATER;So;0;L;;;;;N;;;;;
+101FA;PHAISTOS DISC SIGN STRAINER;So;0;L;;;;;N;;;;;
+101FB;PHAISTOS DISC SIGN SMALL AXE;So;0;L;;;;;N;;;;;
+101FC;PHAISTOS DISC SIGN WAVY BAND;So;0;L;;;;;N;;;;;
+101FD;PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE;Mn;220;NSM;;;;;N;;;;;
+10280;LYCIAN LETTER A;Lo;0;L;;;;;N;;;;;
+10281;LYCIAN LETTER E;Lo;0;L;;;;;N;;;;;
+10282;LYCIAN LETTER B;Lo;0;L;;;;;N;;;;;
+10283;LYCIAN LETTER BH;Lo;0;L;;;;;N;;;;;
+10284;LYCIAN LETTER G;Lo;0;L;;;;;N;;;;;
+10285;LYCIAN LETTER D;Lo;0;L;;;;;N;;;;;
+10286;LYCIAN LETTER I;Lo;0;L;;;;;N;;;;;
+10287;LYCIAN LETTER W;Lo;0;L;;;;;N;;;;;
+10288;LYCIAN LETTER Z;Lo;0;L;;;;;N;;;;;
+10289;LYCIAN LETTER TH;Lo;0;L;;;;;N;;;;;
+1028A;LYCIAN LETTER J;Lo;0;L;;;;;N;;;;;
+1028B;LYCIAN LETTER K;Lo;0;L;;;;;N;;;;;
+1028C;LYCIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+1028D;LYCIAN LETTER L;Lo;0;L;;;;;N;;;;;
+1028E;LYCIAN LETTER M;Lo;0;L;;;;;N;;;;;
+1028F;LYCIAN LETTER N;Lo;0;L;;;;;N;;;;;
+10290;LYCIAN LETTER MM;Lo;0;L;;;;;N;;;;;
+10291;LYCIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+10292;LYCIAN LETTER U;Lo;0;L;;;;;N;;;;;
+10293;LYCIAN LETTER P;Lo;0;L;;;;;N;;;;;
+10294;LYCIAN LETTER KK;Lo;0;L;;;;;N;;;;;
+10295;LYCIAN LETTER R;Lo;0;L;;;;;N;;;;;
+10296;LYCIAN LETTER S;Lo;0;L;;;;;N;;;;;
+10297;LYCIAN LETTER T;Lo;0;L;;;;;N;;;;;
+10298;LYCIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+10299;LYCIAN LETTER AN;Lo;0;L;;;;;N;;;;;
+1029A;LYCIAN LETTER EN;Lo;0;L;;;;;N;;;;;
+1029B;LYCIAN LETTER H;Lo;0;L;;;;;N;;;;;
+1029C;LYCIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102A0;CARIAN LETTER A;Lo;0;L;;;;;N;;;;;
+102A1;CARIAN LETTER P2;Lo;0;L;;;;;N;;;;;
+102A2;CARIAN LETTER D;Lo;0;L;;;;;N;;;;;
+102A3;CARIAN LETTER L;Lo;0;L;;;;;N;;;;;
+102A4;CARIAN LETTER UUU;Lo;0;L;;;;;N;;;;;
+102A5;CARIAN LETTER R;Lo;0;L;;;;;N;;;;;
+102A6;CARIAN LETTER LD;Lo;0;L;;;;;N;;;;;
+102A7;CARIAN LETTER A2;Lo;0;L;;;;;N;;;;;
+102A8;CARIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+102A9;CARIAN LETTER B;Lo;0;L;;;;;N;;;;;
+102AA;CARIAN LETTER M;Lo;0;L;;;;;N;;;;;
+102AB;CARIAN LETTER O;Lo;0;L;;;;;N;;;;;
+102AC;CARIAN LETTER D2;Lo;0;L;;;;;N;;;;;
+102AD;CARIAN LETTER T;Lo;0;L;;;;;N;;;;;
+102AE;CARIAN LETTER SH;Lo;0;L;;;;;N;;;;;
+102AF;CARIAN LETTER SH2;Lo;0;L;;;;;N;;;;;
+102B0;CARIAN LETTER S;Lo;0;L;;;;;N;;;;;
+102B1;CARIAN LETTER C-18;Lo;0;L;;;;;N;;;;;
+102B2;CARIAN LETTER U;Lo;0;L;;;;;N;;;;;
+102B3;CARIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+102B4;CARIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102B5;CARIAN LETTER N;Lo;0;L;;;;;N;;;;;
+102B6;CARIAN LETTER TT2;Lo;0;L;;;;;N;;;;;
+102B7;CARIAN LETTER P;Lo;0;L;;;;;N;;;;;
+102B8;CARIAN LETTER SS;Lo;0;L;;;;;N;;;;;
+102B9;CARIAN LETTER I;Lo;0;L;;;;;N;;;;;
+102BA;CARIAN LETTER E;Lo;0;L;;;;;N;;;;;
+102BB;CARIAN LETTER UUUU;Lo;0;L;;;;;N;;;;;
+102BC;CARIAN LETTER K;Lo;0;L;;;;;N;;;;;
+102BD;CARIAN LETTER K2;Lo;0;L;;;;;N;;;;;
+102BE;CARIAN LETTER ND;Lo;0;L;;;;;N;;;;;
+102BF;CARIAN LETTER UU;Lo;0;L;;;;;N;;;;;
+102C0;CARIAN LETTER G;Lo;0;L;;;;;N;;;;;
+102C1;CARIAN LETTER G2;Lo;0;L;;;;;N;;;;;
+102C2;CARIAN LETTER ST;Lo;0;L;;;;;N;;;;;
+102C3;CARIAN LETTER ST2;Lo;0;L;;;;;N;;;;;
+102C4;CARIAN LETTER NG;Lo;0;L;;;;;N;;;;;
+102C5;CARIAN LETTER II;Lo;0;L;;;;;N;;;;;
+102C6;CARIAN LETTER C-39;Lo;0;L;;;;;N;;;;;
+102C7;CARIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+102C8;CARIAN LETTER UUU2;Lo;0;L;;;;;N;;;;;
+102C9;CARIAN LETTER RR;Lo;0;L;;;;;N;;;;;
+102CA;CARIAN LETTER MB;Lo;0;L;;;;;N;;;;;
+102CB;CARIAN LETTER MB2;Lo;0;L;;;;;N;;;;;
+102CC;CARIAN LETTER MB3;Lo;0;L;;;;;N;;;;;
+102CD;CARIAN LETTER MB4;Lo;0;L;;;;;N;;;;;
+102CE;CARIAN LETTER LD2;Lo;0;L;;;;;N;;;;;
+102CF;CARIAN LETTER E2;Lo;0;L;;;;;N;;;;;
+102D0;CARIAN LETTER UUU3;Lo;0;L;;;;;N;;;;;
+102E0;COPTIC EPACT THOUSANDS MARK;Mn;220;NSM;;;;;N;;;;;
+102E1;COPTIC EPACT DIGIT ONE;No;0;EN;;;;1;N;;;;;
+102E2;COPTIC EPACT DIGIT TWO;No;0;EN;;;;2;N;;;;;
+102E3;COPTIC EPACT DIGIT THREE;No;0;EN;;;;3;N;;;;;
+102E4;COPTIC EPACT DIGIT FOUR;No;0;EN;;;;4;N;;;;;
+102E5;COPTIC EPACT DIGIT FIVE;No;0;EN;;;;5;N;;;;;
+102E6;COPTIC EPACT DIGIT SIX;No;0;EN;;;;6;N;;;;;
+102E7;COPTIC EPACT DIGIT SEVEN;No;0;EN;;;;7;N;;;;;
+102E8;COPTIC EPACT DIGIT EIGHT;No;0;EN;;;;8;N;;;;;
+102E9;COPTIC EPACT DIGIT NINE;No;0;EN;;;;9;N;;;;;
+102EA;COPTIC EPACT NUMBER TEN;No;0;EN;;;;10;N;;;;;
+102EB;COPTIC EPACT NUMBER TWENTY;No;0;EN;;;;20;N;;;;;
+102EC;COPTIC EPACT NUMBER THIRTY;No;0;EN;;;;30;N;;;;;
+102ED;COPTIC EPACT NUMBER FORTY;No;0;EN;;;;40;N;;;;;
+102EE;COPTIC EPACT NUMBER FIFTY;No;0;EN;;;;50;N;;;;;
+102EF;COPTIC EPACT NUMBER SIXTY;No;0;EN;;;;60;N;;;;;
+102F0;COPTIC EPACT NUMBER SEVENTY;No;0;EN;;;;70;N;;;;;
+102F1;COPTIC EPACT NUMBER EIGHTY;No;0;EN;;;;80;N;;;;;
+102F2;COPTIC EPACT NUMBER NINETY;No;0;EN;;;;90;N;;;;;
+102F3;COPTIC EPACT NUMBER ONE HUNDRED;No;0;EN;;;;100;N;;;;;
+102F4;COPTIC EPACT NUMBER TWO HUNDRED;No;0;EN;;;;200;N;;;;;
+102F5;COPTIC EPACT NUMBER THREE HUNDRED;No;0;EN;;;;300;N;;;;;
+102F6;COPTIC EPACT NUMBER FOUR HUNDRED;No;0;EN;;;;400;N;;;;;
+102F7;COPTIC EPACT NUMBER FIVE HUNDRED;No;0;EN;;;;500;N;;;;;
+102F8;COPTIC EPACT NUMBER SIX HUNDRED;No;0;EN;;;;600;N;;;;;
+102F9;COPTIC EPACT NUMBER SEVEN HUNDRED;No;0;EN;;;;700;N;;;;;
+102FA;COPTIC EPACT NUMBER EIGHT HUNDRED;No;0;EN;;;;800;N;;;;;
+102FB;COPTIC EPACT NUMBER NINE HUNDRED;No;0;EN;;;;900;N;;;;;
+10300;OLD ITALIC LETTER A;Lo;0;L;;;;;N;;;;;
+10301;OLD ITALIC LETTER BE;Lo;0;L;;;;;N;;;;;
+10302;OLD ITALIC LETTER KE;Lo;0;L;;;;;N;;;;;
+10303;OLD ITALIC LETTER DE;Lo;0;L;;;;;N;;;;;
+10304;OLD ITALIC LETTER E;Lo;0;L;;;;;N;;;;;
+10305;OLD ITALIC LETTER VE;Lo;0;L;;;;;N;;;;;
+10306;OLD ITALIC LETTER ZE;Lo;0;L;;;;;N;;;;;
+10307;OLD ITALIC LETTER HE;Lo;0;L;;;;;N;;;;;
+10308;OLD ITALIC LETTER THE;Lo;0;L;;;;;N;;;;;
+10309;OLD ITALIC LETTER I;Lo;0;L;;;;;N;;;;;
+1030A;OLD ITALIC LETTER KA;Lo;0;L;;;;;N;;;;;
+1030B;OLD ITALIC LETTER EL;Lo;0;L;;;;;N;;;;;
+1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;;
+1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;;
+1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;;
+1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;;;;
+10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;;
+10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;;
+10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;;
+10313;OLD ITALIC LETTER ER;Lo;0;L;;;;;N;;;;;
+10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;;
+10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;;
+10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;;
+10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;;;;
+10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;;
+10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;;
+1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;;
+1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;;;;
+1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;;;;
+1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;;;;
+1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;;;;
+1031F;OLD ITALIC LETTER ESS;Lo;0;L;;;;;N;;;;;
+10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;;
+10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
+10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
+10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
+10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
+10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
+10333;GOTHIC LETTER DAGS;Lo;0;L;;;;;N;;;;;
+10334;GOTHIC LETTER AIHVUS;Lo;0;L;;;;;N;;;;;
+10335;GOTHIC LETTER QAIRTHRA;Lo;0;L;;;;;N;;;;;
+10336;GOTHIC LETTER IUJA;Lo;0;L;;;;;N;;;;;
+10337;GOTHIC LETTER HAGL;Lo;0;L;;;;;N;;;;;
+10338;GOTHIC LETTER THIUTH;Lo;0;L;;;;;N;;;;;
+10339;GOTHIC LETTER EIS;Lo;0;L;;;;;N;;;;;
+1033A;GOTHIC LETTER KUSMA;Lo;0;L;;;;;N;;;;;
+1033B;GOTHIC LETTER LAGUS;Lo;0;L;;;;;N;;;;;
+1033C;GOTHIC LETTER MANNA;Lo;0;L;;;;;N;;;;;
+1033D;GOTHIC LETTER NAUTHS;Lo;0;L;;;;;N;;;;;
+1033E;GOTHIC LETTER JER;Lo;0;L;;;;;N;;;;;
+1033F;GOTHIC LETTER URUS;Lo;0;L;;;;;N;;;;;
+10340;GOTHIC LETTER PAIRTHRA;Lo;0;L;;;;;N;;;;;
+10341;GOTHIC LETTER NINETY;Nl;0;L;;;;90;N;;;;;
+10342;GOTHIC LETTER RAIDA;Lo;0;L;;;;;N;;;;;
+10343;GOTHIC LETTER SAUIL;Lo;0;L;;;;;N;;;;;
+10344;GOTHIC LETTER TEIWS;Lo;0;L;;;;;N;;;;;
+10345;GOTHIC LETTER WINJA;Lo;0;L;;;;;N;;;;;
+10346;GOTHIC LETTER FAIHU;Lo;0;L;;;;;N;;;;;
+10347;GOTHIC LETTER IGGWS;Lo;0;L;;;;;N;;;;;
+10348;GOTHIC LETTER HWAIR;Lo;0;L;;;;;N;;;;;
+10349;GOTHIC LETTER OTHAL;Lo;0;L;;;;;N;;;;;
+1034A;GOTHIC LETTER NINE HUNDRED;Nl;0;L;;;;900;N;;;;;
+10350;OLD PERMIC LETTER AN;Lo;0;L;;;;;N;;;;;
+10351;OLD PERMIC LETTER BUR;Lo;0;L;;;;;N;;;;;
+10352;OLD PERMIC LETTER GAI;Lo;0;L;;;;;N;;;;;
+10353;OLD PERMIC LETTER DOI;Lo;0;L;;;;;N;;;;;
+10354;OLD PERMIC LETTER E;Lo;0;L;;;;;N;;;;;
+10355;OLD PERMIC LETTER ZHOI;Lo;0;L;;;;;N;;;;;
+10356;OLD PERMIC LETTER DZHOI;Lo;0;L;;;;;N;;;;;
+10357;OLD PERMIC LETTER ZATA;Lo;0;L;;;;;N;;;;;
+10358;OLD PERMIC LETTER DZITA;Lo;0;L;;;;;N;;;;;
+10359;OLD PERMIC LETTER I;Lo;0;L;;;;;N;;;;;
+1035A;OLD PERMIC LETTER KOKE;Lo;0;L;;;;;N;;;;;
+1035B;OLD PERMIC LETTER LEI;Lo;0;L;;;;;N;;;;;
+1035C;OLD PERMIC LETTER MENOE;Lo;0;L;;;;;N;;;;;
+1035D;OLD PERMIC LETTER NENOE;Lo;0;L;;;;;N;;;;;
+1035E;OLD PERMIC LETTER VOOI;Lo;0;L;;;;;N;;;;;
+1035F;OLD PERMIC LETTER PEEI;Lo;0;L;;;;;N;;;;;
+10360;OLD PERMIC LETTER REI;Lo;0;L;;;;;N;;;;;
+10361;OLD PERMIC LETTER SII;Lo;0;L;;;;;N;;;;;
+10362;OLD PERMIC LETTER TAI;Lo;0;L;;;;;N;;;;;
+10363;OLD PERMIC LETTER U;Lo;0;L;;;;;N;;;;;
+10364;OLD PERMIC LETTER CHERY;Lo;0;L;;;;;N;;;;;
+10365;OLD PERMIC LETTER SHOOI;Lo;0;L;;;;;N;;;;;
+10366;OLD PERMIC LETTER SHCHOOI;Lo;0;L;;;;;N;;;;;
+10367;OLD PERMIC LETTER YRY;Lo;0;L;;;;;N;;;;;
+10368;OLD PERMIC LETTER YERU;Lo;0;L;;;;;N;;;;;
+10369;OLD PERMIC LETTER O;Lo;0;L;;;;;N;;;;;
+1036A;OLD PERMIC LETTER OO;Lo;0;L;;;;;N;;;;;
+1036B;OLD PERMIC LETTER EF;Lo;0;L;;;;;N;;;;;
+1036C;OLD PERMIC LETTER HA;Lo;0;L;;;;;N;;;;;
+1036D;OLD PERMIC LETTER TSIU;Lo;0;L;;;;;N;;;;;
+1036E;OLD PERMIC LETTER VER;Lo;0;L;;;;;N;;;;;
+1036F;OLD PERMIC LETTER YER;Lo;0;L;;;;;N;;;;;
+10370;OLD PERMIC LETTER YERI;Lo;0;L;;;;;N;;;;;
+10371;OLD PERMIC LETTER YAT;Lo;0;L;;;;;N;;;;;
+10372;OLD PERMIC LETTER IE;Lo;0;L;;;;;N;;;;;
+10373;OLD PERMIC LETTER YU;Lo;0;L;;;;;N;;;;;
+10374;OLD PERMIC LETTER YA;Lo;0;L;;;;;N;;;;;
+10375;OLD PERMIC LETTER IA;Lo;0;L;;;;;N;;;;;
+10376;COMBINING OLD PERMIC LETTER AN;Mn;230;NSM;;;;;N;;;;;
+10377;COMBINING OLD PERMIC LETTER DOI;Mn;230;NSM;;;;;N;;;;;
+10378;COMBINING OLD PERMIC LETTER ZATA;Mn;230;NSM;;;;;N;;;;;
+10379;COMBINING OLD PERMIC LETTER NENOE;Mn;230;NSM;;;;;N;;;;;
+1037A;COMBINING OLD PERMIC LETTER SII;Mn;230;NSM;;;;;N;;;;;
+10380;UGARITIC LETTER ALPA;Lo;0;L;;;;;N;;;;;
+10381;UGARITIC LETTER BETA;Lo;0;L;;;;;N;;;;;
+10382;UGARITIC LETTER GAMLA;Lo;0;L;;;;;N;;;;;
+10383;UGARITIC LETTER KHA;Lo;0;L;;;;;N;;;;;
+10384;UGARITIC LETTER DELTA;Lo;0;L;;;;;N;;;;;
+10385;UGARITIC LETTER HO;Lo;0;L;;;;;N;;;;;
+10386;UGARITIC LETTER WO;Lo;0;L;;;;;N;;;;;
+10387;UGARITIC LETTER ZETA;Lo;0;L;;;;;N;;;;;
+10388;UGARITIC LETTER HOTA;Lo;0;L;;;;;N;;;;;
+10389;UGARITIC LETTER TET;Lo;0;L;;;;;N;;;;;
+1038A;UGARITIC LETTER YOD;Lo;0;L;;;;;N;;;;;
+1038B;UGARITIC LETTER KAF;Lo;0;L;;;;;N;;;;;
+1038C;UGARITIC LETTER SHIN;Lo;0;L;;;;;N;;;;;
+1038D;UGARITIC LETTER LAMDA;Lo;0;L;;;;;N;;;;;
+1038E;UGARITIC LETTER MEM;Lo;0;L;;;;;N;;;;;
+1038F;UGARITIC LETTER DHAL;Lo;0;L;;;;;N;;;;;
+10390;UGARITIC LETTER NUN;Lo;0;L;;;;;N;;;;;
+10391;UGARITIC LETTER ZU;Lo;0;L;;;;;N;;;;;
+10392;UGARITIC LETTER SAMKA;Lo;0;L;;;;;N;;;;;
+10393;UGARITIC LETTER AIN;Lo;0;L;;;;;N;;;;;
+10394;UGARITIC LETTER PU;Lo;0;L;;;;;N;;;;;
+10395;UGARITIC LETTER SADE;Lo;0;L;;;;;N;;;;;
+10396;UGARITIC LETTER QOPA;Lo;0;L;;;;;N;;;;;
+10397;UGARITIC LETTER RASHA;Lo;0;L;;;;;N;;;;;
+10398;UGARITIC LETTER THANNA;Lo;0;L;;;;;N;;;;;
+10399;UGARITIC LETTER GHAIN;Lo;0;L;;;;;N;;;;;
+1039A;UGARITIC LETTER TO;Lo;0;L;;;;;N;;;;;
+1039B;UGARITIC LETTER I;Lo;0;L;;;;;N;;;;;
+1039C;UGARITIC LETTER U;Lo;0;L;;;;;N;;;;;
+1039D;UGARITIC LETTER SSU;Lo;0;L;;;;;N;;;;;
+1039F;UGARITIC WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103A0;OLD PERSIAN SIGN A;Lo;0;L;;;;;N;;;;;
+103A1;OLD PERSIAN SIGN I;Lo;0;L;;;;;N;;;;;
+103A2;OLD PERSIAN SIGN U;Lo;0;L;;;;;N;;;;;
+103A3;OLD PERSIAN SIGN KA;Lo;0;L;;;;;N;;;;;
+103A4;OLD PERSIAN SIGN KU;Lo;0;L;;;;;N;;;;;
+103A5;OLD PERSIAN SIGN GA;Lo;0;L;;;;;N;;;;;
+103A6;OLD PERSIAN SIGN GU;Lo;0;L;;;;;N;;;;;
+103A7;OLD PERSIAN SIGN XA;Lo;0;L;;;;;N;;;;;
+103A8;OLD PERSIAN SIGN CA;Lo;0;L;;;;;N;;;;;
+103A9;OLD PERSIAN SIGN JA;Lo;0;L;;;;;N;;;;;
+103AA;OLD PERSIAN SIGN JI;Lo;0;L;;;;;N;;;;;
+103AB;OLD PERSIAN SIGN TA;Lo;0;L;;;;;N;;;;;
+103AC;OLD PERSIAN SIGN TU;Lo;0;L;;;;;N;;;;;
+103AD;OLD PERSIAN SIGN DA;Lo;0;L;;;;;N;;;;;
+103AE;OLD PERSIAN SIGN DI;Lo;0;L;;;;;N;;;;;
+103AF;OLD PERSIAN SIGN DU;Lo;0;L;;;;;N;;;;;
+103B0;OLD PERSIAN SIGN THA;Lo;0;L;;;;;N;;;;;
+103B1;OLD PERSIAN SIGN PA;Lo;0;L;;;;;N;;;;;
+103B2;OLD PERSIAN SIGN BA;Lo;0;L;;;;;N;;;;;
+103B3;OLD PERSIAN SIGN FA;Lo;0;L;;;;;N;;;;;
+103B4;OLD PERSIAN SIGN NA;Lo;0;L;;;;;N;;;;;
+103B5;OLD PERSIAN SIGN NU;Lo;0;L;;;;;N;;;;;
+103B6;OLD PERSIAN SIGN MA;Lo;0;L;;;;;N;;;;;
+103B7;OLD PERSIAN SIGN MI;Lo;0;L;;;;;N;;;;;
+103B8;OLD PERSIAN SIGN MU;Lo;0;L;;;;;N;;;;;
+103B9;OLD PERSIAN SIGN YA;Lo;0;L;;;;;N;;;;;
+103BA;OLD PERSIAN SIGN VA;Lo;0;L;;;;;N;;;;;
+103BB;OLD PERSIAN SIGN VI;Lo;0;L;;;;;N;;;;;
+103BC;OLD PERSIAN SIGN RA;Lo;0;L;;;;;N;;;;;
+103BD;OLD PERSIAN SIGN RU;Lo;0;L;;;;;N;;;;;
+103BE;OLD PERSIAN SIGN LA;Lo;0;L;;;;;N;;;;;
+103BF;OLD PERSIAN SIGN SA;Lo;0;L;;;;;N;;;;;
+103C0;OLD PERSIAN SIGN ZA;Lo;0;L;;;;;N;;;;;
+103C1;OLD PERSIAN SIGN SHA;Lo;0;L;;;;;N;;;;;
+103C2;OLD PERSIAN SIGN SSA;Lo;0;L;;;;;N;;;;;
+103C3;OLD PERSIAN SIGN HA;Lo;0;L;;;;;N;;;;;
+103C8;OLD PERSIAN SIGN AURAMAZDAA;Lo;0;L;;;;;N;;;;;
+103C9;OLD PERSIAN SIGN AURAMAZDAA-2;Lo;0;L;;;;;N;;;;;
+103CA;OLD PERSIAN SIGN AURAMAZDAAHA;Lo;0;L;;;;;N;;;;;
+103CB;OLD PERSIAN SIGN XSHAAYATHIYA;Lo;0;L;;;;;N;;;;;
+103CC;OLD PERSIAN SIGN DAHYAAUSH;Lo;0;L;;;;;N;;;;;
+103CD;OLD PERSIAN SIGN DAHYAAUSH-2;Lo;0;L;;;;;N;;;;;
+103CE;OLD PERSIAN SIGN BAGA;Lo;0;L;;;;;N;;;;;
+103CF;OLD PERSIAN SIGN BUUMISH;Lo;0;L;;;;;N;;;;;
+103D0;OLD PERSIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103D1;OLD PERSIAN NUMBER ONE;Nl;0;L;;;;1;N;;;;;
+103D2;OLD PERSIAN NUMBER TWO;Nl;0;L;;;;2;N;;;;;
+103D3;OLD PERSIAN NUMBER TEN;Nl;0;L;;;;10;N;;;;;
+103D4;OLD PERSIAN NUMBER TWENTY;Nl;0;L;;;;20;N;;;;;
+103D5;OLD PERSIAN NUMBER HUNDRED;Nl;0;L;;;;100;N;;;;;
+10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428;
+10401;DESERET CAPITAL LETTER LONG E;Lu;0;L;;;;;N;;;;10429;
+10402;DESERET CAPITAL LETTER LONG A;Lu;0;L;;;;;N;;;;1042A;
+10403;DESERET CAPITAL LETTER LONG AH;Lu;0;L;;;;;N;;;;1042B;
+10404;DESERET CAPITAL LETTER LONG O;Lu;0;L;;;;;N;;;;1042C;
+10405;DESERET CAPITAL LETTER LONG OO;Lu;0;L;;;;;N;;;;1042D;
+10406;DESERET CAPITAL LETTER SHORT I;Lu;0;L;;;;;N;;;;1042E;
+10407;DESERET CAPITAL LETTER SHORT E;Lu;0;L;;;;;N;;;;1042F;
+10408;DESERET CAPITAL LETTER SHORT A;Lu;0;L;;;;;N;;;;10430;
+10409;DESERET CAPITAL LETTER SHORT AH;Lu;0;L;;;;;N;;;;10431;
+1040A;DESERET CAPITAL LETTER SHORT O;Lu;0;L;;;;;N;;;;10432;
+1040B;DESERET CAPITAL LETTER SHORT OO;Lu;0;L;;;;;N;;;;10433;
+1040C;DESERET CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;10434;
+1040D;DESERET CAPITAL LETTER OW;Lu;0;L;;;;;N;;;;10435;
+1040E;DESERET CAPITAL LETTER WU;Lu;0;L;;;;;N;;;;10436;
+1040F;DESERET CAPITAL LETTER YEE;Lu;0;L;;;;;N;;;;10437;
+10410;DESERET CAPITAL LETTER H;Lu;0;L;;;;;N;;;;10438;
+10411;DESERET CAPITAL LETTER PEE;Lu;0;L;;;;;N;;;;10439;
+10412;DESERET CAPITAL LETTER BEE;Lu;0;L;;;;;N;;;;1043A;
+10413;DESERET CAPITAL LETTER TEE;Lu;0;L;;;;;N;;;;1043B;
+10414;DESERET CAPITAL LETTER DEE;Lu;0;L;;;;;N;;;;1043C;
+10415;DESERET CAPITAL LETTER CHEE;Lu;0;L;;;;;N;;;;1043D;
+10416;DESERET CAPITAL LETTER JEE;Lu;0;L;;;;;N;;;;1043E;
+10417;DESERET CAPITAL LETTER KAY;Lu;0;L;;;;;N;;;;1043F;
+10418;DESERET CAPITAL LETTER GAY;Lu;0;L;;;;;N;;;;10440;
+10419;DESERET CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;10441;
+1041A;DESERET CAPITAL LETTER VEE;Lu;0;L;;;;;N;;;;10442;
+1041B;DESERET CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;10443;
+1041C;DESERET CAPITAL LETTER THEE;Lu;0;L;;;;;N;;;;10444;
+1041D;DESERET CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;10445;
+1041E;DESERET CAPITAL LETTER ZEE;Lu;0;L;;;;;N;;;;10446;
+1041F;DESERET CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;10447;
+10420;DESERET CAPITAL LETTER ZHEE;Lu;0;L;;;;;N;;;;10448;
+10421;DESERET CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;10449;
+10422;DESERET CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;1044A;
+10423;DESERET CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;1044B;
+10424;DESERET CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;1044C;
+10425;DESERET CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;1044D;
+10426;DESERET CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;1044E;
+10427;DESERET CAPITAL LETTER EW;Lu;0;L;;;;;N;;;;1044F;
+10428;DESERET SMALL LETTER LONG I;Ll;0;L;;;;;N;;;10400;;10400
+10429;DESERET SMALL LETTER LONG E;Ll;0;L;;;;;N;;;10401;;10401
+1042A;DESERET SMALL LETTER LONG A;Ll;0;L;;;;;N;;;10402;;10402
+1042B;DESERET SMALL LETTER LONG AH;Ll;0;L;;;;;N;;;10403;;10403
+1042C;DESERET SMALL LETTER LONG O;Ll;0;L;;;;;N;;;10404;;10404
+1042D;DESERET SMALL LETTER LONG OO;Ll;0;L;;;;;N;;;10405;;10405
+1042E;DESERET SMALL LETTER SHORT I;Ll;0;L;;;;;N;;;10406;;10406
+1042F;DESERET SMALL LETTER SHORT E;Ll;0;L;;;;;N;;;10407;;10407
+10430;DESERET SMALL LETTER SHORT A;Ll;0;L;;;;;N;;;10408;;10408
+10431;DESERET SMALL LETTER SHORT AH;Ll;0;L;;;;;N;;;10409;;10409
+10432;DESERET SMALL LETTER SHORT O;Ll;0;L;;;;;N;;;1040A;;1040A
+10433;DESERET SMALL LETTER SHORT OO;Ll;0;L;;;;;N;;;1040B;;1040B
+10434;DESERET SMALL LETTER AY;Ll;0;L;;;;;N;;;1040C;;1040C
+10435;DESERET SMALL LETTER OW;Ll;0;L;;;;;N;;;1040D;;1040D
+10436;DESERET SMALL LETTER WU;Ll;0;L;;;;;N;;;1040E;;1040E
+10437;DESERET SMALL LETTER YEE;Ll;0;L;;;;;N;;;1040F;;1040F
+10438;DESERET SMALL LETTER H;Ll;0;L;;;;;N;;;10410;;10410
+10439;DESERET SMALL LETTER PEE;Ll;0;L;;;;;N;;;10411;;10411
+1043A;DESERET SMALL LETTER BEE;Ll;0;L;;;;;N;;;10412;;10412
+1043B;DESERET SMALL LETTER TEE;Ll;0;L;;;;;N;;;10413;;10413
+1043C;DESERET SMALL LETTER DEE;Ll;0;L;;;;;N;;;10414;;10414
+1043D;DESERET SMALL LETTER CHEE;Ll;0;L;;;;;N;;;10415;;10415
+1043E;DESERET SMALL LETTER JEE;Ll;0;L;;;;;N;;;10416;;10416
+1043F;DESERET SMALL LETTER KAY;Ll;0;L;;;;;N;;;10417;;10417
+10440;DESERET SMALL LETTER GAY;Ll;0;L;;;;;N;;;10418;;10418
+10441;DESERET SMALL LETTER EF;Ll;0;L;;;;;N;;;10419;;10419
+10442;DESERET SMALL LETTER VEE;Ll;0;L;;;;;N;;;1041A;;1041A
+10443;DESERET SMALL LETTER ETH;Ll;0;L;;;;;N;;;1041B;;1041B
+10444;DESERET SMALL LETTER THEE;Ll;0;L;;;;;N;;;1041C;;1041C
+10445;DESERET SMALL LETTER ES;Ll;0;L;;;;;N;;;1041D;;1041D
+10446;DESERET SMALL LETTER ZEE;Ll;0;L;;;;;N;;;1041E;;1041E
+10447;DESERET SMALL LETTER ESH;Ll;0;L;;;;;N;;;1041F;;1041F
+10448;DESERET SMALL LETTER ZHEE;Ll;0;L;;;;;N;;;10420;;10420
+10449;DESERET SMALL LETTER ER;Ll;0;L;;;;;N;;;10421;;10421
+1044A;DESERET SMALL LETTER EL;Ll;0;L;;;;;N;;;10422;;10422
+1044B;DESERET SMALL LETTER EM;Ll;0;L;;;;;N;;;10423;;10423
+1044C;DESERET SMALL LETTER EN;Ll;0;L;;;;;N;;;10424;;10424
+1044D;DESERET SMALL LETTER ENG;Ll;0;L;;;;;N;;;10425;;10425
+1044E;DESERET SMALL LETTER OI;Ll;0;L;;;;;N;;;10426;;10426
+1044F;DESERET SMALL LETTER EW;Ll;0;L;;;;;N;;;10427;;10427
+10450;SHAVIAN LETTER PEEP;Lo;0;L;;;;;N;;;;;
+10451;SHAVIAN LETTER TOT;Lo;0;L;;;;;N;;;;;
+10452;SHAVIAN LETTER KICK;Lo;0;L;;;;;N;;;;;
+10453;SHAVIAN LETTER FEE;Lo;0;L;;;;;N;;;;;
+10454;SHAVIAN LETTER THIGH;Lo;0;L;;;;;N;;;;;
+10455;SHAVIAN LETTER SO;Lo;0;L;;;;;N;;;;;
+10456;SHAVIAN LETTER SURE;Lo;0;L;;;;;N;;;;;
+10457;SHAVIAN LETTER CHURCH;Lo;0;L;;;;;N;;;;;
+10458;SHAVIAN LETTER YEA;Lo;0;L;;;;;N;;;;;
+10459;SHAVIAN LETTER HUNG;Lo;0;L;;;;;N;;;;;
+1045A;SHAVIAN LETTER BIB;Lo;0;L;;;;;N;;;;;
+1045B;SHAVIAN LETTER DEAD;Lo;0;L;;;;;N;;;;;
+1045C;SHAVIAN LETTER GAG;Lo;0;L;;;;;N;;;;;
+1045D;SHAVIAN LETTER VOW;Lo;0;L;;;;;N;;;;;
+1045E;SHAVIAN LETTER THEY;Lo;0;L;;;;;N;;;;;
+1045F;SHAVIAN LETTER ZOO;Lo;0;L;;;;;N;;;;;
+10460;SHAVIAN LETTER MEASURE;Lo;0;L;;;;;N;;;;;
+10461;SHAVIAN LETTER JUDGE;Lo;0;L;;;;;N;;;;;
+10462;SHAVIAN LETTER WOE;Lo;0;L;;;;;N;;;;;
+10463;SHAVIAN LETTER HA-HA;Lo;0;L;;;;;N;;;;;
+10464;SHAVIAN LETTER LOLL;Lo;0;L;;;;;N;;;;;
+10465;SHAVIAN LETTER MIME;Lo;0;L;;;;;N;;;;;
+10466;SHAVIAN LETTER IF;Lo;0;L;;;;;N;;;;;
+10467;SHAVIAN LETTER EGG;Lo;0;L;;;;;N;;;;;
+10468;SHAVIAN LETTER ASH;Lo;0;L;;;;;N;;;;;
+10469;SHAVIAN LETTER ADO;Lo;0;L;;;;;N;;;;;
+1046A;SHAVIAN LETTER ON;Lo;0;L;;;;;N;;;;;
+1046B;SHAVIAN LETTER WOOL;Lo;0;L;;;;;N;;;;;
+1046C;SHAVIAN LETTER OUT;Lo;0;L;;;;;N;;;;;
+1046D;SHAVIAN LETTER AH;Lo;0;L;;;;;N;;;;;
+1046E;SHAVIAN LETTER ROAR;Lo;0;L;;;;;N;;;;;
+1046F;SHAVIAN LETTER NUN;Lo;0;L;;;;;N;;;;;
+10470;SHAVIAN LETTER EAT;Lo;0;L;;;;;N;;;;;
+10471;SHAVIAN LETTER AGE;Lo;0;L;;;;;N;;;;;
+10472;SHAVIAN LETTER ICE;Lo;0;L;;;;;N;;;;;
+10473;SHAVIAN LETTER UP;Lo;0;L;;;;;N;;;;;
+10474;SHAVIAN LETTER OAK;Lo;0;L;;;;;N;;;;;
+10475;SHAVIAN LETTER OOZE;Lo;0;L;;;;;N;;;;;
+10476;SHAVIAN LETTER OIL;Lo;0;L;;;;;N;;;;;
+10477;SHAVIAN LETTER AWE;Lo;0;L;;;;;N;;;;;
+10478;SHAVIAN LETTER ARE;Lo;0;L;;;;;N;;;;;
+10479;SHAVIAN LETTER OR;Lo;0;L;;;;;N;;;;;
+1047A;SHAVIAN LETTER AIR;Lo;0;L;;;;;N;;;;;
+1047B;SHAVIAN LETTER ERR;Lo;0;L;;;;;N;;;;;
+1047C;SHAVIAN LETTER ARRAY;Lo;0;L;;;;;N;;;;;
+1047D;SHAVIAN LETTER EAR;Lo;0;L;;;;;N;;;;;
+1047E;SHAVIAN LETTER IAN;Lo;0;L;;;;;N;;;;;
+1047F;SHAVIAN LETTER YEW;Lo;0;L;;;;;N;;;;;
+10480;OSMANYA LETTER ALEF;Lo;0;L;;;;;N;;;;;
+10481;OSMANYA LETTER BA;Lo;0;L;;;;;N;;;;;
+10482;OSMANYA LETTER TA;Lo;0;L;;;;;N;;;;;
+10483;OSMANYA LETTER JA;Lo;0;L;;;;;N;;;;;
+10484;OSMANYA LETTER XA;Lo;0;L;;;;;N;;;;;
+10485;OSMANYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+10486;OSMANYA LETTER DEEL;Lo;0;L;;;;;N;;;;;
+10487;OSMANYA LETTER RA;Lo;0;L;;;;;N;;;;;
+10488;OSMANYA LETTER SA;Lo;0;L;;;;;N;;;;;
+10489;OSMANYA LETTER SHIIN;Lo;0;L;;;;;N;;;;;
+1048A;OSMANYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1048B;OSMANYA LETTER CAYN;Lo;0;L;;;;;N;;;;;
+1048C;OSMANYA LETTER GA;Lo;0;L;;;;;N;;;;;
+1048D;OSMANYA LETTER FA;Lo;0;L;;;;;N;;;;;
+1048E;OSMANYA LETTER QAAF;Lo;0;L;;;;;N;;;;;
+1048F;OSMANYA LETTER KAAF;Lo;0;L;;;;;N;;;;;
+10490;OSMANYA LETTER LAAN;Lo;0;L;;;;;N;;;;;
+10491;OSMANYA LETTER MIIN;Lo;0;L;;;;;N;;;;;
+10492;OSMANYA LETTER NUUN;Lo;0;L;;;;;N;;;;;
+10493;OSMANYA LETTER WAW;Lo;0;L;;;;;N;;;;;
+10494;OSMANYA LETTER HA;Lo;0;L;;;;;N;;;;;
+10495;OSMANYA LETTER YA;Lo;0;L;;;;;N;;;;;
+10496;OSMANYA LETTER A;Lo;0;L;;;;;N;;;;;
+10497;OSMANYA LETTER E;Lo;0;L;;;;;N;;;;;
+10498;OSMANYA LETTER I;Lo;0;L;;;;;N;;;;;
+10499;OSMANYA LETTER O;Lo;0;L;;;;;N;;;;;
+1049A;OSMANYA LETTER U;Lo;0;L;;;;;N;;;;;
+1049B;OSMANYA LETTER AA;Lo;0;L;;;;;N;;;;;
+1049C;OSMANYA LETTER EE;Lo;0;L;;;;;N;;;;;
+1049D;OSMANYA LETTER OO;Lo;0;L;;;;;N;;;;;
+104A0;OSMANYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+104A1;OSMANYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+104A2;OSMANYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+104A3;OSMANYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+104A4;OSMANYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+104A5;OSMANYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+104A6;OSMANYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104B0;OSAGE CAPITAL LETTER A;Lu;0;L;;;;;N;;;;104D8;
+104B1;OSAGE CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;104D9;
+104B2;OSAGE CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;104DA;
+104B3;OSAGE CAPITAL LETTER AH;Lu;0;L;;;;;N;;;;104DB;
+104B4;OSAGE CAPITAL LETTER BRA;Lu;0;L;;;;;N;;;;104DC;
+104B5;OSAGE CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;104DD;
+104B6;OSAGE CAPITAL LETTER EHCHA;Lu;0;L;;;;;N;;;;104DE;
+104B7;OSAGE CAPITAL LETTER E;Lu;0;L;;;;;N;;;;104DF;
+104B8;OSAGE CAPITAL LETTER EIN;Lu;0;L;;;;;N;;;;104E0;
+104B9;OSAGE CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;104E1;
+104BA;OSAGE CAPITAL LETTER HYA;Lu;0;L;;;;;N;;;;104E2;
+104BB;OSAGE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;104E3;
+104BC;OSAGE CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;104E4;
+104BD;OSAGE CAPITAL LETTER EHKA;Lu;0;L;;;;;N;;;;104E5;
+104BE;OSAGE CAPITAL LETTER KYA;Lu;0;L;;;;;N;;;;104E6;
+104BF;OSAGE CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;104E7;
+104C0;OSAGE CAPITAL LETTER MA;Lu;0;L;;;;;N;;;;104E8;
+104C1;OSAGE CAPITAL LETTER NA;Lu;0;L;;;;;N;;;;104E9;
+104C2;OSAGE CAPITAL LETTER O;Lu;0;L;;;;;N;;;;104EA;
+104C3;OSAGE CAPITAL LETTER OIN;Lu;0;L;;;;;N;;;;104EB;
+104C4;OSAGE CAPITAL LETTER PA;Lu;0;L;;;;;N;;;;104EC;
+104C5;OSAGE CAPITAL LETTER EHPA;Lu;0;L;;;;;N;;;;104ED;
+104C6;OSAGE CAPITAL LETTER SA;Lu;0;L;;;;;N;;;;104EE;
+104C7;OSAGE CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;104EF;
+104C8;OSAGE CAPITAL LETTER TA;Lu;0;L;;;;;N;;;;104F0;
+104C9;OSAGE CAPITAL LETTER EHTA;Lu;0;L;;;;;N;;;;104F1;
+104CA;OSAGE CAPITAL LETTER TSA;Lu;0;L;;;;;N;;;;104F2;
+104CB;OSAGE CAPITAL LETTER EHTSA;Lu;0;L;;;;;N;;;;104F3;
+104CC;OSAGE CAPITAL LETTER TSHA;Lu;0;L;;;;;N;;;;104F4;
+104CD;OSAGE CAPITAL LETTER DHA;Lu;0;L;;;;;N;;;;104F5;
+104CE;OSAGE CAPITAL LETTER U;Lu;0;L;;;;;N;;;;104F6;
+104CF;OSAGE CAPITAL LETTER WA;Lu;0;L;;;;;N;;;;104F7;
+104D0;OSAGE CAPITAL LETTER KHA;Lu;0;L;;;;;N;;;;104F8;
+104D1;OSAGE CAPITAL LETTER GHA;Lu;0;L;;;;;N;;;;104F9;
+104D2;OSAGE CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;104FA;
+104D3;OSAGE CAPITAL LETTER ZHA;Lu;0;L;;;;;N;;;;104FB;
+104D8;OSAGE SMALL LETTER A;Ll;0;L;;;;;N;;;104B0;;104B0
+104D9;OSAGE SMALL LETTER AI;Ll;0;L;;;;;N;;;104B1;;104B1
+104DA;OSAGE SMALL LETTER AIN;Ll;0;L;;;;;N;;;104B2;;104B2
+104DB;OSAGE SMALL LETTER AH;Ll;0;L;;;;;N;;;104B3;;104B3
+104DC;OSAGE SMALL LETTER BRA;Ll;0;L;;;;;N;;;104B4;;104B4
+104DD;OSAGE SMALL LETTER CHA;Ll;0;L;;;;;N;;;104B5;;104B5
+104DE;OSAGE SMALL LETTER EHCHA;Ll;0;L;;;;;N;;;104B6;;104B6
+104DF;OSAGE SMALL LETTER E;Ll;0;L;;;;;N;;;104B7;;104B7
+104E0;OSAGE SMALL LETTER EIN;Ll;0;L;;;;;N;;;104B8;;104B8
+104E1;OSAGE SMALL LETTER HA;Ll;0;L;;;;;N;;;104B9;;104B9
+104E2;OSAGE SMALL LETTER HYA;Ll;0;L;;;;;N;;;104BA;;104BA
+104E3;OSAGE SMALL LETTER I;Ll;0;L;;;;;N;;;104BB;;104BB
+104E4;OSAGE SMALL LETTER KA;Ll;0;L;;;;;N;;;104BC;;104BC
+104E5;OSAGE SMALL LETTER EHKA;Ll;0;L;;;;;N;;;104BD;;104BD
+104E6;OSAGE SMALL LETTER KYA;Ll;0;L;;;;;N;;;104BE;;104BE
+104E7;OSAGE SMALL LETTER LA;Ll;0;L;;;;;N;;;104BF;;104BF
+104E8;OSAGE SMALL LETTER MA;Ll;0;L;;;;;N;;;104C0;;104C0
+104E9;OSAGE SMALL LETTER NA;Ll;0;L;;;;;N;;;104C1;;104C1
+104EA;OSAGE SMALL LETTER O;Ll;0;L;;;;;N;;;104C2;;104C2
+104EB;OSAGE SMALL LETTER OIN;Ll;0;L;;;;;N;;;104C3;;104C3
+104EC;OSAGE SMALL LETTER PA;Ll;0;L;;;;;N;;;104C4;;104C4
+104ED;OSAGE SMALL LETTER EHPA;Ll;0;L;;;;;N;;;104C5;;104C5
+104EE;OSAGE SMALL LETTER SA;Ll;0;L;;;;;N;;;104C6;;104C6
+104EF;OSAGE SMALL LETTER SHA;Ll;0;L;;;;;N;;;104C7;;104C7
+104F0;OSAGE SMALL LETTER TA;Ll;0;L;;;;;N;;;104C8;;104C8
+104F1;OSAGE SMALL LETTER EHTA;Ll;0;L;;;;;N;;;104C9;;104C9
+104F2;OSAGE SMALL LETTER TSA;Ll;0;L;;;;;N;;;104CA;;104CA
+104F3;OSAGE SMALL LETTER EHTSA;Ll;0;L;;;;;N;;;104CB;;104CB
+104F4;OSAGE SMALL LETTER TSHA;Ll;0;L;;;;;N;;;104CC;;104CC
+104F5;OSAGE SMALL LETTER DHA;Ll;0;L;;;;;N;;;104CD;;104CD
+104F6;OSAGE SMALL LETTER U;Ll;0;L;;;;;N;;;104CE;;104CE
+104F7;OSAGE SMALL LETTER WA;Ll;0;L;;;;;N;;;104CF;;104CF
+104F8;OSAGE SMALL LETTER KHA;Ll;0;L;;;;;N;;;104D0;;104D0
+104F9;OSAGE SMALL LETTER GHA;Ll;0;L;;;;;N;;;104D1;;104D1
+104FA;OSAGE SMALL LETTER ZA;Ll;0;L;;;;;N;;;104D2;;104D2
+104FB;OSAGE SMALL LETTER ZHA;Ll;0;L;;;;;N;;;104D3;;104D3
+10500;ELBASAN LETTER A;Lo;0;L;;;;;N;;;;;
+10501;ELBASAN LETTER BE;Lo;0;L;;;;;N;;;;;
+10502;ELBASAN LETTER CE;Lo;0;L;;;;;N;;;;;
+10503;ELBASAN LETTER CHE;Lo;0;L;;;;;N;;;;;
+10504;ELBASAN LETTER DE;Lo;0;L;;;;;N;;;;;
+10505;ELBASAN LETTER NDE;Lo;0;L;;;;;N;;;;;
+10506;ELBASAN LETTER DHE;Lo;0;L;;;;;N;;;;;
+10507;ELBASAN LETTER EI;Lo;0;L;;;;;N;;;;;
+10508;ELBASAN LETTER E;Lo;0;L;;;;;N;;;;;
+10509;ELBASAN LETTER FE;Lo;0;L;;;;;N;;;;;
+1050A;ELBASAN LETTER GE;Lo;0;L;;;;;N;;;;;
+1050B;ELBASAN LETTER GJE;Lo;0;L;;;;;N;;;;;
+1050C;ELBASAN LETTER HE;Lo;0;L;;;;;N;;;;;
+1050D;ELBASAN LETTER I;Lo;0;L;;;;;N;;;;;
+1050E;ELBASAN LETTER JE;Lo;0;L;;;;;N;;;;;
+1050F;ELBASAN LETTER KE;Lo;0;L;;;;;N;;;;;
+10510;ELBASAN LETTER LE;Lo;0;L;;;;;N;;;;;
+10511;ELBASAN LETTER LLE;Lo;0;L;;;;;N;;;;;
+10512;ELBASAN LETTER ME;Lo;0;L;;;;;N;;;;;
+10513;ELBASAN LETTER NE;Lo;0;L;;;;;N;;;;;
+10514;ELBASAN LETTER NA;Lo;0;L;;;;;N;;;;;
+10515;ELBASAN LETTER NJE;Lo;0;L;;;;;N;;;;;
+10516;ELBASAN LETTER O;Lo;0;L;;;;;N;;;;;
+10517;ELBASAN LETTER PE;Lo;0;L;;;;;N;;;;;
+10518;ELBASAN LETTER QE;Lo;0;L;;;;;N;;;;;
+10519;ELBASAN LETTER RE;Lo;0;L;;;;;N;;;;;
+1051A;ELBASAN LETTER RRE;Lo;0;L;;;;;N;;;;;
+1051B;ELBASAN LETTER SE;Lo;0;L;;;;;N;;;;;
+1051C;ELBASAN LETTER SHE;Lo;0;L;;;;;N;;;;;
+1051D;ELBASAN LETTER TE;Lo;0;L;;;;;N;;;;;
+1051E;ELBASAN LETTER THE;Lo;0;L;;;;;N;;;;;
+1051F;ELBASAN LETTER U;Lo;0;L;;;;;N;;;;;
+10520;ELBASAN LETTER VE;Lo;0;L;;;;;N;;;;;
+10521;ELBASAN LETTER XE;Lo;0;L;;;;;N;;;;;
+10522;ELBASAN LETTER Y;Lo;0;L;;;;;N;;;;;
+10523;ELBASAN LETTER ZE;Lo;0;L;;;;;N;;;;;
+10524;ELBASAN LETTER ZHE;Lo;0;L;;;;;N;;;;;
+10525;ELBASAN LETTER GHE;Lo;0;L;;;;;N;;;;;
+10526;ELBASAN LETTER GHAMMA;Lo;0;L;;;;;N;;;;;
+10527;ELBASAN LETTER KHE;Lo;0;L;;;;;N;;;;;
+10530;CAUCASIAN ALBANIAN LETTER ALT;Lo;0;L;;;;;N;;;;;
+10531;CAUCASIAN ALBANIAN LETTER BET;Lo;0;L;;;;;N;;;;;
+10532;CAUCASIAN ALBANIAN LETTER GIM;Lo;0;L;;;;;N;;;;;
+10533;CAUCASIAN ALBANIAN LETTER DAT;Lo;0;L;;;;;N;;;;;
+10534;CAUCASIAN ALBANIAN LETTER EB;Lo;0;L;;;;;N;;;;;
+10535;CAUCASIAN ALBANIAN LETTER ZARL;Lo;0;L;;;;;N;;;;;
+10536;CAUCASIAN ALBANIAN LETTER EYN;Lo;0;L;;;;;N;;;;;
+10537;CAUCASIAN ALBANIAN LETTER ZHIL;Lo;0;L;;;;;N;;;;;
+10538;CAUCASIAN ALBANIAN LETTER TAS;Lo;0;L;;;;;N;;;;;
+10539;CAUCASIAN ALBANIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+1053A;CAUCASIAN ALBANIAN LETTER YOWD;Lo;0;L;;;;;N;;;;;
+1053B;CAUCASIAN ALBANIAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+1053C;CAUCASIAN ALBANIAN LETTER IRB;Lo;0;L;;;;;N;;;;;
+1053D;CAUCASIAN ALBANIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+1053E;CAUCASIAN ALBANIAN LETTER LAN;Lo;0;L;;;;;N;;;;;
+1053F;CAUCASIAN ALBANIAN LETTER INYA;Lo;0;L;;;;;N;;;;;
+10540;CAUCASIAN ALBANIAN LETTER XEYN;Lo;0;L;;;;;N;;;;;
+10541;CAUCASIAN ALBANIAN LETTER DYAN;Lo;0;L;;;;;N;;;;;
+10542;CAUCASIAN ALBANIAN LETTER CAR;Lo;0;L;;;;;N;;;;;
+10543;CAUCASIAN ALBANIAN LETTER JHOX;Lo;0;L;;;;;N;;;;;
+10544;CAUCASIAN ALBANIAN LETTER KAR;Lo;0;L;;;;;N;;;;;
+10545;CAUCASIAN ALBANIAN LETTER LYIT;Lo;0;L;;;;;N;;;;;
+10546;CAUCASIAN ALBANIAN LETTER HEYT;Lo;0;L;;;;;N;;;;;
+10547;CAUCASIAN ALBANIAN LETTER QAY;Lo;0;L;;;;;N;;;;;
+10548;CAUCASIAN ALBANIAN LETTER AOR;Lo;0;L;;;;;N;;;;;
+10549;CAUCASIAN ALBANIAN LETTER CHOY;Lo;0;L;;;;;N;;;;;
+1054A;CAUCASIAN ALBANIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
+1054B;CAUCASIAN ALBANIAN LETTER CYAY;Lo;0;L;;;;;N;;;;;
+1054C;CAUCASIAN ALBANIAN LETTER MAQ;Lo;0;L;;;;;N;;;;;
+1054D;CAUCASIAN ALBANIAN LETTER QAR;Lo;0;L;;;;;N;;;;;
+1054E;CAUCASIAN ALBANIAN LETTER NOWC;Lo;0;L;;;;;N;;;;;
+1054F;CAUCASIAN ALBANIAN LETTER DZYAY;Lo;0;L;;;;;N;;;;;
+10550;CAUCASIAN ALBANIAN LETTER SHAK;Lo;0;L;;;;;N;;;;;
+10551;CAUCASIAN ALBANIAN LETTER JAYN;Lo;0;L;;;;;N;;;;;
+10552;CAUCASIAN ALBANIAN LETTER ON;Lo;0;L;;;;;N;;;;;
+10553;CAUCASIAN ALBANIAN LETTER TYAY;Lo;0;L;;;;;N;;;;;
+10554;CAUCASIAN ALBANIAN LETTER FAM;Lo;0;L;;;;;N;;;;;
+10555;CAUCASIAN ALBANIAN LETTER DZAY;Lo;0;L;;;;;N;;;;;
+10556;CAUCASIAN ALBANIAN LETTER CHAT;Lo;0;L;;;;;N;;;;;
+10557;CAUCASIAN ALBANIAN LETTER PEN;Lo;0;L;;;;;N;;;;;
+10558;CAUCASIAN ALBANIAN LETTER GHEYS;Lo;0;L;;;;;N;;;;;
+10559;CAUCASIAN ALBANIAN LETTER RAT;Lo;0;L;;;;;N;;;;;
+1055A;CAUCASIAN ALBANIAN LETTER SEYK;Lo;0;L;;;;;N;;;;;
+1055B;CAUCASIAN ALBANIAN LETTER VEYZ;Lo;0;L;;;;;N;;;;;
+1055C;CAUCASIAN ALBANIAN LETTER TIWR;Lo;0;L;;;;;N;;;;;
+1055D;CAUCASIAN ALBANIAN LETTER SHOY;Lo;0;L;;;;;N;;;;;
+1055E;CAUCASIAN ALBANIAN LETTER IWN;Lo;0;L;;;;;N;;;;;
+1055F;CAUCASIAN ALBANIAN LETTER CYAW;Lo;0;L;;;;;N;;;;;
+10560;CAUCASIAN ALBANIAN LETTER CAYN;Lo;0;L;;;;;N;;;;;
+10561;CAUCASIAN ALBANIAN LETTER YAYD;Lo;0;L;;;;;N;;;;;
+10562;CAUCASIAN ALBANIAN LETTER PIWR;Lo;0;L;;;;;N;;;;;
+10563;CAUCASIAN ALBANIAN LETTER KIW;Lo;0;L;;;;;N;;;;;
+1056F;CAUCASIAN ALBANIAN CITATION MARK;Po;0;L;;;;;N;;;;;
+10600;LINEAR A SIGN AB001;Lo;0;L;;;;;N;;;;;
+10601;LINEAR A SIGN AB002;Lo;0;L;;;;;N;;;;;
+10602;LINEAR A SIGN AB003;Lo;0;L;;;;;N;;;;;
+10603;LINEAR A SIGN AB004;Lo;0;L;;;;;N;;;;;
+10604;LINEAR A SIGN AB005;Lo;0;L;;;;;N;;;;;
+10605;LINEAR A SIGN AB006;Lo;0;L;;;;;N;;;;;
+10606;LINEAR A SIGN AB007;Lo;0;L;;;;;N;;;;;
+10607;LINEAR A SIGN AB008;Lo;0;L;;;;;N;;;;;
+10608;LINEAR A SIGN AB009;Lo;0;L;;;;;N;;;;;
+10609;LINEAR A SIGN AB010;Lo;0;L;;;;;N;;;;;
+1060A;LINEAR A SIGN AB011;Lo;0;L;;;;;N;;;;;
+1060B;LINEAR A SIGN AB013;Lo;0;L;;;;;N;;;;;
+1060C;LINEAR A SIGN AB016;Lo;0;L;;;;;N;;;;;
+1060D;LINEAR A SIGN AB017;Lo;0;L;;;;;N;;;;;
+1060E;LINEAR A SIGN AB020;Lo;0;L;;;;;N;;;;;
+1060F;LINEAR A SIGN AB021;Lo;0;L;;;;;N;;;;;
+10610;LINEAR A SIGN AB021F;Lo;0;L;;;;;N;;;;;
+10611;LINEAR A SIGN AB021M;Lo;0;L;;;;;N;;;;;
+10612;LINEAR A SIGN AB022;Lo;0;L;;;;;N;;;;;
+10613;LINEAR A SIGN AB022F;Lo;0;L;;;;;N;;;;;
+10614;LINEAR A SIGN AB022M;Lo;0;L;;;;;N;;;;;
+10615;LINEAR A SIGN AB023;Lo;0;L;;;;;N;;;;;
+10616;LINEAR A SIGN AB023M;Lo;0;L;;;;;N;;;;;
+10617;LINEAR A SIGN AB024;Lo;0;L;;;;;N;;;;;
+10618;LINEAR A SIGN AB026;Lo;0;L;;;;;N;;;;;
+10619;LINEAR A SIGN AB027;Lo;0;L;;;;;N;;;;;
+1061A;LINEAR A SIGN AB028;Lo;0;L;;;;;N;;;;;
+1061B;LINEAR A SIGN A028B;Lo;0;L;;;;;N;;;;;
+1061C;LINEAR A SIGN AB029;Lo;0;L;;;;;N;;;;;
+1061D;LINEAR A SIGN AB030;Lo;0;L;;;;;N;;;;;
+1061E;LINEAR A SIGN AB031;Lo;0;L;;;;;N;;;;;
+1061F;LINEAR A SIGN AB034;Lo;0;L;;;;;N;;;;;
+10620;LINEAR A SIGN AB037;Lo;0;L;;;;;N;;;;;
+10621;LINEAR A SIGN AB038;Lo;0;L;;;;;N;;;;;
+10622;LINEAR A SIGN AB039;Lo;0;L;;;;;N;;;;;
+10623;LINEAR A SIGN AB040;Lo;0;L;;;;;N;;;;;
+10624;LINEAR A SIGN AB041;Lo;0;L;;;;;N;;;;;
+10625;LINEAR A SIGN AB044;Lo;0;L;;;;;N;;;;;
+10626;LINEAR A SIGN AB045;Lo;0;L;;;;;N;;;;;
+10627;LINEAR A SIGN AB046;Lo;0;L;;;;;N;;;;;
+10628;LINEAR A SIGN AB047;Lo;0;L;;;;;N;;;;;
+10629;LINEAR A SIGN AB048;Lo;0;L;;;;;N;;;;;
+1062A;LINEAR A SIGN AB049;Lo;0;L;;;;;N;;;;;
+1062B;LINEAR A SIGN AB050;Lo;0;L;;;;;N;;;;;
+1062C;LINEAR A SIGN AB051;Lo;0;L;;;;;N;;;;;
+1062D;LINEAR A SIGN AB053;Lo;0;L;;;;;N;;;;;
+1062E;LINEAR A SIGN AB054;Lo;0;L;;;;;N;;;;;
+1062F;LINEAR A SIGN AB055;Lo;0;L;;;;;N;;;;;
+10630;LINEAR A SIGN AB056;Lo;0;L;;;;;N;;;;;
+10631;LINEAR A SIGN AB057;Lo;0;L;;;;;N;;;;;
+10632;LINEAR A SIGN AB058;Lo;0;L;;;;;N;;;;;
+10633;LINEAR A SIGN AB059;Lo;0;L;;;;;N;;;;;
+10634;LINEAR A SIGN AB060;Lo;0;L;;;;;N;;;;;
+10635;LINEAR A SIGN AB061;Lo;0;L;;;;;N;;;;;
+10636;LINEAR A SIGN AB065;Lo;0;L;;;;;N;;;;;
+10637;LINEAR A SIGN AB066;Lo;0;L;;;;;N;;;;;
+10638;LINEAR A SIGN AB067;Lo;0;L;;;;;N;;;;;
+10639;LINEAR A SIGN AB069;Lo;0;L;;;;;N;;;;;
+1063A;LINEAR A SIGN AB070;Lo;0;L;;;;;N;;;;;
+1063B;LINEAR A SIGN AB073;Lo;0;L;;;;;N;;;;;
+1063C;LINEAR A SIGN AB074;Lo;0;L;;;;;N;;;;;
+1063D;LINEAR A SIGN AB076;Lo;0;L;;;;;N;;;;;
+1063E;LINEAR A SIGN AB077;Lo;0;L;;;;;N;;;;;
+1063F;LINEAR A SIGN AB078;Lo;0;L;;;;;N;;;;;
+10640;LINEAR A SIGN AB079;Lo;0;L;;;;;N;;;;;
+10641;LINEAR A SIGN AB080;Lo;0;L;;;;;N;;;;;
+10642;LINEAR A SIGN AB081;Lo;0;L;;;;;N;;;;;
+10643;LINEAR A SIGN AB082;Lo;0;L;;;;;N;;;;;
+10644;LINEAR A SIGN AB085;Lo;0;L;;;;;N;;;;;
+10645;LINEAR A SIGN AB086;Lo;0;L;;;;;N;;;;;
+10646;LINEAR A SIGN AB087;Lo;0;L;;;;;N;;;;;
+10647;LINEAR A SIGN A100-102;Lo;0;L;;;;;N;;;;;
+10648;LINEAR A SIGN AB118;Lo;0;L;;;;;N;;;;;
+10649;LINEAR A SIGN AB120;Lo;0;L;;;;;N;;;;;
+1064A;LINEAR A SIGN A120B;Lo;0;L;;;;;N;;;;;
+1064B;LINEAR A SIGN AB122;Lo;0;L;;;;;N;;;;;
+1064C;LINEAR A SIGN AB123;Lo;0;L;;;;;N;;;;;
+1064D;LINEAR A SIGN AB131A;Lo;0;L;;;;;N;;;;;
+1064E;LINEAR A SIGN AB131B;Lo;0;L;;;;;N;;;;;
+1064F;LINEAR A SIGN A131C;Lo;0;L;;;;;N;;;;;
+10650;LINEAR A SIGN AB164;Lo;0;L;;;;;N;;;;;
+10651;LINEAR A SIGN AB171;Lo;0;L;;;;;N;;;;;
+10652;LINEAR A SIGN AB180;Lo;0;L;;;;;N;;;;;
+10653;LINEAR A SIGN AB188;Lo;0;L;;;;;N;;;;;
+10654;LINEAR A SIGN AB191;Lo;0;L;;;;;N;;;;;
+10655;LINEAR A SIGN A301;Lo;0;L;;;;;N;;;;;
+10656;LINEAR A SIGN A302;Lo;0;L;;;;;N;;;;;
+10657;LINEAR A SIGN A303;Lo;0;L;;;;;N;;;;;
+10658;LINEAR A SIGN A304;Lo;0;L;;;;;N;;;;;
+10659;LINEAR A SIGN A305;Lo;0;L;;;;;N;;;;;
+1065A;LINEAR A SIGN A306;Lo;0;L;;;;;N;;;;;
+1065B;LINEAR A SIGN A307;Lo;0;L;;;;;N;;;;;
+1065C;LINEAR A SIGN A308;Lo;0;L;;;;;N;;;;;
+1065D;LINEAR A SIGN A309A;Lo;0;L;;;;;N;;;;;
+1065E;LINEAR A SIGN A309B;Lo;0;L;;;;;N;;;;;
+1065F;LINEAR A SIGN A309C;Lo;0;L;;;;;N;;;;;
+10660;LINEAR A SIGN A310;Lo;0;L;;;;;N;;;;;
+10661;LINEAR A SIGN A311;Lo;0;L;;;;;N;;;;;
+10662;LINEAR A SIGN A312;Lo;0;L;;;;;N;;;;;
+10663;LINEAR A SIGN A313A;Lo;0;L;;;;;N;;;;;
+10664;LINEAR A SIGN A313B;Lo;0;L;;;;;N;;;;;
+10665;LINEAR A SIGN A313C;Lo;0;L;;;;;N;;;;;
+10666;LINEAR A SIGN A314;Lo;0;L;;;;;N;;;;;
+10667;LINEAR A SIGN A315;Lo;0;L;;;;;N;;;;;
+10668;LINEAR A SIGN A316;Lo;0;L;;;;;N;;;;;
+10669;LINEAR A SIGN A317;Lo;0;L;;;;;N;;;;;
+1066A;LINEAR A SIGN A318;Lo;0;L;;;;;N;;;;;
+1066B;LINEAR A SIGN A319;Lo;0;L;;;;;N;;;;;
+1066C;LINEAR A SIGN A320;Lo;0;L;;;;;N;;;;;
+1066D;LINEAR A SIGN A321;Lo;0;L;;;;;N;;;;;
+1066E;LINEAR A SIGN A322;Lo;0;L;;;;;N;;;;;
+1066F;LINEAR A SIGN A323;Lo;0;L;;;;;N;;;;;
+10670;LINEAR A SIGN A324;Lo;0;L;;;;;N;;;;;
+10671;LINEAR A SIGN A325;Lo;0;L;;;;;N;;;;;
+10672;LINEAR A SIGN A326;Lo;0;L;;;;;N;;;;;
+10673;LINEAR A SIGN A327;Lo;0;L;;;;;N;;;;;
+10674;LINEAR A SIGN A328;Lo;0;L;;;;;N;;;;;
+10675;LINEAR A SIGN A329;Lo;0;L;;;;;N;;;;;
+10676;LINEAR A SIGN A330;Lo;0;L;;;;;N;;;;;
+10677;LINEAR A SIGN A331;Lo;0;L;;;;;N;;;;;
+10678;LINEAR A SIGN A332;Lo;0;L;;;;;N;;;;;
+10679;LINEAR A SIGN A333;Lo;0;L;;;;;N;;;;;
+1067A;LINEAR A SIGN A334;Lo;0;L;;;;;N;;;;;
+1067B;LINEAR A SIGN A335;Lo;0;L;;;;;N;;;;;
+1067C;LINEAR A SIGN A336;Lo;0;L;;;;;N;;;;;
+1067D;LINEAR A SIGN A337;Lo;0;L;;;;;N;;;;;
+1067E;LINEAR A SIGN A338;Lo;0;L;;;;;N;;;;;
+1067F;LINEAR A SIGN A339;Lo;0;L;;;;;N;;;;;
+10680;LINEAR A SIGN A340;Lo;0;L;;;;;N;;;;;
+10681;LINEAR A SIGN A341;Lo;0;L;;;;;N;;;;;
+10682;LINEAR A SIGN A342;Lo;0;L;;;;;N;;;;;
+10683;LINEAR A SIGN A343;Lo;0;L;;;;;N;;;;;
+10684;LINEAR A SIGN A344;Lo;0;L;;;;;N;;;;;
+10685;LINEAR A SIGN A345;Lo;0;L;;;;;N;;;;;
+10686;LINEAR A SIGN A346;Lo;0;L;;;;;N;;;;;
+10687;LINEAR A SIGN A347;Lo;0;L;;;;;N;;;;;
+10688;LINEAR A SIGN A348;Lo;0;L;;;;;N;;;;;
+10689;LINEAR A SIGN A349;Lo;0;L;;;;;N;;;;;
+1068A;LINEAR A SIGN A350;Lo;0;L;;;;;N;;;;;
+1068B;LINEAR A SIGN A351;Lo;0;L;;;;;N;;;;;
+1068C;LINEAR A SIGN A352;Lo;0;L;;;;;N;;;;;
+1068D;LINEAR A SIGN A353;Lo;0;L;;;;;N;;;;;
+1068E;LINEAR A SIGN A354;Lo;0;L;;;;;N;;;;;
+1068F;LINEAR A SIGN A355;Lo;0;L;;;;;N;;;;;
+10690;LINEAR A SIGN A356;Lo;0;L;;;;;N;;;;;
+10691;LINEAR A SIGN A357;Lo;0;L;;;;;N;;;;;
+10692;LINEAR A SIGN A358;Lo;0;L;;;;;N;;;;;
+10693;LINEAR A SIGN A359;Lo;0;L;;;;;N;;;;;
+10694;LINEAR A SIGN A360;Lo;0;L;;;;;N;;;;;
+10695;LINEAR A SIGN A361;Lo;0;L;;;;;N;;;;;
+10696;LINEAR A SIGN A362;Lo;0;L;;;;;N;;;;;
+10697;LINEAR A SIGN A363;Lo;0;L;;;;;N;;;;;
+10698;LINEAR A SIGN A364;Lo;0;L;;;;;N;;;;;
+10699;LINEAR A SIGN A365;Lo;0;L;;;;;N;;;;;
+1069A;LINEAR A SIGN A366;Lo;0;L;;;;;N;;;;;
+1069B;LINEAR A SIGN A367;Lo;0;L;;;;;N;;;;;
+1069C;LINEAR A SIGN A368;Lo;0;L;;;;;N;;;;;
+1069D;LINEAR A SIGN A369;Lo;0;L;;;;;N;;;;;
+1069E;LINEAR A SIGN A370;Lo;0;L;;;;;N;;;;;
+1069F;LINEAR A SIGN A371;Lo;0;L;;;;;N;;;;;
+106A0;LINEAR A SIGN A400-VAS;Lo;0;L;;;;;N;;;;;
+106A1;LINEAR A SIGN A401-VAS;Lo;0;L;;;;;N;;;;;
+106A2;LINEAR A SIGN A402-VAS;Lo;0;L;;;;;N;;;;;
+106A3;LINEAR A SIGN A403-VAS;Lo;0;L;;;;;N;;;;;
+106A4;LINEAR A SIGN A404-VAS;Lo;0;L;;;;;N;;;;;
+106A5;LINEAR A SIGN A405-VAS;Lo;0;L;;;;;N;;;;;
+106A6;LINEAR A SIGN A406-VAS;Lo;0;L;;;;;N;;;;;
+106A7;LINEAR A SIGN A407-VAS;Lo;0;L;;;;;N;;;;;
+106A8;LINEAR A SIGN A408-VAS;Lo;0;L;;;;;N;;;;;
+106A9;LINEAR A SIGN A409-VAS;Lo;0;L;;;;;N;;;;;
+106AA;LINEAR A SIGN A410-VAS;Lo;0;L;;;;;N;;;;;
+106AB;LINEAR A SIGN A411-VAS;Lo;0;L;;;;;N;;;;;
+106AC;LINEAR A SIGN A412-VAS;Lo;0;L;;;;;N;;;;;
+106AD;LINEAR A SIGN A413-VAS;Lo;0;L;;;;;N;;;;;
+106AE;LINEAR A SIGN A414-VAS;Lo;0;L;;;;;N;;;;;
+106AF;LINEAR A SIGN A415-VAS;Lo;0;L;;;;;N;;;;;
+106B0;LINEAR A SIGN A416-VAS;Lo;0;L;;;;;N;;;;;
+106B1;LINEAR A SIGN A417-VAS;Lo;0;L;;;;;N;;;;;
+106B2;LINEAR A SIGN A418-VAS;Lo;0;L;;;;;N;;;;;
+106B3;LINEAR A SIGN A501;Lo;0;L;;;;;N;;;;;
+106B4;LINEAR A SIGN A502;Lo;0;L;;;;;N;;;;;
+106B5;LINEAR A SIGN A503;Lo;0;L;;;;;N;;;;;
+106B6;LINEAR A SIGN A504;Lo;0;L;;;;;N;;;;;
+106B7;LINEAR A SIGN A505;Lo;0;L;;;;;N;;;;;
+106B8;LINEAR A SIGN A506;Lo;0;L;;;;;N;;;;;
+106B9;LINEAR A SIGN A508;Lo;0;L;;;;;N;;;;;
+106BA;LINEAR A SIGN A509;Lo;0;L;;;;;N;;;;;
+106BB;LINEAR A SIGN A510;Lo;0;L;;;;;N;;;;;
+106BC;LINEAR A SIGN A511;Lo;0;L;;;;;N;;;;;
+106BD;LINEAR A SIGN A512;Lo;0;L;;;;;N;;;;;
+106BE;LINEAR A SIGN A513;Lo;0;L;;;;;N;;;;;
+106BF;LINEAR A SIGN A515;Lo;0;L;;;;;N;;;;;
+106C0;LINEAR A SIGN A516;Lo;0;L;;;;;N;;;;;
+106C1;LINEAR A SIGN A520;Lo;0;L;;;;;N;;;;;
+106C2;LINEAR A SIGN A521;Lo;0;L;;;;;N;;;;;
+106C3;LINEAR A SIGN A523;Lo;0;L;;;;;N;;;;;
+106C4;LINEAR A SIGN A524;Lo;0;L;;;;;N;;;;;
+106C5;LINEAR A SIGN A525;Lo;0;L;;;;;N;;;;;
+106C6;LINEAR A SIGN A526;Lo;0;L;;;;;N;;;;;
+106C7;LINEAR A SIGN A527;Lo;0;L;;;;;N;;;;;
+106C8;LINEAR A SIGN A528;Lo;0;L;;;;;N;;;;;
+106C9;LINEAR A SIGN A529;Lo;0;L;;;;;N;;;;;
+106CA;LINEAR A SIGN A530;Lo;0;L;;;;;N;;;;;
+106CB;LINEAR A SIGN A531;Lo;0;L;;;;;N;;;;;
+106CC;LINEAR A SIGN A532;Lo;0;L;;;;;N;;;;;
+106CD;LINEAR A SIGN A534;Lo;0;L;;;;;N;;;;;
+106CE;LINEAR A SIGN A535;Lo;0;L;;;;;N;;;;;
+106CF;LINEAR A SIGN A536;Lo;0;L;;;;;N;;;;;
+106D0;LINEAR A SIGN A537;Lo;0;L;;;;;N;;;;;
+106D1;LINEAR A SIGN A538;Lo;0;L;;;;;N;;;;;
+106D2;LINEAR A SIGN A539;Lo;0;L;;;;;N;;;;;
+106D3;LINEAR A SIGN A540;Lo;0;L;;;;;N;;;;;
+106D4;LINEAR A SIGN A541;Lo;0;L;;;;;N;;;;;
+106D5;LINEAR A SIGN A542;Lo;0;L;;;;;N;;;;;
+106D6;LINEAR A SIGN A545;Lo;0;L;;;;;N;;;;;
+106D7;LINEAR A SIGN A547;Lo;0;L;;;;;N;;;;;
+106D8;LINEAR A SIGN A548;Lo;0;L;;;;;N;;;;;
+106D9;LINEAR A SIGN A549;Lo;0;L;;;;;N;;;;;
+106DA;LINEAR A SIGN A550;Lo;0;L;;;;;N;;;;;
+106DB;LINEAR A SIGN A551;Lo;0;L;;;;;N;;;;;
+106DC;LINEAR A SIGN A552;Lo;0;L;;;;;N;;;;;
+106DD;LINEAR A SIGN A553;Lo;0;L;;;;;N;;;;;
+106DE;LINEAR A SIGN A554;Lo;0;L;;;;;N;;;;;
+106DF;LINEAR A SIGN A555;Lo;0;L;;;;;N;;;;;
+106E0;LINEAR A SIGN A556;Lo;0;L;;;;;N;;;;;
+106E1;LINEAR A SIGN A557;Lo;0;L;;;;;N;;;;;
+106E2;LINEAR A SIGN A559;Lo;0;L;;;;;N;;;;;
+106E3;LINEAR A SIGN A563;Lo;0;L;;;;;N;;;;;
+106E4;LINEAR A SIGN A564;Lo;0;L;;;;;N;;;;;
+106E5;LINEAR A SIGN A565;Lo;0;L;;;;;N;;;;;
+106E6;LINEAR A SIGN A566;Lo;0;L;;;;;N;;;;;
+106E7;LINEAR A SIGN A568;Lo;0;L;;;;;N;;;;;
+106E8;LINEAR A SIGN A569;Lo;0;L;;;;;N;;;;;
+106E9;LINEAR A SIGN A570;Lo;0;L;;;;;N;;;;;
+106EA;LINEAR A SIGN A571;Lo;0;L;;;;;N;;;;;
+106EB;LINEAR A SIGN A572;Lo;0;L;;;;;N;;;;;
+106EC;LINEAR A SIGN A573;Lo;0;L;;;;;N;;;;;
+106ED;LINEAR A SIGN A574;Lo;0;L;;;;;N;;;;;
+106EE;LINEAR A SIGN A575;Lo;0;L;;;;;N;;;;;
+106EF;LINEAR A SIGN A576;Lo;0;L;;;;;N;;;;;
+106F0;LINEAR A SIGN A577;Lo;0;L;;;;;N;;;;;
+106F1;LINEAR A SIGN A578;Lo;0;L;;;;;N;;;;;
+106F2;LINEAR A SIGN A579;Lo;0;L;;;;;N;;;;;
+106F3;LINEAR A SIGN A580;Lo;0;L;;;;;N;;;;;
+106F4;LINEAR A SIGN A581;Lo;0;L;;;;;N;;;;;
+106F5;LINEAR A SIGN A582;Lo;0;L;;;;;N;;;;;
+106F6;LINEAR A SIGN A583;Lo;0;L;;;;;N;;;;;
+106F7;LINEAR A SIGN A584;Lo;0;L;;;;;N;;;;;
+106F8;LINEAR A SIGN A585;Lo;0;L;;;;;N;;;;;
+106F9;LINEAR A SIGN A586;Lo;0;L;;;;;N;;;;;
+106FA;LINEAR A SIGN A587;Lo;0;L;;;;;N;;;;;
+106FB;LINEAR A SIGN A588;Lo;0;L;;;;;N;;;;;
+106FC;LINEAR A SIGN A589;Lo;0;L;;;;;N;;;;;
+106FD;LINEAR A SIGN A591;Lo;0;L;;;;;N;;;;;
+106FE;LINEAR A SIGN A592;Lo;0;L;;;;;N;;;;;
+106FF;LINEAR A SIGN A594;Lo;0;L;;;;;N;;;;;
+10700;LINEAR A SIGN A595;Lo;0;L;;;;;N;;;;;
+10701;LINEAR A SIGN A596;Lo;0;L;;;;;N;;;;;
+10702;LINEAR A SIGN A598;Lo;0;L;;;;;N;;;;;
+10703;LINEAR A SIGN A600;Lo;0;L;;;;;N;;;;;
+10704;LINEAR A SIGN A601;Lo;0;L;;;;;N;;;;;
+10705;LINEAR A SIGN A602;Lo;0;L;;;;;N;;;;;
+10706;LINEAR A SIGN A603;Lo;0;L;;;;;N;;;;;
+10707;LINEAR A SIGN A604;Lo;0;L;;;;;N;;;;;
+10708;LINEAR A SIGN A606;Lo;0;L;;;;;N;;;;;
+10709;LINEAR A SIGN A608;Lo;0;L;;;;;N;;;;;
+1070A;LINEAR A SIGN A609;Lo;0;L;;;;;N;;;;;
+1070B;LINEAR A SIGN A610;Lo;0;L;;;;;N;;;;;
+1070C;LINEAR A SIGN A611;Lo;0;L;;;;;N;;;;;
+1070D;LINEAR A SIGN A612;Lo;0;L;;;;;N;;;;;
+1070E;LINEAR A SIGN A613;Lo;0;L;;;;;N;;;;;
+1070F;LINEAR A SIGN A614;Lo;0;L;;;;;N;;;;;
+10710;LINEAR A SIGN A615;Lo;0;L;;;;;N;;;;;
+10711;LINEAR A SIGN A616;Lo;0;L;;;;;N;;;;;
+10712;LINEAR A SIGN A617;Lo;0;L;;;;;N;;;;;
+10713;LINEAR A SIGN A618;Lo;0;L;;;;;N;;;;;
+10714;LINEAR A SIGN A619;Lo;0;L;;;;;N;;;;;
+10715;LINEAR A SIGN A620;Lo;0;L;;;;;N;;;;;
+10716;LINEAR A SIGN A621;Lo;0;L;;;;;N;;;;;
+10717;LINEAR A SIGN A622;Lo;0;L;;;;;N;;;;;
+10718;LINEAR A SIGN A623;Lo;0;L;;;;;N;;;;;
+10719;LINEAR A SIGN A624;Lo;0;L;;;;;N;;;;;
+1071A;LINEAR A SIGN A626;Lo;0;L;;;;;N;;;;;
+1071B;LINEAR A SIGN A627;Lo;0;L;;;;;N;;;;;
+1071C;LINEAR A SIGN A628;Lo;0;L;;;;;N;;;;;
+1071D;LINEAR A SIGN A629;Lo;0;L;;;;;N;;;;;
+1071E;LINEAR A SIGN A634;Lo;0;L;;;;;N;;;;;
+1071F;LINEAR A SIGN A637;Lo;0;L;;;;;N;;;;;
+10720;LINEAR A SIGN A638;Lo;0;L;;;;;N;;;;;
+10721;LINEAR A SIGN A640;Lo;0;L;;;;;N;;;;;
+10722;LINEAR A SIGN A642;Lo;0;L;;;;;N;;;;;
+10723;LINEAR A SIGN A643;Lo;0;L;;;;;N;;;;;
+10724;LINEAR A SIGN A644;Lo;0;L;;;;;N;;;;;
+10725;LINEAR A SIGN A645;Lo;0;L;;;;;N;;;;;
+10726;LINEAR A SIGN A646;Lo;0;L;;;;;N;;;;;
+10727;LINEAR A SIGN A648;Lo;0;L;;;;;N;;;;;
+10728;LINEAR A SIGN A649;Lo;0;L;;;;;N;;;;;
+10729;LINEAR A SIGN A651;Lo;0;L;;;;;N;;;;;
+1072A;LINEAR A SIGN A652;Lo;0;L;;;;;N;;;;;
+1072B;LINEAR A SIGN A653;Lo;0;L;;;;;N;;;;;
+1072C;LINEAR A SIGN A654;Lo;0;L;;;;;N;;;;;
+1072D;LINEAR A SIGN A655;Lo;0;L;;;;;N;;;;;
+1072E;LINEAR A SIGN A656;Lo;0;L;;;;;N;;;;;
+1072F;LINEAR A SIGN A657;Lo;0;L;;;;;N;;;;;
+10730;LINEAR A SIGN A658;Lo;0;L;;;;;N;;;;;
+10731;LINEAR A SIGN A659;Lo;0;L;;;;;N;;;;;
+10732;LINEAR A SIGN A660;Lo;0;L;;;;;N;;;;;
+10733;LINEAR A SIGN A661;Lo;0;L;;;;;N;;;;;
+10734;LINEAR A SIGN A662;Lo;0;L;;;;;N;;;;;
+10735;LINEAR A SIGN A663;Lo;0;L;;;;;N;;;;;
+10736;LINEAR A SIGN A664;Lo;0;L;;;;;N;;;;;
+10740;LINEAR A SIGN A701 A;Lo;0;L;;;;;N;;;;;
+10741;LINEAR A SIGN A702 B;Lo;0;L;;;;;N;;;;;
+10742;LINEAR A SIGN A703 D;Lo;0;L;;;;;N;;;;;
+10743;LINEAR A SIGN A704 E;Lo;0;L;;;;;N;;;;;
+10744;LINEAR A SIGN A705 F;Lo;0;L;;;;;N;;;;;
+10745;LINEAR A SIGN A706 H;Lo;0;L;;;;;N;;;;;
+10746;LINEAR A SIGN A707 J;Lo;0;L;;;;;N;;;;;
+10747;LINEAR A SIGN A708 K;Lo;0;L;;;;;N;;;;;
+10748;LINEAR A SIGN A709 L;Lo;0;L;;;;;N;;;;;
+10749;LINEAR A SIGN A709-2 L2;Lo;0;L;;;;;N;;;;;
+1074A;LINEAR A SIGN A709-3 L3;Lo;0;L;;;;;N;;;;;
+1074B;LINEAR A SIGN A709-4 L4;Lo;0;L;;;;;N;;;;;
+1074C;LINEAR A SIGN A709-6 L6;Lo;0;L;;;;;N;;;;;
+1074D;LINEAR A SIGN A710 W;Lo;0;L;;;;;N;;;;;
+1074E;LINEAR A SIGN A711 X;Lo;0;L;;;;;N;;;;;
+1074F;LINEAR A SIGN A712 Y;Lo;0;L;;;;;N;;;;;
+10750;LINEAR A SIGN A713 OMEGA;Lo;0;L;;;;;N;;;;;
+10751;LINEAR A SIGN A714 ABB;Lo;0;L;;;;;N;;;;;
+10752;LINEAR A SIGN A715 BB;Lo;0;L;;;;;N;;;;;
+10753;LINEAR A SIGN A717 DD;Lo;0;L;;;;;N;;;;;
+10754;LINEAR A SIGN A726 EYYY;Lo;0;L;;;;;N;;;;;
+10755;LINEAR A SIGN A732 JE;Lo;0;L;;;;;N;;;;;
+10760;LINEAR A SIGN A800;Lo;0;L;;;;;N;;;;;
+10761;LINEAR A SIGN A801;Lo;0;L;;;;;N;;;;;
+10762;LINEAR A SIGN A802;Lo;0;L;;;;;N;;;;;
+10763;LINEAR A SIGN A803;Lo;0;L;;;;;N;;;;;
+10764;LINEAR A SIGN A804;Lo;0;L;;;;;N;;;;;
+10765;LINEAR A SIGN A805;Lo;0;L;;;;;N;;;;;
+10766;LINEAR A SIGN A806;Lo;0;L;;;;;N;;;;;
+10767;LINEAR A SIGN A807;Lo;0;L;;;;;N;;;;;
+10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;;
+10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;;
+10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;;
+10803;CYPRIOT SYLLABLE O;Lo;0;R;;;;;N;;;;;
+10804;CYPRIOT SYLLABLE U;Lo;0;R;;;;;N;;;;;
+10805;CYPRIOT SYLLABLE JA;Lo;0;R;;;;;N;;;;;
+10808;CYPRIOT SYLLABLE JO;Lo;0;R;;;;;N;;;;;
+1080A;CYPRIOT SYLLABLE KA;Lo;0;R;;;;;N;;;;;
+1080B;CYPRIOT SYLLABLE KE;Lo;0;R;;;;;N;;;;;
+1080C;CYPRIOT SYLLABLE KI;Lo;0;R;;;;;N;;;;;
+1080D;CYPRIOT SYLLABLE KO;Lo;0;R;;;;;N;;;;;
+1080E;CYPRIOT SYLLABLE KU;Lo;0;R;;;;;N;;;;;
+1080F;CYPRIOT SYLLABLE LA;Lo;0;R;;;;;N;;;;;
+10810;CYPRIOT SYLLABLE LE;Lo;0;R;;;;;N;;;;;
+10811;CYPRIOT SYLLABLE LI;Lo;0;R;;;;;N;;;;;
+10812;CYPRIOT SYLLABLE LO;Lo;0;R;;;;;N;;;;;
+10813;CYPRIOT SYLLABLE LU;Lo;0;R;;;;;N;;;;;
+10814;CYPRIOT SYLLABLE MA;Lo;0;R;;;;;N;;;;;
+10815;CYPRIOT SYLLABLE ME;Lo;0;R;;;;;N;;;;;
+10816;CYPRIOT SYLLABLE MI;Lo;0;R;;;;;N;;;;;
+10817;CYPRIOT SYLLABLE MO;Lo;0;R;;;;;N;;;;;
+10818;CYPRIOT SYLLABLE MU;Lo;0;R;;;;;N;;;;;
+10819;CYPRIOT SYLLABLE NA;Lo;0;R;;;;;N;;;;;
+1081A;CYPRIOT SYLLABLE NE;Lo;0;R;;;;;N;;;;;
+1081B;CYPRIOT SYLLABLE NI;Lo;0;R;;;;;N;;;;;
+1081C;CYPRIOT SYLLABLE NO;Lo;0;R;;;;;N;;;;;
+1081D;CYPRIOT SYLLABLE NU;Lo;0;R;;;;;N;;;;;
+1081E;CYPRIOT SYLLABLE PA;Lo;0;R;;;;;N;;;;;
+1081F;CYPRIOT SYLLABLE PE;Lo;0;R;;;;;N;;;;;
+10820;CYPRIOT SYLLABLE PI;Lo;0;R;;;;;N;;;;;
+10821;CYPRIOT SYLLABLE PO;Lo;0;R;;;;;N;;;;;
+10822;CYPRIOT SYLLABLE PU;Lo;0;R;;;;;N;;;;;
+10823;CYPRIOT SYLLABLE RA;Lo;0;R;;;;;N;;;;;
+10824;CYPRIOT SYLLABLE RE;Lo;0;R;;;;;N;;;;;
+10825;CYPRIOT SYLLABLE RI;Lo;0;R;;;;;N;;;;;
+10826;CYPRIOT SYLLABLE RO;Lo;0;R;;;;;N;;;;;
+10827;CYPRIOT SYLLABLE RU;Lo;0;R;;;;;N;;;;;
+10828;CYPRIOT SYLLABLE SA;Lo;0;R;;;;;N;;;;;
+10829;CYPRIOT SYLLABLE SE;Lo;0;R;;;;;N;;;;;
+1082A;CYPRIOT SYLLABLE SI;Lo;0;R;;;;;N;;;;;
+1082B;CYPRIOT SYLLABLE SO;Lo;0;R;;;;;N;;;;;
+1082C;CYPRIOT SYLLABLE SU;Lo;0;R;;;;;N;;;;;
+1082D;CYPRIOT SYLLABLE TA;Lo;0;R;;;;;N;;;;;
+1082E;CYPRIOT SYLLABLE TE;Lo;0;R;;;;;N;;;;;
+1082F;CYPRIOT SYLLABLE TI;Lo;0;R;;;;;N;;;;;
+10830;CYPRIOT SYLLABLE TO;Lo;0;R;;;;;N;;;;;
+10831;CYPRIOT SYLLABLE TU;Lo;0;R;;;;;N;;;;;
+10832;CYPRIOT SYLLABLE WA;Lo;0;R;;;;;N;;;;;
+10833;CYPRIOT SYLLABLE WE;Lo;0;R;;;;;N;;;;;
+10834;CYPRIOT SYLLABLE WI;Lo;0;R;;;;;N;;;;;
+10835;CYPRIOT SYLLABLE WO;Lo;0;R;;;;;N;;;;;
+10837;CYPRIOT SYLLABLE XA;Lo;0;R;;;;;N;;;;;
+10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;;
+1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;;
+1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;;
+10840;IMPERIAL ARAMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10841;IMPERIAL ARAMAIC LETTER BETH;Lo;0;R;;;;;N;;;;;
+10842;IMPERIAL ARAMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10843;IMPERIAL ARAMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10844;IMPERIAL ARAMAIC LETTER HE;Lo;0;R;;;;;N;;;;;
+10845;IMPERIAL ARAMAIC LETTER WAW;Lo;0;R;;;;;N;;;;;
+10846;IMPERIAL ARAMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10847;IMPERIAL ARAMAIC LETTER HETH;Lo;0;R;;;;;N;;;;;
+10848;IMPERIAL ARAMAIC LETTER TETH;Lo;0;R;;;;;N;;;;;
+10849;IMPERIAL ARAMAIC LETTER YODH;Lo;0;R;;;;;N;;;;;
+1084A;IMPERIAL ARAMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;;
+1084B;IMPERIAL ARAMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+1084C;IMPERIAL ARAMAIC LETTER MEM;Lo;0;R;;;;;N;;;;;
+1084D;IMPERIAL ARAMAIC LETTER NUN;Lo;0;R;;;;;N;;;;;
+1084E;IMPERIAL ARAMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+1084F;IMPERIAL ARAMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10850;IMPERIAL ARAMAIC LETTER PE;Lo;0;R;;;;;N;;;;;
+10851;IMPERIAL ARAMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10852;IMPERIAL ARAMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10853;IMPERIAL ARAMAIC LETTER RESH;Lo;0;R;;;;;N;;;;;
+10854;IMPERIAL ARAMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10855;IMPERIAL ARAMAIC LETTER TAW;Lo;0;R;;;;;N;;;;;
+10857;IMPERIAL ARAMAIC SECTION SIGN;Po;0;R;;;;;N;;;;;
+10858;IMPERIAL ARAMAIC NUMBER ONE;No;0;R;;;;1;N;;;;;
+10859;IMPERIAL ARAMAIC NUMBER TWO;No;0;R;;;;2;N;;;;;
+1085A;IMPERIAL ARAMAIC NUMBER THREE;No;0;R;;;;3;N;;;;;
+1085B;IMPERIAL ARAMAIC NUMBER TEN;No;0;R;;;;10;N;;;;;
+1085C;IMPERIAL ARAMAIC NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+1085D;IMPERIAL ARAMAIC NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1085E;IMPERIAL ARAMAIC NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+1085F;IMPERIAL ARAMAIC NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;;
+10860;PALMYRENE LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10861;PALMYRENE LETTER BETH;Lo;0;R;;;;;N;;;;;
+10862;PALMYRENE LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10863;PALMYRENE LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10864;PALMYRENE LETTER HE;Lo;0;R;;;;;N;;;;;
+10865;PALMYRENE LETTER WAW;Lo;0;R;;;;;N;;;;;
+10866;PALMYRENE LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10867;PALMYRENE LETTER HETH;Lo;0;R;;;;;N;;;;;
+10868;PALMYRENE LETTER TETH;Lo;0;R;;;;;N;;;;;
+10869;PALMYRENE LETTER YODH;Lo;0;R;;;;;N;;;;;
+1086A;PALMYRENE LETTER KAPH;Lo;0;R;;;;;N;;;;;
+1086B;PALMYRENE LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+1086C;PALMYRENE LETTER MEM;Lo;0;R;;;;;N;;;;;
+1086D;PALMYRENE LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+1086E;PALMYRENE LETTER NUN;Lo;0;R;;;;;N;;;;;
+1086F;PALMYRENE LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10870;PALMYRENE LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10871;PALMYRENE LETTER PE;Lo;0;R;;;;;N;;;;;
+10872;PALMYRENE LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10873;PALMYRENE LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10874;PALMYRENE LETTER RESH;Lo;0;R;;;;;N;;;;;
+10875;PALMYRENE LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10876;PALMYRENE LETTER TAW;Lo;0;R;;;;;N;;;;;
+10877;PALMYRENE LEFT-POINTING FLEURON;So;0;R;;;;;N;;;;;
+10878;PALMYRENE RIGHT-POINTING FLEURON;So;0;R;;;;;N;;;;;
+10879;PALMYRENE NUMBER ONE;No;0;R;;;;1;N;;;;;
+1087A;PALMYRENE NUMBER TWO;No;0;R;;;;2;N;;;;;
+1087B;PALMYRENE NUMBER THREE;No;0;R;;;;3;N;;;;;
+1087C;PALMYRENE NUMBER FOUR;No;0;R;;;;4;N;;;;;
+1087D;PALMYRENE NUMBER FIVE;No;0;R;;;;5;N;;;;;
+1087E;PALMYRENE NUMBER TEN;No;0;R;;;;10;N;;;;;
+1087F;PALMYRENE NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10880;NABATAEAN LETTER FINAL ALEPH;Lo;0;R;;;;;N;;;;;
+10881;NABATAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10882;NABATAEAN LETTER FINAL BETH;Lo;0;R;;;;;N;;;;;
+10883;NABATAEAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10884;NABATAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10885;NABATAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10886;NABATAEAN LETTER FINAL HE;Lo;0;R;;;;;N;;;;;
+10887;NABATAEAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10888;NABATAEAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10889;NABATAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+1088A;NABATAEAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+1088B;NABATAEAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+1088C;NABATAEAN LETTER FINAL YODH;Lo;0;R;;;;;N;;;;;
+1088D;NABATAEAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+1088E;NABATAEAN LETTER FINAL KAPH;Lo;0;R;;;;;N;;;;;
+1088F;NABATAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10890;NABATAEAN LETTER FINAL LAMEDH;Lo;0;R;;;;;N;;;;;
+10891;NABATAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10892;NABATAEAN LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
+10893;NABATAEAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10894;NABATAEAN LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+10895;NABATAEAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10896;NABATAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10897;NABATAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10898;NABATAEAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10899;NABATAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+1089A;NABATAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+1089B;NABATAEAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+1089C;NABATAEAN LETTER FINAL SHIN;Lo;0;R;;;;;N;;;;;
+1089D;NABATAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+1089E;NABATAEAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+108A7;NABATAEAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+108A8;NABATAEAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+108A9;NABATAEAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+108AA;NABATAEAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+108AB;NABATAEAN CRUCIFORM NUMBER FOUR;No;0;R;;;;4;N;;;;;
+108AC;NABATAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+108AD;NABATAEAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+108AE;NABATAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+108AF;NABATAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+108E0;HATRAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+108E1;HATRAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+108E2;HATRAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+108E3;HATRAN LETTER DALETH-RESH;Lo;0;R;;;;;N;;;;;
+108E4;HATRAN LETTER HE;Lo;0;R;;;;;N;;;;;
+108E5;HATRAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+108E6;HATRAN LETTER ZAYN;Lo;0;R;;;;;N;;;;;
+108E7;HATRAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+108E8;HATRAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+108E9;HATRAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+108EA;HATRAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+108EB;HATRAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+108EC;HATRAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+108ED;HATRAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+108EE;HATRAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+108EF;HATRAN LETTER AYN;Lo;0;R;;;;;N;;;;;
+108F0;HATRAN LETTER PE;Lo;0;R;;;;;N;;;;;
+108F1;HATRAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+108F2;HATRAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+108F4;HATRAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+108F5;HATRAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+108FB;HATRAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+108FC;HATRAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+108FD;HATRAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+108FE;HATRAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+108FF;HATRAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;;
+10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;;
+10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;;
+10903;PHOENICIAN LETTER DELT;Lo;0;R;;;;;N;;;;;
+10904;PHOENICIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10905;PHOENICIAN LETTER WAU;Lo;0;R;;;;;N;;;;;
+10906;PHOENICIAN LETTER ZAI;Lo;0;R;;;;;N;;;;;
+10907;PHOENICIAN LETTER HET;Lo;0;R;;;;;N;;;;;
+10908;PHOENICIAN LETTER TET;Lo;0;R;;;;;N;;;;;
+10909;PHOENICIAN LETTER YOD;Lo;0;R;;;;;N;;;;;
+1090A;PHOENICIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
+1090B;PHOENICIAN LETTER LAMD;Lo;0;R;;;;;N;;;;;
+1090C;PHOENICIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+1090D;PHOENICIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+1090E;PHOENICIAN LETTER SEMK;Lo;0;R;;;;;N;;;;;
+1090F;PHOENICIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
+10910;PHOENICIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10911;PHOENICIAN LETTER SADE;Lo;0;R;;;;;N;;;;;
+10912;PHOENICIAN LETTER QOF;Lo;0;R;;;;;N;;;;;
+10913;PHOENICIAN LETTER ROSH;Lo;0;R;;;;;N;;;;;
+10914;PHOENICIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10915;PHOENICIAN LETTER TAU;Lo;0;R;;;;;N;;;;;
+10916;PHOENICIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1091A;PHOENICIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+1091B;PHOENICIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;;
+10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;;
+10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;;
+10922;LYDIAN LETTER G;Lo;0;R;;;;;N;;;;;
+10923;LYDIAN LETTER D;Lo;0;R;;;;;N;;;;;
+10924;LYDIAN LETTER E;Lo;0;R;;;;;N;;;;;
+10925;LYDIAN LETTER V;Lo;0;R;;;;;N;;;;;
+10926;LYDIAN LETTER I;Lo;0;R;;;;;N;;;;;
+10927;LYDIAN LETTER Y;Lo;0;R;;;;;N;;;;;
+10928;LYDIAN LETTER K;Lo;0;R;;;;;N;;;;;
+10929;LYDIAN LETTER L;Lo;0;R;;;;;N;;;;;
+1092A;LYDIAN LETTER M;Lo;0;R;;;;;N;;;;;
+1092B;LYDIAN LETTER N;Lo;0;R;;;;;N;;;;;
+1092C;LYDIAN LETTER O;Lo;0;R;;;;;N;;;;;
+1092D;LYDIAN LETTER R;Lo;0;R;;;;;N;;;;;
+1092E;LYDIAN LETTER SS;Lo;0;R;;;;;N;;;;;
+1092F;LYDIAN LETTER T;Lo;0;R;;;;;N;;;;;
+10930;LYDIAN LETTER U;Lo;0;R;;;;;N;;;;;
+10931;LYDIAN LETTER F;Lo;0;R;;;;;N;;;;;
+10932;LYDIAN LETTER Q;Lo;0;R;;;;;N;;;;;
+10933;LYDIAN LETTER S;Lo;0;R;;;;;N;;;;;
+10934;LYDIAN LETTER TT;Lo;0;R;;;;;N;;;;;
+10935;LYDIAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10936;LYDIAN LETTER EN;Lo;0;R;;;;;N;;;;;
+10937;LYDIAN LETTER LY;Lo;0;R;;;;;N;;;;;
+10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;;
+10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;;
+1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;;
+10980;MEROITIC HIEROGLYPHIC LETTER A;Lo;0;R;;;;;N;;;;;
+10981;MEROITIC HIEROGLYPHIC LETTER E;Lo;0;R;;;;;N;;;;;
+10982;MEROITIC HIEROGLYPHIC LETTER I;Lo;0;R;;;;;N;;;;;
+10983;MEROITIC HIEROGLYPHIC LETTER O;Lo;0;R;;;;;N;;;;;
+10984;MEROITIC HIEROGLYPHIC LETTER YA;Lo;0;R;;;;;N;;;;;
+10985;MEROITIC HIEROGLYPHIC LETTER WA;Lo;0;R;;;;;N;;;;;
+10986;MEROITIC HIEROGLYPHIC LETTER BA;Lo;0;R;;;;;N;;;;;
+10987;MEROITIC HIEROGLYPHIC LETTER BA-2;Lo;0;R;;;;;N;;;;;
+10988;MEROITIC HIEROGLYPHIC LETTER PA;Lo;0;R;;;;;N;;;;;
+10989;MEROITIC HIEROGLYPHIC LETTER MA;Lo;0;R;;;;;N;;;;;
+1098A;MEROITIC HIEROGLYPHIC LETTER NA;Lo;0;R;;;;;N;;;;;
+1098B;MEROITIC HIEROGLYPHIC LETTER NA-2;Lo;0;R;;;;;N;;;;;
+1098C;MEROITIC HIEROGLYPHIC LETTER NE;Lo;0;R;;;;;N;;;;;
+1098D;MEROITIC HIEROGLYPHIC LETTER NE-2;Lo;0;R;;;;;N;;;;;
+1098E;MEROITIC HIEROGLYPHIC LETTER RA;Lo;0;R;;;;;N;;;;;
+1098F;MEROITIC HIEROGLYPHIC LETTER RA-2;Lo;0;R;;;;;N;;;;;
+10990;MEROITIC HIEROGLYPHIC LETTER LA;Lo;0;R;;;;;N;;;;;
+10991;MEROITIC HIEROGLYPHIC LETTER KHA;Lo;0;R;;;;;N;;;;;
+10992;MEROITIC HIEROGLYPHIC LETTER HHA;Lo;0;R;;;;;N;;;;;
+10993;MEROITIC HIEROGLYPHIC LETTER SA;Lo;0;R;;;;;N;;;;;
+10994;MEROITIC HIEROGLYPHIC LETTER SA-2;Lo;0;R;;;;;N;;;;;
+10995;MEROITIC HIEROGLYPHIC LETTER SE;Lo;0;R;;;;;N;;;;;
+10996;MEROITIC HIEROGLYPHIC LETTER KA;Lo;0;R;;;;;N;;;;;
+10997;MEROITIC HIEROGLYPHIC LETTER QA;Lo;0;R;;;;;N;;;;;
+10998;MEROITIC HIEROGLYPHIC LETTER TA;Lo;0;R;;;;;N;;;;;
+10999;MEROITIC HIEROGLYPHIC LETTER TA-2;Lo;0;R;;;;;N;;;;;
+1099A;MEROITIC HIEROGLYPHIC LETTER TE;Lo;0;R;;;;;N;;;;;
+1099B;MEROITIC HIEROGLYPHIC LETTER TE-2;Lo;0;R;;;;;N;;;;;
+1099C;MEROITIC HIEROGLYPHIC LETTER TO;Lo;0;R;;;;;N;;;;;
+1099D;MEROITIC HIEROGLYPHIC LETTER DA;Lo;0;R;;;;;N;;;;;
+1099E;MEROITIC HIEROGLYPHIC SYMBOL VIDJ;Lo;0;R;;;;;N;;;;;
+1099F;MEROITIC HIEROGLYPHIC SYMBOL VIDJ-2;Lo;0;R;;;;;N;;;;;
+109A0;MEROITIC CURSIVE LETTER A;Lo;0;R;;;;;N;;;;;
+109A1;MEROITIC CURSIVE LETTER E;Lo;0;R;;;;;N;;;;;
+109A2;MEROITIC CURSIVE LETTER I;Lo;0;R;;;;;N;;;;;
+109A3;MEROITIC CURSIVE LETTER O;Lo;0;R;;;;;N;;;;;
+109A4;MEROITIC CURSIVE LETTER YA;Lo;0;R;;;;;N;;;;;
+109A5;MEROITIC CURSIVE LETTER WA;Lo;0;R;;;;;N;;;;;
+109A6;MEROITIC CURSIVE LETTER BA;Lo;0;R;;;;;N;;;;;
+109A7;MEROITIC CURSIVE LETTER PA;Lo;0;R;;;;;N;;;;;
+109A8;MEROITIC CURSIVE LETTER MA;Lo;0;R;;;;;N;;;;;
+109A9;MEROITIC CURSIVE LETTER NA;Lo;0;R;;;;;N;;;;;
+109AA;MEROITIC CURSIVE LETTER NE;Lo;0;R;;;;;N;;;;;
+109AB;MEROITIC CURSIVE LETTER RA;Lo;0;R;;;;;N;;;;;
+109AC;MEROITIC CURSIVE LETTER LA;Lo;0;R;;;;;N;;;;;
+109AD;MEROITIC CURSIVE LETTER KHA;Lo;0;R;;;;;N;;;;;
+109AE;MEROITIC CURSIVE LETTER HHA;Lo;0;R;;;;;N;;;;;
+109AF;MEROITIC CURSIVE LETTER SA;Lo;0;R;;;;;N;;;;;
+109B0;MEROITIC CURSIVE LETTER ARCHAIC SA;Lo;0;R;;;;;N;;;;;
+109B1;MEROITIC CURSIVE LETTER SE;Lo;0;R;;;;;N;;;;;
+109B2;MEROITIC CURSIVE LETTER KA;Lo;0;R;;;;;N;;;;;
+109B3;MEROITIC CURSIVE LETTER QA;Lo;0;R;;;;;N;;;;;
+109B4;MEROITIC CURSIVE LETTER TA;Lo;0;R;;;;;N;;;;;
+109B5;MEROITIC CURSIVE LETTER TE;Lo;0;R;;;;;N;;;;;
+109B6;MEROITIC CURSIVE LETTER TO;Lo;0;R;;;;;N;;;;;
+109B7;MEROITIC CURSIVE LETTER DA;Lo;0;R;;;;;N;;;;;
+109BC;MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS;No;0;R;;;;11/12;N;;;;;
+109BD;MEROITIC CURSIVE FRACTION ONE HALF;No;0;R;;;;1/2;N;;;;;
+109BE;MEROITIC CURSIVE LOGOGRAM RMT;Lo;0;R;;;;;N;;;;;
+109BF;MEROITIC CURSIVE LOGOGRAM IMN;Lo;0;R;;;;;N;;;;;
+109C0;MEROITIC CURSIVE NUMBER ONE;No;0;R;;;;1;N;;;;;
+109C1;MEROITIC CURSIVE NUMBER TWO;No;0;R;;;;2;N;;;;;
+109C2;MEROITIC CURSIVE NUMBER THREE;No;0;R;;;;3;N;;;;;
+109C3;MEROITIC CURSIVE NUMBER FOUR;No;0;R;;;;4;N;;;;;
+109C4;MEROITIC CURSIVE NUMBER FIVE;No;0;R;;;;5;N;;;;;
+109C5;MEROITIC CURSIVE NUMBER SIX;No;0;R;;;;6;N;;;;;
+109C6;MEROITIC CURSIVE NUMBER SEVEN;No;0;R;;;;7;N;;;;;
+109C7;MEROITIC CURSIVE NUMBER EIGHT;No;0;R;;;;8;N;;;;;
+109C8;MEROITIC CURSIVE NUMBER NINE;No;0;R;;;;9;N;;;;;
+109C9;MEROITIC CURSIVE NUMBER TEN;No;0;R;;;;10;N;;;;;
+109CA;MEROITIC CURSIVE NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+109CB;MEROITIC CURSIVE NUMBER THIRTY;No;0;R;;;;30;N;;;;;
+109CC;MEROITIC CURSIVE NUMBER FORTY;No;0;R;;;;40;N;;;;;
+109CD;MEROITIC CURSIVE NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+109CE;MEROITIC CURSIVE NUMBER SIXTY;No;0;R;;;;60;N;;;;;
+109CF;MEROITIC CURSIVE NUMBER SEVENTY;No;0;R;;;;70;N;;;;;
+109D2;MEROITIC CURSIVE NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+109D3;MEROITIC CURSIVE NUMBER TWO HUNDRED;No;0;R;;;;200;N;;;;;
+109D4;MEROITIC CURSIVE NUMBER THREE HUNDRED;No;0;R;;;;300;N;;;;;
+109D5;MEROITIC CURSIVE NUMBER FOUR HUNDRED;No;0;R;;;;400;N;;;;;
+109D6;MEROITIC CURSIVE NUMBER FIVE HUNDRED;No;0;R;;;;500;N;;;;;
+109D7;MEROITIC CURSIVE NUMBER SIX HUNDRED;No;0;R;;;;600;N;;;;;
+109D8;MEROITIC CURSIVE NUMBER SEVEN HUNDRED;No;0;R;;;;700;N;;;;;
+109D9;MEROITIC CURSIVE NUMBER EIGHT HUNDRED;No;0;R;;;;800;N;;;;;
+109DA;MEROITIC CURSIVE NUMBER NINE HUNDRED;No;0;R;;;;900;N;;;;;
+109DB;MEROITIC CURSIVE NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+109DC;MEROITIC CURSIVE NUMBER TWO THOUSAND;No;0;R;;;;2000;N;;;;;
+109DD;MEROITIC CURSIVE NUMBER THREE THOUSAND;No;0;R;;;;3000;N;;;;;
+109DE;MEROITIC CURSIVE NUMBER FOUR THOUSAND;No;0;R;;;;4000;N;;;;;
+109DF;MEROITIC CURSIVE NUMBER FIVE THOUSAND;No;0;R;;;;5000;N;;;;;
+109E0;MEROITIC CURSIVE NUMBER SIX THOUSAND;No;0;R;;;;6000;N;;;;;
+109E1;MEROITIC CURSIVE NUMBER SEVEN THOUSAND;No;0;R;;;;7000;N;;;;;
+109E2;MEROITIC CURSIVE NUMBER EIGHT THOUSAND;No;0;R;;;;8000;N;;;;;
+109E3;MEROITIC CURSIVE NUMBER NINE THOUSAND;No;0;R;;;;9000;N;;;;;
+109E4;MEROITIC CURSIVE NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;;
+109E5;MEROITIC CURSIVE NUMBER TWENTY THOUSAND;No;0;R;;;;20000;N;;;;;
+109E6;MEROITIC CURSIVE NUMBER THIRTY THOUSAND;No;0;R;;;;30000;N;;;;;
+109E7;MEROITIC CURSIVE NUMBER FORTY THOUSAND;No;0;R;;;;40000;N;;;;;
+109E8;MEROITIC CURSIVE NUMBER FIFTY THOUSAND;No;0;R;;;;50000;N;;;;;
+109E9;MEROITIC CURSIVE NUMBER SIXTY THOUSAND;No;0;R;;;;60000;N;;;;;
+109EA;MEROITIC CURSIVE NUMBER SEVENTY THOUSAND;No;0;R;;;;70000;N;;;;;
+109EB;MEROITIC CURSIVE NUMBER EIGHTY THOUSAND;No;0;R;;;;80000;N;;;;;
+109EC;MEROITIC CURSIVE NUMBER NINETY THOUSAND;No;0;R;;;;90000;N;;;;;
+109ED;MEROITIC CURSIVE NUMBER ONE HUNDRED THOUSAND;No;0;R;;;;100000;N;;;;;
+109EE;MEROITIC CURSIVE NUMBER TWO HUNDRED THOUSAND;No;0;R;;;;200000;N;;;;;
+109EF;MEROITIC CURSIVE NUMBER THREE HUNDRED THOUSAND;No;0;R;;;;300000;N;;;;;
+109F0;MEROITIC CURSIVE NUMBER FOUR HUNDRED THOUSAND;No;0;R;;;;400000;N;;;;;
+109F1;MEROITIC CURSIVE NUMBER FIVE HUNDRED THOUSAND;No;0;R;;;;500000;N;;;;;
+109F2;MEROITIC CURSIVE NUMBER SIX HUNDRED THOUSAND;No;0;R;;;;600000;N;;;;;
+109F3;MEROITIC CURSIVE NUMBER SEVEN HUNDRED THOUSAND;No;0;R;;;;700000;N;;;;;
+109F4;MEROITIC CURSIVE NUMBER EIGHT HUNDRED THOUSAND;No;0;R;;;;800000;N;;;;;
+109F5;MEROITIC CURSIVE NUMBER NINE HUNDRED THOUSAND;No;0;R;;;;900000;N;;;;;
+109F6;MEROITIC CURSIVE FRACTION ONE TWELFTH;No;0;R;;;;1/12;N;;;;;
+109F7;MEROITIC CURSIVE FRACTION TWO TWELFTHS;No;0;R;;;;2/12;N;;;;;
+109F8;MEROITIC CURSIVE FRACTION THREE TWELFTHS;No;0;R;;;;3/12;N;;;;;
+109F9;MEROITIC CURSIVE FRACTION FOUR TWELFTHS;No;0;R;;;;4/12;N;;;;;
+109FA;MEROITIC CURSIVE FRACTION FIVE TWELFTHS;No;0;R;;;;5/12;N;;;;;
+109FB;MEROITIC CURSIVE FRACTION SIX TWELFTHS;No;0;R;;;;6/12;N;;;;;
+109FC;MEROITIC CURSIVE FRACTION SEVEN TWELFTHS;No;0;R;;;;7/12;N;;;;;
+109FD;MEROITIC CURSIVE FRACTION EIGHT TWELFTHS;No;0;R;;;;8/12;N;;;;;
+109FE;MEROITIC CURSIVE FRACTION NINE TWELFTHS;No;0;R;;;;9/12;N;;;;;
+109FF;MEROITIC CURSIVE FRACTION TEN TWELFTHS;No;0;R;;;;10/12;N;;;;;
+10A00;KHAROSHTHI LETTER A;Lo;0;R;;;;;N;;;;;
+10A01;KHAROSHTHI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+10A02;KHAROSHTHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+10A03;KHAROSHTHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+10A05;KHAROSHTHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+10A06;KHAROSHTHI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+10A0C;KHAROSHTHI VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+10A0D;KHAROSHTHI SIGN DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+10A0E;KHAROSHTHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+10A0F;KHAROSHTHI SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
+10A10;KHAROSHTHI LETTER KA;Lo;0;R;;;;;N;;;;;
+10A11;KHAROSHTHI LETTER KHA;Lo;0;R;;;;;N;;;;;
+10A12;KHAROSHTHI LETTER GA;Lo;0;R;;;;;N;;;;;
+10A13;KHAROSHTHI LETTER GHA;Lo;0;R;;;;;N;;;;;
+10A15;KHAROSHTHI LETTER CA;Lo;0;R;;;;;N;;;;;
+10A16;KHAROSHTHI LETTER CHA;Lo;0;R;;;;;N;;;;;
+10A17;KHAROSHTHI LETTER JA;Lo;0;R;;;;;N;;;;;
+10A19;KHAROSHTHI LETTER NYA;Lo;0;R;;;;;N;;;;;
+10A1A;KHAROSHTHI LETTER TTA;Lo;0;R;;;;;N;;;;;
+10A1B;KHAROSHTHI LETTER TTHA;Lo;0;R;;;;;N;;;;;
+10A1C;KHAROSHTHI LETTER DDA;Lo;0;R;;;;;N;;;;;
+10A1D;KHAROSHTHI LETTER DDHA;Lo;0;R;;;;;N;;;;;
+10A1E;KHAROSHTHI LETTER NNA;Lo;0;R;;;;;N;;;;;
+10A1F;KHAROSHTHI LETTER TA;Lo;0;R;;;;;N;;;;;
+10A20;KHAROSHTHI LETTER THA;Lo;0;R;;;;;N;;;;;
+10A21;KHAROSHTHI LETTER DA;Lo;0;R;;;;;N;;;;;
+10A22;KHAROSHTHI LETTER DHA;Lo;0;R;;;;;N;;;;;
+10A23;KHAROSHTHI LETTER NA;Lo;0;R;;;;;N;;;;;
+10A24;KHAROSHTHI LETTER PA;Lo;0;R;;;;;N;;;;;
+10A25;KHAROSHTHI LETTER PHA;Lo;0;R;;;;;N;;;;;
+10A26;KHAROSHTHI LETTER BA;Lo;0;R;;;;;N;;;;;
+10A27;KHAROSHTHI LETTER BHA;Lo;0;R;;;;;N;;;;;
+10A28;KHAROSHTHI LETTER MA;Lo;0;R;;;;;N;;;;;
+10A29;KHAROSHTHI LETTER YA;Lo;0;R;;;;;N;;;;;
+10A2A;KHAROSHTHI LETTER RA;Lo;0;R;;;;;N;;;;;
+10A2B;KHAROSHTHI LETTER LA;Lo;0;R;;;;;N;;;;;
+10A2C;KHAROSHTHI LETTER VA;Lo;0;R;;;;;N;;;;;
+10A2D;KHAROSHTHI LETTER SHA;Lo;0;R;;;;;N;;;;;
+10A2E;KHAROSHTHI LETTER SSA;Lo;0;R;;;;;N;;;;;
+10A2F;KHAROSHTHI LETTER SA;Lo;0;R;;;;;N;;;;;
+10A30;KHAROSHTHI LETTER ZA;Lo;0;R;;;;;N;;;;;
+10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
+10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
+10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
+10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
+10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
+10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10A3F;KHAROSHTHI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+10A40;KHAROSHTHI DIGIT ONE;No;0;R;;;1;1;N;;;;;
+10A41;KHAROSHTHI DIGIT TWO;No;0;R;;;2;2;N;;;;;
+10A42;KHAROSHTHI DIGIT THREE;No;0;R;;;3;3;N;;;;;
+10A43;KHAROSHTHI DIGIT FOUR;No;0;R;;;4;4;N;;;;;
+10A44;KHAROSHTHI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
+10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
+10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
+10A53;KHAROSHTHI PUNCTUATION CRESCENT BAR;Po;0;R;;;;;N;;;;;
+10A54;KHAROSHTHI PUNCTUATION MANGALAM;Po;0;R;;;;;N;;;;;
+10A55;KHAROSHTHI PUNCTUATION LOTUS;Po;0;R;;;;;N;;;;;
+10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;;
+10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;;
+10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;;
+10A60;OLD SOUTH ARABIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10A61;OLD SOUTH ARABIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10A62;OLD SOUTH ARABIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10A63;OLD SOUTH ARABIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10A64;OLD SOUTH ARABIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10A65;OLD SOUTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10A66;OLD SOUTH ARABIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10A67;OLD SOUTH ARABIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10A68;OLD SOUTH ARABIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10A69;OLD SOUTH ARABIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10A6A;OLD SOUTH ARABIAN LETTER SAT;Lo;0;R;;;;;N;;;;;
+10A6B;OLD SOUTH ARABIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10A6C;OLD SOUTH ARABIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10A6D;OLD SOUTH ARABIAN LETTER KHETH;Lo;0;R;;;;;N;;;;;
+10A6E;OLD SOUTH ARABIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10A6F;OLD SOUTH ARABIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10A70;OLD SOUTH ARABIAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10A71;OLD SOUTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;;
+10A72;OLD SOUTH ARABIAN LETTER AYN;Lo;0;R;;;;;N;;;;;
+10A73;OLD SOUTH ARABIAN LETTER DHADHE;Lo;0;R;;;;;N;;;;;
+10A74;OLD SOUTH ARABIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10A75;OLD SOUTH ARABIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10A76;OLD SOUTH ARABIAN LETTER GHAYN;Lo;0;R;;;;;N;;;;;
+10A77;OLD SOUTH ARABIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10A78;OLD SOUTH ARABIAN LETTER ZAYN;Lo;0;R;;;;;N;;;;;
+10A79;OLD SOUTH ARABIAN LETTER DHALETH;Lo;0;R;;;;;N;;;;;
+10A7A;OLD SOUTH ARABIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10A7B;OLD SOUTH ARABIAN LETTER THAW;Lo;0;R;;;;;N;;;;;
+10A7C;OLD SOUTH ARABIAN LETTER THETH;Lo;0;R;;;;;N;;;;;
+10A7D;OLD SOUTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10A7E;OLD SOUTH ARABIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+10A7F;OLD SOUTH ARABIAN NUMERIC INDICATOR;Po;0;R;;;;;N;;;;;
+10A80;OLD NORTH ARABIAN LETTER HEH;Lo;0;R;;;;;N;;;;;
+10A81;OLD NORTH ARABIAN LETTER LAM;Lo;0;R;;;;;N;;;;;
+10A82;OLD NORTH ARABIAN LETTER HAH;Lo;0;R;;;;;N;;;;;
+10A83;OLD NORTH ARABIAN LETTER MEEM;Lo;0;R;;;;;N;;;;;
+10A84;OLD NORTH ARABIAN LETTER QAF;Lo;0;R;;;;;N;;;;;
+10A85;OLD NORTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10A86;OLD NORTH ARABIAN LETTER ES-2;Lo;0;R;;;;;N;;;;;
+10A87;OLD NORTH ARABIAN LETTER REH;Lo;0;R;;;;;N;;;;;
+10A88;OLD NORTH ARABIAN LETTER BEH;Lo;0;R;;;;;N;;;;;
+10A89;OLD NORTH ARABIAN LETTER TEH;Lo;0;R;;;;;N;;;;;
+10A8A;OLD NORTH ARABIAN LETTER ES-1;Lo;0;R;;;;;N;;;;;
+10A8B;OLD NORTH ARABIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
+10A8C;OLD NORTH ARABIAN LETTER NOON;Lo;0;R;;;;;N;;;;;
+10A8D;OLD NORTH ARABIAN LETTER KHAH;Lo;0;R;;;;;N;;;;;
+10A8E;OLD NORTH ARABIAN LETTER SAD;Lo;0;R;;;;;N;;;;;
+10A8F;OLD NORTH ARABIAN LETTER ES-3;Lo;0;R;;;;;N;;;;;
+10A90;OLD NORTH ARABIAN LETTER FEH;Lo;0;R;;;;;N;;;;;
+10A91;OLD NORTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;;
+10A92;OLD NORTH ARABIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
+10A93;OLD NORTH ARABIAN LETTER DAD;Lo;0;R;;;;;N;;;;;
+10A94;OLD NORTH ARABIAN LETTER GEEM;Lo;0;R;;;;;N;;;;;
+10A95;OLD NORTH ARABIAN LETTER DAL;Lo;0;R;;;;;N;;;;;
+10A96;OLD NORTH ARABIAN LETTER GHAIN;Lo;0;R;;;;;N;;;;;
+10A97;OLD NORTH ARABIAN LETTER TAH;Lo;0;R;;;;;N;;;;;
+10A98;OLD NORTH ARABIAN LETTER ZAIN;Lo;0;R;;;;;N;;;;;
+10A99;OLD NORTH ARABIAN LETTER THAL;Lo;0;R;;;;;N;;;;;
+10A9A;OLD NORTH ARABIAN LETTER YEH;Lo;0;R;;;;;N;;;;;
+10A9B;OLD NORTH ARABIAN LETTER THEH;Lo;0;R;;;;;N;;;;;
+10A9C;OLD NORTH ARABIAN LETTER ZAH;Lo;0;R;;;;;N;;;;;
+10A9D;OLD NORTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10A9E;OLD NORTH ARABIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10A9F;OLD NORTH ARABIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10AC0;MANICHAEAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10AC1;MANICHAEAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10AC2;MANICHAEAN LETTER BHETH;Lo;0;R;;;;;N;;;;;
+10AC3;MANICHAEAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10AC4;MANICHAEAN LETTER GHIMEL;Lo;0;R;;;;;N;;;;;
+10AC5;MANICHAEAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10AC6;MANICHAEAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10AC7;MANICHAEAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10AC8;MANICHAEAN SIGN UD;So;0;R;;;;;N;;;;;
+10AC9;MANICHAEAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10ACA;MANICHAEAN LETTER ZHAYIN;Lo;0;R;;;;;N;;;;;
+10ACB;MANICHAEAN LETTER JAYIN;Lo;0;R;;;;;N;;;;;
+10ACC;MANICHAEAN LETTER JHAYIN;Lo;0;R;;;;;N;;;;;
+10ACD;MANICHAEAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10ACE;MANICHAEAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10ACF;MANICHAEAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10AD0;MANICHAEAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10AD1;MANICHAEAN LETTER XAPH;Lo;0;R;;;;;N;;;;;
+10AD2;MANICHAEAN LETTER KHAPH;Lo;0;R;;;;;N;;;;;
+10AD3;MANICHAEAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10AD4;MANICHAEAN LETTER DHAMEDH;Lo;0;R;;;;;N;;;;;
+10AD5;MANICHAEAN LETTER THAMEDH;Lo;0;R;;;;;N;;;;;
+10AD6;MANICHAEAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10AD7;MANICHAEAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10AD8;MANICHAEAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10AD9;MANICHAEAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10ADA;MANICHAEAN LETTER AAYIN;Lo;0;R;;;;;N;;;;;
+10ADB;MANICHAEAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10ADC;MANICHAEAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10ADD;MANICHAEAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10ADE;MANICHAEAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10ADF;MANICHAEAN LETTER XOPH;Lo;0;R;;;;;N;;;;;
+10AE0;MANICHAEAN LETTER QHOPH;Lo;0;R;;;;;N;;;;;
+10AE1;MANICHAEAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10AE2;MANICHAEAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10AE3;MANICHAEAN LETTER SSHIN;Lo;0;R;;;;;N;;;;;
+10AE4;MANICHAEAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10AE5;MANICHAEAN ABBREVIATION MARK ABOVE;Mn;230;NSM;;;;;N;;;;;
+10AE6;MANICHAEAN ABBREVIATION MARK BELOW;Mn;220;NSM;;;;;N;;;;;
+10AEB;MANICHAEAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10AEC;MANICHAEAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10AED;MANICHAEAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10AEE;MANICHAEAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10AEF;MANICHAEAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10AF0;MANICHAEAN PUNCTUATION STAR;Po;0;R;;;;;N;;;;;
+10AF1;MANICHAEAN PUNCTUATION FLEURON;Po;0;R;;;;;N;;;;;
+10AF2;MANICHAEAN PUNCTUATION DOUBLE DOT WITHIN DOT;Po;0;R;;;;;N;;;;;
+10AF3;MANICHAEAN PUNCTUATION DOT WITHIN DOT;Po;0;R;;;;;N;;;;;
+10AF4;MANICHAEAN PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
+10AF5;MANICHAEAN PUNCTUATION TWO DOTS;Po;0;R;;;;;N;;;;;
+10AF6;MANICHAEAN PUNCTUATION LINE FILLER;Po;0;R;;;;;N;;;;;
+10B00;AVESTAN LETTER A;Lo;0;R;;;;;N;;;;;
+10B01;AVESTAN LETTER AA;Lo;0;R;;;;;N;;;;;
+10B02;AVESTAN LETTER AO;Lo;0;R;;;;;N;;;;;
+10B03;AVESTAN LETTER AAO;Lo;0;R;;;;;N;;;;;
+10B04;AVESTAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10B05;AVESTAN LETTER AAN;Lo;0;R;;;;;N;;;;;
+10B06;AVESTAN LETTER AE;Lo;0;R;;;;;N;;;;;
+10B07;AVESTAN LETTER AEE;Lo;0;R;;;;;N;;;;;
+10B08;AVESTAN LETTER E;Lo;0;R;;;;;N;;;;;
+10B09;AVESTAN LETTER EE;Lo;0;R;;;;;N;;;;;
+10B0A;AVESTAN LETTER O;Lo;0;R;;;;;N;;;;;
+10B0B;AVESTAN LETTER OO;Lo;0;R;;;;;N;;;;;
+10B0C;AVESTAN LETTER I;Lo;0;R;;;;;N;;;;;
+10B0D;AVESTAN LETTER II;Lo;0;R;;;;;N;;;;;
+10B0E;AVESTAN LETTER U;Lo;0;R;;;;;N;;;;;
+10B0F;AVESTAN LETTER UU;Lo;0;R;;;;;N;;;;;
+10B10;AVESTAN LETTER KE;Lo;0;R;;;;;N;;;;;
+10B11;AVESTAN LETTER XE;Lo;0;R;;;;;N;;;;;
+10B12;AVESTAN LETTER XYE;Lo;0;R;;;;;N;;;;;
+10B13;AVESTAN LETTER XVE;Lo;0;R;;;;;N;;;;;
+10B14;AVESTAN LETTER GE;Lo;0;R;;;;;N;;;;;
+10B15;AVESTAN LETTER GGE;Lo;0;R;;;;;N;;;;;
+10B16;AVESTAN LETTER GHE;Lo;0;R;;;;;N;;;;;
+10B17;AVESTAN LETTER CE;Lo;0;R;;;;;N;;;;;
+10B18;AVESTAN LETTER JE;Lo;0;R;;;;;N;;;;;
+10B19;AVESTAN LETTER TE;Lo;0;R;;;;;N;;;;;
+10B1A;AVESTAN LETTER THE;Lo;0;R;;;;;N;;;;;
+10B1B;AVESTAN LETTER DE;Lo;0;R;;;;;N;;;;;
+10B1C;AVESTAN LETTER DHE;Lo;0;R;;;;;N;;;;;
+10B1D;AVESTAN LETTER TTE;Lo;0;R;;;;;N;;;;;
+10B1E;AVESTAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B1F;AVESTAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10B20;AVESTAN LETTER BE;Lo;0;R;;;;;N;;;;;
+10B21;AVESTAN LETTER BHE;Lo;0;R;;;;;N;;;;;
+10B22;AVESTAN LETTER NGE;Lo;0;R;;;;;N;;;;;
+10B23;AVESTAN LETTER NGYE;Lo;0;R;;;;;N;;;;;
+10B24;AVESTAN LETTER NGVE;Lo;0;R;;;;;N;;;;;
+10B25;AVESTAN LETTER NE;Lo;0;R;;;;;N;;;;;
+10B26;AVESTAN LETTER NYE;Lo;0;R;;;;;N;;;;;
+10B27;AVESTAN LETTER NNE;Lo;0;R;;;;;N;;;;;
+10B28;AVESTAN LETTER ME;Lo;0;R;;;;;N;;;;;
+10B29;AVESTAN LETTER HME;Lo;0;R;;;;;N;;;;;
+10B2A;AVESTAN LETTER YYE;Lo;0;R;;;;;N;;;;;
+10B2B;AVESTAN LETTER YE;Lo;0;R;;;;;N;;;;;
+10B2C;AVESTAN LETTER VE;Lo;0;R;;;;;N;;;;;
+10B2D;AVESTAN LETTER RE;Lo;0;R;;;;;N;;;;;
+10B2E;AVESTAN LETTER LE;Lo;0;R;;;;;N;;;;;
+10B2F;AVESTAN LETTER SE;Lo;0;R;;;;;N;;;;;
+10B30;AVESTAN LETTER ZE;Lo;0;R;;;;;N;;;;;
+10B31;AVESTAN LETTER SHE;Lo;0;R;;;;;N;;;;;
+10B32;AVESTAN LETTER ZHE;Lo;0;R;;;;;N;;;;;
+10B33;AVESTAN LETTER SHYE;Lo;0;R;;;;;N;;;;;
+10B34;AVESTAN LETTER SSHE;Lo;0;R;;;;;N;;;;;
+10B35;AVESTAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B39;AVESTAN ABBREVIATION MARK;Po;0;ON;;;;;N;;;;;
+10B3A;TINY TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3B;SMALL TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3C;LARGE TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3D;LARGE ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3E;LARGE TWO RINGS OVER ONE RING PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3F;LARGE ONE RING OVER TWO RINGS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B40;INSCRIPTIONAL PARTHIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B41;INSCRIPTIONAL PARTHIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B42;INSCRIPTIONAL PARTHIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B43;INSCRIPTIONAL PARTHIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B44;INSCRIPTIONAL PARTHIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B45;INSCRIPTIONAL PARTHIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10B46;INSCRIPTIONAL PARTHIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B47;INSCRIPTIONAL PARTHIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B48;INSCRIPTIONAL PARTHIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B49;INSCRIPTIONAL PARTHIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B4A;INSCRIPTIONAL PARTHIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B4B;INSCRIPTIONAL PARTHIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B4C;INSCRIPTIONAL PARTHIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10B4D;INSCRIPTIONAL PARTHIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B4E;INSCRIPTIONAL PARTHIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B4F;INSCRIPTIONAL PARTHIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10B50;INSCRIPTIONAL PARTHIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B51;INSCRIPTIONAL PARTHIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B52;INSCRIPTIONAL PARTHIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10B53;INSCRIPTIONAL PARTHIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10B54;INSCRIPTIONAL PARTHIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B55;INSCRIPTIONAL PARTHIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B58;INSCRIPTIONAL PARTHIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B59;INSCRIPTIONAL PARTHIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B5A;INSCRIPTIONAL PARTHIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B5B;INSCRIPTIONAL PARTHIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B5C;INSCRIPTIONAL PARTHIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B5D;INSCRIPTIONAL PARTHIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B5E;INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B5F;INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10B60;INSCRIPTIONAL PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B61;INSCRIPTIONAL PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B62;INSCRIPTIONAL PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B63;INSCRIPTIONAL PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B64;INSCRIPTIONAL PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;;
+10B65;INSCRIPTIONAL PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;;
+10B66;INSCRIPTIONAL PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B67;INSCRIPTIONAL PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B68;INSCRIPTIONAL PAHLAVI LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B69;INSCRIPTIONAL PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B6A;INSCRIPTIONAL PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B6B;INSCRIPTIONAL PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B6C;INSCRIPTIONAL PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;;
+10B6D;INSCRIPTIONAL PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B6E;INSCRIPTIONAL PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B6F;INSCRIPTIONAL PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;;
+10B70;INSCRIPTIONAL PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B71;INSCRIPTIONAL PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B72;INSCRIPTIONAL PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B78;INSCRIPTIONAL PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B79;INSCRIPTIONAL PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B7A;INSCRIPTIONAL PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B7B;INSCRIPTIONAL PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B7C;INSCRIPTIONAL PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B7D;INSCRIPTIONAL PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B7E;INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B7F;INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10B80;PSALTER PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B81;PSALTER PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B82;PSALTER PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B83;PSALTER PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B84;PSALTER PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;;
+10B85;PSALTER PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;;
+10B86;PSALTER PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B87;PSALTER PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B88;PSALTER PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B89;PSALTER PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B8A;PSALTER PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B8B;PSALTER PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;;
+10B8C;PSALTER PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B8D;PSALTER PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B8E;PSALTER PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;;
+10B8F;PSALTER PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B90;PSALTER PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B91;PSALTER PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B99;PSALTER PAHLAVI SECTION MARK;Po;0;R;;;;;N;;;;;
+10B9A;PSALTER PAHLAVI TURNED SECTION MARK;Po;0;R;;;;;N;;;;;
+10B9B;PSALTER PAHLAVI FOUR DOTS WITH CROSS;Po;0;R;;;;;N;;;;;
+10B9C;PSALTER PAHLAVI FOUR DOTS WITH DOT;Po;0;R;;;;;N;;;;;
+10BA9;PSALTER PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;;
+10BAA;PSALTER PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;;
+10BAB;PSALTER PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;;
+10BAC;PSALTER PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10BAD;PSALTER PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10BAE;PSALTER PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10BAF;PSALTER PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10C00;OLD TURKIC LETTER ORKHON A;Lo;0;R;;;;;N;;;;;
+10C01;OLD TURKIC LETTER YENISEI A;Lo;0;R;;;;;N;;;;;
+10C02;OLD TURKIC LETTER YENISEI AE;Lo;0;R;;;;;N;;;;;
+10C03;OLD TURKIC LETTER ORKHON I;Lo;0;R;;;;;N;;;;;
+10C04;OLD TURKIC LETTER YENISEI I;Lo;0;R;;;;;N;;;;;
+10C05;OLD TURKIC LETTER YENISEI E;Lo;0;R;;;;;N;;;;;
+10C06;OLD TURKIC LETTER ORKHON O;Lo;0;R;;;;;N;;;;;
+10C07;OLD TURKIC LETTER ORKHON OE;Lo;0;R;;;;;N;;;;;
+10C08;OLD TURKIC LETTER YENISEI OE;Lo;0;R;;;;;N;;;;;
+10C09;OLD TURKIC LETTER ORKHON AB;Lo;0;R;;;;;N;;;;;
+10C0A;OLD TURKIC LETTER YENISEI AB;Lo;0;R;;;;;N;;;;;
+10C0B;OLD TURKIC LETTER ORKHON AEB;Lo;0;R;;;;;N;;;;;
+10C0C;OLD TURKIC LETTER YENISEI AEB;Lo;0;R;;;;;N;;;;;
+10C0D;OLD TURKIC LETTER ORKHON AG;Lo;0;R;;;;;N;;;;;
+10C0E;OLD TURKIC LETTER YENISEI AG;Lo;0;R;;;;;N;;;;;
+10C0F;OLD TURKIC LETTER ORKHON AEG;Lo;0;R;;;;;N;;;;;
+10C10;OLD TURKIC LETTER YENISEI AEG;Lo;0;R;;;;;N;;;;;
+10C11;OLD TURKIC LETTER ORKHON AD;Lo;0;R;;;;;N;;;;;
+10C12;OLD TURKIC LETTER YENISEI AD;Lo;0;R;;;;;N;;;;;
+10C13;OLD TURKIC LETTER ORKHON AED;Lo;0;R;;;;;N;;;;;
+10C14;OLD TURKIC LETTER ORKHON EZ;Lo;0;R;;;;;N;;;;;
+10C15;OLD TURKIC LETTER YENISEI EZ;Lo;0;R;;;;;N;;;;;
+10C16;OLD TURKIC LETTER ORKHON AY;Lo;0;R;;;;;N;;;;;
+10C17;OLD TURKIC LETTER YENISEI AY;Lo;0;R;;;;;N;;;;;
+10C18;OLD TURKIC LETTER ORKHON AEY;Lo;0;R;;;;;N;;;;;
+10C19;OLD TURKIC LETTER YENISEI AEY;Lo;0;R;;;;;N;;;;;
+10C1A;OLD TURKIC LETTER ORKHON AEK;Lo;0;R;;;;;N;;;;;
+10C1B;OLD TURKIC LETTER YENISEI AEK;Lo;0;R;;;;;N;;;;;
+10C1C;OLD TURKIC LETTER ORKHON OEK;Lo;0;R;;;;;N;;;;;
+10C1D;OLD TURKIC LETTER YENISEI OEK;Lo;0;R;;;;;N;;;;;
+10C1E;OLD TURKIC LETTER ORKHON AL;Lo;0;R;;;;;N;;;;;
+10C1F;OLD TURKIC LETTER YENISEI AL;Lo;0;R;;;;;N;;;;;
+10C20;OLD TURKIC LETTER ORKHON AEL;Lo;0;R;;;;;N;;;;;
+10C21;OLD TURKIC LETTER ORKHON ELT;Lo;0;R;;;;;N;;;;;
+10C22;OLD TURKIC LETTER ORKHON EM;Lo;0;R;;;;;N;;;;;
+10C23;OLD TURKIC LETTER ORKHON AN;Lo;0;R;;;;;N;;;;;
+10C24;OLD TURKIC LETTER ORKHON AEN;Lo;0;R;;;;;N;;;;;
+10C25;OLD TURKIC LETTER YENISEI AEN;Lo;0;R;;;;;N;;;;;
+10C26;OLD TURKIC LETTER ORKHON ENT;Lo;0;R;;;;;N;;;;;
+10C27;OLD TURKIC LETTER YENISEI ENT;Lo;0;R;;;;;N;;;;;
+10C28;OLD TURKIC LETTER ORKHON ENC;Lo;0;R;;;;;N;;;;;
+10C29;OLD TURKIC LETTER YENISEI ENC;Lo;0;R;;;;;N;;;;;
+10C2A;OLD TURKIC LETTER ORKHON ENY;Lo;0;R;;;;;N;;;;;
+10C2B;OLD TURKIC LETTER YENISEI ENY;Lo;0;R;;;;;N;;;;;
+10C2C;OLD TURKIC LETTER YENISEI ANG;Lo;0;R;;;;;N;;;;;
+10C2D;OLD TURKIC LETTER ORKHON ENG;Lo;0;R;;;;;N;;;;;
+10C2E;OLD TURKIC LETTER YENISEI AENG;Lo;0;R;;;;;N;;;;;
+10C2F;OLD TURKIC LETTER ORKHON EP;Lo;0;R;;;;;N;;;;;
+10C30;OLD TURKIC LETTER ORKHON OP;Lo;0;R;;;;;N;;;;;
+10C31;OLD TURKIC LETTER ORKHON IC;Lo;0;R;;;;;N;;;;;
+10C32;OLD TURKIC LETTER ORKHON EC;Lo;0;R;;;;;N;;;;;
+10C33;OLD TURKIC LETTER YENISEI EC;Lo;0;R;;;;;N;;;;;
+10C34;OLD TURKIC LETTER ORKHON AQ;Lo;0;R;;;;;N;;;;;
+10C35;OLD TURKIC LETTER YENISEI AQ;Lo;0;R;;;;;N;;;;;
+10C36;OLD TURKIC LETTER ORKHON IQ;Lo;0;R;;;;;N;;;;;
+10C37;OLD TURKIC LETTER YENISEI IQ;Lo;0;R;;;;;N;;;;;
+10C38;OLD TURKIC LETTER ORKHON OQ;Lo;0;R;;;;;N;;;;;
+10C39;OLD TURKIC LETTER YENISEI OQ;Lo;0;R;;;;;N;;;;;
+10C3A;OLD TURKIC LETTER ORKHON AR;Lo;0;R;;;;;N;;;;;
+10C3B;OLD TURKIC LETTER YENISEI AR;Lo;0;R;;;;;N;;;;;
+10C3C;OLD TURKIC LETTER ORKHON AER;Lo;0;R;;;;;N;;;;;
+10C3D;OLD TURKIC LETTER ORKHON AS;Lo;0;R;;;;;N;;;;;
+10C3E;OLD TURKIC LETTER ORKHON AES;Lo;0;R;;;;;N;;;;;
+10C3F;OLD TURKIC LETTER ORKHON ASH;Lo;0;R;;;;;N;;;;;
+10C40;OLD TURKIC LETTER YENISEI ASH;Lo;0;R;;;;;N;;;;;
+10C41;OLD TURKIC LETTER ORKHON ESH;Lo;0;R;;;;;N;;;;;
+10C42;OLD TURKIC LETTER YENISEI ESH;Lo;0;R;;;;;N;;;;;
+10C43;OLD TURKIC LETTER ORKHON AT;Lo;0;R;;;;;N;;;;;
+10C44;OLD TURKIC LETTER YENISEI AT;Lo;0;R;;;;;N;;;;;
+10C45;OLD TURKIC LETTER ORKHON AET;Lo;0;R;;;;;N;;;;;
+10C46;OLD TURKIC LETTER YENISEI AET;Lo;0;R;;;;;N;;;;;
+10C47;OLD TURKIC LETTER ORKHON OT;Lo;0;R;;;;;N;;;;;
+10C48;OLD TURKIC LETTER ORKHON BASH;Lo;0;R;;;;;N;;;;;
+10C80;OLD HUNGARIAN CAPITAL LETTER A;Lu;0;R;;;;;N;;;;10CC0;
+10C81;OLD HUNGARIAN CAPITAL LETTER AA;Lu;0;R;;;;;N;;;;10CC1;
+10C82;OLD HUNGARIAN CAPITAL LETTER EB;Lu;0;R;;;;;N;;;;10CC2;
+10C83;OLD HUNGARIAN CAPITAL LETTER AMB;Lu;0;R;;;;;N;;;;10CC3;
+10C84;OLD HUNGARIAN CAPITAL LETTER EC;Lu;0;R;;;;;N;;;;10CC4;
+10C85;OLD HUNGARIAN CAPITAL LETTER ENC;Lu;0;R;;;;;N;;;;10CC5;
+10C86;OLD HUNGARIAN CAPITAL LETTER ECS;Lu;0;R;;;;;N;;;;10CC6;
+10C87;OLD HUNGARIAN CAPITAL LETTER ED;Lu;0;R;;;;;N;;;;10CC7;
+10C88;OLD HUNGARIAN CAPITAL LETTER AND;Lu;0;R;;;;;N;;;;10CC8;
+10C89;OLD HUNGARIAN CAPITAL LETTER E;Lu;0;R;;;;;N;;;;10CC9;
+10C8A;OLD HUNGARIAN CAPITAL LETTER CLOSE E;Lu;0;R;;;;;N;;;;10CCA;
+10C8B;OLD HUNGARIAN CAPITAL LETTER EE;Lu;0;R;;;;;N;;;;10CCB;
+10C8C;OLD HUNGARIAN CAPITAL LETTER EF;Lu;0;R;;;;;N;;;;10CCC;
+10C8D;OLD HUNGARIAN CAPITAL LETTER EG;Lu;0;R;;;;;N;;;;10CCD;
+10C8E;OLD HUNGARIAN CAPITAL LETTER EGY;Lu;0;R;;;;;N;;;;10CCE;
+10C8F;OLD HUNGARIAN CAPITAL LETTER EH;Lu;0;R;;;;;N;;;;10CCF;
+10C90;OLD HUNGARIAN CAPITAL LETTER I;Lu;0;R;;;;;N;;;;10CD0;
+10C91;OLD HUNGARIAN CAPITAL LETTER II;Lu;0;R;;;;;N;;;;10CD1;
+10C92;OLD HUNGARIAN CAPITAL LETTER EJ;Lu;0;R;;;;;N;;;;10CD2;
+10C93;OLD HUNGARIAN CAPITAL LETTER EK;Lu;0;R;;;;;N;;;;10CD3;
+10C94;OLD HUNGARIAN CAPITAL LETTER AK;Lu;0;R;;;;;N;;;;10CD4;
+10C95;OLD HUNGARIAN CAPITAL LETTER UNK;Lu;0;R;;;;;N;;;;10CD5;
+10C96;OLD HUNGARIAN CAPITAL LETTER EL;Lu;0;R;;;;;N;;;;10CD6;
+10C97;OLD HUNGARIAN CAPITAL LETTER ELY;Lu;0;R;;;;;N;;;;10CD7;
+10C98;OLD HUNGARIAN CAPITAL LETTER EM;Lu;0;R;;;;;N;;;;10CD8;
+10C99;OLD HUNGARIAN CAPITAL LETTER EN;Lu;0;R;;;;;N;;;;10CD9;
+10C9A;OLD HUNGARIAN CAPITAL LETTER ENY;Lu;0;R;;;;;N;;;;10CDA;
+10C9B;OLD HUNGARIAN CAPITAL LETTER O;Lu;0;R;;;;;N;;;;10CDB;
+10C9C;OLD HUNGARIAN CAPITAL LETTER OO;Lu;0;R;;;;;N;;;;10CDC;
+10C9D;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG OE;Lu;0;R;;;;;N;;;;10CDD;
+10C9E;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA OE;Lu;0;R;;;;;N;;;;10CDE;
+10C9F;OLD HUNGARIAN CAPITAL LETTER OEE;Lu;0;R;;;;;N;;;;10CDF;
+10CA0;OLD HUNGARIAN CAPITAL LETTER EP;Lu;0;R;;;;;N;;;;10CE0;
+10CA1;OLD HUNGARIAN CAPITAL LETTER EMP;Lu;0;R;;;;;N;;;;10CE1;
+10CA2;OLD HUNGARIAN CAPITAL LETTER ER;Lu;0;R;;;;;N;;;;10CE2;
+10CA3;OLD HUNGARIAN CAPITAL LETTER SHORT ER;Lu;0;R;;;;;N;;;;10CE3;
+10CA4;OLD HUNGARIAN CAPITAL LETTER ES;Lu;0;R;;;;;N;;;;10CE4;
+10CA5;OLD HUNGARIAN CAPITAL LETTER ESZ;Lu;0;R;;;;;N;;;;10CE5;
+10CA6;OLD HUNGARIAN CAPITAL LETTER ET;Lu;0;R;;;;;N;;;;10CE6;
+10CA7;OLD HUNGARIAN CAPITAL LETTER ENT;Lu;0;R;;;;;N;;;;10CE7;
+10CA8;OLD HUNGARIAN CAPITAL LETTER ETY;Lu;0;R;;;;;N;;;;10CE8;
+10CA9;OLD HUNGARIAN CAPITAL LETTER ECH;Lu;0;R;;;;;N;;;;10CE9;
+10CAA;OLD HUNGARIAN CAPITAL LETTER U;Lu;0;R;;;;;N;;;;10CEA;
+10CAB;OLD HUNGARIAN CAPITAL LETTER UU;Lu;0;R;;;;;N;;;;10CEB;
+10CAC;OLD HUNGARIAN CAPITAL LETTER NIKOLSBURG UE;Lu;0;R;;;;;N;;;;10CEC;
+10CAD;OLD HUNGARIAN CAPITAL LETTER RUDIMENTA UE;Lu;0;R;;;;;N;;;;10CED;
+10CAE;OLD HUNGARIAN CAPITAL LETTER EV;Lu;0;R;;;;;N;;;;10CEE;
+10CAF;OLD HUNGARIAN CAPITAL LETTER EZ;Lu;0;R;;;;;N;;;;10CEF;
+10CB0;OLD HUNGARIAN CAPITAL LETTER EZS;Lu;0;R;;;;;N;;;;10CF0;
+10CB1;OLD HUNGARIAN CAPITAL LETTER ENT-SHAPED SIGN;Lu;0;R;;;;;N;;;;10CF1;
+10CB2;OLD HUNGARIAN CAPITAL LETTER US;Lu;0;R;;;;;N;;;;10CF2;
+10CC0;OLD HUNGARIAN SMALL LETTER A;Ll;0;R;;;;;N;;;10C80;;10C80
+10CC1;OLD HUNGARIAN SMALL LETTER AA;Ll;0;R;;;;;N;;;10C81;;10C81
+10CC2;OLD HUNGARIAN SMALL LETTER EB;Ll;0;R;;;;;N;;;10C82;;10C82
+10CC3;OLD HUNGARIAN SMALL LETTER AMB;Ll;0;R;;;;;N;;;10C83;;10C83
+10CC4;OLD HUNGARIAN SMALL LETTER EC;Ll;0;R;;;;;N;;;10C84;;10C84
+10CC5;OLD HUNGARIAN SMALL LETTER ENC;Ll;0;R;;;;;N;;;10C85;;10C85
+10CC6;OLD HUNGARIAN SMALL LETTER ECS;Ll;0;R;;;;;N;;;10C86;;10C86
+10CC7;OLD HUNGARIAN SMALL LETTER ED;Ll;0;R;;;;;N;;;10C87;;10C87
+10CC8;OLD HUNGARIAN SMALL LETTER AND;Ll;0;R;;;;;N;;;10C88;;10C88
+10CC9;OLD HUNGARIAN SMALL LETTER E;Ll;0;R;;;;;N;;;10C89;;10C89
+10CCA;OLD HUNGARIAN SMALL LETTER CLOSE E;Ll;0;R;;;;;N;;;10C8A;;10C8A
+10CCB;OLD HUNGARIAN SMALL LETTER EE;Ll;0;R;;;;;N;;;10C8B;;10C8B
+10CCC;OLD HUNGARIAN SMALL LETTER EF;Ll;0;R;;;;;N;;;10C8C;;10C8C
+10CCD;OLD HUNGARIAN SMALL LETTER EG;Ll;0;R;;;;;N;;;10C8D;;10C8D
+10CCE;OLD HUNGARIAN SMALL LETTER EGY;Ll;0;R;;;;;N;;;10C8E;;10C8E
+10CCF;OLD HUNGARIAN SMALL LETTER EH;Ll;0;R;;;;;N;;;10C8F;;10C8F
+10CD0;OLD HUNGARIAN SMALL LETTER I;Ll;0;R;;;;;N;;;10C90;;10C90
+10CD1;OLD HUNGARIAN SMALL LETTER II;Ll;0;R;;;;;N;;;10C91;;10C91
+10CD2;OLD HUNGARIAN SMALL LETTER EJ;Ll;0;R;;;;;N;;;10C92;;10C92
+10CD3;OLD HUNGARIAN SMALL LETTER EK;Ll;0;R;;;;;N;;;10C93;;10C93
+10CD4;OLD HUNGARIAN SMALL LETTER AK;Ll;0;R;;;;;N;;;10C94;;10C94
+10CD5;OLD HUNGARIAN SMALL LETTER UNK;Ll;0;R;;;;;N;;;10C95;;10C95
+10CD6;OLD HUNGARIAN SMALL LETTER EL;Ll;0;R;;;;;N;;;10C96;;10C96
+10CD7;OLD HUNGARIAN SMALL LETTER ELY;Ll;0;R;;;;;N;;;10C97;;10C97
+10CD8;OLD HUNGARIAN SMALL LETTER EM;Ll;0;R;;;;;N;;;10C98;;10C98
+10CD9;OLD HUNGARIAN SMALL LETTER EN;Ll;0;R;;;;;N;;;10C99;;10C99
+10CDA;OLD HUNGARIAN SMALL LETTER ENY;Ll;0;R;;;;;N;;;10C9A;;10C9A
+10CDB;OLD HUNGARIAN SMALL LETTER O;Ll;0;R;;;;;N;;;10C9B;;10C9B
+10CDC;OLD HUNGARIAN SMALL LETTER OO;Ll;0;R;;;;;N;;;10C9C;;10C9C
+10CDD;OLD HUNGARIAN SMALL LETTER NIKOLSBURG OE;Ll;0;R;;;;;N;;;10C9D;;10C9D
+10CDE;OLD HUNGARIAN SMALL LETTER RUDIMENTA OE;Ll;0;R;;;;;N;;;10C9E;;10C9E
+10CDF;OLD HUNGARIAN SMALL LETTER OEE;Ll;0;R;;;;;N;;;10C9F;;10C9F
+10CE0;OLD HUNGARIAN SMALL LETTER EP;Ll;0;R;;;;;N;;;10CA0;;10CA0
+10CE1;OLD HUNGARIAN SMALL LETTER EMP;Ll;0;R;;;;;N;;;10CA1;;10CA1
+10CE2;OLD HUNGARIAN SMALL LETTER ER;Ll;0;R;;;;;N;;;10CA2;;10CA2
+10CE3;OLD HUNGARIAN SMALL LETTER SHORT ER;Ll;0;R;;;;;N;;;10CA3;;10CA3
+10CE4;OLD HUNGARIAN SMALL LETTER ES;Ll;0;R;;;;;N;;;10CA4;;10CA4
+10CE5;OLD HUNGARIAN SMALL LETTER ESZ;Ll;0;R;;;;;N;;;10CA5;;10CA5
+10CE6;OLD HUNGARIAN SMALL LETTER ET;Ll;0;R;;;;;N;;;10CA6;;10CA6
+10CE7;OLD HUNGARIAN SMALL LETTER ENT;Ll;0;R;;;;;N;;;10CA7;;10CA7
+10CE8;OLD HUNGARIAN SMALL LETTER ETY;Ll;0;R;;;;;N;;;10CA8;;10CA8
+10CE9;OLD HUNGARIAN SMALL LETTER ECH;Ll;0;R;;;;;N;;;10CA9;;10CA9
+10CEA;OLD HUNGARIAN SMALL LETTER U;Ll;0;R;;;;;N;;;10CAA;;10CAA
+10CEB;OLD HUNGARIAN SMALL LETTER UU;Ll;0;R;;;;;N;;;10CAB;;10CAB
+10CEC;OLD HUNGARIAN SMALL LETTER NIKOLSBURG UE;Ll;0;R;;;;;N;;;10CAC;;10CAC
+10CED;OLD HUNGARIAN SMALL LETTER RUDIMENTA UE;Ll;0;R;;;;;N;;;10CAD;;10CAD
+10CEE;OLD HUNGARIAN SMALL LETTER EV;Ll;0;R;;;;;N;;;10CAE;;10CAE
+10CEF;OLD HUNGARIAN SMALL LETTER EZ;Ll;0;R;;;;;N;;;10CAF;;10CAF
+10CF0;OLD HUNGARIAN SMALL LETTER EZS;Ll;0;R;;;;;N;;;10CB0;;10CB0
+10CF1;OLD HUNGARIAN SMALL LETTER ENT-SHAPED SIGN;Ll;0;R;;;;;N;;;10CB1;;10CB1
+10CF2;OLD HUNGARIAN SMALL LETTER US;Ll;0;R;;;;;N;;;10CB2;;10CB2
+10CFA;OLD HUNGARIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10CFB;OLD HUNGARIAN NUMBER FIVE;No;0;R;;;;5;N;;;;;
+10CFC;OLD HUNGARIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10CFD;OLD HUNGARIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+10CFE;OLD HUNGARIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10CFF;OLD HUNGARIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;;
+10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;;
+10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;;
+10E63;RUMI DIGIT FOUR;No;0;AN;;;4;4;N;;;;;
+10E64;RUMI DIGIT FIVE;No;0;AN;;;5;5;N;;;;;
+10E65;RUMI DIGIT SIX;No;0;AN;;;6;6;N;;;;;
+10E66;RUMI DIGIT SEVEN;No;0;AN;;;7;7;N;;;;;
+10E67;RUMI DIGIT EIGHT;No;0;AN;;;8;8;N;;;;;
+10E68;RUMI DIGIT NINE;No;0;AN;;;9;9;N;;;;;
+10E69;RUMI NUMBER TEN;No;0;AN;;;;10;N;;;;;
+10E6A;RUMI NUMBER TWENTY;No;0;AN;;;;20;N;;;;;
+10E6B;RUMI NUMBER THIRTY;No;0;AN;;;;30;N;;;;;
+10E6C;RUMI NUMBER FORTY;No;0;AN;;;;40;N;;;;;
+10E6D;RUMI NUMBER FIFTY;No;0;AN;;;;50;N;;;;;
+10E6E;RUMI NUMBER SIXTY;No;0;AN;;;;60;N;;;;;
+10E6F;RUMI NUMBER SEVENTY;No;0;AN;;;;70;N;;;;;
+10E70;RUMI NUMBER EIGHTY;No;0;AN;;;;80;N;;;;;
+10E71;RUMI NUMBER NINETY;No;0;AN;;;;90;N;;;;;
+10E72;RUMI NUMBER ONE HUNDRED;No;0;AN;;;;100;N;;;;;
+10E73;RUMI NUMBER TWO HUNDRED;No;0;AN;;;;200;N;;;;;
+10E74;RUMI NUMBER THREE HUNDRED;No;0;AN;;;;300;N;;;;;
+10E75;RUMI NUMBER FOUR HUNDRED;No;0;AN;;;;400;N;;;;;
+10E76;RUMI NUMBER FIVE HUNDRED;No;0;AN;;;;500;N;;;;;
+10E77;RUMI NUMBER SIX HUNDRED;No;0;AN;;;;600;N;;;;;
+10E78;RUMI NUMBER SEVEN HUNDRED;No;0;AN;;;;700;N;;;;;
+10E79;RUMI NUMBER EIGHT HUNDRED;No;0;AN;;;;800;N;;;;;
+10E7A;RUMI NUMBER NINE HUNDRED;No;0;AN;;;;900;N;;;;;
+10E7B;RUMI FRACTION ONE HALF;No;0;AN;;;;1/2;N;;;;;
+10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;;
+10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;;
+10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;;
+11000;BRAHMI SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
+11001;BRAHMI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11002;BRAHMI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11003;BRAHMI SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+11004;BRAHMI SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+11005;BRAHMI LETTER A;Lo;0;L;;;;;N;;;;;
+11006;BRAHMI LETTER AA;Lo;0;L;;;;;N;;;;;
+11007;BRAHMI LETTER I;Lo;0;L;;;;;N;;;;;
+11008;BRAHMI LETTER II;Lo;0;L;;;;;N;;;;;
+11009;BRAHMI LETTER U;Lo;0;L;;;;;N;;;;;
+1100A;BRAHMI LETTER UU;Lo;0;L;;;;;N;;;;;
+1100B;BRAHMI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1100C;BRAHMI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1100D;BRAHMI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1100E;BRAHMI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1100F;BRAHMI LETTER E;Lo;0;L;;;;;N;;;;;
+11010;BRAHMI LETTER AI;Lo;0;L;;;;;N;;;;;
+11011;BRAHMI LETTER O;Lo;0;L;;;;;N;;;;;
+11012;BRAHMI LETTER AU;Lo;0;L;;;;;N;;;;;
+11013;BRAHMI LETTER KA;Lo;0;L;;;;;N;;;;;
+11014;BRAHMI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11015;BRAHMI LETTER GA;Lo;0;L;;;;;N;;;;;
+11016;BRAHMI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11017;BRAHMI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11018;BRAHMI LETTER CA;Lo;0;L;;;;;N;;;;;
+11019;BRAHMI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1101A;BRAHMI LETTER JA;Lo;0;L;;;;;N;;;;;
+1101B;BRAHMI LETTER JHA;Lo;0;L;;;;;N;;;;;
+1101C;BRAHMI LETTER NYA;Lo;0;L;;;;;N;;;;;
+1101D;BRAHMI LETTER TTA;Lo;0;L;;;;;N;;;;;
+1101E;BRAHMI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1101F;BRAHMI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11020;BRAHMI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11021;BRAHMI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11022;BRAHMI LETTER TA;Lo;0;L;;;;;N;;;;;
+11023;BRAHMI LETTER THA;Lo;0;L;;;;;N;;;;;
+11024;BRAHMI LETTER DA;Lo;0;L;;;;;N;;;;;
+11025;BRAHMI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11026;BRAHMI LETTER NA;Lo;0;L;;;;;N;;;;;
+11027;BRAHMI LETTER PA;Lo;0;L;;;;;N;;;;;
+11028;BRAHMI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11029;BRAHMI LETTER BA;Lo;0;L;;;;;N;;;;;
+1102A;BRAHMI LETTER BHA;Lo;0;L;;;;;N;;;;;
+1102B;BRAHMI LETTER MA;Lo;0;L;;;;;N;;;;;
+1102C;BRAHMI LETTER YA;Lo;0;L;;;;;N;;;;;
+1102D;BRAHMI LETTER RA;Lo;0;L;;;;;N;;;;;
+1102E;BRAHMI LETTER LA;Lo;0;L;;;;;N;;;;;
+1102F;BRAHMI LETTER VA;Lo;0;L;;;;;N;;;;;
+11030;BRAHMI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11031;BRAHMI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11032;BRAHMI LETTER SA;Lo;0;L;;;;;N;;;;;
+11033;BRAHMI LETTER HA;Lo;0;L;;;;;N;;;;;
+11034;BRAHMI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11035;BRAHMI LETTER OLD TAMIL LLLA;Lo;0;L;;;;;N;;;;;
+11036;BRAHMI LETTER OLD TAMIL RRA;Lo;0;L;;;;;N;;;;;
+11037;BRAHMI LETTER OLD TAMIL NNNA;Lo;0;L;;;;;N;;;;;
+11038;BRAHMI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11039;BRAHMI VOWEL SIGN BHATTIPROLU AA;Mn;0;NSM;;;;;N;;;;;
+1103A;BRAHMI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1103B;BRAHMI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1103C;BRAHMI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1103D;BRAHMI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1103E;BRAHMI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+1103F;BRAHMI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11040;BRAHMI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11041;BRAHMI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+11042;BRAHMI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11043;BRAHMI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11044;BRAHMI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11045;BRAHMI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11046;BRAHMI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11047;BRAHMI DANDA;Po;0;L;;;;;N;;;;;
+11048;BRAHMI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11049;BRAHMI PUNCTUATION DOT;Po;0;L;;;;;N;;;;;
+1104A;BRAHMI PUNCTUATION DOUBLE DOT;Po;0;L;;;;;N;;;;;
+1104B;BRAHMI PUNCTUATION LINE;Po;0;L;;;;;N;;;;;
+1104C;BRAHMI PUNCTUATION CRESCENT BAR;Po;0;L;;;;;N;;;;;
+1104D;BRAHMI PUNCTUATION LOTUS;Po;0;L;;;;;N;;;;;
+11052;BRAHMI NUMBER ONE;No;0;ON;;;1;1;N;;;;;
+11053;BRAHMI NUMBER TWO;No;0;ON;;;2;2;N;;;;;
+11054;BRAHMI NUMBER THREE;No;0;ON;;;3;3;N;;;;;
+11055;BRAHMI NUMBER FOUR;No;0;ON;;;4;4;N;;;;;
+11056;BRAHMI NUMBER FIVE;No;0;ON;;;5;5;N;;;;;
+11057;BRAHMI NUMBER SIX;No;0;ON;;;6;6;N;;;;;
+11058;BRAHMI NUMBER SEVEN;No;0;ON;;;7;7;N;;;;;
+11059;BRAHMI NUMBER EIGHT;No;0;ON;;;8;8;N;;;;;
+1105A;BRAHMI NUMBER NINE;No;0;ON;;;9;9;N;;;;;
+1105B;BRAHMI NUMBER TEN;No;0;ON;;;;10;N;;;;;
+1105C;BRAHMI NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
+1105D;BRAHMI NUMBER THIRTY;No;0;ON;;;;30;N;;;;;
+1105E;BRAHMI NUMBER FORTY;No;0;ON;;;;40;N;;;;;
+1105F;BRAHMI NUMBER FIFTY;No;0;ON;;;;50;N;;;;;
+11060;BRAHMI NUMBER SIXTY;No;0;ON;;;;60;N;;;;;
+11061;BRAHMI NUMBER SEVENTY;No;0;ON;;;;70;N;;;;;
+11062;BRAHMI NUMBER EIGHTY;No;0;ON;;;;80;N;;;;;
+11063;BRAHMI NUMBER NINETY;No;0;ON;;;;90;N;;;;;
+11064;BRAHMI NUMBER ONE HUNDRED;No;0;ON;;;;100;N;;;;;
+11065;BRAHMI NUMBER ONE THOUSAND;No;0;ON;;;;1000;N;;;;;
+11066;BRAHMI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11067;BRAHMI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11068;BRAHMI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11069;BRAHMI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1106A;BRAHMI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1106B;BRAHMI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1106C;BRAHMI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1106D;BRAHMI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1106E;BRAHMI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1106F;BRAHMI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1107F;BRAHMI NUMBER JOINER;Mn;9;NSM;;;;;N;;;;;
+11080;KAITHI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11081;KAITHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11082;KAITHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11083;KAITHI LETTER A;Lo;0;L;;;;;N;;;;;
+11084;KAITHI LETTER AA;Lo;0;L;;;;;N;;;;;
+11085;KAITHI LETTER I;Lo;0;L;;;;;N;;;;;
+11086;KAITHI LETTER II;Lo;0;L;;;;;N;;;;;
+11087;KAITHI LETTER U;Lo;0;L;;;;;N;;;;;
+11088;KAITHI LETTER UU;Lo;0;L;;;;;N;;;;;
+11089;KAITHI LETTER E;Lo;0;L;;;;;N;;;;;
+1108A;KAITHI LETTER AI;Lo;0;L;;;;;N;;;;;
+1108B;KAITHI LETTER O;Lo;0;L;;;;;N;;;;;
+1108C;KAITHI LETTER AU;Lo;0;L;;;;;N;;;;;
+1108D;KAITHI LETTER KA;Lo;0;L;;;;;N;;;;;
+1108E;KAITHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1108F;KAITHI LETTER GA;Lo;0;L;;;;;N;;;;;
+11090;KAITHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11091;KAITHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11092;KAITHI LETTER CA;Lo;0;L;;;;;N;;;;;
+11093;KAITHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11094;KAITHI LETTER JA;Lo;0;L;;;;;N;;;;;
+11095;KAITHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11096;KAITHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11097;KAITHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11098;KAITHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11099;KAITHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+1109A;KAITHI LETTER DDDHA;Lo;0;L;11099 110BA;;;;N;;;;;
+1109B;KAITHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1109C;KAITHI LETTER RHA;Lo;0;L;1109B 110BA;;;;N;;;;;
+1109D;KAITHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+1109E;KAITHI LETTER TA;Lo;0;L;;;;;N;;;;;
+1109F;KAITHI LETTER THA;Lo;0;L;;;;;N;;;;;
+110A0;KAITHI LETTER DA;Lo;0;L;;;;;N;;;;;
+110A1;KAITHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+110A2;KAITHI LETTER NA;Lo;0;L;;;;;N;;;;;
+110A3;KAITHI LETTER PA;Lo;0;L;;;;;N;;;;;
+110A4;KAITHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+110A5;KAITHI LETTER BA;Lo;0;L;;;;;N;;;;;
+110A6;KAITHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+110A7;KAITHI LETTER MA;Lo;0;L;;;;;N;;;;;
+110A8;KAITHI LETTER YA;Lo;0;L;;;;;N;;;;;
+110A9;KAITHI LETTER RA;Lo;0;L;;;;;N;;;;;
+110AA;KAITHI LETTER LA;Lo;0;L;;;;;N;;;;;
+110AB;KAITHI LETTER VA;Lo;0;L;110A5 110BA;;;;N;;;;;
+110AC;KAITHI LETTER SHA;Lo;0;L;;;;;N;;;;;
+110AD;KAITHI LETTER SSA;Lo;0;L;;;;;N;;;;;
+110AE;KAITHI LETTER SA;Lo;0;L;;;;;N;;;;;
+110AF;KAITHI LETTER HA;Lo;0;L;;;;;N;;;;;
+110B0;KAITHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+110B1;KAITHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+110B2;KAITHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+110B3;KAITHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+110B4;KAITHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+110B5;KAITHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+110B6;KAITHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+110B7;KAITHI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+110B8;KAITHI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+110B9;KAITHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+110BA;KAITHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+110BB;KAITHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+110BC;KAITHI ENUMERATION SIGN;Po;0;L;;;;;N;;;;;
+110BD;KAITHI NUMBER SIGN;Cf;0;L;;;;;N;;;;;
+110BE;KAITHI SECTION MARK;Po;0;L;;;;;N;;;;;
+110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
+110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
+110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+110D0;SORA SOMPENG LETTER SAH;Lo;0;L;;;;;N;;;;;
+110D1;SORA SOMPENG LETTER TAH;Lo;0;L;;;;;N;;;;;
+110D2;SORA SOMPENG LETTER BAH;Lo;0;L;;;;;N;;;;;
+110D3;SORA SOMPENG LETTER CAH;Lo;0;L;;;;;N;;;;;
+110D4;SORA SOMPENG LETTER DAH;Lo;0;L;;;;;N;;;;;
+110D5;SORA SOMPENG LETTER GAH;Lo;0;L;;;;;N;;;;;
+110D6;SORA SOMPENG LETTER MAH;Lo;0;L;;;;;N;;;;;
+110D7;SORA SOMPENG LETTER NGAH;Lo;0;L;;;;;N;;;;;
+110D8;SORA SOMPENG LETTER LAH;Lo;0;L;;;;;N;;;;;
+110D9;SORA SOMPENG LETTER NAH;Lo;0;L;;;;;N;;;;;
+110DA;SORA SOMPENG LETTER VAH;Lo;0;L;;;;;N;;;;;
+110DB;SORA SOMPENG LETTER PAH;Lo;0;L;;;;;N;;;;;
+110DC;SORA SOMPENG LETTER YAH;Lo;0;L;;;;;N;;;;;
+110DD;SORA SOMPENG LETTER RAH;Lo;0;L;;;;;N;;;;;
+110DE;SORA SOMPENG LETTER HAH;Lo;0;L;;;;;N;;;;;
+110DF;SORA SOMPENG LETTER KAH;Lo;0;L;;;;;N;;;;;
+110E0;SORA SOMPENG LETTER JAH;Lo;0;L;;;;;N;;;;;
+110E1;SORA SOMPENG LETTER NYAH;Lo;0;L;;;;;N;;;;;
+110E2;SORA SOMPENG LETTER AH;Lo;0;L;;;;;N;;;;;
+110E3;SORA SOMPENG LETTER EEH;Lo;0;L;;;;;N;;;;;
+110E4;SORA SOMPENG LETTER IH;Lo;0;L;;;;;N;;;;;
+110E5;SORA SOMPENG LETTER UH;Lo;0;L;;;;;N;;;;;
+110E6;SORA SOMPENG LETTER OH;Lo;0;L;;;;;N;;;;;
+110E7;SORA SOMPENG LETTER EH;Lo;0;L;;;;;N;;;;;
+110E8;SORA SOMPENG LETTER MAE;Lo;0;L;;;;;N;;;;;
+110F0;SORA SOMPENG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+110F1;SORA SOMPENG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+110F2;SORA SOMPENG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+110F3;SORA SOMPENG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+110F4;SORA SOMPENG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+110F5;SORA SOMPENG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+110F6;SORA SOMPENG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+110F7;SORA SOMPENG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+110F8;SORA SOMPENG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+110F9;SORA SOMPENG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11100;CHAKMA SIGN CANDRABINDU;Mn;230;NSM;;;;;N;;;;;
+11101;CHAKMA SIGN ANUSVARA;Mn;230;NSM;;;;;N;;;;;
+11102;CHAKMA SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
+11103;CHAKMA LETTER AA;Lo;0;L;;;;;N;;;;;
+11104;CHAKMA LETTER I;Lo;0;L;;;;;N;;;;;
+11105;CHAKMA LETTER U;Lo;0;L;;;;;N;;;;;
+11106;CHAKMA LETTER E;Lo;0;L;;;;;N;;;;;
+11107;CHAKMA LETTER KAA;Lo;0;L;;;;;N;;;;;
+11108;CHAKMA LETTER KHAA;Lo;0;L;;;;;N;;;;;
+11109;CHAKMA LETTER GAA;Lo;0;L;;;;;N;;;;;
+1110A;CHAKMA LETTER GHAA;Lo;0;L;;;;;N;;;;;
+1110B;CHAKMA LETTER NGAA;Lo;0;L;;;;;N;;;;;
+1110C;CHAKMA LETTER CAA;Lo;0;L;;;;;N;;;;;
+1110D;CHAKMA LETTER CHAA;Lo;0;L;;;;;N;;;;;
+1110E;CHAKMA LETTER JAA;Lo;0;L;;;;;N;;;;;
+1110F;CHAKMA LETTER JHAA;Lo;0;L;;;;;N;;;;;
+11110;CHAKMA LETTER NYAA;Lo;0;L;;;;;N;;;;;
+11111;CHAKMA LETTER TTAA;Lo;0;L;;;;;N;;;;;
+11112;CHAKMA LETTER TTHAA;Lo;0;L;;;;;N;;;;;
+11113;CHAKMA LETTER DDAA;Lo;0;L;;;;;N;;;;;
+11114;CHAKMA LETTER DDHAA;Lo;0;L;;;;;N;;;;;
+11115;CHAKMA LETTER NNAA;Lo;0;L;;;;;N;;;;;
+11116;CHAKMA LETTER TAA;Lo;0;L;;;;;N;;;;;
+11117;CHAKMA LETTER THAA;Lo;0;L;;;;;N;;;;;
+11118;CHAKMA LETTER DAA;Lo;0;L;;;;;N;;;;;
+11119;CHAKMA LETTER DHAA;Lo;0;L;;;;;N;;;;;
+1111A;CHAKMA LETTER NAA;Lo;0;L;;;;;N;;;;;
+1111B;CHAKMA LETTER PAA;Lo;0;L;;;;;N;;;;;
+1111C;CHAKMA LETTER PHAA;Lo;0;L;;;;;N;;;;;
+1111D;CHAKMA LETTER BAA;Lo;0;L;;;;;N;;;;;
+1111E;CHAKMA LETTER BHAA;Lo;0;L;;;;;N;;;;;
+1111F;CHAKMA LETTER MAA;Lo;0;L;;;;;N;;;;;
+11120;CHAKMA LETTER YYAA;Lo;0;L;;;;;N;;;;;
+11121;CHAKMA LETTER YAA;Lo;0;L;;;;;N;;;;;
+11122;CHAKMA LETTER RAA;Lo;0;L;;;;;N;;;;;
+11123;CHAKMA LETTER LAA;Lo;0;L;;;;;N;;;;;
+11124;CHAKMA LETTER WAA;Lo;0;L;;;;;N;;;;;
+11125;CHAKMA LETTER SAA;Lo;0;L;;;;;N;;;;;
+11126;CHAKMA LETTER HAA;Lo;0;L;;;;;N;;;;;
+11127;CHAKMA VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
+11128;CHAKMA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11129;CHAKMA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1112A;CHAKMA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1112B;CHAKMA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1112C;CHAKMA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1112D;CHAKMA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1112E;CHAKMA VOWEL SIGN O;Mn;0;NSM;11131 11127;;;;N;;;;;
+1112F;CHAKMA VOWEL SIGN AU;Mn;0;NSM;11132 11127;;;;N;;;;;
+11130;CHAKMA VOWEL SIGN OI;Mn;0;NSM;;;;;N;;;;;
+11131;CHAKMA O MARK;Mn;0;NSM;;;;;N;;;;;
+11132;CHAKMA AU MARK;Mn;0;NSM;;;;;N;;;;;
+11133;CHAKMA VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11134;CHAKMA MAAYYAA;Mn;9;NSM;;;;;N;;;;;
+11136;CHAKMA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11137;CHAKMA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11138;CHAKMA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11139;CHAKMA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1113A;CHAKMA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1113B;CHAKMA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1113C;CHAKMA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1113D;CHAKMA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1113E;CHAKMA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1113F;CHAKMA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11140;CHAKMA SECTION MARK;Po;0;L;;;;;N;;;;;
+11141;CHAKMA DANDA;Po;0;L;;;;;N;;;;;
+11142;CHAKMA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11143;CHAKMA QUESTION MARK;Po;0;L;;;;;N;;;;;
+11150;MAHAJANI LETTER A;Lo;0;L;;;;;N;;;;;
+11151;MAHAJANI LETTER I;Lo;0;L;;;;;N;;;;;
+11152;MAHAJANI LETTER U;Lo;0;L;;;;;N;;;;;
+11153;MAHAJANI LETTER E;Lo;0;L;;;;;N;;;;;
+11154;MAHAJANI LETTER O;Lo;0;L;;;;;N;;;;;
+11155;MAHAJANI LETTER KA;Lo;0;L;;;;;N;;;;;
+11156;MAHAJANI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11157;MAHAJANI LETTER GA;Lo;0;L;;;;;N;;;;;
+11158;MAHAJANI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11159;MAHAJANI LETTER CA;Lo;0;L;;;;;N;;;;;
+1115A;MAHAJANI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1115B;MAHAJANI LETTER JA;Lo;0;L;;;;;N;;;;;
+1115C;MAHAJANI LETTER JHA;Lo;0;L;;;;;N;;;;;
+1115D;MAHAJANI LETTER NYA;Lo;0;L;;;;;N;;;;;
+1115E;MAHAJANI LETTER TTA;Lo;0;L;;;;;N;;;;;
+1115F;MAHAJANI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11160;MAHAJANI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11161;MAHAJANI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11162;MAHAJANI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11163;MAHAJANI LETTER TA;Lo;0;L;;;;;N;;;;;
+11164;MAHAJANI LETTER THA;Lo;0;L;;;;;N;;;;;
+11165;MAHAJANI LETTER DA;Lo;0;L;;;;;N;;;;;
+11166;MAHAJANI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11167;MAHAJANI LETTER NA;Lo;0;L;;;;;N;;;;;
+11168;MAHAJANI LETTER PA;Lo;0;L;;;;;N;;;;;
+11169;MAHAJANI LETTER PHA;Lo;0;L;;;;;N;;;;;
+1116A;MAHAJANI LETTER BA;Lo;0;L;;;;;N;;;;;
+1116B;MAHAJANI LETTER BHA;Lo;0;L;;;;;N;;;;;
+1116C;MAHAJANI LETTER MA;Lo;0;L;;;;;N;;;;;
+1116D;MAHAJANI LETTER RA;Lo;0;L;;;;;N;;;;;
+1116E;MAHAJANI LETTER LA;Lo;0;L;;;;;N;;;;;
+1116F;MAHAJANI LETTER VA;Lo;0;L;;;;;N;;;;;
+11170;MAHAJANI LETTER SA;Lo;0;L;;;;;N;;;;;
+11171;MAHAJANI LETTER HA;Lo;0;L;;;;;N;;;;;
+11172;MAHAJANI LETTER RRA;Lo;0;L;;;;;N;;;;;
+11173;MAHAJANI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11174;MAHAJANI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11175;MAHAJANI SECTION MARK;Po;0;L;;;;;N;;;;;
+11176;MAHAJANI LIGATURE SHRI;Lo;0;L;;;;;N;;;;;
+11180;SHARADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11181;SHARADA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11182;SHARADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11183;SHARADA LETTER A;Lo;0;L;;;;;N;;;;;
+11184;SHARADA LETTER AA;Lo;0;L;;;;;N;;;;;
+11185;SHARADA LETTER I;Lo;0;L;;;;;N;;;;;
+11186;SHARADA LETTER II;Lo;0;L;;;;;N;;;;;
+11187;SHARADA LETTER U;Lo;0;L;;;;;N;;;;;
+11188;SHARADA LETTER UU;Lo;0;L;;;;;N;;;;;
+11189;SHARADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1118A;SHARADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1118B;SHARADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1118C;SHARADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1118D;SHARADA LETTER E;Lo;0;L;;;;;N;;;;;
+1118E;SHARADA LETTER AI;Lo;0;L;;;;;N;;;;;
+1118F;SHARADA LETTER O;Lo;0;L;;;;;N;;;;;
+11190;SHARADA LETTER AU;Lo;0;L;;;;;N;;;;;
+11191;SHARADA LETTER KA;Lo;0;L;;;;;N;;;;;
+11192;SHARADA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11193;SHARADA LETTER GA;Lo;0;L;;;;;N;;;;;
+11194;SHARADA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11195;SHARADA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11196;SHARADA LETTER CA;Lo;0;L;;;;;N;;;;;
+11197;SHARADA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11198;SHARADA LETTER JA;Lo;0;L;;;;;N;;;;;
+11199;SHARADA LETTER JHA;Lo;0;L;;;;;N;;;;;
+1119A;SHARADA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1119B;SHARADA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1119C;SHARADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1119D;SHARADA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1119E;SHARADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1119F;SHARADA LETTER NNA;Lo;0;L;;;;;N;;;;;
+111A0;SHARADA LETTER TA;Lo;0;L;;;;;N;;;;;
+111A1;SHARADA LETTER THA;Lo;0;L;;;;;N;;;;;
+111A2;SHARADA LETTER DA;Lo;0;L;;;;;N;;;;;
+111A3;SHARADA LETTER DHA;Lo;0;L;;;;;N;;;;;
+111A4;SHARADA LETTER NA;Lo;0;L;;;;;N;;;;;
+111A5;SHARADA LETTER PA;Lo;0;L;;;;;N;;;;;
+111A6;SHARADA LETTER PHA;Lo;0;L;;;;;N;;;;;
+111A7;SHARADA LETTER BA;Lo;0;L;;;;;N;;;;;
+111A8;SHARADA LETTER BHA;Lo;0;L;;;;;N;;;;;
+111A9;SHARADA LETTER MA;Lo;0;L;;;;;N;;;;;
+111AA;SHARADA LETTER YA;Lo;0;L;;;;;N;;;;;
+111AB;SHARADA LETTER RA;Lo;0;L;;;;;N;;;;;
+111AC;SHARADA LETTER LA;Lo;0;L;;;;;N;;;;;
+111AD;SHARADA LETTER LLA;Lo;0;L;;;;;N;;;;;
+111AE;SHARADA LETTER VA;Lo;0;L;;;;;N;;;;;
+111AF;SHARADA LETTER SHA;Lo;0;L;;;;;N;;;;;
+111B0;SHARADA LETTER SSA;Lo;0;L;;;;;N;;;;;
+111B1;SHARADA LETTER SA;Lo;0;L;;;;;N;;;;;
+111B2;SHARADA LETTER HA;Lo;0;L;;;;;N;;;;;
+111B3;SHARADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+111B4;SHARADA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+111B5;SHARADA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+111B6;SHARADA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+111B7;SHARADA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+111B8;SHARADA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+111B9;SHARADA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+111BA;SHARADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+111BB;SHARADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+111BC;SHARADA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+111BD;SHARADA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+111BE;SHARADA VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+111BF;SHARADA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+111C0;SHARADA SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+111C1;SHARADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+111C2;SHARADA SIGN JIHVAMULIYA;Lo;0;L;;;;;N;;;;;
+111C3;SHARADA SIGN UPADHMANIYA;Lo;0;L;;;;;N;;;;;
+111C4;SHARADA OM;Lo;0;L;;;;;N;;;;;
+111C5;SHARADA DANDA;Po;0;L;;;;;N;;;;;
+111C6;SHARADA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+111C7;SHARADA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+111C8;SHARADA SEPARATOR;Po;0;L;;;;;N;;;;;
+111C9;SHARADA SANDHI MARK;Po;0;L;;;;;N;;;;;
+111CA;SHARADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+111CB;SHARADA VOWEL MODIFIER MARK;Mn;0;NSM;;;;;N;;;;;
+111CC;SHARADA EXTRA SHORT VOWEL MARK;Mn;0;NSM;;;;;N;;;;;
+111CD;SHARADA SUTRA MARK;Po;0;L;;;;;N;;;;;
+111D0;SHARADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+111D1;SHARADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+111D2;SHARADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+111D3;SHARADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+111D4;SHARADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+111D5;SHARADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+111D6;SHARADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+111D7;SHARADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+111D8;SHARADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+111D9;SHARADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+111DA;SHARADA EKAM;Lo;0;L;;;;;N;;;;;
+111DB;SHARADA SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+111DC;SHARADA HEADSTROKE;Lo;0;L;;;;;N;;;;;
+111DD;SHARADA CONTINUATION SIGN;Po;0;L;;;;;N;;;;;
+111DE;SHARADA SECTION MARK-1;Po;0;L;;;;;N;;;;;
+111DF;SHARADA SECTION MARK-2;Po;0;L;;;;;N;;;;;
+111E1;SINHALA ARCHAIC DIGIT ONE;No;0;L;;;;1;N;;;;;
+111E2;SINHALA ARCHAIC DIGIT TWO;No;0;L;;;;2;N;;;;;
+111E3;SINHALA ARCHAIC DIGIT THREE;No;0;L;;;;3;N;;;;;
+111E4;SINHALA ARCHAIC DIGIT FOUR;No;0;L;;;;4;N;;;;;
+111E5;SINHALA ARCHAIC DIGIT FIVE;No;0;L;;;;5;N;;;;;
+111E6;SINHALA ARCHAIC DIGIT SIX;No;0;L;;;;6;N;;;;;
+111E7;SINHALA ARCHAIC DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+111E8;SINHALA ARCHAIC DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+111E9;SINHALA ARCHAIC DIGIT NINE;No;0;L;;;;9;N;;;;;
+111EA;SINHALA ARCHAIC NUMBER TEN;No;0;L;;;;10;N;;;;;
+111EB;SINHALA ARCHAIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+111EC;SINHALA ARCHAIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+111ED;SINHALA ARCHAIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
+111EE;SINHALA ARCHAIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+111EF;SINHALA ARCHAIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+111F0;SINHALA ARCHAIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+111F1;SINHALA ARCHAIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+111F2;SINHALA ARCHAIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
+111F3;SINHALA ARCHAIC NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+111F4;SINHALA ARCHAIC NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+11200;KHOJKI LETTER A;Lo;0;L;;;;;N;;;;;
+11201;KHOJKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11202;KHOJKI LETTER I;Lo;0;L;;;;;N;;;;;
+11203;KHOJKI LETTER U;Lo;0;L;;;;;N;;;;;
+11204;KHOJKI LETTER E;Lo;0;L;;;;;N;;;;;
+11205;KHOJKI LETTER AI;Lo;0;L;;;;;N;;;;;
+11206;KHOJKI LETTER O;Lo;0;L;;;;;N;;;;;
+11207;KHOJKI LETTER AU;Lo;0;L;;;;;N;;;;;
+11208;KHOJKI LETTER KA;Lo;0;L;;;;;N;;;;;
+11209;KHOJKI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1120A;KHOJKI LETTER GA;Lo;0;L;;;;;N;;;;;
+1120B;KHOJKI LETTER GGA;Lo;0;L;;;;;N;;;;;
+1120C;KHOJKI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1120D;KHOJKI LETTER NGA;Lo;0;L;;;;;N;;;;;
+1120E;KHOJKI LETTER CA;Lo;0;L;;;;;N;;;;;
+1120F;KHOJKI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11210;KHOJKI LETTER JA;Lo;0;L;;;;;N;;;;;
+11211;KHOJKI LETTER JJA;Lo;0;L;;;;;N;;;;;
+11213;KHOJKI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11214;KHOJKI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11215;KHOJKI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11216;KHOJKI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11217;KHOJKI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11218;KHOJKI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11219;KHOJKI LETTER TA;Lo;0;L;;;;;N;;;;;
+1121A;KHOJKI LETTER THA;Lo;0;L;;;;;N;;;;;
+1121B;KHOJKI LETTER DA;Lo;0;L;;;;;N;;;;;
+1121C;KHOJKI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+1121D;KHOJKI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1121E;KHOJKI LETTER NA;Lo;0;L;;;;;N;;;;;
+1121F;KHOJKI LETTER PA;Lo;0;L;;;;;N;;;;;
+11220;KHOJKI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11221;KHOJKI LETTER BA;Lo;0;L;;;;;N;;;;;
+11222;KHOJKI LETTER BBA;Lo;0;L;;;;;N;;;;;
+11223;KHOJKI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11224;KHOJKI LETTER MA;Lo;0;L;;;;;N;;;;;
+11225;KHOJKI LETTER YA;Lo;0;L;;;;;N;;;;;
+11226;KHOJKI LETTER RA;Lo;0;L;;;;;N;;;;;
+11227;KHOJKI LETTER LA;Lo;0;L;;;;;N;;;;;
+11228;KHOJKI LETTER VA;Lo;0;L;;;;;N;;;;;
+11229;KHOJKI LETTER SA;Lo;0;L;;;;;N;;;;;
+1122A;KHOJKI LETTER HA;Lo;0;L;;;;;N;;;;;
+1122B;KHOJKI LETTER LLA;Lo;0;L;;;;;N;;;;;
+1122C;KHOJKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1122D;KHOJKI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1122E;KHOJKI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+1122F;KHOJKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11230;KHOJKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11231;KHOJKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11232;KHOJKI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11233;KHOJKI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11234;KHOJKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11235;KHOJKI SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+11236;KHOJKI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11237;KHOJKI SIGN SHADDA;Mn;0;NSM;;;;;N;;;;;
+11238;KHOJKI DANDA;Po;0;L;;;;;N;;;;;
+11239;KHOJKI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+1123A;KHOJKI WORD SEPARATOR;Po;0;L;;;;;N;;;;;
+1123B;KHOJKI SECTION MARK;Po;0;L;;;;;N;;;;;
+1123C;KHOJKI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
+1123D;KHOJKI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+1123E;KHOJKI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
+11280;MULTANI LETTER A;Lo;0;L;;;;;N;;;;;
+11281;MULTANI LETTER I;Lo;0;L;;;;;N;;;;;
+11282;MULTANI LETTER U;Lo;0;L;;;;;N;;;;;
+11283;MULTANI LETTER E;Lo;0;L;;;;;N;;;;;
+11284;MULTANI LETTER KA;Lo;0;L;;;;;N;;;;;
+11285;MULTANI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11286;MULTANI LETTER GA;Lo;0;L;;;;;N;;;;;
+11288;MULTANI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1128A;MULTANI LETTER CA;Lo;0;L;;;;;N;;;;;
+1128B;MULTANI LETTER CHA;Lo;0;L;;;;;N;;;;;
+1128C;MULTANI LETTER JA;Lo;0;L;;;;;N;;;;;
+1128D;MULTANI LETTER JJA;Lo;0;L;;;;;N;;;;;
+1128F;MULTANI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11290;MULTANI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11291;MULTANI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11292;MULTANI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11293;MULTANI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+11294;MULTANI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11295;MULTANI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11296;MULTANI LETTER TA;Lo;0;L;;;;;N;;;;;
+11297;MULTANI LETTER THA;Lo;0;L;;;;;N;;;;;
+11298;MULTANI LETTER DA;Lo;0;L;;;;;N;;;;;
+11299;MULTANI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1129A;MULTANI LETTER NA;Lo;0;L;;;;;N;;;;;
+1129B;MULTANI LETTER PA;Lo;0;L;;;;;N;;;;;
+1129C;MULTANI LETTER PHA;Lo;0;L;;;;;N;;;;;
+1129D;MULTANI LETTER BA;Lo;0;L;;;;;N;;;;;
+1129F;MULTANI LETTER BHA;Lo;0;L;;;;;N;;;;;
+112A0;MULTANI LETTER MA;Lo;0;L;;;;;N;;;;;
+112A1;MULTANI LETTER YA;Lo;0;L;;;;;N;;;;;
+112A2;MULTANI LETTER RA;Lo;0;L;;;;;N;;;;;
+112A3;MULTANI LETTER LA;Lo;0;L;;;;;N;;;;;
+112A4;MULTANI LETTER VA;Lo;0;L;;;;;N;;;;;
+112A5;MULTANI LETTER SA;Lo;0;L;;;;;N;;;;;
+112A6;MULTANI LETTER HA;Lo;0;L;;;;;N;;;;;
+112A7;MULTANI LETTER RRA;Lo;0;L;;;;;N;;;;;
+112A8;MULTANI LETTER RHA;Lo;0;L;;;;;N;;;;;
+112A9;MULTANI SECTION MARK;Po;0;L;;;;;N;;;;;
+112B0;KHUDAWADI LETTER A;Lo;0;L;;;;;N;;;;;
+112B1;KHUDAWADI LETTER AA;Lo;0;L;;;;;N;;;;;
+112B2;KHUDAWADI LETTER I;Lo;0;L;;;;;N;;;;;
+112B3;KHUDAWADI LETTER II;Lo;0;L;;;;;N;;;;;
+112B4;KHUDAWADI LETTER U;Lo;0;L;;;;;N;;;;;
+112B5;KHUDAWADI LETTER UU;Lo;0;L;;;;;N;;;;;
+112B6;KHUDAWADI LETTER E;Lo;0;L;;;;;N;;;;;
+112B7;KHUDAWADI LETTER AI;Lo;0;L;;;;;N;;;;;
+112B8;KHUDAWADI LETTER O;Lo;0;L;;;;;N;;;;;
+112B9;KHUDAWADI LETTER AU;Lo;0;L;;;;;N;;;;;
+112BA;KHUDAWADI LETTER KA;Lo;0;L;;;;;N;;;;;
+112BB;KHUDAWADI LETTER KHA;Lo;0;L;;;;;N;;;;;
+112BC;KHUDAWADI LETTER GA;Lo;0;L;;;;;N;;;;;
+112BD;KHUDAWADI LETTER GGA;Lo;0;L;;;;;N;;;;;
+112BE;KHUDAWADI LETTER GHA;Lo;0;L;;;;;N;;;;;
+112BF;KHUDAWADI LETTER NGA;Lo;0;L;;;;;N;;;;;
+112C0;KHUDAWADI LETTER CA;Lo;0;L;;;;;N;;;;;
+112C1;KHUDAWADI LETTER CHA;Lo;0;L;;;;;N;;;;;
+112C2;KHUDAWADI LETTER JA;Lo;0;L;;;;;N;;;;;
+112C3;KHUDAWADI LETTER JJA;Lo;0;L;;;;;N;;;;;
+112C4;KHUDAWADI LETTER JHA;Lo;0;L;;;;;N;;;;;
+112C5;KHUDAWADI LETTER NYA;Lo;0;L;;;;;N;;;;;
+112C6;KHUDAWADI LETTER TTA;Lo;0;L;;;;;N;;;;;
+112C7;KHUDAWADI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+112C8;KHUDAWADI LETTER DDA;Lo;0;L;;;;;N;;;;;
+112C9;KHUDAWADI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+112CA;KHUDAWADI LETTER RRA;Lo;0;L;;;;;N;;;;;
+112CB;KHUDAWADI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+112CC;KHUDAWADI LETTER NNA;Lo;0;L;;;;;N;;;;;
+112CD;KHUDAWADI LETTER TA;Lo;0;L;;;;;N;;;;;
+112CE;KHUDAWADI LETTER THA;Lo;0;L;;;;;N;;;;;
+112CF;KHUDAWADI LETTER DA;Lo;0;L;;;;;N;;;;;
+112D0;KHUDAWADI LETTER DHA;Lo;0;L;;;;;N;;;;;
+112D1;KHUDAWADI LETTER NA;Lo;0;L;;;;;N;;;;;
+112D2;KHUDAWADI LETTER PA;Lo;0;L;;;;;N;;;;;
+112D3;KHUDAWADI LETTER PHA;Lo;0;L;;;;;N;;;;;
+112D4;KHUDAWADI LETTER BA;Lo;0;L;;;;;N;;;;;
+112D5;KHUDAWADI LETTER BBA;Lo;0;L;;;;;N;;;;;
+112D6;KHUDAWADI LETTER BHA;Lo;0;L;;;;;N;;;;;
+112D7;KHUDAWADI LETTER MA;Lo;0;L;;;;;N;;;;;
+112D8;KHUDAWADI LETTER YA;Lo;0;L;;;;;N;;;;;
+112D9;KHUDAWADI LETTER RA;Lo;0;L;;;;;N;;;;;
+112DA;KHUDAWADI LETTER LA;Lo;0;L;;;;;N;;;;;
+112DB;KHUDAWADI LETTER VA;Lo;0;L;;;;;N;;;;;
+112DC;KHUDAWADI LETTER SHA;Lo;0;L;;;;;N;;;;;
+112DD;KHUDAWADI LETTER SA;Lo;0;L;;;;;N;;;;;
+112DE;KHUDAWADI LETTER HA;Lo;0;L;;;;;N;;;;;
+112DF;KHUDAWADI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+112E0;KHUDAWADI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+112E1;KHUDAWADI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+112E2;KHUDAWADI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+112E3;KHUDAWADI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+112E4;KHUDAWADI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+112E5;KHUDAWADI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+112E6;KHUDAWADI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+112E7;KHUDAWADI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+112E8;KHUDAWADI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+112E9;KHUDAWADI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+112EA;KHUDAWADI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+112F0;KHUDAWADI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+112F1;KHUDAWADI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+112F2;KHUDAWADI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+112F3;KHUDAWADI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+112F4;KHUDAWADI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+112F5;KHUDAWADI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+112F6;KHUDAWADI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+112F7;KHUDAWADI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+112F8;KHUDAWADI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+112F9;KHUDAWADI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11300;GRANTHA SIGN COMBINING ANUSVARA ABOVE;Mn;0;NSM;;;;;N;;;;;
+11301;GRANTHA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11302;GRANTHA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+11303;GRANTHA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11305;GRANTHA LETTER A;Lo;0;L;;;;;N;;;;;
+11306;GRANTHA LETTER AA;Lo;0;L;;;;;N;;;;;
+11307;GRANTHA LETTER I;Lo;0;L;;;;;N;;;;;
+11308;GRANTHA LETTER II;Lo;0;L;;;;;N;;;;;
+11309;GRANTHA LETTER U;Lo;0;L;;;;;N;;;;;
+1130A;GRANTHA LETTER UU;Lo;0;L;;;;;N;;;;;
+1130B;GRANTHA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1130C;GRANTHA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1130F;GRANTHA LETTER EE;Lo;0;L;;;;;N;;;;;
+11310;GRANTHA LETTER AI;Lo;0;L;;;;;N;;;;;
+11313;GRANTHA LETTER OO;Lo;0;L;;;;;N;;;;;
+11314;GRANTHA LETTER AU;Lo;0;L;;;;;N;;;;;
+11315;GRANTHA LETTER KA;Lo;0;L;;;;;N;;;;;
+11316;GRANTHA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11317;GRANTHA LETTER GA;Lo;0;L;;;;;N;;;;;
+11318;GRANTHA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11319;GRANTHA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1131A;GRANTHA LETTER CA;Lo;0;L;;;;;N;;;;;
+1131B;GRANTHA LETTER CHA;Lo;0;L;;;;;N;;;;;
+1131C;GRANTHA LETTER JA;Lo;0;L;;;;;N;;;;;
+1131D;GRANTHA LETTER JHA;Lo;0;L;;;;;N;;;;;
+1131E;GRANTHA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1131F;GRANTHA LETTER TTA;Lo;0;L;;;;;N;;;;;
+11320;GRANTHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11321;GRANTHA LETTER DDA;Lo;0;L;;;;;N;;;;;
+11322;GRANTHA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11323;GRANTHA LETTER NNA;Lo;0;L;;;;;N;;;;;
+11324;GRANTHA LETTER TA;Lo;0;L;;;;;N;;;;;
+11325;GRANTHA LETTER THA;Lo;0;L;;;;;N;;;;;
+11326;GRANTHA LETTER DA;Lo;0;L;;;;;N;;;;;
+11327;GRANTHA LETTER DHA;Lo;0;L;;;;;N;;;;;
+11328;GRANTHA LETTER NA;Lo;0;L;;;;;N;;;;;
+1132A;GRANTHA LETTER PA;Lo;0;L;;;;;N;;;;;
+1132B;GRANTHA LETTER PHA;Lo;0;L;;;;;N;;;;;
+1132C;GRANTHA LETTER BA;Lo;0;L;;;;;N;;;;;
+1132D;GRANTHA LETTER BHA;Lo;0;L;;;;;N;;;;;
+1132E;GRANTHA LETTER MA;Lo;0;L;;;;;N;;;;;
+1132F;GRANTHA LETTER YA;Lo;0;L;;;;;N;;;;;
+11330;GRANTHA LETTER RA;Lo;0;L;;;;;N;;;;;
+11332;GRANTHA LETTER LA;Lo;0;L;;;;;N;;;;;
+11333;GRANTHA LETTER LLA;Lo;0;L;;;;;N;;;;;
+11335;GRANTHA LETTER VA;Lo;0;L;;;;;N;;;;;
+11336;GRANTHA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11337;GRANTHA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11338;GRANTHA LETTER SA;Lo;0;L;;;;;N;;;;;
+11339;GRANTHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1133C;GRANTHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1133D;GRANTHA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+1133E;GRANTHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1133F;GRANTHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11340;GRANTHA VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11341;GRANTHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+11342;GRANTHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+11343;GRANTHA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+11344;GRANTHA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+11347;GRANTHA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+11348;GRANTHA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1134B;GRANTHA VOWEL SIGN OO;Mc;0;L;11347 1133E;;;;N;;;;;
+1134C;GRANTHA VOWEL SIGN AU;Mc;0;L;11347 11357;;;;N;;;;;
+1134D;GRANTHA SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+11350;GRANTHA OM;Lo;0;L;;;;;N;;;;;
+11357;GRANTHA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+1135D;GRANTHA SIGN PLUTA;Lo;0;L;;;;;N;;;;;
+1135E;GRANTHA LETTER VEDIC ANUSVARA;Lo;0;L;;;;;N;;;;;
+1135F;GRANTHA LETTER VEDIC DOUBLE ANUSVARA;Lo;0;L;;;;;N;;;;;
+11360;GRANTHA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11361;GRANTHA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+11362;GRANTHA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
+11363;GRANTHA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
+11366;COMBINING GRANTHA DIGIT ZERO;Mn;230;NSM;;;;;N;;;;;
+11367;COMBINING GRANTHA DIGIT ONE;Mn;230;NSM;;;;;N;;;;;
+11368;COMBINING GRANTHA DIGIT TWO;Mn;230;NSM;;;;;N;;;;;
+11369;COMBINING GRANTHA DIGIT THREE;Mn;230;NSM;;;;;N;;;;;
+1136A;COMBINING GRANTHA DIGIT FOUR;Mn;230;NSM;;;;;N;;;;;
+1136B;COMBINING GRANTHA DIGIT FIVE;Mn;230;NSM;;;;;N;;;;;
+1136C;COMBINING GRANTHA DIGIT SIX;Mn;230;NSM;;;;;N;;;;;
+11370;COMBINING GRANTHA LETTER A;Mn;230;NSM;;;;;N;;;;;
+11371;COMBINING GRANTHA LETTER KA;Mn;230;NSM;;;;;N;;;;;
+11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;;
+11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;;
+11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;;
+11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;;
+11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;;
+11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;;
+11403;NEWA LETTER II;Lo;0;L;;;;;N;;;;;
+11404;NEWA LETTER U;Lo;0;L;;;;;N;;;;;
+11405;NEWA LETTER UU;Lo;0;L;;;;;N;;;;;
+11406;NEWA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11407;NEWA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11408;NEWA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11409;NEWA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1140A;NEWA LETTER E;Lo;0;L;;;;;N;;;;;
+1140B;NEWA LETTER AI;Lo;0;L;;;;;N;;;;;
+1140C;NEWA LETTER O;Lo;0;L;;;;;N;;;;;
+1140D;NEWA LETTER AU;Lo;0;L;;;;;N;;;;;
+1140E;NEWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1140F;NEWA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11410;NEWA LETTER GA;Lo;0;L;;;;;N;;;;;
+11411;NEWA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11412;NEWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11413;NEWA LETTER NGHA;Lo;0;L;;;;;N;;;;;
+11414;NEWA LETTER CA;Lo;0;L;;;;;N;;;;;
+11415;NEWA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11416;NEWA LETTER JA;Lo;0;L;;;;;N;;;;;
+11417;NEWA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11418;NEWA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11419;NEWA LETTER NYHA;Lo;0;L;;;;;N;;;;;
+1141A;NEWA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1141B;NEWA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1141C;NEWA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1141D;NEWA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1141E;NEWA LETTER NNA;Lo;0;L;;;;;N;;;;;
+1141F;NEWA LETTER TA;Lo;0;L;;;;;N;;;;;
+11420;NEWA LETTER THA;Lo;0;L;;;;;N;;;;;
+11421;NEWA LETTER DA;Lo;0;L;;;;;N;;;;;
+11422;NEWA LETTER DHA;Lo;0;L;;;;;N;;;;;
+11423;NEWA LETTER NA;Lo;0;L;;;;;N;;;;;
+11424;NEWA LETTER NHA;Lo;0;L;;;;;N;;;;;
+11425;NEWA LETTER PA;Lo;0;L;;;;;N;;;;;
+11426;NEWA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11427;NEWA LETTER BA;Lo;0;L;;;;;N;;;;;
+11428;NEWA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11429;NEWA LETTER MA;Lo;0;L;;;;;N;;;;;
+1142A;NEWA LETTER MHA;Lo;0;L;;;;;N;;;;;
+1142B;NEWA LETTER YA;Lo;0;L;;;;;N;;;;;
+1142C;NEWA LETTER RA;Lo;0;L;;;;;N;;;;;
+1142D;NEWA LETTER RHA;Lo;0;L;;;;;N;;;;;
+1142E;NEWA LETTER LA;Lo;0;L;;;;;N;;;;;
+1142F;NEWA LETTER LHA;Lo;0;L;;;;;N;;;;;
+11430;NEWA LETTER WA;Lo;0;L;;;;;N;;;;;
+11431;NEWA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11432;NEWA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11433;NEWA LETTER SA;Lo;0;L;;;;;N;;;;;
+11434;NEWA LETTER HA;Lo;0;L;;;;;N;;;;;
+11435;NEWA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11436;NEWA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11437;NEWA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11438;NEWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11439;NEWA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1143A;NEWA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+1143B;NEWA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+1143C;NEWA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1143D;NEWA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+1143E;NEWA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1143F;NEWA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11440;NEWA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11441;NEWA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11442;NEWA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11443;NEWA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11444;NEWA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11445;NEWA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11446;NEWA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11447;NEWA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11448;NEWA SIGN FINAL ANUSVARA;Lo;0;L;;;;;N;;;;;
+11449;NEWA OM;Lo;0;L;;;;;N;;;;;
+1144A;NEWA SIDDHI;Lo;0;L;;;;;N;;;;;
+1144B;NEWA DANDA;Po;0;L;;;;;N;;;;;
+1144C;NEWA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+1144D;NEWA COMMA;Po;0;L;;;;;N;;;;;
+1144E;NEWA GAP FILLER;Po;0;L;;;;;N;;;;;
+1144F;NEWA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11450;NEWA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11451;NEWA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11452;NEWA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11453;NEWA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11454;NEWA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11455;NEWA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11456;NEWA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11457;NEWA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11458;NEWA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;;
+1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;;
+11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;;
+11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;;
+11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;;
+11483;TIRHUTA LETTER I;Lo;0;L;;;;;N;;;;;
+11484;TIRHUTA LETTER II;Lo;0;L;;;;;N;;;;;
+11485;TIRHUTA LETTER U;Lo;0;L;;;;;N;;;;;
+11486;TIRHUTA LETTER UU;Lo;0;L;;;;;N;;;;;
+11487;TIRHUTA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11488;TIRHUTA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11489;TIRHUTA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1148A;TIRHUTA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1148B;TIRHUTA LETTER E;Lo;0;L;;;;;N;;;;;
+1148C;TIRHUTA LETTER AI;Lo;0;L;;;;;N;;;;;
+1148D;TIRHUTA LETTER O;Lo;0;L;;;;;N;;;;;
+1148E;TIRHUTA LETTER AU;Lo;0;L;;;;;N;;;;;
+1148F;TIRHUTA LETTER KA;Lo;0;L;;;;;N;;;;;
+11490;TIRHUTA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11491;TIRHUTA LETTER GA;Lo;0;L;;;;;N;;;;;
+11492;TIRHUTA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11493;TIRHUTA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11494;TIRHUTA LETTER CA;Lo;0;L;;;;;N;;;;;
+11495;TIRHUTA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11496;TIRHUTA LETTER JA;Lo;0;L;;;;;N;;;;;
+11497;TIRHUTA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11498;TIRHUTA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11499;TIRHUTA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1149A;TIRHUTA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1149B;TIRHUTA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1149C;TIRHUTA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1149D;TIRHUTA LETTER NNA;Lo;0;L;;;;;N;;;;;
+1149E;TIRHUTA LETTER TA;Lo;0;L;;;;;N;;;;;
+1149F;TIRHUTA LETTER THA;Lo;0;L;;;;;N;;;;;
+114A0;TIRHUTA LETTER DA;Lo;0;L;;;;;N;;;;;
+114A1;TIRHUTA LETTER DHA;Lo;0;L;;;;;N;;;;;
+114A2;TIRHUTA LETTER NA;Lo;0;L;;;;;N;;;;;
+114A3;TIRHUTA LETTER PA;Lo;0;L;;;;;N;;;;;
+114A4;TIRHUTA LETTER PHA;Lo;0;L;;;;;N;;;;;
+114A5;TIRHUTA LETTER BA;Lo;0;L;;;;;N;;;;;
+114A6;TIRHUTA LETTER BHA;Lo;0;L;;;;;N;;;;;
+114A7;TIRHUTA LETTER MA;Lo;0;L;;;;;N;;;;;
+114A8;TIRHUTA LETTER YA;Lo;0;L;;;;;N;;;;;
+114A9;TIRHUTA LETTER RA;Lo;0;L;;;;;N;;;;;
+114AA;TIRHUTA LETTER LA;Lo;0;L;;;;;N;;;;;
+114AB;TIRHUTA LETTER VA;Lo;0;L;;;;;N;;;;;
+114AC;TIRHUTA LETTER SHA;Lo;0;L;;;;;N;;;;;
+114AD;TIRHUTA LETTER SSA;Lo;0;L;;;;;N;;;;;
+114AE;TIRHUTA LETTER SA;Lo;0;L;;;;;N;;;;;
+114AF;TIRHUTA LETTER HA;Lo;0;L;;;;;N;;;;;
+114B0;TIRHUTA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+114B1;TIRHUTA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+114B2;TIRHUTA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+114B3;TIRHUTA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+114B4;TIRHUTA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+114B5;TIRHUTA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+114B6;TIRHUTA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+114B7;TIRHUTA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+114B8;TIRHUTA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+114B9;TIRHUTA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+114BA;TIRHUTA VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+114BB;TIRHUTA VOWEL SIGN AI;Mc;0;L;114B9 114BA;;;;N;;;;;
+114BC;TIRHUTA VOWEL SIGN O;Mc;0;L;114B9 114B0;;;;N;;;;;
+114BD;TIRHUTA VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+114BE;TIRHUTA VOWEL SIGN AU;Mc;0;L;114B9 114BD;;;;N;;;;;
+114BF;TIRHUTA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+114C0;TIRHUTA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+114C1;TIRHUTA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+114C2;TIRHUTA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+114C3;TIRHUTA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+114C4;TIRHUTA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+114C5;TIRHUTA GVANG;Lo;0;L;;;;;N;;;;;
+114C6;TIRHUTA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+114C7;TIRHUTA OM;Lo;0;L;;;;;N;;;;;
+114D0;TIRHUTA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+114D1;TIRHUTA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+114D2;TIRHUTA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+114D3;TIRHUTA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+114D4;TIRHUTA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+114D5;TIRHUTA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+114D6;TIRHUTA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+114D7;TIRHUTA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+114D8;TIRHUTA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+114D9;TIRHUTA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11580;SIDDHAM LETTER A;Lo;0;L;;;;;N;;;;;
+11581;SIDDHAM LETTER AA;Lo;0;L;;;;;N;;;;;
+11582;SIDDHAM LETTER I;Lo;0;L;;;;;N;;;;;
+11583;SIDDHAM LETTER II;Lo;0;L;;;;;N;;;;;
+11584;SIDDHAM LETTER U;Lo;0;L;;;;;N;;;;;
+11585;SIDDHAM LETTER UU;Lo;0;L;;;;;N;;;;;
+11586;SIDDHAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11587;SIDDHAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11588;SIDDHAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11589;SIDDHAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1158A;SIDDHAM LETTER E;Lo;0;L;;;;;N;;;;;
+1158B;SIDDHAM LETTER AI;Lo;0;L;;;;;N;;;;;
+1158C;SIDDHAM LETTER O;Lo;0;L;;;;;N;;;;;
+1158D;SIDDHAM LETTER AU;Lo;0;L;;;;;N;;;;;
+1158E;SIDDHAM LETTER KA;Lo;0;L;;;;;N;;;;;
+1158F;SIDDHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+11590;SIDDHAM LETTER GA;Lo;0;L;;;;;N;;;;;
+11591;SIDDHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+11592;SIDDHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+11593;SIDDHAM LETTER CA;Lo;0;L;;;;;N;;;;;
+11594;SIDDHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+11595;SIDDHAM LETTER JA;Lo;0;L;;;;;N;;;;;
+11596;SIDDHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+11597;SIDDHAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+11598;SIDDHAM LETTER TTA;Lo;0;L;;;;;N;;;;;
+11599;SIDDHAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1159A;SIDDHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+1159B;SIDDHAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1159C;SIDDHAM LETTER NNA;Lo;0;L;;;;;N;;;;;
+1159D;SIDDHAM LETTER TA;Lo;0;L;;;;;N;;;;;
+1159E;SIDDHAM LETTER THA;Lo;0;L;;;;;N;;;;;
+1159F;SIDDHAM LETTER DA;Lo;0;L;;;;;N;;;;;
+115A0;SIDDHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+115A1;SIDDHAM LETTER NA;Lo;0;L;;;;;N;;;;;
+115A2;SIDDHAM LETTER PA;Lo;0;L;;;;;N;;;;;
+115A3;SIDDHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+115A4;SIDDHAM LETTER BA;Lo;0;L;;;;;N;;;;;
+115A5;SIDDHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+115A6;SIDDHAM LETTER MA;Lo;0;L;;;;;N;;;;;
+115A7;SIDDHAM LETTER YA;Lo;0;L;;;;;N;;;;;
+115A8;SIDDHAM LETTER RA;Lo;0;L;;;;;N;;;;;
+115A9;SIDDHAM LETTER LA;Lo;0;L;;;;;N;;;;;
+115AA;SIDDHAM LETTER VA;Lo;0;L;;;;;N;;;;;
+115AB;SIDDHAM LETTER SHA;Lo;0;L;;;;;N;;;;;
+115AC;SIDDHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+115AD;SIDDHAM LETTER SA;Lo;0;L;;;;;N;;;;;
+115AE;SIDDHAM LETTER HA;Lo;0;L;;;;;N;;;;;
+115AF;SIDDHAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+115B0;SIDDHAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+115B1;SIDDHAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+115B2;SIDDHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+115B3;SIDDHAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+115B4;SIDDHAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+115B5;SIDDHAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+115B8;SIDDHAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+115B9;SIDDHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+115BA;SIDDHAM VOWEL SIGN O;Mc;0;L;115B8 115AF;;;;N;;;;;
+115BB;SIDDHAM VOWEL SIGN AU;Mc;0;L;115B9 115AF;;;;N;;;;;
+115BC;SIDDHAM SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+115BD;SIDDHAM SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+115BE;SIDDHAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+115BF;SIDDHAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+115C0;SIDDHAM SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+115C1;SIDDHAM SIGN SIDDHAM;Po;0;L;;;;;N;;;;;
+115C2;SIDDHAM DANDA;Po;0;L;;;;;N;;;;;
+115C3;SIDDHAM DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+115C4;SIDDHAM SEPARATOR DOT;Po;0;L;;;;;N;;;;;
+115C5;SIDDHAM SEPARATOR BAR;Po;0;L;;;;;N;;;;;
+115C6;SIDDHAM REPETITION MARK-1;Po;0;L;;;;;N;;;;;
+115C7;SIDDHAM REPETITION MARK-2;Po;0;L;;;;;N;;;;;
+115C8;SIDDHAM REPETITION MARK-3;Po;0;L;;;;;N;;;;;
+115C9;SIDDHAM END OF TEXT MARK;Po;0;L;;;;;N;;;;;
+115CA;SIDDHAM SECTION MARK WITH TRIDENT AND U-SHAPED ORNAMENTS;Po;0;L;;;;;N;;;;;
+115CB;SIDDHAM SECTION MARK WITH TRIDENT AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;;
+115CC;SIDDHAM SECTION MARK WITH RAYS AND DOTTED CRESCENTS;Po;0;L;;;;;N;;;;;
+115CD;SIDDHAM SECTION MARK WITH RAYS AND DOTTED DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115CE;SIDDHAM SECTION MARK WITH RAYS AND DOTTED TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115CF;SIDDHAM SECTION MARK DOUBLE RING;Po;0;L;;;;;N;;;;;
+115D0;SIDDHAM SECTION MARK DOUBLE RING WITH RAYS;Po;0;L;;;;;N;;;;;
+115D1;SIDDHAM SECTION MARK WITH DOUBLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D2;SIDDHAM SECTION MARK WITH TRIPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D3;SIDDHAM SECTION MARK WITH QUADRUPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D4;SIDDHAM SECTION MARK WITH SEPTUPLE CRESCENTS;Po;0;L;;;;;N;;;;;
+115D5;SIDDHAM SECTION MARK WITH CIRCLES AND RAYS;Po;0;L;;;;;N;;;;;
+115D6;SIDDHAM SECTION MARK WITH CIRCLES AND TWO ENCLOSURES;Po;0;L;;;;;N;;;;;
+115D7;SIDDHAM SECTION MARK WITH CIRCLES AND FOUR ENCLOSURES;Po;0;L;;;;;N;;;;;
+115D8;SIDDHAM LETTER THREE-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;;
+115D9;SIDDHAM LETTER TWO-CIRCLE ALTERNATE I;Lo;0;L;;;;;N;;;;;
+115DA;SIDDHAM LETTER TWO-CIRCLE ALTERNATE II;Lo;0;L;;;;;N;;;;;
+115DB;SIDDHAM LETTER ALTERNATE U;Lo;0;L;;;;;N;;;;;
+115DC;SIDDHAM VOWEL SIGN ALTERNATE U;Mn;0;NSM;;;;;N;;;;;
+115DD;SIDDHAM VOWEL SIGN ALTERNATE UU;Mn;0;NSM;;;;;N;;;;;
+11600;MODI LETTER A;Lo;0;L;;;;;N;;;;;
+11601;MODI LETTER AA;Lo;0;L;;;;;N;;;;;
+11602;MODI LETTER I;Lo;0;L;;;;;N;;;;;
+11603;MODI LETTER II;Lo;0;L;;;;;N;;;;;
+11604;MODI LETTER U;Lo;0;L;;;;;N;;;;;
+11605;MODI LETTER UU;Lo;0;L;;;;;N;;;;;
+11606;MODI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11607;MODI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11608;MODI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11609;MODI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1160A;MODI LETTER E;Lo;0;L;;;;;N;;;;;
+1160B;MODI LETTER AI;Lo;0;L;;;;;N;;;;;
+1160C;MODI LETTER O;Lo;0;L;;;;;N;;;;;
+1160D;MODI LETTER AU;Lo;0;L;;;;;N;;;;;
+1160E;MODI LETTER KA;Lo;0;L;;;;;N;;;;;
+1160F;MODI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11610;MODI LETTER GA;Lo;0;L;;;;;N;;;;;
+11611;MODI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11612;MODI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11613;MODI LETTER CA;Lo;0;L;;;;;N;;;;;
+11614;MODI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11615;MODI LETTER JA;Lo;0;L;;;;;N;;;;;
+11616;MODI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11617;MODI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11618;MODI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11619;MODI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1161A;MODI LETTER DDA;Lo;0;L;;;;;N;;;;;
+1161B;MODI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1161C;MODI LETTER NNA;Lo;0;L;;;;;N;;;;;
+1161D;MODI LETTER TA;Lo;0;L;;;;;N;;;;;
+1161E;MODI LETTER THA;Lo;0;L;;;;;N;;;;;
+1161F;MODI LETTER DA;Lo;0;L;;;;;N;;;;;
+11620;MODI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11621;MODI LETTER NA;Lo;0;L;;;;;N;;;;;
+11622;MODI LETTER PA;Lo;0;L;;;;;N;;;;;
+11623;MODI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11624;MODI LETTER BA;Lo;0;L;;;;;N;;;;;
+11625;MODI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11626;MODI LETTER MA;Lo;0;L;;;;;N;;;;;
+11627;MODI LETTER YA;Lo;0;L;;;;;N;;;;;
+11628;MODI LETTER RA;Lo;0;L;;;;;N;;;;;
+11629;MODI LETTER LA;Lo;0;L;;;;;N;;;;;
+1162A;MODI LETTER VA;Lo;0;L;;;;;N;;;;;
+1162B;MODI LETTER SHA;Lo;0;L;;;;;N;;;;;
+1162C;MODI LETTER SSA;Lo;0;L;;;;;N;;;;;
+1162D;MODI LETTER SA;Lo;0;L;;;;;N;;;;;
+1162E;MODI LETTER HA;Lo;0;L;;;;;N;;;;;
+1162F;MODI LETTER LLA;Lo;0;L;;;;;N;;;;;
+11630;MODI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11631;MODI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11632;MODI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11633;MODI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11634;MODI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11635;MODI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11636;MODI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11637;MODI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11638;MODI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+11639;MODI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1163A;MODI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1163B;MODI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1163C;MODI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+1163D;MODI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1163E;MODI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+1163F;MODI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11640;MODI SIGN ARDHACANDRA;Mn;0;NSM;;;;;N;;;;;
+11641;MODI DANDA;Po;0;L;;;;;N;;;;;
+11642;MODI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11643;MODI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11644;MODI SIGN HUVA;Lo;0;L;;;;;N;;;;;
+11650;MODI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11651;MODI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11652;MODI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11653;MODI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11654;MODI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11655;MODI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11656;MODI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11657;MODI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11658;MODI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11659;MODI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11660;MONGOLIAN BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11661;MONGOLIAN ROTATED BIRGA;Po;0;ON;;;;;N;;;;;
+11662;MONGOLIAN DOUBLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11663;MONGOLIAN TRIPLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11664;MONGOLIAN BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11665;MONGOLIAN ROTATED BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11666;MONGOLIAN ROTATED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11667;MONGOLIAN INVERTED BIRGA;Po;0;ON;;;;;N;;;;;
+11668;MONGOLIAN INVERTED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11669;MONGOLIAN SWIRL BIRGA;Po;0;ON;;;;;N;;;;;
+1166A;MONGOLIAN SWIRL BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166B;MONGOLIAN SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166C;MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11680;TAKRI LETTER A;Lo;0;L;;;;;N;;;;;
+11681;TAKRI LETTER AA;Lo;0;L;;;;;N;;;;;
+11682;TAKRI LETTER I;Lo;0;L;;;;;N;;;;;
+11683;TAKRI LETTER II;Lo;0;L;;;;;N;;;;;
+11684;TAKRI LETTER U;Lo;0;L;;;;;N;;;;;
+11685;TAKRI LETTER UU;Lo;0;L;;;;;N;;;;;
+11686;TAKRI LETTER E;Lo;0;L;;;;;N;;;;;
+11687;TAKRI LETTER AI;Lo;0;L;;;;;N;;;;;
+11688;TAKRI LETTER O;Lo;0;L;;;;;N;;;;;
+11689;TAKRI LETTER AU;Lo;0;L;;;;;N;;;;;
+1168A;TAKRI LETTER KA;Lo;0;L;;;;;N;;;;;
+1168B;TAKRI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1168C;TAKRI LETTER GA;Lo;0;L;;;;;N;;;;;
+1168D;TAKRI LETTER GHA;Lo;0;L;;;;;N;;;;;
+1168E;TAKRI LETTER NGA;Lo;0;L;;;;;N;;;;;
+1168F;TAKRI LETTER CA;Lo;0;L;;;;;N;;;;;
+11690;TAKRI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11691;TAKRI LETTER JA;Lo;0;L;;;;;N;;;;;
+11692;TAKRI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11693;TAKRI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11694;TAKRI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11695;TAKRI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11696;TAKRI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11697;TAKRI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11698;TAKRI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11699;TAKRI LETTER TA;Lo;0;L;;;;;N;;;;;
+1169A;TAKRI LETTER THA;Lo;0;L;;;;;N;;;;;
+1169B;TAKRI LETTER DA;Lo;0;L;;;;;N;;;;;
+1169C;TAKRI LETTER DHA;Lo;0;L;;;;;N;;;;;
+1169D;TAKRI LETTER NA;Lo;0;L;;;;;N;;;;;
+1169E;TAKRI LETTER PA;Lo;0;L;;;;;N;;;;;
+1169F;TAKRI LETTER PHA;Lo;0;L;;;;;N;;;;;
+116A0;TAKRI LETTER BA;Lo;0;L;;;;;N;;;;;
+116A1;TAKRI LETTER BHA;Lo;0;L;;;;;N;;;;;
+116A2;TAKRI LETTER MA;Lo;0;L;;;;;N;;;;;
+116A3;TAKRI LETTER YA;Lo;0;L;;;;;N;;;;;
+116A4;TAKRI LETTER RA;Lo;0;L;;;;;N;;;;;
+116A5;TAKRI LETTER LA;Lo;0;L;;;;;N;;;;;
+116A6;TAKRI LETTER VA;Lo;0;L;;;;;N;;;;;
+116A7;TAKRI LETTER SHA;Lo;0;L;;;;;N;;;;;
+116A8;TAKRI LETTER SA;Lo;0;L;;;;;N;;;;;
+116A9;TAKRI LETTER HA;Lo;0;L;;;;;N;;;;;
+116AA;TAKRI LETTER RRA;Lo;0;L;;;;;N;;;;;
+116AB;TAKRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+116AC;TAKRI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+116AD;TAKRI VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+116AE;TAKRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+116AF;TAKRI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+116B0;TAKRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+116B1;TAKRI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+116B2;TAKRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+116B3;TAKRI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+116B4;TAKRI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+116B5;TAKRI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+116B6;TAKRI SIGN VIRAMA;Mc;9;L;;;;;N;;;;;
+116B7;TAKRI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+116C0;TAKRI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+116C1;TAKRI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+116C2;TAKRI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+116C3;TAKRI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+116C4;TAKRI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+116C5;TAKRI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+116C6;TAKRI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+116C7;TAKRI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+116C8;TAKRI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+116C9;TAKRI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11700;AHOM LETTER KA;Lo;0;L;;;;;N;;;;;
+11701;AHOM LETTER KHA;Lo;0;L;;;;;N;;;;;
+11702;AHOM LETTER NGA;Lo;0;L;;;;;N;;;;;
+11703;AHOM LETTER NA;Lo;0;L;;;;;N;;;;;
+11704;AHOM LETTER TA;Lo;0;L;;;;;N;;;;;
+11705;AHOM LETTER ALTERNATE TA;Lo;0;L;;;;;N;;;;;
+11706;AHOM LETTER PA;Lo;0;L;;;;;N;;;;;
+11707;AHOM LETTER PHA;Lo;0;L;;;;;N;;;;;
+11708;AHOM LETTER BA;Lo;0;L;;;;;N;;;;;
+11709;AHOM LETTER MA;Lo;0;L;;;;;N;;;;;
+1170A;AHOM LETTER JA;Lo;0;L;;;;;N;;;;;
+1170B;AHOM LETTER CHA;Lo;0;L;;;;;N;;;;;
+1170C;AHOM LETTER THA;Lo;0;L;;;;;N;;;;;
+1170D;AHOM LETTER RA;Lo;0;L;;;;;N;;;;;
+1170E;AHOM LETTER LA;Lo;0;L;;;;;N;;;;;
+1170F;AHOM LETTER SA;Lo;0;L;;;;;N;;;;;
+11710;AHOM LETTER NYA;Lo;0;L;;;;;N;;;;;
+11711;AHOM LETTER HA;Lo;0;L;;;;;N;;;;;
+11712;AHOM LETTER A;Lo;0;L;;;;;N;;;;;
+11713;AHOM LETTER DA;Lo;0;L;;;;;N;;;;;
+11714;AHOM LETTER DHA;Lo;0;L;;;;;N;;;;;
+11715;AHOM LETTER GA;Lo;0;L;;;;;N;;;;;
+11716;AHOM LETTER ALTERNATE GA;Lo;0;L;;;;;N;;;;;
+11717;AHOM LETTER GHA;Lo;0;L;;;;;N;;;;;
+11718;AHOM LETTER BHA;Lo;0;L;;;;;N;;;;;
+11719;AHOM LETTER JHA;Lo;0;L;;;;;N;;;;;
+1171D;AHOM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1171E;AHOM CONSONANT SIGN MEDIAL RA;Mn;0;NSM;;;;;N;;;;;
+1171F;AHOM CONSONANT SIGN MEDIAL LIGATING RA;Mn;0;NSM;;;;;N;;;;;
+11720;AHOM VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+11721;AHOM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11722;AHOM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11723;AHOM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11724;AHOM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11725;AHOM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11726;AHOM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+11727;AHOM VOWEL SIGN AW;Mn;0;NSM;;;;;N;;;;;
+11728;AHOM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11729;AHOM VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1172A;AHOM VOWEL SIGN AM;Mn;0;NSM;;;;;N;;;;;
+1172B;AHOM SIGN KILLER;Mn;9;NSM;;;;;N;;;;;
+11730;AHOM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11731;AHOM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11732;AHOM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11733;AHOM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11734;AHOM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11735;AHOM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11736;AHOM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11737;AHOM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11738;AHOM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11739;AHOM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1173A;AHOM NUMBER TEN;No;0;L;;;;10;N;;;;;
+1173B;AHOM NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+1173C;AHOM SIGN SMALL SECTION;Po;0;L;;;;;N;;;;;
+1173D;AHOM SIGN SECTION;Po;0;L;;;;;N;;;;;
+1173E;AHOM SIGN RULAI;Po;0;L;;;;;N;;;;;
+1173F;AHOM SYMBOL VI;So;0;L;;;;;N;;;;;
+118A0;WARANG CITI CAPITAL LETTER NGAA;Lu;0;L;;;;;N;;;;118C0;
+118A1;WARANG CITI CAPITAL LETTER A;Lu;0;L;;;;;N;;;;118C1;
+118A2;WARANG CITI CAPITAL LETTER WI;Lu;0;L;;;;;N;;;;118C2;
+118A3;WARANG CITI CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;118C3;
+118A4;WARANG CITI CAPITAL LETTER YA;Lu;0;L;;;;;N;;;;118C4;
+118A5;WARANG CITI CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;118C5;
+118A6;WARANG CITI CAPITAL LETTER II;Lu;0;L;;;;;N;;;;118C6;
+118A7;WARANG CITI CAPITAL LETTER UU;Lu;0;L;;;;;N;;;;118C7;
+118A8;WARANG CITI CAPITAL LETTER E;Lu;0;L;;;;;N;;;;118C8;
+118A9;WARANG CITI CAPITAL LETTER O;Lu;0;L;;;;;N;;;;118C9;
+118AA;WARANG CITI CAPITAL LETTER ANG;Lu;0;L;;;;;N;;;;118CA;
+118AB;WARANG CITI CAPITAL LETTER GA;Lu;0;L;;;;;N;;;;118CB;
+118AC;WARANG CITI CAPITAL LETTER KO;Lu;0;L;;;;;N;;;;118CC;
+118AD;WARANG CITI CAPITAL LETTER ENY;Lu;0;L;;;;;N;;;;118CD;
+118AE;WARANG CITI CAPITAL LETTER YUJ;Lu;0;L;;;;;N;;;;118CE;
+118AF;WARANG CITI CAPITAL LETTER UC;Lu;0;L;;;;;N;;;;118CF;
+118B0;WARANG CITI CAPITAL LETTER ENN;Lu;0;L;;;;;N;;;;118D0;
+118B1;WARANG CITI CAPITAL LETTER ODD;Lu;0;L;;;;;N;;;;118D1;
+118B2;WARANG CITI CAPITAL LETTER TTE;Lu;0;L;;;;;N;;;;118D2;
+118B3;WARANG CITI CAPITAL LETTER NUNG;Lu;0;L;;;;;N;;;;118D3;
+118B4;WARANG CITI CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;118D4;
+118B5;WARANG CITI CAPITAL LETTER AT;Lu;0;L;;;;;N;;;;118D5;
+118B6;WARANG CITI CAPITAL LETTER AM;Lu;0;L;;;;;N;;;;118D6;
+118B7;WARANG CITI CAPITAL LETTER BU;Lu;0;L;;;;;N;;;;118D7;
+118B8;WARANG CITI CAPITAL LETTER PU;Lu;0;L;;;;;N;;;;118D8;
+118B9;WARANG CITI CAPITAL LETTER HIYO;Lu;0;L;;;;;N;;;;118D9;
+118BA;WARANG CITI CAPITAL LETTER HOLO;Lu;0;L;;;;;N;;;;118DA;
+118BB;WARANG CITI CAPITAL LETTER HORR;Lu;0;L;;;;;N;;;;118DB;
+118BC;WARANG CITI CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;118DC;
+118BD;WARANG CITI CAPITAL LETTER SSUU;Lu;0;L;;;;;N;;;;118DD;
+118BE;WARANG CITI CAPITAL LETTER SII;Lu;0;L;;;;;N;;;;118DE;
+118BF;WARANG CITI CAPITAL LETTER VIYO;Lu;0;L;;;;;N;;;;118DF;
+118C0;WARANG CITI SMALL LETTER NGAA;Ll;0;L;;;;;N;;;118A0;;118A0
+118C1;WARANG CITI SMALL LETTER A;Ll;0;L;;;;;N;;;118A1;;118A1
+118C2;WARANG CITI SMALL LETTER WI;Ll;0;L;;;;;N;;;118A2;;118A2
+118C3;WARANG CITI SMALL LETTER YU;Ll;0;L;;;;;N;;;118A3;;118A3
+118C4;WARANG CITI SMALL LETTER YA;Ll;0;L;;;;;N;;;118A4;;118A4
+118C5;WARANG CITI SMALL LETTER YO;Ll;0;L;;;;;N;;;118A5;;118A5
+118C6;WARANG CITI SMALL LETTER II;Ll;0;L;;;;;N;;;118A6;;118A6
+118C7;WARANG CITI SMALL LETTER UU;Ll;0;L;;;;;N;;;118A7;;118A7
+118C8;WARANG CITI SMALL LETTER E;Ll;0;L;;;;;N;;;118A8;;118A8
+118C9;WARANG CITI SMALL LETTER O;Ll;0;L;;;;;N;;;118A9;;118A9
+118CA;WARANG CITI SMALL LETTER ANG;Ll;0;L;;;;;N;;;118AA;;118AA
+118CB;WARANG CITI SMALL LETTER GA;Ll;0;L;;;;;N;;;118AB;;118AB
+118CC;WARANG CITI SMALL LETTER KO;Ll;0;L;;;;;N;;;118AC;;118AC
+118CD;WARANG CITI SMALL LETTER ENY;Ll;0;L;;;;;N;;;118AD;;118AD
+118CE;WARANG CITI SMALL LETTER YUJ;Ll;0;L;;;;;N;;;118AE;;118AE
+118CF;WARANG CITI SMALL LETTER UC;Ll;0;L;;;;;N;;;118AF;;118AF
+118D0;WARANG CITI SMALL LETTER ENN;Ll;0;L;;;;;N;;;118B0;;118B0
+118D1;WARANG CITI SMALL LETTER ODD;Ll;0;L;;;;;N;;;118B1;;118B1
+118D2;WARANG CITI SMALL LETTER TTE;Ll;0;L;;;;;N;;;118B2;;118B2
+118D3;WARANG CITI SMALL LETTER NUNG;Ll;0;L;;;;;N;;;118B3;;118B3
+118D4;WARANG CITI SMALL LETTER DA;Ll;0;L;;;;;N;;;118B4;;118B4
+118D5;WARANG CITI SMALL LETTER AT;Ll;0;L;;;;;N;;;118B5;;118B5
+118D6;WARANG CITI SMALL LETTER AM;Ll;0;L;;;;;N;;;118B6;;118B6
+118D7;WARANG CITI SMALL LETTER BU;Ll;0;L;;;;;N;;;118B7;;118B7
+118D8;WARANG CITI SMALL LETTER PU;Ll;0;L;;;;;N;;;118B8;;118B8
+118D9;WARANG CITI SMALL LETTER HIYO;Ll;0;L;;;;;N;;;118B9;;118B9
+118DA;WARANG CITI SMALL LETTER HOLO;Ll;0;L;;;;;N;;;118BA;;118BA
+118DB;WARANG CITI SMALL LETTER HORR;Ll;0;L;;;;;N;;;118BB;;118BB
+118DC;WARANG CITI SMALL LETTER HAR;Ll;0;L;;;;;N;;;118BC;;118BC
+118DD;WARANG CITI SMALL LETTER SSUU;Ll;0;L;;;;;N;;;118BD;;118BD
+118DE;WARANG CITI SMALL LETTER SII;Ll;0;L;;;;;N;;;118BE;;118BE
+118DF;WARANG CITI SMALL LETTER VIYO;Ll;0;L;;;;;N;;;118BF;;118BF
+118E0;WARANG CITI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+118E1;WARANG CITI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+118E2;WARANG CITI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+118E3;WARANG CITI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+118E4;WARANG CITI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+118E5;WARANG CITI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+118E6;WARANG CITI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+118E7;WARANG CITI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+118E8;WARANG CITI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+118E9;WARANG CITI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+118EA;WARANG CITI NUMBER TEN;No;0;L;;;;10;N;;;;;
+118EB;WARANG CITI NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+118EC;WARANG CITI NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+118ED;WARANG CITI NUMBER FORTY;No;0;L;;;;40;N;;;;;
+118EE;WARANG CITI NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+118EF;WARANG CITI NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+118F0;WARANG CITI NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+118F1;WARANG CITI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+118F2;WARANG CITI NUMBER NINETY;No;0;L;;;;90;N;;;;;
+118FF;WARANG CITI OM;Lo;0;L;;;;;N;;;;;
+11AC0;PAU CIN HAU LETTER PA;Lo;0;L;;;;;N;;;;;
+11AC1;PAU CIN HAU LETTER KA;Lo;0;L;;;;;N;;;;;
+11AC2;PAU CIN HAU LETTER LA;Lo;0;L;;;;;N;;;;;
+11AC3;PAU CIN HAU LETTER MA;Lo;0;L;;;;;N;;;;;
+11AC4;PAU CIN HAU LETTER DA;Lo;0;L;;;;;N;;;;;
+11AC5;PAU CIN HAU LETTER ZA;Lo;0;L;;;;;N;;;;;
+11AC6;PAU CIN HAU LETTER VA;Lo;0;L;;;;;N;;;;;
+11AC7;PAU CIN HAU LETTER NGA;Lo;0;L;;;;;N;;;;;
+11AC8;PAU CIN HAU LETTER HA;Lo;0;L;;;;;N;;;;;
+11AC9;PAU CIN HAU LETTER GA;Lo;0;L;;;;;N;;;;;
+11ACA;PAU CIN HAU LETTER KHA;Lo;0;L;;;;;N;;;;;
+11ACB;PAU CIN HAU LETTER SA;Lo;0;L;;;;;N;;;;;
+11ACC;PAU CIN HAU LETTER BA;Lo;0;L;;;;;N;;;;;
+11ACD;PAU CIN HAU LETTER CA;Lo;0;L;;;;;N;;;;;
+11ACE;PAU CIN HAU LETTER TA;Lo;0;L;;;;;N;;;;;
+11ACF;PAU CIN HAU LETTER THA;Lo;0;L;;;;;N;;;;;
+11AD0;PAU CIN HAU LETTER NA;Lo;0;L;;;;;N;;;;;
+11AD1;PAU CIN HAU LETTER PHA;Lo;0;L;;;;;N;;;;;
+11AD2;PAU CIN HAU LETTER RA;Lo;0;L;;;;;N;;;;;
+11AD3;PAU CIN HAU LETTER FA;Lo;0;L;;;;;N;;;;;
+11AD4;PAU CIN HAU LETTER CHA;Lo;0;L;;;;;N;;;;;
+11AD5;PAU CIN HAU LETTER A;Lo;0;L;;;;;N;;;;;
+11AD6;PAU CIN HAU LETTER E;Lo;0;L;;;;;N;;;;;
+11AD7;PAU CIN HAU LETTER I;Lo;0;L;;;;;N;;;;;
+11AD8;PAU CIN HAU LETTER O;Lo;0;L;;;;;N;;;;;
+11AD9;PAU CIN HAU LETTER U;Lo;0;L;;;;;N;;;;;
+11ADA;PAU CIN HAU LETTER UA;Lo;0;L;;;;;N;;;;;
+11ADB;PAU CIN HAU LETTER IA;Lo;0;L;;;;;N;;;;;
+11ADC;PAU CIN HAU LETTER FINAL P;Lo;0;L;;;;;N;;;;;
+11ADD;PAU CIN HAU LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+11ADE;PAU CIN HAU LETTER FINAL T;Lo;0;L;;;;;N;;;;;
+11ADF;PAU CIN HAU LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+11AE0;PAU CIN HAU LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+11AE1;PAU CIN HAU LETTER FINAL L;Lo;0;L;;;;;N;;;;;
+11AE2;PAU CIN HAU LETTER FINAL W;Lo;0;L;;;;;N;;;;;
+11AE3;PAU CIN HAU LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+11AE4;PAU CIN HAU LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
+11AE5;PAU CIN HAU RISING TONE LONG;Lo;0;L;;;;;N;;;;;
+11AE6;PAU CIN HAU RISING TONE;Lo;0;L;;;;;N;;;;;
+11AE7;PAU CIN HAU SANDHI GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+11AE8;PAU CIN HAU RISING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AE9;PAU CIN HAU RISING TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AEA;PAU CIN HAU SANDHI GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
+11AEB;PAU CIN HAU SANDHI TONE LONG;Lo;0;L;;;;;N;;;;;
+11AEC;PAU CIN HAU SANDHI TONE;Lo;0;L;;;;;N;;;;;
+11AED;PAU CIN HAU SANDHI TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AEE;PAU CIN HAU SANDHI TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AEF;PAU CIN HAU MID-LEVEL TONE;Lo;0;L;;;;;N;;;;;
+11AF0;PAU CIN HAU GLOTTAL STOP VARIANT;Lo;0;L;;;;;N;;;;;
+11AF1;PAU CIN HAU MID-LEVEL TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AF2;PAU CIN HAU MID-LEVEL TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AF3;PAU CIN HAU LOW-FALLING TONE LONG;Lo;0;L;;;;;N;;;;;
+11AF4;PAU CIN HAU LOW-FALLING TONE;Lo;0;L;;;;;N;;;;;
+11AF5;PAU CIN HAU GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+11AF6;PAU CIN HAU LOW-FALLING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
+11AF7;PAU CIN HAU LOW-FALLING TONE FINAL;Lo;0;L;;;;;N;;;;;
+11AF8;PAU CIN HAU GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
+11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;;
+11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;;
+11C03;BHAIKSUKI LETTER II;Lo;0;L;;;;;N;;;;;
+11C04;BHAIKSUKI LETTER U;Lo;0;L;;;;;N;;;;;
+11C05;BHAIKSUKI LETTER UU;Lo;0;L;;;;;N;;;;;
+11C06;BHAIKSUKI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11C07;BHAIKSUKI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11C08;BHAIKSUKI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11C0A;BHAIKSUKI LETTER E;Lo;0;L;;;;;N;;;;;
+11C0B;BHAIKSUKI LETTER AI;Lo;0;L;;;;;N;;;;;
+11C0C;BHAIKSUKI LETTER O;Lo;0;L;;;;;N;;;;;
+11C0D;BHAIKSUKI LETTER AU;Lo;0;L;;;;;N;;;;;
+11C0E;BHAIKSUKI LETTER KA;Lo;0;L;;;;;N;;;;;
+11C0F;BHAIKSUKI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C10;BHAIKSUKI LETTER GA;Lo;0;L;;;;;N;;;;;
+11C11;BHAIKSUKI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11C12;BHAIKSUKI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C13;BHAIKSUKI LETTER CA;Lo;0;L;;;;;N;;;;;
+11C14;BHAIKSUKI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C15;BHAIKSUKI LETTER JA;Lo;0;L;;;;;N;;;;;
+11C16;BHAIKSUKI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11C17;BHAIKSUKI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C18;BHAIKSUKI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11C19;BHAIKSUKI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11C1A;BHAIKSUKI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11C1B;BHAIKSUKI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11C1C;BHAIKSUKI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11C1D;BHAIKSUKI LETTER TA;Lo;0;L;;;;;N;;;;;
+11C1E;BHAIKSUKI LETTER THA;Lo;0;L;;;;;N;;;;;
+11C1F;BHAIKSUKI LETTER DA;Lo;0;L;;;;;N;;;;;
+11C20;BHAIKSUKI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11C21;BHAIKSUKI LETTER NA;Lo;0;L;;;;;N;;;;;
+11C22;BHAIKSUKI LETTER PA;Lo;0;L;;;;;N;;;;;
+11C23;BHAIKSUKI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C24;BHAIKSUKI LETTER BA;Lo;0;L;;;;;N;;;;;
+11C25;BHAIKSUKI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11C26;BHAIKSUKI LETTER MA;Lo;0;L;;;;;N;;;;;
+11C27;BHAIKSUKI LETTER YA;Lo;0;L;;;;;N;;;;;
+11C28;BHAIKSUKI LETTER RA;Lo;0;L;;;;;N;;;;;
+11C29;BHAIKSUKI LETTER LA;Lo;0;L;;;;;N;;;;;
+11C2A;BHAIKSUKI LETTER VA;Lo;0;L;;;;;N;;;;;
+11C2B;BHAIKSUKI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C2C;BHAIKSUKI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11C2D;BHAIKSUKI LETTER SA;Lo;0;L;;;;;N;;;;;
+11C2E;BHAIKSUKI LETTER HA;Lo;0;L;;;;;N;;;;;
+11C2F;BHAIKSUKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11C30;BHAIKSUKI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11C31;BHAIKSUKI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11C32;BHAIKSUKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11C33;BHAIKSUKI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11C38;BHAIKSUKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11C39;BHAIKSUKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11C3A;BHAIKSUKI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11C3B;BHAIKSUKI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11C3F;BHAIKSUKI SIGN VIRAMA;Mn;9;L;;;;;N;;;;;
+11C40;BHAIKSUKI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11C41;BHAIKSUKI DANDA;Po;0;L;;;;;N;;;;;
+11C42;BHAIKSUKI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11C43;BHAIKSUKI WORD SEPARATOR;Po;0;L;;;;;N;;;;;
+11C44;BHAIKSUKI GAP FILLER-1;Po;0;L;;;;;N;;;;;
+11C45;BHAIKSUKI GAP FILLER-2;Po;0;L;;;;;N;;;;;
+11C50;BHAIKSUKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11C51;BHAIKSUKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11C52;BHAIKSUKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11C53;BHAIKSUKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11C54;BHAIKSUKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11C55;BHAIKSUKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11C56;BHAIKSUKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11C57;BHAIKSUKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11C58;BHAIKSUKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11C59;BHAIKSUKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11C5A;BHAIKSUKI NUMBER ONE;No;0;L;;;;1;N;;;;;
+11C5B;BHAIKSUKI NUMBER TWO;No;0;L;;;;2;N;;;;;
+11C5C;BHAIKSUKI NUMBER THREE;No;0;L;;;;3;N;;;;;
+11C5D;BHAIKSUKI NUMBER FOUR;No;0;L;;;;4;N;;;;;
+11C5E;BHAIKSUKI NUMBER FIVE;No;0;L;;;;5;N;;;;;
+11C5F;BHAIKSUKI NUMBER SIX;No;0;L;;;;6;N;;;;;
+11C60;BHAIKSUKI NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+11C61;BHAIKSUKI NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+11C62;BHAIKSUKI NUMBER NINE;No;0;L;;;;9;N;;;;;
+11C63;BHAIKSUKI NUMBER TEN;No;0;L;;;;10;N;;;;;
+11C64;BHAIKSUKI NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+11C65;BHAIKSUKI NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+11C66;BHAIKSUKI NUMBER FORTY;No;0;L;;;;40;N;;;;;
+11C67;BHAIKSUKI NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+11C68;BHAIKSUKI NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+11C69;BHAIKSUKI NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+11C6A;BHAIKSUKI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+11C6B;BHAIKSUKI NUMBER NINETY;No;0;L;;;;90;N;;;;;
+11C6C;BHAIKSUKI HUNDREDS UNIT MARK;No;0;L;;;;100;N;;;;;
+11C70;MARCHEN HEAD MARK;Po;0;L;;;;;N;;;;;
+11C71;MARCHEN MARK SHAD;Po;0;L;;;;;N;;;;;
+11C72;MARCHEN LETTER KA;Lo;0;L;;;;;N;;;;;
+11C73;MARCHEN LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C74;MARCHEN LETTER GA;Lo;0;L;;;;;N;;;;;
+11C75;MARCHEN LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C76;MARCHEN LETTER CA;Lo;0;L;;;;;N;;;;;
+11C77;MARCHEN LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C78;MARCHEN LETTER JA;Lo;0;L;;;;;N;;;;;
+11C79;MARCHEN LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C7A;MARCHEN LETTER TA;Lo;0;L;;;;;N;;;;;
+11C7B;MARCHEN LETTER THA;Lo;0;L;;;;;N;;;;;
+11C7C;MARCHEN LETTER DA;Lo;0;L;;;;;N;;;;;
+11C7D;MARCHEN LETTER NA;Lo;0;L;;;;;N;;;;;
+11C7E;MARCHEN LETTER PA;Lo;0;L;;;;;N;;;;;
+11C7F;MARCHEN LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C80;MARCHEN LETTER BA;Lo;0;L;;;;;N;;;;;
+11C81;MARCHEN LETTER MA;Lo;0;L;;;;;N;;;;;
+11C82;MARCHEN LETTER TSA;Lo;0;L;;;;;N;;;;;
+11C83;MARCHEN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11C84;MARCHEN LETTER DZA;Lo;0;L;;;;;N;;;;;
+11C85;MARCHEN LETTER WA;Lo;0;L;;;;;N;;;;;
+11C86;MARCHEN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11C87;MARCHEN LETTER ZA;Lo;0;L;;;;;N;;;;;
+11C88;MARCHEN LETTER -A;Lo;0;L;;;;;N;;;;;
+11C89;MARCHEN LETTER YA;Lo;0;L;;;;;N;;;;;
+11C8A;MARCHEN LETTER RA;Lo;0;L;;;;;N;;;;;
+11C8B;MARCHEN LETTER LA;Lo;0;L;;;;;N;;;;;
+11C8C;MARCHEN LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C8D;MARCHEN LETTER SA;Lo;0;L;;;;;N;;;;;
+11C8E;MARCHEN LETTER HA;Lo;0;L;;;;;N;;;;;
+11C8F;MARCHEN LETTER A;Lo;0;L;;;;;N;;;;;
+11C92;MARCHEN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+11C93;MARCHEN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+11C94;MARCHEN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+11C95;MARCHEN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+11C96;MARCHEN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+11C97;MARCHEN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+11C98;MARCHEN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+11C99;MARCHEN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+11C9A;MARCHEN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+11C9B;MARCHEN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+11C9C;MARCHEN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+11C9D;MARCHEN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+11C9E;MARCHEN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+11C9F;MARCHEN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+11CA0;MARCHEN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+11CA1;MARCHEN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+11CA2;MARCHEN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+11CA3;MARCHEN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+11CA4;MARCHEN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+11CA5;MARCHEN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
+11CA6;MARCHEN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+11CA7;MARCHEN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+11CA9;MARCHEN SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+11CAA;MARCHEN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11CAB;MARCHEN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11CAC;MARCHEN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+11CAD;MARCHEN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+11CAE;MARCHEN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+11CAF;MARCHEN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+11CB0;MARCHEN VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11CB1;MARCHEN VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11CB2;MARCHEN VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11CB3;MARCHEN VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
+12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
+12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
+12003;CUNEIFORM SIGN A TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12004;CUNEIFORM SIGN A TIMES HA;Lo;0;L;;;;;N;;;;;
+12005;CUNEIFORM SIGN A TIMES IGI;Lo;0;L;;;;;N;;;;;
+12006;CUNEIFORM SIGN A TIMES LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+12007;CUNEIFORM SIGN A TIMES MUSH;Lo;0;L;;;;;N;;;;;
+12008;CUNEIFORM SIGN A TIMES SAG;Lo;0;L;;;;;N;;;;;
+12009;CUNEIFORM SIGN A2;Lo;0;L;;;;;N;;;;;
+1200A;CUNEIFORM SIGN AB;Lo;0;L;;;;;N;;;;;
+1200B;CUNEIFORM SIGN AB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1200C;CUNEIFORM SIGN AB TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+1200D;CUNEIFORM SIGN AB TIMES GAL;Lo;0;L;;;;;N;;;;;
+1200E;CUNEIFORM SIGN AB TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1200F;CUNEIFORM SIGN AB TIMES HA;Lo;0;L;;;;;N;;;;;
+12010;CUNEIFORM SIGN AB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12011;CUNEIFORM SIGN AB TIMES IMIN;Lo;0;L;;;;;N;;;;;
+12012;CUNEIFORM SIGN AB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+12013;CUNEIFORM SIGN AB TIMES SHESH;Lo;0;L;;;;;N;;;;;
+12014;CUNEIFORM SIGN AB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12015;CUNEIFORM SIGN AB GUNU;Lo;0;L;;;;;N;;;;;
+12016;CUNEIFORM SIGN AB2;Lo;0;L;;;;;N;;;;;
+12017;CUNEIFORM SIGN AB2 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+12018;CUNEIFORM SIGN AB2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12019;CUNEIFORM SIGN AB2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1201A;CUNEIFORM SIGN AB2 TIMES SHA3;Lo;0;L;;;;;N;;;;;
+1201B;CUNEIFORM SIGN AB2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1201C;CUNEIFORM SIGN AD;Lo;0;L;;;;;N;;;;;
+1201D;CUNEIFORM SIGN AK;Lo;0;L;;;;;N;;;;;
+1201E;CUNEIFORM SIGN AK TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+1201F;CUNEIFORM SIGN AK TIMES SHITA PLUS GISH;Lo;0;L;;;;;N;;;;;
+12020;CUNEIFORM SIGN AL;Lo;0;L;;;;;N;;;;;
+12021;CUNEIFORM SIGN AL TIMES AL;Lo;0;L;;;;;N;;;;;
+12022;CUNEIFORM SIGN AL TIMES DIM2;Lo;0;L;;;;;N;;;;;
+12023;CUNEIFORM SIGN AL TIMES GISH;Lo;0;L;;;;;N;;;;;
+12024;CUNEIFORM SIGN AL TIMES HA;Lo;0;L;;;;;N;;;;;
+12025;CUNEIFORM SIGN AL TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12026;CUNEIFORM SIGN AL TIMES KI;Lo;0;L;;;;;N;;;;;
+12027;CUNEIFORM SIGN AL TIMES SHE;Lo;0;L;;;;;N;;;;;
+12028;CUNEIFORM SIGN AL TIMES USH;Lo;0;L;;;;;N;;;;;
+12029;CUNEIFORM SIGN ALAN;Lo;0;L;;;;;N;;;;;
+1202A;CUNEIFORM SIGN ALEPH;Lo;0;L;;;;;N;;;;;
+1202B;CUNEIFORM SIGN AMAR;Lo;0;L;;;;;N;;;;;
+1202C;CUNEIFORM SIGN AMAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+1202D;CUNEIFORM SIGN AN;Lo;0;L;;;;;N;;;;;
+1202E;CUNEIFORM SIGN AN OVER AN;Lo;0;L;;;;;N;;;;;
+1202F;CUNEIFORM SIGN AN THREE TIMES;Lo;0;L;;;;;N;;;;;
+12030;CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA;Lo;0;L;;;;;N;;;;;
+12031;CUNEIFORM SIGN AN PLUS NAGA SQUARED;Lo;0;L;;;;;N;;;;;
+12032;CUNEIFORM SIGN ANSHE;Lo;0;L;;;;;N;;;;;
+12033;CUNEIFORM SIGN APIN;Lo;0;L;;;;;N;;;;;
+12034;CUNEIFORM SIGN ARAD;Lo;0;L;;;;;N;;;;;
+12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;;
+12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;;
+12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;;N;;;;;
+12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;;
+1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;;
+1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203D;CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203E;CUNEIFORM SIGN ASH2;Lo;0;L;;;;;N;;;;;
+1203F;CUNEIFORM SIGN ASHGAB;Lo;0;L;;;;;N;;;;;
+12040;CUNEIFORM SIGN BA;Lo;0;L;;;;;N;;;;;
+12041;CUNEIFORM SIGN BAD;Lo;0;L;;;;;N;;;;;
+12042;CUNEIFORM SIGN BAG3;Lo;0;L;;;;;N;;;;;
+12043;CUNEIFORM SIGN BAHAR2;Lo;0;L;;;;;N;;;;;
+12044;CUNEIFORM SIGN BAL;Lo;0;L;;;;;N;;;;;
+12045;CUNEIFORM SIGN BAL OVER BAL;Lo;0;L;;;;;N;;;;;
+12046;CUNEIFORM SIGN BALAG;Lo;0;L;;;;;N;;;;;
+12047;CUNEIFORM SIGN BAR;Lo;0;L;;;;;N;;;;;
+12048;CUNEIFORM SIGN BARA2;Lo;0;L;;;;;N;;;;;
+12049;CUNEIFORM SIGN BI;Lo;0;L;;;;;N;;;;;
+1204A;CUNEIFORM SIGN BI TIMES A;Lo;0;L;;;;;N;;;;;
+1204B;CUNEIFORM SIGN BI TIMES GAR;Lo;0;L;;;;;N;;;;;
+1204C;CUNEIFORM SIGN BI TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1204D;CUNEIFORM SIGN BU;Lo;0;L;;;;;N;;;;;
+1204E;CUNEIFORM SIGN BU OVER BU AB;Lo;0;L;;;;;N;;;;;
+1204F;CUNEIFORM SIGN BU OVER BU UN;Lo;0;L;;;;;N;;;;;
+12050;CUNEIFORM SIGN BU CROSSING BU;Lo;0;L;;;;;N;;;;;
+12051;CUNEIFORM SIGN BULUG;Lo;0;L;;;;;N;;;;;
+12052;CUNEIFORM SIGN BULUG OVER BULUG;Lo;0;L;;;;;N;;;;;
+12053;CUNEIFORM SIGN BUR;Lo;0;L;;;;;N;;;;;
+12054;CUNEIFORM SIGN BUR2;Lo;0;L;;;;;N;;;;;
+12055;CUNEIFORM SIGN DA;Lo;0;L;;;;;N;;;;;
+12056;CUNEIFORM SIGN DAG;Lo;0;L;;;;;N;;;;;
+12057;CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH;Lo;0;L;;;;;N;;;;;
+12058;CUNEIFORM SIGN DAG KISIM5 TIMES AMAR;Lo;0;L;;;;;N;;;;;
+12059;CUNEIFORM SIGN DAG KISIM5 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1205A;CUNEIFORM SIGN DAG KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+1205B;CUNEIFORM SIGN DAG KISIM5 TIMES GA;Lo;0;L;;;;;N;;;;;
+1205C;CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH;Lo;0;L;;;;;N;;;;;
+1205D;CUNEIFORM SIGN DAG KISIM5 TIMES GI;Lo;0;L;;;;;N;;;;;
+1205E;CUNEIFORM SIGN DAG KISIM5 TIMES GIR2;Lo;0;L;;;;;N;;;;;
+1205F;CUNEIFORM SIGN DAG KISIM5 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12060;CUNEIFORM SIGN DAG KISIM5 TIMES HA;Lo;0;L;;;;;N;;;;;
+12061;CUNEIFORM SIGN DAG KISIM5 TIMES IR;Lo;0;L;;;;;N;;;;;
+12062;CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU;Lo;0;L;;;;;N;;;;;
+12063;CUNEIFORM SIGN DAG KISIM5 TIMES KAK;Lo;0;L;;;;;N;;;;;
+12064;CUNEIFORM SIGN DAG KISIM5 TIMES LA;Lo;0;L;;;;;N;;;;;
+12065;CUNEIFORM SIGN DAG KISIM5 TIMES LU;Lo;0;L;;;;;N;;;;;
+12066;CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2;Lo;0;L;;;;;N;;;;;
+12067;CUNEIFORM SIGN DAG KISIM5 TIMES LUM;Lo;0;L;;;;;N;;;;;
+12068;CUNEIFORM SIGN DAG KISIM5 TIMES NE;Lo;0;L;;;;;N;;;;;
+12069;CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
+1206A;CUNEIFORM SIGN DAG KISIM5 TIMES SI;Lo;0;L;;;;;N;;;;;
+1206B;CUNEIFORM SIGN DAG KISIM5 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1206C;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2;Lo;0;L;;;;;N;;;;;
+1206D;CUNEIFORM SIGN DAG KISIM5 TIMES USH;Lo;0;L;;;;;N;;;;;
+1206E;CUNEIFORM SIGN DAM;Lo;0;L;;;;;N;;;;;
+1206F;CUNEIFORM SIGN DAR;Lo;0;L;;;;;N;;;;;
+12070;CUNEIFORM SIGN DARA3;Lo;0;L;;;;;N;;;;;
+12071;CUNEIFORM SIGN DARA4;Lo;0;L;;;;;N;;;;;
+12072;CUNEIFORM SIGN DI;Lo;0;L;;;;;N;;;;;
+12073;CUNEIFORM SIGN DIB;Lo;0;L;;;;;N;;;;;
+12074;CUNEIFORM SIGN DIM;Lo;0;L;;;;;N;;;;;
+12075;CUNEIFORM SIGN DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;;
+12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;;
+12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;;
+12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;;N;;;;;
+1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;;
+1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;;
+1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;;
+1207D;CUNEIFORM SIGN DU SHESHIG;Lo;0;L;;;;;N;;;;;
+1207E;CUNEIFORM SIGN DUB;Lo;0;L;;;;;N;;;;;
+1207F;CUNEIFORM SIGN DUB TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12080;CUNEIFORM SIGN DUB2;Lo;0;L;;;;;N;;;;;
+12081;CUNEIFORM SIGN DUG;Lo;0;L;;;;;N;;;;;
+12082;CUNEIFORM SIGN DUGUD;Lo;0;L;;;;;N;;;;;
+12083;CUNEIFORM SIGN DUH;Lo;0;L;;;;;N;;;;;
+12084;CUNEIFORM SIGN DUN;Lo;0;L;;;;;N;;;;;
+12085;CUNEIFORM SIGN DUN3;Lo;0;L;;;;;N;;;;;
+12086;CUNEIFORM SIGN DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+12087;CUNEIFORM SIGN DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+12088;CUNEIFORM SIGN DUN4;Lo;0;L;;;;;N;;;;;
+12089;CUNEIFORM SIGN DUR2;Lo;0;L;;;;;N;;;;;
+1208A;CUNEIFORM SIGN E;Lo;0;L;;;;;N;;;;;
+1208B;CUNEIFORM SIGN E TIMES PAP;Lo;0;L;;;;;N;;;;;
+1208C;CUNEIFORM SIGN E OVER E NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1208D;CUNEIFORM SIGN E2;Lo;0;L;;;;;N;;;;;
+1208E;CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA;Lo;0;L;;;;;N;;;;;
+1208F;CUNEIFORM SIGN E2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+12090;CUNEIFORM SIGN E2 TIMES MI;Lo;0;L;;;;;N;;;;;
+12091;CUNEIFORM SIGN E2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+12092;CUNEIFORM SIGN E2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+12093;CUNEIFORM SIGN E2 TIMES U;Lo;0;L;;;;;N;;;;;
+12094;CUNEIFORM SIGN EDIN;Lo;0;L;;;;;N;;;;;
+12095;CUNEIFORM SIGN EGIR;Lo;0;L;;;;;N;;;;;
+12096;CUNEIFORM SIGN EL;Lo;0;L;;;;;N;;;;;
+12097;CUNEIFORM SIGN EN;Lo;0;L;;;;;N;;;;;
+12098;CUNEIFORM SIGN EN TIMES GAN2;Lo;0;L;;;;;N;;;;;
+12099;CUNEIFORM SIGN EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1209A;CUNEIFORM SIGN EN TIMES ME;Lo;0;L;;;;;N;;;;;
+1209B;CUNEIFORM SIGN EN CROSSING EN;Lo;0;L;;;;;N;;;;;
+1209C;CUNEIFORM SIGN EN OPPOSING EN;Lo;0;L;;;;;N;;;;;
+1209D;CUNEIFORM SIGN EN SQUARED;Lo;0;L;;;;;N;;;;;
+1209E;CUNEIFORM SIGN EREN;Lo;0;L;;;;;N;;;;;
+1209F;CUNEIFORM SIGN ERIN2;Lo;0;L;;;;;N;;;;;
+120A0;CUNEIFORM SIGN ESH2;Lo;0;L;;;;;N;;;;;
+120A1;CUNEIFORM SIGN EZEN;Lo;0;L;;;;;N;;;;;
+120A2;CUNEIFORM SIGN EZEN TIMES A;Lo;0;L;;;;;N;;;;;
+120A3;CUNEIFORM SIGN EZEN TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+120A4;CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120A5;CUNEIFORM SIGN EZEN TIMES AN;Lo;0;L;;;;;N;;;;;
+120A6;CUNEIFORM SIGN EZEN TIMES BAD;Lo;0;L;;;;;N;;;;;
+120A7;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+120A8;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+120A9;CUNEIFORM SIGN EZEN TIMES HA;Lo;0;L;;;;;N;;;;;
+120AA;CUNEIFORM SIGN EZEN TIMES HA GUNU;Lo;0;L;;;;;N;;;;;
+120AB;CUNEIFORM SIGN EZEN TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120AC;CUNEIFORM SIGN EZEN TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120AD;CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED;Lo;0;L;;;;;N;;;;;
+120AE;CUNEIFORM SIGN EZEN TIMES KU3;Lo;0;L;;;;;N;;;;;
+120AF;CUNEIFORM SIGN EZEN TIMES LA;Lo;0;L;;;;;N;;;;;
+120B0;CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120B1;CUNEIFORM SIGN EZEN TIMES LI;Lo;0;L;;;;;N;;;;;
+120B2;CUNEIFORM SIGN EZEN TIMES LU;Lo;0;L;;;;;N;;;;;
+120B3;CUNEIFORM SIGN EZEN TIMES U2;Lo;0;L;;;;;N;;;;;
+120B4;CUNEIFORM SIGN EZEN TIMES UD;Lo;0;L;;;;;N;;;;;
+120B5;CUNEIFORM SIGN GA;Lo;0;L;;;;;N;;;;;
+120B6;CUNEIFORM SIGN GA GUNU;Lo;0;L;;;;;N;;;;;
+120B7;CUNEIFORM SIGN GA2;Lo;0;L;;;;;N;;;;;
+120B8;CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+120B9;CUNEIFORM SIGN GA2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+120BA;CUNEIFORM SIGN GA2 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+120BB;CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB;Lo;0;L;;;;;N;;;;;
+120BC;CUNEIFORM SIGN GA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+120BD;CUNEIFORM SIGN GA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+120BE;CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL;Lo;0;L;;;;;N;;;;;
+120BF;CUNEIFORM SIGN GA2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+120C0;CUNEIFORM SIGN GA2 TIMES BAR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C1;CUNEIFORM SIGN GA2 TIMES BUR;Lo;0;L;;;;;N;;;;;
+120C2;CUNEIFORM SIGN GA2 TIMES BUR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C3;CUNEIFORM SIGN GA2 TIMES DA;Lo;0;L;;;;;N;;;;;
+120C4;CUNEIFORM SIGN GA2 TIMES DI;Lo;0;L;;;;;N;;;;;
+120C5;CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+120C6;CUNEIFORM SIGN GA2 TIMES DUB;Lo;0;L;;;;;N;;;;;
+120C7;CUNEIFORM SIGN GA2 TIMES EL;Lo;0;L;;;;;N;;;;;
+120C8;CUNEIFORM SIGN GA2 TIMES EL PLUS LA;Lo;0;L;;;;;N;;;;;
+120C9;CUNEIFORM SIGN GA2 TIMES EN;Lo;0;L;;;;;N;;;;;
+120CA;CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CB;CUNEIFORM SIGN GA2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CC;CUNEIFORM SIGN GA2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+120CD;CUNEIFORM SIGN GA2 TIMES GI;Lo;0;L;;;;;N;;;;;
+120CE;CUNEIFORM SIGN GA2 TIMES GI4;Lo;0;L;;;;;N;;;;;
+120CF;CUNEIFORM SIGN GA2 TIMES GI4 PLUS A;Lo;0;L;;;;;N;;;;;
+120D0;CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU;Lo;0;L;;;;;N;;;;;
+120D1;CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2;Lo;0;L;;;;;N;;;;;
+120D2;CUNEIFORM SIGN GA2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+120D3;CUNEIFORM SIGN GA2 TIMES HAL PLUS LA;Lo;0;L;;;;;N;;;;;
+120D4;CUNEIFORM SIGN GA2 TIMES HI PLUS LI;Lo;0;L;;;;;N;;;;;
+120D5;CUNEIFORM SIGN GA2 TIMES HUB2;Lo;0;L;;;;;N;;;;;
+120D6;CUNEIFORM SIGN GA2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120D7;CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH;Lo;0;L;;;;;N;;;;;
+120D8;CUNEIFORM SIGN GA2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+120D9;CUNEIFORM SIGN GA2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120DA;CUNEIFORM SIGN GA2 TIMES KID;Lo;0;L;;;;;N;;;;;
+120DB;CUNEIFORM SIGN GA2 TIMES KID PLUS LAL;Lo;0;L;;;;;N;;;;;
+120DC;CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN;Lo;0;L;;;;;N;;;;;
+120DD;CUNEIFORM SIGN GA2 TIMES LA;Lo;0;L;;;;;N;;;;;
+120DE;CUNEIFORM SIGN GA2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+120DF;CUNEIFORM SIGN GA2 TIMES MI;Lo;0;L;;;;;N;;;;;
+120E0;CUNEIFORM SIGN GA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+120E1;CUNEIFORM SIGN GA2 TIMES NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+120E2;CUNEIFORM SIGN GA2 TIMES PA;Lo;0;L;;;;;N;;;;;
+120E3;CUNEIFORM SIGN GA2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+120E4;CUNEIFORM SIGN GA2 TIMES SAR;Lo;0;L;;;;;N;;;;;
+120E5;CUNEIFORM SIGN GA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+120E6;CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR;Lo;0;L;;;;;N;;;;;
+120E7;CUNEIFORM SIGN GA2 TIMES SHID;Lo;0;L;;;;;N;;;;;
+120E8;CUNEIFORM SIGN GA2 TIMES SUM;Lo;0;L;;;;;N;;;;;
+120E9;CUNEIFORM SIGN GA2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+120EA;CUNEIFORM SIGN GA2 TIMES U;Lo;0;L;;;;;N;;;;;
+120EB;CUNEIFORM SIGN GA2 TIMES UD;Lo;0;L;;;;;N;;;;;
+120EC;CUNEIFORM SIGN GA2 TIMES UD PLUS DU;Lo;0;L;;;;;N;;;;;
+120ED;CUNEIFORM SIGN GA2 OVER GA2;Lo;0;L;;;;;N;;;;;
+120EE;CUNEIFORM SIGN GABA;Lo;0;L;;;;;N;;;;;
+120EF;CUNEIFORM SIGN GABA CROSSING GABA;Lo;0;L;;;;;N;;;;;
+120F0;CUNEIFORM SIGN GAD;Lo;0;L;;;;;N;;;;;
+120F1;CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F2;CUNEIFORM SIGN GAL;Lo;0;L;;;;;N;;;;;
+120F3;CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F4;CUNEIFORM SIGN GALAM;Lo;0;L;;;;;N;;;;;
+120F5;CUNEIFORM SIGN GAM;Lo;0;L;;;;;N;;;;;
+120F6;CUNEIFORM SIGN GAN;Lo;0;L;;;;;N;;;;;
+120F7;CUNEIFORM SIGN GAN2;Lo;0;L;;;;;N;;;;;
+120F8;CUNEIFORM SIGN GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120F9;CUNEIFORM SIGN GAN2 OVER GAN2;Lo;0;L;;;;;N;;;;;
+120FA;CUNEIFORM SIGN GAN2 CROSSING GAN2;Lo;0;L;;;;;N;;;;;
+120FB;CUNEIFORM SIGN GAR;Lo;0;L;;;;;N;;;;;
+120FC;CUNEIFORM SIGN GAR3;Lo;0;L;;;;;N;;;;;
+120FD;CUNEIFORM SIGN GASHAN;Lo;0;L;;;;;N;;;;;
+120FE;CUNEIFORM SIGN GESHTIN;Lo;0;L;;;;;N;;;;;
+120FF;CUNEIFORM SIGN GESHTIN TIMES KUR;Lo;0;L;;;;;N;;;;;
+12100;CUNEIFORM SIGN GI;Lo;0;L;;;;;N;;;;;
+12101;CUNEIFORM SIGN GI TIMES E;Lo;0;L;;;;;N;;;;;
+12102;CUNEIFORM SIGN GI TIMES U;Lo;0;L;;;;;N;;;;;
+12103;CUNEIFORM SIGN GI CROSSING GI;Lo;0;L;;;;;N;;;;;
+12104;CUNEIFORM SIGN GI4;Lo;0;L;;;;;N;;;;;
+12105;CUNEIFORM SIGN GI4 OVER GI4;Lo;0;L;;;;;N;;;;;
+12106;CUNEIFORM SIGN GI4 CROSSING GI4;Lo;0;L;;;;;N;;;;;
+12107;CUNEIFORM SIGN GIDIM;Lo;0;L;;;;;N;;;;;
+12108;CUNEIFORM SIGN GIR2;Lo;0;L;;;;;N;;;;;
+12109;CUNEIFORM SIGN GIR2 GUNU;Lo;0;L;;;;;N;;;;;
+1210A;CUNEIFORM SIGN GIR3;Lo;0;L;;;;;N;;;;;
+1210B;CUNEIFORM SIGN GIR3 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210C;CUNEIFORM SIGN GIR3 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1210D;CUNEIFORM SIGN GIR3 TIMES IGI;Lo;0;L;;;;;N;;;;;
+1210E;CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210F;CUNEIFORM SIGN GIR3 TIMES PA;Lo;0;L;;;;;N;;;;;
+12110;CUNEIFORM SIGN GISAL;Lo;0;L;;;;;N;;;;;
+12111;CUNEIFORM SIGN GISH;Lo;0;L;;;;;N;;;;;
+12112;CUNEIFORM SIGN GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+12113;CUNEIFORM SIGN GISH TIMES BAD;Lo;0;L;;;;;N;;;;;
+12114;CUNEIFORM SIGN GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12115;CUNEIFORM SIGN GISH TENU;Lo;0;L;;;;;N;;;;;
+12116;CUNEIFORM SIGN GU;Lo;0;L;;;;;N;;;;;
+12117;CUNEIFORM SIGN GU CROSSING GU;Lo;0;L;;;;;N;;;;;
+12118;CUNEIFORM SIGN GU2;Lo;0;L;;;;;N;;;;;
+12119;CUNEIFORM SIGN GU2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+1211A;CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1211B;CUNEIFORM SIGN GU2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1211C;CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2;Lo;0;L;;;;;N;;;;;
+1211D;CUNEIFORM SIGN GU2 GUNU;Lo;0;L;;;;;N;;;;;
+1211E;CUNEIFORM SIGN GUD;Lo;0;L;;;;;N;;;;;
+1211F;CUNEIFORM SIGN GUD TIMES A PLUS KUR;Lo;0;L;;;;;N;;;;;
+12120;CUNEIFORM SIGN GUD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12121;CUNEIFORM SIGN GUD OVER GUD LUGAL;Lo;0;L;;;;;N;;;;;
+12122;CUNEIFORM SIGN GUL;Lo;0;L;;;;;N;;;;;
+12123;CUNEIFORM SIGN GUM;Lo;0;L;;;;;N;;;;;
+12124;CUNEIFORM SIGN GUM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12125;CUNEIFORM SIGN GUR;Lo;0;L;;;;;N;;;;;
+12126;CUNEIFORM SIGN GUR7;Lo;0;L;;;;;N;;;;;
+12127;CUNEIFORM SIGN GURUN;Lo;0;L;;;;;N;;;;;
+12128;CUNEIFORM SIGN GURUSH;Lo;0;L;;;;;N;;;;;
+12129;CUNEIFORM SIGN HA;Lo;0;L;;;;;N;;;;;
+1212A;CUNEIFORM SIGN HA TENU;Lo;0;L;;;;;N;;;;;
+1212B;CUNEIFORM SIGN HA GUNU;Lo;0;L;;;;;N;;;;;
+1212C;CUNEIFORM SIGN HAL;Lo;0;L;;;;;N;;;;;
+1212D;CUNEIFORM SIGN HI;Lo;0;L;;;;;N;;;;;
+1212E;CUNEIFORM SIGN HI TIMES ASH;Lo;0;L;;;;;N;;;;;
+1212F;CUNEIFORM SIGN HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+12130;CUNEIFORM SIGN HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12131;CUNEIFORM SIGN HI TIMES DISH;Lo;0;L;;;;;N;;;;;
+12132;CUNEIFORM SIGN HI TIMES GAD;Lo;0;L;;;;;N;;;;;
+12133;CUNEIFORM SIGN HI TIMES KIN;Lo;0;L;;;;;N;;;;;
+12134;CUNEIFORM SIGN HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+12135;CUNEIFORM SIGN HI TIMES SHE;Lo;0;L;;;;;N;;;;;
+12136;CUNEIFORM SIGN HI TIMES U;Lo;0;L;;;;;N;;;;;
+12137;CUNEIFORM SIGN HU;Lo;0;L;;;;;N;;;;;
+12138;CUNEIFORM SIGN HUB2;Lo;0;L;;;;;N;;;;;
+12139;CUNEIFORM SIGN HUB2 TIMES AN;Lo;0;L;;;;;N;;;;;
+1213A;CUNEIFORM SIGN HUB2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+1213B;CUNEIFORM SIGN HUB2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1213C;CUNEIFORM SIGN HUB2 TIMES LISH;Lo;0;L;;;;;N;;;;;
+1213D;CUNEIFORM SIGN HUB2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1213E;CUNEIFORM SIGN HUL2;Lo;0;L;;;;;N;;;;;
+1213F;CUNEIFORM SIGN I;Lo;0;L;;;;;N;;;;;
+12140;CUNEIFORM SIGN I A;Lo;0;L;;;;;N;;;;;
+12141;CUNEIFORM SIGN IB;Lo;0;L;;;;;N;;;;;
+12142;CUNEIFORM SIGN IDIM;Lo;0;L;;;;;N;;;;;
+12143;CUNEIFORM SIGN IDIM OVER IDIM BUR;Lo;0;L;;;;;N;;;;;
+12144;CUNEIFORM SIGN IDIM OVER IDIM SQUARED;Lo;0;L;;;;;N;;;;;
+12145;CUNEIFORM SIGN IG;Lo;0;L;;;;;N;;;;;
+12146;CUNEIFORM SIGN IGI;Lo;0;L;;;;;N;;;;;
+12147;CUNEIFORM SIGN IGI DIB;Lo;0;L;;;;;N;;;;;
+12148;CUNEIFORM SIGN IGI RI;Lo;0;L;;;;;N;;;;;
+12149;CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD;Lo;0;L;;;;;N;;;;;
+1214A;CUNEIFORM SIGN IGI GUNU;Lo;0;L;;;;;N;;;;;
+1214B;CUNEIFORM SIGN IL;Lo;0;L;;;;;N;;;;;
+1214C;CUNEIFORM SIGN IL TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1214D;CUNEIFORM SIGN IL2;Lo;0;L;;;;;N;;;;;
+1214E;CUNEIFORM SIGN IM;Lo;0;L;;;;;N;;;;;
+1214F;CUNEIFORM SIGN IM TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12150;CUNEIFORM SIGN IM CROSSING IM;Lo;0;L;;;;;N;;;;;
+12151;CUNEIFORM SIGN IM OPPOSING IM;Lo;0;L;;;;;N;;;;;
+12152;CUNEIFORM SIGN IM SQUARED;Lo;0;L;;;;;N;;;;;
+12153;CUNEIFORM SIGN IMIN;Lo;0;L;;;;;N;;;;;
+12154;CUNEIFORM SIGN IN;Lo;0;L;;;;;N;;;;;
+12155;CUNEIFORM SIGN IR;Lo;0;L;;;;;N;;;;;
+12156;CUNEIFORM SIGN ISH;Lo;0;L;;;;;N;;;;;
+12157;CUNEIFORM SIGN KA;Lo;0;L;;;;;N;;;;;
+12158;CUNEIFORM SIGN KA TIMES A;Lo;0;L;;;;;N;;;;;
+12159;CUNEIFORM SIGN KA TIMES AD;Lo;0;L;;;;;N;;;;;
+1215A;CUNEIFORM SIGN KA TIMES AD PLUS KU3;Lo;0;L;;;;;N;;;;;
+1215B;CUNEIFORM SIGN KA TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1215C;CUNEIFORM SIGN KA TIMES BAD;Lo;0;L;;;;;N;;;;;
+1215D;CUNEIFORM SIGN KA TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1215E;CUNEIFORM SIGN KA TIMES BAR;Lo;0;L;;;;;N;;;;;
+1215F;CUNEIFORM SIGN KA TIMES BI;Lo;0;L;;;;;N;;;;;
+12160;CUNEIFORM SIGN KA TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+12161;CUNEIFORM SIGN KA TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12162;CUNEIFORM SIGN KA TIMES GA;Lo;0;L;;;;;N;;;;;
+12163;CUNEIFORM SIGN KA TIMES GAL;Lo;0;L;;;;;N;;;;;
+12164;CUNEIFORM SIGN KA TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12165;CUNEIFORM SIGN KA TIMES GAR;Lo;0;L;;;;;N;;;;;
+12166;CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A;Lo;0;L;;;;;N;;;;;
+12167;CUNEIFORM SIGN KA TIMES GI;Lo;0;L;;;;;N;;;;;
+12168;CUNEIFORM SIGN KA TIMES GIR2;Lo;0;L;;;;;N;;;;;
+12169;CUNEIFORM SIGN KA TIMES GISH PLUS SAR;Lo;0;L;;;;;N;;;;;
+1216A;CUNEIFORM SIGN KA TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+1216B;CUNEIFORM SIGN KA TIMES GU;Lo;0;L;;;;;N;;;;;
+1216C;CUNEIFORM SIGN KA TIMES GUR7;Lo;0;L;;;;;N;;;;;
+1216D;CUNEIFORM SIGN KA TIMES IGI;Lo;0;L;;;;;N;;;;;
+1216E;CUNEIFORM SIGN KA TIMES IM;Lo;0;L;;;;;N;;;;;
+1216F;CUNEIFORM SIGN KA TIMES KAK;Lo;0;L;;;;;N;;;;;
+12170;CUNEIFORM SIGN KA TIMES KI;Lo;0;L;;;;;N;;;;;
+12171;CUNEIFORM SIGN KA TIMES KID;Lo;0;L;;;;;N;;;;;
+12172;CUNEIFORM SIGN KA TIMES LI;Lo;0;L;;;;;N;;;;;
+12173;CUNEIFORM SIGN KA TIMES LU;Lo;0;L;;;;;N;;;;;
+12174;CUNEIFORM SIGN KA TIMES ME;Lo;0;L;;;;;N;;;;;
+12175;CUNEIFORM SIGN KA TIMES ME PLUS DU;Lo;0;L;;;;;N;;;;;
+12176;CUNEIFORM SIGN KA TIMES ME PLUS GI;Lo;0;L;;;;;N;;;;;
+12177;CUNEIFORM SIGN KA TIMES ME PLUS TE;Lo;0;L;;;;;N;;;;;
+12178;CUNEIFORM SIGN KA TIMES MI;Lo;0;L;;;;;N;;;;;
+12179;CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ;Lo;0;L;;;;;N;;;;;
+1217A;CUNEIFORM SIGN KA TIMES NE;Lo;0;L;;;;;N;;;;;
+1217B;CUNEIFORM SIGN KA TIMES NUN;Lo;0;L;;;;;N;;;;;
+1217C;CUNEIFORM SIGN KA TIMES PI;Lo;0;L;;;;;N;;;;;
+1217D;CUNEIFORM SIGN KA TIMES RU;Lo;0;L;;;;;N;;;;;
+1217E;CUNEIFORM SIGN KA TIMES SA;Lo;0;L;;;;;N;;;;;
+1217F;CUNEIFORM SIGN KA TIMES SAR;Lo;0;L;;;;;N;;;;;
+12180;CUNEIFORM SIGN KA TIMES SHA;Lo;0;L;;;;;N;;;;;
+12181;CUNEIFORM SIGN KA TIMES SHE;Lo;0;L;;;;;N;;;;;
+12182;CUNEIFORM SIGN KA TIMES SHID;Lo;0;L;;;;;N;;;;;
+12183;CUNEIFORM SIGN KA TIMES SHU;Lo;0;L;;;;;N;;;;;
+12184;CUNEIFORM SIGN KA TIMES SIG;Lo;0;L;;;;;N;;;;;
+12185;CUNEIFORM SIGN KA TIMES SUHUR;Lo;0;L;;;;;N;;;;;
+12186;CUNEIFORM SIGN KA TIMES TAR;Lo;0;L;;;;;N;;;;;
+12187;CUNEIFORM SIGN KA TIMES U;Lo;0;L;;;;;N;;;;;
+12188;CUNEIFORM SIGN KA TIMES U2;Lo;0;L;;;;;N;;;;;
+12189;CUNEIFORM SIGN KA TIMES UD;Lo;0;L;;;;;N;;;;;
+1218A;CUNEIFORM SIGN KA TIMES UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+1218B;CUNEIFORM SIGN KA TIMES USH;Lo;0;L;;;;;N;;;;;
+1218C;CUNEIFORM SIGN KA TIMES ZI;Lo;0;L;;;;;N;;;;;
+1218D;CUNEIFORM SIGN KA2;Lo;0;L;;;;;N;;;;;
+1218E;CUNEIFORM SIGN KA2 CROSSING KA2;Lo;0;L;;;;;N;;;;;
+1218F;CUNEIFORM SIGN KAB;Lo;0;L;;;;;N;;;;;
+12190;CUNEIFORM SIGN KAD2;Lo;0;L;;;;;N;;;;;
+12191;CUNEIFORM SIGN KAD3;Lo;0;L;;;;;N;;;;;
+12192;CUNEIFORM SIGN KAD4;Lo;0;L;;;;;N;;;;;
+12193;CUNEIFORM SIGN KAD5;Lo;0;L;;;;;N;;;;;
+12194;CUNEIFORM SIGN KAD5 OVER KAD5;Lo;0;L;;;;;N;;;;;
+12195;CUNEIFORM SIGN KAK;Lo;0;L;;;;;N;;;;;
+12196;CUNEIFORM SIGN KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12197;CUNEIFORM SIGN KAL;Lo;0;L;;;;;N;;;;;
+12198;CUNEIFORM SIGN KAL TIMES BAD;Lo;0;L;;;;;N;;;;;
+12199;CUNEIFORM SIGN KAL CROSSING KAL;Lo;0;L;;;;;N;;;;;
+1219A;CUNEIFORM SIGN KAM2;Lo;0;L;;;;;N;;;;;
+1219B;CUNEIFORM SIGN KAM4;Lo;0;L;;;;;N;;;;;
+1219C;CUNEIFORM SIGN KASKAL;Lo;0;L;;;;;N;;;;;
+1219D;CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219E;CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219F;CUNEIFORM SIGN KESH2;Lo;0;L;;;;;N;;;;;
+121A0;CUNEIFORM SIGN KI;Lo;0;L;;;;;N;;;;;
+121A1;CUNEIFORM SIGN KI TIMES BAD;Lo;0;L;;;;;N;;;;;
+121A2;CUNEIFORM SIGN KI TIMES U;Lo;0;L;;;;;N;;;;;
+121A3;CUNEIFORM SIGN KI TIMES UD;Lo;0;L;;;;;N;;;;;
+121A4;CUNEIFORM SIGN KID;Lo;0;L;;;;;N;;;;;
+121A5;CUNEIFORM SIGN KIN;Lo;0;L;;;;;N;;;;;
+121A6;CUNEIFORM SIGN KISAL;Lo;0;L;;;;;N;;;;;
+121A7;CUNEIFORM SIGN KISH;Lo;0;L;;;;;N;;;;;
+121A8;CUNEIFORM SIGN KISIM5;Lo;0;L;;;;;N;;;;;
+121A9;CUNEIFORM SIGN KISIM5 OVER KISIM5;Lo;0;L;;;;;N;;;;;
+121AA;CUNEIFORM SIGN KU;Lo;0;L;;;;;N;;;;;
+121AB;CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+121AC;CUNEIFORM SIGN KU3;Lo;0;L;;;;;N;;;;;
+121AD;CUNEIFORM SIGN KU4;Lo;0;L;;;;;N;;;;;
+121AE;CUNEIFORM SIGN KU4 VARIANT FORM;Lo;0;L;;;;;N;;;;;
+121AF;CUNEIFORM SIGN KU7;Lo;0;L;;;;;N;;;;;
+121B0;CUNEIFORM SIGN KUL;Lo;0;L;;;;;N;;;;;
+121B1;CUNEIFORM SIGN KUL GUNU;Lo;0;L;;;;;N;;;;;
+121B2;CUNEIFORM SIGN KUN;Lo;0;L;;;;;N;;;;;
+121B3;CUNEIFORM SIGN KUR;Lo;0;L;;;;;N;;;;;
+121B4;CUNEIFORM SIGN KUR OPPOSING KUR;Lo;0;L;;;;;N;;;;;
+121B5;CUNEIFORM SIGN KUSHU2;Lo;0;L;;;;;N;;;;;
+121B6;CUNEIFORM SIGN KWU318;Lo;0;L;;;;;N;;;;;
+121B7;CUNEIFORM SIGN LA;Lo;0;L;;;;;N;;;;;
+121B8;CUNEIFORM SIGN LAGAB;Lo;0;L;;;;;N;;;;;
+121B9;CUNEIFORM SIGN LAGAB TIMES A;Lo;0;L;;;;;N;;;;;
+121BA;CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+121BB;CUNEIFORM SIGN LAGAB TIMES A PLUS GAR;Lo;0;L;;;;;N;;;;;
+121BC;CUNEIFORM SIGN LAGAB TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+121BD;CUNEIFORM SIGN LAGAB TIMES AL;Lo;0;L;;;;;N;;;;;
+121BE;CUNEIFORM SIGN LAGAB TIMES AN;Lo;0;L;;;;;N;;;;;
+121BF;CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+121C0;CUNEIFORM SIGN LAGAB TIMES BAD;Lo;0;L;;;;;N;;;;;
+121C1;CUNEIFORM SIGN LAGAB TIMES BI;Lo;0;L;;;;;N;;;;;
+121C2;CUNEIFORM SIGN LAGAB TIMES DAR;Lo;0;L;;;;;N;;;;;
+121C3;CUNEIFORM SIGN LAGAB TIMES EN;Lo;0;L;;;;;N;;;;;
+121C4;CUNEIFORM SIGN LAGAB TIMES GA;Lo;0;L;;;;;N;;;;;
+121C5;CUNEIFORM SIGN LAGAB TIMES GAR;Lo;0;L;;;;;N;;;;;
+121C6;CUNEIFORM SIGN LAGAB TIMES GUD;Lo;0;L;;;;;N;;;;;
+121C7;CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD;Lo;0;L;;;;;N;;;;;
+121C8;CUNEIFORM SIGN LAGAB TIMES HA;Lo;0;L;;;;;N;;;;;
+121C9;CUNEIFORM SIGN LAGAB TIMES HAL;Lo;0;L;;;;;N;;;;;
+121CA;CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+121CB;CUNEIFORM SIGN LAGAB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+121CC;CUNEIFORM SIGN LAGAB TIMES IM;Lo;0;L;;;;;N;;;;;
+121CD;CUNEIFORM SIGN LAGAB TIMES IM PLUS HA;Lo;0;L;;;;;N;;;;;
+121CE;CUNEIFORM SIGN LAGAB TIMES IM PLUS LU;Lo;0;L;;;;;N;;;;;
+121CF;CUNEIFORM SIGN LAGAB TIMES KI;Lo;0;L;;;;;N;;;;;
+121D0;CUNEIFORM SIGN LAGAB TIMES KIN;Lo;0;L;;;;;N;;;;;
+121D1;CUNEIFORM SIGN LAGAB TIMES KU3;Lo;0;L;;;;;N;;;;;
+121D2;CUNEIFORM SIGN LAGAB TIMES KUL;Lo;0;L;;;;;N;;;;;
+121D3;CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A;Lo;0;L;;;;;N;;;;;
+121D4;CUNEIFORM SIGN LAGAB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+121D5;CUNEIFORM SIGN LAGAB TIMES LISH;Lo;0;L;;;;;N;;;;;
+121D6;CUNEIFORM SIGN LAGAB TIMES LU;Lo;0;L;;;;;N;;;;;
+121D7;CUNEIFORM SIGN LAGAB TIMES LUL;Lo;0;L;;;;;N;;;;;
+121D8;CUNEIFORM SIGN LAGAB TIMES ME;Lo;0;L;;;;;N;;;;;
+121D9;CUNEIFORM SIGN LAGAB TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+121DA;CUNEIFORM SIGN LAGAB TIMES MUSH;Lo;0;L;;;;;N;;;;;
+121DB;CUNEIFORM SIGN LAGAB TIMES NE;Lo;0;L;;;;;N;;;;;
+121DC;CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121DD;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2;Lo;0;L;;;;;N;;;;;
+121DE;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU;Lo;0;L;;;;;N;;;;;
+121DF;CUNEIFORM SIGN LAGAB TIMES SHU2;Lo;0;L;;;;;N;;;;;
+121E0;CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2;Lo;0;L;;;;;N;;;;;
+121E1;CUNEIFORM SIGN LAGAB TIMES SUM;Lo;0;L;;;;;N;;;;;
+121E2;CUNEIFORM SIGN LAGAB TIMES TAG;Lo;0;L;;;;;N;;;;;
+121E3;CUNEIFORM SIGN LAGAB TIMES TAK4;Lo;0;L;;;;;N;;;;;
+121E4;CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA;Lo;0;L;;;;;N;;;;;
+121E5;CUNEIFORM SIGN LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+121E6;CUNEIFORM SIGN LAGAB TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+121E7;CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+121E8;CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+121E9;CUNEIFORM SIGN LAGAB TIMES UD;Lo;0;L;;;;;N;;;;;
+121EA;CUNEIFORM SIGN LAGAB TIMES USH;Lo;0;L;;;;;N;;;;;
+121EB;CUNEIFORM SIGN LAGAB SQUARED;Lo;0;L;;;;;N;;;;;
+121EC;CUNEIFORM SIGN LAGAR;Lo;0;L;;;;;N;;;;;
+121ED;CUNEIFORM SIGN LAGAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+121EE;CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121EF;CUNEIFORM SIGN LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+121F0;CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE;Lo;0;L;;;;;N;;;;;
+121F1;CUNEIFORM SIGN LAHSHU;Lo;0;L;;;;;N;;;;;
+121F2;CUNEIFORM SIGN LAL;Lo;0;L;;;;;N;;;;;
+121F3;CUNEIFORM SIGN LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+121F4;CUNEIFORM SIGN LAM;Lo;0;L;;;;;N;;;;;
+121F5;CUNEIFORM SIGN LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+121F6;CUNEIFORM SIGN LAM TIMES KUR PLUS RU;Lo;0;L;;;;;N;;;;;
+121F7;CUNEIFORM SIGN LI;Lo;0;L;;;;;N;;;;;
+121F8;CUNEIFORM SIGN LIL;Lo;0;L;;;;;N;;;;;
+121F9;CUNEIFORM SIGN LIMMU2;Lo;0;L;;;;;N;;;;;
+121FA;CUNEIFORM SIGN LISH;Lo;0;L;;;;;N;;;;;
+121FB;CUNEIFORM SIGN LU;Lo;0;L;;;;;N;;;;;
+121FC;CUNEIFORM SIGN LU TIMES BAD;Lo;0;L;;;;;N;;;;;
+121FD;CUNEIFORM SIGN LU2;Lo;0;L;;;;;N;;;;;
+121FE;CUNEIFORM SIGN LU2 TIMES AL;Lo;0;L;;;;;N;;;;;
+121FF;CUNEIFORM SIGN LU2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+12200;CUNEIFORM SIGN LU2 TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12201;CUNEIFORM SIGN LU2 TIMES ESH2 TENU;Lo;0;L;;;;;N;;;;;
+12202;CUNEIFORM SIGN LU2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12203;CUNEIFORM SIGN LU2 TIMES HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12204;CUNEIFORM SIGN LU2 TIMES IM;Lo;0;L;;;;;N;;;;;
+12205;CUNEIFORM SIGN LU2 TIMES KAD2;Lo;0;L;;;;;N;;;;;
+12206;CUNEIFORM SIGN LU2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12207;CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12208;CUNEIFORM SIGN LU2 TIMES KI;Lo;0;L;;;;;N;;;;;
+12209;CUNEIFORM SIGN LU2 TIMES LA PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220A;CUNEIFORM SIGN LU2 TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1220B;CUNEIFORM SIGN LU2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1220C;CUNEIFORM SIGN LU2 TIMES NE;Lo;0;L;;;;;N;;;;;
+1220D;CUNEIFORM SIGN LU2 TIMES NU;Lo;0;L;;;;;N;;;;;
+1220E;CUNEIFORM SIGN LU2 TIMES SI PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220F;CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU;Lo;0;L;;;;;N;;;;;
+12210;CUNEIFORM SIGN LU2 TIMES TUG2;Lo;0;L;;;;;N;;;;;
+12211;CUNEIFORM SIGN LU2 TENU;Lo;0;L;;;;;N;;;;;
+12212;CUNEIFORM SIGN LU2 CROSSING LU2;Lo;0;L;;;;;N;;;;;
+12213;CUNEIFORM SIGN LU2 OPPOSING LU2;Lo;0;L;;;;;N;;;;;
+12214;CUNEIFORM SIGN LU2 SQUARED;Lo;0;L;;;;;N;;;;;
+12215;CUNEIFORM SIGN LU2 SHESHIG;Lo;0;L;;;;;N;;;;;
+12216;CUNEIFORM SIGN LU3;Lo;0;L;;;;;N;;;;;
+12217;CUNEIFORM SIGN LUGAL;Lo;0;L;;;;;N;;;;;
+12218;CUNEIFORM SIGN LUGAL OVER LUGAL;Lo;0;L;;;;;N;;;;;
+12219;CUNEIFORM SIGN LUGAL OPPOSING LUGAL;Lo;0;L;;;;;N;;;;;
+1221A;CUNEIFORM SIGN LUGAL SHESHIG;Lo;0;L;;;;;N;;;;;
+1221B;CUNEIFORM SIGN LUH;Lo;0;L;;;;;N;;;;;
+1221C;CUNEIFORM SIGN LUL;Lo;0;L;;;;;N;;;;;
+1221D;CUNEIFORM SIGN LUM;Lo;0;L;;;;;N;;;;;
+1221E;CUNEIFORM SIGN LUM OVER LUM;Lo;0;L;;;;;N;;;;;
+1221F;CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12220;CUNEIFORM SIGN MA;Lo;0;L;;;;;N;;;;;
+12221;CUNEIFORM SIGN MA TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12222;CUNEIFORM SIGN MA GUNU;Lo;0;L;;;;;N;;;;;
+12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;;
+12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;;
+12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;;
+12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;;N;;;;;
+12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;;
+12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;;
+12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;;
+1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;;
+1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;;N;;;;;
+1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;;
+1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;;
+1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;;
+1222F;CUNEIFORM SIGN MUG GUNU;Lo;0;L;;;;;N;;;;;
+12230;CUNEIFORM SIGN MUNSUB;Lo;0;L;;;;;N;;;;;
+12231;CUNEIFORM SIGN MURGU2;Lo;0;L;;;;;N;;;;;
+12232;CUNEIFORM SIGN MUSH;Lo;0;L;;;;;N;;;;;
+12233;CUNEIFORM SIGN MUSH TIMES A;Lo;0;L;;;;;N;;;;;
+12234;CUNEIFORM SIGN MUSH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12235;CUNEIFORM SIGN MUSH TIMES ZA;Lo;0;L;;;;;N;;;;;
+12236;CUNEIFORM SIGN MUSH OVER MUSH;Lo;0;L;;;;;N;;;;;
+12237;CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+12238;CUNEIFORM SIGN MUSH CROSSING MUSH;Lo;0;L;;;;;N;;;;;
+12239;CUNEIFORM SIGN MUSH3;Lo;0;L;;;;;N;;;;;
+1223A;CUNEIFORM SIGN MUSH3 TIMES A;Lo;0;L;;;;;N;;;;;
+1223B;CUNEIFORM SIGN MUSH3 TIMES A PLUS DI;Lo;0;L;;;;;N;;;;;
+1223C;CUNEIFORM SIGN MUSH3 TIMES DI;Lo;0;L;;;;;N;;;;;
+1223D;CUNEIFORM SIGN MUSH3 GUNU;Lo;0;L;;;;;N;;;;;
+1223E;CUNEIFORM SIGN NA;Lo;0;L;;;;;N;;;;;
+1223F;CUNEIFORM SIGN NA2;Lo;0;L;;;;;N;;;;;
+12240;CUNEIFORM SIGN NAGA;Lo;0;L;;;;;N;;;;;
+12241;CUNEIFORM SIGN NAGA INVERTED;Lo;0;L;;;;;N;;;;;
+12242;CUNEIFORM SIGN NAGA TIMES SHU TENU;Lo;0;L;;;;;N;;;;;
+12243;CUNEIFORM SIGN NAGA OPPOSING NAGA;Lo;0;L;;;;;N;;;;;
+12244;CUNEIFORM SIGN NAGAR;Lo;0;L;;;;;N;;;;;
+12245;CUNEIFORM SIGN NAM NUTILLU;Lo;0;L;;;;;N;;;;;
+12246;CUNEIFORM SIGN NAM;Lo;0;L;;;;;N;;;;;
+12247;CUNEIFORM SIGN NAM2;Lo;0;L;;;;;N;;;;;
+12248;CUNEIFORM SIGN NE;Lo;0;L;;;;;N;;;;;
+12249;CUNEIFORM SIGN NE TIMES A;Lo;0;L;;;;;N;;;;;
+1224A;CUNEIFORM SIGN NE TIMES UD;Lo;0;L;;;;;N;;;;;
+1224B;CUNEIFORM SIGN NE SHESHIG;Lo;0;L;;;;;N;;;;;
+1224C;CUNEIFORM SIGN NI;Lo;0;L;;;;;N;;;;;
+1224D;CUNEIFORM SIGN NI TIMES E;Lo;0;L;;;;;N;;;;;
+1224E;CUNEIFORM SIGN NI2;Lo;0;L;;;;;N;;;;;
+1224F;CUNEIFORM SIGN NIM;Lo;0;L;;;;;N;;;;;
+12250;CUNEIFORM SIGN NIM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12251;CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12252;CUNEIFORM SIGN NINDA2;Lo;0;L;;;;;N;;;;;
+12253;CUNEIFORM SIGN NINDA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+12254;CUNEIFORM SIGN NINDA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+12255;CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+12256;CUNEIFORM SIGN NINDA2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12257;CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12258;CUNEIFORM SIGN NINDA2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12259;CUNEIFORM SIGN NINDA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1225A;CUNEIFORM SIGN NINDA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+1225B;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN;Lo;0;L;;;;;N;;;;;
+1225C;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225D;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225E;CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225F;CUNEIFORM SIGN NINDA2 TIMES USH;Lo;0;L;;;;;N;;;;;
+12260;CUNEIFORM SIGN NISAG;Lo;0;L;;;;;N;;;;;
+12261;CUNEIFORM SIGN NU;Lo;0;L;;;;;N;;;;;
+12262;CUNEIFORM SIGN NU11;Lo;0;L;;;;;N;;;;;
+12263;CUNEIFORM SIGN NUN;Lo;0;L;;;;;N;;;;;
+12264;CUNEIFORM SIGN NUN LAGAR TIMES GAR;Lo;0;L;;;;;N;;;;;
+12265;CUNEIFORM SIGN NUN LAGAR TIMES MASH;Lo;0;L;;;;;N;;;;;
+12266;CUNEIFORM SIGN NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12267;CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12268;CUNEIFORM SIGN NUN LAGAR TIMES USH;Lo;0;L;;;;;N;;;;;
+12269;CUNEIFORM SIGN NUN TENU;Lo;0;L;;;;;N;;;;;
+1226A;CUNEIFORM SIGN NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1226B;CUNEIFORM SIGN NUN CROSSING NUN;Lo;0;L;;;;;N;;;;;
+1226C;CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR;Lo;0;L;;;;;N;;;;;
+1226D;CUNEIFORM SIGN NUNUZ;Lo;0;L;;;;;N;;;;;
+1226E;CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1226F;CUNEIFORM SIGN NUNUZ AB2 TIMES BI;Lo;0;L;;;;;N;;;;;
+12270;CUNEIFORM SIGN NUNUZ AB2 TIMES DUG;Lo;0;L;;;;;N;;;;;
+12271;CUNEIFORM SIGN NUNUZ AB2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12272;CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12273;CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12274;CUNEIFORM SIGN NUNUZ AB2 TIMES LA;Lo;0;L;;;;;N;;;;;
+12275;CUNEIFORM SIGN NUNUZ AB2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12276;CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3;Lo;0;L;;;;;N;;;;;
+12277;CUNEIFORM SIGN NUNUZ AB2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12278;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+12279;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U;Lo;0;L;;;;;N;;;;;
+1227A;CUNEIFORM SIGN PA;Lo;0;L;;;;;N;;;;;
+1227B;CUNEIFORM SIGN PAD;Lo;0;L;;;;;N;;;;;
+1227C;CUNEIFORM SIGN PAN;Lo;0;L;;;;;N;;;;;
+1227D;CUNEIFORM SIGN PAP;Lo;0;L;;;;;N;;;;;
+1227E;CUNEIFORM SIGN PESH2;Lo;0;L;;;;;N;;;;;
+1227F;CUNEIFORM SIGN PI;Lo;0;L;;;;;N;;;;;
+12280;CUNEIFORM SIGN PI TIMES A;Lo;0;L;;;;;N;;;;;
+12281;CUNEIFORM SIGN PI TIMES AB;Lo;0;L;;;;;N;;;;;
+12282;CUNEIFORM SIGN PI TIMES BI;Lo;0;L;;;;;N;;;;;
+12283;CUNEIFORM SIGN PI TIMES BU;Lo;0;L;;;;;N;;;;;
+12284;CUNEIFORM SIGN PI TIMES E;Lo;0;L;;;;;N;;;;;
+12285;CUNEIFORM SIGN PI TIMES I;Lo;0;L;;;;;N;;;;;
+12286;CUNEIFORM SIGN PI TIMES IB;Lo;0;L;;;;;N;;;;;
+12287;CUNEIFORM SIGN PI TIMES U;Lo;0;L;;;;;N;;;;;
+12288;CUNEIFORM SIGN PI TIMES U2;Lo;0;L;;;;;N;;;;;
+12289;CUNEIFORM SIGN PI CROSSING PI;Lo;0;L;;;;;N;;;;;
+1228A;CUNEIFORM SIGN PIRIG;Lo;0;L;;;;;N;;;;;
+1228B;CUNEIFORM SIGN PIRIG TIMES KAL;Lo;0;L;;;;;N;;;;;
+1228C;CUNEIFORM SIGN PIRIG TIMES UD;Lo;0;L;;;;;N;;;;;
+1228D;CUNEIFORM SIGN PIRIG TIMES ZA;Lo;0;L;;;;;N;;;;;
+1228E;CUNEIFORM SIGN PIRIG OPPOSING PIRIG;Lo;0;L;;;;;N;;;;;
+1228F;CUNEIFORM SIGN RA;Lo;0;L;;;;;N;;;;;
+12290;CUNEIFORM SIGN RAB;Lo;0;L;;;;;N;;;;;
+12291;CUNEIFORM SIGN RI;Lo;0;L;;;;;N;;;;;
+12292;CUNEIFORM SIGN RU;Lo;0;L;;;;;N;;;;;
+12293;CUNEIFORM SIGN SA;Lo;0;L;;;;;N;;;;;
+12294;CUNEIFORM SIGN SAG NUTILLU;Lo;0;L;;;;;N;;;;;
+12295;CUNEIFORM SIGN SAG;Lo;0;L;;;;;N;;;;;
+12296;CUNEIFORM SIGN SAG TIMES A;Lo;0;L;;;;;N;;;;;
+12297;CUNEIFORM SIGN SAG TIMES DU;Lo;0;L;;;;;N;;;;;
+12298;CUNEIFORM SIGN SAG TIMES DUB;Lo;0;L;;;;;N;;;;;
+12299;CUNEIFORM SIGN SAG TIMES HA;Lo;0;L;;;;;N;;;;;
+1229A;CUNEIFORM SIGN SAG TIMES KAK;Lo;0;L;;;;;N;;;;;
+1229B;CUNEIFORM SIGN SAG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1229C;CUNEIFORM SIGN SAG TIMES LUM;Lo;0;L;;;;;N;;;;;
+1229D;CUNEIFORM SIGN SAG TIMES MI;Lo;0;L;;;;;N;;;;;
+1229E;CUNEIFORM SIGN SAG TIMES NUN;Lo;0;L;;;;;N;;;;;
+1229F;CUNEIFORM SIGN SAG TIMES SAL;Lo;0;L;;;;;N;;;;;
+122A0;CUNEIFORM SIGN SAG TIMES SHID;Lo;0;L;;;;;N;;;;;
+122A1;CUNEIFORM SIGN SAG TIMES TAB;Lo;0;L;;;;;N;;;;;
+122A2;CUNEIFORM SIGN SAG TIMES U2;Lo;0;L;;;;;N;;;;;
+122A3;CUNEIFORM SIGN SAG TIMES UB;Lo;0;L;;;;;N;;;;;
+122A4;CUNEIFORM SIGN SAG TIMES UM;Lo;0;L;;;;;N;;;;;
+122A5;CUNEIFORM SIGN SAG TIMES UR;Lo;0;L;;;;;N;;;;;
+122A6;CUNEIFORM SIGN SAG TIMES USH;Lo;0;L;;;;;N;;;;;
+122A7;CUNEIFORM SIGN SAG OVER SAG;Lo;0;L;;;;;N;;;;;
+122A8;CUNEIFORM SIGN SAG GUNU;Lo;0;L;;;;;N;;;;;
+122A9;CUNEIFORM SIGN SAL;Lo;0;L;;;;;N;;;;;
+122AA;CUNEIFORM SIGN SAL LAGAB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+122AB;CUNEIFORM SIGN SANGA2;Lo;0;L;;;;;N;;;;;
+122AC;CUNEIFORM SIGN SAR;Lo;0;L;;;;;N;;;;;
+122AD;CUNEIFORM SIGN SHA;Lo;0;L;;;;;N;;;;;
+122AE;CUNEIFORM SIGN SHA3;Lo;0;L;;;;;N;;;;;
+122AF;CUNEIFORM SIGN SHA3 TIMES A;Lo;0;L;;;;;N;;;;;
+122B0;CUNEIFORM SIGN SHA3 TIMES BAD;Lo;0;L;;;;;N;;;;;
+122B1;CUNEIFORM SIGN SHA3 TIMES GISH;Lo;0;L;;;;;N;;;;;
+122B2;CUNEIFORM SIGN SHA3 TIMES NE;Lo;0;L;;;;;N;;;;;
+122B3;CUNEIFORM SIGN SHA3 TIMES SHU2;Lo;0;L;;;;;N;;;;;
+122B4;CUNEIFORM SIGN SHA3 TIMES TUR;Lo;0;L;;;;;N;;;;;
+122B5;CUNEIFORM SIGN SHA3 TIMES U;Lo;0;L;;;;;N;;;;;
+122B6;CUNEIFORM SIGN SHA3 TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+122B7;CUNEIFORM SIGN SHA6;Lo;0;L;;;;;N;;;;;
+122B8;CUNEIFORM SIGN SHAB6;Lo;0;L;;;;;N;;;;;
+122B9;CUNEIFORM SIGN SHAR2;Lo;0;L;;;;;N;;;;;
+122BA;CUNEIFORM SIGN SHE;Lo;0;L;;;;;N;;;;;
+122BB;CUNEIFORM SIGN SHE HU;Lo;0;L;;;;;N;;;;;
+122BC;CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BD;CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BE;CUNEIFORM SIGN SHEG9;Lo;0;L;;;;;N;;;;;
+122BF;CUNEIFORM SIGN SHEN;Lo;0;L;;;;;N;;;;;
+122C0;CUNEIFORM SIGN SHESH;Lo;0;L;;;;;N;;;;;
+122C1;CUNEIFORM SIGN SHESH2;Lo;0;L;;;;;N;;;;;
+122C2;CUNEIFORM SIGN SHESHLAM;Lo;0;L;;;;;N;;;;;
+122C3;CUNEIFORM SIGN SHID;Lo;0;L;;;;;N;;;;;
+122C4;CUNEIFORM SIGN SHID TIMES A;Lo;0;L;;;;;N;;;;;
+122C5;CUNEIFORM SIGN SHID TIMES IM;Lo;0;L;;;;;N;;;;;
+122C6;CUNEIFORM SIGN SHIM;Lo;0;L;;;;;N;;;;;
+122C7;CUNEIFORM SIGN SHIM TIMES A;Lo;0;L;;;;;N;;;;;
+122C8;CUNEIFORM SIGN SHIM TIMES BAL;Lo;0;L;;;;;N;;;;;
+122C9;CUNEIFORM SIGN SHIM TIMES BULUG;Lo;0;L;;;;;N;;;;;
+122CA;CUNEIFORM SIGN SHIM TIMES DIN;Lo;0;L;;;;;N;;;;;
+122CB;CUNEIFORM SIGN SHIM TIMES GAR;Lo;0;L;;;;;N;;;;;
+122CC;CUNEIFORM SIGN SHIM TIMES IGI;Lo;0;L;;;;;N;;;;;
+122CD;CUNEIFORM SIGN SHIM TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+122CE;CUNEIFORM SIGN SHIM TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
+122CF;CUNEIFORM SIGN SHIM TIMES LUL;Lo;0;L;;;;;N;;;;;
+122D0;CUNEIFORM SIGN SHIM TIMES MUG;Lo;0;L;;;;;N;;;;;
+122D1;CUNEIFORM SIGN SHIM TIMES SAL;Lo;0;L;;;;;N;;;;;
+122D2;CUNEIFORM SIGN SHINIG;Lo;0;L;;;;;N;;;;;
+122D3;CUNEIFORM SIGN SHIR;Lo;0;L;;;;;N;;;;;
+122D4;CUNEIFORM SIGN SHIR TENU;Lo;0;L;;;;;N;;;;;
+122D5;CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR;Lo;0;L;;;;;N;;;;;
+122D6;CUNEIFORM SIGN SHITA;Lo;0;L;;;;;N;;;;;
+122D7;CUNEIFORM SIGN SHU;Lo;0;L;;;;;N;;;;;
+122D8;CUNEIFORM SIGN SHU OVER INVERTED SHU;Lo;0;L;;;;;N;;;;;
+122D9;CUNEIFORM SIGN SHU2;Lo;0;L;;;;;N;;;;;
+122DA;CUNEIFORM SIGN SHUBUR;Lo;0;L;;;;;N;;;;;
+122DB;CUNEIFORM SIGN SI;Lo;0;L;;;;;N;;;;;
+122DC;CUNEIFORM SIGN SI GUNU;Lo;0;L;;;;;N;;;;;
+122DD;CUNEIFORM SIGN SIG;Lo;0;L;;;;;N;;;;;
+122DE;CUNEIFORM SIGN SIG4;Lo;0;L;;;;;N;;;;;
+122DF;CUNEIFORM SIGN SIG4 OVER SIG4 SHU2;Lo;0;L;;;;;N;;;;;
+122E0;CUNEIFORM SIGN SIK2;Lo;0;L;;;;;N;;;;;
+122E1;CUNEIFORM SIGN SILA3;Lo;0;L;;;;;N;;;;;
+122E2;CUNEIFORM SIGN SU;Lo;0;L;;;;;N;;;;;
+122E3;CUNEIFORM SIGN SU OVER SU;Lo;0;L;;;;;N;;;;;
+122E4;CUNEIFORM SIGN SUD;Lo;0;L;;;;;N;;;;;
+122E5;CUNEIFORM SIGN SUD2;Lo;0;L;;;;;N;;;;;
+122E6;CUNEIFORM SIGN SUHUR;Lo;0;L;;;;;N;;;;;
+122E7;CUNEIFORM SIGN SUM;Lo;0;L;;;;;N;;;;;
+122E8;CUNEIFORM SIGN SUMASH;Lo;0;L;;;;;N;;;;;
+122E9;CUNEIFORM SIGN SUR;Lo;0;L;;;;;N;;;;;
+122EA;CUNEIFORM SIGN SUR9;Lo;0;L;;;;;N;;;;;
+122EB;CUNEIFORM SIGN TA;Lo;0;L;;;;;N;;;;;
+122EC;CUNEIFORM SIGN TA ASTERISK;Lo;0;L;;;;;N;;;;;
+122ED;CUNEIFORM SIGN TA TIMES HI;Lo;0;L;;;;;N;;;;;
+122EE;CUNEIFORM SIGN TA TIMES MI;Lo;0;L;;;;;N;;;;;
+122EF;CUNEIFORM SIGN TA GUNU;Lo;0;L;;;;;N;;;;;
+122F0;CUNEIFORM SIGN TAB;Lo;0;L;;;;;N;;;;;
+122F1;CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH;Lo;0;L;;;;;N;;;;;
+122F2;CUNEIFORM SIGN TAB SQUARED;Lo;0;L;;;;;N;;;;;
+122F3;CUNEIFORM SIGN TAG;Lo;0;L;;;;;N;;;;;
+122F4;CUNEIFORM SIGN TAG TIMES BI;Lo;0;L;;;;;N;;;;;
+122F5;CUNEIFORM SIGN TAG TIMES GUD;Lo;0;L;;;;;N;;;;;
+122F6;CUNEIFORM SIGN TAG TIMES SHE;Lo;0;L;;;;;N;;;;;
+122F7;CUNEIFORM SIGN TAG TIMES SHU;Lo;0;L;;;;;N;;;;;
+122F8;CUNEIFORM SIGN TAG TIMES TUG2;Lo;0;L;;;;;N;;;;;
+122F9;CUNEIFORM SIGN TAG TIMES UD;Lo;0;L;;;;;N;;;;;
+122FA;CUNEIFORM SIGN TAK4;Lo;0;L;;;;;N;;;;;
+122FB;CUNEIFORM SIGN TAR;Lo;0;L;;;;;N;;;;;
+122FC;CUNEIFORM SIGN TE;Lo;0;L;;;;;N;;;;;
+122FD;CUNEIFORM SIGN TE GUNU;Lo;0;L;;;;;N;;;;;
+122FE;CUNEIFORM SIGN TI;Lo;0;L;;;;;N;;;;;
+122FF;CUNEIFORM SIGN TI TENU;Lo;0;L;;;;;N;;;;;
+12300;CUNEIFORM SIGN TIL;Lo;0;L;;;;;N;;;;;
+12301;CUNEIFORM SIGN TIR;Lo;0;L;;;;;N;;;;;
+12302;CUNEIFORM SIGN TIR TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12303;CUNEIFORM SIGN TIR OVER TIR;Lo;0;L;;;;;N;;;;;
+12304;CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12305;CUNEIFORM SIGN TU;Lo;0;L;;;;;N;;;;;
+12306;CUNEIFORM SIGN TUG2;Lo;0;L;;;;;N;;;;;
+12307;CUNEIFORM SIGN TUK;Lo;0;L;;;;;N;;;;;
+12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;;
+12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;;
+1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;;
+1230B;CUNEIFORM SIGN U;Lo;0;L;;;;;N;;;;;
+1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;;
+1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;;N;;;;;
+1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;;
+12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;;
+12311;CUNEIFORM SIGN U2;Lo;0;L;;;;;N;;;;;
+12312;CUNEIFORM SIGN UB;Lo;0;L;;;;;N;;;;;
+12313;CUNEIFORM SIGN UD;Lo;0;L;;;;;N;;;;;
+12314;CUNEIFORM SIGN UD KUSHU2;Lo;0;L;;;;;N;;;;;
+12315;CUNEIFORM SIGN UD TIMES BAD;Lo;0;L;;;;;N;;;;;
+12316;CUNEIFORM SIGN UD TIMES MI;Lo;0;L;;;;;N;;;;;
+12317;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12318;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU;Lo;0;L;;;;;N;;;;;
+12319;CUNEIFORM SIGN UD GUNU;Lo;0;L;;;;;N;;;;;
+1231A;CUNEIFORM SIGN UD SHESHIG;Lo;0;L;;;;;N;;;;;
+1231B;CUNEIFORM SIGN UD SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
+1231C;CUNEIFORM SIGN UDUG;Lo;0;L;;;;;N;;;;;
+1231D;CUNEIFORM SIGN UM;Lo;0;L;;;;;N;;;;;
+1231E;CUNEIFORM SIGN UM TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1231F;CUNEIFORM SIGN UM TIMES ME PLUS DA;Lo;0;L;;;;;N;;;;;
+12320;CUNEIFORM SIGN UM TIMES SHA3;Lo;0;L;;;;;N;;;;;
+12321;CUNEIFORM SIGN UM TIMES U;Lo;0;L;;;;;N;;;;;
+12322;CUNEIFORM SIGN UMBIN;Lo;0;L;;;;;N;;;;;
+12323;CUNEIFORM SIGN UMUM;Lo;0;L;;;;;N;;;;;
+12324;CUNEIFORM SIGN UMUM TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+12325;CUNEIFORM SIGN UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+12326;CUNEIFORM SIGN UN;Lo;0;L;;;;;N;;;;;
+12327;CUNEIFORM SIGN UN GUNU;Lo;0;L;;;;;N;;;;;
+12328;CUNEIFORM SIGN UR;Lo;0;L;;;;;N;;;;;
+12329;CUNEIFORM SIGN UR CROSSING UR;Lo;0;L;;;;;N;;;;;
+1232A;CUNEIFORM SIGN UR SHESHIG;Lo;0;L;;;;;N;;;;;
+1232B;CUNEIFORM SIGN UR2;Lo;0;L;;;;;N;;;;;
+1232C;CUNEIFORM SIGN UR2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+1232D;CUNEIFORM SIGN UR2 TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+1232E;CUNEIFORM SIGN UR2 TIMES AL;Lo;0;L;;;;;N;;;;;
+1232F;CUNEIFORM SIGN UR2 TIMES HA;Lo;0;L;;;;;N;;;;;
+12330;CUNEIFORM SIGN UR2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+12331;CUNEIFORM SIGN UR2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12332;CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12333;CUNEIFORM SIGN UR2 TIMES U2 PLUS BI;Lo;0;L;;;;;N;;;;;
+12334;CUNEIFORM SIGN UR4;Lo;0;L;;;;;N;;;;;
+12335;CUNEIFORM SIGN URI;Lo;0;L;;;;;N;;;;;
+12336;CUNEIFORM SIGN URI3;Lo;0;L;;;;;N;;;;;
+12337;CUNEIFORM SIGN URU;Lo;0;L;;;;;N;;;;;
+12338;CUNEIFORM SIGN URU TIMES A;Lo;0;L;;;;;N;;;;;
+12339;CUNEIFORM SIGN URU TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1233A;CUNEIFORM SIGN URU TIMES BAR;Lo;0;L;;;;;N;;;;;
+1233B;CUNEIFORM SIGN URU TIMES DUN;Lo;0;L;;;;;N;;;;;
+1233C;CUNEIFORM SIGN URU TIMES GA;Lo;0;L;;;;;N;;;;;
+1233D;CUNEIFORM SIGN URU TIMES GAL;Lo;0;L;;;;;N;;;;;
+1233E;CUNEIFORM SIGN URU TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1233F;CUNEIFORM SIGN URU TIMES GAR;Lo;0;L;;;;;N;;;;;
+12340;CUNEIFORM SIGN URU TIMES GU;Lo;0;L;;;;;N;;;;;
+12341;CUNEIFORM SIGN URU TIMES HA;Lo;0;L;;;;;N;;;;;
+12342;CUNEIFORM SIGN URU TIMES IGI;Lo;0;L;;;;;N;;;;;
+12343;CUNEIFORM SIGN URU TIMES IM;Lo;0;L;;;;;N;;;;;
+12344;CUNEIFORM SIGN URU TIMES ISH;Lo;0;L;;;;;N;;;;;
+12345;CUNEIFORM SIGN URU TIMES KI;Lo;0;L;;;;;N;;;;;
+12346;CUNEIFORM SIGN URU TIMES LUM;Lo;0;L;;;;;N;;;;;
+12347;CUNEIFORM SIGN URU TIMES MIN;Lo;0;L;;;;;N;;;;;
+12348;CUNEIFORM SIGN URU TIMES PA;Lo;0;L;;;;;N;;;;;
+12349;CUNEIFORM SIGN URU TIMES SHE;Lo;0;L;;;;;N;;;;;
+1234A;CUNEIFORM SIGN URU TIMES SIG4;Lo;0;L;;;;;N;;;;;
+1234B;CUNEIFORM SIGN URU TIMES TU;Lo;0;L;;;;;N;;;;;
+1234C;CUNEIFORM SIGN URU TIMES U PLUS GUD;Lo;0;L;;;;;N;;;;;
+1234D;CUNEIFORM SIGN URU TIMES UD;Lo;0;L;;;;;N;;;;;
+1234E;CUNEIFORM SIGN URU TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1234F;CUNEIFORM SIGN URUDA;Lo;0;L;;;;;N;;;;;
+12350;CUNEIFORM SIGN URUDA TIMES U;Lo;0;L;;;;;N;;;;;
+12351;CUNEIFORM SIGN USH;Lo;0;L;;;;;N;;;;;
+12352;CUNEIFORM SIGN USH TIMES A;Lo;0;L;;;;;N;;;;;
+12353;CUNEIFORM SIGN USH TIMES KU;Lo;0;L;;;;;N;;;;;
+12354;CUNEIFORM SIGN USH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12355;CUNEIFORM SIGN USH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12356;CUNEIFORM SIGN USHX;Lo;0;L;;;;;N;;;;;
+12357;CUNEIFORM SIGN USH2;Lo;0;L;;;;;N;;;;;
+12358;CUNEIFORM SIGN USHUMX;Lo;0;L;;;;;N;;;;;
+12359;CUNEIFORM SIGN UTUKI;Lo;0;L;;;;;N;;;;;
+1235A;CUNEIFORM SIGN UZ3;Lo;0;L;;;;;N;;;;;
+1235B;CUNEIFORM SIGN UZ3 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1235C;CUNEIFORM SIGN UZU;Lo;0;L;;;;;N;;;;;
+1235D;CUNEIFORM SIGN ZA;Lo;0;L;;;;;N;;;;;
+1235E;CUNEIFORM SIGN ZA TENU;Lo;0;L;;;;;N;;;;;
+1235F;CUNEIFORM SIGN ZA SQUARED TIMES KUR;Lo;0;L;;;;;N;;;;;
+12360;CUNEIFORM SIGN ZAG;Lo;0;L;;;;;N;;;;;
+12361;CUNEIFORM SIGN ZAMX;Lo;0;L;;;;;N;;;;;
+12362;CUNEIFORM SIGN ZE2;Lo;0;L;;;;;N;;;;;
+12363;CUNEIFORM SIGN ZI;Lo;0;L;;;;;N;;;;;
+12364;CUNEIFORM SIGN ZI OVER ZI;Lo;0;L;;;;;N;;;;;
+12365;CUNEIFORM SIGN ZI3;Lo;0;L;;;;;N;;;;;
+12366;CUNEIFORM SIGN ZIB;Lo;0;L;;;;;N;;;;;
+12367;CUNEIFORM SIGN ZIB KABA TENU;Lo;0;L;;;;;N;;;;;
+12368;CUNEIFORM SIGN ZIG;Lo;0;L;;;;;N;;;;;
+12369;CUNEIFORM SIGN ZIZ2;Lo;0;L;;;;;N;;;;;
+1236A;CUNEIFORM SIGN ZU;Lo;0;L;;;;;N;;;;;
+1236B;CUNEIFORM SIGN ZU5;Lo;0;L;;;;;N;;;;;
+1236C;CUNEIFORM SIGN ZU5 TIMES A;Lo;0;L;;;;;N;;;;;
+1236D;CUNEIFORM SIGN ZUBUR;Lo;0;L;;;;;N;;;;;
+1236E;CUNEIFORM SIGN ZUM;Lo;0;L;;;;;N;;;;;
+1236F;CUNEIFORM SIGN KAP ELAMITE;Lo;0;L;;;;;N;;;;;
+12370;CUNEIFORM SIGN AB TIMES NUN;Lo;0;L;;;;;N;;;;;
+12371;CUNEIFORM SIGN AB2 TIMES A;Lo;0;L;;;;;N;;;;;
+12372;CUNEIFORM SIGN AMAR TIMES KUG;Lo;0;L;;;;;N;;;;;
+12373;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS MASH;Lo;0;L;;;;;N;;;;;
+12374;CUNEIFORM SIGN DAG3;Lo;0;L;;;;;N;;;;;
+12375;CUNEIFORM SIGN DISH PLUS SHU;Lo;0;L;;;;;N;;;;;
+12376;CUNEIFORM SIGN DUB TIMES SHE;Lo;0;L;;;;;N;;;;;
+12377;CUNEIFORM SIGN EZEN TIMES GUD;Lo;0;L;;;;;N;;;;;
+12378;CUNEIFORM SIGN EZEN TIMES SHE;Lo;0;L;;;;;N;;;;;
+12379;CUNEIFORM SIGN GA2 TIMES AN PLUS KAK PLUS A;Lo;0;L;;;;;N;;;;;
+1237A;CUNEIFORM SIGN GA2 TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1237B;CUNEIFORM SIGN GE22;Lo;0;L;;;;;N;;;;;
+1237C;CUNEIFORM SIGN GIG;Lo;0;L;;;;;N;;;;;
+1237D;CUNEIFORM SIGN HUSH;Lo;0;L;;;;;N;;;;;
+1237E;CUNEIFORM SIGN KA TIMES ANSHE;Lo;0;L;;;;;N;;;;;
+1237F;CUNEIFORM SIGN KA TIMES ASH3;Lo;0;L;;;;;N;;;;;
+12380;CUNEIFORM SIGN KA TIMES GISH;Lo;0;L;;;;;N;;;;;
+12381;CUNEIFORM SIGN KA TIMES GUD;Lo;0;L;;;;;N;;;;;
+12382;CUNEIFORM SIGN KA TIMES HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+12383;CUNEIFORM SIGN KA TIMES LUM;Lo;0;L;;;;;N;;;;;
+12384;CUNEIFORM SIGN KA TIMES PA;Lo;0;L;;;;;N;;;;;
+12385;CUNEIFORM SIGN KA TIMES SHUL;Lo;0;L;;;;;N;;;;;
+12386;CUNEIFORM SIGN KA TIMES TU;Lo;0;L;;;;;N;;;;;
+12387;CUNEIFORM SIGN KA TIMES UR2;Lo;0;L;;;;;N;;;;;
+12388;CUNEIFORM SIGN LAGAB TIMES GI;Lo;0;L;;;;;N;;;;;
+12389;CUNEIFORM SIGN LU2 SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
+1238A;CUNEIFORM SIGN LU2 TIMES ESH2 PLUS LAL;Lo;0;L;;;;;N;;;;;
+1238B;CUNEIFORM SIGN LU2 TIMES SHU;Lo;0;L;;;;;N;;;;;
+1238C;CUNEIFORM SIGN MESH;Lo;0;L;;;;;N;;;;;
+1238D;CUNEIFORM SIGN MUSH3 TIMES ZA;Lo;0;L;;;;;N;;;;;
+1238E;CUNEIFORM SIGN NA4;Lo;0;L;;;;;N;;;;;
+1238F;CUNEIFORM SIGN NIN;Lo;0;L;;;;;N;;;;;
+12390;CUNEIFORM SIGN NIN9;Lo;0;L;;;;;N;;;;;
+12391;CUNEIFORM SIGN NINDA2 TIMES BAL;Lo;0;L;;;;;N;;;;;
+12392;CUNEIFORM SIGN NINDA2 TIMES GI;Lo;0;L;;;;;N;;;;;
+12393;CUNEIFORM SIGN NU11 ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;;
+12394;CUNEIFORM SIGN PESH2 ASTERISK;Lo;0;L;;;;;N;;;;;
+12395;CUNEIFORM SIGN PIR2;Lo;0;L;;;;;N;;;;;
+12396;CUNEIFORM SIGN SAG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12397;CUNEIFORM SIGN TI2;Lo;0;L;;;;;N;;;;;
+12398;CUNEIFORM SIGN UM TIMES ME;Lo;0;L;;;;;N;;;;;
+12399;CUNEIFORM SIGN U U;Lo;0;L;;;;;N;;;;;
+12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;;
+12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;;
+12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;;
+12403;CUNEIFORM NUMERIC SIGN FIVE ASH;Nl;0;L;;;;5;N;;;;;
+12404;CUNEIFORM NUMERIC SIGN SIX ASH;Nl;0;L;;;;6;N;;;;;
+12405;CUNEIFORM NUMERIC SIGN SEVEN ASH;Nl;0;L;;;;7;N;;;;;
+12406;CUNEIFORM NUMERIC SIGN EIGHT ASH;Nl;0;L;;;;8;N;;;;;
+12407;CUNEIFORM NUMERIC SIGN NINE ASH;Nl;0;L;;;;9;N;;;;;
+12408;CUNEIFORM NUMERIC SIGN THREE DISH;Nl;0;L;;;;3;N;;;;;
+12409;CUNEIFORM NUMERIC SIGN FOUR DISH;Nl;0;L;;;;4;N;;;;;
+1240A;CUNEIFORM NUMERIC SIGN FIVE DISH;Nl;0;L;;;;5;N;;;;;
+1240B;CUNEIFORM NUMERIC SIGN SIX DISH;Nl;0;L;;;;6;N;;;;;
+1240C;CUNEIFORM NUMERIC SIGN SEVEN DISH;Nl;0;L;;;;7;N;;;;;
+1240D;CUNEIFORM NUMERIC SIGN EIGHT DISH;Nl;0;L;;;;8;N;;;;;
+1240E;CUNEIFORM NUMERIC SIGN NINE DISH;Nl;0;L;;;;9;N;;;;;
+1240F;CUNEIFORM NUMERIC SIGN FOUR U;Nl;0;L;;;;4;N;;;;;
+12410;CUNEIFORM NUMERIC SIGN FIVE U;Nl;0;L;;;;5;N;;;;;
+12411;CUNEIFORM NUMERIC SIGN SIX U;Nl;0;L;;;;6;N;;;;;
+12412;CUNEIFORM NUMERIC SIGN SEVEN U;Nl;0;L;;;;7;N;;;;;
+12413;CUNEIFORM NUMERIC SIGN EIGHT U;Nl;0;L;;;;8;N;;;;;
+12414;CUNEIFORM NUMERIC SIGN NINE U;Nl;0;L;;;;9;N;;;;;
+12415;CUNEIFORM NUMERIC SIGN ONE GESH2;Nl;0;L;;;;1;N;;;;;
+12416;CUNEIFORM NUMERIC SIGN TWO GESH2;Nl;0;L;;;;2;N;;;;;
+12417;CUNEIFORM NUMERIC SIGN THREE GESH2;Nl;0;L;;;;3;N;;;;;
+12418;CUNEIFORM NUMERIC SIGN FOUR GESH2;Nl;0;L;;;;4;N;;;;;
+12419;CUNEIFORM NUMERIC SIGN FIVE GESH2;Nl;0;L;;;;5;N;;;;;
+1241A;CUNEIFORM NUMERIC SIGN SIX GESH2;Nl;0;L;;;;6;N;;;;;
+1241B;CUNEIFORM NUMERIC SIGN SEVEN GESH2;Nl;0;L;;;;7;N;;;;;
+1241C;CUNEIFORM NUMERIC SIGN EIGHT GESH2;Nl;0;L;;;;8;N;;;;;
+1241D;CUNEIFORM NUMERIC SIGN NINE GESH2;Nl;0;L;;;;9;N;;;;;
+1241E;CUNEIFORM NUMERIC SIGN ONE GESHU;Nl;0;L;;;;1;N;;;;;
+1241F;CUNEIFORM NUMERIC SIGN TWO GESHU;Nl;0;L;;;;2;N;;;;;
+12420;CUNEIFORM NUMERIC SIGN THREE GESHU;Nl;0;L;;;;3;N;;;;;
+12421;CUNEIFORM NUMERIC SIGN FOUR GESHU;Nl;0;L;;;;4;N;;;;;
+12422;CUNEIFORM NUMERIC SIGN FIVE GESHU;Nl;0;L;;;;5;N;;;;;
+12423;CUNEIFORM NUMERIC SIGN TWO SHAR2;Nl;0;L;;;;2;N;;;;;
+12424;CUNEIFORM NUMERIC SIGN THREE SHAR2;Nl;0;L;;;;3;N;;;;;
+12425;CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12426;CUNEIFORM NUMERIC SIGN FOUR SHAR2;Nl;0;L;;;;4;N;;;;;
+12427;CUNEIFORM NUMERIC SIGN FIVE SHAR2;Nl;0;L;;;;5;N;;;;;
+12428;CUNEIFORM NUMERIC SIGN SIX SHAR2;Nl;0;L;;;;6;N;;;;;
+12429;CUNEIFORM NUMERIC SIGN SEVEN SHAR2;Nl;0;L;;;;7;N;;;;;
+1242A;CUNEIFORM NUMERIC SIGN EIGHT SHAR2;Nl;0;L;;;;8;N;;;;;
+1242B;CUNEIFORM NUMERIC SIGN NINE SHAR2;Nl;0;L;;;;9;N;;;;;
+1242C;CUNEIFORM NUMERIC SIGN ONE SHARU;Nl;0;L;;;;1;N;;;;;
+1242D;CUNEIFORM NUMERIC SIGN TWO SHARU;Nl;0;L;;;;2;N;;;;;
+1242E;CUNEIFORM NUMERIC SIGN THREE SHARU;Nl;0;L;;;;3;N;;;;;
+1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
+12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
+12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;216000;N;;;;;
+12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;432000;N;;;;;
+12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
+12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
+12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
+12437;CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12438;CUNEIFORM NUMERIC SIGN FOUR BURU;Nl;0;L;;;;4;N;;;;;
+12439;CUNEIFORM NUMERIC SIGN FIVE BURU;Nl;0;L;;;;5;N;;;;;
+1243A;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16;Nl;0;L;;;;3;N;;;;;
+1243B;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21;Nl;0;L;;;;3;N;;;;;
+1243C;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU;Nl;0;L;;;;4;N;;;;;
+1243D;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4;Nl;0;L;;;;4;N;;;;;
+1243E;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A;Nl;0;L;;;;4;N;;;;;
+1243F;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B;Nl;0;L;;;;4;N;;;;;
+12440;CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9;Nl;0;L;;;;6;N;;;;;
+12441;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3;Nl;0;L;;;;7;N;;;;;
+12442;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A;Nl;0;L;;;;7;N;;;;;
+12443;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B;Nl;0;L;;;;7;N;;;;;
+12444;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU;Nl;0;L;;;;8;N;;;;;
+12445;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3;Nl;0;L;;;;8;N;;;;;
+12446;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU;Nl;0;L;;;;9;N;;;;;
+12447;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3;Nl;0;L;;;;9;N;;;;;
+12448;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4;Nl;0;L;;;;9;N;;;;;
+12449;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A;Nl;0;L;;;;9;N;;;;;
+1244A;CUNEIFORM NUMERIC SIGN TWO ASH TENU;Nl;0;L;;;;2;N;;;;;
+1244B;CUNEIFORM NUMERIC SIGN THREE ASH TENU;Nl;0;L;;;;3;N;;;;;
+1244C;CUNEIFORM NUMERIC SIGN FOUR ASH TENU;Nl;0;L;;;;4;N;;;;;
+1244D;CUNEIFORM NUMERIC SIGN FIVE ASH TENU;Nl;0;L;;;;5;N;;;;;
+1244E;CUNEIFORM NUMERIC SIGN SIX ASH TENU;Nl;0;L;;;;6;N;;;;;
+1244F;CUNEIFORM NUMERIC SIGN ONE BAN2;Nl;0;L;;;;1;N;;;;;
+12450;CUNEIFORM NUMERIC SIGN TWO BAN2;Nl;0;L;;;;2;N;;;;;
+12451;CUNEIFORM NUMERIC SIGN THREE BAN2;Nl;0;L;;;;3;N;;;;;
+12452;CUNEIFORM NUMERIC SIGN FOUR BAN2;Nl;0;L;;;;4;N;;;;;
+12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
+12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
+12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;2;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;3;N;;;;;
+12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
+12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
+1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;
+1245B;CUNEIFORM NUMERIC SIGN TWO THIRDS DISH;Nl;0;L;;;;2/3;N;;;;;
+1245C;CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH;Nl;0;L;;;;5/6;N;;;;;
+1245D;CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A;Nl;0;L;;;;1/3;N;;;;;
+1245E;CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A;Nl;0;L;;;;2/3;N;;;;;
+1245F;CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH;Nl;0;L;;;;1/8;N;;;;;
+12460;CUNEIFORM NUMERIC SIGN ONE QUARTER ASH;Nl;0;L;;;;1/4;N;;;;;
+12461;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH;Nl;0;L;;;;1/6;N;;;;;
+12462;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER;Nl;0;L;;;;1/4;N;;;;;
+12463;CUNEIFORM NUMERIC SIGN ONE QUARTER GUR;Nl;0;L;;;;1/4;N;;;;;
+12464;CUNEIFORM NUMERIC SIGN ONE HALF GUR;Nl;0;L;;;;1/2;N;;;;;
+12465;CUNEIFORM NUMERIC SIGN ELAMITE ONE THIRD;Nl;0;L;;;;1/3;N;;;;;
+12466;CUNEIFORM NUMERIC SIGN ELAMITE TWO THIRDS;Nl;0;L;;;;2/3;N;;;;;
+12467;CUNEIFORM NUMERIC SIGN ELAMITE FORTY;Nl;0;L;;;;40;N;;;;;
+12468;CUNEIFORM NUMERIC SIGN ELAMITE FIFTY;Nl;0;L;;;;50;N;;;;;
+12469;CUNEIFORM NUMERIC SIGN FOUR U VARIANT FORM;Nl;0;L;;;;4;N;;;;;
+1246A;CUNEIFORM NUMERIC SIGN FIVE U VARIANT FORM;Nl;0;L;;;;5;N;;;;;
+1246B;CUNEIFORM NUMERIC SIGN SIX U VARIANT FORM;Nl;0;L;;;;6;N;;;;;
+1246C;CUNEIFORM NUMERIC SIGN SEVEN U VARIANT FORM;Nl;0;L;;;;7;N;;;;;
+1246D;CUNEIFORM NUMERIC SIGN EIGHT U VARIANT FORM;Nl;0;L;;;;8;N;;;;;
+1246E;CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM;Nl;0;L;;;;9;N;;;;;
+12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;;
+12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;;
+12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;;
+12474;CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON;Po;0;L;;;;;N;;;;;
+12480;CUNEIFORM SIGN AB TIMES NUN TENU;Lo;0;L;;;;;N;;;;;
+12481;CUNEIFORM SIGN AB TIMES SHU2;Lo;0;L;;;;;N;;;;;
+12482;CUNEIFORM SIGN AD TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12483;CUNEIFORM SIGN BAD TIMES DISH TENU;Lo;0;L;;;;;N;;;;;
+12484;CUNEIFORM SIGN BAHAR2 TIMES AB2;Lo;0;L;;;;;N;;;;;
+12485;CUNEIFORM SIGN BAHAR2 TIMES NI;Lo;0;L;;;;;N;;;;;
+12486;CUNEIFORM SIGN BAHAR2 TIMES ZA;Lo;0;L;;;;;N;;;;;
+12487;CUNEIFORM SIGN BU OVER BU TIMES NA2;Lo;0;L;;;;;N;;;;;
+12488;CUNEIFORM SIGN DA TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12489;CUNEIFORM SIGN DAG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1248A;CUNEIFORM SIGN DIM TIMES IGI;Lo;0;L;;;;;N;;;;;
+1248B;CUNEIFORM SIGN DIM TIMES U U U;Lo;0;L;;;;;N;;;;;
+1248C;CUNEIFORM SIGN DIM2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1248D;CUNEIFORM SIGN DUG TIMES ANSHE;Lo;0;L;;;;;N;;;;;
+1248E;CUNEIFORM SIGN DUG TIMES ASH;Lo;0;L;;;;;N;;;;;
+1248F;CUNEIFORM SIGN DUG TIMES ASH AT LEFT;Lo;0;L;;;;;N;;;;;
+12490;CUNEIFORM SIGN DUG TIMES DIN;Lo;0;L;;;;;N;;;;;
+12491;CUNEIFORM SIGN DUG TIMES DUN;Lo;0;L;;;;;N;;;;;
+12492;CUNEIFORM SIGN DUG TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+12493;CUNEIFORM SIGN DUG TIMES GA;Lo;0;L;;;;;N;;;;;
+12494;CUNEIFORM SIGN DUG TIMES GI;Lo;0;L;;;;;N;;;;;
+12495;CUNEIFORM SIGN DUG TIMES GIR2 GUNU;Lo;0;L;;;;;N;;;;;
+12496;CUNEIFORM SIGN DUG TIMES GISH;Lo;0;L;;;;;N;;;;;
+12497;CUNEIFORM SIGN DUG TIMES HA;Lo;0;L;;;;;N;;;;;
+12498;CUNEIFORM SIGN DUG TIMES HI;Lo;0;L;;;;;N;;;;;
+12499;CUNEIFORM SIGN DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1249A;CUNEIFORM SIGN DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1249B;CUNEIFORM SIGN DUG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1249C;CUNEIFORM SIGN DUG TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
+1249D;CUNEIFORM SIGN DUG TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;;
+1249E;CUNEIFORM SIGN DUG TIMES LAK-020;Lo;0;L;;;;;N;;;;;
+1249F;CUNEIFORM SIGN DUG TIMES LAM;Lo;0;L;;;;;N;;;;;
+124A0;CUNEIFORM SIGN DUG TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+124A1;CUNEIFORM SIGN DUG TIMES LUH PLUS GISH;Lo;0;L;;;;;N;;;;;
+124A2;CUNEIFORM SIGN DUG TIMES MASH;Lo;0;L;;;;;N;;;;;
+124A3;CUNEIFORM SIGN DUG TIMES MES;Lo;0;L;;;;;N;;;;;
+124A4;CUNEIFORM SIGN DUG TIMES MI;Lo;0;L;;;;;N;;;;;
+124A5;CUNEIFORM SIGN DUG TIMES NI;Lo;0;L;;;;;N;;;;;
+124A6;CUNEIFORM SIGN DUG TIMES PI;Lo;0;L;;;;;N;;;;;
+124A7;CUNEIFORM SIGN DUG TIMES SHE;Lo;0;L;;;;;N;;;;;
+124A8;CUNEIFORM SIGN DUG TIMES SI GUNU;Lo;0;L;;;;;N;;;;;
+124A9;CUNEIFORM SIGN E2 TIMES KUR;Lo;0;L;;;;;N;;;;;
+124AA;CUNEIFORM SIGN E2 TIMES PAP;Lo;0;L;;;;;N;;;;;
+124AB;CUNEIFORM SIGN ERIN2 X;Lo;0;L;;;;;N;;;;;
+124AC;CUNEIFORM SIGN ESH2 CROSSING ESH2;Lo;0;L;;;;;N;;;;;
+124AD;CUNEIFORM SIGN EZEN SHESHIG TIMES ASH;Lo;0;L;;;;;N;;;;;
+124AE;CUNEIFORM SIGN EZEN SHESHIG TIMES HI;Lo;0;L;;;;;N;;;;;
+124AF;CUNEIFORM SIGN EZEN SHESHIG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124B0;CUNEIFORM SIGN EZEN SHESHIG TIMES LA;Lo;0;L;;;;;N;;;;;
+124B1;CUNEIFORM SIGN EZEN SHESHIG TIMES LAL;Lo;0;L;;;;;N;;;;;
+124B2;CUNEIFORM SIGN EZEN SHESHIG TIMES ME;Lo;0;L;;;;;N;;;;;
+124B3;CUNEIFORM SIGN EZEN SHESHIG TIMES MES;Lo;0;L;;;;;N;;;;;
+124B4;CUNEIFORM SIGN EZEN SHESHIG TIMES SU;Lo;0;L;;;;;N;;;;;
+124B5;CUNEIFORM SIGN EZEN TIMES SU;Lo;0;L;;;;;N;;;;;
+124B6;CUNEIFORM SIGN GA2 TIMES BAHAR2;Lo;0;L;;;;;N;;;;;
+124B7;CUNEIFORM SIGN GA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;;
+124B8;CUNEIFORM SIGN GA2 TIMES DUG TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124B9;CUNEIFORM SIGN GA2 TIMES DUG TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+124BA;CUNEIFORM SIGN GA2 TIMES EREN;Lo;0;L;;;;;N;;;;;
+124BB;CUNEIFORM SIGN GA2 TIMES GA;Lo;0;L;;;;;N;;;;;
+124BC;CUNEIFORM SIGN GA2 TIMES GAR PLUS DI;Lo;0;L;;;;;N;;;;;
+124BD;CUNEIFORM SIGN GA2 TIMES GAR PLUS NE;Lo;0;L;;;;;N;;;;;
+124BE;CUNEIFORM SIGN GA2 TIMES HA PLUS A;Lo;0;L;;;;;N;;;;;
+124BF;CUNEIFORM SIGN GA2 TIMES KUSHU2 PLUS KASKAL;Lo;0;L;;;;;N;;;;;
+124C0;CUNEIFORM SIGN GA2 TIMES LAM;Lo;0;L;;;;;N;;;;;
+124C1;CUNEIFORM SIGN GA2 TIMES LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+124C2;CUNEIFORM SIGN GA2 TIMES LUH;Lo;0;L;;;;;N;;;;;
+124C3;CUNEIFORM SIGN GA2 TIMES MUSH;Lo;0;L;;;;;N;;;;;
+124C4;CUNEIFORM SIGN GA2 TIMES NE;Lo;0;L;;;;;N;;;;;
+124C5;CUNEIFORM SIGN GA2 TIMES NE PLUS E2;Lo;0;L;;;;;N;;;;;
+124C6;CUNEIFORM SIGN GA2 TIMES NE PLUS GI;Lo;0;L;;;;;N;;;;;
+124C7;CUNEIFORM SIGN GA2 TIMES SHIM;Lo;0;L;;;;;N;;;;;
+124C8;CUNEIFORM SIGN GA2 TIMES ZIZ2;Lo;0;L;;;;;N;;;;;
+124C9;CUNEIFORM SIGN GABA ROTATED NINETY DEGREES;Lo;0;L;;;;;N;;;;;
+124CA;CUNEIFORM SIGN GESHTIN TIMES U;Lo;0;L;;;;;N;;;;;
+124CB;CUNEIFORM SIGN GISH TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+124CC;CUNEIFORM SIGN GU2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+124CD;CUNEIFORM SIGN GUD PLUS GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+124CE;CUNEIFORM SIGN HA TENU GUNU;Lo;0;L;;;;;N;;;;;
+124CF;CUNEIFORM SIGN HI TIMES ASH OVER HI TIMES ASH;Lo;0;L;;;;;N;;;;;
+124D0;CUNEIFORM SIGN KA TIMES BU;Lo;0;L;;;;;N;;;;;
+124D1;CUNEIFORM SIGN KA TIMES KA;Lo;0;L;;;;;N;;;;;
+124D2;CUNEIFORM SIGN KA TIMES U U U;Lo;0;L;;;;;N;;;;;
+124D3;CUNEIFORM SIGN KA TIMES UR;Lo;0;L;;;;;N;;;;;
+124D4;CUNEIFORM SIGN LAGAB TIMES ZU OVER ZU;Lo;0;L;;;;;N;;;;;
+124D5;CUNEIFORM SIGN LAK-003;Lo;0;L;;;;;N;;;;;
+124D6;CUNEIFORM SIGN LAK-021;Lo;0;L;;;;;N;;;;;
+124D7;CUNEIFORM SIGN LAK-025;Lo;0;L;;;;;N;;;;;
+124D8;CUNEIFORM SIGN LAK-030;Lo;0;L;;;;;N;;;;;
+124D9;CUNEIFORM SIGN LAK-050;Lo;0;L;;;;;N;;;;;
+124DA;CUNEIFORM SIGN LAK-051;Lo;0;L;;;;;N;;;;;
+124DB;CUNEIFORM SIGN LAK-062;Lo;0;L;;;;;N;;;;;
+124DC;CUNEIFORM SIGN LAK-079 OVER LAK-079 GUNU;Lo;0;L;;;;;N;;;;;
+124DD;CUNEIFORM SIGN LAK-080;Lo;0;L;;;;;N;;;;;
+124DE;CUNEIFORM SIGN LAK-081 OVER LAK-081;Lo;0;L;;;;;N;;;;;
+124DF;CUNEIFORM SIGN LAK-092;Lo;0;L;;;;;N;;;;;
+124E0;CUNEIFORM SIGN LAK-130;Lo;0;L;;;;;N;;;;;
+124E1;CUNEIFORM SIGN LAK-142;Lo;0;L;;;;;N;;;;;
+124E2;CUNEIFORM SIGN LAK-210;Lo;0;L;;;;;N;;;;;
+124E3;CUNEIFORM SIGN LAK-219;Lo;0;L;;;;;N;;;;;
+124E4;CUNEIFORM SIGN LAK-220;Lo;0;L;;;;;N;;;;;
+124E5;CUNEIFORM SIGN LAK-225;Lo;0;L;;;;;N;;;;;
+124E6;CUNEIFORM SIGN LAK-228;Lo;0;L;;;;;N;;;;;
+124E7;CUNEIFORM SIGN LAK-238;Lo;0;L;;;;;N;;;;;
+124E8;CUNEIFORM SIGN LAK-265;Lo;0;L;;;;;N;;;;;
+124E9;CUNEIFORM SIGN LAK-266;Lo;0;L;;;;;N;;;;;
+124EA;CUNEIFORM SIGN LAK-343;Lo;0;L;;;;;N;;;;;
+124EB;CUNEIFORM SIGN LAK-347;Lo;0;L;;;;;N;;;;;
+124EC;CUNEIFORM SIGN LAK-348;Lo;0;L;;;;;N;;;;;
+124ED;CUNEIFORM SIGN LAK-383;Lo;0;L;;;;;N;;;;;
+124EE;CUNEIFORM SIGN LAK-384;Lo;0;L;;;;;N;;;;;
+124EF;CUNEIFORM SIGN LAK-390;Lo;0;L;;;;;N;;;;;
+124F0;CUNEIFORM SIGN LAK-441;Lo;0;L;;;;;N;;;;;
+124F1;CUNEIFORM SIGN LAK-449;Lo;0;L;;;;;N;;;;;
+124F2;CUNEIFORM SIGN LAK-449 TIMES GU;Lo;0;L;;;;;N;;;;;
+124F3;CUNEIFORM SIGN LAK-449 TIMES IGI;Lo;0;L;;;;;N;;;;;
+124F4;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+124F5;CUNEIFORM SIGN LAK-449 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+124F6;CUNEIFORM SIGN LAK-449 TIMES U2 PLUS BA;Lo;0;L;;;;;N;;;;;
+124F7;CUNEIFORM SIGN LAK-450;Lo;0;L;;;;;N;;;;;
+124F8;CUNEIFORM SIGN LAK-457;Lo;0;L;;;;;N;;;;;
+124F9;CUNEIFORM SIGN LAK-470;Lo;0;L;;;;;N;;;;;
+124FA;CUNEIFORM SIGN LAK-483;Lo;0;L;;;;;N;;;;;
+124FB;CUNEIFORM SIGN LAK-490;Lo;0;L;;;;;N;;;;;
+124FC;CUNEIFORM SIGN LAK-492;Lo;0;L;;;;;N;;;;;
+124FD;CUNEIFORM SIGN LAK-493;Lo;0;L;;;;;N;;;;;
+124FE;CUNEIFORM SIGN LAK-495;Lo;0;L;;;;;N;;;;;
+124FF;CUNEIFORM SIGN LAK-550;Lo;0;L;;;;;N;;;;;
+12500;CUNEIFORM SIGN LAK-608;Lo;0;L;;;;;N;;;;;
+12501;CUNEIFORM SIGN LAK-617;Lo;0;L;;;;;N;;;;;
+12502;CUNEIFORM SIGN LAK-617 TIMES ASH;Lo;0;L;;;;;N;;;;;
+12503;CUNEIFORM SIGN LAK-617 TIMES BAD;Lo;0;L;;;;;N;;;;;
+12504;CUNEIFORM SIGN LAK-617 TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+12505;CUNEIFORM SIGN LAK-617 TIMES KU3;Lo;0;L;;;;;N;;;;;
+12506;CUNEIFORM SIGN LAK-617 TIMES LA;Lo;0;L;;;;;N;;;;;
+12507;CUNEIFORM SIGN LAK-617 TIMES TAR;Lo;0;L;;;;;N;;;;;
+12508;CUNEIFORM SIGN LAK-617 TIMES TE;Lo;0;L;;;;;N;;;;;
+12509;CUNEIFORM SIGN LAK-617 TIMES U2;Lo;0;L;;;;;N;;;;;
+1250A;CUNEIFORM SIGN LAK-617 TIMES UD;Lo;0;L;;;;;N;;;;;
+1250B;CUNEIFORM SIGN LAK-617 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1250C;CUNEIFORM SIGN LAK-636;Lo;0;L;;;;;N;;;;;
+1250D;CUNEIFORM SIGN LAK-648;Lo;0;L;;;;;N;;;;;
+1250E;CUNEIFORM SIGN LAK-648 TIMES DUB;Lo;0;L;;;;;N;;;;;
+1250F;CUNEIFORM SIGN LAK-648 TIMES GA;Lo;0;L;;;;;N;;;;;
+12510;CUNEIFORM SIGN LAK-648 TIMES IGI;Lo;0;L;;;;;N;;;;;
+12511;CUNEIFORM SIGN LAK-648 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12512;CUNEIFORM SIGN LAK-648 TIMES NI;Lo;0;L;;;;;N;;;;;
+12513;CUNEIFORM SIGN LAK-648 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+12514;CUNEIFORM SIGN LAK-648 TIMES SHESH PLUS KI;Lo;0;L;;;;;N;;;;;
+12515;CUNEIFORM SIGN LAK-648 TIMES UD;Lo;0;L;;;;;N;;;;;
+12516;CUNEIFORM SIGN LAK-648 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+12517;CUNEIFORM SIGN LAK-724;Lo;0;L;;;;;N;;;;;
+12518;CUNEIFORM SIGN LAK-749;Lo;0;L;;;;;N;;;;;
+12519;CUNEIFORM SIGN LU2 GUNU TIMES ASH;Lo;0;L;;;;;N;;;;;
+1251A;CUNEIFORM SIGN LU2 TIMES DISH;Lo;0;L;;;;;N;;;;;
+1251B;CUNEIFORM SIGN LU2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+1251C;CUNEIFORM SIGN LU2 TIMES PAP;Lo;0;L;;;;;N;;;;;
+1251D;CUNEIFORM SIGN LU2 TIMES PAP PLUS PAP PLUS LU3;Lo;0;L;;;;;N;;;;;
+1251E;CUNEIFORM SIGN LU2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1251F;CUNEIFORM SIGN MI PLUS ZA7;Lo;0;L;;;;;N;;;;;
+12520;CUNEIFORM SIGN MUSH OVER MUSH TIMES GA;Lo;0;L;;;;;N;;;;;
+12521;CUNEIFORM SIGN MUSH OVER MUSH TIMES KAK;Lo;0;L;;;;;N;;;;;
+12522;CUNEIFORM SIGN NINDA2 TIMES DIM GUNU;Lo;0;L;;;;;N;;;;;
+12523;CUNEIFORM SIGN NINDA2 TIMES GISH;Lo;0;L;;;;;N;;;;;
+12524;CUNEIFORM SIGN NINDA2 TIMES GUL;Lo;0;L;;;;;N;;;;;
+12525;CUNEIFORM SIGN NINDA2 TIMES HI;Lo;0;L;;;;;N;;;;;
+12526;CUNEIFORM SIGN NINDA2 TIMES KESH2;Lo;0;L;;;;;N;;;;;
+12527;CUNEIFORM SIGN NINDA2 TIMES LAK-050;Lo;0;L;;;;;N;;;;;
+12528;CUNEIFORM SIGN NINDA2 TIMES MASH;Lo;0;L;;;;;N;;;;;
+12529;CUNEIFORM SIGN NINDA2 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
+1252A;CUNEIFORM SIGN NINDA2 TIMES U;Lo;0;L;;;;;N;;;;;
+1252B;CUNEIFORM SIGN NINDA2 TIMES U PLUS U;Lo;0;L;;;;;N;;;;;
+1252C;CUNEIFORM SIGN NINDA2 TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1252D;CUNEIFORM SIGN SAG GUNU TIMES HA;Lo;0;L;;;;;N;;;;;
+1252E;CUNEIFORM SIGN SAG TIMES EN;Lo;0;L;;;;;N;;;;;
+1252F;CUNEIFORM SIGN SAG TIMES SHE AT LEFT;Lo;0;L;;;;;N;;;;;
+12530;CUNEIFORM SIGN SAG TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12531;CUNEIFORM SIGN SHA6 TENU;Lo;0;L;;;;;N;;;;;
+12532;CUNEIFORM SIGN SHE OVER SHE;Lo;0;L;;;;;N;;;;;
+12533;CUNEIFORM SIGN SHE PLUS HUB2;Lo;0;L;;;;;N;;;;;
+12534;CUNEIFORM SIGN SHE PLUS NAM2;Lo;0;L;;;;;N;;;;;
+12535;CUNEIFORM SIGN SHE PLUS SAR;Lo;0;L;;;;;N;;;;;
+12536;CUNEIFORM SIGN SHU2 PLUS DUG TIMES NI;Lo;0;L;;;;;N;;;;;
+12537;CUNEIFORM SIGN SHU2 PLUS E2 TIMES AN;Lo;0;L;;;;;N;;;;;
+12538;CUNEIFORM SIGN SI TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12539;CUNEIFORM SIGN TAK4 PLUS SAG;Lo;0;L;;;;;N;;;;;
+1253A;CUNEIFORM SIGN TUM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1253B;CUNEIFORM SIGN TUM TIMES THREE DISH;Lo;0;L;;;;;N;;;;;
+1253C;CUNEIFORM SIGN UR2 INVERTED;Lo;0;L;;;;;N;;;;;
+1253D;CUNEIFORM SIGN UR2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1253E;CUNEIFORM SIGN URU TIMES DARA3;Lo;0;L;;;;;N;;;;;
+1253F;CUNEIFORM SIGN URU TIMES LAK-668;Lo;0;L;;;;;N;;;;;
+12540;CUNEIFORM SIGN URU TIMES LU3;Lo;0;L;;;;;N;;;;;
+12541;CUNEIFORM SIGN ZA7;Lo;0;L;;;;;N;;;;;
+12542;CUNEIFORM SIGN ZU OVER ZU PLUS SAR;Lo;0;L;;;;;N;;;;;
+12543;CUNEIFORM SIGN ZU5 TIMES THREE DISH TENU;Lo;0;L;;;;;N;;;;;
+13000;EGYPTIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
+13001;EGYPTIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
+13002;EGYPTIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
+13003;EGYPTIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;;
+13004;EGYPTIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;;
+13005;EGYPTIAN HIEROGLYPH A005A;Lo;0;L;;;;;N;;;;;
+13006;EGYPTIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;;
+13007;EGYPTIAN HIEROGLYPH A006A;Lo;0;L;;;;;N;;;;;
+13008;EGYPTIAN HIEROGLYPH A006B;Lo;0;L;;;;;N;;;;;
+13009;EGYPTIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;;
+1300A;EGYPTIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;;
+1300B;EGYPTIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;;
+1300C;EGYPTIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;;
+1300D;EGYPTIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;;
+1300E;EGYPTIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;;
+1300F;EGYPTIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;;
+13010;EGYPTIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;;
+13011;EGYPTIAN HIEROGLYPH A014A;Lo;0;L;;;;;N;;;;;
+13012;EGYPTIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;;
+13013;EGYPTIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;;
+13014;EGYPTIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;;
+13015;EGYPTIAN HIEROGLYPH A017A;Lo;0;L;;;;;N;;;;;
+13016;EGYPTIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;;
+13017;EGYPTIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;;
+13018;EGYPTIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;;
+13019;EGYPTIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;;
+1301A;EGYPTIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;;
+1301B;EGYPTIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;;
+1301C;EGYPTIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;;
+1301D;EGYPTIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;;
+1301E;EGYPTIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;;
+1301F;EGYPTIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;;
+13020;EGYPTIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;;
+13021;EGYPTIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;;
+13022;EGYPTIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;;
+13023;EGYPTIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;;
+13024;EGYPTIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;;
+13025;EGYPTIAN HIEROGLYPH A032A;Lo;0;L;;;;;N;;;;;
+13026;EGYPTIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;;
+13027;EGYPTIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;;
+13028;EGYPTIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;;
+13029;EGYPTIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;;
+1302A;EGYPTIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;;
+1302B;EGYPTIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;;
+1302C;EGYPTIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;;
+1302D;EGYPTIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;;
+1302E;EGYPTIAN HIEROGLYPH A040A;Lo;0;L;;;;;N;;;;;
+1302F;EGYPTIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;;
+13030;EGYPTIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;;
+13031;EGYPTIAN HIEROGLYPH A042A;Lo;0;L;;;;;N;;;;;
+13032;EGYPTIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;;
+13033;EGYPTIAN HIEROGLYPH A043A;Lo;0;L;;;;;N;;;;;
+13034;EGYPTIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;;
+13035;EGYPTIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;;
+13036;EGYPTIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;;
+13037;EGYPTIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;;
+13038;EGYPTIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;;
+13039;EGYPTIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;;
+1303A;EGYPTIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;;
+1303B;EGYPTIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;;
+1303C;EGYPTIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;;
+1303D;EGYPTIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;;
+1303E;EGYPTIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;;
+1303F;EGYPTIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;;
+13040;EGYPTIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;;
+13041;EGYPTIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;;
+13042;EGYPTIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;;
+13043;EGYPTIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;;
+13044;EGYPTIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;;
+13045;EGYPTIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;;
+13046;EGYPTIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;;
+13047;EGYPTIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;;
+13048;EGYPTIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;;
+13049;EGYPTIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;;
+1304A;EGYPTIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;;
+1304B;EGYPTIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;;
+1304C;EGYPTIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;;
+1304D;EGYPTIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;;
+1304E;EGYPTIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;;
+1304F;EGYPTIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;;
+13050;EGYPTIAN HIEROGLYPH B001;Lo;0;L;;;;;N;;;;;
+13051;EGYPTIAN HIEROGLYPH B002;Lo;0;L;;;;;N;;;;;
+13052;EGYPTIAN HIEROGLYPH B003;Lo;0;L;;;;;N;;;;;
+13053;EGYPTIAN HIEROGLYPH B004;Lo;0;L;;;;;N;;;;;
+13054;EGYPTIAN HIEROGLYPH B005;Lo;0;L;;;;;N;;;;;
+13055;EGYPTIAN HIEROGLYPH B005A;Lo;0;L;;;;;N;;;;;
+13056;EGYPTIAN HIEROGLYPH B006;Lo;0;L;;;;;N;;;;;
+13057;EGYPTIAN HIEROGLYPH B007;Lo;0;L;;;;;N;;;;;
+13058;EGYPTIAN HIEROGLYPH B008;Lo;0;L;;;;;N;;;;;
+13059;EGYPTIAN HIEROGLYPH B009;Lo;0;L;;;;;N;;;;;
+1305A;EGYPTIAN HIEROGLYPH C001;Lo;0;L;;;;;N;;;;;
+1305B;EGYPTIAN HIEROGLYPH C002;Lo;0;L;;;;;N;;;;;
+1305C;EGYPTIAN HIEROGLYPH C002A;Lo;0;L;;;;;N;;;;;
+1305D;EGYPTIAN HIEROGLYPH C002B;Lo;0;L;;;;;N;;;;;
+1305E;EGYPTIAN HIEROGLYPH C002C;Lo;0;L;;;;;N;;;;;
+1305F;EGYPTIAN HIEROGLYPH C003;Lo;0;L;;;;;N;;;;;
+13060;EGYPTIAN HIEROGLYPH C004;Lo;0;L;;;;;N;;;;;
+13061;EGYPTIAN HIEROGLYPH C005;Lo;0;L;;;;;N;;;;;
+13062;EGYPTIAN HIEROGLYPH C006;Lo;0;L;;;;;N;;;;;
+13063;EGYPTIAN HIEROGLYPH C007;Lo;0;L;;;;;N;;;;;
+13064;EGYPTIAN HIEROGLYPH C008;Lo;0;L;;;;;N;;;;;
+13065;EGYPTIAN HIEROGLYPH C009;Lo;0;L;;;;;N;;;;;
+13066;EGYPTIAN HIEROGLYPH C010;Lo;0;L;;;;;N;;;;;
+13067;EGYPTIAN HIEROGLYPH C010A;Lo;0;L;;;;;N;;;;;
+13068;EGYPTIAN HIEROGLYPH C011;Lo;0;L;;;;;N;;;;;
+13069;EGYPTIAN HIEROGLYPH C012;Lo;0;L;;;;;N;;;;;
+1306A;EGYPTIAN HIEROGLYPH C013;Lo;0;L;;;;;N;;;;;
+1306B;EGYPTIAN HIEROGLYPH C014;Lo;0;L;;;;;N;;;;;
+1306C;EGYPTIAN HIEROGLYPH C015;Lo;0;L;;;;;N;;;;;
+1306D;EGYPTIAN HIEROGLYPH C016;Lo;0;L;;;;;N;;;;;
+1306E;EGYPTIAN HIEROGLYPH C017;Lo;0;L;;;;;N;;;;;
+1306F;EGYPTIAN HIEROGLYPH C018;Lo;0;L;;;;;N;;;;;
+13070;EGYPTIAN HIEROGLYPH C019;Lo;0;L;;;;;N;;;;;
+13071;EGYPTIAN HIEROGLYPH C020;Lo;0;L;;;;;N;;;;;
+13072;EGYPTIAN HIEROGLYPH C021;Lo;0;L;;;;;N;;;;;
+13073;EGYPTIAN HIEROGLYPH C022;Lo;0;L;;;;;N;;;;;
+13074;EGYPTIAN HIEROGLYPH C023;Lo;0;L;;;;;N;;;;;
+13075;EGYPTIAN HIEROGLYPH C024;Lo;0;L;;;;;N;;;;;
+13076;EGYPTIAN HIEROGLYPH D001;Lo;0;L;;;;;N;;;;;
+13077;EGYPTIAN HIEROGLYPH D002;Lo;0;L;;;;;N;;;;;
+13078;EGYPTIAN HIEROGLYPH D003;Lo;0;L;;;;;N;;;;;
+13079;EGYPTIAN HIEROGLYPH D004;Lo;0;L;;;;;N;;;;;
+1307A;EGYPTIAN HIEROGLYPH D005;Lo;0;L;;;;;N;;;;;
+1307B;EGYPTIAN HIEROGLYPH D006;Lo;0;L;;;;;N;;;;;
+1307C;EGYPTIAN HIEROGLYPH D007;Lo;0;L;;;;;N;;;;;
+1307D;EGYPTIAN HIEROGLYPH D008;Lo;0;L;;;;;N;;;;;
+1307E;EGYPTIAN HIEROGLYPH D008A;Lo;0;L;;;;;N;;;;;
+1307F;EGYPTIAN HIEROGLYPH D009;Lo;0;L;;;;;N;;;;;
+13080;EGYPTIAN HIEROGLYPH D010;Lo;0;L;;;;;N;;;;;
+13081;EGYPTIAN HIEROGLYPH D011;Lo;0;L;;;;;N;;;;;
+13082;EGYPTIAN HIEROGLYPH D012;Lo;0;L;;;;;N;;;;;
+13083;EGYPTIAN HIEROGLYPH D013;Lo;0;L;;;;;N;;;;;
+13084;EGYPTIAN HIEROGLYPH D014;Lo;0;L;;;;;N;;;;;
+13085;EGYPTIAN HIEROGLYPH D015;Lo;0;L;;;;;N;;;;;
+13086;EGYPTIAN HIEROGLYPH D016;Lo;0;L;;;;;N;;;;;
+13087;EGYPTIAN HIEROGLYPH D017;Lo;0;L;;;;;N;;;;;
+13088;EGYPTIAN HIEROGLYPH D018;Lo;0;L;;;;;N;;;;;
+13089;EGYPTIAN HIEROGLYPH D019;Lo;0;L;;;;;N;;;;;
+1308A;EGYPTIAN HIEROGLYPH D020;Lo;0;L;;;;;N;;;;;
+1308B;EGYPTIAN HIEROGLYPH D021;Lo;0;L;;;;;N;;;;;
+1308C;EGYPTIAN HIEROGLYPH D022;Lo;0;L;;;;;N;;;;;
+1308D;EGYPTIAN HIEROGLYPH D023;Lo;0;L;;;;;N;;;;;
+1308E;EGYPTIAN HIEROGLYPH D024;Lo;0;L;;;;;N;;;;;
+1308F;EGYPTIAN HIEROGLYPH D025;Lo;0;L;;;;;N;;;;;
+13090;EGYPTIAN HIEROGLYPH D026;Lo;0;L;;;;;N;;;;;
+13091;EGYPTIAN HIEROGLYPH D027;Lo;0;L;;;;;N;;;;;
+13092;EGYPTIAN HIEROGLYPH D027A;Lo;0;L;;;;;N;;;;;
+13093;EGYPTIAN HIEROGLYPH D028;Lo;0;L;;;;;N;;;;;
+13094;EGYPTIAN HIEROGLYPH D029;Lo;0;L;;;;;N;;;;;
+13095;EGYPTIAN HIEROGLYPH D030;Lo;0;L;;;;;N;;;;;
+13096;EGYPTIAN HIEROGLYPH D031;Lo;0;L;;;;;N;;;;;
+13097;EGYPTIAN HIEROGLYPH D031A;Lo;0;L;;;;;N;;;;;
+13098;EGYPTIAN HIEROGLYPH D032;Lo;0;L;;;;;N;;;;;
+13099;EGYPTIAN HIEROGLYPH D033;Lo;0;L;;;;;N;;;;;
+1309A;EGYPTIAN HIEROGLYPH D034;Lo;0;L;;;;;N;;;;;
+1309B;EGYPTIAN HIEROGLYPH D034A;Lo;0;L;;;;;N;;;;;
+1309C;EGYPTIAN HIEROGLYPH D035;Lo;0;L;;;;;N;;;;;
+1309D;EGYPTIAN HIEROGLYPH D036;Lo;0;L;;;;;N;;;;;
+1309E;EGYPTIAN HIEROGLYPH D037;Lo;0;L;;;;;N;;;;;
+1309F;EGYPTIAN HIEROGLYPH D038;Lo;0;L;;;;;N;;;;;
+130A0;EGYPTIAN HIEROGLYPH D039;Lo;0;L;;;;;N;;;;;
+130A1;EGYPTIAN HIEROGLYPH D040;Lo;0;L;;;;;N;;;;;
+130A2;EGYPTIAN HIEROGLYPH D041;Lo;0;L;;;;;N;;;;;
+130A3;EGYPTIAN HIEROGLYPH D042;Lo;0;L;;;;;N;;;;;
+130A4;EGYPTIAN HIEROGLYPH D043;Lo;0;L;;;;;N;;;;;
+130A5;EGYPTIAN HIEROGLYPH D044;Lo;0;L;;;;;N;;;;;
+130A6;EGYPTIAN HIEROGLYPH D045;Lo;0;L;;;;;N;;;;;
+130A7;EGYPTIAN HIEROGLYPH D046;Lo;0;L;;;;;N;;;;;
+130A8;EGYPTIAN HIEROGLYPH D046A;Lo;0;L;;;;;N;;;;;
+130A9;EGYPTIAN HIEROGLYPH D047;Lo;0;L;;;;;N;;;;;
+130AA;EGYPTIAN HIEROGLYPH D048;Lo;0;L;;;;;N;;;;;
+130AB;EGYPTIAN HIEROGLYPH D048A;Lo;0;L;;;;;N;;;;;
+130AC;EGYPTIAN HIEROGLYPH D049;Lo;0;L;;;;;N;;;;;
+130AD;EGYPTIAN HIEROGLYPH D050;Lo;0;L;;;;;N;;;;;
+130AE;EGYPTIAN HIEROGLYPH D050A;Lo;0;L;;;;;N;;;;;
+130AF;EGYPTIAN HIEROGLYPH D050B;Lo;0;L;;;;;N;;;;;
+130B0;EGYPTIAN HIEROGLYPH D050C;Lo;0;L;;;;;N;;;;;
+130B1;EGYPTIAN HIEROGLYPH D050D;Lo;0;L;;;;;N;;;;;
+130B2;EGYPTIAN HIEROGLYPH D050E;Lo;0;L;;;;;N;;;;;
+130B3;EGYPTIAN HIEROGLYPH D050F;Lo;0;L;;;;;N;;;;;
+130B4;EGYPTIAN HIEROGLYPH D050G;Lo;0;L;;;;;N;;;;;
+130B5;EGYPTIAN HIEROGLYPH D050H;Lo;0;L;;;;;N;;;;;
+130B6;EGYPTIAN HIEROGLYPH D050I;Lo;0;L;;;;;N;;;;;
+130B7;EGYPTIAN HIEROGLYPH D051;Lo;0;L;;;;;N;;;;;
+130B8;EGYPTIAN HIEROGLYPH D052;Lo;0;L;;;;;N;;;;;
+130B9;EGYPTIAN HIEROGLYPH D052A;Lo;0;L;;;;;N;;;;;
+130BA;EGYPTIAN HIEROGLYPH D053;Lo;0;L;;;;;N;;;;;
+130BB;EGYPTIAN HIEROGLYPH D054;Lo;0;L;;;;;N;;;;;
+130BC;EGYPTIAN HIEROGLYPH D054A;Lo;0;L;;;;;N;;;;;
+130BD;EGYPTIAN HIEROGLYPH D055;Lo;0;L;;;;;N;;;;;
+130BE;EGYPTIAN HIEROGLYPH D056;Lo;0;L;;;;;N;;;;;
+130BF;EGYPTIAN HIEROGLYPH D057;Lo;0;L;;;;;N;;;;;
+130C0;EGYPTIAN HIEROGLYPH D058;Lo;0;L;;;;;N;;;;;
+130C1;EGYPTIAN HIEROGLYPH D059;Lo;0;L;;;;;N;;;;;
+130C2;EGYPTIAN HIEROGLYPH D060;Lo;0;L;;;;;N;;;;;
+130C3;EGYPTIAN HIEROGLYPH D061;Lo;0;L;;;;;N;;;;;
+130C4;EGYPTIAN HIEROGLYPH D062;Lo;0;L;;;;;N;;;;;
+130C5;EGYPTIAN HIEROGLYPH D063;Lo;0;L;;;;;N;;;;;
+130C6;EGYPTIAN HIEROGLYPH D064;Lo;0;L;;;;;N;;;;;
+130C7;EGYPTIAN HIEROGLYPH D065;Lo;0;L;;;;;N;;;;;
+130C8;EGYPTIAN HIEROGLYPH D066;Lo;0;L;;;;;N;;;;;
+130C9;EGYPTIAN HIEROGLYPH D067;Lo;0;L;;;;;N;;;;;
+130CA;EGYPTIAN HIEROGLYPH D067A;Lo;0;L;;;;;N;;;;;
+130CB;EGYPTIAN HIEROGLYPH D067B;Lo;0;L;;;;;N;;;;;
+130CC;EGYPTIAN HIEROGLYPH D067C;Lo;0;L;;;;;N;;;;;
+130CD;EGYPTIAN HIEROGLYPH D067D;Lo;0;L;;;;;N;;;;;
+130CE;EGYPTIAN HIEROGLYPH D067E;Lo;0;L;;;;;N;;;;;
+130CF;EGYPTIAN HIEROGLYPH D067F;Lo;0;L;;;;;N;;;;;
+130D0;EGYPTIAN HIEROGLYPH D067G;Lo;0;L;;;;;N;;;;;
+130D1;EGYPTIAN HIEROGLYPH D067H;Lo;0;L;;;;;N;;;;;
+130D2;EGYPTIAN HIEROGLYPH E001;Lo;0;L;;;;;N;;;;;
+130D3;EGYPTIAN HIEROGLYPH E002;Lo;0;L;;;;;N;;;;;
+130D4;EGYPTIAN HIEROGLYPH E003;Lo;0;L;;;;;N;;;;;
+130D5;EGYPTIAN HIEROGLYPH E004;Lo;0;L;;;;;N;;;;;
+130D6;EGYPTIAN HIEROGLYPH E005;Lo;0;L;;;;;N;;;;;
+130D7;EGYPTIAN HIEROGLYPH E006;Lo;0;L;;;;;N;;;;;
+130D8;EGYPTIAN HIEROGLYPH E007;Lo;0;L;;;;;N;;;;;
+130D9;EGYPTIAN HIEROGLYPH E008;Lo;0;L;;;;;N;;;;;
+130DA;EGYPTIAN HIEROGLYPH E008A;Lo;0;L;;;;;N;;;;;
+130DB;EGYPTIAN HIEROGLYPH E009;Lo;0;L;;;;;N;;;;;
+130DC;EGYPTIAN HIEROGLYPH E009A;Lo;0;L;;;;;N;;;;;
+130DD;EGYPTIAN HIEROGLYPH E010;Lo;0;L;;;;;N;;;;;
+130DE;EGYPTIAN HIEROGLYPH E011;Lo;0;L;;;;;N;;;;;
+130DF;EGYPTIAN HIEROGLYPH E012;Lo;0;L;;;;;N;;;;;
+130E0;EGYPTIAN HIEROGLYPH E013;Lo;0;L;;;;;N;;;;;
+130E1;EGYPTIAN HIEROGLYPH E014;Lo;0;L;;;;;N;;;;;
+130E2;EGYPTIAN HIEROGLYPH E015;Lo;0;L;;;;;N;;;;;
+130E3;EGYPTIAN HIEROGLYPH E016;Lo;0;L;;;;;N;;;;;
+130E4;EGYPTIAN HIEROGLYPH E016A;Lo;0;L;;;;;N;;;;;
+130E5;EGYPTIAN HIEROGLYPH E017;Lo;0;L;;;;;N;;;;;
+130E6;EGYPTIAN HIEROGLYPH E017A;Lo;0;L;;;;;N;;;;;
+130E7;EGYPTIAN HIEROGLYPH E018;Lo;0;L;;;;;N;;;;;
+130E8;EGYPTIAN HIEROGLYPH E019;Lo;0;L;;;;;N;;;;;
+130E9;EGYPTIAN HIEROGLYPH E020;Lo;0;L;;;;;N;;;;;
+130EA;EGYPTIAN HIEROGLYPH E020A;Lo;0;L;;;;;N;;;;;
+130EB;EGYPTIAN HIEROGLYPH E021;Lo;0;L;;;;;N;;;;;
+130EC;EGYPTIAN HIEROGLYPH E022;Lo;0;L;;;;;N;;;;;
+130ED;EGYPTIAN HIEROGLYPH E023;Lo;0;L;;;;;N;;;;;
+130EE;EGYPTIAN HIEROGLYPH E024;Lo;0;L;;;;;N;;;;;
+130EF;EGYPTIAN HIEROGLYPH E025;Lo;0;L;;;;;N;;;;;
+130F0;EGYPTIAN HIEROGLYPH E026;Lo;0;L;;;;;N;;;;;
+130F1;EGYPTIAN HIEROGLYPH E027;Lo;0;L;;;;;N;;;;;
+130F2;EGYPTIAN HIEROGLYPH E028;Lo;0;L;;;;;N;;;;;
+130F3;EGYPTIAN HIEROGLYPH E028A;Lo;0;L;;;;;N;;;;;
+130F4;EGYPTIAN HIEROGLYPH E029;Lo;0;L;;;;;N;;;;;
+130F5;EGYPTIAN HIEROGLYPH E030;Lo;0;L;;;;;N;;;;;
+130F6;EGYPTIAN HIEROGLYPH E031;Lo;0;L;;;;;N;;;;;
+130F7;EGYPTIAN HIEROGLYPH E032;Lo;0;L;;;;;N;;;;;
+130F8;EGYPTIAN HIEROGLYPH E033;Lo;0;L;;;;;N;;;;;
+130F9;EGYPTIAN HIEROGLYPH E034;Lo;0;L;;;;;N;;;;;
+130FA;EGYPTIAN HIEROGLYPH E034A;Lo;0;L;;;;;N;;;;;
+130FB;EGYPTIAN HIEROGLYPH E036;Lo;0;L;;;;;N;;;;;
+130FC;EGYPTIAN HIEROGLYPH E037;Lo;0;L;;;;;N;;;;;
+130FD;EGYPTIAN HIEROGLYPH E038;Lo;0;L;;;;;N;;;;;
+130FE;EGYPTIAN HIEROGLYPH F001;Lo;0;L;;;;;N;;;;;
+130FF;EGYPTIAN HIEROGLYPH F001A;Lo;0;L;;;;;N;;;;;
+13100;EGYPTIAN HIEROGLYPH F002;Lo;0;L;;;;;N;;;;;
+13101;EGYPTIAN HIEROGLYPH F003;Lo;0;L;;;;;N;;;;;
+13102;EGYPTIAN HIEROGLYPH F004;Lo;0;L;;;;;N;;;;;
+13103;EGYPTIAN HIEROGLYPH F005;Lo;0;L;;;;;N;;;;;
+13104;EGYPTIAN HIEROGLYPH F006;Lo;0;L;;;;;N;;;;;
+13105;EGYPTIAN HIEROGLYPH F007;Lo;0;L;;;;;N;;;;;
+13106;EGYPTIAN HIEROGLYPH F008;Lo;0;L;;;;;N;;;;;
+13107;EGYPTIAN HIEROGLYPH F009;Lo;0;L;;;;;N;;;;;
+13108;EGYPTIAN HIEROGLYPH F010;Lo;0;L;;;;;N;;;;;
+13109;EGYPTIAN HIEROGLYPH F011;Lo;0;L;;;;;N;;;;;
+1310A;EGYPTIAN HIEROGLYPH F012;Lo;0;L;;;;;N;;;;;
+1310B;EGYPTIAN HIEROGLYPH F013;Lo;0;L;;;;;N;;;;;
+1310C;EGYPTIAN HIEROGLYPH F013A;Lo;0;L;;;;;N;;;;;
+1310D;EGYPTIAN HIEROGLYPH F014;Lo;0;L;;;;;N;;;;;
+1310E;EGYPTIAN HIEROGLYPH F015;Lo;0;L;;;;;N;;;;;
+1310F;EGYPTIAN HIEROGLYPH F016;Lo;0;L;;;;;N;;;;;
+13110;EGYPTIAN HIEROGLYPH F017;Lo;0;L;;;;;N;;;;;
+13111;EGYPTIAN HIEROGLYPH F018;Lo;0;L;;;;;N;;;;;
+13112;EGYPTIAN HIEROGLYPH F019;Lo;0;L;;;;;N;;;;;
+13113;EGYPTIAN HIEROGLYPH F020;Lo;0;L;;;;;N;;;;;
+13114;EGYPTIAN HIEROGLYPH F021;Lo;0;L;;;;;N;;;;;
+13115;EGYPTIAN HIEROGLYPH F021A;Lo;0;L;;;;;N;;;;;
+13116;EGYPTIAN HIEROGLYPH F022;Lo;0;L;;;;;N;;;;;
+13117;EGYPTIAN HIEROGLYPH F023;Lo;0;L;;;;;N;;;;;
+13118;EGYPTIAN HIEROGLYPH F024;Lo;0;L;;;;;N;;;;;
+13119;EGYPTIAN HIEROGLYPH F025;Lo;0;L;;;;;N;;;;;
+1311A;EGYPTIAN HIEROGLYPH F026;Lo;0;L;;;;;N;;;;;
+1311B;EGYPTIAN HIEROGLYPH F027;Lo;0;L;;;;;N;;;;;
+1311C;EGYPTIAN HIEROGLYPH F028;Lo;0;L;;;;;N;;;;;
+1311D;EGYPTIAN HIEROGLYPH F029;Lo;0;L;;;;;N;;;;;
+1311E;EGYPTIAN HIEROGLYPH F030;Lo;0;L;;;;;N;;;;;
+1311F;EGYPTIAN HIEROGLYPH F031;Lo;0;L;;;;;N;;;;;
+13120;EGYPTIAN HIEROGLYPH F031A;Lo;0;L;;;;;N;;;;;
+13121;EGYPTIAN HIEROGLYPH F032;Lo;0;L;;;;;N;;;;;
+13122;EGYPTIAN HIEROGLYPH F033;Lo;0;L;;;;;N;;;;;
+13123;EGYPTIAN HIEROGLYPH F034;Lo;0;L;;;;;N;;;;;
+13124;EGYPTIAN HIEROGLYPH F035;Lo;0;L;;;;;N;;;;;
+13125;EGYPTIAN HIEROGLYPH F036;Lo;0;L;;;;;N;;;;;
+13126;EGYPTIAN HIEROGLYPH F037;Lo;0;L;;;;;N;;;;;
+13127;EGYPTIAN HIEROGLYPH F037A;Lo;0;L;;;;;N;;;;;
+13128;EGYPTIAN HIEROGLYPH F038;Lo;0;L;;;;;N;;;;;
+13129;EGYPTIAN HIEROGLYPH F038A;Lo;0;L;;;;;N;;;;;
+1312A;EGYPTIAN HIEROGLYPH F039;Lo;0;L;;;;;N;;;;;
+1312B;EGYPTIAN HIEROGLYPH F040;Lo;0;L;;;;;N;;;;;
+1312C;EGYPTIAN HIEROGLYPH F041;Lo;0;L;;;;;N;;;;;
+1312D;EGYPTIAN HIEROGLYPH F042;Lo;0;L;;;;;N;;;;;
+1312E;EGYPTIAN HIEROGLYPH F043;Lo;0;L;;;;;N;;;;;
+1312F;EGYPTIAN HIEROGLYPH F044;Lo;0;L;;;;;N;;;;;
+13130;EGYPTIAN HIEROGLYPH F045;Lo;0;L;;;;;N;;;;;
+13131;EGYPTIAN HIEROGLYPH F045A;Lo;0;L;;;;;N;;;;;
+13132;EGYPTIAN HIEROGLYPH F046;Lo;0;L;;;;;N;;;;;
+13133;EGYPTIAN HIEROGLYPH F046A;Lo;0;L;;;;;N;;;;;
+13134;EGYPTIAN HIEROGLYPH F047;Lo;0;L;;;;;N;;;;;
+13135;EGYPTIAN HIEROGLYPH F047A;Lo;0;L;;;;;N;;;;;
+13136;EGYPTIAN HIEROGLYPH F048;Lo;0;L;;;;;N;;;;;
+13137;EGYPTIAN HIEROGLYPH F049;Lo;0;L;;;;;N;;;;;
+13138;EGYPTIAN HIEROGLYPH F050;Lo;0;L;;;;;N;;;;;
+13139;EGYPTIAN HIEROGLYPH F051;Lo;0;L;;;;;N;;;;;
+1313A;EGYPTIAN HIEROGLYPH F051A;Lo;0;L;;;;;N;;;;;
+1313B;EGYPTIAN HIEROGLYPH F051B;Lo;0;L;;;;;N;;;;;
+1313C;EGYPTIAN HIEROGLYPH F051C;Lo;0;L;;;;;N;;;;;
+1313D;EGYPTIAN HIEROGLYPH F052;Lo;0;L;;;;;N;;;;;
+1313E;EGYPTIAN HIEROGLYPH F053;Lo;0;L;;;;;N;;;;;
+1313F;EGYPTIAN HIEROGLYPH G001;Lo;0;L;;;;;N;;;;;
+13140;EGYPTIAN HIEROGLYPH G002;Lo;0;L;;;;;N;;;;;
+13141;EGYPTIAN HIEROGLYPH G003;Lo;0;L;;;;;N;;;;;
+13142;EGYPTIAN HIEROGLYPH G004;Lo;0;L;;;;;N;;;;;
+13143;EGYPTIAN HIEROGLYPH G005;Lo;0;L;;;;;N;;;;;
+13144;EGYPTIAN HIEROGLYPH G006;Lo;0;L;;;;;N;;;;;
+13145;EGYPTIAN HIEROGLYPH G006A;Lo;0;L;;;;;N;;;;;
+13146;EGYPTIAN HIEROGLYPH G007;Lo;0;L;;;;;N;;;;;
+13147;EGYPTIAN HIEROGLYPH G007A;Lo;0;L;;;;;N;;;;;
+13148;EGYPTIAN HIEROGLYPH G007B;Lo;0;L;;;;;N;;;;;
+13149;EGYPTIAN HIEROGLYPH G008;Lo;0;L;;;;;N;;;;;
+1314A;EGYPTIAN HIEROGLYPH G009;Lo;0;L;;;;;N;;;;;
+1314B;EGYPTIAN HIEROGLYPH G010;Lo;0;L;;;;;N;;;;;
+1314C;EGYPTIAN HIEROGLYPH G011;Lo;0;L;;;;;N;;;;;
+1314D;EGYPTIAN HIEROGLYPH G011A;Lo;0;L;;;;;N;;;;;
+1314E;EGYPTIAN HIEROGLYPH G012;Lo;0;L;;;;;N;;;;;
+1314F;EGYPTIAN HIEROGLYPH G013;Lo;0;L;;;;;N;;;;;
+13150;EGYPTIAN HIEROGLYPH G014;Lo;0;L;;;;;N;;;;;
+13151;EGYPTIAN HIEROGLYPH G015;Lo;0;L;;;;;N;;;;;
+13152;EGYPTIAN HIEROGLYPH G016;Lo;0;L;;;;;N;;;;;
+13153;EGYPTIAN HIEROGLYPH G017;Lo;0;L;;;;;N;;;;;
+13154;EGYPTIAN HIEROGLYPH G018;Lo;0;L;;;;;N;;;;;
+13155;EGYPTIAN HIEROGLYPH G019;Lo;0;L;;;;;N;;;;;
+13156;EGYPTIAN HIEROGLYPH G020;Lo;0;L;;;;;N;;;;;
+13157;EGYPTIAN HIEROGLYPH G020A;Lo;0;L;;;;;N;;;;;
+13158;EGYPTIAN HIEROGLYPH G021;Lo;0;L;;;;;N;;;;;
+13159;EGYPTIAN HIEROGLYPH G022;Lo;0;L;;;;;N;;;;;
+1315A;EGYPTIAN HIEROGLYPH G023;Lo;0;L;;;;;N;;;;;
+1315B;EGYPTIAN HIEROGLYPH G024;Lo;0;L;;;;;N;;;;;
+1315C;EGYPTIAN HIEROGLYPH G025;Lo;0;L;;;;;N;;;;;
+1315D;EGYPTIAN HIEROGLYPH G026;Lo;0;L;;;;;N;;;;;
+1315E;EGYPTIAN HIEROGLYPH G026A;Lo;0;L;;;;;N;;;;;
+1315F;EGYPTIAN HIEROGLYPH G027;Lo;0;L;;;;;N;;;;;
+13160;EGYPTIAN HIEROGLYPH G028;Lo;0;L;;;;;N;;;;;
+13161;EGYPTIAN HIEROGLYPH G029;Lo;0;L;;;;;N;;;;;
+13162;EGYPTIAN HIEROGLYPH G030;Lo;0;L;;;;;N;;;;;
+13163;EGYPTIAN HIEROGLYPH G031;Lo;0;L;;;;;N;;;;;
+13164;EGYPTIAN HIEROGLYPH G032;Lo;0;L;;;;;N;;;;;
+13165;EGYPTIAN HIEROGLYPH G033;Lo;0;L;;;;;N;;;;;
+13166;EGYPTIAN HIEROGLYPH G034;Lo;0;L;;;;;N;;;;;
+13167;EGYPTIAN HIEROGLYPH G035;Lo;0;L;;;;;N;;;;;
+13168;EGYPTIAN HIEROGLYPH G036;Lo;0;L;;;;;N;;;;;
+13169;EGYPTIAN HIEROGLYPH G036A;Lo;0;L;;;;;N;;;;;
+1316A;EGYPTIAN HIEROGLYPH G037;Lo;0;L;;;;;N;;;;;
+1316B;EGYPTIAN HIEROGLYPH G037A;Lo;0;L;;;;;N;;;;;
+1316C;EGYPTIAN HIEROGLYPH G038;Lo;0;L;;;;;N;;;;;
+1316D;EGYPTIAN HIEROGLYPH G039;Lo;0;L;;;;;N;;;;;
+1316E;EGYPTIAN HIEROGLYPH G040;Lo;0;L;;;;;N;;;;;
+1316F;EGYPTIAN HIEROGLYPH G041;Lo;0;L;;;;;N;;;;;
+13170;EGYPTIAN HIEROGLYPH G042;Lo;0;L;;;;;N;;;;;
+13171;EGYPTIAN HIEROGLYPH G043;Lo;0;L;;;;;N;;;;;
+13172;EGYPTIAN HIEROGLYPH G043A;Lo;0;L;;;;;N;;;;;
+13173;EGYPTIAN HIEROGLYPH G044;Lo;0;L;;;;;N;;;;;
+13174;EGYPTIAN HIEROGLYPH G045;Lo;0;L;;;;;N;;;;;
+13175;EGYPTIAN HIEROGLYPH G045A;Lo;0;L;;;;;N;;;;;
+13176;EGYPTIAN HIEROGLYPH G046;Lo;0;L;;;;;N;;;;;
+13177;EGYPTIAN HIEROGLYPH G047;Lo;0;L;;;;;N;;;;;
+13178;EGYPTIAN HIEROGLYPH G048;Lo;0;L;;;;;N;;;;;
+13179;EGYPTIAN HIEROGLYPH G049;Lo;0;L;;;;;N;;;;;
+1317A;EGYPTIAN HIEROGLYPH G050;Lo;0;L;;;;;N;;;;;
+1317B;EGYPTIAN HIEROGLYPH G051;Lo;0;L;;;;;N;;;;;
+1317C;EGYPTIAN HIEROGLYPH G052;Lo;0;L;;;;;N;;;;;
+1317D;EGYPTIAN HIEROGLYPH G053;Lo;0;L;;;;;N;;;;;
+1317E;EGYPTIAN HIEROGLYPH G054;Lo;0;L;;;;;N;;;;;
+1317F;EGYPTIAN HIEROGLYPH H001;Lo;0;L;;;;;N;;;;;
+13180;EGYPTIAN HIEROGLYPH H002;Lo;0;L;;;;;N;;;;;
+13181;EGYPTIAN HIEROGLYPH H003;Lo;0;L;;;;;N;;;;;
+13182;EGYPTIAN HIEROGLYPH H004;Lo;0;L;;;;;N;;;;;
+13183;EGYPTIAN HIEROGLYPH H005;Lo;0;L;;;;;N;;;;;
+13184;EGYPTIAN HIEROGLYPH H006;Lo;0;L;;;;;N;;;;;
+13185;EGYPTIAN HIEROGLYPH H006A;Lo;0;L;;;;;N;;;;;
+13186;EGYPTIAN HIEROGLYPH H007;Lo;0;L;;;;;N;;;;;
+13187;EGYPTIAN HIEROGLYPH H008;Lo;0;L;;;;;N;;;;;
+13188;EGYPTIAN HIEROGLYPH I001;Lo;0;L;;;;;N;;;;;
+13189;EGYPTIAN HIEROGLYPH I002;Lo;0;L;;;;;N;;;;;
+1318A;EGYPTIAN HIEROGLYPH I003;Lo;0;L;;;;;N;;;;;
+1318B;EGYPTIAN HIEROGLYPH I004;Lo;0;L;;;;;N;;;;;
+1318C;EGYPTIAN HIEROGLYPH I005;Lo;0;L;;;;;N;;;;;
+1318D;EGYPTIAN HIEROGLYPH I005A;Lo;0;L;;;;;N;;;;;
+1318E;EGYPTIAN HIEROGLYPH I006;Lo;0;L;;;;;N;;;;;
+1318F;EGYPTIAN HIEROGLYPH I007;Lo;0;L;;;;;N;;;;;
+13190;EGYPTIAN HIEROGLYPH I008;Lo;0;L;;;;;N;;;;;
+13191;EGYPTIAN HIEROGLYPH I009;Lo;0;L;;;;;N;;;;;
+13192;EGYPTIAN HIEROGLYPH I009A;Lo;0;L;;;;;N;;;;;
+13193;EGYPTIAN HIEROGLYPH I010;Lo;0;L;;;;;N;;;;;
+13194;EGYPTIAN HIEROGLYPH I010A;Lo;0;L;;;;;N;;;;;
+13195;EGYPTIAN HIEROGLYPH I011;Lo;0;L;;;;;N;;;;;
+13196;EGYPTIAN HIEROGLYPH I011A;Lo;0;L;;;;;N;;;;;
+13197;EGYPTIAN HIEROGLYPH I012;Lo;0;L;;;;;N;;;;;
+13198;EGYPTIAN HIEROGLYPH I013;Lo;0;L;;;;;N;;;;;
+13199;EGYPTIAN HIEROGLYPH I014;Lo;0;L;;;;;N;;;;;
+1319A;EGYPTIAN HIEROGLYPH I015;Lo;0;L;;;;;N;;;;;
+1319B;EGYPTIAN HIEROGLYPH K001;Lo;0;L;;;;;N;;;;;
+1319C;EGYPTIAN HIEROGLYPH K002;Lo;0;L;;;;;N;;;;;
+1319D;EGYPTIAN HIEROGLYPH K003;Lo;0;L;;;;;N;;;;;
+1319E;EGYPTIAN HIEROGLYPH K004;Lo;0;L;;;;;N;;;;;
+1319F;EGYPTIAN HIEROGLYPH K005;Lo;0;L;;;;;N;;;;;
+131A0;EGYPTIAN HIEROGLYPH K006;Lo;0;L;;;;;N;;;;;
+131A1;EGYPTIAN HIEROGLYPH K007;Lo;0;L;;;;;N;;;;;
+131A2;EGYPTIAN HIEROGLYPH K008;Lo;0;L;;;;;N;;;;;
+131A3;EGYPTIAN HIEROGLYPH L001;Lo;0;L;;;;;N;;;;;
+131A4;EGYPTIAN HIEROGLYPH L002;Lo;0;L;;;;;N;;;;;
+131A5;EGYPTIAN HIEROGLYPH L002A;Lo;0;L;;;;;N;;;;;
+131A6;EGYPTIAN HIEROGLYPH L003;Lo;0;L;;;;;N;;;;;
+131A7;EGYPTIAN HIEROGLYPH L004;Lo;0;L;;;;;N;;;;;
+131A8;EGYPTIAN HIEROGLYPH L005;Lo;0;L;;;;;N;;;;;
+131A9;EGYPTIAN HIEROGLYPH L006;Lo;0;L;;;;;N;;;;;
+131AA;EGYPTIAN HIEROGLYPH L006A;Lo;0;L;;;;;N;;;;;
+131AB;EGYPTIAN HIEROGLYPH L007;Lo;0;L;;;;;N;;;;;
+131AC;EGYPTIAN HIEROGLYPH L008;Lo;0;L;;;;;N;;;;;
+131AD;EGYPTIAN HIEROGLYPH M001;Lo;0;L;;;;;N;;;;;
+131AE;EGYPTIAN HIEROGLYPH M001A;Lo;0;L;;;;;N;;;;;
+131AF;EGYPTIAN HIEROGLYPH M001B;Lo;0;L;;;;;N;;;;;
+131B0;EGYPTIAN HIEROGLYPH M002;Lo;0;L;;;;;N;;;;;
+131B1;EGYPTIAN HIEROGLYPH M003;Lo;0;L;;;;;N;;;;;
+131B2;EGYPTIAN HIEROGLYPH M003A;Lo;0;L;;;;;N;;;;;
+131B3;EGYPTIAN HIEROGLYPH M004;Lo;0;L;;;;;N;;;;;
+131B4;EGYPTIAN HIEROGLYPH M005;Lo;0;L;;;;;N;;;;;
+131B5;EGYPTIAN HIEROGLYPH M006;Lo;0;L;;;;;N;;;;;
+131B6;EGYPTIAN HIEROGLYPH M007;Lo;0;L;;;;;N;;;;;
+131B7;EGYPTIAN HIEROGLYPH M008;Lo;0;L;;;;;N;;;;;
+131B8;EGYPTIAN HIEROGLYPH M009;Lo;0;L;;;;;N;;;;;
+131B9;EGYPTIAN HIEROGLYPH M010;Lo;0;L;;;;;N;;;;;
+131BA;EGYPTIAN HIEROGLYPH M010A;Lo;0;L;;;;;N;;;;;
+131BB;EGYPTIAN HIEROGLYPH M011;Lo;0;L;;;;;N;;;;;
+131BC;EGYPTIAN HIEROGLYPH M012;Lo;0;L;;;;;N;;;;;
+131BD;EGYPTIAN HIEROGLYPH M012A;Lo;0;L;;;;;N;;;;;
+131BE;EGYPTIAN HIEROGLYPH M012B;Lo;0;L;;;;;N;;;;;
+131BF;EGYPTIAN HIEROGLYPH M012C;Lo;0;L;;;;;N;;;;;
+131C0;EGYPTIAN HIEROGLYPH M012D;Lo;0;L;;;;;N;;;;;
+131C1;EGYPTIAN HIEROGLYPH M012E;Lo;0;L;;;;;N;;;;;
+131C2;EGYPTIAN HIEROGLYPH M012F;Lo;0;L;;;;;N;;;;;
+131C3;EGYPTIAN HIEROGLYPH M012G;Lo;0;L;;;;;N;;;;;
+131C4;EGYPTIAN HIEROGLYPH M012H;Lo;0;L;;;;;N;;;;;
+131C5;EGYPTIAN HIEROGLYPH M013;Lo;0;L;;;;;N;;;;;
+131C6;EGYPTIAN HIEROGLYPH M014;Lo;0;L;;;;;N;;;;;
+131C7;EGYPTIAN HIEROGLYPH M015;Lo;0;L;;;;;N;;;;;
+131C8;EGYPTIAN HIEROGLYPH M015A;Lo;0;L;;;;;N;;;;;
+131C9;EGYPTIAN HIEROGLYPH M016;Lo;0;L;;;;;N;;;;;
+131CA;EGYPTIAN HIEROGLYPH M016A;Lo;0;L;;;;;N;;;;;
+131CB;EGYPTIAN HIEROGLYPH M017;Lo;0;L;;;;;N;;;;;
+131CC;EGYPTIAN HIEROGLYPH M017A;Lo;0;L;;;;;N;;;;;
+131CD;EGYPTIAN HIEROGLYPH M018;Lo;0;L;;;;;N;;;;;
+131CE;EGYPTIAN HIEROGLYPH M019;Lo;0;L;;;;;N;;;;;
+131CF;EGYPTIAN HIEROGLYPH M020;Lo;0;L;;;;;N;;;;;
+131D0;EGYPTIAN HIEROGLYPH M021;Lo;0;L;;;;;N;;;;;
+131D1;EGYPTIAN HIEROGLYPH M022;Lo;0;L;;;;;N;;;;;
+131D2;EGYPTIAN HIEROGLYPH M022A;Lo;0;L;;;;;N;;;;;
+131D3;EGYPTIAN HIEROGLYPH M023;Lo;0;L;;;;;N;;;;;
+131D4;EGYPTIAN HIEROGLYPH M024;Lo;0;L;;;;;N;;;;;
+131D5;EGYPTIAN HIEROGLYPH M024A;Lo;0;L;;;;;N;;;;;
+131D6;EGYPTIAN HIEROGLYPH M025;Lo;0;L;;;;;N;;;;;
+131D7;EGYPTIAN HIEROGLYPH M026;Lo;0;L;;;;;N;;;;;
+131D8;EGYPTIAN HIEROGLYPH M027;Lo;0;L;;;;;N;;;;;
+131D9;EGYPTIAN HIEROGLYPH M028;Lo;0;L;;;;;N;;;;;
+131DA;EGYPTIAN HIEROGLYPH M028A;Lo;0;L;;;;;N;;;;;
+131DB;EGYPTIAN HIEROGLYPH M029;Lo;0;L;;;;;N;;;;;
+131DC;EGYPTIAN HIEROGLYPH M030;Lo;0;L;;;;;N;;;;;
+131DD;EGYPTIAN HIEROGLYPH M031;Lo;0;L;;;;;N;;;;;
+131DE;EGYPTIAN HIEROGLYPH M031A;Lo;0;L;;;;;N;;;;;
+131DF;EGYPTIAN HIEROGLYPH M032;Lo;0;L;;;;;N;;;;;
+131E0;EGYPTIAN HIEROGLYPH M033;Lo;0;L;;;;;N;;;;;
+131E1;EGYPTIAN HIEROGLYPH M033A;Lo;0;L;;;;;N;;;;;
+131E2;EGYPTIAN HIEROGLYPH M033B;Lo;0;L;;;;;N;;;;;
+131E3;EGYPTIAN HIEROGLYPH M034;Lo;0;L;;;;;N;;;;;
+131E4;EGYPTIAN HIEROGLYPH M035;Lo;0;L;;;;;N;;;;;
+131E5;EGYPTIAN HIEROGLYPH M036;Lo;0;L;;;;;N;;;;;
+131E6;EGYPTIAN HIEROGLYPH M037;Lo;0;L;;;;;N;;;;;
+131E7;EGYPTIAN HIEROGLYPH M038;Lo;0;L;;;;;N;;;;;
+131E8;EGYPTIAN HIEROGLYPH M039;Lo;0;L;;;;;N;;;;;
+131E9;EGYPTIAN HIEROGLYPH M040;Lo;0;L;;;;;N;;;;;
+131EA;EGYPTIAN HIEROGLYPH M040A;Lo;0;L;;;;;N;;;;;
+131EB;EGYPTIAN HIEROGLYPH M041;Lo;0;L;;;;;N;;;;;
+131EC;EGYPTIAN HIEROGLYPH M042;Lo;0;L;;;;;N;;;;;
+131ED;EGYPTIAN HIEROGLYPH M043;Lo;0;L;;;;;N;;;;;
+131EE;EGYPTIAN HIEROGLYPH M044;Lo;0;L;;;;;N;;;;;
+131EF;EGYPTIAN HIEROGLYPH N001;Lo;0;L;;;;;N;;;;;
+131F0;EGYPTIAN HIEROGLYPH N002;Lo;0;L;;;;;N;;;;;
+131F1;EGYPTIAN HIEROGLYPH N003;Lo;0;L;;;;;N;;;;;
+131F2;EGYPTIAN HIEROGLYPH N004;Lo;0;L;;;;;N;;;;;
+131F3;EGYPTIAN HIEROGLYPH N005;Lo;0;L;;;;;N;;;;;
+131F4;EGYPTIAN HIEROGLYPH N006;Lo;0;L;;;;;N;;;;;
+131F5;EGYPTIAN HIEROGLYPH N007;Lo;0;L;;;;;N;;;;;
+131F6;EGYPTIAN HIEROGLYPH N008;Lo;0;L;;;;;N;;;;;
+131F7;EGYPTIAN HIEROGLYPH N009;Lo;0;L;;;;;N;;;;;
+131F8;EGYPTIAN HIEROGLYPH N010;Lo;0;L;;;;;N;;;;;
+131F9;EGYPTIAN HIEROGLYPH N011;Lo;0;L;;;;;N;;;;;
+131FA;EGYPTIAN HIEROGLYPH N012;Lo;0;L;;;;;N;;;;;
+131FB;EGYPTIAN HIEROGLYPH N013;Lo;0;L;;;;;N;;;;;
+131FC;EGYPTIAN HIEROGLYPH N014;Lo;0;L;;;;;N;;;;;
+131FD;EGYPTIAN HIEROGLYPH N015;Lo;0;L;;;;;N;;;;;
+131FE;EGYPTIAN HIEROGLYPH N016;Lo;0;L;;;;;N;;;;;
+131FF;EGYPTIAN HIEROGLYPH N017;Lo;0;L;;;;;N;;;;;
+13200;EGYPTIAN HIEROGLYPH N018;Lo;0;L;;;;;N;;;;;
+13201;EGYPTIAN HIEROGLYPH N018A;Lo;0;L;;;;;N;;;;;
+13202;EGYPTIAN HIEROGLYPH N018B;Lo;0;L;;;;;N;;;;;
+13203;EGYPTIAN HIEROGLYPH N019;Lo;0;L;;;;;N;;;;;
+13204;EGYPTIAN HIEROGLYPH N020;Lo;0;L;;;;;N;;;;;
+13205;EGYPTIAN HIEROGLYPH N021;Lo;0;L;;;;;N;;;;;
+13206;EGYPTIAN HIEROGLYPH N022;Lo;0;L;;;;;N;;;;;
+13207;EGYPTIAN HIEROGLYPH N023;Lo;0;L;;;;;N;;;;;
+13208;EGYPTIAN HIEROGLYPH N024;Lo;0;L;;;;;N;;;;;
+13209;EGYPTIAN HIEROGLYPH N025;Lo;0;L;;;;;N;;;;;
+1320A;EGYPTIAN HIEROGLYPH N025A;Lo;0;L;;;;;N;;;;;
+1320B;EGYPTIAN HIEROGLYPH N026;Lo;0;L;;;;;N;;;;;
+1320C;EGYPTIAN HIEROGLYPH N027;Lo;0;L;;;;;N;;;;;
+1320D;EGYPTIAN HIEROGLYPH N028;Lo;0;L;;;;;N;;;;;
+1320E;EGYPTIAN HIEROGLYPH N029;Lo;0;L;;;;;N;;;;;
+1320F;EGYPTIAN HIEROGLYPH N030;Lo;0;L;;;;;N;;;;;
+13210;EGYPTIAN HIEROGLYPH N031;Lo;0;L;;;;;N;;;;;
+13211;EGYPTIAN HIEROGLYPH N032;Lo;0;L;;;;;N;;;;;
+13212;EGYPTIAN HIEROGLYPH N033;Lo;0;L;;;;;N;;;;;
+13213;EGYPTIAN HIEROGLYPH N033A;Lo;0;L;;;;;N;;;;;
+13214;EGYPTIAN HIEROGLYPH N034;Lo;0;L;;;;;N;;;;;
+13215;EGYPTIAN HIEROGLYPH N034A;Lo;0;L;;;;;N;;;;;
+13216;EGYPTIAN HIEROGLYPH N035;Lo;0;L;;;;;N;;;;;
+13217;EGYPTIAN HIEROGLYPH N035A;Lo;0;L;;;;;N;;;;;
+13218;EGYPTIAN HIEROGLYPH N036;Lo;0;L;;;;;N;;;;;
+13219;EGYPTIAN HIEROGLYPH N037;Lo;0;L;;;;;N;;;;;
+1321A;EGYPTIAN HIEROGLYPH N037A;Lo;0;L;;;;;N;;;;;
+1321B;EGYPTIAN HIEROGLYPH N038;Lo;0;L;;;;;N;;;;;
+1321C;EGYPTIAN HIEROGLYPH N039;Lo;0;L;;;;;N;;;;;
+1321D;EGYPTIAN HIEROGLYPH N040;Lo;0;L;;;;;N;;;;;
+1321E;EGYPTIAN HIEROGLYPH N041;Lo;0;L;;;;;N;;;;;
+1321F;EGYPTIAN HIEROGLYPH N042;Lo;0;L;;;;;N;;;;;
+13220;EGYPTIAN HIEROGLYPH NL001;Lo;0;L;;;;;N;;;;;
+13221;EGYPTIAN HIEROGLYPH NL002;Lo;0;L;;;;;N;;;;;
+13222;EGYPTIAN HIEROGLYPH NL003;Lo;0;L;;;;;N;;;;;
+13223;EGYPTIAN HIEROGLYPH NL004;Lo;0;L;;;;;N;;;;;
+13224;EGYPTIAN HIEROGLYPH NL005;Lo;0;L;;;;;N;;;;;
+13225;EGYPTIAN HIEROGLYPH NL005A;Lo;0;L;;;;;N;;;;;
+13226;EGYPTIAN HIEROGLYPH NL006;Lo;0;L;;;;;N;;;;;
+13227;EGYPTIAN HIEROGLYPH NL007;Lo;0;L;;;;;N;;;;;
+13228;EGYPTIAN HIEROGLYPH NL008;Lo;0;L;;;;;N;;;;;
+13229;EGYPTIAN HIEROGLYPH NL009;Lo;0;L;;;;;N;;;;;
+1322A;EGYPTIAN HIEROGLYPH NL010;Lo;0;L;;;;;N;;;;;
+1322B;EGYPTIAN HIEROGLYPH NL011;Lo;0;L;;;;;N;;;;;
+1322C;EGYPTIAN HIEROGLYPH NL012;Lo;0;L;;;;;N;;;;;
+1322D;EGYPTIAN HIEROGLYPH NL013;Lo;0;L;;;;;N;;;;;
+1322E;EGYPTIAN HIEROGLYPH NL014;Lo;0;L;;;;;N;;;;;
+1322F;EGYPTIAN HIEROGLYPH NL015;Lo;0;L;;;;;N;;;;;
+13230;EGYPTIAN HIEROGLYPH NL016;Lo;0;L;;;;;N;;;;;
+13231;EGYPTIAN HIEROGLYPH NL017;Lo;0;L;;;;;N;;;;;
+13232;EGYPTIAN HIEROGLYPH NL017A;Lo;0;L;;;;;N;;;;;
+13233;EGYPTIAN HIEROGLYPH NL018;Lo;0;L;;;;;N;;;;;
+13234;EGYPTIAN HIEROGLYPH NL019;Lo;0;L;;;;;N;;;;;
+13235;EGYPTIAN HIEROGLYPH NL020;Lo;0;L;;;;;N;;;;;
+13236;EGYPTIAN HIEROGLYPH NU001;Lo;0;L;;;;;N;;;;;
+13237;EGYPTIAN HIEROGLYPH NU002;Lo;0;L;;;;;N;;;;;
+13238;EGYPTIAN HIEROGLYPH NU003;Lo;0;L;;;;;N;;;;;
+13239;EGYPTIAN HIEROGLYPH NU004;Lo;0;L;;;;;N;;;;;
+1323A;EGYPTIAN HIEROGLYPH NU005;Lo;0;L;;;;;N;;;;;
+1323B;EGYPTIAN HIEROGLYPH NU006;Lo;0;L;;;;;N;;;;;
+1323C;EGYPTIAN HIEROGLYPH NU007;Lo;0;L;;;;;N;;;;;
+1323D;EGYPTIAN HIEROGLYPH NU008;Lo;0;L;;;;;N;;;;;
+1323E;EGYPTIAN HIEROGLYPH NU009;Lo;0;L;;;;;N;;;;;
+1323F;EGYPTIAN HIEROGLYPH NU010;Lo;0;L;;;;;N;;;;;
+13240;EGYPTIAN HIEROGLYPH NU010A;Lo;0;L;;;;;N;;;;;
+13241;EGYPTIAN HIEROGLYPH NU011;Lo;0;L;;;;;N;;;;;
+13242;EGYPTIAN HIEROGLYPH NU011A;Lo;0;L;;;;;N;;;;;
+13243;EGYPTIAN HIEROGLYPH NU012;Lo;0;L;;;;;N;;;;;
+13244;EGYPTIAN HIEROGLYPH NU013;Lo;0;L;;;;;N;;;;;
+13245;EGYPTIAN HIEROGLYPH NU014;Lo;0;L;;;;;N;;;;;
+13246;EGYPTIAN HIEROGLYPH NU015;Lo;0;L;;;;;N;;;;;
+13247;EGYPTIAN HIEROGLYPH NU016;Lo;0;L;;;;;N;;;;;
+13248;EGYPTIAN HIEROGLYPH NU017;Lo;0;L;;;;;N;;;;;
+13249;EGYPTIAN HIEROGLYPH NU018;Lo;0;L;;;;;N;;;;;
+1324A;EGYPTIAN HIEROGLYPH NU018A;Lo;0;L;;;;;N;;;;;
+1324B;EGYPTIAN HIEROGLYPH NU019;Lo;0;L;;;;;N;;;;;
+1324C;EGYPTIAN HIEROGLYPH NU020;Lo;0;L;;;;;N;;;;;
+1324D;EGYPTIAN HIEROGLYPH NU021;Lo;0;L;;;;;N;;;;;
+1324E;EGYPTIAN HIEROGLYPH NU022;Lo;0;L;;;;;N;;;;;
+1324F;EGYPTIAN HIEROGLYPH NU022A;Lo;0;L;;;;;N;;;;;
+13250;EGYPTIAN HIEROGLYPH O001;Lo;0;L;;;;;N;;;;;
+13251;EGYPTIAN HIEROGLYPH O001A;Lo;0;L;;;;;N;;;;;
+13252;EGYPTIAN HIEROGLYPH O002;Lo;0;L;;;;;N;;;;;
+13253;EGYPTIAN HIEROGLYPH O003;Lo;0;L;;;;;N;;;;;
+13254;EGYPTIAN HIEROGLYPH O004;Lo;0;L;;;;;N;;;;;
+13255;EGYPTIAN HIEROGLYPH O005;Lo;0;L;;;;;N;;;;;
+13256;EGYPTIAN HIEROGLYPH O005A;Lo;0;L;;;;;N;;;;;
+13257;EGYPTIAN HIEROGLYPH O006;Lo;0;L;;;;;N;;;;;
+13258;EGYPTIAN HIEROGLYPH O006A;Lo;0;L;;;;;N;;;;;
+13259;EGYPTIAN HIEROGLYPH O006B;Lo;0;L;;;;;N;;;;;
+1325A;EGYPTIAN HIEROGLYPH O006C;Lo;0;L;;;;;N;;;;;
+1325B;EGYPTIAN HIEROGLYPH O006D;Lo;0;L;;;;;N;;;;;
+1325C;EGYPTIAN HIEROGLYPH O006E;Lo;0;L;;;;;N;;;;;
+1325D;EGYPTIAN HIEROGLYPH O006F;Lo;0;L;;;;;N;;;;;
+1325E;EGYPTIAN HIEROGLYPH O007;Lo;0;L;;;;;N;;;;;
+1325F;EGYPTIAN HIEROGLYPH O008;Lo;0;L;;;;;N;;;;;
+13260;EGYPTIAN HIEROGLYPH O009;Lo;0;L;;;;;N;;;;;
+13261;EGYPTIAN HIEROGLYPH O010;Lo;0;L;;;;;N;;;;;
+13262;EGYPTIAN HIEROGLYPH O010A;Lo;0;L;;;;;N;;;;;
+13263;EGYPTIAN HIEROGLYPH O010B;Lo;0;L;;;;;N;;;;;
+13264;EGYPTIAN HIEROGLYPH O010C;Lo;0;L;;;;;N;;;;;
+13265;EGYPTIAN HIEROGLYPH O011;Lo;0;L;;;;;N;;;;;
+13266;EGYPTIAN HIEROGLYPH O012;Lo;0;L;;;;;N;;;;;
+13267;EGYPTIAN HIEROGLYPH O013;Lo;0;L;;;;;N;;;;;
+13268;EGYPTIAN HIEROGLYPH O014;Lo;0;L;;;;;N;;;;;
+13269;EGYPTIAN HIEROGLYPH O015;Lo;0;L;;;;;N;;;;;
+1326A;EGYPTIAN HIEROGLYPH O016;Lo;0;L;;;;;N;;;;;
+1326B;EGYPTIAN HIEROGLYPH O017;Lo;0;L;;;;;N;;;;;
+1326C;EGYPTIAN HIEROGLYPH O018;Lo;0;L;;;;;N;;;;;
+1326D;EGYPTIAN HIEROGLYPH O019;Lo;0;L;;;;;N;;;;;
+1326E;EGYPTIAN HIEROGLYPH O019A;Lo;0;L;;;;;N;;;;;
+1326F;EGYPTIAN HIEROGLYPH O020;Lo;0;L;;;;;N;;;;;
+13270;EGYPTIAN HIEROGLYPH O020A;Lo;0;L;;;;;N;;;;;
+13271;EGYPTIAN HIEROGLYPH O021;Lo;0;L;;;;;N;;;;;
+13272;EGYPTIAN HIEROGLYPH O022;Lo;0;L;;;;;N;;;;;
+13273;EGYPTIAN HIEROGLYPH O023;Lo;0;L;;;;;N;;;;;
+13274;EGYPTIAN HIEROGLYPH O024;Lo;0;L;;;;;N;;;;;
+13275;EGYPTIAN HIEROGLYPH O024A;Lo;0;L;;;;;N;;;;;
+13276;EGYPTIAN HIEROGLYPH O025;Lo;0;L;;;;;N;;;;;
+13277;EGYPTIAN HIEROGLYPH O025A;Lo;0;L;;;;;N;;;;;
+13278;EGYPTIAN HIEROGLYPH O026;Lo;0;L;;;;;N;;;;;
+13279;EGYPTIAN HIEROGLYPH O027;Lo;0;L;;;;;N;;;;;
+1327A;EGYPTIAN HIEROGLYPH O028;Lo;0;L;;;;;N;;;;;
+1327B;EGYPTIAN HIEROGLYPH O029;Lo;0;L;;;;;N;;;;;
+1327C;EGYPTIAN HIEROGLYPH O029A;Lo;0;L;;;;;N;;;;;
+1327D;EGYPTIAN HIEROGLYPH O030;Lo;0;L;;;;;N;;;;;
+1327E;EGYPTIAN HIEROGLYPH O030A;Lo;0;L;;;;;N;;;;;
+1327F;EGYPTIAN HIEROGLYPH O031;Lo;0;L;;;;;N;;;;;
+13280;EGYPTIAN HIEROGLYPH O032;Lo;0;L;;;;;N;;;;;
+13281;EGYPTIAN HIEROGLYPH O033;Lo;0;L;;;;;N;;;;;
+13282;EGYPTIAN HIEROGLYPH O033A;Lo;0;L;;;;;N;;;;;
+13283;EGYPTIAN HIEROGLYPH O034;Lo;0;L;;;;;N;;;;;
+13284;EGYPTIAN HIEROGLYPH O035;Lo;0;L;;;;;N;;;;;
+13285;EGYPTIAN HIEROGLYPH O036;Lo;0;L;;;;;N;;;;;
+13286;EGYPTIAN HIEROGLYPH O036A;Lo;0;L;;;;;N;;;;;
+13287;EGYPTIAN HIEROGLYPH O036B;Lo;0;L;;;;;N;;;;;
+13288;EGYPTIAN HIEROGLYPH O036C;Lo;0;L;;;;;N;;;;;
+13289;EGYPTIAN HIEROGLYPH O036D;Lo;0;L;;;;;N;;;;;
+1328A;EGYPTIAN HIEROGLYPH O037;Lo;0;L;;;;;N;;;;;
+1328B;EGYPTIAN HIEROGLYPH O038;Lo;0;L;;;;;N;;;;;
+1328C;EGYPTIAN HIEROGLYPH O039;Lo;0;L;;;;;N;;;;;
+1328D;EGYPTIAN HIEROGLYPH O040;Lo;0;L;;;;;N;;;;;
+1328E;EGYPTIAN HIEROGLYPH O041;Lo;0;L;;;;;N;;;;;
+1328F;EGYPTIAN HIEROGLYPH O042;Lo;0;L;;;;;N;;;;;
+13290;EGYPTIAN HIEROGLYPH O043;Lo;0;L;;;;;N;;;;;
+13291;EGYPTIAN HIEROGLYPH O044;Lo;0;L;;;;;N;;;;;
+13292;EGYPTIAN HIEROGLYPH O045;Lo;0;L;;;;;N;;;;;
+13293;EGYPTIAN HIEROGLYPH O046;Lo;0;L;;;;;N;;;;;
+13294;EGYPTIAN HIEROGLYPH O047;Lo;0;L;;;;;N;;;;;
+13295;EGYPTIAN HIEROGLYPH O048;Lo;0;L;;;;;N;;;;;
+13296;EGYPTIAN HIEROGLYPH O049;Lo;0;L;;;;;N;;;;;
+13297;EGYPTIAN HIEROGLYPH O050;Lo;0;L;;;;;N;;;;;
+13298;EGYPTIAN HIEROGLYPH O050A;Lo;0;L;;;;;N;;;;;
+13299;EGYPTIAN HIEROGLYPH O050B;Lo;0;L;;;;;N;;;;;
+1329A;EGYPTIAN HIEROGLYPH O051;Lo;0;L;;;;;N;;;;;
+1329B;EGYPTIAN HIEROGLYPH P001;Lo;0;L;;;;;N;;;;;
+1329C;EGYPTIAN HIEROGLYPH P001A;Lo;0;L;;;;;N;;;;;
+1329D;EGYPTIAN HIEROGLYPH P002;Lo;0;L;;;;;N;;;;;
+1329E;EGYPTIAN HIEROGLYPH P003;Lo;0;L;;;;;N;;;;;
+1329F;EGYPTIAN HIEROGLYPH P003A;Lo;0;L;;;;;N;;;;;
+132A0;EGYPTIAN HIEROGLYPH P004;Lo;0;L;;;;;N;;;;;
+132A1;EGYPTIAN HIEROGLYPH P005;Lo;0;L;;;;;N;;;;;
+132A2;EGYPTIAN HIEROGLYPH P006;Lo;0;L;;;;;N;;;;;
+132A3;EGYPTIAN HIEROGLYPH P007;Lo;0;L;;;;;N;;;;;
+132A4;EGYPTIAN HIEROGLYPH P008;Lo;0;L;;;;;N;;;;;
+132A5;EGYPTIAN HIEROGLYPH P009;Lo;0;L;;;;;N;;;;;
+132A6;EGYPTIAN HIEROGLYPH P010;Lo;0;L;;;;;N;;;;;
+132A7;EGYPTIAN HIEROGLYPH P011;Lo;0;L;;;;;N;;;;;
+132A8;EGYPTIAN HIEROGLYPH Q001;Lo;0;L;;;;;N;;;;;
+132A9;EGYPTIAN HIEROGLYPH Q002;Lo;0;L;;;;;N;;;;;
+132AA;EGYPTIAN HIEROGLYPH Q003;Lo;0;L;;;;;N;;;;;
+132AB;EGYPTIAN HIEROGLYPH Q004;Lo;0;L;;;;;N;;;;;
+132AC;EGYPTIAN HIEROGLYPH Q005;Lo;0;L;;;;;N;;;;;
+132AD;EGYPTIAN HIEROGLYPH Q006;Lo;0;L;;;;;N;;;;;
+132AE;EGYPTIAN HIEROGLYPH Q007;Lo;0;L;;;;;N;;;;;
+132AF;EGYPTIAN HIEROGLYPH R001;Lo;0;L;;;;;N;;;;;
+132B0;EGYPTIAN HIEROGLYPH R002;Lo;0;L;;;;;N;;;;;
+132B1;EGYPTIAN HIEROGLYPH R002A;Lo;0;L;;;;;N;;;;;
+132B2;EGYPTIAN HIEROGLYPH R003;Lo;0;L;;;;;N;;;;;
+132B3;EGYPTIAN HIEROGLYPH R003A;Lo;0;L;;;;;N;;;;;
+132B4;EGYPTIAN HIEROGLYPH R003B;Lo;0;L;;;;;N;;;;;
+132B5;EGYPTIAN HIEROGLYPH R004;Lo;0;L;;;;;N;;;;;
+132B6;EGYPTIAN HIEROGLYPH R005;Lo;0;L;;;;;N;;;;;
+132B7;EGYPTIAN HIEROGLYPH R006;Lo;0;L;;;;;N;;;;;
+132B8;EGYPTIAN HIEROGLYPH R007;Lo;0;L;;;;;N;;;;;
+132B9;EGYPTIAN HIEROGLYPH R008;Lo;0;L;;;;;N;;;;;
+132BA;EGYPTIAN HIEROGLYPH R009;Lo;0;L;;;;;N;;;;;
+132BB;EGYPTIAN HIEROGLYPH R010;Lo;0;L;;;;;N;;;;;
+132BC;EGYPTIAN HIEROGLYPH R010A;Lo;0;L;;;;;N;;;;;
+132BD;EGYPTIAN HIEROGLYPH R011;Lo;0;L;;;;;N;;;;;
+132BE;EGYPTIAN HIEROGLYPH R012;Lo;0;L;;;;;N;;;;;
+132BF;EGYPTIAN HIEROGLYPH R013;Lo;0;L;;;;;N;;;;;
+132C0;EGYPTIAN HIEROGLYPH R014;Lo;0;L;;;;;N;;;;;
+132C1;EGYPTIAN HIEROGLYPH R015;Lo;0;L;;;;;N;;;;;
+132C2;EGYPTIAN HIEROGLYPH R016;Lo;0;L;;;;;N;;;;;
+132C3;EGYPTIAN HIEROGLYPH R016A;Lo;0;L;;;;;N;;;;;
+132C4;EGYPTIAN HIEROGLYPH R017;Lo;0;L;;;;;N;;;;;
+132C5;EGYPTIAN HIEROGLYPH R018;Lo;0;L;;;;;N;;;;;
+132C6;EGYPTIAN HIEROGLYPH R019;Lo;0;L;;;;;N;;;;;
+132C7;EGYPTIAN HIEROGLYPH R020;Lo;0;L;;;;;N;;;;;
+132C8;EGYPTIAN HIEROGLYPH R021;Lo;0;L;;;;;N;;;;;
+132C9;EGYPTIAN HIEROGLYPH R022;Lo;0;L;;;;;N;;;;;
+132CA;EGYPTIAN HIEROGLYPH R023;Lo;0;L;;;;;N;;;;;
+132CB;EGYPTIAN HIEROGLYPH R024;Lo;0;L;;;;;N;;;;;
+132CC;EGYPTIAN HIEROGLYPH R025;Lo;0;L;;;;;N;;;;;
+132CD;EGYPTIAN HIEROGLYPH R026;Lo;0;L;;;;;N;;;;;
+132CE;EGYPTIAN HIEROGLYPH R027;Lo;0;L;;;;;N;;;;;
+132CF;EGYPTIAN HIEROGLYPH R028;Lo;0;L;;;;;N;;;;;
+132D0;EGYPTIAN HIEROGLYPH R029;Lo;0;L;;;;;N;;;;;
+132D1;EGYPTIAN HIEROGLYPH S001;Lo;0;L;;;;;N;;;;;
+132D2;EGYPTIAN HIEROGLYPH S002;Lo;0;L;;;;;N;;;;;
+132D3;EGYPTIAN HIEROGLYPH S002A;Lo;0;L;;;;;N;;;;;
+132D4;EGYPTIAN HIEROGLYPH S003;Lo;0;L;;;;;N;;;;;
+132D5;EGYPTIAN HIEROGLYPH S004;Lo;0;L;;;;;N;;;;;
+132D6;EGYPTIAN HIEROGLYPH S005;Lo;0;L;;;;;N;;;;;
+132D7;EGYPTIAN HIEROGLYPH S006;Lo;0;L;;;;;N;;;;;
+132D8;EGYPTIAN HIEROGLYPH S006A;Lo;0;L;;;;;N;;;;;
+132D9;EGYPTIAN HIEROGLYPH S007;Lo;0;L;;;;;N;;;;;
+132DA;EGYPTIAN HIEROGLYPH S008;Lo;0;L;;;;;N;;;;;
+132DB;EGYPTIAN HIEROGLYPH S009;Lo;0;L;;;;;N;;;;;
+132DC;EGYPTIAN HIEROGLYPH S010;Lo;0;L;;;;;N;;;;;
+132DD;EGYPTIAN HIEROGLYPH S011;Lo;0;L;;;;;N;;;;;
+132DE;EGYPTIAN HIEROGLYPH S012;Lo;0;L;;;;;N;;;;;
+132DF;EGYPTIAN HIEROGLYPH S013;Lo;0;L;;;;;N;;;;;
+132E0;EGYPTIAN HIEROGLYPH S014;Lo;0;L;;;;;N;;;;;
+132E1;EGYPTIAN HIEROGLYPH S014A;Lo;0;L;;;;;N;;;;;
+132E2;EGYPTIAN HIEROGLYPH S014B;Lo;0;L;;;;;N;;;;;
+132E3;EGYPTIAN HIEROGLYPH S015;Lo;0;L;;;;;N;;;;;
+132E4;EGYPTIAN HIEROGLYPH S016;Lo;0;L;;;;;N;;;;;
+132E5;EGYPTIAN HIEROGLYPH S017;Lo;0;L;;;;;N;;;;;
+132E6;EGYPTIAN HIEROGLYPH S017A;Lo;0;L;;;;;N;;;;;
+132E7;EGYPTIAN HIEROGLYPH S018;Lo;0;L;;;;;N;;;;;
+132E8;EGYPTIAN HIEROGLYPH S019;Lo;0;L;;;;;N;;;;;
+132E9;EGYPTIAN HIEROGLYPH S020;Lo;0;L;;;;;N;;;;;
+132EA;EGYPTIAN HIEROGLYPH S021;Lo;0;L;;;;;N;;;;;
+132EB;EGYPTIAN HIEROGLYPH S022;Lo;0;L;;;;;N;;;;;
+132EC;EGYPTIAN HIEROGLYPH S023;Lo;0;L;;;;;N;;;;;
+132ED;EGYPTIAN HIEROGLYPH S024;Lo;0;L;;;;;N;;;;;
+132EE;EGYPTIAN HIEROGLYPH S025;Lo;0;L;;;;;N;;;;;
+132EF;EGYPTIAN HIEROGLYPH S026;Lo;0;L;;;;;N;;;;;
+132F0;EGYPTIAN HIEROGLYPH S026A;Lo;0;L;;;;;N;;;;;
+132F1;EGYPTIAN HIEROGLYPH S026B;Lo;0;L;;;;;N;;;;;
+132F2;EGYPTIAN HIEROGLYPH S027;Lo;0;L;;;;;N;;;;;
+132F3;EGYPTIAN HIEROGLYPH S028;Lo;0;L;;;;;N;;;;;
+132F4;EGYPTIAN HIEROGLYPH S029;Lo;0;L;;;;;N;;;;;
+132F5;EGYPTIAN HIEROGLYPH S030;Lo;0;L;;;;;N;;;;;
+132F6;EGYPTIAN HIEROGLYPH S031;Lo;0;L;;;;;N;;;;;
+132F7;EGYPTIAN HIEROGLYPH S032;Lo;0;L;;;;;N;;;;;
+132F8;EGYPTIAN HIEROGLYPH S033;Lo;0;L;;;;;N;;;;;
+132F9;EGYPTIAN HIEROGLYPH S034;Lo;0;L;;;;;N;;;;;
+132FA;EGYPTIAN HIEROGLYPH S035;Lo;0;L;;;;;N;;;;;
+132FB;EGYPTIAN HIEROGLYPH S035A;Lo;0;L;;;;;N;;;;;
+132FC;EGYPTIAN HIEROGLYPH S036;Lo;0;L;;;;;N;;;;;
+132FD;EGYPTIAN HIEROGLYPH S037;Lo;0;L;;;;;N;;;;;
+132FE;EGYPTIAN HIEROGLYPH S038;Lo;0;L;;;;;N;;;;;
+132FF;EGYPTIAN HIEROGLYPH S039;Lo;0;L;;;;;N;;;;;
+13300;EGYPTIAN HIEROGLYPH S040;Lo;0;L;;;;;N;;;;;
+13301;EGYPTIAN HIEROGLYPH S041;Lo;0;L;;;;;N;;;;;
+13302;EGYPTIAN HIEROGLYPH S042;Lo;0;L;;;;;N;;;;;
+13303;EGYPTIAN HIEROGLYPH S043;Lo;0;L;;;;;N;;;;;
+13304;EGYPTIAN HIEROGLYPH S044;Lo;0;L;;;;;N;;;;;
+13305;EGYPTIAN HIEROGLYPH S045;Lo;0;L;;;;;N;;;;;
+13306;EGYPTIAN HIEROGLYPH S046;Lo;0;L;;;;;N;;;;;
+13307;EGYPTIAN HIEROGLYPH T001;Lo;0;L;;;;;N;;;;;
+13308;EGYPTIAN HIEROGLYPH T002;Lo;0;L;;;;;N;;;;;
+13309;EGYPTIAN HIEROGLYPH T003;Lo;0;L;;;;;N;;;;;
+1330A;EGYPTIAN HIEROGLYPH T003A;Lo;0;L;;;;;N;;;;;
+1330B;EGYPTIAN HIEROGLYPH T004;Lo;0;L;;;;;N;;;;;
+1330C;EGYPTIAN HIEROGLYPH T005;Lo;0;L;;;;;N;;;;;
+1330D;EGYPTIAN HIEROGLYPH T006;Lo;0;L;;;;;N;;;;;
+1330E;EGYPTIAN HIEROGLYPH T007;Lo;0;L;;;;;N;;;;;
+1330F;EGYPTIAN HIEROGLYPH T007A;Lo;0;L;;;;;N;;;;;
+13310;EGYPTIAN HIEROGLYPH T008;Lo;0;L;;;;;N;;;;;
+13311;EGYPTIAN HIEROGLYPH T008A;Lo;0;L;;;;;N;;;;;
+13312;EGYPTIAN HIEROGLYPH T009;Lo;0;L;;;;;N;;;;;
+13313;EGYPTIAN HIEROGLYPH T009A;Lo;0;L;;;;;N;;;;;
+13314;EGYPTIAN HIEROGLYPH T010;Lo;0;L;;;;;N;;;;;
+13315;EGYPTIAN HIEROGLYPH T011;Lo;0;L;;;;;N;;;;;
+13316;EGYPTIAN HIEROGLYPH T011A;Lo;0;L;;;;;N;;;;;
+13317;EGYPTIAN HIEROGLYPH T012;Lo;0;L;;;;;N;;;;;
+13318;EGYPTIAN HIEROGLYPH T013;Lo;0;L;;;;;N;;;;;
+13319;EGYPTIAN HIEROGLYPH T014;Lo;0;L;;;;;N;;;;;
+1331A;EGYPTIAN HIEROGLYPH T015;Lo;0;L;;;;;N;;;;;
+1331B;EGYPTIAN HIEROGLYPH T016;Lo;0;L;;;;;N;;;;;
+1331C;EGYPTIAN HIEROGLYPH T016A;Lo;0;L;;;;;N;;;;;
+1331D;EGYPTIAN HIEROGLYPH T017;Lo;0;L;;;;;N;;;;;
+1331E;EGYPTIAN HIEROGLYPH T018;Lo;0;L;;;;;N;;;;;
+1331F;EGYPTIAN HIEROGLYPH T019;Lo;0;L;;;;;N;;;;;
+13320;EGYPTIAN HIEROGLYPH T020;Lo;0;L;;;;;N;;;;;
+13321;EGYPTIAN HIEROGLYPH T021;Lo;0;L;;;;;N;;;;;
+13322;EGYPTIAN HIEROGLYPH T022;Lo;0;L;;;;;N;;;;;
+13323;EGYPTIAN HIEROGLYPH T023;Lo;0;L;;;;;N;;;;;
+13324;EGYPTIAN HIEROGLYPH T024;Lo;0;L;;;;;N;;;;;
+13325;EGYPTIAN HIEROGLYPH T025;Lo;0;L;;;;;N;;;;;
+13326;EGYPTIAN HIEROGLYPH T026;Lo;0;L;;;;;N;;;;;
+13327;EGYPTIAN HIEROGLYPH T027;Lo;0;L;;;;;N;;;;;
+13328;EGYPTIAN HIEROGLYPH T028;Lo;0;L;;;;;N;;;;;
+13329;EGYPTIAN HIEROGLYPH T029;Lo;0;L;;;;;N;;;;;
+1332A;EGYPTIAN HIEROGLYPH T030;Lo;0;L;;;;;N;;;;;
+1332B;EGYPTIAN HIEROGLYPH T031;Lo;0;L;;;;;N;;;;;
+1332C;EGYPTIAN HIEROGLYPH T032;Lo;0;L;;;;;N;;;;;
+1332D;EGYPTIAN HIEROGLYPH T032A;Lo;0;L;;;;;N;;;;;
+1332E;EGYPTIAN HIEROGLYPH T033;Lo;0;L;;;;;N;;;;;
+1332F;EGYPTIAN HIEROGLYPH T033A;Lo;0;L;;;;;N;;;;;
+13330;EGYPTIAN HIEROGLYPH T034;Lo;0;L;;;;;N;;;;;
+13331;EGYPTIAN HIEROGLYPH T035;Lo;0;L;;;;;N;;;;;
+13332;EGYPTIAN HIEROGLYPH T036;Lo;0;L;;;;;N;;;;;
+13333;EGYPTIAN HIEROGLYPH U001;Lo;0;L;;;;;N;;;;;
+13334;EGYPTIAN HIEROGLYPH U002;Lo;0;L;;;;;N;;;;;
+13335;EGYPTIAN HIEROGLYPH U003;Lo;0;L;;;;;N;;;;;
+13336;EGYPTIAN HIEROGLYPH U004;Lo;0;L;;;;;N;;;;;
+13337;EGYPTIAN HIEROGLYPH U005;Lo;0;L;;;;;N;;;;;
+13338;EGYPTIAN HIEROGLYPH U006;Lo;0;L;;;;;N;;;;;
+13339;EGYPTIAN HIEROGLYPH U006A;Lo;0;L;;;;;N;;;;;
+1333A;EGYPTIAN HIEROGLYPH U006B;Lo;0;L;;;;;N;;;;;
+1333B;EGYPTIAN HIEROGLYPH U007;Lo;0;L;;;;;N;;;;;
+1333C;EGYPTIAN HIEROGLYPH U008;Lo;0;L;;;;;N;;;;;
+1333D;EGYPTIAN HIEROGLYPH U009;Lo;0;L;;;;;N;;;;;
+1333E;EGYPTIAN HIEROGLYPH U010;Lo;0;L;;;;;N;;;;;
+1333F;EGYPTIAN HIEROGLYPH U011;Lo;0;L;;;;;N;;;;;
+13340;EGYPTIAN HIEROGLYPH U012;Lo;0;L;;;;;N;;;;;
+13341;EGYPTIAN HIEROGLYPH U013;Lo;0;L;;;;;N;;;;;
+13342;EGYPTIAN HIEROGLYPH U014;Lo;0;L;;;;;N;;;;;
+13343;EGYPTIAN HIEROGLYPH U015;Lo;0;L;;;;;N;;;;;
+13344;EGYPTIAN HIEROGLYPH U016;Lo;0;L;;;;;N;;;;;
+13345;EGYPTIAN HIEROGLYPH U017;Lo;0;L;;;;;N;;;;;
+13346;EGYPTIAN HIEROGLYPH U018;Lo;0;L;;;;;N;;;;;
+13347;EGYPTIAN HIEROGLYPH U019;Lo;0;L;;;;;N;;;;;
+13348;EGYPTIAN HIEROGLYPH U020;Lo;0;L;;;;;N;;;;;
+13349;EGYPTIAN HIEROGLYPH U021;Lo;0;L;;;;;N;;;;;
+1334A;EGYPTIAN HIEROGLYPH U022;Lo;0;L;;;;;N;;;;;
+1334B;EGYPTIAN HIEROGLYPH U023;Lo;0;L;;;;;N;;;;;
+1334C;EGYPTIAN HIEROGLYPH U023A;Lo;0;L;;;;;N;;;;;
+1334D;EGYPTIAN HIEROGLYPH U024;Lo;0;L;;;;;N;;;;;
+1334E;EGYPTIAN HIEROGLYPH U025;Lo;0;L;;;;;N;;;;;
+1334F;EGYPTIAN HIEROGLYPH U026;Lo;0;L;;;;;N;;;;;
+13350;EGYPTIAN HIEROGLYPH U027;Lo;0;L;;;;;N;;;;;
+13351;EGYPTIAN HIEROGLYPH U028;Lo;0;L;;;;;N;;;;;
+13352;EGYPTIAN HIEROGLYPH U029;Lo;0;L;;;;;N;;;;;
+13353;EGYPTIAN HIEROGLYPH U029A;Lo;0;L;;;;;N;;;;;
+13354;EGYPTIAN HIEROGLYPH U030;Lo;0;L;;;;;N;;;;;
+13355;EGYPTIAN HIEROGLYPH U031;Lo;0;L;;;;;N;;;;;
+13356;EGYPTIAN HIEROGLYPH U032;Lo;0;L;;;;;N;;;;;
+13357;EGYPTIAN HIEROGLYPH U032A;Lo;0;L;;;;;N;;;;;
+13358;EGYPTIAN HIEROGLYPH U033;Lo;0;L;;;;;N;;;;;
+13359;EGYPTIAN HIEROGLYPH U034;Lo;0;L;;;;;N;;;;;
+1335A;EGYPTIAN HIEROGLYPH U035;Lo;0;L;;;;;N;;;;;
+1335B;EGYPTIAN HIEROGLYPH U036;Lo;0;L;;;;;N;;;;;
+1335C;EGYPTIAN HIEROGLYPH U037;Lo;0;L;;;;;N;;;;;
+1335D;EGYPTIAN HIEROGLYPH U038;Lo;0;L;;;;;N;;;;;
+1335E;EGYPTIAN HIEROGLYPH U039;Lo;0;L;;;;;N;;;;;
+1335F;EGYPTIAN HIEROGLYPH U040;Lo;0;L;;;;;N;;;;;
+13360;EGYPTIAN HIEROGLYPH U041;Lo;0;L;;;;;N;;;;;
+13361;EGYPTIAN HIEROGLYPH U042;Lo;0;L;;;;;N;;;;;
+13362;EGYPTIAN HIEROGLYPH V001;Lo;0;L;;;;;N;;;;;
+13363;EGYPTIAN HIEROGLYPH V001A;Lo;0;L;;;;;N;;;;;
+13364;EGYPTIAN HIEROGLYPH V001B;Lo;0;L;;;;;N;;;;;
+13365;EGYPTIAN HIEROGLYPH V001C;Lo;0;L;;;;;N;;;;;
+13366;EGYPTIAN HIEROGLYPH V001D;Lo;0;L;;;;;N;;;;;
+13367;EGYPTIAN HIEROGLYPH V001E;Lo;0;L;;;;;N;;;;;
+13368;EGYPTIAN HIEROGLYPH V001F;Lo;0;L;;;;;N;;;;;
+13369;EGYPTIAN HIEROGLYPH V001G;Lo;0;L;;;;;N;;;;;
+1336A;EGYPTIAN HIEROGLYPH V001H;Lo;0;L;;;;;N;;;;;
+1336B;EGYPTIAN HIEROGLYPH V001I;Lo;0;L;;;;;N;;;;;
+1336C;EGYPTIAN HIEROGLYPH V002;Lo;0;L;;;;;N;;;;;
+1336D;EGYPTIAN HIEROGLYPH V002A;Lo;0;L;;;;;N;;;;;
+1336E;EGYPTIAN HIEROGLYPH V003;Lo;0;L;;;;;N;;;;;
+1336F;EGYPTIAN HIEROGLYPH V004;Lo;0;L;;;;;N;;;;;
+13370;EGYPTIAN HIEROGLYPH V005;Lo;0;L;;;;;N;;;;;
+13371;EGYPTIAN HIEROGLYPH V006;Lo;0;L;;;;;N;;;;;
+13372;EGYPTIAN HIEROGLYPH V007;Lo;0;L;;;;;N;;;;;
+13373;EGYPTIAN HIEROGLYPH V007A;Lo;0;L;;;;;N;;;;;
+13374;EGYPTIAN HIEROGLYPH V007B;Lo;0;L;;;;;N;;;;;
+13375;EGYPTIAN HIEROGLYPH V008;Lo;0;L;;;;;N;;;;;
+13376;EGYPTIAN HIEROGLYPH V009;Lo;0;L;;;;;N;;;;;
+13377;EGYPTIAN HIEROGLYPH V010;Lo;0;L;;;;;N;;;;;
+13378;EGYPTIAN HIEROGLYPH V011;Lo;0;L;;;;;N;;;;;
+13379;EGYPTIAN HIEROGLYPH V011A;Lo;0;L;;;;;N;;;;;
+1337A;EGYPTIAN HIEROGLYPH V011B;Lo;0;L;;;;;N;;;;;
+1337B;EGYPTIAN HIEROGLYPH V011C;Lo;0;L;;;;;N;;;;;
+1337C;EGYPTIAN HIEROGLYPH V012;Lo;0;L;;;;;N;;;;;
+1337D;EGYPTIAN HIEROGLYPH V012A;Lo;0;L;;;;;N;;;;;
+1337E;EGYPTIAN HIEROGLYPH V012B;Lo;0;L;;;;;N;;;;;
+1337F;EGYPTIAN HIEROGLYPH V013;Lo;0;L;;;;;N;;;;;
+13380;EGYPTIAN HIEROGLYPH V014;Lo;0;L;;;;;N;;;;;
+13381;EGYPTIAN HIEROGLYPH V015;Lo;0;L;;;;;N;;;;;
+13382;EGYPTIAN HIEROGLYPH V016;Lo;0;L;;;;;N;;;;;
+13383;EGYPTIAN HIEROGLYPH V017;Lo;0;L;;;;;N;;;;;
+13384;EGYPTIAN HIEROGLYPH V018;Lo;0;L;;;;;N;;;;;
+13385;EGYPTIAN HIEROGLYPH V019;Lo;0;L;;;;;N;;;;;
+13386;EGYPTIAN HIEROGLYPH V020;Lo;0;L;;;;;N;;;;;
+13387;EGYPTIAN HIEROGLYPH V020A;Lo;0;L;;;;;N;;;;;
+13388;EGYPTIAN HIEROGLYPH V020B;Lo;0;L;;;;;N;;;;;
+13389;EGYPTIAN HIEROGLYPH V020C;Lo;0;L;;;;;N;;;;;
+1338A;EGYPTIAN HIEROGLYPH V020D;Lo;0;L;;;;;N;;;;;
+1338B;EGYPTIAN HIEROGLYPH V020E;Lo;0;L;;;;;N;;;;;
+1338C;EGYPTIAN HIEROGLYPH V020F;Lo;0;L;;;;;N;;;;;
+1338D;EGYPTIAN HIEROGLYPH V020G;Lo;0;L;;;;;N;;;;;
+1338E;EGYPTIAN HIEROGLYPH V020H;Lo;0;L;;;;;N;;;;;
+1338F;EGYPTIAN HIEROGLYPH V020I;Lo;0;L;;;;;N;;;;;
+13390;EGYPTIAN HIEROGLYPH V020J;Lo;0;L;;;;;N;;;;;
+13391;EGYPTIAN HIEROGLYPH V020K;Lo;0;L;;;;;N;;;;;
+13392;EGYPTIAN HIEROGLYPH V020L;Lo;0;L;;;;;N;;;;;
+13393;EGYPTIAN HIEROGLYPH V021;Lo;0;L;;;;;N;;;;;
+13394;EGYPTIAN HIEROGLYPH V022;Lo;0;L;;;;;N;;;;;
+13395;EGYPTIAN HIEROGLYPH V023;Lo;0;L;;;;;N;;;;;
+13396;EGYPTIAN HIEROGLYPH V023A;Lo;0;L;;;;;N;;;;;
+13397;EGYPTIAN HIEROGLYPH V024;Lo;0;L;;;;;N;;;;;
+13398;EGYPTIAN HIEROGLYPH V025;Lo;0;L;;;;;N;;;;;
+13399;EGYPTIAN HIEROGLYPH V026;Lo;0;L;;;;;N;;;;;
+1339A;EGYPTIAN HIEROGLYPH V027;Lo;0;L;;;;;N;;;;;
+1339B;EGYPTIAN HIEROGLYPH V028;Lo;0;L;;;;;N;;;;;
+1339C;EGYPTIAN HIEROGLYPH V028A;Lo;0;L;;;;;N;;;;;
+1339D;EGYPTIAN HIEROGLYPH V029;Lo;0;L;;;;;N;;;;;
+1339E;EGYPTIAN HIEROGLYPH V029A;Lo;0;L;;;;;N;;;;;
+1339F;EGYPTIAN HIEROGLYPH V030;Lo;0;L;;;;;N;;;;;
+133A0;EGYPTIAN HIEROGLYPH V030A;Lo;0;L;;;;;N;;;;;
+133A1;EGYPTIAN HIEROGLYPH V031;Lo;0;L;;;;;N;;;;;
+133A2;EGYPTIAN HIEROGLYPH V031A;Lo;0;L;;;;;N;;;;;
+133A3;EGYPTIAN HIEROGLYPH V032;Lo;0;L;;;;;N;;;;;
+133A4;EGYPTIAN HIEROGLYPH V033;Lo;0;L;;;;;N;;;;;
+133A5;EGYPTIAN HIEROGLYPH V033A;Lo;0;L;;;;;N;;;;;
+133A6;EGYPTIAN HIEROGLYPH V034;Lo;0;L;;;;;N;;;;;
+133A7;EGYPTIAN HIEROGLYPH V035;Lo;0;L;;;;;N;;;;;
+133A8;EGYPTIAN HIEROGLYPH V036;Lo;0;L;;;;;N;;;;;
+133A9;EGYPTIAN HIEROGLYPH V037;Lo;0;L;;;;;N;;;;;
+133AA;EGYPTIAN HIEROGLYPH V037A;Lo;0;L;;;;;N;;;;;
+133AB;EGYPTIAN HIEROGLYPH V038;Lo;0;L;;;;;N;;;;;
+133AC;EGYPTIAN HIEROGLYPH V039;Lo;0;L;;;;;N;;;;;
+133AD;EGYPTIAN HIEROGLYPH V040;Lo;0;L;;;;;N;;;;;
+133AE;EGYPTIAN HIEROGLYPH V040A;Lo;0;L;;;;;N;;;;;
+133AF;EGYPTIAN HIEROGLYPH W001;Lo;0;L;;;;;N;;;;;
+133B0;EGYPTIAN HIEROGLYPH W002;Lo;0;L;;;;;N;;;;;
+133B1;EGYPTIAN HIEROGLYPH W003;Lo;0;L;;;;;N;;;;;
+133B2;EGYPTIAN HIEROGLYPH W003A;Lo;0;L;;;;;N;;;;;
+133B3;EGYPTIAN HIEROGLYPH W004;Lo;0;L;;;;;N;;;;;
+133B4;EGYPTIAN HIEROGLYPH W005;Lo;0;L;;;;;N;;;;;
+133B5;EGYPTIAN HIEROGLYPH W006;Lo;0;L;;;;;N;;;;;
+133B6;EGYPTIAN HIEROGLYPH W007;Lo;0;L;;;;;N;;;;;
+133B7;EGYPTIAN HIEROGLYPH W008;Lo;0;L;;;;;N;;;;;
+133B8;EGYPTIAN HIEROGLYPH W009;Lo;0;L;;;;;N;;;;;
+133B9;EGYPTIAN HIEROGLYPH W009A;Lo;0;L;;;;;N;;;;;
+133BA;EGYPTIAN HIEROGLYPH W010;Lo;0;L;;;;;N;;;;;
+133BB;EGYPTIAN HIEROGLYPH W010A;Lo;0;L;;;;;N;;;;;
+133BC;EGYPTIAN HIEROGLYPH W011;Lo;0;L;;;;;N;;;;;
+133BD;EGYPTIAN HIEROGLYPH W012;Lo;0;L;;;;;N;;;;;
+133BE;EGYPTIAN HIEROGLYPH W013;Lo;0;L;;;;;N;;;;;
+133BF;EGYPTIAN HIEROGLYPH W014;Lo;0;L;;;;;N;;;;;
+133C0;EGYPTIAN HIEROGLYPH W014A;Lo;0;L;;;;;N;;;;;
+133C1;EGYPTIAN HIEROGLYPH W015;Lo;0;L;;;;;N;;;;;
+133C2;EGYPTIAN HIEROGLYPH W016;Lo;0;L;;;;;N;;;;;
+133C3;EGYPTIAN HIEROGLYPH W017;Lo;0;L;;;;;N;;;;;
+133C4;EGYPTIAN HIEROGLYPH W017A;Lo;0;L;;;;;N;;;;;
+133C5;EGYPTIAN HIEROGLYPH W018;Lo;0;L;;;;;N;;;;;
+133C6;EGYPTIAN HIEROGLYPH W018A;Lo;0;L;;;;;N;;;;;
+133C7;EGYPTIAN HIEROGLYPH W019;Lo;0;L;;;;;N;;;;;
+133C8;EGYPTIAN HIEROGLYPH W020;Lo;0;L;;;;;N;;;;;
+133C9;EGYPTIAN HIEROGLYPH W021;Lo;0;L;;;;;N;;;;;
+133CA;EGYPTIAN HIEROGLYPH W022;Lo;0;L;;;;;N;;;;;
+133CB;EGYPTIAN HIEROGLYPH W023;Lo;0;L;;;;;N;;;;;
+133CC;EGYPTIAN HIEROGLYPH W024;Lo;0;L;;;;;N;;;;;
+133CD;EGYPTIAN HIEROGLYPH W024A;Lo;0;L;;;;;N;;;;;
+133CE;EGYPTIAN HIEROGLYPH W025;Lo;0;L;;;;;N;;;;;
+133CF;EGYPTIAN HIEROGLYPH X001;Lo;0;L;;;;;N;;;;;
+133D0;EGYPTIAN HIEROGLYPH X002;Lo;0;L;;;;;N;;;;;
+133D1;EGYPTIAN HIEROGLYPH X003;Lo;0;L;;;;;N;;;;;
+133D2;EGYPTIAN HIEROGLYPH X004;Lo;0;L;;;;;N;;;;;
+133D3;EGYPTIAN HIEROGLYPH X004A;Lo;0;L;;;;;N;;;;;
+133D4;EGYPTIAN HIEROGLYPH X004B;Lo;0;L;;;;;N;;;;;
+133D5;EGYPTIAN HIEROGLYPH X005;Lo;0;L;;;;;N;;;;;
+133D6;EGYPTIAN HIEROGLYPH X006;Lo;0;L;;;;;N;;;;;
+133D7;EGYPTIAN HIEROGLYPH X006A;Lo;0;L;;;;;N;;;;;
+133D8;EGYPTIAN HIEROGLYPH X007;Lo;0;L;;;;;N;;;;;
+133D9;EGYPTIAN HIEROGLYPH X008;Lo;0;L;;;;;N;;;;;
+133DA;EGYPTIAN HIEROGLYPH X008A;Lo;0;L;;;;;N;;;;;
+133DB;EGYPTIAN HIEROGLYPH Y001;Lo;0;L;;;;;N;;;;;
+133DC;EGYPTIAN HIEROGLYPH Y001A;Lo;0;L;;;;;N;;;;;
+133DD;EGYPTIAN HIEROGLYPH Y002;Lo;0;L;;;;;N;;;;;
+133DE;EGYPTIAN HIEROGLYPH Y003;Lo;0;L;;;;;N;;;;;
+133DF;EGYPTIAN HIEROGLYPH Y004;Lo;0;L;;;;;N;;;;;
+133E0;EGYPTIAN HIEROGLYPH Y005;Lo;0;L;;;;;N;;;;;
+133E1;EGYPTIAN HIEROGLYPH Y006;Lo;0;L;;;;;N;;;;;
+133E2;EGYPTIAN HIEROGLYPH Y007;Lo;0;L;;;;;N;;;;;
+133E3;EGYPTIAN HIEROGLYPH Y008;Lo;0;L;;;;;N;;;;;
+133E4;EGYPTIAN HIEROGLYPH Z001;Lo;0;L;;;;;N;;;;;
+133E5;EGYPTIAN HIEROGLYPH Z002;Lo;0;L;;;;;N;;;;;
+133E6;EGYPTIAN HIEROGLYPH Z002A;Lo;0;L;;;;;N;;;;;
+133E7;EGYPTIAN HIEROGLYPH Z002B;Lo;0;L;;;;;N;;;;;
+133E8;EGYPTIAN HIEROGLYPH Z002C;Lo;0;L;;;;;N;;;;;
+133E9;EGYPTIAN HIEROGLYPH Z002D;Lo;0;L;;;;;N;;;;;
+133EA;EGYPTIAN HIEROGLYPH Z003;Lo;0;L;;;;;N;;;;;
+133EB;EGYPTIAN HIEROGLYPH Z003A;Lo;0;L;;;;;N;;;;;
+133EC;EGYPTIAN HIEROGLYPH Z003B;Lo;0;L;;;;;N;;;;;
+133ED;EGYPTIAN HIEROGLYPH Z004;Lo;0;L;;;;;N;;;;;
+133EE;EGYPTIAN HIEROGLYPH Z004A;Lo;0;L;;;;;N;;;;;
+133EF;EGYPTIAN HIEROGLYPH Z005;Lo;0;L;;;;;N;;;;;
+133F0;EGYPTIAN HIEROGLYPH Z005A;Lo;0;L;;;;;N;;;;;
+133F1;EGYPTIAN HIEROGLYPH Z006;Lo;0;L;;;;;N;;;;;
+133F2;EGYPTIAN HIEROGLYPH Z007;Lo;0;L;;;;;N;;;;;
+133F3;EGYPTIAN HIEROGLYPH Z008;Lo;0;L;;;;;N;;;;;
+133F4;EGYPTIAN HIEROGLYPH Z009;Lo;0;L;;;;;N;;;;;
+133F5;EGYPTIAN HIEROGLYPH Z010;Lo;0;L;;;;;N;;;;;
+133F6;EGYPTIAN HIEROGLYPH Z011;Lo;0;L;;;;;N;;;;;
+133F7;EGYPTIAN HIEROGLYPH Z012;Lo;0;L;;;;;N;;;;;
+133F8;EGYPTIAN HIEROGLYPH Z013;Lo;0;L;;;;;N;;;;;
+133F9;EGYPTIAN HIEROGLYPH Z014;Lo;0;L;;;;;N;;;;;
+133FA;EGYPTIAN HIEROGLYPH Z015;Lo;0;L;;;;;N;;;;;
+133FB;EGYPTIAN HIEROGLYPH Z015A;Lo;0;L;;;;;N;;;;;
+133FC;EGYPTIAN HIEROGLYPH Z015B;Lo;0;L;;;;;N;;;;;
+133FD;EGYPTIAN HIEROGLYPH Z015C;Lo;0;L;;;;;N;;;;;
+133FE;EGYPTIAN HIEROGLYPH Z015D;Lo;0;L;;;;;N;;;;;
+133FF;EGYPTIAN HIEROGLYPH Z015E;Lo;0;L;;;;;N;;;;;
+13400;EGYPTIAN HIEROGLYPH Z015F;Lo;0;L;;;;;N;;;;;
+13401;EGYPTIAN HIEROGLYPH Z015G;Lo;0;L;;;;;N;;;;;
+13402;EGYPTIAN HIEROGLYPH Z015H;Lo;0;L;;;;;N;;;;;
+13403;EGYPTIAN HIEROGLYPH Z015I;Lo;0;L;;;;;N;;;;;
+13404;EGYPTIAN HIEROGLYPH Z016;Lo;0;L;;;;;N;;;;;
+13405;EGYPTIAN HIEROGLYPH Z016A;Lo;0;L;;;;;N;;;;;
+13406;EGYPTIAN HIEROGLYPH Z016B;Lo;0;L;;;;;N;;;;;
+13407;EGYPTIAN HIEROGLYPH Z016C;Lo;0;L;;;;;N;;;;;
+13408;EGYPTIAN HIEROGLYPH Z016D;Lo;0;L;;;;;N;;;;;
+13409;EGYPTIAN HIEROGLYPH Z016E;Lo;0;L;;;;;N;;;;;
+1340A;EGYPTIAN HIEROGLYPH Z016F;Lo;0;L;;;;;N;;;;;
+1340B;EGYPTIAN HIEROGLYPH Z016G;Lo;0;L;;;;;N;;;;;
+1340C;EGYPTIAN HIEROGLYPH Z016H;Lo;0;L;;;;;N;;;;;
+1340D;EGYPTIAN HIEROGLYPH AA001;Lo;0;L;;;;;N;;;;;
+1340E;EGYPTIAN HIEROGLYPH AA002;Lo;0;L;;;;;N;;;;;
+1340F;EGYPTIAN HIEROGLYPH AA003;Lo;0;L;;;;;N;;;;;
+13410;EGYPTIAN HIEROGLYPH AA004;Lo;0;L;;;;;N;;;;;
+13411;EGYPTIAN HIEROGLYPH AA005;Lo;0;L;;;;;N;;;;;
+13412;EGYPTIAN HIEROGLYPH AA006;Lo;0;L;;;;;N;;;;;
+13413;EGYPTIAN HIEROGLYPH AA007;Lo;0;L;;;;;N;;;;;
+13414;EGYPTIAN HIEROGLYPH AA007A;Lo;0;L;;;;;N;;;;;
+13415;EGYPTIAN HIEROGLYPH AA007B;Lo;0;L;;;;;N;;;;;
+13416;EGYPTIAN HIEROGLYPH AA008;Lo;0;L;;;;;N;;;;;
+13417;EGYPTIAN HIEROGLYPH AA009;Lo;0;L;;;;;N;;;;;
+13418;EGYPTIAN HIEROGLYPH AA010;Lo;0;L;;;;;N;;;;;
+13419;EGYPTIAN HIEROGLYPH AA011;Lo;0;L;;;;;N;;;;;
+1341A;EGYPTIAN HIEROGLYPH AA012;Lo;0;L;;;;;N;;;;;
+1341B;EGYPTIAN HIEROGLYPH AA013;Lo;0;L;;;;;N;;;;;
+1341C;EGYPTIAN HIEROGLYPH AA014;Lo;0;L;;;;;N;;;;;
+1341D;EGYPTIAN HIEROGLYPH AA015;Lo;0;L;;;;;N;;;;;
+1341E;EGYPTIAN HIEROGLYPH AA016;Lo;0;L;;;;;N;;;;;
+1341F;EGYPTIAN HIEROGLYPH AA017;Lo;0;L;;;;;N;;;;;
+13420;EGYPTIAN HIEROGLYPH AA018;Lo;0;L;;;;;N;;;;;
+13421;EGYPTIAN HIEROGLYPH AA019;Lo;0;L;;;;;N;;;;;
+13422;EGYPTIAN HIEROGLYPH AA020;Lo;0;L;;;;;N;;;;;
+13423;EGYPTIAN HIEROGLYPH AA021;Lo;0;L;;;;;N;;;;;
+13424;EGYPTIAN HIEROGLYPH AA022;Lo;0;L;;;;;N;;;;;
+13425;EGYPTIAN HIEROGLYPH AA023;Lo;0;L;;;;;N;;;;;
+13426;EGYPTIAN HIEROGLYPH AA024;Lo;0;L;;;;;N;;;;;
+13427;EGYPTIAN HIEROGLYPH AA025;Lo;0;L;;;;;N;;;;;
+13428;EGYPTIAN HIEROGLYPH AA026;Lo;0;L;;;;;N;;;;;
+13429;EGYPTIAN HIEROGLYPH AA027;Lo;0;L;;;;;N;;;;;
+1342A;EGYPTIAN HIEROGLYPH AA028;Lo;0;L;;;;;N;;;;;
+1342B;EGYPTIAN HIEROGLYPH AA029;Lo;0;L;;;;;N;;;;;
+1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;;
+1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;;
+1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;;
+14400;ANATOLIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
+14401;ANATOLIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
+14402;ANATOLIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
+14403;ANATOLIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;;
+14404;ANATOLIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;;
+14405;ANATOLIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;;
+14406;ANATOLIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;;
+14407;ANATOLIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;;
+14408;ANATOLIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;;
+14409;ANATOLIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;;
+1440A;ANATOLIAN HIEROGLYPH A010A;Lo;0;L;;;;;N;;;;;
+1440B;ANATOLIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;;
+1440C;ANATOLIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;;
+1440D;ANATOLIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;;
+1440E;ANATOLIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;;
+1440F;ANATOLIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;;
+14410;ANATOLIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;;
+14411;ANATOLIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;;
+14412;ANATOLIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;;
+14413;ANATOLIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;;
+14414;ANATOLIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;;
+14415;ANATOLIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;;
+14416;ANATOLIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;;
+14417;ANATOLIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;;
+14418;ANATOLIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;;
+14419;ANATOLIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;;
+1441A;ANATOLIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;;
+1441B;ANATOLIAN HIEROGLYPH A026A;Lo;0;L;;;;;N;;;;;
+1441C;ANATOLIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;;
+1441D;ANATOLIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;;
+1441E;ANATOLIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;;
+1441F;ANATOLIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;;
+14420;ANATOLIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;;
+14421;ANATOLIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;;
+14422;ANATOLIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;;
+14423;ANATOLIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;;
+14424;ANATOLIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;;
+14425;ANATOLIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;;
+14426;ANATOLIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;;
+14427;ANATOLIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;;
+14428;ANATOLIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;;
+14429;ANATOLIAN HIEROGLYPH A039A;Lo;0;L;;;;;N;;;;;
+1442A;ANATOLIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;;
+1442B;ANATOLIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;;
+1442C;ANATOLIAN HIEROGLYPH A041A;Lo;0;L;;;;;N;;;;;
+1442D;ANATOLIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;;
+1442E;ANATOLIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;;
+1442F;ANATOLIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;;
+14430;ANATOLIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;;
+14431;ANATOLIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;;
+14432;ANATOLIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;;
+14433;ANATOLIAN HIEROGLYPH A046A;Lo;0;L;;;;;N;;;;;
+14434;ANATOLIAN HIEROGLYPH A046B;Lo;0;L;;;;;N;;;;;
+14435;ANATOLIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;;
+14436;ANATOLIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;;
+14437;ANATOLIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;;
+14438;ANATOLIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;;
+14439;ANATOLIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;;
+1443A;ANATOLIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;;
+1443B;ANATOLIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;;
+1443C;ANATOLIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;;
+1443D;ANATOLIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;;
+1443E;ANATOLIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;;
+1443F;ANATOLIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;;
+14440;ANATOLIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;;
+14441;ANATOLIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;;
+14442;ANATOLIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;;
+14443;ANATOLIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;;
+14444;ANATOLIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;;
+14445;ANATOLIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;;
+14446;ANATOLIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;;
+14447;ANATOLIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;;
+14448;ANATOLIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;;
+14449;ANATOLIAN HIEROGLYPH A066A;Lo;0;L;;;;;N;;;;;
+1444A;ANATOLIAN HIEROGLYPH A066B;Lo;0;L;;;;;N;;;;;
+1444B;ANATOLIAN HIEROGLYPH A066C;Lo;0;L;;;;;N;;;;;
+1444C;ANATOLIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;;
+1444D;ANATOLIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;;
+1444E;ANATOLIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;;
+1444F;ANATOLIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;;
+14450;ANATOLIAN HIEROGLYPH A071;Lo;0;L;;;;;N;;;;;
+14451;ANATOLIAN HIEROGLYPH A072;Lo;0;L;;;;;N;;;;;
+14452;ANATOLIAN HIEROGLYPH A073;Lo;0;L;;;;;N;;;;;
+14453;ANATOLIAN HIEROGLYPH A074;Lo;0;L;;;;;N;;;;;
+14454;ANATOLIAN HIEROGLYPH A075;Lo;0;L;;;;;N;;;;;
+14455;ANATOLIAN HIEROGLYPH A076;Lo;0;L;;;;;N;;;;;
+14456;ANATOLIAN HIEROGLYPH A077;Lo;0;L;;;;;N;;;;;
+14457;ANATOLIAN HIEROGLYPH A078;Lo;0;L;;;;;N;;;;;
+14458;ANATOLIAN HIEROGLYPH A079;Lo;0;L;;;;;N;;;;;
+14459;ANATOLIAN HIEROGLYPH A080;Lo;0;L;;;;;N;;;;;
+1445A;ANATOLIAN HIEROGLYPH A081;Lo;0;L;;;;;N;;;;;
+1445B;ANATOLIAN HIEROGLYPH A082;Lo;0;L;;;;;N;;;;;
+1445C;ANATOLIAN HIEROGLYPH A083;Lo;0;L;;;;;N;;;;;
+1445D;ANATOLIAN HIEROGLYPH A084;Lo;0;L;;;;;N;;;;;
+1445E;ANATOLIAN HIEROGLYPH A085;Lo;0;L;;;;;N;;;;;
+1445F;ANATOLIAN HIEROGLYPH A086;Lo;0;L;;;;;N;;;;;
+14460;ANATOLIAN HIEROGLYPH A087;Lo;0;L;;;;;N;;;;;
+14461;ANATOLIAN HIEROGLYPH A088;Lo;0;L;;;;;N;;;;;
+14462;ANATOLIAN HIEROGLYPH A089;Lo;0;L;;;;;N;;;;;
+14463;ANATOLIAN HIEROGLYPH A090;Lo;0;L;;;;;N;;;;;
+14464;ANATOLIAN HIEROGLYPH A091;Lo;0;L;;;;;N;;;;;
+14465;ANATOLIAN HIEROGLYPH A092;Lo;0;L;;;;;N;;;;;
+14466;ANATOLIAN HIEROGLYPH A093;Lo;0;L;;;;;N;;;;;
+14467;ANATOLIAN HIEROGLYPH A094;Lo;0;L;;;;;N;;;;;
+14468;ANATOLIAN HIEROGLYPH A095;Lo;0;L;;;;;N;;;;;
+14469;ANATOLIAN HIEROGLYPH A096;Lo;0;L;;;;;N;;;;;
+1446A;ANATOLIAN HIEROGLYPH A097;Lo;0;L;;;;;N;;;;;
+1446B;ANATOLIAN HIEROGLYPH A097A;Lo;0;L;;;;;N;;;;;
+1446C;ANATOLIAN HIEROGLYPH A098;Lo;0;L;;;;;N;;;;;
+1446D;ANATOLIAN HIEROGLYPH A098A;Lo;0;L;;;;;N;;;;;
+1446E;ANATOLIAN HIEROGLYPH A099;Lo;0;L;;;;;N;;;;;
+1446F;ANATOLIAN HIEROGLYPH A100;Lo;0;L;;;;;N;;;;;
+14470;ANATOLIAN HIEROGLYPH A100A;Lo;0;L;;;;;N;;;;;
+14471;ANATOLIAN HIEROGLYPH A101;Lo;0;L;;;;;N;;;;;
+14472;ANATOLIAN HIEROGLYPH A101A;Lo;0;L;;;;;N;;;;;
+14473;ANATOLIAN HIEROGLYPH A102;Lo;0;L;;;;;N;;;;;
+14474;ANATOLIAN HIEROGLYPH A102A;Lo;0;L;;;;;N;;;;;
+14475;ANATOLIAN HIEROGLYPH A103;Lo;0;L;;;;;N;;;;;
+14476;ANATOLIAN HIEROGLYPH A104;Lo;0;L;;;;;N;;;;;
+14477;ANATOLIAN HIEROGLYPH A104A;Lo;0;L;;;;;N;;;;;
+14478;ANATOLIAN HIEROGLYPH A104B;Lo;0;L;;;;;N;;;;;
+14479;ANATOLIAN HIEROGLYPH A104C;Lo;0;L;;;;;N;;;;;
+1447A;ANATOLIAN HIEROGLYPH A105;Lo;0;L;;;;;N;;;;;
+1447B;ANATOLIAN HIEROGLYPH A105A;Lo;0;L;;;;;N;;;;;
+1447C;ANATOLIAN HIEROGLYPH A105B;Lo;0;L;;;;;N;;;;;
+1447D;ANATOLIAN HIEROGLYPH A106;Lo;0;L;;;;;N;;;;;
+1447E;ANATOLIAN HIEROGLYPH A107;Lo;0;L;;;;;N;;;;;
+1447F;ANATOLIAN HIEROGLYPH A107A;Lo;0;L;;;;;N;;;;;
+14480;ANATOLIAN HIEROGLYPH A107B;Lo;0;L;;;;;N;;;;;
+14481;ANATOLIAN HIEROGLYPH A107C;Lo;0;L;;;;;N;;;;;
+14482;ANATOLIAN HIEROGLYPH A108;Lo;0;L;;;;;N;;;;;
+14483;ANATOLIAN HIEROGLYPH A109;Lo;0;L;;;;;N;;;;;
+14484;ANATOLIAN HIEROGLYPH A110;Lo;0;L;;;;;N;;;;;
+14485;ANATOLIAN HIEROGLYPH A110A;Lo;0;L;;;;;N;;;;;
+14486;ANATOLIAN HIEROGLYPH A110B;Lo;0;L;;;;;N;;;;;
+14487;ANATOLIAN HIEROGLYPH A111;Lo;0;L;;;;;N;;;;;
+14488;ANATOLIAN HIEROGLYPH A112;Lo;0;L;;;;;N;;;;;
+14489;ANATOLIAN HIEROGLYPH A113;Lo;0;L;;;;;N;;;;;
+1448A;ANATOLIAN HIEROGLYPH A114;Lo;0;L;;;;;N;;;;;
+1448B;ANATOLIAN HIEROGLYPH A115;Lo;0;L;;;;;N;;;;;
+1448C;ANATOLIAN HIEROGLYPH A115A;Lo;0;L;;;;;N;;;;;
+1448D;ANATOLIAN HIEROGLYPH A116;Lo;0;L;;;;;N;;;;;
+1448E;ANATOLIAN HIEROGLYPH A117;Lo;0;L;;;;;N;;;;;
+1448F;ANATOLIAN HIEROGLYPH A118;Lo;0;L;;;;;N;;;;;
+14490;ANATOLIAN HIEROGLYPH A119;Lo;0;L;;;;;N;;;;;
+14491;ANATOLIAN HIEROGLYPH A120;Lo;0;L;;;;;N;;;;;
+14492;ANATOLIAN HIEROGLYPH A121;Lo;0;L;;;;;N;;;;;
+14493;ANATOLIAN HIEROGLYPH A122;Lo;0;L;;;;;N;;;;;
+14494;ANATOLIAN HIEROGLYPH A123;Lo;0;L;;;;;N;;;;;
+14495;ANATOLIAN HIEROGLYPH A124;Lo;0;L;;;;;N;;;;;
+14496;ANATOLIAN HIEROGLYPH A125;Lo;0;L;;;;;N;;;;;
+14497;ANATOLIAN HIEROGLYPH A125A;Lo;0;L;;;;;N;;;;;
+14498;ANATOLIAN HIEROGLYPH A126;Lo;0;L;;;;;N;;;;;
+14499;ANATOLIAN HIEROGLYPH A127;Lo;0;L;;;;;N;;;;;
+1449A;ANATOLIAN HIEROGLYPH A128;Lo;0;L;;;;;N;;;;;
+1449B;ANATOLIAN HIEROGLYPH A129;Lo;0;L;;;;;N;;;;;
+1449C;ANATOLIAN HIEROGLYPH A130;Lo;0;L;;;;;N;;;;;
+1449D;ANATOLIAN HIEROGLYPH A131;Lo;0;L;;;;;N;;;;;
+1449E;ANATOLIAN HIEROGLYPH A132;Lo;0;L;;;;;N;;;;;
+1449F;ANATOLIAN HIEROGLYPH A133;Lo;0;L;;;;;N;;;;;
+144A0;ANATOLIAN HIEROGLYPH A134;Lo;0;L;;;;;N;;;;;
+144A1;ANATOLIAN HIEROGLYPH A135;Lo;0;L;;;;;N;;;;;
+144A2;ANATOLIAN HIEROGLYPH A135A;Lo;0;L;;;;;N;;;;;
+144A3;ANATOLIAN HIEROGLYPH A136;Lo;0;L;;;;;N;;;;;
+144A4;ANATOLIAN HIEROGLYPH A137;Lo;0;L;;;;;N;;;;;
+144A5;ANATOLIAN HIEROGLYPH A138;Lo;0;L;;;;;N;;;;;
+144A6;ANATOLIAN HIEROGLYPH A139;Lo;0;L;;;;;N;;;;;
+144A7;ANATOLIAN HIEROGLYPH A140;Lo;0;L;;;;;N;;;;;
+144A8;ANATOLIAN HIEROGLYPH A141;Lo;0;L;;;;;N;;;;;
+144A9;ANATOLIAN HIEROGLYPH A142;Lo;0;L;;;;;N;;;;;
+144AA;ANATOLIAN HIEROGLYPH A143;Lo;0;L;;;;;N;;;;;
+144AB;ANATOLIAN HIEROGLYPH A144;Lo;0;L;;;;;N;;;;;
+144AC;ANATOLIAN HIEROGLYPH A145;Lo;0;L;;;;;N;;;;;
+144AD;ANATOLIAN HIEROGLYPH A146;Lo;0;L;;;;;N;;;;;
+144AE;ANATOLIAN HIEROGLYPH A147;Lo;0;L;;;;;N;;;;;
+144AF;ANATOLIAN HIEROGLYPH A148;Lo;0;L;;;;;N;;;;;
+144B0;ANATOLIAN HIEROGLYPH A149;Lo;0;L;;;;;N;;;;;
+144B1;ANATOLIAN HIEROGLYPH A150;Lo;0;L;;;;;N;;;;;
+144B2;ANATOLIAN HIEROGLYPH A151;Lo;0;L;;;;;N;;;;;
+144B3;ANATOLIAN HIEROGLYPH A152;Lo;0;L;;;;;N;;;;;
+144B4;ANATOLIAN HIEROGLYPH A153;Lo;0;L;;;;;N;;;;;
+144B5;ANATOLIAN HIEROGLYPH A154;Lo;0;L;;;;;N;;;;;
+144B6;ANATOLIAN HIEROGLYPH A155;Lo;0;L;;;;;N;;;;;
+144B7;ANATOLIAN HIEROGLYPH A156;Lo;0;L;;;;;N;;;;;
+144B8;ANATOLIAN HIEROGLYPH A157;Lo;0;L;;;;;N;;;;;
+144B9;ANATOLIAN HIEROGLYPH A158;Lo;0;L;;;;;N;;;;;
+144BA;ANATOLIAN HIEROGLYPH A159;Lo;0;L;;;;;N;;;;;
+144BB;ANATOLIAN HIEROGLYPH A160;Lo;0;L;;;;;N;;;;;
+144BC;ANATOLIAN HIEROGLYPH A161;Lo;0;L;;;;;N;;;;;
+144BD;ANATOLIAN HIEROGLYPH A162;Lo;0;L;;;;;N;;;;;
+144BE;ANATOLIAN HIEROGLYPH A163;Lo;0;L;;;;;N;;;;;
+144BF;ANATOLIAN HIEROGLYPH A164;Lo;0;L;;;;;N;;;;;
+144C0;ANATOLIAN HIEROGLYPH A165;Lo;0;L;;;;;N;;;;;
+144C1;ANATOLIAN HIEROGLYPH A166;Lo;0;L;;;;;N;;;;;
+144C2;ANATOLIAN HIEROGLYPH A167;Lo;0;L;;;;;N;;;;;
+144C3;ANATOLIAN HIEROGLYPH A168;Lo;0;L;;;;;N;;;;;
+144C4;ANATOLIAN HIEROGLYPH A169;Lo;0;L;;;;;N;;;;;
+144C5;ANATOLIAN HIEROGLYPH A170;Lo;0;L;;;;;N;;;;;
+144C6;ANATOLIAN HIEROGLYPH A171;Lo;0;L;;;;;N;;;;;
+144C7;ANATOLIAN HIEROGLYPH A172;Lo;0;L;;;;;N;;;;;
+144C8;ANATOLIAN HIEROGLYPH A173;Lo;0;L;;;;;N;;;;;
+144C9;ANATOLIAN HIEROGLYPH A174;Lo;0;L;;;;;N;;;;;
+144CA;ANATOLIAN HIEROGLYPH A175;Lo;0;L;;;;;N;;;;;
+144CB;ANATOLIAN HIEROGLYPH A176;Lo;0;L;;;;;N;;;;;
+144CC;ANATOLIAN HIEROGLYPH A177;Lo;0;L;;;;;N;;;;;
+144CD;ANATOLIAN HIEROGLYPH A178;Lo;0;L;;;;;N;;;;;
+144CE;ANATOLIAN HIEROGLYPH A179;Lo;0;L;;;;;N;;;;;
+144CF;ANATOLIAN HIEROGLYPH A180;Lo;0;L;;;;;N;;;;;
+144D0;ANATOLIAN HIEROGLYPH A181;Lo;0;L;;;;;N;;;;;
+144D1;ANATOLIAN HIEROGLYPH A182;Lo;0;L;;;;;N;;;;;
+144D2;ANATOLIAN HIEROGLYPH A183;Lo;0;L;;;;;N;;;;;
+144D3;ANATOLIAN HIEROGLYPH A184;Lo;0;L;;;;;N;;;;;
+144D4;ANATOLIAN HIEROGLYPH A185;Lo;0;L;;;;;N;;;;;
+144D5;ANATOLIAN HIEROGLYPH A186;Lo;0;L;;;;;N;;;;;
+144D6;ANATOLIAN HIEROGLYPH A187;Lo;0;L;;;;;N;;;;;
+144D7;ANATOLIAN HIEROGLYPH A188;Lo;0;L;;;;;N;;;;;
+144D8;ANATOLIAN HIEROGLYPH A189;Lo;0;L;;;;;N;;;;;
+144D9;ANATOLIAN HIEROGLYPH A190;Lo;0;L;;;;;N;;;;;
+144DA;ANATOLIAN HIEROGLYPH A191;Lo;0;L;;;;;N;;;;;
+144DB;ANATOLIAN HIEROGLYPH A192;Lo;0;L;;;;;N;;;;;
+144DC;ANATOLIAN HIEROGLYPH A193;Lo;0;L;;;;;N;;;;;
+144DD;ANATOLIAN HIEROGLYPH A194;Lo;0;L;;;;;N;;;;;
+144DE;ANATOLIAN HIEROGLYPH A195;Lo;0;L;;;;;N;;;;;
+144DF;ANATOLIAN HIEROGLYPH A196;Lo;0;L;;;;;N;;;;;
+144E0;ANATOLIAN HIEROGLYPH A197;Lo;0;L;;;;;N;;;;;
+144E1;ANATOLIAN HIEROGLYPH A198;Lo;0;L;;;;;N;;;;;
+144E2;ANATOLIAN HIEROGLYPH A199;Lo;0;L;;;;;N;;;;;
+144E3;ANATOLIAN HIEROGLYPH A200;Lo;0;L;;;;;N;;;;;
+144E4;ANATOLIAN HIEROGLYPH A201;Lo;0;L;;;;;N;;;;;
+144E5;ANATOLIAN HIEROGLYPH A202;Lo;0;L;;;;;N;;;;;
+144E6;ANATOLIAN HIEROGLYPH A202A;Lo;0;L;;;;;N;;;;;
+144E7;ANATOLIAN HIEROGLYPH A202B;Lo;0;L;;;;;N;;;;;
+144E8;ANATOLIAN HIEROGLYPH A203;Lo;0;L;;;;;N;;;;;
+144E9;ANATOLIAN HIEROGLYPH A204;Lo;0;L;;;;;N;;;;;
+144EA;ANATOLIAN HIEROGLYPH A205;Lo;0;L;;;;;N;;;;;
+144EB;ANATOLIAN HIEROGLYPH A206;Lo;0;L;;;;;N;;;;;
+144EC;ANATOLIAN HIEROGLYPH A207;Lo;0;L;;;;;N;;;;;
+144ED;ANATOLIAN HIEROGLYPH A207A;Lo;0;L;;;;;N;;;;;
+144EE;ANATOLIAN HIEROGLYPH A208;Lo;0;L;;;;;N;;;;;
+144EF;ANATOLIAN HIEROGLYPH A209;Lo;0;L;;;;;N;;;;;
+144F0;ANATOLIAN HIEROGLYPH A209A;Lo;0;L;;;;;N;;;;;
+144F1;ANATOLIAN HIEROGLYPH A210;Lo;0;L;;;;;N;;;;;
+144F2;ANATOLIAN HIEROGLYPH A211;Lo;0;L;;;;;N;;;;;
+144F3;ANATOLIAN HIEROGLYPH A212;Lo;0;L;;;;;N;;;;;
+144F4;ANATOLIAN HIEROGLYPH A213;Lo;0;L;;;;;N;;;;;
+144F5;ANATOLIAN HIEROGLYPH A214;Lo;0;L;;;;;N;;;;;
+144F6;ANATOLIAN HIEROGLYPH A215;Lo;0;L;;;;;N;;;;;
+144F7;ANATOLIAN HIEROGLYPH A215A;Lo;0;L;;;;;N;;;;;
+144F8;ANATOLIAN HIEROGLYPH A216;Lo;0;L;;;;;N;;;;;
+144F9;ANATOLIAN HIEROGLYPH A216A;Lo;0;L;;;;;N;;;;;
+144FA;ANATOLIAN HIEROGLYPH A217;Lo;0;L;;;;;N;;;;;
+144FB;ANATOLIAN HIEROGLYPH A218;Lo;0;L;;;;;N;;;;;
+144FC;ANATOLIAN HIEROGLYPH A219;Lo;0;L;;;;;N;;;;;
+144FD;ANATOLIAN HIEROGLYPH A220;Lo;0;L;;;;;N;;;;;
+144FE;ANATOLIAN HIEROGLYPH A221;Lo;0;L;;;;;N;;;;;
+144FF;ANATOLIAN HIEROGLYPH A222;Lo;0;L;;;;;N;;;;;
+14500;ANATOLIAN HIEROGLYPH A223;Lo;0;L;;;;;N;;;;;
+14501;ANATOLIAN HIEROGLYPH A224;Lo;0;L;;;;;N;;;;;
+14502;ANATOLIAN HIEROGLYPH A225;Lo;0;L;;;;;N;;;;;
+14503;ANATOLIAN HIEROGLYPH A226;Lo;0;L;;;;;N;;;;;
+14504;ANATOLIAN HIEROGLYPH A227;Lo;0;L;;;;;N;;;;;
+14505;ANATOLIAN HIEROGLYPH A227A;Lo;0;L;;;;;N;;;;;
+14506;ANATOLIAN HIEROGLYPH A228;Lo;0;L;;;;;N;;;;;
+14507;ANATOLIAN HIEROGLYPH A229;Lo;0;L;;;;;N;;;;;
+14508;ANATOLIAN HIEROGLYPH A230;Lo;0;L;;;;;N;;;;;
+14509;ANATOLIAN HIEROGLYPH A231;Lo;0;L;;;;;N;;;;;
+1450A;ANATOLIAN HIEROGLYPH A232;Lo;0;L;;;;;N;;;;;
+1450B;ANATOLIAN HIEROGLYPH A233;Lo;0;L;;;;;N;;;;;
+1450C;ANATOLIAN HIEROGLYPH A234;Lo;0;L;;;;;N;;;;;
+1450D;ANATOLIAN HIEROGLYPH A235;Lo;0;L;;;;;N;;;;;
+1450E;ANATOLIAN HIEROGLYPH A236;Lo;0;L;;;;;N;;;;;
+1450F;ANATOLIAN HIEROGLYPH A237;Lo;0;L;;;;;N;;;;;
+14510;ANATOLIAN HIEROGLYPH A238;Lo;0;L;;;;;N;;;;;
+14511;ANATOLIAN HIEROGLYPH A239;Lo;0;L;;;;;N;;;;;
+14512;ANATOLIAN HIEROGLYPH A240;Lo;0;L;;;;;N;;;;;
+14513;ANATOLIAN HIEROGLYPH A241;Lo;0;L;;;;;N;;;;;
+14514;ANATOLIAN HIEROGLYPH A242;Lo;0;L;;;;;N;;;;;
+14515;ANATOLIAN HIEROGLYPH A243;Lo;0;L;;;;;N;;;;;
+14516;ANATOLIAN HIEROGLYPH A244;Lo;0;L;;;;;N;;;;;
+14517;ANATOLIAN HIEROGLYPH A245;Lo;0;L;;;;;N;;;;;
+14518;ANATOLIAN HIEROGLYPH A246;Lo;0;L;;;;;N;;;;;
+14519;ANATOLIAN HIEROGLYPH A247;Lo;0;L;;;;;N;;;;;
+1451A;ANATOLIAN HIEROGLYPH A248;Lo;0;L;;;;;N;;;;;
+1451B;ANATOLIAN HIEROGLYPH A249;Lo;0;L;;;;;N;;;;;
+1451C;ANATOLIAN HIEROGLYPH A250;Lo;0;L;;;;;N;;;;;
+1451D;ANATOLIAN HIEROGLYPH A251;Lo;0;L;;;;;N;;;;;
+1451E;ANATOLIAN HIEROGLYPH A252;Lo;0;L;;;;;N;;;;;
+1451F;ANATOLIAN HIEROGLYPH A253;Lo;0;L;;;;;N;;;;;
+14520;ANATOLIAN HIEROGLYPH A254;Lo;0;L;;;;;N;;;;;
+14521;ANATOLIAN HIEROGLYPH A255;Lo;0;L;;;;;N;;;;;
+14522;ANATOLIAN HIEROGLYPH A256;Lo;0;L;;;;;N;;;;;
+14523;ANATOLIAN HIEROGLYPH A257;Lo;0;L;;;;;N;;;;;
+14524;ANATOLIAN HIEROGLYPH A258;Lo;0;L;;;;;N;;;;;
+14525;ANATOLIAN HIEROGLYPH A259;Lo;0;L;;;;;N;;;;;
+14526;ANATOLIAN HIEROGLYPH A260;Lo;0;L;;;;;N;;;;;
+14527;ANATOLIAN HIEROGLYPH A261;Lo;0;L;;;;;N;;;;;
+14528;ANATOLIAN HIEROGLYPH A262;Lo;0;L;;;;;N;;;;;
+14529;ANATOLIAN HIEROGLYPH A263;Lo;0;L;;;;;N;;;;;
+1452A;ANATOLIAN HIEROGLYPH A264;Lo;0;L;;;;;N;;;;;
+1452B;ANATOLIAN HIEROGLYPH A265;Lo;0;L;;;;;N;;;;;
+1452C;ANATOLIAN HIEROGLYPH A266;Lo;0;L;;;;;N;;;;;
+1452D;ANATOLIAN HIEROGLYPH A267;Lo;0;L;;;;;N;;;;;
+1452E;ANATOLIAN HIEROGLYPH A267A;Lo;0;L;;;;;N;;;;;
+1452F;ANATOLIAN HIEROGLYPH A268;Lo;0;L;;;;;N;;;;;
+14530;ANATOLIAN HIEROGLYPH A269;Lo;0;L;;;;;N;;;;;
+14531;ANATOLIAN HIEROGLYPH A270;Lo;0;L;;;;;N;;;;;
+14532;ANATOLIAN HIEROGLYPH A271;Lo;0;L;;;;;N;;;;;
+14533;ANATOLIAN HIEROGLYPH A272;Lo;0;L;;;;;N;;;;;
+14534;ANATOLIAN HIEROGLYPH A273;Lo;0;L;;;;;N;;;;;
+14535;ANATOLIAN HIEROGLYPH A274;Lo;0;L;;;;;N;;;;;
+14536;ANATOLIAN HIEROGLYPH A275;Lo;0;L;;;;;N;;;;;
+14537;ANATOLIAN HIEROGLYPH A276;Lo;0;L;;;;;N;;;;;
+14538;ANATOLIAN HIEROGLYPH A277;Lo;0;L;;;;;N;;;;;
+14539;ANATOLIAN HIEROGLYPH A278;Lo;0;L;;;;;N;;;;;
+1453A;ANATOLIAN HIEROGLYPH A279;Lo;0;L;;;;;N;;;;;
+1453B;ANATOLIAN HIEROGLYPH A280;Lo;0;L;;;;;N;;;;;
+1453C;ANATOLIAN HIEROGLYPH A281;Lo;0;L;;;;;N;;;;;
+1453D;ANATOLIAN HIEROGLYPH A282;Lo;0;L;;;;;N;;;;;
+1453E;ANATOLIAN HIEROGLYPH A283;Lo;0;L;;;;;N;;;;;
+1453F;ANATOLIAN HIEROGLYPH A284;Lo;0;L;;;;;N;;;;;
+14540;ANATOLIAN HIEROGLYPH A285;Lo;0;L;;;;;N;;;;;
+14541;ANATOLIAN HIEROGLYPH A286;Lo;0;L;;;;;N;;;;;
+14542;ANATOLIAN HIEROGLYPH A287;Lo;0;L;;;;;N;;;;;
+14543;ANATOLIAN HIEROGLYPH A288;Lo;0;L;;;;;N;;;;;
+14544;ANATOLIAN HIEROGLYPH A289;Lo;0;L;;;;;N;;;;;
+14545;ANATOLIAN HIEROGLYPH A289A;Lo;0;L;;;;;N;;;;;
+14546;ANATOLIAN HIEROGLYPH A290;Lo;0;L;;;;;N;;;;;
+14547;ANATOLIAN HIEROGLYPH A291;Lo;0;L;;;;;N;;;;;
+14548;ANATOLIAN HIEROGLYPH A292;Lo;0;L;;;;;N;;;;;
+14549;ANATOLIAN HIEROGLYPH A293;Lo;0;L;;;;;N;;;;;
+1454A;ANATOLIAN HIEROGLYPH A294;Lo;0;L;;;;;N;;;;;
+1454B;ANATOLIAN HIEROGLYPH A294A;Lo;0;L;;;;;N;;;;;
+1454C;ANATOLIAN HIEROGLYPH A295;Lo;0;L;;;;;N;;;;;
+1454D;ANATOLIAN HIEROGLYPH A296;Lo;0;L;;;;;N;;;;;
+1454E;ANATOLIAN HIEROGLYPH A297;Lo;0;L;;;;;N;;;;;
+1454F;ANATOLIAN HIEROGLYPH A298;Lo;0;L;;;;;N;;;;;
+14550;ANATOLIAN HIEROGLYPH A299;Lo;0;L;;;;;N;;;;;
+14551;ANATOLIAN HIEROGLYPH A299A;Lo;0;L;;;;;N;;;;;
+14552;ANATOLIAN HIEROGLYPH A300;Lo;0;L;;;;;N;;;;;
+14553;ANATOLIAN HIEROGLYPH A301;Lo;0;L;;;;;N;;;;;
+14554;ANATOLIAN HIEROGLYPH A302;Lo;0;L;;;;;N;;;;;
+14555;ANATOLIAN HIEROGLYPH A303;Lo;0;L;;;;;N;;;;;
+14556;ANATOLIAN HIEROGLYPH A304;Lo;0;L;;;;;N;;;;;
+14557;ANATOLIAN HIEROGLYPH A305;Lo;0;L;;;;;N;;;;;
+14558;ANATOLIAN HIEROGLYPH A306;Lo;0;L;;;;;N;;;;;
+14559;ANATOLIAN HIEROGLYPH A307;Lo;0;L;;;;;N;;;;;
+1455A;ANATOLIAN HIEROGLYPH A308;Lo;0;L;;;;;N;;;;;
+1455B;ANATOLIAN HIEROGLYPH A309;Lo;0;L;;;;;N;;;;;
+1455C;ANATOLIAN HIEROGLYPH A309A;Lo;0;L;;;;;N;;;;;
+1455D;ANATOLIAN HIEROGLYPH A310;Lo;0;L;;;;;N;;;;;
+1455E;ANATOLIAN HIEROGLYPH A311;Lo;0;L;;;;;N;;;;;
+1455F;ANATOLIAN HIEROGLYPH A312;Lo;0;L;;;;;N;;;;;
+14560;ANATOLIAN HIEROGLYPH A313;Lo;0;L;;;;;N;;;;;
+14561;ANATOLIAN HIEROGLYPH A314;Lo;0;L;;;;;N;;;;;
+14562;ANATOLIAN HIEROGLYPH A315;Lo;0;L;;;;;N;;;;;
+14563;ANATOLIAN HIEROGLYPH A316;Lo;0;L;;;;;N;;;;;
+14564;ANATOLIAN HIEROGLYPH A317;Lo;0;L;;;;;N;;;;;
+14565;ANATOLIAN HIEROGLYPH A318;Lo;0;L;;;;;N;;;;;
+14566;ANATOLIAN HIEROGLYPH A319;Lo;0;L;;;;;N;;;;;
+14567;ANATOLIAN HIEROGLYPH A320;Lo;0;L;;;;;N;;;;;
+14568;ANATOLIAN HIEROGLYPH A321;Lo;0;L;;;;;N;;;;;
+14569;ANATOLIAN HIEROGLYPH A322;Lo;0;L;;;;;N;;;;;
+1456A;ANATOLIAN HIEROGLYPH A323;Lo;0;L;;;;;N;;;;;
+1456B;ANATOLIAN HIEROGLYPH A324;Lo;0;L;;;;;N;;;;;
+1456C;ANATOLIAN HIEROGLYPH A325;Lo;0;L;;;;;N;;;;;
+1456D;ANATOLIAN HIEROGLYPH A326;Lo;0;L;;;;;N;;;;;
+1456E;ANATOLIAN HIEROGLYPH A327;Lo;0;L;;;;;N;;;;;
+1456F;ANATOLIAN HIEROGLYPH A328;Lo;0;L;;;;;N;;;;;
+14570;ANATOLIAN HIEROGLYPH A329;Lo;0;L;;;;;N;;;;;
+14571;ANATOLIAN HIEROGLYPH A329A;Lo;0;L;;;;;N;;;;;
+14572;ANATOLIAN HIEROGLYPH A330;Lo;0;L;;;;;N;;;;;
+14573;ANATOLIAN HIEROGLYPH A331;Lo;0;L;;;;;N;;;;;
+14574;ANATOLIAN HIEROGLYPH A332A;Lo;0;L;;;;;N;;;;;
+14575;ANATOLIAN HIEROGLYPH A332B;Lo;0;L;;;;;N;;;;;
+14576;ANATOLIAN HIEROGLYPH A332C;Lo;0;L;;;;;N;;;;;
+14577;ANATOLIAN HIEROGLYPH A333;Lo;0;L;;;;;N;;;;;
+14578;ANATOLIAN HIEROGLYPH A334;Lo;0;L;;;;;N;;;;;
+14579;ANATOLIAN HIEROGLYPH A335;Lo;0;L;;;;;N;;;;;
+1457A;ANATOLIAN HIEROGLYPH A336;Lo;0;L;;;;;N;;;;;
+1457B;ANATOLIAN HIEROGLYPH A336A;Lo;0;L;;;;;N;;;;;
+1457C;ANATOLIAN HIEROGLYPH A336B;Lo;0;L;;;;;N;;;;;
+1457D;ANATOLIAN HIEROGLYPH A336C;Lo;0;L;;;;;N;;;;;
+1457E;ANATOLIAN HIEROGLYPH A337;Lo;0;L;;;;;N;;;;;
+1457F;ANATOLIAN HIEROGLYPH A338;Lo;0;L;;;;;N;;;;;
+14580;ANATOLIAN HIEROGLYPH A339;Lo;0;L;;;;;N;;;;;
+14581;ANATOLIAN HIEROGLYPH A340;Lo;0;L;;;;;N;;;;;
+14582;ANATOLIAN HIEROGLYPH A341;Lo;0;L;;;;;N;;;;;
+14583;ANATOLIAN HIEROGLYPH A342;Lo;0;L;;;;;N;;;;;
+14584;ANATOLIAN HIEROGLYPH A343;Lo;0;L;;;;;N;;;;;
+14585;ANATOLIAN HIEROGLYPH A344;Lo;0;L;;;;;N;;;;;
+14586;ANATOLIAN HIEROGLYPH A345;Lo;0;L;;;;;N;;;;;
+14587;ANATOLIAN HIEROGLYPH A346;Lo;0;L;;;;;N;;;;;
+14588;ANATOLIAN HIEROGLYPH A347;Lo;0;L;;;;;N;;;;;
+14589;ANATOLIAN HIEROGLYPH A348;Lo;0;L;;;;;N;;;;;
+1458A;ANATOLIAN HIEROGLYPH A349;Lo;0;L;;;;;N;;;;;
+1458B;ANATOLIAN HIEROGLYPH A350;Lo;0;L;;;;;N;;;;;
+1458C;ANATOLIAN HIEROGLYPH A351;Lo;0;L;;;;;N;;;;;
+1458D;ANATOLIAN HIEROGLYPH A352;Lo;0;L;;;;;N;;;;;
+1458E;ANATOLIAN HIEROGLYPH A353;Lo;0;L;;;;;N;;;;;
+1458F;ANATOLIAN HIEROGLYPH A354;Lo;0;L;;;;;N;;;;;
+14590;ANATOLIAN HIEROGLYPH A355;Lo;0;L;;;;;N;;;;;
+14591;ANATOLIAN HIEROGLYPH A356;Lo;0;L;;;;;N;;;;;
+14592;ANATOLIAN HIEROGLYPH A357;Lo;0;L;;;;;N;;;;;
+14593;ANATOLIAN HIEROGLYPH A358;Lo;0;L;;;;;N;;;;;
+14594;ANATOLIAN HIEROGLYPH A359;Lo;0;L;;;;;N;;;;;
+14595;ANATOLIAN HIEROGLYPH A359A;Lo;0;L;;;;;N;;;;;
+14596;ANATOLIAN HIEROGLYPH A360;Lo;0;L;;;;;N;;;;;
+14597;ANATOLIAN HIEROGLYPH A361;Lo;0;L;;;;;N;;;;;
+14598;ANATOLIAN HIEROGLYPH A362;Lo;0;L;;;;;N;;;;;
+14599;ANATOLIAN HIEROGLYPH A363;Lo;0;L;;;;;N;;;;;
+1459A;ANATOLIAN HIEROGLYPH A364;Lo;0;L;;;;;N;;;;;
+1459B;ANATOLIAN HIEROGLYPH A364A;Lo;0;L;;;;;N;;;;;
+1459C;ANATOLIAN HIEROGLYPH A365;Lo;0;L;;;;;N;;;;;
+1459D;ANATOLIAN HIEROGLYPH A366;Lo;0;L;;;;;N;;;;;
+1459E;ANATOLIAN HIEROGLYPH A367;Lo;0;L;;;;;N;;;;;
+1459F;ANATOLIAN HIEROGLYPH A368;Lo;0;L;;;;;N;;;;;
+145A0;ANATOLIAN HIEROGLYPH A368A;Lo;0;L;;;;;N;;;;;
+145A1;ANATOLIAN HIEROGLYPH A369;Lo;0;L;;;;;N;;;;;
+145A2;ANATOLIAN HIEROGLYPH A370;Lo;0;L;;;;;N;;;;;
+145A3;ANATOLIAN HIEROGLYPH A371;Lo;0;L;;;;;N;;;;;
+145A4;ANATOLIAN HIEROGLYPH A371A;Lo;0;L;;;;;N;;;;;
+145A5;ANATOLIAN HIEROGLYPH A372;Lo;0;L;;;;;N;;;;;
+145A6;ANATOLIAN HIEROGLYPH A373;Lo;0;L;;;;;N;;;;;
+145A7;ANATOLIAN HIEROGLYPH A374;Lo;0;L;;;;;N;;;;;
+145A8;ANATOLIAN HIEROGLYPH A375;Lo;0;L;;;;;N;;;;;
+145A9;ANATOLIAN HIEROGLYPH A376;Lo;0;L;;;;;N;;;;;
+145AA;ANATOLIAN HIEROGLYPH A377;Lo;0;L;;;;;N;;;;;
+145AB;ANATOLIAN HIEROGLYPH A378;Lo;0;L;;;;;N;;;;;
+145AC;ANATOLIAN HIEROGLYPH A379;Lo;0;L;;;;;N;;;;;
+145AD;ANATOLIAN HIEROGLYPH A380;Lo;0;L;;;;;N;;;;;
+145AE;ANATOLIAN HIEROGLYPH A381;Lo;0;L;;;;;N;;;;;
+145AF;ANATOLIAN HIEROGLYPH A381A;Lo;0;L;;;;;N;;;;;
+145B0;ANATOLIAN HIEROGLYPH A382;Lo;0;L;;;;;N;;;;;
+145B1;ANATOLIAN HIEROGLYPH A383 RA OR RI;Lo;0;L;;;;;N;;;;;
+145B2;ANATOLIAN HIEROGLYPH A383A;Lo;0;L;;;;;N;;;;;
+145B3;ANATOLIAN HIEROGLYPH A384;Lo;0;L;;;;;N;;;;;
+145B4;ANATOLIAN HIEROGLYPH A385;Lo;0;L;;;;;N;;;;;
+145B5;ANATOLIAN HIEROGLYPH A386;Lo;0;L;;;;;N;;;;;
+145B6;ANATOLIAN HIEROGLYPH A386A;Lo;0;L;;;;;N;;;;;
+145B7;ANATOLIAN HIEROGLYPH A387;Lo;0;L;;;;;N;;;;;
+145B8;ANATOLIAN HIEROGLYPH A388;Lo;0;L;;;;;N;;;;;
+145B9;ANATOLIAN HIEROGLYPH A389;Lo;0;L;;;;;N;;;;;
+145BA;ANATOLIAN HIEROGLYPH A390;Lo;0;L;;;;;N;;;;;
+145BB;ANATOLIAN HIEROGLYPH A391;Lo;0;L;;;;;N;;;;;
+145BC;ANATOLIAN HIEROGLYPH A392;Lo;0;L;;;;;N;;;;;
+145BD;ANATOLIAN HIEROGLYPH A393 EIGHT;Lo;0;L;;;;;N;;;;;
+145BE;ANATOLIAN HIEROGLYPH A394;Lo;0;L;;;;;N;;;;;
+145BF;ANATOLIAN HIEROGLYPH A395;Lo;0;L;;;;;N;;;;;
+145C0;ANATOLIAN HIEROGLYPH A396;Lo;0;L;;;;;N;;;;;
+145C1;ANATOLIAN HIEROGLYPH A397;Lo;0;L;;;;;N;;;;;
+145C2;ANATOLIAN HIEROGLYPH A398;Lo;0;L;;;;;N;;;;;
+145C3;ANATOLIAN HIEROGLYPH A399;Lo;0;L;;;;;N;;;;;
+145C4;ANATOLIAN HIEROGLYPH A400;Lo;0;L;;;;;N;;;;;
+145C5;ANATOLIAN HIEROGLYPH A401;Lo;0;L;;;;;N;;;;;
+145C6;ANATOLIAN HIEROGLYPH A402;Lo;0;L;;;;;N;;;;;
+145C7;ANATOLIAN HIEROGLYPH A403;Lo;0;L;;;;;N;;;;;
+145C8;ANATOLIAN HIEROGLYPH A404;Lo;0;L;;;;;N;;;;;
+145C9;ANATOLIAN HIEROGLYPH A405;Lo;0;L;;;;;N;;;;;
+145CA;ANATOLIAN HIEROGLYPH A406;Lo;0;L;;;;;N;;;;;
+145CB;ANATOLIAN HIEROGLYPH A407;Lo;0;L;;;;;N;;;;;
+145CC;ANATOLIAN HIEROGLYPH A408;Lo;0;L;;;;;N;;;;;
+145CD;ANATOLIAN HIEROGLYPH A409;Lo;0;L;;;;;N;;;;;
+145CE;ANATOLIAN HIEROGLYPH A410 BEGIN LOGOGRAM MARK;Lo;0;L;;;;;N;;;;;
+145CF;ANATOLIAN HIEROGLYPH A410A END LOGOGRAM MARK;Lo;0;L;;;;;N;;;;;
+145D0;ANATOLIAN HIEROGLYPH A411;Lo;0;L;;;;;N;;;;;
+145D1;ANATOLIAN HIEROGLYPH A412;Lo;0;L;;;;;N;;;;;
+145D2;ANATOLIAN HIEROGLYPH A413;Lo;0;L;;;;;N;;;;;
+145D3;ANATOLIAN HIEROGLYPH A414;Lo;0;L;;;;;N;;;;;
+145D4;ANATOLIAN HIEROGLYPH A415;Lo;0;L;;;;;N;;;;;
+145D5;ANATOLIAN HIEROGLYPH A416;Lo;0;L;;;;;N;;;;;
+145D6;ANATOLIAN HIEROGLYPH A417;Lo;0;L;;;;;N;;;;;
+145D7;ANATOLIAN HIEROGLYPH A418;Lo;0;L;;;;;N;;;;;
+145D8;ANATOLIAN HIEROGLYPH A419;Lo;0;L;;;;;N;;;;;
+145D9;ANATOLIAN HIEROGLYPH A420;Lo;0;L;;;;;N;;;;;
+145DA;ANATOLIAN HIEROGLYPH A421;Lo;0;L;;;;;N;;;;;
+145DB;ANATOLIAN HIEROGLYPH A422;Lo;0;L;;;;;N;;;;;
+145DC;ANATOLIAN HIEROGLYPH A423;Lo;0;L;;;;;N;;;;;
+145DD;ANATOLIAN HIEROGLYPH A424;Lo;0;L;;;;;N;;;;;
+145DE;ANATOLIAN HIEROGLYPH A425;Lo;0;L;;;;;N;;;;;
+145DF;ANATOLIAN HIEROGLYPH A426;Lo;0;L;;;;;N;;;;;
+145E0;ANATOLIAN HIEROGLYPH A427;Lo;0;L;;;;;N;;;;;
+145E1;ANATOLIAN HIEROGLYPH A428;Lo;0;L;;;;;N;;;;;
+145E2;ANATOLIAN HIEROGLYPH A429;Lo;0;L;;;;;N;;;;;
+145E3;ANATOLIAN HIEROGLYPH A430;Lo;0;L;;;;;N;;;;;
+145E4;ANATOLIAN HIEROGLYPH A431;Lo;0;L;;;;;N;;;;;
+145E5;ANATOLIAN HIEROGLYPH A432;Lo;0;L;;;;;N;;;;;
+145E6;ANATOLIAN HIEROGLYPH A433;Lo;0;L;;;;;N;;;;;
+145E7;ANATOLIAN HIEROGLYPH A434;Lo;0;L;;;;;N;;;;;
+145E8;ANATOLIAN HIEROGLYPH A435;Lo;0;L;;;;;N;;;;;
+145E9;ANATOLIAN HIEROGLYPH A436;Lo;0;L;;;;;N;;;;;
+145EA;ANATOLIAN HIEROGLYPH A437;Lo;0;L;;;;;N;;;;;
+145EB;ANATOLIAN HIEROGLYPH A438;Lo;0;L;;;;;N;;;;;
+145EC;ANATOLIAN HIEROGLYPH A439;Lo;0;L;;;;;N;;;;;
+145ED;ANATOLIAN HIEROGLYPH A440;Lo;0;L;;;;;N;;;;;
+145EE;ANATOLIAN HIEROGLYPH A441;Lo;0;L;;;;;N;;;;;
+145EF;ANATOLIAN HIEROGLYPH A442;Lo;0;L;;;;;N;;;;;
+145F0;ANATOLIAN HIEROGLYPH A443;Lo;0;L;;;;;N;;;;;
+145F1;ANATOLIAN HIEROGLYPH A444;Lo;0;L;;;;;N;;;;;
+145F2;ANATOLIAN HIEROGLYPH A445;Lo;0;L;;;;;N;;;;;
+145F3;ANATOLIAN HIEROGLYPH A446;Lo;0;L;;;;;N;;;;;
+145F4;ANATOLIAN HIEROGLYPH A447;Lo;0;L;;;;;N;;;;;
+145F5;ANATOLIAN HIEROGLYPH A448;Lo;0;L;;;;;N;;;;;
+145F6;ANATOLIAN HIEROGLYPH A449;Lo;0;L;;;;;N;;;;;
+145F7;ANATOLIAN HIEROGLYPH A450;Lo;0;L;;;;;N;;;;;
+145F8;ANATOLIAN HIEROGLYPH A450A;Lo;0;L;;;;;N;;;;;
+145F9;ANATOLIAN HIEROGLYPH A451;Lo;0;L;;;;;N;;;;;
+145FA;ANATOLIAN HIEROGLYPH A452;Lo;0;L;;;;;N;;;;;
+145FB;ANATOLIAN HIEROGLYPH A453;Lo;0;L;;;;;N;;;;;
+145FC;ANATOLIAN HIEROGLYPH A454;Lo;0;L;;;;;N;;;;;
+145FD;ANATOLIAN HIEROGLYPH A455;Lo;0;L;;;;;N;;;;;
+145FE;ANATOLIAN HIEROGLYPH A456;Lo;0;L;;;;;N;;;;;
+145FF;ANATOLIAN HIEROGLYPH A457;Lo;0;L;;;;;N;;;;;
+14600;ANATOLIAN HIEROGLYPH A457A;Lo;0;L;;;;;N;;;;;
+14601;ANATOLIAN HIEROGLYPH A458;Lo;0;L;;;;;N;;;;;
+14602;ANATOLIAN HIEROGLYPH A459;Lo;0;L;;;;;N;;;;;
+14603;ANATOLIAN HIEROGLYPH A460;Lo;0;L;;;;;N;;;;;
+14604;ANATOLIAN HIEROGLYPH A461;Lo;0;L;;;;;N;;;;;
+14605;ANATOLIAN HIEROGLYPH A462;Lo;0;L;;;;;N;;;;;
+14606;ANATOLIAN HIEROGLYPH A463;Lo;0;L;;;;;N;;;;;
+14607;ANATOLIAN HIEROGLYPH A464;Lo;0;L;;;;;N;;;;;
+14608;ANATOLIAN HIEROGLYPH A465;Lo;0;L;;;;;N;;;;;
+14609;ANATOLIAN HIEROGLYPH A466;Lo;0;L;;;;;N;;;;;
+1460A;ANATOLIAN HIEROGLYPH A467;Lo;0;L;;;;;N;;;;;
+1460B;ANATOLIAN HIEROGLYPH A468;Lo;0;L;;;;;N;;;;;
+1460C;ANATOLIAN HIEROGLYPH A469;Lo;0;L;;;;;N;;;;;
+1460D;ANATOLIAN HIEROGLYPH A470;Lo;0;L;;;;;N;;;;;
+1460E;ANATOLIAN HIEROGLYPH A471;Lo;0;L;;;;;N;;;;;
+1460F;ANATOLIAN HIEROGLYPH A472;Lo;0;L;;;;;N;;;;;
+14610;ANATOLIAN HIEROGLYPH A473;Lo;0;L;;;;;N;;;;;
+14611;ANATOLIAN HIEROGLYPH A474;Lo;0;L;;;;;N;;;;;
+14612;ANATOLIAN HIEROGLYPH A475;Lo;0;L;;;;;N;;;;;
+14613;ANATOLIAN HIEROGLYPH A476;Lo;0;L;;;;;N;;;;;
+14614;ANATOLIAN HIEROGLYPH A477;Lo;0;L;;;;;N;;;;;
+14615;ANATOLIAN HIEROGLYPH A478;Lo;0;L;;;;;N;;;;;
+14616;ANATOLIAN HIEROGLYPH A479;Lo;0;L;;;;;N;;;;;
+14617;ANATOLIAN HIEROGLYPH A480;Lo;0;L;;;;;N;;;;;
+14618;ANATOLIAN HIEROGLYPH A481;Lo;0;L;;;;;N;;;;;
+14619;ANATOLIAN HIEROGLYPH A482;Lo;0;L;;;;;N;;;;;
+1461A;ANATOLIAN HIEROGLYPH A483;Lo;0;L;;;;;N;;;;;
+1461B;ANATOLIAN HIEROGLYPH A484;Lo;0;L;;;;;N;;;;;
+1461C;ANATOLIAN HIEROGLYPH A485;Lo;0;L;;;;;N;;;;;
+1461D;ANATOLIAN HIEROGLYPH A486;Lo;0;L;;;;;N;;;;;
+1461E;ANATOLIAN HIEROGLYPH A487;Lo;0;L;;;;;N;;;;;
+1461F;ANATOLIAN HIEROGLYPH A488;Lo;0;L;;;;;N;;;;;
+14620;ANATOLIAN HIEROGLYPH A489;Lo;0;L;;;;;N;;;;;
+14621;ANATOLIAN HIEROGLYPH A490;Lo;0;L;;;;;N;;;;;
+14622;ANATOLIAN HIEROGLYPH A491;Lo;0;L;;;;;N;;;;;
+14623;ANATOLIAN HIEROGLYPH A492;Lo;0;L;;;;;N;;;;;
+14624;ANATOLIAN HIEROGLYPH A493;Lo;0;L;;;;;N;;;;;
+14625;ANATOLIAN HIEROGLYPH A494;Lo;0;L;;;;;N;;;;;
+14626;ANATOLIAN HIEROGLYPH A495;Lo;0;L;;;;;N;;;;;
+14627;ANATOLIAN HIEROGLYPH A496;Lo;0;L;;;;;N;;;;;
+14628;ANATOLIAN HIEROGLYPH A497;Lo;0;L;;;;;N;;;;;
+14629;ANATOLIAN HIEROGLYPH A501;Lo;0;L;;;;;N;;;;;
+1462A;ANATOLIAN HIEROGLYPH A502;Lo;0;L;;;;;N;;;;;
+1462B;ANATOLIAN HIEROGLYPH A503;Lo;0;L;;;;;N;;;;;
+1462C;ANATOLIAN HIEROGLYPH A504;Lo;0;L;;;;;N;;;;;
+1462D;ANATOLIAN HIEROGLYPH A505;Lo;0;L;;;;;N;;;;;
+1462E;ANATOLIAN HIEROGLYPH A506;Lo;0;L;;;;;N;;;;;
+1462F;ANATOLIAN HIEROGLYPH A507;Lo;0;L;;;;;N;;;;;
+14630;ANATOLIAN HIEROGLYPH A508;Lo;0;L;;;;;N;;;;;
+14631;ANATOLIAN HIEROGLYPH A509;Lo;0;L;;;;;N;;;;;
+14632;ANATOLIAN HIEROGLYPH A510;Lo;0;L;;;;;N;;;;;
+14633;ANATOLIAN HIEROGLYPH A511;Lo;0;L;;;;;N;;;;;
+14634;ANATOLIAN HIEROGLYPH A512;Lo;0;L;;;;;N;;;;;
+14635;ANATOLIAN HIEROGLYPH A513;Lo;0;L;;;;;N;;;;;
+14636;ANATOLIAN HIEROGLYPH A514;Lo;0;L;;;;;N;;;;;
+14637;ANATOLIAN HIEROGLYPH A515;Lo;0;L;;;;;N;;;;;
+14638;ANATOLIAN HIEROGLYPH A516;Lo;0;L;;;;;N;;;;;
+14639;ANATOLIAN HIEROGLYPH A517;Lo;0;L;;;;;N;;;;;
+1463A;ANATOLIAN HIEROGLYPH A518;Lo;0;L;;;;;N;;;;;
+1463B;ANATOLIAN HIEROGLYPH A519;Lo;0;L;;;;;N;;;;;
+1463C;ANATOLIAN HIEROGLYPH A520;Lo;0;L;;;;;N;;;;;
+1463D;ANATOLIAN HIEROGLYPH A521;Lo;0;L;;;;;N;;;;;
+1463E;ANATOLIAN HIEROGLYPH A522;Lo;0;L;;;;;N;;;;;
+1463F;ANATOLIAN HIEROGLYPH A523;Lo;0;L;;;;;N;;;;;
+14640;ANATOLIAN HIEROGLYPH A524;Lo;0;L;;;;;N;;;;;
+14641;ANATOLIAN HIEROGLYPH A525;Lo;0;L;;;;;N;;;;;
+14642;ANATOLIAN HIEROGLYPH A526;Lo;0;L;;;;;N;;;;;
+14643;ANATOLIAN HIEROGLYPH A527;Lo;0;L;;;;;N;;;;;
+14644;ANATOLIAN HIEROGLYPH A528;Lo;0;L;;;;;N;;;;;
+14645;ANATOLIAN HIEROGLYPH A529;Lo;0;L;;;;;N;;;;;
+14646;ANATOLIAN HIEROGLYPH A530;Lo;0;L;;;;;N;;;;;
+16800;BAMUM LETTER PHASE-A NGKUE MFON;Lo;0;L;;;;;N;;;;;
+16801;BAMUM LETTER PHASE-A GBIEE FON;Lo;0;L;;;;;N;;;;;
+16802;BAMUM LETTER PHASE-A PON MFON PIPAEMGBIEE;Lo;0;L;;;;;N;;;;;
+16803;BAMUM LETTER PHASE-A PON MFON PIPAEMBA;Lo;0;L;;;;;N;;;;;
+16804;BAMUM LETTER PHASE-A NAA MFON;Lo;0;L;;;;;N;;;;;
+16805;BAMUM LETTER PHASE-A SHUENSHUET;Lo;0;L;;;;;N;;;;;
+16806;BAMUM LETTER PHASE-A TITA MFON;Lo;0;L;;;;;N;;;;;
+16807;BAMUM LETTER PHASE-A NZA MFON;Lo;0;L;;;;;N;;;;;
+16808;BAMUM LETTER PHASE-A SHINDA PA NJI;Lo;0;L;;;;;N;;;;;
+16809;BAMUM LETTER PHASE-A PON PA NJI PIPAEMGBIEE;Lo;0;L;;;;;N;;;;;
+1680A;BAMUM LETTER PHASE-A PON PA NJI PIPAEMBA;Lo;0;L;;;;;N;;;;;
+1680B;BAMUM LETTER PHASE-A MAEMBGBIEE;Lo;0;L;;;;;N;;;;;
+1680C;BAMUM LETTER PHASE-A TU MAEMBA;Lo;0;L;;;;;N;;;;;
+1680D;BAMUM LETTER PHASE-A NGANGU;Lo;0;L;;;;;N;;;;;
+1680E;BAMUM LETTER PHASE-A MAEMVEUX;Lo;0;L;;;;;N;;;;;
+1680F;BAMUM LETTER PHASE-A MANSUAE;Lo;0;L;;;;;N;;;;;
+16810;BAMUM LETTER PHASE-A MVEUAENGAM;Lo;0;L;;;;;N;;;;;
+16811;BAMUM LETTER PHASE-A SEUNYAM;Lo;0;L;;;;;N;;;;;
+16812;BAMUM LETTER PHASE-A NTOQPEN;Lo;0;L;;;;;N;;;;;
+16813;BAMUM LETTER PHASE-A KEUKEUTNDA;Lo;0;L;;;;;N;;;;;
+16814;BAMUM LETTER PHASE-A NKINDI;Lo;0;L;;;;;N;;;;;
+16815;BAMUM LETTER PHASE-A SUU;Lo;0;L;;;;;N;;;;;
+16816;BAMUM LETTER PHASE-A NGKUENZEUM;Lo;0;L;;;;;N;;;;;
+16817;BAMUM LETTER PHASE-A LAPAQ;Lo;0;L;;;;;N;;;;;
+16818;BAMUM LETTER PHASE-A LET KUT;Lo;0;L;;;;;N;;;;;
+16819;BAMUM LETTER PHASE-A NTAP MFAA;Lo;0;L;;;;;N;;;;;
+1681A;BAMUM LETTER PHASE-A MAEKEUP;Lo;0;L;;;;;N;;;;;
+1681B;BAMUM LETTER PHASE-A PASHAE;Lo;0;L;;;;;N;;;;;
+1681C;BAMUM LETTER PHASE-A GHEUAERAE;Lo;0;L;;;;;N;;;;;
+1681D;BAMUM LETTER PHASE-A PAMSHAE;Lo;0;L;;;;;N;;;;;
+1681E;BAMUM LETTER PHASE-A MON NGGEUAET;Lo;0;L;;;;;N;;;;;
+1681F;BAMUM LETTER PHASE-A NZUN MEUT;Lo;0;L;;;;;N;;;;;
+16820;BAMUM LETTER PHASE-A U YUQ NAE;Lo;0;L;;;;;N;;;;;
+16821;BAMUM LETTER PHASE-A GHEUAEGHEUAE;Lo;0;L;;;;;N;;;;;
+16822;BAMUM LETTER PHASE-A NTAP NTAA;Lo;0;L;;;;;N;;;;;
+16823;BAMUM LETTER PHASE-A SISA;Lo;0;L;;;;;N;;;;;
+16824;BAMUM LETTER PHASE-A MGBASA;Lo;0;L;;;;;N;;;;;
+16825;BAMUM LETTER PHASE-A MEUNJOMNDEUQ;Lo;0;L;;;;;N;;;;;
+16826;BAMUM LETTER PHASE-A MOOMPUQ;Lo;0;L;;;;;N;;;;;
+16827;BAMUM LETTER PHASE-A KAFA;Lo;0;L;;;;;N;;;;;
+16828;BAMUM LETTER PHASE-A PA LEERAEWA;Lo;0;L;;;;;N;;;;;
+16829;BAMUM LETTER PHASE-A NDA LEERAEWA;Lo;0;L;;;;;N;;;;;
+1682A;BAMUM LETTER PHASE-A PET;Lo;0;L;;;;;N;;;;;
+1682B;BAMUM LETTER PHASE-A MAEMKPEN;Lo;0;L;;;;;N;;;;;
+1682C;BAMUM LETTER PHASE-A NIKA;Lo;0;L;;;;;N;;;;;
+1682D;BAMUM LETTER PHASE-A PUP;Lo;0;L;;;;;N;;;;;
+1682E;BAMUM LETTER PHASE-A TUAEP;Lo;0;L;;;;;N;;;;;
+1682F;BAMUM LETTER PHASE-A LUAEP;Lo;0;L;;;;;N;;;;;
+16830;BAMUM LETTER PHASE-A SONJAM;Lo;0;L;;;;;N;;;;;
+16831;BAMUM LETTER PHASE-A TEUTEUWEN;Lo;0;L;;;;;N;;;;;
+16832;BAMUM LETTER PHASE-A MAENYI;Lo;0;L;;;;;N;;;;;
+16833;BAMUM LETTER PHASE-A KET;Lo;0;L;;;;;N;;;;;
+16834;BAMUM LETTER PHASE-A NDAANGGEUAET;Lo;0;L;;;;;N;;;;;
+16835;BAMUM LETTER PHASE-A KUOQ;Lo;0;L;;;;;N;;;;;
+16836;BAMUM LETTER PHASE-A MOOMEUT;Lo;0;L;;;;;N;;;;;
+16837;BAMUM LETTER PHASE-A SHUM;Lo;0;L;;;;;N;;;;;
+16838;BAMUM LETTER PHASE-A LOMMAE;Lo;0;L;;;;;N;;;;;
+16839;BAMUM LETTER PHASE-A FIRI;Lo;0;L;;;;;N;;;;;
+1683A;BAMUM LETTER PHASE-A ROM;Lo;0;L;;;;;N;;;;;
+1683B;BAMUM LETTER PHASE-A KPOQ;Lo;0;L;;;;;N;;;;;
+1683C;BAMUM LETTER PHASE-A SOQ;Lo;0;L;;;;;N;;;;;
+1683D;BAMUM LETTER PHASE-A MAP PIEET;Lo;0;L;;;;;N;;;;;
+1683E;BAMUM LETTER PHASE-A SHIRAE;Lo;0;L;;;;;N;;;;;
+1683F;BAMUM LETTER PHASE-A NTAP;Lo;0;L;;;;;N;;;;;
+16840;BAMUM LETTER PHASE-A SHOQ NSHUT YUM;Lo;0;L;;;;;N;;;;;
+16841;BAMUM LETTER PHASE-A NYIT MONGKEUAEQ;Lo;0;L;;;;;N;;;;;
+16842;BAMUM LETTER PHASE-A PAARAE;Lo;0;L;;;;;N;;;;;
+16843;BAMUM LETTER PHASE-A NKAARAE;Lo;0;L;;;;;N;;;;;
+16844;BAMUM LETTER PHASE-A UNKNOWN;Lo;0;L;;;;;N;;;;;
+16845;BAMUM LETTER PHASE-A NGGEN;Lo;0;L;;;;;N;;;;;
+16846;BAMUM LETTER PHASE-A MAESI;Lo;0;L;;;;;N;;;;;
+16847;BAMUM LETTER PHASE-A NJAM;Lo;0;L;;;;;N;;;;;
+16848;BAMUM LETTER PHASE-A MBANYI;Lo;0;L;;;;;N;;;;;
+16849;BAMUM LETTER PHASE-A NYET;Lo;0;L;;;;;N;;;;;
+1684A;BAMUM LETTER PHASE-A TEUAEN;Lo;0;L;;;;;N;;;;;
+1684B;BAMUM LETTER PHASE-A SOT;Lo;0;L;;;;;N;;;;;
+1684C;BAMUM LETTER PHASE-A PAAM;Lo;0;L;;;;;N;;;;;
+1684D;BAMUM LETTER PHASE-A NSHIEE;Lo;0;L;;;;;N;;;;;
+1684E;BAMUM LETTER PHASE-A MAEM;Lo;0;L;;;;;N;;;;;
+1684F;BAMUM LETTER PHASE-A NYI;Lo;0;L;;;;;N;;;;;
+16850;BAMUM LETTER PHASE-A KAQ;Lo;0;L;;;;;N;;;;;
+16851;BAMUM LETTER PHASE-A NSHA;Lo;0;L;;;;;N;;;;;
+16852;BAMUM LETTER PHASE-A VEE;Lo;0;L;;;;;N;;;;;
+16853;BAMUM LETTER PHASE-A LU;Lo;0;L;;;;;N;;;;;
+16854;BAMUM LETTER PHASE-A NEN;Lo;0;L;;;;;N;;;;;
+16855;BAMUM LETTER PHASE-A NAQ;Lo;0;L;;;;;N;;;;;
+16856;BAMUM LETTER PHASE-A MBAQ;Lo;0;L;;;;;N;;;;;
+16857;BAMUM LETTER PHASE-B NSHUET;Lo;0;L;;;;;N;;;;;
+16858;BAMUM LETTER PHASE-B TU MAEMGBIEE;Lo;0;L;;;;;N;;;;;
+16859;BAMUM LETTER PHASE-B SIEE;Lo;0;L;;;;;N;;;;;
+1685A;BAMUM LETTER PHASE-B SET TU;Lo;0;L;;;;;N;;;;;
+1685B;BAMUM LETTER PHASE-B LOM NTEUM;Lo;0;L;;;;;N;;;;;
+1685C;BAMUM LETTER PHASE-B MBA MAELEE;Lo;0;L;;;;;N;;;;;
+1685D;BAMUM LETTER PHASE-B KIEEM;Lo;0;L;;;;;N;;;;;
+1685E;BAMUM LETTER PHASE-B YEURAE;Lo;0;L;;;;;N;;;;;
+1685F;BAMUM LETTER PHASE-B MBAARAE;Lo;0;L;;;;;N;;;;;
+16860;BAMUM LETTER PHASE-B KAM;Lo;0;L;;;;;N;;;;;
+16861;BAMUM LETTER PHASE-B PEESHI;Lo;0;L;;;;;N;;;;;
+16862;BAMUM LETTER PHASE-B YAFU LEERAEWA;Lo;0;L;;;;;N;;;;;
+16863;BAMUM LETTER PHASE-B LAM NSHUT NYAM;Lo;0;L;;;;;N;;;;;
+16864;BAMUM LETTER PHASE-B NTIEE SHEUOQ;Lo;0;L;;;;;N;;;;;
+16865;BAMUM LETTER PHASE-B NDU NJAA;Lo;0;L;;;;;N;;;;;
+16866;BAMUM LETTER PHASE-B GHEUGHEUAEM;Lo;0;L;;;;;N;;;;;
+16867;BAMUM LETTER PHASE-B PIT;Lo;0;L;;;;;N;;;;;
+16868;BAMUM LETTER PHASE-B TU NSIEE;Lo;0;L;;;;;N;;;;;
+16869;BAMUM LETTER PHASE-B SHET NJAQ;Lo;0;L;;;;;N;;;;;
+1686A;BAMUM LETTER PHASE-B SHEUAEQTU;Lo;0;L;;;;;N;;;;;
+1686B;BAMUM LETTER PHASE-B MFON TEUAEQ;Lo;0;L;;;;;N;;;;;
+1686C;BAMUM LETTER PHASE-B MBIT MBAAKET;Lo;0;L;;;;;N;;;;;
+1686D;BAMUM LETTER PHASE-B NYI NTEUM;Lo;0;L;;;;;N;;;;;
+1686E;BAMUM LETTER PHASE-B KEUPUQ;Lo;0;L;;;;;N;;;;;
+1686F;BAMUM LETTER PHASE-B GHEUGHEN;Lo;0;L;;;;;N;;;;;
+16870;BAMUM LETTER PHASE-B KEUYEUX;Lo;0;L;;;;;N;;;;;
+16871;BAMUM LETTER PHASE-B LAANAE;Lo;0;L;;;;;N;;;;;
+16872;BAMUM LETTER PHASE-B PARUM;Lo;0;L;;;;;N;;;;;
+16873;BAMUM LETTER PHASE-B VEUM;Lo;0;L;;;;;N;;;;;
+16874;BAMUM LETTER PHASE-B NGKINDI MVOP;Lo;0;L;;;;;N;;;;;
+16875;BAMUM LETTER PHASE-B NGGEU MBU;Lo;0;L;;;;;N;;;;;
+16876;BAMUM LETTER PHASE-B WUAET;Lo;0;L;;;;;N;;;;;
+16877;BAMUM LETTER PHASE-B SAKEUAE;Lo;0;L;;;;;N;;;;;
+16878;BAMUM LETTER PHASE-B TAAM;Lo;0;L;;;;;N;;;;;
+16879;BAMUM LETTER PHASE-B MEUQ;Lo;0;L;;;;;N;;;;;
+1687A;BAMUM LETTER PHASE-B NGGUOQ;Lo;0;L;;;;;N;;;;;
+1687B;BAMUM LETTER PHASE-B NGGUOQ LARGE;Lo;0;L;;;;;N;;;;;
+1687C;BAMUM LETTER PHASE-B MFIYAQ;Lo;0;L;;;;;N;;;;;
+1687D;BAMUM LETTER PHASE-B SUE;Lo;0;L;;;;;N;;;;;
+1687E;BAMUM LETTER PHASE-B MBEURI;Lo;0;L;;;;;N;;;;;
+1687F;BAMUM LETTER PHASE-B MONTIEEN;Lo;0;L;;;;;N;;;;;
+16880;BAMUM LETTER PHASE-B NYAEMAE;Lo;0;L;;;;;N;;;;;
+16881;BAMUM LETTER PHASE-B PUNGAAM;Lo;0;L;;;;;N;;;;;
+16882;BAMUM LETTER PHASE-B MEUT NGGEET;Lo;0;L;;;;;N;;;;;
+16883;BAMUM LETTER PHASE-B FEUX;Lo;0;L;;;;;N;;;;;
+16884;BAMUM LETTER PHASE-B MBUOQ;Lo;0;L;;;;;N;;;;;
+16885;BAMUM LETTER PHASE-B FEE;Lo;0;L;;;;;N;;;;;
+16886;BAMUM LETTER PHASE-B KEUAEM;Lo;0;L;;;;;N;;;;;
+16887;BAMUM LETTER PHASE-B MA NJEUAENA;Lo;0;L;;;;;N;;;;;
+16888;BAMUM LETTER PHASE-B MA NJUQA;Lo;0;L;;;;;N;;;;;
+16889;BAMUM LETTER PHASE-B LET;Lo;0;L;;;;;N;;;;;
+1688A;BAMUM LETTER PHASE-B NGGAAM;Lo;0;L;;;;;N;;;;;
+1688B;BAMUM LETTER PHASE-B NSEN;Lo;0;L;;;;;N;;;;;
+1688C;BAMUM LETTER PHASE-B MA;Lo;0;L;;;;;N;;;;;
+1688D;BAMUM LETTER PHASE-B KIQ;Lo;0;L;;;;;N;;;;;
+1688E;BAMUM LETTER PHASE-B NGOM;Lo;0;L;;;;;N;;;;;
+1688F;BAMUM LETTER PHASE-C NGKUE MAEMBA;Lo;0;L;;;;;N;;;;;
+16890;BAMUM LETTER PHASE-C NZA;Lo;0;L;;;;;N;;;;;
+16891;BAMUM LETTER PHASE-C YUM;Lo;0;L;;;;;N;;;;;
+16892;BAMUM LETTER PHASE-C WANGKUOQ;Lo;0;L;;;;;N;;;;;
+16893;BAMUM LETTER PHASE-C NGGEN;Lo;0;L;;;;;N;;;;;
+16894;BAMUM LETTER PHASE-C NDEUAEREE;Lo;0;L;;;;;N;;;;;
+16895;BAMUM LETTER PHASE-C NGKAQ;Lo;0;L;;;;;N;;;;;
+16896;BAMUM LETTER PHASE-C GHARAE;Lo;0;L;;;;;N;;;;;
+16897;BAMUM LETTER PHASE-C MBEEKEET;Lo;0;L;;;;;N;;;;;
+16898;BAMUM LETTER PHASE-C GBAYI;Lo;0;L;;;;;N;;;;;
+16899;BAMUM LETTER PHASE-C NYIR MKPARAQ MEUN;Lo;0;L;;;;;N;;;;;
+1689A;BAMUM LETTER PHASE-C NTU MBIT;Lo;0;L;;;;;N;;;;;
+1689B;BAMUM LETTER PHASE-C MBEUM;Lo;0;L;;;;;N;;;;;
+1689C;BAMUM LETTER PHASE-C PIRIEEN;Lo;0;L;;;;;N;;;;;
+1689D;BAMUM LETTER PHASE-C NDOMBU;Lo;0;L;;;;;N;;;;;
+1689E;BAMUM LETTER PHASE-C MBAA CABBAGE-TREE;Lo;0;L;;;;;N;;;;;
+1689F;BAMUM LETTER PHASE-C KEUSHEUAEP;Lo;0;L;;;;;N;;;;;
+168A0;BAMUM LETTER PHASE-C GHAP;Lo;0;L;;;;;N;;;;;
+168A1;BAMUM LETTER PHASE-C KEUKAQ;Lo;0;L;;;;;N;;;;;
+168A2;BAMUM LETTER PHASE-C YU MUOMAE;Lo;0;L;;;;;N;;;;;
+168A3;BAMUM LETTER PHASE-C NZEUM;Lo;0;L;;;;;N;;;;;
+168A4;BAMUM LETTER PHASE-C MBUE;Lo;0;L;;;;;N;;;;;
+168A5;BAMUM LETTER PHASE-C NSEUAEN;Lo;0;L;;;;;N;;;;;
+168A6;BAMUM LETTER PHASE-C MBIT;Lo;0;L;;;;;N;;;;;
+168A7;BAMUM LETTER PHASE-C YEUQ;Lo;0;L;;;;;N;;;;;
+168A8;BAMUM LETTER PHASE-C KPARAQ;Lo;0;L;;;;;N;;;;;
+168A9;BAMUM LETTER PHASE-C KAA;Lo;0;L;;;;;N;;;;;
+168AA;BAMUM LETTER PHASE-C SEUX;Lo;0;L;;;;;N;;;;;
+168AB;BAMUM LETTER PHASE-C NDIDA;Lo;0;L;;;;;N;;;;;
+168AC;BAMUM LETTER PHASE-C TAASHAE;Lo;0;L;;;;;N;;;;;
+168AD;BAMUM LETTER PHASE-C NJUEQ;Lo;0;L;;;;;N;;;;;
+168AE;BAMUM LETTER PHASE-C TITA YUE;Lo;0;L;;;;;N;;;;;
+168AF;BAMUM LETTER PHASE-C SUAET;Lo;0;L;;;;;N;;;;;
+168B0;BAMUM LETTER PHASE-C NGGUAEN NYAM;Lo;0;L;;;;;N;;;;;
+168B1;BAMUM LETTER PHASE-C VEUX;Lo;0;L;;;;;N;;;;;
+168B2;BAMUM LETTER PHASE-C NANSANAQ;Lo;0;L;;;;;N;;;;;
+168B3;BAMUM LETTER PHASE-C MA KEUAERI;Lo;0;L;;;;;N;;;;;
+168B4;BAMUM LETTER PHASE-C NTAA;Lo;0;L;;;;;N;;;;;
+168B5;BAMUM LETTER PHASE-C NGGUON;Lo;0;L;;;;;N;;;;;
+168B6;BAMUM LETTER PHASE-C LAP;Lo;0;L;;;;;N;;;;;
+168B7;BAMUM LETTER PHASE-C MBIRIEEN;Lo;0;L;;;;;N;;;;;
+168B8;BAMUM LETTER PHASE-C MGBASAQ;Lo;0;L;;;;;N;;;;;
+168B9;BAMUM LETTER PHASE-C NTEUNGBA;Lo;0;L;;;;;N;;;;;
+168BA;BAMUM LETTER PHASE-C TEUTEUX;Lo;0;L;;;;;N;;;;;
+168BB;BAMUM LETTER PHASE-C NGGUM;Lo;0;L;;;;;N;;;;;
+168BC;BAMUM LETTER PHASE-C FUE;Lo;0;L;;;;;N;;;;;
+168BD;BAMUM LETTER PHASE-C NDEUT;Lo;0;L;;;;;N;;;;;
+168BE;BAMUM LETTER PHASE-C NSA;Lo;0;L;;;;;N;;;;;
+168BF;BAMUM LETTER PHASE-C NSHAQ;Lo;0;L;;;;;N;;;;;
+168C0;BAMUM LETTER PHASE-C BUNG;Lo;0;L;;;;;N;;;;;
+168C1;BAMUM LETTER PHASE-C VEUAEPEN;Lo;0;L;;;;;N;;;;;
+168C2;BAMUM LETTER PHASE-C MBERAE;Lo;0;L;;;;;N;;;;;
+168C3;BAMUM LETTER PHASE-C RU;Lo;0;L;;;;;N;;;;;
+168C4;BAMUM LETTER PHASE-C NJAEM;Lo;0;L;;;;;N;;;;;
+168C5;BAMUM LETTER PHASE-C LAM;Lo;0;L;;;;;N;;;;;
+168C6;BAMUM LETTER PHASE-C TITUAEP;Lo;0;L;;;;;N;;;;;
+168C7;BAMUM LETTER PHASE-C NSUOT NGOM;Lo;0;L;;;;;N;;;;;
+168C8;BAMUM LETTER PHASE-C NJEEEE;Lo;0;L;;;;;N;;;;;
+168C9;BAMUM LETTER PHASE-C KET;Lo;0;L;;;;;N;;;;;
+168CA;BAMUM LETTER PHASE-C NGGU;Lo;0;L;;;;;N;;;;;
+168CB;BAMUM LETTER PHASE-C MAESI;Lo;0;L;;;;;N;;;;;
+168CC;BAMUM LETTER PHASE-C MBUAEM;Lo;0;L;;;;;N;;;;;
+168CD;BAMUM LETTER PHASE-C LU;Lo;0;L;;;;;N;;;;;
+168CE;BAMUM LETTER PHASE-C KUT;Lo;0;L;;;;;N;;;;;
+168CF;BAMUM LETTER PHASE-C NJAM;Lo;0;L;;;;;N;;;;;
+168D0;BAMUM LETTER PHASE-C NGOM;Lo;0;L;;;;;N;;;;;
+168D1;BAMUM LETTER PHASE-C WUP;Lo;0;L;;;;;N;;;;;
+168D2;BAMUM LETTER PHASE-C NGGUEET;Lo;0;L;;;;;N;;;;;
+168D3;BAMUM LETTER PHASE-C NSOM;Lo;0;L;;;;;N;;;;;
+168D4;BAMUM LETTER PHASE-C NTEN;Lo;0;L;;;;;N;;;;;
+168D5;BAMUM LETTER PHASE-C KUOP NKAARAE;Lo;0;L;;;;;N;;;;;
+168D6;BAMUM LETTER PHASE-C NSUN;Lo;0;L;;;;;N;;;;;
+168D7;BAMUM LETTER PHASE-C NDAM;Lo;0;L;;;;;N;;;;;
+168D8;BAMUM LETTER PHASE-C MA NSIEE;Lo;0;L;;;;;N;;;;;
+168D9;BAMUM LETTER PHASE-C YAA;Lo;0;L;;;;;N;;;;;
+168DA;BAMUM LETTER PHASE-C NDAP;Lo;0;L;;;;;N;;;;;
+168DB;BAMUM LETTER PHASE-C SHUEQ;Lo;0;L;;;;;N;;;;;
+168DC;BAMUM LETTER PHASE-C SETFON;Lo;0;L;;;;;N;;;;;
+168DD;BAMUM LETTER PHASE-C MBI;Lo;0;L;;;;;N;;;;;
+168DE;BAMUM LETTER PHASE-C MAEMBA;Lo;0;L;;;;;N;;;;;
+168DF;BAMUM LETTER PHASE-C MBANYI;Lo;0;L;;;;;N;;;;;
+168E0;BAMUM LETTER PHASE-C KEUSEUX;Lo;0;L;;;;;N;;;;;
+168E1;BAMUM LETTER PHASE-C MBEUX;Lo;0;L;;;;;N;;;;;
+168E2;BAMUM LETTER PHASE-C KEUM;Lo;0;L;;;;;N;;;;;
+168E3;BAMUM LETTER PHASE-C MBAA PICKET;Lo;0;L;;;;;N;;;;;
+168E4;BAMUM LETTER PHASE-C YUWOQ;Lo;0;L;;;;;N;;;;;
+168E5;BAMUM LETTER PHASE-C NJEUX;Lo;0;L;;;;;N;;;;;
+168E6;BAMUM LETTER PHASE-C MIEE;Lo;0;L;;;;;N;;;;;
+168E7;BAMUM LETTER PHASE-C MUAE;Lo;0;L;;;;;N;;;;;
+168E8;BAMUM LETTER PHASE-C SHIQ;Lo;0;L;;;;;N;;;;;
+168E9;BAMUM LETTER PHASE-C KEN LAW;Lo;0;L;;;;;N;;;;;
+168EA;BAMUM LETTER PHASE-C KEN FATIGUE;Lo;0;L;;;;;N;;;;;
+168EB;BAMUM LETTER PHASE-C NGAQ;Lo;0;L;;;;;N;;;;;
+168EC;BAMUM LETTER PHASE-C NAQ;Lo;0;L;;;;;N;;;;;
+168ED;BAMUM LETTER PHASE-C LIQ;Lo;0;L;;;;;N;;;;;
+168EE;BAMUM LETTER PHASE-C PIN;Lo;0;L;;;;;N;;;;;
+168EF;BAMUM LETTER PHASE-C PEN;Lo;0;L;;;;;N;;;;;
+168F0;BAMUM LETTER PHASE-C TET;Lo;0;L;;;;;N;;;;;
+168F1;BAMUM LETTER PHASE-D MBUO;Lo;0;L;;;;;N;;;;;
+168F2;BAMUM LETTER PHASE-D WAP;Lo;0;L;;;;;N;;;;;
+168F3;BAMUM LETTER PHASE-D NJI;Lo;0;L;;;;;N;;;;;
+168F4;BAMUM LETTER PHASE-D MFON;Lo;0;L;;;;;N;;;;;
+168F5;BAMUM LETTER PHASE-D NJIEE;Lo;0;L;;;;;N;;;;;
+168F6;BAMUM LETTER PHASE-D LIEE;Lo;0;L;;;;;N;;;;;
+168F7;BAMUM LETTER PHASE-D NJEUT;Lo;0;L;;;;;N;;;;;
+168F8;BAMUM LETTER PHASE-D NSHEE;Lo;0;L;;;;;N;;;;;
+168F9;BAMUM LETTER PHASE-D NGGAAMAE;Lo;0;L;;;;;N;;;;;
+168FA;BAMUM LETTER PHASE-D NYAM;Lo;0;L;;;;;N;;;;;
+168FB;BAMUM LETTER PHASE-D WUAEN;Lo;0;L;;;;;N;;;;;
+168FC;BAMUM LETTER PHASE-D NGKUN;Lo;0;L;;;;;N;;;;;
+168FD;BAMUM LETTER PHASE-D SHEE;Lo;0;L;;;;;N;;;;;
+168FE;BAMUM LETTER PHASE-D NGKAP;Lo;0;L;;;;;N;;;;;
+168FF;BAMUM LETTER PHASE-D KEUAETMEUN;Lo;0;L;;;;;N;;;;;
+16900;BAMUM LETTER PHASE-D TEUT;Lo;0;L;;;;;N;;;;;
+16901;BAMUM LETTER PHASE-D SHEUAE;Lo;0;L;;;;;N;;;;;
+16902;BAMUM LETTER PHASE-D NJAP;Lo;0;L;;;;;N;;;;;
+16903;BAMUM LETTER PHASE-D SUE;Lo;0;L;;;;;N;;;;;
+16904;BAMUM LETTER PHASE-D KET;Lo;0;L;;;;;N;;;;;
+16905;BAMUM LETTER PHASE-D YAEMMAE;Lo;0;L;;;;;N;;;;;
+16906;BAMUM LETTER PHASE-D KUOM;Lo;0;L;;;;;N;;;;;
+16907;BAMUM LETTER PHASE-D SAP;Lo;0;L;;;;;N;;;;;
+16908;BAMUM LETTER PHASE-D MFEUT;Lo;0;L;;;;;N;;;;;
+16909;BAMUM LETTER PHASE-D NDEUX;Lo;0;L;;;;;N;;;;;
+1690A;BAMUM LETTER PHASE-D MALEERI;Lo;0;L;;;;;N;;;;;
+1690B;BAMUM LETTER PHASE-D MEUT;Lo;0;L;;;;;N;;;;;
+1690C;BAMUM LETTER PHASE-D SEUAEQ;Lo;0;L;;;;;N;;;;;
+1690D;BAMUM LETTER PHASE-D YEN;Lo;0;L;;;;;N;;;;;
+1690E;BAMUM LETTER PHASE-D NJEUAEM;Lo;0;L;;;;;N;;;;;
+1690F;BAMUM LETTER PHASE-D KEUOT MBUAE;Lo;0;L;;;;;N;;;;;
+16910;BAMUM LETTER PHASE-D NGKEURI;Lo;0;L;;;;;N;;;;;
+16911;BAMUM LETTER PHASE-D TU;Lo;0;L;;;;;N;;;;;
+16912;BAMUM LETTER PHASE-D GHAA;Lo;0;L;;;;;N;;;;;
+16913;BAMUM LETTER PHASE-D NGKYEE;Lo;0;L;;;;;N;;;;;
+16914;BAMUM LETTER PHASE-D FEUFEUAET;Lo;0;L;;;;;N;;;;;
+16915;BAMUM LETTER PHASE-D NDEE;Lo;0;L;;;;;N;;;;;
+16916;BAMUM LETTER PHASE-D MGBOFUM;Lo;0;L;;;;;N;;;;;
+16917;BAMUM LETTER PHASE-D LEUAEP;Lo;0;L;;;;;N;;;;;
+16918;BAMUM LETTER PHASE-D NDON;Lo;0;L;;;;;N;;;;;
+16919;BAMUM LETTER PHASE-D MONI;Lo;0;L;;;;;N;;;;;
+1691A;BAMUM LETTER PHASE-D MGBEUN;Lo;0;L;;;;;N;;;;;
+1691B;BAMUM LETTER PHASE-D PUUT;Lo;0;L;;;;;N;;;;;
+1691C;BAMUM LETTER PHASE-D MGBIEE;Lo;0;L;;;;;N;;;;;
+1691D;BAMUM LETTER PHASE-D MFO;Lo;0;L;;;;;N;;;;;
+1691E;BAMUM LETTER PHASE-D LUM;Lo;0;L;;;;;N;;;;;
+1691F;BAMUM LETTER PHASE-D NSIEEP;Lo;0;L;;;;;N;;;;;
+16920;BAMUM LETTER PHASE-D MBAA;Lo;0;L;;;;;N;;;;;
+16921;BAMUM LETTER PHASE-D KWAET;Lo;0;L;;;;;N;;;;;
+16922;BAMUM LETTER PHASE-D NYET;Lo;0;L;;;;;N;;;;;
+16923;BAMUM LETTER PHASE-D TEUAEN;Lo;0;L;;;;;N;;;;;
+16924;BAMUM LETTER PHASE-D SOT;Lo;0;L;;;;;N;;;;;
+16925;BAMUM LETTER PHASE-D YUWOQ;Lo;0;L;;;;;N;;;;;
+16926;BAMUM LETTER PHASE-D KEUM;Lo;0;L;;;;;N;;;;;
+16927;BAMUM LETTER PHASE-D RAEM;Lo;0;L;;;;;N;;;;;
+16928;BAMUM LETTER PHASE-D TEEEE;Lo;0;L;;;;;N;;;;;
+16929;BAMUM LETTER PHASE-D NGKEUAEQ;Lo;0;L;;;;;N;;;;;
+1692A;BAMUM LETTER PHASE-D MFEUAE;Lo;0;L;;;;;N;;;;;
+1692B;BAMUM LETTER PHASE-D NSIEET;Lo;0;L;;;;;N;;;;;
+1692C;BAMUM LETTER PHASE-D KEUP;Lo;0;L;;;;;N;;;;;
+1692D;BAMUM LETTER PHASE-D PIP;Lo;0;L;;;;;N;;;;;
+1692E;BAMUM LETTER PHASE-D PEUTAE;Lo;0;L;;;;;N;;;;;
+1692F;BAMUM LETTER PHASE-D NYUE;Lo;0;L;;;;;N;;;;;
+16930;BAMUM LETTER PHASE-D LET;Lo;0;L;;;;;N;;;;;
+16931;BAMUM LETTER PHASE-D NGGAAM;Lo;0;L;;;;;N;;;;;
+16932;BAMUM LETTER PHASE-D MFIEE;Lo;0;L;;;;;N;;;;;
+16933;BAMUM LETTER PHASE-D NGGWAEN;Lo;0;L;;;;;N;;;;;
+16934;BAMUM LETTER PHASE-D YUOM;Lo;0;L;;;;;N;;;;;
+16935;BAMUM LETTER PHASE-D PAP;Lo;0;L;;;;;N;;;;;
+16936;BAMUM LETTER PHASE-D YUOP;Lo;0;L;;;;;N;;;;;
+16937;BAMUM LETTER PHASE-D NDAM;Lo;0;L;;;;;N;;;;;
+16938;BAMUM LETTER PHASE-D NTEUM;Lo;0;L;;;;;N;;;;;
+16939;BAMUM LETTER PHASE-D SUAE;Lo;0;L;;;;;N;;;;;
+1693A;BAMUM LETTER PHASE-D KUN;Lo;0;L;;;;;N;;;;;
+1693B;BAMUM LETTER PHASE-D NGGEUX;Lo;0;L;;;;;N;;;;;
+1693C;BAMUM LETTER PHASE-D NGKIEE;Lo;0;L;;;;;N;;;;;
+1693D;BAMUM LETTER PHASE-D TUOT;Lo;0;L;;;;;N;;;;;
+1693E;BAMUM LETTER PHASE-D MEUN;Lo;0;L;;;;;N;;;;;
+1693F;BAMUM LETTER PHASE-D KUQ;Lo;0;L;;;;;N;;;;;
+16940;BAMUM LETTER PHASE-D NSUM;Lo;0;L;;;;;N;;;;;
+16941;BAMUM LETTER PHASE-D TEUN;Lo;0;L;;;;;N;;;;;
+16942;BAMUM LETTER PHASE-D MAENJET;Lo;0;L;;;;;N;;;;;
+16943;BAMUM LETTER PHASE-D NGGAP;Lo;0;L;;;;;N;;;;;
+16944;BAMUM LETTER PHASE-D LEUM;Lo;0;L;;;;;N;;;;;
+16945;BAMUM LETTER PHASE-D NGGUOM;Lo;0;L;;;;;N;;;;;
+16946;BAMUM LETTER PHASE-D NSHUT;Lo;0;L;;;;;N;;;;;
+16947;BAMUM LETTER PHASE-D NJUEQ;Lo;0;L;;;;;N;;;;;
+16948;BAMUM LETTER PHASE-D GHEUAE;Lo;0;L;;;;;N;;;;;
+16949;BAMUM LETTER PHASE-D KU;Lo;0;L;;;;;N;;;;;
+1694A;BAMUM LETTER PHASE-D REN OLD;Lo;0;L;;;;;N;;;;;
+1694B;BAMUM LETTER PHASE-D TAE;Lo;0;L;;;;;N;;;;;
+1694C;BAMUM LETTER PHASE-D TOQ;Lo;0;L;;;;;N;;;;;
+1694D;BAMUM LETTER PHASE-D NYI;Lo;0;L;;;;;N;;;;;
+1694E;BAMUM LETTER PHASE-D RII;Lo;0;L;;;;;N;;;;;
+1694F;BAMUM LETTER PHASE-D LEEEE;Lo;0;L;;;;;N;;;;;
+16950;BAMUM LETTER PHASE-D MEEEE;Lo;0;L;;;;;N;;;;;
+16951;BAMUM LETTER PHASE-D M;Lo;0;L;;;;;N;;;;;
+16952;BAMUM LETTER PHASE-D SUU;Lo;0;L;;;;;N;;;;;
+16953;BAMUM LETTER PHASE-D MU;Lo;0;L;;;;;N;;;;;
+16954;BAMUM LETTER PHASE-D SHII;Lo;0;L;;;;;N;;;;;
+16955;BAMUM LETTER PHASE-D SHEUX;Lo;0;L;;;;;N;;;;;
+16956;BAMUM LETTER PHASE-D KYEE;Lo;0;L;;;;;N;;;;;
+16957;BAMUM LETTER PHASE-D NU;Lo;0;L;;;;;N;;;;;
+16958;BAMUM LETTER PHASE-D SHU;Lo;0;L;;;;;N;;;;;
+16959;BAMUM LETTER PHASE-D NTEE;Lo;0;L;;;;;N;;;;;
+1695A;BAMUM LETTER PHASE-D PEE;Lo;0;L;;;;;N;;;;;
+1695B;BAMUM LETTER PHASE-D NI;Lo;0;L;;;;;N;;;;;
+1695C;BAMUM LETTER PHASE-D SHOQ;Lo;0;L;;;;;N;;;;;
+1695D;BAMUM LETTER PHASE-D PUQ;Lo;0;L;;;;;N;;;;;
+1695E;BAMUM LETTER PHASE-D MVOP;Lo;0;L;;;;;N;;;;;
+1695F;BAMUM LETTER PHASE-D LOQ;Lo;0;L;;;;;N;;;;;
+16960;BAMUM LETTER PHASE-D REN MUCH;Lo;0;L;;;;;N;;;;;
+16961;BAMUM LETTER PHASE-D TI;Lo;0;L;;;;;N;;;;;
+16962;BAMUM LETTER PHASE-D NTUU;Lo;0;L;;;;;N;;;;;
+16963;BAMUM LETTER PHASE-D MBAA SEVEN;Lo;0;L;;;;;N;;;;;
+16964;BAMUM LETTER PHASE-D SAQ;Lo;0;L;;;;;N;;;;;
+16965;BAMUM LETTER PHASE-D FAA;Lo;0;L;;;;;N;;;;;
+16966;BAMUM LETTER PHASE-E NDAP;Lo;0;L;;;;;N;;;;;
+16967;BAMUM LETTER PHASE-E TOON;Lo;0;L;;;;;N;;;;;
+16968;BAMUM LETTER PHASE-E MBEUM;Lo;0;L;;;;;N;;;;;
+16969;BAMUM LETTER PHASE-E LAP;Lo;0;L;;;;;N;;;;;
+1696A;BAMUM LETTER PHASE-E VOM;Lo;0;L;;;;;N;;;;;
+1696B;BAMUM LETTER PHASE-E LOON;Lo;0;L;;;;;N;;;;;
+1696C;BAMUM LETTER PHASE-E PAA;Lo;0;L;;;;;N;;;;;
+1696D;BAMUM LETTER PHASE-E SOM;Lo;0;L;;;;;N;;;;;
+1696E;BAMUM LETTER PHASE-E RAQ;Lo;0;L;;;;;N;;;;;
+1696F;BAMUM LETTER PHASE-E NSHUOP;Lo;0;L;;;;;N;;;;;
+16970;BAMUM LETTER PHASE-E NDUN;Lo;0;L;;;;;N;;;;;
+16971;BAMUM LETTER PHASE-E PUAE;Lo;0;L;;;;;N;;;;;
+16972;BAMUM LETTER PHASE-E TAM;Lo;0;L;;;;;N;;;;;
+16973;BAMUM LETTER PHASE-E NGKA;Lo;0;L;;;;;N;;;;;
+16974;BAMUM LETTER PHASE-E KPEUX;Lo;0;L;;;;;N;;;;;
+16975;BAMUM LETTER PHASE-E WUO;Lo;0;L;;;;;N;;;;;
+16976;BAMUM LETTER PHASE-E SEE;Lo;0;L;;;;;N;;;;;
+16977;BAMUM LETTER PHASE-E NGGEUAET;Lo;0;L;;;;;N;;;;;
+16978;BAMUM LETTER PHASE-E PAAM;Lo;0;L;;;;;N;;;;;
+16979;BAMUM LETTER PHASE-E TOO;Lo;0;L;;;;;N;;;;;
+1697A;BAMUM LETTER PHASE-E KUOP;Lo;0;L;;;;;N;;;;;
+1697B;BAMUM LETTER PHASE-E LOM;Lo;0;L;;;;;N;;;;;
+1697C;BAMUM LETTER PHASE-E NSHIEE;Lo;0;L;;;;;N;;;;;
+1697D;BAMUM LETTER PHASE-E NGOP;Lo;0;L;;;;;N;;;;;
+1697E;BAMUM LETTER PHASE-E MAEM;Lo;0;L;;;;;N;;;;;
+1697F;BAMUM LETTER PHASE-E NGKEUX;Lo;0;L;;;;;N;;;;;
+16980;BAMUM LETTER PHASE-E NGOQ;Lo;0;L;;;;;N;;;;;
+16981;BAMUM LETTER PHASE-E NSHUE;Lo;0;L;;;;;N;;;;;
+16982;BAMUM LETTER PHASE-E RIMGBA;Lo;0;L;;;;;N;;;;;
+16983;BAMUM LETTER PHASE-E NJEUX;Lo;0;L;;;;;N;;;;;
+16984;BAMUM LETTER PHASE-E PEEM;Lo;0;L;;;;;N;;;;;
+16985;BAMUM LETTER PHASE-E SAA;Lo;0;L;;;;;N;;;;;
+16986;BAMUM LETTER PHASE-E NGGURAE;Lo;0;L;;;;;N;;;;;
+16987;BAMUM LETTER PHASE-E MGBA;Lo;0;L;;;;;N;;;;;
+16988;BAMUM LETTER PHASE-E GHEUX;Lo;0;L;;;;;N;;;;;
+16989;BAMUM LETTER PHASE-E NGKEUAEM;Lo;0;L;;;;;N;;;;;
+1698A;BAMUM LETTER PHASE-E NJAEMLI;Lo;0;L;;;;;N;;;;;
+1698B;BAMUM LETTER PHASE-E MAP;Lo;0;L;;;;;N;;;;;
+1698C;BAMUM LETTER PHASE-E LOOT;Lo;0;L;;;;;N;;;;;
+1698D;BAMUM LETTER PHASE-E NGGEEEE;Lo;0;L;;;;;N;;;;;
+1698E;BAMUM LETTER PHASE-E NDIQ;Lo;0;L;;;;;N;;;;;
+1698F;BAMUM LETTER PHASE-E TAEN NTEUM;Lo;0;L;;;;;N;;;;;
+16990;BAMUM LETTER PHASE-E SET;Lo;0;L;;;;;N;;;;;
+16991;BAMUM LETTER PHASE-E PUM;Lo;0;L;;;;;N;;;;;
+16992;BAMUM LETTER PHASE-E NDAA SOFTNESS;Lo;0;L;;;;;N;;;;;
+16993;BAMUM LETTER PHASE-E NGGUAESHAE NYAM;Lo;0;L;;;;;N;;;;;
+16994;BAMUM LETTER PHASE-E YIEE;Lo;0;L;;;;;N;;;;;
+16995;BAMUM LETTER PHASE-E GHEUN;Lo;0;L;;;;;N;;;;;
+16996;BAMUM LETTER PHASE-E TUAE;Lo;0;L;;;;;N;;;;;
+16997;BAMUM LETTER PHASE-E YEUAE;Lo;0;L;;;;;N;;;;;
+16998;BAMUM LETTER PHASE-E PO;Lo;0;L;;;;;N;;;;;
+16999;BAMUM LETTER PHASE-E TUMAE;Lo;0;L;;;;;N;;;;;
+1699A;BAMUM LETTER PHASE-E KEUAE;Lo;0;L;;;;;N;;;;;
+1699B;BAMUM LETTER PHASE-E SUAEN;Lo;0;L;;;;;N;;;;;
+1699C;BAMUM LETTER PHASE-E TEUAEQ;Lo;0;L;;;;;N;;;;;
+1699D;BAMUM LETTER PHASE-E VEUAE;Lo;0;L;;;;;N;;;;;
+1699E;BAMUM LETTER PHASE-E WEUX;Lo;0;L;;;;;N;;;;;
+1699F;BAMUM LETTER PHASE-E LAAM;Lo;0;L;;;;;N;;;;;
+169A0;BAMUM LETTER PHASE-E PU;Lo;0;L;;;;;N;;;;;
+169A1;BAMUM LETTER PHASE-E TAAQ;Lo;0;L;;;;;N;;;;;
+169A2;BAMUM LETTER PHASE-E GHAAMAE;Lo;0;L;;;;;N;;;;;
+169A3;BAMUM LETTER PHASE-E NGEUREUT;Lo;0;L;;;;;N;;;;;
+169A4;BAMUM LETTER PHASE-E SHEUAEQ;Lo;0;L;;;;;N;;;;;
+169A5;BAMUM LETTER PHASE-E MGBEN;Lo;0;L;;;;;N;;;;;
+169A6;BAMUM LETTER PHASE-E MBEE;Lo;0;L;;;;;N;;;;;
+169A7;BAMUM LETTER PHASE-E NZAQ;Lo;0;L;;;;;N;;;;;
+169A8;BAMUM LETTER PHASE-E NKOM;Lo;0;L;;;;;N;;;;;
+169A9;BAMUM LETTER PHASE-E GBET;Lo;0;L;;;;;N;;;;;
+169AA;BAMUM LETTER PHASE-E TUM;Lo;0;L;;;;;N;;;;;
+169AB;BAMUM LETTER PHASE-E KUET;Lo;0;L;;;;;N;;;;;
+169AC;BAMUM LETTER PHASE-E YAP;Lo;0;L;;;;;N;;;;;
+169AD;BAMUM LETTER PHASE-E NYI CLEAVER;Lo;0;L;;;;;N;;;;;
+169AE;BAMUM LETTER PHASE-E YIT;Lo;0;L;;;;;N;;;;;
+169AF;BAMUM LETTER PHASE-E MFEUQ;Lo;0;L;;;;;N;;;;;
+169B0;BAMUM LETTER PHASE-E NDIAQ;Lo;0;L;;;;;N;;;;;
+169B1;BAMUM LETTER PHASE-E PIEEQ;Lo;0;L;;;;;N;;;;;
+169B2;BAMUM LETTER PHASE-E YUEQ;Lo;0;L;;;;;N;;;;;
+169B3;BAMUM LETTER PHASE-E LEUAEM;Lo;0;L;;;;;N;;;;;
+169B4;BAMUM LETTER PHASE-E FUE;Lo;0;L;;;;;N;;;;;
+169B5;BAMUM LETTER PHASE-E GBEUX;Lo;0;L;;;;;N;;;;;
+169B6;BAMUM LETTER PHASE-E NGKUP;Lo;0;L;;;;;N;;;;;
+169B7;BAMUM LETTER PHASE-E KET;Lo;0;L;;;;;N;;;;;
+169B8;BAMUM LETTER PHASE-E MAE;Lo;0;L;;;;;N;;;;;
+169B9;BAMUM LETTER PHASE-E NGKAAMI;Lo;0;L;;;;;N;;;;;
+169BA;BAMUM LETTER PHASE-E GHET;Lo;0;L;;;;;N;;;;;
+169BB;BAMUM LETTER PHASE-E FA;Lo;0;L;;;;;N;;;;;
+169BC;BAMUM LETTER PHASE-E NTUM;Lo;0;L;;;;;N;;;;;
+169BD;BAMUM LETTER PHASE-E PEUT;Lo;0;L;;;;;N;;;;;
+169BE;BAMUM LETTER PHASE-E YEUM;Lo;0;L;;;;;N;;;;;
+169BF;BAMUM LETTER PHASE-E NGGEUAE;Lo;0;L;;;;;N;;;;;
+169C0;BAMUM LETTER PHASE-E NYI BETWEEN;Lo;0;L;;;;;N;;;;;
+169C1;BAMUM LETTER PHASE-E NZUQ;Lo;0;L;;;;;N;;;;;
+169C2;BAMUM LETTER PHASE-E POON;Lo;0;L;;;;;N;;;;;
+169C3;BAMUM LETTER PHASE-E MIEE;Lo;0;L;;;;;N;;;;;
+169C4;BAMUM LETTER PHASE-E FUET;Lo;0;L;;;;;N;;;;;
+169C5;BAMUM LETTER PHASE-E NAE;Lo;0;L;;;;;N;;;;;
+169C6;BAMUM LETTER PHASE-E MUAE;Lo;0;L;;;;;N;;;;;
+169C7;BAMUM LETTER PHASE-E GHEUAE;Lo;0;L;;;;;N;;;;;
+169C8;BAMUM LETTER PHASE-E FU I;Lo;0;L;;;;;N;;;;;
+169C9;BAMUM LETTER PHASE-E MVI;Lo;0;L;;;;;N;;;;;
+169CA;BAMUM LETTER PHASE-E PUAQ;Lo;0;L;;;;;N;;;;;
+169CB;BAMUM LETTER PHASE-E NGKUM;Lo;0;L;;;;;N;;;;;
+169CC;BAMUM LETTER PHASE-E KUT;Lo;0;L;;;;;N;;;;;
+169CD;BAMUM LETTER PHASE-E PIET;Lo;0;L;;;;;N;;;;;
+169CE;BAMUM LETTER PHASE-E NTAP;Lo;0;L;;;;;N;;;;;
+169CF;BAMUM LETTER PHASE-E YEUAET;Lo;0;L;;;;;N;;;;;
+169D0;BAMUM LETTER PHASE-E NGGUP;Lo;0;L;;;;;N;;;;;
+169D1;BAMUM LETTER PHASE-E PA PEOPLE;Lo;0;L;;;;;N;;;;;
+169D2;BAMUM LETTER PHASE-E FU CALL;Lo;0;L;;;;;N;;;;;
+169D3;BAMUM LETTER PHASE-E FOM;Lo;0;L;;;;;N;;;;;
+169D4;BAMUM LETTER PHASE-E NJEE;Lo;0;L;;;;;N;;;;;
+169D5;BAMUM LETTER PHASE-E A;Lo;0;L;;;;;N;;;;;
+169D6;BAMUM LETTER PHASE-E TOQ;Lo;0;L;;;;;N;;;;;
+169D7;BAMUM LETTER PHASE-E O;Lo;0;L;;;;;N;;;;;
+169D8;BAMUM LETTER PHASE-E I;Lo;0;L;;;;;N;;;;;
+169D9;BAMUM LETTER PHASE-E LAQ;Lo;0;L;;;;;N;;;;;
+169DA;BAMUM LETTER PHASE-E PA PLURAL;Lo;0;L;;;;;N;;;;;
+169DB;BAMUM LETTER PHASE-E TAA;Lo;0;L;;;;;N;;;;;
+169DC;BAMUM LETTER PHASE-E TAQ;Lo;0;L;;;;;N;;;;;
+169DD;BAMUM LETTER PHASE-E NDAA MY HOUSE;Lo;0;L;;;;;N;;;;;
+169DE;BAMUM LETTER PHASE-E SHIQ;Lo;0;L;;;;;N;;;;;
+169DF;BAMUM LETTER PHASE-E YEUX;Lo;0;L;;;;;N;;;;;
+169E0;BAMUM LETTER PHASE-E NGUAE;Lo;0;L;;;;;N;;;;;
+169E1;BAMUM LETTER PHASE-E YUAEN;Lo;0;L;;;;;N;;;;;
+169E2;BAMUM LETTER PHASE-E YOQ SWIMMING;Lo;0;L;;;;;N;;;;;
+169E3;BAMUM LETTER PHASE-E YOQ COVER;Lo;0;L;;;;;N;;;;;
+169E4;BAMUM LETTER PHASE-E YUQ;Lo;0;L;;;;;N;;;;;
+169E5;BAMUM LETTER PHASE-E YUN;Lo;0;L;;;;;N;;;;;
+169E6;BAMUM LETTER PHASE-E KEUX;Lo;0;L;;;;;N;;;;;
+169E7;BAMUM LETTER PHASE-E PEUX;Lo;0;L;;;;;N;;;;;
+169E8;BAMUM LETTER PHASE-E NJEE EPOCH;Lo;0;L;;;;;N;;;;;
+169E9;BAMUM LETTER PHASE-E PUE;Lo;0;L;;;;;N;;;;;
+169EA;BAMUM LETTER PHASE-E WUE;Lo;0;L;;;;;N;;;;;
+169EB;BAMUM LETTER PHASE-E FEE;Lo;0;L;;;;;N;;;;;
+169EC;BAMUM LETTER PHASE-E VEE;Lo;0;L;;;;;N;;;;;
+169ED;BAMUM LETTER PHASE-E LU;Lo;0;L;;;;;N;;;;;
+169EE;BAMUM LETTER PHASE-E MI;Lo;0;L;;;;;N;;;;;
+169EF;BAMUM LETTER PHASE-E REUX;Lo;0;L;;;;;N;;;;;
+169F0;BAMUM LETTER PHASE-E RAE;Lo;0;L;;;;;N;;;;;
+169F1;BAMUM LETTER PHASE-E NGUAET;Lo;0;L;;;;;N;;;;;
+169F2;BAMUM LETTER PHASE-E NGA;Lo;0;L;;;;;N;;;;;
+169F3;BAMUM LETTER PHASE-E SHO;Lo;0;L;;;;;N;;;;;
+169F4;BAMUM LETTER PHASE-E SHOQ;Lo;0;L;;;;;N;;;;;
+169F5;BAMUM LETTER PHASE-E FU REMEDY;Lo;0;L;;;;;N;;;;;
+169F6;BAMUM LETTER PHASE-E NA;Lo;0;L;;;;;N;;;;;
+169F7;BAMUM LETTER PHASE-E PI;Lo;0;L;;;;;N;;;;;
+169F8;BAMUM LETTER PHASE-E LOQ;Lo;0;L;;;;;N;;;;;
+169F9;BAMUM LETTER PHASE-E KO;Lo;0;L;;;;;N;;;;;
+169FA;BAMUM LETTER PHASE-E MEN;Lo;0;L;;;;;N;;;;;
+169FB;BAMUM LETTER PHASE-E MA;Lo;0;L;;;;;N;;;;;
+169FC;BAMUM LETTER PHASE-E MAQ;Lo;0;L;;;;;N;;;;;
+169FD;BAMUM LETTER PHASE-E TEU;Lo;0;L;;;;;N;;;;;
+169FE;BAMUM LETTER PHASE-E KI;Lo;0;L;;;;;N;;;;;
+169FF;BAMUM LETTER PHASE-E MON;Lo;0;L;;;;;N;;;;;
+16A00;BAMUM LETTER PHASE-E TEN;Lo;0;L;;;;;N;;;;;
+16A01;BAMUM LETTER PHASE-E FAQ;Lo;0;L;;;;;N;;;;;
+16A02;BAMUM LETTER PHASE-E GHOM;Lo;0;L;;;;;N;;;;;
+16A03;BAMUM LETTER PHASE-F KA;Lo;0;L;;;;;N;;;;;
+16A04;BAMUM LETTER PHASE-F U;Lo;0;L;;;;;N;;;;;
+16A05;BAMUM LETTER PHASE-F KU;Lo;0;L;;;;;N;;;;;
+16A06;BAMUM LETTER PHASE-F EE;Lo;0;L;;;;;N;;;;;
+16A07;BAMUM LETTER PHASE-F REE;Lo;0;L;;;;;N;;;;;
+16A08;BAMUM LETTER PHASE-F TAE;Lo;0;L;;;;;N;;;;;
+16A09;BAMUM LETTER PHASE-F NYI;Lo;0;L;;;;;N;;;;;
+16A0A;BAMUM LETTER PHASE-F LA;Lo;0;L;;;;;N;;;;;
+16A0B;BAMUM LETTER PHASE-F RII;Lo;0;L;;;;;N;;;;;
+16A0C;BAMUM LETTER PHASE-F RIEE;Lo;0;L;;;;;N;;;;;
+16A0D;BAMUM LETTER PHASE-F MEEEE;Lo;0;L;;;;;N;;;;;
+16A0E;BAMUM LETTER PHASE-F TAA;Lo;0;L;;;;;N;;;;;
+16A0F;BAMUM LETTER PHASE-F NDAA;Lo;0;L;;;;;N;;;;;
+16A10;BAMUM LETTER PHASE-F NJAEM;Lo;0;L;;;;;N;;;;;
+16A11;BAMUM LETTER PHASE-F M;Lo;0;L;;;;;N;;;;;
+16A12;BAMUM LETTER PHASE-F SUU;Lo;0;L;;;;;N;;;;;
+16A13;BAMUM LETTER PHASE-F SHII;Lo;0;L;;;;;N;;;;;
+16A14;BAMUM LETTER PHASE-F SI;Lo;0;L;;;;;N;;;;;
+16A15;BAMUM LETTER PHASE-F SEUX;Lo;0;L;;;;;N;;;;;
+16A16;BAMUM LETTER PHASE-F KYEE;Lo;0;L;;;;;N;;;;;
+16A17;BAMUM LETTER PHASE-F KET;Lo;0;L;;;;;N;;;;;
+16A18;BAMUM LETTER PHASE-F NUAE;Lo;0;L;;;;;N;;;;;
+16A19;BAMUM LETTER PHASE-F NU;Lo;0;L;;;;;N;;;;;
+16A1A;BAMUM LETTER PHASE-F NJUAE;Lo;0;L;;;;;N;;;;;
+16A1B;BAMUM LETTER PHASE-F YOQ;Lo;0;L;;;;;N;;;;;
+16A1C;BAMUM LETTER PHASE-F SHU;Lo;0;L;;;;;N;;;;;
+16A1D;BAMUM LETTER PHASE-F YA;Lo;0;L;;;;;N;;;;;
+16A1E;BAMUM LETTER PHASE-F NSHA;Lo;0;L;;;;;N;;;;;
+16A1F;BAMUM LETTER PHASE-F PEUX;Lo;0;L;;;;;N;;;;;
+16A20;BAMUM LETTER PHASE-F NTEE;Lo;0;L;;;;;N;;;;;
+16A21;BAMUM LETTER PHASE-F WUE;Lo;0;L;;;;;N;;;;;
+16A22;BAMUM LETTER PHASE-F PEE;Lo;0;L;;;;;N;;;;;
+16A23;BAMUM LETTER PHASE-F RU;Lo;0;L;;;;;N;;;;;
+16A24;BAMUM LETTER PHASE-F NI;Lo;0;L;;;;;N;;;;;
+16A25;BAMUM LETTER PHASE-F REUX;Lo;0;L;;;;;N;;;;;
+16A26;BAMUM LETTER PHASE-F KEN;Lo;0;L;;;;;N;;;;;
+16A27;BAMUM LETTER PHASE-F NGKWAEN;Lo;0;L;;;;;N;;;;;
+16A28;BAMUM LETTER PHASE-F NGGA;Lo;0;L;;;;;N;;;;;
+16A29;BAMUM LETTER PHASE-F SHO;Lo;0;L;;;;;N;;;;;
+16A2A;BAMUM LETTER PHASE-F PUAE;Lo;0;L;;;;;N;;;;;
+16A2B;BAMUM LETTER PHASE-F FOM;Lo;0;L;;;;;N;;;;;
+16A2C;BAMUM LETTER PHASE-F WA;Lo;0;L;;;;;N;;;;;
+16A2D;BAMUM LETTER PHASE-F LI;Lo;0;L;;;;;N;;;;;
+16A2E;BAMUM LETTER PHASE-F LOQ;Lo;0;L;;;;;N;;;;;
+16A2F;BAMUM LETTER PHASE-F KO;Lo;0;L;;;;;N;;;;;
+16A30;BAMUM LETTER PHASE-F MBEN;Lo;0;L;;;;;N;;;;;
+16A31;BAMUM LETTER PHASE-F REN;Lo;0;L;;;;;N;;;;;
+16A32;BAMUM LETTER PHASE-F MA;Lo;0;L;;;;;N;;;;;
+16A33;BAMUM LETTER PHASE-F MO;Lo;0;L;;;;;N;;;;;
+16A34;BAMUM LETTER PHASE-F MBAA;Lo;0;L;;;;;N;;;;;
+16A35;BAMUM LETTER PHASE-F TET;Lo;0;L;;;;;N;;;;;
+16A36;BAMUM LETTER PHASE-F KPA;Lo;0;L;;;;;N;;;;;
+16A37;BAMUM LETTER PHASE-F SAMBA;Lo;0;L;;;;;N;;;;;
+16A38;BAMUM LETTER PHASE-F VUEQ;Lo;0;L;;;;;N;;;;;
+16A40;MRO LETTER TA;Lo;0;L;;;;;N;;;;;
+16A41;MRO LETTER NGI;Lo;0;L;;;;;N;;;;;
+16A42;MRO LETTER YO;Lo;0;L;;;;;N;;;;;
+16A43;MRO LETTER MIM;Lo;0;L;;;;;N;;;;;
+16A44;MRO LETTER BA;Lo;0;L;;;;;N;;;;;
+16A45;MRO LETTER DA;Lo;0;L;;;;;N;;;;;
+16A46;MRO LETTER A;Lo;0;L;;;;;N;;;;;
+16A47;MRO LETTER PHI;Lo;0;L;;;;;N;;;;;
+16A48;MRO LETTER KHAI;Lo;0;L;;;;;N;;;;;
+16A49;MRO LETTER HAO;Lo;0;L;;;;;N;;;;;
+16A4A;MRO LETTER DAI;Lo;0;L;;;;;N;;;;;
+16A4B;MRO LETTER CHU;Lo;0;L;;;;;N;;;;;
+16A4C;MRO LETTER KEAAE;Lo;0;L;;;;;N;;;;;
+16A4D;MRO LETTER OL;Lo;0;L;;;;;N;;;;;
+16A4E;MRO LETTER MAEM;Lo;0;L;;;;;N;;;;;
+16A4F;MRO LETTER NIN;Lo;0;L;;;;;N;;;;;
+16A50;MRO LETTER PA;Lo;0;L;;;;;N;;;;;
+16A51;MRO LETTER OO;Lo;0;L;;;;;N;;;;;
+16A52;MRO LETTER O;Lo;0;L;;;;;N;;;;;
+16A53;MRO LETTER RO;Lo;0;L;;;;;N;;;;;
+16A54;MRO LETTER SHI;Lo;0;L;;;;;N;;;;;
+16A55;MRO LETTER THEA;Lo;0;L;;;;;N;;;;;
+16A56;MRO LETTER EA;Lo;0;L;;;;;N;;;;;
+16A57;MRO LETTER WA;Lo;0;L;;;;;N;;;;;
+16A58;MRO LETTER E;Lo;0;L;;;;;N;;;;;
+16A59;MRO LETTER KO;Lo;0;L;;;;;N;;;;;
+16A5A;MRO LETTER LAN;Lo;0;L;;;;;N;;;;;
+16A5B;MRO LETTER LA;Lo;0;L;;;;;N;;;;;
+16A5C;MRO LETTER HAI;Lo;0;L;;;;;N;;;;;
+16A5D;MRO LETTER RI;Lo;0;L;;;;;N;;;;;
+16A5E;MRO LETTER TEK;Lo;0;L;;;;;N;;;;;
+16A60;MRO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+16A61;MRO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+16A62;MRO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+16A63;MRO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+16A64;MRO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+16A65;MRO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+16A66;MRO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+16A67;MRO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+16A68;MRO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+16A69;MRO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+16A6E;MRO DANDA;Po;0;L;;;;;N;;;;;
+16A6F;MRO DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+16AD0;BASSA VAH LETTER ENNI;Lo;0;L;;;;;N;;;;;
+16AD1;BASSA VAH LETTER KA;Lo;0;L;;;;;N;;;;;
+16AD2;BASSA VAH LETTER SE;Lo;0;L;;;;;N;;;;;
+16AD3;BASSA VAH LETTER FA;Lo;0;L;;;;;N;;;;;
+16AD4;BASSA VAH LETTER MBE;Lo;0;L;;;;;N;;;;;
+16AD5;BASSA VAH LETTER YIE;Lo;0;L;;;;;N;;;;;
+16AD6;BASSA VAH LETTER GAH;Lo;0;L;;;;;N;;;;;
+16AD7;BASSA VAH LETTER DHII;Lo;0;L;;;;;N;;;;;
+16AD8;BASSA VAH LETTER KPAH;Lo;0;L;;;;;N;;;;;
+16AD9;BASSA VAH LETTER JO;Lo;0;L;;;;;N;;;;;
+16ADA;BASSA VAH LETTER HWAH;Lo;0;L;;;;;N;;;;;
+16ADB;BASSA VAH LETTER WA;Lo;0;L;;;;;N;;;;;
+16ADC;BASSA VAH LETTER ZO;Lo;0;L;;;;;N;;;;;
+16ADD;BASSA VAH LETTER GBU;Lo;0;L;;;;;N;;;;;
+16ADE;BASSA VAH LETTER DO;Lo;0;L;;;;;N;;;;;
+16ADF;BASSA VAH LETTER CE;Lo;0;L;;;;;N;;;;;
+16AE0;BASSA VAH LETTER UWU;Lo;0;L;;;;;N;;;;;
+16AE1;BASSA VAH LETTER TO;Lo;0;L;;;;;N;;;;;
+16AE2;BASSA VAH LETTER BA;Lo;0;L;;;;;N;;;;;
+16AE3;BASSA VAH LETTER VU;Lo;0;L;;;;;N;;;;;
+16AE4;BASSA VAH LETTER YEIN;Lo;0;L;;;;;N;;;;;
+16AE5;BASSA VAH LETTER PA;Lo;0;L;;;;;N;;;;;
+16AE6;BASSA VAH LETTER WADDA;Lo;0;L;;;;;N;;;;;
+16AE7;BASSA VAH LETTER A;Lo;0;L;;;;;N;;;;;
+16AE8;BASSA VAH LETTER O;Lo;0;L;;;;;N;;;;;
+16AE9;BASSA VAH LETTER OO;Lo;0;L;;;;;N;;;;;
+16AEA;BASSA VAH LETTER U;Lo;0;L;;;;;N;;;;;
+16AEB;BASSA VAH LETTER EE;Lo;0;L;;;;;N;;;;;
+16AEC;BASSA VAH LETTER E;Lo;0;L;;;;;N;;;;;
+16AED;BASSA VAH LETTER I;Lo;0;L;;;;;N;;;;;
+16AF0;BASSA VAH COMBINING HIGH TONE;Mn;1;NSM;;;;;N;;;;;
+16AF1;BASSA VAH COMBINING LOW TONE;Mn;1;NSM;;;;;N;;;;;
+16AF2;BASSA VAH COMBINING MID TONE;Mn;1;NSM;;;;;N;;;;;
+16AF3;BASSA VAH COMBINING LOW-MID TONE;Mn;1;NSM;;;;;N;;;;;
+16AF4;BASSA VAH COMBINING HIGH-LOW TONE;Mn;1;NSM;;;;;N;;;;;
+16AF5;BASSA VAH FULL STOP;Po;0;L;;;;;N;;;;;
+16B00;PAHAWH HMONG VOWEL KEEB;Lo;0;L;;;;;N;;;;;
+16B01;PAHAWH HMONG VOWEL KEEV;Lo;0;L;;;;;N;;;;;
+16B02;PAHAWH HMONG VOWEL KIB;Lo;0;L;;;;;N;;;;;
+16B03;PAHAWH HMONG VOWEL KIV;Lo;0;L;;;;;N;;;;;
+16B04;PAHAWH HMONG VOWEL KAUB;Lo;0;L;;;;;N;;;;;
+16B05;PAHAWH HMONG VOWEL KAUV;Lo;0;L;;;;;N;;;;;
+16B06;PAHAWH HMONG VOWEL KUB;Lo;0;L;;;;;N;;;;;
+16B07;PAHAWH HMONG VOWEL KUV;Lo;0;L;;;;;N;;;;;
+16B08;PAHAWH HMONG VOWEL KEB;Lo;0;L;;;;;N;;;;;
+16B09;PAHAWH HMONG VOWEL KEV;Lo;0;L;;;;;N;;;;;
+16B0A;PAHAWH HMONG VOWEL KAIB;Lo;0;L;;;;;N;;;;;
+16B0B;PAHAWH HMONG VOWEL KAIV;Lo;0;L;;;;;N;;;;;
+16B0C;PAHAWH HMONG VOWEL KOOB;Lo;0;L;;;;;N;;;;;
+16B0D;PAHAWH HMONG VOWEL KOOV;Lo;0;L;;;;;N;;;;;
+16B0E;PAHAWH HMONG VOWEL KAWB;Lo;0;L;;;;;N;;;;;
+16B0F;PAHAWH HMONG VOWEL KAWV;Lo;0;L;;;;;N;;;;;
+16B10;PAHAWH HMONG VOWEL KUAB;Lo;0;L;;;;;N;;;;;
+16B11;PAHAWH HMONG VOWEL KUAV;Lo;0;L;;;;;N;;;;;
+16B12;PAHAWH HMONG VOWEL KOB;Lo;0;L;;;;;N;;;;;
+16B13;PAHAWH HMONG VOWEL KOV;Lo;0;L;;;;;N;;;;;
+16B14;PAHAWH HMONG VOWEL KIAB;Lo;0;L;;;;;N;;;;;
+16B15;PAHAWH HMONG VOWEL KIAV;Lo;0;L;;;;;N;;;;;
+16B16;PAHAWH HMONG VOWEL KAB;Lo;0;L;;;;;N;;;;;
+16B17;PAHAWH HMONG VOWEL KAV;Lo;0;L;;;;;N;;;;;
+16B18;PAHAWH HMONG VOWEL KWB;Lo;0;L;;;;;N;;;;;
+16B19;PAHAWH HMONG VOWEL KWV;Lo;0;L;;;;;N;;;;;
+16B1A;PAHAWH HMONG VOWEL KAAB;Lo;0;L;;;;;N;;;;;
+16B1B;PAHAWH HMONG VOWEL KAAV;Lo;0;L;;;;;N;;;;;
+16B1C;PAHAWH HMONG CONSONANT VAU;Lo;0;L;;;;;N;;;;;
+16B1D;PAHAWH HMONG CONSONANT NTSAU;Lo;0;L;;;;;N;;;;;
+16B1E;PAHAWH HMONG CONSONANT LAU;Lo;0;L;;;;;N;;;;;
+16B1F;PAHAWH HMONG CONSONANT HAU;Lo;0;L;;;;;N;;;;;
+16B20;PAHAWH HMONG CONSONANT NLAU;Lo;0;L;;;;;N;;;;;
+16B21;PAHAWH HMONG CONSONANT RAU;Lo;0;L;;;;;N;;;;;
+16B22;PAHAWH HMONG CONSONANT NKAU;Lo;0;L;;;;;N;;;;;
+16B23;PAHAWH HMONG CONSONANT QHAU;Lo;0;L;;;;;N;;;;;
+16B24;PAHAWH HMONG CONSONANT YAU;Lo;0;L;;;;;N;;;;;
+16B25;PAHAWH HMONG CONSONANT HLAU;Lo;0;L;;;;;N;;;;;
+16B26;PAHAWH HMONG CONSONANT MAU;Lo;0;L;;;;;N;;;;;
+16B27;PAHAWH HMONG CONSONANT CHAU;Lo;0;L;;;;;N;;;;;
+16B28;PAHAWH HMONG CONSONANT NCHAU;Lo;0;L;;;;;N;;;;;
+16B29;PAHAWH HMONG CONSONANT HNAU;Lo;0;L;;;;;N;;;;;
+16B2A;PAHAWH HMONG CONSONANT PLHAU;Lo;0;L;;;;;N;;;;;
+16B2B;PAHAWH HMONG CONSONANT NTHAU;Lo;0;L;;;;;N;;;;;
+16B2C;PAHAWH HMONG CONSONANT NAU;Lo;0;L;;;;;N;;;;;
+16B2D;PAHAWH HMONG CONSONANT AU;Lo;0;L;;;;;N;;;;;
+16B2E;PAHAWH HMONG CONSONANT XAU;Lo;0;L;;;;;N;;;;;
+16B2F;PAHAWH HMONG CONSONANT CAU;Lo;0;L;;;;;N;;;;;
+16B30;PAHAWH HMONG MARK CIM TUB;Mn;230;NSM;;;;;N;;;;;
+16B31;PAHAWH HMONG MARK CIM SO;Mn;230;NSM;;;;;N;;;;;
+16B32;PAHAWH HMONG MARK CIM KES;Mn;230;NSM;;;;;N;;;;;
+16B33;PAHAWH HMONG MARK CIM KHAV;Mn;230;NSM;;;;;N;;;;;
+16B34;PAHAWH HMONG MARK CIM SUAM;Mn;230;NSM;;;;;N;;;;;
+16B35;PAHAWH HMONG MARK CIM HOM;Mn;230;NSM;;;;;N;;;;;
+16B36;PAHAWH HMONG MARK CIM TAUM;Mn;230;NSM;;;;;N;;;;;
+16B37;PAHAWH HMONG SIGN VOS THOM;Po;0;L;;;;;N;;;;;
+16B38;PAHAWH HMONG SIGN VOS TSHAB CEEB;Po;0;L;;;;;N;;;;;
+16B39;PAHAWH HMONG SIGN CIM CHEEM;Po;0;L;;;;;N;;;;;
+16B3A;PAHAWH HMONG SIGN VOS THIAB;Po;0;L;;;;;N;;;;;
+16B3B;PAHAWH HMONG SIGN VOS FEEM;Po;0;L;;;;;N;;;;;
+16B3C;PAHAWH HMONG SIGN XYEEM NTXIV;So;0;L;;;;;N;;;;;
+16B3D;PAHAWH HMONG SIGN XYEEM RHO;So;0;L;;;;;N;;;;;
+16B3E;PAHAWH HMONG SIGN XYEEM TOV;So;0;L;;;;;N;;;;;
+16B3F;PAHAWH HMONG SIGN XYEEM FAIB;So;0;L;;;;;N;;;;;
+16B40;PAHAWH HMONG SIGN VOS SEEV;Lm;0;L;;;;;N;;;;;
+16B41;PAHAWH HMONG SIGN MEEJ SUAB;Lm;0;L;;;;;N;;;;;
+16B42;PAHAWH HMONG SIGN VOS NRUA;Lm;0;L;;;;;N;;;;;
+16B43;PAHAWH HMONG SIGN IB YAM;Lm;0;L;;;;;N;;;;;
+16B44;PAHAWH HMONG SIGN XAUS;Po;0;L;;;;;N;;;;;
+16B45;PAHAWH HMONG SIGN CIM TSOV ROG;So;0;L;;;;;N;;;;;
+16B50;PAHAWH HMONG DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+16B51;PAHAWH HMONG DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+16B52;PAHAWH HMONG DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+16B53;PAHAWH HMONG DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+16B54;PAHAWH HMONG DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+16B55;PAHAWH HMONG DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+16B56;PAHAWH HMONG DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+16B57;PAHAWH HMONG DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+16B58;PAHAWH HMONG DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+16B59;PAHAWH HMONG DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+16B5B;PAHAWH HMONG NUMBER TENS;No;0;L;;;;10;N;;;;;
+16B5C;PAHAWH HMONG NUMBER HUNDREDS;No;0;L;;;;100;N;;;;;
+16B5D;PAHAWH HMONG NUMBER TEN THOUSANDS;No;0;L;;;;10000;N;;;;;
+16B5E;PAHAWH HMONG NUMBER MILLIONS;No;0;L;;;;1000000;N;;;;;
+16B5F;PAHAWH HMONG NUMBER HUNDRED MILLIONS;No;0;L;;;;100000000;N;;;;;
+16B60;PAHAWH HMONG NUMBER TEN BILLIONS;No;0;L;;;;10000000000;N;;;;;
+16B61;PAHAWH HMONG NUMBER TRILLIONS;No;0;L;;;;1000000000000;N;;;;;
+16B63;PAHAWH HMONG SIGN VOS LUB;Lo;0;L;;;;;N;;;;;
+16B64;PAHAWH HMONG SIGN XYOO;Lo;0;L;;;;;N;;;;;
+16B65;PAHAWH HMONG SIGN HLI;Lo;0;L;;;;;N;;;;;
+16B66;PAHAWH HMONG SIGN THIRD-STAGE HLI;Lo;0;L;;;;;N;;;;;
+16B67;PAHAWH HMONG SIGN ZWJ THAJ;Lo;0;L;;;;;N;;;;;
+16B68;PAHAWH HMONG SIGN HNUB;Lo;0;L;;;;;N;;;;;
+16B69;PAHAWH HMONG SIGN NQIG;Lo;0;L;;;;;N;;;;;
+16B6A;PAHAWH HMONG SIGN XIAB;Lo;0;L;;;;;N;;;;;
+16B6B;PAHAWH HMONG SIGN NTUJ;Lo;0;L;;;;;N;;;;;
+16B6C;PAHAWH HMONG SIGN AV;Lo;0;L;;;;;N;;;;;
+16B6D;PAHAWH HMONG SIGN TXHEEJ CEEV;Lo;0;L;;;;;N;;;;;
+16B6E;PAHAWH HMONG SIGN MEEJ TSEEB;Lo;0;L;;;;;N;;;;;
+16B6F;PAHAWH HMONG SIGN TAU;Lo;0;L;;;;;N;;;;;
+16B70;PAHAWH HMONG SIGN LOS;Lo;0;L;;;;;N;;;;;
+16B71;PAHAWH HMONG SIGN MUS;Lo;0;L;;;;;N;;;;;
+16B72;PAHAWH HMONG SIGN CIM HAIS LUS NTOG NTOG;Lo;0;L;;;;;N;;;;;
+16B73;PAHAWH HMONG SIGN CIM CUAM TSHOOJ;Lo;0;L;;;;;N;;;;;
+16B74;PAHAWH HMONG SIGN CIM TXWV;Lo;0;L;;;;;N;;;;;
+16B75;PAHAWH HMONG SIGN CIM TXWV CHWV;Lo;0;L;;;;;N;;;;;
+16B76;PAHAWH HMONG SIGN CIM PUB DAWB;Lo;0;L;;;;;N;;;;;
+16B77;PAHAWH HMONG SIGN CIM NRES TOS;Lo;0;L;;;;;N;;;;;
+16B7D;PAHAWH HMONG CLAN SIGN TSHEEJ;Lo;0;L;;;;;N;;;;;
+16B7E;PAHAWH HMONG CLAN SIGN YEEG;Lo;0;L;;;;;N;;;;;
+16B7F;PAHAWH HMONG CLAN SIGN LIS;Lo;0;L;;;;;N;;;;;
+16B80;PAHAWH HMONG CLAN SIGN LAUJ;Lo;0;L;;;;;N;;;;;
+16B81;PAHAWH HMONG CLAN SIGN XYOOJ;Lo;0;L;;;;;N;;;;;
+16B82;PAHAWH HMONG CLAN SIGN KOO;Lo;0;L;;;;;N;;;;;
+16B83;PAHAWH HMONG CLAN SIGN HAWJ;Lo;0;L;;;;;N;;;;;
+16B84;PAHAWH HMONG CLAN SIGN MUAS;Lo;0;L;;;;;N;;;;;
+16B85;PAHAWH HMONG CLAN SIGN THOJ;Lo;0;L;;;;;N;;;;;
+16B86;PAHAWH HMONG CLAN SIGN TSAB;Lo;0;L;;;;;N;;;;;
+16B87;PAHAWH HMONG CLAN SIGN PHAB;Lo;0;L;;;;;N;;;;;
+16B88;PAHAWH HMONG CLAN SIGN KHAB;Lo;0;L;;;;;N;;;;;
+16B89;PAHAWH HMONG CLAN SIGN HAM;Lo;0;L;;;;;N;;;;;
+16B8A;PAHAWH HMONG CLAN SIGN VAJ;Lo;0;L;;;;;N;;;;;
+16B8B;PAHAWH HMONG CLAN SIGN FAJ;Lo;0;L;;;;;N;;;;;
+16B8C;PAHAWH HMONG CLAN SIGN YAJ;Lo;0;L;;;;;N;;;;;
+16B8D;PAHAWH HMONG CLAN SIGN TSWB;Lo;0;L;;;;;N;;;;;
+16B8E;PAHAWH HMONG CLAN SIGN KWM;Lo;0;L;;;;;N;;;;;
+16B8F;PAHAWH HMONG CLAN SIGN VWJ;Lo;0;L;;;;;N;;;;;
+16F00;MIAO LETTER PA;Lo;0;L;;;;;N;;;;;
+16F01;MIAO LETTER BA;Lo;0;L;;;;;N;;;;;
+16F02;MIAO LETTER YI PA;Lo;0;L;;;;;N;;;;;
+16F03;MIAO LETTER PLA;Lo;0;L;;;;;N;;;;;
+16F04;MIAO LETTER MA;Lo;0;L;;;;;N;;;;;
+16F05;MIAO LETTER MHA;Lo;0;L;;;;;N;;;;;
+16F06;MIAO LETTER ARCHAIC MA;Lo;0;L;;;;;N;;;;;
+16F07;MIAO LETTER FA;Lo;0;L;;;;;N;;;;;
+16F08;MIAO LETTER VA;Lo;0;L;;;;;N;;;;;
+16F09;MIAO LETTER VFA;Lo;0;L;;;;;N;;;;;
+16F0A;MIAO LETTER TA;Lo;0;L;;;;;N;;;;;
+16F0B;MIAO LETTER DA;Lo;0;L;;;;;N;;;;;
+16F0C;MIAO LETTER YI TTA;Lo;0;L;;;;;N;;;;;
+16F0D;MIAO LETTER YI TA;Lo;0;L;;;;;N;;;;;
+16F0E;MIAO LETTER TTA;Lo;0;L;;;;;N;;;;;
+16F0F;MIAO LETTER DDA;Lo;0;L;;;;;N;;;;;
+16F10;MIAO LETTER NA;Lo;0;L;;;;;N;;;;;
+16F11;MIAO LETTER NHA;Lo;0;L;;;;;N;;;;;
+16F12;MIAO LETTER YI NNA;Lo;0;L;;;;;N;;;;;
+16F13;MIAO LETTER ARCHAIC NA;Lo;0;L;;;;;N;;;;;
+16F14;MIAO LETTER NNA;Lo;0;L;;;;;N;;;;;
+16F15;MIAO LETTER NNHA;Lo;0;L;;;;;N;;;;;
+16F16;MIAO LETTER LA;Lo;0;L;;;;;N;;;;;
+16F17;MIAO LETTER LYA;Lo;0;L;;;;;N;;;;;
+16F18;MIAO LETTER LHA;Lo;0;L;;;;;N;;;;;
+16F19;MIAO LETTER LHYA;Lo;0;L;;;;;N;;;;;
+16F1A;MIAO LETTER TLHA;Lo;0;L;;;;;N;;;;;
+16F1B;MIAO LETTER DLHA;Lo;0;L;;;;;N;;;;;
+16F1C;MIAO LETTER TLHYA;Lo;0;L;;;;;N;;;;;
+16F1D;MIAO LETTER DLHYA;Lo;0;L;;;;;N;;;;;
+16F1E;MIAO LETTER KA;Lo;0;L;;;;;N;;;;;
+16F1F;MIAO LETTER GA;Lo;0;L;;;;;N;;;;;
+16F20;MIAO LETTER YI KA;Lo;0;L;;;;;N;;;;;
+16F21;MIAO LETTER QA;Lo;0;L;;;;;N;;;;;
+16F22;MIAO LETTER QGA;Lo;0;L;;;;;N;;;;;
+16F23;MIAO LETTER NGA;Lo;0;L;;;;;N;;;;;
+16F24;MIAO LETTER NGHA;Lo;0;L;;;;;N;;;;;
+16F25;MIAO LETTER ARCHAIC NGA;Lo;0;L;;;;;N;;;;;
+16F26;MIAO LETTER HA;Lo;0;L;;;;;N;;;;;
+16F27;MIAO LETTER XA;Lo;0;L;;;;;N;;;;;
+16F28;MIAO LETTER GHA;Lo;0;L;;;;;N;;;;;
+16F29;MIAO LETTER GHHA;Lo;0;L;;;;;N;;;;;
+16F2A;MIAO LETTER TSSA;Lo;0;L;;;;;N;;;;;
+16F2B;MIAO LETTER DZZA;Lo;0;L;;;;;N;;;;;
+16F2C;MIAO LETTER NYA;Lo;0;L;;;;;N;;;;;
+16F2D;MIAO LETTER NYHA;Lo;0;L;;;;;N;;;;;
+16F2E;MIAO LETTER TSHA;Lo;0;L;;;;;N;;;;;
+16F2F;MIAO LETTER DZHA;Lo;0;L;;;;;N;;;;;
+16F30;MIAO LETTER YI TSHA;Lo;0;L;;;;;N;;;;;
+16F31;MIAO LETTER YI DZHA;Lo;0;L;;;;;N;;;;;
+16F32;MIAO LETTER REFORMED TSHA;Lo;0;L;;;;;N;;;;;
+16F33;MIAO LETTER SHA;Lo;0;L;;;;;N;;;;;
+16F34;MIAO LETTER SSA;Lo;0;L;;;;;N;;;;;
+16F35;MIAO LETTER ZHA;Lo;0;L;;;;;N;;;;;
+16F36;MIAO LETTER ZSHA;Lo;0;L;;;;;N;;;;;
+16F37;MIAO LETTER TSA;Lo;0;L;;;;;N;;;;;
+16F38;MIAO LETTER DZA;Lo;0;L;;;;;N;;;;;
+16F39;MIAO LETTER YI TSA;Lo;0;L;;;;;N;;;;;
+16F3A;MIAO LETTER SA;Lo;0;L;;;;;N;;;;;
+16F3B;MIAO LETTER ZA;Lo;0;L;;;;;N;;;;;
+16F3C;MIAO LETTER ZSA;Lo;0;L;;;;;N;;;;;
+16F3D;MIAO LETTER ZZA;Lo;0;L;;;;;N;;;;;
+16F3E;MIAO LETTER ZZSA;Lo;0;L;;;;;N;;;;;
+16F3F;MIAO LETTER ARCHAIC ZZA;Lo;0;L;;;;;N;;;;;
+16F40;MIAO LETTER ZZYA;Lo;0;L;;;;;N;;;;;
+16F41;MIAO LETTER ZZSYA;Lo;0;L;;;;;N;;;;;
+16F42;MIAO LETTER WA;Lo;0;L;;;;;N;;;;;
+16F43;MIAO LETTER AH;Lo;0;L;;;;;N;;;;;
+16F44;MIAO LETTER HHA;Lo;0;L;;;;;N;;;;;
+16F50;MIAO LETTER NASALIZATION;Lo;0;L;;;;;N;;;;;
+16F51;MIAO SIGN ASPIRATION;Mc;0;L;;;;;N;;;;;
+16F52;MIAO SIGN REFORMED VOICING;Mc;0;L;;;;;N;;;;;
+16F53;MIAO SIGN REFORMED ASPIRATION;Mc;0;L;;;;;N;;;;;
+16F54;MIAO VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+16F55;MIAO VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+16F56;MIAO VOWEL SIGN AHH;Mc;0;L;;;;;N;;;;;
+16F57;MIAO VOWEL SIGN AN;Mc;0;L;;;;;N;;;;;
+16F58;MIAO VOWEL SIGN ANG;Mc;0;L;;;;;N;;;;;
+16F59;MIAO VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+16F5A;MIAO VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+16F5B;MIAO VOWEL SIGN WO;Mc;0;L;;;;;N;;;;;
+16F5C;MIAO VOWEL SIGN W;Mc;0;L;;;;;N;;;;;
+16F5D;MIAO VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+16F5E;MIAO VOWEL SIGN EN;Mc;0;L;;;;;N;;;;;
+16F5F;MIAO VOWEL SIGN ENG;Mc;0;L;;;;;N;;;;;
+16F60;MIAO VOWEL SIGN OEY;Mc;0;L;;;;;N;;;;;
+16F61;MIAO VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+16F62;MIAO VOWEL SIGN IA;Mc;0;L;;;;;N;;;;;
+16F63;MIAO VOWEL SIGN IAN;Mc;0;L;;;;;N;;;;;
+16F64;MIAO VOWEL SIGN IANG;Mc;0;L;;;;;N;;;;;
+16F65;MIAO VOWEL SIGN IO;Mc;0;L;;;;;N;;;;;
+16F66;MIAO VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
+16F67;MIAO VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+16F68;MIAO VOWEL SIGN IU;Mc;0;L;;;;;N;;;;;
+16F69;MIAO VOWEL SIGN ING;Mc;0;L;;;;;N;;;;;
+16F6A;MIAO VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+16F6B;MIAO VOWEL SIGN UA;Mc;0;L;;;;;N;;;;;
+16F6C;MIAO VOWEL SIGN UAN;Mc;0;L;;;;;N;;;;;
+16F6D;MIAO VOWEL SIGN UANG;Mc;0;L;;;;;N;;;;;
+16F6E;MIAO VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+16F6F;MIAO VOWEL SIGN UEI;Mc;0;L;;;;;N;;;;;
+16F70;MIAO VOWEL SIGN UNG;Mc;0;L;;;;;N;;;;;
+16F71;MIAO VOWEL SIGN Y;Mc;0;L;;;;;N;;;;;
+16F72;MIAO VOWEL SIGN YI;Mc;0;L;;;;;N;;;;;
+16F73;MIAO VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+16F74;MIAO VOWEL SIGN AEE;Mc;0;L;;;;;N;;;;;
+16F75;MIAO VOWEL SIGN ERR;Mc;0;L;;;;;N;;;;;
+16F76;MIAO VOWEL SIGN ROUNDED ERR;Mc;0;L;;;;;N;;;;;
+16F77;MIAO VOWEL SIGN ER;Mc;0;L;;;;;N;;;;;
+16F78;MIAO VOWEL SIGN ROUNDED ER;Mc;0;L;;;;;N;;;;;
+16F79;MIAO VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+16F7A;MIAO VOWEL SIGN EI;Mc;0;L;;;;;N;;;;;
+16F7B;MIAO VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+16F7C;MIAO VOWEL SIGN OU;Mc;0;L;;;;;N;;;;;
+16F7D;MIAO VOWEL SIGN N;Mc;0;L;;;;;N;;;;;
+16F7E;MIAO VOWEL SIGN NG;Mc;0;L;;;;;N;;;;;
+16F8F;MIAO TONE RIGHT;Mn;0;NSM;;;;;N;;;;;
+16F90;MIAO TONE TOP RIGHT;Mn;0;NSM;;;;;N;;;;;
+16F91;MIAO TONE ABOVE;Mn;0;NSM;;;;;N;;;;;
+16F92;MIAO TONE BELOW;Mn;0;NSM;;;;;N;;;;;
+16F93;MIAO LETTER TONE-2;Lm;0;L;;;;;N;;;;;
+16F94;MIAO LETTER TONE-3;Lm;0;L;;;;;N;;;;;
+16F95;MIAO LETTER TONE-4;Lm;0;L;;;;;N;;;;;
+16F96;MIAO LETTER TONE-5;Lm;0;L;;;;;N;;;;;
+16F97;MIAO LETTER TONE-6;Lm;0;L;;;;;N;;;;;
+16F98;MIAO LETTER TONE-7;Lm;0;L;;;;;N;;;;;
+16F99;MIAO LETTER TONE-8;Lm;0;L;;;;;N;;;;;
+16F9A;MIAO LETTER REFORMED TONE-1;Lm;0;L;;;;;N;;;;;
+16F9B;MIAO LETTER REFORMED TONE-2;Lm;0;L;;;;;N;;;;;
+16F9C;MIAO LETTER REFORMED TONE-4;Lm;0;L;;;;;N;;;;;
+16F9D;MIAO LETTER REFORMED TONE-5;Lm;0;L;;;;;N;;;;;
+16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;;
+16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;;
+16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
+17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
+187EC;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
+18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
+18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
+18803;TANGUT COMPONENT-004;Lo;0;L;;;;;N;;;;;
+18804;TANGUT COMPONENT-005;Lo;0;L;;;;;N;;;;;
+18805;TANGUT COMPONENT-006;Lo;0;L;;;;;N;;;;;
+18806;TANGUT COMPONENT-007;Lo;0;L;;;;;N;;;;;
+18807;TANGUT COMPONENT-008;Lo;0;L;;;;;N;;;;;
+18808;TANGUT COMPONENT-009;Lo;0;L;;;;;N;;;;;
+18809;TANGUT COMPONENT-010;Lo;0;L;;;;;N;;;;;
+1880A;TANGUT COMPONENT-011;Lo;0;L;;;;;N;;;;;
+1880B;TANGUT COMPONENT-012;Lo;0;L;;;;;N;;;;;
+1880C;TANGUT COMPONENT-013;Lo;0;L;;;;;N;;;;;
+1880D;TANGUT COMPONENT-014;Lo;0;L;;;;;N;;;;;
+1880E;TANGUT COMPONENT-015;Lo;0;L;;;;;N;;;;;
+1880F;TANGUT COMPONENT-016;Lo;0;L;;;;;N;;;;;
+18810;TANGUT COMPONENT-017;Lo;0;L;;;;;N;;;;;
+18811;TANGUT COMPONENT-018;Lo;0;L;;;;;N;;;;;
+18812;TANGUT COMPONENT-019;Lo;0;L;;;;;N;;;;;
+18813;TANGUT COMPONENT-020;Lo;0;L;;;;;N;;;;;
+18814;TANGUT COMPONENT-021;Lo;0;L;;;;;N;;;;;
+18815;TANGUT COMPONENT-022;Lo;0;L;;;;;N;;;;;
+18816;TANGUT COMPONENT-023;Lo;0;L;;;;;N;;;;;
+18817;TANGUT COMPONENT-024;Lo;0;L;;;;;N;;;;;
+18818;TANGUT COMPONENT-025;Lo;0;L;;;;;N;;;;;
+18819;TANGUT COMPONENT-026;Lo;0;L;;;;;N;;;;;
+1881A;TANGUT COMPONENT-027;Lo;0;L;;;;;N;;;;;
+1881B;TANGUT COMPONENT-028;Lo;0;L;;;;;N;;;;;
+1881C;TANGUT COMPONENT-029;Lo;0;L;;;;;N;;;;;
+1881D;TANGUT COMPONENT-030;Lo;0;L;;;;;N;;;;;
+1881E;TANGUT COMPONENT-031;Lo;0;L;;;;;N;;;;;
+1881F;TANGUT COMPONENT-032;Lo;0;L;;;;;N;;;;;
+18820;TANGUT COMPONENT-033;Lo;0;L;;;;;N;;;;;
+18821;TANGUT COMPONENT-034;Lo;0;L;;;;;N;;;;;
+18822;TANGUT COMPONENT-035;Lo;0;L;;;;;N;;;;;
+18823;TANGUT COMPONENT-036;Lo;0;L;;;;;N;;;;;
+18824;TANGUT COMPONENT-037;Lo;0;L;;;;;N;;;;;
+18825;TANGUT COMPONENT-038;Lo;0;L;;;;;N;;;;;
+18826;TANGUT COMPONENT-039;Lo;0;L;;;;;N;;;;;
+18827;TANGUT COMPONENT-040;Lo;0;L;;;;;N;;;;;
+18828;TANGUT COMPONENT-041;Lo;0;L;;;;;N;;;;;
+18829;TANGUT COMPONENT-042;Lo;0;L;;;;;N;;;;;
+1882A;TANGUT COMPONENT-043;Lo;0;L;;;;;N;;;;;
+1882B;TANGUT COMPONENT-044;Lo;0;L;;;;;N;;;;;
+1882C;TANGUT COMPONENT-045;Lo;0;L;;;;;N;;;;;
+1882D;TANGUT COMPONENT-046;Lo;0;L;;;;;N;;;;;
+1882E;TANGUT COMPONENT-047;Lo;0;L;;;;;N;;;;;
+1882F;TANGUT COMPONENT-048;Lo;0;L;;;;;N;;;;;
+18830;TANGUT COMPONENT-049;Lo;0;L;;;;;N;;;;;
+18831;TANGUT COMPONENT-050;Lo;0;L;;;;;N;;;;;
+18832;TANGUT COMPONENT-051;Lo;0;L;;;;;N;;;;;
+18833;TANGUT COMPONENT-052;Lo;0;L;;;;;N;;;;;
+18834;TANGUT COMPONENT-053;Lo;0;L;;;;;N;;;;;
+18835;TANGUT COMPONENT-054;Lo;0;L;;;;;N;;;;;
+18836;TANGUT COMPONENT-055;Lo;0;L;;;;;N;;;;;
+18837;TANGUT COMPONENT-056;Lo;0;L;;;;;N;;;;;
+18838;TANGUT COMPONENT-057;Lo;0;L;;;;;N;;;;;
+18839;TANGUT COMPONENT-058;Lo;0;L;;;;;N;;;;;
+1883A;TANGUT COMPONENT-059;Lo;0;L;;;;;N;;;;;
+1883B;TANGUT COMPONENT-060;Lo;0;L;;;;;N;;;;;
+1883C;TANGUT COMPONENT-061;Lo;0;L;;;;;N;;;;;
+1883D;TANGUT COMPONENT-062;Lo;0;L;;;;;N;;;;;
+1883E;TANGUT COMPONENT-063;Lo;0;L;;;;;N;;;;;
+1883F;TANGUT COMPONENT-064;Lo;0;L;;;;;N;;;;;
+18840;TANGUT COMPONENT-065;Lo;0;L;;;;;N;;;;;
+18841;TANGUT COMPONENT-066;Lo;0;L;;;;;N;;;;;
+18842;TANGUT COMPONENT-067;Lo;0;L;;;;;N;;;;;
+18843;TANGUT COMPONENT-068;Lo;0;L;;;;;N;;;;;
+18844;TANGUT COMPONENT-069;Lo;0;L;;;;;N;;;;;
+18845;TANGUT COMPONENT-070;Lo;0;L;;;;;N;;;;;
+18846;TANGUT COMPONENT-071;Lo;0;L;;;;;N;;;;;
+18847;TANGUT COMPONENT-072;Lo;0;L;;;;;N;;;;;
+18848;TANGUT COMPONENT-073;Lo;0;L;;;;;N;;;;;
+18849;TANGUT COMPONENT-074;Lo;0;L;;;;;N;;;;;
+1884A;TANGUT COMPONENT-075;Lo;0;L;;;;;N;;;;;
+1884B;TANGUT COMPONENT-076;Lo;0;L;;;;;N;;;;;
+1884C;TANGUT COMPONENT-077;Lo;0;L;;;;;N;;;;;
+1884D;TANGUT COMPONENT-078;Lo;0;L;;;;;N;;;;;
+1884E;TANGUT COMPONENT-079;Lo;0;L;;;;;N;;;;;
+1884F;TANGUT COMPONENT-080;Lo;0;L;;;;;N;;;;;
+18850;TANGUT COMPONENT-081;Lo;0;L;;;;;N;;;;;
+18851;TANGUT COMPONENT-082;Lo;0;L;;;;;N;;;;;
+18852;TANGUT COMPONENT-083;Lo;0;L;;;;;N;;;;;
+18853;TANGUT COMPONENT-084;Lo;0;L;;;;;N;;;;;
+18854;TANGUT COMPONENT-085;Lo;0;L;;;;;N;;;;;
+18855;TANGUT COMPONENT-086;Lo;0;L;;;;;N;;;;;
+18856;TANGUT COMPONENT-087;Lo;0;L;;;;;N;;;;;
+18857;TANGUT COMPONENT-088;Lo;0;L;;;;;N;;;;;
+18858;TANGUT COMPONENT-089;Lo;0;L;;;;;N;;;;;
+18859;TANGUT COMPONENT-090;Lo;0;L;;;;;N;;;;;
+1885A;TANGUT COMPONENT-091;Lo;0;L;;;;;N;;;;;
+1885B;TANGUT COMPONENT-092;Lo;0;L;;;;;N;;;;;
+1885C;TANGUT COMPONENT-093;Lo;0;L;;;;;N;;;;;
+1885D;TANGUT COMPONENT-094;Lo;0;L;;;;;N;;;;;
+1885E;TANGUT COMPONENT-095;Lo;0;L;;;;;N;;;;;
+1885F;TANGUT COMPONENT-096;Lo;0;L;;;;;N;;;;;
+18860;TANGUT COMPONENT-097;Lo;0;L;;;;;N;;;;;
+18861;TANGUT COMPONENT-098;Lo;0;L;;;;;N;;;;;
+18862;TANGUT COMPONENT-099;Lo;0;L;;;;;N;;;;;
+18863;TANGUT COMPONENT-100;Lo;0;L;;;;;N;;;;;
+18864;TANGUT COMPONENT-101;Lo;0;L;;;;;N;;;;;
+18865;TANGUT COMPONENT-102;Lo;0;L;;;;;N;;;;;
+18866;TANGUT COMPONENT-103;Lo;0;L;;;;;N;;;;;
+18867;TANGUT COMPONENT-104;Lo;0;L;;;;;N;;;;;
+18868;TANGUT COMPONENT-105;Lo;0;L;;;;;N;;;;;
+18869;TANGUT COMPONENT-106;Lo;0;L;;;;;N;;;;;
+1886A;TANGUT COMPONENT-107;Lo;0;L;;;;;N;;;;;
+1886B;TANGUT COMPONENT-108;Lo;0;L;;;;;N;;;;;
+1886C;TANGUT COMPONENT-109;Lo;0;L;;;;;N;;;;;
+1886D;TANGUT COMPONENT-110;Lo;0;L;;;;;N;;;;;
+1886E;TANGUT COMPONENT-111;Lo;0;L;;;;;N;;;;;
+1886F;TANGUT COMPONENT-112;Lo;0;L;;;;;N;;;;;
+18870;TANGUT COMPONENT-113;Lo;0;L;;;;;N;;;;;
+18871;TANGUT COMPONENT-114;Lo;0;L;;;;;N;;;;;
+18872;TANGUT COMPONENT-115;Lo;0;L;;;;;N;;;;;
+18873;TANGUT COMPONENT-116;Lo;0;L;;;;;N;;;;;
+18874;TANGUT COMPONENT-117;Lo;0;L;;;;;N;;;;;
+18875;TANGUT COMPONENT-118;Lo;0;L;;;;;N;;;;;
+18876;TANGUT COMPONENT-119;Lo;0;L;;;;;N;;;;;
+18877;TANGUT COMPONENT-120;Lo;0;L;;;;;N;;;;;
+18878;TANGUT COMPONENT-121;Lo;0;L;;;;;N;;;;;
+18879;TANGUT COMPONENT-122;Lo;0;L;;;;;N;;;;;
+1887A;TANGUT COMPONENT-123;Lo;0;L;;;;;N;;;;;
+1887B;TANGUT COMPONENT-124;Lo;0;L;;;;;N;;;;;
+1887C;TANGUT COMPONENT-125;Lo;0;L;;;;;N;;;;;
+1887D;TANGUT COMPONENT-126;Lo;0;L;;;;;N;;;;;
+1887E;TANGUT COMPONENT-127;Lo;0;L;;;;;N;;;;;
+1887F;TANGUT COMPONENT-128;Lo;0;L;;;;;N;;;;;
+18880;TANGUT COMPONENT-129;Lo;0;L;;;;;N;;;;;
+18881;TANGUT COMPONENT-130;Lo;0;L;;;;;N;;;;;
+18882;TANGUT COMPONENT-131;Lo;0;L;;;;;N;;;;;
+18883;TANGUT COMPONENT-132;Lo;0;L;;;;;N;;;;;
+18884;TANGUT COMPONENT-133;Lo;0;L;;;;;N;;;;;
+18885;TANGUT COMPONENT-134;Lo;0;L;;;;;N;;;;;
+18886;TANGUT COMPONENT-135;Lo;0;L;;;;;N;;;;;
+18887;TANGUT COMPONENT-136;Lo;0;L;;;;;N;;;;;
+18888;TANGUT COMPONENT-137;Lo;0;L;;;;;N;;;;;
+18889;TANGUT COMPONENT-138;Lo;0;L;;;;;N;;;;;
+1888A;TANGUT COMPONENT-139;Lo;0;L;;;;;N;;;;;
+1888B;TANGUT COMPONENT-140;Lo;0;L;;;;;N;;;;;
+1888C;TANGUT COMPONENT-141;Lo;0;L;;;;;N;;;;;
+1888D;TANGUT COMPONENT-142;Lo;0;L;;;;;N;;;;;
+1888E;TANGUT COMPONENT-143;Lo;0;L;;;;;N;;;;;
+1888F;TANGUT COMPONENT-144;Lo;0;L;;;;;N;;;;;
+18890;TANGUT COMPONENT-145;Lo;0;L;;;;;N;;;;;
+18891;TANGUT COMPONENT-146;Lo;0;L;;;;;N;;;;;
+18892;TANGUT COMPONENT-147;Lo;0;L;;;;;N;;;;;
+18893;TANGUT COMPONENT-148;Lo;0;L;;;;;N;;;;;
+18894;TANGUT COMPONENT-149;Lo;0;L;;;;;N;;;;;
+18895;TANGUT COMPONENT-150;Lo;0;L;;;;;N;;;;;
+18896;TANGUT COMPONENT-151;Lo;0;L;;;;;N;;;;;
+18897;TANGUT COMPONENT-152;Lo;0;L;;;;;N;;;;;
+18898;TANGUT COMPONENT-153;Lo;0;L;;;;;N;;;;;
+18899;TANGUT COMPONENT-154;Lo;0;L;;;;;N;;;;;
+1889A;TANGUT COMPONENT-155;Lo;0;L;;;;;N;;;;;
+1889B;TANGUT COMPONENT-156;Lo;0;L;;;;;N;;;;;
+1889C;TANGUT COMPONENT-157;Lo;0;L;;;;;N;;;;;
+1889D;TANGUT COMPONENT-158;Lo;0;L;;;;;N;;;;;
+1889E;TANGUT COMPONENT-159;Lo;0;L;;;;;N;;;;;
+1889F;TANGUT COMPONENT-160;Lo;0;L;;;;;N;;;;;
+188A0;TANGUT COMPONENT-161;Lo;0;L;;;;;N;;;;;
+188A1;TANGUT COMPONENT-162;Lo;0;L;;;;;N;;;;;
+188A2;TANGUT COMPONENT-163;Lo;0;L;;;;;N;;;;;
+188A3;TANGUT COMPONENT-164;Lo;0;L;;;;;N;;;;;
+188A4;TANGUT COMPONENT-165;Lo;0;L;;;;;N;;;;;
+188A5;TANGUT COMPONENT-166;Lo;0;L;;;;;N;;;;;
+188A6;TANGUT COMPONENT-167;Lo;0;L;;;;;N;;;;;
+188A7;TANGUT COMPONENT-168;Lo;0;L;;;;;N;;;;;
+188A8;TANGUT COMPONENT-169;Lo;0;L;;;;;N;;;;;
+188A9;TANGUT COMPONENT-170;Lo;0;L;;;;;N;;;;;
+188AA;TANGUT COMPONENT-171;Lo;0;L;;;;;N;;;;;
+188AB;TANGUT COMPONENT-172;Lo;0;L;;;;;N;;;;;
+188AC;TANGUT COMPONENT-173;Lo;0;L;;;;;N;;;;;
+188AD;TANGUT COMPONENT-174;Lo;0;L;;;;;N;;;;;
+188AE;TANGUT COMPONENT-175;Lo;0;L;;;;;N;;;;;
+188AF;TANGUT COMPONENT-176;Lo;0;L;;;;;N;;;;;
+188B0;TANGUT COMPONENT-177;Lo;0;L;;;;;N;;;;;
+188B1;TANGUT COMPONENT-178;Lo;0;L;;;;;N;;;;;
+188B2;TANGUT COMPONENT-179;Lo;0;L;;;;;N;;;;;
+188B3;TANGUT COMPONENT-180;Lo;0;L;;;;;N;;;;;
+188B4;TANGUT COMPONENT-181;Lo;0;L;;;;;N;;;;;
+188B5;TANGUT COMPONENT-182;Lo;0;L;;;;;N;;;;;
+188B6;TANGUT COMPONENT-183;Lo;0;L;;;;;N;;;;;
+188B7;TANGUT COMPONENT-184;Lo;0;L;;;;;N;;;;;
+188B8;TANGUT COMPONENT-185;Lo;0;L;;;;;N;;;;;
+188B9;TANGUT COMPONENT-186;Lo;0;L;;;;;N;;;;;
+188BA;TANGUT COMPONENT-187;Lo;0;L;;;;;N;;;;;
+188BB;TANGUT COMPONENT-188;Lo;0;L;;;;;N;;;;;
+188BC;TANGUT COMPONENT-189;Lo;0;L;;;;;N;;;;;
+188BD;TANGUT COMPONENT-190;Lo;0;L;;;;;N;;;;;
+188BE;TANGUT COMPONENT-191;Lo;0;L;;;;;N;;;;;
+188BF;TANGUT COMPONENT-192;Lo;0;L;;;;;N;;;;;
+188C0;TANGUT COMPONENT-193;Lo;0;L;;;;;N;;;;;
+188C1;TANGUT COMPONENT-194;Lo;0;L;;;;;N;;;;;
+188C2;TANGUT COMPONENT-195;Lo;0;L;;;;;N;;;;;
+188C3;TANGUT COMPONENT-196;Lo;0;L;;;;;N;;;;;
+188C4;TANGUT COMPONENT-197;Lo;0;L;;;;;N;;;;;
+188C5;TANGUT COMPONENT-198;Lo;0;L;;;;;N;;;;;
+188C6;TANGUT COMPONENT-199;Lo;0;L;;;;;N;;;;;
+188C7;TANGUT COMPONENT-200;Lo;0;L;;;;;N;;;;;
+188C8;TANGUT COMPONENT-201;Lo;0;L;;;;;N;;;;;
+188C9;TANGUT COMPONENT-202;Lo;0;L;;;;;N;;;;;
+188CA;TANGUT COMPONENT-203;Lo;0;L;;;;;N;;;;;
+188CB;TANGUT COMPONENT-204;Lo;0;L;;;;;N;;;;;
+188CC;TANGUT COMPONENT-205;Lo;0;L;;;;;N;;;;;
+188CD;TANGUT COMPONENT-206;Lo;0;L;;;;;N;;;;;
+188CE;TANGUT COMPONENT-207;Lo;0;L;;;;;N;;;;;
+188CF;TANGUT COMPONENT-208;Lo;0;L;;;;;N;;;;;
+188D0;TANGUT COMPONENT-209;Lo;0;L;;;;;N;;;;;
+188D1;TANGUT COMPONENT-210;Lo;0;L;;;;;N;;;;;
+188D2;TANGUT COMPONENT-211;Lo;0;L;;;;;N;;;;;
+188D3;TANGUT COMPONENT-212;Lo;0;L;;;;;N;;;;;
+188D4;TANGUT COMPONENT-213;Lo;0;L;;;;;N;;;;;
+188D5;TANGUT COMPONENT-214;Lo;0;L;;;;;N;;;;;
+188D6;TANGUT COMPONENT-215;Lo;0;L;;;;;N;;;;;
+188D7;TANGUT COMPONENT-216;Lo;0;L;;;;;N;;;;;
+188D8;TANGUT COMPONENT-217;Lo;0;L;;;;;N;;;;;
+188D9;TANGUT COMPONENT-218;Lo;0;L;;;;;N;;;;;
+188DA;TANGUT COMPONENT-219;Lo;0;L;;;;;N;;;;;
+188DB;TANGUT COMPONENT-220;Lo;0;L;;;;;N;;;;;
+188DC;TANGUT COMPONENT-221;Lo;0;L;;;;;N;;;;;
+188DD;TANGUT COMPONENT-222;Lo;0;L;;;;;N;;;;;
+188DE;TANGUT COMPONENT-223;Lo;0;L;;;;;N;;;;;
+188DF;TANGUT COMPONENT-224;Lo;0;L;;;;;N;;;;;
+188E0;TANGUT COMPONENT-225;Lo;0;L;;;;;N;;;;;
+188E1;TANGUT COMPONENT-226;Lo;0;L;;;;;N;;;;;
+188E2;TANGUT COMPONENT-227;Lo;0;L;;;;;N;;;;;
+188E3;TANGUT COMPONENT-228;Lo;0;L;;;;;N;;;;;
+188E4;TANGUT COMPONENT-229;Lo;0;L;;;;;N;;;;;
+188E5;TANGUT COMPONENT-230;Lo;0;L;;;;;N;;;;;
+188E6;TANGUT COMPONENT-231;Lo;0;L;;;;;N;;;;;
+188E7;TANGUT COMPONENT-232;Lo;0;L;;;;;N;;;;;
+188E8;TANGUT COMPONENT-233;Lo;0;L;;;;;N;;;;;
+188E9;TANGUT COMPONENT-234;Lo;0;L;;;;;N;;;;;
+188EA;TANGUT COMPONENT-235;Lo;0;L;;;;;N;;;;;
+188EB;TANGUT COMPONENT-236;Lo;0;L;;;;;N;;;;;
+188EC;TANGUT COMPONENT-237;Lo;0;L;;;;;N;;;;;
+188ED;TANGUT COMPONENT-238;Lo;0;L;;;;;N;;;;;
+188EE;TANGUT COMPONENT-239;Lo;0;L;;;;;N;;;;;
+188EF;TANGUT COMPONENT-240;Lo;0;L;;;;;N;;;;;
+188F0;TANGUT COMPONENT-241;Lo;0;L;;;;;N;;;;;
+188F1;TANGUT COMPONENT-242;Lo;0;L;;;;;N;;;;;
+188F2;TANGUT COMPONENT-243;Lo;0;L;;;;;N;;;;;
+188F3;TANGUT COMPONENT-244;Lo;0;L;;;;;N;;;;;
+188F4;TANGUT COMPONENT-245;Lo;0;L;;;;;N;;;;;
+188F5;TANGUT COMPONENT-246;Lo;0;L;;;;;N;;;;;
+188F6;TANGUT COMPONENT-247;Lo;0;L;;;;;N;;;;;
+188F7;TANGUT COMPONENT-248;Lo;0;L;;;;;N;;;;;
+188F8;TANGUT COMPONENT-249;Lo;0;L;;;;;N;;;;;
+188F9;TANGUT COMPONENT-250;Lo;0;L;;;;;N;;;;;
+188FA;TANGUT COMPONENT-251;Lo;0;L;;;;;N;;;;;
+188FB;TANGUT COMPONENT-252;Lo;0;L;;;;;N;;;;;
+188FC;TANGUT COMPONENT-253;Lo;0;L;;;;;N;;;;;
+188FD;TANGUT COMPONENT-254;Lo;0;L;;;;;N;;;;;
+188FE;TANGUT COMPONENT-255;Lo;0;L;;;;;N;;;;;
+188FF;TANGUT COMPONENT-256;Lo;0;L;;;;;N;;;;;
+18900;TANGUT COMPONENT-257;Lo;0;L;;;;;N;;;;;
+18901;TANGUT COMPONENT-258;Lo;0;L;;;;;N;;;;;
+18902;TANGUT COMPONENT-259;Lo;0;L;;;;;N;;;;;
+18903;TANGUT COMPONENT-260;Lo;0;L;;;;;N;;;;;
+18904;TANGUT COMPONENT-261;Lo;0;L;;;;;N;;;;;
+18905;TANGUT COMPONENT-262;Lo;0;L;;;;;N;;;;;
+18906;TANGUT COMPONENT-263;Lo;0;L;;;;;N;;;;;
+18907;TANGUT COMPONENT-264;Lo;0;L;;;;;N;;;;;
+18908;TANGUT COMPONENT-265;Lo;0;L;;;;;N;;;;;
+18909;TANGUT COMPONENT-266;Lo;0;L;;;;;N;;;;;
+1890A;TANGUT COMPONENT-267;Lo;0;L;;;;;N;;;;;
+1890B;TANGUT COMPONENT-268;Lo;0;L;;;;;N;;;;;
+1890C;TANGUT COMPONENT-269;Lo;0;L;;;;;N;;;;;
+1890D;TANGUT COMPONENT-270;Lo;0;L;;;;;N;;;;;
+1890E;TANGUT COMPONENT-271;Lo;0;L;;;;;N;;;;;
+1890F;TANGUT COMPONENT-272;Lo;0;L;;;;;N;;;;;
+18910;TANGUT COMPONENT-273;Lo;0;L;;;;;N;;;;;
+18911;TANGUT COMPONENT-274;Lo;0;L;;;;;N;;;;;
+18912;TANGUT COMPONENT-275;Lo;0;L;;;;;N;;;;;
+18913;TANGUT COMPONENT-276;Lo;0;L;;;;;N;;;;;
+18914;TANGUT COMPONENT-277;Lo;0;L;;;;;N;;;;;
+18915;TANGUT COMPONENT-278;Lo;0;L;;;;;N;;;;;
+18916;TANGUT COMPONENT-279;Lo;0;L;;;;;N;;;;;
+18917;TANGUT COMPONENT-280;Lo;0;L;;;;;N;;;;;
+18918;TANGUT COMPONENT-281;Lo;0;L;;;;;N;;;;;
+18919;TANGUT COMPONENT-282;Lo;0;L;;;;;N;;;;;
+1891A;TANGUT COMPONENT-283;Lo;0;L;;;;;N;;;;;
+1891B;TANGUT COMPONENT-284;Lo;0;L;;;;;N;;;;;
+1891C;TANGUT COMPONENT-285;Lo;0;L;;;;;N;;;;;
+1891D;TANGUT COMPONENT-286;Lo;0;L;;;;;N;;;;;
+1891E;TANGUT COMPONENT-287;Lo;0;L;;;;;N;;;;;
+1891F;TANGUT COMPONENT-288;Lo;0;L;;;;;N;;;;;
+18920;TANGUT COMPONENT-289;Lo;0;L;;;;;N;;;;;
+18921;TANGUT COMPONENT-290;Lo;0;L;;;;;N;;;;;
+18922;TANGUT COMPONENT-291;Lo;0;L;;;;;N;;;;;
+18923;TANGUT COMPONENT-292;Lo;0;L;;;;;N;;;;;
+18924;TANGUT COMPONENT-293;Lo;0;L;;;;;N;;;;;
+18925;TANGUT COMPONENT-294;Lo;0;L;;;;;N;;;;;
+18926;TANGUT COMPONENT-295;Lo;0;L;;;;;N;;;;;
+18927;TANGUT COMPONENT-296;Lo;0;L;;;;;N;;;;;
+18928;TANGUT COMPONENT-297;Lo;0;L;;;;;N;;;;;
+18929;TANGUT COMPONENT-298;Lo;0;L;;;;;N;;;;;
+1892A;TANGUT COMPONENT-299;Lo;0;L;;;;;N;;;;;
+1892B;TANGUT COMPONENT-300;Lo;0;L;;;;;N;;;;;
+1892C;TANGUT COMPONENT-301;Lo;0;L;;;;;N;;;;;
+1892D;TANGUT COMPONENT-302;Lo;0;L;;;;;N;;;;;
+1892E;TANGUT COMPONENT-303;Lo;0;L;;;;;N;;;;;
+1892F;TANGUT COMPONENT-304;Lo;0;L;;;;;N;;;;;
+18930;TANGUT COMPONENT-305;Lo;0;L;;;;;N;;;;;
+18931;TANGUT COMPONENT-306;Lo;0;L;;;;;N;;;;;
+18932;TANGUT COMPONENT-307;Lo;0;L;;;;;N;;;;;
+18933;TANGUT COMPONENT-308;Lo;0;L;;;;;N;;;;;
+18934;TANGUT COMPONENT-309;Lo;0;L;;;;;N;;;;;
+18935;TANGUT COMPONENT-310;Lo;0;L;;;;;N;;;;;
+18936;TANGUT COMPONENT-311;Lo;0;L;;;;;N;;;;;
+18937;TANGUT COMPONENT-312;Lo;0;L;;;;;N;;;;;
+18938;TANGUT COMPONENT-313;Lo;0;L;;;;;N;;;;;
+18939;TANGUT COMPONENT-314;Lo;0;L;;;;;N;;;;;
+1893A;TANGUT COMPONENT-315;Lo;0;L;;;;;N;;;;;
+1893B;TANGUT COMPONENT-316;Lo;0;L;;;;;N;;;;;
+1893C;TANGUT COMPONENT-317;Lo;0;L;;;;;N;;;;;
+1893D;TANGUT COMPONENT-318;Lo;0;L;;;;;N;;;;;
+1893E;TANGUT COMPONENT-319;Lo;0;L;;;;;N;;;;;
+1893F;TANGUT COMPONENT-320;Lo;0;L;;;;;N;;;;;
+18940;TANGUT COMPONENT-321;Lo;0;L;;;;;N;;;;;
+18941;TANGUT COMPONENT-322;Lo;0;L;;;;;N;;;;;
+18942;TANGUT COMPONENT-323;Lo;0;L;;;;;N;;;;;
+18943;TANGUT COMPONENT-324;Lo;0;L;;;;;N;;;;;
+18944;TANGUT COMPONENT-325;Lo;0;L;;;;;N;;;;;
+18945;TANGUT COMPONENT-326;Lo;0;L;;;;;N;;;;;
+18946;TANGUT COMPONENT-327;Lo;0;L;;;;;N;;;;;
+18947;TANGUT COMPONENT-328;Lo;0;L;;;;;N;;;;;
+18948;TANGUT COMPONENT-329;Lo;0;L;;;;;N;;;;;
+18949;TANGUT COMPONENT-330;Lo;0;L;;;;;N;;;;;
+1894A;TANGUT COMPONENT-331;Lo;0;L;;;;;N;;;;;
+1894B;TANGUT COMPONENT-332;Lo;0;L;;;;;N;;;;;
+1894C;TANGUT COMPONENT-333;Lo;0;L;;;;;N;;;;;
+1894D;TANGUT COMPONENT-334;Lo;0;L;;;;;N;;;;;
+1894E;TANGUT COMPONENT-335;Lo;0;L;;;;;N;;;;;
+1894F;TANGUT COMPONENT-336;Lo;0;L;;;;;N;;;;;
+18950;TANGUT COMPONENT-337;Lo;0;L;;;;;N;;;;;
+18951;TANGUT COMPONENT-338;Lo;0;L;;;;;N;;;;;
+18952;TANGUT COMPONENT-339;Lo;0;L;;;;;N;;;;;
+18953;TANGUT COMPONENT-340;Lo;0;L;;;;;N;;;;;
+18954;TANGUT COMPONENT-341;Lo;0;L;;;;;N;;;;;
+18955;TANGUT COMPONENT-342;Lo;0;L;;;;;N;;;;;
+18956;TANGUT COMPONENT-343;Lo;0;L;;;;;N;;;;;
+18957;TANGUT COMPONENT-344;Lo;0;L;;;;;N;;;;;
+18958;TANGUT COMPONENT-345;Lo;0;L;;;;;N;;;;;
+18959;TANGUT COMPONENT-346;Lo;0;L;;;;;N;;;;;
+1895A;TANGUT COMPONENT-347;Lo;0;L;;;;;N;;;;;
+1895B;TANGUT COMPONENT-348;Lo;0;L;;;;;N;;;;;
+1895C;TANGUT COMPONENT-349;Lo;0;L;;;;;N;;;;;
+1895D;TANGUT COMPONENT-350;Lo;0;L;;;;;N;;;;;
+1895E;TANGUT COMPONENT-351;Lo;0;L;;;;;N;;;;;
+1895F;TANGUT COMPONENT-352;Lo;0;L;;;;;N;;;;;
+18960;TANGUT COMPONENT-353;Lo;0;L;;;;;N;;;;;
+18961;TANGUT COMPONENT-354;Lo;0;L;;;;;N;;;;;
+18962;TANGUT COMPONENT-355;Lo;0;L;;;;;N;;;;;
+18963;TANGUT COMPONENT-356;Lo;0;L;;;;;N;;;;;
+18964;TANGUT COMPONENT-357;Lo;0;L;;;;;N;;;;;
+18965;TANGUT COMPONENT-358;Lo;0;L;;;;;N;;;;;
+18966;TANGUT COMPONENT-359;Lo;0;L;;;;;N;;;;;
+18967;TANGUT COMPONENT-360;Lo;0;L;;;;;N;;;;;
+18968;TANGUT COMPONENT-361;Lo;0;L;;;;;N;;;;;
+18969;TANGUT COMPONENT-362;Lo;0;L;;;;;N;;;;;
+1896A;TANGUT COMPONENT-363;Lo;0;L;;;;;N;;;;;
+1896B;TANGUT COMPONENT-364;Lo;0;L;;;;;N;;;;;
+1896C;TANGUT COMPONENT-365;Lo;0;L;;;;;N;;;;;
+1896D;TANGUT COMPONENT-366;Lo;0;L;;;;;N;;;;;
+1896E;TANGUT COMPONENT-367;Lo;0;L;;;;;N;;;;;
+1896F;TANGUT COMPONENT-368;Lo;0;L;;;;;N;;;;;
+18970;TANGUT COMPONENT-369;Lo;0;L;;;;;N;;;;;
+18971;TANGUT COMPONENT-370;Lo;0;L;;;;;N;;;;;
+18972;TANGUT COMPONENT-371;Lo;0;L;;;;;N;;;;;
+18973;TANGUT COMPONENT-372;Lo;0;L;;;;;N;;;;;
+18974;TANGUT COMPONENT-373;Lo;0;L;;;;;N;;;;;
+18975;TANGUT COMPONENT-374;Lo;0;L;;;;;N;;;;;
+18976;TANGUT COMPONENT-375;Lo;0;L;;;;;N;;;;;
+18977;TANGUT COMPONENT-376;Lo;0;L;;;;;N;;;;;
+18978;TANGUT COMPONENT-377;Lo;0;L;;;;;N;;;;;
+18979;TANGUT COMPONENT-378;Lo;0;L;;;;;N;;;;;
+1897A;TANGUT COMPONENT-379;Lo;0;L;;;;;N;;;;;
+1897B;TANGUT COMPONENT-380;Lo;0;L;;;;;N;;;;;
+1897C;TANGUT COMPONENT-381;Lo;0;L;;;;;N;;;;;
+1897D;TANGUT COMPONENT-382;Lo;0;L;;;;;N;;;;;
+1897E;TANGUT COMPONENT-383;Lo;0;L;;;;;N;;;;;
+1897F;TANGUT COMPONENT-384;Lo;0;L;;;;;N;;;;;
+18980;TANGUT COMPONENT-385;Lo;0;L;;;;;N;;;;;
+18981;TANGUT COMPONENT-386;Lo;0;L;;;;;N;;;;;
+18982;TANGUT COMPONENT-387;Lo;0;L;;;;;N;;;;;
+18983;TANGUT COMPONENT-388;Lo;0;L;;;;;N;;;;;
+18984;TANGUT COMPONENT-389;Lo;0;L;;;;;N;;;;;
+18985;TANGUT COMPONENT-390;Lo;0;L;;;;;N;;;;;
+18986;TANGUT COMPONENT-391;Lo;0;L;;;;;N;;;;;
+18987;TANGUT COMPONENT-392;Lo;0;L;;;;;N;;;;;
+18988;TANGUT COMPONENT-393;Lo;0;L;;;;;N;;;;;
+18989;TANGUT COMPONENT-394;Lo;0;L;;;;;N;;;;;
+1898A;TANGUT COMPONENT-395;Lo;0;L;;;;;N;;;;;
+1898B;TANGUT COMPONENT-396;Lo;0;L;;;;;N;;;;;
+1898C;TANGUT COMPONENT-397;Lo;0;L;;;;;N;;;;;
+1898D;TANGUT COMPONENT-398;Lo;0;L;;;;;N;;;;;
+1898E;TANGUT COMPONENT-399;Lo;0;L;;;;;N;;;;;
+1898F;TANGUT COMPONENT-400;Lo;0;L;;;;;N;;;;;
+18990;TANGUT COMPONENT-401;Lo;0;L;;;;;N;;;;;
+18991;TANGUT COMPONENT-402;Lo;0;L;;;;;N;;;;;
+18992;TANGUT COMPONENT-403;Lo;0;L;;;;;N;;;;;
+18993;TANGUT COMPONENT-404;Lo;0;L;;;;;N;;;;;
+18994;TANGUT COMPONENT-405;Lo;0;L;;;;;N;;;;;
+18995;TANGUT COMPONENT-406;Lo;0;L;;;;;N;;;;;
+18996;TANGUT COMPONENT-407;Lo;0;L;;;;;N;;;;;
+18997;TANGUT COMPONENT-408;Lo;0;L;;;;;N;;;;;
+18998;TANGUT COMPONENT-409;Lo;0;L;;;;;N;;;;;
+18999;TANGUT COMPONENT-410;Lo;0;L;;;;;N;;;;;
+1899A;TANGUT COMPONENT-411;Lo;0;L;;;;;N;;;;;
+1899B;TANGUT COMPONENT-412;Lo;0;L;;;;;N;;;;;
+1899C;TANGUT COMPONENT-413;Lo;0;L;;;;;N;;;;;
+1899D;TANGUT COMPONENT-414;Lo;0;L;;;;;N;;;;;
+1899E;TANGUT COMPONENT-415;Lo;0;L;;;;;N;;;;;
+1899F;TANGUT COMPONENT-416;Lo;0;L;;;;;N;;;;;
+189A0;TANGUT COMPONENT-417;Lo;0;L;;;;;N;;;;;
+189A1;TANGUT COMPONENT-418;Lo;0;L;;;;;N;;;;;
+189A2;TANGUT COMPONENT-419;Lo;0;L;;;;;N;;;;;
+189A3;TANGUT COMPONENT-420;Lo;0;L;;;;;N;;;;;
+189A4;TANGUT COMPONENT-421;Lo;0;L;;;;;N;;;;;
+189A5;TANGUT COMPONENT-422;Lo;0;L;;;;;N;;;;;
+189A6;TANGUT COMPONENT-423;Lo;0;L;;;;;N;;;;;
+189A7;TANGUT COMPONENT-424;Lo;0;L;;;;;N;;;;;
+189A8;TANGUT COMPONENT-425;Lo;0;L;;;;;N;;;;;
+189A9;TANGUT COMPONENT-426;Lo;0;L;;;;;N;;;;;
+189AA;TANGUT COMPONENT-427;Lo;0;L;;;;;N;;;;;
+189AB;TANGUT COMPONENT-428;Lo;0;L;;;;;N;;;;;
+189AC;TANGUT COMPONENT-429;Lo;0;L;;;;;N;;;;;
+189AD;TANGUT COMPONENT-430;Lo;0;L;;;;;N;;;;;
+189AE;TANGUT COMPONENT-431;Lo;0;L;;;;;N;;;;;
+189AF;TANGUT COMPONENT-432;Lo;0;L;;;;;N;;;;;
+189B0;TANGUT COMPONENT-433;Lo;0;L;;;;;N;;;;;
+189B1;TANGUT COMPONENT-434;Lo;0;L;;;;;N;;;;;
+189B2;TANGUT COMPONENT-435;Lo;0;L;;;;;N;;;;;
+189B3;TANGUT COMPONENT-436;Lo;0;L;;;;;N;;;;;
+189B4;TANGUT COMPONENT-437;Lo;0;L;;;;;N;;;;;
+189B5;TANGUT COMPONENT-438;Lo;0;L;;;;;N;;;;;
+189B6;TANGUT COMPONENT-439;Lo;0;L;;;;;N;;;;;
+189B7;TANGUT COMPONENT-440;Lo;0;L;;;;;N;;;;;
+189B8;TANGUT COMPONENT-441;Lo;0;L;;;;;N;;;;;
+189B9;TANGUT COMPONENT-442;Lo;0;L;;;;;N;;;;;
+189BA;TANGUT COMPONENT-443;Lo;0;L;;;;;N;;;;;
+189BB;TANGUT COMPONENT-444;Lo;0;L;;;;;N;;;;;
+189BC;TANGUT COMPONENT-445;Lo;0;L;;;;;N;;;;;
+189BD;TANGUT COMPONENT-446;Lo;0;L;;;;;N;;;;;
+189BE;TANGUT COMPONENT-447;Lo;0;L;;;;;N;;;;;
+189BF;TANGUT COMPONENT-448;Lo;0;L;;;;;N;;;;;
+189C0;TANGUT COMPONENT-449;Lo;0;L;;;;;N;;;;;
+189C1;TANGUT COMPONENT-450;Lo;0;L;;;;;N;;;;;
+189C2;TANGUT COMPONENT-451;Lo;0;L;;;;;N;;;;;
+189C3;TANGUT COMPONENT-452;Lo;0;L;;;;;N;;;;;
+189C4;TANGUT COMPONENT-453;Lo;0;L;;;;;N;;;;;
+189C5;TANGUT COMPONENT-454;Lo;0;L;;;;;N;;;;;
+189C6;TANGUT COMPONENT-455;Lo;0;L;;;;;N;;;;;
+189C7;TANGUT COMPONENT-456;Lo;0;L;;;;;N;;;;;
+189C8;TANGUT COMPONENT-457;Lo;0;L;;;;;N;;;;;
+189C9;TANGUT COMPONENT-458;Lo;0;L;;;;;N;;;;;
+189CA;TANGUT COMPONENT-459;Lo;0;L;;;;;N;;;;;
+189CB;TANGUT COMPONENT-460;Lo;0;L;;;;;N;;;;;
+189CC;TANGUT COMPONENT-461;Lo;0;L;;;;;N;;;;;
+189CD;TANGUT COMPONENT-462;Lo;0;L;;;;;N;;;;;
+189CE;TANGUT COMPONENT-463;Lo;0;L;;;;;N;;;;;
+189CF;TANGUT COMPONENT-464;Lo;0;L;;;;;N;;;;;
+189D0;TANGUT COMPONENT-465;Lo;0;L;;;;;N;;;;;
+189D1;TANGUT COMPONENT-466;Lo;0;L;;;;;N;;;;;
+189D2;TANGUT COMPONENT-467;Lo;0;L;;;;;N;;;;;
+189D3;TANGUT COMPONENT-468;Lo;0;L;;;;;N;;;;;
+189D4;TANGUT COMPONENT-469;Lo;0;L;;;;;N;;;;;
+189D5;TANGUT COMPONENT-470;Lo;0;L;;;;;N;;;;;
+189D6;TANGUT COMPONENT-471;Lo;0;L;;;;;N;;;;;
+189D7;TANGUT COMPONENT-472;Lo;0;L;;;;;N;;;;;
+189D8;TANGUT COMPONENT-473;Lo;0;L;;;;;N;;;;;
+189D9;TANGUT COMPONENT-474;Lo;0;L;;;;;N;;;;;
+189DA;TANGUT COMPONENT-475;Lo;0;L;;;;;N;;;;;
+189DB;TANGUT COMPONENT-476;Lo;0;L;;;;;N;;;;;
+189DC;TANGUT COMPONENT-477;Lo;0;L;;;;;N;;;;;
+189DD;TANGUT COMPONENT-478;Lo;0;L;;;;;N;;;;;
+189DE;TANGUT COMPONENT-479;Lo;0;L;;;;;N;;;;;
+189DF;TANGUT COMPONENT-480;Lo;0;L;;;;;N;;;;;
+189E0;TANGUT COMPONENT-481;Lo;0;L;;;;;N;;;;;
+189E1;TANGUT COMPONENT-482;Lo;0;L;;;;;N;;;;;
+189E2;TANGUT COMPONENT-483;Lo;0;L;;;;;N;;;;;
+189E3;TANGUT COMPONENT-484;Lo;0;L;;;;;N;;;;;
+189E4;TANGUT COMPONENT-485;Lo;0;L;;;;;N;;;;;
+189E5;TANGUT COMPONENT-486;Lo;0;L;;;;;N;;;;;
+189E6;TANGUT COMPONENT-487;Lo;0;L;;;;;N;;;;;
+189E7;TANGUT COMPONENT-488;Lo;0;L;;;;;N;;;;;
+189E8;TANGUT COMPONENT-489;Lo;0;L;;;;;N;;;;;
+189E9;TANGUT COMPONENT-490;Lo;0;L;;;;;N;;;;;
+189EA;TANGUT COMPONENT-491;Lo;0;L;;;;;N;;;;;
+189EB;TANGUT COMPONENT-492;Lo;0;L;;;;;N;;;;;
+189EC;TANGUT COMPONENT-493;Lo;0;L;;;;;N;;;;;
+189ED;TANGUT COMPONENT-494;Lo;0;L;;;;;N;;;;;
+189EE;TANGUT COMPONENT-495;Lo;0;L;;;;;N;;;;;
+189EF;TANGUT COMPONENT-496;Lo;0;L;;;;;N;;;;;
+189F0;TANGUT COMPONENT-497;Lo;0;L;;;;;N;;;;;
+189F1;TANGUT COMPONENT-498;Lo;0;L;;;;;N;;;;;
+189F2;TANGUT COMPONENT-499;Lo;0;L;;;;;N;;;;;
+189F3;TANGUT COMPONENT-500;Lo;0;L;;;;;N;;;;;
+189F4;TANGUT COMPONENT-501;Lo;0;L;;;;;N;;;;;
+189F5;TANGUT COMPONENT-502;Lo;0;L;;;;;N;;;;;
+189F6;TANGUT COMPONENT-503;Lo;0;L;;;;;N;;;;;
+189F7;TANGUT COMPONENT-504;Lo;0;L;;;;;N;;;;;
+189F8;TANGUT COMPONENT-505;Lo;0;L;;;;;N;;;;;
+189F9;TANGUT COMPONENT-506;Lo;0;L;;;;;N;;;;;
+189FA;TANGUT COMPONENT-507;Lo;0;L;;;;;N;;;;;
+189FB;TANGUT COMPONENT-508;Lo;0;L;;;;;N;;;;;
+189FC;TANGUT COMPONENT-509;Lo;0;L;;;;;N;;;;;
+189FD;TANGUT COMPONENT-510;Lo;0;L;;;;;N;;;;;
+189FE;TANGUT COMPONENT-511;Lo;0;L;;;;;N;;;;;
+189FF;TANGUT COMPONENT-512;Lo;0;L;;;;;N;;;;;
+18A00;TANGUT COMPONENT-513;Lo;0;L;;;;;N;;;;;
+18A01;TANGUT COMPONENT-514;Lo;0;L;;;;;N;;;;;
+18A02;TANGUT COMPONENT-515;Lo;0;L;;;;;N;;;;;
+18A03;TANGUT COMPONENT-516;Lo;0;L;;;;;N;;;;;
+18A04;TANGUT COMPONENT-517;Lo;0;L;;;;;N;;;;;
+18A05;TANGUT COMPONENT-518;Lo;0;L;;;;;N;;;;;
+18A06;TANGUT COMPONENT-519;Lo;0;L;;;;;N;;;;;
+18A07;TANGUT COMPONENT-520;Lo;0;L;;;;;N;;;;;
+18A08;TANGUT COMPONENT-521;Lo;0;L;;;;;N;;;;;
+18A09;TANGUT COMPONENT-522;Lo;0;L;;;;;N;;;;;
+18A0A;TANGUT COMPONENT-523;Lo;0;L;;;;;N;;;;;
+18A0B;TANGUT COMPONENT-524;Lo;0;L;;;;;N;;;;;
+18A0C;TANGUT COMPONENT-525;Lo;0;L;;;;;N;;;;;
+18A0D;TANGUT COMPONENT-526;Lo;0;L;;;;;N;;;;;
+18A0E;TANGUT COMPONENT-527;Lo;0;L;;;;;N;;;;;
+18A0F;TANGUT COMPONENT-528;Lo;0;L;;;;;N;;;;;
+18A10;TANGUT COMPONENT-529;Lo;0;L;;;;;N;;;;;
+18A11;TANGUT COMPONENT-530;Lo;0;L;;;;;N;;;;;
+18A12;TANGUT COMPONENT-531;Lo;0;L;;;;;N;;;;;
+18A13;TANGUT COMPONENT-532;Lo;0;L;;;;;N;;;;;
+18A14;TANGUT COMPONENT-533;Lo;0;L;;;;;N;;;;;
+18A15;TANGUT COMPONENT-534;Lo;0;L;;;;;N;;;;;
+18A16;TANGUT COMPONENT-535;Lo;0;L;;;;;N;;;;;
+18A17;TANGUT COMPONENT-536;Lo;0;L;;;;;N;;;;;
+18A18;TANGUT COMPONENT-537;Lo;0;L;;;;;N;;;;;
+18A19;TANGUT COMPONENT-538;Lo;0;L;;;;;N;;;;;
+18A1A;TANGUT COMPONENT-539;Lo;0;L;;;;;N;;;;;
+18A1B;TANGUT COMPONENT-540;Lo;0;L;;;;;N;;;;;
+18A1C;TANGUT COMPONENT-541;Lo;0;L;;;;;N;;;;;
+18A1D;TANGUT COMPONENT-542;Lo;0;L;;;;;N;;;;;
+18A1E;TANGUT COMPONENT-543;Lo;0;L;;;;;N;;;;;
+18A1F;TANGUT COMPONENT-544;Lo;0;L;;;;;N;;;;;
+18A20;TANGUT COMPONENT-545;Lo;0;L;;;;;N;;;;;
+18A21;TANGUT COMPONENT-546;Lo;0;L;;;;;N;;;;;
+18A22;TANGUT COMPONENT-547;Lo;0;L;;;;;N;;;;;
+18A23;TANGUT COMPONENT-548;Lo;0;L;;;;;N;;;;;
+18A24;TANGUT COMPONENT-549;Lo;0;L;;;;;N;;;;;
+18A25;TANGUT COMPONENT-550;Lo;0;L;;;;;N;;;;;
+18A26;TANGUT COMPONENT-551;Lo;0;L;;;;;N;;;;;
+18A27;TANGUT COMPONENT-552;Lo;0;L;;;;;N;;;;;
+18A28;TANGUT COMPONENT-553;Lo;0;L;;;;;N;;;;;
+18A29;TANGUT COMPONENT-554;Lo;0;L;;;;;N;;;;;
+18A2A;TANGUT COMPONENT-555;Lo;0;L;;;;;N;;;;;
+18A2B;TANGUT COMPONENT-556;Lo;0;L;;;;;N;;;;;
+18A2C;TANGUT COMPONENT-557;Lo;0;L;;;;;N;;;;;
+18A2D;TANGUT COMPONENT-558;Lo;0;L;;;;;N;;;;;
+18A2E;TANGUT COMPONENT-559;Lo;0;L;;;;;N;;;;;
+18A2F;TANGUT COMPONENT-560;Lo;0;L;;;;;N;;;;;
+18A30;TANGUT COMPONENT-561;Lo;0;L;;;;;N;;;;;
+18A31;TANGUT COMPONENT-562;Lo;0;L;;;;;N;;;;;
+18A32;TANGUT COMPONENT-563;Lo;0;L;;;;;N;;;;;
+18A33;TANGUT COMPONENT-564;Lo;0;L;;;;;N;;;;;
+18A34;TANGUT COMPONENT-565;Lo;0;L;;;;;N;;;;;
+18A35;TANGUT COMPONENT-566;Lo;0;L;;;;;N;;;;;
+18A36;TANGUT COMPONENT-567;Lo;0;L;;;;;N;;;;;
+18A37;TANGUT COMPONENT-568;Lo;0;L;;;;;N;;;;;
+18A38;TANGUT COMPONENT-569;Lo;0;L;;;;;N;;;;;
+18A39;TANGUT COMPONENT-570;Lo;0;L;;;;;N;;;;;
+18A3A;TANGUT COMPONENT-571;Lo;0;L;;;;;N;;;;;
+18A3B;TANGUT COMPONENT-572;Lo;0;L;;;;;N;;;;;
+18A3C;TANGUT COMPONENT-573;Lo;0;L;;;;;N;;;;;
+18A3D;TANGUT COMPONENT-574;Lo;0;L;;;;;N;;;;;
+18A3E;TANGUT COMPONENT-575;Lo;0;L;;;;;N;;;;;
+18A3F;TANGUT COMPONENT-576;Lo;0;L;;;;;N;;;;;
+18A40;TANGUT COMPONENT-577;Lo;0;L;;;;;N;;;;;
+18A41;TANGUT COMPONENT-578;Lo;0;L;;;;;N;;;;;
+18A42;TANGUT COMPONENT-579;Lo;0;L;;;;;N;;;;;
+18A43;TANGUT COMPONENT-580;Lo;0;L;;;;;N;;;;;
+18A44;TANGUT COMPONENT-581;Lo;0;L;;;;;N;;;;;
+18A45;TANGUT COMPONENT-582;Lo;0;L;;;;;N;;;;;
+18A46;TANGUT COMPONENT-583;Lo;0;L;;;;;N;;;;;
+18A47;TANGUT COMPONENT-584;Lo;0;L;;;;;N;;;;;
+18A48;TANGUT COMPONENT-585;Lo;0;L;;;;;N;;;;;
+18A49;TANGUT COMPONENT-586;Lo;0;L;;;;;N;;;;;
+18A4A;TANGUT COMPONENT-587;Lo;0;L;;;;;N;;;;;
+18A4B;TANGUT COMPONENT-588;Lo;0;L;;;;;N;;;;;
+18A4C;TANGUT COMPONENT-589;Lo;0;L;;;;;N;;;;;
+18A4D;TANGUT COMPONENT-590;Lo;0;L;;;;;N;;;;;
+18A4E;TANGUT COMPONENT-591;Lo;0;L;;;;;N;;;;;
+18A4F;TANGUT COMPONENT-592;Lo;0;L;;;;;N;;;;;
+18A50;TANGUT COMPONENT-593;Lo;0;L;;;;;N;;;;;
+18A51;TANGUT COMPONENT-594;Lo;0;L;;;;;N;;;;;
+18A52;TANGUT COMPONENT-595;Lo;0;L;;;;;N;;;;;
+18A53;TANGUT COMPONENT-596;Lo;0;L;;;;;N;;;;;
+18A54;TANGUT COMPONENT-597;Lo;0;L;;;;;N;;;;;
+18A55;TANGUT COMPONENT-598;Lo;0;L;;;;;N;;;;;
+18A56;TANGUT COMPONENT-599;Lo;0;L;;;;;N;;;;;
+18A57;TANGUT COMPONENT-600;Lo;0;L;;;;;N;;;;;
+18A58;TANGUT COMPONENT-601;Lo;0;L;;;;;N;;;;;
+18A59;TANGUT COMPONENT-602;Lo;0;L;;;;;N;;;;;
+18A5A;TANGUT COMPONENT-603;Lo;0;L;;;;;N;;;;;
+18A5B;TANGUT COMPONENT-604;Lo;0;L;;;;;N;;;;;
+18A5C;TANGUT COMPONENT-605;Lo;0;L;;;;;N;;;;;
+18A5D;TANGUT COMPONENT-606;Lo;0;L;;;;;N;;;;;
+18A5E;TANGUT COMPONENT-607;Lo;0;L;;;;;N;;;;;
+18A5F;TANGUT COMPONENT-608;Lo;0;L;;;;;N;;;;;
+18A60;TANGUT COMPONENT-609;Lo;0;L;;;;;N;;;;;
+18A61;TANGUT COMPONENT-610;Lo;0;L;;;;;N;;;;;
+18A62;TANGUT COMPONENT-611;Lo;0;L;;;;;N;;;;;
+18A63;TANGUT COMPONENT-612;Lo;0;L;;;;;N;;;;;
+18A64;TANGUT COMPONENT-613;Lo;0;L;;;;;N;;;;;
+18A65;TANGUT COMPONENT-614;Lo;0;L;;;;;N;;;;;
+18A66;TANGUT COMPONENT-615;Lo;0;L;;;;;N;;;;;
+18A67;TANGUT COMPONENT-616;Lo;0;L;;;;;N;;;;;
+18A68;TANGUT COMPONENT-617;Lo;0;L;;;;;N;;;;;
+18A69;TANGUT COMPONENT-618;Lo;0;L;;;;;N;;;;;
+18A6A;TANGUT COMPONENT-619;Lo;0;L;;;;;N;;;;;
+18A6B;TANGUT COMPONENT-620;Lo;0;L;;;;;N;;;;;
+18A6C;TANGUT COMPONENT-621;Lo;0;L;;;;;N;;;;;
+18A6D;TANGUT COMPONENT-622;Lo;0;L;;;;;N;;;;;
+18A6E;TANGUT COMPONENT-623;Lo;0;L;;;;;N;;;;;
+18A6F;TANGUT COMPONENT-624;Lo;0;L;;;;;N;;;;;
+18A70;TANGUT COMPONENT-625;Lo;0;L;;;;;N;;;;;
+18A71;TANGUT COMPONENT-626;Lo;0;L;;;;;N;;;;;
+18A72;TANGUT COMPONENT-627;Lo;0;L;;;;;N;;;;;
+18A73;TANGUT COMPONENT-628;Lo;0;L;;;;;N;;;;;
+18A74;TANGUT COMPONENT-629;Lo;0;L;;;;;N;;;;;
+18A75;TANGUT COMPONENT-630;Lo;0;L;;;;;N;;;;;
+18A76;TANGUT COMPONENT-631;Lo;0;L;;;;;N;;;;;
+18A77;TANGUT COMPONENT-632;Lo;0;L;;;;;N;;;;;
+18A78;TANGUT COMPONENT-633;Lo;0;L;;;;;N;;;;;
+18A79;TANGUT COMPONENT-634;Lo;0;L;;;;;N;;;;;
+18A7A;TANGUT COMPONENT-635;Lo;0;L;;;;;N;;;;;
+18A7B;TANGUT COMPONENT-636;Lo;0;L;;;;;N;;;;;
+18A7C;TANGUT COMPONENT-637;Lo;0;L;;;;;N;;;;;
+18A7D;TANGUT COMPONENT-638;Lo;0;L;;;;;N;;;;;
+18A7E;TANGUT COMPONENT-639;Lo;0;L;;;;;N;;;;;
+18A7F;TANGUT COMPONENT-640;Lo;0;L;;;;;N;;;;;
+18A80;TANGUT COMPONENT-641;Lo;0;L;;;;;N;;;;;
+18A81;TANGUT COMPONENT-642;Lo;0;L;;;;;N;;;;;
+18A82;TANGUT COMPONENT-643;Lo;0;L;;;;;N;;;;;
+18A83;TANGUT COMPONENT-644;Lo;0;L;;;;;N;;;;;
+18A84;TANGUT COMPONENT-645;Lo;0;L;;;;;N;;;;;
+18A85;TANGUT COMPONENT-646;Lo;0;L;;;;;N;;;;;
+18A86;TANGUT COMPONENT-647;Lo;0;L;;;;;N;;;;;
+18A87;TANGUT COMPONENT-648;Lo;0;L;;;;;N;;;;;
+18A88;TANGUT COMPONENT-649;Lo;0;L;;;;;N;;;;;
+18A89;TANGUT COMPONENT-650;Lo;0;L;;;;;N;;;;;
+18A8A;TANGUT COMPONENT-651;Lo;0;L;;;;;N;;;;;
+18A8B;TANGUT COMPONENT-652;Lo;0;L;;;;;N;;;;;
+18A8C;TANGUT COMPONENT-653;Lo;0;L;;;;;N;;;;;
+18A8D;TANGUT COMPONENT-654;Lo;0;L;;;;;N;;;;;
+18A8E;TANGUT COMPONENT-655;Lo;0;L;;;;;N;;;;;
+18A8F;TANGUT COMPONENT-656;Lo;0;L;;;;;N;;;;;
+18A90;TANGUT COMPONENT-657;Lo;0;L;;;;;N;;;;;
+18A91;TANGUT COMPONENT-658;Lo;0;L;;;;;N;;;;;
+18A92;TANGUT COMPONENT-659;Lo;0;L;;;;;N;;;;;
+18A93;TANGUT COMPONENT-660;Lo;0;L;;;;;N;;;;;
+18A94;TANGUT COMPONENT-661;Lo;0;L;;;;;N;;;;;
+18A95;TANGUT COMPONENT-662;Lo;0;L;;;;;N;;;;;
+18A96;TANGUT COMPONENT-663;Lo;0;L;;;;;N;;;;;
+18A97;TANGUT COMPONENT-664;Lo;0;L;;;;;N;;;;;
+18A98;TANGUT COMPONENT-665;Lo;0;L;;;;;N;;;;;
+18A99;TANGUT COMPONENT-666;Lo;0;L;;;;;N;;;;;
+18A9A;TANGUT COMPONENT-667;Lo;0;L;;;;;N;;;;;
+18A9B;TANGUT COMPONENT-668;Lo;0;L;;;;;N;;;;;
+18A9C;TANGUT COMPONENT-669;Lo;0;L;;;;;N;;;;;
+18A9D;TANGUT COMPONENT-670;Lo;0;L;;;;;N;;;;;
+18A9E;TANGUT COMPONENT-671;Lo;0;L;;;;;N;;;;;
+18A9F;TANGUT COMPONENT-672;Lo;0;L;;;;;N;;;;;
+18AA0;TANGUT COMPONENT-673;Lo;0;L;;;;;N;;;;;
+18AA1;TANGUT COMPONENT-674;Lo;0;L;;;;;N;;;;;
+18AA2;TANGUT COMPONENT-675;Lo;0;L;;;;;N;;;;;
+18AA3;TANGUT COMPONENT-676;Lo;0;L;;;;;N;;;;;
+18AA4;TANGUT COMPONENT-677;Lo;0;L;;;;;N;;;;;
+18AA5;TANGUT COMPONENT-678;Lo;0;L;;;;;N;;;;;
+18AA6;TANGUT COMPONENT-679;Lo;0;L;;;;;N;;;;;
+18AA7;TANGUT COMPONENT-680;Lo;0;L;;;;;N;;;;;
+18AA8;TANGUT COMPONENT-681;Lo;0;L;;;;;N;;;;;
+18AA9;TANGUT COMPONENT-682;Lo;0;L;;;;;N;;;;;
+18AAA;TANGUT COMPONENT-683;Lo;0;L;;;;;N;;;;;
+18AAB;TANGUT COMPONENT-684;Lo;0;L;;;;;N;;;;;
+18AAC;TANGUT COMPONENT-685;Lo;0;L;;;;;N;;;;;
+18AAD;TANGUT COMPONENT-686;Lo;0;L;;;;;N;;;;;
+18AAE;TANGUT COMPONENT-687;Lo;0;L;;;;;N;;;;;
+18AAF;TANGUT COMPONENT-688;Lo;0;L;;;;;N;;;;;
+18AB0;TANGUT COMPONENT-689;Lo;0;L;;;;;N;;;;;
+18AB1;TANGUT COMPONENT-690;Lo;0;L;;;;;N;;;;;
+18AB2;TANGUT COMPONENT-691;Lo;0;L;;;;;N;;;;;
+18AB3;TANGUT COMPONENT-692;Lo;0;L;;;;;N;;;;;
+18AB4;TANGUT COMPONENT-693;Lo;0;L;;;;;N;;;;;
+18AB5;TANGUT COMPONENT-694;Lo;0;L;;;;;N;;;;;
+18AB6;TANGUT COMPONENT-695;Lo;0;L;;;;;N;;;;;
+18AB7;TANGUT COMPONENT-696;Lo;0;L;;;;;N;;;;;
+18AB8;TANGUT COMPONENT-697;Lo;0;L;;;;;N;;;;;
+18AB9;TANGUT COMPONENT-698;Lo;0;L;;;;;N;;;;;
+18ABA;TANGUT COMPONENT-699;Lo;0;L;;;;;N;;;;;
+18ABB;TANGUT COMPONENT-700;Lo;0;L;;;;;N;;;;;
+18ABC;TANGUT COMPONENT-701;Lo;0;L;;;;;N;;;;;
+18ABD;TANGUT COMPONENT-702;Lo;0;L;;;;;N;;;;;
+18ABE;TANGUT COMPONENT-703;Lo;0;L;;;;;N;;;;;
+18ABF;TANGUT COMPONENT-704;Lo;0;L;;;;;N;;;;;
+18AC0;TANGUT COMPONENT-705;Lo;0;L;;;;;N;;;;;
+18AC1;TANGUT COMPONENT-706;Lo;0;L;;;;;N;;;;;
+18AC2;TANGUT COMPONENT-707;Lo;0;L;;;;;N;;;;;
+18AC3;TANGUT COMPONENT-708;Lo;0;L;;;;;N;;;;;
+18AC4;TANGUT COMPONENT-709;Lo;0;L;;;;;N;;;;;
+18AC5;TANGUT COMPONENT-710;Lo;0;L;;;;;N;;;;;
+18AC6;TANGUT COMPONENT-711;Lo;0;L;;;;;N;;;;;
+18AC7;TANGUT COMPONENT-712;Lo;0;L;;;;;N;;;;;
+18AC8;TANGUT COMPONENT-713;Lo;0;L;;;;;N;;;;;
+18AC9;TANGUT COMPONENT-714;Lo;0;L;;;;;N;;;;;
+18ACA;TANGUT COMPONENT-715;Lo;0;L;;;;;N;;;;;
+18ACB;TANGUT COMPONENT-716;Lo;0;L;;;;;N;;;;;
+18ACC;TANGUT COMPONENT-717;Lo;0;L;;;;;N;;;;;
+18ACD;TANGUT COMPONENT-718;Lo;0;L;;;;;N;;;;;
+18ACE;TANGUT COMPONENT-719;Lo;0;L;;;;;N;;;;;
+18ACF;TANGUT COMPONENT-720;Lo;0;L;;;;;N;;;;;
+18AD0;TANGUT COMPONENT-721;Lo;0;L;;;;;N;;;;;
+18AD1;TANGUT COMPONENT-722;Lo;0;L;;;;;N;;;;;
+18AD2;TANGUT COMPONENT-723;Lo;0;L;;;;;N;;;;;
+18AD3;TANGUT COMPONENT-724;Lo;0;L;;;;;N;;;;;
+18AD4;TANGUT COMPONENT-725;Lo;0;L;;;;;N;;;;;
+18AD5;TANGUT COMPONENT-726;Lo;0;L;;;;;N;;;;;
+18AD6;TANGUT COMPONENT-727;Lo;0;L;;;;;N;;;;;
+18AD7;TANGUT COMPONENT-728;Lo;0;L;;;;;N;;;;;
+18AD8;TANGUT COMPONENT-729;Lo;0;L;;;;;N;;;;;
+18AD9;TANGUT COMPONENT-730;Lo;0;L;;;;;N;;;;;
+18ADA;TANGUT COMPONENT-731;Lo;0;L;;;;;N;;;;;
+18ADB;TANGUT COMPONENT-732;Lo;0;L;;;;;N;;;;;
+18ADC;TANGUT COMPONENT-733;Lo;0;L;;;;;N;;;;;
+18ADD;TANGUT COMPONENT-734;Lo;0;L;;;;;N;;;;;
+18ADE;TANGUT COMPONENT-735;Lo;0;L;;;;;N;;;;;
+18ADF;TANGUT COMPONENT-736;Lo;0;L;;;;;N;;;;;
+18AE0;TANGUT COMPONENT-737;Lo;0;L;;;;;N;;;;;
+18AE1;TANGUT COMPONENT-738;Lo;0;L;;;;;N;;;;;
+18AE2;TANGUT COMPONENT-739;Lo;0;L;;;;;N;;;;;
+18AE3;TANGUT COMPONENT-740;Lo;0;L;;;;;N;;;;;
+18AE4;TANGUT COMPONENT-741;Lo;0;L;;;;;N;;;;;
+18AE5;TANGUT COMPONENT-742;Lo;0;L;;;;;N;;;;;
+18AE6;TANGUT COMPONENT-743;Lo;0;L;;;;;N;;;;;
+18AE7;TANGUT COMPONENT-744;Lo;0;L;;;;;N;;;;;
+18AE8;TANGUT COMPONENT-745;Lo;0;L;;;;;N;;;;;
+18AE9;TANGUT COMPONENT-746;Lo;0;L;;;;;N;;;;;
+18AEA;TANGUT COMPONENT-747;Lo;0;L;;;;;N;;;;;
+18AEB;TANGUT COMPONENT-748;Lo;0;L;;;;;N;;;;;
+18AEC;TANGUT COMPONENT-749;Lo;0;L;;;;;N;;;;;
+18AED;TANGUT COMPONENT-750;Lo;0;L;;;;;N;;;;;
+18AEE;TANGUT COMPONENT-751;Lo;0;L;;;;;N;;;;;
+18AEF;TANGUT COMPONENT-752;Lo;0;L;;;;;N;;;;;
+18AF0;TANGUT COMPONENT-753;Lo;0;L;;;;;N;;;;;
+18AF1;TANGUT COMPONENT-754;Lo;0;L;;;;;N;;;;;
+18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;;
+1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;;
+1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
+1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;;
+1BC01;DUPLOYAN LETTER X;Lo;0;L;;;;;N;;;;;
+1BC02;DUPLOYAN LETTER P;Lo;0;L;;;;;N;;;;;
+1BC03;DUPLOYAN LETTER T;Lo;0;L;;;;;N;;;;;
+1BC04;DUPLOYAN LETTER F;Lo;0;L;;;;;N;;;;;
+1BC05;DUPLOYAN LETTER K;Lo;0;L;;;;;N;;;;;
+1BC06;DUPLOYAN LETTER L;Lo;0;L;;;;;N;;;;;
+1BC07;DUPLOYAN LETTER B;Lo;0;L;;;;;N;;;;;
+1BC08;DUPLOYAN LETTER D;Lo;0;L;;;;;N;;;;;
+1BC09;DUPLOYAN LETTER V;Lo;0;L;;;;;N;;;;;
+1BC0A;DUPLOYAN LETTER G;Lo;0;L;;;;;N;;;;;
+1BC0B;DUPLOYAN LETTER R;Lo;0;L;;;;;N;;;;;
+1BC0C;DUPLOYAN LETTER P N;Lo;0;L;;;;;N;;;;;
+1BC0D;DUPLOYAN LETTER D S;Lo;0;L;;;;;N;;;;;
+1BC0E;DUPLOYAN LETTER F N;Lo;0;L;;;;;N;;;;;
+1BC0F;DUPLOYAN LETTER K M;Lo;0;L;;;;;N;;;;;
+1BC10;DUPLOYAN LETTER R S;Lo;0;L;;;;;N;;;;;
+1BC11;DUPLOYAN LETTER TH;Lo;0;L;;;;;N;;;;;
+1BC12;DUPLOYAN LETTER SLOAN DH;Lo;0;L;;;;;N;;;;;
+1BC13;DUPLOYAN LETTER DH;Lo;0;L;;;;;N;;;;;
+1BC14;DUPLOYAN LETTER KK;Lo;0;L;;;;;N;;;;;
+1BC15;DUPLOYAN LETTER SLOAN J;Lo;0;L;;;;;N;;;;;
+1BC16;DUPLOYAN LETTER HL;Lo;0;L;;;;;N;;;;;
+1BC17;DUPLOYAN LETTER LH;Lo;0;L;;;;;N;;;;;
+1BC18;DUPLOYAN LETTER RH;Lo;0;L;;;;;N;;;;;
+1BC19;DUPLOYAN LETTER M;Lo;0;L;;;;;N;;;;;
+1BC1A;DUPLOYAN LETTER N;Lo;0;L;;;;;N;;;;;
+1BC1B;DUPLOYAN LETTER J;Lo;0;L;;;;;N;;;;;
+1BC1C;DUPLOYAN LETTER S;Lo;0;L;;;;;N;;;;;
+1BC1D;DUPLOYAN LETTER M N;Lo;0;L;;;;;N;;;;;
+1BC1E;DUPLOYAN LETTER N M;Lo;0;L;;;;;N;;;;;
+1BC1F;DUPLOYAN LETTER J M;Lo;0;L;;;;;N;;;;;
+1BC20;DUPLOYAN LETTER S J;Lo;0;L;;;;;N;;;;;
+1BC21;DUPLOYAN LETTER M WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC22;DUPLOYAN LETTER N WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC23;DUPLOYAN LETTER J WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC24;DUPLOYAN LETTER J WITH DOTS INSIDE AND ABOVE;Lo;0;L;;;;;N;;;;;
+1BC25;DUPLOYAN LETTER S WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC26;DUPLOYAN LETTER S WITH DOT BELOW;Lo;0;L;;;;;N;;;;;
+1BC27;DUPLOYAN LETTER M S;Lo;0;L;;;;;N;;;;;
+1BC28;DUPLOYAN LETTER N S;Lo;0;L;;;;;N;;;;;
+1BC29;DUPLOYAN LETTER J S;Lo;0;L;;;;;N;;;;;
+1BC2A;DUPLOYAN LETTER S S;Lo;0;L;;;;;N;;;;;
+1BC2B;DUPLOYAN LETTER M N S;Lo;0;L;;;;;N;;;;;
+1BC2C;DUPLOYAN LETTER N M S;Lo;0;L;;;;;N;;;;;
+1BC2D;DUPLOYAN LETTER J M S;Lo;0;L;;;;;N;;;;;
+1BC2E;DUPLOYAN LETTER S J S;Lo;0;L;;;;;N;;;;;
+1BC2F;DUPLOYAN LETTER J S WITH DOT;Lo;0;L;;;;;N;;;;;
+1BC30;DUPLOYAN LETTER J N;Lo;0;L;;;;;N;;;;;
+1BC31;DUPLOYAN LETTER J N S;Lo;0;L;;;;;N;;;;;
+1BC32;DUPLOYAN LETTER S T;Lo;0;L;;;;;N;;;;;
+1BC33;DUPLOYAN LETTER S T R;Lo;0;L;;;;;N;;;;;
+1BC34;DUPLOYAN LETTER S P;Lo;0;L;;;;;N;;;;;
+1BC35;DUPLOYAN LETTER S P R;Lo;0;L;;;;;N;;;;;
+1BC36;DUPLOYAN LETTER T S;Lo;0;L;;;;;N;;;;;
+1BC37;DUPLOYAN LETTER T R S;Lo;0;L;;;;;N;;;;;
+1BC38;DUPLOYAN LETTER W;Lo;0;L;;;;;N;;;;;
+1BC39;DUPLOYAN LETTER WH;Lo;0;L;;;;;N;;;;;
+1BC3A;DUPLOYAN LETTER W R;Lo;0;L;;;;;N;;;;;
+1BC3B;DUPLOYAN LETTER S N;Lo;0;L;;;;;N;;;;;
+1BC3C;DUPLOYAN LETTER S M;Lo;0;L;;;;;N;;;;;
+1BC3D;DUPLOYAN LETTER K R S;Lo;0;L;;;;;N;;;;;
+1BC3E;DUPLOYAN LETTER G R S;Lo;0;L;;;;;N;;;;;
+1BC3F;DUPLOYAN LETTER S K;Lo;0;L;;;;;N;;;;;
+1BC40;DUPLOYAN LETTER S K R;Lo;0;L;;;;;N;;;;;
+1BC41;DUPLOYAN LETTER A;Lo;0;L;;;;;N;;;;;
+1BC42;DUPLOYAN LETTER SLOAN OW;Lo;0;L;;;;;N;;;;;
+1BC43;DUPLOYAN LETTER OA;Lo;0;L;;;;;N;;;;;
+1BC44;DUPLOYAN LETTER O;Lo;0;L;;;;;N;;;;;
+1BC45;DUPLOYAN LETTER AOU;Lo;0;L;;;;;N;;;;;
+1BC46;DUPLOYAN LETTER I;Lo;0;L;;;;;N;;;;;
+1BC47;DUPLOYAN LETTER E;Lo;0;L;;;;;N;;;;;
+1BC48;DUPLOYAN LETTER IE;Lo;0;L;;;;;N;;;;;
+1BC49;DUPLOYAN LETTER SHORT I;Lo;0;L;;;;;N;;;;;
+1BC4A;DUPLOYAN LETTER UI;Lo;0;L;;;;;N;;;;;
+1BC4B;DUPLOYAN LETTER EE;Lo;0;L;;;;;N;;;;;
+1BC4C;DUPLOYAN LETTER SLOAN EH;Lo;0;L;;;;;N;;;;;
+1BC4D;DUPLOYAN LETTER ROMANIAN I;Lo;0;L;;;;;N;;;;;
+1BC4E;DUPLOYAN LETTER SLOAN EE;Lo;0;L;;;;;N;;;;;
+1BC4F;DUPLOYAN LETTER LONG I;Lo;0;L;;;;;N;;;;;
+1BC50;DUPLOYAN LETTER YE;Lo;0;L;;;;;N;;;;;
+1BC51;DUPLOYAN LETTER U;Lo;0;L;;;;;N;;;;;
+1BC52;DUPLOYAN LETTER EU;Lo;0;L;;;;;N;;;;;
+1BC53;DUPLOYAN LETTER XW;Lo;0;L;;;;;N;;;;;
+1BC54;DUPLOYAN LETTER U N;Lo;0;L;;;;;N;;;;;
+1BC55;DUPLOYAN LETTER LONG U;Lo;0;L;;;;;N;;;;;
+1BC56;DUPLOYAN LETTER ROMANIAN U;Lo;0;L;;;;;N;;;;;
+1BC57;DUPLOYAN LETTER UH;Lo;0;L;;;;;N;;;;;
+1BC58;DUPLOYAN LETTER SLOAN U;Lo;0;L;;;;;N;;;;;
+1BC59;DUPLOYAN LETTER OOH;Lo;0;L;;;;;N;;;;;
+1BC5A;DUPLOYAN LETTER OW;Lo;0;L;;;;;N;;;;;
+1BC5B;DUPLOYAN LETTER OU;Lo;0;L;;;;;N;;;;;
+1BC5C;DUPLOYAN LETTER WA;Lo;0;L;;;;;N;;;;;
+1BC5D;DUPLOYAN LETTER WO;Lo;0;L;;;;;N;;;;;
+1BC5E;DUPLOYAN LETTER WI;Lo;0;L;;;;;N;;;;;
+1BC5F;DUPLOYAN LETTER WEI;Lo;0;L;;;;;N;;;;;
+1BC60;DUPLOYAN LETTER WOW;Lo;0;L;;;;;N;;;;;
+1BC61;DUPLOYAN LETTER NASAL U;Lo;0;L;;;;;N;;;;;
+1BC62;DUPLOYAN LETTER NASAL O;Lo;0;L;;;;;N;;;;;
+1BC63;DUPLOYAN LETTER NASAL I;Lo;0;L;;;;;N;;;;;
+1BC64;DUPLOYAN LETTER NASAL A;Lo;0;L;;;;;N;;;;;
+1BC65;DUPLOYAN LETTER PERNIN AN;Lo;0;L;;;;;N;;;;;
+1BC66;DUPLOYAN LETTER PERNIN AM;Lo;0;L;;;;;N;;;;;
+1BC67;DUPLOYAN LETTER SLOAN EN;Lo;0;L;;;;;N;;;;;
+1BC68;DUPLOYAN LETTER SLOAN AN;Lo;0;L;;;;;N;;;;;
+1BC69;DUPLOYAN LETTER SLOAN ON;Lo;0;L;;;;;N;;;;;
+1BC6A;DUPLOYAN LETTER VOCALIC M;Lo;0;L;;;;;N;;;;;
+1BC70;DUPLOYAN AFFIX LEFT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC71;DUPLOYAN AFFIX MID HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC72;DUPLOYAN AFFIX RIGHT HORIZONTAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC73;DUPLOYAN AFFIX LOW VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC74;DUPLOYAN AFFIX MID VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC75;DUPLOYAN AFFIX HIGH VERTICAL SECANT;Lo;0;L;;;;;N;;;;;
+1BC76;DUPLOYAN AFFIX ATTACHED SECANT;Lo;0;L;;;;;N;;;;;
+1BC77;DUPLOYAN AFFIX ATTACHED LEFT-TO-RIGHT SECANT;Lo;0;L;;;;;N;;;;;
+1BC78;DUPLOYAN AFFIX ATTACHED TANGENT;Lo;0;L;;;;;N;;;;;
+1BC79;DUPLOYAN AFFIX ATTACHED TAIL;Lo;0;L;;;;;N;;;;;
+1BC7A;DUPLOYAN AFFIX ATTACHED E HOOK;Lo;0;L;;;;;N;;;;;
+1BC7B;DUPLOYAN AFFIX ATTACHED I HOOK;Lo;0;L;;;;;N;;;;;
+1BC7C;DUPLOYAN AFFIX ATTACHED TANGENT HOOK;Lo;0;L;;;;;N;;;;;
+1BC80;DUPLOYAN AFFIX HIGH ACUTE;Lo;0;L;;;;;N;;;;;
+1BC81;DUPLOYAN AFFIX HIGH TIGHT ACUTE;Lo;0;L;;;;;N;;;;;
+1BC82;DUPLOYAN AFFIX HIGH GRAVE;Lo;0;L;;;;;N;;;;;
+1BC83;DUPLOYAN AFFIX HIGH LONG GRAVE;Lo;0;L;;;;;N;;;;;
+1BC84;DUPLOYAN AFFIX HIGH DOT;Lo;0;L;;;;;N;;;;;
+1BC85;DUPLOYAN AFFIX HIGH CIRCLE;Lo;0;L;;;;;N;;;;;
+1BC86;DUPLOYAN AFFIX HIGH LINE;Lo;0;L;;;;;N;;;;;
+1BC87;DUPLOYAN AFFIX HIGH WAVE;Lo;0;L;;;;;N;;;;;
+1BC88;DUPLOYAN AFFIX HIGH VERTICAL;Lo;0;L;;;;;N;;;;;
+1BC90;DUPLOYAN AFFIX LOW ACUTE;Lo;0;L;;;;;N;;;;;
+1BC91;DUPLOYAN AFFIX LOW TIGHT ACUTE;Lo;0;L;;;;;N;;;;;
+1BC92;DUPLOYAN AFFIX LOW GRAVE;Lo;0;L;;;;;N;;;;;
+1BC93;DUPLOYAN AFFIX LOW LONG GRAVE;Lo;0;L;;;;;N;;;;;
+1BC94;DUPLOYAN AFFIX LOW DOT;Lo;0;L;;;;;N;;;;;
+1BC95;DUPLOYAN AFFIX LOW CIRCLE;Lo;0;L;;;;;N;;;;;
+1BC96;DUPLOYAN AFFIX LOW LINE;Lo;0;L;;;;;N;;;;;
+1BC97;DUPLOYAN AFFIX LOW WAVE;Lo;0;L;;;;;N;;;;;
+1BC98;DUPLOYAN AFFIX LOW VERTICAL;Lo;0;L;;;;;N;;;;;
+1BC99;DUPLOYAN AFFIX LOW ARROW;Lo;0;L;;;;;N;;;;;
+1BC9C;DUPLOYAN SIGN O WITH CROSS;So;0;L;;;;;N;;;;;
+1BC9D;DUPLOYAN THICK LETTER SELECTOR;Mn;0;NSM;;;;;N;;;;;
+1BC9E;DUPLOYAN DOUBLE MARK;Mn;1;NSM;;;;;N;;;;;
+1BC9F;DUPLOYAN PUNCTUATION CHINOOK FULL STOP;Po;0;L;;;;;N;;;;;
+1BCA0;SHORTHAND FORMAT LETTER OVERLAP;Cf;0;BN;;;;;N;;;;;
+1BCA1;SHORTHAND FORMAT CONTINUING OVERLAP;Cf;0;BN;;;;;N;;;;;
+1BCA2;SHORTHAND FORMAT DOWN STEP;Cf;0;BN;;;;;N;;;;;
+1BCA3;SHORTHAND FORMAT UP STEP;Cf;0;BN;;;;;N;;;;;
+1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;;
+1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;;
+1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;;
+1D003;BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D004;BYZANTINE MUSICAL SYMBOL OXEIA DIPLI;So;0;L;;;;;N;;;;;
+1D005;BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D006;BYZANTINE MUSICAL SYMBOL VAREIA DIPLI;So;0;L;;;;;N;;;;;
+1D007;BYZANTINE MUSICAL SYMBOL KATHISTI;So;0;L;;;;;N;;;;;
+1D008;BYZANTINE MUSICAL SYMBOL SYRMATIKI;So;0;L;;;;;N;;;;;
+1D009;BYZANTINE MUSICAL SYMBOL PARAKLITIKI;So;0;L;;;;;N;;;;;
+1D00A;BYZANTINE MUSICAL SYMBOL YPOKRISIS;So;0;L;;;;;N;;;;;
+1D00B;BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI;So;0;L;;;;;N;;;;;
+1D00C;BYZANTINE MUSICAL SYMBOL KREMASTI;So;0;L;;;;;N;;;;;
+1D00D;BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00E;BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00F;BYZANTINE MUSICAL SYMBOL TELEIA;So;0;L;;;;;N;;;;;
+1D010;BYZANTINE MUSICAL SYMBOL KENTIMATA;So;0;L;;;;;N;;;;;
+1D011;BYZANTINE MUSICAL SYMBOL APOSTROFOS;So;0;L;;;;;N;;;;;
+1D012;BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI;So;0;L;;;;;N;;;;;
+1D013;BYZANTINE MUSICAL SYMBOL SYNEVMA;So;0;L;;;;;N;;;;;
+1D014;BYZANTINE MUSICAL SYMBOL THITA;So;0;L;;;;;N;;;;;
+1D015;BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION;So;0;L;;;;;N;;;;;
+1D016;BYZANTINE MUSICAL SYMBOL GORGON ARCHAION;So;0;L;;;;;N;;;;;
+1D017;BYZANTINE MUSICAL SYMBOL PSILON;So;0;L;;;;;N;;;;;
+1D018;BYZANTINE MUSICAL SYMBOL CHAMILON;So;0;L;;;;;N;;;;;
+1D019;BYZANTINE MUSICAL SYMBOL VATHY;So;0;L;;;;;N;;;;;
+1D01A;BYZANTINE MUSICAL SYMBOL ISON ARCHAION;So;0;L;;;;;N;;;;;
+1D01B;BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D01C;BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION;So;0;L;;;;;N;;;;;
+1D01D;BYZANTINE MUSICAL SYMBOL SAXIMATA;So;0;L;;;;;N;;;;;
+1D01E;BYZANTINE MUSICAL SYMBOL PARICHON;So;0;L;;;;;N;;;;;
+1D01F;BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA;So;0;L;;;;;N;;;;;
+1D020;BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D021;BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D022;BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION;So;0;L;;;;;N;;;;;
+1D023;BYZANTINE MUSICAL SYMBOL APOTHEMA;So;0;L;;;;;N;;;;;
+1D024;BYZANTINE MUSICAL SYMBOL KLASMA;So;0;L;;;;;N;;;;;
+1D025;BYZANTINE MUSICAL SYMBOL REVMA;So;0;L;;;;;N;;;;;
+1D026;BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION;So;0;L;;;;;N;;;;;
+1D027;BYZANTINE MUSICAL SYMBOL TINAGMA;So;0;L;;;;;N;;;;;
+1D028;BYZANTINE MUSICAL SYMBOL ANATRICHISMA;So;0;L;;;;;N;;;;;
+1D029;BYZANTINE MUSICAL SYMBOL SEISMA;So;0;L;;;;;N;;;;;
+1D02A;BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02B;BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU;So;0;L;;;;;N;;;;;
+1D02C;BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02D;BYZANTINE MUSICAL SYMBOL THEMA;So;0;L;;;;;N;;;;;
+1D02E;BYZANTINE MUSICAL SYMBOL LEMOI;So;0;L;;;;;N;;;;;
+1D02F;BYZANTINE MUSICAL SYMBOL DYO;So;0;L;;;;;N;;;;;
+1D030;BYZANTINE MUSICAL SYMBOL TRIA;So;0;L;;;;;N;;;;;
+1D031;BYZANTINE MUSICAL SYMBOL TESSERA;So;0;L;;;;;N;;;;;
+1D032;BYZANTINE MUSICAL SYMBOL KRATIMATA;So;0;L;;;;;N;;;;;
+1D033;BYZANTINE MUSICAL SYMBOL APESO EXO NEO;So;0;L;;;;;N;;;;;
+1D034;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION;So;0;L;;;;;N;;;;;
+1D035;BYZANTINE MUSICAL SYMBOL IMIFTHORA;So;0;L;;;;;N;;;;;
+1D036;BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION;So;0;L;;;;;N;;;;;
+1D037;BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON;So;0;L;;;;;N;;;;;
+1D038;BYZANTINE MUSICAL SYMBOL PELASTON;So;0;L;;;;;N;;;;;
+1D039;BYZANTINE MUSICAL SYMBOL PSIFISTON;So;0;L;;;;;N;;;;;
+1D03A;BYZANTINE MUSICAL SYMBOL KONTEVMA;So;0;L;;;;;N;;;;;
+1D03B;BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03C;BYZANTINE MUSICAL SYMBOL RAPISMA;So;0;L;;;;;N;;;;;
+1D03D;BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION;So;0;L;;;;;N;;;;;
+1D03F;BYZANTINE MUSICAL SYMBOL ICHADIN;So;0;L;;;;;N;;;;;
+1D040;BYZANTINE MUSICAL SYMBOL NANA;So;0;L;;;;;N;;;;;
+1D041;BYZANTINE MUSICAL SYMBOL PETASMA;So;0;L;;;;;N;;;;;
+1D042;BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO;So;0;L;;;;;N;;;;;
+1D043;BYZANTINE MUSICAL SYMBOL TROMIKON ALLO;So;0;L;;;;;N;;;;;
+1D044;BYZANTINE MUSICAL SYMBOL STRAGGISMATA;So;0;L;;;;;N;;;;;
+1D045;BYZANTINE MUSICAL SYMBOL GRONTHISMATA;So;0;L;;;;;N;;;;;
+1D046;BYZANTINE MUSICAL SYMBOL ISON NEO;So;0;L;;;;;N;;;;;
+1D047;BYZANTINE MUSICAL SYMBOL OLIGON NEO;So;0;L;;;;;N;;;;;
+1D048;BYZANTINE MUSICAL SYMBOL OXEIA NEO;So;0;L;;;;;N;;;;;
+1D049;BYZANTINE MUSICAL SYMBOL PETASTI;So;0;L;;;;;N;;;;;
+1D04A;BYZANTINE MUSICAL SYMBOL KOUFISMA;So;0;L;;;;;N;;;;;
+1D04B;BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04C;BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04D;BYZANTINE MUSICAL SYMBOL PELASTON NEO;So;0;L;;;;;N;;;;;
+1D04E;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO;So;0;L;;;;;N;;;;;
+1D04F;BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO;So;0;L;;;;;N;;;;;
+1D050;BYZANTINE MUSICAL SYMBOL YPSILI;So;0;L;;;;;N;;;;;
+1D051;BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO;So;0;L;;;;;N;;;;;
+1D052;BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO;So;0;L;;;;;N;;;;;
+1D053;BYZANTINE MUSICAL SYMBOL YPORROI;So;0;L;;;;;N;;;;;
+1D054;BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON;So;0;L;;;;;N;;;;;
+1D055;BYZANTINE MUSICAL SYMBOL ELAFRON;So;0;L;;;;;N;;;;;
+1D056;BYZANTINE MUSICAL SYMBOL CHAMILI;So;0;L;;;;;N;;;;;
+1D057;BYZANTINE MUSICAL SYMBOL MIKRON ISON;So;0;L;;;;;N;;;;;
+1D058;BYZANTINE MUSICAL SYMBOL VAREIA NEO;So;0;L;;;;;N;;;;;
+1D059;BYZANTINE MUSICAL SYMBOL PIASMA NEO;So;0;L;;;;;N;;;;;
+1D05A;BYZANTINE MUSICAL SYMBOL PSIFISTON NEO;So;0;L;;;;;N;;;;;
+1D05B;BYZANTINE MUSICAL SYMBOL OMALON;So;0;L;;;;;N;;;;;
+1D05C;BYZANTINE MUSICAL SYMBOL ANTIKENOMA;So;0;L;;;;;N;;;;;
+1D05D;BYZANTINE MUSICAL SYMBOL LYGISMA;So;0;L;;;;;N;;;;;
+1D05E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO;So;0;L;;;;;N;;;;;
+1D05F;BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO;So;0;L;;;;;N;;;;;
+1D060;BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA;So;0;L;;;;;N;;;;;
+1D061;BYZANTINE MUSICAL SYMBOL KYLISMA;So;0;L;;;;;N;;;;;
+1D062;BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA;So;0;L;;;;;N;;;;;
+1D063;BYZANTINE MUSICAL SYMBOL TROMIKON NEO;So;0;L;;;;;N;;;;;
+1D064;BYZANTINE MUSICAL SYMBOL EKSTREPTON;So;0;L;;;;;N;;;;;
+1D065;BYZANTINE MUSICAL SYMBOL SYNAGMA NEO;So;0;L;;;;;N;;;;;
+1D066;BYZANTINE MUSICAL SYMBOL SYRMA;So;0;L;;;;;N;;;;;
+1D067;BYZANTINE MUSICAL SYMBOL CHOREVMA NEO;So;0;L;;;;;N;;;;;
+1D068;BYZANTINE MUSICAL SYMBOL EPEGERMA;So;0;L;;;;;N;;;;;
+1D069;BYZANTINE MUSICAL SYMBOL SEISMA NEO;So;0;L;;;;;N;;;;;
+1D06A;BYZANTINE MUSICAL SYMBOL XIRON KLASMA;So;0;L;;;;;N;;;;;
+1D06B;BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON;So;0;L;;;;;N;;;;;
+1D06C;BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA;So;0;L;;;;;N;;;;;
+1D06D;BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA;So;0;L;;;;;N;;;;;
+1D06E;BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D06F;BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D070;BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA;So;0;L;;;;;N;;;;;
+1D071;BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA;So;0;L;;;;;N;;;;;
+1D072;BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D073;BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D074;BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D075;BYZANTINE MUSICAL SYMBOL OYRANISMA NEO;So;0;L;;;;;N;;;;;
+1D076;BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO;So;0;L;;;;;N;;;;;
+1D077;BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO;So;0;L;;;;;N;;;;;
+1D078;BYZANTINE MUSICAL SYMBOL THEMA APLOUN;So;0;L;;;;;N;;;;;
+1D079;BYZANTINE MUSICAL SYMBOL THES KAI APOTHES;So;0;L;;;;;N;;;;;
+1D07A;BYZANTINE MUSICAL SYMBOL KATAVASMA;So;0;L;;;;;N;;;;;
+1D07B;BYZANTINE MUSICAL SYMBOL ENDOFONON;So;0;L;;;;;N;;;;;
+1D07C;BYZANTINE MUSICAL SYMBOL YFEN KATO;So;0;L;;;;;N;;;;;
+1D07D;BYZANTINE MUSICAL SYMBOL YFEN ANO;So;0;L;;;;;N;;;;;
+1D07E;BYZANTINE MUSICAL SYMBOL STAVROS;So;0;L;;;;;N;;;;;
+1D07F;BYZANTINE MUSICAL SYMBOL KLASMA ANO;So;0;L;;;;;N;;;;;
+1D080;BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION;So;0;L;;;;;N;;;;;
+1D081;BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D082;BYZANTINE MUSICAL SYMBOL KRATIMA ALLO;So;0;L;;;;;N;;;;;
+1D083;BYZANTINE MUSICAL SYMBOL KRATIMA NEO;So;0;L;;;;;N;;;;;
+1D084;BYZANTINE MUSICAL SYMBOL APODERMA NEO;So;0;L;;;;;N;;;;;
+1D085;BYZANTINE MUSICAL SYMBOL APLI;So;0;L;;;;;N;;;;;
+1D086;BYZANTINE MUSICAL SYMBOL DIPLI;So;0;L;;;;;N;;;;;
+1D087;BYZANTINE MUSICAL SYMBOL TRIPLI;So;0;L;;;;;N;;;;;
+1D088;BYZANTINE MUSICAL SYMBOL TETRAPLI;So;0;L;;;;;N;;;;;
+1D089;BYZANTINE MUSICAL SYMBOL KORONIS;So;0;L;;;;;N;;;;;
+1D08A;BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08B;BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON;So;0;L;;;;;N;;;;;
+1D08C;BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON;So;0;L;;;;;N;;;;;
+1D08D;BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON;So;0;L;;;;;N;;;;;
+1D08E;BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08F;BYZANTINE MUSICAL SYMBOL GORGON NEO ANO;So;0;L;;;;;N;;;;;
+1D090;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA;So;0;L;;;;;N;;;;;
+1D091;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D092;BYZANTINE MUSICAL SYMBOL DIGORGON;So;0;L;;;;;N;;;;;
+1D093;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO;So;0;L;;;;;N;;;;;
+1D094;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO;So;0;L;;;;;N;;;;;
+1D095;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D096;BYZANTINE MUSICAL SYMBOL TRIGORGON;So;0;L;;;;;N;;;;;
+1D097;BYZANTINE MUSICAL SYMBOL ARGON;So;0;L;;;;;N;;;;;
+1D098;BYZANTINE MUSICAL SYMBOL IMIDIARGON;So;0;L;;;;;N;;;;;
+1D099;BYZANTINE MUSICAL SYMBOL DIARGON;So;0;L;;;;;N;;;;;
+1D09A;BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI;So;0;L;;;;;N;;;;;
+1D09B;BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI;So;0;L;;;;;N;;;;;
+1D09C;BYZANTINE MUSICAL SYMBOL AGOGI ARGI;So;0;L;;;;;N;;;;;
+1D09D;BYZANTINE MUSICAL SYMBOL AGOGI METRIA;So;0;L;;;;;N;;;;;
+1D09E;BYZANTINE MUSICAL SYMBOL AGOGI MESI;So;0;L;;;;;N;;;;;
+1D09F;BYZANTINE MUSICAL SYMBOL AGOGI GORGI;So;0;L;;;;;N;;;;;
+1D0A0;BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI;So;0;L;;;;;N;;;;;
+1D0A1;BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI;So;0;L;;;;;N;;;;;
+1D0A2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A3;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A4;BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A5;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A6;BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A7;BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS;So;0;L;;;;;N;;;;;
+1D0A8;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A9;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AA;BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AB;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AC;BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AD;BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AE;BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS;So;0;L;;;;;N;;;;;
+1D0AF;BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0B0;BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS;So;0;L;;;;;N;;;;;
+1D0B1;BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B3;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0B4;BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN;So;0;L;;;;;N;;;;;
+1D0B5;BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN;So;0;L;;;;;N;;;;;
+1D0B6;BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU;So;0;L;;;;;N;;;;;
+1D0B7;BYZANTINE MUSICAL SYMBOL IMIFONON;So;0;L;;;;;N;;;;;
+1D0B8;BYZANTINE MUSICAL SYMBOL IMIFTHORON;So;0;L;;;;;N;;;;;
+1D0B9;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU;So;0;L;;;;;N;;;;;
+1D0BA;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA;So;0;L;;;;;N;;;;;
+1D0BB;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA;So;0;L;;;;;N;;;;;
+1D0BC;BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS;So;0;L;;;;;N;;;;;
+1D0BD;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI;So;0;L;;;;;N;;;;;
+1D0BE;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI;So;0;L;;;;;N;;;;;
+1D0BF;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE;So;0;L;;;;;N;;;;;
+1D0C0;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO;So;0;L;;;;;N;;;;;
+1D0C1;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO;So;0;L;;;;;N;;;;;
+1D0C2;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO;So;0;L;;;;;N;;;;;
+1D0C3;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS;So;0;L;;;;;N;;;;;
+1D0C4;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0C5;BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS;So;0;L;;;;;N;;;;;
+1D0C6;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI;So;0;L;;;;;N;;;;;
+1D0C7;BYZANTINE MUSICAL SYMBOL FTHORA NENANO;So;0;L;;;;;N;;;;;
+1D0C8;BYZANTINE MUSICAL SYMBOL CHROA ZYGOS;So;0;L;;;;;N;;;;;
+1D0C9;BYZANTINE MUSICAL SYMBOL CHROA KLITON;So;0;L;;;;;N;;;;;
+1D0CA;BYZANTINE MUSICAL SYMBOL CHROA SPATHI;So;0;L;;;;;N;;;;;
+1D0CB;BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0CC;BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA;So;0;L;;;;;N;;;;;
+1D0CD;BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CE;BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CF;BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0D0;BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D1;BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D2;BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D3;BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D4;BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D5;BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D6;BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D7;BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D8;BYZANTINE MUSICAL SYMBOL GENIKI DIESIS;So;0;L;;;;;N;;;;;
+1D0D9;BYZANTINE MUSICAL SYMBOL GENIKI YFESIS;So;0;L;;;;;N;;;;;
+1D0DA;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI;So;0;L;;;;;N;;;;;
+1D0DB;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI;So;0;L;;;;;N;;;;;
+1D0DC;BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI;So;0;L;;;;;N;;;;;
+1D0DD;BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS;So;0;L;;;;;N;;;;;
+1D0DE;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS;So;0;L;;;;;N;;;;;
+1D0DF;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E0;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E1;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E2;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS;So;0;L;;;;;N;;;;;
+1D0E3;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E4;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E5;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E6;BYZANTINE MUSICAL SYMBOL DIGRAMMA GG;So;0;L;;;;;N;;;;;
+1D0E7;BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU;So;0;L;;;;;N;;;;;
+1D0E8;BYZANTINE MUSICAL SYMBOL STIGMA;So;0;L;;;;;N;;;;;
+1D0E9;BYZANTINE MUSICAL SYMBOL ARKTIKO PA;So;0;L;;;;;N;;;;;
+1D0EA;BYZANTINE MUSICAL SYMBOL ARKTIKO VOU;So;0;L;;;;;N;;;;;
+1D0EB;BYZANTINE MUSICAL SYMBOL ARKTIKO GA;So;0;L;;;;;N;;;;;
+1D0EC;BYZANTINE MUSICAL SYMBOL ARKTIKO DI;So;0;L;;;;;N;;;;;
+1D0ED;BYZANTINE MUSICAL SYMBOL ARKTIKO KE;So;0;L;;;;;N;;;;;
+1D0EE;BYZANTINE MUSICAL SYMBOL ARKTIKO ZO;So;0;L;;;;;N;;;;;
+1D0EF;BYZANTINE MUSICAL SYMBOL ARKTIKO NI;So;0;L;;;;;N;;;;;
+1D0F0;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F1;BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F2;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F3;BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F4;BYZANTINE MUSICAL SYMBOL KLASMA KATO;So;0;L;;;;;N;;;;;
+1D0F5;BYZANTINE MUSICAL SYMBOL GORGON NEO KATO;So;0;L;;;;;N;;;;;
+1D100;MUSICAL SYMBOL SINGLE BARLINE;So;0;L;;;;;N;;;;;
+1D101;MUSICAL SYMBOL DOUBLE BARLINE;So;0;L;;;;;N;;;;;
+1D102;MUSICAL SYMBOL FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D103;MUSICAL SYMBOL REVERSE FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D104;MUSICAL SYMBOL DASHED BARLINE;So;0;L;;;;;N;;;;;
+1D105;MUSICAL SYMBOL SHORT BARLINE;So;0;L;;;;;N;;;;;
+1D106;MUSICAL SYMBOL LEFT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D107;MUSICAL SYMBOL RIGHT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D108;MUSICAL SYMBOL REPEAT DOTS;So;0;L;;;;;N;;;;;
+1D109;MUSICAL SYMBOL DAL SEGNO;So;0;L;;;;;N;;;;;
+1D10A;MUSICAL SYMBOL DA CAPO;So;0;L;;;;;N;;;;;
+1D10B;MUSICAL SYMBOL SEGNO;So;0;L;;;;;N;;;;;
+1D10C;MUSICAL SYMBOL CODA;So;0;L;;;;;N;;;;;
+1D10D;MUSICAL SYMBOL REPEATED FIGURE-1;So;0;L;;;;;N;;;;;
+1D10E;MUSICAL SYMBOL REPEATED FIGURE-2;So;0;L;;;;;N;;;;;
+1D10F;MUSICAL SYMBOL REPEATED FIGURE-3;So;0;L;;;;;N;;;;;
+1D110;MUSICAL SYMBOL FERMATA;So;0;L;;;;;N;;;;;
+1D111;MUSICAL SYMBOL FERMATA BELOW;So;0;L;;;;;N;;;;;
+1D112;MUSICAL SYMBOL BREATH MARK;So;0;L;;;;;N;;;;;
+1D113;MUSICAL SYMBOL CAESURA;So;0;L;;;;;N;;;;;
+1D114;MUSICAL SYMBOL BRACE;So;0;L;;;;;N;;;;;
+1D115;MUSICAL SYMBOL BRACKET;So;0;L;;;;;N;;;;;
+1D116;MUSICAL SYMBOL ONE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D117;MUSICAL SYMBOL TWO-LINE STAFF;So;0;L;;;;;N;;;;;
+1D118;MUSICAL SYMBOL THREE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D119;MUSICAL SYMBOL FOUR-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11A;MUSICAL SYMBOL FIVE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11B;MUSICAL SYMBOL SIX-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11C;MUSICAL SYMBOL SIX-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11D;MUSICAL SYMBOL FOUR-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11E;MUSICAL SYMBOL G CLEF;So;0;L;;;;;N;;;;;
+1D11F;MUSICAL SYMBOL G CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D120;MUSICAL SYMBOL G CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D121;MUSICAL SYMBOL C CLEF;So;0;L;;;;;N;;;;;
+1D122;MUSICAL SYMBOL F CLEF;So;0;L;;;;;N;;;;;
+1D123;MUSICAL SYMBOL F CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;;
+1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;;
+1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;;
+1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;;
+1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;;
+1D12C;MUSICAL SYMBOL FLAT UP;So;0;L;;;;;N;;;;;
+1D12D;MUSICAL SYMBOL FLAT DOWN;So;0;L;;;;;N;;;;;
+1D12E;MUSICAL SYMBOL NATURAL UP;So;0;L;;;;;N;;;;;
+1D12F;MUSICAL SYMBOL NATURAL DOWN;So;0;L;;;;;N;;;;;
+1D130;MUSICAL SYMBOL SHARP UP;So;0;L;;;;;N;;;;;
+1D131;MUSICAL SYMBOL SHARP DOWN;So;0;L;;;;;N;;;;;
+1D132;MUSICAL SYMBOL QUARTER TONE SHARP;So;0;L;;;;;N;;;;;
+1D133;MUSICAL SYMBOL QUARTER TONE FLAT;So;0;L;;;;;N;;;;;
+1D134;MUSICAL SYMBOL COMMON TIME;So;0;L;;;;;N;;;;;
+1D135;MUSICAL SYMBOL CUT TIME;So;0;L;;;;;N;;;;;
+1D136;MUSICAL SYMBOL OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D137;MUSICAL SYMBOL OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D138;MUSICAL SYMBOL QUINDICESIMA ALTA;So;0;L;;;;;N;;;;;
+1D139;MUSICAL SYMBOL QUINDICESIMA BASSA;So;0;L;;;;;N;;;;;
+1D13A;MUSICAL SYMBOL MULTI REST;So;0;L;;;;;N;;;;;
+1D13B;MUSICAL SYMBOL WHOLE REST;So;0;L;;;;;N;;;;;
+1D13C;MUSICAL SYMBOL HALF REST;So;0;L;;;;;N;;;;;
+1D13D;MUSICAL SYMBOL QUARTER REST;So;0;L;;;;;N;;;;;
+1D13E;MUSICAL SYMBOL EIGHTH REST;So;0;L;;;;;N;;;;;
+1D13F;MUSICAL SYMBOL SIXTEENTH REST;So;0;L;;;;;N;;;;;
+1D140;MUSICAL SYMBOL THIRTY-SECOND REST;So;0;L;;;;;N;;;;;
+1D141;MUSICAL SYMBOL SIXTY-FOURTH REST;So;0;L;;;;;N;;;;;
+1D142;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST;So;0;L;;;;;N;;;;;
+1D143;MUSICAL SYMBOL X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D144;MUSICAL SYMBOL PLUS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D145;MUSICAL SYMBOL CIRCLE X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D146;MUSICAL SYMBOL SQUARE NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D147;MUSICAL SYMBOL SQUARE NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D148;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE;So;0;L;;;;;N;;;;;
+1D149;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK;So;0;L;;;;;N;;;;;
+1D14A;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE;So;0;L;;;;;N;;;;;
+1D14B;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK;So;0;L;;;;;N;;;;;
+1D14C;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D14D;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D14E;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D14F;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D150;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D151;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D152;MUSICAL SYMBOL MOON NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D153;MUSICAL SYMBOL MOON NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D154;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D155;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D156;MUSICAL SYMBOL PARENTHESIS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D157;MUSICAL SYMBOL VOID NOTEHEAD;So;0;L;;;;;N;;;;;
+1D158;MUSICAL SYMBOL NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D159;MUSICAL SYMBOL NULL NOTEHEAD;So;0;L;;;;;N;;;;;
+1D15A;MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D15B;MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D15C;MUSICAL SYMBOL BREVE;So;0;L;;;;;N;;;;;
+1D15D;MUSICAL SYMBOL WHOLE NOTE;So;0;L;;;;;N;;;;;
+1D15E;MUSICAL SYMBOL HALF NOTE;So;0;L;1D157 1D165;;;;N;;;;;
+1D15F;MUSICAL SYMBOL QUARTER NOTE;So;0;L;1D158 1D165;;;;N;;;;;
+1D160;MUSICAL SYMBOL EIGHTH NOTE;So;0;L;1D15F 1D16E;;;;N;;;;;
+1D161;MUSICAL SYMBOL SIXTEENTH NOTE;So;0;L;1D15F 1D16F;;;;N;;;;;
+1D162;MUSICAL SYMBOL THIRTY-SECOND NOTE;So;0;L;1D15F 1D170;;;;N;;;;;
+1D163;MUSICAL SYMBOL SIXTY-FOURTH NOTE;So;0;L;1D15F 1D171;;;;N;;;;;
+1D164;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE;So;0;L;1D15F 1D172;;;;N;;;;;
+1D165;MUSICAL SYMBOL COMBINING STEM;Mc;216;L;;;;;N;;;;;
+1D166;MUSICAL SYMBOL COMBINING SPRECHGESANG STEM;Mc;216;L;;;;;N;;;;;
+1D167;MUSICAL SYMBOL COMBINING TREMOLO-1;Mn;1;NSM;;;;;N;;;;;
+1D168;MUSICAL SYMBOL COMBINING TREMOLO-2;Mn;1;NSM;;;;;N;;;;;
+1D169;MUSICAL SYMBOL COMBINING TREMOLO-3;Mn;1;NSM;;;;;N;;;;;
+1D16A;MUSICAL SYMBOL FINGERED TREMOLO-1;So;0;L;;;;;N;;;;;
+1D16B;MUSICAL SYMBOL FINGERED TREMOLO-2;So;0;L;;;;;N;;;;;
+1D16C;MUSICAL SYMBOL FINGERED TREMOLO-3;So;0;L;;;;;N;;;;;
+1D16D;MUSICAL SYMBOL COMBINING AUGMENTATION DOT;Mc;226;L;;;;;N;;;;;
+1D16E;MUSICAL SYMBOL COMBINING FLAG-1;Mc;216;L;;;;;N;;;;;
+1D16F;MUSICAL SYMBOL COMBINING FLAG-2;Mc;216;L;;;;;N;;;;;
+1D170;MUSICAL SYMBOL COMBINING FLAG-3;Mc;216;L;;;;;N;;;;;
+1D171;MUSICAL SYMBOL COMBINING FLAG-4;Mc;216;L;;;;;N;;;;;
+1D172;MUSICAL SYMBOL COMBINING FLAG-5;Mc;216;L;;;;;N;;;;;
+1D173;MUSICAL SYMBOL BEGIN BEAM;Cf;0;BN;;;;;N;;;;;
+1D174;MUSICAL SYMBOL END BEAM;Cf;0;BN;;;;;N;;;;;
+1D175;MUSICAL SYMBOL BEGIN TIE;Cf;0;BN;;;;;N;;;;;
+1D176;MUSICAL SYMBOL END TIE;Cf;0;BN;;;;;N;;;;;
+1D177;MUSICAL SYMBOL BEGIN SLUR;Cf;0;BN;;;;;N;;;;;
+1D178;MUSICAL SYMBOL END SLUR;Cf;0;BN;;;;;N;;;;;
+1D179;MUSICAL SYMBOL BEGIN PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17A;MUSICAL SYMBOL END PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17B;MUSICAL SYMBOL COMBINING ACCENT;Mn;220;NSM;;;;;N;;;;;
+1D17C;MUSICAL SYMBOL COMBINING STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D17D;MUSICAL SYMBOL COMBINING TENUTO;Mn;220;NSM;;;;;N;;;;;
+1D17E;MUSICAL SYMBOL COMBINING STACCATISSIMO;Mn;220;NSM;;;;;N;;;;;
+1D17F;MUSICAL SYMBOL COMBINING MARCATO;Mn;220;NSM;;;;;N;;;;;
+1D180;MUSICAL SYMBOL COMBINING MARCATO-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D181;MUSICAL SYMBOL COMBINING ACCENT-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D182;MUSICAL SYMBOL COMBINING LOURE;Mn;220;NSM;;;;;N;;;;;
+1D183;MUSICAL SYMBOL ARPEGGIATO UP;So;0;L;;;;;N;;;;;
+1D184;MUSICAL SYMBOL ARPEGGIATO DOWN;So;0;L;;;;;N;;;;;
+1D185;MUSICAL SYMBOL COMBINING DOIT;Mn;230;NSM;;;;;N;;;;;
+1D186;MUSICAL SYMBOL COMBINING RIP;Mn;230;NSM;;;;;N;;;;;
+1D187;MUSICAL SYMBOL COMBINING FLIP;Mn;230;NSM;;;;;N;;;;;
+1D188;MUSICAL SYMBOL COMBINING SMEAR;Mn;230;NSM;;;;;N;;;;;
+1D189;MUSICAL SYMBOL COMBINING BEND;Mn;230;NSM;;;;;N;;;;;
+1D18A;MUSICAL SYMBOL COMBINING DOUBLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18B;MUSICAL SYMBOL COMBINING TRIPLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18C;MUSICAL SYMBOL RINFORZANDO;So;0;L;;;;;N;;;;;
+1D18D;MUSICAL SYMBOL SUBITO;So;0;L;;;;;N;;;;;
+1D18E;MUSICAL SYMBOL Z;So;0;L;;;;;N;;;;;
+1D18F;MUSICAL SYMBOL PIANO;So;0;L;;;;;N;;;;;
+1D190;MUSICAL SYMBOL MEZZO;So;0;L;;;;;N;;;;;
+1D191;MUSICAL SYMBOL FORTE;So;0;L;;;;;N;;;;;
+1D192;MUSICAL SYMBOL CRESCENDO;So;0;L;;;;;N;;;;;
+1D193;MUSICAL SYMBOL DECRESCENDO;So;0;L;;;;;N;;;;;
+1D194;MUSICAL SYMBOL GRACE NOTE SLASH;So;0;L;;;;;N;;;;;
+1D195;MUSICAL SYMBOL GRACE NOTE NO SLASH;So;0;L;;;;;N;;;;;
+1D196;MUSICAL SYMBOL TR;So;0;L;;;;;N;;;;;
+1D197;MUSICAL SYMBOL TURN;So;0;L;;;;;N;;;;;
+1D198;MUSICAL SYMBOL INVERTED TURN;So;0;L;;;;;N;;;;;
+1D199;MUSICAL SYMBOL TURN SLASH;So;0;L;;;;;N;;;;;
+1D19A;MUSICAL SYMBOL TURN UP;So;0;L;;;;;N;;;;;
+1D19B;MUSICAL SYMBOL ORNAMENT STROKE-1;So;0;L;;;;;N;;;;;
+1D19C;MUSICAL SYMBOL ORNAMENT STROKE-2;So;0;L;;;;;N;;;;;
+1D19D;MUSICAL SYMBOL ORNAMENT STROKE-3;So;0;L;;;;;N;;;;;
+1D19E;MUSICAL SYMBOL ORNAMENT STROKE-4;So;0;L;;;;;N;;;;;
+1D19F;MUSICAL SYMBOL ORNAMENT STROKE-5;So;0;L;;;;;N;;;;;
+1D1A0;MUSICAL SYMBOL ORNAMENT STROKE-6;So;0;L;;;;;N;;;;;
+1D1A1;MUSICAL SYMBOL ORNAMENT STROKE-7;So;0;L;;;;;N;;;;;
+1D1A2;MUSICAL SYMBOL ORNAMENT STROKE-8;So;0;L;;;;;N;;;;;
+1D1A3;MUSICAL SYMBOL ORNAMENT STROKE-9;So;0;L;;;;;N;;;;;
+1D1A4;MUSICAL SYMBOL ORNAMENT STROKE-10;So;0;L;;;;;N;;;;;
+1D1A5;MUSICAL SYMBOL ORNAMENT STROKE-11;So;0;L;;;;;N;;;;;
+1D1A6;MUSICAL SYMBOL HAUPTSTIMME;So;0;L;;;;;N;;;;;
+1D1A7;MUSICAL SYMBOL NEBENSTIMME;So;0;L;;;;;N;;;;;
+1D1A8;MUSICAL SYMBOL END OF STIMME;So;0;L;;;;;N;;;;;
+1D1A9;MUSICAL SYMBOL DEGREE SLASH;So;0;L;;;;;N;;;;;
+1D1AA;MUSICAL SYMBOL COMBINING DOWN BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AB;MUSICAL SYMBOL COMBINING UP BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AC;MUSICAL SYMBOL COMBINING HARMONIC;Mn;230;NSM;;;;;N;;;;;
+1D1AD;MUSICAL SYMBOL COMBINING SNAP PIZZICATO;Mn;230;NSM;;;;;N;;;;;
+1D1AE;MUSICAL SYMBOL PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1AF;MUSICAL SYMBOL PEDAL UP MARK;So;0;L;;;;;N;;;;;
+1D1B0;MUSICAL SYMBOL HALF PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1B1;MUSICAL SYMBOL GLISSANDO UP;So;0;L;;;;;N;;;;;
+1D1B2;MUSICAL SYMBOL GLISSANDO DOWN;So;0;L;;;;;N;;;;;
+1D1B3;MUSICAL SYMBOL WITH FINGERNAILS;So;0;L;;;;;N;;;;;
+1D1B4;MUSICAL SYMBOL DAMP;So;0;L;;;;;N;;;;;
+1D1B5;MUSICAL SYMBOL DAMP ALL;So;0;L;;;;;N;;;;;
+1D1B6;MUSICAL SYMBOL MAXIMA;So;0;L;;;;;N;;;;;
+1D1B7;MUSICAL SYMBOL LONGA;So;0;L;;;;;N;;;;;
+1D1B8;MUSICAL SYMBOL BREVIS;So;0;L;;;;;N;;;;;
+1D1B9;MUSICAL SYMBOL SEMIBREVIS WHITE;So;0;L;;;;;N;;;;;
+1D1BA;MUSICAL SYMBOL SEMIBREVIS BLACK;So;0;L;;;;;N;;;;;
+1D1BB;MUSICAL SYMBOL MINIMA;So;0;L;1D1B9 1D165;;;;N;;;;;
+1D1BC;MUSICAL SYMBOL MINIMA BLACK;So;0;L;1D1BA 1D165;;;;N;;;;;
+1D1BD;MUSICAL SYMBOL SEMIMINIMA WHITE;So;0;L;1D1BB 1D16E;;;;N;;;;;
+1D1BE;MUSICAL SYMBOL SEMIMINIMA BLACK;So;0;L;1D1BC 1D16E;;;;N;;;;;
+1D1BF;MUSICAL SYMBOL FUSA WHITE;So;0;L;1D1BB 1D16F;;;;N;;;;;
+1D1C0;MUSICAL SYMBOL FUSA BLACK;So;0;L;1D1BC 1D16F;;;;N;;;;;
+1D1C1;MUSICAL SYMBOL LONGA PERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C2;MUSICAL SYMBOL LONGA IMPERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C3;MUSICAL SYMBOL BREVIS REST;So;0;L;;;;;N;;;;;
+1D1C4;MUSICAL SYMBOL SEMIBREVIS REST;So;0;L;;;;;N;;;;;
+1D1C5;MUSICAL SYMBOL MINIMA REST;So;0;L;;;;;N;;;;;
+1D1C6;MUSICAL SYMBOL SEMIMINIMA REST;So;0;L;;;;;N;;;;;
+1D1C7;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1C8;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1C9;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CA;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1CB;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1CC;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CD;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2;So;0;L;;;;;N;;;;;
+1D1CE;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3;So;0;L;;;;;N;;;;;
+1D1CF;MUSICAL SYMBOL CROIX;So;0;L;;;;;N;;;;;
+1D1D0;MUSICAL SYMBOL GREGORIAN C CLEF;So;0;L;;;;;N;;;;;
+1D1D1;MUSICAL SYMBOL GREGORIAN F CLEF;So;0;L;;;;;N;;;;;
+1D1D2;MUSICAL SYMBOL SQUARE B;So;0;L;;;;;N;;;;;
+1D1D3;MUSICAL SYMBOL VIRGA;So;0;L;;;;;N;;;;;
+1D1D4;MUSICAL SYMBOL PODATUS;So;0;L;;;;;N;;;;;
+1D1D5;MUSICAL SYMBOL CLIVIS;So;0;L;;;;;N;;;;;
+1D1D6;MUSICAL SYMBOL SCANDICUS;So;0;L;;;;;N;;;;;
+1D1D7;MUSICAL SYMBOL CLIMACUS;So;0;L;;;;;N;;;;;
+1D1D8;MUSICAL SYMBOL TORCULUS;So;0;L;;;;;N;;;;;
+1D1D9;MUSICAL SYMBOL PORRECTUS;So;0;L;;;;;N;;;;;
+1D1DA;MUSICAL SYMBOL PORRECTUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DB;MUSICAL SYMBOL SCANDICUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DC;MUSICAL SYMBOL TORCULUS RESUPINUS;So;0;L;;;;;N;;;;;
+1D1DD;MUSICAL SYMBOL PES SUBPUNCTIS;So;0;L;;;;;N;;;;;
+1D1DE;MUSICAL SYMBOL KIEVAN C CLEF;So;0;L;;;;;N;;;;;
+1D1DF;MUSICAL SYMBOL KIEVAN END OF PIECE;So;0;L;;;;;N;;;;;
+1D1E0;MUSICAL SYMBOL KIEVAN FINAL NOTE;So;0;L;;;;;N;;;;;
+1D1E1;MUSICAL SYMBOL KIEVAN RECITATIVE MARK;So;0;L;;;;;N;;;;;
+1D1E2;MUSICAL SYMBOL KIEVAN WHOLE NOTE;So;0;L;;;;;N;;;;;
+1D1E3;MUSICAL SYMBOL KIEVAN HALF NOTE;So;0;L;;;;;N;;;;;
+1D1E4;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM DOWN;So;0;L;;;;;N;;;;;
+1D1E5;MUSICAL SYMBOL KIEVAN QUARTER NOTE STEM UP;So;0;L;;;;;N;;;;;
+1D1E6;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM DOWN;So;0;L;;;;;N;;;;;
+1D1E7;MUSICAL SYMBOL KIEVAN EIGHTH NOTE STEM UP;So;0;L;;;;;N;;;;;
+1D1E8;MUSICAL SYMBOL KIEVAN FLAT SIGN;So;0;L;;;;;N;;;;;
+1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;;
+1D203;GREEK VOCAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D204;GREEK VOCAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D205;GREEK VOCAL NOTATION SYMBOL-6;So;0;ON;;;;;N;;;;;
+1D206;GREEK VOCAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D207;GREEK VOCAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D208;GREEK VOCAL NOTATION SYMBOL-9;So;0;ON;;;;;N;;;;;
+1D209;GREEK VOCAL NOTATION SYMBOL-10;So;0;ON;;;;;N;;;;;
+1D20A;GREEK VOCAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D20B;GREEK VOCAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D20C;GREEK VOCAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D20D;GREEK VOCAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D20E;GREEK VOCAL NOTATION SYMBOL-15;So;0;ON;;;;;N;;;;;
+1D20F;GREEK VOCAL NOTATION SYMBOL-16;So;0;ON;;;;;N;;;;;
+1D210;GREEK VOCAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D211;GREEK VOCAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D212;GREEK VOCAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D213;GREEK VOCAL NOTATION SYMBOL-20;So;0;ON;;;;;N;;;;;
+1D214;GREEK VOCAL NOTATION SYMBOL-21;So;0;ON;;;;;N;;;;;
+1D215;GREEK VOCAL NOTATION SYMBOL-22;So;0;ON;;;;;N;;;;;
+1D216;GREEK VOCAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D217;GREEK VOCAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D218;GREEK VOCAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D219;GREEK VOCAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D21A;GREEK VOCAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D21B;GREEK VOCAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D21C;GREEK VOCAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D21D;GREEK INSTRUMENTAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D21E;GREEK INSTRUMENTAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D21F;GREEK INSTRUMENTAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D220;GREEK INSTRUMENTAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D221;GREEK INSTRUMENTAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D222;GREEK INSTRUMENTAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D223;GREEK INSTRUMENTAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D224;GREEK INSTRUMENTAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D225;GREEK INSTRUMENTAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D226;GREEK INSTRUMENTAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D227;GREEK INSTRUMENTAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D228;GREEK INSTRUMENTAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D229;GREEK INSTRUMENTAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D22A;GREEK INSTRUMENTAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D22B;GREEK INSTRUMENTAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D22C;GREEK INSTRUMENTAL NOTATION SYMBOL-25;So;0;ON;;;;;N;;;;;
+1D22D;GREEK INSTRUMENTAL NOTATION SYMBOL-26;So;0;ON;;;;;N;;;;;
+1D22E;GREEK INSTRUMENTAL NOTATION SYMBOL-27;So;0;ON;;;;;N;;;;;
+1D22F;GREEK INSTRUMENTAL NOTATION SYMBOL-29;So;0;ON;;;;;N;;;;;
+1D230;GREEK INSTRUMENTAL NOTATION SYMBOL-30;So;0;ON;;;;;N;;;;;
+1D231;GREEK INSTRUMENTAL NOTATION SYMBOL-32;So;0;ON;;;;;N;;;;;
+1D232;GREEK INSTRUMENTAL NOTATION SYMBOL-36;So;0;ON;;;;;N;;;;;
+1D233;GREEK INSTRUMENTAL NOTATION SYMBOL-37;So;0;ON;;;;;N;;;;;
+1D234;GREEK INSTRUMENTAL NOTATION SYMBOL-38;So;0;ON;;;;;N;;;;;
+1D235;GREEK INSTRUMENTAL NOTATION SYMBOL-39;So;0;ON;;;;;N;;;;;
+1D236;GREEK INSTRUMENTAL NOTATION SYMBOL-40;So;0;ON;;;;;N;;;;;
+1D237;GREEK INSTRUMENTAL NOTATION SYMBOL-42;So;0;ON;;;;;N;;;;;
+1D238;GREEK INSTRUMENTAL NOTATION SYMBOL-43;So;0;ON;;;;;N;;;;;
+1D239;GREEK INSTRUMENTAL NOTATION SYMBOL-45;So;0;ON;;;;;N;;;;;
+1D23A;GREEK INSTRUMENTAL NOTATION SYMBOL-47;So;0;ON;;;;;N;;;;;
+1D23B;GREEK INSTRUMENTAL NOTATION SYMBOL-48;So;0;ON;;;;;N;;;;;
+1D23C;GREEK INSTRUMENTAL NOTATION SYMBOL-49;So;0;ON;;;;;N;;;;;
+1D23D;GREEK INSTRUMENTAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D23E;GREEK INSTRUMENTAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D23F;GREEK INSTRUMENTAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D240;GREEK INSTRUMENTAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D241;GREEK INSTRUMENTAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D242;COMBINING GREEK MUSICAL TRISEME;Mn;230;NSM;;;;;N;;;;;
+1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
+1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
+1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
+1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;;
+1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;;
+1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;;;;
+1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;;;;
+1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;;
+1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;;
+1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;;
+1D309;TETRAGRAM FOR BARRIER;So;0;ON;;;;;N;;;;;
+1D30A;TETRAGRAM FOR KEEPING SMALL;So;0;ON;;;;;N;;;;;
+1D30B;TETRAGRAM FOR CONTRARIETY;So;0;ON;;;;;N;;;;;
+1D30C;TETRAGRAM FOR ASCENT;So;0;ON;;;;;N;;;;;
+1D30D;TETRAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+1D30E;TETRAGRAM FOR BRANCHING OUT;So;0;ON;;;;;N;;;;;
+1D30F;TETRAGRAM FOR DEFECTIVENESS OR DISTORTION;So;0;ON;;;;;N;;;;;
+1D310;TETRAGRAM FOR DIVERGENCE;So;0;ON;;;;;N;;;;;
+1D311;TETRAGRAM FOR YOUTHFULNESS;So;0;ON;;;;;N;;;;;
+1D312;TETRAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+1D313;TETRAGRAM FOR PENETRATION;So;0;ON;;;;;N;;;;;
+1D314;TETRAGRAM FOR REACH;So;0;ON;;;;;N;;;;;
+1D315;TETRAGRAM FOR CONTACT;So;0;ON;;;;;N;;;;;
+1D316;TETRAGRAM FOR HOLDING BACK;So;0;ON;;;;;N;;;;;
+1D317;TETRAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+1D318;TETRAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+1D319;TETRAGRAM FOR ADVANCE;So;0;ON;;;;;N;;;;;
+1D31A;TETRAGRAM FOR RELEASE;So;0;ON;;;;;N;;;;;
+1D31B;TETRAGRAM FOR RESISTANCE;So;0;ON;;;;;N;;;;;
+1D31C;TETRAGRAM FOR EASE;So;0;ON;;;;;N;;;;;
+1D31D;TETRAGRAM FOR JOY;So;0;ON;;;;;N;;;;;
+1D31E;TETRAGRAM FOR CONTENTION;So;0;ON;;;;;N;;;;;
+1D31F;TETRAGRAM FOR ENDEAVOUR;So;0;ON;;;;;N;;;;;
+1D320;TETRAGRAM FOR DUTIES;So;0;ON;;;;;N;;;;;
+1D321;TETRAGRAM FOR CHANGE;So;0;ON;;;;;N;;;;;
+1D322;TETRAGRAM FOR DECISIVENESS;So;0;ON;;;;;N;;;;;
+1D323;TETRAGRAM FOR BOLD RESOLUTION;So;0;ON;;;;;N;;;;;
+1D324;TETRAGRAM FOR PACKING;So;0;ON;;;;;N;;;;;
+1D325;TETRAGRAM FOR LEGION;So;0;ON;;;;;N;;;;;
+1D326;TETRAGRAM FOR CLOSENESS;So;0;ON;;;;;N;;;;;
+1D327;TETRAGRAM FOR KINSHIP;So;0;ON;;;;;N;;;;;
+1D328;TETRAGRAM FOR GATHERING;So;0;ON;;;;;N;;;;;
+1D329;TETRAGRAM FOR STRENGTH;So;0;ON;;;;;N;;;;;
+1D32A;TETRAGRAM FOR PURITY;So;0;ON;;;;;N;;;;;
+1D32B;TETRAGRAM FOR FULLNESS;So;0;ON;;;;;N;;;;;
+1D32C;TETRAGRAM FOR RESIDENCE;So;0;ON;;;;;N;;;;;
+1D32D;TETRAGRAM FOR LAW OR MODEL;So;0;ON;;;;;N;;;;;
+1D32E;TETRAGRAM FOR RESPONSE;So;0;ON;;;;;N;;;;;
+1D32F;TETRAGRAM FOR GOING TO MEET;So;0;ON;;;;;N;;;;;
+1D330;TETRAGRAM FOR ENCOUNTERS;So;0;ON;;;;;N;;;;;
+1D331;TETRAGRAM FOR STOVE;So;0;ON;;;;;N;;;;;
+1D332;TETRAGRAM FOR GREATNESS;So;0;ON;;;;;N;;;;;
+1D333;TETRAGRAM FOR ENLARGEMENT;So;0;ON;;;;;N;;;;;
+1D334;TETRAGRAM FOR PATTERN;So;0;ON;;;;;N;;;;;
+1D335;TETRAGRAM FOR RITUAL;So;0;ON;;;;;N;;;;;
+1D336;TETRAGRAM FOR FLIGHT;So;0;ON;;;;;N;;;;;
+1D337;TETRAGRAM FOR VASTNESS OR WASTING;So;0;ON;;;;;N;;;;;
+1D338;TETRAGRAM FOR CONSTANCY;So;0;ON;;;;;N;;;;;
+1D339;TETRAGRAM FOR MEASURE;So;0;ON;;;;;N;;;;;
+1D33A;TETRAGRAM FOR ETERNITY;So;0;ON;;;;;N;;;;;
+1D33B;TETRAGRAM FOR UNITY;So;0;ON;;;;;N;;;;;
+1D33C;TETRAGRAM FOR DIMINISHMENT;So;0;ON;;;;;N;;;;;
+1D33D;TETRAGRAM FOR CLOSED MOUTH;So;0;ON;;;;;N;;;;;
+1D33E;TETRAGRAM FOR GUARDEDNESS;So;0;ON;;;;;N;;;;;
+1D33F;TETRAGRAM FOR GATHERING IN;So;0;ON;;;;;N;;;;;
+1D340;TETRAGRAM FOR MASSING;So;0;ON;;;;;N;;;;;
+1D341;TETRAGRAM FOR ACCUMULATION;So;0;ON;;;;;N;;;;;
+1D342;TETRAGRAM FOR EMBELLISHMENT;So;0;ON;;;;;N;;;;;
+1D343;TETRAGRAM FOR DOUBT;So;0;ON;;;;;N;;;;;
+1D344;TETRAGRAM FOR WATCH;So;0;ON;;;;;N;;;;;
+1D345;TETRAGRAM FOR SINKING;So;0;ON;;;;;N;;;;;
+1D346;TETRAGRAM FOR INNER;So;0;ON;;;;;N;;;;;
+1D347;TETRAGRAM FOR DEPARTURE;So;0;ON;;;;;N;;;;;
+1D348;TETRAGRAM FOR DARKENING;So;0;ON;;;;;N;;;;;
+1D349;TETRAGRAM FOR DIMMING;So;0;ON;;;;;N;;;;;
+1D34A;TETRAGRAM FOR EXHAUSTION;So;0;ON;;;;;N;;;;;
+1D34B;TETRAGRAM FOR SEVERANCE;So;0;ON;;;;;N;;;;;
+1D34C;TETRAGRAM FOR STOPPAGE;So;0;ON;;;;;N;;;;;
+1D34D;TETRAGRAM FOR HARDNESS;So;0;ON;;;;;N;;;;;
+1D34E;TETRAGRAM FOR COMPLETION;So;0;ON;;;;;N;;;;;
+1D34F;TETRAGRAM FOR CLOSURE;So;0;ON;;;;;N;;;;;
+1D350;TETRAGRAM FOR FAILURE;So;0;ON;;;;;N;;;;;
+1D351;TETRAGRAM FOR AGGRAVATION;So;0;ON;;;;;N;;;;;
+1D352;TETRAGRAM FOR COMPLIANCE;So;0;ON;;;;;N;;;;;
+1D353;TETRAGRAM FOR ON THE VERGE;So;0;ON;;;;;N;;;;;
+1D354;TETRAGRAM FOR DIFFICULTIES;So;0;ON;;;;;N;;;;;
+1D355;TETRAGRAM FOR LABOURING;So;0;ON;;;;;N;;;;;
+1D356;TETRAGRAM FOR FOSTERING;So;0;ON;;;;;N;;;;;
+1D360;COUNTING ROD UNIT DIGIT ONE;No;0;L;;;;1;N;;;;;
+1D361;COUNTING ROD UNIT DIGIT TWO;No;0;L;;;;2;N;;;;;
+1D362;COUNTING ROD UNIT DIGIT THREE;No;0;L;;;;3;N;;;;;
+1D363;COUNTING ROD UNIT DIGIT FOUR;No;0;L;;;;4;N;;;;;
+1D364;COUNTING ROD UNIT DIGIT FIVE;No;0;L;;;;5;N;;;;;
+1D365;COUNTING ROD UNIT DIGIT SIX;No;0;L;;;;6;N;;;;;
+1D366;COUNTING ROD UNIT DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+1D367;COUNTING ROD UNIT DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+1D368;COUNTING ROD UNIT DIGIT NINE;No;0;L;;;;9;N;;;;;
+1D369;COUNTING ROD TENS DIGIT ONE;No;0;L;;;;10;N;;;;;
+1D36A;COUNTING ROD TENS DIGIT TWO;No;0;L;;;;20;N;;;;;
+1D36B;COUNTING ROD TENS DIGIT THREE;No;0;L;;;;30;N;;;;;
+1D36C;COUNTING ROD TENS DIGIT FOUR;No;0;L;;;;40;N;;;;;
+1D36D;COUNTING ROD TENS DIGIT FIVE;No;0;L;;;;50;N;;;;;
+1D36E;COUNTING ROD TENS DIGIT SIX;No;0;L;;;;60;N;;;;;
+1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
+1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
+1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
+1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D403;MATHEMATICAL BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D404;MATHEMATICAL BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D405;MATHEMATICAL BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D406;MATHEMATICAL BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D407;MATHEMATICAL BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D408;MATHEMATICAL BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D409;MATHEMATICAL BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D40A;MATHEMATICAL BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D40B;MATHEMATICAL BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D40C;MATHEMATICAL BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D40D;MATHEMATICAL BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D40E;MATHEMATICAL BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D40F;MATHEMATICAL BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D410;MATHEMATICAL BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D411;MATHEMATICAL BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D412;MATHEMATICAL BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D413;MATHEMATICAL BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D414;MATHEMATICAL BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D415;MATHEMATICAL BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D416;MATHEMATICAL BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D417;MATHEMATICAL BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D418;MATHEMATICAL BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D419;MATHEMATICAL BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D41A;MATHEMATICAL BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D41B;MATHEMATICAL BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D41C;MATHEMATICAL BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D41D;MATHEMATICAL BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D41E;MATHEMATICAL BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D41F;MATHEMATICAL BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D420;MATHEMATICAL BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D421;MATHEMATICAL BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D422;MATHEMATICAL BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D423;MATHEMATICAL BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D424;MATHEMATICAL BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D425;MATHEMATICAL BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D426;MATHEMATICAL BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D427;MATHEMATICAL BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D428;MATHEMATICAL BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D429;MATHEMATICAL BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D42A;MATHEMATICAL BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D42B;MATHEMATICAL BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D42C;MATHEMATICAL BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D42D;MATHEMATICAL BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D42E;MATHEMATICAL BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D42F;MATHEMATICAL BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D430;MATHEMATICAL BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D431;MATHEMATICAL BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D432;MATHEMATICAL BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D433;MATHEMATICAL BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D434;MATHEMATICAL ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D435;MATHEMATICAL ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D436;MATHEMATICAL ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D437;MATHEMATICAL ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D438;MATHEMATICAL ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D439;MATHEMATICAL ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D43A;MATHEMATICAL ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D43B;MATHEMATICAL ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D43C;MATHEMATICAL ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D43D;MATHEMATICAL ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D43E;MATHEMATICAL ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D43F;MATHEMATICAL ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D440;MATHEMATICAL ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D441;MATHEMATICAL ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D442;MATHEMATICAL ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D443;MATHEMATICAL ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D444;MATHEMATICAL ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D445;MATHEMATICAL ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D446;MATHEMATICAL ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D447;MATHEMATICAL ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D448;MATHEMATICAL ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D449;MATHEMATICAL ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D44A;MATHEMATICAL ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D44B;MATHEMATICAL ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D44C;MATHEMATICAL ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D44D;MATHEMATICAL ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D44E;MATHEMATICAL ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D44F;MATHEMATICAL ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D450;MATHEMATICAL ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D451;MATHEMATICAL ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D452;MATHEMATICAL ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D453;MATHEMATICAL ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D454;MATHEMATICAL ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D456;MATHEMATICAL ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D457;MATHEMATICAL ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D458;MATHEMATICAL ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D459;MATHEMATICAL ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D45A;MATHEMATICAL ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D45B;MATHEMATICAL ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D45C;MATHEMATICAL ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D45D;MATHEMATICAL ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D45E;MATHEMATICAL ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D45F;MATHEMATICAL ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D460;MATHEMATICAL ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D461;MATHEMATICAL ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D462;MATHEMATICAL ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D463;MATHEMATICAL ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D464;MATHEMATICAL ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D465;MATHEMATICAL ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D466;MATHEMATICAL ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D467;MATHEMATICAL ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D468;MATHEMATICAL BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D469;MATHEMATICAL BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D46A;MATHEMATICAL BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D46B;MATHEMATICAL BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D46C;MATHEMATICAL BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D46D;MATHEMATICAL BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D46E;MATHEMATICAL BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D46F;MATHEMATICAL BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D470;MATHEMATICAL BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D471;MATHEMATICAL BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D472;MATHEMATICAL BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D473;MATHEMATICAL BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D474;MATHEMATICAL BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D475;MATHEMATICAL BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D476;MATHEMATICAL BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D477;MATHEMATICAL BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D478;MATHEMATICAL BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D479;MATHEMATICAL BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D47A;MATHEMATICAL BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D47B;MATHEMATICAL BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D47C;MATHEMATICAL BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D47D;MATHEMATICAL BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D47E;MATHEMATICAL BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D47F;MATHEMATICAL BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D480;MATHEMATICAL BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D481;MATHEMATICAL BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D482;MATHEMATICAL BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D483;MATHEMATICAL BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D484;MATHEMATICAL BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D485;MATHEMATICAL BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D486;MATHEMATICAL BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D487;MATHEMATICAL BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D488;MATHEMATICAL BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D489;MATHEMATICAL BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D48A;MATHEMATICAL BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D48B;MATHEMATICAL BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D48C;MATHEMATICAL BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D48D;MATHEMATICAL BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D48E;MATHEMATICAL BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D48F;MATHEMATICAL BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D490;MATHEMATICAL BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D491;MATHEMATICAL BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D492;MATHEMATICAL BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D493;MATHEMATICAL BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D494;MATHEMATICAL BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D495;MATHEMATICAL BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D496;MATHEMATICAL BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D497;MATHEMATICAL BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D498;MATHEMATICAL BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D499;MATHEMATICAL BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D49A;MATHEMATICAL BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D49B;MATHEMATICAL BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D49C;MATHEMATICAL SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D49E;MATHEMATICAL SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D49F;MATHEMATICAL SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4A2;MATHEMATICAL SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4A5;MATHEMATICAL SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4A6;MATHEMATICAL SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4A9;MATHEMATICAL SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4AA;MATHEMATICAL SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4AB;MATHEMATICAL SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4AC;MATHEMATICAL SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4AE;MATHEMATICAL SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4AF;MATHEMATICAL SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4B0;MATHEMATICAL SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4B1;MATHEMATICAL SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4B2;MATHEMATICAL SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4B3;MATHEMATICAL SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4B4;MATHEMATICAL SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4B5;MATHEMATICAL SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4B6;MATHEMATICAL SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4B7;MATHEMATICAL SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4B8;MATHEMATICAL SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4B9;MATHEMATICAL SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4BB;MATHEMATICAL SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4BD;MATHEMATICAL SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4BE;MATHEMATICAL SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4BF;MATHEMATICAL SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4C0;MATHEMATICAL SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4C1;MATHEMATICAL SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4C2;MATHEMATICAL SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4C3;MATHEMATICAL SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4C5;MATHEMATICAL SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4C6;MATHEMATICAL SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4C7;MATHEMATICAL SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4C8;MATHEMATICAL SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4C9;MATHEMATICAL SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4CA;MATHEMATICAL SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4CB;MATHEMATICAL SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D4CC;MATHEMATICAL SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D4CD;MATHEMATICAL SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D4CE;MATHEMATICAL SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D4CF;MATHEMATICAL SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D4D0;MATHEMATICAL BOLD SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D4D1;MATHEMATICAL BOLD SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D4D2;MATHEMATICAL BOLD SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D4D3;MATHEMATICAL BOLD SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4D4;MATHEMATICAL BOLD SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D4D5;MATHEMATICAL BOLD SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D4D6;MATHEMATICAL BOLD SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4D7;MATHEMATICAL BOLD SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D4D8;MATHEMATICAL BOLD SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D4D9;MATHEMATICAL BOLD SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4DA;MATHEMATICAL BOLD SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4DB;MATHEMATICAL BOLD SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D4DC;MATHEMATICAL BOLD SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D4DD;MATHEMATICAL BOLD SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4DE;MATHEMATICAL BOLD SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4DF;MATHEMATICAL BOLD SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4E0;MATHEMATICAL BOLD SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4E1;MATHEMATICAL BOLD SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D4E2;MATHEMATICAL BOLD SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4E3;MATHEMATICAL BOLD SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4E4;MATHEMATICAL BOLD SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4E5;MATHEMATICAL BOLD SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4E6;MATHEMATICAL BOLD SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4E7;MATHEMATICAL BOLD SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4E8;MATHEMATICAL BOLD SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4E9;MATHEMATICAL BOLD SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4EA;MATHEMATICAL BOLD SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4EB;MATHEMATICAL BOLD SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4EC;MATHEMATICAL BOLD SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4ED;MATHEMATICAL BOLD SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4EE;MATHEMATICAL BOLD SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D4EF;MATHEMATICAL BOLD SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4F0;MATHEMATICAL BOLD SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D4F1;MATHEMATICAL BOLD SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4F2;MATHEMATICAL BOLD SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4F3;MATHEMATICAL BOLD SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4F4;MATHEMATICAL BOLD SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4F5;MATHEMATICAL BOLD SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4F6;MATHEMATICAL BOLD SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4F7;MATHEMATICAL BOLD SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4F8;MATHEMATICAL BOLD SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D4F9;MATHEMATICAL BOLD SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4FA;MATHEMATICAL BOLD SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4FB;MATHEMATICAL BOLD SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4FC;MATHEMATICAL BOLD SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4FD;MATHEMATICAL BOLD SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4FE;MATHEMATICAL BOLD SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4FF;MATHEMATICAL BOLD SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D500;MATHEMATICAL BOLD SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D501;MATHEMATICAL BOLD SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D502;MATHEMATICAL BOLD SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D503;MATHEMATICAL BOLD SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D504;MATHEMATICAL FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D505;MATHEMATICAL FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D507;MATHEMATICAL FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D508;MATHEMATICAL FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D509;MATHEMATICAL FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D50A;MATHEMATICAL FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D50D;MATHEMATICAL FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D50E;MATHEMATICAL FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D50F;MATHEMATICAL FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D510;MATHEMATICAL FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D511;MATHEMATICAL FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D512;MATHEMATICAL FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D513;MATHEMATICAL FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D514;MATHEMATICAL FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D516;MATHEMATICAL FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D517;MATHEMATICAL FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D518;MATHEMATICAL FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D519;MATHEMATICAL FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D51A;MATHEMATICAL FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D51B;MATHEMATICAL FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D51C;MATHEMATICAL FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D51E;MATHEMATICAL FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D51F;MATHEMATICAL FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D520;MATHEMATICAL FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D521;MATHEMATICAL FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D522;MATHEMATICAL FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D523;MATHEMATICAL FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D524;MATHEMATICAL FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D525;MATHEMATICAL FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D526;MATHEMATICAL FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D527;MATHEMATICAL FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D528;MATHEMATICAL FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D529;MATHEMATICAL FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D52A;MATHEMATICAL FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D52B;MATHEMATICAL FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D52C;MATHEMATICAL FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D52D;MATHEMATICAL FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D52E;MATHEMATICAL FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D52F;MATHEMATICAL FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D530;MATHEMATICAL FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D531;MATHEMATICAL FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D532;MATHEMATICAL FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D533;MATHEMATICAL FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D534;MATHEMATICAL FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D535;MATHEMATICAL FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D536;MATHEMATICAL FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D537;MATHEMATICAL FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D538;MATHEMATICAL DOUBLE-STRUCK CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D539;MATHEMATICAL DOUBLE-STRUCK CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D53B;MATHEMATICAL DOUBLE-STRUCK CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D53C;MATHEMATICAL DOUBLE-STRUCK CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D53D;MATHEMATICAL DOUBLE-STRUCK CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D53E;MATHEMATICAL DOUBLE-STRUCK CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D540;MATHEMATICAL DOUBLE-STRUCK CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D541;MATHEMATICAL DOUBLE-STRUCK CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D542;MATHEMATICAL DOUBLE-STRUCK CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D543;MATHEMATICAL DOUBLE-STRUCK CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D544;MATHEMATICAL DOUBLE-STRUCK CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D546;MATHEMATICAL DOUBLE-STRUCK CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D54A;MATHEMATICAL DOUBLE-STRUCK CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D54B;MATHEMATICAL DOUBLE-STRUCK CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D54C;MATHEMATICAL DOUBLE-STRUCK CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D54D;MATHEMATICAL DOUBLE-STRUCK CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D54E;MATHEMATICAL DOUBLE-STRUCK CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D54F;MATHEMATICAL DOUBLE-STRUCK CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D550;MATHEMATICAL DOUBLE-STRUCK CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D552;MATHEMATICAL DOUBLE-STRUCK SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D553;MATHEMATICAL DOUBLE-STRUCK SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D554;MATHEMATICAL DOUBLE-STRUCK SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D555;MATHEMATICAL DOUBLE-STRUCK SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D556;MATHEMATICAL DOUBLE-STRUCK SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D557;MATHEMATICAL DOUBLE-STRUCK SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D558;MATHEMATICAL DOUBLE-STRUCK SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D559;MATHEMATICAL DOUBLE-STRUCK SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D55A;MATHEMATICAL DOUBLE-STRUCK SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D55B;MATHEMATICAL DOUBLE-STRUCK SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D55C;MATHEMATICAL DOUBLE-STRUCK SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D55D;MATHEMATICAL DOUBLE-STRUCK SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D55E;MATHEMATICAL DOUBLE-STRUCK SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D55F;MATHEMATICAL DOUBLE-STRUCK SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D560;MATHEMATICAL DOUBLE-STRUCK SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D561;MATHEMATICAL DOUBLE-STRUCK SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D562;MATHEMATICAL DOUBLE-STRUCK SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D563;MATHEMATICAL DOUBLE-STRUCK SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D564;MATHEMATICAL DOUBLE-STRUCK SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D565;MATHEMATICAL DOUBLE-STRUCK SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D566;MATHEMATICAL DOUBLE-STRUCK SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D567;MATHEMATICAL DOUBLE-STRUCK SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D568;MATHEMATICAL DOUBLE-STRUCK SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D569;MATHEMATICAL DOUBLE-STRUCK SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D56A;MATHEMATICAL DOUBLE-STRUCK SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D56B;MATHEMATICAL DOUBLE-STRUCK SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D56C;MATHEMATICAL BOLD FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D56D;MATHEMATICAL BOLD FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D56E;MATHEMATICAL BOLD FRAKTUR CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D56F;MATHEMATICAL BOLD FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D570;MATHEMATICAL BOLD FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D571;MATHEMATICAL BOLD FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D572;MATHEMATICAL BOLD FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D573;MATHEMATICAL BOLD FRAKTUR CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D574;MATHEMATICAL BOLD FRAKTUR CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D575;MATHEMATICAL BOLD FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D576;MATHEMATICAL BOLD FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D577;MATHEMATICAL BOLD FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D578;MATHEMATICAL BOLD FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D579;MATHEMATICAL BOLD FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D57A;MATHEMATICAL BOLD FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D57B;MATHEMATICAL BOLD FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D57C;MATHEMATICAL BOLD FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D57D;MATHEMATICAL BOLD FRAKTUR CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D57E;MATHEMATICAL BOLD FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D57F;MATHEMATICAL BOLD FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D580;MATHEMATICAL BOLD FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D581;MATHEMATICAL BOLD FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D582;MATHEMATICAL BOLD FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D583;MATHEMATICAL BOLD FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D584;MATHEMATICAL BOLD FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D585;MATHEMATICAL BOLD FRAKTUR CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D586;MATHEMATICAL BOLD FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D587;MATHEMATICAL BOLD FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D588;MATHEMATICAL BOLD FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D589;MATHEMATICAL BOLD FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D58A;MATHEMATICAL BOLD FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D58B;MATHEMATICAL BOLD FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D58C;MATHEMATICAL BOLD FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D58D;MATHEMATICAL BOLD FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D58E;MATHEMATICAL BOLD FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D58F;MATHEMATICAL BOLD FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D590;MATHEMATICAL BOLD FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D591;MATHEMATICAL BOLD FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D592;MATHEMATICAL BOLD FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D593;MATHEMATICAL BOLD FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D594;MATHEMATICAL BOLD FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D595;MATHEMATICAL BOLD FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D596;MATHEMATICAL BOLD FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D597;MATHEMATICAL BOLD FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D598;MATHEMATICAL BOLD FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D599;MATHEMATICAL BOLD FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D59A;MATHEMATICAL BOLD FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D59B;MATHEMATICAL BOLD FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D59C;MATHEMATICAL BOLD FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D59D;MATHEMATICAL BOLD FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D59E;MATHEMATICAL BOLD FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D59F;MATHEMATICAL BOLD FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5A0;MATHEMATICAL SANS-SERIF CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5A1;MATHEMATICAL SANS-SERIF CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5A2;MATHEMATICAL SANS-SERIF CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5A3;MATHEMATICAL SANS-SERIF CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5A4;MATHEMATICAL SANS-SERIF CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5A5;MATHEMATICAL SANS-SERIF CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5A6;MATHEMATICAL SANS-SERIF CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5A7;MATHEMATICAL SANS-SERIF CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5A8;MATHEMATICAL SANS-SERIF CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5A9;MATHEMATICAL SANS-SERIF CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5AA;MATHEMATICAL SANS-SERIF CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5AB;MATHEMATICAL SANS-SERIF CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5AC;MATHEMATICAL SANS-SERIF CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5AD;MATHEMATICAL SANS-SERIF CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5AE;MATHEMATICAL SANS-SERIF CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5AF;MATHEMATICAL SANS-SERIF CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5B0;MATHEMATICAL SANS-SERIF CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5B1;MATHEMATICAL SANS-SERIF CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5B2;MATHEMATICAL SANS-SERIF CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5B3;MATHEMATICAL SANS-SERIF CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5B4;MATHEMATICAL SANS-SERIF CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5B5;MATHEMATICAL SANS-SERIF CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5B6;MATHEMATICAL SANS-SERIF CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5B7;MATHEMATICAL SANS-SERIF CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5B8;MATHEMATICAL SANS-SERIF CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5B9;MATHEMATICAL SANS-SERIF CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5BA;MATHEMATICAL SANS-SERIF SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5BB;MATHEMATICAL SANS-SERIF SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5BC;MATHEMATICAL SANS-SERIF SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5BD;MATHEMATICAL SANS-SERIF SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5BE;MATHEMATICAL SANS-SERIF SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5BF;MATHEMATICAL SANS-SERIF SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5C0;MATHEMATICAL SANS-SERIF SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5C1;MATHEMATICAL SANS-SERIF SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5C2;MATHEMATICAL SANS-SERIF SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5C3;MATHEMATICAL SANS-SERIF SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5C4;MATHEMATICAL SANS-SERIF SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5C5;MATHEMATICAL SANS-SERIF SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5C6;MATHEMATICAL SANS-SERIF SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5C7;MATHEMATICAL SANS-SERIF SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5C8;MATHEMATICAL SANS-SERIF SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5C9;MATHEMATICAL SANS-SERIF SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5CA;MATHEMATICAL SANS-SERIF SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5CB;MATHEMATICAL SANS-SERIF SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D5CC;MATHEMATICAL SANS-SERIF SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D5CD;MATHEMATICAL SANS-SERIF SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D5CE;MATHEMATICAL SANS-SERIF SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D5CF;MATHEMATICAL SANS-SERIF SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D5D0;MATHEMATICAL SANS-SERIF SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D5D1;MATHEMATICAL SANS-SERIF SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D5D2;MATHEMATICAL SANS-SERIF SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D5D3;MATHEMATICAL SANS-SERIF SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5D4;MATHEMATICAL SANS-SERIF BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5D5;MATHEMATICAL SANS-SERIF BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5D6;MATHEMATICAL SANS-SERIF BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5D7;MATHEMATICAL SANS-SERIF BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5D8;MATHEMATICAL SANS-SERIF BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5D9;MATHEMATICAL SANS-SERIF BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5DA;MATHEMATICAL SANS-SERIF BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5DB;MATHEMATICAL SANS-SERIF BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5DC;MATHEMATICAL SANS-SERIF BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5DD;MATHEMATICAL SANS-SERIF BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5DE;MATHEMATICAL SANS-SERIF BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5DF;MATHEMATICAL SANS-SERIF BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5E0;MATHEMATICAL SANS-SERIF BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5E1;MATHEMATICAL SANS-SERIF BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5E2;MATHEMATICAL SANS-SERIF BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5E3;MATHEMATICAL SANS-SERIF BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5E4;MATHEMATICAL SANS-SERIF BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5E5;MATHEMATICAL SANS-SERIF BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5E6;MATHEMATICAL SANS-SERIF BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5E7;MATHEMATICAL SANS-SERIF BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5E8;MATHEMATICAL SANS-SERIF BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5E9;MATHEMATICAL SANS-SERIF BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5EA;MATHEMATICAL SANS-SERIF BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5EB;MATHEMATICAL SANS-SERIF BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5EC;MATHEMATICAL SANS-SERIF BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5ED;MATHEMATICAL SANS-SERIF BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5EE;MATHEMATICAL SANS-SERIF BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5EF;MATHEMATICAL SANS-SERIF BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5F0;MATHEMATICAL SANS-SERIF BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5F1;MATHEMATICAL SANS-SERIF BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5F2;MATHEMATICAL SANS-SERIF BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5F3;MATHEMATICAL SANS-SERIF BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5F4;MATHEMATICAL SANS-SERIF BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5F5;MATHEMATICAL SANS-SERIF BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5F6;MATHEMATICAL SANS-SERIF BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5F7;MATHEMATICAL SANS-SERIF BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5F8;MATHEMATICAL SANS-SERIF BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5F9;MATHEMATICAL SANS-SERIF BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5FA;MATHEMATICAL SANS-SERIF BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5FB;MATHEMATICAL SANS-SERIF BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5FC;MATHEMATICAL SANS-SERIF BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5FD;MATHEMATICAL SANS-SERIF BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5FE;MATHEMATICAL SANS-SERIF BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5FF;MATHEMATICAL SANS-SERIF BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D600;MATHEMATICAL SANS-SERIF BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D601;MATHEMATICAL SANS-SERIF BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D602;MATHEMATICAL SANS-SERIF BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D603;MATHEMATICAL SANS-SERIF BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D604;MATHEMATICAL SANS-SERIF BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D605;MATHEMATICAL SANS-SERIF BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D606;MATHEMATICAL SANS-SERIF BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D607;MATHEMATICAL SANS-SERIF BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D608;MATHEMATICAL SANS-SERIF ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D609;MATHEMATICAL SANS-SERIF ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D60A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D60B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D60C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D60D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D60E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D60F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D610;MATHEMATICAL SANS-SERIF ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D611;MATHEMATICAL SANS-SERIF ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D612;MATHEMATICAL SANS-SERIF ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D613;MATHEMATICAL SANS-SERIF ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D614;MATHEMATICAL SANS-SERIF ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D615;MATHEMATICAL SANS-SERIF ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D616;MATHEMATICAL SANS-SERIF ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D617;MATHEMATICAL SANS-SERIF ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D618;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D619;MATHEMATICAL SANS-SERIF ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D61A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D61B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D61C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D61D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D61E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D61F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D620;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D621;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D622;MATHEMATICAL SANS-SERIF ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D623;MATHEMATICAL SANS-SERIF ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D624;MATHEMATICAL SANS-SERIF ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D625;MATHEMATICAL SANS-SERIF ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D626;MATHEMATICAL SANS-SERIF ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D627;MATHEMATICAL SANS-SERIF ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D628;MATHEMATICAL SANS-SERIF ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D629;MATHEMATICAL SANS-SERIF ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D62A;MATHEMATICAL SANS-SERIF ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D62B;MATHEMATICAL SANS-SERIF ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D62C;MATHEMATICAL SANS-SERIF ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D62D;MATHEMATICAL SANS-SERIF ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D62E;MATHEMATICAL SANS-SERIF ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D62F;MATHEMATICAL SANS-SERIF ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D630;MATHEMATICAL SANS-SERIF ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D631;MATHEMATICAL SANS-SERIF ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D632;MATHEMATICAL SANS-SERIF ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D633;MATHEMATICAL SANS-SERIF ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D634;MATHEMATICAL SANS-SERIF ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D635;MATHEMATICAL SANS-SERIF ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D636;MATHEMATICAL SANS-SERIF ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D637;MATHEMATICAL SANS-SERIF ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D638;MATHEMATICAL SANS-SERIF ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D639;MATHEMATICAL SANS-SERIF ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D63A;MATHEMATICAL SANS-SERIF ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D63B;MATHEMATICAL SANS-SERIF ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D63C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D63D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D63E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D63F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D640;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D641;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D642;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D643;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D644;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D645;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D646;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D647;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D648;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D649;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D64A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D64B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D64C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D64D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D64E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D64F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D650;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D651;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D652;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D653;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D654;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D655;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D656;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D657;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D658;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D659;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D65A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D65B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D65C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D65D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D65E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D65F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D660;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D661;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D662;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D663;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D664;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D665;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D666;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D667;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D668;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D669;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D66A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D66B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D66C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D66D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D66E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D66F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D670;MATHEMATICAL MONOSPACE CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D671;MATHEMATICAL MONOSPACE CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D672;MATHEMATICAL MONOSPACE CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D673;MATHEMATICAL MONOSPACE CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D674;MATHEMATICAL MONOSPACE CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D675;MATHEMATICAL MONOSPACE CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D676;MATHEMATICAL MONOSPACE CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D677;MATHEMATICAL MONOSPACE CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D678;MATHEMATICAL MONOSPACE CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D679;MATHEMATICAL MONOSPACE CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D67A;MATHEMATICAL MONOSPACE CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D67B;MATHEMATICAL MONOSPACE CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D67C;MATHEMATICAL MONOSPACE CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D67D;MATHEMATICAL MONOSPACE CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D67E;MATHEMATICAL MONOSPACE CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D67F;MATHEMATICAL MONOSPACE CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D680;MATHEMATICAL MONOSPACE CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D681;MATHEMATICAL MONOSPACE CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D682;MATHEMATICAL MONOSPACE CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D683;MATHEMATICAL MONOSPACE CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D684;MATHEMATICAL MONOSPACE CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D685;MATHEMATICAL MONOSPACE CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D686;MATHEMATICAL MONOSPACE CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D687;MATHEMATICAL MONOSPACE CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D688;MATHEMATICAL MONOSPACE CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D689;MATHEMATICAL MONOSPACE CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D68A;MATHEMATICAL MONOSPACE SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D68B;MATHEMATICAL MONOSPACE SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D68C;MATHEMATICAL MONOSPACE SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D68D;MATHEMATICAL MONOSPACE SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D68E;MATHEMATICAL MONOSPACE SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D68F;MATHEMATICAL MONOSPACE SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D690;MATHEMATICAL MONOSPACE SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D691;MATHEMATICAL MONOSPACE SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D692;MATHEMATICAL MONOSPACE SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D693;MATHEMATICAL MONOSPACE SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D694;MATHEMATICAL MONOSPACE SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D695;MATHEMATICAL MONOSPACE SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D696;MATHEMATICAL MONOSPACE SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D697;MATHEMATICAL MONOSPACE SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D698;MATHEMATICAL MONOSPACE SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D699;MATHEMATICAL MONOSPACE SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D69A;MATHEMATICAL MONOSPACE SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D69B;MATHEMATICAL MONOSPACE SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D69C;MATHEMATICAL MONOSPACE SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D69D;MATHEMATICAL MONOSPACE SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D69E;MATHEMATICAL MONOSPACE SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D69F;MATHEMATICAL MONOSPACE SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D6A0;MATHEMATICAL MONOSPACE SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D6A1;MATHEMATICAL MONOSPACE SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D6A2;MATHEMATICAL MONOSPACE SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L;<font> 0131;;;;N;;;;;
+1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L;<font> 0237;;;;N;;;;;
+1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6AB;MATHEMATICAL BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6AC;MATHEMATICAL BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6AD;MATHEMATICAL BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6AE;MATHEMATICAL BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6AF;MATHEMATICAL BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6B0;MATHEMATICAL BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6B1;MATHEMATICAL BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6B2;MATHEMATICAL BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6B3;MATHEMATICAL BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6B4;MATHEMATICAL BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6B5;MATHEMATICAL BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6B6;MATHEMATICAL BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6B7;MATHEMATICAL BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6B8;MATHEMATICAL BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6B9;MATHEMATICAL BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6BA;MATHEMATICAL BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6BB;MATHEMATICAL BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6BC;MATHEMATICAL BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6BD;MATHEMATICAL BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6C5;MATHEMATICAL BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D6C6;MATHEMATICAL BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D6C7;MATHEMATICAL BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D6C8;MATHEMATICAL BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D6C9;MATHEMATICAL BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D6CA;MATHEMATICAL BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D6CB;MATHEMATICAL BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D6CC;MATHEMATICAL BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D6CD;MATHEMATICAL BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D6CE;MATHEMATICAL BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D6CF;MATHEMATICAL BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D6D0;MATHEMATICAL BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D6D1;MATHEMATICAL BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D6D2;MATHEMATICAL BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D6D3;MATHEMATICAL BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D6D4;MATHEMATICAL BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D6D5;MATHEMATICAL BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D6D6;MATHEMATICAL BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D6D7;MATHEMATICAL BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D6DF;MATHEMATICAL BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D6E0;MATHEMATICAL BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D6E1;MATHEMATICAL BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D6E2;MATHEMATICAL ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6E3;MATHEMATICAL ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6E4;MATHEMATICAL ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6E5;MATHEMATICAL ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6E6;MATHEMATICAL ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6E7;MATHEMATICAL ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6E8;MATHEMATICAL ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6E9;MATHEMATICAL ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6EA;MATHEMATICAL ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6EB;MATHEMATICAL ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6EC;MATHEMATICAL ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6ED;MATHEMATICAL ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6EE;MATHEMATICAL ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6EF;MATHEMATICAL ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6F0;MATHEMATICAL ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6F1;MATHEMATICAL ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6F2;MATHEMATICAL ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6F3;MATHEMATICAL ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6F4;MATHEMATICAL ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6F5;MATHEMATICAL ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6F6;MATHEMATICAL ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6F7;MATHEMATICAL ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6FF;MATHEMATICAL ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D700;MATHEMATICAL ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D701;MATHEMATICAL ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D702;MATHEMATICAL ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D703;MATHEMATICAL ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D704;MATHEMATICAL ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D705;MATHEMATICAL ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D706;MATHEMATICAL ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D707;MATHEMATICAL ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D708;MATHEMATICAL ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D709;MATHEMATICAL ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D70A;MATHEMATICAL ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D70B;MATHEMATICAL ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D70C;MATHEMATICAL ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D70D;MATHEMATICAL ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D70E;MATHEMATICAL ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D70F;MATHEMATICAL ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D710;MATHEMATICAL ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D711;MATHEMATICAL ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D719;MATHEMATICAL ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D71A;MATHEMATICAL ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D71B;MATHEMATICAL ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D71C;MATHEMATICAL BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D71D;MATHEMATICAL BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D71E;MATHEMATICAL BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D71F;MATHEMATICAL BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D720;MATHEMATICAL BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D721;MATHEMATICAL BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D722;MATHEMATICAL BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D723;MATHEMATICAL BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D724;MATHEMATICAL BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D725;MATHEMATICAL BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D726;MATHEMATICAL BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D727;MATHEMATICAL BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D728;MATHEMATICAL BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D729;MATHEMATICAL BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D72A;MATHEMATICAL BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D72B;MATHEMATICAL BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D72C;MATHEMATICAL BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D72D;MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D72E;MATHEMATICAL BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D72F;MATHEMATICAL BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D730;MATHEMATICAL BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D731;MATHEMATICAL BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D739;MATHEMATICAL BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D73A;MATHEMATICAL BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D73B;MATHEMATICAL BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D73C;MATHEMATICAL BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D73D;MATHEMATICAL BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D73E;MATHEMATICAL BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D73F;MATHEMATICAL BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D740;MATHEMATICAL BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D741;MATHEMATICAL BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D742;MATHEMATICAL BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D743;MATHEMATICAL BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D744;MATHEMATICAL BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D745;MATHEMATICAL BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D746;MATHEMATICAL BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D747;MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D748;MATHEMATICAL BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D749;MATHEMATICAL BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D74A;MATHEMATICAL BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D74B;MATHEMATICAL BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D753;MATHEMATICAL BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D754;MATHEMATICAL BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D755;MATHEMATICAL BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D756;MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D757;MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D758;MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D759;MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D75A;MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D75B;MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D75C;MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D75D;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D75E;MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D75F;MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D760;MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D761;MATHEMATICAL SANS-SERIF BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D762;MATHEMATICAL SANS-SERIF BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D763;MATHEMATICAL SANS-SERIF BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D764;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D765;MATHEMATICAL SANS-SERIF BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D766;MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D767;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D768;MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D769;MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D76A;MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D76B;MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D773;MATHEMATICAL SANS-SERIF BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D774;MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D775;MATHEMATICAL SANS-SERIF BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D776;MATHEMATICAL SANS-SERIF BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D777;MATHEMATICAL SANS-SERIF BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D778;MATHEMATICAL SANS-SERIF BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D779;MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D77A;MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D77B;MATHEMATICAL SANS-SERIF BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D77C;MATHEMATICAL SANS-SERIF BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D77D;MATHEMATICAL SANS-SERIF BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D77E;MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D77F;MATHEMATICAL SANS-SERIF BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D780;MATHEMATICAL SANS-SERIF BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D781;MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D782;MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D783;MATHEMATICAL SANS-SERIF BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D784;MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D785;MATHEMATICAL SANS-SERIF BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D78D;MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D78E;MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D78F;MATHEMATICAL SANS-SERIF BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D790;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D791;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D792;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D793;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D794;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D795;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D796;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D797;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D798;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D799;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D79A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D79B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D79C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D79D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D79E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D79F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D7A0;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D7A1;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D7A2;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D7A3;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D7A4;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D7A5;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D7AD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D7AE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D7AF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D7B0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D7B1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D7B2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D7B3;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D7B4;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D7B5;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D7B6;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D7B7;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D7B8;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D7B9;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D7BA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D7BB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D7BC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D7BD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D7BE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D7BF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
+1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D7C7;MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D7C8;MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D7C9;MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D7CA;MATHEMATICAL BOLD CAPITAL DIGAMMA;Lu;0;L;<font> 03DC;;;;N;;;;;
+1D7CB;MATHEMATICAL BOLD SMALL DIGAMMA;Ll;0;L;<font> 03DD;;;;N;;;;;
+1D7CE;MATHEMATICAL BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7CF;MATHEMATICAL BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7D0;MATHEMATICAL BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7D1;MATHEMATICAL BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7D2;MATHEMATICAL BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7D3;MATHEMATICAL BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7D4;MATHEMATICAL BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7D5;MATHEMATICAL BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7D6;MATHEMATICAL BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7D7;MATHEMATICAL BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7D8;MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7D9;MATHEMATICAL DOUBLE-STRUCK DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7DA;MATHEMATICAL DOUBLE-STRUCK DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7DB;MATHEMATICAL DOUBLE-STRUCK DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7DC;MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7DD;MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7DE;MATHEMATICAL DOUBLE-STRUCK DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7DF;MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7E0;MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7E1;MATHEMATICAL DOUBLE-STRUCK DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7E2;MATHEMATICAL SANS-SERIF DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7E3;MATHEMATICAL SANS-SERIF DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7E4;MATHEMATICAL SANS-SERIF DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7E5;MATHEMATICAL SANS-SERIF DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7E6;MATHEMATICAL SANS-SERIF DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7E7;MATHEMATICAL SANS-SERIF DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7E8;MATHEMATICAL SANS-SERIF DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7E9;MATHEMATICAL SANS-SERIF DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7EA;MATHEMATICAL SANS-SERIF DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7EB;MATHEMATICAL SANS-SERIF DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7EC;MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7ED;MATHEMATICAL SANS-SERIF BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7EE;MATHEMATICAL SANS-SERIF BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7EF;MATHEMATICAL SANS-SERIF BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7F0;MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7F1;MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7F2;MATHEMATICAL SANS-SERIF BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7F3;MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7F4;MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7F5;MATHEMATICAL SANS-SERIF BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7F6;MATHEMATICAL MONOSPACE DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7F7;MATHEMATICAL MONOSPACE DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7F8;MATHEMATICAL MONOSPACE DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7F9;MATHEMATICAL MONOSPACE DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7FA;MATHEMATICAL MONOSPACE DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7FB;MATHEMATICAL MONOSPACE DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7FC;MATHEMATICAL MONOSPACE DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7FD;MATHEMATICAL MONOSPACE DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7FE;MATHEMATICAL MONOSPACE DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7FF;MATHEMATICAL MONOSPACE DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D800;SIGNWRITING HAND-FIST INDEX;So;0;L;;;;;N;;;;;
+1D801;SIGNWRITING HAND-CIRCLE INDEX;So;0;L;;;;;N;;;;;
+1D802;SIGNWRITING HAND-CUP INDEX;So;0;L;;;;;N;;;;;
+1D803;SIGNWRITING HAND-OVAL INDEX;So;0;L;;;;;N;;;;;
+1D804;SIGNWRITING HAND-HINGE INDEX;So;0;L;;;;;N;;;;;
+1D805;SIGNWRITING HAND-ANGLE INDEX;So;0;L;;;;;N;;;;;
+1D806;SIGNWRITING HAND-FIST INDEX BENT;So;0;L;;;;;N;;;;;
+1D807;SIGNWRITING HAND-CIRCLE INDEX BENT;So;0;L;;;;;N;;;;;
+1D808;SIGNWRITING HAND-FIST THUMB UNDER INDEX BENT;So;0;L;;;;;N;;;;;
+1D809;SIGNWRITING HAND-FIST INDEX RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D80A;SIGNWRITING HAND-FIST INDEX CUPPED;So;0;L;;;;;N;;;;;
+1D80B;SIGNWRITING HAND-FIST INDEX HINGED;So;0;L;;;;;N;;;;;
+1D80C;SIGNWRITING HAND-FIST INDEX HINGED LOW;So;0;L;;;;;N;;;;;
+1D80D;SIGNWRITING HAND-CIRCLE INDEX HINGE;So;0;L;;;;;N;;;;;
+1D80E;SIGNWRITING HAND-FIST INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D80F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D810;SIGNWRITING HAND-FIST INDEX MIDDLE BENT;So;0;L;;;;;N;;;;;
+1D811;SIGNWRITING HAND-FIST INDEX MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D812;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D813;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D814;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D815;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED;So;0;L;;;;;N;;;;;
+1D816;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED INDEX BENT;So;0;L;;;;;N;;;;;
+1D817;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED MIDDLE BENT;So;0;L;;;;;N;;;;;
+1D818;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED;So;0;L;;;;;N;;;;;
+1D819;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED;So;0;L;;;;;N;;;;;
+1D81A;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;;
+1D81B;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSSED;So;0;L;;;;;N;;;;;
+1D81C;SIGNWRITING HAND-FIST MIDDLE BENT OVER INDEX;So;0;L;;;;;N;;;;;
+1D81D;SIGNWRITING HAND-FIST INDEX BENT OVER MIDDLE;So;0;L;;;;;N;;;;;
+1D81E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D81F;SIGNWRITING HAND-CIRCLE INDEX MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D820;SIGNWRITING HAND-FIST INDEX MIDDLE STRAIGHT THUMB BENT;So;0;L;;;;;N;;;;;
+1D821;SIGNWRITING HAND-FIST INDEX MIDDLE BENT THUMB STRAIGHT;So;0;L;;;;;N;;;;;
+1D822;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB BENT;So;0;L;;;;;N;;;;;
+1D823;SIGNWRITING HAND-FIST INDEX MIDDLE HINGED SPREAD THUMB SIDE;So;0;L;;;;;N;;;;;
+1D824;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D825;SIGNWRITING HAND-FIST INDEX UP MIDDLE HINGED THUMB CONJOINED;So;0;L;;;;;N;;;;;
+1D826;SIGNWRITING HAND-FIST INDEX HINGED MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D827;SIGNWRITING HAND-FIST INDEX MIDDLE UP SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D828;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CUPPED;So;0;L;;;;;N;;;;;
+1D829;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CIRCLED;So;0;L;;;;;N;;;;;
+1D82A;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HOOKED;So;0;L;;;;;N;;;;;
+1D82B;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB HINGED;So;0;L;;;;;N;;;;;
+1D82C;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D82D;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D82E;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;;
+1D82F;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D830;SIGNWRITING HAND-FIST MIDDLE THUMB HOOKED INDEX UP;So;0;L;;;;;N;;;;;
+1D831;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D832;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D833;SIGNWRITING HAND-FIST INDEX MIDDLE CROSSED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D834;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D835;SIGNWRITING HAND-FIST INDEX MIDDLE CONJOINED CUPPED THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D836;SIGNWRITING HAND-FIST MIDDLE THUMB CUPPED INDEX UP;So;0;L;;;;;N;;;;;
+1D837;SIGNWRITING HAND-FIST INDEX THUMB CUPPED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D838;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX UP;So;0;L;;;;;N;;;;;
+1D839;SIGNWRITING HAND-FIST MIDDLE THUMB CIRCLED INDEX HINGED;So;0;L;;;;;N;;;;;
+1D83A;SIGNWRITING HAND-FIST INDEX THUMB ANGLED OUT MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83B;SIGNWRITING HAND-FIST INDEX THUMB ANGLED IN MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83C;SIGNWRITING HAND-FIST INDEX THUMB CIRCLED MIDDLE UP;So;0;L;;;;;N;;;;;
+1D83D;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB CONJOINED HINGED;So;0;L;;;;;N;;;;;
+1D83E;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED OUT;So;0;L;;;;;N;;;;;
+1D83F;SIGNWRITING HAND-FIST INDEX MIDDLE THUMB ANGLED;So;0;L;;;;;N;;;;;
+1D840;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX UP;So;0;L;;;;;N;;;;;
+1D841;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED OUT INDEX CROSSED;So;0;L;;;;;N;;;;;
+1D842;SIGNWRITING HAND-FIST MIDDLE THUMB ANGLED INDEX UP;So;0;L;;;;;N;;;;;
+1D843;SIGNWRITING HAND-FIST INDEX THUMB HOOKED MIDDLE HINGED;So;0;L;;;;;N;;;;;
+1D844;SIGNWRITING HAND-FLAT FOUR FINGERS;So;0;L;;;;;N;;;;;
+1D845;SIGNWRITING HAND-FLAT FOUR FINGERS BENT;So;0;L;;;;;N;;;;;
+1D846;SIGNWRITING HAND-FLAT FOUR FINGERS HINGED;So;0;L;;;;;N;;;;;
+1D847;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D848;SIGNWRITING HAND-FLAT FOUR FINGERS CONJOINED SPLIT;So;0;L;;;;;N;;;;;
+1D849;SIGNWRITING HAND-CLAW FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D84A;SIGNWRITING HAND-FIST FOUR FINGERS CONJOINED BENT;So;0;L;;;;;N;;;;;
+1D84B;SIGNWRITING HAND-HINGE FOUR FINGERS CONJOINED;So;0;L;;;;;N;;;;;
+1D84C;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D84D;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D84E;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;;
+1D84F;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD FOUR BENT;So;0;L;;;;;N;;;;;
+1D850;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;;
+1D851;SIGNWRITING HAND-FLAT HEEL FIVE FINGERS SPREAD BENT;So;0;L;;;;;N;;;;;
+1D852;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D853;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D854;SIGNWRITING HAND-CUP FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;;
+1D855;SIGNWRITING HAND-HINGE FIVE FINGERS SPREAD OPEN;So;0;L;;;;;N;;;;;
+1D856;SIGNWRITING HAND-OVAL FIVE FINGERS SPREAD;So;0;L;;;;;N;;;;;
+1D857;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED;So;0;L;;;;;N;;;;;
+1D858;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED THUMB SIDE;So;0;L;;;;;N;;;;;
+1D859;SIGNWRITING HAND-FLAT FIVE FINGERS SPREAD HINGED NO THUMB;So;0;L;;;;;N;;;;;
+1D85A;SIGNWRITING HAND-FLAT;So;0;L;;;;;N;;;;;
+1D85B;SIGNWRITING HAND-FLAT BETWEEN PALM FACINGS;So;0;L;;;;;N;;;;;
+1D85C;SIGNWRITING HAND-FLAT HEEL;So;0;L;;;;;N;;;;;
+1D85D;SIGNWRITING HAND-FLAT THUMB SIDE;So;0;L;;;;;N;;;;;
+1D85E;SIGNWRITING HAND-FLAT HEEL THUMB SIDE;So;0;L;;;;;N;;;;;
+1D85F;SIGNWRITING HAND-FLAT THUMB BENT;So;0;L;;;;;N;;;;;
+1D860;SIGNWRITING HAND-FLAT THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D861;SIGNWRITING HAND-FLAT SPLIT INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D862;SIGNWRITING HAND-FLAT SPLIT CENTRE;So;0;L;;;;;N;;;;;
+1D863;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE;So;0;L;;;;;N;;;;;
+1D864;SIGNWRITING HAND-FLAT SPLIT CENTRE THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D865;SIGNWRITING HAND-FLAT SPLIT LITTLE;So;0;L;;;;;N;;;;;
+1D866;SIGNWRITING HAND-CLAW;So;0;L;;;;;N;;;;;
+1D867;SIGNWRITING HAND-CLAW THUMB SIDE;So;0;L;;;;;N;;;;;
+1D868;SIGNWRITING HAND-CLAW NO THUMB;So;0;L;;;;;N;;;;;
+1D869;SIGNWRITING HAND-CLAW THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D86A;SIGNWRITING HAND-HOOK CURLICUE;So;0;L;;;;;N;;;;;
+1D86B;SIGNWRITING HAND-HOOK;So;0;L;;;;;N;;;;;
+1D86C;SIGNWRITING HAND-CUP OPEN;So;0;L;;;;;N;;;;;
+1D86D;SIGNWRITING HAND-CUP;So;0;L;;;;;N;;;;;
+1D86E;SIGNWRITING HAND-CUP OPEN THUMB SIDE;So;0;L;;;;;N;;;;;
+1D86F;SIGNWRITING HAND-CUP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D870;SIGNWRITING HAND-CUP OPEN NO THUMB;So;0;L;;;;;N;;;;;
+1D871;SIGNWRITING HAND-CUP NO THUMB;So;0;L;;;;;N;;;;;
+1D872;SIGNWRITING HAND-CUP OPEN THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D873;SIGNWRITING HAND-CUP THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D874;SIGNWRITING HAND-CURLICUE OPEN;So;0;L;;;;;N;;;;;
+1D875;SIGNWRITING HAND-CURLICUE;So;0;L;;;;;N;;;;;
+1D876;SIGNWRITING HAND-CIRCLE;So;0;L;;;;;N;;;;;
+1D877;SIGNWRITING HAND-OVAL;So;0;L;;;;;N;;;;;
+1D878;SIGNWRITING HAND-OVAL THUMB SIDE;So;0;L;;;;;N;;;;;
+1D879;SIGNWRITING HAND-OVAL NO THUMB;So;0;L;;;;;N;;;;;
+1D87A;SIGNWRITING HAND-OVAL THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D87B;SIGNWRITING HAND-HINGE OPEN;So;0;L;;;;;N;;;;;
+1D87C;SIGNWRITING HAND-HINGE OPEN THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D87D;SIGNWRITING HAND-HINGE;So;0;L;;;;;N;;;;;
+1D87E;SIGNWRITING HAND-HINGE SMALL;So;0;L;;;;;N;;;;;
+1D87F;SIGNWRITING HAND-HINGE OPEN THUMB SIDE;So;0;L;;;;;N;;;;;
+1D880;SIGNWRITING HAND-HINGE THUMB SIDE;So;0;L;;;;;N;;;;;
+1D881;SIGNWRITING HAND-HINGE OPEN NO THUMB;So;0;L;;;;;N;;;;;
+1D882;SIGNWRITING HAND-HINGE NO THUMB;So;0;L;;;;;N;;;;;
+1D883;SIGNWRITING HAND-HINGE THUMB SIDE TOUCHING INDEX;So;0;L;;;;;N;;;;;
+1D884;SIGNWRITING HAND-HINGE THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;;
+1D885;SIGNWRITING HAND-ANGLE;So;0;L;;;;;N;;;;;
+1D886;SIGNWRITING HAND-FIST INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D887;SIGNWRITING HAND-CIRCLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D888;SIGNWRITING HAND-HINGE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D889;SIGNWRITING HAND-ANGLE INDEX MIDDLE RING;So;0;L;;;;;N;;;;;
+1D88A;SIGNWRITING HAND-HINGE LITTLE;So;0;L;;;;;N;;;;;
+1D88B;SIGNWRITING HAND-FIST INDEX MIDDLE RING BENT;So;0;L;;;;;N;;;;;
+1D88C;SIGNWRITING HAND-FIST INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;;
+1D88D;SIGNWRITING HAND-HINGE INDEX MIDDLE RING CONJOINED;So;0;L;;;;;N;;;;;
+1D88E;SIGNWRITING HAND-FIST LITTLE DOWN;So;0;L;;;;;N;;;;;
+1D88F;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D890;SIGNWRITING HAND-FIST LITTLE DOWN RIPPLE CURVED;So;0;L;;;;;N;;;;;
+1D891;SIGNWRITING HAND-FIST LITTLE DOWN OTHERS CIRCLED;So;0;L;;;;;N;;;;;
+1D892;SIGNWRITING HAND-FIST LITTLE UP;So;0;L;;;;;N;;;;;
+1D893;SIGNWRITING HAND-FIST THUMB UNDER LITTLE UP;So;0;L;;;;;N;;;;;
+1D894;SIGNWRITING HAND-CIRCLE LITTLE UP;So;0;L;;;;;N;;;;;
+1D895;SIGNWRITING HAND-OVAL LITTLE UP;So;0;L;;;;;N;;;;;
+1D896;SIGNWRITING HAND-ANGLE LITTLE UP;So;0;L;;;;;N;;;;;
+1D897;SIGNWRITING HAND-FIST LITTLE RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D898;SIGNWRITING HAND-FIST LITTLE BENT;So;0;L;;;;;N;;;;;
+1D899;SIGNWRITING HAND-FIST LITTLE TOUCHES THUMB;So;0;L;;;;;N;;;;;
+1D89A;SIGNWRITING HAND-FIST LITTLE THUMB;So;0;L;;;;;N;;;;;
+1D89B;SIGNWRITING HAND-HINGE LITTLE THUMB;So;0;L;;;;;N;;;;;
+1D89C;SIGNWRITING HAND-FIST LITTLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D89D;SIGNWRITING HAND-HINGE LITTLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D89E;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB OUT;So;0;L;;;;;N;;;;;
+1D89F;SIGNWRITING HAND-ANGLE LITTLE INDEX THUMB INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8A0;SIGNWRITING HAND-FIST LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A1;SIGNWRITING HAND-CIRCLE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A2;SIGNWRITING HAND-HINGE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A3;SIGNWRITING HAND-ANGLE LITTLE INDEX;So;0;L;;;;;N;;;;;
+1D8A4;SIGNWRITING HAND-FIST INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A5;SIGNWRITING HAND-CIRCLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A6;SIGNWRITING HAND-HINGE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A7;SIGNWRITING HAND-HINGE RING;So;0;L;;;;;N;;;;;
+1D8A8;SIGNWRITING HAND-ANGLE INDEX MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8A9;SIGNWRITING HAND-FIST INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;;
+1D8AA;SIGNWRITING HAND-CIRCLE INDEX MIDDLE CROSS LITTLE;So;0;L;;;;;N;;;;;
+1D8AB;SIGNWRITING HAND-FIST RING DOWN;So;0;L;;;;;N;;;;;
+1D8AC;SIGNWRITING HAND-HINGE RING DOWN INDEX THUMB HOOK MIDDLE;So;0;L;;;;;N;;;;;
+1D8AD;SIGNWRITING HAND-ANGLE RING DOWN MIDDLE THUMB INDEX CROSS;So;0;L;;;;;N;;;;;
+1D8AE;SIGNWRITING HAND-FIST RING UP;So;0;L;;;;;N;;;;;
+1D8AF;SIGNWRITING HAND-FIST RING RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D8B0;SIGNWRITING HAND-FIST RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B1;SIGNWRITING HAND-CIRCLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B2;SIGNWRITING HAND-OVAL RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B3;SIGNWRITING HAND-ANGLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8B4;SIGNWRITING HAND-FIST RING MIDDLE;So;0;L;;;;;N;;;;;
+1D8B5;SIGNWRITING HAND-FIST RING MIDDLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8B6;SIGNWRITING HAND-FIST RING MIDDLE RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D8B7;SIGNWRITING HAND-FIST RING INDEX;So;0;L;;;;;N;;;;;
+1D8B8;SIGNWRITING HAND-FIST RING THUMB;So;0;L;;;;;N;;;;;
+1D8B9;SIGNWRITING HAND-HOOK RING THUMB;So;0;L;;;;;N;;;;;
+1D8BA;SIGNWRITING HAND-FIST INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8BB;SIGNWRITING HAND-CIRCLE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8BC;SIGNWRITING HAND-CURLICUE INDEX RING LITTLE ON;So;0;L;;;;;N;;;;;
+1D8BD;SIGNWRITING HAND-HOOK INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8BE;SIGNWRITING HAND-HOOK INDEX RING LITTLE IN;So;0;L;;;;;N;;;;;
+1D8BF;SIGNWRITING HAND-HOOK INDEX RING LITTLE UNDER;So;0;L;;;;;N;;;;;
+1D8C0;SIGNWRITING HAND-CUP INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C1;SIGNWRITING HAND-HINGE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C2;SIGNWRITING HAND-ANGLE INDEX RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8C3;SIGNWRITING HAND-ANGLE INDEX RING LITTLE;So;0;L;;;;;N;;;;;
+1D8C4;SIGNWRITING HAND-FIST MIDDLE DOWN;So;0;L;;;;;N;;;;;
+1D8C5;SIGNWRITING HAND-HINGE MIDDLE;So;0;L;;;;;N;;;;;
+1D8C6;SIGNWRITING HAND-FIST MIDDLE UP;So;0;L;;;;;N;;;;;
+1D8C7;SIGNWRITING HAND-CIRCLE MIDDLE UP;So;0;L;;;;;N;;;;;
+1D8C8;SIGNWRITING HAND-FIST MIDDLE RAISED KNUCKLE;So;0;L;;;;;N;;;;;
+1D8C9;SIGNWRITING HAND-FIST MIDDLE UP THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8CA;SIGNWRITING HAND-HOOK MIDDLE THUMB;So;0;L;;;;;N;;;;;
+1D8CB;SIGNWRITING HAND-FIST MIDDLE THUMB LITTLE;So;0;L;;;;;N;;;;;
+1D8CC;SIGNWRITING HAND-FIST MIDDLE LITTLE;So;0;L;;;;;N;;;;;
+1D8CD;SIGNWRITING HAND-FIST MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8CE;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8CF;SIGNWRITING HAND-CURLICUE MIDDLE RING LITTLE ON;So;0;L;;;;;N;;;;;
+1D8D0;SIGNWRITING HAND-CUP MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D1;SIGNWRITING HAND-HINGE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D2;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE OUT;So;0;L;;;;;N;;;;;
+1D8D3;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE IN;So;0;L;;;;;N;;;;;
+1D8D4;SIGNWRITING HAND-ANGLE MIDDLE RING LITTLE;So;0;L;;;;;N;;;;;
+1D8D5;SIGNWRITING HAND-CIRCLE MIDDLE RING LITTLE BENT;So;0;L;;;;;N;;;;;
+1D8D6;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8D7;SIGNWRITING HAND-CLAW MIDDLE RING LITTLE CONJOINED SIDE;So;0;L;;;;;N;;;;;
+1D8D8;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED OUT;So;0;L;;;;;N;;;;;
+1D8D9;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED IN;So;0;L;;;;;N;;;;;
+1D8DA;SIGNWRITING HAND-HOOK MIDDLE RING LITTLE CONJOINED;So;0;L;;;;;N;;;;;
+1D8DB;SIGNWRITING HAND-HINGE INDEX HINGED;So;0;L;;;;;N;;;;;
+1D8DC;SIGNWRITING HAND-FIST INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8DD;SIGNWRITING HAND-HINGE INDEX THUMB SIDE;So;0;L;;;;;N;;;;;
+1D8DE;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB DIAGONAL;So;0;L;;;;;N;;;;;
+1D8DF;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB CONJOINED;So;0;L;;;;;N;;;;;
+1D8E0;SIGNWRITING HAND-FIST INDEX THUMB SIDE THUMB BENT;So;0;L;;;;;N;;;;;
+1D8E1;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX BENT;So;0;L;;;;;N;;;;;
+1D8E2;SIGNWRITING HAND-FIST INDEX THUMB SIDE BOTH BENT;So;0;L;;;;;N;;;;;
+1D8E3;SIGNWRITING HAND-FIST INDEX THUMB SIDE INDEX HINGE;So;0;L;;;;;N;;;;;
+1D8E4;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX STRAIGHT;So;0;L;;;;;N;;;;;
+1D8E5;SIGNWRITING HAND-FIST INDEX THUMB FORWARD INDEX BENT;So;0;L;;;;;N;;;;;
+1D8E6;SIGNWRITING HAND-FIST INDEX THUMB HOOK;So;0;L;;;;;N;;;;;
+1D8E7;SIGNWRITING HAND-FIST INDEX THUMB CURLICUE;So;0;L;;;;;N;;;;;
+1D8E8;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;;
+1D8E9;SIGNWRITING HAND-CLAW INDEX THUMB CURVE THUMB INSIDE;So;0;L;;;;;N;;;;;
+1D8EA;SIGNWRITING HAND-FIST INDEX THUMB CURVE THUMB UNDER;So;0;L;;;;;N;;;;;
+1D8EB;SIGNWRITING HAND-FIST INDEX THUMB CIRCLE;So;0;L;;;;;N;;;;;
+1D8EC;SIGNWRITING HAND-CUP INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8ED;SIGNWRITING HAND-CUP INDEX THUMB OPEN;So;0;L;;;;;N;;;;;
+1D8EE;SIGNWRITING HAND-HINGE INDEX THUMB OPEN;So;0;L;;;;;N;;;;;
+1D8EF;SIGNWRITING HAND-HINGE INDEX THUMB LARGE;So;0;L;;;;;N;;;;;
+1D8F0;SIGNWRITING HAND-HINGE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8F1;SIGNWRITING HAND-HINGE INDEX THUMB SMALL;So;0;L;;;;;N;;;;;
+1D8F2;SIGNWRITING HAND-ANGLE INDEX THUMB OUT;So;0;L;;;;;N;;;;;
+1D8F3;SIGNWRITING HAND-ANGLE INDEX THUMB IN;So;0;L;;;;;N;;;;;
+1D8F4;SIGNWRITING HAND-ANGLE INDEX THUMB;So;0;L;;;;;N;;;;;
+1D8F5;SIGNWRITING HAND-FIST THUMB;So;0;L;;;;;N;;;;;
+1D8F6;SIGNWRITING HAND-FIST THUMB HEEL;So;0;L;;;;;N;;;;;
+1D8F7;SIGNWRITING HAND-FIST THUMB SIDE DIAGONAL;So;0;L;;;;;N;;;;;
+1D8F8;SIGNWRITING HAND-FIST THUMB SIDE CONJOINED;So;0;L;;;;;N;;;;;
+1D8F9;SIGNWRITING HAND-FIST THUMB SIDE BENT;So;0;L;;;;;N;;;;;
+1D8FA;SIGNWRITING HAND-FIST THUMB FORWARD;So;0;L;;;;;N;;;;;
+1D8FB;SIGNWRITING HAND-FIST THUMB BETWEEN INDEX MIDDLE;So;0;L;;;;;N;;;;;
+1D8FC;SIGNWRITING HAND-FIST THUMB BETWEEN MIDDLE RING;So;0;L;;;;;N;;;;;
+1D8FD;SIGNWRITING HAND-FIST THUMB BETWEEN RING LITTLE;So;0;L;;;;;N;;;;;
+1D8FE;SIGNWRITING HAND-FIST THUMB UNDER TWO FINGERS;So;0;L;;;;;N;;;;;
+1D8FF;SIGNWRITING HAND-FIST THUMB OVER TWO FINGERS;So;0;L;;;;;N;;;;;
+1D900;SIGNWRITING HAND-FIST THUMB UNDER THREE FINGERS;So;0;L;;;;;N;;;;;
+1D901;SIGNWRITING HAND-FIST THUMB UNDER FOUR FINGERS;So;0;L;;;;;N;;;;;
+1D902;SIGNWRITING HAND-FIST THUMB OVER FOUR RAISED KNUCKLES;So;0;L;;;;;N;;;;;
+1D903;SIGNWRITING HAND-FIST;So;0;L;;;;;N;;;;;
+1D904;SIGNWRITING HAND-FIST HEEL;So;0;L;;;;;N;;;;;
+1D905;SIGNWRITING TOUCH SINGLE;So;0;L;;;;;N;;;;;
+1D906;SIGNWRITING TOUCH MULTIPLE;So;0;L;;;;;N;;;;;
+1D907;SIGNWRITING TOUCH BETWEEN;So;0;L;;;;;N;;;;;
+1D908;SIGNWRITING GRASP SINGLE;So;0;L;;;;;N;;;;;
+1D909;SIGNWRITING GRASP MULTIPLE;So;0;L;;;;;N;;;;;
+1D90A;SIGNWRITING GRASP BETWEEN;So;0;L;;;;;N;;;;;
+1D90B;SIGNWRITING STRIKE SINGLE;So;0;L;;;;;N;;;;;
+1D90C;SIGNWRITING STRIKE MULTIPLE;So;0;L;;;;;N;;;;;
+1D90D;SIGNWRITING STRIKE BETWEEN;So;0;L;;;;;N;;;;;
+1D90E;SIGNWRITING BRUSH SINGLE;So;0;L;;;;;N;;;;;
+1D90F;SIGNWRITING BRUSH MULTIPLE;So;0;L;;;;;N;;;;;
+1D910;SIGNWRITING BRUSH BETWEEN;So;0;L;;;;;N;;;;;
+1D911;SIGNWRITING RUB SINGLE;So;0;L;;;;;N;;;;;
+1D912;SIGNWRITING RUB MULTIPLE;So;0;L;;;;;N;;;;;
+1D913;SIGNWRITING RUB BETWEEN;So;0;L;;;;;N;;;;;
+1D914;SIGNWRITING SURFACE SYMBOLS;So;0;L;;;;;N;;;;;
+1D915;SIGNWRITING SURFACE BETWEEN;So;0;L;;;;;N;;;;;
+1D916;SIGNWRITING SQUEEZE LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D917;SIGNWRITING SQUEEZE SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D918;SIGNWRITING SQUEEZE LARGE MULTIPLE;So;0;L;;;;;N;;;;;
+1D919;SIGNWRITING SQUEEZE SMALL MULTIPLE;So;0;L;;;;;N;;;;;
+1D91A;SIGNWRITING SQUEEZE SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D91B;SIGNWRITING FLICK LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D91C;SIGNWRITING FLICK SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D91D;SIGNWRITING FLICK LARGE MULTIPLE;So;0;L;;;;;N;;;;;
+1D91E;SIGNWRITING FLICK SMALL MULTIPLE;So;0;L;;;;;N;;;;;
+1D91F;SIGNWRITING FLICK SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D920;SIGNWRITING SQUEEZE FLICK ALTERNATING;So;0;L;;;;;N;;;;;
+1D921;SIGNWRITING MOVEMENT-HINGE UP DOWN LARGE;So;0;L;;;;;N;;;;;
+1D922;SIGNWRITING MOVEMENT-HINGE UP DOWN SMALL;So;0;L;;;;;N;;;;;
+1D923;SIGNWRITING MOVEMENT-HINGE UP SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D924;SIGNWRITING MOVEMENT-HINGE DOWN SEQUENTIAL;So;0;L;;;;;N;;;;;
+1D925;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING LARGE;So;0;L;;;;;N;;;;;
+1D926;SIGNWRITING MOVEMENT-HINGE UP DOWN ALTERNATING SMALL;So;0;L;;;;;N;;;;;
+1D927;SIGNWRITING MOVEMENT-HINGE SIDE TO SIDE SCISSORS;So;0;L;;;;;N;;;;;
+1D928;SIGNWRITING MOVEMENT-WALLPLANE FINGER CONTACT;So;0;L;;;;;N;;;;;
+1D929;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CONTACT;So;0;L;;;;;N;;;;;
+1D92A;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;;
+1D92B;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;;
+1D92C;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;;
+1D92D;SIGNWRITING MOVEMENT-WALLPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;;
+1D92E;SIGNWRITING MOVEMENT-WALLPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D92F;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D930;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D931;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D932;SIGNWRITING MOVEMENT-WALLPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D933;SIGNWRITING MOVEMENT-WALLPLANE CROSS;So;0;L;;;;;N;;;;;
+1D934;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;;
+1D935;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D936;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D937;SIGNWRITING MOVEMENT-WALLPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D938;SIGNWRITING MOVEMENT-WALLPLANE BEND SMALL;So;0;L;;;;;N;;;;;
+1D939;SIGNWRITING MOVEMENT-WALLPLANE BEND MEDIUM;So;0;L;;;;;N;;;;;
+1D93A;SIGNWRITING MOVEMENT-WALLPLANE BEND LARGE;So;0;L;;;;;N;;;;;
+1D93B;SIGNWRITING MOVEMENT-WALLPLANE CORNER SMALL;So;0;L;;;;;N;;;;;
+1D93C;SIGNWRITING MOVEMENT-WALLPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;;
+1D93D;SIGNWRITING MOVEMENT-WALLPLANE CORNER LARGE;So;0;L;;;;;N;;;;;
+1D93E;SIGNWRITING MOVEMENT-WALLPLANE CORNER ROTATION;So;0;L;;;;;N;;;;;
+1D93F;SIGNWRITING MOVEMENT-WALLPLANE CHECK SMALL;So;0;L;;;;;N;;;;;
+1D940;SIGNWRITING MOVEMENT-WALLPLANE CHECK MEDIUM;So;0;L;;;;;N;;;;;
+1D941;SIGNWRITING MOVEMENT-WALLPLANE CHECK LARGE;So;0;L;;;;;N;;;;;
+1D942;SIGNWRITING MOVEMENT-WALLPLANE BOX SMALL;So;0;L;;;;;N;;;;;
+1D943;SIGNWRITING MOVEMENT-WALLPLANE BOX MEDIUM;So;0;L;;;;;N;;;;;
+1D944;SIGNWRITING MOVEMENT-WALLPLANE BOX LARGE;So;0;L;;;;;N;;;;;
+1D945;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;;
+1D946;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;;
+1D947;SIGNWRITING MOVEMENT-WALLPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;;
+1D948;SIGNWRITING MOVEMENT-WALLPLANE PEAKS SMALL;So;0;L;;;;;N;;;;;
+1D949;SIGNWRITING MOVEMENT-WALLPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;;
+1D94A;SIGNWRITING MOVEMENT-WALLPLANE PEAKS LARGE;So;0;L;;;;;N;;;;;
+1D94B;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D94C;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D94D;SIGNWRITING TRAVEL-WALLPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D94E;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D94F;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D950;SIGNWRITING TRAVEL-WALLPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D951;SIGNWRITING TRAVEL-WALLPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D952;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL SINGLE;So;0;L;;;;;N;;;;;
+1D953;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL DOUBLE;So;0;L;;;;;N;;;;;
+1D954;SIGNWRITING TRAVEL-WALLPLANE ARM SPIRAL TRIPLE;So;0;L;;;;;N;;;;;
+1D955;SIGNWRITING MOVEMENT-DIAGONAL AWAY SMALL;So;0;L;;;;;N;;;;;
+1D956;SIGNWRITING MOVEMENT-DIAGONAL AWAY MEDIUM;So;0;L;;;;;N;;;;;
+1D957;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGE;So;0;L;;;;;N;;;;;
+1D958;SIGNWRITING MOVEMENT-DIAGONAL AWAY LARGEST;So;0;L;;;;;N;;;;;
+1D959;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS SMALL;So;0;L;;;;;N;;;;;
+1D95A;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS MEDIUM;So;0;L;;;;;N;;;;;
+1D95B;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGE;So;0;L;;;;;N;;;;;
+1D95C;SIGNWRITING MOVEMENT-DIAGONAL TOWARDS LARGEST;So;0;L;;;;;N;;;;;
+1D95D;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY SMALL;So;0;L;;;;;N;;;;;
+1D95E;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY MEDIUM;So;0;L;;;;;N;;;;;
+1D95F;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGE;So;0;L;;;;;N;;;;;
+1D960;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN AWAY LARGEST;So;0;L;;;;;N;;;;;
+1D961;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS SMALL;So;0;L;;;;;N;;;;;
+1D962;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS MEDIUM;So;0;L;;;;;N;;;;;
+1D963;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGE;So;0;L;;;;;N;;;;;
+1D964;SIGNWRITING MOVEMENT-DIAGONAL BETWEEN TOWARDS LARGEST;So;0;L;;;;;N;;;;;
+1D965;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT SMALL;So;0;L;;;;;N;;;;;
+1D966;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT MEDIUM;So;0;L;;;;;N;;;;;
+1D967;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGE;So;0;L;;;;;N;;;;;
+1D968;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE STRAIGHT LARGEST;So;0;L;;;;;N;;;;;
+1D969;SIGNWRITING MOVEMENT-FLOORPLANE SINGLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96A;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE STRAIGHT;So;0;L;;;;;N;;;;;
+1D96B;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96C;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING;So;0;L;;;;;N;;;;;
+1D96D;SIGNWRITING MOVEMENT-FLOORPLANE DOUBLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D96E;SIGNWRITING MOVEMENT-FLOORPLANE CROSS;So;0;L;;;;;N;;;;;
+1D96F;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE STRAIGHT MOVEMENT;So;0;L;;;;;N;;;;;
+1D970;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE WRIST FLEX;So;0;L;;;;;N;;;;;
+1D971;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING MOVEMENT;So;0;L;;;;;N;;;;;
+1D972;SIGNWRITING MOVEMENT-FLOORPLANE TRIPLE ALTERNATING WRIST FLEX;So;0;L;;;;;N;;;;;
+1D973;SIGNWRITING MOVEMENT-FLOORPLANE BEND;So;0;L;;;;;N;;;;;
+1D974;SIGNWRITING MOVEMENT-FLOORPLANE CORNER SMALL;So;0;L;;;;;N;;;;;
+1D975;SIGNWRITING MOVEMENT-FLOORPLANE CORNER MEDIUM;So;0;L;;;;;N;;;;;
+1D976;SIGNWRITING MOVEMENT-FLOORPLANE CORNER LARGE;So;0;L;;;;;N;;;;;
+1D977;SIGNWRITING MOVEMENT-FLOORPLANE CHECK;So;0;L;;;;;N;;;;;
+1D978;SIGNWRITING MOVEMENT-FLOORPLANE BOX SMALL;So;0;L;;;;;N;;;;;
+1D979;SIGNWRITING MOVEMENT-FLOORPLANE BOX MEDIUM;So;0;L;;;;;N;;;;;
+1D97A;SIGNWRITING MOVEMENT-FLOORPLANE BOX LARGE;So;0;L;;;;;N;;;;;
+1D97B;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG SMALL;So;0;L;;;;;N;;;;;
+1D97C;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG MEDIUM;So;0;L;;;;;N;;;;;
+1D97D;SIGNWRITING MOVEMENT-FLOORPLANE ZIGZAG LARGE;So;0;L;;;;;N;;;;;
+1D97E;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS SMALL;So;0;L;;;;;N;;;;;
+1D97F;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS MEDIUM;So;0;L;;;;;N;;;;;
+1D980;SIGNWRITING MOVEMENT-FLOORPLANE PEAKS LARGE;So;0;L;;;;;N;;;;;
+1D981;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D982;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D983;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D984;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D985;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D986;SIGNWRITING TRAVEL-FLOORPLANE ROTATION-WALLPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D987;SIGNWRITING TRAVEL-FLOORPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D988;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER SMALL;So;0;L;;;;;N;;;;;
+1D989;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER MEDIUM;So;0;L;;;;;N;;;;;
+1D98A;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGE;So;0;L;;;;;N;;;;;
+1D98B;SIGNWRITING MOVEMENT-WALLPLANE CURVE QUARTER LARGEST;So;0;L;;;;;N;;;;;
+1D98C;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE SMALL;So;0;L;;;;;N;;;;;
+1D98D;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE MEDIUM;So;0;L;;;;;N;;;;;
+1D98E;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGE;So;0;L;;;;;N;;;;;
+1D98F;SIGNWRITING MOVEMENT-WALLPLANE CURVE HALF-CIRCLE LARGEST;So;0;L;;;;;N;;;;;
+1D990;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE SMALL;So;0;L;;;;;N;;;;;
+1D991;SIGNWRITING MOVEMENT-WALLPLANE CURVE THREE-QUARTER CIRCLE MEDIUM;So;0;L;;;;;N;;;;;
+1D992;SIGNWRITING MOVEMENT-WALLPLANE HUMP SMALL;So;0;L;;;;;N;;;;;
+1D993;SIGNWRITING MOVEMENT-WALLPLANE HUMP MEDIUM;So;0;L;;;;;N;;;;;
+1D994;SIGNWRITING MOVEMENT-WALLPLANE HUMP LARGE;So;0;L;;;;;N;;;;;
+1D995;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL;So;0;L;;;;;N;;;;;
+1D996;SIGNWRITING MOVEMENT-WALLPLANE LOOP MEDIUM;So;0;L;;;;;N;;;;;
+1D997;SIGNWRITING MOVEMENT-WALLPLANE LOOP LARGE;So;0;L;;;;;N;;;;;
+1D998;SIGNWRITING MOVEMENT-WALLPLANE LOOP SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D999;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE SMALL;So;0;L;;;;;N;;;;;
+1D99A;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE MEDIUM;So;0;L;;;;;N;;;;;
+1D99B;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE DOUBLE LARGE;So;0;L;;;;;N;;;;;
+1D99C;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE SMALL;So;0;L;;;;;N;;;;;
+1D99D;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE MEDIUM;So;0;L;;;;;N;;;;;
+1D99E;SIGNWRITING MOVEMENT-WALLPLANE WAVE CURVE TRIPLE LARGE;So;0;L;;;;;N;;;;;
+1D99F;SIGNWRITING MOVEMENT-WALLPLANE CURVE THEN STRAIGHT;So;0;L;;;;;N;;;;;
+1D9A0;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS SMALL;So;0;L;;;;;N;;;;;
+1D9A1;SIGNWRITING MOVEMENT-WALLPLANE CURVED CROSS MEDIUM;So;0;L;;;;;N;;;;;
+1D9A2;SIGNWRITING ROTATION-WALLPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D9A3;SIGNWRITING ROTATION-WALLPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D9A4;SIGNWRITING ROTATION-WALLPLANE ALTERNATE;So;0;L;;;;;N;;;;;
+1D9A5;SIGNWRITING MOVEMENT-WALLPLANE SHAKING;So;0;L;;;;;N;;;;;
+1D9A6;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A7;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A8;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9A9;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AA;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AB;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AC;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING FRONT WALL;So;0;L;;;;;N;;;;;
+1D9AD;SIGNWRITING MOVEMENT-WALLPLANE CURVE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9AE;SIGNWRITING MOVEMENT-WALLPLANE HUMP HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9AF;SIGNWRITING MOVEMENT-WALLPLANE LOOP HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B0;SIGNWRITING MOVEMENT-WALLPLANE WAVE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B1;SIGNWRITING ROTATION-WALLPLANE SINGLE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B2;SIGNWRITING ROTATION-WALLPLANE DOUBLE HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B3;SIGNWRITING ROTATION-WALLPLANE ALTERNATING HITTING CHEST;So;0;L;;;;;N;;;;;
+1D9B4;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH SMALL;So;0;L;;;;;N;;;;;
+1D9B5;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH MEDIUM;So;0;L;;;;;N;;;;;
+1D9B6;SIGNWRITING MOVEMENT-WALLPLANE WAVE DIAGONAL PATH LARGE;So;0;L;;;;;N;;;;;
+1D9B7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;;
+1D9B8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;;
+1D9B9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9BA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9BB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING SMALL TRIPLE;So;0;L;;;;;N;;;;;
+1D9BC;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING CEILING LARGE TRIPLE;So;0;L;;;;;N;;;;;
+1D9BD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9BE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9BF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9C0;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING CEILING LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9C1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING SMALL;So;0;L;;;;;N;;;;;
+1D9C2;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING CEILING LARGE;So;0;L;;;;;N;;;;;
+1D9C3;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C4;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C5;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING CEILING;So;0;L;;;;;N;;;;;
+1D9C6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;;
+1D9C7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;;
+1D9C8;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9C9;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9CA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE SMALL TRIPLE;So;0;L;;;;;N;;;;;
+1D9CB;SIGNWRITING MOVEMENT-FLOORPLANE HUMP HITTING FLOOR TRIPLE LARGE TRIPLE;So;0;L;;;;;N;;;;;
+1D9CC;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9CD;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9CE;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9CF;SIGNWRITING MOVEMENT-FLOORPLANE LOOP HITTING FLOOR LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9D0;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR SMALL;So;0;L;;;;;N;;;;;
+1D9D1;SIGNWRITING MOVEMENT-FLOORPLANE WAVE HITTING FLOOR LARGE;So;0;L;;;;;N;;;;;
+1D9D2;SIGNWRITING ROTATION-FLOORPLANE SINGLE HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D3;SIGNWRITING ROTATION-FLOORPLANE DOUBLE HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D4;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING HITTING FLOOR;So;0;L;;;;;N;;;;;
+1D9D5;SIGNWRITING MOVEMENT-FLOORPLANE CURVE SMALL;So;0;L;;;;;N;;;;;
+1D9D6;SIGNWRITING MOVEMENT-FLOORPLANE CURVE MEDIUM;So;0;L;;;;;N;;;;;
+1D9D7;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGE;So;0;L;;;;;N;;;;;
+1D9D8;SIGNWRITING MOVEMENT-FLOORPLANE CURVE LARGEST;So;0;L;;;;;N;;;;;
+1D9D9;SIGNWRITING MOVEMENT-FLOORPLANE CURVE COMBINED;So;0;L;;;;;N;;;;;
+1D9DA;SIGNWRITING MOVEMENT-FLOORPLANE HUMP SMALL;So;0;L;;;;;N;;;;;
+1D9DB;SIGNWRITING MOVEMENT-FLOORPLANE LOOP SMALL;So;0;L;;;;;N;;;;;
+1D9DC;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SNAKE;So;0;L;;;;;N;;;;;
+1D9DD;SIGNWRITING MOVEMENT-FLOORPLANE WAVE SMALL;So;0;L;;;;;N;;;;;
+1D9DE;SIGNWRITING MOVEMENT-FLOORPLANE WAVE LARGE;So;0;L;;;;;N;;;;;
+1D9DF;SIGNWRITING ROTATION-FLOORPLANE SINGLE;So;0;L;;;;;N;;;;;
+1D9E0;SIGNWRITING ROTATION-FLOORPLANE DOUBLE;So;0;L;;;;;N;;;;;
+1D9E1;SIGNWRITING ROTATION-FLOORPLANE ALTERNATING;So;0;L;;;;;N;;;;;
+1D9E2;SIGNWRITING MOVEMENT-FLOORPLANE SHAKING PARALLEL;So;0;L;;;;;N;;;;;
+1D9E3;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9E4;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM SINGLE;So;0;L;;;;;N;;;;;
+1D9E5;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9E6;SIGNWRITING MOVEMENT-WALLPLANE ARM CIRCLE MEDIUM DOUBLE;So;0;L;;;;;N;;;;;
+1D9E7;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL SINGLE;So;0;L;;;;;N;;;;;
+1D9E8;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM SINGLE;So;0;L;;;;;N;;;;;
+1D9E9;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE SINGLE;So;0;L;;;;;N;;;;;
+1D9EA;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL SMALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9EB;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL MEDIUM DOUBLE;So;0;L;;;;;N;;;;;
+1D9EC;SIGNWRITING MOVEMENT-FLOORPLANE ARM CIRCLE HITTING WALL LARGE DOUBLE;So;0;L;;;;;N;;;;;
+1D9ED;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT SINGLE;So;0;L;;;;;N;;;;;
+1D9EE;SIGNWRITING MOVEMENT-WALLPLANE WRIST CIRCLE FRONT DOUBLE;So;0;L;;;;;N;;;;;
+1D9EF;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL SINGLE;So;0;L;;;;;N;;;;;
+1D9F0;SIGNWRITING MOVEMENT-FLOORPLANE WRIST CIRCLE HITTING WALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9F1;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES SINGLE;So;0;L;;;;;N;;;;;
+1D9F2;SIGNWRITING MOVEMENT-WALLPLANE FINGER CIRCLES DOUBLE;So;0;L;;;;;N;;;;;
+1D9F3;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL SINGLE;So;0;L;;;;;N;;;;;
+1D9F4;SIGNWRITING MOVEMENT-FLOORPLANE FINGER CIRCLES HITTING WALL DOUBLE;So;0;L;;;;;N;;;;;
+1D9F5;SIGNWRITING DYNAMIC ARROWHEAD SMALL;So;0;L;;;;;N;;;;;
+1D9F6;SIGNWRITING DYNAMIC ARROWHEAD LARGE;So;0;L;;;;;N;;;;;
+1D9F7;SIGNWRITING DYNAMIC FAST;So;0;L;;;;;N;;;;;
+1D9F8;SIGNWRITING DYNAMIC SLOW;So;0;L;;;;;N;;;;;
+1D9F9;SIGNWRITING DYNAMIC TENSE;So;0;L;;;;;N;;;;;
+1D9FA;SIGNWRITING DYNAMIC RELAXED;So;0;L;;;;;N;;;;;
+1D9FB;SIGNWRITING DYNAMIC SIMULTANEOUS;So;0;L;;;;;N;;;;;
+1D9FC;SIGNWRITING DYNAMIC SIMULTANEOUS ALTERNATING;So;0;L;;;;;N;;;;;
+1D9FD;SIGNWRITING DYNAMIC EVERY OTHER TIME;So;0;L;;;;;N;;;;;
+1D9FE;SIGNWRITING DYNAMIC GRADUAL;So;0;L;;;;;N;;;;;
+1D9FF;SIGNWRITING HEAD;So;0;L;;;;;N;;;;;
+1DA00;SIGNWRITING HEAD RIM;Mn;0;NSM;;;;;N;;;;;
+1DA01;SIGNWRITING HEAD MOVEMENT-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA02;SIGNWRITING HEAD MOVEMENT-WALLPLANE TILT;Mn;0;NSM;;;;;N;;;;;
+1DA03;SIGNWRITING HEAD MOVEMENT-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA04;SIGNWRITING HEAD MOVEMENT-WALLPLANE CURVE;Mn;0;NSM;;;;;N;;;;;
+1DA05;SIGNWRITING HEAD MOVEMENT-FLOORPLANE CURVE;Mn;0;NSM;;;;;N;;;;;
+1DA06;SIGNWRITING HEAD MOVEMENT CIRCLE;Mn;0;NSM;;;;;N;;;;;
+1DA07;SIGNWRITING FACE DIRECTION POSITION NOSE FORWARD TILTING;Mn;0;NSM;;;;;N;;;;;
+1DA08;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA09;SIGNWRITING FACE DIRECTION POSITION NOSE UP OR DOWN TILTING;Mn;0;NSM;;;;;N;;;;;
+1DA0A;SIGNWRITING EYEBROWS STRAIGHT UP;Mn;0;NSM;;;;;N;;;;;
+1DA0B;SIGNWRITING EYEBROWS STRAIGHT NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA0C;SIGNWRITING EYEBROWS STRAIGHT DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA0D;SIGNWRITING DREAMY EYEBROWS NEUTRAL DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA0E;SIGNWRITING DREAMY EYEBROWS DOWN NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA0F;SIGNWRITING DREAMY EYEBROWS UP NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA10;SIGNWRITING DREAMY EYEBROWS NEUTRAL UP;Mn;0;NSM;;;;;N;;;;;
+1DA11;SIGNWRITING FOREHEAD NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA12;SIGNWRITING FOREHEAD CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA13;SIGNWRITING FOREHEAD WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA14;SIGNWRITING EYES OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA15;SIGNWRITING EYES SQUEEZED;Mn;0;NSM;;;;;N;;;;;
+1DA16;SIGNWRITING EYES CLOSED;Mn;0;NSM;;;;;N;;;;;
+1DA17;SIGNWRITING EYE BLINK SINGLE;Mn;0;NSM;;;;;N;;;;;
+1DA18;SIGNWRITING EYE BLINK MULTIPLE;Mn;0;NSM;;;;;N;;;;;
+1DA19;SIGNWRITING EYES HALF OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA1A;SIGNWRITING EYES WIDE OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA1B;SIGNWRITING EYES HALF CLOSED;Mn;0;NSM;;;;;N;;;;;
+1DA1C;SIGNWRITING EYES WIDENING MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA1D;SIGNWRITING EYE WINK;Mn;0;NSM;;;;;N;;;;;
+1DA1E;SIGNWRITING EYELASHES UP;Mn;0;NSM;;;;;N;;;;;
+1DA1F;SIGNWRITING EYELASHES DOWN;Mn;0;NSM;;;;;N;;;;;
+1DA20;SIGNWRITING EYELASHES FLUTTERING;Mn;0;NSM;;;;;N;;;;;
+1DA21;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA22;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA23;SIGNWRITING EYEGAZE-WALLPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;;
+1DA24;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT;Mn;0;NSM;;;;;N;;;;;
+1DA25;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA26;SIGNWRITING EYEGAZE-FLOORPLANE STRAIGHT ALTERNATING;Mn;0;NSM;;;;;N;;;;;
+1DA27;SIGNWRITING EYEGAZE-WALLPLANE CURVED;Mn;0;NSM;;;;;N;;;;;
+1DA28;SIGNWRITING EYEGAZE-FLOORPLANE CURVED;Mn;0;NSM;;;;;N;;;;;
+1DA29;SIGNWRITING EYEGAZE-WALLPLANE CIRCLING;Mn;0;NSM;;;;;N;;;;;
+1DA2A;SIGNWRITING CHEEKS PUFFED;Mn;0;NSM;;;;;N;;;;;
+1DA2B;SIGNWRITING CHEEKS NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA2C;SIGNWRITING CHEEKS SUCKED;Mn;0;NSM;;;;;N;;;;;
+1DA2D;SIGNWRITING TENSE CHEEKS HIGH;Mn;0;NSM;;;;;N;;;;;
+1DA2E;SIGNWRITING TENSE CHEEKS MIDDLE;Mn;0;NSM;;;;;N;;;;;
+1DA2F;SIGNWRITING TENSE CHEEKS LOW;Mn;0;NSM;;;;;N;;;;;
+1DA30;SIGNWRITING EARS;Mn;0;NSM;;;;;N;;;;;
+1DA31;SIGNWRITING NOSE NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA32;SIGNWRITING NOSE CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA33;SIGNWRITING NOSE WRINKLES;Mn;0;NSM;;;;;N;;;;;
+1DA34;SIGNWRITING NOSE WIGGLES;Mn;0;NSM;;;;;N;;;;;
+1DA35;SIGNWRITING AIR BLOWING OUT;Mn;0;NSM;;;;;N;;;;;
+1DA36;SIGNWRITING AIR SUCKING IN;Mn;0;NSM;;;;;N;;;;;
+1DA37;SIGNWRITING AIR BLOW SMALL ROTATIONS;So;0;L;;;;;N;;;;;
+1DA38;SIGNWRITING AIR SUCK SMALL ROTATIONS;So;0;L;;;;;N;;;;;
+1DA39;SIGNWRITING BREATH INHALE;So;0;L;;;;;N;;;;;
+1DA3A;SIGNWRITING BREATH EXHALE;So;0;L;;;;;N;;;;;
+1DA3B;SIGNWRITING MOUTH CLOSED NEUTRAL;Mn;0;NSM;;;;;N;;;;;
+1DA3C;SIGNWRITING MOUTH CLOSED FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA3D;SIGNWRITING MOUTH CLOSED CONTACT;Mn;0;NSM;;;;;N;;;;;
+1DA3E;SIGNWRITING MOUTH SMILE;Mn;0;NSM;;;;;N;;;;;
+1DA3F;SIGNWRITING MOUTH SMILE WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA40;SIGNWRITING MOUTH SMILE OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA41;SIGNWRITING MOUTH FROWN;Mn;0;NSM;;;;;N;;;;;
+1DA42;SIGNWRITING MOUTH FROWN WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA43;SIGNWRITING MOUTH FROWN OPEN;Mn;0;NSM;;;;;N;;;;;
+1DA44;SIGNWRITING MOUTH OPEN CIRCLE;Mn;0;NSM;;;;;N;;;;;
+1DA45;SIGNWRITING MOUTH OPEN FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA46;SIGNWRITING MOUTH OPEN WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA47;SIGNWRITING MOUTH OPEN OVAL;Mn;0;NSM;;;;;N;;;;;
+1DA48;SIGNWRITING MOUTH OPEN OVAL WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA49;SIGNWRITING MOUTH OPEN OVAL YAWN;Mn;0;NSM;;;;;N;;;;;
+1DA4A;SIGNWRITING MOUTH OPEN RECTANGLE;Mn;0;NSM;;;;;N;;;;;
+1DA4B;SIGNWRITING MOUTH OPEN RECTANGLE WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA4C;SIGNWRITING MOUTH OPEN RECTANGLE YAWN;Mn;0;NSM;;;;;N;;;;;
+1DA4D;SIGNWRITING MOUTH KISS;Mn;0;NSM;;;;;N;;;;;
+1DA4E;SIGNWRITING MOUTH KISS FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA4F;SIGNWRITING MOUTH KISS WRINKLED;Mn;0;NSM;;;;;N;;;;;
+1DA50;SIGNWRITING MOUTH TENSE;Mn;0;NSM;;;;;N;;;;;
+1DA51;SIGNWRITING MOUTH TENSE FORWARD;Mn;0;NSM;;;;;N;;;;;
+1DA52;SIGNWRITING MOUTH TENSE SUCKED;Mn;0;NSM;;;;;N;;;;;
+1DA53;SIGNWRITING LIPS PRESSED TOGETHER;Mn;0;NSM;;;;;N;;;;;
+1DA54;SIGNWRITING LIP LOWER OVER UPPER;Mn;0;NSM;;;;;N;;;;;
+1DA55;SIGNWRITING LIP UPPER OVER LOWER;Mn;0;NSM;;;;;N;;;;;
+1DA56;SIGNWRITING MOUTH CORNERS;Mn;0;NSM;;;;;N;;;;;
+1DA57;SIGNWRITING MOUTH WRINKLES SINGLE;Mn;0;NSM;;;;;N;;;;;
+1DA58;SIGNWRITING MOUTH WRINKLES DOUBLE;Mn;0;NSM;;;;;N;;;;;
+1DA59;SIGNWRITING TONGUE STICKING OUT FAR;Mn;0;NSM;;;;;N;;;;;
+1DA5A;SIGNWRITING TONGUE LICKING LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA5B;SIGNWRITING TONGUE TIP BETWEEN LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA5C;SIGNWRITING TONGUE TIP TOUCHING INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;;
+1DA5D;SIGNWRITING TONGUE INSIDE MOUTH RELAXED;Mn;0;NSM;;;;;N;;;;;
+1DA5E;SIGNWRITING TONGUE MOVES AGAINST CHEEK;Mn;0;NSM;;;;;N;;;;;
+1DA5F;SIGNWRITING TONGUE CENTRE STICKING OUT;Mn;0;NSM;;;;;N;;;;;
+1DA60;SIGNWRITING TONGUE CENTRE INSIDE MOUTH;Mn;0;NSM;;;;;N;;;;;
+1DA61;SIGNWRITING TEETH;Mn;0;NSM;;;;;N;;;;;
+1DA62;SIGNWRITING TEETH MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA63;SIGNWRITING TEETH ON TONGUE;Mn;0;NSM;;;;;N;;;;;
+1DA64;SIGNWRITING TEETH ON TONGUE MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA65;SIGNWRITING TEETH ON LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA66;SIGNWRITING TEETH ON LIPS MOVEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA67;SIGNWRITING TEETH BITE LIPS;Mn;0;NSM;;;;;N;;;;;
+1DA68;SIGNWRITING MOVEMENT-WALLPLANE JAW;Mn;0;NSM;;;;;N;;;;;
+1DA69;SIGNWRITING MOVEMENT-FLOORPLANE JAW;Mn;0;NSM;;;;;N;;;;;
+1DA6A;SIGNWRITING NECK;Mn;0;NSM;;;;;N;;;;;
+1DA6B;SIGNWRITING HAIR;Mn;0;NSM;;;;;N;;;;;
+1DA6C;SIGNWRITING EXCITEMENT;Mn;0;NSM;;;;;N;;;;;
+1DA6D;SIGNWRITING SHOULDER HIP SPINE;So;0;L;;;;;N;;;;;
+1DA6E;SIGNWRITING SHOULDER HIP POSITIONS;So;0;L;;;;;N;;;;;
+1DA6F;SIGNWRITING WALLPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;;
+1DA70;SIGNWRITING FLOORPLANE SHOULDER HIP MOVE;So;0;L;;;;;N;;;;;
+1DA71;SIGNWRITING SHOULDER TILTING FROM WAIST;So;0;L;;;;;N;;;;;
+1DA72;SIGNWRITING TORSO-WALLPLANE STRAIGHT STRETCH;So;0;L;;;;;N;;;;;
+1DA73;SIGNWRITING TORSO-WALLPLANE CURVED BEND;So;0;L;;;;;N;;;;;
+1DA74;SIGNWRITING TORSO-FLOORPLANE TWISTING;So;0;L;;;;;N;;;;;
+1DA75;SIGNWRITING UPPER BODY TILTING FROM HIP JOINTS;Mn;0;NSM;;;;;N;;;;;
+1DA76;SIGNWRITING LIMB COMBINATION;So;0;L;;;;;N;;;;;
+1DA77;SIGNWRITING LIMB LENGTH-1;So;0;L;;;;;N;;;;;
+1DA78;SIGNWRITING LIMB LENGTH-2;So;0;L;;;;;N;;;;;
+1DA79;SIGNWRITING LIMB LENGTH-3;So;0;L;;;;;N;;;;;
+1DA7A;SIGNWRITING LIMB LENGTH-4;So;0;L;;;;;N;;;;;
+1DA7B;SIGNWRITING LIMB LENGTH-5;So;0;L;;;;;N;;;;;
+1DA7C;SIGNWRITING LIMB LENGTH-6;So;0;L;;;;;N;;;;;
+1DA7D;SIGNWRITING LIMB LENGTH-7;So;0;L;;;;;N;;;;;
+1DA7E;SIGNWRITING FINGER;So;0;L;;;;;N;;;;;
+1DA7F;SIGNWRITING LOCATION-WALLPLANE SPACE;So;0;L;;;;;N;;;;;
+1DA80;SIGNWRITING LOCATION-FLOORPLANE SPACE;So;0;L;;;;;N;;;;;
+1DA81;SIGNWRITING LOCATION HEIGHT;So;0;L;;;;;N;;;;;
+1DA82;SIGNWRITING LOCATION WIDTH;So;0;L;;;;;N;;;;;
+1DA83;SIGNWRITING LOCATION DEPTH;So;0;L;;;;;N;;;;;
+1DA84;SIGNWRITING LOCATION HEAD NECK;Mn;0;NSM;;;;;N;;;;;
+1DA85;SIGNWRITING LOCATION TORSO;So;0;L;;;;;N;;;;;
+1DA86;SIGNWRITING LOCATION LIMBS DIGITS;So;0;L;;;;;N;;;;;
+1DA87;SIGNWRITING COMMA;Po;0;L;;;;;N;;;;;
+1DA88;SIGNWRITING FULL STOP;Po;0;L;;;;;N;;;;;
+1DA89;SIGNWRITING SEMICOLON;Po;0;L;;;;;N;;;;;
+1DA8A;SIGNWRITING COLON;Po;0;L;;;;;N;;;;;
+1DA8B;SIGNWRITING PARENTHESIS;Po;0;L;;;;;N;;;;;
+1DA9B;SIGNWRITING FILL MODIFIER-2;Mn;0;NSM;;;;;N;;;;;
+1DA9C;SIGNWRITING FILL MODIFIER-3;Mn;0;NSM;;;;;N;;;;;
+1DA9D;SIGNWRITING FILL MODIFIER-4;Mn;0;NSM;;;;;N;;;;;
+1DA9E;SIGNWRITING FILL MODIFIER-5;Mn;0;NSM;;;;;N;;;;;
+1DA9F;SIGNWRITING FILL MODIFIER-6;Mn;0;NSM;;;;;N;;;;;
+1DAA1;SIGNWRITING ROTATION MODIFIER-2;Mn;0;NSM;;;;;N;;;;;
+1DAA2;SIGNWRITING ROTATION MODIFIER-3;Mn;0;NSM;;;;;N;;;;;
+1DAA3;SIGNWRITING ROTATION MODIFIER-4;Mn;0;NSM;;;;;N;;;;;
+1DAA4;SIGNWRITING ROTATION MODIFIER-5;Mn;0;NSM;;;;;N;;;;;
+1DAA5;SIGNWRITING ROTATION MODIFIER-6;Mn;0;NSM;;;;;N;;;;;
+1DAA6;SIGNWRITING ROTATION MODIFIER-7;Mn;0;NSM;;;;;N;;;;;
+1DAA7;SIGNWRITING ROTATION MODIFIER-8;Mn;0;NSM;;;;;N;;;;;
+1DAA8;SIGNWRITING ROTATION MODIFIER-9;Mn;0;NSM;;;;;N;;;;;
+1DAA9;SIGNWRITING ROTATION MODIFIER-10;Mn;0;NSM;;;;;N;;;;;
+1DAAA;SIGNWRITING ROTATION MODIFIER-11;Mn;0;NSM;;;;;N;;;;;
+1DAAB;SIGNWRITING ROTATION MODIFIER-12;Mn;0;NSM;;;;;N;;;;;
+1DAAC;SIGNWRITING ROTATION MODIFIER-13;Mn;0;NSM;;;;;N;;;;;
+1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;;
+1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;;
+1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;;
+1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;;
+1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;;
+1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;;
+1E003;COMBINING GLAGOLITIC LETTER GLAGOLI;Mn;230;NSM;;;;;N;;;;;
+1E004;COMBINING GLAGOLITIC LETTER DOBRO;Mn;230;NSM;;;;;N;;;;;
+1E005;COMBINING GLAGOLITIC LETTER YESTU;Mn;230;NSM;;;;;N;;;;;
+1E006;COMBINING GLAGOLITIC LETTER ZHIVETE;Mn;230;NSM;;;;;N;;;;;
+1E008;COMBINING GLAGOLITIC LETTER ZEMLJA;Mn;230;NSM;;;;;N;;;;;
+1E009;COMBINING GLAGOLITIC LETTER IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00A;COMBINING GLAGOLITIC LETTER INITIAL IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00B;COMBINING GLAGOLITIC LETTER I;Mn;230;NSM;;;;;N;;;;;
+1E00C;COMBINING GLAGOLITIC LETTER DJERVI;Mn;230;NSM;;;;;N;;;;;
+1E00D;COMBINING GLAGOLITIC LETTER KAKO;Mn;230;NSM;;;;;N;;;;;
+1E00E;COMBINING GLAGOLITIC LETTER LJUDIJE;Mn;230;NSM;;;;;N;;;;;
+1E00F;COMBINING GLAGOLITIC LETTER MYSLITE;Mn;230;NSM;;;;;N;;;;;
+1E010;COMBINING GLAGOLITIC LETTER NASHI;Mn;230;NSM;;;;;N;;;;;
+1E011;COMBINING GLAGOLITIC LETTER ONU;Mn;230;NSM;;;;;N;;;;;
+1E012;COMBINING GLAGOLITIC LETTER POKOJI;Mn;230;NSM;;;;;N;;;;;
+1E013;COMBINING GLAGOLITIC LETTER RITSI;Mn;230;NSM;;;;;N;;;;;
+1E014;COMBINING GLAGOLITIC LETTER SLOVO;Mn;230;NSM;;;;;N;;;;;
+1E015;COMBINING GLAGOLITIC LETTER TVRIDO;Mn;230;NSM;;;;;N;;;;;
+1E016;COMBINING GLAGOLITIC LETTER UKU;Mn;230;NSM;;;;;N;;;;;
+1E017;COMBINING GLAGOLITIC LETTER FRITU;Mn;230;NSM;;;;;N;;;;;
+1E018;COMBINING GLAGOLITIC LETTER HERU;Mn;230;NSM;;;;;N;;;;;
+1E01B;COMBINING GLAGOLITIC LETTER SHTA;Mn;230;NSM;;;;;N;;;;;
+1E01C;COMBINING GLAGOLITIC LETTER TSI;Mn;230;NSM;;;;;N;;;;;
+1E01D;COMBINING GLAGOLITIC LETTER CHRIVI;Mn;230;NSM;;;;;N;;;;;
+1E01E;COMBINING GLAGOLITIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+1E01F;COMBINING GLAGOLITIC LETTER YERU;Mn;230;NSM;;;;;N;;;;;
+1E020;COMBINING GLAGOLITIC LETTER YERI;Mn;230;NSM;;;;;N;;;;;
+1E021;COMBINING GLAGOLITIC LETTER YATI;Mn;230;NSM;;;;;N;;;;;
+1E023;COMBINING GLAGOLITIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+1E024;COMBINING GLAGOLITIC LETTER SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E026;COMBINING GLAGOLITIC LETTER YO;Mn;230;NSM;;;;;N;;;;;
+1E027;COMBINING GLAGOLITIC LETTER IOTATED SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E028;COMBINING GLAGOLITIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E029;COMBINING GLAGOLITIC LETTER IOTATED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E02A;COMBINING GLAGOLITIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
+1E800;MENDE KIKAKUI SYLLABLE M001 KI;Lo;0;R;;;;;N;;;;;
+1E801;MENDE KIKAKUI SYLLABLE M002 KA;Lo;0;R;;;;;N;;;;;
+1E802;MENDE KIKAKUI SYLLABLE M003 KU;Lo;0;R;;;;;N;;;;;
+1E803;MENDE KIKAKUI SYLLABLE M065 KEE;Lo;0;R;;;;;N;;;;;
+1E804;MENDE KIKAKUI SYLLABLE M095 KE;Lo;0;R;;;;;N;;;;;
+1E805;MENDE KIKAKUI SYLLABLE M076 KOO;Lo;0;R;;;;;N;;;;;
+1E806;MENDE KIKAKUI SYLLABLE M048 KO;Lo;0;R;;;;;N;;;;;
+1E807;MENDE KIKAKUI SYLLABLE M179 KUA;Lo;0;R;;;;;N;;;;;
+1E808;MENDE KIKAKUI SYLLABLE M004 WI;Lo;0;R;;;;;N;;;;;
+1E809;MENDE KIKAKUI SYLLABLE M005 WA;Lo;0;R;;;;;N;;;;;
+1E80A;MENDE KIKAKUI SYLLABLE M006 WU;Lo;0;R;;;;;N;;;;;
+1E80B;MENDE KIKAKUI SYLLABLE M126 WEE;Lo;0;R;;;;;N;;;;;
+1E80C;MENDE KIKAKUI SYLLABLE M118 WE;Lo;0;R;;;;;N;;;;;
+1E80D;MENDE KIKAKUI SYLLABLE M114 WOO;Lo;0;R;;;;;N;;;;;
+1E80E;MENDE KIKAKUI SYLLABLE M045 WO;Lo;0;R;;;;;N;;;;;
+1E80F;MENDE KIKAKUI SYLLABLE M194 WUI;Lo;0;R;;;;;N;;;;;
+1E810;MENDE KIKAKUI SYLLABLE M143 WEI;Lo;0;R;;;;;N;;;;;
+1E811;MENDE KIKAKUI SYLLABLE M061 WVI;Lo;0;R;;;;;N;;;;;
+1E812;MENDE KIKAKUI SYLLABLE M049 WVA;Lo;0;R;;;;;N;;;;;
+1E813;MENDE KIKAKUI SYLLABLE M139 WVE;Lo;0;R;;;;;N;;;;;
+1E814;MENDE KIKAKUI SYLLABLE M007 MIN;Lo;0;R;;;;;N;;;;;
+1E815;MENDE KIKAKUI SYLLABLE M008 MAN;Lo;0;R;;;;;N;;;;;
+1E816;MENDE KIKAKUI SYLLABLE M009 MUN;Lo;0;R;;;;;N;;;;;
+1E817;MENDE KIKAKUI SYLLABLE M059 MEN;Lo;0;R;;;;;N;;;;;
+1E818;MENDE KIKAKUI SYLLABLE M094 MON;Lo;0;R;;;;;N;;;;;
+1E819;MENDE KIKAKUI SYLLABLE M154 MUAN;Lo;0;R;;;;;N;;;;;
+1E81A;MENDE KIKAKUI SYLLABLE M189 MUEN;Lo;0;R;;;;;N;;;;;
+1E81B;MENDE KIKAKUI SYLLABLE M010 BI;Lo;0;R;;;;;N;;;;;
+1E81C;MENDE KIKAKUI SYLLABLE M011 BA;Lo;0;R;;;;;N;;;;;
+1E81D;MENDE KIKAKUI SYLLABLE M012 BU;Lo;0;R;;;;;N;;;;;
+1E81E;MENDE KIKAKUI SYLLABLE M150 BEE;Lo;0;R;;;;;N;;;;;
+1E81F;MENDE KIKAKUI SYLLABLE M097 BE;Lo;0;R;;;;;N;;;;;
+1E820;MENDE KIKAKUI SYLLABLE M103 BOO;Lo;0;R;;;;;N;;;;;
+1E821;MENDE KIKAKUI SYLLABLE M138 BO;Lo;0;R;;;;;N;;;;;
+1E822;MENDE KIKAKUI SYLLABLE M013 I;Lo;0;R;;;;;N;;;;;
+1E823;MENDE KIKAKUI SYLLABLE M014 A;Lo;0;R;;;;;N;;;;;
+1E824;MENDE KIKAKUI SYLLABLE M015 U;Lo;0;R;;;;;N;;;;;
+1E825;MENDE KIKAKUI SYLLABLE M163 EE;Lo;0;R;;;;;N;;;;;
+1E826;MENDE KIKAKUI SYLLABLE M100 E;Lo;0;R;;;;;N;;;;;
+1E827;MENDE KIKAKUI SYLLABLE M165 OO;Lo;0;R;;;;;N;;;;;
+1E828;MENDE KIKAKUI SYLLABLE M147 O;Lo;0;R;;;;;N;;;;;
+1E829;MENDE KIKAKUI SYLLABLE M137 EI;Lo;0;R;;;;;N;;;;;
+1E82A;MENDE KIKAKUI SYLLABLE M131 IN;Lo;0;R;;;;;N;;;;;
+1E82B;MENDE KIKAKUI SYLLABLE M135 IN;Lo;0;R;;;;;N;;;;;
+1E82C;MENDE KIKAKUI SYLLABLE M195 AN;Lo;0;R;;;;;N;;;;;
+1E82D;MENDE KIKAKUI SYLLABLE M178 EN;Lo;0;R;;;;;N;;;;;
+1E82E;MENDE KIKAKUI SYLLABLE M019 SI;Lo;0;R;;;;;N;;;;;
+1E82F;MENDE KIKAKUI SYLLABLE M020 SA;Lo;0;R;;;;;N;;;;;
+1E830;MENDE KIKAKUI SYLLABLE M021 SU;Lo;0;R;;;;;N;;;;;
+1E831;MENDE KIKAKUI SYLLABLE M162 SEE;Lo;0;R;;;;;N;;;;;
+1E832;MENDE KIKAKUI SYLLABLE M116 SE;Lo;0;R;;;;;N;;;;;
+1E833;MENDE KIKAKUI SYLLABLE M136 SOO;Lo;0;R;;;;;N;;;;;
+1E834;MENDE KIKAKUI SYLLABLE M079 SO;Lo;0;R;;;;;N;;;;;
+1E835;MENDE KIKAKUI SYLLABLE M196 SIA;Lo;0;R;;;;;N;;;;;
+1E836;MENDE KIKAKUI SYLLABLE M025 LI;Lo;0;R;;;;;N;;;;;
+1E837;MENDE KIKAKUI SYLLABLE M026 LA;Lo;0;R;;;;;N;;;;;
+1E838;MENDE KIKAKUI SYLLABLE M027 LU;Lo;0;R;;;;;N;;;;;
+1E839;MENDE KIKAKUI SYLLABLE M084 LEE;Lo;0;R;;;;;N;;;;;
+1E83A;MENDE KIKAKUI SYLLABLE M073 LE;Lo;0;R;;;;;N;;;;;
+1E83B;MENDE KIKAKUI SYLLABLE M054 LOO;Lo;0;R;;;;;N;;;;;
+1E83C;MENDE KIKAKUI SYLLABLE M153 LO;Lo;0;R;;;;;N;;;;;
+1E83D;MENDE KIKAKUI SYLLABLE M110 LONG LE;Lo;0;R;;;;;N;;;;;
+1E83E;MENDE KIKAKUI SYLLABLE M016 DI;Lo;0;R;;;;;N;;;;;
+1E83F;MENDE KIKAKUI SYLLABLE M017 DA;Lo;0;R;;;;;N;;;;;
+1E840;MENDE KIKAKUI SYLLABLE M018 DU;Lo;0;R;;;;;N;;;;;
+1E841;MENDE KIKAKUI SYLLABLE M089 DEE;Lo;0;R;;;;;N;;;;;
+1E842;MENDE KIKAKUI SYLLABLE M180 DOO;Lo;0;R;;;;;N;;;;;
+1E843;MENDE KIKAKUI SYLLABLE M181 DO;Lo;0;R;;;;;N;;;;;
+1E844;MENDE KIKAKUI SYLLABLE M022 TI;Lo;0;R;;;;;N;;;;;
+1E845;MENDE KIKAKUI SYLLABLE M023 TA;Lo;0;R;;;;;N;;;;;
+1E846;MENDE KIKAKUI SYLLABLE M024 TU;Lo;0;R;;;;;N;;;;;
+1E847;MENDE KIKAKUI SYLLABLE M091 TEE;Lo;0;R;;;;;N;;;;;
+1E848;MENDE KIKAKUI SYLLABLE M055 TE;Lo;0;R;;;;;N;;;;;
+1E849;MENDE KIKAKUI SYLLABLE M104 TOO;Lo;0;R;;;;;N;;;;;
+1E84A;MENDE KIKAKUI SYLLABLE M069 TO;Lo;0;R;;;;;N;;;;;
+1E84B;MENDE KIKAKUI SYLLABLE M028 JI;Lo;0;R;;;;;N;;;;;
+1E84C;MENDE KIKAKUI SYLLABLE M029 JA;Lo;0;R;;;;;N;;;;;
+1E84D;MENDE KIKAKUI SYLLABLE M030 JU;Lo;0;R;;;;;N;;;;;
+1E84E;MENDE KIKAKUI SYLLABLE M157 JEE;Lo;0;R;;;;;N;;;;;
+1E84F;MENDE KIKAKUI SYLLABLE M113 JE;Lo;0;R;;;;;N;;;;;
+1E850;MENDE KIKAKUI SYLLABLE M160 JOO;Lo;0;R;;;;;N;;;;;
+1E851;MENDE KIKAKUI SYLLABLE M063 JO;Lo;0;R;;;;;N;;;;;
+1E852;MENDE KIKAKUI SYLLABLE M175 LONG JO;Lo;0;R;;;;;N;;;;;
+1E853;MENDE KIKAKUI SYLLABLE M031 YI;Lo;0;R;;;;;N;;;;;
+1E854;MENDE KIKAKUI SYLLABLE M032 YA;Lo;0;R;;;;;N;;;;;
+1E855;MENDE KIKAKUI SYLLABLE M033 YU;Lo;0;R;;;;;N;;;;;
+1E856;MENDE KIKAKUI SYLLABLE M109 YEE;Lo;0;R;;;;;N;;;;;
+1E857;MENDE KIKAKUI SYLLABLE M080 YE;Lo;0;R;;;;;N;;;;;
+1E858;MENDE KIKAKUI SYLLABLE M141 YOO;Lo;0;R;;;;;N;;;;;
+1E859;MENDE KIKAKUI SYLLABLE M121 YO;Lo;0;R;;;;;N;;;;;
+1E85A;MENDE KIKAKUI SYLLABLE M034 FI;Lo;0;R;;;;;N;;;;;
+1E85B;MENDE KIKAKUI SYLLABLE M035 FA;Lo;0;R;;;;;N;;;;;
+1E85C;MENDE KIKAKUI SYLLABLE M036 FU;Lo;0;R;;;;;N;;;;;
+1E85D;MENDE KIKAKUI SYLLABLE M078 FEE;Lo;0;R;;;;;N;;;;;
+1E85E;MENDE KIKAKUI SYLLABLE M075 FE;Lo;0;R;;;;;N;;;;;
+1E85F;MENDE KIKAKUI SYLLABLE M133 FOO;Lo;0;R;;;;;N;;;;;
+1E860;MENDE KIKAKUI SYLLABLE M088 FO;Lo;0;R;;;;;N;;;;;
+1E861;MENDE KIKAKUI SYLLABLE M197 FUA;Lo;0;R;;;;;N;;;;;
+1E862;MENDE KIKAKUI SYLLABLE M101 FAN;Lo;0;R;;;;;N;;;;;
+1E863;MENDE KIKAKUI SYLLABLE M037 NIN;Lo;0;R;;;;;N;;;;;
+1E864;MENDE KIKAKUI SYLLABLE M038 NAN;Lo;0;R;;;;;N;;;;;
+1E865;MENDE KIKAKUI SYLLABLE M039 NUN;Lo;0;R;;;;;N;;;;;
+1E866;MENDE KIKAKUI SYLLABLE M117 NEN;Lo;0;R;;;;;N;;;;;
+1E867;MENDE KIKAKUI SYLLABLE M169 NON;Lo;0;R;;;;;N;;;;;
+1E868;MENDE KIKAKUI SYLLABLE M176 HI;Lo;0;R;;;;;N;;;;;
+1E869;MENDE KIKAKUI SYLLABLE M041 HA;Lo;0;R;;;;;N;;;;;
+1E86A;MENDE KIKAKUI SYLLABLE M186 HU;Lo;0;R;;;;;N;;;;;
+1E86B;MENDE KIKAKUI SYLLABLE M040 HEE;Lo;0;R;;;;;N;;;;;
+1E86C;MENDE KIKAKUI SYLLABLE M096 HE;Lo;0;R;;;;;N;;;;;
+1E86D;MENDE KIKAKUI SYLLABLE M042 HOO;Lo;0;R;;;;;N;;;;;
+1E86E;MENDE KIKAKUI SYLLABLE M140 HO;Lo;0;R;;;;;N;;;;;
+1E86F;MENDE KIKAKUI SYLLABLE M083 HEEI;Lo;0;R;;;;;N;;;;;
+1E870;MENDE KIKAKUI SYLLABLE M128 HOOU;Lo;0;R;;;;;N;;;;;
+1E871;MENDE KIKAKUI SYLLABLE M053 HIN;Lo;0;R;;;;;N;;;;;
+1E872;MENDE KIKAKUI SYLLABLE M130 HAN;Lo;0;R;;;;;N;;;;;
+1E873;MENDE KIKAKUI SYLLABLE M087 HUN;Lo;0;R;;;;;N;;;;;
+1E874;MENDE KIKAKUI SYLLABLE M052 HEN;Lo;0;R;;;;;N;;;;;
+1E875;MENDE KIKAKUI SYLLABLE M193 HON;Lo;0;R;;;;;N;;;;;
+1E876;MENDE KIKAKUI SYLLABLE M046 HUAN;Lo;0;R;;;;;N;;;;;
+1E877;MENDE KIKAKUI SYLLABLE M090 NGGI;Lo;0;R;;;;;N;;;;;
+1E878;MENDE KIKAKUI SYLLABLE M043 NGGA;Lo;0;R;;;;;N;;;;;
+1E879;MENDE KIKAKUI SYLLABLE M082 NGGU;Lo;0;R;;;;;N;;;;;
+1E87A;MENDE KIKAKUI SYLLABLE M115 NGGEE;Lo;0;R;;;;;N;;;;;
+1E87B;MENDE KIKAKUI SYLLABLE M146 NGGE;Lo;0;R;;;;;N;;;;;
+1E87C;MENDE KIKAKUI SYLLABLE M156 NGGOO;Lo;0;R;;;;;N;;;;;
+1E87D;MENDE KIKAKUI SYLLABLE M120 NGGO;Lo;0;R;;;;;N;;;;;
+1E87E;MENDE KIKAKUI SYLLABLE M159 NGGAA;Lo;0;R;;;;;N;;;;;
+1E87F;MENDE KIKAKUI SYLLABLE M127 NGGUA;Lo;0;R;;;;;N;;;;;
+1E880;MENDE KIKAKUI SYLLABLE M086 LONG NGGE;Lo;0;R;;;;;N;;;;;
+1E881;MENDE KIKAKUI SYLLABLE M106 LONG NGGOO;Lo;0;R;;;;;N;;;;;
+1E882;MENDE KIKAKUI SYLLABLE M183 LONG NGGO;Lo;0;R;;;;;N;;;;;
+1E883;MENDE KIKAKUI SYLLABLE M155 GI;Lo;0;R;;;;;N;;;;;
+1E884;MENDE KIKAKUI SYLLABLE M111 GA;Lo;0;R;;;;;N;;;;;
+1E885;MENDE KIKAKUI SYLLABLE M168 GU;Lo;0;R;;;;;N;;;;;
+1E886;MENDE KIKAKUI SYLLABLE M190 GEE;Lo;0;R;;;;;N;;;;;
+1E887;MENDE KIKAKUI SYLLABLE M166 GUEI;Lo;0;R;;;;;N;;;;;
+1E888;MENDE KIKAKUI SYLLABLE M167 GUAN;Lo;0;R;;;;;N;;;;;
+1E889;MENDE KIKAKUI SYLLABLE M184 NGEN;Lo;0;R;;;;;N;;;;;
+1E88A;MENDE KIKAKUI SYLLABLE M057 NGON;Lo;0;R;;;;;N;;;;;
+1E88B;MENDE KIKAKUI SYLLABLE M177 NGUAN;Lo;0;R;;;;;N;;;;;
+1E88C;MENDE KIKAKUI SYLLABLE M068 PI;Lo;0;R;;;;;N;;;;;
+1E88D;MENDE KIKAKUI SYLLABLE M099 PA;Lo;0;R;;;;;N;;;;;
+1E88E;MENDE KIKAKUI SYLLABLE M050 PU;Lo;0;R;;;;;N;;;;;
+1E88F;MENDE KIKAKUI SYLLABLE M081 PEE;Lo;0;R;;;;;N;;;;;
+1E890;MENDE KIKAKUI SYLLABLE M051 PE;Lo;0;R;;;;;N;;;;;
+1E891;MENDE KIKAKUI SYLLABLE M102 POO;Lo;0;R;;;;;N;;;;;
+1E892;MENDE KIKAKUI SYLLABLE M066 PO;Lo;0;R;;;;;N;;;;;
+1E893;MENDE KIKAKUI SYLLABLE M145 MBI;Lo;0;R;;;;;N;;;;;
+1E894;MENDE KIKAKUI SYLLABLE M062 MBA;Lo;0;R;;;;;N;;;;;
+1E895;MENDE KIKAKUI SYLLABLE M122 MBU;Lo;0;R;;;;;N;;;;;
+1E896;MENDE KIKAKUI SYLLABLE M047 MBEE;Lo;0;R;;;;;N;;;;;
+1E897;MENDE KIKAKUI SYLLABLE M188 MBEE;Lo;0;R;;;;;N;;;;;
+1E898;MENDE KIKAKUI SYLLABLE M072 MBE;Lo;0;R;;;;;N;;;;;
+1E899;MENDE KIKAKUI SYLLABLE M172 MBOO;Lo;0;R;;;;;N;;;;;
+1E89A;MENDE KIKAKUI SYLLABLE M174 MBO;Lo;0;R;;;;;N;;;;;
+1E89B;MENDE KIKAKUI SYLLABLE M187 MBUU;Lo;0;R;;;;;N;;;;;
+1E89C;MENDE KIKAKUI SYLLABLE M161 LONG MBE;Lo;0;R;;;;;N;;;;;
+1E89D;MENDE KIKAKUI SYLLABLE M105 LONG MBOO;Lo;0;R;;;;;N;;;;;
+1E89E;MENDE KIKAKUI SYLLABLE M142 LONG MBO;Lo;0;R;;;;;N;;;;;
+1E89F;MENDE KIKAKUI SYLLABLE M132 KPI;Lo;0;R;;;;;N;;;;;
+1E8A0;MENDE KIKAKUI SYLLABLE M092 KPA;Lo;0;R;;;;;N;;;;;
+1E8A1;MENDE KIKAKUI SYLLABLE M074 KPU;Lo;0;R;;;;;N;;;;;
+1E8A2;MENDE KIKAKUI SYLLABLE M044 KPEE;Lo;0;R;;;;;N;;;;;
+1E8A3;MENDE KIKAKUI SYLLABLE M108 KPE;Lo;0;R;;;;;N;;;;;
+1E8A4;MENDE KIKAKUI SYLLABLE M112 KPOO;Lo;0;R;;;;;N;;;;;
+1E8A5;MENDE KIKAKUI SYLLABLE M158 KPO;Lo;0;R;;;;;N;;;;;
+1E8A6;MENDE KIKAKUI SYLLABLE M124 GBI;Lo;0;R;;;;;N;;;;;
+1E8A7;MENDE KIKAKUI SYLLABLE M056 GBA;Lo;0;R;;;;;N;;;;;
+1E8A8;MENDE KIKAKUI SYLLABLE M148 GBU;Lo;0;R;;;;;N;;;;;
+1E8A9;MENDE KIKAKUI SYLLABLE M093 GBEE;Lo;0;R;;;;;N;;;;;
+1E8AA;MENDE KIKAKUI SYLLABLE M107 GBE;Lo;0;R;;;;;N;;;;;
+1E8AB;MENDE KIKAKUI SYLLABLE M071 GBOO;Lo;0;R;;;;;N;;;;;
+1E8AC;MENDE KIKAKUI SYLLABLE M070 GBO;Lo;0;R;;;;;N;;;;;
+1E8AD;MENDE KIKAKUI SYLLABLE M171 RA;Lo;0;R;;;;;N;;;;;
+1E8AE;MENDE KIKAKUI SYLLABLE M123 NDI;Lo;0;R;;;;;N;;;;;
+1E8AF;MENDE KIKAKUI SYLLABLE M129 NDA;Lo;0;R;;;;;N;;;;;
+1E8B0;MENDE KIKAKUI SYLLABLE M125 NDU;Lo;0;R;;;;;N;;;;;
+1E8B1;MENDE KIKAKUI SYLLABLE M191 NDEE;Lo;0;R;;;;;N;;;;;
+1E8B2;MENDE KIKAKUI SYLLABLE M119 NDE;Lo;0;R;;;;;N;;;;;
+1E8B3;MENDE KIKAKUI SYLLABLE M067 NDOO;Lo;0;R;;;;;N;;;;;
+1E8B4;MENDE KIKAKUI SYLLABLE M064 NDO;Lo;0;R;;;;;N;;;;;
+1E8B5;MENDE KIKAKUI SYLLABLE M152 NJA;Lo;0;R;;;;;N;;;;;
+1E8B6;MENDE KIKAKUI SYLLABLE M192 NJU;Lo;0;R;;;;;N;;;;;
+1E8B7;MENDE KIKAKUI SYLLABLE M149 NJEE;Lo;0;R;;;;;N;;;;;
+1E8B8;MENDE KIKAKUI SYLLABLE M134 NJOO;Lo;0;R;;;;;N;;;;;
+1E8B9;MENDE KIKAKUI SYLLABLE M182 VI;Lo;0;R;;;;;N;;;;;
+1E8BA;MENDE KIKAKUI SYLLABLE M185 VA;Lo;0;R;;;;;N;;;;;
+1E8BB;MENDE KIKAKUI SYLLABLE M151 VU;Lo;0;R;;;;;N;;;;;
+1E8BC;MENDE KIKAKUI SYLLABLE M173 VEE;Lo;0;R;;;;;N;;;;;
+1E8BD;MENDE KIKAKUI SYLLABLE M085 VE;Lo;0;R;;;;;N;;;;;
+1E8BE;MENDE KIKAKUI SYLLABLE M144 VOO;Lo;0;R;;;;;N;;;;;
+1E8BF;MENDE KIKAKUI SYLLABLE M077 VO;Lo;0;R;;;;;N;;;;;
+1E8C0;MENDE KIKAKUI SYLLABLE M164 NYIN;Lo;0;R;;;;;N;;;;;
+1E8C1;MENDE KIKAKUI SYLLABLE M058 NYAN;Lo;0;R;;;;;N;;;;;
+1E8C2;MENDE KIKAKUI SYLLABLE M170 NYUN;Lo;0;R;;;;;N;;;;;
+1E8C3;MENDE KIKAKUI SYLLABLE M098 NYEN;Lo;0;R;;;;;N;;;;;
+1E8C4;MENDE KIKAKUI SYLLABLE M060 NYON;Lo;0;R;;;;;N;;;;;
+1E8C7;MENDE KIKAKUI DIGIT ONE;No;0;R;;;;1;N;;;;;
+1E8C8;MENDE KIKAKUI DIGIT TWO;No;0;R;;;;2;N;;;;;
+1E8C9;MENDE KIKAKUI DIGIT THREE;No;0;R;;;;3;N;;;;;
+1E8CA;MENDE KIKAKUI DIGIT FOUR;No;0;R;;;;4;N;;;;;
+1E8CB;MENDE KIKAKUI DIGIT FIVE;No;0;R;;;;5;N;;;;;
+1E8CC;MENDE KIKAKUI DIGIT SIX;No;0;R;;;;6;N;;;;;
+1E8CD;MENDE KIKAKUI DIGIT SEVEN;No;0;R;;;;7;N;;;;;
+1E8CE;MENDE KIKAKUI DIGIT EIGHT;No;0;R;;;;8;N;;;;;
+1E8CF;MENDE KIKAKUI DIGIT NINE;No;0;R;;;;9;N;;;;;
+1E8D0;MENDE KIKAKUI COMBINING NUMBER TEENS;Mn;220;NSM;;;;;N;;;;;
+1E8D1;MENDE KIKAKUI COMBINING NUMBER TENS;Mn;220;NSM;;;;;N;;;;;
+1E8D2;MENDE KIKAKUI COMBINING NUMBER HUNDREDS;Mn;220;NSM;;;;;N;;;;;
+1E8D3;MENDE KIKAKUI COMBINING NUMBER THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D4;MENDE KIKAKUI COMBINING NUMBER TEN THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D5;MENDE KIKAKUI COMBINING NUMBER HUNDRED THOUSANDS;Mn;220;NSM;;;;;N;;;;;
+1E8D6;MENDE KIKAKUI COMBINING NUMBER MILLIONS;Mn;220;NSM;;;;;N;;;;;
+1E900;ADLAM CAPITAL LETTER ALIF;Lu;0;R;;;;;N;;;;1E922;
+1E901;ADLAM CAPITAL LETTER DAALI;Lu;0;R;;;;;N;;;;1E923;
+1E902;ADLAM CAPITAL LETTER LAAM;Lu;0;R;;;;;N;;;;1E924;
+1E903;ADLAM CAPITAL LETTER MIIM;Lu;0;R;;;;;N;;;;1E925;
+1E904;ADLAM CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;1E926;
+1E905;ADLAM CAPITAL LETTER SINNYIIYHE;Lu;0;R;;;;;N;;;;1E927;
+1E906;ADLAM CAPITAL LETTER PE;Lu;0;R;;;;;N;;;;1E928;
+1E907;ADLAM CAPITAL LETTER BHE;Lu;0;R;;;;;N;;;;1E929;
+1E908;ADLAM CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;1E92A;
+1E909;ADLAM CAPITAL LETTER E;Lu;0;R;;;;;N;;;;1E92B;
+1E90A;ADLAM CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;1E92C;
+1E90B;ADLAM CAPITAL LETTER I;Lu;0;R;;;;;N;;;;1E92D;
+1E90C;ADLAM CAPITAL LETTER O;Lu;0;R;;;;;N;;;;1E92E;
+1E90D;ADLAM CAPITAL LETTER DHA;Lu;0;R;;;;;N;;;;1E92F;
+1E90E;ADLAM CAPITAL LETTER YHE;Lu;0;R;;;;;N;;;;1E930;
+1E90F;ADLAM CAPITAL LETTER WAW;Lu;0;R;;;;;N;;;;1E931;
+1E910;ADLAM CAPITAL LETTER NUN;Lu;0;R;;;;;N;;;;1E932;
+1E911;ADLAM CAPITAL LETTER KAF;Lu;0;R;;;;;N;;;;1E933;
+1E912;ADLAM CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;1E934;
+1E913;ADLAM CAPITAL LETTER U;Lu;0;R;;;;;N;;;;1E935;
+1E914;ADLAM CAPITAL LETTER JIIM;Lu;0;R;;;;;N;;;;1E936;
+1E915;ADLAM CAPITAL LETTER CHI;Lu;0;R;;;;;N;;;;1E937;
+1E916;ADLAM CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;1E938;
+1E917;ADLAM CAPITAL LETTER QAAF;Lu;0;R;;;;;N;;;;1E939;
+1E918;ADLAM CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;1E93A;
+1E919;ADLAM CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;1E93B;
+1E91A;ADLAM CAPITAL LETTER TU;Lu;0;R;;;;;N;;;;1E93C;
+1E91B;ADLAM CAPITAL LETTER NHA;Lu;0;R;;;;;N;;;;1E93D;
+1E91C;ADLAM CAPITAL LETTER VA;Lu;0;R;;;;;N;;;;1E93E;
+1E91D;ADLAM CAPITAL LETTER KHA;Lu;0;R;;;;;N;;;;1E93F;
+1E91E;ADLAM CAPITAL LETTER GBE;Lu;0;R;;;;;N;;;;1E940;
+1E91F;ADLAM CAPITAL LETTER ZAL;Lu;0;R;;;;;N;;;;1E941;
+1E920;ADLAM CAPITAL LETTER KPO;Lu;0;R;;;;;N;;;;1E942;
+1E921;ADLAM CAPITAL LETTER SHA;Lu;0;R;;;;;N;;;;1E943;
+1E922;ADLAM SMALL LETTER ALIF;Ll;0;R;;;;;N;;;1E900;;1E900
+1E923;ADLAM SMALL LETTER DAALI;Ll;0;R;;;;;N;;;1E901;;1E901
+1E924;ADLAM SMALL LETTER LAAM;Ll;0;R;;;;;N;;;1E902;;1E902
+1E925;ADLAM SMALL LETTER MIIM;Ll;0;R;;;;;N;;;1E903;;1E903
+1E926;ADLAM SMALL LETTER BA;Ll;0;R;;;;;N;;;1E904;;1E904
+1E927;ADLAM SMALL LETTER SINNYIIYHE;Ll;0;R;;;;;N;;;1E905;;1E905
+1E928;ADLAM SMALL LETTER PE;Ll;0;R;;;;;N;;;1E906;;1E906
+1E929;ADLAM SMALL LETTER BHE;Ll;0;R;;;;;N;;;1E907;;1E907
+1E92A;ADLAM SMALL LETTER RA;Ll;0;R;;;;;N;;;1E908;;1E908
+1E92B;ADLAM SMALL LETTER E;Ll;0;R;;;;;N;;;1E909;;1E909
+1E92C;ADLAM SMALL LETTER FA;Ll;0;R;;;;;N;;;1E90A;;1E90A
+1E92D;ADLAM SMALL LETTER I;Ll;0;R;;;;;N;;;1E90B;;1E90B
+1E92E;ADLAM SMALL LETTER O;Ll;0;R;;;;;N;;;1E90C;;1E90C
+1E92F;ADLAM SMALL LETTER DHA;Ll;0;R;;;;;N;;;1E90D;;1E90D
+1E930;ADLAM SMALL LETTER YHE;Ll;0;R;;;;;N;;;1E90E;;1E90E
+1E931;ADLAM SMALL LETTER WAW;Ll;0;R;;;;;N;;;1E90F;;1E90F
+1E932;ADLAM SMALL LETTER NUN;Ll;0;R;;;;;N;;;1E910;;1E910
+1E933;ADLAM SMALL LETTER KAF;Ll;0;R;;;;;N;;;1E911;;1E911
+1E934;ADLAM SMALL LETTER YA;Ll;0;R;;;;;N;;;1E912;;1E912
+1E935;ADLAM SMALL LETTER U;Ll;0;R;;;;;N;;;1E913;;1E913
+1E936;ADLAM SMALL LETTER JIIM;Ll;0;R;;;;;N;;;1E914;;1E914
+1E937;ADLAM SMALL LETTER CHI;Ll;0;R;;;;;N;;;1E915;;1E915
+1E938;ADLAM SMALL LETTER HA;Ll;0;R;;;;;N;;;1E916;;1E916
+1E939;ADLAM SMALL LETTER QAAF;Ll;0;R;;;;;N;;;1E917;;1E917
+1E93A;ADLAM SMALL LETTER GA;Ll;0;R;;;;;N;;;1E918;;1E918
+1E93B;ADLAM SMALL LETTER NYA;Ll;0;R;;;;;N;;;1E919;;1E919
+1E93C;ADLAM SMALL LETTER TU;Ll;0;R;;;;;N;;;1E91A;;1E91A
+1E93D;ADLAM SMALL LETTER NHA;Ll;0;R;;;;;N;;;1E91B;;1E91B
+1E93E;ADLAM SMALL LETTER VA;Ll;0;R;;;;;N;;;1E91C;;1E91C
+1E93F;ADLAM SMALL LETTER KHA;Ll;0;R;;;;;N;;;1E91D;;1E91D
+1E940;ADLAM SMALL LETTER GBE;Ll;0;R;;;;;N;;;1E91E;;1E91E
+1E941;ADLAM SMALL LETTER ZAL;Ll;0;R;;;;;N;;;1E91F;;1E91F
+1E942;ADLAM SMALL LETTER KPO;Ll;0;R;;;;;N;;;1E920;;1E920
+1E943;ADLAM SMALL LETTER SHA;Ll;0;R;;;;;N;;;1E921;;1E921
+1E944;ADLAM ALIF LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E945;ADLAM VOWEL LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E946;ADLAM GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1E947;ADLAM HAMZA;Mn;230;NSM;;;;;N;;;;;
+1E948;ADLAM CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E949;ADLAM GEMINATE CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E94A;ADLAM NUKTA;Mn;7;NSM;;;;;N;;;;;
+1E950;ADLAM DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+1E951;ADLAM DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+1E952;ADLAM DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+1E953;ADLAM DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+1E954;ADLAM DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+1E955;ADLAM DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+1E956;ADLAM DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+1E957;ADLAM DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+1E958;ADLAM DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;;
+1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;;
+1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
+1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE03;ARABIC MATHEMATICAL DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EE05;ARABIC MATHEMATICAL WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EE06;ARABIC MATHEMATICAL ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EE07;ARABIC MATHEMATICAL HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE08;ARABIC MATHEMATICAL TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE09;ARABIC MATHEMATICAL YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE0A;ARABIC MATHEMATICAL KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE0B;ARABIC MATHEMATICAL LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE0C;ARABIC MATHEMATICAL MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE0D;ARABIC MATHEMATICAL NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE0E;ARABIC MATHEMATICAL SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE0F;ARABIC MATHEMATICAL AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE10;ARABIC MATHEMATICAL FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE11;ARABIC MATHEMATICAL SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE12;ARABIC MATHEMATICAL QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE13;ARABIC MATHEMATICAL REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EE14;ARABIC MATHEMATICAL SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE15;ARABIC MATHEMATICAL TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE16;ARABIC MATHEMATICAL THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE17;ARABIC MATHEMATICAL KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE18;ARABIC MATHEMATICAL THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EE19;ARABIC MATHEMATICAL DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE1A;ARABIC MATHEMATICAL ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE1B;ARABIC MATHEMATICAL GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE1C;ARABIC MATHEMATICAL DOTLESS BEH;Lo;0;AL;<font> 066E;;;;N;;;;;
+1EE1D;ARABIC MATHEMATICAL DOTLESS NOON;Lo;0;AL;<font> 06BA;;;;N;;;;;
+1EE1E;ARABIC MATHEMATICAL DOTLESS FEH;Lo;0;AL;<font> 06A1;;;;N;;;;;
+1EE1F;ARABIC MATHEMATICAL DOTLESS QAF;Lo;0;AL;<font> 066F;;;;N;;;;;
+1EE21;ARABIC MATHEMATICAL INITIAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE22;ARABIC MATHEMATICAL INITIAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE24;ARABIC MATHEMATICAL INITIAL HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE27;ARABIC MATHEMATICAL INITIAL HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE29;ARABIC MATHEMATICAL INITIAL YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE2A;ARABIC MATHEMATICAL INITIAL KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE2B;ARABIC MATHEMATICAL INITIAL LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE2C;ARABIC MATHEMATICAL INITIAL MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE2D;ARABIC MATHEMATICAL INITIAL NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE2E;ARABIC MATHEMATICAL INITIAL SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE2F;ARABIC MATHEMATICAL INITIAL AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE30;ARABIC MATHEMATICAL INITIAL FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE31;ARABIC MATHEMATICAL INITIAL SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE32;ARABIC MATHEMATICAL INITIAL QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE34;ARABIC MATHEMATICAL INITIAL SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE35;ARABIC MATHEMATICAL INITIAL TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE36;ARABIC MATHEMATICAL INITIAL THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE37;ARABIC MATHEMATICAL INITIAL KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE39;ARABIC MATHEMATICAL INITIAL DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE3B;ARABIC MATHEMATICAL INITIAL GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE42;ARABIC MATHEMATICAL TAILED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE47;ARABIC MATHEMATICAL TAILED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE49;ARABIC MATHEMATICAL TAILED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE4B;ARABIC MATHEMATICAL TAILED LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE4D;ARABIC MATHEMATICAL TAILED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE4E;ARABIC MATHEMATICAL TAILED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE4F;ARABIC MATHEMATICAL TAILED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE51;ARABIC MATHEMATICAL TAILED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE52;ARABIC MATHEMATICAL TAILED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE54;ARABIC MATHEMATICAL TAILED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE57;ARABIC MATHEMATICAL TAILED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE59;ARABIC MATHEMATICAL TAILED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE5B;ARABIC MATHEMATICAL TAILED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE5D;ARABIC MATHEMATICAL TAILED DOTLESS NOON;Lo;0;AL;<font> 06BA;;;;N;;;;;
+1EE5F;ARABIC MATHEMATICAL TAILED DOTLESS QAF;Lo;0;AL;<font> 066F;;;;N;;;;;
+1EE61;ARABIC MATHEMATICAL STRETCHED BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE62;ARABIC MATHEMATICAL STRETCHED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE64;ARABIC MATHEMATICAL STRETCHED HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE67;ARABIC MATHEMATICAL STRETCHED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE68;ARABIC MATHEMATICAL STRETCHED TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE69;ARABIC MATHEMATICAL STRETCHED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE6A;ARABIC MATHEMATICAL STRETCHED KAF;Lo;0;AL;<font> 0643;;;;N;;;;;
+1EE6C;ARABIC MATHEMATICAL STRETCHED MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE6D;ARABIC MATHEMATICAL STRETCHED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE6E;ARABIC MATHEMATICAL STRETCHED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE6F;ARABIC MATHEMATICAL STRETCHED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE70;ARABIC MATHEMATICAL STRETCHED FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE71;ARABIC MATHEMATICAL STRETCHED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE72;ARABIC MATHEMATICAL STRETCHED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE74;ARABIC MATHEMATICAL STRETCHED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE75;ARABIC MATHEMATICAL STRETCHED TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE76;ARABIC MATHEMATICAL STRETCHED THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE77;ARABIC MATHEMATICAL STRETCHED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE79;ARABIC MATHEMATICAL STRETCHED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE7A;ARABIC MATHEMATICAL STRETCHED ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE7B;ARABIC MATHEMATICAL STRETCHED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EE7C;ARABIC MATHEMATICAL STRETCHED DOTLESS BEH;Lo;0;AL;<font> 066E;;;;N;;;;;
+1EE7E;ARABIC MATHEMATICAL STRETCHED DOTLESS FEH;Lo;0;AL;<font> 06A1;;;;N;;;;;
+1EE80;ARABIC MATHEMATICAL LOOPED ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
+1EE81;ARABIC MATHEMATICAL LOOPED BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EE82;ARABIC MATHEMATICAL LOOPED JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EE83;ARABIC MATHEMATICAL LOOPED DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EE84;ARABIC MATHEMATICAL LOOPED HEH;Lo;0;AL;<font> 0647;;;;N;;;;;
+1EE85;ARABIC MATHEMATICAL LOOPED WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EE86;ARABIC MATHEMATICAL LOOPED ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EE87;ARABIC MATHEMATICAL LOOPED HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EE88;ARABIC MATHEMATICAL LOOPED TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EE89;ARABIC MATHEMATICAL LOOPED YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EE8B;ARABIC MATHEMATICAL LOOPED LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EE8C;ARABIC MATHEMATICAL LOOPED MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EE8D;ARABIC MATHEMATICAL LOOPED NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EE8E;ARABIC MATHEMATICAL LOOPED SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EE8F;ARABIC MATHEMATICAL LOOPED AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EE90;ARABIC MATHEMATICAL LOOPED FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EE91;ARABIC MATHEMATICAL LOOPED SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EE92;ARABIC MATHEMATICAL LOOPED QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EE93;ARABIC MATHEMATICAL LOOPED REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EE94;ARABIC MATHEMATICAL LOOPED SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EE95;ARABIC MATHEMATICAL LOOPED TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EE96;ARABIC MATHEMATICAL LOOPED THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EE97;ARABIC MATHEMATICAL LOOPED KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EE98;ARABIC MATHEMATICAL LOOPED THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EE99;ARABIC MATHEMATICAL LOOPED DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EE9A;ARABIC MATHEMATICAL LOOPED ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EE9B;ARABIC MATHEMATICAL LOOPED GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EEA1;ARABIC MATHEMATICAL DOUBLE-STRUCK BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
+1EEA2;ARABIC MATHEMATICAL DOUBLE-STRUCK JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
+1EEA3;ARABIC MATHEMATICAL DOUBLE-STRUCK DAL;Lo;0;AL;<font> 062F;;;;N;;;;;
+1EEA5;ARABIC MATHEMATICAL DOUBLE-STRUCK WAW;Lo;0;AL;<font> 0648;;;;N;;;;;
+1EEA6;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAIN;Lo;0;AL;<font> 0632;;;;N;;;;;
+1EEA7;ARABIC MATHEMATICAL DOUBLE-STRUCK HAH;Lo;0;AL;<font> 062D;;;;N;;;;;
+1EEA8;ARABIC MATHEMATICAL DOUBLE-STRUCK TAH;Lo;0;AL;<font> 0637;;;;N;;;;;
+1EEA9;ARABIC MATHEMATICAL DOUBLE-STRUCK YEH;Lo;0;AL;<font> 064A;;;;N;;;;;
+1EEAB;ARABIC MATHEMATICAL DOUBLE-STRUCK LAM;Lo;0;AL;<font> 0644;;;;N;;;;;
+1EEAC;ARABIC MATHEMATICAL DOUBLE-STRUCK MEEM;Lo;0;AL;<font> 0645;;;;N;;;;;
+1EEAD;ARABIC MATHEMATICAL DOUBLE-STRUCK NOON;Lo;0;AL;<font> 0646;;;;N;;;;;
+1EEAE;ARABIC MATHEMATICAL DOUBLE-STRUCK SEEN;Lo;0;AL;<font> 0633;;;;N;;;;;
+1EEAF;ARABIC MATHEMATICAL DOUBLE-STRUCK AIN;Lo;0;AL;<font> 0639;;;;N;;;;;
+1EEB0;ARABIC MATHEMATICAL DOUBLE-STRUCK FEH;Lo;0;AL;<font> 0641;;;;N;;;;;
+1EEB1;ARABIC MATHEMATICAL DOUBLE-STRUCK SAD;Lo;0;AL;<font> 0635;;;;N;;;;;
+1EEB2;ARABIC MATHEMATICAL DOUBLE-STRUCK QAF;Lo;0;AL;<font> 0642;;;;N;;;;;
+1EEB3;ARABIC MATHEMATICAL DOUBLE-STRUCK REH;Lo;0;AL;<font> 0631;;;;N;;;;;
+1EEB4;ARABIC MATHEMATICAL DOUBLE-STRUCK SHEEN;Lo;0;AL;<font> 0634;;;;N;;;;;
+1EEB5;ARABIC MATHEMATICAL DOUBLE-STRUCK TEH;Lo;0;AL;<font> 062A;;;;N;;;;;
+1EEB6;ARABIC MATHEMATICAL DOUBLE-STRUCK THEH;Lo;0;AL;<font> 062B;;;;N;;;;;
+1EEB7;ARABIC MATHEMATICAL DOUBLE-STRUCK KHAH;Lo;0;AL;<font> 062E;;;;N;;;;;
+1EEB8;ARABIC MATHEMATICAL DOUBLE-STRUCK THAL;Lo;0;AL;<font> 0630;;;;N;;;;;
+1EEB9;ARABIC MATHEMATICAL DOUBLE-STRUCK DAD;Lo;0;AL;<font> 0636;;;;N;;;;;
+1EEBA;ARABIC MATHEMATICAL DOUBLE-STRUCK ZAH;Lo;0;AL;<font> 0638;;;;N;;;;;
+1EEBB;ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN;Lo;0;AL;<font> 063A;;;;N;;;;;
+1EEF0;ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL;Sm;0;ON;;;;;N;;;;;
+1EEF1;ARABIC MATHEMATICAL OPERATOR HAH WITH DAL;Sm;0;ON;;;;;N;;;;;
+1F000;MAHJONG TILE EAST WIND;So;0;ON;;;;;N;;;;;
+1F001;MAHJONG TILE SOUTH WIND;So;0;ON;;;;;N;;;;;
+1F002;MAHJONG TILE WEST WIND;So;0;ON;;;;;N;;;;;
+1F003;MAHJONG TILE NORTH WIND;So;0;ON;;;;;N;;;;;
+1F004;MAHJONG TILE RED DRAGON;So;0;ON;;;;;N;;;;;
+1F005;MAHJONG TILE GREEN DRAGON;So;0;ON;;;;;N;;;;;
+1F006;MAHJONG TILE WHITE DRAGON;So;0;ON;;;;;N;;;;;
+1F007;MAHJONG TILE ONE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F008;MAHJONG TILE TWO OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F009;MAHJONG TILE THREE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00A;MAHJONG TILE FOUR OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00B;MAHJONG TILE FIVE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00C;MAHJONG TILE SIX OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00D;MAHJONG TILE SEVEN OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00E;MAHJONG TILE EIGHT OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00F;MAHJONG TILE NINE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F010;MAHJONG TILE ONE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F011;MAHJONG TILE TWO OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F012;MAHJONG TILE THREE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F013;MAHJONG TILE FOUR OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F014;MAHJONG TILE FIVE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F015;MAHJONG TILE SIX OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F016;MAHJONG TILE SEVEN OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F017;MAHJONG TILE EIGHT OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F018;MAHJONG TILE NINE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F019;MAHJONG TILE ONE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01A;MAHJONG TILE TWO OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01B;MAHJONG TILE THREE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01C;MAHJONG TILE FOUR OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01D;MAHJONG TILE FIVE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01E;MAHJONG TILE SIX OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01F;MAHJONG TILE SEVEN OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F020;MAHJONG TILE EIGHT OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F021;MAHJONG TILE NINE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F022;MAHJONG TILE PLUM;So;0;ON;;;;;N;;;;;
+1F023;MAHJONG TILE ORCHID;So;0;ON;;;;;N;;;;;
+1F024;MAHJONG TILE BAMBOO;So;0;ON;;;;;N;;;;;
+1F025;MAHJONG TILE CHRYSANTHEMUM;So;0;ON;;;;;N;;;;;
+1F026;MAHJONG TILE SPRING;So;0;ON;;;;;N;;;;;
+1F027;MAHJONG TILE SUMMER;So;0;ON;;;;;N;;;;;
+1F028;MAHJONG TILE AUTUMN;So;0;ON;;;;;N;;;;;
+1F029;MAHJONG TILE WINTER;So;0;ON;;;;;N;;;;;
+1F02A;MAHJONG TILE JOKER;So;0;ON;;;;;N;;;;;
+1F02B;MAHJONG TILE BACK;So;0;ON;;;;;N;;;;;
+1F030;DOMINO TILE HORIZONTAL BACK;So;0;ON;;;;;N;;;;;
+1F031;DOMINO TILE HORIZONTAL-00-00;So;0;ON;;;;;N;;;;;
+1F032;DOMINO TILE HORIZONTAL-00-01;So;0;ON;;;;;N;;;;;
+1F033;DOMINO TILE HORIZONTAL-00-02;So;0;ON;;;;;N;;;;;
+1F034;DOMINO TILE HORIZONTAL-00-03;So;0;ON;;;;;N;;;;;
+1F035;DOMINO TILE HORIZONTAL-00-04;So;0;ON;;;;;N;;;;;
+1F036;DOMINO TILE HORIZONTAL-00-05;So;0;ON;;;;;N;;;;;
+1F037;DOMINO TILE HORIZONTAL-00-06;So;0;ON;;;;;N;;;;;
+1F038;DOMINO TILE HORIZONTAL-01-00;So;0;ON;;;;;N;;;;;
+1F039;DOMINO TILE HORIZONTAL-01-01;So;0;ON;;;;;N;;;;;
+1F03A;DOMINO TILE HORIZONTAL-01-02;So;0;ON;;;;;N;;;;;
+1F03B;DOMINO TILE HORIZONTAL-01-03;So;0;ON;;;;;N;;;;;
+1F03C;DOMINO TILE HORIZONTAL-01-04;So;0;ON;;;;;N;;;;;
+1F03D;DOMINO TILE HORIZONTAL-01-05;So;0;ON;;;;;N;;;;;
+1F03E;DOMINO TILE HORIZONTAL-01-06;So;0;ON;;;;;N;;;;;
+1F03F;DOMINO TILE HORIZONTAL-02-00;So;0;ON;;;;;N;;;;;
+1F040;DOMINO TILE HORIZONTAL-02-01;So;0;ON;;;;;N;;;;;
+1F041;DOMINO TILE HORIZONTAL-02-02;So;0;ON;;;;;N;;;;;
+1F042;DOMINO TILE HORIZONTAL-02-03;So;0;ON;;;;;N;;;;;
+1F043;DOMINO TILE HORIZONTAL-02-04;So;0;ON;;;;;N;;;;;
+1F044;DOMINO TILE HORIZONTAL-02-05;So;0;ON;;;;;N;;;;;
+1F045;DOMINO TILE HORIZONTAL-02-06;So;0;ON;;;;;N;;;;;
+1F046;DOMINO TILE HORIZONTAL-03-00;So;0;ON;;;;;N;;;;;
+1F047;DOMINO TILE HORIZONTAL-03-01;So;0;ON;;;;;N;;;;;
+1F048;DOMINO TILE HORIZONTAL-03-02;So;0;ON;;;;;N;;;;;
+1F049;DOMINO TILE HORIZONTAL-03-03;So;0;ON;;;;;N;;;;;
+1F04A;DOMINO TILE HORIZONTAL-03-04;So;0;ON;;;;;N;;;;;
+1F04B;DOMINO TILE HORIZONTAL-03-05;So;0;ON;;;;;N;;;;;
+1F04C;DOMINO TILE HORIZONTAL-03-06;So;0;ON;;;;;N;;;;;
+1F04D;DOMINO TILE HORIZONTAL-04-00;So;0;ON;;;;;N;;;;;
+1F04E;DOMINO TILE HORIZONTAL-04-01;So;0;ON;;;;;N;;;;;
+1F04F;DOMINO TILE HORIZONTAL-04-02;So;0;ON;;;;;N;;;;;
+1F050;DOMINO TILE HORIZONTAL-04-03;So;0;ON;;;;;N;;;;;
+1F051;DOMINO TILE HORIZONTAL-04-04;So;0;ON;;;;;N;;;;;
+1F052;DOMINO TILE HORIZONTAL-04-05;So;0;ON;;;;;N;;;;;
+1F053;DOMINO TILE HORIZONTAL-04-06;So;0;ON;;;;;N;;;;;
+1F054;DOMINO TILE HORIZONTAL-05-00;So;0;ON;;;;;N;;;;;
+1F055;DOMINO TILE HORIZONTAL-05-01;So;0;ON;;;;;N;;;;;
+1F056;DOMINO TILE HORIZONTAL-05-02;So;0;ON;;;;;N;;;;;
+1F057;DOMINO TILE HORIZONTAL-05-03;So;0;ON;;;;;N;;;;;
+1F058;DOMINO TILE HORIZONTAL-05-04;So;0;ON;;;;;N;;;;;
+1F059;DOMINO TILE HORIZONTAL-05-05;So;0;ON;;;;;N;;;;;
+1F05A;DOMINO TILE HORIZONTAL-05-06;So;0;ON;;;;;N;;;;;
+1F05B;DOMINO TILE HORIZONTAL-06-00;So;0;ON;;;;;N;;;;;
+1F05C;DOMINO TILE HORIZONTAL-06-01;So;0;ON;;;;;N;;;;;
+1F05D;DOMINO TILE HORIZONTAL-06-02;So;0;ON;;;;;N;;;;;
+1F05E;DOMINO TILE HORIZONTAL-06-03;So;0;ON;;;;;N;;;;;
+1F05F;DOMINO TILE HORIZONTAL-06-04;So;0;ON;;;;;N;;;;;
+1F060;DOMINO TILE HORIZONTAL-06-05;So;0;ON;;;;;N;;;;;
+1F061;DOMINO TILE HORIZONTAL-06-06;So;0;ON;;;;;N;;;;;
+1F062;DOMINO TILE VERTICAL BACK;So;0;ON;;;;;N;;;;;
+1F063;DOMINO TILE VERTICAL-00-00;So;0;ON;;;;;N;;;;;
+1F064;DOMINO TILE VERTICAL-00-01;So;0;ON;;;;;N;;;;;
+1F065;DOMINO TILE VERTICAL-00-02;So;0;ON;;;;;N;;;;;
+1F066;DOMINO TILE VERTICAL-00-03;So;0;ON;;;;;N;;;;;
+1F067;DOMINO TILE VERTICAL-00-04;So;0;ON;;;;;N;;;;;
+1F068;DOMINO TILE VERTICAL-00-05;So;0;ON;;;;;N;;;;;
+1F069;DOMINO TILE VERTICAL-00-06;So;0;ON;;;;;N;;;;;
+1F06A;DOMINO TILE VERTICAL-01-00;So;0;ON;;;;;N;;;;;
+1F06B;DOMINO TILE VERTICAL-01-01;So;0;ON;;;;;N;;;;;
+1F06C;DOMINO TILE VERTICAL-01-02;So;0;ON;;;;;N;;;;;
+1F06D;DOMINO TILE VERTICAL-01-03;So;0;ON;;;;;N;;;;;
+1F06E;DOMINO TILE VERTICAL-01-04;So;0;ON;;;;;N;;;;;
+1F06F;DOMINO TILE VERTICAL-01-05;So;0;ON;;;;;N;;;;;
+1F070;DOMINO TILE VERTICAL-01-06;So;0;ON;;;;;N;;;;;
+1F071;DOMINO TILE VERTICAL-02-00;So;0;ON;;;;;N;;;;;
+1F072;DOMINO TILE VERTICAL-02-01;So;0;ON;;;;;N;;;;;
+1F073;DOMINO TILE VERTICAL-02-02;So;0;ON;;;;;N;;;;;
+1F074;DOMINO TILE VERTICAL-02-03;So;0;ON;;;;;N;;;;;
+1F075;DOMINO TILE VERTICAL-02-04;So;0;ON;;;;;N;;;;;
+1F076;DOMINO TILE VERTICAL-02-05;So;0;ON;;;;;N;;;;;
+1F077;DOMINO TILE VERTICAL-02-06;So;0;ON;;;;;N;;;;;
+1F078;DOMINO TILE VERTICAL-03-00;So;0;ON;;;;;N;;;;;
+1F079;DOMINO TILE VERTICAL-03-01;So;0;ON;;;;;N;;;;;
+1F07A;DOMINO TILE VERTICAL-03-02;So;0;ON;;;;;N;;;;;
+1F07B;DOMINO TILE VERTICAL-03-03;So;0;ON;;;;;N;;;;;
+1F07C;DOMINO TILE VERTICAL-03-04;So;0;ON;;;;;N;;;;;
+1F07D;DOMINO TILE VERTICAL-03-05;So;0;ON;;;;;N;;;;;
+1F07E;DOMINO TILE VERTICAL-03-06;So;0;ON;;;;;N;;;;;
+1F07F;DOMINO TILE VERTICAL-04-00;So;0;ON;;;;;N;;;;;
+1F080;DOMINO TILE VERTICAL-04-01;So;0;ON;;;;;N;;;;;
+1F081;DOMINO TILE VERTICAL-04-02;So;0;ON;;;;;N;;;;;
+1F082;DOMINO TILE VERTICAL-04-03;So;0;ON;;;;;N;;;;;
+1F083;DOMINO TILE VERTICAL-04-04;So;0;ON;;;;;N;;;;;
+1F084;DOMINO TILE VERTICAL-04-05;So;0;ON;;;;;N;;;;;
+1F085;DOMINO TILE VERTICAL-04-06;So;0;ON;;;;;N;;;;;
+1F086;DOMINO TILE VERTICAL-05-00;So;0;ON;;;;;N;;;;;
+1F087;DOMINO TILE VERTICAL-05-01;So;0;ON;;;;;N;;;;;
+1F088;DOMINO TILE VERTICAL-05-02;So;0;ON;;;;;N;;;;;
+1F089;DOMINO TILE VERTICAL-05-03;So;0;ON;;;;;N;;;;;
+1F08A;DOMINO TILE VERTICAL-05-04;So;0;ON;;;;;N;;;;;
+1F08B;DOMINO TILE VERTICAL-05-05;So;0;ON;;;;;N;;;;;
+1F08C;DOMINO TILE VERTICAL-05-06;So;0;ON;;;;;N;;;;;
+1F08D;DOMINO TILE VERTICAL-06-00;So;0;ON;;;;;N;;;;;
+1F08E;DOMINO TILE VERTICAL-06-01;So;0;ON;;;;;N;;;;;
+1F08F;DOMINO TILE VERTICAL-06-02;So;0;ON;;;;;N;;;;;
+1F090;DOMINO TILE VERTICAL-06-03;So;0;ON;;;;;N;;;;;
+1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;;
+1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;;
+1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;;
+1F0A0;PLAYING CARD BACK;So;0;ON;;;;;N;;;;;
+1F0A1;PLAYING CARD ACE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A2;PLAYING CARD TWO OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A3;PLAYING CARD THREE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A4;PLAYING CARD FOUR OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A5;PLAYING CARD FIVE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A6;PLAYING CARD SIX OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A7;PLAYING CARD SEVEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A8;PLAYING CARD EIGHT OF SPADES;So;0;ON;;;;;N;;;;;
+1F0A9;PLAYING CARD NINE OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AA;PLAYING CARD TEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AB;PLAYING CARD JACK OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AC;PLAYING CARD KNIGHT OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AD;PLAYING CARD QUEEN OF SPADES;So;0;ON;;;;;N;;;;;
+1F0AE;PLAYING CARD KING OF SPADES;So;0;ON;;;;;N;;;;;
+1F0B1;PLAYING CARD ACE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B2;PLAYING CARD TWO OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B3;PLAYING CARD THREE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B4;PLAYING CARD FOUR OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B5;PLAYING CARD FIVE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B6;PLAYING CARD SIX OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B7;PLAYING CARD SEVEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B8;PLAYING CARD EIGHT OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0B9;PLAYING CARD NINE OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BA;PLAYING CARD TEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BB;PLAYING CARD JACK OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BC;PLAYING CARD KNIGHT OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BD;PLAYING CARD QUEEN OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BE;PLAYING CARD KING OF HEARTS;So;0;ON;;;;;N;;;;;
+1F0BF;PLAYING CARD RED JOKER;So;0;ON;;;;;N;;;;;
+1F0C1;PLAYING CARD ACE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C2;PLAYING CARD TWO OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C3;PLAYING CARD THREE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C4;PLAYING CARD FOUR OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C5;PLAYING CARD FIVE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C6;PLAYING CARD SIX OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C7;PLAYING CARD SEVEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C8;PLAYING CARD EIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0C9;PLAYING CARD NINE OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CA;PLAYING CARD TEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CB;PLAYING CARD JACK OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CC;PLAYING CARD KNIGHT OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CD;PLAYING CARD QUEEN OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CE;PLAYING CARD KING OF DIAMONDS;So;0;ON;;;;;N;;;;;
+1F0CF;PLAYING CARD BLACK JOKER;So;0;ON;;;;;N;;;;;
+1F0D1;PLAYING CARD ACE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D2;PLAYING CARD TWO OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D3;PLAYING CARD THREE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D4;PLAYING CARD FOUR OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D5;PLAYING CARD FIVE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D6;PLAYING CARD SIX OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D7;PLAYING CARD SEVEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D8;PLAYING CARD EIGHT OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0D9;PLAYING CARD NINE OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DA;PLAYING CARD TEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DB;PLAYING CARD JACK OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DC;PLAYING CARD KNIGHT OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DD;PLAYING CARD QUEEN OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DE;PLAYING CARD KING OF CLUBS;So;0;ON;;;;;N;;;;;
+1F0DF;PLAYING CARD WHITE JOKER;So;0;ON;;;;;N;;;;;
+1F0E0;PLAYING CARD FOOL;So;0;ON;;;;;N;;;;;
+1F0E1;PLAYING CARD TRUMP-1;So;0;ON;;;;;N;;;;;
+1F0E2;PLAYING CARD TRUMP-2;So;0;ON;;;;;N;;;;;
+1F0E3;PLAYING CARD TRUMP-3;So;0;ON;;;;;N;;;;;
+1F0E4;PLAYING CARD TRUMP-4;So;0;ON;;;;;N;;;;;
+1F0E5;PLAYING CARD TRUMP-5;So;0;ON;;;;;N;;;;;
+1F0E6;PLAYING CARD TRUMP-6;So;0;ON;;;;;N;;;;;
+1F0E7;PLAYING CARD TRUMP-7;So;0;ON;;;;;N;;;;;
+1F0E8;PLAYING CARD TRUMP-8;So;0;ON;;;;;N;;;;;
+1F0E9;PLAYING CARD TRUMP-9;So;0;ON;;;;;N;;;;;
+1F0EA;PLAYING CARD TRUMP-10;So;0;ON;;;;;N;;;;;
+1F0EB;PLAYING CARD TRUMP-11;So;0;ON;;;;;N;;;;;
+1F0EC;PLAYING CARD TRUMP-12;So;0;ON;;;;;N;;;;;
+1F0ED;PLAYING CARD TRUMP-13;So;0;ON;;;;;N;;;;;
+1F0EE;PLAYING CARD TRUMP-14;So;0;ON;;;;;N;;;;;
+1F0EF;PLAYING CARD TRUMP-15;So;0;ON;;;;;N;;;;;
+1F0F0;PLAYING CARD TRUMP-16;So;0;ON;;;;;N;;;;;
+1F0F1;PLAYING CARD TRUMP-17;So;0;ON;;;;;N;;;;;
+1F0F2;PLAYING CARD TRUMP-18;So;0;ON;;;;;N;;;;;
+1F0F3;PLAYING CARD TRUMP-19;So;0;ON;;;;;N;;;;;
+1F0F4;PLAYING CARD TRUMP-20;So;0;ON;;;;;N;;;;;
+1F0F5;PLAYING CARD TRUMP-21;So;0;ON;;;;;N;;;;;
+1F100;DIGIT ZERO FULL STOP;No;0;EN;<compat> 0030 002E;;0;0;N;;;;;
+1F101;DIGIT ZERO COMMA;No;0;EN;<compat> 0030 002C;;0;0;N;;;;;
+1F102;DIGIT ONE COMMA;No;0;EN;<compat> 0031 002C;;1;1;N;;;;;
+1F103;DIGIT TWO COMMA;No;0;EN;<compat> 0032 002C;;2;2;N;;;;;
+1F104;DIGIT THREE COMMA;No;0;EN;<compat> 0033 002C;;3;3;N;;;;;
+1F105;DIGIT FOUR COMMA;No;0;EN;<compat> 0034 002C;;4;4;N;;;;;
+1F106;DIGIT FIVE COMMA;No;0;EN;<compat> 0035 002C;;5;5;N;;;;;
+1F107;DIGIT SIX COMMA;No;0;EN;<compat> 0036 002C;;6;6;N;;;;;
+1F108;DIGIT SEVEN COMMA;No;0;EN;<compat> 0037 002C;;7;7;N;;;;;
+1F109;DIGIT EIGHT COMMA;No;0;EN;<compat> 0038 002C;;8;8;N;;;;;
+1F10A;DIGIT NINE COMMA;No;0;EN;<compat> 0039 002C;;9;9;N;;;;;
+1F10B;DINGBAT CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;;
+1F10C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO;No;0;ON;;;;0;N;;;;;
+1F110;PARENTHESIZED LATIN CAPITAL LETTER A;So;0;L;<compat> 0028 0041 0029;;;;N;;;;;
+1F111;PARENTHESIZED LATIN CAPITAL LETTER B;So;0;L;<compat> 0028 0042 0029;;;;N;;;;;
+1F112;PARENTHESIZED LATIN CAPITAL LETTER C;So;0;L;<compat> 0028 0043 0029;;;;N;;;;;
+1F113;PARENTHESIZED LATIN CAPITAL LETTER D;So;0;L;<compat> 0028 0044 0029;;;;N;;;;;
+1F114;PARENTHESIZED LATIN CAPITAL LETTER E;So;0;L;<compat> 0028 0045 0029;;;;N;;;;;
+1F115;PARENTHESIZED LATIN CAPITAL LETTER F;So;0;L;<compat> 0028 0046 0029;;;;N;;;;;
+1F116;PARENTHESIZED LATIN CAPITAL LETTER G;So;0;L;<compat> 0028 0047 0029;;;;N;;;;;
+1F117;PARENTHESIZED LATIN CAPITAL LETTER H;So;0;L;<compat> 0028 0048 0029;;;;N;;;;;
+1F118;PARENTHESIZED LATIN CAPITAL LETTER I;So;0;L;<compat> 0028 0049 0029;;;;N;;;;;
+1F119;PARENTHESIZED LATIN CAPITAL LETTER J;So;0;L;<compat> 0028 004A 0029;;;;N;;;;;
+1F11A;PARENTHESIZED LATIN CAPITAL LETTER K;So;0;L;<compat> 0028 004B 0029;;;;N;;;;;
+1F11B;PARENTHESIZED LATIN CAPITAL LETTER L;So;0;L;<compat> 0028 004C 0029;;;;N;;;;;
+1F11C;PARENTHESIZED LATIN CAPITAL LETTER M;So;0;L;<compat> 0028 004D 0029;;;;N;;;;;
+1F11D;PARENTHESIZED LATIN CAPITAL LETTER N;So;0;L;<compat> 0028 004E 0029;;;;N;;;;;
+1F11E;PARENTHESIZED LATIN CAPITAL LETTER O;So;0;L;<compat> 0028 004F 0029;;;;N;;;;;
+1F11F;PARENTHESIZED LATIN CAPITAL LETTER P;So;0;L;<compat> 0028 0050 0029;;;;N;;;;;
+1F120;PARENTHESIZED LATIN CAPITAL LETTER Q;So;0;L;<compat> 0028 0051 0029;;;;N;;;;;
+1F121;PARENTHESIZED LATIN CAPITAL LETTER R;So;0;L;<compat> 0028 0052 0029;;;;N;;;;;
+1F122;PARENTHESIZED LATIN CAPITAL LETTER S;So;0;L;<compat> 0028 0053 0029;;;;N;;;;;
+1F123;PARENTHESIZED LATIN CAPITAL LETTER T;So;0;L;<compat> 0028 0054 0029;;;;N;;;;;
+1F124;PARENTHESIZED LATIN CAPITAL LETTER U;So;0;L;<compat> 0028 0055 0029;;;;N;;;;;
+1F125;PARENTHESIZED LATIN CAPITAL LETTER V;So;0;L;<compat> 0028 0056 0029;;;;N;;;;;
+1F126;PARENTHESIZED LATIN CAPITAL LETTER W;So;0;L;<compat> 0028 0057 0029;;;;N;;;;;
+1F127;PARENTHESIZED LATIN CAPITAL LETTER X;So;0;L;<compat> 0028 0058 0029;;;;N;;;;;
+1F128;PARENTHESIZED LATIN CAPITAL LETTER Y;So;0;L;<compat> 0028 0059 0029;;;;N;;;;;
+1F129;PARENTHESIZED LATIN CAPITAL LETTER Z;So;0;L;<compat> 0028 005A 0029;;;;N;;;;;
+1F12A;TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S;So;0;L;<compat> 3014 0053 3015;;;;N;;;;;
+1F12B;CIRCLED ITALIC LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;;
+1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;;
+1F12D;CIRCLED CD;So;0;L;<circle> 0043 0044;;;;N;;;;;
+1F12E;CIRCLED WZ;So;0;L;<circle> 0057 005A;;;;N;;;;;
+1F130;SQUARED LATIN CAPITAL LETTER A;So;0;L;<square> 0041;;;;N;;;;;
+1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L;<square> 0042;;;;N;;;;;
+1F132;SQUARED LATIN CAPITAL LETTER C;So;0;L;<square> 0043;;;;N;;;;;
+1F133;SQUARED LATIN CAPITAL LETTER D;So;0;L;<square> 0044;;;;N;;;;;
+1F134;SQUARED LATIN CAPITAL LETTER E;So;0;L;<square> 0045;;;;N;;;;;
+1F135;SQUARED LATIN CAPITAL LETTER F;So;0;L;<square> 0046;;;;N;;;;;
+1F136;SQUARED LATIN CAPITAL LETTER G;So;0;L;<square> 0047;;;;N;;;;;
+1F137;SQUARED LATIN CAPITAL LETTER H;So;0;L;<square> 0048;;;;N;;;;;
+1F138;SQUARED LATIN CAPITAL LETTER I;So;0;L;<square> 0049;;;;N;;;;;
+1F139;SQUARED LATIN CAPITAL LETTER J;So;0;L;<square> 004A;;;;N;;;;;
+1F13A;SQUARED LATIN CAPITAL LETTER K;So;0;L;<square> 004B;;;;N;;;;;
+1F13B;SQUARED LATIN CAPITAL LETTER L;So;0;L;<square> 004C;;;;N;;;;;
+1F13C;SQUARED LATIN CAPITAL LETTER M;So;0;L;<square> 004D;;;;N;;;;;
+1F13D;SQUARED LATIN CAPITAL LETTER N;So;0;L;<square> 004E;;;;N;;;;;
+1F13E;SQUARED LATIN CAPITAL LETTER O;So;0;L;<square> 004F;;;;N;;;;;
+1F13F;SQUARED LATIN CAPITAL LETTER P;So;0;L;<square> 0050;;;;N;;;;;
+1F140;SQUARED LATIN CAPITAL LETTER Q;So;0;L;<square> 0051;;;;N;;;;;
+1F141;SQUARED LATIN CAPITAL LETTER R;So;0;L;<square> 0052;;;;N;;;;;
+1F142;SQUARED LATIN CAPITAL LETTER S;So;0;L;<square> 0053;;;;N;;;;;
+1F143;SQUARED LATIN CAPITAL LETTER T;So;0;L;<square> 0054;;;;N;;;;;
+1F144;SQUARED LATIN CAPITAL LETTER U;So;0;L;<square> 0055;;;;N;;;;;
+1F145;SQUARED LATIN CAPITAL LETTER V;So;0;L;<square> 0056;;;;N;;;;;
+1F146;SQUARED LATIN CAPITAL LETTER W;So;0;L;<square> 0057;;;;N;;;;;
+1F147;SQUARED LATIN CAPITAL LETTER X;So;0;L;<square> 0058;;;;N;;;;;
+1F148;SQUARED LATIN CAPITAL LETTER Y;So;0;L;<square> 0059;;;;N;;;;;
+1F149;SQUARED LATIN CAPITAL LETTER Z;So;0;L;<square> 005A;;;;N;;;;;
+1F14A;SQUARED HV;So;0;L;<square> 0048 0056;;;;N;;;;;
+1F14B;SQUARED MV;So;0;L;<square> 004D 0056;;;;N;;;;;
+1F14C;SQUARED SD;So;0;L;<square> 0053 0044;;;;N;;;;;
+1F14D;SQUARED SS;So;0;L;<square> 0053 0053;;;;N;;;;;
+1F14E;SQUARED PPV;So;0;L;<square> 0050 0050 0056;;;;N;;;;;
+1F14F;SQUARED WC;So;0;L;<square> 0057 0043;;;;N;;;;;
+1F150;NEGATIVE CIRCLED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;;
+1F151;NEGATIVE CIRCLED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;;
+1F152;NEGATIVE CIRCLED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;;
+1F153;NEGATIVE CIRCLED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;;
+1F154;NEGATIVE CIRCLED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;;
+1F155;NEGATIVE CIRCLED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;;
+1F156;NEGATIVE CIRCLED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;;
+1F157;NEGATIVE CIRCLED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;;
+1F158;NEGATIVE CIRCLED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;;
+1F159;NEGATIVE CIRCLED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;;
+1F15A;NEGATIVE CIRCLED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;;
+1F15B;NEGATIVE CIRCLED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;;
+1F15C;NEGATIVE CIRCLED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;;
+1F15D;NEGATIVE CIRCLED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;;
+1F15E;NEGATIVE CIRCLED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;;
+1F15F;NEGATIVE CIRCLED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F160;NEGATIVE CIRCLED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;;
+1F161;NEGATIVE CIRCLED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;;
+1F162;NEGATIVE CIRCLED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;;
+1F163;NEGATIVE CIRCLED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;;
+1F164;NEGATIVE CIRCLED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;;
+1F165;NEGATIVE CIRCLED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;;
+1F166;NEGATIVE CIRCLED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;;
+1F167;NEGATIVE CIRCLED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;;
+1F168;NEGATIVE CIRCLED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;;
+1F169;NEGATIVE CIRCLED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;;
+1F16A;RAISED MC SIGN;So;0;ON;<super> 004D 0043;;;;N;;;;;
+1F16B;RAISED MD SIGN;So;0;ON;<super> 004D 0044;;;;N;;;;;
+1F170;NEGATIVE SQUARED LATIN CAPITAL LETTER A;So;0;L;;;;;N;;;;;
+1F171;NEGATIVE SQUARED LATIN CAPITAL LETTER B;So;0;L;;;;;N;;;;;
+1F172;NEGATIVE SQUARED LATIN CAPITAL LETTER C;So;0;L;;;;;N;;;;;
+1F173;NEGATIVE SQUARED LATIN CAPITAL LETTER D;So;0;L;;;;;N;;;;;
+1F174;NEGATIVE SQUARED LATIN CAPITAL LETTER E;So;0;L;;;;;N;;;;;
+1F175;NEGATIVE SQUARED LATIN CAPITAL LETTER F;So;0;L;;;;;N;;;;;
+1F176;NEGATIVE SQUARED LATIN CAPITAL LETTER G;So;0;L;;;;;N;;;;;
+1F177;NEGATIVE SQUARED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;;
+1F178;NEGATIVE SQUARED LATIN CAPITAL LETTER I;So;0;L;;;;;N;;;;;
+1F179;NEGATIVE SQUARED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;;
+1F17A;NEGATIVE SQUARED LATIN CAPITAL LETTER K;So;0;L;;;;;N;;;;;
+1F17B;NEGATIVE SQUARED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;;
+1F17C;NEGATIVE SQUARED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;;
+1F17D;NEGATIVE SQUARED LATIN CAPITAL LETTER N;So;0;L;;;;;N;;;;;
+1F17E;NEGATIVE SQUARED LATIN CAPITAL LETTER O;So;0;L;;;;;N;;;;;
+1F17F;NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F180;NEGATIVE SQUARED LATIN CAPITAL LETTER Q;So;0;L;;;;;N;;;;;
+1F181;NEGATIVE SQUARED LATIN CAPITAL LETTER R;So;0;L;;;;;N;;;;;
+1F182;NEGATIVE SQUARED LATIN CAPITAL LETTER S;So;0;L;;;;;N;;;;;
+1F183;NEGATIVE SQUARED LATIN CAPITAL LETTER T;So;0;L;;;;;N;;;;;
+1F184;NEGATIVE SQUARED LATIN CAPITAL LETTER U;So;0;L;;;;;N;;;;;
+1F185;NEGATIVE SQUARED LATIN CAPITAL LETTER V;So;0;L;;;;;N;;;;;
+1F186;NEGATIVE SQUARED LATIN CAPITAL LETTER W;So;0;L;;;;;N;;;;;
+1F187;NEGATIVE SQUARED LATIN CAPITAL LETTER X;So;0;L;;;;;N;;;;;
+1F188;NEGATIVE SQUARED LATIN CAPITAL LETTER Y;So;0;L;;;;;N;;;;;
+1F189;NEGATIVE SQUARED LATIN CAPITAL LETTER Z;So;0;L;;;;;N;;;;;
+1F18A;CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F18B;NEGATIVE SQUARED IC;So;0;L;;;;;N;;;;;
+1F18C;NEGATIVE SQUARED PA;So;0;L;;;;;N;;;;;
+1F18D;NEGATIVE SQUARED SA;So;0;L;;;;;N;;;;;
+1F18E;NEGATIVE SQUARED AB;So;0;L;;;;;N;;;;;
+1F18F;NEGATIVE SQUARED WC;So;0;L;;;;;N;;;;;
+1F190;SQUARE DJ;So;0;L;<square> 0044 004A;;;;N;;;;;
+1F191;SQUARED CL;So;0;L;;;;;N;;;;;
+1F192;SQUARED COOL;So;0;L;;;;;N;;;;;
+1F193;SQUARED FREE;So;0;L;;;;;N;;;;;
+1F194;SQUARED ID;So;0;L;;;;;N;;;;;
+1F195;SQUARED NEW;So;0;L;;;;;N;;;;;
+1F196;SQUARED NG;So;0;L;;;;;N;;;;;
+1F197;SQUARED OK;So;0;L;;;;;N;;;;;
+1F198;SQUARED SOS;So;0;L;;;;;N;;;;;
+1F199;SQUARED UP WITH EXCLAMATION MARK;So;0;L;;;;;N;;;;;
+1F19A;SQUARED VS;So;0;L;;;;;N;;;;;
+1F19B;SQUARED THREE D;So;0;L;;;;;N;;;;;
+1F19C;SQUARED SECOND SCREEN;So;0;L;;;;;N;;;;;
+1F19D;SQUARED TWO K;So;0;L;;;;;N;;;;;
+1F19E;SQUARED FOUR K;So;0;L;;;;;N;;;;;
+1F19F;SQUARED EIGHT K;So;0;L;;;;;N;;;;;
+1F1A0;SQUARED FIVE POINT ONE;So;0;L;;;;;N;;;;;
+1F1A1;SQUARED SEVEN POINT ONE;So;0;L;;;;;N;;;;;
+1F1A2;SQUARED TWENTY-TWO POINT TWO;So;0;L;;;;;N;;;;;
+1F1A3;SQUARED SIXTY P;So;0;L;;;;;N;;;;;
+1F1A4;SQUARED ONE HUNDRED TWENTY P;So;0;L;;;;;N;;;;;
+1F1A5;SQUARED LATIN SMALL LETTER D;So;0;L;;;;;N;;;;;
+1F1A6;SQUARED HC;So;0;L;;;;;N;;;;;
+1F1A7;SQUARED HDR;So;0;L;;;;;N;;;;;
+1F1A8;SQUARED HI-RES;So;0;L;;;;;N;;;;;
+1F1A9;SQUARED LOSSLESS;So;0;L;;;;;N;;;;;
+1F1AA;SQUARED SHV;So;0;L;;;;;N;;;;;
+1F1AB;SQUARED UHD;So;0;L;;;;;N;;;;;
+1F1AC;SQUARED VOD;So;0;L;;;;;N;;;;;
+1F1E6;REGIONAL INDICATOR SYMBOL LETTER A;So;0;L;;;;;N;;;;;
+1F1E7;REGIONAL INDICATOR SYMBOL LETTER B;So;0;L;;;;;N;;;;;
+1F1E8;REGIONAL INDICATOR SYMBOL LETTER C;So;0;L;;;;;N;;;;;
+1F1E9;REGIONAL INDICATOR SYMBOL LETTER D;So;0;L;;;;;N;;;;;
+1F1EA;REGIONAL INDICATOR SYMBOL LETTER E;So;0;L;;;;;N;;;;;
+1F1EB;REGIONAL INDICATOR SYMBOL LETTER F;So;0;L;;;;;N;;;;;
+1F1EC;REGIONAL INDICATOR SYMBOL LETTER G;So;0;L;;;;;N;;;;;
+1F1ED;REGIONAL INDICATOR SYMBOL LETTER H;So;0;L;;;;;N;;;;;
+1F1EE;REGIONAL INDICATOR SYMBOL LETTER I;So;0;L;;;;;N;;;;;
+1F1EF;REGIONAL INDICATOR SYMBOL LETTER J;So;0;L;;;;;N;;;;;
+1F1F0;REGIONAL INDICATOR SYMBOL LETTER K;So;0;L;;;;;N;;;;;
+1F1F1;REGIONAL INDICATOR SYMBOL LETTER L;So;0;L;;;;;N;;;;;
+1F1F2;REGIONAL INDICATOR SYMBOL LETTER M;So;0;L;;;;;N;;;;;
+1F1F3;REGIONAL INDICATOR SYMBOL LETTER N;So;0;L;;;;;N;;;;;
+1F1F4;REGIONAL INDICATOR SYMBOL LETTER O;So;0;L;;;;;N;;;;;
+1F1F5;REGIONAL INDICATOR SYMBOL LETTER P;So;0;L;;;;;N;;;;;
+1F1F6;REGIONAL INDICATOR SYMBOL LETTER Q;So;0;L;;;;;N;;;;;
+1F1F7;REGIONAL INDICATOR SYMBOL LETTER R;So;0;L;;;;;N;;;;;
+1F1F8;REGIONAL INDICATOR SYMBOL LETTER S;So;0;L;;;;;N;;;;;
+1F1F9;REGIONAL INDICATOR SYMBOL LETTER T;So;0;L;;;;;N;;;;;
+1F1FA;REGIONAL INDICATOR SYMBOL LETTER U;So;0;L;;;;;N;;;;;
+1F1FB;REGIONAL INDICATOR SYMBOL LETTER V;So;0;L;;;;;N;;;;;
+1F1FC;REGIONAL INDICATOR SYMBOL LETTER W;So;0;L;;;;;N;;;;;
+1F1FD;REGIONAL INDICATOR SYMBOL LETTER X;So;0;L;;;;;N;;;;;
+1F1FE;REGIONAL INDICATOR SYMBOL LETTER Y;So;0;L;;;;;N;;;;;
+1F1FF;REGIONAL INDICATOR SYMBOL LETTER Z;So;0;L;;;;;N;;;;;
+1F200;SQUARE HIRAGANA HOKA;So;0;L;<square> 307B 304B;;;;N;;;;;
+1F201;SQUARED KATAKANA KOKO;So;0;L;<square> 30B3 30B3;;;;N;;;;;
+1F202;SQUARED KATAKANA SA;So;0;L;<square> 30B5;;;;N;;;;;
+1F210;SQUARED CJK UNIFIED IDEOGRAPH-624B;So;0;L;<square> 624B;;;;N;;;;;
+1F211;SQUARED CJK UNIFIED IDEOGRAPH-5B57;So;0;L;<square> 5B57;;;;N;;;;;
+1F212;SQUARED CJK UNIFIED IDEOGRAPH-53CC;So;0;L;<square> 53CC;;;;N;;;;;
+1F213;SQUARED KATAKANA DE;So;0;L;<square> 30C7;;;;N;;;;;
+1F214;SQUARED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<square> 4E8C;;;;N;;;;;
+1F215;SQUARED CJK UNIFIED IDEOGRAPH-591A;So;0;L;<square> 591A;;;;N;;;;;
+1F216;SQUARED CJK UNIFIED IDEOGRAPH-89E3;So;0;L;<square> 89E3;;;;N;;;;;
+1F217;SQUARED CJK UNIFIED IDEOGRAPH-5929;So;0;L;<square> 5929;;;;N;;;;;
+1F218;SQUARED CJK UNIFIED IDEOGRAPH-4EA4;So;0;L;<square> 4EA4;;;;N;;;;;
+1F219;SQUARED CJK UNIFIED IDEOGRAPH-6620;So;0;L;<square> 6620;;;;N;;;;;
+1F21A;SQUARED CJK UNIFIED IDEOGRAPH-7121;So;0;L;<square> 7121;;;;N;;;;;
+1F21B;SQUARED CJK UNIFIED IDEOGRAPH-6599;So;0;L;<square> 6599;;;;N;;;;;
+1F21C;SQUARED CJK UNIFIED IDEOGRAPH-524D;So;0;L;<square> 524D;;;;N;;;;;
+1F21D;SQUARED CJK UNIFIED IDEOGRAPH-5F8C;So;0;L;<square> 5F8C;;;;N;;;;;
+1F21E;SQUARED CJK UNIFIED IDEOGRAPH-518D;So;0;L;<square> 518D;;;;N;;;;;
+1F21F;SQUARED CJK UNIFIED IDEOGRAPH-65B0;So;0;L;<square> 65B0;;;;N;;;;;
+1F220;SQUARED CJK UNIFIED IDEOGRAPH-521D;So;0;L;<square> 521D;;;;N;;;;;
+1F221;SQUARED CJK UNIFIED IDEOGRAPH-7D42;So;0;L;<square> 7D42;;;;N;;;;;
+1F222;SQUARED CJK UNIFIED IDEOGRAPH-751F;So;0;L;<square> 751F;;;;N;;;;;
+1F223;SQUARED CJK UNIFIED IDEOGRAPH-8CA9;So;0;L;<square> 8CA9;;;;N;;;;;
+1F224;SQUARED CJK UNIFIED IDEOGRAPH-58F0;So;0;L;<square> 58F0;;;;N;;;;;
+1F225;SQUARED CJK UNIFIED IDEOGRAPH-5439;So;0;L;<square> 5439;;;;N;;;;;
+1F226;SQUARED CJK UNIFIED IDEOGRAPH-6F14;So;0;L;<square> 6F14;;;;N;;;;;
+1F227;SQUARED CJK UNIFIED IDEOGRAPH-6295;So;0;L;<square> 6295;;;;N;;;;;
+1F228;SQUARED CJK UNIFIED IDEOGRAPH-6355;So;0;L;<square> 6355;;;;N;;;;;
+1F229;SQUARED CJK UNIFIED IDEOGRAPH-4E00;So;0;L;<square> 4E00;;;;N;;;;;
+1F22A;SQUARED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<square> 4E09;;;;N;;;;;
+1F22B;SQUARED CJK UNIFIED IDEOGRAPH-904A;So;0;L;<square> 904A;;;;N;;;;;
+1F22C;SQUARED CJK UNIFIED IDEOGRAPH-5DE6;So;0;L;<square> 5DE6;;;;N;;;;;
+1F22D;SQUARED CJK UNIFIED IDEOGRAPH-4E2D;So;0;L;<square> 4E2D;;;;N;;;;;
+1F22E;SQUARED CJK UNIFIED IDEOGRAPH-53F3;So;0;L;<square> 53F3;;;;N;;;;;
+1F22F;SQUARED CJK UNIFIED IDEOGRAPH-6307;So;0;L;<square> 6307;;;;N;;;;;
+1F230;SQUARED CJK UNIFIED IDEOGRAPH-8D70;So;0;L;<square> 8D70;;;;N;;;;;
+1F231;SQUARED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<square> 6253;;;;N;;;;;
+1F232;SQUARED CJK UNIFIED IDEOGRAPH-7981;So;0;L;<square> 7981;;;;N;;;;;
+1F233;SQUARED CJK UNIFIED IDEOGRAPH-7A7A;So;0;L;<square> 7A7A;;;;N;;;;;
+1F234;SQUARED CJK UNIFIED IDEOGRAPH-5408;So;0;L;<square> 5408;;;;N;;;;;
+1F235;SQUARED CJK UNIFIED IDEOGRAPH-6E80;So;0;L;<square> 6E80;;;;N;;;;;
+1F236;SQUARED CJK UNIFIED IDEOGRAPH-6709;So;0;L;<square> 6709;;;;N;;;;;
+1F237;SQUARED CJK UNIFIED IDEOGRAPH-6708;So;0;L;<square> 6708;;;;N;;;;;
+1F238;SQUARED CJK UNIFIED IDEOGRAPH-7533;So;0;L;<square> 7533;;;;N;;;;;
+1F239;SQUARED CJK UNIFIED IDEOGRAPH-5272;So;0;L;<square> 5272;;;;N;;;;;
+1F23A;SQUARED CJK UNIFIED IDEOGRAPH-55B6;So;0;L;<square> 55B6;;;;N;;;;;
+1F23B;SQUARED CJK UNIFIED IDEOGRAPH-914D;So;0;L;<square> 914D;;;;N;;;;;
+1F240;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C;So;0;L;<compat> 3014 672C 3015;;;;N;;;;;
+1F241;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<compat> 3014 4E09 3015;;;;N;;;;;
+1F242;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<compat> 3014 4E8C 3015;;;;N;;;;;
+1F243;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89;So;0;L;<compat> 3014 5B89 3015;;;;N;;;;;
+1F244;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9;So;0;L;<compat> 3014 70B9 3015;;;;N;;;;;
+1F245;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<compat> 3014 6253 3015;;;;N;;;;;
+1F246;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7;So;0;L;<compat> 3014 76D7 3015;;;;N;;;;;
+1F247;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD;So;0;L;<compat> 3014 52DD 3015;;;;N;;;;;
+1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L;<compat> 3014 6557 3015;;;;N;;;;;
+1F250;CIRCLED IDEOGRAPH ADVANTAGE;So;0;L;<circle> 5F97;;;;N;;;;;
+1F251;CIRCLED IDEOGRAPH ACCEPT;So;0;L;<circle> 53EF;;;;N;;;;;
+1F300;CYCLONE;So;0;ON;;;;;N;;;;;
+1F301;FOGGY;So;0;ON;;;;;N;;;;;
+1F302;CLOSED UMBRELLA;So;0;ON;;;;;N;;;;;
+1F303;NIGHT WITH STARS;So;0;ON;;;;;N;;;;;
+1F304;SUNRISE OVER MOUNTAINS;So;0;ON;;;;;N;;;;;
+1F305;SUNRISE;So;0;ON;;;;;N;;;;;
+1F306;CITYSCAPE AT DUSK;So;0;ON;;;;;N;;;;;
+1F307;SUNSET OVER BUILDINGS;So;0;ON;;;;;N;;;;;
+1F308;RAINBOW;So;0;ON;;;;;N;;;;;
+1F309;BRIDGE AT NIGHT;So;0;ON;;;;;N;;;;;
+1F30A;WATER WAVE;So;0;ON;;;;;N;;;;;
+1F30B;VOLCANO;So;0;ON;;;;;N;;;;;
+1F30C;MILKY WAY;So;0;ON;;;;;N;;;;;
+1F30D;EARTH GLOBE EUROPE-AFRICA;So;0;ON;;;;;N;;;;;
+1F30E;EARTH GLOBE AMERICAS;So;0;ON;;;;;N;;;;;
+1F30F;EARTH GLOBE ASIA-AUSTRALIA;So;0;ON;;;;;N;;;;;
+1F310;GLOBE WITH MERIDIANS;So;0;ON;;;;;N;;;;;
+1F311;NEW MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F312;WAXING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F313;FIRST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F314;WAXING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F315;FULL MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F316;WANING GIBBOUS MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F317;LAST QUARTER MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F318;WANING CRESCENT MOON SYMBOL;So;0;ON;;;;;N;;;;;
+1F319;CRESCENT MOON;So;0;ON;;;;;N;;;;;
+1F31A;NEW MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31B;FIRST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31C;LAST QUARTER MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31D;FULL MOON WITH FACE;So;0;ON;;;;;N;;;;;
+1F31E;SUN WITH FACE;So;0;ON;;;;;N;;;;;
+1F31F;GLOWING STAR;So;0;ON;;;;;N;;;;;
+1F320;SHOOTING STAR;So;0;ON;;;;;N;;;;;
+1F321;THERMOMETER;So;0;ON;;;;;N;;;;;
+1F322;BLACK DROPLET;So;0;ON;;;;;N;;;;;
+1F323;WHITE SUN;So;0;ON;;;;;N;;;;;
+1F324;WHITE SUN WITH SMALL CLOUD;So;0;ON;;;;;N;;;;;
+1F325;WHITE SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;;
+1F326;WHITE SUN BEHIND CLOUD WITH RAIN;So;0;ON;;;;;N;;;;;
+1F327;CLOUD WITH RAIN;So;0;ON;;;;;N;;;;;
+1F328;CLOUD WITH SNOW;So;0;ON;;;;;N;;;;;
+1F329;CLOUD WITH LIGHTNING;So;0;ON;;;;;N;;;;;
+1F32A;CLOUD WITH TORNADO;So;0;ON;;;;;N;;;;;
+1F32B;FOG;So;0;ON;;;;;N;;;;;
+1F32C;WIND BLOWING FACE;So;0;ON;;;;;N;;;;;
+1F32D;HOT DOG;So;0;ON;;;;;N;;;;;
+1F32E;TACO;So;0;ON;;;;;N;;;;;
+1F32F;BURRITO;So;0;ON;;;;;N;;;;;
+1F330;CHESTNUT;So;0;ON;;;;;N;;;;;
+1F331;SEEDLING;So;0;ON;;;;;N;;;;;
+1F332;EVERGREEN TREE;So;0;ON;;;;;N;;;;;
+1F333;DECIDUOUS TREE;So;0;ON;;;;;N;;;;;
+1F334;PALM TREE;So;0;ON;;;;;N;;;;;
+1F335;CACTUS;So;0;ON;;;;;N;;;;;
+1F336;HOT PEPPER;So;0;ON;;;;;N;;;;;
+1F337;TULIP;So;0;ON;;;;;N;;;;;
+1F338;CHERRY BLOSSOM;So;0;ON;;;;;N;;;;;
+1F339;ROSE;So;0;ON;;;;;N;;;;;
+1F33A;HIBISCUS;So;0;ON;;;;;N;;;;;
+1F33B;SUNFLOWER;So;0;ON;;;;;N;;;;;
+1F33C;BLOSSOM;So;0;ON;;;;;N;;;;;
+1F33D;EAR OF MAIZE;So;0;ON;;;;;N;;;;;
+1F33E;EAR OF RICE;So;0;ON;;;;;N;;;;;
+1F33F;HERB;So;0;ON;;;;;N;;;;;
+1F340;FOUR LEAF CLOVER;So;0;ON;;;;;N;;;;;
+1F341;MAPLE LEAF;So;0;ON;;;;;N;;;;;
+1F342;FALLEN LEAF;So;0;ON;;;;;N;;;;;
+1F343;LEAF FLUTTERING IN WIND;So;0;ON;;;;;N;;;;;
+1F344;MUSHROOM;So;0;ON;;;;;N;;;;;
+1F345;TOMATO;So;0;ON;;;;;N;;;;;
+1F346;AUBERGINE;So;0;ON;;;;;N;;;;;
+1F347;GRAPES;So;0;ON;;;;;N;;;;;
+1F348;MELON;So;0;ON;;;;;N;;;;;
+1F349;WATERMELON;So;0;ON;;;;;N;;;;;
+1F34A;TANGERINE;So;0;ON;;;;;N;;;;;
+1F34B;LEMON;So;0;ON;;;;;N;;;;;
+1F34C;BANANA;So;0;ON;;;;;N;;;;;
+1F34D;PINEAPPLE;So;0;ON;;;;;N;;;;;
+1F34E;RED APPLE;So;0;ON;;;;;N;;;;;
+1F34F;GREEN APPLE;So;0;ON;;;;;N;;;;;
+1F350;PEAR;So;0;ON;;;;;N;;;;;
+1F351;PEACH;So;0;ON;;;;;N;;;;;
+1F352;CHERRIES;So;0;ON;;;;;N;;;;;
+1F353;STRAWBERRY;So;0;ON;;;;;N;;;;;
+1F354;HAMBURGER;So;0;ON;;;;;N;;;;;
+1F355;SLICE OF PIZZA;So;0;ON;;;;;N;;;;;
+1F356;MEAT ON BONE;So;0;ON;;;;;N;;;;;
+1F357;POULTRY LEG;So;0;ON;;;;;N;;;;;
+1F358;RICE CRACKER;So;0;ON;;;;;N;;;;;
+1F359;RICE BALL;So;0;ON;;;;;N;;;;;
+1F35A;COOKED RICE;So;0;ON;;;;;N;;;;;
+1F35B;CURRY AND RICE;So;0;ON;;;;;N;;;;;
+1F35C;STEAMING BOWL;So;0;ON;;;;;N;;;;;
+1F35D;SPAGHETTI;So;0;ON;;;;;N;;;;;
+1F35E;BREAD;So;0;ON;;;;;N;;;;;
+1F35F;FRENCH FRIES;So;0;ON;;;;;N;;;;;
+1F360;ROASTED SWEET POTATO;So;0;ON;;;;;N;;;;;
+1F361;DANGO;So;0;ON;;;;;N;;;;;
+1F362;ODEN;So;0;ON;;;;;N;;;;;
+1F363;SUSHI;So;0;ON;;;;;N;;;;;
+1F364;FRIED SHRIMP;So;0;ON;;;;;N;;;;;
+1F365;FISH CAKE WITH SWIRL DESIGN;So;0;ON;;;;;N;;;;;
+1F366;SOFT ICE CREAM;So;0;ON;;;;;N;;;;;
+1F367;SHAVED ICE;So;0;ON;;;;;N;;;;;
+1F368;ICE CREAM;So;0;ON;;;;;N;;;;;
+1F369;DOUGHNUT;So;0;ON;;;;;N;;;;;
+1F36A;COOKIE;So;0;ON;;;;;N;;;;;
+1F36B;CHOCOLATE BAR;So;0;ON;;;;;N;;;;;
+1F36C;CANDY;So;0;ON;;;;;N;;;;;
+1F36D;LOLLIPOP;So;0;ON;;;;;N;;;;;
+1F36E;CUSTARD;So;0;ON;;;;;N;;;;;
+1F36F;HONEY POT;So;0;ON;;;;;N;;;;;
+1F370;SHORTCAKE;So;0;ON;;;;;N;;;;;
+1F371;BENTO BOX;So;0;ON;;;;;N;;;;;
+1F372;POT OF FOOD;So;0;ON;;;;;N;;;;;
+1F373;COOKING;So;0;ON;;;;;N;;;;;
+1F374;FORK AND KNIFE;So;0;ON;;;;;N;;;;;
+1F375;TEACUP WITHOUT HANDLE;So;0;ON;;;;;N;;;;;
+1F376;SAKE BOTTLE AND CUP;So;0;ON;;;;;N;;;;;
+1F377;WINE GLASS;So;0;ON;;;;;N;;;;;
+1F378;COCKTAIL GLASS;So;0;ON;;;;;N;;;;;
+1F379;TROPICAL DRINK;So;0;ON;;;;;N;;;;;
+1F37A;BEER MUG;So;0;ON;;;;;N;;;;;
+1F37B;CLINKING BEER MUGS;So;0;ON;;;;;N;;;;;
+1F37C;BABY BOTTLE;So;0;ON;;;;;N;;;;;
+1F37D;FORK AND KNIFE WITH PLATE;So;0;ON;;;;;N;;;;;
+1F37E;BOTTLE WITH POPPING CORK;So;0;ON;;;;;N;;;;;
+1F37F;POPCORN;So;0;ON;;;;;N;;;;;
+1F380;RIBBON;So;0;ON;;;;;N;;;;;
+1F381;WRAPPED PRESENT;So;0;ON;;;;;N;;;;;
+1F382;BIRTHDAY CAKE;So;0;ON;;;;;N;;;;;
+1F383;JACK-O-LANTERN;So;0;ON;;;;;N;;;;;
+1F384;CHRISTMAS TREE;So;0;ON;;;;;N;;;;;
+1F385;FATHER CHRISTMAS;So;0;ON;;;;;N;;;;;
+1F386;FIREWORKS;So;0;ON;;;;;N;;;;;
+1F387;FIREWORK SPARKLER;So;0;ON;;;;;N;;;;;
+1F388;BALLOON;So;0;ON;;;;;N;;;;;
+1F389;PARTY POPPER;So;0;ON;;;;;N;;;;;
+1F38A;CONFETTI BALL;So;0;ON;;;;;N;;;;;
+1F38B;TANABATA TREE;So;0;ON;;;;;N;;;;;
+1F38C;CROSSED FLAGS;So;0;ON;;;;;N;;;;;
+1F38D;PINE DECORATION;So;0;ON;;;;;N;;;;;
+1F38E;JAPANESE DOLLS;So;0;ON;;;;;N;;;;;
+1F38F;CARP STREAMER;So;0;ON;;;;;N;;;;;
+1F390;WIND CHIME;So;0;ON;;;;;N;;;;;
+1F391;MOON VIEWING CEREMONY;So;0;ON;;;;;N;;;;;
+1F392;SCHOOL SATCHEL;So;0;ON;;;;;N;;;;;
+1F393;GRADUATION CAP;So;0;ON;;;;;N;;;;;
+1F394;HEART WITH TIP ON THE LEFT;So;0;ON;;;;;N;;;;;
+1F395;BOUQUET OF FLOWERS;So;0;ON;;;;;N;;;;;
+1F396;MILITARY MEDAL;So;0;ON;;;;;N;;;;;
+1F397;REMINDER RIBBON;So;0;ON;;;;;N;;;;;
+1F398;MUSICAL KEYBOARD WITH JACKS;So;0;ON;;;;;N;;;;;
+1F399;STUDIO MICROPHONE;So;0;ON;;;;;N;;;;;
+1F39A;LEVEL SLIDER;So;0;ON;;;;;N;;;;;
+1F39B;CONTROL KNOBS;So;0;ON;;;;;N;;;;;
+1F39C;BEAMED ASCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F39D;BEAMED DESCENDING MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F39E;FILM FRAMES;So;0;ON;;;;;N;;;;;
+1F39F;ADMISSION TICKETS;So;0;ON;;;;;N;;;;;
+1F3A0;CAROUSEL HORSE;So;0;ON;;;;;N;;;;;
+1F3A1;FERRIS WHEEL;So;0;ON;;;;;N;;;;;
+1F3A2;ROLLER COASTER;So;0;ON;;;;;N;;;;;
+1F3A3;FISHING POLE AND FISH;So;0;ON;;;;;N;;;;;
+1F3A4;MICROPHONE;So;0;ON;;;;;N;;;;;
+1F3A5;MOVIE CAMERA;So;0;ON;;;;;N;;;;;
+1F3A6;CINEMA;So;0;ON;;;;;N;;;;;
+1F3A7;HEADPHONE;So;0;ON;;;;;N;;;;;
+1F3A8;ARTIST PALETTE;So;0;ON;;;;;N;;;;;
+1F3A9;TOP HAT;So;0;ON;;;;;N;;;;;
+1F3AA;CIRCUS TENT;So;0;ON;;;;;N;;;;;
+1F3AB;TICKET;So;0;ON;;;;;N;;;;;
+1F3AC;CLAPPER BOARD;So;0;ON;;;;;N;;;;;
+1F3AD;PERFORMING ARTS;So;0;ON;;;;;N;;;;;
+1F3AE;VIDEO GAME;So;0;ON;;;;;N;;;;;
+1F3AF;DIRECT HIT;So;0;ON;;;;;N;;;;;
+1F3B0;SLOT MACHINE;So;0;ON;;;;;N;;;;;
+1F3B1;BILLIARDS;So;0;ON;;;;;N;;;;;
+1F3B2;GAME DIE;So;0;ON;;;;;N;;;;;
+1F3B3;BOWLING;So;0;ON;;;;;N;;;;;
+1F3B4;FLOWER PLAYING CARDS;So;0;ON;;;;;N;;;;;
+1F3B5;MUSICAL NOTE;So;0;ON;;;;;N;;;;;
+1F3B6;MULTIPLE MUSICAL NOTES;So;0;ON;;;;;N;;;;;
+1F3B7;SAXOPHONE;So;0;ON;;;;;N;;;;;
+1F3B8;GUITAR;So;0;ON;;;;;N;;;;;
+1F3B9;MUSICAL KEYBOARD;So;0;ON;;;;;N;;;;;
+1F3BA;TRUMPET;So;0;ON;;;;;N;;;;;
+1F3BB;VIOLIN;So;0;ON;;;;;N;;;;;
+1F3BC;MUSICAL SCORE;So;0;ON;;;;;N;;;;;
+1F3BD;RUNNING SHIRT WITH SASH;So;0;ON;;;;;N;;;;;
+1F3BE;TENNIS RACQUET AND BALL;So;0;ON;;;;;N;;;;;
+1F3BF;SKI AND SKI BOOT;So;0;ON;;;;;N;;;;;
+1F3C0;BASKETBALL AND HOOP;So;0;ON;;;;;N;;;;;
+1F3C1;CHEQUERED FLAG;So;0;ON;;;;;N;;;;;
+1F3C2;SNOWBOARDER;So;0;ON;;;;;N;;;;;
+1F3C3;RUNNER;So;0;ON;;;;;N;;;;;
+1F3C4;SURFER;So;0;ON;;;;;N;;;;;
+1F3C5;SPORTS MEDAL;So;0;ON;;;;;N;;;;;
+1F3C6;TROPHY;So;0;ON;;;;;N;;;;;
+1F3C7;HORSE RACING;So;0;ON;;;;;N;;;;;
+1F3C8;AMERICAN FOOTBALL;So;0;ON;;;;;N;;;;;
+1F3C9;RUGBY FOOTBALL;So;0;ON;;;;;N;;;;;
+1F3CA;SWIMMER;So;0;ON;;;;;N;;;;;
+1F3CB;WEIGHT LIFTER;So;0;ON;;;;;N;;;;;
+1F3CC;GOLFER;So;0;ON;;;;;N;;;;;
+1F3CD;RACING MOTORCYCLE;So;0;ON;;;;;N;;;;;
+1F3CE;RACING CAR;So;0;ON;;;;;N;;;;;
+1F3CF;CRICKET BAT AND BALL;So;0;ON;;;;;N;;;;;
+1F3D0;VOLLEYBALL;So;0;ON;;;;;N;;;;;
+1F3D1;FIELD HOCKEY STICK AND BALL;So;0;ON;;;;;N;;;;;
+1F3D2;ICE HOCKEY STICK AND PUCK;So;0;ON;;;;;N;;;;;
+1F3D3;TABLE TENNIS PADDLE AND BALL;So;0;ON;;;;;N;;;;;
+1F3D4;SNOW CAPPED MOUNTAIN;So;0;ON;;;;;N;;;;;
+1F3D5;CAMPING;So;0;ON;;;;;N;;;;;
+1F3D6;BEACH WITH UMBRELLA;So;0;ON;;;;;N;;;;;
+1F3D7;BUILDING CONSTRUCTION;So;0;ON;;;;;N;;;;;
+1F3D8;HOUSE BUILDINGS;So;0;ON;;;;;N;;;;;
+1F3D9;CITYSCAPE;So;0;ON;;;;;N;;;;;
+1F3DA;DERELICT HOUSE BUILDING;So;0;ON;;;;;N;;;;;
+1F3DB;CLASSICAL BUILDING;So;0;ON;;;;;N;;;;;
+1F3DC;DESERT;So;0;ON;;;;;N;;;;;
+1F3DD;DESERT ISLAND;So;0;ON;;;;;N;;;;;
+1F3DE;NATIONAL PARK;So;0;ON;;;;;N;;;;;
+1F3DF;STADIUM;So;0;ON;;;;;N;;;;;
+1F3E0;HOUSE BUILDING;So;0;ON;;;;;N;;;;;
+1F3E1;HOUSE WITH GARDEN;So;0;ON;;;;;N;;;;;
+1F3E2;OFFICE BUILDING;So;0;ON;;;;;N;;;;;
+1F3E3;JAPANESE POST OFFICE;So;0;ON;;;;;N;;;;;
+1F3E4;EUROPEAN POST OFFICE;So;0;ON;;;;;N;;;;;
+1F3E5;HOSPITAL;So;0;ON;;;;;N;;;;;
+1F3E6;BANK;So;0;ON;;;;;N;;;;;
+1F3E7;AUTOMATED TELLER MACHINE;So;0;ON;;;;;N;;;;;
+1F3E8;HOTEL;So;0;ON;;;;;N;;;;;
+1F3E9;LOVE HOTEL;So;0;ON;;;;;N;;;;;
+1F3EA;CONVENIENCE STORE;So;0;ON;;;;;N;;;;;
+1F3EB;SCHOOL;So;0;ON;;;;;N;;;;;
+1F3EC;DEPARTMENT STORE;So;0;ON;;;;;N;;;;;
+1F3ED;FACTORY;So;0;ON;;;;;N;;;;;
+1F3EE;IZAKAYA LANTERN;So;0;ON;;;;;N;;;;;
+1F3EF;JAPANESE CASTLE;So;0;ON;;;;;N;;;;;
+1F3F0;EUROPEAN CASTLE;So;0;ON;;;;;N;;;;;
+1F3F1;WHITE PENNANT;So;0;ON;;;;;N;;;;;
+1F3F2;BLACK PENNANT;So;0;ON;;;;;N;;;;;
+1F3F3;WAVING WHITE FLAG;So;0;ON;;;;;N;;;;;
+1F3F4;WAVING BLACK FLAG;So;0;ON;;;;;N;;;;;
+1F3F5;ROSETTE;So;0;ON;;;;;N;;;;;
+1F3F6;BLACK ROSETTE;So;0;ON;;;;;N;;;;;
+1F3F7;LABEL;So;0;ON;;;;;N;;;;;
+1F3F8;BADMINTON RACQUET AND SHUTTLECOCK;So;0;ON;;;;;N;;;;;
+1F3F9;BOW AND ARROW;So;0;ON;;;;;N;;;;;
+1F3FA;AMPHORA;So;0;ON;;;;;N;;;;;
+1F3FB;EMOJI MODIFIER FITZPATRICK TYPE-1-2;Sk;0;ON;;;;;N;;;;;
+1F3FC;EMOJI MODIFIER FITZPATRICK TYPE-3;Sk;0;ON;;;;;N;;;;;
+1F3FD;EMOJI MODIFIER FITZPATRICK TYPE-4;Sk;0;ON;;;;;N;;;;;
+1F3FE;EMOJI MODIFIER FITZPATRICK TYPE-5;Sk;0;ON;;;;;N;;;;;
+1F3FF;EMOJI MODIFIER FITZPATRICK TYPE-6;Sk;0;ON;;;;;N;;;;;
+1F400;RAT;So;0;ON;;;;;N;;;;;
+1F401;MOUSE;So;0;ON;;;;;N;;;;;
+1F402;OX;So;0;ON;;;;;N;;;;;
+1F403;WATER BUFFALO;So;0;ON;;;;;N;;;;;
+1F404;COW;So;0;ON;;;;;N;;;;;
+1F405;TIGER;So;0;ON;;;;;N;;;;;
+1F406;LEOPARD;So;0;ON;;;;;N;;;;;
+1F407;RABBIT;So;0;ON;;;;;N;;;;;
+1F408;CAT;So;0;ON;;;;;N;;;;;
+1F409;DRAGON;So;0;ON;;;;;N;;;;;
+1F40A;CROCODILE;So;0;ON;;;;;N;;;;;
+1F40B;WHALE;So;0;ON;;;;;N;;;;;
+1F40C;SNAIL;So;0;ON;;;;;N;;;;;
+1F40D;SNAKE;So;0;ON;;;;;N;;;;;
+1F40E;HORSE;So;0;ON;;;;;N;;;;;
+1F40F;RAM;So;0;ON;;;;;N;;;;;
+1F410;GOAT;So;0;ON;;;;;N;;;;;
+1F411;SHEEP;So;0;ON;;;;;N;;;;;
+1F412;MONKEY;So;0;ON;;;;;N;;;;;
+1F413;ROOSTER;So;0;ON;;;;;N;;;;;
+1F414;CHICKEN;So;0;ON;;;;;N;;;;;
+1F415;DOG;So;0;ON;;;;;N;;;;;
+1F416;PIG;So;0;ON;;;;;N;;;;;
+1F417;BOAR;So;0;ON;;;;;N;;;;;
+1F418;ELEPHANT;So;0;ON;;;;;N;;;;;
+1F419;OCTOPUS;So;0;ON;;;;;N;;;;;
+1F41A;SPIRAL SHELL;So;0;ON;;;;;N;;;;;
+1F41B;BUG;So;0;ON;;;;;N;;;;;
+1F41C;ANT;So;0;ON;;;;;N;;;;;
+1F41D;HONEYBEE;So;0;ON;;;;;N;;;;;
+1F41E;LADY BEETLE;So;0;ON;;;;;N;;;;;
+1F41F;FISH;So;0;ON;;;;;N;;;;;
+1F420;TROPICAL FISH;So;0;ON;;;;;N;;;;;
+1F421;BLOWFISH;So;0;ON;;;;;N;;;;;
+1F422;TURTLE;So;0;ON;;;;;N;;;;;
+1F423;HATCHING CHICK;So;0;ON;;;;;N;;;;;
+1F424;BABY CHICK;So;0;ON;;;;;N;;;;;
+1F425;FRONT-FACING BABY CHICK;So;0;ON;;;;;N;;;;;
+1F426;BIRD;So;0;ON;;;;;N;;;;;
+1F427;PENGUIN;So;0;ON;;;;;N;;;;;
+1F428;KOALA;So;0;ON;;;;;N;;;;;
+1F429;POODLE;So;0;ON;;;;;N;;;;;
+1F42A;DROMEDARY CAMEL;So;0;ON;;;;;N;;;;;
+1F42B;BACTRIAN CAMEL;So;0;ON;;;;;N;;;;;
+1F42C;DOLPHIN;So;0;ON;;;;;N;;;;;
+1F42D;MOUSE FACE;So;0;ON;;;;;N;;;;;
+1F42E;COW FACE;So;0;ON;;;;;N;;;;;
+1F42F;TIGER FACE;So;0;ON;;;;;N;;;;;
+1F430;RABBIT FACE;So;0;ON;;;;;N;;;;;
+1F431;CAT FACE;So;0;ON;;;;;N;;;;;
+1F432;DRAGON FACE;So;0;ON;;;;;N;;;;;
+1F433;SPOUTING WHALE;So;0;ON;;;;;N;;;;;
+1F434;HORSE FACE;So;0;ON;;;;;N;;;;;
+1F435;MONKEY FACE;So;0;ON;;;;;N;;;;;
+1F436;DOG FACE;So;0;ON;;;;;N;;;;;
+1F437;PIG FACE;So;0;ON;;;;;N;;;;;
+1F438;FROG FACE;So;0;ON;;;;;N;;;;;
+1F439;HAMSTER FACE;So;0;ON;;;;;N;;;;;
+1F43A;WOLF FACE;So;0;ON;;;;;N;;;;;
+1F43B;BEAR FACE;So;0;ON;;;;;N;;;;;
+1F43C;PANDA FACE;So;0;ON;;;;;N;;;;;
+1F43D;PIG NOSE;So;0;ON;;;;;N;;;;;
+1F43E;PAW PRINTS;So;0;ON;;;;;N;;;;;
+1F43F;CHIPMUNK;So;0;ON;;;;;N;;;;;
+1F440;EYES;So;0;ON;;;;;N;;;;;
+1F441;EYE;So;0;ON;;;;;N;;;;;
+1F442;EAR;So;0;ON;;;;;N;;;;;
+1F443;NOSE;So;0;ON;;;;;N;;;;;
+1F444;MOUTH;So;0;ON;;;;;N;;;;;
+1F445;TONGUE;So;0;ON;;;;;N;;;;;
+1F446;WHITE UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F447;WHITE DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F448;WHITE LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F449;WHITE RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F44A;FISTED HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44B;WAVING HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44C;OK HAND SIGN;So;0;ON;;;;;N;;;;;
+1F44D;THUMBS UP SIGN;So;0;ON;;;;;N;;;;;
+1F44E;THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;;
+1F44F;CLAPPING HANDS SIGN;So;0;ON;;;;;N;;;;;
+1F450;OPEN HANDS SIGN;So;0;ON;;;;;N;;;;;
+1F451;CROWN;So;0;ON;;;;;N;;;;;
+1F452;WOMANS HAT;So;0;ON;;;;;N;;;;;
+1F453;EYEGLASSES;So;0;ON;;;;;N;;;;;
+1F454;NECKTIE;So;0;ON;;;;;N;;;;;
+1F455;T-SHIRT;So;0;ON;;;;;N;;;;;
+1F456;JEANS;So;0;ON;;;;;N;;;;;
+1F457;DRESS;So;0;ON;;;;;N;;;;;
+1F458;KIMONO;So;0;ON;;;;;N;;;;;
+1F459;BIKINI;So;0;ON;;;;;N;;;;;
+1F45A;WOMANS CLOTHES;So;0;ON;;;;;N;;;;;
+1F45B;PURSE;So;0;ON;;;;;N;;;;;
+1F45C;HANDBAG;So;0;ON;;;;;N;;;;;
+1F45D;POUCH;So;0;ON;;;;;N;;;;;
+1F45E;MANS SHOE;So;0;ON;;;;;N;;;;;
+1F45F;ATHLETIC SHOE;So;0;ON;;;;;N;;;;;
+1F460;HIGH-HEELED SHOE;So;0;ON;;;;;N;;;;;
+1F461;WOMANS SANDAL;So;0;ON;;;;;N;;;;;
+1F462;WOMANS BOOTS;So;0;ON;;;;;N;;;;;
+1F463;FOOTPRINTS;So;0;ON;;;;;N;;;;;
+1F464;BUST IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F465;BUSTS IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F466;BOY;So;0;ON;;;;;N;;;;;
+1F467;GIRL;So;0;ON;;;;;N;;;;;
+1F468;MAN;So;0;ON;;;;;N;;;;;
+1F469;WOMAN;So;0;ON;;;;;N;;;;;
+1F46A;FAMILY;So;0;ON;;;;;N;;;;;
+1F46B;MAN AND WOMAN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46C;TWO MEN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46D;TWO WOMEN HOLDING HANDS;So;0;ON;;;;;N;;;;;
+1F46E;POLICE OFFICER;So;0;ON;;;;;N;;;;;
+1F46F;WOMAN WITH BUNNY EARS;So;0;ON;;;;;N;;;;;
+1F470;BRIDE WITH VEIL;So;0;ON;;;;;N;;;;;
+1F471;PERSON WITH BLOND HAIR;So;0;ON;;;;;N;;;;;
+1F472;MAN WITH GUA PI MAO;So;0;ON;;;;;N;;;;;
+1F473;MAN WITH TURBAN;So;0;ON;;;;;N;;;;;
+1F474;OLDER MAN;So;0;ON;;;;;N;;;;;
+1F475;OLDER WOMAN;So;0;ON;;;;;N;;;;;
+1F476;BABY;So;0;ON;;;;;N;;;;;
+1F477;CONSTRUCTION WORKER;So;0;ON;;;;;N;;;;;
+1F478;PRINCESS;So;0;ON;;;;;N;;;;;
+1F479;JAPANESE OGRE;So;0;ON;;;;;N;;;;;
+1F47A;JAPANESE GOBLIN;So;0;ON;;;;;N;;;;;
+1F47B;GHOST;So;0;ON;;;;;N;;;;;
+1F47C;BABY ANGEL;So;0;ON;;;;;N;;;;;
+1F47D;EXTRATERRESTRIAL ALIEN;So;0;ON;;;;;N;;;;;
+1F47E;ALIEN MONSTER;So;0;ON;;;;;N;;;;;
+1F47F;IMP;So;0;ON;;;;;N;;;;;
+1F480;SKULL;So;0;ON;;;;;N;;;;;
+1F481;INFORMATION DESK PERSON;So;0;ON;;;;;N;;;;;
+1F482;GUARDSMAN;So;0;ON;;;;;N;;;;;
+1F483;DANCER;So;0;ON;;;;;N;;;;;
+1F484;LIPSTICK;So;0;ON;;;;;N;;;;;
+1F485;NAIL POLISH;So;0;ON;;;;;N;;;;;
+1F486;FACE MASSAGE;So;0;ON;;;;;N;;;;;
+1F487;HAIRCUT;So;0;ON;;;;;N;;;;;
+1F488;BARBER POLE;So;0;ON;;;;;N;;;;;
+1F489;SYRINGE;So;0;ON;;;;;N;;;;;
+1F48A;PILL;So;0;ON;;;;;N;;;;;
+1F48B;KISS MARK;So;0;ON;;;;;N;;;;;
+1F48C;LOVE LETTER;So;0;ON;;;;;N;;;;;
+1F48D;RING;So;0;ON;;;;;N;;;;;
+1F48E;GEM STONE;So;0;ON;;;;;N;;;;;
+1F48F;KISS;So;0;ON;;;;;N;;;;;
+1F490;BOUQUET;So;0;ON;;;;;N;;;;;
+1F491;COUPLE WITH HEART;So;0;ON;;;;;N;;;;;
+1F492;WEDDING;So;0;ON;;;;;N;;;;;
+1F493;BEATING HEART;So;0;ON;;;;;N;;;;;
+1F494;BROKEN HEART;So;0;ON;;;;;N;;;;;
+1F495;TWO HEARTS;So;0;ON;;;;;N;;;;;
+1F496;SPARKLING HEART;So;0;ON;;;;;N;;;;;
+1F497;GROWING HEART;So;0;ON;;;;;N;;;;;
+1F498;HEART WITH ARROW;So;0;ON;;;;;N;;;;;
+1F499;BLUE HEART;So;0;ON;;;;;N;;;;;
+1F49A;GREEN HEART;So;0;ON;;;;;N;;;;;
+1F49B;YELLOW HEART;So;0;ON;;;;;N;;;;;
+1F49C;PURPLE HEART;So;0;ON;;;;;N;;;;;
+1F49D;HEART WITH RIBBON;So;0;ON;;;;;N;;;;;
+1F49E;REVOLVING HEARTS;So;0;ON;;;;;N;;;;;
+1F49F;HEART DECORATION;So;0;ON;;;;;N;;;;;
+1F4A0;DIAMOND SHAPE WITH A DOT INSIDE;So;0;ON;;;;;N;;;;;
+1F4A1;ELECTRIC LIGHT BULB;So;0;ON;;;;;N;;;;;
+1F4A2;ANGER SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A3;BOMB;So;0;ON;;;;;N;;;;;
+1F4A4;SLEEPING SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A5;COLLISION SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A6;SPLASHING SWEAT SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A7;DROPLET;So;0;ON;;;;;N;;;;;
+1F4A8;DASH SYMBOL;So;0;ON;;;;;N;;;;;
+1F4A9;PILE OF POO;So;0;ON;;;;;N;;;;;
+1F4AA;FLEXED BICEPS;So;0;ON;;;;;N;;;;;
+1F4AB;DIZZY SYMBOL;So;0;ON;;;;;N;;;;;
+1F4AC;SPEECH BALLOON;So;0;ON;;;;;N;;;;;
+1F4AD;THOUGHT BALLOON;So;0;ON;;;;;N;;;;;
+1F4AE;WHITE FLOWER;So;0;ON;;;;;N;;;;;
+1F4AF;HUNDRED POINTS SYMBOL;So;0;ON;;;;;N;;;;;
+1F4B0;MONEY BAG;So;0;ON;;;;;N;;;;;
+1F4B1;CURRENCY EXCHANGE;So;0;ON;;;;;N;;;;;
+1F4B2;HEAVY DOLLAR SIGN;So;0;ON;;;;;N;;;;;
+1F4B3;CREDIT CARD;So;0;ON;;;;;N;;;;;
+1F4B4;BANKNOTE WITH YEN SIGN;So;0;ON;;;;;N;;;;;
+1F4B5;BANKNOTE WITH DOLLAR SIGN;So;0;ON;;;;;N;;;;;
+1F4B6;BANKNOTE WITH EURO SIGN;So;0;ON;;;;;N;;;;;
+1F4B7;BANKNOTE WITH POUND SIGN;So;0;ON;;;;;N;;;;;
+1F4B8;MONEY WITH WINGS;So;0;ON;;;;;N;;;;;
+1F4B9;CHART WITH UPWARDS TREND AND YEN SIGN;So;0;ON;;;;;N;;;;;
+1F4BA;SEAT;So;0;ON;;;;;N;;;;;
+1F4BB;PERSONAL COMPUTER;So;0;ON;;;;;N;;;;;
+1F4BC;BRIEFCASE;So;0;ON;;;;;N;;;;;
+1F4BD;MINIDISC;So;0;ON;;;;;N;;;;;
+1F4BE;FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F4BF;OPTICAL DISC;So;0;ON;;;;;N;;;;;
+1F4C0;DVD;So;0;ON;;;;;N;;;;;
+1F4C1;FILE FOLDER;So;0;ON;;;;;N;;;;;
+1F4C2;OPEN FILE FOLDER;So;0;ON;;;;;N;;;;;
+1F4C3;PAGE WITH CURL;So;0;ON;;;;;N;;;;;
+1F4C4;PAGE FACING UP;So;0;ON;;;;;N;;;;;
+1F4C5;CALENDAR;So;0;ON;;;;;N;;;;;
+1F4C6;TEAR-OFF CALENDAR;So;0;ON;;;;;N;;;;;
+1F4C7;CARD INDEX;So;0;ON;;;;;N;;;;;
+1F4C8;CHART WITH UPWARDS TREND;So;0;ON;;;;;N;;;;;
+1F4C9;CHART WITH DOWNWARDS TREND;So;0;ON;;;;;N;;;;;
+1F4CA;BAR CHART;So;0;ON;;;;;N;;;;;
+1F4CB;CLIPBOARD;So;0;ON;;;;;N;;;;;
+1F4CC;PUSHPIN;So;0;ON;;;;;N;;;;;
+1F4CD;ROUND PUSHPIN;So;0;ON;;;;;N;;;;;
+1F4CE;PAPERCLIP;So;0;ON;;;;;N;;;;;
+1F4CF;STRAIGHT RULER;So;0;ON;;;;;N;;;;;
+1F4D0;TRIANGULAR RULER;So;0;ON;;;;;N;;;;;
+1F4D1;BOOKMARK TABS;So;0;ON;;;;;N;;;;;
+1F4D2;LEDGER;So;0;ON;;;;;N;;;;;
+1F4D3;NOTEBOOK;So;0;ON;;;;;N;;;;;
+1F4D4;NOTEBOOK WITH DECORATIVE COVER;So;0;ON;;;;;N;;;;;
+1F4D5;CLOSED BOOK;So;0;ON;;;;;N;;;;;
+1F4D6;OPEN BOOK;So;0;ON;;;;;N;;;;;
+1F4D7;GREEN BOOK;So;0;ON;;;;;N;;;;;
+1F4D8;BLUE BOOK;So;0;ON;;;;;N;;;;;
+1F4D9;ORANGE BOOK;So;0;ON;;;;;N;;;;;
+1F4DA;BOOKS;So;0;ON;;;;;N;;;;;
+1F4DB;NAME BADGE;So;0;ON;;;;;N;;;;;
+1F4DC;SCROLL;So;0;ON;;;;;N;;;;;
+1F4DD;MEMO;So;0;ON;;;;;N;;;;;
+1F4DE;TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F4DF;PAGER;So;0;ON;;;;;N;;;;;
+1F4E0;FAX MACHINE;So;0;ON;;;;;N;;;;;
+1F4E1;SATELLITE ANTENNA;So;0;ON;;;;;N;;;;;
+1F4E2;PUBLIC ADDRESS LOUDSPEAKER;So;0;ON;;;;;N;;;;;
+1F4E3;CHEERING MEGAPHONE;So;0;ON;;;;;N;;;;;
+1F4E4;OUTBOX TRAY;So;0;ON;;;;;N;;;;;
+1F4E5;INBOX TRAY;So;0;ON;;;;;N;;;;;
+1F4E6;PACKAGE;So;0;ON;;;;;N;;;;;
+1F4E7;E-MAIL SYMBOL;So;0;ON;;;;;N;;;;;
+1F4E8;INCOMING ENVELOPE;So;0;ON;;;;;N;;;;;
+1F4E9;ENVELOPE WITH DOWNWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F4EA;CLOSED MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;;
+1F4EB;CLOSED MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;;
+1F4EC;OPEN MAILBOX WITH RAISED FLAG;So;0;ON;;;;;N;;;;;
+1F4ED;OPEN MAILBOX WITH LOWERED FLAG;So;0;ON;;;;;N;;;;;
+1F4EE;POSTBOX;So;0;ON;;;;;N;;;;;
+1F4EF;POSTAL HORN;So;0;ON;;;;;N;;;;;
+1F4F0;NEWSPAPER;So;0;ON;;;;;N;;;;;
+1F4F1;MOBILE PHONE;So;0;ON;;;;;N;;;;;
+1F4F2;MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT;So;0;ON;;;;;N;;;;;
+1F4F3;VIBRATION MODE;So;0;ON;;;;;N;;;;;
+1F4F4;MOBILE PHONE OFF;So;0;ON;;;;;N;;;;;
+1F4F5;NO MOBILE PHONES;So;0;ON;;;;;N;;;;;
+1F4F6;ANTENNA WITH BARS;So;0;ON;;;;;N;;;;;
+1F4F7;CAMERA;So;0;ON;;;;;N;;;;;
+1F4F8;CAMERA WITH FLASH;So;0;ON;;;;;N;;;;;
+1F4F9;VIDEO CAMERA;So;0;ON;;;;;N;;;;;
+1F4FA;TELEVISION;So;0;ON;;;;;N;;;;;
+1F4FB;RADIO;So;0;ON;;;;;N;;;;;
+1F4FC;VIDEOCASSETTE;So;0;ON;;;;;N;;;;;
+1F4FD;FILM PROJECTOR;So;0;ON;;;;;N;;;;;
+1F4FE;PORTABLE STEREO;So;0;ON;;;;;N;;;;;
+1F4FF;PRAYER BEADS;So;0;ON;;;;;N;;;;;
+1F500;TWISTED RIGHTWARDS ARROWS;So;0;ON;;;;;N;;;;;
+1F501;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F502;CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY;So;0;ON;;;;;N;;;;;
+1F503;CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F504;ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F505;LOW BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;;
+1F506;HIGH BRIGHTNESS SYMBOL;So;0;ON;;;;;N;;;;;
+1F507;SPEAKER WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;;
+1F508;SPEAKER;So;0;ON;;;;;N;;;;;
+1F509;SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;;
+1F50A;SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F50B;BATTERY;So;0;ON;;;;;N;;;;;
+1F50C;ELECTRIC PLUG;So;0;ON;;;;;N;;;;;
+1F50D;LEFT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;;
+1F50E;RIGHT-POINTING MAGNIFYING GLASS;So;0;ON;;;;;N;;;;;
+1F50F;LOCK WITH INK PEN;So;0;ON;;;;;N;;;;;
+1F510;CLOSED LOCK WITH KEY;So;0;ON;;;;;N;;;;;
+1F511;KEY;So;0;ON;;;;;N;;;;;
+1F512;LOCK;So;0;ON;;;;;N;;;;;
+1F513;OPEN LOCK;So;0;ON;;;;;N;;;;;
+1F514;BELL;So;0;ON;;;;;N;;;;;
+1F515;BELL WITH CANCELLATION STROKE;So;0;ON;;;;;N;;;;;
+1F516;BOOKMARK;So;0;ON;;;;;N;;;;;
+1F517;LINK SYMBOL;So;0;ON;;;;;N;;;;;
+1F518;RADIO BUTTON;So;0;ON;;;;;N;;;;;
+1F519;BACK WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51A;END WITH LEFTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51B;ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51C;SOON WITH RIGHTWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51D;TOP WITH UPWARDS ARROW ABOVE;So;0;ON;;;;;N;;;;;
+1F51E;NO ONE UNDER EIGHTEEN SYMBOL;So;0;ON;;;;;N;;;;;
+1F51F;KEYCAP TEN;So;0;ON;;;;;N;;;;;
+1F520;INPUT SYMBOL FOR LATIN CAPITAL LETTERS;So;0;ON;;;;;N;;;;;
+1F521;INPUT SYMBOL FOR LATIN SMALL LETTERS;So;0;ON;;;;;N;;;;;
+1F522;INPUT SYMBOL FOR NUMBERS;So;0;ON;;;;;N;;;;;
+1F523;INPUT SYMBOL FOR SYMBOLS;So;0;ON;;;;;N;;;;;
+1F524;INPUT SYMBOL FOR LATIN LETTERS;So;0;ON;;;;;N;;;;;
+1F525;FIRE;So;0;ON;;;;;N;;;;;
+1F526;ELECTRIC TORCH;So;0;ON;;;;;N;;;;;
+1F527;WRENCH;So;0;ON;;;;;N;;;;;
+1F528;HAMMER;So;0;ON;;;;;N;;;;;
+1F529;NUT AND BOLT;So;0;ON;;;;;N;;;;;
+1F52A;HOCHO;So;0;ON;;;;;N;;;;;
+1F52B;PISTOL;So;0;ON;;;;;N;;;;;
+1F52C;MICROSCOPE;So;0;ON;;;;;N;;;;;
+1F52D;TELESCOPE;So;0;ON;;;;;N;;;;;
+1F52E;CRYSTAL BALL;So;0;ON;;;;;N;;;;;
+1F52F;SIX POINTED STAR WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
+1F530;JAPANESE SYMBOL FOR BEGINNER;So;0;ON;;;;;N;;;;;
+1F531;TRIDENT EMBLEM;So;0;ON;;;;;N;;;;;
+1F532;BLACK SQUARE BUTTON;So;0;ON;;;;;N;;;;;
+1F533;WHITE SQUARE BUTTON;So;0;ON;;;;;N;;;;;
+1F534;LARGE RED CIRCLE;So;0;ON;;;;;N;;;;;
+1F535;LARGE BLUE CIRCLE;So;0;ON;;;;;N;;;;;
+1F536;LARGE ORANGE DIAMOND;So;0;ON;;;;;N;;;;;
+1F537;LARGE BLUE DIAMOND;So;0;ON;;;;;N;;;;;
+1F538;SMALL ORANGE DIAMOND;So;0;ON;;;;;N;;;;;
+1F539;SMALL BLUE DIAMOND;So;0;ON;;;;;N;;;;;
+1F53A;UP-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53B;DOWN-POINTING RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53C;UP-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53D;DOWN-POINTING SMALL RED TRIANGLE;So;0;ON;;;;;N;;;;;
+1F53E;LOWER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F53F;UPPER RIGHT SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F540;CIRCLED CROSS POMMEE;So;0;ON;;;;;N;;;;;
+1F541;CROSS POMMEE WITH HALF-CIRCLE BELOW;So;0;ON;;;;;N;;;;;
+1F542;CROSS POMMEE;So;0;ON;;;;;N;;;;;
+1F543;NOTCHED LEFT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F544;NOTCHED RIGHT SEMICIRCLE WITH THREE DOTS;So;0;ON;;;;;N;;;;;
+1F545;SYMBOL FOR MARKS CHAPTER;So;0;ON;;;;;N;;;;;
+1F546;WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
+1F547;HEAVY LATIN CROSS;So;0;ON;;;;;N;;;;;
+1F548;CELTIC CROSS;So;0;ON;;;;;N;;;;;
+1F549;OM SYMBOL;So;0;ON;;;;;N;;;;;
+1F54A;DOVE OF PEACE;So;0;ON;;;;;N;;;;;
+1F54B;KAABA;So;0;ON;;;;;N;;;;;
+1F54C;MOSQUE;So;0;ON;;;;;N;;;;;
+1F54D;SYNAGOGUE;So;0;ON;;;;;N;;;;;
+1F54E;MENORAH WITH NINE BRANCHES;So;0;ON;;;;;N;;;;;
+1F54F;BOWL OF HYGIEIA;So;0;ON;;;;;N;;;;;
+1F550;CLOCK FACE ONE OCLOCK;So;0;ON;;;;;N;;;;;
+1F551;CLOCK FACE TWO OCLOCK;So;0;ON;;;;;N;;;;;
+1F552;CLOCK FACE THREE OCLOCK;So;0;ON;;;;;N;;;;;
+1F553;CLOCK FACE FOUR OCLOCK;So;0;ON;;;;;N;;;;;
+1F554;CLOCK FACE FIVE OCLOCK;So;0;ON;;;;;N;;;;;
+1F555;CLOCK FACE SIX OCLOCK;So;0;ON;;;;;N;;;;;
+1F556;CLOCK FACE SEVEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F557;CLOCK FACE EIGHT OCLOCK;So;0;ON;;;;;N;;;;;
+1F558;CLOCK FACE NINE OCLOCK;So;0;ON;;;;;N;;;;;
+1F559;CLOCK FACE TEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F55A;CLOCK FACE ELEVEN OCLOCK;So;0;ON;;;;;N;;;;;
+1F55B;CLOCK FACE TWELVE OCLOCK;So;0;ON;;;;;N;;;;;
+1F55C;CLOCK FACE ONE-THIRTY;So;0;ON;;;;;N;;;;;
+1F55D;CLOCK FACE TWO-THIRTY;So;0;ON;;;;;N;;;;;
+1F55E;CLOCK FACE THREE-THIRTY;So;0;ON;;;;;N;;;;;
+1F55F;CLOCK FACE FOUR-THIRTY;So;0;ON;;;;;N;;;;;
+1F560;CLOCK FACE FIVE-THIRTY;So;0;ON;;;;;N;;;;;
+1F561;CLOCK FACE SIX-THIRTY;So;0;ON;;;;;N;;;;;
+1F562;CLOCK FACE SEVEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F563;CLOCK FACE EIGHT-THIRTY;So;0;ON;;;;;N;;;;;
+1F564;CLOCK FACE NINE-THIRTY;So;0;ON;;;;;N;;;;;
+1F565;CLOCK FACE TEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F566;CLOCK FACE ELEVEN-THIRTY;So;0;ON;;;;;N;;;;;
+1F567;CLOCK FACE TWELVE-THIRTY;So;0;ON;;;;;N;;;;;
+1F568;RIGHT SPEAKER;So;0;ON;;;;;N;;;;;
+1F569;RIGHT SPEAKER WITH ONE SOUND WAVE;So;0;ON;;;;;N;;;;;
+1F56A;RIGHT SPEAKER WITH THREE SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F56B;BULLHORN;So;0;ON;;;;;N;;;;;
+1F56C;BULLHORN WITH SOUND WAVES;So;0;ON;;;;;N;;;;;
+1F56D;RINGING BELL;So;0;ON;;;;;N;;;;;
+1F56E;BOOK;So;0;ON;;;;;N;;;;;
+1F56F;CANDLE;So;0;ON;;;;;N;;;;;
+1F570;MANTELPIECE CLOCK;So;0;ON;;;;;N;;;;;
+1F571;BLACK SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
+1F572;NO PIRACY;So;0;ON;;;;;N;;;;;
+1F573;HOLE;So;0;ON;;;;;N;;;;;
+1F574;MAN IN BUSINESS SUIT LEVITATING;So;0;ON;;;;;N;;;;;
+1F575;SLEUTH OR SPY;So;0;ON;;;;;N;;;;;
+1F576;DARK SUNGLASSES;So;0;ON;;;;;N;;;;;
+1F577;SPIDER;So;0;ON;;;;;N;;;;;
+1F578;SPIDER WEB;So;0;ON;;;;;N;;;;;
+1F579;JOYSTICK;So;0;ON;;;;;N;;;;;
+1F57A;MAN DANCING;So;0;ON;;;;;N;;;;;
+1F57B;LEFT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F57C;TELEPHONE RECEIVER WITH PAGE;So;0;ON;;;;;N;;;;;
+1F57D;RIGHT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
+1F57E;WHITE TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;;
+1F57F;BLACK TOUCHTONE TELEPHONE;So;0;ON;;;;;N;;;;;
+1F580;TELEPHONE ON TOP OF MODEM;So;0;ON;;;;;N;;;;;
+1F581;CLAMSHELL MOBILE PHONE;So;0;ON;;;;;N;;;;;
+1F582;BACK OF ENVELOPE;So;0;ON;;;;;N;;;;;
+1F583;STAMPED ENVELOPE;So;0;ON;;;;;N;;;;;
+1F584;ENVELOPE WITH LIGHTNING;So;0;ON;;;;;N;;;;;
+1F585;FLYING ENVELOPE;So;0;ON;;;;;N;;;;;
+1F586;PEN OVER STAMPED ENVELOPE;So;0;ON;;;;;N;;;;;
+1F587;LINKED PAPERCLIPS;So;0;ON;;;;;N;;;;;
+1F588;BLACK PUSHPIN;So;0;ON;;;;;N;;;;;
+1F589;LOWER LEFT PENCIL;So;0;ON;;;;;N;;;;;
+1F58A;LOWER LEFT BALLPOINT PEN;So;0;ON;;;;;N;;;;;
+1F58B;LOWER LEFT FOUNTAIN PEN;So;0;ON;;;;;N;;;;;
+1F58C;LOWER LEFT PAINTBRUSH;So;0;ON;;;;;N;;;;;
+1F58D;LOWER LEFT CRAYON;So;0;ON;;;;;N;;;;;
+1F58E;LEFT WRITING HAND;So;0;ON;;;;;N;;;;;
+1F58F;TURNED OK HAND SIGN;So;0;ON;;;;;N;;;;;
+1F590;RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;;
+1F591;REVERSED RAISED HAND WITH FINGERS SPLAYED;So;0;ON;;;;;N;;;;;
+1F592;REVERSED THUMBS UP SIGN;So;0;ON;;;;;N;;;;;
+1F593;REVERSED THUMBS DOWN SIGN;So;0;ON;;;;;N;;;;;
+1F594;REVERSED VICTORY HAND;So;0;ON;;;;;N;;;;;
+1F595;REVERSED HAND WITH MIDDLE FINGER EXTENDED;So;0;ON;;;;;N;;;;;
+1F596;RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS;So;0;ON;;;;;N;;;;;
+1F597;WHITE DOWN POINTING LEFT HAND INDEX;So;0;ON;;;;;N;;;;;
+1F598;SIDEWAYS WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F599;SIDEWAYS WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59A;SIDEWAYS BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59B;SIDEWAYS BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59C;BLACK LEFT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F59D;BLACK RIGHT POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F59E;SIDEWAYS WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F59F;SIDEWAYS WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A0;SIDEWAYS BLACK UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A1;SIDEWAYS BLACK DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+1F5A2;BLACK UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F5A3;BLACK DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F5A4;BLACK HEART;So;0;ON;;;;;N;;;;;
+1F5A5;DESKTOP COMPUTER;So;0;ON;;;;;N;;;;;
+1F5A6;KEYBOARD AND MOUSE;So;0;ON;;;;;N;;;;;
+1F5A7;THREE NETWORKED COMPUTERS;So;0;ON;;;;;N;;;;;
+1F5A8;PRINTER;So;0;ON;;;;;N;;;;;
+1F5A9;POCKET CALCULATOR;So;0;ON;;;;;N;;;;;
+1F5AA;BLACK HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AB;WHITE HARD SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AC;SOFT SHELL FLOPPY DISK;So;0;ON;;;;;N;;;;;
+1F5AD;TAPE CARTRIDGE;So;0;ON;;;;;N;;;;;
+1F5AE;WIRED KEYBOARD;So;0;ON;;;;;N;;;;;
+1F5AF;ONE BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B0;TWO BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B1;THREE BUTTON MOUSE;So;0;ON;;;;;N;;;;;
+1F5B2;TRACKBALL;So;0;ON;;;;;N;;;;;
+1F5B3;OLD PERSONAL COMPUTER;So;0;ON;;;;;N;;;;;
+1F5B4;HARD DISK;So;0;ON;;;;;N;;;;;
+1F5B5;SCREEN;So;0;ON;;;;;N;;;;;
+1F5B6;PRINTER ICON;So;0;ON;;;;;N;;;;;
+1F5B7;FAX ICON;So;0;ON;;;;;N;;;;;
+1F5B8;OPTICAL DISC ICON;So;0;ON;;;;;N;;;;;
+1F5B9;DOCUMENT WITH TEXT;So;0;ON;;;;;N;;;;;
+1F5BA;DOCUMENT WITH TEXT AND PICTURE;So;0;ON;;;;;N;;;;;
+1F5BB;DOCUMENT WITH PICTURE;So;0;ON;;;;;N;;;;;
+1F5BC;FRAME WITH PICTURE;So;0;ON;;;;;N;;;;;
+1F5BD;FRAME WITH TILES;So;0;ON;;;;;N;;;;;
+1F5BE;FRAME WITH AN X;So;0;ON;;;;;N;;;;;
+1F5BF;BLACK FOLDER;So;0;ON;;;;;N;;;;;
+1F5C0;FOLDER;So;0;ON;;;;;N;;;;;
+1F5C1;OPEN FOLDER;So;0;ON;;;;;N;;;;;
+1F5C2;CARD INDEX DIVIDERS;So;0;ON;;;;;N;;;;;
+1F5C3;CARD FILE BOX;So;0;ON;;;;;N;;;;;
+1F5C4;FILE CABINET;So;0;ON;;;;;N;;;;;
+1F5C5;EMPTY NOTE;So;0;ON;;;;;N;;;;;
+1F5C6;EMPTY NOTE PAGE;So;0;ON;;;;;N;;;;;
+1F5C7;EMPTY NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5C8;NOTE;So;0;ON;;;;;N;;;;;
+1F5C9;NOTE PAGE;So;0;ON;;;;;N;;;;;
+1F5CA;NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5CB;EMPTY DOCUMENT;So;0;ON;;;;;N;;;;;
+1F5CC;EMPTY PAGE;So;0;ON;;;;;N;;;;;
+1F5CD;EMPTY PAGES;So;0;ON;;;;;N;;;;;
+1F5CE;DOCUMENT;So;0;ON;;;;;N;;;;;
+1F5CF;PAGE;So;0;ON;;;;;N;;;;;
+1F5D0;PAGES;So;0;ON;;;;;N;;;;;
+1F5D1;WASTEBASKET;So;0;ON;;;;;N;;;;;
+1F5D2;SPIRAL NOTE PAD;So;0;ON;;;;;N;;;;;
+1F5D3;SPIRAL CALENDAR PAD;So;0;ON;;;;;N;;;;;
+1F5D4;DESKTOP WINDOW;So;0;ON;;;;;N;;;;;
+1F5D5;MINIMIZE;So;0;ON;;;;;N;;;;;
+1F5D6;MAXIMIZE;So;0;ON;;;;;N;;;;;
+1F5D7;OVERLAP;So;0;ON;;;;;N;;;;;
+1F5D8;CLOCKWISE RIGHT AND LEFT SEMICIRCLE ARROWS;So;0;ON;;;;;N;;;;;
+1F5D9;CANCELLATION X;So;0;ON;;;;;N;;;;;
+1F5DA;INCREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;;
+1F5DB;DECREASE FONT SIZE SYMBOL;So;0;ON;;;;;N;;;;;
+1F5DC;COMPRESSION;So;0;ON;;;;;N;;;;;
+1F5DD;OLD KEY;So;0;ON;;;;;N;;;;;
+1F5DE;ROLLED-UP NEWSPAPER;So;0;ON;;;;;N;;;;;
+1F5DF;PAGE WITH CIRCLED TEXT;So;0;ON;;;;;N;;;;;
+1F5E0;STOCK CHART;So;0;ON;;;;;N;;;;;
+1F5E1;DAGGER KNIFE;So;0;ON;;;;;N;;;;;
+1F5E2;LIPS;So;0;ON;;;;;N;;;;;
+1F5E3;SPEAKING HEAD IN SILHOUETTE;So;0;ON;;;;;N;;;;;
+1F5E4;THREE RAYS ABOVE;So;0;ON;;;;;N;;;;;
+1F5E5;THREE RAYS BELOW;So;0;ON;;;;;N;;;;;
+1F5E6;THREE RAYS LEFT;So;0;ON;;;;;N;;;;;
+1F5E7;THREE RAYS RIGHT;So;0;ON;;;;;N;;;;;
+1F5E8;LEFT SPEECH BUBBLE;So;0;ON;;;;;N;;;;;
+1F5E9;RIGHT SPEECH BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EA;TWO SPEECH BUBBLES;So;0;ON;;;;;N;;;;;
+1F5EB;THREE SPEECH BUBBLES;So;0;ON;;;;;N;;;;;
+1F5EC;LEFT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;;
+1F5ED;RIGHT THOUGHT BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EE;LEFT ANGER BUBBLE;So;0;ON;;;;;N;;;;;
+1F5EF;RIGHT ANGER BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F0;MOOD BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F1;LIGHTNING MOOD BUBBLE;So;0;ON;;;;;N;;;;;
+1F5F2;LIGHTNING MOOD;So;0;ON;;;;;N;;;;;
+1F5F3;BALLOT BOX WITH BALLOT;So;0;ON;;;;;N;;;;;
+1F5F4;BALLOT SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F5;BALLOT BOX WITH SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F6;BALLOT BOLD SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F7;BALLOT BOX WITH BOLD SCRIPT X;So;0;ON;;;;;N;;;;;
+1F5F8;LIGHT CHECK MARK;So;0;ON;;;;;N;;;;;
+1F5F9;BALLOT BOX WITH BOLD CHECK;So;0;ON;;;;;N;;;;;
+1F5FA;WORLD MAP;So;0;ON;;;;;N;;;;;
+1F5FB;MOUNT FUJI;So;0;ON;;;;;N;;;;;
+1F5FC;TOKYO TOWER;So;0;ON;;;;;N;;;;;
+1F5FD;STATUE OF LIBERTY;So;0;ON;;;;;N;;;;;
+1F5FE;SILHOUETTE OF JAPAN;So;0;ON;;;;;N;;;;;
+1F5FF;MOYAI;So;0;ON;;;;;N;;;;;
+1F600;GRINNING FACE;So;0;ON;;;;;N;;;;;
+1F601;GRINNING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F602;FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;;
+1F603;SMILING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F604;SMILING FACE WITH OPEN MOUTH AND SMILING EYES;So;0;ON;;;;;N;;;;;
+1F605;SMILING FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F606;SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F607;SMILING FACE WITH HALO;So;0;ON;;;;;N;;;;;
+1F608;SMILING FACE WITH HORNS;So;0;ON;;;;;N;;;;;
+1F609;WINKING FACE;So;0;ON;;;;;N;;;;;
+1F60A;SMILING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F60B;FACE SAVOURING DELICIOUS FOOD;So;0;ON;;;;;N;;;;;
+1F60C;RELIEVED FACE;So;0;ON;;;;;N;;;;;
+1F60D;SMILING FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;;
+1F60E;SMILING FACE WITH SUNGLASSES;So;0;ON;;;;;N;;;;;
+1F60F;SMIRKING FACE;So;0;ON;;;;;N;;;;;
+1F610;NEUTRAL FACE;So;0;ON;;;;;N;;;;;
+1F611;EXPRESSIONLESS FACE;So;0;ON;;;;;N;;;;;
+1F612;UNAMUSED FACE;So;0;ON;;;;;N;;;;;
+1F613;FACE WITH COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F614;PENSIVE FACE;So;0;ON;;;;;N;;;;;
+1F615;CONFUSED FACE;So;0;ON;;;;;N;;;;;
+1F616;CONFOUNDED FACE;So;0;ON;;;;;N;;;;;
+1F617;KISSING FACE;So;0;ON;;;;;N;;;;;
+1F618;FACE THROWING A KISS;So;0;ON;;;;;N;;;;;
+1F619;KISSING FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F61A;KISSING FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F61B;FACE WITH STUCK-OUT TONGUE;So;0;ON;;;;;N;;;;;
+1F61C;FACE WITH STUCK-OUT TONGUE AND WINKING EYE;So;0;ON;;;;;N;;;;;
+1F61D;FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F61E;DISAPPOINTED FACE;So;0;ON;;;;;N;;;;;
+1F61F;WORRIED FACE;So;0;ON;;;;;N;;;;;
+1F620;ANGRY FACE;So;0;ON;;;;;N;;;;;
+1F621;POUTING FACE;So;0;ON;;;;;N;;;;;
+1F622;CRYING FACE;So;0;ON;;;;;N;;;;;
+1F623;PERSEVERING FACE;So;0;ON;;;;;N;;;;;
+1F624;FACE WITH LOOK OF TRIUMPH;So;0;ON;;;;;N;;;;;
+1F625;DISAPPOINTED BUT RELIEVED FACE;So;0;ON;;;;;N;;;;;
+1F626;FROWNING FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F627;ANGUISHED FACE;So;0;ON;;;;;N;;;;;
+1F628;FEARFUL FACE;So;0;ON;;;;;N;;;;;
+1F629;WEARY FACE;So;0;ON;;;;;N;;;;;
+1F62A;SLEEPY FACE;So;0;ON;;;;;N;;;;;
+1F62B;TIRED FACE;So;0;ON;;;;;N;;;;;
+1F62C;GRIMACING FACE;So;0;ON;;;;;N;;;;;
+1F62D;LOUDLY CRYING FACE;So;0;ON;;;;;N;;;;;
+1F62E;FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F62F;HUSHED FACE;So;0;ON;;;;;N;;;;;
+1F630;FACE WITH OPEN MOUTH AND COLD SWEAT;So;0;ON;;;;;N;;;;;
+1F631;FACE SCREAMING IN FEAR;So;0;ON;;;;;N;;;;;
+1F632;ASTONISHED FACE;So;0;ON;;;;;N;;;;;
+1F633;FLUSHED FACE;So;0;ON;;;;;N;;;;;
+1F634;SLEEPING FACE;So;0;ON;;;;;N;;;;;
+1F635;DIZZY FACE;So;0;ON;;;;;N;;;;;
+1F636;FACE WITHOUT MOUTH;So;0;ON;;;;;N;;;;;
+1F637;FACE WITH MEDICAL MASK;So;0;ON;;;;;N;;;;;
+1F638;GRINNING CAT FACE WITH SMILING EYES;So;0;ON;;;;;N;;;;;
+1F639;CAT FACE WITH TEARS OF JOY;So;0;ON;;;;;N;;;;;
+1F63A;SMILING CAT FACE WITH OPEN MOUTH;So;0;ON;;;;;N;;;;;
+1F63B;SMILING CAT FACE WITH HEART-SHAPED EYES;So;0;ON;;;;;N;;;;;
+1F63C;CAT FACE WITH WRY SMILE;So;0;ON;;;;;N;;;;;
+1F63D;KISSING CAT FACE WITH CLOSED EYES;So;0;ON;;;;;N;;;;;
+1F63E;POUTING CAT FACE;So;0;ON;;;;;N;;;;;
+1F63F;CRYING CAT FACE;So;0;ON;;;;;N;;;;;
+1F640;WEARY CAT FACE;So;0;ON;;;;;N;;;;;
+1F641;SLIGHTLY FROWNING FACE;So;0;ON;;;;;N;;;;;
+1F642;SLIGHTLY SMILING FACE;So;0;ON;;;;;N;;;;;
+1F643;UPSIDE-DOWN FACE;So;0;ON;;;;;N;;;;;
+1F644;FACE WITH ROLLING EYES;So;0;ON;;;;;N;;;;;
+1F645;FACE WITH NO GOOD GESTURE;So;0;ON;;;;;N;;;;;
+1F646;FACE WITH OK GESTURE;So;0;ON;;;;;N;;;;;
+1F647;PERSON BOWING DEEPLY;So;0;ON;;;;;N;;;;;
+1F648;SEE-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F649;HEAR-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F64A;SPEAK-NO-EVIL MONKEY;So;0;ON;;;;;N;;;;;
+1F64B;HAPPY PERSON RAISING ONE HAND;So;0;ON;;;;;N;;;;;
+1F64C;PERSON RAISING BOTH HANDS IN CELEBRATION;So;0;ON;;;;;N;;;;;
+1F64D;PERSON FROWNING;So;0;ON;;;;;N;;;;;
+1F64E;PERSON WITH POUTING FACE;So;0;ON;;;;;N;;;;;
+1F64F;PERSON WITH FOLDED HANDS;So;0;ON;;;;;N;;;;;
+1F650;NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F651;SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F652;NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F653;SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F654;TURNED NORTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F655;TURNED SOUTH WEST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F656;TURNED NORTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F657;TURNED SOUTH EAST POINTING LEAF;So;0;ON;;;;;N;;;;;
+1F658;NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F659;SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65A;NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65B;SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65C;HEAVY NORTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65D;HEAVY SOUTH WEST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65E;HEAVY NORTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F65F;HEAVY SOUTH EAST POINTING VINE LEAF;So;0;ON;;;;;N;;;;;
+1F660;NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F661;SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F662;NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F663;SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F664;HEAVY NORTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F665;HEAVY SOUTH WEST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F666;HEAVY NORTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F667;HEAVY SOUTH EAST POINTING BUD;So;0;ON;;;;;N;;;;;
+1F668;HOLLOW QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;;
+1F669;HOLLOW QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+1F66A;SOLID QUILT SQUARE ORNAMENT;So;0;ON;;;;;N;;;;;
+1F66B;SOLID QUILT SQUARE ORNAMENT IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+1F66C;LEFTWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66D;UPWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66E;RIGHTWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F66F;DOWNWARDS ROCKET;So;0;ON;;;;;N;;;;;
+1F670;SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F671;HEAVY SCRIPT LIGATURE ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F672;LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F673;HEAVY LIGATURE OPEN ET ORNAMENT;So;0;ON;;;;;N;;;;;
+1F674;HEAVY AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;;
+1F675;SWASH AMPERSAND ORNAMENT;So;0;ON;;;;;N;;;;;
+1F676;SANS-SERIF HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F677;SANS-SERIF HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F678;SANS-SERIF HEAVY LOW DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+1F679;HEAVY INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67A;SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67B;HEAVY SANS-SERIF INTERROBANG ORNAMENT;So;0;ON;;;;;N;;;;;
+1F67C;VERY HEAVY SOLIDUS;So;0;ON;;;;;N;;;;;
+1F67D;VERY HEAVY REVERSE SOLIDUS;So;0;ON;;;;;N;;;;;
+1F67E;CHECKER BOARD;So;0;ON;;;;;N;;;;;
+1F67F;REVERSE CHECKER BOARD;So;0;ON;;;;;N;;;;;
+1F680;ROCKET;So;0;ON;;;;;N;;;;;
+1F681;HELICOPTER;So;0;ON;;;;;N;;;;;
+1F682;STEAM LOCOMOTIVE;So;0;ON;;;;;N;;;;;
+1F683;RAILWAY CAR;So;0;ON;;;;;N;;;;;
+1F684;HIGH-SPEED TRAIN;So;0;ON;;;;;N;;;;;
+1F685;HIGH-SPEED TRAIN WITH BULLET NOSE;So;0;ON;;;;;N;;;;;
+1F686;TRAIN;So;0;ON;;;;;N;;;;;
+1F687;METRO;So;0;ON;;;;;N;;;;;
+1F688;LIGHT RAIL;So;0;ON;;;;;N;;;;;
+1F689;STATION;So;0;ON;;;;;N;;;;;
+1F68A;TRAM;So;0;ON;;;;;N;;;;;
+1F68B;TRAM CAR;So;0;ON;;;;;N;;;;;
+1F68C;BUS;So;0;ON;;;;;N;;;;;
+1F68D;ONCOMING BUS;So;0;ON;;;;;N;;;;;
+1F68E;TROLLEYBUS;So;0;ON;;;;;N;;;;;
+1F68F;BUS STOP;So;0;ON;;;;;N;;;;;
+1F690;MINIBUS;So;0;ON;;;;;N;;;;;
+1F691;AMBULANCE;So;0;ON;;;;;N;;;;;
+1F692;FIRE ENGINE;So;0;ON;;;;;N;;;;;
+1F693;POLICE CAR;So;0;ON;;;;;N;;;;;
+1F694;ONCOMING POLICE CAR;So;0;ON;;;;;N;;;;;
+1F695;TAXI;So;0;ON;;;;;N;;;;;
+1F696;ONCOMING TAXI;So;0;ON;;;;;N;;;;;
+1F697;AUTOMOBILE;So;0;ON;;;;;N;;;;;
+1F698;ONCOMING AUTOMOBILE;So;0;ON;;;;;N;;;;;
+1F699;RECREATIONAL VEHICLE;So;0;ON;;;;;N;;;;;
+1F69A;DELIVERY TRUCK;So;0;ON;;;;;N;;;;;
+1F69B;ARTICULATED LORRY;So;0;ON;;;;;N;;;;;
+1F69C;TRACTOR;So;0;ON;;;;;N;;;;;
+1F69D;MONORAIL;So;0;ON;;;;;N;;;;;
+1F69E;MOUNTAIN RAILWAY;So;0;ON;;;;;N;;;;;
+1F69F;SUSPENSION RAILWAY;So;0;ON;;;;;N;;;;;
+1F6A0;MOUNTAIN CABLEWAY;So;0;ON;;;;;N;;;;;
+1F6A1;AERIAL TRAMWAY;So;0;ON;;;;;N;;;;;
+1F6A2;SHIP;So;0;ON;;;;;N;;;;;
+1F6A3;ROWBOAT;So;0;ON;;;;;N;;;;;
+1F6A4;SPEEDBOAT;So;0;ON;;;;;N;;;;;
+1F6A5;HORIZONTAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;;
+1F6A6;VERTICAL TRAFFIC LIGHT;So;0;ON;;;;;N;;;;;
+1F6A7;CONSTRUCTION SIGN;So;0;ON;;;;;N;;;;;
+1F6A8;POLICE CARS REVOLVING LIGHT;So;0;ON;;;;;N;;;;;
+1F6A9;TRIANGULAR FLAG ON POST;So;0;ON;;;;;N;;;;;
+1F6AA;DOOR;So;0;ON;;;;;N;;;;;
+1F6AB;NO ENTRY SIGN;So;0;ON;;;;;N;;;;;
+1F6AC;SMOKING SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AD;NO SMOKING SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AE;PUT LITTER IN ITS PLACE SYMBOL;So;0;ON;;;;;N;;;;;
+1F6AF;DO NOT LITTER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B0;POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B1;NON-POTABLE WATER SYMBOL;So;0;ON;;;;;N;;;;;
+1F6B2;BICYCLE;So;0;ON;;;;;N;;;;;
+1F6B3;NO BICYCLES;So;0;ON;;;;;N;;;;;
+1F6B4;BICYCLIST;So;0;ON;;;;;N;;;;;
+1F6B5;MOUNTAIN BICYCLIST;So;0;ON;;;;;N;;;;;
+1F6B6;PEDESTRIAN;So;0;ON;;;;;N;;;;;
+1F6B7;NO PEDESTRIANS;So;0;ON;;;;;N;;;;;
+1F6B8;CHILDREN CROSSING;So;0;ON;;;;;N;;;;;
+1F6B9;MENS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BA;WOMENS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BB;RESTROOM;So;0;ON;;;;;N;;;;;
+1F6BC;BABY SYMBOL;So;0;ON;;;;;N;;;;;
+1F6BD;TOILET;So;0;ON;;;;;N;;;;;
+1F6BE;WATER CLOSET;So;0;ON;;;;;N;;;;;
+1F6BF;SHOWER;So;0;ON;;;;;N;;;;;
+1F6C0;BATH;So;0;ON;;;;;N;;;;;
+1F6C1;BATHTUB;So;0;ON;;;;;N;;;;;
+1F6C2;PASSPORT CONTROL;So;0;ON;;;;;N;;;;;
+1F6C3;CUSTOMS;So;0;ON;;;;;N;;;;;
+1F6C4;BAGGAGE CLAIM;So;0;ON;;;;;N;;;;;
+1F6C5;LEFT LUGGAGE;So;0;ON;;;;;N;;;;;
+1F6C6;TRIANGLE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+1F6C7;PROHIBITED SIGN;So;0;ON;;;;;N;;;;;
+1F6C8;CIRCLED INFORMATION SOURCE;So;0;ON;;;;;N;;;;;
+1F6C9;BOYS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6CA;GIRLS SYMBOL;So;0;ON;;;;;N;;;;;
+1F6CB;COUCH AND LAMP;So;0;ON;;;;;N;;;;;
+1F6CC;SLEEPING ACCOMMODATION;So;0;ON;;;;;N;;;;;
+1F6CD;SHOPPING BAGS;So;0;ON;;;;;N;;;;;
+1F6CE;BELLHOP BELL;So;0;ON;;;;;N;;;;;
+1F6CF;BED;So;0;ON;;;;;N;;;;;
+1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;;
+1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;;
+1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;;
+1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;;
+1F6E1;SHIELD;So;0;ON;;;;;N;;;;;
+1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;;
+1F6E3;MOTORWAY;So;0;ON;;;;;N;;;;;
+1F6E4;RAILWAY TRACK;So;0;ON;;;;;N;;;;;
+1F6E5;MOTOR BOAT;So;0;ON;;;;;N;;;;;
+1F6E6;UP-POINTING MILITARY AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E7;UP-POINTING AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E8;UP-POINTING SMALL AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6E9;SMALL AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6EA;NORTHEAST-POINTING AIRPLANE;So;0;ON;;;;;N;;;;;
+1F6EB;AIRPLANE DEPARTURE;So;0;ON;;;;;N;;;;;
+1F6EC;AIRPLANE ARRIVING;So;0;ON;;;;;N;;;;;
+1F6F0;SATELLITE;So;0;ON;;;;;N;;;;;
+1F6F1;ONCOMING FIRE ENGINE;So;0;ON;;;;;N;;;;;
+1F6F2;DIESEL LOCOMOTIVE;So;0;ON;;;;;N;;;;;
+1F6F3;PASSENGER SHIP;So;0;ON;;;;;N;;;;;
+1F6F4;SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F6;CANOE;So;0;ON;;;;;N;;;;;
+1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
+1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
+1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
+1F703;ALCHEMICAL SYMBOL FOR EARTH;So;0;ON;;;;;N;;;;;
+1F704;ALCHEMICAL SYMBOL FOR WATER;So;0;ON;;;;;N;;;;;
+1F705;ALCHEMICAL SYMBOL FOR AQUAFORTIS;So;0;ON;;;;;N;;;;;
+1F706;ALCHEMICAL SYMBOL FOR AQUA REGIA;So;0;ON;;;;;N;;;;;
+1F707;ALCHEMICAL SYMBOL FOR AQUA REGIA-2;So;0;ON;;;;;N;;;;;
+1F708;ALCHEMICAL SYMBOL FOR AQUA VITAE;So;0;ON;;;;;N;;;;;
+1F709;ALCHEMICAL SYMBOL FOR AQUA VITAE-2;So;0;ON;;;;;N;;;;;
+1F70A;ALCHEMICAL SYMBOL FOR VINEGAR;So;0;ON;;;;;N;;;;;
+1F70B;ALCHEMICAL SYMBOL FOR VINEGAR-2;So;0;ON;;;;;N;;;;;
+1F70C;ALCHEMICAL SYMBOL FOR VINEGAR-3;So;0;ON;;;;;N;;;;;
+1F70D;ALCHEMICAL SYMBOL FOR SULFUR;So;0;ON;;;;;N;;;;;
+1F70E;ALCHEMICAL SYMBOL FOR PHILOSOPHERS SULFUR;So;0;ON;;;;;N;;;;;
+1F70F;ALCHEMICAL SYMBOL FOR BLACK SULFUR;So;0;ON;;;;;N;;;;;
+1F710;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE;So;0;ON;;;;;N;;;;;
+1F711;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-2;So;0;ON;;;;;N;;;;;
+1F712;ALCHEMICAL SYMBOL FOR MERCURY SUBLIMATE-3;So;0;ON;;;;;N;;;;;
+1F713;ALCHEMICAL SYMBOL FOR CINNABAR;So;0;ON;;;;;N;;;;;
+1F714;ALCHEMICAL SYMBOL FOR SALT;So;0;ON;;;;;N;;;;;
+1F715;ALCHEMICAL SYMBOL FOR NITRE;So;0;ON;;;;;N;;;;;
+1F716;ALCHEMICAL SYMBOL FOR VITRIOL;So;0;ON;;;;;N;;;;;
+1F717;ALCHEMICAL SYMBOL FOR VITRIOL-2;So;0;ON;;;;;N;;;;;
+1F718;ALCHEMICAL SYMBOL FOR ROCK SALT;So;0;ON;;;;;N;;;;;
+1F719;ALCHEMICAL SYMBOL FOR ROCK SALT-2;So;0;ON;;;;;N;;;;;
+1F71A;ALCHEMICAL SYMBOL FOR GOLD;So;0;ON;;;;;N;;;;;
+1F71B;ALCHEMICAL SYMBOL FOR SILVER;So;0;ON;;;;;N;;;;;
+1F71C;ALCHEMICAL SYMBOL FOR IRON ORE;So;0;ON;;;;;N;;;;;
+1F71D;ALCHEMICAL SYMBOL FOR IRON ORE-2;So;0;ON;;;;;N;;;;;
+1F71E;ALCHEMICAL SYMBOL FOR CROCUS OF IRON;So;0;ON;;;;;N;;;;;
+1F71F;ALCHEMICAL SYMBOL FOR REGULUS OF IRON;So;0;ON;;;;;N;;;;;
+1F720;ALCHEMICAL SYMBOL FOR COPPER ORE;So;0;ON;;;;;N;;;;;
+1F721;ALCHEMICAL SYMBOL FOR IRON-COPPER ORE;So;0;ON;;;;;N;;;;;
+1F722;ALCHEMICAL SYMBOL FOR SUBLIMATE OF COPPER;So;0;ON;;;;;N;;;;;
+1F723;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER;So;0;ON;;;;;N;;;;;
+1F724;ALCHEMICAL SYMBOL FOR CROCUS OF COPPER-2;So;0;ON;;;;;N;;;;;
+1F725;ALCHEMICAL SYMBOL FOR COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;;
+1F726;ALCHEMICAL SYMBOL FOR SALT OF COPPER ANTIMONIATE;So;0;ON;;;;;N;;;;;
+1F727;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF COPPER;So;0;ON;;;;;N;;;;;
+1F728;ALCHEMICAL SYMBOL FOR VERDIGRIS;So;0;ON;;;;;N;;;;;
+1F729;ALCHEMICAL SYMBOL FOR TIN ORE;So;0;ON;;;;;N;;;;;
+1F72A;ALCHEMICAL SYMBOL FOR LEAD ORE;So;0;ON;;;;;N;;;;;
+1F72B;ALCHEMICAL SYMBOL FOR ANTIMONY ORE;So;0;ON;;;;;N;;;;;
+1F72C;ALCHEMICAL SYMBOL FOR SUBLIMATE OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72D;ALCHEMICAL SYMBOL FOR SALT OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72E;ALCHEMICAL SYMBOL FOR SUBLIMATE OF SALT OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F72F;ALCHEMICAL SYMBOL FOR VINEGAR OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F730;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY;So;0;ON;;;;;N;;;;;
+1F731;ALCHEMICAL SYMBOL FOR REGULUS OF ANTIMONY-2;So;0;ON;;;;;N;;;;;
+1F732;ALCHEMICAL SYMBOL FOR REGULUS;So;0;ON;;;;;N;;;;;
+1F733;ALCHEMICAL SYMBOL FOR REGULUS-2;So;0;ON;;;;;N;;;;;
+1F734;ALCHEMICAL SYMBOL FOR REGULUS-3;So;0;ON;;;;;N;;;;;
+1F735;ALCHEMICAL SYMBOL FOR REGULUS-4;So;0;ON;;;;;N;;;;;
+1F736;ALCHEMICAL SYMBOL FOR ALKALI;So;0;ON;;;;;N;;;;;
+1F737;ALCHEMICAL SYMBOL FOR ALKALI-2;So;0;ON;;;;;N;;;;;
+1F738;ALCHEMICAL SYMBOL FOR MARCASITE;So;0;ON;;;;;N;;;;;
+1F739;ALCHEMICAL SYMBOL FOR SAL-AMMONIAC;So;0;ON;;;;;N;;;;;
+1F73A;ALCHEMICAL SYMBOL FOR ARSENIC;So;0;ON;;;;;N;;;;;
+1F73B;ALCHEMICAL SYMBOL FOR REALGAR;So;0;ON;;;;;N;;;;;
+1F73C;ALCHEMICAL SYMBOL FOR REALGAR-2;So;0;ON;;;;;N;;;;;
+1F73D;ALCHEMICAL SYMBOL FOR AURIPIGMENT;So;0;ON;;;;;N;;;;;
+1F73E;ALCHEMICAL SYMBOL FOR BISMUTH ORE;So;0;ON;;;;;N;;;;;
+1F73F;ALCHEMICAL SYMBOL FOR TARTAR;So;0;ON;;;;;N;;;;;
+1F740;ALCHEMICAL SYMBOL FOR TARTAR-2;So;0;ON;;;;;N;;;;;
+1F741;ALCHEMICAL SYMBOL FOR QUICK LIME;So;0;ON;;;;;N;;;;;
+1F742;ALCHEMICAL SYMBOL FOR BORAX;So;0;ON;;;;;N;;;;;
+1F743;ALCHEMICAL SYMBOL FOR BORAX-2;So;0;ON;;;;;N;;;;;
+1F744;ALCHEMICAL SYMBOL FOR BORAX-3;So;0;ON;;;;;N;;;;;
+1F745;ALCHEMICAL SYMBOL FOR ALUM;So;0;ON;;;;;N;;;;;
+1F746;ALCHEMICAL SYMBOL FOR OIL;So;0;ON;;;;;N;;;;;
+1F747;ALCHEMICAL SYMBOL FOR SPIRIT;So;0;ON;;;;;N;;;;;
+1F748;ALCHEMICAL SYMBOL FOR TINCTURE;So;0;ON;;;;;N;;;;;
+1F749;ALCHEMICAL SYMBOL FOR GUM;So;0;ON;;;;;N;;;;;
+1F74A;ALCHEMICAL SYMBOL FOR WAX;So;0;ON;;;;;N;;;;;
+1F74B;ALCHEMICAL SYMBOL FOR POWDER;So;0;ON;;;;;N;;;;;
+1F74C;ALCHEMICAL SYMBOL FOR CALX;So;0;ON;;;;;N;;;;;
+1F74D;ALCHEMICAL SYMBOL FOR TUTTY;So;0;ON;;;;;N;;;;;
+1F74E;ALCHEMICAL SYMBOL FOR CAPUT MORTUUM;So;0;ON;;;;;N;;;;;
+1F74F;ALCHEMICAL SYMBOL FOR SCEPTER OF JOVE;So;0;ON;;;;;N;;;;;
+1F750;ALCHEMICAL SYMBOL FOR CADUCEUS;So;0;ON;;;;;N;;;;;
+1F751;ALCHEMICAL SYMBOL FOR TRIDENT;So;0;ON;;;;;N;;;;;
+1F752;ALCHEMICAL SYMBOL FOR STARRED TRIDENT;So;0;ON;;;;;N;;;;;
+1F753;ALCHEMICAL SYMBOL FOR LODESTONE;So;0;ON;;;;;N;;;;;
+1F754;ALCHEMICAL SYMBOL FOR SOAP;So;0;ON;;;;;N;;;;;
+1F755;ALCHEMICAL SYMBOL FOR URINE;So;0;ON;;;;;N;;;;;
+1F756;ALCHEMICAL SYMBOL FOR HORSE DUNG;So;0;ON;;;;;N;;;;;
+1F757;ALCHEMICAL SYMBOL FOR ASHES;So;0;ON;;;;;N;;;;;
+1F758;ALCHEMICAL SYMBOL FOR POT ASHES;So;0;ON;;;;;N;;;;;
+1F759;ALCHEMICAL SYMBOL FOR BRICK;So;0;ON;;;;;N;;;;;
+1F75A;ALCHEMICAL SYMBOL FOR POWDERED BRICK;So;0;ON;;;;;N;;;;;
+1F75B;ALCHEMICAL SYMBOL FOR AMALGAM;So;0;ON;;;;;N;;;;;
+1F75C;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM;So;0;ON;;;;;N;;;;;
+1F75D;ALCHEMICAL SYMBOL FOR STRATUM SUPER STRATUM-2;So;0;ON;;;;;N;;;;;
+1F75E;ALCHEMICAL SYMBOL FOR SUBLIMATION;So;0;ON;;;;;N;;;;;
+1F75F;ALCHEMICAL SYMBOL FOR PRECIPITATE;So;0;ON;;;;;N;;;;;
+1F760;ALCHEMICAL SYMBOL FOR DISTILL;So;0;ON;;;;;N;;;;;
+1F761;ALCHEMICAL SYMBOL FOR DISSOLVE;So;0;ON;;;;;N;;;;;
+1F762;ALCHEMICAL SYMBOL FOR DISSOLVE-2;So;0;ON;;;;;N;;;;;
+1F763;ALCHEMICAL SYMBOL FOR PURIFY;So;0;ON;;;;;N;;;;;
+1F764;ALCHEMICAL SYMBOL FOR PUTREFACTION;So;0;ON;;;;;N;;;;;
+1F765;ALCHEMICAL SYMBOL FOR CRUCIBLE;So;0;ON;;;;;N;;;;;
+1F766;ALCHEMICAL SYMBOL FOR CRUCIBLE-2;So;0;ON;;;;;N;;;;;
+1F767;ALCHEMICAL SYMBOL FOR CRUCIBLE-3;So;0;ON;;;;;N;;;;;
+1F768;ALCHEMICAL SYMBOL FOR CRUCIBLE-4;So;0;ON;;;;;N;;;;;
+1F769;ALCHEMICAL SYMBOL FOR CRUCIBLE-5;So;0;ON;;;;;N;;;;;
+1F76A;ALCHEMICAL SYMBOL FOR ALEMBIC;So;0;ON;;;;;N;;;;;
+1F76B;ALCHEMICAL SYMBOL FOR BATH OF MARY;So;0;ON;;;;;N;;;;;
+1F76C;ALCHEMICAL SYMBOL FOR BATH OF VAPOURS;So;0;ON;;;;;N;;;;;
+1F76D;ALCHEMICAL SYMBOL FOR RETORT;So;0;ON;;;;;N;;;;;
+1F76E;ALCHEMICAL SYMBOL FOR HOUR;So;0;ON;;;;;N;;;;;
+1F76F;ALCHEMICAL SYMBOL FOR NIGHT;So;0;ON;;;;;N;;;;;
+1F770;ALCHEMICAL SYMBOL FOR DAY-NIGHT;So;0;ON;;;;;N;;;;;
+1F771;ALCHEMICAL SYMBOL FOR MONTH;So;0;ON;;;;;N;;;;;
+1F772;ALCHEMICAL SYMBOL FOR HALF DRAM;So;0;ON;;;;;N;;;;;
+1F773;ALCHEMICAL SYMBOL FOR HALF OUNCE;So;0;ON;;;;;N;;;;;
+1F780;BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F781;BLACK UP-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F782;BLACK RIGHT-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F783;BLACK DOWN-POINTING ISOSCELES RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+1F784;BLACK SLIGHTLY SMALL CIRCLE;So;0;ON;;;;;N;;;;;
+1F785;MEDIUM BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F786;BOLD WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F787;HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F788;VERY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F789;EXTREMELY HEAVY WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+1F78A;WHITE CIRCLE CONTAINING BLACK SMALL CIRCLE;So;0;ON;;;;;N;;;;;
+1F78B;ROUND TARGET;So;0;ON;;;;;N;;;;;
+1F78C;BLACK TINY SQUARE;So;0;ON;;;;;N;;;;;
+1F78D;BLACK SLIGHTLY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+1F78E;LIGHT WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F78F;MEDIUM WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F790;BOLD WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F791;HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F792;VERY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F793;EXTREMELY HEAVY WHITE SQUARE;So;0;ON;;;;;N;;;;;
+1F794;WHITE SQUARE CONTAINING BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+1F795;WHITE SQUARE CONTAINING BLACK MEDIUM SQUARE;So;0;ON;;;;;N;;;;;
+1F796;SQUARE TARGET;So;0;ON;;;;;N;;;;;
+1F797;BLACK TINY DIAMOND;So;0;ON;;;;;N;;;;;
+1F798;BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F799;BLACK MEDIUM SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F79A;WHITE DIAMOND CONTAINING BLACK VERY SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+1F79B;WHITE DIAMOND CONTAINING BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+1F79C;DIAMOND TARGET;So;0;ON;;;;;N;;;;;
+1F79D;BLACK TINY LOZENGE;So;0;ON;;;;;N;;;;;
+1F79E;BLACK VERY SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F79F;BLACK MEDIUM SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F7A0;WHITE LOZENGE CONTAINING BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+1F7A1;THIN GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A2;LIGHT GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A3;MEDIUM GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A4;BOLD GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A5;VERY BOLD GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A6;VERY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A7;EXTREMELY HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+1F7A8;THIN SALTIRE;So;0;ON;;;;;N;;;;;
+1F7A9;LIGHT SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AA;MEDIUM SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AB;BOLD SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AC;HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AD;VERY HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AE;EXTREMELY HEAVY SALTIRE;So;0;ON;;;;;N;;;;;
+1F7AF;LIGHT FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B0;MEDIUM FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B1;BOLD FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B2;HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B3;VERY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B4;EXTREMELY HEAVY FIVE SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B5;LIGHT SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B6;MEDIUM SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B7;BOLD SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B8;HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7B9;VERY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BA;EXTREMELY HEAVY SIX SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BB;LIGHT EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BC;MEDIUM EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BD;BOLD EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BE;HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7BF;VERY HEAVY EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+1F7C0;LIGHT THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C1;MEDIUM THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C2;THREE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C3;MEDIUM THREE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C4;LIGHT FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C5;MEDIUM FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C6;FOUR POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7C7;MEDIUM FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C8;REVERSE LIGHT FOUR POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7C9;LIGHT FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CA;HEAVY FIVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CB;MEDIUM SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CC;HEAVY SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CD;SIX POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7CE;MEDIUM EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7CF;HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D0;VERY HEAVY EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D1;HEAVY EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F7D2;LIGHT TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D3;HEAVY TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+1F7D4;HEAVY TWELVE POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+1F800;LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F801;UPWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F802;RIGHTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F803;DOWNWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F804;LEFTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F805;UPWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F806;RIGHTWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F807;DOWNWARDS ARROW WITH MEDIUM TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F808;LEFTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F809;UPWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F80A;RIGHTWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F80B;DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F810;LEFTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F811;UPWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F812;RIGHTWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F813;DOWNWARDS ARROW WITH SMALL EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F814;LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F815;UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F816;RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F817;DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F818;HEAVY LEFTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F819;HEAVY UPWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81A;HEAVY RIGHTWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81B;HEAVY DOWNWARDS ARROW WITH EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81C;HEAVY LEFTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81D;HEAVY UPWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81E;HEAVY RIGHTWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F81F;HEAVY DOWNWARDS ARROW WITH LARGE EQUILATERAL ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F820;LEFTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F821;UPWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F822;RIGHTWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F823;DOWNWARDS TRIANGLE-HEADED ARROW WITH NARROW SHAFT;So;0;ON;;;;;N;;;;;
+1F824;LEFTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F825;UPWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F826;RIGHTWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F827;DOWNWARDS TRIANGLE-HEADED ARROW WITH MEDIUM SHAFT;So;0;ON;;;;;N;;;;;
+1F828;LEFTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F829;UPWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82A;RIGHTWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82B;DOWNWARDS TRIANGLE-HEADED ARROW WITH BOLD SHAFT;So;0;ON;;;;;N;;;;;
+1F82C;LEFTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82D;UPWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82E;RIGHTWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F82F;DOWNWARDS TRIANGLE-HEADED ARROW WITH HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F830;LEFTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F831;UPWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F832;RIGHTWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F833;DOWNWARDS TRIANGLE-HEADED ARROW WITH VERY HEAVY SHAFT;So;0;ON;;;;;N;;;;;
+1F834;LEFTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F835;UPWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F836;RIGHTWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F837;DOWNWARDS FINGER-POST ARROW;So;0;ON;;;;;N;;;;;
+1F838;LEFTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F839;UPWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83A;RIGHTWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83B;DOWNWARDS SQUARED ARROW;So;0;ON;;;;;N;;;;;
+1F83C;LEFTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83D;UPWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83E;RIGHTWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F83F;DOWNWARDS COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F840;LEFTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F841;UPWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F842;RIGHTWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F843;DOWNWARDS HEAVY COMPRESSED ARROW;So;0;ON;;;;;N;;;;;
+1F844;LEFTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F845;UPWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F846;RIGHTWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F847;DOWNWARDS HEAVY ARROW;So;0;ON;;;;;N;;;;;
+1F850;LEFTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F851;UPWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F852;RIGHTWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F853;DOWNWARDS SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F854;NORTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F855;NORTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F856;SOUTH EAST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F857;SOUTH WEST SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F858;LEFT RIGHT SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F859;UP DOWN SANS-SERIF ARROW;So;0;ON;;;;;N;;;;;
+1F860;WIDE-HEADED LEFTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F861;WIDE-HEADED UPWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F862;WIDE-HEADED RIGHTWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F863;WIDE-HEADED DOWNWARDS LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F864;WIDE-HEADED NORTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F865;WIDE-HEADED NORTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F866;WIDE-HEADED SOUTH EAST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F867;WIDE-HEADED SOUTH WEST LIGHT BARB ARROW;So;0;ON;;;;;N;;;;;
+1F868;WIDE-HEADED LEFTWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F869;WIDE-HEADED UPWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86A;WIDE-HEADED RIGHTWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86B;WIDE-HEADED DOWNWARDS BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86C;WIDE-HEADED NORTH WEST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86D;WIDE-HEADED NORTH EAST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86E;WIDE-HEADED SOUTH EAST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F86F;WIDE-HEADED SOUTH WEST BARB ARROW;So;0;ON;;;;;N;;;;;
+1F870;WIDE-HEADED LEFTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F871;WIDE-HEADED UPWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F872;WIDE-HEADED RIGHTWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F873;WIDE-HEADED DOWNWARDS MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F874;WIDE-HEADED NORTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F875;WIDE-HEADED NORTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F876;WIDE-HEADED SOUTH EAST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F877;WIDE-HEADED SOUTH WEST MEDIUM BARB ARROW;So;0;ON;;;;;N;;;;;
+1F878;WIDE-HEADED LEFTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F879;WIDE-HEADED UPWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87A;WIDE-HEADED RIGHTWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87B;WIDE-HEADED DOWNWARDS HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87C;WIDE-HEADED NORTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87D;WIDE-HEADED NORTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87E;WIDE-HEADED SOUTH EAST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F87F;WIDE-HEADED SOUTH WEST HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F880;WIDE-HEADED LEFTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F881;WIDE-HEADED UPWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F882;WIDE-HEADED RIGHTWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F883;WIDE-HEADED DOWNWARDS VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F884;WIDE-HEADED NORTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F885;WIDE-HEADED NORTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F886;WIDE-HEADED SOUTH EAST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F887;WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW;So;0;ON;;;;;N;;;;;
+1F890;LEFTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F891;UPWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F892;RIGHTWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F893;DOWNWARDS TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F894;LEFTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F895;UPWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F896;RIGHTWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F897;DOWNWARDS WHITE ARROW WITHIN TRIANGLE ARROWHEAD;So;0;ON;;;;;N;;;;;
+1F898;LEFTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F899;UPWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89A;RIGHTWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89B;DOWNWARDS ARROW WITH NOTCHED TAIL;So;0;ON;;;;;N;;;;;
+1F89C;HEAVY ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
+1F89D;HEAVY ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F89E;HEAVY ARROW SHAFT WIDTH ONE HALF;So;0;ON;;;;;N;;;;;
+1F89F;HEAVY ARROW SHAFT WIDTH ONE THIRD;So;0;ON;;;;;N;;;;;
+1F8A0;LEFTWARDS BOTTOM-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A1;RIGHTWARDS BOTTOM SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A2;LEFTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A3;RIGHTWARDS TOP SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A4;LEFTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A5;RIGHTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A6;LEFTWARDS RIGHT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A7;RIGHTWARDS LEFT-SHADED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A8;LEFTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8A9;RIGHTWARDS BACK-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AA;LEFTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AB;RIGHTWARDS FRONT-TILTED SHADOWED WHITE ARROW;So;0;ON;;;;;N;;;;;
+1F8AC;WHITE ARROW SHAFT WIDTH ONE;So;0;ON;;;;;N;;;;;
+1F8AD;WHITE ARROW SHAFT WIDTH TWO THIRDS;So;0;ON;;;;;N;;;;;
+1F910;ZIPPER-MOUTH FACE;So;0;ON;;;;;N;;;;;
+1F911;MONEY-MOUTH FACE;So;0;ON;;;;;N;;;;;
+1F912;FACE WITH THERMOMETER;So;0;ON;;;;;N;;;;;
+1F913;NERD FACE;So;0;ON;;;;;N;;;;;
+1F914;THINKING FACE;So;0;ON;;;;;N;;;;;
+1F915;FACE WITH HEAD-BANDAGE;So;0;ON;;;;;N;;;;;
+1F916;ROBOT FACE;So;0;ON;;;;;N;;;;;
+1F917;HUGGING FACE;So;0;ON;;;;;N;;;;;
+1F918;SIGN OF THE HORNS;So;0;ON;;;;;N;;;;;
+1F919;CALL ME HAND;So;0;ON;;;;;N;;;;;
+1F91A;RAISED BACK OF HAND;So;0;ON;;;;;N;;;;;
+1F91B;LEFT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;;
+1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;;
+1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;;
+1F921;CLOWN FACE;So;0;ON;;;;;N;;;;;
+1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;;
+1F923;ROLLING ON THE FLOOR LAUGHING;So;0;ON;;;;;N;;;;;
+1F924;DROOLING FACE;So;0;ON;;;;;N;;;;;
+1F925;LYING FACE;So;0;ON;;;;;N;;;;;
+1F926;FACE PALM;So;0;ON;;;;;N;;;;;
+1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;;
+1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;;
+1F933;SELFIE;So;0;ON;;;;;N;;;;;
+1F934;PRINCE;So;0;ON;;;;;N;;;;;
+1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;;
+1F936;MOTHER CHRISTMAS;So;0;ON;;;;;N;;;;;
+1F937;SHRUG;So;0;ON;;;;;N;;;;;
+1F938;PERSON DOING CARTWHEEL;So;0;ON;;;;;N;;;;;
+1F939;JUGGLING;So;0;ON;;;;;N;;;;;
+1F93A;FENCER;So;0;ON;;;;;N;;;;;
+1F93B;MODERN PENTATHLON;So;0;ON;;;;;N;;;;;
+1F93C;WRESTLERS;So;0;ON;;;;;N;;;;;
+1F93D;WATER POLO;So;0;ON;;;;;N;;;;;
+1F93E;HANDBALL;So;0;ON;;;;;N;;;;;
+1F940;WILTED FLOWER;So;0;ON;;;;;N;;;;;
+1F941;DRUM WITH DRUMSTICKS;So;0;ON;;;;;N;;;;;
+1F942;CLINKING GLASSES;So;0;ON;;;;;N;;;;;
+1F943;TUMBLER GLASS;So;0;ON;;;;;N;;;;;
+1F944;SPOON;So;0;ON;;;;;N;;;;;
+1F945;GOAL NET;So;0;ON;;;;;N;;;;;
+1F946;RIFLE;So;0;ON;;;;;N;;;;;
+1F947;FIRST PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F948;SECOND PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
+1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
+1F950;CROISSANT;So;0;ON;;;;;N;;;;;
+1F951;AVOCADO;So;0;ON;;;;;N;;;;;
+1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
+1F953;BACON;So;0;ON;;;;;N;;;;;
+1F954;POTATO;So;0;ON;;;;;N;;;;;
+1F955;CARROT;So;0;ON;;;;;N;;;;;
+1F956;BAGUETTE BREAD;So;0;ON;;;;;N;;;;;
+1F957;GREEN SALAD;So;0;ON;;;;;N;;;;;
+1F958;SHALLOW PAN OF FOOD;So;0;ON;;;;;N;;;;;
+1F959;STUFFED FLATBREAD;So;0;ON;;;;;N;;;;;
+1F95A;EGG;So;0;ON;;;;;N;;;;;
+1F95B;GLASS OF MILK;So;0;ON;;;;;N;;;;;
+1F95C;PEANUTS;So;0;ON;;;;;N;;;;;
+1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;;
+1F95E;PANCAKES;So;0;ON;;;;;N;;;;;
+1F980;CRAB;So;0;ON;;;;;N;;;;;
+1F981;LION FACE;So;0;ON;;;;;N;;;;;
+1F982;SCORPION;So;0;ON;;;;;N;;;;;
+1F983;TURKEY;So;0;ON;;;;;N;;;;;
+1F984;UNICORN FACE;So;0;ON;;;;;N;;;;;
+1F985;EAGLE;So;0;ON;;;;;N;;;;;
+1F986;DUCK;So;0;ON;;;;;N;;;;;
+1F987;BAT;So;0;ON;;;;;N;;;;;
+1F988;SHARK;So;0;ON;;;;;N;;;;;
+1F989;OWL;So;0;ON;;;;;N;;;;;
+1F98A;FOX FACE;So;0;ON;;;;;N;;;;;
+1F98B;BUTTERFLY;So;0;ON;;;;;N;;;;;
+1F98C;DEER;So;0;ON;;;;;N;;;;;
+1F98D;GORILLA;So;0;ON;;;;;N;;;;;
+1F98E;LIZARD;So;0;ON;;;;;N;;;;;
+1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;;
+1F990;SHRIMP;So;0;ON;;;;;N;;;;;
+1F991;SQUID;So;0;ON;;;;;N;;;;;
+1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
+20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
+2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
+2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
+2B734;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
+2B740;<CJK Ideograph Extension D, First>;Lo;0;L;;;;;N;;;;;
+2B81D;<CJK Ideograph Extension D, Last>;Lo;0;L;;;;;N;;;;;
+2B820;<CJK Ideograph Extension E, First>;Lo;0;L;;;;;N;;;;;
+2CEA1;<CJK Ideograph Extension E, Last>;Lo;0;L;;;;;N;;;;;
+2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
+2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
+2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
+2F803;CJK COMPATIBILITY IDEOGRAPH-2F803;Lo;0;L;20122;;;;N;;;;;
+2F804;CJK COMPATIBILITY IDEOGRAPH-2F804;Lo;0;L;4F60;;;;N;;;;;
+2F805;CJK COMPATIBILITY IDEOGRAPH-2F805;Lo;0;L;4FAE;;;;N;;;;;
+2F806;CJK COMPATIBILITY IDEOGRAPH-2F806;Lo;0;L;4FBB;;;;N;;;;;
+2F807;CJK COMPATIBILITY IDEOGRAPH-2F807;Lo;0;L;5002;;;;N;;;;;
+2F808;CJK COMPATIBILITY IDEOGRAPH-2F808;Lo;0;L;507A;;;;N;;;;;
+2F809;CJK COMPATIBILITY IDEOGRAPH-2F809;Lo;0;L;5099;;;;N;;;;;
+2F80A;CJK COMPATIBILITY IDEOGRAPH-2F80A;Lo;0;L;50E7;;;;N;;;;;
+2F80B;CJK COMPATIBILITY IDEOGRAPH-2F80B;Lo;0;L;50CF;;;;N;;;;;
+2F80C;CJK COMPATIBILITY IDEOGRAPH-2F80C;Lo;0;L;349E;;;;N;;;;;
+2F80D;CJK COMPATIBILITY IDEOGRAPH-2F80D;Lo;0;L;2063A;;;;N;;;;;
+2F80E;CJK COMPATIBILITY IDEOGRAPH-2F80E;Lo;0;L;514D;;;;N;;;;;
+2F80F;CJK COMPATIBILITY IDEOGRAPH-2F80F;Lo;0;L;5154;;;;N;;;;;
+2F810;CJK COMPATIBILITY IDEOGRAPH-2F810;Lo;0;L;5164;;;;N;;;;;
+2F811;CJK COMPATIBILITY IDEOGRAPH-2F811;Lo;0;L;5177;;;;N;;;;;
+2F812;CJK COMPATIBILITY IDEOGRAPH-2F812;Lo;0;L;2051C;;;;N;;;;;
+2F813;CJK COMPATIBILITY IDEOGRAPH-2F813;Lo;0;L;34B9;;;;N;;;;;
+2F814;CJK COMPATIBILITY IDEOGRAPH-2F814;Lo;0;L;5167;;;;N;;;;;
+2F815;CJK COMPATIBILITY IDEOGRAPH-2F815;Lo;0;L;518D;;;;N;;;;;
+2F816;CJK COMPATIBILITY IDEOGRAPH-2F816;Lo;0;L;2054B;;;;N;;;;;
+2F817;CJK COMPATIBILITY IDEOGRAPH-2F817;Lo;0;L;5197;;;;N;;;;;
+2F818;CJK COMPATIBILITY IDEOGRAPH-2F818;Lo;0;L;51A4;;;;N;;;;;
+2F819;CJK COMPATIBILITY IDEOGRAPH-2F819;Lo;0;L;4ECC;;;;N;;;;;
+2F81A;CJK COMPATIBILITY IDEOGRAPH-2F81A;Lo;0;L;51AC;;;;N;;;;;
+2F81B;CJK COMPATIBILITY IDEOGRAPH-2F81B;Lo;0;L;51B5;;;;N;;;;;
+2F81C;CJK COMPATIBILITY IDEOGRAPH-2F81C;Lo;0;L;291DF;;;;N;;;;;
+2F81D;CJK COMPATIBILITY IDEOGRAPH-2F81D;Lo;0;L;51F5;;;;N;;;;;
+2F81E;CJK COMPATIBILITY IDEOGRAPH-2F81E;Lo;0;L;5203;;;;N;;;;;
+2F81F;CJK COMPATIBILITY IDEOGRAPH-2F81F;Lo;0;L;34DF;;;;N;;;;;
+2F820;CJK COMPATIBILITY IDEOGRAPH-2F820;Lo;0;L;523B;;;;N;;;;;
+2F821;CJK COMPATIBILITY IDEOGRAPH-2F821;Lo;0;L;5246;;;;N;;;;;
+2F822;CJK COMPATIBILITY IDEOGRAPH-2F822;Lo;0;L;5272;;;;N;;;;;
+2F823;CJK COMPATIBILITY IDEOGRAPH-2F823;Lo;0;L;5277;;;;N;;;;;
+2F824;CJK COMPATIBILITY IDEOGRAPH-2F824;Lo;0;L;3515;;;;N;;;;;
+2F825;CJK COMPATIBILITY IDEOGRAPH-2F825;Lo;0;L;52C7;;;;N;;;;;
+2F826;CJK COMPATIBILITY IDEOGRAPH-2F826;Lo;0;L;52C9;;;;N;;;;;
+2F827;CJK COMPATIBILITY IDEOGRAPH-2F827;Lo;0;L;52E4;;;;N;;;;;
+2F828;CJK COMPATIBILITY IDEOGRAPH-2F828;Lo;0;L;52FA;;;;N;;;;;
+2F829;CJK COMPATIBILITY IDEOGRAPH-2F829;Lo;0;L;5305;;;;N;;;;;
+2F82A;CJK COMPATIBILITY IDEOGRAPH-2F82A;Lo;0;L;5306;;;;N;;;;;
+2F82B;CJK COMPATIBILITY IDEOGRAPH-2F82B;Lo;0;L;5317;;;;N;;;;;
+2F82C;CJK COMPATIBILITY IDEOGRAPH-2F82C;Lo;0;L;5349;;;;N;;;;;
+2F82D;CJK COMPATIBILITY IDEOGRAPH-2F82D;Lo;0;L;5351;;;;N;;;;;
+2F82E;CJK COMPATIBILITY IDEOGRAPH-2F82E;Lo;0;L;535A;;;;N;;;;;
+2F82F;CJK COMPATIBILITY IDEOGRAPH-2F82F;Lo;0;L;5373;;;;N;;;;;
+2F830;CJK COMPATIBILITY IDEOGRAPH-2F830;Lo;0;L;537D;;;;N;;;;;
+2F831;CJK COMPATIBILITY IDEOGRAPH-2F831;Lo;0;L;537F;;;;N;;;;;
+2F832;CJK COMPATIBILITY IDEOGRAPH-2F832;Lo;0;L;537F;;;;N;;;;;
+2F833;CJK COMPATIBILITY IDEOGRAPH-2F833;Lo;0;L;537F;;;;N;;;;;
+2F834;CJK COMPATIBILITY IDEOGRAPH-2F834;Lo;0;L;20A2C;;;;N;;;;;
+2F835;CJK COMPATIBILITY IDEOGRAPH-2F835;Lo;0;L;7070;;;;N;;;;;
+2F836;CJK COMPATIBILITY IDEOGRAPH-2F836;Lo;0;L;53CA;;;;N;;;;;
+2F837;CJK COMPATIBILITY IDEOGRAPH-2F837;Lo;0;L;53DF;;;;N;;;;;
+2F838;CJK COMPATIBILITY IDEOGRAPH-2F838;Lo;0;L;20B63;;;;N;;;;;
+2F839;CJK COMPATIBILITY IDEOGRAPH-2F839;Lo;0;L;53EB;;;;N;;;;;
+2F83A;CJK COMPATIBILITY IDEOGRAPH-2F83A;Lo;0;L;53F1;;;;N;;;;;
+2F83B;CJK COMPATIBILITY IDEOGRAPH-2F83B;Lo;0;L;5406;;;;N;;;;;
+2F83C;CJK COMPATIBILITY IDEOGRAPH-2F83C;Lo;0;L;549E;;;;N;;;;;
+2F83D;CJK COMPATIBILITY IDEOGRAPH-2F83D;Lo;0;L;5438;;;;N;;;;;
+2F83E;CJK COMPATIBILITY IDEOGRAPH-2F83E;Lo;0;L;5448;;;;N;;;;;
+2F83F;CJK COMPATIBILITY IDEOGRAPH-2F83F;Lo;0;L;5468;;;;N;;;;;
+2F840;CJK COMPATIBILITY IDEOGRAPH-2F840;Lo;0;L;54A2;;;;N;;;;;
+2F841;CJK COMPATIBILITY IDEOGRAPH-2F841;Lo;0;L;54F6;;;;N;;;;;
+2F842;CJK COMPATIBILITY IDEOGRAPH-2F842;Lo;0;L;5510;;;;N;;;;;
+2F843;CJK COMPATIBILITY IDEOGRAPH-2F843;Lo;0;L;5553;;;;N;;;;;
+2F844;CJK COMPATIBILITY IDEOGRAPH-2F844;Lo;0;L;5563;;;;N;;;;;
+2F845;CJK COMPATIBILITY IDEOGRAPH-2F845;Lo;0;L;5584;;;;N;;;;;
+2F846;CJK COMPATIBILITY IDEOGRAPH-2F846;Lo;0;L;5584;;;;N;;;;;
+2F847;CJK COMPATIBILITY IDEOGRAPH-2F847;Lo;0;L;5599;;;;N;;;;;
+2F848;CJK COMPATIBILITY IDEOGRAPH-2F848;Lo;0;L;55AB;;;;N;;;;;
+2F849;CJK COMPATIBILITY IDEOGRAPH-2F849;Lo;0;L;55B3;;;;N;;;;;
+2F84A;CJK COMPATIBILITY IDEOGRAPH-2F84A;Lo;0;L;55C2;;;;N;;;;;
+2F84B;CJK COMPATIBILITY IDEOGRAPH-2F84B;Lo;0;L;5716;;;;N;;;;;
+2F84C;CJK COMPATIBILITY IDEOGRAPH-2F84C;Lo;0;L;5606;;;;N;;;;;
+2F84D;CJK COMPATIBILITY IDEOGRAPH-2F84D;Lo;0;L;5717;;;;N;;;;;
+2F84E;CJK COMPATIBILITY IDEOGRAPH-2F84E;Lo;0;L;5651;;;;N;;;;;
+2F84F;CJK COMPATIBILITY IDEOGRAPH-2F84F;Lo;0;L;5674;;;;N;;;;;
+2F850;CJK COMPATIBILITY IDEOGRAPH-2F850;Lo;0;L;5207;;;;N;;;;;
+2F851;CJK COMPATIBILITY IDEOGRAPH-2F851;Lo;0;L;58EE;;;;N;;;;;
+2F852;CJK COMPATIBILITY IDEOGRAPH-2F852;Lo;0;L;57CE;;;;N;;;;;
+2F853;CJK COMPATIBILITY IDEOGRAPH-2F853;Lo;0;L;57F4;;;;N;;;;;
+2F854;CJK COMPATIBILITY IDEOGRAPH-2F854;Lo;0;L;580D;;;;N;;;;;
+2F855;CJK COMPATIBILITY IDEOGRAPH-2F855;Lo;0;L;578B;;;;N;;;;;
+2F856;CJK COMPATIBILITY IDEOGRAPH-2F856;Lo;0;L;5832;;;;N;;;;;
+2F857;CJK COMPATIBILITY IDEOGRAPH-2F857;Lo;0;L;5831;;;;N;;;;;
+2F858;CJK COMPATIBILITY IDEOGRAPH-2F858;Lo;0;L;58AC;;;;N;;;;;
+2F859;CJK COMPATIBILITY IDEOGRAPH-2F859;Lo;0;L;214E4;;;;N;;;;;
+2F85A;CJK COMPATIBILITY IDEOGRAPH-2F85A;Lo;0;L;58F2;;;;N;;;;;
+2F85B;CJK COMPATIBILITY IDEOGRAPH-2F85B;Lo;0;L;58F7;;;;N;;;;;
+2F85C;CJK COMPATIBILITY IDEOGRAPH-2F85C;Lo;0;L;5906;;;;N;;;;;
+2F85D;CJK COMPATIBILITY IDEOGRAPH-2F85D;Lo;0;L;591A;;;;N;;;;;
+2F85E;CJK COMPATIBILITY IDEOGRAPH-2F85E;Lo;0;L;5922;;;;N;;;;;
+2F85F;CJK COMPATIBILITY IDEOGRAPH-2F85F;Lo;0;L;5962;;;;N;;;;;
+2F860;CJK COMPATIBILITY IDEOGRAPH-2F860;Lo;0;L;216A8;;;;N;;;;;
+2F861;CJK COMPATIBILITY IDEOGRAPH-2F861;Lo;0;L;216EA;;;;N;;;;;
+2F862;CJK COMPATIBILITY IDEOGRAPH-2F862;Lo;0;L;59EC;;;;N;;;;;
+2F863;CJK COMPATIBILITY IDEOGRAPH-2F863;Lo;0;L;5A1B;;;;N;;;;;
+2F864;CJK COMPATIBILITY IDEOGRAPH-2F864;Lo;0;L;5A27;;;;N;;;;;
+2F865;CJK COMPATIBILITY IDEOGRAPH-2F865;Lo;0;L;59D8;;;;N;;;;;
+2F866;CJK COMPATIBILITY IDEOGRAPH-2F866;Lo;0;L;5A66;;;;N;;;;;
+2F867;CJK COMPATIBILITY IDEOGRAPH-2F867;Lo;0;L;36EE;;;;N;;;;;
+2F868;CJK COMPATIBILITY IDEOGRAPH-2F868;Lo;0;L;36FC;;;;N;;;;;
+2F869;CJK COMPATIBILITY IDEOGRAPH-2F869;Lo;0;L;5B08;;;;N;;;;;
+2F86A;CJK COMPATIBILITY IDEOGRAPH-2F86A;Lo;0;L;5B3E;;;;N;;;;;
+2F86B;CJK COMPATIBILITY IDEOGRAPH-2F86B;Lo;0;L;5B3E;;;;N;;;;;
+2F86C;CJK COMPATIBILITY IDEOGRAPH-2F86C;Lo;0;L;219C8;;;;N;;;;;
+2F86D;CJK COMPATIBILITY IDEOGRAPH-2F86D;Lo;0;L;5BC3;;;;N;;;;;
+2F86E;CJK COMPATIBILITY IDEOGRAPH-2F86E;Lo;0;L;5BD8;;;;N;;;;;
+2F86F;CJK COMPATIBILITY IDEOGRAPH-2F86F;Lo;0;L;5BE7;;;;N;;;;;
+2F870;CJK COMPATIBILITY IDEOGRAPH-2F870;Lo;0;L;5BF3;;;;N;;;;;
+2F871;CJK COMPATIBILITY IDEOGRAPH-2F871;Lo;0;L;21B18;;;;N;;;;;
+2F872;CJK COMPATIBILITY IDEOGRAPH-2F872;Lo;0;L;5BFF;;;;N;;;;;
+2F873;CJK COMPATIBILITY IDEOGRAPH-2F873;Lo;0;L;5C06;;;;N;;;;;
+2F874;CJK COMPATIBILITY IDEOGRAPH-2F874;Lo;0;L;5F53;;;;N;;;;;
+2F875;CJK COMPATIBILITY IDEOGRAPH-2F875;Lo;0;L;5C22;;;;N;;;;;
+2F876;CJK COMPATIBILITY IDEOGRAPH-2F876;Lo;0;L;3781;;;;N;;;;;
+2F877;CJK COMPATIBILITY IDEOGRAPH-2F877;Lo;0;L;5C60;;;;N;;;;;
+2F878;CJK COMPATIBILITY IDEOGRAPH-2F878;Lo;0;L;5C6E;;;;N;;;;;
+2F879;CJK COMPATIBILITY IDEOGRAPH-2F879;Lo;0;L;5CC0;;;;N;;;;;
+2F87A;CJK COMPATIBILITY IDEOGRAPH-2F87A;Lo;0;L;5C8D;;;;N;;;;;
+2F87B;CJK COMPATIBILITY IDEOGRAPH-2F87B;Lo;0;L;21DE4;;;;N;;;;;
+2F87C;CJK COMPATIBILITY IDEOGRAPH-2F87C;Lo;0;L;5D43;;;;N;;;;;
+2F87D;CJK COMPATIBILITY IDEOGRAPH-2F87D;Lo;0;L;21DE6;;;;N;;;;;
+2F87E;CJK COMPATIBILITY IDEOGRAPH-2F87E;Lo;0;L;5D6E;;;;N;;;;;
+2F87F;CJK COMPATIBILITY IDEOGRAPH-2F87F;Lo;0;L;5D6B;;;;N;;;;;
+2F880;CJK COMPATIBILITY IDEOGRAPH-2F880;Lo;0;L;5D7C;;;;N;;;;;
+2F881;CJK COMPATIBILITY IDEOGRAPH-2F881;Lo;0;L;5DE1;;;;N;;;;;
+2F882;CJK COMPATIBILITY IDEOGRAPH-2F882;Lo;0;L;5DE2;;;;N;;;;;
+2F883;CJK COMPATIBILITY IDEOGRAPH-2F883;Lo;0;L;382F;;;;N;;;;;
+2F884;CJK COMPATIBILITY IDEOGRAPH-2F884;Lo;0;L;5DFD;;;;N;;;;;
+2F885;CJK COMPATIBILITY IDEOGRAPH-2F885;Lo;0;L;5E28;;;;N;;;;;
+2F886;CJK COMPATIBILITY IDEOGRAPH-2F886;Lo;0;L;5E3D;;;;N;;;;;
+2F887;CJK COMPATIBILITY IDEOGRAPH-2F887;Lo;0;L;5E69;;;;N;;;;;
+2F888;CJK COMPATIBILITY IDEOGRAPH-2F888;Lo;0;L;3862;;;;N;;;;;
+2F889;CJK COMPATIBILITY IDEOGRAPH-2F889;Lo;0;L;22183;;;;N;;;;;
+2F88A;CJK COMPATIBILITY IDEOGRAPH-2F88A;Lo;0;L;387C;;;;N;;;;;
+2F88B;CJK COMPATIBILITY IDEOGRAPH-2F88B;Lo;0;L;5EB0;;;;N;;;;;
+2F88C;CJK COMPATIBILITY IDEOGRAPH-2F88C;Lo;0;L;5EB3;;;;N;;;;;
+2F88D;CJK COMPATIBILITY IDEOGRAPH-2F88D;Lo;0;L;5EB6;;;;N;;;;;
+2F88E;CJK COMPATIBILITY IDEOGRAPH-2F88E;Lo;0;L;5ECA;;;;N;;;;;
+2F88F;CJK COMPATIBILITY IDEOGRAPH-2F88F;Lo;0;L;2A392;;;;N;;;;;
+2F890;CJK COMPATIBILITY IDEOGRAPH-2F890;Lo;0;L;5EFE;;;9;N;;;;;
+2F891;CJK COMPATIBILITY IDEOGRAPH-2F891;Lo;0;L;22331;;;;N;;;;;
+2F892;CJK COMPATIBILITY IDEOGRAPH-2F892;Lo;0;L;22331;;;;N;;;;;
+2F893;CJK COMPATIBILITY IDEOGRAPH-2F893;Lo;0;L;8201;;;;N;;;;;
+2F894;CJK COMPATIBILITY IDEOGRAPH-2F894;Lo;0;L;5F22;;;;N;;;;;
+2F895;CJK COMPATIBILITY IDEOGRAPH-2F895;Lo;0;L;5F22;;;;N;;;;;
+2F896;CJK COMPATIBILITY IDEOGRAPH-2F896;Lo;0;L;38C7;;;;N;;;;;
+2F897;CJK COMPATIBILITY IDEOGRAPH-2F897;Lo;0;L;232B8;;;;N;;;;;
+2F898;CJK COMPATIBILITY IDEOGRAPH-2F898;Lo;0;L;261DA;;;;N;;;;;
+2F899;CJK COMPATIBILITY IDEOGRAPH-2F899;Lo;0;L;5F62;;;;N;;;;;
+2F89A;CJK COMPATIBILITY IDEOGRAPH-2F89A;Lo;0;L;5F6B;;;;N;;;;;
+2F89B;CJK COMPATIBILITY IDEOGRAPH-2F89B;Lo;0;L;38E3;;;;N;;;;;
+2F89C;CJK COMPATIBILITY IDEOGRAPH-2F89C;Lo;0;L;5F9A;;;;N;;;;;
+2F89D;CJK COMPATIBILITY IDEOGRAPH-2F89D;Lo;0;L;5FCD;;;;N;;;;;
+2F89E;CJK COMPATIBILITY IDEOGRAPH-2F89E;Lo;0;L;5FD7;;;;N;;;;;
+2F89F;CJK COMPATIBILITY IDEOGRAPH-2F89F;Lo;0;L;5FF9;;;;N;;;;;
+2F8A0;CJK COMPATIBILITY IDEOGRAPH-2F8A0;Lo;0;L;6081;;;;N;;;;;
+2F8A1;CJK COMPATIBILITY IDEOGRAPH-2F8A1;Lo;0;L;393A;;;;N;;;;;
+2F8A2;CJK COMPATIBILITY IDEOGRAPH-2F8A2;Lo;0;L;391C;;;;N;;;;;
+2F8A3;CJK COMPATIBILITY IDEOGRAPH-2F8A3;Lo;0;L;6094;;;;N;;;;;
+2F8A4;CJK COMPATIBILITY IDEOGRAPH-2F8A4;Lo;0;L;226D4;;;;N;;;;;
+2F8A5;CJK COMPATIBILITY IDEOGRAPH-2F8A5;Lo;0;L;60C7;;;;N;;;;;
+2F8A6;CJK COMPATIBILITY IDEOGRAPH-2F8A6;Lo;0;L;6148;;;;N;;;;;
+2F8A7;CJK COMPATIBILITY IDEOGRAPH-2F8A7;Lo;0;L;614C;;;;N;;;;;
+2F8A8;CJK COMPATIBILITY IDEOGRAPH-2F8A8;Lo;0;L;614E;;;;N;;;;;
+2F8A9;CJK COMPATIBILITY IDEOGRAPH-2F8A9;Lo;0;L;614C;;;;N;;;;;
+2F8AA;CJK COMPATIBILITY IDEOGRAPH-2F8AA;Lo;0;L;617A;;;;N;;;;;
+2F8AB;CJK COMPATIBILITY IDEOGRAPH-2F8AB;Lo;0;L;618E;;;;N;;;;;
+2F8AC;CJK COMPATIBILITY IDEOGRAPH-2F8AC;Lo;0;L;61B2;;;;N;;;;;
+2F8AD;CJK COMPATIBILITY IDEOGRAPH-2F8AD;Lo;0;L;61A4;;;;N;;;;;
+2F8AE;CJK COMPATIBILITY IDEOGRAPH-2F8AE;Lo;0;L;61AF;;;;N;;;;;
+2F8AF;CJK COMPATIBILITY IDEOGRAPH-2F8AF;Lo;0;L;61DE;;;;N;;;;;
+2F8B0;CJK COMPATIBILITY IDEOGRAPH-2F8B0;Lo;0;L;61F2;;;;N;;;;;
+2F8B1;CJK COMPATIBILITY IDEOGRAPH-2F8B1;Lo;0;L;61F6;;;;N;;;;;
+2F8B2;CJK COMPATIBILITY IDEOGRAPH-2F8B2;Lo;0;L;6210;;;;N;;;;;
+2F8B3;CJK COMPATIBILITY IDEOGRAPH-2F8B3;Lo;0;L;621B;;;;N;;;;;
+2F8B4;CJK COMPATIBILITY IDEOGRAPH-2F8B4;Lo;0;L;625D;;;;N;;;;;
+2F8B5;CJK COMPATIBILITY IDEOGRAPH-2F8B5;Lo;0;L;62B1;;;;N;;;;;
+2F8B6;CJK COMPATIBILITY IDEOGRAPH-2F8B6;Lo;0;L;62D4;;;;N;;;;;
+2F8B7;CJK COMPATIBILITY IDEOGRAPH-2F8B7;Lo;0;L;6350;;;;N;;;;;
+2F8B8;CJK COMPATIBILITY IDEOGRAPH-2F8B8;Lo;0;L;22B0C;;;;N;;;;;
+2F8B9;CJK COMPATIBILITY IDEOGRAPH-2F8B9;Lo;0;L;633D;;;;N;;;;;
+2F8BA;CJK COMPATIBILITY IDEOGRAPH-2F8BA;Lo;0;L;62FC;;;;N;;;;;
+2F8BB;CJK COMPATIBILITY IDEOGRAPH-2F8BB;Lo;0;L;6368;;;;N;;;;;
+2F8BC;CJK COMPATIBILITY IDEOGRAPH-2F8BC;Lo;0;L;6383;;;;N;;;;;
+2F8BD;CJK COMPATIBILITY IDEOGRAPH-2F8BD;Lo;0;L;63E4;;;;N;;;;;
+2F8BE;CJK COMPATIBILITY IDEOGRAPH-2F8BE;Lo;0;L;22BF1;;;;N;;;;;
+2F8BF;CJK COMPATIBILITY IDEOGRAPH-2F8BF;Lo;0;L;6422;;;;N;;;;;
+2F8C0;CJK COMPATIBILITY IDEOGRAPH-2F8C0;Lo;0;L;63C5;;;;N;;;;;
+2F8C1;CJK COMPATIBILITY IDEOGRAPH-2F8C1;Lo;0;L;63A9;;;;N;;;;;
+2F8C2;CJK COMPATIBILITY IDEOGRAPH-2F8C2;Lo;0;L;3A2E;;;;N;;;;;
+2F8C3;CJK COMPATIBILITY IDEOGRAPH-2F8C3;Lo;0;L;6469;;;;N;;;;;
+2F8C4;CJK COMPATIBILITY IDEOGRAPH-2F8C4;Lo;0;L;647E;;;;N;;;;;
+2F8C5;CJK COMPATIBILITY IDEOGRAPH-2F8C5;Lo;0;L;649D;;;;N;;;;;
+2F8C6;CJK COMPATIBILITY IDEOGRAPH-2F8C6;Lo;0;L;6477;;;;N;;;;;
+2F8C7;CJK COMPATIBILITY IDEOGRAPH-2F8C7;Lo;0;L;3A6C;;;;N;;;;;
+2F8C8;CJK COMPATIBILITY IDEOGRAPH-2F8C8;Lo;0;L;654F;;;;N;;;;;
+2F8C9;CJK COMPATIBILITY IDEOGRAPH-2F8C9;Lo;0;L;656C;;;;N;;;;;
+2F8CA;CJK COMPATIBILITY IDEOGRAPH-2F8CA;Lo;0;L;2300A;;;;N;;;;;
+2F8CB;CJK COMPATIBILITY IDEOGRAPH-2F8CB;Lo;0;L;65E3;;;;N;;;;;
+2F8CC;CJK COMPATIBILITY IDEOGRAPH-2F8CC;Lo;0;L;66F8;;;;N;;;;;
+2F8CD;CJK COMPATIBILITY IDEOGRAPH-2F8CD;Lo;0;L;6649;;;;N;;;;;
+2F8CE;CJK COMPATIBILITY IDEOGRAPH-2F8CE;Lo;0;L;3B19;;;;N;;;;;
+2F8CF;CJK COMPATIBILITY IDEOGRAPH-2F8CF;Lo;0;L;6691;;;;N;;;;;
+2F8D0;CJK COMPATIBILITY IDEOGRAPH-2F8D0;Lo;0;L;3B08;;;;N;;;;;
+2F8D1;CJK COMPATIBILITY IDEOGRAPH-2F8D1;Lo;0;L;3AE4;;;;N;;;;;
+2F8D2;CJK COMPATIBILITY IDEOGRAPH-2F8D2;Lo;0;L;5192;;;;N;;;;;
+2F8D3;CJK COMPATIBILITY IDEOGRAPH-2F8D3;Lo;0;L;5195;;;;N;;;;;
+2F8D4;CJK COMPATIBILITY IDEOGRAPH-2F8D4;Lo;0;L;6700;;;;N;;;;;
+2F8D5;CJK COMPATIBILITY IDEOGRAPH-2F8D5;Lo;0;L;669C;;;;N;;;;;
+2F8D6;CJK COMPATIBILITY IDEOGRAPH-2F8D6;Lo;0;L;80AD;;;;N;;;;;
+2F8D7;CJK COMPATIBILITY IDEOGRAPH-2F8D7;Lo;0;L;43D9;;;;N;;;;;
+2F8D8;CJK COMPATIBILITY IDEOGRAPH-2F8D8;Lo;0;L;6717;;;;N;;;;;
+2F8D9;CJK COMPATIBILITY IDEOGRAPH-2F8D9;Lo;0;L;671B;;;;N;;;;;
+2F8DA;CJK COMPATIBILITY IDEOGRAPH-2F8DA;Lo;0;L;6721;;;;N;;;;;
+2F8DB;CJK COMPATIBILITY IDEOGRAPH-2F8DB;Lo;0;L;675E;;;;N;;;;;
+2F8DC;CJK COMPATIBILITY IDEOGRAPH-2F8DC;Lo;0;L;6753;;;;N;;;;;
+2F8DD;CJK COMPATIBILITY IDEOGRAPH-2F8DD;Lo;0;L;233C3;;;;N;;;;;
+2F8DE;CJK COMPATIBILITY IDEOGRAPH-2F8DE;Lo;0;L;3B49;;;;N;;;;;
+2F8DF;CJK COMPATIBILITY IDEOGRAPH-2F8DF;Lo;0;L;67FA;;;;N;;;;;
+2F8E0;CJK COMPATIBILITY IDEOGRAPH-2F8E0;Lo;0;L;6785;;;;N;;;;;
+2F8E1;CJK COMPATIBILITY IDEOGRAPH-2F8E1;Lo;0;L;6852;;;;N;;;;;
+2F8E2;CJK COMPATIBILITY IDEOGRAPH-2F8E2;Lo;0;L;6885;;;;N;;;;;
+2F8E3;CJK COMPATIBILITY IDEOGRAPH-2F8E3;Lo;0;L;2346D;;;;N;;;;;
+2F8E4;CJK COMPATIBILITY IDEOGRAPH-2F8E4;Lo;0;L;688E;;;;N;;;;;
+2F8E5;CJK COMPATIBILITY IDEOGRAPH-2F8E5;Lo;0;L;681F;;;;N;;;;;
+2F8E6;CJK COMPATIBILITY IDEOGRAPH-2F8E6;Lo;0;L;6914;;;;N;;;;;
+2F8E7;CJK COMPATIBILITY IDEOGRAPH-2F8E7;Lo;0;L;3B9D;;;;N;;;;;
+2F8E8;CJK COMPATIBILITY IDEOGRAPH-2F8E8;Lo;0;L;6942;;;;N;;;;;
+2F8E9;CJK COMPATIBILITY IDEOGRAPH-2F8E9;Lo;0;L;69A3;;;;N;;;;;
+2F8EA;CJK COMPATIBILITY IDEOGRAPH-2F8EA;Lo;0;L;69EA;;;;N;;;;;
+2F8EB;CJK COMPATIBILITY IDEOGRAPH-2F8EB;Lo;0;L;6AA8;;;;N;;;;;
+2F8EC;CJK COMPATIBILITY IDEOGRAPH-2F8EC;Lo;0;L;236A3;;;;N;;;;;
+2F8ED;CJK COMPATIBILITY IDEOGRAPH-2F8ED;Lo;0;L;6ADB;;;;N;;;;;
+2F8EE;CJK COMPATIBILITY IDEOGRAPH-2F8EE;Lo;0;L;3C18;;;;N;;;;;
+2F8EF;CJK COMPATIBILITY IDEOGRAPH-2F8EF;Lo;0;L;6B21;;;;N;;;;;
+2F8F0;CJK COMPATIBILITY IDEOGRAPH-2F8F0;Lo;0;L;238A7;;;;N;;;;;
+2F8F1;CJK COMPATIBILITY IDEOGRAPH-2F8F1;Lo;0;L;6B54;;;;N;;;;;
+2F8F2;CJK COMPATIBILITY IDEOGRAPH-2F8F2;Lo;0;L;3C4E;;;;N;;;;;
+2F8F3;CJK COMPATIBILITY IDEOGRAPH-2F8F3;Lo;0;L;6B72;;;;N;;;;;
+2F8F4;CJK COMPATIBILITY IDEOGRAPH-2F8F4;Lo;0;L;6B9F;;;;N;;;;;
+2F8F5;CJK COMPATIBILITY IDEOGRAPH-2F8F5;Lo;0;L;6BBA;;;;N;;;;;
+2F8F6;CJK COMPATIBILITY IDEOGRAPH-2F8F6;Lo;0;L;6BBB;;;;N;;;;;
+2F8F7;CJK COMPATIBILITY IDEOGRAPH-2F8F7;Lo;0;L;23A8D;;;;N;;;;;
+2F8F8;CJK COMPATIBILITY IDEOGRAPH-2F8F8;Lo;0;L;21D0B;;;;N;;;;;
+2F8F9;CJK COMPATIBILITY IDEOGRAPH-2F8F9;Lo;0;L;23AFA;;;;N;;;;;
+2F8FA;CJK COMPATIBILITY IDEOGRAPH-2F8FA;Lo;0;L;6C4E;;;;N;;;;;
+2F8FB;CJK COMPATIBILITY IDEOGRAPH-2F8FB;Lo;0;L;23CBC;;;;N;;;;;
+2F8FC;CJK COMPATIBILITY IDEOGRAPH-2F8FC;Lo;0;L;6CBF;;;;N;;;;;
+2F8FD;CJK COMPATIBILITY IDEOGRAPH-2F8FD;Lo;0;L;6CCD;;;;N;;;;;
+2F8FE;CJK COMPATIBILITY IDEOGRAPH-2F8FE;Lo;0;L;6C67;;;;N;;;;;
+2F8FF;CJK COMPATIBILITY IDEOGRAPH-2F8FF;Lo;0;L;6D16;;;;N;;;;;
+2F900;CJK COMPATIBILITY IDEOGRAPH-2F900;Lo;0;L;6D3E;;;;N;;;;;
+2F901;CJK COMPATIBILITY IDEOGRAPH-2F901;Lo;0;L;6D77;;;;N;;;;;
+2F902;CJK COMPATIBILITY IDEOGRAPH-2F902;Lo;0;L;6D41;;;;N;;;;;
+2F903;CJK COMPATIBILITY IDEOGRAPH-2F903;Lo;0;L;6D69;;;;N;;;;;
+2F904;CJK COMPATIBILITY IDEOGRAPH-2F904;Lo;0;L;6D78;;;;N;;;;;
+2F905;CJK COMPATIBILITY IDEOGRAPH-2F905;Lo;0;L;6D85;;;;N;;;;;
+2F906;CJK COMPATIBILITY IDEOGRAPH-2F906;Lo;0;L;23D1E;;;;N;;;;;
+2F907;CJK COMPATIBILITY IDEOGRAPH-2F907;Lo;0;L;6D34;;;;N;;;;;
+2F908;CJK COMPATIBILITY IDEOGRAPH-2F908;Lo;0;L;6E2F;;;;N;;;;;
+2F909;CJK COMPATIBILITY IDEOGRAPH-2F909;Lo;0;L;6E6E;;;;N;;;;;
+2F90A;CJK COMPATIBILITY IDEOGRAPH-2F90A;Lo;0;L;3D33;;;;N;;;;;
+2F90B;CJK COMPATIBILITY IDEOGRAPH-2F90B;Lo;0;L;6ECB;;;;N;;;;;
+2F90C;CJK COMPATIBILITY IDEOGRAPH-2F90C;Lo;0;L;6EC7;;;;N;;;;;
+2F90D;CJK COMPATIBILITY IDEOGRAPH-2F90D;Lo;0;L;23ED1;;;;N;;;;;
+2F90E;CJK COMPATIBILITY IDEOGRAPH-2F90E;Lo;0;L;6DF9;;;;N;;;;;
+2F90F;CJK COMPATIBILITY IDEOGRAPH-2F90F;Lo;0;L;6F6E;;;;N;;;;;
+2F910;CJK COMPATIBILITY IDEOGRAPH-2F910;Lo;0;L;23F5E;;;;N;;;;;
+2F911;CJK COMPATIBILITY IDEOGRAPH-2F911;Lo;0;L;23F8E;;;;N;;;;;
+2F912;CJK COMPATIBILITY IDEOGRAPH-2F912;Lo;0;L;6FC6;;;;N;;;;;
+2F913;CJK COMPATIBILITY IDEOGRAPH-2F913;Lo;0;L;7039;;;;N;;;;;
+2F914;CJK COMPATIBILITY IDEOGRAPH-2F914;Lo;0;L;701E;;;;N;;;;;
+2F915;CJK COMPATIBILITY IDEOGRAPH-2F915;Lo;0;L;701B;;;;N;;;;;
+2F916;CJK COMPATIBILITY IDEOGRAPH-2F916;Lo;0;L;3D96;;;;N;;;;;
+2F917;CJK COMPATIBILITY IDEOGRAPH-2F917;Lo;0;L;704A;;;;N;;;;;
+2F918;CJK COMPATIBILITY IDEOGRAPH-2F918;Lo;0;L;707D;;;;N;;;;;
+2F919;CJK COMPATIBILITY IDEOGRAPH-2F919;Lo;0;L;7077;;;;N;;;;;
+2F91A;CJK COMPATIBILITY IDEOGRAPH-2F91A;Lo;0;L;70AD;;;;N;;;;;
+2F91B;CJK COMPATIBILITY IDEOGRAPH-2F91B;Lo;0;L;20525;;;;N;;;;;
+2F91C;CJK COMPATIBILITY IDEOGRAPH-2F91C;Lo;0;L;7145;;;;N;;;;;
+2F91D;CJK COMPATIBILITY IDEOGRAPH-2F91D;Lo;0;L;24263;;;;N;;;;;
+2F91E;CJK COMPATIBILITY IDEOGRAPH-2F91E;Lo;0;L;719C;;;;N;;;;;
+2F91F;CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo;0;L;243AB;;;;N;;;;;
+2F920;CJK COMPATIBILITY IDEOGRAPH-2F920;Lo;0;L;7228;;;;N;;;;;
+2F921;CJK COMPATIBILITY IDEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;
+2F922;CJK COMPATIBILITY IDEOGRAPH-2F922;Lo;0;L;7250;;;;N;;;;;
+2F923;CJK COMPATIBILITY IDEOGRAPH-2F923;Lo;0;L;24608;;;;N;;;;;
+2F924;CJK COMPATIBILITY IDEOGRAPH-2F924;Lo;0;L;7280;;;;N;;;;;
+2F925;CJK COMPATIBILITY IDEOGRAPH-2F925;Lo;0;L;7295;;;;N;;;;;
+2F926;CJK COMPATIBILITY IDEOGRAPH-2F926;Lo;0;L;24735;;;;N;;;;;
+2F927;CJK COMPATIBILITY IDEOGRAPH-2F927;Lo;0;L;24814;;;;N;;;;;
+2F928;CJK COMPATIBILITY IDEOGRAPH-2F928;Lo;0;L;737A;;;;N;;;;;
+2F929;CJK COMPATIBILITY IDEOGRAPH-2F929;Lo;0;L;738B;;;;N;;;;;
+2F92A;CJK COMPATIBILITY IDEOGRAPH-2F92A;Lo;0;L;3EAC;;;;N;;;;;
+2F92B;CJK COMPATIBILITY IDEOGRAPH-2F92B;Lo;0;L;73A5;;;;N;;;;;
+2F92C;CJK COMPATIBILITY IDEOGRAPH-2F92C;Lo;0;L;3EB8;;;;N;;;;;
+2F92D;CJK COMPATIBILITY IDEOGRAPH-2F92D;Lo;0;L;3EB8;;;;N;;;;;
+2F92E;CJK COMPATIBILITY IDEOGRAPH-2F92E;Lo;0;L;7447;;;;N;;;;;
+2F92F;CJK COMPATIBILITY IDEOGRAPH-2F92F;Lo;0;L;745C;;;;N;;;;;
+2F930;CJK COMPATIBILITY IDEOGRAPH-2F930;Lo;0;L;7471;;;;N;;;;;
+2F931;CJK COMPATIBILITY IDEOGRAPH-2F931;Lo;0;L;7485;;;;N;;;;;
+2F932;CJK COMPATIBILITY IDEOGRAPH-2F932;Lo;0;L;74CA;;;;N;;;;;
+2F933;CJK COMPATIBILITY IDEOGRAPH-2F933;Lo;0;L;3F1B;;;;N;;;;;
+2F934;CJK COMPATIBILITY IDEOGRAPH-2F934;Lo;0;L;7524;;;;N;;;;;
+2F935;CJK COMPATIBILITY IDEOGRAPH-2F935;Lo;0;L;24C36;;;;N;;;;;
+2F936;CJK COMPATIBILITY IDEOGRAPH-2F936;Lo;0;L;753E;;;;N;;;;;
+2F937;CJK COMPATIBILITY IDEOGRAPH-2F937;Lo;0;L;24C92;;;;N;;;;;
+2F938;CJK COMPATIBILITY IDEOGRAPH-2F938;Lo;0;L;7570;;;;N;;;;;
+2F939;CJK COMPATIBILITY IDEOGRAPH-2F939;Lo;0;L;2219F;;;;N;;;;;
+2F93A;CJK COMPATIBILITY IDEOGRAPH-2F93A;Lo;0;L;7610;;;;N;;;;;
+2F93B;CJK COMPATIBILITY IDEOGRAPH-2F93B;Lo;0;L;24FA1;;;;N;;;;;
+2F93C;CJK COMPATIBILITY IDEOGRAPH-2F93C;Lo;0;L;24FB8;;;;N;;;;;
+2F93D;CJK COMPATIBILITY IDEOGRAPH-2F93D;Lo;0;L;25044;;;;N;;;;;
+2F93E;CJK COMPATIBILITY IDEOGRAPH-2F93E;Lo;0;L;3FFC;;;;N;;;;;
+2F93F;CJK COMPATIBILITY IDEOGRAPH-2F93F;Lo;0;L;4008;;;;N;;;;;
+2F940;CJK COMPATIBILITY IDEOGRAPH-2F940;Lo;0;L;76F4;;;;N;;;;;
+2F941;CJK COMPATIBILITY IDEOGRAPH-2F941;Lo;0;L;250F3;;;;N;;;;;
+2F942;CJK COMPATIBILITY IDEOGRAPH-2F942;Lo;0;L;250F2;;;;N;;;;;
+2F943;CJK COMPATIBILITY IDEOGRAPH-2F943;Lo;0;L;25119;;;;N;;;;;
+2F944;CJK COMPATIBILITY IDEOGRAPH-2F944;Lo;0;L;25133;;;;N;;;;;
+2F945;CJK COMPATIBILITY IDEOGRAPH-2F945;Lo;0;L;771E;;;;N;;;;;
+2F946;CJK COMPATIBILITY IDEOGRAPH-2F946;Lo;0;L;771F;;;;N;;;;;
+2F947;CJK COMPATIBILITY IDEOGRAPH-2F947;Lo;0;L;771F;;;;N;;;;;
+2F948;CJK COMPATIBILITY IDEOGRAPH-2F948;Lo;0;L;774A;;;;N;;;;;
+2F949;CJK COMPATIBILITY IDEOGRAPH-2F949;Lo;0;L;4039;;;;N;;;;;
+2F94A;CJK COMPATIBILITY IDEOGRAPH-2F94A;Lo;0;L;778B;;;;N;;;;;
+2F94B;CJK COMPATIBILITY IDEOGRAPH-2F94B;Lo;0;L;4046;;;;N;;;;;
+2F94C;CJK COMPATIBILITY IDEOGRAPH-2F94C;Lo;0;L;4096;;;;N;;;;;
+2F94D;CJK COMPATIBILITY IDEOGRAPH-2F94D;Lo;0;L;2541D;;;;N;;;;;
+2F94E;CJK COMPATIBILITY IDEOGRAPH-2F94E;Lo;0;L;784E;;;;N;;;;;
+2F94F;CJK COMPATIBILITY IDEOGRAPH-2F94F;Lo;0;L;788C;;;;N;;;;;
+2F950;CJK COMPATIBILITY IDEOGRAPH-2F950;Lo;0;L;78CC;;;;N;;;;;
+2F951;CJK COMPATIBILITY IDEOGRAPH-2F951;Lo;0;L;40E3;;;;N;;;;;
+2F952;CJK COMPATIBILITY IDEOGRAPH-2F952;Lo;0;L;25626;;;;N;;;;;
+2F953;CJK COMPATIBILITY IDEOGRAPH-2F953;Lo;0;L;7956;;;;N;;;;;
+2F954;CJK COMPATIBILITY IDEOGRAPH-2F954;Lo;0;L;2569A;;;;N;;;;;
+2F955;CJK COMPATIBILITY IDEOGRAPH-2F955;Lo;0;L;256C5;;;;N;;;;;
+2F956;CJK COMPATIBILITY IDEOGRAPH-2F956;Lo;0;L;798F;;;;N;;;;;
+2F957;CJK COMPATIBILITY IDEOGRAPH-2F957;Lo;0;L;79EB;;;;N;;;;;
+2F958;CJK COMPATIBILITY IDEOGRAPH-2F958;Lo;0;L;412F;;;;N;;;;;
+2F959;CJK COMPATIBILITY IDEOGRAPH-2F959;Lo;0;L;7A40;;;;N;;;;;
+2F95A;CJK COMPATIBILITY IDEOGRAPH-2F95A;Lo;0;L;7A4A;;;;N;;;;;
+2F95B;CJK COMPATIBILITY IDEOGRAPH-2F95B;Lo;0;L;7A4F;;;;N;;;;;
+2F95C;CJK COMPATIBILITY IDEOGRAPH-2F95C;Lo;0;L;2597C;;;;N;;;;;
+2F95D;CJK COMPATIBILITY IDEOGRAPH-2F95D;Lo;0;L;25AA7;;;;N;;;;;
+2F95E;CJK COMPATIBILITY IDEOGRAPH-2F95E;Lo;0;L;25AA7;;;;N;;;;;
+2F95F;CJK COMPATIBILITY IDEOGRAPH-2F95F;Lo;0;L;7AEE;;;;N;;;;;
+2F960;CJK COMPATIBILITY IDEOGRAPH-2F960;Lo;0;L;4202;;;;N;;;;;
+2F961;CJK COMPATIBILITY IDEOGRAPH-2F961;Lo;0;L;25BAB;;;;N;;;;;
+2F962;CJK COMPATIBILITY IDEOGRAPH-2F962;Lo;0;L;7BC6;;;;N;;;;;
+2F963;CJK COMPATIBILITY IDEOGRAPH-2F963;Lo;0;L;7BC9;;;;N;;;;;
+2F964;CJK COMPATIBILITY IDEOGRAPH-2F964;Lo;0;L;4227;;;;N;;;;;
+2F965;CJK COMPATIBILITY IDEOGRAPH-2F965;Lo;0;L;25C80;;;;N;;;;;
+2F966;CJK COMPATIBILITY IDEOGRAPH-2F966;Lo;0;L;7CD2;;;;N;;;;;
+2F967;CJK COMPATIBILITY IDEOGRAPH-2F967;Lo;0;L;42A0;;;;N;;;;;
+2F968;CJK COMPATIBILITY IDEOGRAPH-2F968;Lo;0;L;7CE8;;;;N;;;;;
+2F969;CJK COMPATIBILITY IDEOGRAPH-2F969;Lo;0;L;7CE3;;;;N;;;;;
+2F96A;CJK COMPATIBILITY IDEOGRAPH-2F96A;Lo;0;L;7D00;;;;N;;;;;
+2F96B;CJK COMPATIBILITY IDEOGRAPH-2F96B;Lo;0;L;25F86;;;;N;;;;;
+2F96C;CJK COMPATIBILITY IDEOGRAPH-2F96C;Lo;0;L;7D63;;;;N;;;;;
+2F96D;CJK COMPATIBILITY IDEOGRAPH-2F96D;Lo;0;L;4301;;;;N;;;;;
+2F96E;CJK COMPATIBILITY IDEOGRAPH-2F96E;Lo;0;L;7DC7;;;;N;;;;;
+2F96F;CJK COMPATIBILITY IDEOGRAPH-2F96F;Lo;0;L;7E02;;;;N;;;;;
+2F970;CJK COMPATIBILITY IDEOGRAPH-2F970;Lo;0;L;7E45;;;;N;;;;;
+2F971;CJK COMPATIBILITY IDEOGRAPH-2F971;Lo;0;L;4334;;;;N;;;;;
+2F972;CJK COMPATIBILITY IDEOGRAPH-2F972;Lo;0;L;26228;;;;N;;;;;
+2F973;CJK COMPATIBILITY IDEOGRAPH-2F973;Lo;0;L;26247;;;;N;;;;;
+2F974;CJK COMPATIBILITY IDEOGRAPH-2F974;Lo;0;L;4359;;;;N;;;;;
+2F975;CJK COMPATIBILITY IDEOGRAPH-2F975;Lo;0;L;262D9;;;;N;;;;;
+2F976;CJK COMPATIBILITY IDEOGRAPH-2F976;Lo;0;L;7F7A;;;;N;;;;;
+2F977;CJK COMPATIBILITY IDEOGRAPH-2F977;Lo;0;L;2633E;;;;N;;;;;
+2F978;CJK COMPATIBILITY IDEOGRAPH-2F978;Lo;0;L;7F95;;;;N;;;;;
+2F979;CJK COMPATIBILITY IDEOGRAPH-2F979;Lo;0;L;7FFA;;;;N;;;;;
+2F97A;CJK COMPATIBILITY IDEOGRAPH-2F97A;Lo;0;L;8005;;;;N;;;;;
+2F97B;CJK COMPATIBILITY IDEOGRAPH-2F97B;Lo;0;L;264DA;;;;N;;;;;
+2F97C;CJK COMPATIBILITY IDEOGRAPH-2F97C;Lo;0;L;26523;;;;N;;;;;
+2F97D;CJK COMPATIBILITY IDEOGRAPH-2F97D;Lo;0;L;8060;;;;N;;;;;
+2F97E;CJK COMPATIBILITY IDEOGRAPH-2F97E;Lo;0;L;265A8;;;;N;;;;;
+2F97F;CJK COMPATIBILITY IDEOGRAPH-2F97F;Lo;0;L;8070;;;;N;;;;;
+2F980;CJK COMPATIBILITY IDEOGRAPH-2F980;Lo;0;L;2335F;;;;N;;;;;
+2F981;CJK COMPATIBILITY IDEOGRAPH-2F981;Lo;0;L;43D5;;;;N;;;;;
+2F982;CJK COMPATIBILITY IDEOGRAPH-2F982;Lo;0;L;80B2;;;;N;;;;;
+2F983;CJK COMPATIBILITY IDEOGRAPH-2F983;Lo;0;L;8103;;;;N;;;;;
+2F984;CJK COMPATIBILITY IDEOGRAPH-2F984;Lo;0;L;440B;;;;N;;;;;
+2F985;CJK COMPATIBILITY IDEOGRAPH-2F985;Lo;0;L;813E;;;;N;;;;;
+2F986;CJK COMPATIBILITY IDEOGRAPH-2F986;Lo;0;L;5AB5;;;;N;;;;;
+2F987;CJK COMPATIBILITY IDEOGRAPH-2F987;Lo;0;L;267A7;;;;N;;;;;
+2F988;CJK COMPATIBILITY IDEOGRAPH-2F988;Lo;0;L;267B5;;;;N;;;;;
+2F989;CJK COMPATIBILITY IDEOGRAPH-2F989;Lo;0;L;23393;;;;N;;;;;
+2F98A;CJK COMPATIBILITY IDEOGRAPH-2F98A;Lo;0;L;2339C;;;;N;;;;;
+2F98B;CJK COMPATIBILITY IDEOGRAPH-2F98B;Lo;0;L;8201;;;;N;;;;;
+2F98C;CJK COMPATIBILITY IDEOGRAPH-2F98C;Lo;0;L;8204;;;;N;;;;;
+2F98D;CJK COMPATIBILITY IDEOGRAPH-2F98D;Lo;0;L;8F9E;;;;N;;;;;
+2F98E;CJK COMPATIBILITY IDEOGRAPH-2F98E;Lo;0;L;446B;;;;N;;;;;
+2F98F;CJK COMPATIBILITY IDEOGRAPH-2F98F;Lo;0;L;8291;;;;N;;;;;
+2F990;CJK COMPATIBILITY IDEOGRAPH-2F990;Lo;0;L;828B;;;;N;;;;;
+2F991;CJK COMPATIBILITY IDEOGRAPH-2F991;Lo;0;L;829D;;;;N;;;;;
+2F992;CJK COMPATIBILITY IDEOGRAPH-2F992;Lo;0;L;52B3;;;;N;;;;;
+2F993;CJK COMPATIBILITY IDEOGRAPH-2F993;Lo;0;L;82B1;;;;N;;;;;
+2F994;CJK COMPATIBILITY IDEOGRAPH-2F994;Lo;0;L;82B3;;;;N;;;;;
+2F995;CJK COMPATIBILITY IDEOGRAPH-2F995;Lo;0;L;82BD;;;;N;;;;;
+2F996;CJK COMPATIBILITY IDEOGRAPH-2F996;Lo;0;L;82E6;;;;N;;;;;
+2F997;CJK COMPATIBILITY IDEOGRAPH-2F997;Lo;0;L;26B3C;;;;N;;;;;
+2F998;CJK COMPATIBILITY IDEOGRAPH-2F998;Lo;0;L;82E5;;;;N;;;;;
+2F999;CJK COMPATIBILITY IDEOGRAPH-2F999;Lo;0;L;831D;;;;N;;;;;
+2F99A;CJK COMPATIBILITY IDEOGRAPH-2F99A;Lo;0;L;8363;;;;N;;;;;
+2F99B;CJK COMPATIBILITY IDEOGRAPH-2F99B;Lo;0;L;83AD;;;;N;;;;;
+2F99C;CJK COMPATIBILITY IDEOGRAPH-2F99C;Lo;0;L;8323;;;;N;;;;;
+2F99D;CJK COMPATIBILITY IDEOGRAPH-2F99D;Lo;0;L;83BD;;;;N;;;;;
+2F99E;CJK COMPATIBILITY IDEOGRAPH-2F99E;Lo;0;L;83E7;;;;N;;;;;
+2F99F;CJK COMPATIBILITY IDEOGRAPH-2F99F;Lo;0;L;8457;;;;N;;;;;
+2F9A0;CJK COMPATIBILITY IDEOGRAPH-2F9A0;Lo;0;L;8353;;;;N;;;;;
+2F9A1;CJK COMPATIBILITY IDEOGRAPH-2F9A1;Lo;0;L;83CA;;;;N;;;;;
+2F9A2;CJK COMPATIBILITY IDEOGRAPH-2F9A2;Lo;0;L;83CC;;;;N;;;;;
+2F9A3;CJK COMPATIBILITY IDEOGRAPH-2F9A3;Lo;0;L;83DC;;;;N;;;;;
+2F9A4;CJK COMPATIBILITY IDEOGRAPH-2F9A4;Lo;0;L;26C36;;;;N;;;;;
+2F9A5;CJK COMPATIBILITY IDEOGRAPH-2F9A5;Lo;0;L;26D6B;;;;N;;;;;
+2F9A6;CJK COMPATIBILITY IDEOGRAPH-2F9A6;Lo;0;L;26CD5;;;;N;;;;;
+2F9A7;CJK COMPATIBILITY IDEOGRAPH-2F9A7;Lo;0;L;452B;;;;N;;;;;
+2F9A8;CJK COMPATIBILITY IDEOGRAPH-2F9A8;Lo;0;L;84F1;;;;N;;;;;
+2F9A9;CJK COMPATIBILITY IDEOGRAPH-2F9A9;Lo;0;L;84F3;;;;N;;;;;
+2F9AA;CJK COMPATIBILITY IDEOGRAPH-2F9AA;Lo;0;L;8516;;;;N;;;;;
+2F9AB;CJK COMPATIBILITY IDEOGRAPH-2F9AB;Lo;0;L;273CA;;;;N;;;;;
+2F9AC;CJK COMPATIBILITY IDEOGRAPH-2F9AC;Lo;0;L;8564;;;;N;;;;;
+2F9AD;CJK COMPATIBILITY IDEOGRAPH-2F9AD;Lo;0;L;26F2C;;;;N;;;;;
+2F9AE;CJK COMPATIBILITY IDEOGRAPH-2F9AE;Lo;0;L;455D;;;;N;;;;;
+2F9AF;CJK COMPATIBILITY IDEOGRAPH-2F9AF;Lo;0;L;4561;;;;N;;;;;
+2F9B0;CJK COMPATIBILITY IDEOGRAPH-2F9B0;Lo;0;L;26FB1;;;;N;;;;;
+2F9B1;CJK COMPATIBILITY IDEOGRAPH-2F9B1;Lo;0;L;270D2;;;;N;;;;;
+2F9B2;CJK COMPATIBILITY IDEOGRAPH-2F9B2;Lo;0;L;456B;;;;N;;;;;
+2F9B3;CJK COMPATIBILITY IDEOGRAPH-2F9B3;Lo;0;L;8650;;;;N;;;;;
+2F9B4;CJK COMPATIBILITY IDEOGRAPH-2F9B4;Lo;0;L;865C;;;;N;;;;;
+2F9B5;CJK COMPATIBILITY IDEOGRAPH-2F9B5;Lo;0;L;8667;;;;N;;;;;
+2F9B6;CJK COMPATIBILITY IDEOGRAPH-2F9B6;Lo;0;L;8669;;;;N;;;;;
+2F9B7;CJK COMPATIBILITY IDEOGRAPH-2F9B7;Lo;0;L;86A9;;;;N;;;;;
+2F9B8;CJK COMPATIBILITY IDEOGRAPH-2F9B8;Lo;0;L;8688;;;;N;;;;;
+2F9B9;CJK COMPATIBILITY IDEOGRAPH-2F9B9;Lo;0;L;870E;;;;N;;;;;
+2F9BA;CJK COMPATIBILITY IDEOGRAPH-2F9BA;Lo;0;L;86E2;;;;N;;;;;
+2F9BB;CJK COMPATIBILITY IDEOGRAPH-2F9BB;Lo;0;L;8779;;;;N;;;;;
+2F9BC;CJK COMPATIBILITY IDEOGRAPH-2F9BC;Lo;0;L;8728;;;;N;;;;;
+2F9BD;CJK COMPATIBILITY IDEOGRAPH-2F9BD;Lo;0;L;876B;;;;N;;;;;
+2F9BE;CJK COMPATIBILITY IDEOGRAPH-2F9BE;Lo;0;L;8786;;;;N;;;;;
+2F9BF;CJK COMPATIBILITY IDEOGRAPH-2F9BF;Lo;0;L;45D7;;;;N;;;;;
+2F9C0;CJK COMPATIBILITY IDEOGRAPH-2F9C0;Lo;0;L;87E1;;;;N;;;;;
+2F9C1;CJK COMPATIBILITY IDEOGRAPH-2F9C1;Lo;0;L;8801;;;;N;;;;;
+2F9C2;CJK COMPATIBILITY IDEOGRAPH-2F9C2;Lo;0;L;45F9;;;;N;;;;;
+2F9C3;CJK COMPATIBILITY IDEOGRAPH-2F9C3;Lo;0;L;8860;;;;N;;;;;
+2F9C4;CJK COMPATIBILITY IDEOGRAPH-2F9C4;Lo;0;L;8863;;;;N;;;;;
+2F9C5;CJK COMPATIBILITY IDEOGRAPH-2F9C5;Lo;0;L;27667;;;;N;;;;;
+2F9C6;CJK COMPATIBILITY IDEOGRAPH-2F9C6;Lo;0;L;88D7;;;;N;;;;;
+2F9C7;CJK COMPATIBILITY IDEOGRAPH-2F9C7;Lo;0;L;88DE;;;;N;;;;;
+2F9C8;CJK COMPATIBILITY IDEOGRAPH-2F9C8;Lo;0;L;4635;;;;N;;;;;
+2F9C9;CJK COMPATIBILITY IDEOGRAPH-2F9C9;Lo;0;L;88FA;;;;N;;;;;
+2F9CA;CJK COMPATIBILITY IDEOGRAPH-2F9CA;Lo;0;L;34BB;;;;N;;;;;
+2F9CB;CJK COMPATIBILITY IDEOGRAPH-2F9CB;Lo;0;L;278AE;;;;N;;;;;
+2F9CC;CJK COMPATIBILITY IDEOGRAPH-2F9CC;Lo;0;L;27966;;;;N;;;;;
+2F9CD;CJK COMPATIBILITY IDEOGRAPH-2F9CD;Lo;0;L;46BE;;;;N;;;;;
+2F9CE;CJK COMPATIBILITY IDEOGRAPH-2F9CE;Lo;0;L;46C7;;;;N;;;;;
+2F9CF;CJK COMPATIBILITY IDEOGRAPH-2F9CF;Lo;0;L;8AA0;;;;N;;;;;
+2F9D0;CJK COMPATIBILITY IDEOGRAPH-2F9D0;Lo;0;L;8AED;;;;N;;;;;
+2F9D1;CJK COMPATIBILITY IDEOGRAPH-2F9D1;Lo;0;L;8B8A;;;;N;;;;;
+2F9D2;CJK COMPATIBILITY IDEOGRAPH-2F9D2;Lo;0;L;8C55;;;;N;;;;;
+2F9D3;CJK COMPATIBILITY IDEOGRAPH-2F9D3;Lo;0;L;27CA8;;;;N;;;;;
+2F9D4;CJK COMPATIBILITY IDEOGRAPH-2F9D4;Lo;0;L;8CAB;;;;N;;;;;
+2F9D5;CJK COMPATIBILITY IDEOGRAPH-2F9D5;Lo;0;L;8CC1;;;;N;;;;;
+2F9D6;CJK COMPATIBILITY IDEOGRAPH-2F9D6;Lo;0;L;8D1B;;;;N;;;;;
+2F9D7;CJK COMPATIBILITY IDEOGRAPH-2F9D7;Lo;0;L;8D77;;;;N;;;;;
+2F9D8;CJK COMPATIBILITY IDEOGRAPH-2F9D8;Lo;0;L;27F2F;;;;N;;;;;
+2F9D9;CJK COMPATIBILITY IDEOGRAPH-2F9D9;Lo;0;L;20804;;;;N;;;;;
+2F9DA;CJK COMPATIBILITY IDEOGRAPH-2F9DA;Lo;0;L;8DCB;;;;N;;;;;
+2F9DB;CJK COMPATIBILITY IDEOGRAPH-2F9DB;Lo;0;L;8DBC;;;;N;;;;;
+2F9DC;CJK COMPATIBILITY IDEOGRAPH-2F9DC;Lo;0;L;8DF0;;;;N;;;;;
+2F9DD;CJK COMPATIBILITY IDEOGRAPH-2F9DD;Lo;0;L;208DE;;;;N;;;;;
+2F9DE;CJK COMPATIBILITY IDEOGRAPH-2F9DE;Lo;0;L;8ED4;;;;N;;;;;
+2F9DF;CJK COMPATIBILITY IDEOGRAPH-2F9DF;Lo;0;L;8F38;;;;N;;;;;
+2F9E0;CJK COMPATIBILITY IDEOGRAPH-2F9E0;Lo;0;L;285D2;;;;N;;;;;
+2F9E1;CJK COMPATIBILITY IDEOGRAPH-2F9E1;Lo;0;L;285ED;;;;N;;;;;
+2F9E2;CJK COMPATIBILITY IDEOGRAPH-2F9E2;Lo;0;L;9094;;;;N;;;;;
+2F9E3;CJK COMPATIBILITY IDEOGRAPH-2F9E3;Lo;0;L;90F1;;;;N;;;;;
+2F9E4;CJK COMPATIBILITY IDEOGRAPH-2F9E4;Lo;0;L;9111;;;;N;;;;;
+2F9E5;CJK COMPATIBILITY IDEOGRAPH-2F9E5;Lo;0;L;2872E;;;;N;;;;;
+2F9E6;CJK COMPATIBILITY IDEOGRAPH-2F9E6;Lo;0;L;911B;;;;N;;;;;
+2F9E7;CJK COMPATIBILITY IDEOGRAPH-2F9E7;Lo;0;L;9238;;;;N;;;;;
+2F9E8;CJK COMPATIBILITY IDEOGRAPH-2F9E8;Lo;0;L;92D7;;;;N;;;;;
+2F9E9;CJK COMPATIBILITY IDEOGRAPH-2F9E9;Lo;0;L;92D8;;;;N;;;;;
+2F9EA;CJK COMPATIBILITY IDEOGRAPH-2F9EA;Lo;0;L;927C;;;;N;;;;;
+2F9EB;CJK COMPATIBILITY IDEOGRAPH-2F9EB;Lo;0;L;93F9;;;;N;;;;;
+2F9EC;CJK COMPATIBILITY IDEOGRAPH-2F9EC;Lo;0;L;9415;;;;N;;;;;
+2F9ED;CJK COMPATIBILITY IDEOGRAPH-2F9ED;Lo;0;L;28BFA;;;;N;;;;;
+2F9EE;CJK COMPATIBILITY IDEOGRAPH-2F9EE;Lo;0;L;958B;;;;N;;;;;
+2F9EF;CJK COMPATIBILITY IDEOGRAPH-2F9EF;Lo;0;L;4995;;;;N;;;;;
+2F9F0;CJK COMPATIBILITY IDEOGRAPH-2F9F0;Lo;0;L;95B7;;;;N;;;;;
+2F9F1;CJK COMPATIBILITY IDEOGRAPH-2F9F1;Lo;0;L;28D77;;;;N;;;;;
+2F9F2;CJK COMPATIBILITY IDEOGRAPH-2F9F2;Lo;0;L;49E6;;;;N;;;;;
+2F9F3;CJK COMPATIBILITY IDEOGRAPH-2F9F3;Lo;0;L;96C3;;;;N;;;;;
+2F9F4;CJK COMPATIBILITY IDEOGRAPH-2F9F4;Lo;0;L;5DB2;;;;N;;;;;
+2F9F5;CJK COMPATIBILITY IDEOGRAPH-2F9F5;Lo;0;L;9723;;;;N;;;;;
+2F9F6;CJK COMPATIBILITY IDEOGRAPH-2F9F6;Lo;0;L;29145;;;;N;;;;;
+2F9F7;CJK COMPATIBILITY IDEOGRAPH-2F9F7;Lo;0;L;2921A;;;;N;;;;;
+2F9F8;CJK COMPATIBILITY IDEOGRAPH-2F9F8;Lo;0;L;4A6E;;;;N;;;;;
+2F9F9;CJK COMPATIBILITY IDEOGRAPH-2F9F9;Lo;0;L;4A76;;;;N;;;;;
+2F9FA;CJK COMPATIBILITY IDEOGRAPH-2F9FA;Lo;0;L;97E0;;;;N;;;;;
+2F9FB;CJK COMPATIBILITY IDEOGRAPH-2F9FB;Lo;0;L;2940A;;;;N;;;;;
+2F9FC;CJK COMPATIBILITY IDEOGRAPH-2F9FC;Lo;0;L;4AB2;;;;N;;;;;
+2F9FD;CJK COMPATIBILITY IDEOGRAPH-2F9FD;Lo;0;L;29496;;;;N;;;;;
+2F9FE;CJK COMPATIBILITY IDEOGRAPH-2F9FE;Lo;0;L;980B;;;;N;;;;;
+2F9FF;CJK COMPATIBILITY IDEOGRAPH-2F9FF;Lo;0;L;980B;;;;N;;;;;
+2FA00;CJK COMPATIBILITY IDEOGRAPH-2FA00;Lo;0;L;9829;;;;N;;;;;
+2FA01;CJK COMPATIBILITY IDEOGRAPH-2FA01;Lo;0;L;295B6;;;;N;;;;;
+2FA02;CJK COMPATIBILITY IDEOGRAPH-2FA02;Lo;0;L;98E2;;;;N;;;;;
+2FA03;CJK COMPATIBILITY IDEOGRAPH-2FA03;Lo;0;L;4B33;;;;N;;;;;
+2FA04;CJK COMPATIBILITY IDEOGRAPH-2FA04;Lo;0;L;9929;;;;N;;;;;
+2FA05;CJK COMPATIBILITY IDEOGRAPH-2FA05;Lo;0;L;99A7;;;;N;;;;;
+2FA06;CJK COMPATIBILITY IDEOGRAPH-2FA06;Lo;0;L;99C2;;;;N;;;;;
+2FA07;CJK COMPATIBILITY IDEOGRAPH-2FA07;Lo;0;L;99FE;;;;N;;;;;
+2FA08;CJK COMPATIBILITY IDEOGRAPH-2FA08;Lo;0;L;4BCE;;;;N;;;;;
+2FA09;CJK COMPATIBILITY IDEOGRAPH-2FA09;Lo;0;L;29B30;;;;N;;;;;
+2FA0A;CJK COMPATIBILITY IDEOGRAPH-2FA0A;Lo;0;L;9B12;;;;N;;;;;
+2FA0B;CJK COMPATIBILITY IDEOGRAPH-2FA0B;Lo;0;L;9C40;;;;N;;;;;
+2FA0C;CJK COMPATIBILITY IDEOGRAPH-2FA0C;Lo;0;L;9CFD;;;;N;;;;;
+2FA0D;CJK COMPATIBILITY IDEOGRAPH-2FA0D;Lo;0;L;4CCE;;;;N;;;;;
+2FA0E;CJK COMPATIBILITY IDEOGRAPH-2FA0E;Lo;0;L;4CED;;;;N;;;;;
+2FA0F;CJK COMPATIBILITY IDEOGRAPH-2FA0F;Lo;0;L;9D67;;;;N;;;;;
+2FA10;CJK COMPATIBILITY IDEOGRAPH-2FA10;Lo;0;L;2A0CE;;;;N;;;;;
+2FA11;CJK COMPATIBILITY IDEOGRAPH-2FA11;Lo;0;L;4CF8;;;;N;;;;;
+2FA12;CJK COMPATIBILITY IDEOGRAPH-2FA12;Lo;0;L;2A105;;;;N;;;;;
+2FA13;CJK COMPATIBILITY IDEOGRAPH-2FA13;Lo;0;L;2A20E;;;;N;;;;;
+2FA14;CJK COMPATIBILITY IDEOGRAPH-2FA14;Lo;0;L;2A291;;;;N;;;;;
+2FA15;CJK COMPATIBILITY IDEOGRAPH-2FA15;Lo;0;L;9EBB;;;;N;;;;;
+2FA16;CJK COMPATIBILITY IDEOGRAPH-2FA16;Lo;0;L;4D56;;;;N;;;;;
+2FA17;CJK COMPATIBILITY IDEOGRAPH-2FA17;Lo;0;L;9EF9;;;;N;;;;;
+2FA18;CJK COMPATIBILITY IDEOGRAPH-2FA18;Lo;0;L;9EFE;;;;N;;;;;
+2FA19;CJK COMPATIBILITY IDEOGRAPH-2FA19;Lo;0;L;9F05;;;;N;;;;;
+2FA1A;CJK COMPATIBILITY IDEOGRAPH-2FA1A;Lo;0;L;9F0F;;;;N;;;;;
+2FA1B;CJK COMPATIBILITY IDEOGRAPH-2FA1B;Lo;0;L;9F16;;;;N;;;;;
+2FA1C;CJK COMPATIBILITY IDEOGRAPH-2FA1C;Lo;0;L;9F3B;;;;N;;;;;
+2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;;
+E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
+E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
+E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;
+E0022;TAG QUOTATION MARK;Cf;0;BN;;;;;N;;;;;
+E0023;TAG NUMBER SIGN;Cf;0;BN;;;;;N;;;;;
+E0024;TAG DOLLAR SIGN;Cf;0;BN;;;;;N;;;;;
+E0025;TAG PERCENT SIGN;Cf;0;BN;;;;;N;;;;;
+E0026;TAG AMPERSAND;Cf;0;BN;;;;;N;;;;;
+E0027;TAG APOSTROPHE;Cf;0;BN;;;;;N;;;;;
+E0028;TAG LEFT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E0029;TAG RIGHT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E002A;TAG ASTERISK;Cf;0;BN;;;;;N;;;;;
+E002B;TAG PLUS SIGN;Cf;0;BN;;;;;N;;;;;
+E002C;TAG COMMA;Cf;0;BN;;;;;N;;;;;
+E002D;TAG HYPHEN-MINUS;Cf;0;BN;;;;;N;;;;;
+E002E;TAG FULL STOP;Cf;0;BN;;;;;N;;;;;
+E002F;TAG SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E0030;TAG DIGIT ZERO;Cf;0;BN;;;;;N;;;;;
+E0031;TAG DIGIT ONE;Cf;0;BN;;;;;N;;;;;
+E0032;TAG DIGIT TWO;Cf;0;BN;;;;;N;;;;;
+E0033;TAG DIGIT THREE;Cf;0;BN;;;;;N;;;;;
+E0034;TAG DIGIT FOUR;Cf;0;BN;;;;;N;;;;;
+E0035;TAG DIGIT FIVE;Cf;0;BN;;;;;N;;;;;
+E0036;TAG DIGIT SIX;Cf;0;BN;;;;;N;;;;;
+E0037;TAG DIGIT SEVEN;Cf;0;BN;;;;;N;;;;;
+E0038;TAG DIGIT EIGHT;Cf;0;BN;;;;;N;;;;;
+E0039;TAG DIGIT NINE;Cf;0;BN;;;;;N;;;;;
+E003A;TAG COLON;Cf;0;BN;;;;;N;;;;;
+E003B;TAG SEMICOLON;Cf;0;BN;;;;;N;;;;;
+E003C;TAG LESS-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003D;TAG EQUALS SIGN;Cf;0;BN;;;;;N;;;;;
+E003E;TAG GREATER-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003F;TAG QUESTION MARK;Cf;0;BN;;;;;N;;;;;
+E0040;TAG COMMERCIAL AT;Cf;0;BN;;;;;N;;;;;
+E0041;TAG LATIN CAPITAL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0042;TAG LATIN CAPITAL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0043;TAG LATIN CAPITAL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0044;TAG LATIN CAPITAL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0045;TAG LATIN CAPITAL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0046;TAG LATIN CAPITAL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0047;TAG LATIN CAPITAL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0048;TAG LATIN CAPITAL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0049;TAG LATIN CAPITAL LETTER I;Cf;0;BN;;;;;N;;;;;
+E004A;TAG LATIN CAPITAL LETTER J;Cf;0;BN;;;;;N;;;;;
+E004B;TAG LATIN CAPITAL LETTER K;Cf;0;BN;;;;;N;;;;;
+E004C;TAG LATIN CAPITAL LETTER L;Cf;0;BN;;;;;N;;;;;
+E004D;TAG LATIN CAPITAL LETTER M;Cf;0;BN;;;;;N;;;;;
+E004E;TAG LATIN CAPITAL LETTER N;Cf;0;BN;;;;;N;;;;;
+E004F;TAG LATIN CAPITAL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0050;TAG LATIN CAPITAL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0051;TAG LATIN CAPITAL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0052;TAG LATIN CAPITAL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0053;TAG LATIN CAPITAL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0054;TAG LATIN CAPITAL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0055;TAG LATIN CAPITAL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0056;TAG LATIN CAPITAL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0057;TAG LATIN CAPITAL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0058;TAG LATIN CAPITAL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0059;TAG LATIN CAPITAL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E005A;TAG LATIN CAPITAL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E005B;TAG LEFT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005C;TAG REVERSE SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E005D;TAG RIGHT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005E;TAG CIRCUMFLEX ACCENT;Cf;0;BN;;;;;N;;;;;
+E005F;TAG LOW LINE;Cf;0;BN;;;;;N;;;;;
+E0060;TAG GRAVE ACCENT;Cf;0;BN;;;;;N;;;;;
+E0061;TAG LATIN SMALL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0062;TAG LATIN SMALL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0063;TAG LATIN SMALL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0064;TAG LATIN SMALL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0065;TAG LATIN SMALL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0066;TAG LATIN SMALL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0067;TAG LATIN SMALL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0068;TAG LATIN SMALL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0069;TAG LATIN SMALL LETTER I;Cf;0;BN;;;;;N;;;;;
+E006A;TAG LATIN SMALL LETTER J;Cf;0;BN;;;;;N;;;;;
+E006B;TAG LATIN SMALL LETTER K;Cf;0;BN;;;;;N;;;;;
+E006C;TAG LATIN SMALL LETTER L;Cf;0;BN;;;;;N;;;;;
+E006D;TAG LATIN SMALL LETTER M;Cf;0;BN;;;;;N;;;;;
+E006E;TAG LATIN SMALL LETTER N;Cf;0;BN;;;;;N;;;;;
+E006F;TAG LATIN SMALL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0070;TAG LATIN SMALL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0071;TAG LATIN SMALL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0072;TAG LATIN SMALL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0073;TAG LATIN SMALL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0074;TAG LATIN SMALL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0075;TAG LATIN SMALL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0076;TAG LATIN SMALL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0077;TAG LATIN SMALL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0078;TAG LATIN SMALL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0079;TAG LATIN SMALL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E007A;TAG LATIN SMALL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E007B;TAG LEFT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007C;TAG VERTICAL LINE;Cf;0;BN;;;;;N;;;;;
+E007D;TAG RIGHT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007E;TAG TILDE;Cf;0;BN;;;;;N;;;;;
+E007F;CANCEL TAG;Cf;0;BN;;;;;N;;;;;
+E0100;VARIATION SELECTOR-17;Mn;0;NSM;;;;;N;;;;;
+E0101;VARIATION SELECTOR-18;Mn;0;NSM;;;;;N;;;;;
+E0102;VARIATION SELECTOR-19;Mn;0;NSM;;;;;N;;;;;
+E0103;VARIATION SELECTOR-20;Mn;0;NSM;;;;;N;;;;;
+E0104;VARIATION SELECTOR-21;Mn;0;NSM;;;;;N;;;;;
+E0105;VARIATION SELECTOR-22;Mn;0;NSM;;;;;N;;;;;
+E0106;VARIATION SELECTOR-23;Mn;0;NSM;;;;;N;;;;;
+E0107;VARIATION SELECTOR-24;Mn;0;NSM;;;;;N;;;;;
+E0108;VARIATION SELECTOR-25;Mn;0;NSM;;;;;N;;;;;
+E0109;VARIATION SELECTOR-26;Mn;0;NSM;;;;;N;;;;;
+E010A;VARIATION SELECTOR-27;Mn;0;NSM;;;;;N;;;;;
+E010B;VARIATION SELECTOR-28;Mn;0;NSM;;;;;N;;;;;
+E010C;VARIATION SELECTOR-29;Mn;0;NSM;;;;;N;;;;;
+E010D;VARIATION SELECTOR-30;Mn;0;NSM;;;;;N;;;;;
+E010E;VARIATION SELECTOR-31;Mn;0;NSM;;;;;N;;;;;
+E010F;VARIATION SELECTOR-32;Mn;0;NSM;;;;;N;;;;;
+E0110;VARIATION SELECTOR-33;Mn;0;NSM;;;;;N;;;;;
+E0111;VARIATION SELECTOR-34;Mn;0;NSM;;;;;N;;;;;
+E0112;VARIATION SELECTOR-35;Mn;0;NSM;;;;;N;;;;;
+E0113;VARIATION SELECTOR-36;Mn;0;NSM;;;;;N;;;;;
+E0114;VARIATION SELECTOR-37;Mn;0;NSM;;;;;N;;;;;
+E0115;VARIATION SELECTOR-38;Mn;0;NSM;;;;;N;;;;;
+E0116;VARIATION SELECTOR-39;Mn;0;NSM;;;;;N;;;;;
+E0117;VARIATION SELECTOR-40;Mn;0;NSM;;;;;N;;;;;
+E0118;VARIATION SELECTOR-41;Mn;0;NSM;;;;;N;;;;;
+E0119;VARIATION SELECTOR-42;Mn;0;NSM;;;;;N;;;;;
+E011A;VARIATION SELECTOR-43;Mn;0;NSM;;;;;N;;;;;
+E011B;VARIATION SELECTOR-44;Mn;0;NSM;;;;;N;;;;;
+E011C;VARIATION SELECTOR-45;Mn;0;NSM;;;;;N;;;;;
+E011D;VARIATION SELECTOR-46;Mn;0;NSM;;;;;N;;;;;
+E011E;VARIATION SELECTOR-47;Mn;0;NSM;;;;;N;;;;;
+E011F;VARIATION SELECTOR-48;Mn;0;NSM;;;;;N;;;;;
+E0120;VARIATION SELECTOR-49;Mn;0;NSM;;;;;N;;;;;
+E0121;VARIATION SELECTOR-50;Mn;0;NSM;;;;;N;;;;;
+E0122;VARIATION SELECTOR-51;Mn;0;NSM;;;;;N;;;;;
+E0123;VARIATION SELECTOR-52;Mn;0;NSM;;;;;N;;;;;
+E0124;VARIATION SELECTOR-53;Mn;0;NSM;;;;;N;;;;;
+E0125;VARIATION SELECTOR-54;Mn;0;NSM;;;;;N;;;;;
+E0126;VARIATION SELECTOR-55;Mn;0;NSM;;;;;N;;;;;
+E0127;VARIATION SELECTOR-56;Mn;0;NSM;;;;;N;;;;;
+E0128;VARIATION SELECTOR-57;Mn;0;NSM;;;;;N;;;;;
+E0129;VARIATION SELECTOR-58;Mn;0;NSM;;;;;N;;;;;
+E012A;VARIATION SELECTOR-59;Mn;0;NSM;;;;;N;;;;;
+E012B;VARIATION SELECTOR-60;Mn;0;NSM;;;;;N;;;;;
+E012C;VARIATION SELECTOR-61;Mn;0;NSM;;;;;N;;;;;
+E012D;VARIATION SELECTOR-62;Mn;0;NSM;;;;;N;;;;;
+E012E;VARIATION SELECTOR-63;Mn;0;NSM;;;;;N;;;;;
+E012F;VARIATION SELECTOR-64;Mn;0;NSM;;;;;N;;;;;
+E0130;VARIATION SELECTOR-65;Mn;0;NSM;;;;;N;;;;;
+E0131;VARIATION SELECTOR-66;Mn;0;NSM;;;;;N;;;;;
+E0132;VARIATION SELECTOR-67;Mn;0;NSM;;;;;N;;;;;
+E0133;VARIATION SELECTOR-68;Mn;0;NSM;;;;;N;;;;;
+E0134;VARIATION SELECTOR-69;Mn;0;NSM;;;;;N;;;;;
+E0135;VARIATION SELECTOR-70;Mn;0;NSM;;;;;N;;;;;
+E0136;VARIATION SELECTOR-71;Mn;0;NSM;;;;;N;;;;;
+E0137;VARIATION SELECTOR-72;Mn;0;NSM;;;;;N;;;;;
+E0138;VARIATION SELECTOR-73;Mn;0;NSM;;;;;N;;;;;
+E0139;VARIATION SELECTOR-74;Mn;0;NSM;;;;;N;;;;;
+E013A;VARIATION SELECTOR-75;Mn;0;NSM;;;;;N;;;;;
+E013B;VARIATION SELECTOR-76;Mn;0;NSM;;;;;N;;;;;
+E013C;VARIATION SELECTOR-77;Mn;0;NSM;;;;;N;;;;;
+E013D;VARIATION SELECTOR-78;Mn;0;NSM;;;;;N;;;;;
+E013E;VARIATION SELECTOR-79;Mn;0;NSM;;;;;N;;;;;
+E013F;VARIATION SELECTOR-80;Mn;0;NSM;;;;;N;;;;;
+E0140;VARIATION SELECTOR-81;Mn;0;NSM;;;;;N;;;;;
+E0141;VARIATION SELECTOR-82;Mn;0;NSM;;;;;N;;;;;
+E0142;VARIATION SELECTOR-83;Mn;0;NSM;;;;;N;;;;;
+E0143;VARIATION SELECTOR-84;Mn;0;NSM;;;;;N;;;;;
+E0144;VARIATION SELECTOR-85;Mn;0;NSM;;;;;N;;;;;
+E0145;VARIATION SELECTOR-86;Mn;0;NSM;;;;;N;;;;;
+E0146;VARIATION SELECTOR-87;Mn;0;NSM;;;;;N;;;;;
+E0147;VARIATION SELECTOR-88;Mn;0;NSM;;;;;N;;;;;
+E0148;VARIATION SELECTOR-89;Mn;0;NSM;;;;;N;;;;;
+E0149;VARIATION SELECTOR-90;Mn;0;NSM;;;;;N;;;;;
+E014A;VARIATION SELECTOR-91;Mn;0;NSM;;;;;N;;;;;
+E014B;VARIATION SELECTOR-92;Mn;0;NSM;;;;;N;;;;;
+E014C;VARIATION SELECTOR-93;Mn;0;NSM;;;;;N;;;;;
+E014D;VARIATION SELECTOR-94;Mn;0;NSM;;;;;N;;;;;
+E014E;VARIATION SELECTOR-95;Mn;0;NSM;;;;;N;;;;;
+E014F;VARIATION SELECTOR-96;Mn;0;NSM;;;;;N;;;;;
+E0150;VARIATION SELECTOR-97;Mn;0;NSM;;;;;N;;;;;
+E0151;VARIATION SELECTOR-98;Mn;0;NSM;;;;;N;;;;;
+E0152;VARIATION SELECTOR-99;Mn;0;NSM;;;;;N;;;;;
+E0153;VARIATION SELECTOR-100;Mn;0;NSM;;;;;N;;;;;
+E0154;VARIATION SELECTOR-101;Mn;0;NSM;;;;;N;;;;;
+E0155;VARIATION SELECTOR-102;Mn;0;NSM;;;;;N;;;;;
+E0156;VARIATION SELECTOR-103;Mn;0;NSM;;;;;N;;;;;
+E0157;VARIATION SELECTOR-104;Mn;0;NSM;;;;;N;;;;;
+E0158;VARIATION SELECTOR-105;Mn;0;NSM;;;;;N;;;;;
+E0159;VARIATION SELECTOR-106;Mn;0;NSM;;;;;N;;;;;
+E015A;VARIATION SELECTOR-107;Mn;0;NSM;;;;;N;;;;;
+E015B;VARIATION SELECTOR-108;Mn;0;NSM;;;;;N;;;;;
+E015C;VARIATION SELECTOR-109;Mn;0;NSM;;;;;N;;;;;
+E015D;VARIATION SELECTOR-110;Mn;0;NSM;;;;;N;;;;;
+E015E;VARIATION SELECTOR-111;Mn;0;NSM;;;;;N;;;;;
+E015F;VARIATION SELECTOR-112;Mn;0;NSM;;;;;N;;;;;
+E0160;VARIATION SELECTOR-113;Mn;0;NSM;;;;;N;;;;;
+E0161;VARIATION SELECTOR-114;Mn;0;NSM;;;;;N;;;;;
+E0162;VARIATION SELECTOR-115;Mn;0;NSM;;;;;N;;;;;
+E0163;VARIATION SELECTOR-116;Mn;0;NSM;;;;;N;;;;;
+E0164;VARIATION SELECTOR-117;Mn;0;NSM;;;;;N;;;;;
+E0165;VARIATION SELECTOR-118;Mn;0;NSM;;;;;N;;;;;
+E0166;VARIATION SELECTOR-119;Mn;0;NSM;;;;;N;;;;;
+E0167;VARIATION SELECTOR-120;Mn;0;NSM;;;;;N;;;;;
+E0168;VARIATION SELECTOR-121;Mn;0;NSM;;;;;N;;;;;
+E0169;VARIATION SELECTOR-122;Mn;0;NSM;;;;;N;;;;;
+E016A;VARIATION SELECTOR-123;Mn;0;NSM;;;;;N;;;;;
+E016B;VARIATION SELECTOR-124;Mn;0;NSM;;;;;N;;;;;
+E016C;VARIATION SELECTOR-125;Mn;0;NSM;;;;;N;;;;;
+E016D;VARIATION SELECTOR-126;Mn;0;NSM;;;;;N;;;;;
+E016E;VARIATION SELECTOR-127;Mn;0;NSM;;;;;N;;;;;
+E016F;VARIATION SELECTOR-128;Mn;0;NSM;;;;;N;;;;;
+E0170;VARIATION SELECTOR-129;Mn;0;NSM;;;;;N;;;;;
+E0171;VARIATION SELECTOR-130;Mn;0;NSM;;;;;N;;;;;
+E0172;VARIATION SELECTOR-131;Mn;0;NSM;;;;;N;;;;;
+E0173;VARIATION SELECTOR-132;Mn;0;NSM;;;;;N;;;;;
+E0174;VARIATION SELECTOR-133;Mn;0;NSM;;;;;N;;;;;
+E0175;VARIATION SELECTOR-134;Mn;0;NSM;;;;;N;;;;;
+E0176;VARIATION SELECTOR-135;Mn;0;NSM;;;;;N;;;;;
+E0177;VARIATION SELECTOR-136;Mn;0;NSM;;;;;N;;;;;
+E0178;VARIATION SELECTOR-137;Mn;0;NSM;;;;;N;;;;;
+E0179;VARIATION SELECTOR-138;Mn;0;NSM;;;;;N;;;;;
+E017A;VARIATION SELECTOR-139;Mn;0;NSM;;;;;N;;;;;
+E017B;VARIATION SELECTOR-140;Mn;0;NSM;;;;;N;;;;;
+E017C;VARIATION SELECTOR-141;Mn;0;NSM;;;;;N;;;;;
+E017D;VARIATION SELECTOR-142;Mn;0;NSM;;;;;N;;;;;
+E017E;VARIATION SELECTOR-143;Mn;0;NSM;;;;;N;;;;;
+E017F;VARIATION SELECTOR-144;Mn;0;NSM;;;;;N;;;;;
+E0180;VARIATION SELECTOR-145;Mn;0;NSM;;;;;N;;;;;
+E0181;VARIATION SELECTOR-146;Mn;0;NSM;;;;;N;;;;;
+E0182;VARIATION SELECTOR-147;Mn;0;NSM;;;;;N;;;;;
+E0183;VARIATION SELECTOR-148;Mn;0;NSM;;;;;N;;;;;
+E0184;VARIATION SELECTOR-149;Mn;0;NSM;;;;;N;;;;;
+E0185;VARIATION SELECTOR-150;Mn;0;NSM;;;;;N;;;;;
+E0186;VARIATION SELECTOR-151;Mn;0;NSM;;;;;N;;;;;
+E0187;VARIATION SELECTOR-152;Mn;0;NSM;;;;;N;;;;;
+E0188;VARIATION SELECTOR-153;Mn;0;NSM;;;;;N;;;;;
+E0189;VARIATION SELECTOR-154;Mn;0;NSM;;;;;N;;;;;
+E018A;VARIATION SELECTOR-155;Mn;0;NSM;;;;;N;;;;;
+E018B;VARIATION SELECTOR-156;Mn;0;NSM;;;;;N;;;;;
+E018C;VARIATION SELECTOR-157;Mn;0;NSM;;;;;N;;;;;
+E018D;VARIATION SELECTOR-158;Mn;0;NSM;;;;;N;;;;;
+E018E;VARIATION SELECTOR-159;Mn;0;NSM;;;;;N;;;;;
+E018F;VARIATION SELECTOR-160;Mn;0;NSM;;;;;N;;;;;
+E0190;VARIATION SELECTOR-161;Mn;0;NSM;;;;;N;;;;;
+E0191;VARIATION SELECTOR-162;Mn;0;NSM;;;;;N;;;;;
+E0192;VARIATION SELECTOR-163;Mn;0;NSM;;;;;N;;;;;
+E0193;VARIATION SELECTOR-164;Mn;0;NSM;;;;;N;;;;;
+E0194;VARIATION SELECTOR-165;Mn;0;NSM;;;;;N;;;;;
+E0195;VARIATION SELECTOR-166;Mn;0;NSM;;;;;N;;;;;
+E0196;VARIATION SELECTOR-167;Mn;0;NSM;;;;;N;;;;;
+E0197;VARIATION SELECTOR-168;Mn;0;NSM;;;;;N;;;;;
+E0198;VARIATION SELECTOR-169;Mn;0;NSM;;;;;N;;;;;
+E0199;VARIATION SELECTOR-170;Mn;0;NSM;;;;;N;;;;;
+E019A;VARIATION SELECTOR-171;Mn;0;NSM;;;;;N;;;;;
+E019B;VARIATION SELECTOR-172;Mn;0;NSM;;;;;N;;;;;
+E019C;VARIATION SELECTOR-173;Mn;0;NSM;;;;;N;;;;;
+E019D;VARIATION SELECTOR-174;Mn;0;NSM;;;;;N;;;;;
+E019E;VARIATION SELECTOR-175;Mn;0;NSM;;;;;N;;;;;
+E019F;VARIATION SELECTOR-176;Mn;0;NSM;;;;;N;;;;;
+E01A0;VARIATION SELECTOR-177;Mn;0;NSM;;;;;N;;;;;
+E01A1;VARIATION SELECTOR-178;Mn;0;NSM;;;;;N;;;;;
+E01A2;VARIATION SELECTOR-179;Mn;0;NSM;;;;;N;;;;;
+E01A3;VARIATION SELECTOR-180;Mn;0;NSM;;;;;N;;;;;
+E01A4;VARIATION SELECTOR-181;Mn;0;NSM;;;;;N;;;;;
+E01A5;VARIATION SELECTOR-182;Mn;0;NSM;;;;;N;;;;;
+E01A6;VARIATION SELECTOR-183;Mn;0;NSM;;;;;N;;;;;
+E01A7;VARIATION SELECTOR-184;Mn;0;NSM;;;;;N;;;;;
+E01A8;VARIATION SELECTOR-185;Mn;0;NSM;;;;;N;;;;;
+E01A9;VARIATION SELECTOR-186;Mn;0;NSM;;;;;N;;;;;
+E01AA;VARIATION SELECTOR-187;Mn;0;NSM;;;;;N;;;;;
+E01AB;VARIATION SELECTOR-188;Mn;0;NSM;;;;;N;;;;;
+E01AC;VARIATION SELECTOR-189;Mn;0;NSM;;;;;N;;;;;
+E01AD;VARIATION SELECTOR-190;Mn;0;NSM;;;;;N;;;;;
+E01AE;VARIATION SELECTOR-191;Mn;0;NSM;;;;;N;;;;;
+E01AF;VARIATION SELECTOR-192;Mn;0;NSM;;;;;N;;;;;
+E01B0;VARIATION SELECTOR-193;Mn;0;NSM;;;;;N;;;;;
+E01B1;VARIATION SELECTOR-194;Mn;0;NSM;;;;;N;;;;;
+E01B2;VARIATION SELECTOR-195;Mn;0;NSM;;;;;N;;;;;
+E01B3;VARIATION SELECTOR-196;Mn;0;NSM;;;;;N;;;;;
+E01B4;VARIATION SELECTOR-197;Mn;0;NSM;;;;;N;;;;;
+E01B5;VARIATION SELECTOR-198;Mn;0;NSM;;;;;N;;;;;
+E01B6;VARIATION SELECTOR-199;Mn;0;NSM;;;;;N;;;;;
+E01B7;VARIATION SELECTOR-200;Mn;0;NSM;;;;;N;;;;;
+E01B8;VARIATION SELECTOR-201;Mn;0;NSM;;;;;N;;;;;
+E01B9;VARIATION SELECTOR-202;Mn;0;NSM;;;;;N;;;;;
+E01BA;VARIATION SELECTOR-203;Mn;0;NSM;;;;;N;;;;;
+E01BB;VARIATION SELECTOR-204;Mn;0;NSM;;;;;N;;;;;
+E01BC;VARIATION SELECTOR-205;Mn;0;NSM;;;;;N;;;;;
+E01BD;VARIATION SELECTOR-206;Mn;0;NSM;;;;;N;;;;;
+E01BE;VARIATION SELECTOR-207;Mn;0;NSM;;;;;N;;;;;
+E01BF;VARIATION SELECTOR-208;Mn;0;NSM;;;;;N;;;;;
+E01C0;VARIATION SELECTOR-209;Mn;0;NSM;;;;;N;;;;;
+E01C1;VARIATION SELECTOR-210;Mn;0;NSM;;;;;N;;;;;
+E01C2;VARIATION SELECTOR-211;Mn;0;NSM;;;;;N;;;;;
+E01C3;VARIATION SELECTOR-212;Mn;0;NSM;;;;;N;;;;;
+E01C4;VARIATION SELECTOR-213;Mn;0;NSM;;;;;N;;;;;
+E01C5;VARIATION SELECTOR-214;Mn;0;NSM;;;;;N;;;;;
+E01C6;VARIATION SELECTOR-215;Mn;0;NSM;;;;;N;;;;;
+E01C7;VARIATION SELECTOR-216;Mn;0;NSM;;;;;N;;;;;
+E01C8;VARIATION SELECTOR-217;Mn;0;NSM;;;;;N;;;;;
+E01C9;VARIATION SELECTOR-218;Mn;0;NSM;;;;;N;;;;;
+E01CA;VARIATION SELECTOR-219;Mn;0;NSM;;;;;N;;;;;
+E01CB;VARIATION SELECTOR-220;Mn;0;NSM;;;;;N;;;;;
+E01CC;VARIATION SELECTOR-221;Mn;0;NSM;;;;;N;;;;;
+E01CD;VARIATION SELECTOR-222;Mn;0;NSM;;;;;N;;;;;
+E01CE;VARIATION SELECTOR-223;Mn;0;NSM;;;;;N;;;;;
+E01CF;VARIATION SELECTOR-224;Mn;0;NSM;;;;;N;;;;;
+E01D0;VARIATION SELECTOR-225;Mn;0;NSM;;;;;N;;;;;
+E01D1;VARIATION SELECTOR-226;Mn;0;NSM;;;;;N;;;;;
+E01D2;VARIATION SELECTOR-227;Mn;0;NSM;;;;;N;;;;;
+E01D3;VARIATION SELECTOR-228;Mn;0;NSM;;;;;N;;;;;
+E01D4;VARIATION SELECTOR-229;Mn;0;NSM;;;;;N;;;;;
+E01D5;VARIATION SELECTOR-230;Mn;0;NSM;;;;;N;;;;;
+E01D6;VARIATION SELECTOR-231;Mn;0;NSM;;;;;N;;;;;
+E01D7;VARIATION SELECTOR-232;Mn;0;NSM;;;;;N;;;;;
+E01D8;VARIATION SELECTOR-233;Mn;0;NSM;;;;;N;;;;;
+E01D9;VARIATION SELECTOR-234;Mn;0;NSM;;;;;N;;;;;
+E01DA;VARIATION SELECTOR-235;Mn;0;NSM;;;;;N;;;;;
+E01DB;VARIATION SELECTOR-236;Mn;0;NSM;;;;;N;;;;;
+E01DC;VARIATION SELECTOR-237;Mn;0;NSM;;;;;N;;;;;
+E01DD;VARIATION SELECTOR-238;Mn;0;NSM;;;;;N;;;;;
+E01DE;VARIATION SELECTOR-239;Mn;0;NSM;;;;;N;;;;;
+E01DF;VARIATION SELECTOR-240;Mn;0;NSM;;;;;N;;;;;
+E01E0;VARIATION SELECTOR-241;Mn;0;NSM;;;;;N;;;;;
+E01E1;VARIATION SELECTOR-242;Mn;0;NSM;;;;;N;;;;;
+E01E2;VARIATION SELECTOR-243;Mn;0;NSM;;;;;N;;;;;
+E01E3;VARIATION SELECTOR-244;Mn;0;NSM;;;;;N;;;;;
+E01E4;VARIATION SELECTOR-245;Mn;0;NSM;;;;;N;;;;;
+E01E5;VARIATION SELECTOR-246;Mn;0;NSM;;;;;N;;;;;
+E01E6;VARIATION SELECTOR-247;Mn;0;NSM;;;;;N;;;;;
+E01E7;VARIATION SELECTOR-248;Mn;0;NSM;;;;;N;;;;;
+E01E8;VARIATION SELECTOR-249;Mn;0;NSM;;;;;N;;;;;
+E01E9;VARIATION SELECTOR-250;Mn;0;NSM;;;;;N;;;;;
+E01EA;VARIATION SELECTOR-251;Mn;0;NSM;;;;;N;;;;;
+E01EB;VARIATION SELECTOR-252;Mn;0;NSM;;;;;N;;;;;
+E01EC;VARIATION SELECTOR-253;Mn;0;NSM;;;;;N;;;;;
+E01ED;VARIATION SELECTOR-254;Mn;0;NSM;;;;;N;;;;;
+E01EE;VARIATION SELECTOR-255;Mn;0;NSM;;;;;N;;;;;
+E01EF;VARIATION SELECTOR-256;Mn;0;NSM;;;;;N;;;;;
+F0000;<Plane 15 Private Use, First>;Co;0;L;;;;;N;;;;;
+FFFFD;<Plane 15 Private Use, Last>;Co;0;L;;;;;N;;;;;
+100000;<Plane 16 Private Use, First>;Co;0;L;;;;;N;;;;;
+10FFFD;<Plane 16 Private Use, Last>;Co;0;L;;;;;N;;;;;
diff --git a/test/functional/fixtures/non_executable.txt b/test/functional/fixtures/non_executable.txt
new file mode 100644
index 0000000000..cc27ecc664
--- /dev/null
+++ b/test/functional/fixtures/non_executable.txt
@@ -0,0 +1 @@
+This file is not an executable
diff --git a/test/functional/fixtures/printargs-test.c b/test/functional/fixtures/printargs-test.c
new file mode 100644
index 0000000000..2c25cf8447
--- /dev/null
+++ b/test/functional/fixtures/printargs-test.c
@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  for (int i=1; i<argc; i++) {
+    printf("arg%d=%s;", i, argv[i]);
+  }
+  return 0;
+}
diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c
index 40ba131003..778e7f3cd3 100644
--- a/test/functional/fixtures/tty-test.c
+++ b/test/functional/fixtures/tty-test.c
@@ -31,12 +31,24 @@ static void walk_cb(uv_handle_t *handle, void *arg) {
   }
 }
 
-static void sigwinch_handler(int signum)
+#ifndef WIN32
+static void sig_handler(int signum)
 {
-  int width, height;
-  uv_tty_get_winsize(&tty, &width, &height);
-  fprintf(stderr, "rows: %d, cols: %d\n", height, width);
+  switch(signum) {
+  case SIGWINCH: {
+    int width, height;
+    uv_tty_get_winsize(&tty, &width, &height);
+    fprintf(stderr, "rows: %d, cols: %d\n", height, width);
+    return;
+  }
+  case SIGHUP:
+    exit(42);  // arbitrary exit code to test against
+    return;
+  default:
+    return;
+  }
 }
+#endif
 
 // static void sigwinch_cb(uv_signal_t *handle, int signum)
 // {
@@ -135,16 +147,22 @@ int main(int argc, char **argv)
   uv_tty_set_mode(&tty, UV_TTY_MODE_RAW);
   tty.data = &interrupted;
   uv_read_start((uv_stream_t *)&tty, alloc_cb, read_cb);
+#ifndef WIN32
   struct sigaction sa;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
-  sa.sa_handler = sigwinch_handler;
+  sa.sa_handler = sig_handler;
+  sigaction(SIGHUP, &sa, NULL);
   sigaction(SIGWINCH, &sa, NULL);
   // uv_signal_t sigwinch_watcher;
   // uv_signal_init(uv_default_loop(), &sigwinch_watcher);
   // sigwinch_watcher.data = &tty;
   // uv_signal_start(&sigwinch_watcher, sigwinch_cb, SIGWINCH);
+#endif
   uv_run(uv_default_loop(), UV_RUN_DEFAULT);
 
+  // XXX: Without this the SIGHUP handler is skipped on some systems.
+  sleep(100);
+
   return 0;
 }
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 37b7bf664c..880cb6546c 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -1,9 +1,22 @@
 require('coxpcall')
+local luv = require('luv')
 local lfs = require('lfs')
-local assert = require('luassert')
-local ChildProcessStream = require('nvim.child_process_stream')
+local global_helpers = require('test.helpers')
+
+-- nvim client: Found in .deps/usr/share/lua/<version>/nvim/ if "bundled".
 local Session = require('nvim.session')
+local TcpStream = require('nvim.tcp_stream')
+local SocketStream = require('nvim.socket_stream')
+local ChildProcessStream = require('nvim.child_process_stream')
 
+local check_logs = global_helpers.check_logs
+local neq = global_helpers.neq
+local eq = global_helpers.eq
+local ok = global_helpers.ok
+local map = global_helpers.map
+local filter = global_helpers.filter
+
+local start_dir = lfs.currentdir()
 local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim'
 local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
                    '--cmd', 'set shortmess+=I background=light noswapfile noautoindent laststatus=1 undodir=. directory=. viewdir=. backupdir=.',
@@ -11,18 +24,17 @@ local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
 
 local mpack = require('mpack')
 
+local tmpname = global_helpers.tmpname
+local uname = global_helpers.uname
+
 -- Formulate a path to the directory containing nvim.  We use this to
 -- help run test executables.  It helps to keep the tests working, even
 -- when the build is not in the default location.
 local nvim_dir = nvim_prog:gsub("[/\\][^/\\]+$", "")
 if nvim_dir == nvim_prog then
-    nvim_dir = "."
+  nvim_dir = "."
 end
 
--- Nvim "Unit Under Test" http://en.wikipedia.org/wiki/Device_under_test
-local NvimUUT = {}
-NvimUUT.__index = NvimUUT
-
 local prepend_argv
 
 if os.getenv('VALGRIND') then
@@ -30,7 +42,7 @@ if os.getenv('VALGRIND') then
   prepend_argv = {'valgrind', '-q', '--tool=memcheck',
                   '--leak-check=yes', '--track-origins=yes',
                   '--show-possibly-lost=no',
-                  '--suppressions=.valgrind.supp',
+                  '--suppressions=src/.valgrind.supp',
                   '--log-file='..log_file}
   if os.getenv('GDB') then
     table.insert(prepend_argv, '--vgdb=yes')
@@ -127,12 +139,16 @@ local function stop()
   session:stop()
 end
 
+-- Executes an ex-command. VimL errors manifest as client (lua) errors, but
+-- v:errmsg will not be updated.
 local function nvim_command(cmd)
-  request('vim_command', cmd)
+  request('nvim_command', cmd)
 end
 
+-- Evaluates a VimL expression.
+-- Fails on VimL error, but does not update v:errmsg.
 local function nvim_eval(expr)
-  return request('vim_eval', expr)
+  return request('nvim_eval', expr)
 end
 
 local os_name = (function()
@@ -151,13 +167,21 @@ local os_name = (function()
   end)
 end)()
 
+local function iswin()
+  return os_name() == 'windows'
+end
+
+-- Executes a VimL function.
+-- Fails on VimL error, but does not update v:errmsg.
 local function nvim_call(name, ...)
-  return request('vim_call_function', name, {...})
+  return request('nvim_call_function', name, {...})
 end
 
+-- Sends user input to Nvim.
+-- Does not fail on VimL error, but v:errmsg will be updated.
 local function nvim_feed(input)
   while #input > 0 do
-    local written = request('vim_input', input)
+    local written = request('nvim_input', input)
     input = input:sub(written + 1)
   end
 end
@@ -171,7 +195,7 @@ local function dedent(str)
       indent = line_indent
     end
   end
-  if #indent == 0 then
+  if indent == nil or #indent == 0 then
     -- no minimum common indent
     return str
   end
@@ -211,18 +235,76 @@ local function merge_args(...)
   return argv
 end
 
-local function spawn(argv, merge)
-  local child_stream = ChildProcessStream.spawn(merge and merge_args(prepend_argv, argv) or argv)
+local function spawn(argv, merge, env)
+  local child_stream = ChildProcessStream.spawn(
+      merge and merge_args(prepend_argv, argv) or argv,
+      env)
   return Session.new(child_stream)
 end
 
-local function clear(extra_cmd)
+-- Creates a new Session connected by domain socket (named pipe) or TCP.
+local function connect(file_or_address)
+  local addr, port = string.match(file_or_address, "(.*):(%d+)")
+  local stream = (addr and port) and TcpStream.open(addr, port) or
+    SocketStream.open(file_or_address)
+  return Session.new(stream)
+end
+
+-- Calls fn() until it succeeds, up to `max` times or until `max_ms`
+-- milliseconds have passed.
+local function retry(max, max_ms, fn)
+  local tries = 1
+  local timeout = (max_ms and max_ms > 0) and max_ms or 10000
+  local start_time = luv.now()
+  while true do
+    local status, result = pcall(fn)
+    if status then
+      return result
+    end
+    if (max and tries >= max) or (luv.now() - start_time > timeout) then
+      break
+    end
+    tries = tries + 1
+  end
+  -- Do not use pcall() for the final attempt, let the failure bubble up.
+  return fn()
+end
+
+local function clear(...)
   local args = {unpack(nvim_argv)}
-  if extra_cmd ~= nil then
-    table.insert(args, '--cmd')
-    table.insert(args, extra_cmd)
+  local new_args
+  local env = nil
+  local opts = select(1, ...)
+  if type(opts) == 'table' then
+    if opts.env then
+      local env_tbl = {}
+      for k, v in pairs(opts.env) do
+        assert(type(k) == 'string')
+        assert(type(v) == 'string')
+        env_tbl[k] = v
+      end
+      for _, k in ipairs({
+        'HOME',
+        'ASAN_OPTIONS',
+        'LD_LIBRARY_PATH', 'PATH',
+        'NVIM_LOG_FILE',
+        'NVIM_RPLUGIN_MANIFEST',
+      }) do
+        env_tbl[k] = os.getenv(k)
+      end
+      env = {}
+      for k, v in pairs(env_tbl) do
+        env[#env + 1] = k .. '=' .. v
+      end
+    end
+    new_args = opts.args or {}
+  else
+    new_args = {...}
   end
-  set_session(spawn(args))
+  for _, arg in ipairs(new_args) do
+    table.insert(args, arg)
+  end
+  set_session(spawn(args, nil, env))
 end
 
 local function insert(...)
@@ -234,6 +316,8 @@ local function insert(...)
   nvim_feed('<ESC>')
 end
 
+-- Executes an ex-command by user input. Because nvim_input() is used, VimL
+-- errors will not manifest as client (lua) errors. Use command() for that.
 local function execute(...)
   for _, v in ipairs({...}) do
     if v:sub(1, 1) ~= '/' then
@@ -257,108 +341,130 @@ local function write_file(name, text, dont_dedent)
 end
 
 local function source(code)
-  local tmpname = os.tmpname()
-  if os_name() == 'osx' and string.match(tmpname, '^/tmp') then
-   tmpname = '/private'..tmpname
-  end
-  write_file(tmpname, code)
-  nvim_command('source '..tmpname)
-  os.remove(tmpname)
-  return tmpname
+  local fname = tmpname()
+  write_file(fname, code)
+  nvim_command('source '..fname)
+  os.remove(fname)
+  return fname
 end
 
-local function eq(expected, actual)
-  return assert.are.same(expected, actual)
+local function set_shell_powershell()
+  source([[
+    set shell=powershell shellquote=\" shellpipe=\| shellredir=>
+    set shellcmdflag=\ -ExecutionPolicy\ RemoteSigned\ -Command
+    let &shellxquote=' '
+  ]])
 end
 
-local function neq(expected, actual)
-  return assert.are_not.same(expected, actual)
+local function nvim(method, ...)
+  return request('nvim_'..method, ...)
 end
 
-local function ok(expr)
-  assert.is_true(expr)
-end
-
-local function nvim(method, ...)
-  return request('vim_'..method, ...)
+local function ui(method, ...)
+  return request('nvim_ui_'..method, ...)
 end
 
 local function nvim_async(method, ...)
-  session:notify('vim_'..method, ...)
+  session:notify('nvim_'..method, ...)
 end
 
 local function buffer(method, ...)
-  return request('buffer_'..method, ...)
+  return request('nvim_buf_'..method, ...)
 end
 
 local function window(method, ...)
-  return request('window_'..method, ...)
+  return request('nvim_win_'..method, ...)
 end
 
 local function tabpage(method, ...)
-  return request('tabpage_'..method, ...)
+  return request('nvim_tabpage_'..method, ...)
 end
 
 local function curbuf(method, ...)
-  local buf = nvim('get_current_buffer')
   if not method then
-    return buf
+    return nvim('get_current_buf')
   end
-  return buffer(method, buf, ...)
+  return buffer(method, 0, ...)
 end
 
 local function wait()
+  -- Execute 'vim_eval' (a deferred function) to block
+  -- until all pending input is processed.
   session:request('vim_eval', '1')
 end
 
+-- sleeps the test runner (_not_ the nvim instance)
+local function sleep(ms)
+  run(nil, nil, nil, ms)
+end
+
 local function curbuf_contents()
-  -- Before inspecting the buffer, execute 'vim_eval' to wait until all
-  -- previously sent keys are processed(vim_eval is a deferred function, and
-  -- only processed after all input)
-  wait()
+  wait()  -- Before inspecting the buffer, process all input.
   return table.concat(curbuf('get_lines', 0, -1, true), '\n')
 end
 
 local function curwin(method, ...)
-  local win = nvim('get_current_window')
   if not method then
-    return win
+    return nvim('get_current_win')
   end
-  return window(method, win, ...)
+  return window(method, 0, ...)
 end
 
 local function curtab(method, ...)
-  local tab = nvim('get_current_tabpage')
   if not method then
-    return tab
+    return nvim('get_current_tabpage')
   end
-  return tabpage(method, tab, ...)
+  return tabpage(method, 0, ...)
 end
 
 local function expect(contents)
   return eq(dedent(contents), curbuf_contents())
 end
 
-local function rmdir(path)
+local function do_rmdir(path)
   if lfs.attributes(path, 'mode') ~= 'directory' then
     return nil
   end
   for file in lfs.dir(path) do
     if file ~= '.' and file ~= '..' then
-      local ret, err = os.remove(path..'/'..file)
-      if not ret then
-        error('os.remove: '..err)
-        return nil
+      local abspath = path..'/'..file
+      if lfs.attributes(abspath, 'mode') == 'directory' then
+        local ret = do_rmdir(abspath)  -- recurse
+        if not ret then
+          return nil
+        end
+      else
+        local ret, err = os.remove(abspath)
+        if not ret then
+          error('os.remove: '..err)
+          return nil
+        end
       end
     end
   end
-  local ret, err = os.remove(path)
+  local ret, err = lfs.rmdir(path)
   if not ret then
-    error('os.remove: '..err)
+    error('lfs.rmdir('..path..'): '..err)
   end
   return ret
 end
 
+local function rmdir(path)
+  local ret, _ = pcall(do_rmdir, path)
+  if not ret and os_name() == "windows" then
+    -- Maybe "Permission denied"; try again after changing the nvim
+    -- process to the top-level directory.
+    nvim_command([[exe 'cd '.fnameescape(']]..start_dir.."')")
+    ret, _ = pcall(do_rmdir, path)
+  end
+  -- During teardown, the nvim process may not exit quickly enough, then rmdir()
+  -- will fail (on Windows).
+  if not ret then  -- Try again.
+    sleep(1000)
+    do_rmdir(path)
+  end
+end
+
 local exc_exec = function(cmd)
   nvim_command(([[
     try
@@ -395,8 +501,38 @@ local function create_callindex(func)
   return table
 end
 
+-- Helper to skip tests. Returns true in Windows systems.
+-- pending_fn is pending() from busted
+local function pending_win32(pending_fn)
+  if uname() == 'Windows' then
+    if pending_fn ~= nil then
+      pending_fn('FIXME: Windows', function() end)
+    end
+    return true
+  else
+    return false
+  end
+end
+
+-- Calls pending() and returns `true` if the system is too slow to
+-- run fragile or expensive tests. Else returns `false`.
+local function skip_fragile(pending_fn, cond)
+  if pending_fn == nil or type(pending_fn) ~= type(function()end) then
+    error("invalid pending_fn")
+  end
+  if cond then
+    pending_fn("skipped (test is fragile on this system)", function() end)
+    return true
+  elseif os.getenv("TEST_SKIP_FRAGILE") then
+    pending_fn("skipped (TEST_SKIP_FRAGILE)", function() end)
+    return true
+  end
+  return false
+end
+
 local funcs = create_callindex(nvim_call)
 local meths = create_callindex(nvim)
+local uimeths = create_callindex(ui)
 local bufmeths = create_callindex(buffer)
 local winmeths = create_callindex(window)
 local tabmeths = create_callindex(tabpage)
@@ -404,14 +540,17 @@ local curbufmeths = create_callindex(curbuf)
 local curwinmeths = create_callindex(curwin)
 local curtabmeths = create_callindex(curtab)
 
-return {
+local M = {
   prepend_argv = prepend_argv,
   clear = clear,
+  connect = connect,
+  retry = retry,
   spawn = spawn,
   dedent = dedent,
   source = source,
   rawfeed = rawfeed,
   insert = insert,
+  iswin = iswin,
   feed = feed,
   execute = execute,
   eval = nvim_eval,
@@ -425,6 +564,8 @@ return {
   neq = neq,
   expect = expect,
   ok = ok,
+  map = map,
+  filter = filter,
   nvim = nvim,
   nvim_async = nvim_async,
   nvim_prog = nvim_prog,
@@ -437,6 +578,7 @@ return {
   curtab = curtab,
   curbuf_contents = curbuf_contents,
   wait = wait,
+  sleep = sleep,
   set_session = set_session,
   write_file = write_file,
   os_name = os_name,
@@ -450,8 +592,20 @@ return {
   bufmeths = bufmeths,
   winmeths = winmeths,
   tabmeths = tabmeths,
+  uimeths = uimeths,
   curbufmeths = curbufmeths,
   curwinmeths = curwinmeths,
   curtabmeths = curtabmeths,
-  NIL = mpack.NIL
+  pending_win32 = pending_win32,
+  skip_fragile = skip_fragile,
+  set_shell_powershell = set_shell_powershell,
+  tmpname = tmpname,
+  NIL = mpack.NIL,
 }
+
+return function(after_each)
+  if after_each then
+    after_each(check_logs)
+  end
+  return M
+end
diff --git a/test/functional/legacy/002_filename_recognition_spec.lua b/test/functional/legacy/002_filename_recognition_spec.lua
index 569e748631..5a833281e7 100644
--- a/test/functional/legacy/002_filename_recognition_spec.lua
+++ b/test/functional/legacy/002_filename_recognition_spec.lua
@@ -1,7 +1,7 @@
 -- Test if URLs are recognized as filenames by commands such as "gf". Here
 -- we'll use `expand("<cfile>")` since "gf" would need to open the file.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/003_cindent_spec.lua b/test/functional/legacy/003_cindent_spec.lua
index 4b838eda1d..83388bd1eb 100644
--- a/test/functional/legacy/003_cindent_spec.lua
+++ b/test/functional/legacy/003_cindent_spec.lua
@@ -3,7 +3,7 @@
 -- There are 50+ test command blocks (the stuff between STARTTEST and ENDTEST)
 -- in the original test. These have been converted to "it" test cases here.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/004_bufenter_with_modelines_spec.lua b/test/functional/legacy/004_bufenter_with_modelines_spec.lua
index 34e702b798..3e5cdd2ff2 100644
--- a/test/functional/legacy/004_bufenter_with_modelines_spec.lua
+++ b/test/functional/legacy/004_bufenter_with_modelines_spec.lua
@@ -2,7 +2,7 @@
 -- Test for autocommand that changes current buffer on BufEnter event.
 -- Check if modelines are interpreted for the correct buffer.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/005_bufleave_delete_buffer_spec.lua b/test/functional/legacy/005_bufleave_delete_buffer_spec.lua
index e6989a6674..895f4ad181 100644
--- a/test/functional/legacy/005_bufleave_delete_buffer_spec.lua
+++ b/test/functional/legacy/005_bufleave_delete_buffer_spec.lua
@@ -1,7 +1,7 @@
 -- Test for autocommand that deletes the current buffer on BufLeave event.
 -- Also test deleting the last buffer, should give a new, empty buffer.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/006_argument_list_spec.lua b/test/functional/legacy/006_argument_list_spec.lua
index 1266a876d4..764854314f 100644
--- a/test/functional/legacy/006_argument_list_spec.lua
+++ b/test/functional/legacy/006_argument_list_spec.lua
@@ -1,6 +1,6 @@
 -- Test for autocommand that redefines the argument list, when doing ":all".
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, dedent, eq = helpers.execute, helpers.dedent, helpers.eq
 local curbuf_contents = helpers.curbuf_contents
diff --git a/test/functional/legacy/007_ball_buffer_list_spec.lua b/test/functional/legacy/007_ball_buffer_list_spec.lua
index 295f63f044..07e3fe6e7a 100644
--- a/test/functional/legacy/007_ball_buffer_list_spec.lua
+++ b/test/functional/legacy/007_ball_buffer_list_spec.lua
@@ -1,6 +1,6 @@
 -- Test for autocommand that changes the buffer list, when doing ":ball".
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/009_bufleave_autocommand_spec.lua b/test/functional/legacy/009_bufleave_autocommand_spec.lua
index 8c18639c8f..7481c639cf 100644
--- a/test/functional/legacy/009_bufleave_autocommand_spec.lua
+++ b/test/functional/legacy/009_bufleave_autocommand_spec.lua
@@ -1,6 +1,6 @@
 -- Test for Bufleave autocommand that deletes the buffer we are about to edit.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, insert = helpers.clear, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/011_autocommands_spec.lua b/test/functional/legacy/011_autocommands_spec.lua
index 483e465cee..ba899f8119 100644
--- a/test/functional/legacy/011_autocommands_spec.lua
+++ b/test/functional/legacy/011_autocommands_spec.lua
@@ -12,11 +12,14 @@
 -- Use a FileChangedShell autocommand to avoid a prompt for "Xtestfile.gz"
 -- being modified outside of Vim (noticed on Solaris).
 
-local helpers, lfs = require('test.functional.helpers'), require('lfs')
+local helpers= require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
 local clear, execute, expect, eq, neq, dedent, write_file, feed =
   helpers.clear, helpers.execute, helpers.expect, helpers.eq, helpers.neq,
   helpers.dedent, helpers.write_file, helpers.feed
 
+if helpers.pending_win32(pending) then return end
+
 local function has_gzip()
   return os.execute('gzip --help >/dev/null 2>&1') == 0
 end
diff --git a/test/functional/legacy/012_directory_spec.lua b/test/functional/legacy/012_directory_spec.lua
new file mode 100644
index 0000000000..cef31ae405
--- /dev/null
+++ b/test/functional/legacy/012_directory_spec.lua
@@ -0,0 +1,82 @@
+-- Tests for 'directory' option.
+-- - ".", in same dir as file
+-- - "./dir", in directory relative to file
+-- - "dir", in directory relative to current dir
+
+local helpers          = require('test.functional.helpers')(after_each)
+local lfs              = require('lfs')
+local insert, eq       = helpers.insert, helpers.eq
+local neq, eval        = helpers.neq, helpers.eval
+local clear, execute   = helpers.clear, helpers.execute
+local wait, write_file = helpers.wait, helpers.write_file
+
+local function ls_dir_sorted(dirname)
+  local files = {}
+  for f in lfs.dir(dirname) do
+    if f ~= "." and f~= ".." then
+      table.insert(files, f)
+    end
+  end
+  table.sort(files)
+  return files
+end
+
+describe("'directory' option", function()
+  setup(function()
+    local text = [[
+      start of testfile
+      line 2 Abcdefghij
+      line 3 Abcdefghij
+      end of testfile
+      ]]
+    write_file('Xtest1', text)
+    lfs.mkdir('Xtest.je')
+    lfs.mkdir('Xtest2')
+    write_file('Xtest2/Xtest3', text)
+    clear()
+  end)
+  teardown(function()
+    execute('qall!')
+    helpers.rmdir('Xtest.je')
+    helpers.rmdir('Xtest2')
+    os.remove('Xtest1')
+  end)
+
+  it('is working', function()
+    insert([[
+      start of testfile
+      line 2 Abcdefghij
+      line 3 Abcdefghij
+      end of testfile]])
+
+    execute('set swapfile')
+    execute('set dir=.,~')
+
+    -- sanity check: files should not exist yet.
+    eq(nil, lfs.attributes('.Xtest1.swp'))
+
+    execute('e! Xtest1')
+    wait()
+    eq('Xtest1', eval('buffer_name("%")'))
+    -- Verify that the swapfile exists. In the legacy test this was done by
+    -- reading the output from :!ls.
+    neq(nil, lfs.attributes('.Xtest1.swp'))
+
+    execute('set dir=./Xtest2,.,~')
+    execute('e Xtest1')
+    wait()
+
+    -- swapfile should no longer exist in CWD.
+    eq(nil, lfs.attributes('.Xtest1.swp'))
+
+    eq({ "Xtest1.swp", "Xtest3" }, ls_dir_sorted("Xtest2"))
+
+    execute('set dir=Xtest.je,~')
+    execute('e Xtest2/Xtest3')
+    eq(1, eval('&swapfile'))
+    wait()
+
+    eq({ "Xtest3" }, ls_dir_sorted("Xtest2"))
+    eq({ "Xtest3.swp" }, ls_dir_sorted("Xtest.je"))
+  end)
+end)
diff --git a/test/functional/legacy/015_alignment_spec.lua b/test/functional/legacy/015_alignment_spec.lua
index 3b19f4ff42..48d4042ff2 100644
--- a/test/functional/legacy/015_alignment_spec.lua
+++ b/test/functional/legacy/015_alignment_spec.lua
@@ -2,7 +2,7 @@
 -- Also test formatting a paragraph.
 -- Also test undo after ":%s" and formatting.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/018_unset_smart_indenting_spec.lua b/test/functional/legacy/018_unset_smart_indenting_spec.lua
index 6975cb7f26..ba1eac02cb 100644
--- a/test/functional/legacy/018_unset_smart_indenting_spec.lua
+++ b/test/functional/legacy/018_unset_smart_indenting_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for not doing smart indenting when it isn't set.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/019_smarttab_expandtab_spec.lua b/test/functional/legacy/019_smarttab_expandtab_spec.lua
index a33bd0c3ae..2287a9f786 100644
--- a/test/functional/legacy/019_smarttab_expandtab_spec.lua
+++ b/test/functional/legacy/019_smarttab_expandtab_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for "r<Tab>" with 'smarttab' and 'expandtab' set/not set.
 -- Also test that dv_ works correctly
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/020_blockwise_visual_spec.lua b/test/functional/legacy/020_blockwise_visual_spec.lua
index 95574a0957..660348a792 100644
--- a/test/functional/legacy/020_blockwise_visual_spec.lua
+++ b/test/functional/legacy/020_blockwise_visual_spec.lua
@@ -3,7 +3,7 @@
 -- First test for undo working properly when executing commands from a register.
 -- Also test this in an empty buffer.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/021_control_wi_spec.lua b/test/functional/legacy/021_control_wi_spec.lua
index 9fd83fec5f..787a384fca 100644
--- a/test/functional/legacy/021_control_wi_spec.lua
+++ b/test/functional/legacy/021_control_wi_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Tests for [ CTRL-I with a count and CTRL-W CTRL-I with a count
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/022_line_ending_spec.lua b/test/functional/legacy/022_line_ending_spec.lua
index a841378a82..092440bb16 100644
--- a/test/functional/legacy/022_line_ending_spec.lua
+++ b/test/functional/legacy/022_line_ending_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for file with some lines ending in CTRL-M, some not
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/023_edit_arguments_spec.lua b/test/functional/legacy/023_edit_arguments_spec.lua
index 15b30bfa3a..95ab983d24 100644
--- a/test/functional/legacy/023_edit_arguments_spec.lua
+++ b/test/functional/legacy/023_edit_arguments_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for complicated + argument to :edit command
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, insert = helpers.clear, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/025_jump_tag_hidden_spec.lua b/test/functional/legacy/025_jump_tag_hidden_spec.lua
index bd434c013c..99224f9e08 100644
--- a/test/functional/legacy/025_jump_tag_hidden_spec.lua
+++ b/test/functional/legacy/025_jump_tag_hidden_spec.lua
@@ -1,10 +1,12 @@
 -- Test for jumping to a tag with 'hidden' set, with symbolic link in path of tag.
 -- This only works for Unix, because of the symbolic link.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('jump to a tag with hidden set', function()
   setup(clear)
 
diff --git a/test/functional/legacy/026_execute_while_if_spec.lua b/test/functional/legacy/026_execute_while_if_spec.lua
index f17bb79702..74ef34bb20 100644
--- a/test/functional/legacy/026_execute_while_if_spec.lua
+++ b/test/functional/legacy/026_execute_while_if_spec.lua
@@ -1,6 +1,6 @@
 -- Test for :execute, :while and :if
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 local source = helpers.source
diff --git a/test/functional/legacy/027_expand_file_names_spec.lua b/test/functional/legacy/027_expand_file_names_spec.lua
deleted file mode 100644
index 4778d16d43..0000000000
--- a/test/functional/legacy/027_expand_file_names_spec.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- Test for expanding file names
-
-local helpers = require('test.functional.helpers')
-local clear, feed = helpers.clear, helpers.feed
-local execute = helpers.execute
-local curbuf_contents = helpers.curbuf_contents
-local eq = helpers.eq
-
-describe('expand file name', function()
-  setup(clear)
-
-  it('is working', function()
-    execute('!mkdir Xdir1')
-    execute('!mkdir Xdir2')
-    execute('!mkdir Xdir3')
-    execute('cd Xdir3')
-    execute('!mkdir Xdir4')
-    execute('cd ..')
-    execute('w Xdir1/file')
-    execute('w Xdir3/Xdir4/file')
-    execute('n Xdir?/*/file')
-
-    -- Yank current file path to @a register
-    feed('i<C-R>%<Esc>V"ad')
-
-    -- Put @a and current file path in the current buffer
-    execute('n! Xdir?/*/nofile')
-    feed('V"ap')
-    feed('o<C-R>%<Esc>')
-
-    eq("Xdir3/Xdir4/file\nXdir?/*/nofile", curbuf_contents())
-  end)
-
-  teardown(function()
-    os.execute('rm -rf Xdir1 Xdir2 Xdir3')
-  end)
-end)
diff --git a/test/functional/legacy/028_source_ctrl_v_spec.lua b/test/functional/legacy/028_source_ctrl_v_spec.lua
index fc36b436ef..a8c43260be 100644
--- a/test/functional/legacy/028_source_ctrl_v_spec.lua
+++ b/test/functional/legacy/028_source_ctrl_v_spec.lua
@@ -1,6 +1,6 @@
 -- Test for sourcing a file with CTRL-V's at the end of the line
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/029_join_spec.lua b/test/functional/legacy/029_join_spec.lua
index 25a072ad6e..7a183fcbec 100644
--- a/test/functional/legacy/029_join_spec.lua
+++ b/test/functional/legacy/029_join_spec.lua
@@ -1,6 +1,6 @@
 -- Test for joining lines with marks in them (and with 'joinspaces' set/reset)
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/030_fileformats_spec.lua b/test/functional/legacy/030_fileformats_spec.lua
new file mode 100644
index 0000000000..5fd78b2c59
--- /dev/null
+++ b/test/functional/legacy/030_fileformats_spec.lua
@@ -0,0 +1,377 @@
+-- Test for a lot of variations of the 'fileformats' option
+
+local helpers = require('test.functional.helpers')(after_each)
+local feed, clear, execute = helpers.feed, helpers.clear, helpers.execute
+local eq, write_file = helpers.eq, helpers.write_file
+
+if helpers.pending_win32(pending) then return end
+
+describe('fileformats option', function()
+  setup(function()
+    clear()
+    local dos = 'dos\r\ndos\r\n'
+    local mac = 'mac\rmac\r'
+    local unix = 'unix\nunix\n'
+    local eol = 'noeol'
+    write_file('XXDos', dos)
+    write_file('XXMac', mac)
+    write_file('XXUnix', unix)
+    write_file('XXEol', eol)
+    write_file('XXDosMac', dos..mac)
+    write_file('XXMacEol', mac..eol)
+    write_file('XXUxDs', unix..dos)
+    write_file('XXUxDsMc', unix..dos..mac)
+    write_file('XXUxMac', unix..mac)
+  end)
+
+  teardown(function()
+    os.remove('test.out')
+    os.remove('XXDos')
+    os.remove('XXMac')
+    os.remove('XXUnix')
+    os.remove('XXEol')
+    os.remove('XXDosMac')
+    os.remove('XXMacEol')
+    os.remove('XXUxDs')
+    os.remove('XXUxDsMc')
+    os.remove('XXUxMac')
+    for i = 0, 9 do
+      for j = 1, 4 do
+        os.remove('XXtt'..i..j)
+      end
+    end
+  end)
+
+  it('is working', function()
+
+    -- Try reading and writing with 'fileformats' empty.
+    execute('set fileformats=')
+    execute('set fileformat=unix')
+    execute('e! XXUnix')
+    execute('w! test.out')
+    execute('e! XXDos')
+    execute('w! XXtt01')
+    execute('e! XXMac')
+    execute('w! XXtt02')
+    execute('bwipe XXUnix XXDos XXMac')
+    execute('set fileformat=dos')
+    execute('e! XXUnix')
+    execute('w! XXtt11')
+    execute('e! XXDos')
+    execute('w! XXtt12')
+    execute('e! XXMac')
+    execute('w! XXtt13')
+    execute('bwipe XXUnix XXDos XXMac')
+    execute('set fileformat=mac')
+    execute('e! XXUnix')
+    execute('w! XXtt21')
+    execute('e! XXDos')
+    execute('w! XXtt22')
+    execute('e! XXMac')
+    execute('w! XXtt23')
+    execute('bwipe XXUnix XXDos XXMac')
+
+    -- Try reading and writing with 'fileformats' set to one format.
+    execute('set fileformats=unix')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt31')
+    execute('bwipe XXUxDsMc')
+    execute('set fileformats=dos')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt32')
+    execute('bwipe XXUxDsMc')
+    execute('set fileformats=mac')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt33')
+    execute('bwipe XXUxDsMc')
+
+    -- Try reading and writing with 'fileformats' set to two formats.
+    execute('set fileformats=unix,dos')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt41')
+    execute('bwipe XXUxDsMc')
+    execute('e! XXUxMac')
+    execute('w! XXtt42')
+    execute('bwipe XXUxMac')
+    execute('e! XXDosMac')
+    execute('w! XXtt43')
+    execute('bwipe XXDosMac')
+    execute('set fileformats=unix,mac')
+    execute('e! XXUxDs')
+    execute('w! XXtt51')
+    execute('bwipe XXUxDs')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt52')
+    execute('bwipe XXUxDsMc')
+    execute('e! XXDosMac')
+    execute('w! XXtt53')
+    execute('bwipe XXDosMac')
+    execute('e! XXEol')
+    feed('ggO<C-R>=&ffs<CR>:<C-R>=&ff<CR><ESC>')
+    execute('w! XXtt54')
+    execute('bwipe XXEol')
+    execute('set fileformats=dos,mac')
+    execute('e! XXUxDs')
+    execute('w! XXtt61')
+    execute('bwipe XXUxDs')
+    execute('e! XXUxMac')
+    feed('ggO<C-R>=&ffs<CR>:<C-R>=&ff<CR><ESC>')
+    execute('w! XXtt62')
+    execute('bwipe XXUxMac')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt63')
+    execute('bwipe XXUxDsMc')
+    execute('e! XXMacEol')
+    feed('ggO<C-R>=&ffs<CR>:<C-R>=&ff<CR><ESC>')
+    execute('w! XXtt64')
+    execute('bwipe XXMacEol')
+
+    -- Try reading and writing with 'fileformats' set to three formats.
+    execute('set fileformats=unix,dos,mac')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt71')
+    execute('bwipe XXUxDsMc')
+    execute('e! XXEol')
+    feed('ggO<C-R>=&ffs<CR>:<C-R>=&ff<CR><ESC>')
+    execute('w! XXtt72')
+    execute('bwipe XXEol')
+    execute('set fileformats=mac,dos,unix')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt81')
+    execute('bwipe XXUxDsMc')
+    execute('e! XXEol')
+    feed('ggO<C-R>=&ffs<CR>:<C-R>=&ff<CR><ESC>')
+    execute('w! XXtt82')
+    execute('bwipe XXEol')
+    -- Try with 'binary' set.
+    execute('set fileformats=mac,unix,dos')
+    execute('set binary')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt91')
+    execute('bwipe XXUxDsMc')
+    execute('set fileformats=mac')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt92')
+    execute('bwipe XXUxDsMc')
+    execute('set fileformats=dos')
+    execute('e! XXUxDsMc')
+    execute('w! XXtt93')
+
+    -- Append "END" to each file so that we can see what the last written
+    -- char was.
+    execute('set fileformat=unix nobin')
+    feed('ggdGaEND<esc>')
+    execute('w >>XXtt01')
+    execute('w >>XXtt02')
+    execute('w >>XXtt11')
+    execute('w >>XXtt12')
+    execute('w >>XXtt13')
+    execute('w >>XXtt21')
+    execute('w >>XXtt22')
+    execute('w >>XXtt23')
+    execute('w >>XXtt31')
+    execute('w >>XXtt32')
+    execute('w >>XXtt33')
+    execute('w >>XXtt41')
+    execute('w >>XXtt42')
+    execute('w >>XXtt43')
+    execute('w >>XXtt51')
+    execute('w >>XXtt52')
+    execute('w >>XXtt53')
+    execute('w >>XXtt54')
+    execute('w >>XXtt61')
+    execute('w >>XXtt62')
+    execute('w >>XXtt63')
+    execute('w >>XXtt64')
+    execute('w >>XXtt71')
+    execute('w >>XXtt72')
+    execute('w >>XXtt81')
+    execute('w >>XXtt82')
+    execute('w >>XXtt91')
+    execute('w >>XXtt92')
+    execute('w >>XXtt93')
+
+    -- Concatenate the results.
+    -- Make fileformat of test.out the native fileformat.
+    -- Add a newline at the end.
+    execute('set binary')
+    execute('e! test.out')
+    execute('$r XXtt01')
+    execute('$r XXtt02')
+    feed('Go1<esc>')
+    execute('$r XXtt11')
+    execute('$r XXtt12')
+    execute('$r XXtt13')
+    feed('Go2<esc>')
+    execute('$r XXtt21')
+    execute('$r XXtt22')
+    execute('$r XXtt23')
+    feed('Go3<esc>')
+    execute('$r XXtt31')
+    execute('$r XXtt32')
+    execute('$r XXtt33')
+    feed('Go4<esc>')
+    execute('$r XXtt41')
+    execute('$r XXtt42')
+    execute('$r XXtt43')
+    feed('Go5<esc>')
+    execute('$r XXtt51')
+    execute('$r XXtt52')
+    execute('$r XXtt53')
+    execute('$r XXtt54')
+    feed('Go6<esc>')
+    execute('$r XXtt61')
+    execute('$r XXtt62')
+    execute('$r XXtt63')
+    execute('$r XXtt64')
+    feed('Go7<esc>')
+    execute('$r XXtt71')
+    execute('$r XXtt72')
+    feed('Go8<esc>')
+    execute('$r XXtt81')
+    execute('$r XXtt82')
+    feed('Go9<esc>')
+    execute('$r XXtt91')
+    execute('$r XXtt92')
+    execute('$r XXtt93')
+    feed('Go10<esc>')
+    execute('$r XXUnix')
+    execute('set nobinary ff&')
+
+    -- Assert buffer contents.  This has to be done manually as
+    -- helpers.expect() calls helpers.dedent() which messes up the white space
+    -- and carrige returns.
+    eq(
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'END\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      '1\n'..
+      'unix\r\n'..
+      'unix\r\n'..
+      'END\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'END\n'..
+      'mac\rmac\r\r\n'..
+      'END\n'..
+      '2\n'..
+      'unix\n'..
+      'unix\n'..
+      '\rEND\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      '\rEND\n'..
+      'mac\rmac\rEND\n'..
+      '3\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'unix\r\n'..
+      'unix\r\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\r\n'..
+      'END\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\rEND\n'..
+      '4\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'unix\n'..
+      'unix\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\r\n'..
+      'END\n'..
+      '5\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'END\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\rEND\n'..
+      'unix,mac:unix\n'..
+      'noeol\n'..
+      'END\n'..
+      '6\n'..
+      'unix\r\n'..
+      'unix\r\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'END\n'..
+      'dos,mac:dos\r\n'..
+      'unix\r\n'..
+      'unix\r\n'..
+      'mac\rmac\r\r\n'..
+      'END\n'..
+      'unix\r\n'..
+      'unix\r\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\r\n'..
+      'END\n'..
+      'dos,mac:mac\rmac\rmac\rnoeol\rEND\n'..
+      '7\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'unix,dos,mac:unix\n'..
+      'noeol\n'..
+      'END\n'..
+      '8\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\r\n'..
+      'END\n'..
+      'mac,dos,unix:mac\rnoeol\rEND\n'..
+      '9\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\rEND\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\rEND\n'..
+      'unix\n'..
+      'unix\n'..
+      'dos\r\n'..
+      'dos\r\n'..
+      'mac\rmac\rEND\n'..
+      '10\n'..
+      'unix\n'..
+      'unix',
+      helpers.curbuf_contents())
+  end)
+end)
diff --git a/test/functional/legacy/031_close_commands_spec.lua b/test/functional/legacy/031_close_commands_spec.lua
index b79b1903ba..d41eadaa00 100644
--- a/test/functional/legacy/031_close_commands_spec.lua
+++ b/test/functional/legacy/031_close_commands_spec.lua
@@ -9,12 +9,28 @@
 -- :buf
 -- :edit
 
-local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local helpers = require('test.functional.helpers')(after_each)
+
+local feed = helpers.feed
+local clear = helpers.clear
+local source = helpers.source
+local insert = helpers.insert
+local expect = helpers.expect
+local execute = helpers.execute
 
 describe('Commands that close windows and/or buffers', function()
-  setup(clear)
+  local function cleanup()
+    os.remove('Xtest1')
+    os.remove('Xtest2')
+    os.remove('Xtest3')
+  end
+  setup(function()
+    cleanup()
+    clear()
+  end)
+  teardown(function()
+    cleanup()
+  end)
 
   it('is working', function()
     insert('testtext')
@@ -107,10 +123,4 @@ describe('Commands that close windows and/or buffers', function()
       " Now nvim should have exited
       throw "Oh, Not finished yet."]])
   end)
-
-  teardown(function()
-    os.remove('Xtest1')
-    os.remove('Xtest2')
-    os.remove('Xtest3')
-  end)
 end)
diff --git a/test/functional/legacy/033_lisp_indent_spec.lua b/test/functional/legacy/033_lisp_indent_spec.lua
index 0a5577fad3..b4abb02ac2 100644
--- a/test/functional/legacy/033_lisp_indent_spec.lua
+++ b/test/functional/legacy/033_lisp_indent_spec.lua
@@ -2,7 +2,7 @@
 -- Test for 'lisp'
 -- If the lisp feature is not enabled, this will fail!
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/034_user_function_spec.lua b/test/functional/legacy/034_user_function_spec.lua
new file mode 100644
index 0000000000..38989cd982
--- /dev/null
+++ b/test/functional/legacy/034_user_function_spec.lua
@@ -0,0 +1,102 @@
+-- Test for user functions.
+-- Also test an <expr> mapping calling a function.
+-- Also test that a builtin function cannot be replaced.
+-- Also test for regression when calling arbitrary expression.
+
+local helpers = require('test.functional.helpers')(after_each)
+local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+
+describe('user functions, expr-mappings, overwrite protected builtin functions and regression on calling expressions', function()
+  setup(clear)
+
+  it('are working', function()
+    insert('here')
+
+    source([[
+      function Table(title, ...)
+        let ret = a:title
+        let idx = 1
+        while idx <= a:0
+          exe "let ret = ret . a:" . idx
+          let idx = idx + 1
+        endwhile
+        return ret
+      endfunction
+      function Compute(n1, n2, divname)
+        if a:n2 == 0
+          return "fail"
+        endif
+        exe "let g:" . a:divname . " = ". a:n1 / a:n2
+        return "ok"
+      endfunction
+      func Expr1()
+        normal! v
+        return "111"
+      endfunc
+      func Expr2()
+        call search('XX', 'b')
+        return "222"
+      endfunc
+      func ListItem()
+        let g:counter += 1
+        return g:counter . '. '
+      endfunc
+      func ListReset()
+        let g:counter = 0
+        return ''
+      endfunc
+      func FuncWithRef(a)
+        unlet g:FuncRef
+        return a:a
+      endfunc
+      let g:FuncRef=function("FuncWithRef")
+      let counter = 0
+      inoremap <expr> ( ListItem()
+      inoremap <expr> [ ListReset()
+      imap <expr> + Expr1()
+      imap <expr> * Expr2()
+      let retval = "nop"
+      /^here
+    ]])
+    feed('C<C-R>=Table("xxx", 4, "asdf")<cr>')
+    -- Using a actual space will not work as feed() calls dedent on the input.
+    feed('<space><C-R>=Compute(45, 0, "retval")<cr>')
+    feed('<space><C-R>=retval<cr>')
+    feed('<space><C-R>=Compute(45, 5, "retval")<cr>')
+    feed('<space><C-R>=retval<cr>')
+    feed('<space><C-R>=g:FuncRef(333)<cr>')
+    feed('<cr>')
+    feed('XX+-XX<cr>')
+    feed('---*---<cr>')
+    feed('(one<cr>')
+    feed('(two<cr>')
+    feed('[(one again<esc>')
+    execute('call append(line("$"), max([1, 2, 3]))')
+    execute('call extend(g:, {"max": function("min")})')
+    execute('call append(line("$"), max([1, 2, 3]))')
+    execute('try')
+    -- Regression: the first line below used to throw "E110: Missing ')'"
+    -- Second is here just to prove that this line is correct when not
+    -- skipping rhs of &&.
+    execute([[    $put =(0&&(function('tr'))(1, 2, 3))]])
+    execute([[    $put =(1&&(function('tr'))(1, 2, 3))]])
+    execute('catch')
+    execute([[    $put ='!!! Unexpected exception:']])
+    execute('    $put =v:exception')
+    execute('endtry')
+
+    -- Assert buffer contents.
+    expect([[
+      xxx4asdf fail nop ok 9 333
+      XX111-XX
+      ---222---
+      1. one
+      2. two
+      1. one again
+      3
+      3
+      0
+      1]])
+  end)
+end)
diff --git a/test/functional/legacy/035_increment_and_decrement_spec.lua b/test/functional/legacy/035_increment_and_decrement_spec.lua
index e6252c384b..3b9f7a9d85 100644
--- a/test/functional/legacy/035_increment_and_decrement_spec.lua
+++ b/test/functional/legacy/035_increment_and_decrement_spec.lua
@@ -1,7 +1,7 @@
 -- Test Ctrl-A and Ctrl-X, which increment and decrement decimal, hexadecimal,
 -- and octal numbers.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/036_regexp_character_classes_spec.lua b/test/functional/legacy/036_regexp_character_classes_spec.lua
index de080f4b43..15287b9901 100644
--- a/test/functional/legacy/036_regexp_character_classes_spec.lua
+++ b/test/functional/legacy/036_regexp_character_classes_spec.lua
@@ -1,9 +1,8 @@
 -- Test character classes in regexp using regexpengine 0, 1, 2.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local source, write_file = helpers.source, helpers.write_file
-local os_name = helpers.os_name
 
 local function sixlines(text)
     local result = ''
@@ -14,19 +13,16 @@ local function sixlines(text)
 end
 
 local function diff(text, nodedent)
-  local tmpname = os.tmpname()
-  if os_name() == 'osx' and string.match(tmpname, '^/tmp') then
-   tmpname = '/private'..tmpname
-  end
-  execute('w! '..tmpname)
+  local fname = helpers.tmpname()
+  execute('w! '..fname)
   helpers.wait()
-  local data = io.open(tmpname):read('*all')
+  local data = io.open(fname):read('*all')
   if nodedent then
     helpers.eq(text, data)
   else
     helpers.eq(helpers.dedent(text), data)
   end
-  os.remove(tmpname)
+  os.remove(fname)
 end
 
 describe('character classes in regexp', function()
@@ -268,4 +264,15 @@ describe('character classes in regexp', function()
       ABCDEFGHIXYZ
       ABCDEFGHIXYZ]])
   end)
+  it([["\%1l^#.*" does not match on a line starting with "#". (vim-patch:7.4.1305)]], function()
+    source([[
+      1 s/\%#=0\%1l^\t...//g
+      2 s/\%#=1\%2l^\t...//g
+      3 s/\%#=2\%3l^\t...//g
+      4 s/\%#=0\%4l^\t...//g
+      5 s/\%#=1\%5l^\t...//g
+      6 s/\%#=2\%6l^\t...//g]])
+    diff(sixlines(string.sub(punct1, 1)..digits..punct2..upper..punct3..
+      lower..punct4..ctrl2..iso_text))
+  end)
 end)
diff --git a/test/functional/legacy/038_virtual_replace_spec.lua b/test/functional/legacy/038_virtual_replace_spec.lua
index 10d42f0cea..dcbc9c39f7 100644
--- a/test/functional/legacy/038_virtual_replace_spec.lua
+++ b/test/functional/legacy/038_virtual_replace_spec.lua
@@ -1,6 +1,6 @@
 -- Test Virtual replace mode.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed = helpers.feed
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/039_visual_block_mode_commands_spec.lua b/test/functional/legacy/039_visual_block_mode_commands_spec.lua
index 7195d7d11d..63335985cc 100644
--- a/test/functional/legacy/039_visual_block_mode_commands_spec.lua
+++ b/test/functional/legacy/039_visual_block_mode_commands_spec.lua
@@ -1,7 +1,7 @@
 -- Test Visual block mode commands
 -- And test "U" in Visual mode, also on German sharp S.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim, eq = helpers.meths, helpers.eq
 local insert, feed = helpers.insert, helpers.feed
 local clear, expect = helpers.clear, helpers.expect
diff --git a/test/functional/legacy/041_writing_and_reading_hundred_kbyte_spec.lua b/test/functional/legacy/041_writing_and_reading_hundred_kbyte_spec.lua
index 42fb5ed2b3..b6451eb720 100644
--- a/test/functional/legacy/041_writing_and_reading_hundred_kbyte_spec.lua
+++ b/test/functional/legacy/041_writing_and_reading_hundred_kbyte_spec.lua
@@ -1,6 +1,6 @@
 -- Test for writing and reading a file of over 100 Kbyte
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/043_magic_settings_spec.lua b/test/functional/legacy/043_magic_settings_spec.lua
index 27694e3754..f174751de2 100644
--- a/test/functional/legacy/043_magic_settings_spec.lua
+++ b/test/functional/legacy/043_magic_settings_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Tests for regexp with various magic settings.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
index 2a4c0149fa..c6883e4902 100644
--- a/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
+++ b/test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua
@@ -3,7 +3,7 @@
 --
 -- This test contains both "test44" and "test99" from the old test suite.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
@@ -28,8 +28,6 @@ local function run_test_with_regexpengine(regexpengine)
     e ������y
     f ������z
     g a啷bb
-    h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ
-    i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ
     j 0123❤x
     k combinations
     l ä ö ü ᾱ̆́]])
@@ -68,14 +66,6 @@ local function run_test_with_regexpengine(regexpengine)
   feed([[/\%U12345678<cr>x]])
   feed([[/[\U1234abcd\u1234\uabcd]<cr>x]])
   feed([[/\%d21879b<cr>x]])
-  feed('/ [[=A=]]* [[=B=]]* [[=C=]]* [[=D=]]* [[=E=]]* [[=F=]]* ' ..
-    '[[=G=]]* [[=H=]]* [[=I=]]* [[=J=]]* [[=K=]]* [[=L=]]* [[=M=]]* ' ..
-    '[[=N=]]* [[=O=]]* [[=P=]]* [[=Q=]]* [[=R=]]* [[=S=]]* [[=T=]]* ' ..
-    '[[=U=]]* [[=V=]]* [[=W=]]* [[=X=]]* [[=Y=]]* [[=Z=]]*/e<cr>x')
-  feed('/ [[=a=]]* [[=b=]]* [[=c=]]* [[=d=]]* [[=e=]]* [[=f=]]* ' ..
-    '[[=g=]]* [[=h=]]* [[=i=]]* [[=j=]]* [[=k=]]* [[=l=]]* [[=m=]]* ' ..
-    '[[=n=]]* [[=o=]]* [[=p=]]* [[=q=]]* [[=r=]]* [[=s=]]* [[=t=]]* ' ..
-    '[[=u=]]* [[=v=]]* [[=w=]]* [[=x=]]* [[=y=]]* [[=z=]]*/e<cr>x')
 
   -- Line j. Test backwards search from a multi-byte character.
   feed('/x<cr>x')
@@ -125,8 +115,6 @@ local function run_test_with_regexpengine(regexpengine)
     e y
     f z
     g abb
-    h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐ
-    i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑ
     j 012❤
     k œ̄ṣ́m̥̄ᾱ̆́
      l ä ö ü ᾱ̆́
diff --git a/test/functional/legacy/045_folding_spec.lua b/test/functional/legacy/045_folding_spec.lua
index 04b623ff3b..cefd7c0d42 100644
--- a/test/functional/legacy/045_folding_spec.lua
+++ b/test/functional/legacy/045_folding_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for folding.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, clear, execute, expect =
   helpers.feed, helpers.insert, helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/046_multi_line_regexps_spec.lua b/test/functional/legacy/046_multi_line_regexps_spec.lua
index b17ab42fe3..30ec76ea3e 100644
--- a/test/functional/legacy/046_multi_line_regexps_spec.lua
+++ b/test/functional/legacy/046_multi_line_regexps_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Tests for multi-line regexps with ":s"
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local expect = helpers.expect
 
diff --git a/test/functional/legacy/051_highlight_spec.lua b/test/functional/legacy/051_highlight_spec.lua
index 94c42b73e5..ef392d8c67 100644
--- a/test/functional/legacy/051_highlight_spec.lua
+++ b/test/functional/legacy/051_highlight_spec.lua
@@ -2,11 +2,13 @@
 -- Tests for ":highlight".
 
 local Screen = require('test.functional.ui.screen')
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
 local wait = helpers.wait
 
+if helpers.pending_win32(pending) then return end
+
 describe(':highlight', function()
   setup(clear)
 
diff --git a/test/functional/legacy/054_buffer_local_autocommands_spec.lua b/test/functional/legacy/054_buffer_local_autocommands_spec.lua
index bcedb26b7e..494ea8f927 100644
--- a/test/functional/legacy/054_buffer_local_autocommands_spec.lua
+++ b/test/functional/legacy/054_buffer_local_autocommands_spec.lua
@@ -1,6 +1,6 @@
 -- Some tests for buffer-local autocommands
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, eq = helpers.clear, helpers.execute, helpers.eq
 local curbuf_contents = helpers.curbuf_contents
 
diff --git a/test/functional/legacy/055_list_and_dict_types_spec.lua b/test/functional/legacy/055_list_and_dict_types_spec.lua
new file mode 100644
index 0000000000..dbe9e1bc7f
--- /dev/null
+++ b/test/functional/legacy/055_list_and_dict_types_spec.lua
@@ -0,0 +1,922 @@
+-- Tests for List and Dictionary types.
+
+local helpers = require('test.functional.helpers')(after_each)
+local feed, source = helpers.feed, helpers.source
+local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+
+describe('list and dictionary types', function()
+  before_each(clear)
+
+  it('creating list directly with different types', function()
+    source([[
+      lang C
+      let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
+      $put =string(l)
+      $put =string(l[-1])
+      $put =string(l[-4])
+      try
+        $put =string(l[-5])
+      catch
+        $put =v:exception[:14]
+      endtry]])
+    expect([[
+      
+      [1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
+      {'a': 1}
+      1
+      Vim(put):E684: ]])
+  end)
+
+  it('list slices', function()
+    source([[
+      lang C
+      " The list from the first test repeated after splitting the tests.
+      let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
+      $put =string(l[:])
+      $put =string(l[1:])
+      $put =string(l[:-2])
+      $put =string(l[0:8])
+      $put =string(l[8:-1])]])
+    expect([=[
+      
+      [1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
+      ['as''d', [1, 2, function('strlen')], {'a': 1}]
+      [1, 'as''d', [1, 2, function('strlen')]]
+      [1, 'as''d', [1, 2, function('strlen')], {'a': 1}]
+      []]=])
+  end)
+
+  it('list identity', function()
+    source([[
+      lang C
+      " The list from the first test repeated after splitting the tests.
+      let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
+      let ll = l
+      let lx = copy(l)
+      try
+	      $put =(l == ll) . (l isnot ll) . (l is ll) . (l == lx) .
+	        \ (l is lx) . (l isnot lx)
+      catch
+	      $put =v:exception
+      endtry]])
+    expect('\n101101')
+  end)
+
+  it('creating dictionary directly with different types', function()
+    source([[
+      lang C
+      let d = {001: 'asd', 'b': [1, 2, function('strlen')], -1: {'a': 1},}
+      $put =string(d) . d.1
+      $put =string(sort(keys(d)))
+      $put =string (values(d))
+      for [key, val] in items(d)
+	      $put =key . ':' . string(val)
+	      unlet key val
+      endfor
+      call extend  (d, {3:33, 1:99})
+      call extend(d, {'b':'bbb', 'c':'ccc'}, "keep")
+      try
+	      call extend(d, {3:333,4:444}, "error")
+      catch
+	      $put =v:exception[:15] . v:exception[-1:-1]
+      endtry
+      $put =string(d)
+      call filter(d, 'v:key =~ ''[ac391]''')
+      $put =string(d)]])
+    expect([[
+      
+      {'1': 'asd', 'b': [1, 2, function('strlen')], '-1': {'a': 1}}asd
+      ['-1', '1', 'b']
+      ['asd', [1, 2, function('strlen')], {'a': 1}]
+      1:'asd'
+      b:[1, 2, function('strlen')]
+      -1:{'a': 1}
+      Vim(call):E737: 3
+      {'c': 'ccc', '1': 99, 'b': [1, 2, function('strlen')], '3': 33, '-1': {'a': 1}}
+      {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}}]])
+  end)
+
+  it('dictionary identity', function()
+    source([[
+      lang C
+      " The dict from the first test repeated after splitting the tests.
+      let d = {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}}
+      let dd = d
+      let dx = copy(d)
+      try
+	      $put =(d == dd) . (d isnot dd) . (d is dd) . (d == dx) . (d is dx) .
+	        \ (d isnot dx)
+      catch
+	      $put =v:exception
+      endtry]])
+    expect('\n101101')
+  end)
+
+  it('removing items with :unlet', function()
+    source([[
+      lang C
+      " The list from the first test repeated after splitting the tests.
+      let l = [1, 'as''d', [1, 2, function("strlen")], {'a': 1},]
+      " The dict from the first test repeated after splitting the tests.
+      let d = {'c': 'ccc', '1': 99, '3': 33, '-1': {'a': 1}}
+      unlet l[2]
+      $put =string(l)
+      let l = range(8)
+      try
+	      unlet l[:3]
+	      unlet l[1:]
+      catch
+	      $put =v:exception
+      endtry
+      $put =string(l)
+
+      unlet d.c
+      unlet d[-1]
+      $put =string(d)]])
+    expect([[
+      
+      [1, 'as''d', {'a': 1}]
+      [4]
+      {'1': 99, '3': 33}]])
+  end)
+
+  it("removing items out of range: silently skip items that don't exist", function()
+    -- We can not use source() here as we want to ignore all errors.
+    execute('lang C')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[2:1]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[2:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[2:3]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[2:4]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[2:5]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-1:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-2:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-3:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-4:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-5:2]')
+    execute('$put =string(l)')
+    execute('let l = [0, 1, 2, 3]')
+    execute('unlet l[-6:2]')
+    execute('$put =string(l)')
+    expect([=[
+      
+      [0, 1, 2, 3]
+      [0, 1, 3]
+      [0, 1]
+      [0, 1]
+      [0, 1]
+      [0, 1, 2, 3]
+      [0, 1, 3]
+      [0, 3]
+      [3]
+      [3]
+      [3]]=])
+  end)
+
+  it('assignment to a list', function()
+    source([[
+      let l = [0, 1, 2, 3]
+      let [va, vb] = l[2:3]
+      $put =va
+      $put =vb
+      try
+	      let [va, vb] = l
+      catch
+	      $put =v:exception[:14]
+      endtry
+      try
+	      let [va, vb] = l[1:1]
+      catch
+	      $put =v:exception[:14]
+      endtry]])
+    expect([[
+      
+      2
+      3
+      Vim(let):E687: 
+      Vim(let):E688: ]])
+  end)
+
+  it('manipulating a big dictionary', function()
+    -- Manipulating a big Dictionary (hashtable.c has a border of 1000
+    -- entries).
+    source([[
+      let d = {}
+      for i in range(1500)
+	      let d[i] = 3000 - i
+      endfor
+      $put =d[0] . ' ' . d[100] . ' ' . d[999] . ' ' . d[1400] . ' ' .
+	      \ d[1499]
+      try
+	      let n = d[1500]
+      catch
+	      $put =substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '')
+      endtry
+      " Lookup each items.
+      for i in range(1500)
+	      if d[i] != 3000 - i
+	        $put =d[i]
+	      endif
+      endfor
+      let i += 1
+      " Delete even items.
+      while i >= 2
+	      let i -= 2
+	      unlet d[i]
+      endwhile
+      $put =get(d, 1500 - 100, 'NONE') . ' ' . d[1]
+      " Delete odd items, checking value, one intentionally wrong.
+      let d[33] = 999
+      let i = 1
+      while i < 1500
+	      if d[i] != 3000 - i
+	        $put =i . '=' . d[i]
+	      else
+	        unlet d[i]
+	      endif
+	      let i += 2
+      endwhile
+      " Must be almost empty now.
+      $put =string(d)]])
+    expect([[
+      
+      3000 2900 2001 1600 1501
+      Vim(let):E716: 1500
+      NONE 2999
+      33=999
+      {'33': 999}]])
+  end)
+
+  it('dictionary function', function()
+    source([[
+      let dict = {}
+      func dict.func(a) dict
+	      $put =a:a . len(self.data)
+      endfunc
+      let dict.data = [1,2,3]
+      call dict.func("len: ")
+      let x = dict.func("again: ")
+      let Fn = dict.func
+      call Fn('xxx')]])
+    expect([[
+      
+      len: 3
+      again: 3
+      xxx3]])
+  end)
+
+  it('Function in script-local List or Dict', function()
+    source([[
+      let g:dict = {}
+      function g:dict.func() dict
+	      $put ='g:dict.func'.self.foo[1].self.foo[0]('asdf')
+      endfunc
+      let g:dict.foo = ['-', 2, 3]
+      call insert(g:dict.foo, function('strlen'))
+      call g:dict.func()]])
+    expect('\ng:dict.func-4')
+  end)
+
+  it("remove func from dict that's being called (works)", function()
+    source([[
+      let d = {1:1}
+      func d.func(a)
+	      return "a:". a:a
+      endfunc
+      $put =d.func(string(remove(d, 'func')))]])
+    -- The function number changed from 3 to 1 because we split the test.
+    -- There were two other functions in the old test before this.
+    expect("\na:function('1')")
+  end)
+
+  it('deepcopy() dict that refers to itself', function()
+    -- Nasty: deepcopy() dict that refers to itself (fails when noref used).
+    source([[
+      let d = {1:1, 2:2}
+      let l = [4, d, 6]
+      let d[3] = l
+      let dc = deepcopy(d)
+      try
+	      let dc = deepcopy(d, 1)
+      catch
+	      $put =v:exception[:14]
+      endtry
+      let l2 = [0, l, l, 3]
+      let l[1] = l2
+      let l3 = deepcopy(l2)
+      $put ='same list: ' . (l3[1] is l3[2])]])
+    expect([[
+      
+      Vim(let):E698: 
+      same list: 1]])
+  end)
+
+  it('locked variables (part 1)', function()
+    source([=[
+      let l = []
+      for depth in range(5)
+	      $put ='depth is ' . depth
+	      for u in range(3)
+	        unlet l
+	        let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
+	        exe "lockvar " . depth . " l"
+	        if u == 1
+	          exe "unlockvar l"
+	        elseif u == 2
+	          exe "unlockvar " . depth . " l"
+	        endif
+	        let ps = islocked("l") . islocked("l[1]") . islocked("l[1][1]") .
+	          \ islocked("l[1][1][0]") . '-' . islocked("l[2]") .
+	          \ islocked("l[2]['6']") . islocked("l[2]['6'][7]")
+	        $put =ps
+	        let ps = ''
+	        try
+	          let l[1][1][0] = 99
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l[1][1] = [99]
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l[1] = [99]
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l[2]['6'][7] = 99
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l[2][6] = {99: 99}
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l[2] = {99: 99}
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        try
+	          let l = [99]
+	          let ps .= 'p'
+	        catch
+	          let ps .= 'F'
+	        endtry
+	        $put =ps
+	      endfor
+      endfor]=])
+    expect([[
+      
+      depth is 0
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 1
+      1000-000
+      ppppppF
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 2
+      1100-100
+      ppFppFF
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 3
+      1110-110
+      pFFpFFF
+      0010-010
+      pFppFpp
+      0000-000
+      ppppppp
+      depth is 4
+      1111-111
+      FFFFFFF
+      0011-011
+      FFpFFpp
+      0000-000
+      ppppppp]])
+  end)
+
+  -- TODO In the original test the 5th line of this source() call was used.
+  -- But now the test only passes if I comment it.
+  it('unletting locked variables', function()
+    source([=[
+      let l = []
+      for depth in range(5)
+        $put ='depth is ' . depth
+        for u in range(3)
+          "unlet l
+          let l = [0, [1, [2, 3]], {4: 5, 6: {7: 8}}]
+          exe "lockvar " . depth . " l"
+          if u == 1
+            exe "unlockvar l"
+          elseif u == 2
+            exe "unlockvar " . depth . " l"
+          endif
+          let ps = islocked("l") . islocked("l[1]") . islocked("l[1][1]") .
+	          \ islocked("l[1][1][0]") . '-' . islocked("l[2]") .
+	          \ islocked("l[2]['6']") . islocked("l[2]['6'][7]")
+          $put =ps
+          let ps = ''
+          try
+            unlet l[2]['6'][7]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l[2][6]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l[2]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l[1][1][0]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l[1][1]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l[1]
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          try
+            unlet l
+            let ps .= 'p'
+          catch
+            let ps .= 'F'
+          endtry
+          $put =ps
+        endfor
+      endfor]=])
+    expect([[
+      
+      depth is 0
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 1
+      1000-000
+      ppFppFp
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 2
+      1100-100
+      pFFpFFp
+      0000-000
+      ppppppp
+      0000-000
+      ppppppp
+      depth is 3
+      1110-110
+      FFFFFFp
+      0010-010
+      FppFppp
+      0000-000
+      ppppppp
+      depth is 4
+      1111-111
+      FFFFFFp
+      0011-011
+      FppFppp
+      0000-000
+      ppppppp]])
+  end)
+
+  it('locked variables and :unlet or list / dict functions', function()
+    source([[
+      $put ='Locks and commands or functions:'
+
+      $put ='No :unlet after lock on dict:'
+      unlet! d
+      let d = {'a': 99, 'b': 100}
+      lockvar 1 d
+      try
+        unlet d.a
+        $put ='did :unlet'
+      catch
+        $put =v:exception[:16]
+      endtry
+      $put =string(d)
+
+      $put =':unlet after lock on dict item:'
+      unlet! d
+      let d = {'a': 99, 'b': 100}
+      lockvar d.a
+      try
+        unlet d.a
+        $put ='did :unlet'
+      catch
+        $put =v:exception[:16]
+      endtry
+      $put =string(d)
+
+      $put ='filter() after lock on dict item:'
+      unlet! d
+      let d = {'a': 99, 'b': 100}
+      lockvar d.a
+      try
+        call filter(d, 'v:key != "a"')
+        $put ='did filter()'
+      catch
+        $put =v:exception[:16]
+      endtry
+      $put =string(d)
+
+      $put ='map() after lock on dict:'
+      unlet! d
+      let d = {'a': 99, 'b': 100}
+      lockvar 1 d
+      try
+        call map(d, 'v:val + 200')
+        $put ='did map()'
+      catch
+        $put =v:exception[:16]
+      endtry
+      $put =string(d)
+
+      $put ='No extend() after lock on dict item:'
+      unlet! d
+      let d = {'a': 99, 'b': 100}
+      lockvar d.a
+      try
+        $put =string(extend(d, {'a': 123}))
+        $put ='did extend()'
+      catch
+        $put =v:exception[:14]
+      endtry
+      $put =string(d)
+
+      $put ='No remove() of write-protected scope-level variable:'
+      fun! Tfunc(this_is_a_loooooooooong_parameter_name)
+        try
+          $put =string(remove(a:, 'this_is_a_loooooooooong_parameter_name'))
+          $put ='did remove()'
+        catch
+          $put =v:exception[:14]
+        endtry
+      endfun
+      call Tfunc('testval')
+
+      $put ='No extend() of write-protected scope-level variable:'
+      fun! Tfunc(this_is_a_loooooooooong_parameter_name)
+        try
+          $put =string(extend(a:, {'this_is_a_loooooooooong_parameter_name': 1234}))
+          $put ='did extend()'
+        catch
+          $put =v:exception[:14]
+        endtry
+      endfun
+      call Tfunc('testval')
+
+      $put ='No :unlet of variable in locked scope:'
+      let b:testvar = 123
+      lockvar 1 b:
+      try
+        unlet b:testvar
+        $put ='b:testvar was :unlet: '. (!exists('b:testvar'))
+      catch
+        $put =v:exception[:16]
+      endtry
+      unlockvar 1 b:
+      unlet! b:testvar
+
+      $put ='No :let += of locked list variable:'
+      let l = ['a', 'b', 3]
+      lockvar 1 l
+      try
+        let l += ['x']
+        $put ='did :let +='
+      catch
+        $put =v:exception[:14]
+      endtry
+      $put =string(l)]])
+
+    expect([=[
+      
+      Locks and commands or functions:
+      No :unlet after lock on dict:
+      Vim(unlet):E741: 
+      {'a': 99, 'b': 100}
+      :unlet after lock on dict item:
+      did :unlet
+      {'b': 100}
+      filter() after lock on dict item:
+      did filter()
+      {'b': 100}
+      map() after lock on dict:
+      did map()
+      {'a': 299, 'b': 300}
+      No extend() after lock on dict item:
+      Vim(put):E741: 
+      {'a': 99, 'b': 100}
+      No remove() of write-protected scope-level variable:
+      Vim(put):E795: 
+      No extend() of write-protected scope-level variable:
+      Vim(put):E742: 
+      No :unlet of variable in locked scope:
+      Vim(unlet):E741: 
+      No :let += of locked list variable:
+      Vim(let):E741: 
+      ['a', 'b', 3]]=])
+  end)
+
+  it('locked variables (part 2)', function()
+    execute(
+      'let l = [1, 2, 3, 4]',
+      'lockvar! l',
+      '$put =string(l)',
+      'unlockvar l[1]',
+      'unlet l[0:1]',
+      '$put =string(l)',
+      'unlet l[1:2]',
+      '$put =string(l)',
+      'unlockvar l[1]',
+      'let l[0:1] = [0, 1]',
+      '$put =string(l)',
+      'let l[1:2] = [0, 1]',
+      '$put =string(l)')
+    expect([=[
+      
+      [1, 2, 3, 4]
+      [1, 2, 3, 4]
+      [1, 2, 3, 4]
+      [1, 2, 3, 4]
+      [1, 2, 3, 4]]=])
+  end)
+
+  it(':lockvar/islocked() triggering script autoloading.', function()
+    source([[           
+      set rtp+=test/functional/fixtures
+      lockvar g:footest#x
+      unlockvar g:footest#x
+      $put ='locked g:footest#x:'.islocked('g:footest#x')
+      $put ='exists g:footest#x:'.exists('g:footest#x')
+      $put ='g:footest#x: '.g:footest#x]])
+    expect([[
+      
+      locked g:footest#x:-1
+      exists g:footest#x:0
+      g:footest#x: 1]])
+  end)
+
+  it('a:000 function argument', function()
+    source([[
+      function Test(...)
+        " First the tests that should fail.
+        try
+          let a:000 = [1, 2]
+        catch
+          $put ='caught a:000'
+        endtry
+        try
+          let a:000[0] = 9
+        catch
+          $put ='caught a:000[0]'
+        endtry
+        try
+          let a:000[2] = [9, 10]
+        catch
+          $put ='caught a:000[2]'
+        endtry
+        try
+          let a:000[3] = {9: 10}
+        catch
+          $put ='caught a:000[3]'
+        endtry
+        " Now the tests that should pass.
+        try
+          let a:000[2][1] = 9
+          call extend(a:000[2], [5, 6])
+          let a:000[3][5] = 8
+          let a:000[3]['a'] = 12
+          $put =string(a:000)
+        catch
+          $put ='caught ' . v:exception
+        endtry
+      endfunction]])
+    execute('call Test(1, 2, [3, 4], {5: 6})')
+    expect([=[
+      
+      caught a:000
+      caught a:000[0]
+      caught a:000[2]
+      caught a:000[3]
+      [1, 2, [3, 9, 5, 6], {'a': 12, '5': 8}]]=])
+  end)
+
+  it('reverse(), sort(), uniq()', function()
+    source([=[
+      let l = ['-0', 'A11', 2, 2, 'xaaa', 4, 'foo', 'foo6', 'foo',
+	      \ [0, 1, 2], 'x8', [0, 1, 2], 1.5]
+      $put =string(uniq(copy(l)))
+      $put =string(reverse(l))
+      $put =string(reverse(reverse(l)))
+      $put =string(sort(l))
+      $put =string(reverse(sort(l)))
+      $put =string(sort(reverse(sort(l))))
+      $put =string(uniq(sort(l)))
+      let l=[7, 9, 'one', 18, 12, 22, 'two', 10.0e-16, -1, 'three', 0xff,
+	      \ 0.22, 'four']
+      $put =string(sort(copy(l), 'n'))
+      let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'bar',
+	      \ 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', {}, []]
+      $put =string(sort(copy(l), 1))
+      $put =string(sort(copy(l), 'i'))
+      $put =string(sort(copy(l)))]=])
+    expect([=[
+      
+      ['-0', 'A11', 2, 'xaaa', 4, 'foo', 'foo6', 'foo', [0, 1, 2], 'x8', [0, 1, 2], 1.5]
+      [1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0']
+      [1.5, [0, 1, 2], 'x8', [0, 1, 2], 'foo', 'foo6', 'foo', 4, 'xaaa', 2, 2, 'A11', '-0']
+      ['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
+      [[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0']
+      ['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]]
+      ['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]]
+      [-1, 'one', 'two', 'three', 'four', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255]
+      ['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
+      ['bar', 'BAR', 'Bar', 'Foo', 'FOO', 'foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]
+      ['BAR', 'Bar', 'FOO', 'FOOBAR', 'Foo', 'bar', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}]]=])
+  end)
+
+  it('splitting a string to a list', function()
+    source([[
+      $put =string(split('  aa  bb '))
+      $put =string(split('  aa  bb  ', '\W\+', 0))
+      $put =string(split('  aa  bb  ', '\W\+', 1))
+      $put =string(split('  aa  bb  ', '\W', 1))
+      $put =string(split(':aa::bb:', ':', 0))
+      $put =string(split(':aa::bb:', ':', 1))
+      $put =string(split('aa,,bb, cc,', ',\s*', 1))
+      $put =string(split('abc', '\zs'))
+      $put =string(split('abc', '\zs', 1))]])
+    expect([=[
+      
+      ['aa', 'bb']
+      ['aa', 'bb']
+      ['', 'aa', 'bb', '']
+      ['', '', 'aa', '', 'bb', '', '']
+      ['aa', '', 'bb']
+      ['', 'aa', '', 'bb', '']
+      ['aa', '', 'bb', 'cc', '']
+      ['a', 'b', 'c']
+      ['', 'a', '', 'b', '', 'c', '']]=])
+  end)
+
+  it('compare recursively linked list and dict', function()
+    source([[
+      let l = [1, 2, 3, 4]
+      let d = {'1': 1, '2': l, '3': 3}
+      let l[1] = d
+      $put =(l == l)
+      $put =(d == d)
+      $put =(l != deepcopy(l))
+      $put =(d != deepcopy(d))]])
+    expect([[
+      
+      1
+      1
+      0
+      0]])
+  end)
+
+  it('compare complex recursively linked list and dict', function()
+    source([[
+      let l = []
+      call add(l, l)
+      let dict4 = {"l": l}
+      call add(dict4.l, dict4)
+      let lcopy = deepcopy(l)
+      let dict4copy = deepcopy(dict4)
+      $put =(l == lcopy)
+      $put =(dict4 == dict4copy)]])
+    expect([[
+      
+      1
+      1]])
+  end)
+
+  it('pass the same list to extend()', function()
+    source([[
+      let l = [1, 2, 3, 4, 5]
+      call extend(l, l)
+      $put =string(l)]])
+    expect([=[
+      
+      [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]]=])
+  end)
+
+  it('pass the same dict to extend()', function()
+    source([[
+      let d = { 'a': {'b': 'B'}}
+      call extend(d, d)
+      $put =string(d)]])
+    expect([[
+      
+      {'a': {'b': 'B'}}]])
+  end)
+
+  it('pass the same dict to extend() with "error"', function()
+    source([[
+      " Copy dict from previous test.
+      let d = { 'a': {'b': 'B'}}
+      try
+	      call extend(d, d, "error")
+      catch
+	      $put =v:exception[:15] . v:exception[-1:-1]
+      endtry
+      $put =string(d)]])
+    expect([[
+      
+      Vim(call):E737: a
+      {'a': {'b': 'B'}}]])
+  end)
+
+  it('test for range assign', function()
+    source([[
+      let l = [0]
+      let l[:] = [1, 2]
+      $put =string(l)]])
+    expect([=[
+      
+      [1, 2]]=])
+  end)
+
+  it('vim patch 7.3.637', function()
+    execute('let a = "No error caught"')
+    execute('try')
+    execute('  foldopen')
+    execute('catch')
+    execute("  let a = matchstr(v:exception,'^[^ ]*')")
+    execute('endtry')
+    feed('o<C-R>=a<CR><esc>')
+    execute('lang C')
+    execute('redir => a')
+    -- The test failes if this is not in one line.
+    execute("try|foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry")
+    execute('redir END')
+    feed('o<C-R>=a<CR><esc>')
+    expect([[
+      
+      Vim(foldopen):E490:
+      
+      
+      Error detected while processing :
+      E492: Not an editor command: foobar|catch|let a = matchstr(v:exception,'^[^ ]*')|endtry
+      ]])
+  end)
+end)
diff --git a/test/functional/legacy/056_script_local_function_spec.lua b/test/functional/legacy/056_script_local_function_spec.lua
index dec88e8001..084817ad7a 100644
--- a/test/functional/legacy/056_script_local_function_spec.lua
+++ b/test/functional/legacy/056_script_local_function_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Test for script-local function.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local expect = helpers.expect
 
diff --git a/test/functional/legacy/057_sort_spec.lua b/test/functional/legacy/057_sort_spec.lua
index 36062ded3a..6984ad0de2 100644
--- a/test/functional/legacy/057_sort_spec.lua
+++ b/test/functional/legacy/057_sort_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for :sort command.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, execute, clear, expect, eq, eval, source = helpers.insert,
   helpers.execute, helpers.clear, helpers.expect, helpers.eq, helpers.eval,
   helpers.source
diff --git a/test/functional/legacy/059_utf8_spell_checking_spec.lua b/test/functional/legacy/059_utf8_spell_checking_spec.lua
index 63df387be3..2fb8f3557d 100644
--- a/test/functional/legacy/059_utf8_spell_checking_spec.lua
+++ b/test/functional/legacy/059_utf8_spell_checking_spec.lua
@@ -1,10 +1,12 @@
 -- Tests for spell checking with 'encoding' set to "utf-8".
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local write_file, call = helpers.write_file, helpers.call
 
+if helpers.pending_win32(pending) then return end
+
 local function write_latin1(name, text)
   text = call('iconv', text, 'utf-8', 'latin-1')
   write_file(name, text)
diff --git a/test/functional/legacy/060_exists_and_has_functions_spec.lua b/test/functional/legacy/060_exists_and_has_functions_spec.lua
index 7f44b35a4e..3e99f6df57 100644
--- a/test/functional/legacy/060_exists_and_has_functions_spec.lua
+++ b/test/functional/legacy/060_exists_and_has_functions_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for the exists() and has() functions.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source = helpers.source
 local clear, expect = helpers.clear, helpers.expect
 local write_file = helpers.write_file
@@ -638,15 +638,6 @@ describe('exists() and has() functions', function()
 
       call TestExists()
 
-      function TestHas()
-        redir >> test.out
-        for pl in ['6.9.999', '7.1.999', '7.4.123', '9.1.0', '9.9.1']
-          echo 'has patch ' . pl . ': ' . has('patch-' . pl)
-        endfor
-        redir END
-      endfunc
-      call TestHas()
-
       edit! test.out
       set ff=unix
     ]=])
@@ -858,12 +849,7 @@ describe('exists() and has() functions', function()
       OK
        g:footest#x = 1
          footest#F() 0
-      UndefFun() 0
-      has patch 6.9.999: 1
-      has patch 7.1.999: 1
-      has patch 7.4.123: 1
-      has patch 9.1.0: 0
-      has patch 9.9.1: 0]])
+      UndefFun() 0]])
 
   end)
 end)
diff --git a/test/functional/legacy/061_undo_tree_spec.lua b/test/functional/legacy/061_undo_tree_spec.lua
index 6db37bf1ff..aeb2001d11 100644
--- a/test/functional/legacy/061_undo_tree_spec.lua
+++ b/test/functional/legacy/061_undo_tree_spec.lua
@@ -1,10 +1,15 @@
 -- Tests for undo tree and :earlier and :later.
+local helpers = require('test.functional.helpers')(after_each)
 
-local helpers = require('test.functional.helpers')
-local feed, source, eq, eval, clear, execute, expect, wait, write_file =
-  helpers.feed, helpers.source, helpers.eq, helpers.eval,
-  helpers.clear, helpers.execute, helpers.expect, helpers.wait,
-  helpers.write_file
+local write_file = helpers.write_file
+local execute = helpers.execute
+local command = helpers.command
+local source = helpers.source
+local expect = helpers.expect
+local clear = helpers.clear
+local feed = helpers.feed
+local eval = helpers.eval
+local eq = helpers.eq
 
 local function expect_empty_buffer()
   -- The space will be removed by helpers.dedent but is needed because dedent
@@ -57,8 +62,7 @@ describe('undo tree:', function()
         -- Delete three other characters and go back in time step by step.
         feed('$xxx')
         expect_line('123456')
-        execute('sleep 1')
-        wait()
+        command('sleep 1')
         feed('g-')
         expect_line('1234567')
         feed('g-')
@@ -79,8 +83,7 @@ describe('undo tree:', function()
         expect_line('123456')
 
         -- Delay for two seconds and go some seconds forward and backward.
-        execute('sleep 2')
-        wait()
+        command('sleep 2')
         feed('Aa<esc>')
         feed('Ab<esc>')
         feed('Ac<esc>')
@@ -95,15 +98,7 @@ describe('undo tree:', function()
         expect_line('123456abc')
       end
 
-      -- Retry up to 3 times. pcall() is _not_ used for the final attempt, so
-      -- that failure messages can bubble up.
-      for _ = 1, 2 do
-        local success = pcall(test_earlier_later)
-        if success then
-          return
-        end
-      end
-      test_earlier_later()
+      helpers.retry(2, nil, test_earlier_later)
     end)
 
     it('file-write specifications', function()
diff --git a/test/functional/legacy/062_tab_pages_spec.lua b/test/functional/legacy/062_tab_pages_spec.lua
index f1c8b8d58b..d5b10b160e 100644
--- a/test/functional/legacy/062_tab_pages_spec.lua
+++ b/test/functional/legacy/062_tab_pages_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for tab pages
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source, clear, execute, expect, eval, eq =
   helpers.feed, helpers.insert, helpers.source, helpers.clear,
   helpers.execute, helpers.expect, helpers.eval, helpers.eq
diff --git a/test/functional/legacy/063_match_and_matchadd_spec.lua b/test/functional/legacy/063_match_and_matchadd_spec.lua
index 23b4f4551b..298e0a31ea 100644
--- a/test/functional/legacy/063_match_and_matchadd_spec.lua
+++ b/test/functional/legacy/063_match_and_matchadd_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for adjusting window and contents
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local feed, insert = helpers.feed, helpers.insert
 local eval, clear, execute = helpers.eval, helpers.clear, helpers.execute
diff --git a/test/functional/legacy/065_float_and_logic_operators_spec.lua b/test/functional/legacy/065_float_and_logic_operators_spec.lua
index e78b230956..d12ea502f3 100644
--- a/test/functional/legacy/065_float_and_logic_operators_spec.lua
+++ b/test/functional/legacy/065_float_and_logic_operators_spec.lua
@@ -1,6 +1,6 @@
 -- Test for floating point and logical operators.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/066_visual_block_tab_spec.lua b/test/functional/legacy/066_visual_block_tab_spec.lua
index 82bb988c67..72fa7d881b 100644
--- a/test/functional/legacy/066_visual_block_tab_spec.lua
+++ b/test/functional/legacy/066_visual_block_tab_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Test for visual block shift and tab characters.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/067_augroup_exists_spec.lua b/test/functional/legacy/067_augroup_exists_spec.lua
index dc4c9c7eeb..8f6b881ed8 100644
--- a/test/functional/legacy/067_augroup_exists_spec.lua
+++ b/test/functional/legacy/067_augroup_exists_spec.lua
@@ -1,7 +1,7 @@
 -- Test that groups and patterns are tested correctly when calling exists() for
 -- autocommands.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/068_text_formatting_spec.lua b/test/functional/legacy/068_text_formatting_spec.lua
index cac8be77f3..e232e5073d 100644
--- a/test/functional/legacy/068_text_formatting_spec.lua
+++ b/test/functional/legacy/068_text_formatting_spec.lua
@@ -1,6 +1,10 @@
-local helpers = require('test.functional.helpers')
-local feed, insert = helpers.feed, helpers.insert
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local helpers = require('test.functional.helpers')(after_each)
+
+local feed = helpers.feed
+local clear = helpers.clear
+local insert = helpers.insert
+local execute = helpers.execute
+local expect = helpers.expect
 
 describe('text formatting', function()
   setup(clear)
diff --git a/test/functional/legacy/072_undo_file_spec.lua b/test/functional/legacy/072_undo_file_spec.lua
index efcc2f2cc3..4682a82008 100644
--- a/test/functional/legacy/072_undo_file_spec.lua
+++ b/test/functional/legacy/072_undo_file_spec.lua
@@ -2,7 +2,7 @@
 -- Since this script is sourced we need to explicitly break changes up in
 -- undo-able pieces.  Do that by setting 'undolevels'.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/074_global_var_in_viminfo_spec.lua b/test/functional/legacy/074_global_var_in_viminfo_spec.lua
index 49c4827613..2fc30c9d83 100644
--- a/test/functional/legacy/074_global_var_in_viminfo_spec.lua
+++ b/test/functional/legacy/074_global_var_in_viminfo_spec.lua
@@ -1,6 +1,7 @@
 -- Tests for storing global variables in the .shada file
 
-local helpers, lfs = require('test.functional.helpers'), require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
 local clear, execute, eq, neq, eval, wait, spawn =
   helpers.clear, helpers.execute, helpers.eq, helpers.neq, helpers.eval,
   helpers.wait, helpers.spawn
diff --git a/test/functional/legacy/075_maparg_spec.lua b/test/functional/legacy/075_maparg_spec.lua
index 82965f5cb2..e9d2acdaf5 100644
--- a/test/functional/legacy/075_maparg_spec.lua
+++ b/test/functional/legacy/075_maparg_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for maparg().
 -- Also test utf8 map with a 0x80 byte.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/076_completefunc_spec.lua b/test/functional/legacy/076_completefunc_spec.lua
deleted file mode 100644
index 8af3be003e..0000000000
--- a/test/functional/legacy/076_completefunc_spec.lua
+++ /dev/null
@@ -1,68 +0,0 @@
--- Tests for completefunc/omnifunc.
-
-local helpers = require('test.functional.helpers')
-local feed, insert, source = helpers.feed, helpers.insert, helpers.source
-local clear, expect, execute = helpers.clear, helpers.expect, helpers.execute
-
-describe('completefunc', function()
-  setup(clear)
-
-  it('is working', function()
-    insert([=[
-      +++
-      one
-      two
-      three]=])
-
-    -- Test that nothing happens if the 'completefunc' opens
-    -- a new window (no completion, no crash).
-    source([=[
-      function! DummyCompleteOne(findstart, base)
-        if a:findstart
-          return 0
-        else
-          wincmd n
-          return ['onedef', 'oneDEF']
-        endif
-      endfunction
-      setlocal completefunc=DummyCompleteOne
-      /^one
-    ]=])
-    feed('A<C-X><C-U><C-N><esc>')
-    execute('q!')
-    source([=[
-      function! DummyCompleteTwo(findstart, base)
-        if a:findstart
-          wincmd n
-          return 0
-        else
-          return ['twodef', 'twoDEF']
-        endif
-      endfunction
-      setlocal completefunc=DummyCompleteTwo
-      /^two
-    ]=])
-    feed('A<C-X><C-U><C-N><esc>')
-    execute('q!')
-    -- Test that 'completefunc' works when it's OK.
-    source([=[
-      function! DummyCompleteThree(findstart, base)
-        if a:findstart
-          return 0
-        else
-          return ['threedef', 'threeDEF']
-        endif
-      endfunction
-      setlocal completefunc=DummyCompleteThree
-      /^three
-    ]=])
-    feed('A<C-X><C-U><C-N><esc>')
-
-    -- Assert buffer contents.
-    expect([=[
-      +++
-      
-      two
-      threeDEF]=])
-  end)
-end)
diff --git a/test/functional/legacy/077_mf_hash_grow_spec.lua b/test/functional/legacy/077_mf_hash_grow_spec.lua
index 029fe98fe9..b43263300d 100644
--- a/test/functional/legacy/077_mf_hash_grow_spec.lua
+++ b/test/functional/legacy/077_mf_hash_grow_spec.lua
@@ -6,7 +6,7 @@
 -- cksum is part of POSIX and so should be available on most Unixes.
 -- If it isn't available then the test will be skipped.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed = helpers.feed
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/078_swapfile_recover_spec.lua b/test/functional/legacy/078_swapfile_recover_spec.lua
index e48fddaac1..4390ba2ca8 100644
--- a/test/functional/legacy/078_swapfile_recover_spec.lua
+++ b/test/functional/legacy/078_swapfile_recover_spec.lua
@@ -3,7 +3,7 @@
 -- restored. We need about 10000 lines of 100 characters to get two levels of
 -- pointer blocks.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, expect, source = helpers.clear, helpers.expect, helpers.source
 
 describe('78', function()
diff --git a/test/functional/legacy/080_substitute_spec.lua b/test/functional/legacy/080_substitute_spec.lua
index 96082364e0..1bdae9be59 100644
--- a/test/functional/legacy/080_substitute_spec.lua
+++ b/test/functional/legacy/080_substitute_spec.lua
@@ -2,7 +2,7 @@
 -- Test for submatch() on substitue().
 -- Test for *:s%* on :substitute.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local eq, eval = helpers.eq, helpers.eval
diff --git a/test/functional/legacy/081_coptions_movement_spec.lua b/test/functional/legacy/081_coptions_movement_spec.lua
index f27667b976..2ac1332687 100644
--- a/test/functional/legacy/081_coptions_movement_spec.lua
+++ b/test/functional/legacy/081_coptions_movement_spec.lua
@@ -1,6 +1,6 @@
 -- Test for t movement command and 'cpo-;' setting
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/082_string_comparison_spec.lua b/test/functional/legacy/082_string_comparison_spec.lua
index 933c6c8fa3..d6f3c45e1f 100644
--- a/test/functional/legacy/082_string_comparison_spec.lua
+++ b/test/functional/legacy/082_string_comparison_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for case-insensitive UTF-8 comparisons (utf_strnicmp() in mbyte.c)
 -- Also test "g~ap".
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, source = helpers.feed, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
index 6b5ee60568..e94b46ca66 100644
--- a/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
+++ b/test/functional/legacy/083_tag_search_with_file_encoding_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for tag search with !_TAG_FILE_ENCODING.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source, clear, expect, write_file = helpers.insert,
   helpers.source, helpers.clear, helpers.expect, helpers.write_file
 
diff --git a/test/functional/legacy/084_curswant_spec.lua b/test/functional/legacy/084_curswant_spec.lua
index 946dd5e501..818914eeb9 100644
--- a/test/functional/legacy/084_curswant_spec.lua
+++ b/test/functional/legacy/084_curswant_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for curswant not changing when setting an option.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/088_conceal_tabs_spec.lua b/test/functional/legacy/088_conceal_tabs_spec.lua
index c78f4e5c3e..00e7312bf8 100644
--- a/test/functional/legacy/088_conceal_tabs_spec.lua
+++ b/test/functional/legacy/088_conceal_tabs_spec.lua
@@ -1,7 +1,7 @@
 -- Tests for correct display (cursor column position) with +conceal and
 -- tabulators.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, clear, execute =
   helpers.feed, helpers.insert, helpers.clear, helpers.execute
 
diff --git a/test/functional/legacy/089_number_relnumber_findfile_spec.lua b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
index f72ebf3f72..7a87fc8603 100644
--- a/test/functional/legacy/089_number_relnumber_findfile_spec.lua
+++ b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
@@ -2,7 +2,7 @@
 --   This is not all that useful now that the options are no longer reset when
 --   setting the other.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed = helpers.feed
 local clear, expect, source = helpers.clear, helpers.expect, helpers.source
 
diff --git a/test/functional/legacy/090_sha256_spec.lua b/test/functional/legacy/090_sha256_spec.lua
index 95e50063a1..e364af9400 100644
--- a/test/functional/legacy/090_sha256_spec.lua
+++ b/test/functional/legacy/090_sha256_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for sha256() function.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/091_context_variables_spec.lua b/test/functional/legacy/091_context_variables_spec.lua
index 2c46ef643c..edf497d397 100644
--- a/test/functional/legacy/091_context_variables_spec.lua
+++ b/test/functional/legacy/091_context_variables_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for getbufvar(), getwinvar(), gettabvar() and gettabwinvar().
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
index f76ba25d7a..f8564384e9 100644
--- a/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
+++ b/test/functional/legacy/092_mksession_cursor_cols_utf8_spec.lua
@@ -3,7 +3,7 @@
 --
 -- Same as legacy test 93 but using UTF-8 file encoding.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
index bf3af1a827..40be7dcca4 100644
--- a/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
+++ b/test/functional/legacy/093_mksession_cursor_cols_latin1_spec.lua
@@ -3,10 +3,12 @@
 --
 -- Same as legacy test 92 but using Latin-1 file encoding.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('store cursor position in session file in Latin-1', function()
   setup(clear)
 
diff --git a/test/functional/legacy/094_visual_mode_operators_spec.lua b/test/functional/legacy/094_visual_mode_operators_spec.lua
index 4dce39b8d2..a52fa00672 100644
--- a/test/functional/legacy/094_visual_mode_operators_spec.lua
+++ b/test/functional/legacy/094_visual_mode_operators_spec.lua
@@ -4,7 +4,7 @@
 -- followed by an operator and those executed via Operator-pending mode. Also
 -- part of the test are mappings, counts, and repetition with the . command.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/095_regexp_multibyte_spec.lua b/test/functional/legacy/095_regexp_multibyte_spec.lua
index a80a247612..845ebaaad7 100644
--- a/test/functional/legacy/095_regexp_multibyte_spec.lua
+++ b/test/functional/legacy/095_regexp_multibyte_spec.lua
@@ -3,7 +3,7 @@
 -- A pattern that gives the expected result produces OK, so that we know it was
 -- actually tried.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/096_location_list_spec.lua b/test/functional/legacy/096_location_list_spec.lua
index 6e2f22ea33..eac8d6356d 100644
--- a/test/functional/legacy/096_location_list_spec.lua
+++ b/test/functional/legacy/096_location_list_spec.lua
@@ -6,7 +6,7 @@
 -- C. make sure that the location list window is not reused instead of the window
 --    it belongs to.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source = helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/097_glob_path_spec.lua b/test/functional/legacy/097_glob_path_spec.lua
index 5c467fbb20..23f1427cb5 100644
--- a/test/functional/legacy/097_glob_path_spec.lua
+++ b/test/functional/legacy/097_glob_path_spec.lua
@@ -2,10 +2,12 @@
 -- Test whether glob()/globpath() return correct results with certain escaped
 -- characters.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('glob() and globpath()', function()
   setup(clear)
 
diff --git a/test/functional/legacy/098_scrollbind_spec.lua b/test/functional/legacy/098_scrollbind_spec.lua
index 6850e373ab..d22aefdcbc 100644
--- a/test/functional/legacy/098_scrollbind_spec.lua
+++ b/test/functional/legacy/098_scrollbind_spec.lua
@@ -1,6 +1,6 @@
 -- Test for 'scrollbind' causing an unexpected scroll of one of the windows.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source = helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/101_hlsearch_spec.lua b/test/functional/legacy/101_hlsearch_spec.lua
index 335d275c2a..fa29e5fbe8 100644
--- a/test/functional/legacy/101_hlsearch_spec.lua
+++ b/test/functional/legacy/101_hlsearch_spec.lua
@@ -1,6 +1,6 @@
 -- Test for v:hlsearch
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed = helpers.clear, helpers.feed
 local execute, expect = helpers.execute, helpers.expect
 
@@ -61,6 +61,6 @@ describe('v:hlsearch', function()
       0:not highlighted
       1:highlighted
       0:not highlighted
-      Vim(let):E706:]])
+      Vim(let):E745:]])
   end)
 end)
diff --git a/test/functional/legacy/102_fnameescape_spec.lua b/test/functional/legacy/102_fnameescape_spec.lua
index a3b0313d7a..c1a6c57956 100644
--- a/test/functional/legacy/102_fnameescape_spec.lua
+++ b/test/functional/legacy/102_fnameescape_spec.lua
@@ -1,6 +1,6 @@
 -- Test if fnameescape is correct for special chars like!
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/103_visual_mode_reset_spec.lua b/test/functional/legacy/103_visual_mode_reset_spec.lua
index c1407ef10a..d05b47fa32 100644
--- a/test/functional/legacy/103_visual_mode_reset_spec.lua
+++ b/test/functional/legacy/103_visual_mode_reset_spec.lua
@@ -1,6 +1,6 @@
 -- Test for visual mode not being reset causing E315 error.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, source = helpers.feed, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/104_let_assignment_spec.lua b/test/functional/legacy/104_let_assignment_spec.lua
index a2431da835..27c3715231 100644
--- a/test/functional/legacy/104_let_assignment_spec.lua
+++ b/test/functional/legacy/104_let_assignment_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for :let.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/106_errorformat_spec.lua b/test/functional/legacy/106_errorformat_spec.lua
index 5958f1aa7b..2b17d63378 100644
--- a/test/functional/legacy/106_errorformat_spec.lua
+++ b/test/functional/legacy/106_errorformat_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for errorformat.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/107_adjust_window_and_contents_spec.lua b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
index 7a6de3d748..610bac7f21 100644
--- a/test/functional/legacy/107_adjust_window_and_contents_spec.lua
+++ b/test/functional/legacy/107_adjust_window_and_contents_spec.lua
@@ -1,10 +1,12 @@
 -- Tests for adjusting window and contents
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local insert = helpers.insert
 local clear, execute = helpers.clear, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('107', function()
   setup(clear)
 
diff --git a/test/functional/legacy/108_backtrace_debug_commands_spec.lua b/test/functional/legacy/108_backtrace_debug_commands_spec.lua
index 6df645d255..a03092e446 100644
--- a/test/functional/legacy/108_backtrace_debug_commands_spec.lua
+++ b/test/functional/legacy/108_backtrace_debug_commands_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for backtrace debug commands.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, clear = helpers.feed, helpers.clear
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua
new file mode 100644
index 0000000000..b86d3f0aea
--- /dev/null
+++ b/test/functional/legacy/arglist_spec.lua
@@ -0,0 +1,270 @@
+-- Test argument list commands
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear, execute, eq = helpers.clear, helpers.execute, helpers.eq
+local eval, exc_exec, neq = helpers.eval, helpers.exc_exec, helpers.neq
+
+if helpers.pending_win32(pending) then return end
+
+describe('argument list commands', function()
+  before_each(clear)
+
+  local function init_abc()
+    execute('args a b c')
+    execute('next')
+  end
+
+  local function reset_arglist()
+    execute('arga a | %argd')
+  end
+
+  local function assert_fails(cmd, err)
+    neq(exc_exec(cmd):find(err), nil)
+  end
+
+  it('test that argidx() works', function()
+    execute('args a b c')
+    execute('last')
+    eq(2, eval('argidx()'))
+    execute('%argdelete')
+    eq(0, eval('argidx()'))
+
+    execute('args a b c')
+    eq(0, eval('argidx()'))
+    execute('next')
+    eq(1, eval('argidx()'))
+    execute('next')
+    eq(2, eval('argidx()'))
+    execute('1argdelete')
+    eq(1, eval('argidx()'))
+    execute('1argdelete')
+    eq(0, eval('argidx()'))
+    execute('1argdelete')
+    eq(0, eval('argidx()'))
+  end)
+
+  it('test that argadd() works', function()
+    execute('%argdelete')
+    execute('argadd a b c')
+    eq(0, eval('argidx()'))
+
+    execute('%argdelete')
+    execute('argadd a')
+    eq(0, eval('argidx()'))
+    execute('argadd b c d')
+    eq(0, eval('argidx()'))
+
+    init_abc()
+    execute('argadd x')
+    eq({'a', 'b', 'x', 'c'}, eval('argv()'))
+    eq(1, eval('argidx()'))
+
+    init_abc()
+    execute('0argadd x')
+    eq({'x', 'a', 'b', 'c'}, eval('argv()'))
+    eq(2, eval('argidx()'))
+
+    init_abc()
+    execute('1argadd x')
+    eq({'a', 'x', 'b', 'c'}, eval('argv()'))
+    eq(2, eval('argidx()'))
+
+    init_abc()
+    execute('$argadd x')
+    eq({'a', 'b', 'c', 'x'}, eval('argv()'))
+    eq(1, eval('argidx()'))
+
+    init_abc()
+    execute('$argadd x')
+    execute('+2argadd y')
+    eq({'a', 'b', 'c', 'x', 'y'}, eval('argv()'))
+    eq(1, eval('argidx()'))
+
+    execute('%argd')
+    execute('edit d')
+    execute('arga')
+    eq(1, eval('len(argv())'))
+    eq('d', eval('get(argv(), 0, "")'))
+
+    execute('%argd')
+    execute('new')
+    execute('arga')
+    eq(0, eval('len(argv())'))
+  end)
+
+  it('test for [count]argument and [count]argdelete commands', function()
+    reset_arglist()
+    execute('let save_hidden = &hidden')
+    execute('set hidden')
+    execute('let g:buffers = []')
+    execute('augroup TEST')
+    execute([[au BufEnter * call add(buffers, expand('%:t'))]])
+    execute('augroup END')
+
+    execute('argadd a b c d')
+    execute('$argu')
+    execute('$-argu')
+    execute('-argu')
+    execute('1argu')
+    execute('+2argu')
+
+    execute('augroup TEST')
+    execute('au!')
+    execute('augroup END')
+
+    eq({'d', 'c', 'b', 'a', 'c'}, eval('g:buffers'))
+
+    execute('redir => result')
+    execute('ar')
+    execute('redir END')
+    eq(1, eval([[result =~# 'a b \[c] d']]))
+
+    execute('.argd')
+    eq({'a', 'b', 'd'}, eval('argv()'))
+
+    execute('-argd')
+    eq({'a', 'd'}, eval('argv()'))
+
+    execute('$argd')
+    eq({'a'}, eval('argv()'))
+
+    execute('1arga c')
+    execute('1arga b')
+    execute('$argu')
+    execute('$arga x')
+    eq({'a', 'b', 'c', 'x'}, eval('argv()'))
+
+    execute('0arga Y')
+    eq({'Y', 'a', 'b', 'c', 'x'}, eval('argv()'))
+
+    execute('%argd')
+    eq({}, eval('argv()'))
+
+    execute('arga a b c d e f')
+    execute('2,$-argd')
+    eq({'a', 'f'}, eval('argv()'))
+
+    execute('let &hidden = save_hidden')
+
+    -- Setting the argument list should fail when the current buffer has
+    -- unsaved changes
+    execute('%argd')
+    execute('enew!')
+    execute('set modified')
+    assert_fails('args x y z', 'E37:')
+    execute('args! x y z')
+    eq({'x', 'y', 'z'}, eval('argv()'))
+    eq('x', eval('expand("%:t")'))
+
+    execute('%argdelete')
+    assert_fails('argument', 'E163:')
+  end)
+
+  it('test for 0argadd and 0argedit', function()
+    reset_arglist()
+
+    execute('arga a b c d')
+    execute('2argu')
+    execute('0arga added')
+    eq({'added', 'a', 'b', 'c', 'd'}, eval('argv()'))
+
+    execute('%argd')
+    execute('arga a b c d')
+    execute('2argu')
+    execute('0arge edited')
+    eq({'edited', 'a', 'b', 'c', 'd'}, eval('argv()'))
+
+    execute('2argu')
+    execute('arga third')
+    eq({'edited', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
+  end)
+
+  it('test for argc()', function()
+    reset_arglist()
+    eq(0, eval('argc()'))
+    execute('argadd a b')
+    eq(2, eval('argc()'))
+  end)
+
+  it('test for arglistid()', function()
+    reset_arglist()
+    execute('arga a b')
+    eq(0, eval('arglistid()'))
+    execute('split')
+    execute('arglocal')
+    eq(1, eval('arglistid()'))
+    execute('tabnew | tabfirst')
+    eq(0, eval('arglistid(2)'))
+    eq(1, eval('arglistid(1, 1)'))
+    eq(0, eval('arglistid(2, 1)'))
+    eq(1, eval('arglistid(1, 2)'))
+    execute('tabonly | only | enew!')
+    execute('argglobal')
+    eq(0, eval('arglistid()'))
+  end)
+
+  it('test for argv()', function()
+    reset_arglist()
+    eq({}, eval('argv()'))
+    eq('', eval('argv(2)'))
+    execute('argadd a b c d')
+    eq('c', eval('argv(2)'))
+  end)
+
+  it('test for :argedit command', function()
+    reset_arglist()
+    execute('argedit a')
+    eq({'a'}, eval('argv()'))
+    eq('a', eval('expand("%:t")'))
+    execute('argedit b')
+    eq({'a', 'b'}, eval('argv()'))
+    eq('b', eval('expand("%:t")'))
+    execute('argedit a')
+    eq({'a', 'b'}, eval('argv()'))
+    eq('a', eval('expand("%:t")'))
+    assert_fails('argedit a b', 'E172:')
+    execute('argedit c')
+    eq({'a', 'c', 'b'}, eval('argv()'))
+    execute('0argedit x')
+    eq({'x', 'a', 'c', 'b'}, eval('argv()'))
+    execute('enew! | set modified')
+    assert_fails('argedit y', 'E37:')
+    execute('argedit! y')
+    eq({'x', 'y', 'a', 'c', 'b'}, eval('argv()'))
+    execute('%argd')
+  end)
+
+  it('test for :argdelete command', function()
+    reset_arglist()
+    execute('args aa a aaa b bb')
+    execute('argdelete a*')
+    eq({'b', 'bb'}, eval('argv()'))
+    eq('aa', eval('expand("%:t")'))
+    execute('last')
+    execute('argdelete %')
+    eq({'b'}, eval('argv()'))
+    assert_fails('argdelete', 'E471:')
+    assert_fails('1,100argdelete', 'E16:')
+    execute('%argd')
+  end)
+
+  it('test for the :next, :prev, :first, :last, :rewind commands', function()
+    reset_arglist()
+    execute('args a b c d')
+    execute('last')
+    eq(3, eval('argidx()'))
+    assert_fails('next', 'E165:')
+    execute('prev')
+    eq(2, eval('argidx()'))
+    execute('Next')
+    eq(1, eval('argidx()'))
+    execute('first')
+    eq(0, eval('argidx()'))
+    assert_fails('prev', 'E164:')
+    execute('3next')
+    eq(3, eval('argidx()'))
+    execute('rewind')
+    eq(0, eval('argidx()'))
+    execute('%argd')
+  end)
+end)
diff --git a/test/functional/legacy/argument_0count_spec.lua b/test/functional/legacy/argument_0count_spec.lua
deleted file mode 100644
index 6e8b60547b..0000000000
--- a/test/functional/legacy/argument_0count_spec.lua
+++ /dev/null
@@ -1,28 +0,0 @@
--- Tests for :0argadd and :0argedit
-
-local helpers = require('test.functional.helpers')
-local eq, eval, clear, execute =
-  helpers.eq, helpers.eval, helpers.clear, helpers.execute
-
-describe('argument_0count', function()
-  setup(clear)
-
-  it('is working', function()
-    execute('arga a b c d')
-    eq({'a', 'b', 'c', 'd'}, eval('argv()'))
-    execute('2argu')
-    execute('0arga added')
-    eq({'added', 'a', 'b', 'c', 'd'}, eval('argv()'))
-    execute('2argu')
-    execute('arga third')
-    eq({'added', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
-    execute('%argd')
-    execute('arga a b c d')
-    execute('2argu')
-    execute('0arge edited')
-    eq({'edited', 'a', 'b', 'c', 'd'}, eval('argv()'))
-    execute('2argu')
-    execute('arga third')
-    eq({'edited', 'a', 'third', 'b', 'c', 'd'}, eval('argv()'))
-  end)
-end)
diff --git a/test/functional/legacy/argument_count_spec.lua b/test/functional/legacy/argument_count_spec.lua
deleted file mode 100644
index 182cce9475..0000000000
--- a/test/functional/legacy/argument_count_spec.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- Tests for :[count]argument! and :[count]argdelete
-
-local helpers = require('test.functional.helpers')
-local clear, execute, eq, eval =
-  helpers.clear, helpers.execute, helpers.eq, helpers.eval
-
-describe('argument_count', function()
-  setup(clear)
-
-  it('is working', function()
-    execute('%argd')
-    execute('argadd a b c d')
-    eq({'a', 'b', 'c', 'd'}, eval('argv()'))
-    execute('set hidden')
-    execute('let buffers = []')
-    execute('augroup TEST')
-    execute([[au BufEnter * call add(buffers, expand('%:t'))]])
-    execute('augroup END')
-    execute('$argu')
-    execute('$-argu')
-    execute('-argu')
-    execute('1argu')
-    execute('+2argu')
-    execute('augroup TEST')
-    execute('au!')
-    execute('augroup END')
-    eq({'d', 'c', 'b', 'a', 'c'}, eval('buffers'))
-    execute('.argd')
-    eq({'a', 'b', 'd'}, eval('argv()'))
-    execute('-argd')
-    eq({'a', 'd'}, eval('argv()'))
-    execute('$argd')
-    eq({'a'}, eval('argv()'))
-    execute('1arga c')
-    execute('1arga b')
-    execute('$argu')
-    execute('$arga x')
-    eq({'a', 'b', 'c', 'x'}, eval('argv()'))
-    execute('0arga Y')
-    eq({'Y', 'a', 'b', 'c', 'x'}, eval('argv()'))
-    execute('%argd')
-    eq({}, eval('argv()'))
-    execute('arga a b c d e f')
-    execute('2,$-argd')
-    eq({'a', 'f'}, eval('argv()'))
-  end)
-end)
diff --git a/test/functional/legacy/assert_spec.lua b/test/functional/legacy/assert_spec.lua
index 1ce665360d..8a042be7f7 100644
--- a/test/functional/legacy/assert_spec.lua
+++ b/test/functional/legacy/assert_spec.lua
@@ -1,7 +1,8 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim, call = helpers.meths, helpers.call
 local clear, eq = helpers.clear, helpers.eq
 local source, execute = helpers.source, helpers.execute
+local exc_exec = helpers.exc_exec
 
 local function expected_errors(errors)
   eq(errors, nvim.get_vvar('errors'))
@@ -62,6 +63,34 @@ describe('assert function:', function()
       call('assert_equal', 'true', 'false')
       expected_errors({"Expected 'true' but got 'false'"})
     end)
+
+    it('should change v:errors when expected is not equal to actual', function()
+      source([[
+      function CheckAssert()
+        let s:v = {}
+        let s:x = {"a": s:v}
+        let s:v["b"] = s:x
+        let s:w = {"c": s:x, "d": ''}
+        call assert_equal(s:w, '')
+      endfunction
+      ]])
+      eq('Vim(call):E724: unable to correctly dump variable with self-referencing container',
+         exc_exec('call CheckAssert()'))
+    end)
+  end)
+
+  -- assert_notequal({expected}, {actual}[, {msg}])
+  describe('assert_notequal', function()
+    it('should not change v:errors when expected differs from actual', function()
+      call('assert_notequal', 'foo', 4)
+      call('assert_notequal', {1, 2, 3}, 'foo')
+      expected_empty()
+    end)
+
+    it('should change v:errors when expected is equal to actual', function()
+      call('assert_notequal', 'foo', 'foo')
+      expected_errors({"Expected 'foo' differs from 'foo'"})
+    end)
   end)
 
   -- assert_false({actual}, [, {msg}])
@@ -141,5 +170,98 @@ describe('assert function:', function()
         tmpname_two .. " line 1: 'file two'",
       })
     end)
+
+    it('is reset to a list by assert functions', function()
+      source([[
+        let save_verrors = v:errors
+        let v:['errors'] = {'foo': 3}
+        call assert_equal('yes', 'no')
+        let verrors = v:errors
+        let v:errors = save_verrors
+        call assert_equal(type([]), type(verrors))
+      ]])
+      expected_empty()
+    end)
+  end)
+
+  -- assert_match({pat}, {text}[, {msg}])
+  describe('assert_match', function()
+    it('should not change v:errors when pat matches text', function()
+      call('assert_match', '^f.*b.*r$', 'foobar')
+      expected_empty()
+    end)
+
+    it('should change v:errors when pat does not match text', function()
+      call('assert_match', 'bar.*foo', 'foobar')
+      expected_errors({"Pattern 'bar.*foo' does not match 'foobar'"})
+    end)
+
+    it('should set v:errors to msg when given and match fails', function()
+      call('assert_match', 'bar.*foo', 'foobar', 'wrong')
+      expected_errors({"'wrong'"})
+    end)
+  end)
+
+  -- assert_notmatch({pat}, {text}[, {msg}])
+  describe('assert_notmatch', function()
+    it('should not change v:errors when pat does not match text', function()
+      call('assert_notmatch', 'foo', 'bar')
+      call('assert_notmatch', '^foobar$', 'foobars')
+      expected_empty()
+    end)
+
+    it('should change v:errors when pat matches text', function()
+      call('assert_notmatch', 'foo', 'foobar')
+      expected_errors({"Pattern 'foo' does match 'foobar'"})
+    end)
+  end)
+
+  -- assert_fails({cmd}, [, {error}])
+  describe('assert_fails', function()
+    it('should change v:errors when error does not match v:errmsg', function()
+      execute([[call assert_fails('xxx', {})]])
+      execute([[call assert_match("Expected {} but got 'E731:", v:errors[0])]])
+      expected_errors({"Expected {} but got 'E731: using Dictionary as a String'"})
+    end)
+
+    it('should not change v:errors when cmd errors', function()
+      call('assert_fails', 'NonexistentCmd')
+      expected_empty()
+    end)
+
+    it('should change v:errors when cmd succeeds', function()
+      call('assert_fails', 'call empty("")')
+      expected_errors({'command did not fail: call empty("")'})
+    end)
+  end)
+
+  -- assert_exception({cmd}, [, {error}])
+  describe('assert_exception()', function()
+    it('should assert thrown exceptions properly', function()
+      source([[
+        try
+          nocommand
+        catch
+          call assert_exception('E492')
+        endtry
+      ]])
+      expected_empty()
+    end)
+
+    it('should work properly when nested', function()
+      source([[
+        try
+          nocommand
+        catch
+          try
+            " illegal argument, get NULL for error
+            call assert_exception([])
+          catch
+            call assert_exception('E730')
+          endtry
+        endtry
+      ]])
+      expected_empty()
+    end)
   end)
 end)
diff --git a/test/functional/legacy/autochdir_spec.lua b/test/functional/legacy/autochdir_spec.lua
new file mode 100644
index 0000000000..06f7c1dd11
--- /dev/null
+++ b/test/functional/legacy/autochdir_spec.lua
@@ -0,0 +1,26 @@
+local lfs = require('lfs')
+local helpers = require('test.functional.helpers')(after_each)
+local clear, eq = helpers.clear, helpers.eq
+local eval, execute = helpers.eval, helpers.execute
+
+describe('autochdir behavior', function()
+  local dir = 'Xtest-functional-legacy-autochdir'
+
+  before_each(function()
+    lfs.mkdir(dir)
+    clear()
+  end)
+
+  after_each(function()
+    helpers.rmdir(dir)
+  end)
+
+  -- Tests vim/vim/777 without test_autochdir().
+  it('sets filename', function()
+    execute('set acd')
+    execute('new')
+    execute('w '..dir..'/Xtest')
+    eq('Xtest', eval("expand('%')"))
+    eq(dir, eval([[substitute(getcwd(), '.*[/\\]\(\k*\)', '\1', '')]]))
+  end)
+end)
diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua
index 6349371808..28037e17c5 100644
--- a/test/functional/legacy/autocmd_option_spec.lua
+++ b/test/functional/legacy/autocmd_option_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim = helpers.meths
 local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq
 local curbuf, buf = helpers.curbuf, helpers.bufmeths
diff --git a/test/functional/legacy/autoformat_join_spec.lua b/test/functional/legacy/autoformat_join_spec.lua
index a99cabca24..4110d66f5b 100644
--- a/test/functional/legacy/autoformat_join_spec.lua
+++ b/test/functional/legacy/autoformat_join_spec.lua
@@ -1,7 +1,7 @@
 -- vim: set foldmethod=marker foldmarker=[[,]] :
 -- Tests for setting the '[,'] marks when joining lines.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/backspace_opt_spec.lua b/test/functional/legacy/backspace_opt_spec.lua
index b40019a410..90bc6f74f0 100644
--- a/test/functional/legacy/backspace_opt_spec.lua
+++ b/test/functional/legacy/backspace_opt_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local call, clear = helpers.call, helpers.clear
 local source, eq, nvim = helpers.source, helpers.eq, helpers.meths
 
diff --git a/test/functional/legacy/breakindent_spec.lua b/test/functional/legacy/breakindent_spec.lua
index a12d4add10..2504fe8e51 100644
--- a/test/functional/legacy/breakindent_spec.lua
+++ b/test/functional/legacy/breakindent_spec.lua
@@ -1,6 +1,6 @@
 -- Test for breakindent
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/cdo_spec.lua b/test/functional/legacy/cdo_spec.lua
index 4b313ede3f..5e46431cc1 100644
--- a/test/functional/legacy/cdo_spec.lua
+++ b/test/functional/legacy/cdo_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for the :cdo, :cfdo, :ldo and :lfdo commands
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim, clear = helpers.meths, helpers.clear
 local call, feed = helpers.call, helpers.feed
 local source, eq = helpers.source, helpers.eq
diff --git a/test/functional/legacy/changelist_spec.lua b/test/functional/legacy/changelist_spec.lua
index 7c696369d4..c718da3736 100644
--- a/test/functional/legacy/changelist_spec.lua
+++ b/test/functional/legacy/changelist_spec.lua
@@ -1,7 +1,7 @@
 -- Test changelist position after splitting window
 -- Set 'undolevels' to make changelist for sourced file
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/charsearch_spec.lua b/test/functional/legacy/charsearch_spec.lua
index 4a83801cfc..ef3369728d 100644
--- a/test/functional/legacy/charsearch_spec.lua
+++ b/test/functional/legacy/charsearch_spec.lua
@@ -1,6 +1,6 @@
 -- Test for character searches
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert = helpers.feed, helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/close_count_spec.lua b/test/functional/legacy/close_count_spec.lua
index ee6b29c618..ad1812f22e 100644
--- a/test/functional/legacy/close_count_spec.lua
+++ b/test/functional/legacy/close_count_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for :[count]close! and :[count]hide
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, eval, eq, clear, execute =
   helpers.feed, helpers.eval, helpers.eq, helpers.clear, helpers.execute
 
diff --git a/test/functional/legacy/command_count_spec.lua b/test/functional/legacy/command_count_spec.lua
index d9b4f09263..c463ada968 100644
--- a/test/functional/legacy/command_count_spec.lua
+++ b/test/functional/legacy/command_count_spec.lua
@@ -1,25 +1,20 @@
 -- Test for user command counts
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, source, expect = helpers.clear, helpers.source, helpers.expect
-local execute, spawn = helpers.execute, helpers.spawn
-local nvim_prog = helpers.nvim_prog
+local execute = helpers.execute
 
 describe('command_count', function()
-  setup(clear)
-  teardown(function()
-    os.remove('test.out')
-  end)
-
   it('is working', function()
     -- It is relevant for the test to load a file initially.  If this is
     -- emulated with :arg the buffer count is wrong as nvim creates an empty
     -- buffer if it was started without a filename.
-    local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed',
-				    'test_command_count.in'})
-    helpers.set_session(nvim2)
+    clear('test_command_count.in')
 
     source([[
+      let g:tmpname = tempname()
+      call mkdir(g:tmpname)
+      execute "cd ".g:tmpname
       lang C
       let g:lines = []
       com -range=% RangeLines
@@ -239,5 +234,10 @@ describe('command_count', function()
       bufdo: 2 3 4 5 6 7 8 9 10 15
       bufdo: 4 5 6 7
       tabdo: 2 3 4]])
+
+    source([[
+      cd ..
+      call delete(g:tmpname, 'rf')
+    ]])
   end)
 end)
diff --git a/test/functional/legacy/comparators_spec.lua b/test/functional/legacy/comparators_spec.lua
index e3fa3eea23..27879b0f65 100644
--- a/test/functional/legacy/comparators_spec.lua
+++ b/test/functional/legacy/comparators_spec.lua
@@ -1,6 +1,6 @@
 -- " Test for expression comparators.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eq = helpers.clear, helpers.eq
 local eval, execute = helpers.eval, helpers.execute
 
diff --git a/test/functional/legacy/delete_spec.lua b/test/functional/legacy/delete_spec.lua
index cd18a8f750..cd19e31a79 100644
--- a/test/functional/legacy/delete_spec.lua
+++ b/test/functional/legacy/delete_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local eq, eval, execute = helpers.eq, helpers.eval, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('Test for delete()', function()
   before_each(clear)
 
diff --git a/test/functional/legacy/erasebackword_spec.lua b/test/functional/legacy/erasebackword_spec.lua
index cb3967b763..33b7704b65 100644
--- a/test/functional/legacy/erasebackword_spec.lua
+++ b/test/functional/legacy/erasebackword_spec.lua
@@ -1,6 +1,6 @@
 -- Test for CTRL-W in Insert mode
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, expect = helpers.clear, helpers.feed, helpers.expect
 
 describe('CTRL-W in Insert mode', function()
diff --git a/test/functional/legacy/eval_spec.lua b/test/functional/legacy/eval_spec.lua
index 3ff1092a4b..3684fe714d 100644
--- a/test/functional/legacy/eval_spec.lua
+++ b/test/functional/legacy/eval_spec.lua
@@ -1,15 +1,10 @@
 -- Test for various eval features.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local eq, eval, write_file = helpers.eq, helpers.eval, helpers.write_file
 
-local function has_clipboard()
-  clear()
-  return 1 == eval("has('clipboard')")
-end
-
 describe('eval', function()
   setup(function()
     write_file('test_eval_setup.vim', [[
@@ -539,8 +534,13 @@ describe('eval', function()
       =: type v; value: abc/]].."\000 (['abc/\000"..[[']), expr: "abc/]]..'\000'..[[" (['"abc/]]..'\000'..[["'])]])
   end)
 
-  if has_clipboard() then
-    it('system clipboard', function()
+  describe('system clipboard', function()
+    before_each(function()
+      execute('let &runtimepath = "test/functional/fixtures,".&runtimepath')
+      execute('call getreg("*")') -- force load of provider
+    end)
+
+    it('works', function()
       insert([[
 	Some first line (this text was at the top of the old test_eval.in).
 	
@@ -570,9 +570,7 @@ describe('eval', function()
 	*: type V; value: clipboard contents]]..'\00'..[[ (['clipboard contents']), expr: clipboard contents]]..'\00'..[[ (['clipboard contents'])
 	*: type V; value: something else]]..'\00'..[[ (['something else']), expr: something else]]..'\00'..[[ (['something else'])]])
     end)
-  else
-    pending('system clipboard not available', function() end)
-  end
+  end)
 
   it('errors', function()
     source([[
diff --git a/test/functional/legacy/expand_spec.lua b/test/functional/legacy/expand_spec.lua
new file mode 100644
index 0000000000..7bf6fb67dc
--- /dev/null
+++ b/test/functional/legacy/expand_spec.lua
@@ -0,0 +1,77 @@
+-- Test for expanding file names
+
+local helpers = require('test.functional.helpers')(after_each)
+local eq = helpers.eq
+local call = helpers.call
+local nvim = helpers.meths
+local clear = helpers.clear
+local source = helpers.source
+
+local function expected_empty()
+  eq({}, nvim.get_vvar('errors'))
+end
+
+describe('expand file name', function()
+  after_each(function()
+    helpers.rmdir('Xdir1')
+    helpers.rmdir('Xdir2')
+    helpers.rmdir('Xdir3')
+    helpers.rmdir('Xdir4')
+  end)
+
+  before_each(function()
+    clear()
+
+    source([[
+      func Test_with_directories()
+        call mkdir('Xdir1')
+        call mkdir('Xdir2')
+        call mkdir('Xdir3')
+        cd Xdir3
+        call mkdir('Xdir4')
+        cd ..
+
+        split Xdir1/file
+        call setline(1, ['a', 'b'])
+        w
+        w Xdir3/Xdir4/file
+        close
+
+        next Xdir?/*/file
+        call assert_equal('Xdir3/Xdir4/file', expand('%'))
+				if has('unix')
+					next! Xdir?/*/nofile
+					call assert_equal('Xdir?/*/nofile', expand('%'))
+				endif
+        " Edit another file, on MS-Windows the swap file would be in use and can't
+        " be deleted
+        edit foo
+
+        call assert_equal(0, delete('Xdir1', 'rf'))
+        call assert_equal(0, delete('Xdir2', 'rf'))
+        call assert_equal(0, delete('Xdir3', 'rf'))
+      endfunc
+
+      func Test_with_tilde()
+        let dir = getcwd()
+        call mkdir('Xdir ~ dir')
+        call assert_true(isdirectory('Xdir ~ dir'))
+        cd Xdir\ ~\ dir
+        call assert_true(getcwd() =~ 'Xdir \~ dir')
+        exe 'cd ' . fnameescape(dir)
+        call delete('Xdir ~ dir', 'd')
+        call assert_false(isdirectory('Xdir ~ dir'))
+      endfunc
+    ]])
+  end)
+
+  it('works with directories', function()
+    call('Test_with_directories')
+    expected_empty()
+  end)
+
+  it('works with tilde', function()
+    call('Test_with_tilde')
+    expected_empty()
+  end)
+end)
diff --git a/test/functional/legacy/file_perm_spec.lua b/test/functional/legacy/file_perm_spec.lua
index cabeecdc9c..77e82352c5 100644
--- a/test/functional/legacy/file_perm_spec.lua
+++ b/test/functional/legacy/file_perm_spec.lua
@@ -1,12 +1,12 @@
 -- Test getting and setting file permissions.
 require('os')
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, call, eq = helpers.clear, helpers.call, helpers.eq
 local neq, exc_exec = helpers.neq, helpers.exc_exec
 
 describe('Test getting and setting file permissions', function()
-  local tempfile = os.tmpname()
+  local tempfile = helpers.tmpname()
 
   before_each(function()
     os.remove(tempfile)
@@ -21,7 +21,7 @@ describe('Test getting and setting file permissions', function()
     eq(9, call('len', call('getfperm', tempfile)))
 
     eq(1, call('setfperm', tempfile, 'rwx------'))
-    if helpers.os_name == 'windows' then
+    if helpers.os_name() == 'windows' then
       eq('rw-rw-rw-', call('getfperm', tempfile))
     else
       eq('rwx------', call('getfperm', tempfile))
diff --git a/test/functional/legacy/fixeol_spec.lua b/test/functional/legacy/fixeol_spec.lua
index 2d1824c8cd..1e9e832536 100644
--- a/test/functional/legacy/fixeol_spec.lua
+++ b/test/functional/legacy/fixeol_spec.lua
@@ -1,9 +1,11 @@
 -- Tests for 'fixeol'
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed = helpers.feed
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('fixeol', function()
   local function rmtestfiles()
     os.remove('test.out')
diff --git a/test/functional/legacy/fnamemodify_spec.lua b/test/functional/legacy/fnamemodify_spec.lua
index 2a32aea127..d8ecbfe058 100644
--- a/test/functional/legacy/fnamemodify_spec.lua
+++ b/test/functional/legacy/fnamemodify_spec.lua
@@ -1,9 +1,11 @@
 -- Test filename modifiers.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, source = helpers.clear, helpers.source
 local call, eq, nvim = helpers.call, helpers.eq, helpers.meths
 
+if helpers.pending_win32(pending) then return end
+
 local function expected_empty()
   eq({}, nvim.get_vvar('errors'))
 end
diff --git a/test/functional/legacy/function_sort_spec.lua b/test/functional/legacy/function_sort_spec.lua
index 9083911021..1b65f1ce95 100644
--- a/test/functional/legacy/function_sort_spec.lua
+++ b/test/functional/legacy/function_sort_spec.lua
@@ -1,7 +1,10 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
+local execute = helpers.execute
+local exc_exec = helpers.exc_exec
+local neq = helpers.neq
 
 describe('sort', function()
   before_each(clear)
@@ -26,4 +29,25 @@ describe('sort', function()
   it('numbers compared as float', function()
     eq({0.28, 3, 13.5}, eval("sort([13.5, 0.28, 3], 'f')"))
   end)
+
+  it('ability to call sort() from a compare function', function()
+    execute('func Compare1(a, b) abort')
+    execute([[call sort(range(3), 'Compare2')]])
+    execute('return a:a - a:b')
+    execute('endfunc')
+
+    execute('func Compare2(a, b) abort')
+    execute('return a:a - a:b')
+    execute('endfunc')
+    eq({1, 3, 5}, eval("sort([3, 1, 5], 'Compare1')"))
+  end)
+
+  it('default sort', function()
+    -- docs say omitted, empty or zero argument sorts on string representation
+    eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"])'))
+    eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval([[sort([3.3, 1, "2", "A", "a", "AA"], '')]]))
+    eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"], 0)'))
+    eq({'2', 'A', 'a', 'AA', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"], 1)'))
+    neq(exc_exec('call sort([3.3, 1, "2"], 3)'):find('E474:'), nil)
+  end)
 end)
diff --git a/test/functional/legacy/getcwd_spec.lua b/test/functional/legacy/getcwd_spec.lua
new file mode 100644
index 0000000000..dcb56eb242
--- /dev/null
+++ b/test/functional/legacy/getcwd_spec.lua
@@ -0,0 +1,88 @@
+-- Tests for getcwd(), haslocaldir(), and :lcd
+
+local helpers = require('test.functional.helpers')(after_each)
+local eq, eval, source = helpers.eq, helpers.eval, helpers.source
+local call, clear, execute = helpers.call, helpers.clear, helpers.execute
+
+if helpers.pending_win32(pending) then return end
+
+describe('getcwd', function()
+  before_each(clear)
+
+  after_each(function()
+    helpers.rmdir('Xtopdir')
+  end)
+
+  it('is working', function()
+    source([[
+      function! GetCwdInfo(win, tab)
+       let tab_changed = 0
+       let mod = ":t"
+       if a:tab > 0 && a:tab != tabpagenr()
+         let tab_changed = 1
+         exec "tabnext " . a:tab
+       endif
+       let bufname = fnamemodify(bufname(winbufnr(a:win)), mod)
+       if tab_changed
+         tabprevious
+       endif
+       if a:win == 0 && a:tab == 0
+         let dirname = fnamemodify(getcwd(), mod)
+         let lflag = haslocaldir()
+       elseif a:tab == 0
+         let dirname = fnamemodify(getcwd(a:win), mod)
+         let lflag = haslocaldir(a:win)
+       else
+         let dirname = fnamemodify(getcwd(a:win, a:tab), mod)
+         let lflag = haslocaldir(a:win, a:tab)
+       endif
+       return bufname . ' ' . dirname . ' ' . lflag
+      endfunction
+    ]])
+    execute('new')
+    execute('let cwd=getcwd()')
+    call('mkdir', 'Xtopdir')
+    execute('silent cd Xtopdir')
+    call('mkdir', 'Xdir1')
+    call('mkdir', 'Xdir2')
+    call('mkdir', 'Xdir3')
+    execute('new a')
+    execute('new b')
+    execute('new c')
+    execute('3wincmd w')
+    execute('silent lcd Xdir1')
+    eq('a Xdir1 1', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    eq('b Xtopdir 0', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir3')
+    eq('c Xdir3 1', eval('GetCwdInfo(0, 0)'))
+    eq('a Xdir1 1', eval('GetCwdInfo(bufwinnr("a"), 0)'))
+    eq('b Xtopdir 0', eval('GetCwdInfo(bufwinnr("b"), 0)'))
+    eq('c Xdir3 1', eval('GetCwdInfo(bufwinnr("c"), 0)'))
+    execute('wincmd W')
+    eq('a Xdir1 1', eval('GetCwdInfo(bufwinnr("a"), tabpagenr())'))
+    eq('b Xtopdir 0', eval('GetCwdInfo(bufwinnr("b"), tabpagenr())'))
+    eq('c Xdir3 1', eval('GetCwdInfo(bufwinnr("c"), tabpagenr())'))
+
+    execute('tabnew x')
+    execute('new y')
+    execute('new z')
+    execute('3wincmd w')
+    eq('x Xtopdir 0', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir2')
+    eq('y Xdir2 1', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir3')
+    eq('z Xdir3 1', eval('GetCwdInfo(0, 0)'))
+    eq('x Xtopdir 0', eval('GetCwdInfo(bufwinnr("x"), 0)'))
+    eq('y Xdir2 1', eval('GetCwdInfo(bufwinnr("y"), 0)'))
+    eq('z Xdir3 1', eval('GetCwdInfo(bufwinnr("z"), 0)'))
+    execute('let tp_nr = tabpagenr()')
+    execute('tabrewind')
+    eq('x Xtopdir 0', eval('GetCwdInfo(3, tp_nr)'))
+    eq('y Xdir2 1', eval('GetCwdInfo(2, tp_nr)'))
+    eq('z Xdir3 1', eval('GetCwdInfo(1, tp_nr)'))
+  end)
+end)
diff --git a/test/functional/legacy/glob2regpat_spec.lua b/test/functional/legacy/glob2regpat_spec.lua
index 0492143616..82e7e3010f 100644
--- a/test/functional/legacy/glob2regpat_spec.lua
+++ b/test/functional/legacy/glob2regpat_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for signs
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute = helpers.clear, helpers.execute
 local eq, neq, eval = helpers.eq, helpers.neq, helpers.eval
 
diff --git a/test/functional/legacy/increment_spec.lua b/test/functional/legacy/increment_spec.lua
index 4aa24c0d53..a76718ed8e 100644
--- a/test/functional/legacy/increment_spec.lua
+++ b/test/functional/legacy/increment_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for using Ctrl-A/Ctrl-X on visual selections
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source, execute = helpers.source, helpers.execute
 local call, clear = helpers.call, helpers.clear
 local eq, nvim = helpers.eq, helpers.meths
@@ -727,6 +727,14 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
         exec "norm! gg$\<C-A>"
         call assert_equal("002", getline(1))
       endfunc
+
+      " Test a regression of patch 7.4.1087 fixed.
+      func Test_normal_increment_02()
+        call setline(1, ["hello 10", "world"])
+        exec "norm! ggl\<C-A>jx"
+        call assert_equal(["hello 11", "worl"], getline(1, '$'))
+        call assert_equal([0, 2, 4, 0], getpos('.'))
+      endfunc
     ]=])
   end)
 
@@ -745,4 +753,9 @@ describe('Ctrl-A/Ctrl-X on visual selections', function()
     call('Test_normal_increment_01')
     eq({}, nvim.get_vvar('errors'))
   end)
+
+  it('maintains correct column after CTRL-A', function()
+    call('Test_normal_increment_02')
+    eq({}, nvim.get_vvar('errors'))
+  end)
 end)
diff --git a/test/functional/legacy/insertcount_spec.lua b/test/functional/legacy/insertcount_spec.lua
index 01236e1afe..3142f040b3 100644
--- a/test/functional/legacy/insertcount_spec.lua
+++ b/test/functional/legacy/insertcount_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for repeating insert and replace.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/join_spec.lua b/test/functional/legacy/join_spec.lua
index 17ff2e71ad..3c4da8119c 100644
--- a/test/functional/legacy/join_spec.lua
+++ b/test/functional/legacy/join_spec.lua
@@ -1,6 +1,6 @@
 -- Test for joining lines
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, eq = helpers.clear, helpers.eq
 local eval, execute = helpers.eval, helpers.execute
 
diff --git a/test/functional/legacy/lispwords_spec.lua b/test/functional/legacy/lispwords_spec.lua
index 48df4de55e..2ec51dca1b 100644
--- a/test/functional/legacy/lispwords_spec.lua
+++ b/test/functional/legacy/lispwords_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
diff --git a/test/functional/legacy/listchars_spec.lua b/test/functional/legacy/listchars_spec.lua
index 89ed90178b..d2838cddb6 100644
--- a/test/functional/legacy/listchars_spec.lua
+++ b/test/functional/legacy/listchars_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for 'listchars' display with 'list' and :list.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/listlbr_spec.lua b/test/functional/legacy/listlbr_spec.lua
new file mode 100644
index 0000000000..eb979edc69
--- /dev/null
+++ b/test/functional/legacy/listlbr_spec.lua
@@ -0,0 +1,195 @@
+-- Test for linebreak and list option (non-utf8)
+
+local helpers = require('test.functional.helpers')(after_each)
+local feed, insert, source = helpers.feed, helpers.insert, helpers.source
+local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+
+describe('listlbr', function()
+  setup(clear)
+
+  it('is working', function()
+    insert([[
+      dummy text]])
+
+    execute('set wildchar=^E')
+    execute('10new')
+    execute('vsp')
+    execute('vert resize 20')
+    execute([[put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"]])
+    execute('norm! zt')
+    execute('set ts=4 sw=4 sts=4 linebreak sbr=+ wrap')
+    source([[
+      fu! ScreenChar(width)
+      	let c=''
+      	for j in range(1,4)
+	  for i in range(1,a:width)
+	    let c.=nr2char(screenchar(j, i))
+	  endfor
+	  let c.="\n"
+      	endfor
+      	return c
+      endfu
+      fu! DoRecordScreen()
+      	wincmd l
+      	$put =printf(\"\n%s\", g:test)
+      	$put =g:line
+      	wincmd p
+      endfu
+    ]])
+    execute('let g:test="Test 1: set linebreak"')
+    execute('redraw!')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+
+    execute('let g:test="Test 2: set linebreak + set list"')
+    execute('set linebreak list listchars=')
+    execute('redraw!')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+
+    execute('let g:test ="Test 3: set linebreak nolist"')
+    execute('set nolist linebreak')
+    execute('redraw!')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+
+    execute('let g:test ="Test 4: set linebreak with tab and 1 line as long as screen: should break!"')
+    execute('set nolist linebreak ts=8')
+    execute([[let line="1\t".repeat('a', winwidth(0)-2)]])
+    execute('$put =line')
+    execute('$')
+    execute('norm! zt')
+    execute('redraw!')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+    execute([[let line="_S_\t bla"]])
+    execute('$put =line')
+    execute('$')
+    execute('norm! zt')
+
+    execute('let g:test ="Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)"')
+    execute('set cpo&vim list linebreak conceallevel=2 concealcursor=nv listchars=tab:ab')
+    execute('syn match ConcealVar contained /_/ conceal')
+    execute('syn match All /.*/ contains=ConcealVar')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+    execute('set cpo&vim linebreak')
+
+    execute('let g:test ="Test 6: set linebreak with visual block mode"')
+    execute('let line="REMOVE: this not"')
+    execute('$put =g:test')
+    execute('$put =line')
+    execute('let line="REMOVE: aaaaaaaaaaaaa"')
+    execute('$put =line')
+    execute('1/^REMOVE:')
+    feed('0<C-V>jf x')
+    execute('$put')
+    execute('set cpo&vim linebreak')
+
+    execute('let g:test ="Test 7: set linebreak with visual block mode and v_b_A"')
+    execute('$put =g:test')
+    feed('Golong line: <esc>40afoobar <esc>aTARGET at end<esc>')
+    execute([[exe "norm! $3B\<C-v>eAx\<Esc>"]])
+    execute('set cpo&vim linebreak sbr=')
+
+    execute('let g:test ="Test 8: set linebreak with visual char mode and changing block"')
+    execute('$put =g:test')
+    feed('Go1111-1111-1111-11-1111-1111-1111<esc>0f-lv3lc2222<esc>bgj.')
+
+    execute('let g:test ="Test 9: using redo after block visual mode"')
+    execute('$put =g:test')
+    feed('Go<CR>')
+    feed('aaa<CR>')
+    feed('aaa<CR>')
+    feed('a<ESC>2k<C-V>2j~e.<CR>')
+
+    execute('let g:test ="Test 10: using normal commands after block-visual"')
+    execute('$put =g:test')
+    execute('set linebreak')
+    feed('Go<cr>')
+    feed('abcd{ef<cr>')
+    feed('ghijklm<cr>')
+    feed('no}pqrs<esc>2k0f{<C-V><C-V>c%<esc>')
+
+    execute('let g:test ="Test 11: using block replace mode after wrapping"')
+    execute('$put =g:test')
+    execute('set linebreak wrap')
+    feed('Go<esc>150aa<esc>yypk147|<C-V>jr0<cr>')
+
+    execute('let g:test ="Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$"')
+    execute('set list listchars=space:_,trail:-,tab:>-,eol:$')
+    execute('$put =g:test')
+    execute([[let line="a aaaaaaaaaaaaaaaaaaaaaa\ta "]])
+    execute('$put =line')
+    execute('$')
+    execute('norm! zt')
+    execute('redraw!')
+    execute('let line=ScreenChar(winwidth(0))')
+    execute('call DoRecordScreen()')
+
+    -- Assert buffer contents.
+    expect([[
+      
+      	abcdef hijklmn	pqrstuvwxyz_1060ABCDEFGHIJKLMNOP 
+      
+      Test 1: set linebreak
+          abcdef          
+      +hijklmn            
+      +pqrstuvwxyz_1060ABC
+      +DEFGHIJKLMNOP      
+      
+      Test 2: set linebreak + set list
+      ^Iabcdef hijklmn^I  
+      +pqrstuvwxyz_1060ABC
+      +DEFGHIJKLMNOP      
+                          
+      
+      Test 3: set linebreak nolist
+          abcdef          
+      +hijklmn            
+      +pqrstuvwxyz_1060ABC
+      +DEFGHIJKLMNOP      
+      1	aaaaaaaaaaaaaaaaaa
+      
+      Test 4: set linebreak with tab and 1 line as long as screen: should break!
+      1                   
+      +aaaaaaaaaaaaaaaaaa 
+      ~                   
+      ~                   
+      _S_	 bla
+      
+      Test 5: set linebreak with conceal and set list and tab displayed by different char (line may not be truncated)
+      Sabbbbbb bla        
+      ~                   
+      ~                   
+      ~                   
+      Test 6: set linebreak with visual block mode
+      this not
+      aaaaaaaaaaaaa
+      REMOVE: 
+      REMOVE: 
+      Test 7: set linebreak with visual block mode and v_b_A
+      long line: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar TARGETx at end
+      Test 8: set linebreak with visual char mode and changing block
+      1111-2222-1111-11-1111-2222-1111
+      Test 9: using redo after block visual mode
+      
+      AaA
+      AaA
+      A
+      Test 10: using normal commands after block-visual
+      
+      abcdpqrs
+      Test 11: using block replace mode after wrapping
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
+      aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa0aaa
+      Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
+      a aaaaaaaaaaaaaaaaaaaaaa	a 
+      
+      Test 12: set linebreak list listchars=space:_,tab:>-,tail:-,eol:$
+      a_                  
+      aaaaaaaaaaaaaaaaaaaa
+      aa>-----a-$         
+      ~                   ]])
+  end)
+end)
diff --git a/test/functional/legacy/listlbr_utf8_spec.lua b/test/functional/legacy/listlbr_utf8_spec.lua
index df0e817533..f06bca72ba 100644
--- a/test/functional/legacy/listlbr_utf8_spec.lua
+++ b/test/functional/legacy/listlbr_utf8_spec.lua
@@ -1,6 +1,6 @@
 -- Test for linebreak and list option in utf-8 mode
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source = helpers.source
 local feed = helpers.feed
 local clear, expect = helpers.clear, helpers.expect
diff --git a/test/functional/legacy/mapping_spec.lua b/test/functional/legacy/mapping_spec.lua
index a0d19926cb..1712219d04 100644
--- a/test/functional/legacy/mapping_spec.lua
+++ b/test/functional/legacy/mapping_spec.lua
@@ -1,6 +1,6 @@
 -- Test for mappings and abbreviations
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect, wait = helpers.execute, helpers.expect, helpers.wait
 
diff --git a/test/functional/legacy/marks_spec.lua b/test/functional/legacy/marks_spec.lua
index 8e9ceb1653..6ecba70f08 100644
--- a/test/functional/legacy/marks_spec.lua
+++ b/test/functional/legacy/marks_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/match_conceal_spec.lua b/test/functional/legacy/match_conceal_spec.lua
deleted file mode 100644
index 0ffa3cae7a..0000000000
--- a/test/functional/legacy/match_conceal_spec.lua
+++ /dev/null
@@ -1,228 +0,0 @@
--- Test for matchadd() and conceal feature
-
-local helpers = require('test.functional.helpers')
-local clear = helpers.clear
-local expect = helpers.expect
-local source = helpers.source
-
-describe('match_conceal', function()
-  before_each(function()
-    clear()
-
-    source([[
-      set wildchar=^E
-      10new
-      vsp
-      vert resize 20
-      put =\"\#\ This\ is\ a\ Test\"
-      norm! mazt
-      
-      fu! ScreenChar(width, lines)
-        let c=''
-        for j in range(1,a:lines)
-          for i in range(1,a:width)
-            let c.=nr2char(screenchar(j, i))
-          endfor
-          let c.="\n"
-        endfor
-        return c
-      endfu
-      
-      fu! ScreenAttr(line, pos, eval)
-        let g:attr=[]
-        for col in a:pos
-          call add(g:attr, screenattr(a:line,col))
-        endfor
-        " In case all values are zero, probably the terminal
-        " isn't set correctly, so catch that case
-        let null = (eval(join(g:attr, '+')) == 0)
-        let str=substitute(a:eval, '\d\+', 'g:attr[&]', 'g')
-        if null || eval(str)
-          let g:attr_test="OK: ". str
-        else
-          let g:attr_test="FAILED: ".str
-          let g:attr_test.="\n". join(g:attr, ' ')
-          let g:attr_test.="\n TERM: ". &term
-        endif
-      endfu
-      
-      fu! DoRecordScreen()
-        wincmd l
-        $put =printf(\"\n%s\", g:test)
-        $put =g:line
-        $put =g:attr_test
-        wincmd p
-      endfu
-    ]])
-  end)
-
-  it('is working', function()
-    source([=[
-      let g:test ="Test 1: simple addmatch()"
-      call matchadd('Conceal', '\%2l ')
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 2: simple addmatch() and conceal (should be: #XThisXisXaXTest)"
-      norm! 'azt
-      call clearmatches()
-      syntax on
-      set concealcursor=n conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 3: addmatch() and conceallevel=3 (should be: #ThisisaTest)"
-      norm! 'azt
-      set conceallevel=3
-      call clearmatches()
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 1==2 && 1==3 && 1==4 && 0!=5")
-      call DoRecordScreen()
-
-      let g:test ="Test 4: more match() (should be: #Thisisa Test)"
-      norm! 'azt
-      call matchadd('ErrorMsg', '\%2l Test', 20, -1, {'conceal': 'X'})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 1==2 && 0!=3 && 3==4 && 0!=5 && 3!=5")
-      call DoRecordScreen()
-
-      let g:test ="Test 5/1: default conceal char (should be: # This is a Test)"
-      norm! 'azt
-      call clearmatches()
-      set conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      let g:test ="Test 5/2: default conceal char (should be: #+This+is+a+Test)"
-      norm! 'azt
-      set listchars=conceal:+
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      set listchars&vi
-
-      let g:test ="Test 6/1: syn and match conceal (should be: #ZThisZisZaZTest)"
-      norm! 'azt
-      call clearmatches()
-      set conceallevel=1
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
-      syn match MyConceal /\%2l / conceal containedin=ALL cchar=*
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-      let g:test ="Test 6/2: syn and match conceal (should be: #*This*is*a*Test)"
-      norm! 'azt
-      call clearmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 7/1: clear matches"
-      norm! 'azt
-      syn on
-      call matchadd('Conceal', '\%2l ', 10, -1, {'conceal': 'Z'})
-      let a=getmatches()
-      call clearmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0==1 && 0==2 && 0==3 && 0==4 && 0==5")
-      call DoRecordScreen()
-      $put =a
-      call setmatches(a)
-      norm! 'azt
-      let g:test ="Test 7/2: reset match using setmatches()"
-      norm! 'azt
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-
-      let g:test ="Test 8: using matchaddpos() (should be #Pis a Test"
-      norm! 'azt
-      call clearmatches()
-      call matchaddpos('Conceal', [[2,2,6]], 10, -1, {'conceal': 'P'})
-      let a=getmatches()
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1!=2 && 0==2 && 0==3 && 0!=4 && 0!=5 && 4==5")
-      call DoRecordScreen()
-      $put =a
-
-      let g:test ="Test 9: match using multibyte conceal char (should be: #ˑThisˑisˑaˑTest)"
-      norm! 'azt
-      call clearmatches()
-      call matchadd('Conceal', '\%2l ', 20, -1, {'conceal': "\u02d1"})
-      redraw!
-      let line=ScreenChar(winwidth(0),1)
-      call ScreenAttr(1,[1,2,7,10,12,16], "0!=1 && 1==2 && 1==3 && 1==4 && 0==5")
-      call DoRecordScreen()
-    ]=])
-
-    expect([=[
-      
-      # This is a Test
-      
-      Test 1: simple addmatch()
-      # This is a Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 2: simple addmatch() and conceal (should be: #XThisXisXaXTest)
-      #XThisXisXaXTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 3: addmatch() and conceallevel=3 (should be: #ThisisaTest)
-      #ThisisaTest        
-      OK: g:attr[0]==g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]!=g:attr[5]
-      
-      Test 4: more match() (should be: #Thisisa Test)
-      #Thisisa Test       
-      OK: g:attr[0]==g:attr[1] && g:attr[1]==g:attr[2] && g:attr[0]!=g:attr[3] && g:attr[3]==g:attr[4] && g:attr[0]!=g:attr[5] && g:attr[3]!=g:attr[5]
-      
-      Test 5/1: default conceal char (should be: # This is a Test)
-      # This is a Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 5/2: default conceal char (should be: #+This+is+a+Test)
-      #+This+is+a+Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 6/1: syn and match conceal (should be: #ZThisZisZaZTest)
-      #ZThisZisZaZTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 6/2: syn and match conceal (should be: #*This*is*a*Test)
-      #*This*is*a*Test    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 7/1: clear matches
-      # This is a Test    
-      OK: g:attr[0]==g:attr[1] && g:attr[0]==g:attr[2] && g:attr[0]==g:attr[3] && g:attr[0]==g:attr[4] && g:attr[0]==g:attr[5]
-      {'group': 'Conceal', 'pattern': '\%2l ', 'priority': 10, 'id': 10, 'conceal': 'Z'}
-      
-      Test 7/2: reset match using setmatches()
-      #ZThisZisZaZTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]
-      
-      Test 8: using matchaddpos() (should be #Pis a Test
-      #Pis a Test         
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]!=g:attr[2] && g:attr[0]==g:attr[2] && g:attr[0]==g:attr[3] && g:attr[0]!=g:attr[4] && g:attr[0]!=g:attr[5] && g:attr[4]==g:attr[5]
-      {'group': 'Conceal', 'id': 11, 'priority': 10, 'pos1': [2, 2, 6], 'conceal': 'P'}
-      
-      Test 9: match using multibyte conceal char (should be: #ˑThisˑisˑaˑTest)
-      #ˑThisˑisˑaˑTest    
-      OK: g:attr[0]!=g:attr[1] && g:attr[1]==g:attr[2] && g:attr[1]==g:attr[3] && g:attr[1]==g:attr[4] && g:attr[0]==g:attr[5]]=])
-  end)
-end)
diff --git a/test/functional/legacy/nested_function_spec.lua b/test/functional/legacy/nested_function_spec.lua
index fac3b03191..be9b66ee38 100644
--- a/test/functional/legacy/nested_function_spec.lua
+++ b/test/functional/legacy/nested_function_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for nested function.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, insert = helpers.clear, helpers.insert
 local execute, expect, source = helpers.execute, helpers.expect, helpers.source
 
diff --git a/test/functional/legacy/options_spec.lua b/test/functional/legacy/options_spec.lua
index 21e99c4aa1..4f4d4ceaf9 100644
--- a/test/functional/legacy/options_spec.lua
+++ b/test/functional/legacy/options_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local command, clear = helpers.command, helpers.clear
 local source, expect = helpers.source, helpers.expect
 
diff --git a/test/functional/legacy/packadd_spec.lua b/test/functional/legacy/packadd_spec.lua
new file mode 100644
index 0000000000..2d851819e3
--- /dev/null
+++ b/test/functional/legacy/packadd_spec.lua
@@ -0,0 +1,356 @@
+-- Tests for 'packpath' and :packadd
+
+local helpers = require('test.functional.helpers')(after_each)
+local clear, source, execute = helpers.clear, helpers.source, helpers.execute
+local call, eq, nvim = helpers.call, helpers.eq, helpers.meths
+local feed = helpers.feed
+
+local function expected_empty()
+  eq({}, nvim.get_vvar('errors'))
+end
+
+if helpers.pending_win32(pending) then return end
+
+describe('packadd', function()
+  before_each(function()
+    clear()
+
+    source([=[
+      func SetUp()
+        let s:topdir = expand('%:p:h') . '/Xdir'
+        exe 'set packpath=' . s:topdir
+        let s:plugdir = s:topdir . '/pack/mine/opt/mytest'
+      endfunc
+
+      func TearDown()
+        call delete(s:topdir, 'rf')
+      endfunc
+
+      func Test_packadd()
+        call mkdir(s:plugdir . '/plugin/also', 'p')
+        call mkdir(s:plugdir . '/ftdetect', 'p')
+        call mkdir(s:plugdir . '/after', 'p')
+        set rtp&
+        let rtp = &rtp
+        filetype on
+
+        exe 'split ' . s:plugdir . '/plugin/test.vim'
+        call setline(1, 'let g:plugin_works = 42')
+        wq
+
+        exe 'split ' . s:plugdir . '/plugin/also/loaded.vim'
+        call setline(1, 'let g:plugin_also_works = 77')
+        wq
+
+        exe 'split ' . s:plugdir . '/ftdetect/test.vim'
+        call setline(1, 'let g:ftdetect_works = 17')
+        wq
+
+        packadd mytest
+
+        call assert_true(42, g:plugin_works)
+        call assert_equal(77, g:plugin_also_works)
+        call assert_true(17, g:ftdetect_works)
+        call assert_true(len(&rtp) > len(rtp))
+        call assert_true(&rtp =~ (s:plugdir . '\($\|,\)'))
+        call assert_true(&rtp =~ (s:plugdir . '/after$'))
+
+        " Check exception
+        call assert_fails("packadd directorynotfound", 'E919:')
+        call assert_fails("packadd", 'E471:')
+      endfunc
+
+      func Test_packadd_noload()
+        call mkdir(s:plugdir . '/plugin', 'p')
+        call mkdir(s:plugdir . '/syntax', 'p')
+        set rtp&
+        let rtp = &rtp
+
+        exe 'split ' . s:plugdir . '/plugin/test.vim'
+        call setline(1, 'let g:plugin_works = 42')
+        wq
+        let g:plugin_works = 0
+
+        packadd! mytest
+
+        call assert_true(len(&rtp) > len(rtp))
+        call assert_true(&rtp =~ (s:plugdir . '\($\|,\)'))
+        call assert_equal(0, g:plugin_works)
+
+        " check the path is not added twice
+        let new_rtp = &rtp
+        packadd! mytest
+        call assert_equal(new_rtp, &rtp)
+      endfunc
+
+      func Test_packloadall()
+        " plugin foo with an autoload directory
+        let fooplugindir = &packpath . '/pack/mine/start/foo/plugin'
+        call mkdir(fooplugindir, 'p')
+        call writefile(['let g:plugin_foo_number = 1234',
+          \ 'let g:plugin_foo_auto = bbb#value',
+          \ 'let g:plugin_extra_auto = extra#value'], fooplugindir . '/bar.vim')
+        let fooautodir = &packpath . '/pack/mine/start/foo/autoload'
+        call mkdir(fooautodir, 'p')
+        call writefile(['let bar#value = 77'], fooautodir . '/bar.vim')
+
+        " plugin aaa with an autoload directory
+        let aaaplugindir = &packpath . '/pack/mine/start/aaa/plugin'
+        call mkdir(aaaplugindir, 'p')
+        call writefile(['let g:plugin_aaa_number = 333',
+          \ 'let g:plugin_aaa_auto = bar#value'], aaaplugindir . '/bbb.vim')
+        let aaaautodir = &packpath . '/pack/mine/start/aaa/autoload'
+        call mkdir(aaaautodir, 'p')
+        call writefile(['let bbb#value = 55'], aaaautodir . '/bbb.vim')
+
+        " plugin extra with only an autoload directory
+        let extraautodir = &packpath . '/pack/mine/start/extra/autoload'
+        call mkdir(extraautodir, 'p')
+        call writefile(['let extra#value = 99'], extraautodir . '/extra.vim')
+
+        packloadall
+        call assert_equal(1234, g:plugin_foo_number)
+        call assert_equal(55, g:plugin_foo_auto)
+        call assert_equal(99, g:plugin_extra_auto)
+        call assert_equal(333, g:plugin_aaa_number)
+        call assert_equal(77, g:plugin_aaa_auto)
+
+        " only works once
+        call writefile(['let g:plugin_bar_number = 4321'],
+          \ fooplugindir . '/bar2.vim')
+        packloadall
+        call assert_false(exists('g:plugin_bar_number'))
+
+        " works when ! used
+        packloadall!
+        call assert_equal(4321, g:plugin_bar_number)
+      endfunc
+
+      func Test_helptags()
+        let docdir1 = &packpath . '/pack/mine/start/foo/doc'
+        let docdir2 = &packpath . '/pack/mine/start/bar/doc'
+        call mkdir(docdir1, 'p')
+        call mkdir(docdir2, 'p')
+        call writefile(['look here: *look-here*'], docdir1 . '/bar.txt')
+        call writefile(['look away: *look-away*'], docdir2 . '/foo.txt')
+        exe 'set rtp=' . &packpath . '/pack/mine/start/foo,' . &packpath . '/pack/mine/start/bar'
+
+        helptags ALL
+
+        let tags1 = readfile(docdir1 . '/tags') 
+        call assert_true(tags1[0] =~ 'look-here')
+        let tags2 = readfile(docdir2 . '/tags') 
+        call assert_true(tags2[0] =~ 'look-away')
+      endfunc
+
+      func Test_colorscheme()
+        let colordirrun = &packpath . '/runtime/colors'
+        let colordirstart = &packpath . '/pack/mine/start/foo/colors'
+        let colordiropt = &packpath . '/pack/mine/opt/bar/colors'
+        call mkdir(colordirrun, 'p')
+        call mkdir(colordirstart, 'p')
+        call mkdir(colordiropt, 'p')
+        call writefile(['let g:found_one = 1'], colordirrun . '/one.vim')
+        call writefile(['let g:found_two = 1'], colordirstart . '/two.vim')
+        call writefile(['let g:found_three = 1'], colordiropt . '/three.vim')
+        exe 'set rtp=' . &packpath . '/runtime'
+
+        colorscheme one
+        call assert_equal(1, g:found_one)
+        colorscheme two
+        call assert_equal(1, g:found_two)
+        colorscheme three
+        call assert_equal(1, g:found_three)
+      endfunc
+
+      func Test_runtime()
+        let rundir = &packpath . '/runtime/extra'
+        let startdir = &packpath . '/pack/mine/start/foo/extra'
+        let optdir = &packpath . '/pack/mine/opt/bar/extra'
+        call mkdir(rundir, 'p')
+        call mkdir(startdir, 'p')
+        call mkdir(optdir, 'p')
+        call writefile(['let g:sequence .= "run"'], rundir . '/bar.vim')
+        call writefile(['let g:sequence .= "start"'], startdir . '/bar.vim')
+        call writefile(['let g:sequence .= "foostart"'], startdir . '/foo.vim')
+        call writefile(['let g:sequence .= "opt"'], optdir . '/bar.vim')
+        call writefile(['let g:sequence .= "xxxopt"'], optdir . '/xxx.vim')
+        exe 'set rtp=' . &packpath . '/runtime'
+
+        let g:sequence = ''
+        runtime extra/bar.vim
+        call assert_equal('run', g:sequence)
+        let g:sequence = ''
+        runtime START extra/bar.vim
+        call assert_equal('start', g:sequence)
+        let g:sequence = ''
+        runtime OPT extra/bar.vim
+        call assert_equal('opt', g:sequence)
+        let g:sequence = ''
+        runtime PACK extra/bar.vim
+        call assert_equal('start', g:sequence)
+        let g:sequence = ''
+        runtime! PACK extra/bar.vim
+        call assert_equal('startopt', g:sequence)
+        let g:sequence = ''
+        runtime PACK extra/xxx.vim
+        call assert_equal('xxxopt', g:sequence)
+
+        let g:sequence = ''
+        runtime ALL extra/bar.vim
+        call assert_equal('run', g:sequence)
+        let g:sequence = ''
+        runtime ALL extra/foo.vim
+        call assert_equal('foostart', g:sequence)
+        let g:sequence = ''
+        runtime! ALL extra/xxx.vim
+        call assert_equal('xxxopt', g:sequence)
+        let g:sequence = ''
+        runtime! ALL extra/bar.vim
+        call assert_equal('runstartopt', g:sequence)
+      endfunc
+    ]=])
+    call('SetUp')
+  end)
+
+  after_each(function()
+    call('TearDown')
+  end)
+
+  it('is working', function()
+    call('Test_packadd')
+    expected_empty()
+  end)
+
+  it('works with packadd!', function()
+    call('Test_packadd_noload')
+    expected_empty()
+  end)
+
+  it('works with :packloadall', function()
+    call('Test_packloadall')
+    expected_empty()
+  end)
+
+  it('works with helptags', function()
+    call('Test_helptags')
+    expected_empty()
+  end)
+
+  it('works with colorschemes', function()
+    call('Test_colorscheme')
+    expected_empty()
+  end)
+
+  it('works with :runtime [what]', function()
+    call('Test_runtime')
+    expected_empty()
+  end)
+
+  describe('command line completion', function()
+    local Screen = require('test.functional.ui.screen')
+    local screen
+
+    before_each(function()
+      screen = Screen.new(30, 5)
+      screen:attach()
+      screen:set_default_attr_ids({
+        [0] = {bold=true, foreground=Screen.colors.Blue},
+        [1] = {
+          foreground = Screen.colors.Black,
+          background = Screen.colors.Yellow,
+        },
+        [2] = {bold = true, reverse = true}
+      })
+
+      execute([[let optdir1 = &packpath . '/pack/mine/opt']])
+      execute([[let optdir2 = &packpath . '/pack/candidate/opt']])
+      execute([[call mkdir(optdir1 . '/pluginA', 'p')]])
+      execute([[call mkdir(optdir1 . '/pluginC', 'p')]])
+      execute([[call mkdir(optdir2 . '/pluginB', 'p')]])
+      execute([[call mkdir(optdir2 . '/pluginC', 'p')]])
+    end)
+
+    it('works', function()
+      feed(':packadd <Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {1:pluginA}{2:  pluginB  pluginC     }|
+        :packadd pluginA^              |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:pluginA  }{1:pluginB}{2:  pluginC     }|
+        :packadd pluginB^              |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:pluginA  pluginB  }{1:pluginC}{2:     }|
+        :packadd pluginC^              |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:pluginA  pluginB  pluginC     }|
+        :packadd ^                     |
+      ]=])
+    end)
+
+    it('works for colorschemes', function()
+      source([[
+        let colordirrun = &packpath . '/runtime/colors'
+        let colordirstart = &packpath . '/pack/mine/start/foo/colors'
+        let colordiropt = &packpath . '/pack/mine/opt/bar/colors'
+        call mkdir(colordirrun, 'p')
+        call mkdir(colordirstart, 'p')
+        call mkdir(colordiropt, 'p')
+        call writefile(['let g:found_one = 1'], colordirrun . '/one.vim')
+        call writefile(['let g:found_two = 1'], colordirstart . '/two.vim')
+        call writefile(['let g:found_three = 1'], colordiropt . '/three.vim')
+        exe 'set rtp=' . &packpath . '/runtime']])
+
+      feed(':colorscheme <Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {1:one}{2:  three  two               }|
+        :colorscheme one^              |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:one  }{1:three}{2:  two               }|
+        :colorscheme three^            |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:one  three  }{1:two}{2:               }|
+        :colorscheme two^              |
+      ]=])
+      feed('<Tab>')
+      screen:expect([=[
+                                      |
+        {0:~                             }|
+        {0:~                             }|
+        {2:one  three  two               }|
+        :colorscheme ^                 |
+      ]=])
+    end)
+  end)
+end)
diff --git a/test/functional/legacy/qf_title_spec.lua b/test/functional/legacy/qf_title_spec.lua
index 01c781cc05..9f97eb27b2 100644
--- a/test/functional/legacy/qf_title_spec.lua
+++ b/test/functional/legacy/qf_title_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for quickfix window's title
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
 local clear, expect = helpers.clear, helpers.expect
 
diff --git a/test/functional/legacy/quickfix_spec.lua b/test/functional/legacy/quickfix_spec.lua
deleted file mode 100644
index 88f86815b3..0000000000
--- a/test/functional/legacy/quickfix_spec.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- Test for the quickfix commands.
-
-local helpers = require('test.functional.helpers')
-local source, clear = helpers.source, helpers.clear
-
-describe('helpgrep', function()
-  before_each(clear)
-
-  it('works', function()
-    source([[
-      helpgrep quickfix
-      copen
-      " This wipes out the buffer, make sure that doesn't cause trouble.
-      cclose
-    ]])
-  end)
-end)
diff --git a/test/functional/legacy/search_mbyte_spec.lua b/test/functional/legacy/search_mbyte_spec.lua
index 075b24b897..a5a5822a45 100644
--- a/test/functional/legacy/search_mbyte_spec.lua
+++ b/test/functional/legacy/search_mbyte_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert = helpers.insert
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
diff --git a/test/functional/legacy/searchpos_spec.lua b/test/functional/legacy/searchpos_spec.lua
index 1c9b1ccee6..7d4b7a3734 100644
--- a/test/functional/legacy/searchpos_spec.lua
+++ b/test/functional/legacy/searchpos_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local call = helpers.call
 local clear = helpers.clear
 local execute = helpers.execute
diff --git a/test/functional/legacy/set_spec.lua b/test/functional/legacy/set_spec.lua
index f2c907084e..11f371569d 100644
--- a/test/functional/legacy/set_spec.lua
+++ b/test/functional/legacy/set_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for :set
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, eval, eq =
   helpers.clear, helpers.execute, helpers.eval, helpers.eq
 
diff --git a/test/functional/legacy/signs_spec.lua b/test/functional/legacy/signs_spec.lua
index 5a834c39e3..e80a32455a 100644
--- a/test/functional/legacy/signs_spec.lua
+++ b/test/functional/legacy/signs_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for signs
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('signs', function()
diff --git a/test/functional/legacy/tagcase_spec.lua b/test/functional/legacy/tagcase_spec.lua
index 9a8c6fbe42..ed2876a375 100644
--- a/test/functional/legacy/tagcase_spec.lua
+++ b/test/functional/legacy/tagcase_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
diff --git a/test/functional/legacy/textobjects_spec.lua b/test/functional/legacy/textobjects_spec.lua
index 1e8e0b0bcb..15a93e3819 100644
--- a/test/functional/legacy/textobjects_spec.lua
+++ b/test/functional/legacy/textobjects_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local call = helpers.call
 local clear = helpers.clear
 local execute = helpers.execute
diff --git a/test/functional/legacy/undolevels_spec.lua b/test/functional/legacy/undolevels_spec.lua
index 41274b3a04..1dfc4c17ba 100644
--- a/test/functional/legacy/undolevels_spec.lua
+++ b/test/functional/legacy/undolevels_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local source, clear = helpers.source, helpers.clear
 local eq, nvim = helpers.eq, helpers.meths
 
@@ -10,7 +10,7 @@ describe('undolevel', function()
       func FillBuffer()
         for i in range(1,13)
           put=i
-          " Set 'undolevels' to split undo. 
+          " Set 'undolevels' to split undo.
           exe "setg ul=" . &g:ul
         endfor
       endfunc
@@ -48,6 +48,10 @@ describe('undolevel', function()
         call assert_equal(50, &g:undolevels)
         call assert_equal(-123456, &l:undolevels)
 
+        " Drop created windows
+        set ul&
+        new
+        only!
       endfunc
 
       call Test_global_local_undolevels()
diff --git a/test/functional/legacy/utf8_spec.lua b/test/functional/legacy/utf8_spec.lua
index d33ba6b5fd..4d4f55b9eb 100644
--- a/test/functional/legacy/utf8_spec.lua
+++ b/test/functional/legacy/utf8_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for Unicode manipulations
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, expect = helpers.execute, helpers.expect
 local eq, eval = helpers.eq, helpers.eval
diff --git a/test/functional/legacy/wordcount_spec.lua b/test/functional/legacy/wordcount_spec.lua
index ba7be8f21b..171ec3de92 100644
--- a/test/functional/legacy/wordcount_spec.lua
+++ b/test/functional/legacy/wordcount_spec.lua
@@ -1,10 +1,12 @@
 -- Test for wordcount() function
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute = helpers.clear, helpers.execute
 local eq, eval = helpers.eq, helpers.eval
 
+if helpers.pending_win32(pending) then return end
+
 describe('wordcount', function()
   before_each(clear)
 
diff --git a/test/functional/legacy/writefile_spec.lua b/test/functional/legacy/writefile_spec.lua
index efdfc1d09f..765d373b82 100644
--- a/test/functional/legacy/writefile_spec.lua
+++ b/test/functional/legacy/writefile_spec.lua
@@ -1,6 +1,6 @@
 -- Tests for writefile()
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 
 describe('writefile', function()
@@ -17,6 +17,7 @@ describe('writefile', function()
     execute('bwipeout!')
     execute('$put =readfile(f)')
     execute('1 delete _')
+    execute('call delete(f)')
 
     -- Assert buffer contents.
     expect([[
diff --git a/test/functional/normal/K_spec.lua b/test/functional/normal/K_spec.lua
index df6b429f50..43e598633c 100644
--- a/test/functional/normal/K_spec.lua
+++ b/test/functional/normal/K_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eq, clear, eval, feed =
   helpers.eq, helpers.clear, helpers.eval, helpers.feed
 
+if helpers.pending_win32(pending) then return end
+
 describe('K', function()
   local test_file = 'K_spec_out'
   before_each(function()
diff --git a/test/functional/normal/count_spec.lua b/test/functional/normal/count_spec.lua
new file mode 100644
index 0000000000..700e1f3e81
--- /dev/null
+++ b/test/functional/normal/count_spec.lua
@@ -0,0 +1,39 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local eval = helpers.eval
+local feed = helpers.feed
+local clear = helpers.clear
+local execute = helpers.execute
+
+describe('v:count/v:count1', function()
+  before_each(function()
+    clear()
+
+    execute('map <silent> _x :<C-u>let g:count = "v:count=". v:count .", v:count1=". v:count1<CR>')
+  end)
+
+  describe('in cmdwin', function()
+    it('equal 0/1 when no count is given', function()
+      feed('q:_x')
+      eq('v:count=0, v:count1=1', eval('g:count'))
+    end)
+
+    it('equal 2/2 when count of 2 is given', function()
+      feed('q:2_x')
+      eq('v:count=2, v:count1=2', eval('g:count'))
+    end)
+  end)
+
+  describe('in normal mode', function()
+    it('equal 0/1 when no count is given', function()
+      feed('_x')
+      eq('v:count=0, v:count1=1', eval('g:count'))
+    end)
+
+    it('equal 2/2 when count of 2 is given', function()
+      feed('2_x')
+      eq('v:count=2, v:count1=2', eval('g:count'))
+    end)
+  end)
+end)
diff --git a/test/functional/normal/put_spec.lua b/test/functional/normal/put_spec.lua
new file mode 100644
index 0000000000..36d5e8b43c
--- /dev/null
+++ b/test/functional/normal/put_spec.lua
@@ -0,0 +1,936 @@
+local Screen = require('test.functional.ui.screen')
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local insert = helpers.insert
+local feed = helpers.feed
+local expect = helpers.expect
+local eq = helpers.eq
+local map = helpers.map
+local filter = helpers.filter
+local execute = helpers.execute
+local curbuf_contents = helpers.curbuf_contents
+local funcs = helpers.funcs
+local dedent = helpers.dedent
+local getreg = funcs.getreg
+
+local function reset()
+  clear()
+  insert([[
+  Line of words 1
+  Line of words 2]])
+  execute('goto 1')
+  feed('itest_string.<esc>u')
+  funcs.setreg('a', 'test_stringa', 'V')
+  funcs.setreg('b', 'test_stringb\ntest_stringb\ntest_stringb', 'b')
+  funcs.setreg('"', 'test_string"', 'v')
+end
+
+-- We check the last inserted register ". in each of these tests because it is
+-- implemented completely differently in do_put().
+-- It is implemented differently so that control characters and imap'ped
+-- characters work in the same manner when pasted as when inserted.
+describe('put command', function()
+  -- Put a call to clear() here to force the connection to the server.
+  -- This means we can use the funcs.*() functions while mangling text before
+  -- the actual tests are run.
+  clear()
+  before_each(reset)
+
+  local function visual_marks_zero()
+    for _,v in pairs(funcs.getpos("'<")) do
+      if v ~= 0 then
+        return false
+      end
+    end
+    for _,v in pairs(funcs.getpos("'>")) do
+      if v ~= 0 then
+        return false
+      end
+    end
+    return true
+  end
+
+  -- {{{ Where test definitions are run
+  local function run_test_variations(test_variations, extra_setup)
+    reset()
+    if extra_setup then extra_setup() end
+    local init_contents = curbuf_contents()
+    local init_cursorpos = funcs.getcurpos()
+    local assert_no_change = function (exception_table, after_undo)
+      expect(init_contents)
+      -- When putting the ". register forwards, undo doesn't move
+      -- the cursor back to where it was before.
+      -- This is because it uses the command character 'a' to
+      -- start the insert, and undo after that leaves the cursor
+      -- one place to the right (unless we were at the end of the
+      -- line when we pasted).
+      if not (exception_table.undo_position and after_undo) then
+        eq(funcs.getcurpos(), init_cursorpos)
+      end
+    end
+
+    for _, test in pairs(test_variations) do
+      it(test.description, function()
+        if extra_setup then extra_setup() end
+        local orig_dotstr = funcs.getreg('.')
+        helpers.ok(visual_marks_zero())
+        -- Make sure every test starts from the same conditions
+        assert_no_change(test.exception_table, false)
+        local was_cli = test.test_action()
+        test.test_assertions(test.exception_table, false)
+        -- Check that undo twice puts us back to the original conditions
+        -- (i.e. puts the cursor and text back to before)
+        feed('u')
+        assert_no_change(test.exception_table, true)
+
+        -- Should not have changed the ". register
+        -- If we paste the ". register with a count we can't avoid
+        -- changing this register, hence avoid this check.
+        if not test.exception_table.dot_reg_changed then
+          eq(funcs.getreg('.'), orig_dotstr)
+        end
+
+        -- Doing something, undoing it, and then redoing it should
+        -- leave us in the same state as just doing it once.
+        -- For :ex actions we want '@:', for normal actions we want '.'
+
+        -- The '.' redo doesn't work for visual put so just exit if
+        -- it was tested.
+        -- We check that visual put was used by checking if the '< and
+        -- '> marks were changed.
+        if not visual_marks_zero() then
+          return
+        end
+
+        if test.exception_table.undo_position then
+          funcs.setpos('.', init_cursorpos)
+        end
+        if was_cli then
+          feed('@:')
+        else
+          feed('.')
+        end
+
+        test.test_assertions(test.exception_table, true)
+      end)
+    end
+  end -- run_test_variations()
+  -- }}}
+
+  local function create_test_defs(test_defs, command_base, command_creator, -- {{{
+                                  expect_base, expect_creator)
+    local rettab = {}
+    local exceptions
+    for _, v in pairs(test_defs) do
+      if v[4] then
+        exceptions = v[4]
+      else
+        exceptions = {}
+      end
+      table.insert(rettab,
+      {
+        test_action = command_creator(command_base, v[1]),
+        test_assertions = expect_creator(expect_base, v[2]),
+        description = v[3],
+        exception_table = exceptions,
+      })
+    end
+    return rettab
+  end -- create_test_defs() }}}
+
+  local function find_cursor_position(expect_string) -- {{{
+    -- There must only be one occurance of the character 'x' in
+    -- expect_string.
+    -- This function removes that occurance, and returns the position that
+    -- it was in.
+    -- This returns the cursor position that would leave the 'x' in that
+    -- place if we feed 'ix<esc>' and the string existed before it.
+    for linenum, line in pairs(funcs.split(expect_string, '\n', 1)) do
+      local column = line:find('x')
+      if column then
+        return {linenum, column}, expect_string:gsub('x', '')
+      end
+    end
+  end -- find_cursor_position() }}}
+
+  -- Action function creators {{{
+  local function create_p_action(test_map, substitution)
+    local temp_val = test_map:gsub('p', substitution)
+    return function()
+      feed(temp_val)
+      return false
+    end
+  end
+
+  local function create_put_action(command_base, substitution)
+    local temp_val = command_base:gsub('put', substitution)
+    return function()
+      execute(temp_val)
+      return true
+    end
+  end
+  -- }}}
+
+  -- Expect function creator {{{
+  local function expect_creator(conversion_function, expect_base, conversion_table)
+    local temp_expect_string = conversion_function(expect_base, conversion_table)
+    local cursor_position, expect_string = find_cursor_position(temp_expect_string)
+    return function(exception_table, after_redo)
+      expect(expect_string)
+
+      -- Have to use getcurpos() instead of curwinmeths.get_cursor() in
+      -- order to account for virtualedit.
+      -- We always want the curswant element in getcurpos(), which is
+      -- sometimes different to the column element in
+      -- curwinmeths.get_cursor().
+      -- NOTE: The ".gp command leaves the cursor after the pasted text
+      -- when running, but does not when the command is redone with the
+      -- '.' command.
+      if not (exception_table.redo_position and after_redo) then
+        local actual_position = funcs.getcurpos()
+        eq(cursor_position, {actual_position[2], actual_position[5]})
+      end
+    end
+  end -- expect_creator() }}}
+
+  -- Test definitions {{{
+  local function copy_def(def)
+    local rettab = { '', {}, '', nil }
+    rettab[1] = def[1]
+    for k,v in pairs(def[2]) do
+      rettab[2][k] = v
+    end
+    rettab[3] = def[3]
+    if def[4] then
+      rettab[4] = {}
+      for k,v in pairs(def[4]) do
+        rettab[4][k] = v
+      end
+    end
+    return rettab
+  end
+
+  local normal_command_defs = {
+    {
+      'p',
+      {cursor_after = false, put_backwards = false, dot_register = false},
+      'pastes after cursor with p',
+    },
+    {
+      'gp',
+      {cursor_after = true, put_backwards = false, dot_register = false},
+      'leaves cursor after text with gp',
+    },
+    {
+      '".p',
+      {cursor_after = false, put_backwards = false, dot_register = true},
+      'works with the ". register',
+    },
+    {
+      '".gp',
+      {cursor_after = true, put_backwards = false, dot_register = true},
+      'gp works with the ". register',
+      {redo_position = true},
+    },
+    {
+      'P',
+      {cursor_after = false, put_backwards = true, dot_register = false},
+      'pastes before cursor with P',
+    },
+    {
+      'gP',
+      {cursor_after = true, put_backwards = true, dot_register = false},
+      'gP pastes before cursor and leaves cursor after text',
+    },
+    {
+      '".P',
+      {cursor_after = false, put_backwards = true, dot_register = true},
+      'P works with ". register',
+    },
+    {
+      '".gP',
+      {cursor_after = true, put_backwards = true, dot_register = true},
+      'gP works with ". register',
+      {redo_position = true},
+    },
+  }
+
+  -- Add a definition applying a count for each definition above.
+  -- Could do this for each transformation (p -> P, p -> gp etc), but I think
+  -- it's neater this way (balance between being explicit and too verbose).
+  for i = 1,#normal_command_defs do
+    local cur = normal_command_defs[i]
+
+    -- Make modified copy of current definition that includes a count.
+    local newdef = copy_def(cur)
+    newdef[2].count = 2
+    cur[2].count = 1
+    newdef[1] = '2' .. newdef[1]
+    newdef[3] = 'double ' .. newdef[3]
+
+    if cur[2].dot_register then
+      if not cur[4] then
+        newdef[4] = {}
+      end
+      newdef[4].dot_reg_changed = true
+    end
+
+    normal_command_defs[#normal_command_defs + 1] = newdef
+  end
+
+  local ex_command_defs = {
+    {
+      'put',
+      {put_backwards = false, dot_register = false},
+      'pastes linewise forwards with :put',
+    },
+    {
+      'put!',
+      {put_backwards = true, dot_register = false},
+      'pastes linewise backwards with :put!',
+    },
+    {
+      'put .',
+      {put_backwards = false, dot_register = true},
+      'pastes linewise with the dot register',
+    },
+    {
+      'put! .',
+      {put_backwards = true, dot_register = true},
+      'pastes linewise backwards with the dot register',
+    },
+  }
+
+  local function non_dotdefs(def_table)
+    return filter(function(d) return not d[2].dot_register end, def_table)
+  end
+
+  -- }}}
+
+  -- Conversion functions {{{
+  local function convert_characterwise(expect_base, conversion_table,
+                                       virtualedit_end, visual_put)
+    expect_base = dedent(expect_base)
+    -- There is no difference between 'P' and 'p' when VIsual_active
+    if not visual_put then
+      if conversion_table.put_backwards then
+        -- Special case for virtualedit at the end of a line.
+        local replace_string
+        if not virtualedit_end then
+          replace_string = 'test_stringx"%1'
+        else
+          replace_string = 'test_stringx"'
+        end
+        expect_base = expect_base:gsub('(.)test_stringx"', replace_string)
+      end
+    end
+    if conversion_table.count > 1 then
+      local rep_string = 'test_string"'
+      local extra_puts =  rep_string:rep(conversion_table.count - 1)
+      expect_base = expect_base:gsub('test_stringx"', extra_puts .. 'test_stringx"')
+    end
+    if conversion_table.cursor_after then
+      expect_base = expect_base:gsub('test_stringx"', 'test_string"x')
+    end
+    if conversion_table.dot_register then
+      expect_base = expect_base:gsub('(test_stringx?)"', '%1.')
+    end
+    return expect_base
+  end -- convert_characterwise()
+
+  local function make_back(string)
+    local prev_line
+    local rettab = {}
+    local string_found = false
+    for _, line in pairs(funcs.split(string, '\n', 1)) do
+      if line:find('test_string') then
+        string_found = true
+        table.insert(rettab, line)
+      else
+        if string_found then
+          if prev_line then
+            table.insert(rettab, prev_line)
+            prev_line = nil
+          end
+          table.insert(rettab, line)
+        else
+          table.insert(rettab, prev_line)
+          prev_line = line
+        end
+      end
+    end
+    -- In case there are no lines after the text that was put.
+    if prev_line and string_found then
+      table.insert(rettab, prev_line)
+    end
+    return table.concat(rettab, '\n')
+  end -- make_back()
+
+  local function convert_linewise(expect_base, conversion_table, _, use_a, indent)
+    expect_base = dedent(expect_base)
+    if conversion_table.put_backwards then
+      expect_base = make_back(expect_base)
+    end
+    local p_str = 'test_string"'
+    if use_a then
+      p_str = 'test_stringa'
+    end
+
+    if conversion_table.dot_register then
+      expect_base = expect_base:gsub('x' .. p_str, 'xtest_string.')
+      p_str = 'test_string.'
+    end
+
+    if conversion_table.cursor_after then
+      expect_base = expect_base:gsub('x' .. p_str .. '\n', p_str .. '\nx')
+    end
+
+    -- The 'indent' argument is only used here because a single put with an
+    -- indent doesn't require special handling. It doesn't require special
+    -- handling because the cursor is never put before the indent, hence
+    -- the modification of 'test_stringx"' gives the same overall answer as
+    -- modifying '    test_stringx"'.
+
+    -- Only happens when using normal mode command actions.
+    if conversion_table.count and conversion_table.count > 1 then
+      if not indent then
+        indent = ''
+      end
+      local rep_string = indent .. p_str .. '\n'
+      local extra_puts =  rep_string:rep(conversion_table.count - 1)
+      local orig_string, new_string
+      if conversion_table.cursor_after then
+        orig_string = indent .. p_str .. '\nx'
+        new_string = extra_puts .. orig_string
+      else
+        orig_string = indent .. 'x' .. p_str .. '\n'
+        new_string = orig_string .. extra_puts
+      end
+      expect_base = expect_base:gsub(orig_string, new_string)
+    end
+    return expect_base
+  end
+
+  local function put_x_last(orig_line, p_str)
+    local prev_end, cur_end, cur_start = 0, 0, 0
+    while cur_start do
+      prev_end = cur_end
+      cur_start, cur_end = orig_line:find(p_str, prev_end)
+    end
+    -- Assume (because that is the only way I call it) that p_str matches
+    -- the pattern 'test_string.'
+    return orig_line:sub(1, prev_end - 1) .. 'x' .. orig_line:sub(prev_end)
+  end
+
+  local function convert_blockwise(expect_base, conversion_table, visual,
+                                   use_b, trailing_whitespace)
+    expect_base = dedent(expect_base)
+    local p_str = 'test_string"'
+    if use_b then
+      p_str = 'test_stringb'
+    end
+
+    if conversion_table.dot_register then
+      expect_base = expect_base:gsub('(x?)' .. p_str, '%1test_string.')
+      -- Looks strange, but the dot is a special character in the pattern
+      -- and a literal character in the replacement.
+      expect_base = expect_base:gsub('test_stringx.', 'test_stringx.')
+      p_str = 'test_string.'
+    end
+
+    -- No difference between 'p' and 'P' in visual mode.
+    if not visual then
+      if conversion_table.put_backwards then
+        -- One for the line where the cursor is left, one for all other
+        -- lines.
+        expect_base = expect_base:gsub('([^x])' .. p_str, p_str .. '%1')
+        expect_base = expect_base:gsub('([^x])x' .. p_str, 'x' .. p_str .. '%1')
+        if not trailing_whitespace then
+          expect_base = expect_base:gsub(' \n', '\n')
+          expect_base = expect_base:gsub(' $', '')
+        end
+      end
+    end
+
+    if conversion_table.count and conversion_table.count > 1 then
+      local p_pattern = p_str:gsub('%.', '%%.')
+      expect_base = expect_base:gsub(p_pattern,
+                                     p_str:rep(conversion_table.count))
+      expect_base = expect_base:gsub('test_stringx([b".])',
+                                     p_str:rep(conversion_table.count - 1)
+                                     .. '%0')
+    end
+
+    if conversion_table.cursor_after then
+      if not visual then
+        local prev_line
+        local rettab = {}
+        local prev_in_block = false
+        for _, line in pairs(funcs.split(expect_base, '\n', 1)) do
+          if line:find('test_string') then
+            if prev_line then
+              prev_line = prev_line:gsub('x', '')
+              table.insert(rettab, prev_line)
+            end
+            prev_line = line
+            prev_in_block = true
+          else
+            if prev_in_block then
+              prev_line = put_x_last(prev_line, p_str)
+              table.insert(rettab, prev_line)
+              prev_in_block = false
+            end
+            table.insert(rettab, line)
+          end
+        end
+        if prev_line and prev_in_block then
+          table.insert(rettab, put_x_last(prev_line, p_str))
+        end
+
+        expect_base = table.concat(rettab, '\n')
+      else
+        expect_base = expect_base:gsub('x(.)', '%1x')
+      end
+    end
+
+    return expect_base
+  end
+  -- }}}
+
+  -- Convenience functions {{{
+  local function run_normal_mode_tests(test_string, base_map, extra_setup,
+                                       virtualedit_end, selection_string)
+    local function convert_closure(e, c)
+      return convert_characterwise(e, c, virtualedit_end, selection_string)
+    end
+    local function expect_normal_creator(expect_base, conversion_table)
+      local test_expect = expect_creator(convert_closure, expect_base, conversion_table)
+      return function(exception_table, after_redo)
+        test_expect(exception_table, after_redo)
+        if selection_string then
+          eq(getreg('"'), selection_string)
+        else
+          eq(getreg('"'), 'test_string"')
+        end
+      end
+    end
+    run_test_variations(
+      create_test_defs(
+        normal_command_defs,
+        base_map,
+        create_p_action,
+        test_string,
+        expect_normal_creator
+      ),
+      extra_setup
+    )
+  end -- run_normal_mode_tests()
+
+  local function convert_linewiseer(expect_base, conversion_table)
+    return expect_creator(convert_linewise, expect_base, conversion_table)
+  end
+
+  local function run_linewise_tests(expect_base, base_command, extra_setup)
+    local linewise_test_defs = create_test_defs(
+        ex_command_defs, base_command,
+        create_put_action, expect_base, convert_linewiseer)
+    run_test_variations(linewise_test_defs, extra_setup)
+  end -- run_linewise_tests()
+  -- }}}
+
+  -- Actual tests
+  describe('default pasting', function()
+    local expect_string = [[
+    Ltest_stringx"ine of words 1
+    Line of words 2]]
+    run_normal_mode_tests(expect_string, 'p')
+
+    run_linewise_tests([[
+      Line of words 1
+      xtest_string"
+      Line of words 2]],
+      'put'
+    )
+  end)
+
+  describe('linewise register', function()
+    -- put with 'p'
+    local local_ex_command_defs = non_dotdefs(normal_command_defs)
+    local base_expect_string = [[
+    Line of words 1
+    xtest_stringa
+    Line of words 2]]
+    local function local_convert_linewise(expect_base, conversion_table)
+      return convert_linewise(expect_base, conversion_table, nil, true)
+    end
+    local function expect_lineput(expect_base, conversion_table)
+      return expect_creator(local_convert_linewise, expect_base, conversion_table)
+    end
+    run_test_variations(
+      create_test_defs(
+        local_ex_command_defs,
+        '"ap',
+        create_p_action,
+        base_expect_string,
+        expect_lineput
+      )
+    )
+
+    -- put with :put
+    local linewise_put_defs = non_dotdefs(ex_command_defs)
+    base_expect_string = [[
+    Line of words 1
+    xtest_stringa
+    Line of words 2]]
+    run_test_variations(
+      create_test_defs(
+        linewise_put_defs,
+        'put a', create_put_action,
+        base_expect_string, convert_linewiseer
+      )
+    )
+
+  end)
+
+  describe('blockwise register', function()
+    local blockwise_put_defs = non_dotdefs(normal_command_defs)
+    local test_base = [[
+    Lxtest_stringbine of words 1
+    Ltest_stringbine of words 2
+     test_stringb]]
+
+    local function expect_block_creator(expect_base, conversion_table)
+      return expect_creator(function(e,c) return convert_blockwise(e,c,nil,true) end,
+                    expect_base, conversion_table)
+    end
+
+    run_test_variations(
+      create_test_defs(
+        blockwise_put_defs,
+        '"bp',
+        create_p_action,
+        test_base,
+        expect_block_creator
+      )
+    )
+  end)
+
+  it('adds correct indentation when put with [p and ]p', function()
+    feed('G>>"a]pix<esc>')
+    -- luacheck: ignore
+    expect([[
+    Line of words 1
+    	Line of words 2
+    	xtest_stringa]])
+    feed('uu"a[pix<esc>')
+    -- luacheck: ignore
+    expect([[
+    Line of words 1
+    	xtest_stringa
+    	Line of words 2]])
+  end)
+
+  describe('linewise paste with autoindent', function()
+    -- luacheck: ignore
+    run_linewise_tests([[
+        Line of words 1
+        	Line of words 2
+        xtest_string"]],
+        'put'
+      ,
+      function()
+        funcs.setline('$', '	Line of words 2')
+        -- Set curswant to '8' to be at the end of the tab character
+        -- This is where the cursor is put back after the 'u' command.
+        funcs.setpos('.', {0, 2, 1, 0, 8})
+        execute('set autoindent')
+      end
+    )
+  end)
+
+  describe('put inside tabs with virtualedit', function()
+    local test_string = [[
+    Line of words 1
+       test_stringx"     Line of words 2]]
+    run_normal_mode_tests(test_string, 'p', function()
+      funcs.setline('$', '	Line of words 2')
+      execute('set virtualedit=all')
+      funcs.setpos('.', {0, 2, 1, 2, 3})
+    end)
+  end)
+
+  describe('put after the line with virtualedit', function()
+    local test_string = [[
+    Line of words 1  test_stringx"
+    	Line of words 2]]
+    run_normal_mode_tests(test_string, 'p', function()
+      funcs.setline('$', '	Line of words 2')
+      execute('set virtualedit=all')
+      funcs.setpos('.', {0, 1, 16, 1, 17})
+    end, true)
+  end)
+
+  describe('Visual put', function()
+    describe('basic put', function()
+      local test_string = [[
+      test_stringx" words 1
+      Line of words 2]]
+      run_normal_mode_tests(test_string, 'v2ep', nil, nil, 'Line of')
+    end)
+    describe('over trailing newline', function()
+      local test_string =  'Line of test_stringx"Line of words 2'
+      run_normal_mode_tests(test_string, 'v$p', function()
+        funcs.setpos('.', {0, 1, 9, 0, 9})
+      end,
+      nil,
+      'words 1\n')
+    end)
+    describe('linewise mode', function()
+      local test_string = [[
+      xtest_string"
+      Line of words 2]]
+      local function expect_vis_linewise(expect_base, conversion_table)
+        return expect_creator(function(e, c)
+          return convert_linewise(e, c, nil, nil)
+        end,
+        expect_base, conversion_table)
+      end
+      run_test_variations(
+        create_test_defs(
+          normal_command_defs,
+          'Vp',
+          create_p_action,
+          test_string,
+          expect_vis_linewise
+        ),
+        function() funcs.setpos('.', {0, 1, 1, 0, 1}) end
+      )
+
+      describe('with whitespace at bol', function()
+        local function expect_vis_lineindented(expect_base, conversion_table)
+          local test_expect = expect_creator(function(e, c)
+              return convert_linewise(e, c, nil, nil, '    ')
+            end,
+            expect_base, conversion_table)
+          return function(exception_table, after_redo)
+            test_expect(exception_table, after_redo)
+            eq(getreg('"'), 'Line of words 1\n')
+          end
+        end
+        local base_expect_string = [[
+            xtest_string"
+        Line of words 2]]
+        run_test_variations(
+          create_test_defs(
+            normal_command_defs,
+            'Vp',
+            create_p_action,
+            base_expect_string,
+            expect_vis_lineindented
+          ),
+          function()
+            feed('i    test_string.<esc>u')
+            funcs.setreg('"', '    test_string"', 'v')
+          end
+        )
+      end)
+
+    end)
+
+    describe('blockwise visual mode', function()
+      local test_base = [[
+        test_stringx"e of words 1
+        test_string"e of words 2]]
+
+      local function expect_block_creator(expect_base, conversion_table)
+        local test_expect = expect_creator(function(e, c)
+            return convert_blockwise(e, c, true)
+          end, expect_base, conversion_table)
+        return function(e,c)
+          test_expect(e,c)
+          eq(getreg('"'), 'Lin\nLin')
+        end
+      end
+
+      local select_down_test_defs = create_test_defs(
+          normal_command_defs,
+          '<C-v>jllp',
+          create_p_action,
+          test_base,
+          expect_block_creator
+      )
+      run_test_variations(select_down_test_defs)
+
+
+      -- Undo and redo of a visual block put leave the cursor in the top
+      -- left of the visual block area no matter where the cursor was
+      -- when it started.
+      local undo_redo_no = map(function(table)
+          local rettab = copy_def(table)
+          if not rettab[4] then
+            rettab[4] = {}
+          end
+          rettab[4].undo_position = true
+          rettab[4].redo_position = true
+          return rettab
+        end,
+        normal_command_defs)
+
+      -- Selection direction doesn't matter
+      run_test_variations(
+        create_test_defs(
+          undo_redo_no,
+          '<C-v>kllp',
+          create_p_action,
+          test_base,
+          expect_block_creator
+        ),
+        function() funcs.setpos('.', {0, 2, 1, 0, 1}) end
+      )
+
+      describe('blockwise cursor after undo', function()
+        -- A bit of a hack of the reset above.
+        -- In the tests that selection direction doesn't matter, we
+        -- don't check the undo/redo position because it doesn't fit
+        -- the same pattern as everything else.
+        -- Here we fix this by directly checking the undo/redo position
+        -- in the test_assertions of our test definitions.
+        local function assertion_creator(_,_)
+          return function(_,_)
+            feed('u')
+            -- Have to use feed('u') here to set curswant, because
+            -- ex_undo() doesn't do that.
+            eq(funcs.getcurpos(), {0, 1, 1, 0, 1})
+            feed('<C-r>')
+            eq(funcs.getcurpos(), {0, 1, 1, 0, 1})
+          end
+        end
+
+        run_test_variations(
+          create_test_defs(
+            undo_redo_no,
+            '<C-v>kllp',
+            create_p_action,
+            test_base,
+            assertion_creator
+          ),
+          function() funcs.setpos('.', {0, 2, 1, 0, 1}) end
+        )
+      end)
+    end)
+
+
+    describe("with 'virtualedit'", function()
+      describe('splitting a tab character', function()
+        local base_expect_string = [[
+        Line of words 1
+          test_stringx"     Line of words 2]]
+        run_normal_mode_tests(
+          base_expect_string,
+          'vp',
+          function()
+            funcs.setline('$', '	Line of words 2')
+            execute('set virtualedit=all')
+            funcs.setpos('.', {0, 2, 1, 2, 3})
+          end,
+          nil,
+          ' '
+        )
+      end)
+      describe('after end of line', function()
+        local base_expect_string = [[
+        Line of words 1  test_stringx"
+        Line of words 2]]
+        run_normal_mode_tests(
+          base_expect_string,
+          'vp',
+          function()
+            execute('set virtualedit=all')
+            funcs.setpos('.', {0, 1, 16, 2, 18})
+          end,
+          true,
+          ' '
+        )
+      end)
+    end)
+  end)
+
+  describe('. register special tests', function()
+    before_each(reset)
+    it('applies control character actions', function()
+      feed('i<C-t><esc>u')
+      expect([[
+      Line of words 1
+      Line of words 2]])
+      feed('".p')
+      expect([[
+      	Line of words 1
+      Line of words 2]])
+      feed('u1go<C-v>j".p')
+      eq([[
+	ine of words 1
+	ine of words 2]], curbuf_contents())
+    end)
+
+    local function bell_test(actions, should_ring)
+      local screen = Screen.new()
+      screen:attach()
+      helpers.ok(not screen.bell and not screen.visualbell)
+      actions()
+      helpers.wait()
+      screen:wait(function()
+        if should_ring then
+          if not screen.bell and not screen.visualbell then
+            return 'Bell was not rung after action'
+          end
+        else
+          if screen.bell or screen.visualbell then
+            return 'Bell was rung after action'
+          end
+        end
+      end)
+      screen:detach()
+    end
+
+    it('should not ring the bell with gp at end of line', function()
+      bell_test(function() feed('$".gp') end)
+
+      -- Even if the last character is a multibyte character.
+      reset()
+      funcs.setline(1, 'helloม')
+      bell_test(function() feed('$".gp') end)
+    end)
+
+    it('should not ring the bell with gp and end of file', function()
+      funcs.setpos('.', {0, 2, 1, 0})
+      bell_test(function() feed('$vl".gp') end)
+    end)
+
+    it('should ring the bell when deleting if not appropriate', function()
+        execute('goto 2')
+        feed('i<bs><esc>')
+        expect([[
+        ine of words 1
+        Line of words 2]])
+        bell_test(function() feed('".P') end, true)
+    end)
+
+    it('should restore cursor position after undo of ".p', function()
+      local origpos = funcs.getcurpos()
+      feed('".pu')
+      eq(origpos, funcs.getcurpos())
+    end)
+
+    it("should be unaffected by 'autoindent' with V\".2p", function()
+      execute('set autoindent')
+      feed('i test_string.<esc>u')
+      feed('V".2p')
+      expect([[
+       test_string.
+       test_string.
+      Line of words 2]])
+    end)
+  end)
+end)
+
diff --git a/test/functional/normal/undo_spec.lua b/test/functional/normal/undo_spec.lua
new file mode 100644
index 0000000000..55429f2e1e
--- /dev/null
+++ b/test/functional/normal/undo_spec.lua
@@ -0,0 +1,61 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local clear = helpers.clear
+local execute = helpers.execute
+local expect = helpers.expect
+local feed = helpers.feed
+local insert = helpers.insert
+
+describe('u CTRL-R g- g+', function()
+  before_each(clear)
+
+  local function create_history(num_steps)
+    if num_steps == 0 then return end
+    insert('1')
+    if num_steps == 1 then return end
+    feed('o2<esc>')
+    feed('o3<esc>')
+    feed('u')
+    if num_steps == 2 then return end
+    feed('o4<esc>')
+    if num_steps == 3 then return end
+    feed('u')
+  end
+
+  local function undo_and_redo(hist_pos, undo, redo, expect_str)
+    execute('enew!')
+    create_history(hist_pos)
+    local cur_contents = helpers.curbuf_contents()
+    feed(undo)
+    expect(expect_str)
+    feed(redo)
+    expect(cur_contents)
+  end
+
+  -- TODO Look for message saying 'Already at oldest change'
+  it('does nothing when no changes have happened', function()
+    undo_and_redo(0, 'u', '<C-r>', '')
+    undo_and_redo(0, 'g-', 'g+', '')
+  end)
+  it('undoes a change when at a leaf', function()
+    undo_and_redo(1, 'u', '<C-r>', '')
+    undo_and_redo(1, 'g-', 'g+', '')
+  end)
+  it('undoes a change when in a non-leaf', function()
+    undo_and_redo(2, 'u', '<C-r>', '1')
+    undo_and_redo(2, 'g-', 'g+', '1')
+  end)
+  it('undoes properly around a branch point', function()
+    undo_and_redo(3, 'u', '<C-r>', [[
+      1
+      2]])
+    undo_and_redo(3, 'g-', 'g+', [[
+      1
+      2
+      3]])
+  end)
+  it('can find the previous sequence after undoing to a branch', function()
+    undo_and_redo(4, 'u', '<C-r>', '1')
+    undo_and_redo(4, 'g-', 'g+', '1')
+  end)
+end)
diff --git a/test/functional/options/autochdir_spec.lua b/test/functional/options/autochdir_spec.lua
new file mode 100644
index 0000000000..209531515c
--- /dev/null
+++ b/test/functional/options/autochdir_spec.lua
@@ -0,0 +1,20 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear = helpers.clear
+local eq = helpers.eq
+local getcwd = helpers.funcs.getcwd
+
+if helpers.pending_win32(pending) then return end
+
+describe("'autochdir'", function()
+  it('given on the shell gets processed properly', function()
+    local targetdir = 'test/functional/fixtures'
+
+    -- By default 'autochdir' is off, thus getcwd() returns the repo root.
+    clear(targetdir..'/tty-test.c')
+    local rootdir = getcwd()
+
+    -- With 'autochdir' on, we should get the directory of tty-test.c.
+    clear('--cmd', 'set autochdir', targetdir..'/tty-test.c')
+    eq(rootdir..'/'..targetdir, getcwd())
+  end)
+end)
diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index d4c3267997..caeca5e4e2 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -1,7 +1,13 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
+
 local Screen = require('test.functional.ui.screen')
-local clear, eval, eq  = helpers.clear, helpers.eval, helpers.eq
+
+local meths = helpers.meths
 local execute = helpers.execute
+local clear = helpers.clear
+local eval = helpers.eval
+local eq = helpers.eq
+local neq = helpers.neq
 
 local function init_session(...)
   local args = { helpers.nvim_prog, '-i', 'NONE', '--embed',
@@ -15,11 +21,9 @@ local function init_session(...)
 end
 
 describe('startup defaults', function()
-  before_each(function()
-    clear()
-  end)
-
   describe(':filetype', function()
+    if helpers.pending_win32(pending) then return end
+
     local function expect_filetype(expected)
       local screen = Screen.new(48, 4)
       screen:attach()
@@ -79,6 +83,223 @@ describe('startup defaults', function()
       eq(0, eval('exists("g:syntax_on")'))
     end)
   end)
+
+  describe('packpath', function()
+    it('defaults to &runtimepath', function()
+      eq(meths.get_option('runtimepath'), meths.get_option('packpath'))
+    end)
+
+    it('does not follow modifications to runtimepath', function()
+      meths.command('set runtimepath+=foo')
+      neq(meths.get_option('runtimepath'), meths.get_option('packpath'))
+      meths.command('set packpath+=foo')
+      eq(meths.get_option('runtimepath'), meths.get_option('packpath'))
+    end)
+  end)
 end)
 
+describe('XDG-based defaults', function()
+  -- Need separate describe() blocks to not run clear() twice.
+  -- Do not put before_each() here for the same reasons.
+
+  describe('with empty/broken environment', function()
+    it('sets correct defaults', function()
+      clear({env={
+        XDG_CONFIG_HOME=nil,
+        XDG_DATA_HOME=nil,
+        XDG_CACHE_HOME=nil,
+        XDG_RUNTIME_DIR=nil,
+        XDG_CONFIG_DIRS=nil,
+        XDG_DATA_DIRS=nil,
+        LOCALAPPDATA=nil,
+        HOMEPATH=nil,
+        HOMEDRIVE=nil,
+        HOME=nil,
+        TEMP=nil,
+        VIMRUNTIME=nil,
+        USER=nil,
+      }})
+
+      eq('.', meths.get_option('backupdir'))
+      eq('.', meths.get_option('viewdir'))
+      eq('.', meths.get_option('directory'))
+      eq('.', meths.get_option('undodir'))
+    end)
+  end)
+
+  -- TODO(jkeyes): tests below fail on win32 because of path separator.
+  if helpers.pending_win32(pending) then return end
 
+  describe('with too long XDG variables', function()
+    before_each(function()
+      clear({env={
+        XDG_CONFIG_HOME=('/x'):rep(4096),
+        XDG_CONFIG_DIRS=(('/a'):rep(2048)
+                         .. ':' .. ('/b'):rep(2048)
+                         .. (':/c'):rep(512)),
+        XDG_DATA_HOME=('/X'):rep(4096),
+        XDG_DATA_DIRS=(('/A'):rep(2048)
+                       .. ':' .. ('/B'):rep(2048)
+                       .. (':/C'):rep(512)),
+      }})
+    end)
+
+    it('are correctly set', function()
+      eq((('/x'):rep(4096) .. '/nvim'
+          .. ',' .. ('/a'):rep(2048) .. '/nvim'
+          .. ',' .. ('/b'):rep(2048) .. '/nvim'
+          .. (',' .. '/c/nvim'):rep(512)
+          .. ',' .. ('/X'):rep(4096) .. '/nvim/site'
+          .. ',' .. ('/A'):rep(2048) .. '/nvim/site'
+          .. ',' .. ('/B'):rep(2048) .. '/nvim/site'
+          .. (',' .. '/C/nvim/site'):rep(512)
+          .. ',' .. eval('$VIMRUNTIME')
+          .. (',' .. '/C/nvim/site/after'):rep(512)
+          .. ',' .. ('/B'):rep(2048) .. '/nvim/site/after'
+          .. ',' .. ('/A'):rep(2048) .. '/nvim/site/after'
+          .. ',' .. ('/X'):rep(4096) .. '/nvim/site/after'
+          .. (',' .. '/c/nvim/after'):rep(512)
+          .. ',' .. ('/b'):rep(2048) .. '/nvim/after'
+          .. ',' .. ('/a'):rep(2048) .. '/nvim/after'
+          .. ',' .. ('/x'):rep(4096) .. '/nvim/after'
+      ), meths.get_option('runtimepath'))
+      meths.command('set runtimepath&')
+      meths.command('set backupdir&')
+      meths.command('set directory&')
+      meths.command('set undodir&')
+      meths.command('set viewdir&')
+      eq((('/x'):rep(4096) .. '/nvim'
+          .. ',' .. ('/a'):rep(2048) .. '/nvim'
+          .. ',' .. ('/b'):rep(2048) .. '/nvim'
+          .. (',' .. '/c/nvim'):rep(512)
+          .. ',' .. ('/X'):rep(4096) .. '/nvim/site'
+          .. ',' .. ('/A'):rep(2048) .. '/nvim/site'
+          .. ',' .. ('/B'):rep(2048) .. '/nvim/site'
+          .. (',' .. '/C/nvim/site'):rep(512)
+          .. ',' .. eval('$VIMRUNTIME')
+          .. (',' .. '/C/nvim/site/after'):rep(512)
+          .. ',' .. ('/B'):rep(2048) .. '/nvim/site/after'
+          .. ',' .. ('/A'):rep(2048) .. '/nvim/site/after'
+          .. ',' .. ('/X'):rep(4096) .. '/nvim/site/after'
+          .. (',' .. '/c/nvim/after'):rep(512)
+          .. ',' .. ('/b'):rep(2048) .. '/nvim/after'
+          .. ',' .. ('/a'):rep(2048) .. '/nvim/after'
+          .. ',' .. ('/x'):rep(4096) .. '/nvim/after'
+      ), meths.get_option('runtimepath'))
+      eq('.,' .. ('/X'):rep(4096) .. '/nvim/backup',
+         meths.get_option('backupdir'))
+      eq(('/X'):rep(4096) .. '/nvim/swap//', meths.get_option('directory'))
+      eq(('/X'):rep(4096) .. '/nvim/undo', meths.get_option('undodir'))
+      eq(('/X'):rep(4096) .. '/nvim/view', meths.get_option('viewdir'))
+    end)
+  end)
+
+  describe('with XDG variables that can be expanded', function()
+    before_each(function()
+      clear({env={
+        XDG_CONFIG_HOME='$XDG_DATA_HOME',
+        XDG_CONFIG_DIRS='$XDG_DATA_DIRS',
+        XDG_DATA_HOME='$XDG_CONFIG_HOME',
+        XDG_DATA_DIRS='$XDG_CONFIG_DIRS',
+      }})
+    end)
+
+    it('are not expanded', function()
+      eq(('$XDG_DATA_HOME/nvim'
+          .. ',$XDG_DATA_DIRS/nvim'
+          .. ',$XDG_CONFIG_HOME/nvim/site'
+          .. ',$XDG_CONFIG_DIRS/nvim/site'
+          .. ',' .. eval('$VIMRUNTIME')
+          .. ',$XDG_CONFIG_DIRS/nvim/site/after'
+          .. ',$XDG_CONFIG_HOME/nvim/site/after'
+          .. ',$XDG_DATA_DIRS/nvim/after'
+          .. ',$XDG_DATA_HOME/nvim/after'
+      ), meths.get_option('runtimepath'))
+      meths.command('set runtimepath&')
+      meths.command('set backupdir&')
+      meths.command('set directory&')
+      meths.command('set undodir&')
+      meths.command('set viewdir&')
+      eq(('$XDG_DATA_HOME/nvim'
+          .. ',$XDG_DATA_DIRS/nvim'
+          .. ',$XDG_CONFIG_HOME/nvim/site'
+          .. ',$XDG_CONFIG_DIRS/nvim/site'
+          .. ',' .. eval('$VIMRUNTIME')
+          .. ',$XDG_CONFIG_DIRS/nvim/site/after'
+          .. ',$XDG_CONFIG_HOME/nvim/site/after'
+          .. ',$XDG_DATA_DIRS/nvim/after'
+          .. ',$XDG_DATA_HOME/nvim/after'
+      ), meths.get_option('runtimepath'))
+      eq('.,$XDG_CONFIG_HOME/nvim/backup', meths.get_option('backupdir'))
+      eq('$XDG_CONFIG_HOME/nvim/swap//', meths.get_option('directory'))
+      eq('$XDG_CONFIG_HOME/nvim/undo', meths.get_option('undodir'))
+      eq('$XDG_CONFIG_HOME/nvim/view', meths.get_option('viewdir'))
+      meths.command('set all&')
+      eq(('$XDG_DATA_HOME/nvim'
+          .. ',$XDG_DATA_DIRS/nvim'
+          .. ',$XDG_CONFIG_HOME/nvim/site'
+          .. ',$XDG_CONFIG_DIRS/nvim/site'
+          .. ',' .. eval('$VIMRUNTIME')
+          .. ',$XDG_CONFIG_DIRS/nvim/site/after'
+          .. ',$XDG_CONFIG_HOME/nvim/site/after'
+          .. ',$XDG_DATA_DIRS/nvim/after'
+          .. ',$XDG_DATA_HOME/nvim/after'
+      ), meths.get_option('runtimepath'))
+      eq('.,$XDG_CONFIG_HOME/nvim/backup', meths.get_option('backupdir'))
+      eq('$XDG_CONFIG_HOME/nvim/swap//', meths.get_option('directory'))
+      eq('$XDG_CONFIG_HOME/nvim/undo', meths.get_option('undodir'))
+      eq('$XDG_CONFIG_HOME/nvim/view', meths.get_option('viewdir'))
+    end)
+  end)
+
+  describe('with commas', function()
+    before_each(function()
+      clear({env={
+        XDG_CONFIG_HOME=', , ,',
+        XDG_CONFIG_DIRS=',-,-,:-,-,-',
+        XDG_DATA_HOME=',=,=,',
+        XDG_DATA_DIRS=',≡,≡,:≡,≡,≡',
+      }})
+    end)
+
+    it('are escaped properly', function()
+      eq(('\\, \\, \\,/nvim'
+          .. ',\\,-\\,-\\,/nvim'
+          .. ',-\\,-\\,-/nvim'
+          .. ',\\,=\\,=\\,/nvim/site'
+          .. ',\\,≡\\,≡\\,/nvim/site'
+          .. ',≡\\,≡\\,≡/nvim/site'
+          .. ',' .. eval('$VIMRUNTIME')
+          .. ',≡\\,≡\\,≡/nvim/site/after'
+          .. ',\\,≡\\,≡\\,/nvim/site/after'
+          .. ',\\,=\\,=\\,/nvim/site/after'
+          .. ',-\\,-\\,-/nvim/after'
+          .. ',\\,-\\,-\\,/nvim/after'
+          .. ',\\, \\, \\,/nvim/after'
+      ), meths.get_option('runtimepath'))
+      meths.command('set runtimepath&')
+      meths.command('set backupdir&')
+      meths.command('set directory&')
+      meths.command('set undodir&')
+      meths.command('set viewdir&')
+      eq(('\\, \\, \\,/nvim'
+          .. ',\\,-\\,-\\,/nvim'
+          .. ',-\\,-\\,-/nvim'
+          .. ',\\,=\\,=\\,/nvim/site'
+          .. ',\\,≡\\,≡\\,/nvim/site'
+          .. ',≡\\,≡\\,≡/nvim/site'
+          .. ',' .. eval('$VIMRUNTIME')
+          .. ',≡\\,≡\\,≡/nvim/site/after'
+          .. ',\\,≡\\,≡\\,/nvim/site/after'
+          .. ',\\,=\\,=\\,/nvim/site/after'
+          .. ',-\\,-\\,-/nvim/after'
+          .. ',\\,-\\,-\\,/nvim/after'
+          .. ',\\, \\, \\,/nvim/after'
+      ), meths.get_option('runtimepath'))
+      eq('.,\\,=\\,=\\,/nvim/backup', meths.get_option('backupdir'))
+      eq('\\,=\\,=\\,/nvim/swap//', meths.get_option('directory'))
+      eq('\\,=\\,=\\,/nvim/undo', meths.get_option('undodir'))
+      eq('\\,=\\,=\\,/nvim/view', meths.get_option('viewdir'))
+    end)
+  end)
+end)
diff --git a/test/functional/options/shortmess_spec.lua b/test/functional/options/shortmess_spec.lua
index 4455ef663f..22e8a39b79 100644
--- a/test/functional/options/shortmess_spec.lua
+++ b/test/functional/options/shortmess_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, execute = helpers.clear, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe("'shortmess'", function()
   local screen
 
diff --git a/test/functional/plugin/health_spec.lua b/test/functional/plugin/health_spec.lua
new file mode 100644
index 0000000000..52dc008707
--- /dev/null
+++ b/test/functional/plugin/health_spec.lua
@@ -0,0 +1,86 @@
+local helpers = require('test.functional.helpers')(after_each)
+local plugin_helpers = require('test.functional.plugin.helpers')
+
+describe('health.vim', function()
+  before_each(function()
+    plugin_helpers.reset()
+    -- Provides functions:
+    --    health#broken#check()
+    --    health#success1#check()
+    --    health#success2#check()
+    helpers.execute("set runtimepath+=test/functional/fixtures")
+  end)
+
+  it("reports", function()
+    helpers.source([[
+      let g:health_report = execute([
+        \ "call health#report_start('Check Bar')",
+        \ "call health#report_ok('Bar status')",
+        \ "call health#report_ok('Other Bar status')",
+        \ "call health#report_warn('Zub')",
+        \ "call health#report_start('Baz')",
+        \ "call health#report_warn('Zim', ['suggestion 1', 'suggestion 2'])"
+        \ ])
+    ]])
+    local result = helpers.eval("g:health_report")
+
+    helpers.eq(helpers.dedent([[
+
+
+      ## Check Bar
+        - SUCCESS: Bar status
+        - SUCCESS: Other Bar status
+        - WARNING: Zub
+
+      ## Baz
+        - WARNING: Zim
+          - SUGGESTIONS:
+            - suggestion 1
+            - suggestion 2]]),
+      result)
+  end)
+
+
+  describe(":CheckHealth", function()
+    it("concatenates multiple reports", function()
+      helpers.execute("CheckHealth success1 success2")
+      helpers.expect([[
+
+        health#success1#check
+        ========================================================================
+        ## report 1
+          - SUCCESS: everything is fine
+
+        ## report 2
+          - SUCCESS: nothing to see here
+
+        health#success2#check
+        ========================================================================
+        ## another 1
+          - SUCCESS: ok
+        ]])
+    end)
+
+    it("gracefully handles broken healthcheck", function()
+      helpers.execute("CheckHealth broken")
+      helpers.expect([[
+
+        health#broken#check
+        ========================================================================
+          - ERROR: Failed to run healthcheck for "broken" plugin. Exception:
+            function health#check[20]..health#broken#check, line 1
+            caused an error
+        ]])
+    end)
+
+    it("gracefully handles invalid healthcheck", function()
+      helpers.execute("CheckHealth non_existent_healthcheck")
+      helpers.expect([[
+
+        health#non_existent_healthcheck#check
+        ========================================================================
+          - ERROR: No healthcheck found for "non_existent_healthcheck" plugin.
+        ]])
+    end)
+  end)
+end)
diff --git a/test/functional/plugin/helpers.lua b/test/functional/plugin/helpers.lua
index 5b6ea88c34..7580670149 100644
--- a/test/functional/plugin/helpers.lua
+++ b/test/functional/plugin/helpers.lua
@@ -1,6 +1,6 @@
 local paths = require('test.config.paths')
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(nil)
 local spawn, set_session, nvim_prog, merge_args =
   helpers.spawn, helpers.set_session, helpers.nvim_prog, helpers.merge_args
 
diff --git a/test/functional/plugin/matchparen_spec.lua b/test/functional/plugin/matchparen_spec.lua
index d8c1f2d392..3e1ab70daf 100644
--- a/test/functional/plugin/matchparen_spec.lua
+++ b/test/functional/plugin/matchparen_spec.lua
@@ -1,20 +1,30 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
+local plugin_helpers = require('test.functional.plugin.helpers')
 local Screen = require('test.functional.ui.screen')
-local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
 
-describe('matchparen', function() 
+local execute = helpers.execute
+local meths = helpers.meths
+local feed = helpers.feed
+local eq = helpers.eq
+
+local reset = plugin_helpers.reset
+
+describe('matchparen', function()
   local screen
 
   before_each(function()
-    clear()
+    reset()
     screen = Screen.new(20,5)
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true},
+    } )
   end)
 
   it('uses correct column after i_<Up>. Vim patch 7.4.1296', function()
-    execute('set noai nosi nocin')
-    execute('runtime plugin/matchparen.vim')
+    execute('set noautoindent nosmartindent nocindent laststatus=0')
+    eq(1, meths.get_var('loaded_matchparen'))
     feed('ivoid f_test()<cr>')
     feed('{<cr>')
     feed('}')
@@ -30,7 +40,7 @@ describe('matchparen', function()
       ^                    |
       }                   |
       {1:-- INSERT --}        |
-    ]], {[1] = {bold = true}})    
+    ]])
 
   end)
 end)
diff --git a/test/functional/plugin/msgpack_spec.lua b/test/functional/plugin/msgpack_spec.lua
index 60ba88e55b..5ba19708cf 100644
--- a/test/functional/plugin/msgpack_spec.lua
+++ b/test/functional/plugin/msgpack_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local meths = helpers.meths
 local eq, nvim_eval, nvim_command, exc_exec =
   helpers.eq, helpers.eval, helpers.command, helpers.exc_exec
@@ -652,6 +652,8 @@ describe('In autoload/msgpack.vim', function()
 
       eval_eq('integer', ('a'):byte(), '\'a\'')
       eval_eq('integer', 0xAB, '\'«\'')
+      eval_eq('integer', 0, '\'\\0\'')
+      eval_eq('integer', 10246567, '\'\\10246567\'')
     end)
 
     it('correctly loads constants', function()
diff --git a/test/functional/plugin/shada_spec.lua b/test/functional/plugin/shada_spec.lua
index aad0e366bf..b543037ae2 100644
--- a/test/functional/plugin/shada_spec.lua
+++ b/test/functional/plugin/shada_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eq, nvim_eval, nvim_command, nvim, exc_exec, funcs, nvim_feed, curbuf =
   helpers.eq, helpers.eval, helpers.command, helpers.nvim, helpers.exc_exec,
   helpers.funcs, helpers.feed, helpers.curbuf
@@ -43,6 +43,8 @@ local wshada, _, fname = get_shada_rw('Xtest-functional-plugin-shada.shada')
 local wshada_tmp, _, fname_tmp =
   get_shada_rw('Xtest-functional-plugin-shada.shada.tmp.f')
 
+if helpers.pending_win32(pending) then return end
+
 describe('In autoload/shada.vim', function()
   local epoch = os.date('%Y-%m-%dT%H:%M:%S', 0)
   before_each(function()
@@ -607,6 +609,18 @@ describe('In autoload/shada.vim', function()
         'abc',
         -1,
       ]}] ]]):gsub('\n', ''))
+      -- Regression: NUL separator must be properly supported
+      sd2strings_eq({
+        'History entry with timestamp ' .. epoch .. ':',
+        '  @ Description_  Value',
+        '  - history type  SEARCH',
+        '  - contents      ""',
+        '  - separator     \'\\0\'',
+      }, ([[ [{'type': 4, 'timestamp': 0, 'data': [
+        1,
+        '',
+        0x0
+      ]}] ]]):gsub('\n', ''))
     end)
 
     it('works with register items', function()
@@ -835,7 +849,7 @@ describe('In autoload/shada.vim', function()
       sd2strings_eq({
         'Global mark with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
-        '  + n    name         20',
+        '  + n    name         \'\\20\'',
         '  + f    file name    "foo"',
         '  # Value is negative',
         '  + l    line number  -10',
@@ -850,7 +864,18 @@ describe('In autoload/shada.vim', function()
       sd2strings_eq({
         'Global mark with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
-        '  + n    name         20',
+        '  + n    name         128',
+        '  + f    file name    "foo"',
+        '  + l    line number  1',
+        '  + c    column       0',
+      }, ([[ [{'type': 7, 'timestamp': 0, 'data': {
+        'n': 128,
+        'f': 'foo',
+      }}] ]]):gsub('\n', ''))
+      sd2strings_eq({
+        'Global mark with timestamp ' .. epoch .. ':',
+        '  % Key  Description  Value',
+        '  + n    name         \'\\20\'',
         '  + f    file name    "foo"',
         '  # Expected integer',
         '  + l    line number  "FOO"',
@@ -1121,7 +1146,7 @@ describe('In autoload/shada.vim', function()
         'Local mark with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
         '  + f    file name    "foo"',
-        '  + n    name         20',
+        '  + n    name         \'\\20\'',
         '  # Value is negative',
         '  + l    line number  -10',
         '  # Value is negative',
@@ -1136,7 +1161,7 @@ describe('In autoload/shada.vim', function()
         'Local mark with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
         '  + f    file name    "foo"',
-        '  + n    name         20',
+        '  + n    name         \'\\20\'',
         '  # Expected integer',
         '  + l    line number  "FOO"',
         '  # Expected integer',
@@ -1930,13 +1955,13 @@ describe('In autoload/shada.vim', function()
         'Buffer list with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
         '  # Expected binary string',
-        '  + f    file name    10',
+        '  + f    file name    \'\\10\'',
         '  + l    line number  1',
         '  + c    column       0',
         '',
         '  % Key  Description  Value',
         '  # Expected binary string',
-        '  + f    file name    20',
+        '  + f    file name    \'\\20\'',
         '  + l    line number  1',
         '  + c    column       0',
       })
@@ -1946,7 +1971,7 @@ describe('In autoload/shada.vim', function()
         'Buffer list with timestamp ' .. epoch .. ':',
         '  % Key  Description  Value',
         '  # Expected binary string',
-        '  + f    file name    10',
+        '  + f    file name    \'\\10\'',
         '  + l    line number  1',
         '  + c    column       0',
         '',
@@ -2461,17 +2486,17 @@ describe('ftplugin/shada.vim', function()
     nvim_command('setlocal filetype=shada')
     funcs.setline(1, '  Replacement with timestamp ' .. epoch)
     nvim_feed('ggA:\027')
-    eq('Replacement with timestamp ' .. epoch .. ':', curbuf('get_line', 0))
+    eq('Replacement with timestamp ' .. epoch .. ':', curbuf('get_lines', 0, 1, true)[1])
     nvim_feed('o-\027')
-    eq('  -', curbuf('get_line', 1))
+    eq({'  -'}, curbuf('get_lines', 1, 2, true))
     nvim_feed('ggO+\027')
-    eq('+', curbuf('get_line', 0))
+    eq({'+'}, curbuf('get_lines', 0, 1, true))
     nvim_feed('GO*\027')
-    eq('  *', curbuf('get_line', 2))
+    eq({'  *'}, curbuf('get_lines', 2, 3, true))
     nvim_feed('ggO  /\027')
-    eq('  /', curbuf('get_line', 0))
+    eq({'  /'}, curbuf('get_lines', 0, 1, true))
     nvim_feed('ggOx\027')
-    eq('x', curbuf('get_line', 0))
+    eq({'x'}, curbuf('get_lines', 0, 1, true))
   end)
 end)
 
diff --git a/test/functional/preload.lua b/test/functional/preload.lua
index 1971ef77cc..1107b45d54 100644
--- a/test/functional/preload.lua
+++ b/test/functional/preload.lua
@@ -1,4 +1,4 @@
 -- Modules loaded here will not be cleared and reloaded by Busted.
 -- Busted started doing this to help provide more isolation.  See issue #62
 -- for more information about this.
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(nil)
diff --git a/test/functional/provider/define_spec.lua b/test/functional/provider/define_spec.lua
index c30ad6d8c2..b0363eb435 100644
--- a/test/functional/provider/define_spec.lua
+++ b/test/functional/provider/define_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eval, command, nvim = helpers.eval, helpers.command, helpers.nvim
 local eq, run, stop = helpers.eq, helpers.run, helpers.stop
 local clear = helpers.clear
diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index a94880d4a2..a4e9a49c8a 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local eval, command, feed = helpers.eval, helpers.command, helpers.feed
 local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
 local expect, write_file = helpers.expect, helpers.write_file
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index da45d6aa00..94dfa90ea8 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -1,12 +1,22 @@
-local helpers = require('test.functional.helpers')
-local eval, command, feed = helpers.eval, helpers.command, helpers.feed
-local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
-local expect, write_file = helpers.expect, helpers.write_file
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local neq = helpers.neq
+local feed = helpers.feed
+local clear = helpers.clear
+local funcs = helpers.funcs
+local meths = helpers.meths
+local insert = helpers.insert
+local expect = helpers.expect
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local write_file = helpers.write_file
+local curbufmeths = helpers.curbufmeths
 
 do
   clear()
   command('let [g:interp, g:errors] = provider#pythonx#Detect(2)')
-  local errors = eval('g:errors')
+  local errors = meths.get_var('errors')
   if errors ~= '' then
     pending(
       'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. errors,
@@ -15,49 +25,58 @@ do
   end
 end
 
-describe('python commands and functions', function()
-  before_each(function()
-    clear()
-    command('python import vim')
-  end)
+before_each(function()
+  clear()
+  command('python import vim')
+end)
 
-  it('feature test', function()
-    eq(1, eval('has("python")'))
+describe('python feature test', function()
+  it('works', function()
+    eq(1, funcs.has('python'))
   end)
+end)
 
-  it('python_execute', function()
+describe(':python command', function()
+  it('works with a line', function()
     command('python vim.vars["set_by_python"] = [100, 0]')
-    eq({100, 0}, eval('g:set_by_python'))
+    eq({100, 0}, meths.get_var('set_by_python'))
   end)
 
-  it('python_execute with nested commands', function()
+  -- TODO(ZyX-I): works with << EOF
+  -- TODO(ZyX-I): works with execute 'python' line1."\n".line2."\n"…
+
+  it('supports nesting', function()
     command([[python vim.command('python vim.command("python vim.command(\'let set_by_nested_python = 555\')")')]])
-    eq(555, eval('g:set_by_nested_python'))
+    eq(555, meths.get_var('set_by_nested_python'))
   end)
 
-  it('python_execute with range', function()
+  it('supports range', function()
     insert([[
       line1
       line2
       line3
       line4]])
     feed('ggjvj:python vim.vars["range"] = vim.current.range[:]<CR>')
-    eq({'line2', 'line3'}, eval('g:range'))
+    eq({'line2', 'line3'}, meths.get_var('range'))
   end)
+end)
 
-  it('pyfile', function()
+describe(':pyfile command', function()
+  it('works', function()
     local fname = 'pyfile.py'
     write_file(fname, 'vim.command("let set_by_pyfile = 123")')
     command('pyfile pyfile.py')
-    eq(123, eval('g:set_by_pyfile'))
+    eq(123, meths.get_var('set_by_pyfile'))
     os.remove(fname)
   end)
+end)
 
-  it('pydo', function()
+describe(':pydo command', function()
+  it('works', function()
     -- :pydo 42 returns None for all lines,
     -- the buffer should not be changed
     command('normal :pydo 42')
-    eq(0, eval('&mod'))
+    eq(false, curbufmeths.get_option('modified'))
     -- insert some text
     insert('abc\ndef\nghi')
     expect([[
@@ -71,8 +90,25 @@ describe('python commands and functions', function()
       2
       ghi]])
   end)
+end)
+
+describe('pyeval()', function()
+  it('works', function()
+    eq({1, 2, {['key'] = 'val'}}, funcs.pyeval('[1, 2, {"key": "val"}]'))
+  end)
+
+  it('errors out when given non-string', function()
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(10)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_dict)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_list)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(0.0)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(function("tr"))'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:true)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:false)'))
+    eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:null)'))
+  end)
 
-  it('pyeval', function()
-    eq({1, 2, {['key'] = 'val'}}, eval([[pyeval('[1, 2, {"key": "val"}]')]]))
+  it('accepts NULL string', function()
+    neq(0, exc_exec('call pyeval($XXX_NONEXISTENT_VAR_XXX)'))
   end)
 end)
diff --git a/test/functional/provider/ruby_spec.lua b/test/functional/provider/ruby_spec.lua
new file mode 100644
index 0000000000..7b0e17688d
--- /dev/null
+++ b/test/functional/provider/ruby_spec.lua
@@ -0,0 +1,96 @@
+local helpers = require('test.functional.helpers')(after_each)
+
+local eq = helpers.eq
+local feed = helpers.feed
+local clear = helpers.clear
+local funcs = helpers.funcs
+local meths = helpers.meths
+local insert = helpers.insert
+local expect = helpers.expect
+local command = helpers.command
+local write_file = helpers.write_file
+local curbufmeths = helpers.curbufmeths
+
+do
+  clear()
+  command('let g:prog = provider#ruby#Detect()')
+  local prog = meths.get_var('prog')
+
+  if prog == '' then
+    pending(
+      "Cannot find the neovim RubyGem. Try :CheckHealth",
+      function() end)
+    return
+  end
+end
+
+before_each(function()
+  clear()
+end)
+
+describe('ruby feature test', function()
+  it('works', function()
+    eq(1, funcs.has('ruby'))
+  end)
+end)
+
+describe(':ruby command', function()
+  it('evaluates ruby', function()
+    command('ruby VIM.command("let g:set_by_ruby = [100, 0]")')
+    eq({100, 0}, meths.get_var('set_by_ruby'))
+  end)
+
+  it('supports nesting', function()
+    command([[ruby VIM.command('ruby VIM.command("let set_by_nested_ruby = 555")')]])
+    eq(555, meths.get_var('set_by_nested_ruby'))
+  end)
+end)
+
+describe(':rubyfile command', function()
+  it('evaluates a ruby file', function()
+    local fname = 'rubyfile.rb'
+    write_file(fname, 'VIM.command("let set_by_rubyfile = 123")')
+    command('rubyfile rubyfile.rb')
+    eq(123, meths.get_var('set_by_rubyfile'))
+    os.remove(fname)
+  end)
+end)
+
+describe(':rubydo command', function()
+  it('exposes the $_ variable for modifying lines', function()
+    insert('abc\ndef\nghi\njkl')
+    expect([[
+      abc
+      def
+      ghi
+      jkl]])
+
+    feed('ggjvj:rubydo $_.upcase!<CR>')
+    expect([[
+      abc
+      DEF
+      GHI
+      jkl]])
+  end)
+
+  it('operates on all lines when not given a range', function()
+    insert('abc\ndef\nghi\njkl')
+    expect([[
+      abc
+      def
+      ghi
+      jkl]])
+
+    feed(':rubydo $_.upcase!<CR>')
+    expect([[
+      ABC
+      DEF
+      GHI
+      JKL]])
+  end)
+
+  it('does not modify the buffer if no changes are made', function()
+    command('normal :rubydo 42')
+    eq(false, curbufmeths.get_option('modified'))
+  end)
+end)
diff --git a/test/functional/shada/buffers_spec.lua b/test/functional/shada/buffers_spec.lua
index fd4809e01a..a4746c2205 100644
--- a/test/functional/shada/buffers_spec.lua
+++ b/test/functional/shada/buffers_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa buffer list saving/reading support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, eq, curbufmeths =
   helpers.command, helpers.funcs, helpers.eq, helpers.curbufmeths
 
@@ -78,13 +78,25 @@ describe('ShaDa support code', function()
   it('does not dump unnamed buffers', function()
     set_additional_cmd('set shada+=% hidden')
     reset()
-    curbufmeths.set_line(0, 'foo')
+    curbufmeths.set_lines(0, 1, true, {'foo'})
     nvim_command('enew')
-    curbufmeths.set_line(0, 'bar')
+    curbufmeths.set_lines(0, 1, true, {'bar'})
     eq(2, funcs.bufnr('$'))
     nvim_command('qall!')
     reset()
     eq(1, funcs.bufnr('$'))
     eq('', funcs.bufname(1))
   end)
+
+  it('restores 1 buffer with %1 in &shada, #5759', function()
+    set_additional_cmd('set shada+=%1')
+    reset()
+    nvim_command('edit ' .. testfilename)
+    nvim_command('edit ' .. testfilename_2)
+    nvim_command('qall')
+    reset()
+    eq(2, funcs.bufnr('$'))
+    eq('', funcs.bufname(1))
+    eq(testfilename, funcs.bufname(2))
+  end)
 end)
diff --git a/test/functional/shada/compatibility_spec.lua b/test/functional/shada/compatibility_spec.lua
index 1fa88c58e5..1287ac010c 100644
--- a/test/functional/shada/compatibility_spec.lua
+++ b/test/functional/shada/compatibility_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa compatibility support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, eq = helpers.command, helpers.funcs, helpers.eq
 local exc_exec = helpers.exc_exec
 
diff --git a/test/functional/shada/errors_spec.lua b/test/functional/shada/errors_spec.lua
index e7951ee74c..2b6b26b433 100644
--- a/test/functional/shada/errors_spec.lua
+++ b/test/functional/shada/errors_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa errors handling support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, eq, exc_exec, redir_exec =
   helpers.command, helpers.eq, helpers.exc_exec, helpers.redir_exec
 
@@ -17,9 +17,9 @@ describe('ShaDa error handling', function()
     clean()
   end)
 
-  -- Note: most of tests have additional items like sX, mX, rX. These are for 
-  -- valgrind tests, to check for memory leaks (i.e. whether error handling code 
-  -- does (not) forget to call ga_clear). Not needed for array-based items like 
+  -- Note: most of tests have additional items like sX, mX, rX. These are for
+  -- valgrind tests, to check for memory leaks (i.e. whether error handling code
+  -- does (not) forget to call ga_clear). Not needed for array-based items like
   -- history because they are not using ad_ga.
 
   it('does not fail on empty file', function()
@@ -69,15 +69,15 @@ describe('ShaDa error handling', function()
   end)
 
   it('fails on search pattern item with invalid byte', function()
-    -- 195 (== 0xC1) cannot start any valid messagepack entry (the only byte 
+    -- 195 (== 0xC1) cannot start any valid messagepack entry (the only byte
     -- that cannot do this). Specifically unpack_template.h contains
     --
     --     //case 0xc1:  // string
     --     //  again_terminal_trail(NEXT_CS(p), p+1);
     --
-    -- (literally: commented out code) which means that in place of this code 
-    -- `goto _failed` is used from default: case. I do not know any other way to 
-    -- get MSGPACK_UNPACK_PARSE_ERROR and not MSGPACK_UNPACK_CONTINUE or 
+    -- (literally: commented out code) which means that in place of this code
+    -- `goto _failed` is used from default: case. I do not know any other way to
+    -- get MSGPACK_UNPACK_PARSE_ERROR and not MSGPACK_UNPACK_CONTINUE or
     -- MSGPACK_UNPACK_EXTRA_BYTES.
     wshada('\002\000\001\193')
     eq('Vim(rshada):E576: Failed to parse ShaDa file due to a msgpack parser error at position 3', exc_exec(sdrcmd()))
@@ -497,7 +497,7 @@ $
   it('errors when a funcref is stored in a variable', function()
     nvim_command('let F = function("tr")')
     nvim_command('set shada+=!')
-    eq('\nE951: Error while dumping variable g:F, itself: attempt to dump function reference'
+    eq('\nE5004: Error while dumping variable g:F, itself: attempt to dump function reference'
        .. '\nE574: Failed to write variable F',
        redir_exec('wshada'))
   end)
@@ -506,7 +506,7 @@ $
     nvim_command('let L = []')
     nvim_command('call add(L, L)')
     nvim_command('set shada+=!')
-    eq('\nE952: Unable to dump variable g:L: container references itself in index 0'
+    eq('\nE5005: Unable to dump variable g:L: container references itself in index 0'
        .. '\nE574: Failed to write variable L',
        redir_exec('wshada'))
   end)
diff --git a/test/functional/shada/helpers.lua b/test/functional/shada/helpers.lua
index d4eb7f57bd..8e2c0cc1f6 100644
--- a/test/functional/shada/helpers.lua
+++ b/test/functional/shada/helpers.lua
@@ -1,15 +1,15 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(nil)
 local spawn, set_session, meths, nvim_prog =
   helpers.spawn, helpers.set_session, helpers.meths, helpers.nvim_prog
 local write_file, merge_args = helpers.write_file, helpers.merge_args
 
 local mpack = require('mpack')
 
-local tmpname = os.tmpname()
+local tmpname = helpers.tmpname()
 local additional_cmd = ''
 
-local function nvim_argv()
-  local argv = {nvim_prog, '-u', 'NONE', '-i', tmpname, '-N',
+local function nvim_argv(shada_file)
+  local argv = {nvim_prog, '-u', 'NONE', '-i', shada_file or tmpname, '-N',
                 '--cmd', 'set shortmess+=I background=light noswapfile',
                 '--cmd', additional_cmd,
                 '--embed'}
@@ -20,8 +20,8 @@ local function nvim_argv()
   end
 end
 
-local reset = function()
-  set_session(spawn(nvim_argv()))
+local reset = function(shada_file)
+  set_session(spawn(nvim_argv(shada_file)))
   meths.set_var('tmpname', tmpname)
 end
 
diff --git a/test/functional/shada/history_spec.lua b/test/functional/shada/history_spec.lua
index 94513945d0..c4be9e563d 100644
--- a/test/functional/shada/history_spec.lua
+++ b/test/functional/shada/history_spec.lua
@@ -1,12 +1,10 @@
 -- ShaDa history saving/reading support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, meths, nvim_feed, eq =
   helpers.command, helpers.funcs, helpers.meths, helpers.feed, helpers.eq
 
 local shada_helpers = require('test.functional.shada.helpers')
-local reset, set_additional_cmd, clear =
-  shada_helpers.reset, shada_helpers.set_additional_cmd,
-  shada_helpers.clear
+local reset, clear = shada_helpers.reset, shada_helpers.clear
 
 describe('ShaDa support code', function()
   before_each(reset)
@@ -173,158 +171,57 @@ describe('ShaDa support code', function()
     eq('goo', funcs.getline(1))
   end)
 
-  it('dumps and loads history correctly when &encoding is not UTF-8', function()
-    set_additional_cmd('set encoding=latin1')
+  it('dumps and loads history with UTF-8 characters', function()
     reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_feed(':echo "\171"\n')
-    nvim_command('qall')
-    reset()
-    eq('echo "\171"', funcs.histget(':', -1))
-  end)
-
-  it('dumps and loads history correctly when &encoding /= UTF-8 when dumping',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_feed(':echo "\171"\n')
-    set_additional_cmd('')
-    nvim_command('qall')
-    reset()
-    eq('echo "«"', funcs.histget(':', -1))
-  end)
-
-  it('dumps and loads history correctly when &encoding /= UTF-8 when loading',
-  function()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
     nvim_feed(':echo "«"\n')
-    set_additional_cmd('set encoding=latin1')
     nvim_command('qall')
     reset()
-    eq('echo "\171"', funcs.histget(':', -1))
+    eq('echo "«"', funcs.histget(':', -1))
   end)
 
-  it('dumps and loads replacement correctly when &encoding is not UTF-8',
+  it('dumps and loads replacement with UTF-8 characters',
   function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/./\171/ge')
+    nvim_command('substitute/./«/ge')
     nvim_command('qall!')
     reset()
     funcs.setline('.', {'.'})
     nvim_command('&')
-    eq('\171', funcs.getline('.'))
-  end)
-
-  it('dumps&loads replacement correctly when &encoding /= UTF-8 when dumping',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/./\171/ge')
-    set_additional_cmd('')
-    nvim_command('qall')
-    reset()
-    funcs.setline('.', {'.'})
-    nvim_command('&')
     eq('«', funcs.getline('.'))
   end)
 
-  it('dumps&loads replacement correctly when &encoding /= UTF-8 when loading',
-  function()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/./«/ge')
-    set_additional_cmd('set encoding=latin1')
-    nvim_command('qall')
-    reset()
-    funcs.setline('.', {'.'})
-    nvim_command('&')
-    eq('\171', funcs.getline('.'))
-  end)
-
-  it('dumps and loads substitute pattern correctly when &encoding is not UTF-8',
+  it('dumps and loads substitute pattern with UTF-8 characters',
   function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/\171/./ge')
+    nvim_command('substitute/«/./ge')
     nvim_command('qall!')
     reset()
-    funcs.setline('.', {'\171«'})
-    nvim_command('&')
-    eq('.«', funcs.getline('.'))
-  end)
-
-  it('dumps&loads s/pattern correctly when &encoding /= UTF-8 when dumping',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/\171/./ge')
-    set_additional_cmd('')
-    nvim_command('qall')
-    reset()
     funcs.setline('.', {'«\171'})
     nvim_command('&')
     eq('.\171', funcs.getline('.'))
   end)
 
-  it('dumps&loads s/pattern correctly when &encoding /= UTF-8 when loading',
+  it('dumps and loads search pattern with UTF-8 characters',
   function()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('substitute/«/./ge')
-    set_additional_cmd('set encoding=latin1')
-    nvim_command('qall')
-    reset()
-    funcs.setline('.', {'\171«'})
-    nvim_command('&')
-    eq('.«', funcs.getline('.'))
-  end)
-
-  it('dumps and loads search pattern correctly when &encoding is not UTF-8',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('silent! /\171/')
+    nvim_command('silent! /«/')
     nvim_command('set shada+=/0')
     nvim_command('qall!')
     reset()
     funcs.setline('.', {'\171«'})
     nvim_command('~&')
-    eq('«', funcs.getline('.'))
-    eq('', funcs.histget('/', -1))
-  end)
-
-  it('dumps&loads /pattern correctly when &encoding /= UTF-8 when dumping',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('silent! /\171/')
-    nvim_command('set shada+=/0')
-    set_additional_cmd('')
-    nvim_command('qall')
-    reset()
-    funcs.setline('.', {'«\171'})
-    nvim_command('~&')
     eq('\171', funcs.getline('.'))
     eq('', funcs.histget('/', -1))
   end)
 
-  it('dumps&loads /pattern correctly when &encoding /= UTF-8 when loading',
+  it('dumps and loads search pattern with 8-bit single-byte',
   function()
     -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    nvim_command('silent! /«/')
+    nvim_command('silent! /\171/')
     nvim_command('set shada+=/0')
-    set_additional_cmd('set encoding=latin1')
-    nvim_command('qall')
+    nvim_command('qall!')
     reset()
     funcs.setline('.', {'\171«'})
     nvim_command('~&')
     eq('«', funcs.getline('.'))
     eq('', funcs.histget('/', -1))
   end)
+
 end)
diff --git a/test/functional/shada/marks_spec.lua b/test/functional/shada/marks_spec.lua
index 955a6f382b..fa760ceb5b 100644
--- a/test/functional/shada/marks_spec.lua
+++ b/test/functional/shada/marks_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa marks saving/reading support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local meths, curwinmeths, curbufmeths, nvim_command, funcs, eq =
   helpers.meths, helpers.curwinmeths, helpers.curbufmeths, helpers.command,
   helpers.funcs, helpers.eq
@@ -100,6 +100,18 @@ describe('ShaDa support code', function()
     eq(2, nvim_current_line())
   end)
 
+  it('is able to dump and read back mark " from a closed tab', function()
+    nvim_command('edit ' .. testfilename)
+    nvim_command('tabedit ' .. testfilename_2)
+    nvim_command('2')
+    nvim_command('q!')
+    nvim_command('qall')
+    reset()
+    nvim_command('edit ' .. testfilename_2)
+    nvim_command('normal! `"')
+    eq(2, nvim_current_line())
+  end)
+
   it('is able to populate v:oldfiles', function()
     nvim_command('edit ' .. testfilename)
     local tf_full = curbufmeths.get_name()
@@ -139,6 +151,19 @@ describe('ShaDa support code', function()
     eq(saved, redir_exec('jumps'))
   end)
 
+  it('when dumping jump list also dumps current position', function()
+    nvim_command('edit ' .. testfilename)
+    nvim_command('normal! G')
+    nvim_command('split ' .. testfilename_2)
+    nvim_command('normal! G')
+    nvim_command('wshada')
+    nvim_command('quit')
+    nvim_command('rshada')
+    nvim_command('normal! \15')  -- <C-o>
+    eq(testfilename_2, funcs.bufname('%'))
+    eq({2, 0}, curwinmeths.get_cursor())
+  end)
+
   it('is able to dump and restore jump list with different times (slow!)',
   function()
     nvim_command('edit ' .. testfilename_2)
@@ -180,8 +205,8 @@ describe('ShaDa support code', function()
     reset()
     nvim_command('edit ' .. testfilename)
     nvim_command('normal! Gg;')
-    -- Note: without “sync” “commands” test has good changes to fail for unknown 
-    -- reason (in first eq expected 1 is compared with 2). Any command inserted 
+    -- Note: without “sync” “commands” test has good changes to fail for unknown
+    -- reason (in first eq expected 1 is compared with 2). Any command inserted
     -- causes this to work properly.
     nvim_command('" sync')
     eq(1, nvim_current_line())
diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua
index 221f989409..25c73b99eb 100644
--- a/test/functional/shada/merging_spec.lua
+++ b/test/functional/shada/merging_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa merging data support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, curbufmeths, eq =
   helpers.command, helpers.funcs,
   helpers.curbufmeths, helpers.eq
diff --git a/test/functional/shada/registers_spec.lua b/test/functional/shada/registers_spec.lua
index 4043d94a69..fc812f799c 100644
--- a/test/functional/shada/registers_spec.lua
+++ b/test/functional/shada/registers_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa registers saving/reading support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local nvim_command, funcs, eq = helpers.command, helpers.funcs, helpers.eq
 
 local shada_helpers = require('test.functional.shada.helpers')
@@ -128,36 +128,24 @@ describe('ShaDa support code', function()
     eq({{}, ''}, getreg('h'))
   end)
 
-  it('dumps and loads register correctly when &encoding is not UTF-8',
+  it('dumps and loads register correctly with utf-8 contents',
   function()
-    set_additional_cmd('set encoding=latin1')
     reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    setreg('e', {'\171'}, 'c')
+    setreg('e', {'«'}, 'c')
     nvim_command('qall')
     reset()
-    eq({{'\171'}, 'v'}, getreg('e'))
+    eq({{'«'}, 'v'}, getreg('e'))
   end)
 
-  it('dumps and loads history correctly when &encoding /= UTF-8 when dumping',
+  it('dumps and loads history correctly with 8-bit single-byte',
   function()
-    set_additional_cmd('set encoding=latin1')
     reset()
     -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    setreg('e', {'\171'}, 'c')
+    setreg('e', {'\171«'}, 'c')
     set_additional_cmd('')
     nvim_command('qall')
     reset()
-    eq({{'«'}, 'v'}, getreg('e'))
+    eq({{'\171«'}, 'v'}, getreg('e'))
   end)
 
-  it('dumps and loads history correctly when &encoding /= UTF-8 when loading',
-  function()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    setreg('e', {'«'}, 'c')
-    set_additional_cmd('set encoding=latin1')
-    nvim_command('qall')
-    reset()
-    eq({{'\171'}, 'v'}, getreg('e'))
-  end)
 end)
diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua
index 683d520627..32598fc399 100644
--- a/test/functional/shada/shada_spec.lua
+++ b/test/functional/shada/shada_spec.lua
@@ -1,10 +1,11 @@
 -- Other ShaDa tests
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local meths, nvim_command, funcs, eq =
   helpers.meths, helpers.command, helpers.funcs, helpers.eq
 local write_file, spawn, set_session, nvim_prog, exc_exec =
   helpers.write_file, helpers.spawn, helpers.set_session, helpers.nvim_prog,
   helpers.exc_exec
+
 local lfs = require('lfs')
 local paths = require('test.config.paths')
 
@@ -14,15 +15,20 @@ local shada_helpers = require('test.functional.shada.helpers')
 local reset, clear, get_shada_rw =
   shada_helpers.reset, shada_helpers.clear, shada_helpers.get_shada_rw
 local read_shada_file = shada_helpers.read_shada_file
+local set_additional_cmd = shada_helpers.set_additional_cmd
 
 local wshada, _, shada_fname, clean =
   get_shada_rw('Xtest-functional-shada-shada.shada')
 
+local dirname = 'Xtest-functional-shada-shada.d'
+local dirshada = dirname .. '/main.shada'
+
 describe('ShaDa support code', function()
   before_each(reset)
   after_each(function()
     clear()
     clean()
+    lfs.rmdir(dirname)
   end)
 
   it('preserves `s` item size limit with unknown entries', function()
@@ -165,6 +171,7 @@ describe('ShaDa support code', function()
   end
 
   it('correctly uses shada-r option', function()
+    nvim_command('set shellslash')
     meths.set_var('__home', paths.test_source_path)
     nvim_command('let $HOME = __home')
     nvim_command('unlet __home')
@@ -188,6 +195,7 @@ describe('ShaDa support code', function()
   end)
 
   it('correctly ignores case with shada-r option', function()
+    nvim_command('set shellslash')
     local pwd = funcs.getcwd()
     local relfname = 'абв/test'
     local fname = pwd .. '/' .. relfname
@@ -230,4 +238,19 @@ describe('ShaDa support code', function()
     eq('', meths.get_option('viminfo'))
     eq('', meths.get_option('shada'))
   end)
+
+  it('does not crash when ShaDa file directory is not writable', function()
+    if helpers.pending_win32(pending) then return end
+
+    funcs.mkdir(dirname, '', 0)
+    eq(0, funcs.filewritable(dirname))
+    set_additional_cmd('set shada=')
+    reset(dirshada)
+    meths.set_option('shada', '\'10')
+    eq('Vim(wshada):E886: System error while opening ShaDa file '
+       .. 'Xtest-functional-shada-shada.d/main.shada for reading to merge '
+       .. 'before writing it: permission denied',
+       exc_exec('wshada'))
+    meths.set_option('shada', '')
+  end)
 end)
diff --git a/test/functional/shada/variables_spec.lua b/test/functional/shada/variables_spec.lua
index 7ceeafdc71..f817bcef74 100644
--- a/test/functional/shada/variables_spec.lua
+++ b/test/functional/shada/variables_spec.lua
@@ -1,5 +1,5 @@
 -- ShaDa variables saving/reading support
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local meths, funcs, nvim_command, eq, exc_exec =
   helpers.meths, helpers.funcs, helpers.command, helpers.eq, helpers.exc_exec
 
@@ -33,7 +33,7 @@ describe('ShaDa support code', function()
       else
         meths.set_var(varname, varval)
       end
-      -- Exit during `reset` is not a regular exit: it does not write shada 
+      -- Exit during `reset` is not a regular exit: it does not write shada
       -- automatically
       nvim_command('qall')
       reset()
@@ -91,35 +91,13 @@ describe('ShaDa support code', function()
     eq(0, funcs.exists('g:str_var'))
   end)
 
-  it('dumps and loads variables correctly when &encoding is not UTF-8',
+  it('dumps and loads variables correctly with utf-8 strings',
   function()
-    set_additional_cmd('set encoding=latin1')
     reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    meths.set_var('STRVAR', '\171')
-    meths.set_var('LSTVAR', {'\171'})
-    meths.set_var('DCTVAR', {['\171']='\171'})
-    meths.set_var('NESTEDVAR', {['\171']={{'\171'}, {['\171']='\171'},
-                                {a='Test'}}})
-    nvim_command('qall')
-    reset()
-    eq('\171', meths.get_var('STRVAR'))
-    eq({'\171'}, meths.get_var('LSTVAR'))
-    eq({['\171']='\171'}, meths.get_var('DCTVAR'))
-    eq({['\171']={{'\171'}, {['\171']='\171'}, {a='Test'}}},
-       meths.get_var('NESTEDVAR'))
-  end)
-
-  it('dumps and loads variables correctly when &encoding /= UTF-8 when dumping',
-  function()
-    set_additional_cmd('set encoding=latin1')
-    reset()
-    -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    meths.set_var('STRVAR', '\171')
-    meths.set_var('LSTVAR', {'\171'})
-    meths.set_var('DCTVAR', {['\171']='\171'})
-    meths.set_var('NESTEDVAR', {['\171']={{'\171'}, {['\171']='\171'},
-                                {a='Test'}}})
+    meths.set_var('STRVAR', '«')
+    meths.set_var('LSTVAR', {'«'})
+    meths.set_var('DCTVAR', {['«']='«'})
+    meths.set_var('NESTEDVAR', {['«']={{'«'}, {['«']='«'}, {a='Test'}}})
     set_additional_cmd('')
     nvim_command('qall')
     reset()
@@ -129,20 +107,22 @@ describe('ShaDa support code', function()
     eq({['«']={{'«'}, {['«']='«'}, {a='Test'}}}, meths.get_var('NESTEDVAR'))
   end)
 
-  it('dumps and loads variables correctly when &encoding /= UTF-8 when loading',
+  it('dumps and loads variables correctly with 8-bit strings',
   function()
+    reset()
     -- \171 is U+00AB LEFT-POINTING DOUBLE ANGLE QUOTATION MARK in latin1
-    meths.set_var('STRVAR', '«')
-    meths.set_var('LSTVAR', {'«'})
-    meths.set_var('DCTVAR', {['«']='«'})
-    meths.set_var('NESTEDVAR', {['«']={{'«'}, {['«']='«'}, {a='Test'}}})
-    set_additional_cmd('set encoding=latin1')
+    -- This is invalid unicode, but we should still dump and restore it.
+    meths.set_var('STRVAR', '\171')
+    meths.set_var('LSTVAR', {'\171'})
+    meths.set_var('DCTVAR', {['«\171']='«\171'})
+    meths.set_var('NESTEDVAR', {['\171']={{'\171«'}, {['\171']='\171'},
+                                {a='Test'}}})
     nvim_command('qall')
     reset()
     eq('\171', meths.get_var('STRVAR'))
     eq({'\171'}, meths.get_var('LSTVAR'))
-    eq({['\171']='\171'}, meths.get_var('DCTVAR'))
-    eq({['\171']={{'\171'}, {['\171']='\171'}, {a='Test'}}},
+    eq({['«\171']='«\171'}, meths.get_var('DCTVAR'))
+    eq({['\171']={{'\171«'}, {['\171']='\171'}, {a='Test'}}},
        meths.get_var('NESTEDVAR'))
   end)
 
@@ -152,7 +132,7 @@ describe('ShaDa support code', function()
     meths.set_var('U', '10')
     nvim_command('set shada+=!')
     set_additional_cmd('set shada+=!')
-    eq('Vim(wshada):E951: Error while dumping variable g:F, itself: attempt to dump function reference',
+    eq('Vim(wshada):E5004: Error while dumping variable g:F, itself: attempt to dump function reference',
        exc_exec('wshada'))
     meths.set_option('shada', '')
     reset()
@@ -165,7 +145,7 @@ describe('ShaDa support code', function()
     nvim_command('call add(L, L)')
     meths.set_var('U', '10')
     nvim_command('set shada+=!')
-    eq('Vim(wshada):E952: Unable to dump variable g:L: container references itself in index 0',
+    eq('Vim(wshada):E5005: Unable to dump variable g:L: container references itself in index 0',
        exc_exec('wshada'))
     meths.set_option('shada', '')
     set_additional_cmd('set shada+=!')
diff --git a/test/functional/terminal/altscreen_spec.lua b/test/functional/terminal/altscreen_spec.lua
index d9d96b25f9..4526037808 100644
--- a/test/functional/terminal/altscreen_spec.lua
+++ b/test/functional/terminal/altscreen_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local clear, eq, curbuf = helpers.clear, helpers.eq, helpers.curbuf
 local feed = helpers.feed
@@ -6,6 +6,8 @@ local feed_data = thelpers.feed_data
 local enter_altscreen = thelpers.enter_altscreen
 local exit_altscreen = thelpers.exit_altscreen
 
+if helpers.pending_win32(pending) then return end
+
 describe('terminal altscreen', function()
   local screen
 
@@ -21,7 +23,7 @@ describe('terminal altscreen', function()
       line7                                             |
       line8                                             |
       {1: }                                                 |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     enter_altscreen()
     screen:expect([[
@@ -31,7 +33,7 @@ describe('terminal altscreen', function()
                                                         |
                                                         |
       {1: }                                                 |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     eq(10, curbuf('line_count'))
   end)
@@ -60,7 +62,7 @@ describe('terminal altscreen', function()
         line7                                             |
         line8                                             |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
       feed('<c-\\><c-n>gg')
       screen:expect([[
@@ -86,7 +88,7 @@ describe('terminal altscreen', function()
         line15                                            |
         line16                                            |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end)
 
@@ -116,7 +118,7 @@ describe('terminal altscreen', function()
                                                           |
         rows: 4, cols: 50                                 |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end
 
@@ -149,7 +151,7 @@ describe('terminal altscreen', function()
           line5                                             |
           line6                                             |
           line7                                             |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
     end)
diff --git a/test/functional/terminal/api_spec.lua b/test/functional/terminal/api_spec.lua
new file mode 100644
index 0000000000..045bdb0749
--- /dev/null
+++ b/test/functional/terminal/api_spec.lua
@@ -0,0 +1,70 @@
+local helpers = require('test.functional.helpers')(after_each)
+local child_session = require('test.functional.terminal.helpers')
+local ok = helpers.ok
+
+if helpers.pending_win32(pending) then return end
+
+describe('api', function()
+  local screen
+  local socket_name = "Xtest_functional_api.sock"
+
+  before_each(function()
+    helpers.clear()
+    os.remove(socket_name)
+    screen = child_session.screen_setup(0, '["'..helpers.nvim_prog
+      ..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile"]')
+  end)
+  after_each(function()
+    os.remove(socket_name)
+  end)
+
+  it("qa! RPC request during insert-mode", function()
+    -- Start the socket from the child nvim.
+    child_session.feed_data(":echo serverstart('"..socket_name.."')\n")
+
+    -- Wait for socket creation.
+    screen:expect([[
+      {1: }                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
+      ]]..socket_name..[[                         |
+      {3:-- TERMINAL --}                                    |
+    ]])
+
+    local socket_session1 = helpers.connect(socket_name)
+    local socket_session2 = helpers.connect(socket_name)
+
+    child_session.feed_data("i[tui] insert-mode")
+    -- Wait for stdin to be processed.
+    screen:expect([[
+      [tui] insert-mode{1: }                                |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
+    ]])
+
+    ok(socket_session1:request("nvim_ui_attach", 42, 6, {rgb=true}))
+    ok(socket_session2:request("nvim_ui_attach", 25, 30, {rgb=true}))
+
+    socket_session1:notify("nvim_input", "\n[socket 1] this is more than 25 columns")
+    socket_session2:notify("nvim_input", "\n[socket 2] input")
+
+    screen:expect([[
+      [tui] insert-mode                                 |
+      [socket 1] this is more t{4:                         }|
+      han 25 columns           {4:                         }|
+      [socket 2] input{1: }        {4:                         }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
+    ]])
+
+    socket_session1:request("nvim_command", "qa!")
+  end)
+end)
+
diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua
index cefb603a7e..cecd67d7fa 100644
--- a/test/functional/terminal/buffer_spec.lua
+++ b/test/functional/terminal/buffer_spec.lua
@@ -1,10 +1,11 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local wait = helpers.wait
 local eval, execute, source = helpers.eval, helpers.execute, helpers.source
 local eq, neq = helpers.eq, helpers.neq
 
+if helpers.pending_win32(pending) then return end
 
 describe('terminal buffer', function()
   local screen
@@ -21,11 +22,11 @@ describe('terminal buffer', function()
       feed('<c-\\><c-n>:set bufhidden=wipe<cr>:enew<cr>')
       screen:expect([[
         ^                                                  |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
         :enew                                             |
       ]])
     end)
@@ -34,11 +35,11 @@ describe('terminal buffer', function()
       feed(':bnext:l<esc>')
       screen:expect([[
         ^                                                  |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
-        ~                                                 |
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
+        {4:~                                                 }|
                                                           |
       ]])
     end)
@@ -78,7 +79,7 @@ describe('terminal buffer', function()
                                                         |
                                                         |
       ^                                                  |
-      E21: Cannot make changes, 'modifiable' is off     |
+      {8:E21: Cannot make changes, 'modifiable' is off}     |
     ]])
   end)
 
@@ -138,21 +139,21 @@ describe('terminal buffer', function()
     feed('<c-\\><c-n>:bd!<cr>')
     screen:expect([[
       ^                                                  |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
       :bd!                                              |
     ]])
     execute('bnext')
     screen:expect([[
       ^                                                  |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
       :bnext                                            |
     ]])
   end)
@@ -166,7 +167,7 @@ describe('terminal buffer', function()
     local tbuf = eval('bufnr("%")')
 
     source([[
-    function! SplitWindow()
+    function! SplitWindow(id, data, event)
       new
       call feedkeys("iabc\<Esc>")
     endfunction
@@ -180,8 +181,8 @@ describe('terminal buffer', function()
     -- We should be in a new buffer now.
     screen:expect([[
       ab^c                                               |
-      ~                                                 |
-      ==========                                        |
+      {4:~                                                 }|
+      {5:==========                                        }|
       rows: 2, cols: 50                                 |
       {2: }                                                 |
       {1:==========                                        }|
diff --git a/test/functional/terminal/cursor_spec.lua b/test/functional/terminal/cursor_spec.lua
index c15da2f760..1953022a7a 100644
--- a/test/functional/terminal/cursor_spec.lua
+++ b/test/functional/terminal/cursor_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
@@ -6,6 +6,7 @@ local nvim_dir, execute = helpers.nvim_dir, helpers.execute
 local hide_cursor = thelpers.hide_cursor
 local show_cursor = thelpers.show_cursor
 
+if helpers.pending_win32(pending) then return end
 
 describe('terminal cursor', function()
   local screen
@@ -25,7 +26,7 @@ describe('terminal cursor', function()
                                                         |
                                                         |
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -49,12 +50,12 @@ describe('terminal cursor', function()
 
     it('is positioned correctly when unfocused', function()
       screen:expect([[
-          1 tty ready                                     |
-          2 {2: }                                             |
-          3                                               |
-          4                                               |
-          5                                               |
-          6 ^                                              |
+        {7:  1 }tty ready                                     |
+        {7:  2 }{2: }                                             |
+        {7:  3 }                                              |
+        {7:  4 }                                              |
+        {7:  5 }                                              |
+        {7:  6 }^                                              |
         :set number                                       |
       ]])
     end)
@@ -83,7 +84,7 @@ describe('terminal cursor', function()
                                                           |
                                                           |
                                                           |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
       show_cursor()
       screen:expect([[
@@ -93,7 +94,7 @@ describe('terminal cursor', function()
                                                           |
                                                           |
                                                           |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
       -- same for when the terminal is unfocused
       feed('<c-\\><c-n>')
@@ -132,16 +133,10 @@ describe('cursor with customized highlighting', function()
     screen = Screen.new(50, 7)
     screen:set_default_attr_ids({
       [1] = {foreground = 45, background = 46},
-      [2] = {foreground = 55, background = 56}
-    })
-    screen:set_default_attr_ignore({
-      [1] = {bold = true},
-      [2] = {foreground = 12},
-      [3] = {bold = true, reverse = true},
-      [5] = {background = 11},
-      [6] = {foreground = 130},
+      [2] = {foreground = 55, background = 56},
+      [3] = {bold = true},
     })
-    screen:attach(false)
+    screen:attach({rgb=false})
     execute('call termopen(["'..nvim_dir..'/tty-test"]) | startinsert')
   end)
 
@@ -153,7 +148,7 @@ describe('cursor with customized highlighting', function()
                                                         |
                                                         |
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('<c-\\><c-n>')
     screen:expect([[
diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua
index dcc4a54610..8edcfa56b7 100644
--- a/test/functional/terminal/edit_spec.lua
+++ b/test/functional/terminal/edit_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local screen = require('test.functional.ui.screen')
 
 local curbufmeths = helpers.curbufmeths
@@ -12,7 +12,7 @@ local eq = helpers.eq
 describe(':edit term://*', function()
   local get_screen = function(columns, lines)
     local scr = screen.new(columns, lines)
-    scr:attach(false)
+    scr:attach({rgb=false})
     return scr
   end
 
@@ -45,7 +45,7 @@ describe(':edit term://*', function()
     command('edit term://foobar')
     local bufcontents = {}
     local winheight = curwinmeths.get_height()
-    -- I have no idea why there is + 4 needed. But otherwise it works fine with 
+    -- I have no idea why there is + 4 needed. But otherwise it works fine with
     -- different scrollbacks.
     local shift = -4
     local buf_cont_start = rep_size - 1 - sb - winheight - shift
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index d89092ff27..7c391db18c 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -1,23 +1,67 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, wait, nvim = helpers.clear, helpers.wait, helpers.nvim
 local nvim_dir, source, eq = helpers.nvim_dir, helpers.source, helpers.eq
 local execute, eval = helpers.execute, helpers.eval
 
+if helpers.pending_win32(pending) then return end
+
 describe(':terminal', function()
   local screen
 
   before_each(function()
     clear()
     screen = Screen.new(50, 4)
-    screen:attach(false)
+    screen:attach({rgb=false})
+  end)
+
+  it("does not interrupt Press-ENTER prompt #2748", function()
+    -- Ensure that :messages shows Press-ENTER.
+    source([[
+      echomsg "msg1"
+      echomsg "msg2"
+    ]])
+    -- Invoke a command that emits frequent terminal activity.
+    execute([[terminal while true; do echo X; done]])
+    helpers.feed([[<C-\><C-N>]])
+    screen:expect([[
+      X                                                 |
+      X                                                 |
+      ^X                                                 |
+                                                        |
+    ]])
+    helpers.sleep(10)  -- Let some terminal activity happen.
+    execute("messages")
+    screen:expect([[
+      X                                                 |
+      msg1                                              |
+      msg2                                              |
+      Press ENTER or type command to continue^           |
+    ]])
+  end)
+
+end)
+
+describe(':terminal (with fake shell)', function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(50, 4)
+    screen:attach({rgb=false})
+    -- shell-test.c is a fake shell that prints its arguments and exits.
     nvim('set_option', 'shell', nvim_dir..'/shell-test')
     nvim('set_option', 'shellcmdflag', 'EXE')
-
   end)
 
+  -- Invokes `:terminal {cmd}` using a fake shell (shell-test.c) which prints
+  -- the {cmd} and exits immediately .
+  local function terminal_with_fake_shell(cmd)
+    execute("terminal "..(cmd and cmd or ""))
+  end
+
   it('with no argument, acts like termopen()', function()
-    execute('terminal')
+    terminal_with_fake_shell()
     wait()
     screen:expect([[
       ready $                                           |
@@ -28,7 +72,7 @@ describe(':terminal', function()
   end)
 
   it('executes a given command through the shell', function()
-    execute('terminal echo hi')
+    terminal_with_fake_shell('echo hi')
     wait()
     screen:expect([[
       ready $ echo hi                                   |
@@ -39,7 +83,7 @@ describe(':terminal', function()
   end)
 
   it('allows quotes and slashes', function()
-    execute([[terminal echo 'hello' \ "world"]])
+    terminal_with_fake_shell([[echo 'hello' \ "world"]])
     wait()
     screen:expect([[
       ready $ echo 'hello' \ "world"                    |
@@ -56,4 +100,52 @@ describe(':terminal', function()
       -- Verify that BufNew actually fired (else the test is invalid).
     eq('foo', eval('&shell'))
   end)
+
+  it('ignores writes if the backing stream closes', function()
+      terminal_with_fake_shell()
+      helpers.feed('iiXXXXXXX')
+      wait()
+      -- Race: Though the shell exited (and streams were closed by SIGCHLD
+      -- handler), :terminal cleanup is pending on the main-loop.
+      -- This write should be ignored (not crash, #5445).
+      helpers.feed('iiYYYYYYY')
+      eq(2, eval("1+1"))  -- Still alive?
+  end)
+
+  it('works with findfile()', function()
+    execute('terminal')
+    eq('term://', string.match(eval('bufname("%")'), "^term://"))
+    eq('scripts/shadacat.py', eval('findfile("scripts/shadacat.py", ".")'))
+  end)
+
+  it('works with :find', function()
+    terminal_with_fake_shell()
+    wait()
+    screen:expect([[
+      ready $                                           |
+      [Process exited 0]                                |
+                                                        |
+      -- TERMINAL --                                    |
+    ]])
+    eq('term://', string.match(eval('bufname("%")'), "^term://"))
+    helpers.feed([[<C-\><C-N>]])
+    execute([[find */shadacat.py]])
+    eq('scripts/shadacat.py', eval('bufname("%")'))
+  end)
+
+  it('works with gf', function()
+    terminal_with_fake_shell([[echo "scripts/shadacat.py"]])
+    wait()
+    screen:expect([[
+      ready $ echo "scripts/shadacat.py"                |
+                                                        |
+      [Process exited 0]                                |
+      -- TERMINAL --                                    |
+    ]])
+    helpers.feed([[<C-\><C-N>]])
+    eq('term://', string.match(eval('bufname("%")'), "^term://"))
+    helpers.feed([[ggf"lgf]])
+    eq('scripts/shadacat.py', eval('bufname("%")'))
+  end)
+
 end)
diff --git a/test/functional/terminal/helpers.lua b/test/functional/terminal/helpers.lua
index a32ae650d6..ae5e6d4b1f 100644
--- a/test/functional/terminal/helpers.lua
+++ b/test/functional/terminal/helpers.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(nil)
 local Screen = require('test.functional.ui.screen')
 local nvim_dir = helpers.nvim_dir
 local execute, nvim, wait = helpers.execute, helpers.nvim, helpers.wait
@@ -44,17 +44,17 @@ local function screen_setup(extra_height, command)
   screen:set_default_attr_ids({
     [1] = {reverse = true},   -- focused cursor
     [2] = {background = 11},  -- unfocused cursor
-  })
-  screen:set_default_attr_ignore({
-    [1] = {bold = true},
-    [2] = {foreground = 12},
-    [3] = {bold = true, reverse = true},
-    [5] = {background = 11},
-    [6] = {foreground = 130},
-    [7] = {foreground = 15, background = 1}, -- error message
+    [3] = {bold = true},
+    [4] = {foreground = 12},
+    [5] = {bold = true, reverse = true},
+    [6] = {background = 11},
+    [7] = {foreground = 130},
+    [8] = {foreground = 15, background = 1}, -- error message
+    [9] = {foreground = 4},
+    [10] = {foreground = 2},  -- "Press ENTER" in embedded :terminal session.
   })
 
-  screen:attach(false)
+  screen:attach({rgb=false})
   -- tty-test puts the terminal into raw mode and echoes all input. tests are
   -- done by feeding it with terminfo codes to control the display and
   -- verifying output with screen:expect.
@@ -76,7 +76,7 @@ local function screen_setup(extra_height, command)
       table.insert(expected, empty_line)
     end
 
-    table.insert(expected, '-- TERMINAL --                                     ')
+    table.insert(expected, '{3:-- TERMINAL --}                                     ')
     screen:expect(table.concat(expected, '\n'))
   else
     wait()
diff --git a/test/functional/terminal/highlight_spec.lua b/test/functional/terminal/highlight_spec.lua
index 97875c5147..0fe463401e 100644
--- a/test/functional/terminal/highlight_spec.lua
+++ b/test/functional/terminal/highlight_spec.lua
@@ -1,10 +1,11 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear, nvim = helpers.feed, helpers.clear, helpers.nvim
 local nvim_dir, execute = helpers.nvim_dir, helpers.execute
 local eq, eval = helpers.eq, helpers.eval
 
+if helpers.pending_win32(pending) then return end
 
 describe('terminal window highlighting', function()
   local screen
@@ -16,36 +17,35 @@ describe('terminal window highlighting', function()
       [1] = {foreground = 45},
       [2] = {background = 46},
       [3] = {foreground = 45, background = 46},
-      [4] = {bold = true, italic = true, underline = true}
-    })
-    screen:set_default_attr_ignore({
-      [1] = {bold = true},
-      [2] = {foreground = 12},
-      [3] = {bold = true, reverse = true},
-      [5] = {background = 11},
-      [6] = {foreground = 130},
-      [7] = {reverse = true},
+      [4] = {bold = true, italic = true, underline = true},
+      [5] = {bold = true},
+      [6] = {foreground = 12},
+      [7] = {bold = true, reverse = true},
       [8] = {background = 11},
+      [9] = {foreground = 130},
+      [10] = {reverse = true},
+      [11] = {background = 11},
     })
-    screen:attach(false)
+    screen:attach({rgb=false})
     execute('enew | call termopen(["'..nvim_dir..'/tty-test"]) | startinsert')
     screen:expect([[
       tty ready                                         |
+      {10: }                                                 |
                                                         |
                                                         |
                                                         |
                                                         |
-                                                        |
-      -- TERMINAL --                                    |
+      {5:-- TERMINAL --}                                    |
     ]])
   end)
 
   local function descr(title, attr_num, set_attrs_fn)
     local function sub(s)
-      return s:gsub('NUM', attr_num)
+      local str = s:gsub('NUM', attr_num)
+      return str
     end
 
-    describe(title, function() 
+    describe(title, function()
       before_each(function()
         set_attrs_fn()
         thelpers.feed_data('text')
@@ -54,16 +54,15 @@ describe('terminal window highlighting', function()
       end)
 
       local function pass_attrs()
-        local s = sub([[
+        screen:expect(sub([[
           tty ready                                         |
-          {NUM:text}text                                          |
+          {NUM:text}text{10: }                                         |
                                                             |
                                                             |
                                                             |
                                                             |
-          -- TERMINAL --                                    |
-        ]])
-        screen:expect(s)
+          {5:-- TERMINAL --}                                    |
+        ]]))
       end
 
       it('will pass the corresponding attributes', pass_attrs)
@@ -82,11 +81,11 @@ describe('terminal window highlighting', function()
           line6                                             |
           line7                                             |
           line8                                             |
-                                                            |
-          -- TERMINAL --                                    |
+          {10: }                                                 |
+          {5:-- TERMINAL --}                                    |
         ]])
         feed('<c-\\><c-n>gg')
-        local s = sub([[
+        screen:expect(sub([[
           ^tty ready                                         |
           {NUM:text}textline1                                     |
           line2                                             |
@@ -94,8 +93,7 @@ describe('terminal window highlighting', function()
           line4                                             |
           line5                                             |
                                                             |
-        ]])
-        screen:expect(s)
+        ]]))
       end)
     end)
   end
@@ -121,28 +119,26 @@ describe('terminal window highlighting with custom palette', function()
     clear()
     screen = Screen.new(50, 7)
     screen:set_default_attr_ids({
-      [1] = {foreground = 1193046, special = Screen.colors.Black}
-    })
-    screen:set_default_attr_ignore({
-      [1] = {bold = true},
+      [1] = {foreground = 1193046, special = Screen.colors.Black},
       [2] = {foreground = 12},
       [3] = {bold = true, reverse = true},
       [5] = {background = 11},
       [6] = {foreground = 130},
       [7] = {reverse = true},
       [8] = {background = 11},
+      [9] = {bold = true},
     })
-    screen:attach(true)
+    screen:attach({rgb=true})
     nvim('set_var', 'terminal_color_3', '#123456')
     execute('enew | call termopen(["'..nvim_dir..'/tty-test"]) | startinsert')
     screen:expect([[
       tty ready                                         |
+      {7: }                                                 |
                                                         |
                                                         |
                                                         |
                                                         |
-                                                        |
-      -- TERMINAL --                                    |
+      {9:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -153,36 +149,111 @@ describe('terminal window highlighting with custom palette', function()
     thelpers.feed_data('text')
     screen:expect([[
       tty ready                                         |
-      {1:text}text                                          |
+      {1:text}text{7: }                                         |
                                                         |
                                                         |
                                                         |
                                                         |
-      -- TERMINAL --                                    |
+      {9:-- TERMINAL --}                                    |
     ]])
   end)
 end)
 
 describe('synIDattr()', function()
   local screen
-
   before_each(function()
     clear()
     screen = Screen.new(50, 7)
-    execute('highlight Normal ctermfg=1 guifg=#ff0000')
+    execute('highlight Normal ctermfg=252 guifg=#ff0000 guibg=Black')
+    -- Salmon #fa8072 Maroon #800000
+    execute('highlight Keyword ctermfg=79 guifg=Salmon guisp=Maroon')
+  end)
+
+  it('returns cterm-color if RGB-capable UI is _not_ attached', function()
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg")'))
+    eq('252', eval('synIDattr(hlID("Normal"),  "fg#")'))
+    eq('',    eval('synIDattr(hlID("Normal"),  "bg")'))
+    eq('',    eval('synIDattr(hlID("Normal"),  "bg#")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('79',  eval('synIDattr(hlID("Keyword"), "fg#")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp")'))
+    eq('',    eval('synIDattr(hlID("Keyword"), "sp#")'))
   end)
 
-  after_each(function()
-    screen:detach()
+  it('returns gui-color if "gui" arg is passed', function()
+    eq('Black',  eval('synIDattr(hlID("Normal"),  "bg", "gui")'))
+    eq('Maroon', eval('synIDattr(hlID("Keyword"), "sp", "gui")'))
   end)
 
-  it('returns RGB number if GUI', function()
-    screen:attach(true)
-    eq('#ff0000', eval('synIDattr(hlID("Normal"), "fg")'))
+  it('returns gui-color if RGB-capable UI is attached', function()
+    screen:attach({rgb=true})
+    eq('#ff0000', eval('synIDattr(hlID("Normal"),  "fg")'))
+    eq('Black',   eval('synIDattr(hlID("Normal"),  "bg")'))
+    eq('Salmon',  eval('synIDattr(hlID("Keyword"), "fg")'))
+    eq('Maroon',  eval('synIDattr(hlID("Keyword"), "sp")'))
+  end)
+
+  it('returns #RRGGBB value for fg#/bg#/sp#', function()
+    screen:attach({rgb=true})
+    eq('#ff0000', eval('synIDattr(hlID("Normal"),  "fg#")'))
+    eq('#000000', eval('synIDattr(hlID("Normal"),  "bg#")'))
+    eq('#fa8072', eval('synIDattr(hlID("Keyword"), "fg#")'))
+    eq('#800000', eval('synIDattr(hlID("Keyword"), "sp#")'))
   end)
 
   it('returns color number if non-GUI', function()
-    screen:attach(false)
-    eq('1', eval('synIDattr(hlID("Normal"), "fg")'))
+    screen:attach({rgb=false})
+    eq('252', eval('synIDattr(hlID("Normal"), "fg")'))
+    eq('79', eval('synIDattr(hlID("Keyword"), "fg")'))
+  end)
+end)
+
+describe('fg/bg special colors', function()
+  local screen
+  before_each(function()
+    clear()
+    screen = Screen.new(50, 7)
+    execute('highlight Normal ctermfg=145 ctermbg=16 guifg=#ff0000 guibg=Black')
+    execute('highlight Visual ctermfg=bg ctermbg=fg guifg=bg guibg=fg guisp=bg')
+  end)
+
+  it('resolve to "Normal" values', function()
+    eq(eval('synIDattr(hlID("Normal"), "bg")'),
+       eval('synIDattr(hlID("Visual"), "fg")'))
+    eq(eval('synIDattr(hlID("Normal"), "bg#")'),
+       eval('synIDattr(hlID("Visual"), "fg#")'))
+    eq(eval('synIDattr(hlID("Normal"), "fg")'),
+       eval('synIDattr(hlID("Visual"), "bg")'))
+    eq(eval('synIDattr(hlID("Normal"), "fg#")'),
+       eval('synIDattr(hlID("Visual"), "bg#")'))
+    eq('bg', eval('synIDattr(hlID("Visual"), "fg", "gui")'))
+    eq('bg', eval('synIDattr(hlID("Visual"), "fg#", "gui")'))
+    eq('fg', eval('synIDattr(hlID("Visual"), "bg", "gui")'))
+    eq('fg', eval('synIDattr(hlID("Visual"), "bg#", "gui")'))
+    eq('bg', eval('synIDattr(hlID("Visual"), "sp", "gui")'))
+    eq('bg', eval('synIDattr(hlID("Visual"), "sp#", "gui")'))
+  end)
+
+  it('resolve to "Normal" values in RGB-capable UI', function()
+    screen:attach({rgb=true})
+    eq('bg', eval('synIDattr(hlID("Visual"), "fg")'))
+    eq(eval('synIDattr(hlID("Normal"), "bg#")'),
+       eval('synIDattr(hlID("Visual"), "fg#")'))
+    eq('fg', eval('synIDattr(hlID("Visual"), "bg")'))
+    eq(eval('synIDattr(hlID("Normal"), "fg#")'),
+       eval('synIDattr(hlID("Visual"), "bg#")'))
+    eq('bg', eval('synIDattr(hlID("Visual"), "sp")'))
+    eq(eval('synIDattr(hlID("Normal"), "bg#")'),
+       eval('synIDattr(hlID("Visual"), "sp#")'))
+  end)
+
+  it('resolve after the "Normal" group is modified', function()
+    screen:attach({rgb=true})
+    local new_guibg = '#282c34'
+    local new_guifg = '#abb2bf'
+    execute('highlight Normal guifg='..new_guifg..' guibg='..new_guibg)
+    eq(new_guibg, eval('synIDattr(hlID("Visual"), "fg#")'))
+    eq(new_guifg, eval('synIDattr(hlID("Visual"), "bg#")'))
+    eq(new_guibg, eval('synIDattr(hlID("Visual"), "sp#")'))
   end)
 end)
diff --git a/test/functional/terminal/mouse_spec.lua b/test/functional/terminal/mouse_spec.lua
index c4bd3c2663..ecb0b2beb0 100644
--- a/test/functional/terminal/mouse_spec.lua
+++ b/test/functional/terminal/mouse_spec.lua
@@ -1,9 +1,11 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local clear = helpers.clear
 local feed, nvim = helpers.feed, helpers.nvim
 local feed_data = thelpers.feed_data
 
+if helpers.pending_win32(pending) then return end
+
 describe('terminal mouse', function()
   local screen
 
@@ -27,7 +29,7 @@ describe('terminal mouse', function()
       line29                                            |
       line30                                            |
       {1: }                                                 |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -74,7 +76,7 @@ describe('terminal mouse', function()
           line30                                            |
           mouse enabled                                     |
           {1: }                                                 |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
 
@@ -87,7 +89,7 @@ describe('terminal mouse', function()
           line30                                            |
           mouse enabled                                     |
            "#{1: }                                              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
 
@@ -100,7 +102,7 @@ describe('terminal mouse', function()
           line30                                            |
           mouse enabled                                     |
           `!!{1: }                                              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
     end)
@@ -112,86 +114,86 @@ describe('terminal mouse', function()
           line28                   |line28                  |
           line29                   |line29                  |
           line30                   |line30                  |
-          rows: 5, cols: 24        |rows: 5, cols: 24       |
+          rows: 5, cols: 25        |rows: 5, cols: 25       |
           {2:^ }                        |{2: }                       |
           ==========                ==========              |
                                                             |
         ]])
         feed(':enew | set number<cr>')
         screen:expect([[
-            1 ^                     |line28                  |
-          ~                        |line29                  |
-          ~                        |line30                  |
-          ~                        |rows: 5, cols: 24       |
-          ~                        |{2: }                       |
+          {7:  1 }^                     |line28                  |
+          {4:~                        }|line29                  |
+          {4:~                        }|line30                  |
+          {4:~                        }|rows: 5, cols: 25       |
+          {4:~                        }|{2: }                       |
           ==========                ==========              |
           :enew | set number                                |
         ]])
         feed('30iline\n<esc>')
         screen:expect([[
-           27 line                 |line28                  |
-           28 line                 |line29                  |
-           29 line                 |line30                  |
-           30 line                 |rows: 5, cols: 24       |
-           31 ^                     |{2: }                       |
+          {7: 27 }line                 |line28                  |
+          {7: 28 }line                 |line29                  |
+          {7: 29 }line                 |line30                  |
+          {7: 30 }line                 |rows: 5, cols: 25       |
+          {7: 31 }^                     |{2: }                       |
           ==========                ==========              |
                                                             |
         ]])
         feed('<c-w>li')
         screen:expect([[
-           27 line                 |line28                  |
-           28 line                 |line29                  |
-           29 line                 |line30                  |
-           30 line                 |rows: 5, cols: 24       |
-           31                      |{1: }                       |
+          {7: 27 }line                 |line29                  |
+          {7: 28 }line                 |line30                  |
+          {7: 29 }line                 |rows: 5, cols: 25       |
+          {7: 30 }line                 |rows: 5, cols: 24       |
+          {7: 31 }                     |{1: }                       |
           ==========                ==========              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
         -- enabling mouse won't affect interaction with other windows
         thelpers.enable_mouse()
         thelpers.feed_data('mouse enabled\n')
         screen:expect([[
-           27 line                 |line29                  |
-           28 line                 |line30                  |
-           29 line                 |rows: 5, cols: 24       |
-           30 line                 |mouse enabled           |
-           31                      |{1: }                       |
+          {7: 27 }line                 |line30                  |
+          {7: 28 }line                 |rows: 5, cols: 25       |
+          {7: 29 }line                 |rows: 5, cols: 24       |
+          {7: 30 }line                 |mouse enabled           |
+          {7: 31 }                     |{1: }                       |
           ==========                ==========              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
 
       it('wont lose focus if another window is scrolled', function()
         feed('<MouseDown><0,0><MouseDown><0,0>')
         screen:expect([[
-           21 line                 |line29                  |
-           22 line                 |line30                  |
-           23 line                 |rows: 5, cols: 24       |
-           24 line                 |mouse enabled           |
-           25 line                 |{1: }                       |
+          {7: 21 }line                 |line30                  |
+          {7: 22 }line                 |rows: 5, cols: 25       |
+          {7: 23 }line                 |rows: 5, cols: 24       |
+          {7: 24 }line                 |mouse enabled           |
+          {7: 25 }line                 |{1: }                       |
           ==========                ==========              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
         feed('<S-MouseUp><0,0>')
         screen:expect([[
-           26 line                 |line29                  |
-           27 line                 |line30                  |
-           28 line                 |rows: 5, cols: 24       |
-           29 line                 |mouse enabled           |
-           30 line                 |{1: }                       |
+          {7: 26 }line                 |line30                  |
+          {7: 27 }line                 |rows: 5, cols: 25       |
+          {7: 28 }line                 |rows: 5, cols: 24       |
+          {7: 29 }line                 |mouse enabled           |
+          {7: 30 }line                 |{1: }                       |
           ==========                ==========              |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end)
 
       it('will lose focus if another window is clicked', function()
         feed('<LeftMouse><5,1>')
         screen:expect([[
-           27 line                 |line29                  |
-           28 l^ine                 |line30                  |
-           29 line                 |rows: 5, cols: 24       |
-           30 line                 |mouse enabled           |
-           31                      |{2: }                       |
+          {7: 27 }line                 |line30                  |
+          {7: 28 }l^ine                 |rows: 5, cols: 25       |
+          {7: 29 }line                 |rows: 5, cols: 24       |
+          {7: 30 }line                 |mouse enabled           |
+          {7: 31 }                     |{2: }                       |
           ==========                ==========              |
                                                             |
         ]])
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 4b56698520..d60819af65 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -1,11 +1,13 @@
 local Screen = require('test.functional.ui.screen')
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local clear, eq, curbuf = helpers.clear, helpers.eq, helpers.curbuf
 local feed, nvim_dir, execute = helpers.feed, helpers.nvim_dir, helpers.execute
 local wait = helpers.wait
 local feed_data = thelpers.feed_data
 
+if helpers.pending_win32(pending) then return end
+
 describe('terminal scrollback', function()
   local screen
 
@@ -33,7 +35,7 @@ describe('terminal scrollback', function()
         line29                                            |
         line30                                            |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end)
 
@@ -61,7 +63,7 @@ describe('terminal scrollback', function()
         line3                                             |
         line4                                             |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end)
 
@@ -76,7 +78,7 @@ describe('terminal scrollback', function()
           line4                                             |
           line5                                             |
           {1: }                                                 |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
         eq(7, curbuf('line_count'))
       end)
@@ -92,7 +94,7 @@ describe('terminal scrollback', function()
             line6                                             |
             line7                                             |
             line8{1: }                                            |
-            -- TERMINAL --                                    |
+            {3:-- TERMINAL --}                                    |
           ]])
 
           feed('<c-\\><c-n>6k')
@@ -141,7 +143,7 @@ describe('terminal scrollback', function()
           line4                                             |
           rows: 5, cols: 50                                 |
           {1: }                                                 |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end
 
@@ -158,7 +160,7 @@ describe('terminal scrollback', function()
             rows: 5, cols: 50                                 |
             rows: 3, cols: 50                                 |
             {1: }                                                 |
-            -- TERMINAL --                                    |
+            {3:-- TERMINAL --}                                    |
           ]])
           eq(8, curbuf('line_count'))
           feed('<c-\\><c-n>3k')
@@ -185,7 +187,7 @@ describe('terminal scrollback', function()
           rows: 4, cols: 50                                 |
           {1: }                                                 |
                                                             |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
         eq(4, curbuf('line_count'))
       end
@@ -203,7 +205,7 @@ describe('terminal scrollback', function()
             rows: 4, cols: 50                                 |
             rows: 3, cols: 50                                 |
             {1: }                                                 |
-            -- TERMINAL --                                    |
+            {3:-- TERMINAL --}                                    |
           ]])
           eq(4, curbuf('line_count'))
           feed('<c-\\><c-n>gg')
@@ -218,7 +220,7 @@ describe('terminal scrollback', function()
             rows: 4, cols: 50                                 |
             rows: 3, cols: 50                                 |
             {1: }                                                 |
-            -- TERMINAL --                                    |
+            {3:-- TERMINAL --}                                    |
           ]])
         end)
       end)
@@ -235,14 +237,14 @@ describe('terminal scrollback', function()
         line3                                             |
         line4                                             |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
       screen:try_resize(screen._width, screen._height - 3)
       screen:expect([[
         line4                                             |
         rows: 3, cols: 50                                 |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
       eq(7, curbuf('line_count'))
     end)
@@ -255,7 +257,7 @@ describe('terminal scrollback', function()
           rows: 3, cols: 50                                 |
           rows: 4, cols: 50                                 |
           {1: }                                                 |
-          -- TERMINAL --                                    |
+          {3:-- TERMINAL --}                                    |
         ]])
       end
 
@@ -277,7 +279,7 @@ describe('terminal scrollback', function()
             rows: 4, cols: 50                                 |
             rows: 7, cols: 50                                 |
             {1: }                                                 |
-            -- TERMINAL --                                    |
+            {3:-- TERMINAL --}                                    |
           ]])
           eq(9, curbuf('line_count'))
           feed('<c-\\><c-n>gg')
@@ -315,7 +317,7 @@ describe('terminal scrollback', function()
               rows: 11, cols: 50                                |
               {1: }                                                 |
                                                                 |
-              -- TERMINAL --                                    |
+              {3:-- TERMINAL --}                                    |
             ]])
             -- since there's an empty line after the cursor, the buffer line
             -- count equals the terminal screen height
@@ -331,7 +333,7 @@ describe('terminal prints more lines than the screen height and exits', function
   it('will push extra lines to scrollback', function()
     clear()
     local screen = Screen.new(50, 7)
-    screen:attach(false)
+    screen:attach({rgb=false})
     execute('call termopen(["'..nvim_dir..'/tty-test", "10"]) | startinsert')
     wait()
     screen:expect([[
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index 364ca327a4..60f989d701 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -1,11 +1,13 @@
 -- Some sanity checks for the TUI using the builtin terminal emulator
 -- as a simple way to send keys and assert screen state.
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local feed = thelpers.feed_data
 local execute = helpers.execute
 local nvim_dir = helpers.nvim_dir
 
+if helpers.pending_win32(pending) then return end
+
 describe('tui', function()
   local screen
 
@@ -17,12 +19,12 @@ describe('tui', function()
     screen.timeout = 60000
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -36,20 +38,20 @@ describe('tui', function()
       abc                                               |
       test1                                             |
       test2{1: }                                            |
-      ~                                                 |
-      [No Name] [+]                                     |
-      -- INSERT --                                      |
-      -- TERMINAL --                                    |
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('\027')
     screen:expect([[
       abc                                               |
       test1                                             |
       test{1:2}                                             |
-      ~                                                 |
-      [No Name] [+]                                     |
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -64,9 +66,9 @@ describe('tui', function()
       alt-k                                             |
       alt-l                                             |
       {1: }                                                 |
-      [No Name] [+]                                     |
+      {5:[No Name] [+]                                     }|
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('gg')
     screen:expect([[
@@ -74,9 +76,9 @@ describe('tui', function()
       alt-f                                             |
       alt-g                                             |
       alt-h                                             |
-      [No Name] [+]                                     |
+      {5:[No Name] [+]                                     }|
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -90,12 +92,12 @@ describe('tui', function()
     feed('i\027j')
     screen:expect([[
       j{1: }                                                |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name] [+]                                     |
-      -- INSERT --                                      |
-      -- TERMINAL --                                    |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -105,46 +107,46 @@ describe('tui', function()
     feed('\022\022') -- ctrl+v
     feed('\022\013') -- ctrl+m
     screen:expect([[
-    {3:^G^V^M}{1: }                                           |
-    ~                                                 |
-    ~                                                 |
-    ~                                                 |
-    [No Name] [+]                                     |
-    -- INSERT --                                      |
-    -- TERMINAL --                                    |
-    ]], {[1] = {reverse = true}, [2] = {background = 11}, [3] = {foreground = 4}})
+    {9:^G^V^M}{1: }                                           |
+    {4:~                                                 }|
+    {4:~                                                 }|
+    {4:~                                                 }|
+    {5:[No Name] [+]                                     }|
+    {3:-- INSERT --}                                      |
+    {3:-- TERMINAL --}                                    |
+    ]])
   end)
 
   it('automatically sends <Paste> for bracketed paste sequences', function()
     feed('i\027[200~')
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
-      -- INSERT (paste) --                              |
-      -- TERMINAL --                                    |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
+      {3:-- INSERT (paste) --}                              |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('pasted from terminal')
     screen:expect([[
       pasted from terminal{1: }                             |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name] [+]                                     |
-      -- INSERT (paste) --                              |
-      -- TERMINAL --                                    |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT (paste) --}                              |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('\027[201~')
     screen:expect([[
       pasted from terminal{1: }                             |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name] [+]                                     |
-      -- INSERT --                                      |
-      -- TERMINAL --                                    |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name] [+]                                     }|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -160,9 +162,9 @@ describe('tui', function()
       item 2998                                         |
       item 2999                                         |
       item 3000{1: }                                        |
-      [No Name] [+]                   3000,10        Bot|
-      -- INSERT --                                      |
-      -- TERMINAL --                                    |
+      {5:[No Name] [+]                   3000,10        Bot}|
+      {3:-- INSERT --}                                      |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 end)
@@ -176,17 +178,15 @@ describe('tui with non-tty file descriptors', function()
 
   it('can handle pipes as stdout and stderr', function()
     local screen = thelpers.screen_setup(0, '"'..helpers.nvim_prog..' -u NONE -i NONE --cmd \'set noswapfile\' --cmd \'normal iabc\' > /dev/null 2>&1 && cat testF && rm testF"')
-    screen:set_default_attr_ids({})
-    screen:set_default_attr_ignore(true)
     feed(':w testF\n:q\n')
     screen:expect([[
       :w testF                                          |
       :q                                                |
       abc                                               |
                                                         |
-      [Process exited 0]                                |
+      [Process exited 0]{1: }                               |
                                                         |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 end)
@@ -205,23 +205,23 @@ describe('tui focus event handling', function()
     feed('\027[I')
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       gained                                            |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
 
     feed('\027[O')
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       lost                                              |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -231,22 +231,22 @@ describe('tui focus event handling', function()
     feed('\027[I')
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       gained                                            |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('\027[O')
     screen:expect([[
       {1: }                                                 |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       lost                                              |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -255,22 +255,22 @@ describe('tui focus event handling', function()
     feed('\027[I')
     screen:expect([[
                                                         |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       g{1:a}ined                                            |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
     feed('\027[O')
     screen:expect([[
                                                         |
-      ~                                                 |
-      ~                                                 |
-      ~                                                 |
-      [No Name]                                         |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
       l{1:o}st                                              |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 
@@ -287,7 +287,7 @@ describe('tui focus event handling', function()
                                                         |
                                                         |
       gained                                            |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
    feed('\027[O')
     screen:expect([[
@@ -297,7 +297,82 @@ describe('tui focus event handling', function()
                                                         |
                                                         |
       lost                                              |
-      -- TERMINAL --                                    |
+      {3:-- TERMINAL --}                                    |
     ]])
   end)
 end)
+
+-- These tests require `thelpers` because --headless/--embed
+-- does not initialize the TUI.
+describe("tui 't_Co' (terminal colors)", function()
+  local screen
+  local is_linux = (helpers.eval("system('uname') =~? 'linux'") == 1)
+
+  local function assert_term_colors(term, colorterm, maxcolors)
+    helpers.clear({env={TERM=term}, args={}})
+    -- This is ugly because :term/termopen() forces TERM=xterm-256color.
+    -- TODO: Revisit this after jobstart/termopen accept `env` dict.
+    screen = thelpers.screen_setup(0, string.format(
+      [=[['sh', '-c', 'LANG=C TERM=%s %s %s -u NONE -i NONE --cmd "silent set noswapfile"']]=],
+      term,
+      (colorterm ~= nil and "COLORTERM="..colorterm or ""),
+      helpers.nvim_prog))
+
+    thelpers.feed_data(":echo &t_Co\n")
+    local tline
+    if maxcolors == 8 then
+      tline = "~                                                 "
+    else
+      tline = "{4:~                                                 }"
+    end
+    screen:expect(string.format([[
+      {1: }                                                 |
+      %s|
+      %s|
+      %s|
+      {5:[No Name]                                         }|
+      %-3s                                               |
+      {3:-- TERMINAL --}                                    |
+    ]], tline, tline, tline, tostring(maxcolors and maxcolors or "")))
+  end
+
+  it("unknown TERM sets empty 't_Co'", function()
+    assert_term_colors("yet-another-term", nil, nil)
+  end)
+
+  it("unknown TERM with COLORTERM=screen-256color uses 256 colors", function()
+    assert_term_colors("yet-another-term", "screen-256color", 256)
+  end)
+
+  it("TERM=linux uses 8 colors", function()
+    if is_linux then
+      assert_term_colors("linux", nil, 8)
+    else
+      pending()
+    end
+  end)
+
+  it("TERM=screen uses 8 colors", function()
+    if is_linux then
+      assert_term_colors("screen", nil, 8)
+    else
+      pending()
+    end
+  end)
+
+  it("TERM=screen COLORTERM=screen-256color uses 256 colors", function()
+    assert_term_colors("screen", "screen-256color", 256)
+  end)
+
+  it("TERM=yet-another-term COLORTERM=screen-256color uses 256 colors", function()
+    assert_term_colors("screen", "screen-256color", 256)
+  end)
+
+  it("TERM=xterm uses 256 colors", function()
+    assert_term_colors("xterm", nil, 256)
+  end)
+
+  it("TERM=xterm-256color uses 256 colors", function()
+    assert_term_colors("xterm-256color", nil, 256)
+  end)
+end)
diff --git a/test/functional/terminal/window_spec.lua b/test/functional/terminal/window_spec.lua
index 6c236ed868..eb7a67a1a6 100644
--- a/test/functional/terminal/window_spec.lua
+++ b/test/functional/terminal/window_spec.lua
@@ -1,8 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local feed, clear = helpers.feed, helpers.clear
 local wait = helpers.wait
 
+if helpers.pending_win32(pending) then return end
 
 describe('terminal window', function()
   local screen
@@ -35,7 +36,7 @@ describe('terminal window', function()
                                                           |
                                                           |
                                                           |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end)
   end)
@@ -51,7 +52,7 @@ describe('terminal window', function()
         line3                                             |
         line4                                             |
         {1: }                                                 |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                    |
       ]])
     end)
 
diff --git a/test/functional/terminal/window_split_tab_spec.lua b/test/functional/terminal/window_split_tab_spec.lua
index 727eba2717..6951b84a69 100644
--- a/test/functional/terminal/window_split_tab_spec.lua
+++ b/test/functional/terminal/window_split_tab_spec.lua
@@ -1,7 +1,10 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local thelpers = require('test.functional.terminal.helpers')
 local clear = helpers.clear
 local feed, nvim = helpers.feed, helpers.nvim
+local execute = helpers.execute
+
+if helpers.pending_win32(pending) then return end
 
 describe('terminal', function()
   local screen
@@ -21,6 +24,49 @@ describe('terminal', function()
     screen:detach()
   end)
 
+  it('resets its size when entering terminal window', function()
+    feed('<c-\\><c-n>')
+    execute('2split')
+    screen:expect([[
+      tty ready                                         |
+      ^rows: 2, cols: 50                                 |
+      ==========                                        |
+      tty ready                                         |
+      rows: 2, cols: 50                                 |
+      {2: }                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      ==========                                        |
+                                                        |
+    ]])
+    execute('wincmd p')
+    screen:expect([[
+      tty ready                                         |
+      rows: 2, cols: 50                                 |
+      ==========                                        |
+      tty ready                                         |
+      rows: 2, cols: 50                                 |
+      rows: 5, cols: 50                                 |
+      {2: }                                                 |
+      ^                                                  |
+      ==========                                        |
+      :wincmd p                                         |
+    ]])
+    execute('wincmd p')
+    screen:expect([[
+      rows: 5, cols: 50                                 |
+      ^rows: 2, cols: 50                                 |
+      ==========                                        |
+      rows: 5, cols: 50                                 |
+      rows: 2, cols: 50                                 |
+      {2: }                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      ==========                                        |
+      :wincmd p                                         |
+    ]])
+  end)
+
   describe('when the screen is resized', function()
     it('will forward a resize request to the program', function()
       screen:try_resize(screen._width + 3, screen._height + 5)
@@ -39,7 +85,7 @@ describe('terminal', function()
                                                              |
                                                              |
                                                              |
-        -- TERMINAL --                                       |
+        {3:-- TERMINAL --}                                       |
       ]])
       screen:try_resize(screen._width - 6, screen._height - 10)
       screen:expect([[
@@ -47,91 +93,8 @@ describe('terminal', function()
         rows: 14, cols: 53                             |
         rows: 4, cols: 47                              |
         {1: }                                              |
-        -- TERMINAL --                                 |
-      ]])
-    end)
-  end)
-
-  describe('split horizontally', function()
-    before_each(function()
-      nvim('command', 'sp')
-    end)
-
-    local function reduce_height()
-      screen:expect([[
-        tty ready                                         |
-        rows: 3, cols: 50                                 |
-        {1: }                                                 |
-        ~                                                 |
-        ==========                                        |
-        tty ready                                         |
-        rows: 3, cols: 50                                 |
-        {2: }                                                 |
-        ==========                                        |
-        -- TERMINAL --                                    |
+        {3:-- TERMINAL --}                                 |
       ]])
-    end
-
-    it('uses the minimum height of all window displaying it', reduce_height)
-
-    describe('and then vertically', function()
-      before_each(function()
-        reduce_height()
-        nvim('command', 'vsp')
-      end)
-
-      local function reduce_width()
-        screen:expect([[
-          rows: 3, cols: 50        |rows: 3, cols: 50       |
-          rows: 3, cols: 24        |rows: 3, cols: 24       |
-          {1: }                        |{2: }                       |
-          ~                        |~                       |
-          ==========                ==========              |
-          rows: 3, cols: 50                                 |
-          rows: 3, cols: 24                                 |
-          {2: }                                                 |
-          ==========                                        |
-          -- TERMINAL --                                    |
-        ]])
-        feed('<c-\\><c-n>gg')
-        screen:expect([[
-          ^tty ready                |rows: 3, cols: 50       |
-          rows: 3, cols: 50        |rows: 3, cols: 24       |
-          rows: 3, cols: 24        |{2: }                       |
-          {2: }                        |~                       |
-          ==========                ==========              |
-          rows: 3, cols: 50                                 |
-          rows: 3, cols: 24                                 |
-          {2: }                                                 |
-          ==========                                        |
-                                                            |
-        ]])
-      end
-
-      it('uses the minimum width of all window displaying it', reduce_width)
-
-      describe('and then closes one of the vertical splits with q:', function()
-        before_each(function()
-          reduce_width()
-          nvim('command', 'q')
-          feed('<c-w>ja')
-        end)
-
-        it('will restore the width', function()
-          screen:expect([[
-            rows: 3, cols: 24                                 |
-            rows: 3, cols: 50                                 |
-            {2: }                                                 |
-            ~                                                 |
-            ==========                                        |
-            rows: 3, cols: 24                                 |
-            rows: 3, cols: 50                                 |
-            {1: }                                                 |
-            ==========                                        |
-            -- TERMINAL --                                    |
-          ]])
-        end)
-      end)
     end)
   end)
 end)
diff --git a/test/functional/ui/bufhl_spec.lua b/test/functional/ui/bufhl_spec.lua
index 58f5b11de0..53fe303762 100644
--- a/test/functional/ui/bufhl_spec.lua
+++ b/test/functional/ui/bufhl_spec.lua
@@ -1,39 +1,31 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, request, neq = helpers.execute, helpers.request, helpers.neq
 
+if helpers.pending_win32(pending) then return end
 
 describe('Buffer highlighting', function()
   local screen
   local curbuf
 
-  local hl_colors = {
-    NonText = Screen.colors.Blue,
-    Question = Screen.colors.SeaGreen,
-    String = Screen.colors.Fuchsia,
-    Statement = Screen.colors.Brown,
-    Special = Screen.colors.SlateBlue,
-    Identifier = Screen.colors.DarkCyan
-  }
-
   before_each(function()
     clear()
     execute("syntax on")
     screen = Screen.new(40, 8)
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=hl_colors.NonText}} )
     screen:set_default_attr_ids({
-      [1] = {foreground = hl_colors.String},
-      [2] = {foreground = hl_colors.Statement, bold = true},
-      [3] = {foreground = hl_colors.Special},
-      [4] = {bold = true, foreground = hl_colors.Special},
-      [5] = {foreground = hl_colors.Identifier},
-      [6] = {bold = true},
-      [7] = {underline = true, bold = true, foreground = hl_colors.Special},
-      [8] = {foreground = hl_colors.Special, underline = true}
+      [1] = {bold=true, foreground=Screen.colors.Blue},
+      [2] = {foreground = Screen.colors.Fuchsia}, -- String
+      [3] = {foreground = Screen.colors.Brown, bold = true}, -- Statement
+      [4] = {foreground = Screen.colors.SlateBlue}, -- Special
+      [5] = {bold = true, foreground = Screen.colors.SlateBlue},
+      [6] = {foreground = Screen.colors.DarkCyan}, -- Identifier
+      [7] = {bold = true},
+      [8] = {underline = true, bold = true, foreground = Screen.colors.SlateBlue},
+      [9] = {foreground = Screen.colors.SlateBlue, underline = true}
     })
-    curbuf = request('vim_get_current_buffer')
+    curbuf = request('nvim_get_current_buf')
   end)
 
   after_each(function()
@@ -41,11 +33,11 @@ describe('Buffer highlighting', function()
   end)
 
   local function add_hl(...)
-    return request('buffer_add_highlight', curbuf, ...)
+    return request('nvim_buf_add_highlight', curbuf, ...)
   end
 
   local function clear_hl(...)
-    return request('buffer_clear_highlight', curbuf, ...)
+    return request('nvim_buf_clear_highlight', curbuf, ...)
   end
 
 
@@ -58,11 +50,11 @@ describe('Buffer highlighting', function()
     screen:expect([[
       these are some lines                    |
       with colorful tex^t                      |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
 
@@ -70,25 +62,25 @@ describe('Buffer highlighting', function()
     add_hl(-1, "Statement", 1 , 5, -1)
 
     screen:expect([[
-      these are {1:some} lines                    |
-      with {2:colorful tex^t}                      |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      these are {2:some} lines                    |
+      with {3:colorful tex^t}                      |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
 
     feed("ggo<esc>")
     screen:expect([[
-      these are {1:some} lines                    |
+      these are {2:some} lines                    |
       ^                                        |
-      with {2:colorful text}                      |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      with {3:colorful text}                      |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
 
@@ -97,10 +89,10 @@ describe('Buffer highlighting', function()
       these are some lines                    |
       ^                                        |
       with colorful text                      |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
   end)
@@ -120,21 +112,25 @@ describe('Buffer highlighting', function()
       add_hl(id1, "ImportantWord", 2, 0, 9)
       add_hl(id1, "ImportantWord", 3, 5, 14)
 
-      id2 = add_hl(0, "Special", 0, 2, 8)
+      -- add_highlight can be called like this to get a new source
+      -- without adding any highlight
+      id2 = add_hl(0, "", 0, 0, 0)
+      neq(id1, id2)
+
+      add_hl(id2, "Special", 0, 2, 8)
       add_hl(id2, "Identifier", 1, 3, 8)
       add_hl(id2, "Special", 1, 14, 20)
       add_hl(id2, "Underlined", 2, 6, 12)
       add_hl(id2, "Underlined", 3, 0, 9)
-      neq(id1, id2)
 
       screen:expect([[
-        a {4:longer} example                        |
-        in {5:order} to {6:de}{4:monstr}{6:ate}                 |
-        {6:combin}{7:ing}{8: hi}ghlights                    |
-        {8:from }{7:diff}{6:erent} source^s                  |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        a {5:longer} example                        |
+        in {6:order} to {7:de}{5:monstr}{7:ate}                 |
+        {7:combin}{8:ing}{9: hi}ghlights                    |
+        {9:from }{8:diff}{7:erent} source^s                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
         :hi ImportantWord gui=bold cterm=bold   |
       ]])
     end)
@@ -142,13 +138,13 @@ describe('Buffer highlighting', function()
     it('and clearing the first added', function()
       clear_hl(id1, 0, -1)
       screen:expect([[
-        a {3:longer} example                        |
-        in {5:order} to de{3:monstr}ate                 |
-        combin{8:ing hi}ghlights                    |
-        {8:from diff}erent source^s                  |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        a {4:longer} example                        |
+        in {6:order} to de{4:monstr}ate                 |
+        combin{9:ing hi}ghlights                    |
+        {9:from diff}erent source^s                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
         :hi ImportantWord gui=bold cterm=bold   |
       ]])
     end)
@@ -156,13 +152,13 @@ describe('Buffer highlighting', function()
     it('and clearing the second added', function()
       clear_hl(id2, 0, -1)
       screen:expect([[
-        a {6:longer} example                        |
-        in order to {6:demonstrate}                 |
-        {6:combining} highlights                    |
-        from {6:different} source^s                  |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        a {7:longer} example                        |
+        in order to {7:demonstrate}                 |
+        {7:combining} highlights                    |
+        from {7:different} source^s                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
         :hi ImportantWord gui=bold cterm=bold   |
       ]])
     end)
@@ -173,12 +169,12 @@ describe('Buffer highlighting', function()
       clear_hl(id2, 2, -1)
       screen:expect([[
         a longer example                        |
-        in {5:order} to de{3:monstr}ate                 |
-        {6:combining} highlights                    |
-        from {6:different} source^s                  |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        in {6:order} to de{4:monstr}ate                 |
+        {7:combining} highlights                    |
+        from {7:different} source^s                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
         :hi ImportantWord gui=bold cterm=bold   |
       ]])
     end)
@@ -186,25 +182,25 @@ describe('Buffer highlighting', function()
     it('and renumbering lines', function()
       feed('3Gddggo<esc>')
       screen:expect([[
-        a {4:longer} example                        |
+        a {5:longer} example                        |
         ^                                        |
-        in {5:order} to {6:de}{4:monstr}{6:ate}                 |
-        {8:from }{7:diff}{6:erent} sources                  |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        in {6:order} to {7:de}{5:monstr}{7:ate}                 |
+        {9:from }{8:diff}{7:erent} sources                  |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
                                                 |
       ]])
 
       execute(':3move 4')
       screen:expect([[
-        a {4:longer} example                        |
+        a {5:longer} example                        |
                                                 |
-        {8:from }{7:diff}{6:erent} sources                  |
-        ^in {5:order} to {6:de}{4:monstr}{6:ate}                 |
-        ~                                       |
-        ~                                       |
-        ~                                       |
+        {9:from }{8:diff}{7:erent} sources                  |
+        ^in {6:order} to {7:de}{5:monstr}{7:ate}                 |
+        {1:~                                       }|
+        {1:~                                       }|
+        {1:~                                       }|
         ::3move 4                               |
       ]])
     end)
@@ -218,25 +214,25 @@ describe('Buffer highlighting', function()
     local id = add_hl(0, "Special", 0, 0, 9)
 
     screen:expect([[
-      {3:three ove}{5:rlapp}{1:ing color}^s                |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {4:three ove}{6:rlapp}{2:ing color}^s                |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
 
     clear_hl(id, 0, 1)
     screen:expect([[
-      three {5:overlapp}{1:ing color}^s                |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      three {6:overlapp}{2:ing color}^s                |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
   end)
@@ -248,13 +244,13 @@ describe('Buffer highlighting', function()
     add_hl(-1, "String", 0, 16, 21)
 
     screen:expect([[
-      Ta {5:båten} över {1:sjön}^!                     |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      Ta {6:båten} över {2:sjön}^!                     |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
                                               |
     ]])
   end)
diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 85fca4d7ca..945b16ef92 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -1,9 +1,10 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local os = require('os')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute, request, eq = helpers.execute, helpers.request, helpers.eq
 
+if helpers.pending_win32(pending) then return end
 
 describe('color scheme compatibility', function()
   before_each(function()
@@ -12,7 +13,7 @@ describe('color scheme compatibility', function()
 
   it('t_Co is set to 256 by default', function()
     eq('256', request('vim_eval', '&t_Co'))
-    request('vim_set_option', 't_Co', '88')
+    request('nvim_set_option', 't_Co', '88')
     eq('88', request('vim_eval', '&t_Co'))
   end)
 end)
@@ -27,10 +28,11 @@ describe('manual syntax highlight', function()
     clear()
     screen = Screen.new(20,5)
     screen:attach()
-    --ignore highligting of ~-lines
-    screen:set_default_attr_ignore( {{bold=true, foreground=Screen.colors.Blue}} )
     --syntax highlight for vimcscripts "echo"
-    screen:set_default_attr_ids( {[1] = {bold=true, foreground=Screen.colors.Brown}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=Screen.colors.Blue},
+      [1] = {bold=true, foreground=Screen.colors.Brown}
+    } )
   end)
 
   after_each(function()
@@ -38,7 +40,6 @@ describe('manual syntax highlight', function()
     os.remove('Xtest-functional-ui-highlight.tmp.vim')
   end)
 
-  -- test with "set hidden" even if the bug did not occur this way
   it("works with buffer switch and 'hidden'", function()
     execute('e tmp1.vim')
     execute('e Xtest-functional-ui-highlight.tmp.vim')
@@ -54,9 +55,9 @@ describe('manual syntax highlight', function()
     execute('bp')
     screen:expect([[
       {1:^echo} 1              |
-      ~                   |
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
+      {0:~                   }|
       <f 1 --100%-- col 1 |
     ]])
   end)
@@ -76,9 +77,9 @@ describe('manual syntax highlight', function()
     execute('bp')
     screen:expect([[
       {1:^echo} 1              |
-      ~                   |
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
+      {0:~                   }|
       <ht.tmp.vim" 1L, 7C |
     ]])
   end)
@@ -90,17 +91,10 @@ describe('Default highlight groups', function()
   -- command
   local screen
 
-  local hlgroup_colors = {
-    NonText = Screen.colors.Blue,
-    Question = Screen.colors.SeaGreen
-  }
-
   before_each(function()
     clear()
     screen = Screen.new()
     screen:attach()
-    --ignore highligting of ~-lines
-    screen:set_default_attr_ignore( {{bold=true, foreground=hlgroup_colors.NonText}} )
   end)
 
   after_each(function()
@@ -109,23 +103,24 @@ describe('Default highlight groups', function()
 
   it('window status bar', function()
     screen:set_default_attr_ids({
+      [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {reverse = true, bold = true},  -- StatusLine
       [2] = {reverse = true}                -- StatusLineNC
     })
     execute('sp', 'vsp', 'vsp')
     screen:expect([[
       ^                    {2:|}                {2:|}               |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
       {1:[No Name]            }{2:[No Name]        [No Name]      }|
                                                            |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {2:[No Name]                                            }|
                                                            |
     ]])
@@ -133,17 +128,17 @@ describe('Default highlight groups', function()
     feed('<c-w>j')
     screen:expect([[
                           {2:|}                {2:|}               |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
-      ~                   {2:|}~               {2:|}~              |
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
+      {0:~                   }{2:|}{0:~               }{2:|}{0:~              }|
       {2:[No Name]            [No Name]        [No Name]      }|
       ^                                                     |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {1:[No Name]                                            }|
                                                            |
     ]])
@@ -153,51 +148,51 @@ describe('Default highlight groups', function()
     feed('<c-w>k<c-w>l')
     screen:expect([[
                           {2:|}^                    {2:|}           |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
       {2:[No Name]            }{1:[No Name]            }{2:[No Name]  }|
                                                            |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {2:[No Name]                                            }|
                                                            |
     ]])
     feed('<c-w>l')
     screen:expect([[
                           {2:|}           {2:|}^                    |
-      ~                   {2:|}~          {2:|}~                   |
-      ~                   {2:|}~          {2:|}~                   |
-      ~                   {2:|}~          {2:|}~                   |
-      ~                   {2:|}~          {2:|}~                   |
-      ~                   {2:|}~          {2:|}~                   |
+      {0:~                   }{2:|}{0:~          }{2:|}{0:~                   }|
+      {0:~                   }{2:|}{0:~          }{2:|}{0:~                   }|
+      {0:~                   }{2:|}{0:~          }{2:|}{0:~                   }|
+      {0:~                   }{2:|}{0:~          }{2:|}{0:~                   }|
+      {0:~                   }{2:|}{0:~          }{2:|}{0:~                   }|
       {2:[No Name]            [No Name]   }{1:[No Name]           }|
                                                            |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {2:[No Name]                                            }|
                                                            |
     ]])
     feed('<c-w>h<c-w>h')
     screen:expect([[
       ^                    {2:|}                    {2:|}           |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
-      ~                   {2:|}~                   {2:|}~          |
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
+      {0:~                   }{2:|}{0:~                   }{2:|}{0:~          }|
       {1:[No Name]            }{2:[No Name]            [No Name]  }|
                                                            |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {2:[No Name]                                            }|
                                                            |
     ]])
@@ -207,20 +202,21 @@ describe('Default highlight groups', function()
     feed('i')
     screen:expect([[
       ^                                                     |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {1:-- INSERT --}                                         |
-    ]], {[1] = {bold = true}})
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
+    [1] = {bold = true}})
   end)
 
   it('end of file markers', function()
@@ -239,27 +235,28 @@ describe('Default highlight groups', function()
       {1:~                                                    }|
       {1:~                                                    }|
                                                            |
-    ]], {[1] = {bold = true, foreground = hlgroup_colors.NonText}})
+    ]], {[1] = {bold = true, foreground = Screen.colors.Blue}})
   end)
 
   it('"wait return" text', function()
     feed(':ls<cr>')
     screen:expect([[
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       :ls                                                  |
         1 %a   "[No Name]"                    line 1       |
       {1:Press ENTER or type command to continue}^              |
-    ]], {[1] = {bold = true, foreground = hlgroup_colors.Question}})
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
+    [1] = {bold = true, foreground = Screen.colors.SeaGreen}})
     feed('<cr>') --  skip the "Press ENTER..." state or tests will hang
   end)
   it('can be cleared and linked to other highlight groups', function()
@@ -267,40 +264,42 @@ describe('Default highlight groups', function()
     feed('i')
     screen:expect([[
       ^                                                     |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       -- INSERT --                                         |
-    ]], {})
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
+    [1] = {bold=true}})
     feed('<esc>')
     execute('highlight CustomHLGroup guifg=red guibg=green')
     execute('highlight link ModeMsg CustomHLGroup')
     feed('i')
     screen:expect([[
       ^                                                     |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
       {1:-- INSERT --}                                         |
-    ]], {[1] = {foreground = Screen.colors.Red, background = Screen.colors.Green}})
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue},
+    [1] = {foreground = Screen.colors.Red, background = Screen.colors.Green}})
   end)
   it('can be cleared by assigning NONE', function()
     execute('syn keyword TmpKeyword neovim')
@@ -308,40 +307,41 @@ describe('Default highlight groups', function()
     insert('neovim')
     screen:expect([[
       {1:neovi^m}                                               |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
                                                            |
     ]], {
+      [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {foreground = Screen.colors.White, background = Screen.colors.Red}
     })
     execute("hi ErrorMsg term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE"
             .. " gui=NONE guifg=NONE guibg=NONE guisp=NONE")
     screen:expect([[
       neovi^m                                               |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
                                                            |
-    ]], {})
+    ]], {[0] = {bold=true, foreground=Screen.colors.Blue}})
   end)
 end)
 
@@ -352,10 +352,6 @@ describe('guisp (special/undercurl)', function()
     clear()
     screen = Screen.new(25,10)
     screen:attach()
-    screen:set_default_attr_ignore({
-      [1] = {bold = true, foreground = Screen.colors.Blue},
-      [2] = {bold = true}
-    })
   end)
 
   it('can be set and is applied like foreground or background', function()
@@ -390,14 +386,16 @@ describe('guisp (special/undercurl)', function()
       {4:specialwithfg}            |
                                |
               {1:neovim} tabbed^    |
-      ~                        |
-      -- INSERT --             |
+      {0:~                        }|
+      {5:-- INSERT --}             |
     ]],{
+      [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {background = Screen.colors.Yellow, foreground = Screen.colors.Red,
              special = Screen.colors.Red},
       [2] = {special = Screen.colors.Red},
       [3] = {special = Screen.colors.Red, background = Screen.colors.Yellow},
       [4] = {foreground = Screen.colors.Red, special = Screen.colors.Red},
+      [5] = {bold=true},
     })
 
   end)
@@ -406,13 +404,6 @@ end)
 describe("'cursorline' with 'listchars'", function()
   local screen
 
-  local hlgroup_colors = {
-    NonText = Screen.colors.Blue,
-    Cursorline = Screen.colors.Grey90,
-    SpecialKey = Screen.colors.Red,
-    Visual = Screen.colors.LightGrey,
-  }
-
   before_each(function()
     clear()
     screen = Screen.new(20,5)
@@ -424,48 +415,50 @@ describe("'cursorline' with 'listchars'", function()
   end)
 
   it("'cursorline' and 'cursorcolumn'", function()
-    screen:set_default_attr_ids({[1] = {background=hlgroup_colors.Cursorline}})
-    screen:set_default_attr_ignore( {{bold=true, foreground=hlgroup_colors.NonText}} )
+    screen:set_default_attr_ids({
+      [0] = {bold=true, foreground=Screen.colors.Blue},
+      [1] = {background=Screen.colors.Grey90}
+    })
     execute('highlight clear ModeMsg')
     execute('set cursorline')
     feed('i')
     screen:expect([[
       {1:^                    }|
-      ~                   |
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
+      {0:~                   }|
       -- INSERT --        |
     ]])
     feed('abcdefg<cr>kkasdf')
     screen:expect([[
       abcdefg             |
       {1:kkasdf^              }|
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
       -- INSERT --        |
     ]])
     feed('<esc>')
     screen:expect([[
       abcdefg             |
       {1:kkasd^f              }|
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
                           |
     ]])
     execute('set nocursorline')
     screen:expect([[
       abcdefg             |
       kkasd^f              |
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
       :set nocursorline   |
     ]])
     feed('k')
     screen:expect([[
       abcde^fg             |
       kkasdf              |
-      ~                   |
-      ~                   |
+      {0:~                   }|
+      {0:~                   }|
       :set nocursorline   |
     ]])
     feed('jjji<cr><cr><cr><esc>')
@@ -498,22 +491,22 @@ describe("'cursorline' with 'listchars'", function()
 
   it("'cursorline' and with 'listchar' option: space, eol, tab, and trail", function()
     screen:set_default_attr_ids({
-      [1] = {background=hlgroup_colors.Cursorline},
+      [1] = {background=Screen.colors.Grey90},
       [2] = {
-        foreground=hlgroup_colors.SpecialKey,
-        background=hlgroup_colors.Cursorline,
+        foreground=Screen.colors.Red,
+        background=Screen.colors.Grey90,
       },
       [3] = {
-        background=hlgroup_colors.Cursorline,
-        foreground=hlgroup_colors.NonText,
+        background=Screen.colors.Grey90,
+        foreground=Screen.colors.Blue,
         bold=true,
       },
       [4] = {
-        foreground=hlgroup_colors.NonText,
+        foreground=Screen.colors.Blue,
         bold=true,
       },
       [5] = {
-        foreground=hlgroup_colors.SpecialKey,
+        foreground=Screen.colors.Red,
       },
     })
     execute('highlight clear ModeMsg')
@@ -582,33 +575,33 @@ describe("'cursorline' with 'listchars'", function()
 
   it("'listchar' in visual mode", function()
     screen:set_default_attr_ids({
-      [1] = {background=hlgroup_colors.Cursorline},
+      [1] = {background=Screen.colors.Grey90},
       [2] = {
-        foreground=hlgroup_colors.SpecialKey,
-        background=hlgroup_colors.Cursorline,
+        foreground=Screen.colors.Red,
+        background=Screen.colors.Grey90,
       },
       [3] = {
-        background=hlgroup_colors.Cursorline,
-        foreground=hlgroup_colors.NonText,
+        background=Screen.colors.Grey90,
+        foreground=Screen.colors.Blue,
         bold=true,
       },
       [4] = {
-        foreground=hlgroup_colors.NonText,
+        foreground=Screen.colors.Blue,
         bold=true,
       },
       [5] = {
-        foreground=hlgroup_colors.SpecialKey,
+        foreground=Screen.colors.Red,
       },
       [6] = {
-        background=hlgroup_colors.Visual,
+        background=Screen.colors.LightGrey,
       },
       [7] = {
-        background=hlgroup_colors.Visual,
-        foreground=hlgroup_colors.SpecialKey,
+        background=Screen.colors.LightGrey,
+        foreground=Screen.colors.Red,
       },
       [8] = {
-        background=hlgroup_colors.Visual,
-        foreground=hlgroup_colors.NonText,
+        background=Screen.colors.LightGrey,
+        foreground=Screen.colors.Blue,
         bold=true,
       },
     })
diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
new file mode 100644
index 0000000000..6da22b6a3a
--- /dev/null
+++ b/test/functional/ui/inccommand_spec.lua
@@ -0,0 +1,1623 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear = helpers.clear
+local curbufmeths = helpers.curbufmeths
+local eq = helpers.eq
+local eval = helpers.eval
+local execute = helpers.execute
+local expect = helpers.expect
+local feed = helpers.feed
+local insert = helpers.insert
+local meths = helpers.meths
+local neq = helpers.neq
+local ok = helpers.ok
+local source = helpers.source
+local wait = helpers.wait
+
+local default_text = [[
+  Inc substitution on
+  two lines
+]]
+
+local function common_setup(screen, inccommand, text)
+  if screen then
+    execute("syntax on")
+    execute("set nohlsearch")
+    execute("hi Substitute guifg=red guibg=yellow")
+    screen:attach()
+    screen:set_default_attr_ids({
+      [1]  = {foreground = Screen.colors.Fuchsia},
+      [2]  = {foreground = Screen.colors.Brown, bold = true},
+      [3]  = {foreground = Screen.colors.SlateBlue},
+      [4]  = {bold = true, foreground = Screen.colors.SlateBlue},
+      [5]  = {foreground = Screen.colors.DarkCyan},
+      [6]  = {bold = true},
+      [7]  = {underline = true, bold = true, foreground = Screen.colors.SlateBlue},
+      [8]  = {foreground = Screen.colors.Slateblue, underline = true},
+      [9]  = {background = Screen.colors.Yellow},
+      [10] = {reverse = true},
+      [11] = {reverse = true, bold=true},
+      [12] = {foreground = Screen.colors.Red, background = Screen.colors.Yellow},
+      [13] = {bold = true, foreground = Screen.colors.SeaGreen},
+      [14] = {foreground = Screen.colors.White, background = Screen.colors.Red},
+      [15] = {bold=true, foreground=Screen.colors.Blue},
+      [16] = {background=Screen.colors.Grey90},  -- cursorline
+      vis  = {background=Screen.colors.LightGrey}
+    })
+  end
+
+  execute("set inccommand=" .. (inccommand and inccommand or ""))
+
+  if text then
+    insert(text)
+  end
+end
+
+describe(":substitute, inccommand=split does not trigger preview", function()
+  before_each(function()
+    clear()
+    common_setup(nil, "split", default_text)
+  end)
+
+  it("if invoked by a script ", function()
+    source('%s/tw/MO/g')
+    wait()
+    eq(1, eval("bufnr('$')"))
+
+    -- sanity check: assert the buffer state
+    expect(default_text:gsub("tw", "MO"))
+  end)
+
+  it("if invoked by feedkeys()", function()
+    -- in a script...
+    source([[:call feedkeys(":%s/tw/MO/g\<CR>")]])
+    wait()
+    -- or interactively...
+    feed([[:call feedkeys(":%s/tw/MO/g\<CR>")<CR>]])
+    wait()
+    eq(1, eval("bufnr('$')"))
+
+    -- sanity check: assert the buffer state
+    expect(default_text:gsub("tw", "MO"))
+  end)
+end)
+
+describe(":substitute, 'inccommand' preserves", function()
+   if helpers.pending_win32(pending) then return end
+
+  before_each(clear)
+
+  it('listed buffers (:ls)', function()
+    local screen = Screen.new(30,10)
+    common_setup(screen, "split", "ABC")
+
+    execute("%s/AB/BA/")
+    execute("ls")
+
+    screen:expect([[
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      :ls                           |
+        1 %a + "[No Name]"          |
+                line 1              |
+      {13:Press ENTER or type command to}|
+      {13: continue}^                     |
+    ]])
+  end)
+
+  for _, case in pairs{"", "split", "nosplit"} do
+    it("various delimiters (inccommand="..case..")", function()
+      insert(default_text)
+      execute("set inccommand=" .. case)
+
+      local delims = { '/', '#', ';', '%', ',', '@', '!', ''}
+      for _,delim in pairs(delims) do
+        execute("%s"..delim.."lines"..delim.."LINES"..delim.."g")
+        expect([[
+          Inc substitution on
+          two LINES
+          ]])
+        execute("undo")
+      end
+    end)
+  end
+
+  for _, case in pairs{"", "split", "nosplit"} do
+    it("'undolevels' (inccommand="..case..")", function()
+      execute("set undolevels=139")
+      execute("setlocal undolevels=34")
+      execute("set inccommand=" .. case)
+      insert("as")
+      feed(":%s/as/glork/<enter>")
+      eq(meths.get_option('undolevels'), 139)
+      eq(curbufmeths.get_option('undolevels'), 34)
+    end)
+  end
+
+  for _, case in ipairs({"", "split", "nosplit"}) do
+    it("empty undotree() (inccommand="..case..")", function()
+      execute("set undolevels=1000")
+      execute("set inccommand=" .. case)
+      local expected_undotree = eval("undotree()")
+
+      -- Start typing an incomplete :substitute command.
+      feed([[:%s/e/YYYY/g]])
+      wait()
+      -- Cancel the :substitute.
+      feed([[<C-\><C-N>]])
+
+      -- The undo tree should be unchanged.
+      eq(expected_undotree, eval("undotree()"))
+      eq({}, eval("undotree()")["entries"])
+    end)
+  end
+
+  for _, case in ipairs({"", "split", "nosplit"}) do
+    it("undotree() with branches (inccommand="..case..")", function()
+      execute("set undolevels=1000")
+      execute("set inccommand=" .. case)
+      -- Make some changes.
+      feed([[isome text 1<C-\><C-N>]])
+      feed([[osome text 2<C-\><C-N>]])
+      -- Add an undo branch.
+      feed([[u]])
+      -- More changes, more undo branches.
+      feed([[osome text 3<C-\><C-N>]])
+      feed([[AX<C-\><C-N>]])
+      feed([[...]])
+      feed([[uu]])
+      feed([[osome text 4<C-\><C-N>]])
+      feed([[u<C-R>u]])
+      feed([[osome text 5<C-\><C-N>]])
+      expect([[
+        some text 1
+        some text 3XX
+        some text 5]])
+      local expected_undotree = eval("undotree()")
+      eq(5, #expected_undotree["entries"])  -- sanity
+
+      -- Start typing an incomplete :substitute command.
+      feed([[:%s/e/YYYY/g]])
+      wait()
+      -- Cancel the :substitute.
+      feed([[<C-\><C-N>]])
+
+      -- The undo tree should be unchanged.
+      eq(expected_undotree, eval("undotree()"))
+    end)
+  end
+
+  for _, case in pairs{"", "split", "nosplit"} do
+    it("b:changedtick (inccommand="..case..")", function()
+      execute("set inccommand=" .. case)
+      feed([[isome text 1<C-\><C-N>]])
+      feed([[osome text 2<C-\><C-N>]])
+      local expected_tick = eval("b:changedtick")
+      ok(expected_tick > 0)
+
+      expect([[
+        some text 1
+        some text 2]])
+      feed(":%s/e/XXX/")
+      wait()
+
+      eq(expected_tick, eval("b:changedtick"))
+    end)
+  end
+
+  for _, case in pairs{"", "split", "nosplit"} do
+    it("visual selection for non-previewable command (inccommand="..case..") #5888", function()
+      local screen = Screen.new(30,10)
+      common_setup(screen, case, default_text)
+      feed('1G2V')
+
+      feed(':s')
+      screen:expect([[
+        {vis:Inc substitution on}           |
+        t{vis:wo lines}                     |
+                                      |
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        :'<,'>s^                       |
+      ]])
+
+      feed('o')
+      screen:expect([[
+        {vis:Inc substitution on}           |
+        t{vis:wo lines}                     |
+                                      |
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        {15:~                             }|
+        :'<,'>so^                      |
+      ]])
+    end)
+  end
+
+end)
+
+describe(":substitute, 'inccommand' preserves undo", function()
+   if helpers.pending_win32(pending) then return end
+
+  local cases = { "", "split", "nosplit" }
+
+  local substrings = {
+    ":%s/1",
+    ":%s/1/",
+    ":%s/1/<bs>",
+    ":%s/1/a",
+    ":%s/1/a<bs>",
+    ":%s/1/ax",
+    ":%s/1/ax<bs>",
+    ":%s/1/ax<bs><bs>",
+    ":%s/1/ax<bs><bs><bs>",
+    ":%s/1/ax/",
+    ":%s/1/ax/<bs>",
+    ":%s/1/ax/<bs>/",
+    ":%s/1/ax/g",
+    ":%s/1/ax/g<bs>",
+    ":%s/1/ax/g<bs><bs>"
+  }
+
+  local function test_sub(substring, split, redoable)
+    clear()
+    execute("set inccommand=" .. split)
+
+    insert("1")
+    feed("o2<esc>")
+    execute("undo")
+    feed("o3<esc>")
+    if redoable then
+      feed("o4<esc>")
+      execute("undo")
+    end
+    feed(substring.. "<enter>")
+    execute("undo")
+
+    feed("g-")
+    expect([[
+      1
+      2]])
+
+    feed("g+")
+    expect([[
+      1
+      3]])
+  end
+
+  local function test_notsub(substring, split, redoable)
+    clear()
+    execute("set inccommand=" .. split)
+
+    insert("1")
+    feed("o2<esc>")
+    execute("undo")
+    feed("o3<esc>")
+    if redoable then
+      feed("o4<esc>")
+      execute("undo")
+    end
+    feed(substring .. "<esc>")
+
+    feed("g-")
+    expect([[
+      1
+      2]])
+
+    feed("g+")
+    expect([[
+      1
+      3]])
+
+    if redoable then
+      feed("<c-r>")
+      expect([[
+        1
+        3
+        4]])
+    end
+  end
+
+
+  local function test_threetree(substring, split)
+    clear()
+    execute("set inccommand=" .. split)
+
+    insert("1")
+    feed("o2<esc>")
+    feed("o3<esc>")
+    feed("uu")
+    feed("oa<esc>")
+    feed("ob<esc>")
+    feed("uu")
+    feed("oA<esc>")
+    feed("oB<esc>")
+
+    -- This is the undo tree (x-Axis is timeline), we're at B now
+    --    ----------------A - B
+    --   /
+    --  | --------a - b
+    --  |/
+    --  1 - 2 - 3
+
+    feed("2u")
+    feed(substring .. "<esc>")
+    expect([[
+      1]])
+    feed("g-")
+    expect([[
+      ]])
+    feed("g+")
+    expect([[
+      1]])
+    feed("<c-r>")
+    expect([[
+      1
+      A]])
+
+    feed("g-") -- go to b
+    feed("2u")
+    feed(substring .. "<esc>")
+    feed("<c-r>")
+    expect([[
+      1
+      a]])
+
+    feed("g-") -- go to 3
+    feed("2u")
+    feed(substring .. "<esc>")
+    feed("<c-r>")
+    expect([[
+      1
+      2]])
+  end
+
+  it("at a non-leaf of the undo tree", function()
+   for _, case in pairs(cases) do
+     for _, str in pairs(substrings) do
+       for _, redoable in pairs({true}) do
+         test_sub(str, case, redoable)
+       end
+     end
+   end
+  end)
+
+  it("at a leaf of the undo tree", function()
+    for _, case in pairs(cases) do
+      for _, str in pairs(substrings) do
+        for _, redoable in pairs({false}) do
+          test_sub(str, case, redoable)
+        end
+      end
+    end
+  end)
+
+  it("when interrupting substitution", function()
+    for _, case in pairs(cases) do
+      for _, str in pairs(substrings) do
+        for _, redoable in pairs({true,false}) do
+          test_notsub(str, case, redoable)
+        end
+      end
+    end
+  end)
+
+  it("in a complex undo scenario", function()
+    for _, case in pairs(cases) do
+      for _, str in pairs(substrings) do
+        test_threetree(str, case)
+      end
+    end
+  end)
+
+  it('with undolevels=0', function()
+    for _, case in pairs(cases) do
+      clear()
+      common_setup(nil, case, default_text)
+      execute("set undolevels=0")
+
+      feed("1G0")
+      insert("X")
+      feed(":%s/tw/MO/<esc>")
+      execute("undo")
+      expect(default_text)
+      execute("undo")
+      expect(default_text:gsub("Inc", "XInc"))
+      execute("undo")
+
+      execute("%s/tw/MO/g")
+      expect(default_text:gsub("tw", "MO"))
+      execute("undo")
+      expect(default_text)
+      execute("undo")
+      expect(default_text:gsub("tw", "MO"))
+    end
+  end)
+
+  it('with undolevels=1', function()
+    local screen = Screen.new(20,10)
+
+    for _, case in pairs(cases) do
+      clear()
+      common_setup(screen, case, default_text)
+      execute("set undolevels=1")
+
+      feed("1G0")
+      insert("X")
+      feed("IY<esc>")
+      feed(":%s/tw/MO/<esc>")
+      -- execute("undo") here would cause "Press ENTER".
+      feed("u")
+      expect(default_text:gsub("Inc", "XInc"))
+      feed("u")
+      expect(default_text)
+
+      feed(":%s/tw/MO/g<enter>")
+      feed(":%s/MO/GO/g<enter>")
+      feed(":%s/GO/NO/g<enter>")
+      feed("u")
+      expect(default_text:gsub("tw", "GO"))
+      feed("u")
+      expect(default_text:gsub("tw", "MO"))
+      feed("u")
+
+      if case == "split" then
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      else
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      end
+    end
+    screen:detach()
+  end)
+
+  it('with undolevels=2', function()
+    local screen = Screen.new(20,10)
+
+    for _, case in pairs(cases) do
+      clear()
+      common_setup(screen, case, default_text)
+      execute("set undolevels=2")
+
+      feed("2GAx<esc>")
+      feed("Ay<esc>")
+      feed("Az<esc>")
+      feed(":%s/tw/AR<esc>")
+      -- using execute("undo") here will result in a "Press ENTER" prompt
+      feed("u")
+      expect(default_text:gsub("lines", "linesxy"))
+      feed("u")
+      expect(default_text:gsub("lines", "linesx"))
+      feed("u")
+      expect(default_text)
+      feed("u")
+
+      if case == "split" then
+        screen:expect([[
+          Inc substitution on |
+          two line^s           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      else
+        screen:expect([[
+          Inc substitution on |
+          two line^s           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      end
+
+      feed(":%s/tw/MO/g<enter>")
+      feed(":%s/MO/GO/g<enter>")
+      feed(":%s/GO/NO/g<enter>")
+      feed(":%s/NO/LO/g<enter>")
+      feed("u")
+      expect(default_text:gsub("tw", "NO"))
+      feed("u")
+      expect(default_text:gsub("tw", "GO"))
+      feed("u")
+      expect(default_text:gsub("tw", "MO"))
+      feed("u")
+
+      if case == "split" then
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      else
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      end
+      screen:detach()
+    end
+  end)
+
+  it('with undolevels=-1', function()
+    local screen = Screen.new(20,10)
+
+    for _, case in pairs(cases) do
+      clear()
+      common_setup(screen, case, default_text)
+
+      execute("set undolevels=-1")
+      feed(":%s/tw/MO/g<enter>")
+      -- using execute("undo") here will result in a "Press ENTER" prompt
+      feed("u")
+      if case == "split" then
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      else
+        screen:expect([[
+          Inc substitution on |
+          ^MOo lines           |
+                              |
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          {15:~                   }|
+          Already...st change |
+        ]])
+      end
+
+      -- repeat with an interrupted substitution
+      clear()
+      common_setup(screen, case, default_text)
+
+      execute("set undolevels=-1")
+      feed("1G")
+      feed("IL<esc>")
+      feed(":%s/tw/MO/g<esc>")
+      feed("u")
+
+      screen:expect([[
+        ^LInc substitution on|
+        two lines           |
+                            |
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        Already...st change |
+      ]])
+    end
+    screen:detach()
+  end)
+
+end)
+
+describe(":substitute, inccommand=split", function()
+  if helpers.pending_win32(pending) then return end
+
+  local screen = Screen.new(30,15)
+
+  before_each(function()
+    clear()
+    common_setup(screen, "split", default_text .. default_text)
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it("preserves 'modified' buffer flag", function()
+    execute("set nomodified")
+    feed(":%s/tw")
+    screen:expect([[
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name]                     }|
+      |2| two lines                 |
+      |4| two lines                 |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw^                        |
+    ]])
+    feed([[<C-\><C-N>]])  -- Cancel the :substitute command.
+    eq(0, eval("&modified"))
+  end)
+
+  it('shows split window when typing the pattern', function()
+    feed(":%s/tw")
+    screen:expect([[
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name] [+]                 }|
+      |2| two lines                 |
+      |4| two lines                 |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw^                        |
+    ]])
+  end)
+
+  it('shows preview with empty replacement', function()
+    feed(":%s/tw/")
+    screen:expect([[
+      Inc substitution on           |
+      o lines                       |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name] [+]                 }|
+      |2| o lines                   |
+      |4| o lines                   |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw/^                       |
+    ]])
+
+    feed("x")
+    screen:expect([[
+      Inc substitution on           |
+      xo lines                      |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name] [+]                 }|
+      |2| {12:x}o lines                  |
+      |4| {12:x}o lines                  |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw/x^                      |
+    ]])
+
+    feed("<bs>")
+    screen:expect([[
+      Inc substitution on           |
+      o lines                       |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name] [+]                 }|
+      |2| o lines                   |
+      |4| o lines                   |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw/^                       |
+    ]])
+
+  end)
+
+  it('shows split window when typing replacement', function()
+    feed(":%s/tw/XX")
+    screen:expect([[
+      Inc substitution on           |
+      XXo lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {11:[No Name] [+]                 }|
+      |2| {12:XX}o lines                 |
+      |4| {12:XX}o lines                 |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw/XX^                     |
+    ]])
+  end)
+
+  it('does not show split window for :s/', function()
+    feed("2gg")
+    feed(":s/tw")
+    wait()
+    screen:expect([[
+      Inc substitution on           |
+      two lines                     |
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      :s/tw^                         |
+    ]])
+  end)
+
+  it("'hlsearch' is active, 'cursorline' is not", function()
+    execute("set hlsearch cursorline")
+    feed("gg")
+
+    -- Assert that 'cursorline' is active.
+    screen:expect([[
+      {16:^Inc substitution on           }|
+      two lines                     |
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      :set hlsearch cursorline      |
+    ]])
+
+    feed(":%s/tw")
+    -- 'cursorline' is NOT active during preview.
+    screen:expect([[
+      Inc substitution on           |
+      {9:tw}o lines                     |
+      Inc substitution on           |
+      {9:tw}o lines                     |
+                                    |
+      {11:[No Name] [+]                 }|
+      |2| {9:tw}o lines                 |
+      |4| {9:tw}o lines                 |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/tw^                        |
+    ]])
+  end)
+
+  it('highlights the replacement text', function()
+    feed('ggO')
+    feed('M     M       M<esc>')
+    feed(':%s/M/123/g')
+    screen:expect([[
+      123     123       123         |
+      Inc substitution on           |
+      two lines                     |
+      Inc substitution on           |
+      two lines                     |
+      {11:[No Name] [+]                 }|
+      |1| {12:123}     {12:123}       {12:123}     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :%s/M/123/g^                   |
+    ]])
+  end)
+
+  it('actually replaces text', function()
+    feed(":%s/tw/XX/g<Enter>")
+
+    screen:expect([[
+      Inc substitution on           |
+      XXo lines                     |
+      Inc substitution on           |
+      ^XXo lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      :%s/tw/XX/g                   |
+    ]])
+  end)
+
+  it('shows correct line numbers with many lines', function()
+    feed("gg")
+    feed("2yy")
+    feed("2000p")
+    execute("1,1000s/tw/BB/g")
+
+    feed(":%s/tw/X")
+    screen:expect([[
+      BBo lines                     |
+      Inc substitution on           |
+      Xo lines                      |
+      Inc substitution on           |
+      Xo lines                      |
+      {11:[No Name] [+]                 }|
+      |1001| {12:X}o lines               |
+      |1003| {12:X}o lines               |
+      |1005| {12:X}o lines               |
+      |1007| {12:X}o lines               |
+      |1009| {12:X}o lines               |
+      |1011| {12:X}o lines               |
+      |1013| {12:X}o lines               |
+      {10:[Preview]                     }|
+      :%s/tw/X^                      |
+    ]])
+  end)
+
+  it('does not spam the buffer numbers', function()
+    -- The preview buffer is re-used (unless user deleted it), so buffer numbers
+    -- will not increase on each keystroke.
+    feed(":%s/tw/Xo/g")
+    -- Delete and re-type the g a few times.
+    feed("<BS>")
+    wait()
+    feed("g")
+    wait()
+    feed("<BS>")
+    wait()
+    feed("g")
+    wait()
+    feed("<CR>")
+    wait()
+    feed(":vs tmp<enter>")
+    eq(3, helpers.call('bufnr', '$'))
+  end)
+
+  it('works with the n flag', function()
+    feed(":%s/tw/Mix/n<Enter>")
+    screen:expect([[
+      Inc substitution on           |
+      two lines                     |
+      Inc substitution on           |
+      two lines                     |
+      ^                              |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      2 matches on 2 lines          |
+    ]])
+  end)
+
+  it("deactivates if 'redrawtime' is exceeded #5602", function()
+    -- Assert that 'inccommand' is ENABLED initially.
+    eq("split", eval("&inccommand"))
+    -- Set 'redrawtime' to minimal value, to ensure timeout is triggered.
+    execute("set redrawtime=1 nowrap")
+    -- Load a big file.
+    execute("silent edit! test/functional/fixtures/bigfile.txt")
+    -- Start :substitute with a slow pattern.
+    feed([[:%s/B.*N/x]])
+    wait()
+
+    -- Assert that 'inccommand' is DISABLED in cmdline mode.
+    eq("", eval("&inccommand"))
+    -- Assert that preview cleared (or never manifested).
+    screen:expect([[
+      0000;<control>;Cc;0;BN;;;;;N;N|
+      0001;<control>;Cc;0;BN;;;;;N;S|
+      0002;<control>;Cc;0;BN;;;;;N;S|
+      0003;<control>;Cc;0;BN;;;;;N;E|
+      0004;<control>;Cc;0;BN;;;;;N;E|
+      0005;<control>;Cc;0;BN;;;;;N;E|
+      0006;<control>;Cc;0;BN;;;;;N;A|
+      0007;<control>;Cc;0;BN;;;;;N;B|
+      0008;<control>;Cc;0;BN;;;;;N;B|
+      0009;<control>;Cc;0;S;;;;;N;CH|
+      000A;<control>;Cc;0;B;;;;;N;LI|
+      000B;<control>;Cc;0;S;;;;;N;LI|
+      000C;<control>;Cc;0;WS;;;;;N;F|
+      000D;<control>;Cc;0;B;;;;;N;CA|
+      :%s/B.*N/x^                    |
+    ]])
+
+    -- Assert that 'inccommand' is again ENABLED after leaving cmdline mode.
+    feed([[<C-\><C-N>]])
+    eq("split", eval("&inccommand"))
+  end)
+
+  it("clears preview if non-previewable command is edited #5585", function()
+    -- Put a non-previewable command in history.
+    execute("echo 'foo'")
+    -- Start an incomplete :substitute command.
+    feed(":1,2s/t/X")
+
+    screen:expect([[
+      Inc subsXitution on           |
+      Xwo lines                     |
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {11:[No Name] [+]                 }|
+      |1| Inc subs{12:X}itution on       |
+      |2| {12:X}wo lines                 |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {10:[Preview]                     }|
+      :1,2s/t/X^                     |
+    ]])
+
+    -- Select the previous command.
+    feed("<C-P>")
+    -- Assert that preview was cleared.
+    screen:expect([[
+      Inc substitution on           |
+      two lines                     |
+      Inc substitution on           |
+      two lines                     |
+                                    |
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      {15:~                             }|
+      :echo 'foo'^                   |
+    ]])
+  end)
+
+end)
+
+describe("inccommand=nosplit", function()
+  if helpers.pending_win32(pending) then return end
+
+  local screen = Screen.new(20,10)
+
+  before_each(function()
+    clear()
+    common_setup(screen, "nosplit", default_text .. default_text)
+  end)
+
+  after_each(function()
+    if screen then screen:detach() end
+  end)
+
+  it("works with :smagic, :snomagic", function()
+    execute("set hlsearch")
+    insert("Line *.3.* here")
+
+    feed(":%smagic/3.*/X")    -- start :smagic command
+    screen:expect([[
+      Inc substitution on |
+      two lines           |
+      Inc substitution on |
+      two lines           |
+      Line *.X            |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%smagic/3.*/X^      |
+    ]])
+
+
+    feed([[<C-\><C-N>]])      -- cancel
+    feed(":%snomagic/3.*/X")  -- start :snomagic command
+    screen:expect([[
+      Inc substitution on |
+      two lines           |
+      Inc substitution on |
+      two lines           |
+      Line *.X here       |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%snomagic/3.*/X^    |
+    ]])
+  end)
+
+  it('never shows preview buffer', function()
+    execute("set hlsearch")
+
+    feed(":%s/tw")
+    screen:expect([[
+      Inc substitution on |
+      {9:tw}o lines           |
+      Inc substitution on |
+      {9:tw}o lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%s/tw^              |
+    ]])
+
+    feed("/BM")
+    screen:expect([[
+      Inc substitution on |
+      BMo lines           |
+      Inc substitution on |
+      BMo lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%s/tw/BM^           |
+    ]])
+
+    feed("/")
+    screen:expect([[
+      Inc substitution on |
+      BMo lines           |
+      Inc substitution on |
+      BMo lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%s/tw/BM/^          |
+    ]])
+
+    feed("<enter>")
+    screen:expect([[
+      Inc substitution on |
+      BMo lines           |
+      Inc substitution on |
+      ^BMo lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :%s/tw/BM/          |
+    ]])
+  end)
+
+  it("clears preview if non-previewable command is edited", function()
+    -- Put a non-previewable command in history.
+    execute("echo 'foo'")
+    -- Start an incomplete :substitute command.
+    feed(":1,2s/t/X")
+
+    screen:expect([[
+      Inc subsXitution on |
+      Xwo lines           |
+      Inc substitution on |
+      two lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :1,2s/t/X^           |
+    ]])
+
+    -- Select the previous command.
+    feed("<C-P>")
+    -- Assert that preview was cleared.
+    screen:expect([[
+      Inc substitution on |
+      two lines           |
+      Inc substitution on |
+      two lines           |
+                          |
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      {15:~                   }|
+      :echo 'foo'^         |
+    ]])
+  end)
+end)
+
+describe(":substitute, 'inccommand' with a failing expression", function()
+  if helpers.pending_win32(pending) then return end
+
+  local screen = Screen.new(20,10)
+  local cases = { "", "split", "nosplit" }
+
+  local function refresh(case)
+    clear()
+    common_setup(screen, case, default_text)
+  end
+
+  it('in the pattern does nothing', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      execute("set inccommand=" .. case)
+      feed(":silent! %s/tw\\(/LARD/<enter>")
+      expect(default_text)
+    end
+  end)
+
+  it('in the replacement deletes the matches', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      local replacements = { "\\='LARD", "\\=xx_novar__xx" }
+
+      for _, repl in pairs(replacements) do
+        execute("set inccommand=" .. case)
+        feed(":silent! %s/tw/" .. repl .. "/<enter>")
+        expect(default_text:gsub("tw", ""))
+        execute("undo")
+      end
+    end
+  end)
+
+  it('in the range does not error #5912', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      feed(':100s/')
+
+      screen:expect([[
+        Inc substitution on |
+        two lines           |
+                            |
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        :100s/^              |
+      ]])
+
+      feed('<enter>')
+      screen:expect([[
+        Inc substitution on |
+        two lines           |
+        ^                    |
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {15:~                   }|
+        {14:E16: Invalid range}  |
+      ]])
+    end
+  end)
+
+end)
+
+describe("'inccommand' and :cnoremap", function()
+  local cases = { "",  "split", "nosplit" }
+
+  local function refresh(case)
+    clear()
+    common_setup(nil, case, default_text)
+  end
+
+  it('work with remapped characters', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      local command = "%s/lines/LINES/g"
+
+      for i = 1, string.len(command) do
+        local c = string.sub(command, i, i)
+        execute("cnoremap ".. c .. " " .. c)
+      end
+
+      execute(command)
+      expect([[
+        Inc substitution on
+        two LINES
+        ]])
+      end
+  end)
+
+  it('work when mappings move the cursor', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      execute("cnoremap ,S LINES/<left><left><left><left><left><left>")
+
+      feed(":%s/lines/,Sor three <enter>")
+      expect([[
+        Inc substitution on
+        two or three LINES
+        ]])
+
+      execute("cnoremap ;S /X/<left><left><left>")
+      feed(":%s/;SI<enter>")
+      expect([[
+        Xnc substitution on
+        two or three LXNES
+        ]])
+
+      execute("cnoremap ,T //Y/<left><left><left>")
+      feed(":%s,TX<enter>")
+      expect([[
+        Ync substitution on
+        two or three LYNES
+        ]])
+
+      execute("cnoremap ;T s//Z/<left><left><left>")
+      feed(":%;TY<enter>")
+      expect([[
+        Znc substitution on
+        two or three LZNES
+        ]])
+      end
+  end)
+
+  it('does not work with a failing mapping', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      execute("cnoremap <expr> x execute('bwipeout!')[-1].'x'")
+
+      feed(":%s/tw/tox<enter>")
+
+      -- error thrown b/c of the mapping
+      neq(nil, eval('v:errmsg'):find('^E523:'))
+      expect(default_text)
+    end
+  end)
+
+  it('work when temporarily moving the cursor', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      execute("cnoremap <expr> x cursor(1, 1)[-1].'x'")
+
+      feed(":%s/tw/tox/g<enter>")
+      expect(default_text:gsub("tw", "tox"))
+    end
+  end)
+
+  it("work when a mapping disables 'inccommand'", function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      execute("cnoremap <expr> x execute('set inccommand=')[-1]")
+
+      feed(":%s/tw/toxa/g<enter>")
+      expect(default_text:gsub("tw", "toa"))
+    end
+  end)
+
+  it('work with a complex mapping', function()
+    for _, case in pairs(cases) do
+      refresh(case)
+      source([[cnoremap x <C-\>eextend(g:, {'fo': getcmdline()})
+      \.fo<CR><C-c>:new<CR>:bw!<CR>:<C-r>=remove(g:, 'fo')<CR>x]])
+
+      feed(":%s/tw/tox")
+      feed("/<enter>")
+      expect(default_text:gsub("tw", "tox"))
+    end
+  end)
+
+end)
+
+describe("'inccommand' autocommands", function()
+  before_each(clear)
+
+  -- keys are events to be tested
+  -- values are arrays like
+  --    { open = { 1 }, close = { 2, 3} }
+  -- which would mean that during the test below the event fires for
+  -- buffer 1 when opening the preview window, and for buffers 2 and 3
+  -- when closing the preview window
+  local eventsExpected = {
+    BufAdd = {},
+    BufDelete = {},
+    BufEnter = {},
+    BufFilePost = {},
+    BufFilePre = {},
+    BufHidden = {},
+    BufLeave = {},
+    BufNew = {},
+    BufNewFile = {},
+    BufRead = {},
+    BufReadCmd = {},
+    BufReadPre = {},
+    BufUnload = {},
+    BufWinEnter = {},
+    BufWinLeave = {},
+    BufWipeout = {},
+    BufWrite = {},
+    BufWriteCmd = {},
+    BufWritePost = {},
+    Syntax = {},
+    FileType = {},
+    WinEnter = {},
+    WinLeave = {},
+    CmdwinEnter = {},
+    CmdwinLeave = {},
+  }
+
+  local function bufferlist(t)
+    local s = ""
+    for _, buffer in pairs(t) do
+      s = s .. ", " .. tostring(buffer)
+    end
+    return s
+  end
+
+  -- fill the table with default values
+  for event, _ in pairs(eventsExpected) do
+    eventsExpected[event].open = eventsExpected[event].open or {}
+    eventsExpected[event].close = eventsExpected[event].close or {}
+  end
+
+  local function register_autocmd(event)
+    meths.set_var(event .. "_fired", {})
+    execute("autocmd " .. event .. " * call add(g:" .. event .. "_fired, expand('<abuf>'))")
+  end
+
+  it('are not fired when splitting', function()
+    common_setup(nil, "split", default_text)
+
+    local eventsObserved = {}
+    for event, _ in pairs(eventsExpected) do
+      eventsObserved[event] = {}
+      register_autocmd(event)
+    end
+
+    feed(":%s/tw")
+
+    for event, _ in pairs(eventsExpected) do
+      eventsObserved[event].open = meths.get_var(event .. "_fired")
+      meths.set_var(event .. "_fired", {})
+    end
+
+    feed("/<enter>")
+
+    for event, _ in pairs(eventsExpected) do
+        eventsObserved[event].close = meths.get_var(event .. "_fired")
+    end
+
+    for event, _ in pairs(eventsExpected) do
+      eq(event .. bufferlist(eventsExpected[event].open),
+         event .. bufferlist(eventsObserved[event].open))
+      eq(event .. bufferlist(eventsExpected[event].close),
+         event .. bufferlist(eventsObserved[event].close))
+    end
+  end)
+
+end)
+
+describe("'inccommand' split windows", function()
+  if helpers.pending_win32(pending) then return end
+
+  local screen
+  local function refresh()
+    clear()
+    screen = Screen.new(40,30)
+    common_setup(screen, "split", default_text)
+  end
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  it('work after more splits', function()
+    refresh()
+
+    feed("gg")
+    execute("vsplit")
+    execute("split")
+    feed(":%s/tw")
+    screen:expect([[
+      Inc substitution on {10:|}Inc substitution on|
+      two lines           {10:|}two lines          |
+                          {10:|}                   |
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {11:[No Name] [+]       }{10:|}{15:~                  }|
+      Inc substitution on {10:|}{15:~                  }|
+      two lines           {10:|}{15:~                  }|
+                          {10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {10:[No Name] [+]        [No Name] [+]      }|
+      |2| two lines                           |
+                                              |
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {10:[Preview]                               }|
+      :%s/tw^                                  |
+    ]])
+
+    feed("<esc>")
+    execute("only")
+    execute("split")
+    execute("vsplit")
+
+    feed(":%s/tw")
+    screen:expect([[
+      Inc substitution on {10:|}Inc substitution on|
+      two lines           {10:|}two lines          |
+                          {10:|}                   |
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {15:~                   }{10:|}{15:~                  }|
+      {11:[No Name] [+]        }{10:[No Name] [+]      }|
+      Inc substitution on                     |
+      two lines                               |
+                                              |
+      {15:~                                       }|
+      {15:~                                       }|
+      {10:[No Name] [+]                           }|
+      |2| two lines                           |
+                                              |
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {15:~                                       }|
+      {10:[Preview]                               }|
+      :%s/tw^                                  |
+    ]])
+  end)
+
+  local settings = {
+  "splitbelow",
+  "splitright",
+  "noequalalways",
+  "equalalways eadirection=ver",
+  "equalalways eadirection=hor",
+  "equalalways eadirection=both",
+  }
+
+  it("are not affected by various settings", function()
+    for _, setting in pairs(settings) do
+      refresh()
+      execute("set " .. setting)
+
+      feed(":%s/tw")
+
+      screen:expect([[
+        Inc substitution on                     |
+        two lines                               |
+                                                |
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {11:[No Name] [+]                           }|
+        |2| two lines                           |
+                                                |
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {15:~                                       }|
+        {10:[Preview]                               }|
+        :%s/tw^                                  |
+      ]])
+    end
+  end)
+
+end)
diff --git a/test/functional/ui/input_spec.lua b/test/functional/ui/input_spec.lua
index 6f5cadaf81..cec19250d2 100644
--- a/test/functional/ui/input_spec.lua
+++ b/test/functional/ui/input_spec.lua
@@ -1,9 +1,11 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local clear, execute, nvim = helpers.clear, helpers.execute, helpers.nvim
 local feed, next_message, eq = helpers.feed, helpers.next_message, helpers.eq
 local expect = helpers.expect
 local Screen = require('test.functional.ui.screen')
 
+if helpers.pending_win32(pending) then return end
+
 describe('mappings', function()
   local cid
 
diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua
index 993bbd5b0e..17d949825a 100644
--- a/test/functional/ui/mouse_spec.lua
+++ b/test/functional/ui/mouse_spec.lua
@@ -1,42 +1,41 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
 local insert, execute = helpers.insert, helpers.execute
 local eq, funcs = helpers.eq, helpers.funcs
 
+if helpers.pending_win32(pending) then return end
+
 describe('Mouse input', function()
   local screen
 
-  local hlgroup_colors = {
-    NonText = Screen.colors.Blue,
-    Visual = Screen.colors.LightGrey
-  }
-
   before_each(function()
     clear()
     meths.set_option('mouse', 'a')
     meths.set_option('listchars', 'eol:$')
-    -- set mouset to very high value to ensure that even in valgrind/travis,
+    -- set mousetime to very high value to ensure that even in valgrind/travis,
     -- nvim will still pick multiple clicks
-    meths.set_option('mouset', 5000)
+    meths.set_option('mousetime', 5000)
     screen = Screen.new(25, 5)
     screen:attach()
     screen:set_default_attr_ids({
-      [1] = {background = hlgroup_colors.Visual},
+      [0] = {bold=true, foreground=Screen.colors.Blue},
+      [1] = {background = Screen.colors.LightGrey},
       [2] = {bold = true},
       [3] = {
-        foreground = hlgroup_colors.NonText,
-        background = hlgroup_colors.Visual,
+        foreground = Screen.colors.Blue,
+        background = Screen.colors.LightGrey,
         bold = true,
       },
+      [4] = {reverse = true},
+      [5] = {bold = true, reverse = true},
     })
-    screen:set_default_attr_ignore( {{bold=true, foreground=hlgroup_colors.NonText}} )
     feed('itesting<cr>mouse<cr>support and selection<esc>')
     screen:expect([[
       testing                  |
       mouse                    |
       support and selectio^n    |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
   end)
@@ -45,13 +44,13 @@ describe('Mouse input', function()
     screen:detach()
   end)
 
-  it('left click moves cursor', function()
+  it('single left click moves cursor', function()
     feed('<LeftMouse><2,1>')
     screen:expect([[
       testing                  |
       mo^use                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
     feed('<LeftMouse><0,0>')
@@ -59,17 +58,298 @@ describe('Mouse input', function()
       ^testing                  |
       mouse                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
   end)
 
+  it('double left click enters visual mode', function()
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    screen:expect([[
+      {1:testin}^g                  |
+      mouse                    |
+      support and selection    |
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]])
+  end)
+
+  it('triple left click enters visual line mode', function()
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    screen:expect([[
+      ^t{1:esting}{3: }                 |
+      mouse                    |
+      support and selection    |
+      {0:~                        }|
+      {2:-- VISUAL LINE --}        |
+    ]])
+  end)
+
+  it('quadruple left click enters visual block mode', function()
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    feed('<LeftMouse><0,0>')
+    feed('<LeftRelease><0,0>')
+    screen:expect([[
+      ^testing                  |
+      mouse                    |
+      support and selection    |
+      {0:~                        }|
+      {2:-- VISUAL BLOCK --}       |
+    ]])
+  end)
+
+  describe('tab drag', function()
+    before_each(function()
+      screen:set_default_attr_ids( {
+        [0] = {bold=true, foreground=Screen.colors.Blue},
+        tab  = { background=Screen.colors.LightGrey, underline=true },
+        sel  = { bold=true },
+        fill = { reverse=true }
+      })
+      screen.timeout = 15000
+    end)
+
+    it('in tabline on filler space moves tab to the end', function()
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><4,0>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><14,0>')
+      screen:expect([[
+        {tab: + bar }{sel: + foo }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+
+    it('in tabline to the left moves tab left', function()
+      if helpers.skip_fragile(pending,
+        os.getenv("TRAVIS") and (helpers.os_name() == "osx"
+          or os.getenv("CLANG_SANITIZER") == "ASAN_UBSAN"))  -- #4874
+      then
+        return
+      end
+
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><11,0>')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><6,0>')
+      screen:expect([[
+        {sel: + bar }{tab: + foo }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+
+    it('in tabline to the right moves tab right', function()
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><4,0>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><7,0>')
+      screen:expect([[
+        {tab: + bar }{sel: + foo }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+
+    it('out of tabline under filler space moves tab to the end', function()
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><4,0>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><4,1>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><14,1>')
+      screen:expect([[
+        {tab: + bar }{sel: + foo }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+
+    it('out of tabline to the left moves tab left', function()
+      if helpers.skip_fragile(pending,
+        os.getenv("TRAVIS") and (helpers.os_name() == "osx"
+          or os.getenv("CLANG_SANITIZER") == "ASAN_UBSAN"))  -- #4874
+      then
+        return
+      end
+
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><11,0>')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><11,1>')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><6,1>')
+      screen:expect([[
+        {sel: + bar }{tab: + foo }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+
+    it('out of tabline to the right moves tab right', function()
+      execute('%delete')
+      insert('this is foo')
+      execute('silent file foo | tabnew | file bar')
+      insert('this is bar')
+      screen:expect([[
+        {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
+        this is ba^r              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftMouse><4,0>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><4,1>')
+      screen:expect([[
+        {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+      feed('<LeftDrag><7,1>')
+      screen:expect([[
+        {tab: + bar }{sel: + foo }{fill:          }{tab:X}|
+        this is fo^o              |
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end)
+  end)
+
   describe('tabline', function()
-    local tab_attrs = {
-      tab  = { background=Screen.colors.LightGrey, underline=true },
-      sel  = { bold=true },
-      fill = { reverse=true }
-    }
+    before_each(function()
+      screen:set_default_attr_ids( {
+        [0] = {bold=true, foreground=Screen.colors.Blue},
+        tab  = { background=Screen.colors.LightGrey, underline=true },
+        sel  = { bold=true },
+        fill = { reverse=true }
+      })
+    end)
 
     it('left click in default tabline (position 4) switches to tab', function()
       execute('%delete')
@@ -79,18 +359,18 @@ describe('Mouse input', function()
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
         this is ba^r              |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
       feed('<LeftMouse><4,0>')
       screen:expect([[
         {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
         this is fo^o              |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
     end)
 
     it('left click in default tabline (position 24) closes tab', function()
@@ -102,18 +382,18 @@ describe('Mouse input', function()
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
         this is ba^r              |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
       feed('<LeftMouse><24,0>')
       screen:expect([[
         this is fo^o              |
-        ~                        |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
     end)
 
     it('double click in default tabline (position 4) opens new tab', function()
@@ -125,18 +405,18 @@ describe('Mouse input', function()
       screen:expect([[
         {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
         this is ba^r              |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
       feed('<2-LeftMouse><4,0>')
       screen:expect([[
         {sel:  Name] }{tab: + foo  + bar }{fill:  }{tab:X}|
         ^                         |
-        ~                        |
-        ~                        |
+        {0:~                        }|
+        {0:~                        }|
                                  |
-      ]], tab_attrs)
+      ]])
     end)
 
     describe('%@ label', function()
@@ -158,9 +438,9 @@ describe('Mouse input', function()
           {fill:test-test2               }|
           mouse                    |
           support and selectio^n    |
-          ~                        |
+          {0:~                        }|
                                    |
-        ]], tab_attrs)
+        ]])
         meths.set_var('reply', {})
       end)
 
@@ -216,7 +496,7 @@ describe('Mouse input', function()
       testing                  |
       mo^use                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
     feed('<LeftDrag><4,1>')
@@ -224,7 +504,7 @@ describe('Mouse input', function()
       testing                  |
       mo{1:us}^e                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
     feed('<LeftDrag><2,2>')
@@ -232,7 +512,7 @@ describe('Mouse input', function()
       testing                  |
       mo{1:use}{3: }                   |
       {1:su}^pport and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
     feed('<LeftDrag><0,0>')
@@ -240,18 +520,19 @@ describe('Mouse input', function()
       ^t{1:esting}{3: }                 |
       {1:mou}se                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
   end)
 
   it('left drag changes visual selection after tab click', function()
-    local tab_attrs = {
+    screen:set_default_attr_ids({
+      [0] = {bold=true, foreground=Screen.colors.Blue},
       tab  = { background=Screen.colors.LightGrey, underline=true },
       sel  = { bold=true },
       fill = { reverse=true },
       vis  = { background=Screen.colors.LightGrey }
-    }
+    })
     execute('silent file foo | tabnew | file bar')
     insert('this is bar')
     execute('tabprevious')  -- go to first tab
@@ -259,27 +540,27 @@ describe('Mouse input', function()
       {sel: + foo }{tab: + bar }{fill:          }{tab:X}|
       mouse                    |
       support and selectio^n    |
-      ~                        |
+      {0:~                        }|
                                |
-    ]], tab_attrs)
+    ]])
     feed('<LeftMouse><10,0><LeftRelease>')  -- go to second tab
     helpers.wait()
     feed('<LeftMouse><0,1>')
     screen:expect([[
       {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
       ^this is bar              |
-      ~                        |
-      ~                        |
+      {0:~                        }|
+      {0:~                        }|
                                |
-    ]], tab_attrs)
+    ]])
     feed('<LeftDrag><4,1>')
     screen:expect([[
       {tab: + foo }{sel: + bar }{fill:          }{tab:X}|
       {vis:this}^ is bar              |
-      ~                        |
-      ~                        |
+      {0:~                        }|
+      {0:~                        }|
       {sel:-- VISUAL --}             |
-    ]], tab_attrs)
+    ]])
   end)
 
   it('two clicks will select the word and enter VISUAL', function()
@@ -288,7 +569,7 @@ describe('Mouse input', function()
       testing                  |
       mouse                    |
       {1:suppor}^t and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
   end)
@@ -299,7 +580,7 @@ describe('Mouse input', function()
       testing                  |
       mouse                    |
       {1:su}^p{1:port and selection}{3: }   |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL LINE --}        |
     ]])
   end)
@@ -310,7 +591,7 @@ describe('Mouse input', function()
       testing                  |
       mouse                    |
       su^pport and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL BLOCK --}       |
     ]])
   end)
@@ -321,7 +602,7 @@ describe('Mouse input', function()
       ^testing                  |
       mouse                    |
       support and selection    |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
     feed('<RightMouse><2,2>')
@@ -329,7 +610,7 @@ describe('Mouse input', function()
       {1:testing}{3: }                 |
       {1:mouse}{3: }                   |
       {1:su}^pport and selection    |
-      ~                        |
+      {0:~                        }|
       {2:-- VISUAL --}             |
     ]])
   end)
@@ -361,73 +642,71 @@ describe('Mouse input', function()
     ]])
     screen:try_resize(53, 14)
     execute('sp', 'vsp')
-    screen:set_default_attr_ignore( {{bold=true, foreground=hlgroup_colors.NonText},
-            {reverse=true}, {bold=true, reverse=true}} )
     screen:expect([[
-      lines                     |lines                     |
-      to                        |to                        |
-      test                      |test                      |
-      mouse scrolling           |mouse scrolling           |
-      ^                          |                          |
-      ~                         |~                         |
-      [No Name] [+]              [No Name] [+]             |
+      lines                     {4:|}lines                     |
+      to                        {4:|}to                        |
+      test                      {4:|}test                      |
+      mouse scrolling           {4:|}mouse scrolling           |
+      ^                          {4:|}                          |
+      {0:~                         }{4:|}{0:~                         }|
+      {5:[No Name] [+]              }{4:[No Name] [+]             }|
       to                                                   |
       test                                                 |
       mouse scrolling                                      |
                                                            |
-      ~                                                    |
-      [No Name] [+]                                        |
+      {0:~                                                    }|
+      {4:[No Name] [+]                                        }|
       :vsp                                                 |
     ]])
     feed('<MouseUp><0,0>')
     screen:expect([[
-      mouse scrolling           |lines                     |
-      ^                          |to                        |
-      ~                         |test                      |
-      ~                         |mouse scrolling           |
-      ~                         |                          |
-      ~                         |~                         |
-      [No Name] [+]              [No Name] [+]             |
+      mouse scrolling           {4:|}lines                     |
+      ^                          {4:|}to                        |
+      {0:~                         }{4:|}test                      |
+      {0:~                         }{4:|}mouse scrolling           |
+      {0:~                         }{4:|}                          |
+      {0:~                         }{4:|}{0:~                         }|
+      {5:[No Name] [+]              }{4:[No Name] [+]             }|
       to                                                   |
       test                                                 |
       mouse scrolling                                      |
                                                            |
-      ~                                                    |
-      [No Name] [+]                                        |
+      {0:~                                                    }|
+      {4:[No Name] [+]                                        }|
                                                            |
     ]])
     feed('<MouseDown><27,0>')
     screen:expect([[
-      mouse scrolling           |text                      |
-      ^                          |with                      |
-      ~                         |many                      |
-      ~                         |lines                     |
-      ~                         |to                        |
-      ~                         |test                      |
-      [No Name] [+]              [No Name] [+]             |
+      mouse scrolling           {4:|}text                      |
+      ^                          {4:|}with                      |
+      {0:~                         }{4:|}many                      |
+      {0:~                         }{4:|}lines                     |
+      {0:~                         }{4:|}to                        |
+      {0:~                         }{4:|}test                      |
+      {5:[No Name] [+]              }{4:[No Name] [+]             }|
       to                                                   |
       test                                                 |
       mouse scrolling                                      |
                                                            |
-      ~                                                    |
-      [No Name] [+]                                        |
+      {0:~                                                    }|
+      {4:[No Name] [+]                                        }|
                                                            |
     ]])
     feed('<MouseDown><27,7><MouseDown>')
     screen:expect([[
-      mouse scrolling           |text                      |
-      ^                          |with                      |
-      ~                         |many                      |
-      ~                         |lines                     |
-      ~                         |to                        |
-      ~                         |test                      |
-      [No Name] [+]              [No Name] [+]             |
+      mouse scrolling           {4:|}text                      |
+      ^                          {4:|}with                      |
+      {0:~                         }{4:|}many                      |
+      {0:~                         }{4:|}lines                     |
+      {0:~                         }{4:|}to                        |
+      {0:~                         }{4:|}test                      |
+      {5:[No Name] [+]              }{4:[No Name] [+]             }|
       Inserting                                            |
       text                                                 |
       with                                                 |
       many                                                 |
       lines                                                |
-      [No Name] [+]                                        |
+      {4:[No Name] [+]                                        }|
                                                            |
     ]])
   end)
@@ -440,7 +719,7 @@ describe('Mouse input', function()
                                |
                                |
       bbbbbbbbbbbbbbb^b         |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
 
@@ -449,7 +728,7 @@ describe('Mouse input', function()
                                |
                                |
       n bbbbbbbbbbbbbbbbbbb^b   |
-      ~                        |
+      {0:~                        }|
                                |
     ]])
 
@@ -458,8 +737,326 @@ describe('Mouse input', function()
       g                        |
                                |
       ^t and selection bbbbbbbbb|
-      ~                        |
+      {0:~                        }|
                                |
     ]])
   end)
+
+  describe('on concealed text', function()
+    -- Helpful for reading the test expectations:
+    -- :match Error /\^/
+
+    before_each(function()
+      screen:try_resize(25, 7)
+      screen:set_default_attr_ids({
+        [0] = {bold=true, foreground=Screen.colors.Blue},
+        c = { foreground = Screen.colors.LightGrey, background = Screen.colors.DarkGray },
+      })
+      feed('ggdG')
+
+      execute('set concealcursor=n')
+      execute('set nowrap')
+      execute('syntax match NonText "\\<amet\\>" conceal')
+      execute('syntax match NonText "\\cs\\|g." conceal cchar=X')
+      execute('syntax match NonText "\\%(lo\\|cl\\)." conceal')
+      execute('syntax match NonText "Lo" conceal cchar=Y')
+
+      insert([[
+      Lorem ipsum dolor sit amet, consetetur sadipscing elitr.
+      Stet clita kasd gubergren, no sea takimata sanctus est.
+      ]])
+
+      feed('gg')
+    end)
+
+    it('(level 1) click on non-wrapped lines', function()
+      execute('let &conceallevel=1', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        {c:^Y}rem ip{c:X}um do{c: } {c:X}it {c: }, con|
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en, no|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><1,0>')
+      screen:expect([[
+        {c:Y}^rem ip{c:X}um do{c: } {c:X}it {c: }, con|
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en, no|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,0>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do{c: } {c:^X}it {c: }, con|
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en, no|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do{c: } {c:X}it {c: }, con|
+        {c:X}tet {c: }ta ka{c:X}d {c:X}^ber{c:X}en, no|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end) -- level 1 - non wrapped
+
+    it('(level 1) click on wrapped lines', function()
+      execute('let &conceallevel=1', 'let &wrap=1', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        {c:^Y}rem ip{c:X}um do{c: } {c:X}it {c: }     |
+        , con{c:X}etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en    |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><6,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do{c: } {c:X}it {c: }     |
+        , con{c:X}^etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en    |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do{c: } {c:X}it {c: }     |
+        , con{c:X}etetur {c:X}a^dip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet {c: }ta ka{c:X}d {c:X}ber{c:X}en    |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,3>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do{c: } {c:X}it {c: }     |
+        , con{c:X}etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet {c: }ta ka{c:X}d {c:X}^ber{c:X}en    |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+    end) -- level 1 - wrapped
+
+
+    it('(level 2) click on non-wrapped lines', function()
+      execute('let &conceallevel=2', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        {c:^Y}rem ip{c:X}um do {c:X}it , con{c:X}e|
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en, no |
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><1,0>')
+      screen:expect([[
+        {c:Y}^rem ip{c:X}um do {c:X}it , con{c:X}e|
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en, no |
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,0>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do {c:X}^it , con{c:X}e|
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en, no |
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do {c:X}it , con{c:X}e|
+        {c:X}tet ta ka{c:X}d {c:X}b^er{c:X}en, no |
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end) -- level 2 - non wrapped
+
+    it('(level 2) click on wrapped lines', function()
+      execute('let &conceallevel=2', 'let &wrap=1', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        {c:^Y}rem ip{c:X}um do {c:X}it        |
+        , con{c:X}etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en     |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><6,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do {c:X}it        |
+        , con{c:X}^etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en     |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do {c:X}it        |
+        , con{c:X}etetur {c:X}a^dip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet ta ka{c:X}d {c:X}ber{c:X}en     |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,3>')
+      screen:expect([[
+        {c:Y}rem ip{c:X}um do {c:X}it        |
+        , con{c:X}etetur {c:X}adip{c:X}cin{c:X}  |
+        elitr.                   |
+        {c:X}tet ta ka{c:X}d {c:X}b^er{c:X}en     |
+        , no {c:X}ea takimata {c:X}anctu{c:X}|
+         e{c:X}t.                    |
+                                 |
+      ]])
+    end) -- level 2 - wrapped
+
+
+    it('(level 3) click on non-wrapped lines', function()
+      execute('let &conceallevel=3', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        ^rem ipum do it , conetetu|
+        tet ta kad beren, no ea t|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><1,0>')
+      screen:expect([[
+        r^em ipum do it , conetetu|
+        tet ta kad beren, no ea t|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,0>')
+      screen:expect([[
+        rem ipum do it ^, conetetu|
+        tet ta kad beren, no ea t|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        rem ipum do it , conetetu|
+        tet ta kad bere^n, no ea t|
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]])
+    end) -- level 3 - non wrapped
+
+    it('(level 3) click on wrapped lines', function()
+      execute('let &conceallevel=3', 'let &wrap=1', 'echo')
+
+      feed('<esc><LeftMouse><0,0>')
+      screen:expect([[
+        ^rem ipum do it           |
+        , conetetur adipcin      |
+        elitr.                   |
+        tet ta kad beren         |
+        , no ea takimata anctu   |
+         et.                     |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><6,1>')
+      screen:expect([[
+        rem ipum do it           |
+        , cone^tetur adipcin      |
+        elitr.                   |
+        tet ta kad beren         |
+        , no ea takimata anctu   |
+         et.                     |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,1>')
+      screen:expect([[
+        rem ipum do it           |
+        , conetetur adi^pcin      |
+        elitr.                   |
+        tet ta kad beren         |
+        , no ea takimata anctu   |
+         et.                     |
+                                 |
+      ]])
+
+      feed('<esc><LeftMouse><15,3>')
+      screen:expect([[
+        rem ipum do it           |
+        , conetetur adipcin      |
+        elitr.                   |
+        tet ta kad bere^n         |
+        , no ea takimata anctu   |
+         et.                     |
+                                 |
+      ]])
+    end) -- level 3 - wrapped
+  end)
 end)
diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua
new file mode 100644
index 0000000000..33086a61b1
--- /dev/null
+++ b/test/functional/ui/output_spec.lua
@@ -0,0 +1,68 @@
+local session = require('test.functional.helpers')(after_each)
+local child_session = require('test.functional.terminal.helpers')
+
+if session.pending_win32(pending) then return end
+
+describe("shell command :!", function()
+  local screen
+  before_each(function()
+    session.clear()
+    screen = child_session.screen_setup(0, '["'..session.nvim_prog..
+      '", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile"]')
+    screen:expect([[
+      {1: }                                                 |
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
+                                                        |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+
+  after_each(function()
+    child_session.feed_data("\3") -- Ctrl-C
+    screen:detach()
+  end)
+
+  it("displays output without LF/EOF. #4646 #4569 #3772", function()
+    -- NOTE: We use a child nvim (within a :term buffer)
+    --       to avoid triggering a UI flush.
+    child_session.feed_data(":!printf foo; sleep 200\n")
+    screen:expect([[
+      {4:~                                                 }|
+      {4:~                                                 }|
+      {5:[No Name]                                         }|
+      :!printf foo; sleep 200                           |
+                                                        |
+      foo                                               |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+
+  it("throttles shell-command output greater than ~10KB", function()
+    if os.getenv("TRAVIS") and session.os_name() == "osx" then
+      pending("[Unreliable on Travis macOS.]", function() end)
+      return
+    end
+
+    screen.timeout = 20000  -- Avoid false failure on slow systems.
+    child_session.feed_data(
+      ":!for i in $(seq 2 3000); do echo XXXXXXXXXX $i; done\n")
+
+    -- If we observe any line starting with a dot, then throttling occurred.
+    screen:expect("\n.", nil, nil, nil, true)
+
+    -- Final chunk of output should always be displayed, never skipped.
+    -- (Throttling is non-deterministic, this test is merely a sanity check.)
+    screen:expect([[
+      XXXXXXXXXX 2996                                   |
+      XXXXXXXXXX 2997                                   |
+      XXXXXXXXXX 2998                                   |
+      XXXXXXXXXX 2999                                   |
+      XXXXXXXXXX 3000                                   |
+      {10:Press ENTER or type command to continue}{1: }          |
+      {3:-- TERMINAL --}                                    |
+    ]])
+  end)
+end)
diff --git a/test/functional/ui/quickfix_spec.lua b/test/functional/ui/quickfix_spec.lua
new file mode 100644
index 0000000000..29b28fe9f0
--- /dev/null
+++ b/test/functional/ui/quickfix_spec.lua
@@ -0,0 +1,196 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, feed, meths = helpers.clear, helpers.feed, helpers.meths
+local insert, execute = helpers.insert, helpers.execute
+
+
+describe('quickfix selection highlight', function()
+  local screen
+
+  before_each(function()
+    clear()
+
+    screen = Screen.new(25, 10)
+    screen:attach()
+    screen:set_default_attr_ids({
+      [1] = { bold = true, foreground = Screen.colors.Blue },
+      [2] = {reverse = true},
+      [3] = {foreground = Screen.colors.Brown},
+      [4] = {bold = true, reverse = true},
+      [5] = {background = Screen.colors.Green},
+      [6] = {foreground = Screen.colors.Brown, background = Screen.colors.Green},
+      [7] = {background = Screen.colors.Red},
+      [8] = {foreground = Screen.colors.Brown, background = Screen.colors.Red},
+      [9] = {background = Screen.colors.Fuchsia},
+      [10] = {foreground = Screen.colors.Red, background = Screen.colors.Fuchsia},
+      [11] = {foreground = Screen.colors.Red},
+      [12] = {foreground = Screen.colors.Brown, background = Screen.colors.Fuchsia},
+    })
+
+    meths.set_option('errorformat', '%m %l')
+    execute('syntax on')
+    execute('highlight Search guibg=Green')
+
+    insert([[
+    Line 1
+    Line 2
+    Line 3
+    Line 4
+    Line 5
+    ]])
+
+    execute('cad')
+    feed('gg')
+
+    screen:expect([[
+      ^Line 1                   |
+      Line 2                   |
+      Line 3                   |
+      Line 4                   |
+      Line 5                   |
+                               |
+      {1:~                        }|
+      {1:~                        }|
+      {1:~                        }|
+      :cad                     |
+    ]])
+  end)
+
+  it('using default Search highlight group', function()
+    execute('copen')
+
+    screen:expect([[
+      Line 1                   |
+      {2:[No Name] [+]            }|
+      {5:^|}{6:1}{5:| Line                 }|
+      |{3:2}| Line                 |
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+
+    execute('cnext')
+
+    screen:expect([[
+      Line 1                   |
+      {2:[No Name] [+]            }|
+      |{3:1}| Line                 |
+      {5:^|}{6:2}{5:| Line                 }|
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :cnext                   |
+    ]])
+  end)
+
+  it('using QuickFixLine highlight group', function()
+    execute('highlight QuickFixLine guibg=Red')
+
+    execute('copen')
+
+    screen:expect([[
+      Line 1                   |
+      {2:[No Name] [+]            }|
+      {7:^|}{8:1}{7:| Line                 }|
+      |{3:2}| Line                 |
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+
+    execute('cnext')
+
+    screen:expect([[
+      Line 1                   |
+      {2:[No Name] [+]            }|
+      |{3:1}| Line                 |
+      {7:^|}{8:2}{7:| Line                 }|
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :cnext                   |
+    ]])
+  end)
+
+  it('combines with CursorLine', function()
+    execute('set cursorline')
+    execute('highlight QuickFixLine guifg=Red')
+    execute('highlight CursorLine guibg=Fuchsia')
+
+    execute('copen')
+
+    screen:expect([[
+      {9:Line 1                   }|
+      {2:[No Name] [+]            }|
+      {10:^|1| Line                 }|
+      |{3:2}| Line                 |
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+
+    feed('j')
+
+    screen:expect([[
+      {9:Line 1                   }|
+      {2:[No Name] [+]            }|
+      {11:|1| Line                 }|
+      {9:^|}{12:2}{9:| Line                 }|
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+  end)
+
+  it('QuickFixLine background takes precedence over CursorLine', function()
+    execute('set cursorline')
+    execute('highlight QuickFixLine guibg=Red')
+    execute('highlight CursorLine guibg=Fuchsia')
+
+    execute('copen')
+
+    screen:expect([[
+      {9:Line 1                   }|
+      {2:[No Name] [+]            }|
+      {7:^|}{8:1}{7:| Line                 }|
+      |{3:2}| Line                 |
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+
+    feed('j')
+
+    screen:expect([[
+      {9:Line 1                   }|
+      {2:[No Name] [+]            }|
+      {7:|}{8:1}{7:| Line                 }|
+      {9:^|}{12:2}{9:| Line                 }|
+      |{3:3}| Line                 |
+      |{3:4}| Line                 |
+      |{3:5}| Line                 |
+      ||                       |
+      {4:[Quickfix List]          }|
+      :copen                   |
+    ]])
+  end)
+end)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 6372cbe081..54f43387dc 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -1,31 +1,17 @@
--- This module contains the Screen class, a complete Nvim screen implementation
--- designed for functional testing. The goal is to provide a simple and
--- intuitive API for verifying screen state after a set of actions.
+-- This module contains the Screen class, a complete Nvim UI implementation
+-- designed for functional testing (verifying screen state, in particular).
 --
--- The screen class exposes a single assertion method, "Screen:expect". This
--- method takes a string representing the expected screen state and an optional
--- set of attribute identifiers for checking highlighted characters(more on
--- this later).
---
--- The string passed to "expect" will be processed according to these rules:
---
---  - Each line of the string represents and is matched individually against
---    a screen row.
---  - The entire string is stripped of common indentation
---  - Expected screen rows are stripped of the last character. The last
---    character should be used to write pipes(|) that make clear where the
---    screen ends
---  - The last line is stripped, so the string must have (row count + 1)
---    lines.
+-- Screen:expect() takes a string representing the expected screen state and an
+-- optional set of attribute identifiers for checking highlighted characters.
 --
 -- Example usage:
 --
 --     local screen = Screen.new(25, 10)
---     -- attach the screen to the current Nvim instance
+--     -- Attach the screen to the current Nvim instance.
 --     screen:attach()
---     --enter insert mode and type some text
+--     -- Enter insert-mode and type some text.
 --     feed('ihello screen')
---     -- declare an expectation for the eventual screen state
+--     -- Assert the expected screen state.
 --     screen:expect([[
 --       hello screen             |
 --       ~                        |
@@ -39,31 +25,19 @@
 --       -- INSERT --             |
 --     ]]) -- <- Last line is stripped
 --
--- Since screen updates are received asynchronously, "expect" is actually
--- specifying the eventual screen state. This is how "expect" works: It will
--- start the event loop with a timeout of 5 seconds. Each time it receives an
--- update the expected state will be checked against the updated state.
---
--- If the expected state matches the current state, the event loop will be
--- stopped and "expect" will return.  If the timeout expires, the last match
--- error will be reported and the test will fail.
+-- Since screen updates are received asynchronously, expect() actually specifies
+-- the _eventual_ screen state.
 --
--- If the second argument is passed to "expect", the screen rows will be
--- transformed before being matched against the string lines. The
--- transformation rule is simple: Each substring "S" composed with characters
--- having the exact same set of attributes will be substituted by "{K:S}",
--- where K is a key associated the attribute set via the second argument of
--- "expect".
--- If a transformation table is present, unexpected attribute sets in the final
--- state is considered an error. To make testing simpler, a list of attribute
--- sets that should be ignored can be passed as a third argument. Alternatively,
--- this third argument can be "true" to indicate that all unexpected attribute
--- sets should be ignored.
+-- This is how expect() works:
+--  * It starts the event loop with a timeout.
+--  * Each time it receives an update it checks that against the expected state.
+--    * If the expected state matches the current state, the event loop will be
+--      stopped and expect() will return.
+--    * If the timeout expires, the last match error will be reported and the
+--      test will fail.
 --
--- To illustrate how this works, let's say that in the above example we wanted
--- to assert that the "-- INSERT --" string is highlighted with the bold
--- attribute(which normally is), here's how the call to "expect" should look
--- like:
+-- Continuing the above example, say we want to assert that "-- INSERT --" is
+-- highlighted with the bold attribute. The expect() call should look like this:
 --
 --     NonText = Screen.colors.Blue
 --     screen:expect([[
@@ -81,32 +55,24 @@
 --
 -- In this case "b" is a string associated with the set composed of one
 -- attribute: bold. Note that since the {b:} markup is not a real part of the
--- screen, the delimiter(|) had to be moved right. Also, the highlighting of the
--- NonText markers (~) is ignored in this test.
+-- screen, the delimiter "|" moved to the right. Also, the highlighting of the
+-- NonText markers "~" is ignored in this test.
+--
+-- Tests will often share a group of attribute sets to expect(). Those can be
+-- defined at the beginning of a test:
 --
--- Multiple expect:s will likely share a group of attribute sets to test.
--- Therefore these could be specified at the beginning of a test like this:
 --    NonText = Screen.colors.Blue
 --    screen:set_default_attr_ids( {
 --      [1] = {reverse = true, bold = true},
 --      [2] = {reverse = true}
 --    })
 --    screen:set_default_attr_ignore( {{}, {bold=true, foreground=NonText}} )
--- These can be overridden for a specific expect expression, by passing
--- different sets as parameters.
 --
--- To help writing screen tests, there is a utility function
--- "screen:snapshot_util()", that can be placed in a test file at any point an
--- "expect(...)" should be. It will wait a short amount of time and then dump
--- the current state of the screen, in the form of an "expect(..)" expression
--- that would match it exactly. "snapshot_util" optionally also take the
--- transformation and ignore set as parameters, like expect, or uses the default
--- set. It will generate a larger attribute transformation set, if needed.
--- To generate a text-only test without highlight checks,
--- use `screen:snapshot_util({},true)`
-
-local helpers = require('test.functional.helpers')
-local request, run = helpers.request, helpers.run
+-- To help write screen tests, see Screen:snapshot_util().
+-- To debug screen tests, see Screen:redraw_debug().
+
+local helpers = require('test.functional.helpers')(nil)
+local request, run, uimeths = helpers.request, helpers.run, helpers.uimeths
 local dedent = helpers.dedent
 
 local Screen = {}
@@ -126,7 +92,7 @@ end
 do
   local spawn, nvim_prog = helpers.spawn, helpers.nvim_prog
   local session = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', '--embed'})
-  local status, rv = session:request('vim_get_color_map')
+  local status, rv = session:request('nvim_get_color_map')
   if not status then
     print('failed to get color map')
     os.exit(1)
@@ -170,9 +136,9 @@ function Screen.new(width, height)
     update_menu = false,
     visual_bell = false,
     suspended = false,
+    mode = 'normal',
     _default_attr_ids = nil,
     _default_attr_ignore = nil,
-    _mode = 'normal',
     _mouse_enabled = true,
     _attrs = {},
     _cursor = {
@@ -192,22 +158,39 @@ function Screen:set_default_attr_ignore(attr_ignore)
   self._default_attr_ignore = attr_ignore
 end
 
-function Screen:attach(rgb)
-  if rgb == nil then
-    rgb = true
+function Screen:attach(options)
+  if options == nil then
+    options = {rgb=true}
   end
-  request('ui_attach', self._width, self._height, rgb)
+  uimeths.attach(self._width, self._height, options)
 end
 
 function Screen:detach()
-  request('ui_detach')
+  uimeths.detach()
 end
 
 function Screen:try_resize(columns, rows)
-  request('ui_try_resize', columns, rows)
+  uimeths.try_resize(columns, rows)
+  -- Give ourselves a chance to _handle_resize, which requires using
+  -- self.sleep() (for the resize notification) rather than run()
+  self:sleep(0.1)
 end
 
-function Screen:expect(expected, attr_ids, attr_ignore)
+-- Asserts that `expected` eventually matches the screen state.
+--
+-- expected:    Expected screen state (string). Each line represents a screen
+--              row. Last character of each row (typically "|") is stripped.
+--              Common indentation is stripped.
+-- attr_ids:    Expected text attributes. Screen rows are transformed according
+--              to this table, as follows: each substring S composed of
+--              characters having the same attributes will be substituted by
+--              "{K:S}", where K is a key in `attr_ids`. Any unexpected
+--              attributes in the final state are an error.
+-- attr_ignore: Ignored text attributes, or `true` to ignore all.
+-- condition:   Function asserting some arbitrary condition.
+-- any:         true: Succeed if `expected` matches ANY screen line(s).
+--              false (default): `expected` must match screen exactly.
+function Screen:expect(expected, attr_ids, attr_ignore, condition, any)
   -- remove the last line and dedent
   expected = dedent(expected:gsub('\n[ ]+$', ''))
   local expected_rows = {}
@@ -216,26 +199,52 @@ function Screen:expect(expected, attr_ids, attr_ignore)
     row = row:sub(1, #row - 1)
     table.insert(expected_rows, row)
   end
+  if not any then
+    assert(self._height == #expected_rows,
+      "Expected screen state's row count(" .. #expected_rows
+      .. ') differs from configured height(' .. self._height .. ') of Screen.')
+  end
   local ids = attr_ids or self._default_attr_ids
   local ignore = attr_ignore or self._default_attr_ignore
   self:wait(function()
+    if condition ~= nil then
+      local status, res = pcall(condition)
+      if not status then
+        return tostring(res)
+      end
+    end
     local actual_rows = {}
     for i = 1, self._height do
       actual_rows[i] = self:_row_repr(self._rows[i], ids, ignore)
     end
-    for i = 1, self._height do
-      if expected_rows[i] ~= actual_rows[i] then
-        local msg_expected_rows = {}
-        for j = 1, #expected_rows do
-          msg_expected_rows[j] = expected_rows[j]
-        end
-        msg_expected_rows[i] = '*' .. msg_expected_rows[i]
-        actual_rows[i] = '*' .. actual_rows[i]
+
+    if any then
+      -- Search for `expected` anywhere in the screen lines.
+      local actual_screen_str = table.concat(actual_rows, '\n')
+      if nil == string.find(actual_screen_str, expected) then
         return (
-          'Row ' .. tostring(i) .. ' didn\'t match.\n'
-          .. 'Expected:\n|' .. table.concat(msg_expected_rows, '|\n|') .. '|\n'
-          .. 'Actual:\n|' .. table.concat(actual_rows, '|\n|') .. '|'
-        )
+          'Failed to match any screen lines.\n'
+          .. 'Expected (anywhere): "' .. expected .. '"\n'
+          .. 'Actual:\n  |' .. table.concat(actual_rows, '|\n  |') .. '|\n\n')
+      end
+    else
+      -- `expected` must match the screen lines exactly.
+      for i = 1, self._height do
+        if expected_rows[i] ~= actual_rows[i] then
+          local msg_expected_rows = {}
+          for j = 1, #expected_rows do
+            msg_expected_rows[j] = expected_rows[j]
+          end
+          msg_expected_rows[i] = '*' .. msg_expected_rows[i]
+          actual_rows[i] = '*' .. actual_rows[i]
+          return (
+            'Row ' .. tostring(i) .. ' did not match.\n'
+            ..'Expected:\n  |'..table.concat(msg_expected_rows, '|\n  |')..'|\n'
+            ..'Actual:\n  |'..table.concat(actual_rows, '|\n  |')..'|\n\n'..[[
+To print the expect() call that would assert the current screen state, use
+screen:snaphot_util(). In case of non-deterministic failures, use
+screen:redraw_debug() to show all intermediate screen states.  ]])
+        end
       end
     end
   end)
@@ -290,6 +299,10 @@ If everything else fails, use Screen:redraw_debug to help investigate what is
   end
 end
 
+function Screen:sleep(ms)
+  pcall(function() self:wait(function() return "error" end, ms) end)
+end
+
 function Screen:_redraw(updates)
   for _, update in ipairs(updates) do
     -- print('--')
@@ -297,12 +310,20 @@ function Screen:_redraw(updates)
     local method = update[1]
     for i = 2, #update do
       local handler = self['_handle_'..method]
-      handler(self, unpack(update[i]))
+      if handler ~= nil then
+        handler(self, unpack(update[i]))
+      else
+        self._on_event(method, update[i])
+      end
     end
     -- print(self:_current_screen())
   end
 end
 
+function Screen:set_on_event_handler(callback)
+  self._on_event = callback
+end
+
 function Screen:_handle_resize(width, height)
   local rows = {}
   for _ = 1, height do
@@ -354,8 +375,9 @@ function Screen:_handle_mouse_off()
 end
 
 function Screen:_handle_mode_change(mode)
-  assert(mode == 'insert' or mode == 'replace' or mode == 'normal')
-  self._mode = mode
+  assert(mode == 'insert' or mode == 'replace'
+        or mode == 'normal' or mode == 'cmdline')
+  self.mode = mode
 end
 
 function Screen:_handle_set_scroll_region(top, bot, left, right)
@@ -499,9 +521,13 @@ function Screen:_current_screen()
   return table.concat(rv, '\n')
 end
 
+-- Generates tests. Call it where Screen:expect() would be. Waits briefly, then
+-- dumps the current screen state in the form of Screen:expect().
+-- Use snapshot_util({},true) to generate a text-only (no attributes) test.
+--
+-- @see Screen:redraw_debug()
 function Screen:snapshot_util(attrs, ignore)
-  -- util to generate screen test
-  pcall(function() self:wait(function() return "error" end, 250) end)
+  self:sleep(250)
   self:print_snapshot(attrs, ignore)
 end
 
@@ -529,7 +555,7 @@ function Screen:print_snapshot(attrs, ignore)
   if attrs == nil then
     attrs = {}
     if self._default_attr_ids ~= nil then
-      for i, a in ipairs(self._default_attr_ids) do
+      for i, a in pairs(self._default_attr_ids) do
         attrs[i] = a
       end
     end
@@ -587,7 +613,7 @@ function Screen:_pprint_attrs(attrs)
     return table.concat(items, ", ")
 end
 
-function backward_find_meaningful(tbl, from)  -- luacheck: ignore
+local function backward_find_meaningful(tbl, from)  -- luacheck: no unused
   for i = from or #tbl, 1, -1 do
     if tbl[i] ~= ' ' then
       return i + 1
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index a4545eeff0..0824585717 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -1,8 +1,10 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local spawn, set_session, clear = helpers.spawn, helpers.set_session, helpers.clear
 local feed, execute = helpers.feed, helpers.execute
 local insert = helpers.insert
+local eq = helpers.eq
+local eval = helpers.eval
 
 describe('Initial screen', function()
   local screen
@@ -15,7 +17,10 @@ describe('Initial screen', function()
     set_session(screen_nvim)
     screen = Screen.new()
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=255}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true, reverse=true},
+    } )
   end)
 
   after_each(function()
@@ -25,18 +30,18 @@ describe('Initial screen', function()
   it('is the default initial screen', function()
       screen:expect([[
       ^                                                     |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      ~                                                    |
-      [No Name]                                            |
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {0:~                                                    }|
+      {1:[No Name]                                            }|
                                                            |
     ]])
   end)
@@ -49,7 +54,16 @@ describe('Screen', function()
     clear()
     screen = Screen.new()
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=255}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true, reverse=true},
+      [2] = {bold=true},
+      [3] = {reverse=true},
+      [4] = {background = Screen.colors.LightGrey, underline = true},
+      [5] = {background = Screen.colors.LightGrey, underline = true, bold = true, foreground = Screen.colors.Fuchsia},
+      [6] = {bold = true, foreground = Screen.colors.Fuchsia},
+      [7] = {bold = true, foreground = Screen.colors.SeaGreen},
+    } )
   end)
 
   after_each(function()
@@ -147,18 +161,18 @@ describe('Screen', function()
         execute('sp')
         screen:expect([[
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          [No Name]                                            |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {1:[No Name]                                            }|
                                                                |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          [No Name]                                            |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {3:[No Name]                                            }|
           :sp                                                  |
         ]])
       end)
@@ -168,18 +182,18 @@ describe('Screen', function()
         execute('resize 8')
         screen:expect([[
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          [No Name]                                            |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {1:[No Name]                                            }|
                                                                |
-          ~                                                    |
-          ~                                                    |
-          [No Name]                                            |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {3:[No Name]                                            }|
           :resize 8                                            |
         ]])
       end)
@@ -187,36 +201,36 @@ describe('Screen', function()
       it('horizontal and vertical', function()
         execute('sp', 'vsp', 'vsp')
         screen:expect([[
-          ^                    |                |               |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          [No Name]            [No Name]        [No Name]      |
+          ^                    {3:|}                {3:|}               |
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {1:[No Name]            }{3:[No Name]        [No Name]      }|
                                                                |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          [No Name]                                            |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {3:[No Name]                                            }|
                                                                |
         ]])
         insert('hello')
         screen:expect([[
-          hell^o               |hello           |hello          |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          ~                   |~               |~              |
-          [No Name] [+]        [No Name] [+]    [No Name] [+]  |
+          hell^o               {3:|}hello           {3:|}hello          |
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+          {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
           hello                                                |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          [No Name] [+]                                        |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {3:[No Name] [+]                                        }|
                                                                |
         ]])
       end)
@@ -228,55 +242,55 @@ describe('Screen', function()
       execute('sp', 'vsp', 'vsp')
       insert('hello')
       screen:expect([[
-        hell^o               |hello           |hello          |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        [No Name] [+]        [No Name] [+]    [No Name] [+]  |
+        hell^o               {3:|}hello           {3:|}hello          |
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         hello                                                |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        [No Name] [+]                                        |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       execute('tabnew')
       insert('hello2')
       feed('h')
       screen:expect([[
-         4+ [No Name]  + [No Name]                          X|
+        {4: }{5:4}{4:+ [No Name] }{2: + [No Name] }{3:                         }{4:X}|
         hell^o2                                               |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
                                                              |
       ]])
       execute('tabprevious')
       screen:expect([[
-         4+ [No Name]  + [No Name]                          X|
-        hell^o               |hello           |hello          |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        ~                   |~               |~              |
-        [No Name] [+]        [No Name] [+]    [No Name] [+]  |
+        {2: }{6:4}{2:+ [No Name] }{4: + [No Name] }{3:                         }{4:X}|
+        hell^o               {3:|}hello           {3:|}hello          |
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {0:~                   }{3:|}{0:~               }{3:|}{0:~              }|
+        {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         hello                                                |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        [No Name] [+]                                        |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
     end)
@@ -289,17 +303,17 @@ describe('Screen', function()
         line 1                                               |
         line 2                                               |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        -- INSERT --                                         |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {2:-- INSERT --}                                         |
       ]])
     end)
   end)
@@ -314,17 +328,17 @@ describe('Screen', function()
       screen:expect([[
         0123^456                                              |
         789                                                  |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :set ruler                         1,5           All |
       ]])
     end)
@@ -335,18 +349,18 @@ describe('Screen', function()
       feed(':ls')
       screen:expect([[
                                                              |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :ls^                                                  |
       ]])
     end)
@@ -354,20 +368,20 @@ describe('Screen', function()
     it('execute command with multi-line output', function()
       feed(':ls<cr>')
       screen:expect([[
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :ls                                                  |
           1 %a   "[No Name]"                    line 1       |
-        Press ENTER or type command to continue^              |
+        {7:Press ENTER or type command to continue}^              |
       ]])
       feed('<cr>') --  skip the "Press ENTER..." state or tests will hang
     end)
@@ -392,19 +406,19 @@ describe('Screen', function()
       ]])
       execute('sp', 'vsp', 'vsp')
       screen:expect([[
-        and                 |and             |and            |
-        clearing            |clearing        |clearing       |
-        in                  |in              |in             |
-        split               |split           |split          |
-        windows             |windows         |windows        |
-        ^                    |                |               |
-        [No Name] [+]        [No Name] [+]    [No Name] [+]  |
+        and                 {3:|}and             {3:|}and            |
+        clearing            {3:|}clearing        {3:|}clearing       |
+        in                  {3:|}in              {3:|}in             |
+        split               {3:|}split           {3:|}split          |
+        windows             {3:|}windows         {3:|}windows        |
+        ^                    {3:|}                {3:|}               |
+        {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
     end)
@@ -412,121 +426,121 @@ describe('Screen', function()
     it('only affects the current scroll region', function()
       feed('6k')
       screen:expect([[
-        ^scrolling           |and             |and            |
-        and                 |clearing        |clearing       |
-        clearing            |in              |in             |
-        in                  |split           |split          |
-        split               |windows         |windows        |
-        windows             |                |               |
-        [No Name] [+]        [No Name] [+]    [No Name] [+]  |
+        ^scrolling           {3:|}and             {3:|}and            |
+        and                 {3:|}clearing        {3:|}clearing       |
+        clearing            {3:|}in              {3:|}in             |
+        in                  {3:|}split           {3:|}split          |
+        split               {3:|}windows         {3:|}windows        |
+        windows             {3:|}                {3:|}               |
+        {1:[No Name] [+]        }{3:[No Name] [+]    [No Name] [+]  }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('<c-w>l')
       screen:expect([[
-        scrolling           |and                 |and        |
-        and                 |clearing            |clearing   |
-        clearing            |in                  |in         |
-        in                  |split               |split      |
-        split               |windows             |windows    |
-        windows             |^                    |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}and                 {3:|}and        |
+        and                 {3:|}clearing            {3:|}clearing   |
+        clearing            {3:|}in                  {3:|}in         |
+        in                  {3:|}split               {3:|}split      |
+        split               {3:|}windows             {3:|}windows    |
+        windows             {3:|}^                    {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('gg')
       screen:expect([[
-        scrolling           |^Inserting           |and        |
-        and                 |text                |clearing   |
-        clearing            |with                |in         |
-        in                  |many                |split      |
-        split               |lines               |windows    |
-        windows             |to                  |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}^Inserting           {3:|}and        |
+        and                 {3:|}text                {3:|}clearing   |
+        clearing            {3:|}with                {3:|}in         |
+        in                  {3:|}many                {3:|}split      |
+        split               {3:|}lines               {3:|}windows    |
+        windows             {3:|}to                  {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('7j')
       screen:expect([[
-        scrolling           |with                |and        |
-        and                 |many                |clearing   |
-        clearing            |lines               |in         |
-        in                  |to                  |split      |
-        split               |test                |windows    |
-        windows             |^scrolling           |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}with                {3:|}and        |
+        and                 {3:|}many                {3:|}clearing   |
+        clearing            {3:|}lines               {3:|}in         |
+        in                  {3:|}to                  {3:|}split      |
+        split               {3:|}test                {3:|}windows    |
+        windows             {3:|}^scrolling           {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('2j')
       screen:expect([[
-        scrolling           |lines               |and        |
-        and                 |to                  |clearing   |
-        clearing            |test                |in         |
-        in                  |scrolling           |split      |
-        split               |and                 |windows    |
-        windows             |^clearing            |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}lines               {3:|}and        |
+        and                 {3:|}to                  {3:|}clearing   |
+        clearing            {3:|}test                {3:|}in         |
+        in                  {3:|}scrolling           {3:|}split      |
+        split               {3:|}and                 {3:|}windows    |
+        windows             {3:|}^clearing            {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('5k')
       screen:expect([[
-        scrolling           |^lines               |and        |
-        and                 |to                  |clearing   |
-        clearing            |test                |in         |
-        in                  |scrolling           |split      |
-        split               |and                 |windows    |
-        windows             |clearing            |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}^lines               {3:|}and        |
+        and                 {3:|}to                  {3:|}clearing   |
+        clearing            {3:|}test                {3:|}in         |
+        in                  {3:|}scrolling           {3:|}split      |
+        split               {3:|}and                 {3:|}windows    |
+        windows             {3:|}clearing            {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
       feed('k')
       screen:expect([[
-        scrolling           |^many                |and        |
-        and                 |lines               |clearing   |
-        clearing            |to                  |in         |
-        in                  |test                |split      |
-        split               |scrolling           |windows    |
-        windows             |and                 |           |
-        [No Name] [+]        [No Name] [+]        <Name] [+] |
+        scrolling           {3:|}^many                {3:|}and        |
+        and                 {3:|}lines               {3:|}clearing   |
+        clearing            {3:|}to                  {3:|}in         |
+        in                  {3:|}test                {3:|}split      |
+        split               {3:|}scrolling           {3:|}windows    |
+        windows             {3:|}and                 {3:|}           |
+        {3:[No Name] [+]        }{1:[No Name] [+]        }{3:<Name] [+] }|
         clearing                                             |
         in                                                   |
         split                                                |
         windows                                              |
                                                              |
-        [No Name] [+]                                        |
+        {3:[No Name] [+]                                        }|
                                                              |
       ]])
     end)
@@ -541,18 +555,17 @@ describe('Screen', function()
     it('rebuilds the whole screen', function()
       screen:expect([[
         resize^                   |
-        ~                        |
-        ~                        |
-        ~                        |
-        -- INSERT --             |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        {2:-- INSERT --}             |
       ]])
     end)
 
-    -- FIXME this has some race conditions that cause it to fail periodically
-    pending('has minimum width/height values', function()
+    it('has minimum width/height values', function()
       screen:try_resize(1, 1)
       screen:expect([[
-        -- INS^ERT --|
+        {2:-- INS^ERT --}|
                     |
       ]])
       feed('<esc>:ls')
@@ -562,4 +575,125 @@ describe('Screen', function()
       ]])
     end)
   end)
+
+  describe('mode change', function()
+    before_each(function()
+      screen:try_resize(25, 5)
+    end)
+
+    it('works in normal mode', function()
+      screen:expect([[
+        ^                         |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]],nil,nil,function ()
+        eq("normal", screen.mode)
+      end)
+    end)
+
+    it('works in insert mode', function()
+      feed('i')
+      screen:expect([[
+        ^                         |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        {2:-- INSERT --}             |
+      ]],nil,nil,function ()
+        eq("insert", screen.mode)
+      end)
+
+      feed('word<esc>')
+      screen:expect([[
+        wor^d                     |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]], nil, nil, function ()
+        eq("normal", screen.mode)
+      end)
+    end)
+
+    it('works in replace mode', function()
+      feed('R')
+      screen:expect([[
+        ^                         |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        {2:-- REPLACE --}            |
+      ]], nil, nil, function ()
+        eq("replace", screen.mode)
+      end)
+
+      feed('word<esc>')
+      screen:expect([[
+        wor^d                     |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]], nil, nil, function ()
+        eq("normal", screen.mode)
+      end)
+    end)
+
+    it('works in cmdline mode', function()
+      feed(':')
+      screen:expect([[
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        :^                        |
+      ]],nil,nil,function ()
+        eq("cmdline", screen.mode)
+      end)
+
+      feed('<esc>/')
+      screen:expect([[
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        /^                        |
+      ]],nil,nil,function ()
+        eq("cmdline", screen.mode)
+      end)
+
+
+      feed('<esc>?')
+      screen:expect([[
+                                 |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+        ?^                        |
+      ]],nil,nil,function ()
+        eq("cmdline", screen.mode)
+      end)
+
+      feed('<esc>')
+      screen:expect([[
+        ^                         |
+        {0:~                        }|
+        {0:~                        }|
+        {0:~                        }|
+                                 |
+      ]],nil,nil,function ()
+        eq("normal", screen.mode)
+      end)
+    end)
+  end)
+
+  it('nvim_ui_attach() handles very large width/height #2180', function()
+    screen:detach()
+    screen = Screen.new(999, 999)
+    screen:attach()
+    eq(999, eval('&lines'))
+    eq(999, eval('&columns'))
+  end)
 end)
diff --git a/test/functional/ui/searchhl_spec.lua b/test/functional/ui/searchhl_spec.lua
index e4217abcfe..3914648e8f 100644
--- a/test/functional/ui/searchhl_spec.lua
+++ b/test/functional/ui/searchhl_spec.lua
@@ -1,28 +1,24 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
 local execute = helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('search highlighting', function()
   local screen
   local colors = Screen.colors
-  local hl_colors = {
-    NonText = colors.Blue,
-    Search = colors.Yellow,
-    Message = colors.Red,
-  }
 
   before_each(function()
     clear()
     screen = Screen.new(40, 7)
     screen:attach()
-    --ignore highligting of ~-lines
     screen:set_default_attr_ids( {
-      [1] = {background = hl_colors.Search},
-      [2] = {reverse = true},
-      [3] = {foreground = hl_colors.Message},
+      [1] = {bold=true, foreground=Screen.colors.Blue},
+      [2] = {background = colors.Yellow}, -- Search
+      [3] = {reverse = true},
+      [4] = {foreground = colors.Red}, -- Message
     })
-    screen:set_default_attr_ignore( {{bold=true, foreground=hl_colors.NonText}} )
   end)
 
   it('is disabled by ":set nohlsearch"', function()
@@ -32,10 +28,10 @@ describe('search highlighting', function()
     screen:expect([[
       some ^text                               |
       more text                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /text                                   |
     ]])
   end)
@@ -51,35 +47,35 @@ describe('search highlighting', function()
     -- 'hlsearch' is enabled by default. #2859
     feed("gg/text<cr>")
     screen:expect([[
-        some {1:^text}                             |
-        more {1:text}stuff                        |
-        stupid{1:texttext}stuff                   |
-        a {1:text} word                           |
+        some {2:^text}                             |
+        more {2:text}stuff                        |
+        stupid{2:texttext}stuff                   |
+        a {2:text} word                           |
                                               |
-      ~                                       |
+      {1:~                                       }|
       /text                                   |
     ]])
 
     -- overlapping matches not allowed
     feed("3nx")
     screen:expect([[
-        some {1:text}                             |
-        more {1:text}stuff                        |
-        stupid{1:text}^extstuff                    |
-        a {1:text} word                           |
+        some {2:text}                             |
+        more {2:text}stuff                        |
+        stupid{2:text}^extstuff                    |
+        a {2:text} word                           |
                                               |
-      ~                                       |
+      {1:~                                       }|
       /text                                   |
     ]])
 
     feed("ggn*") -- search for entire word
     screen:expect([[
-        some {1:text}                             |
+        some {2:text}                             |
         more textstuff                        |
         stupidtextextstuff                    |
-        a {1:^text} word                           |
+        a {2:^text} word                           |
                                               |
-      ~                                       |
+      {1:~                                       }|
       /\<text\>                               |
     ]])
 
@@ -90,7 +86,7 @@ describe('search highlighting', function()
         stupidtextextstuff                    |
         a ^text word                           |
                                               |
-      ~                                       |
+      {1:~                                       }|
       :nohlsearch                             |
     ]])
   end)
@@ -104,45 +100,45 @@ describe('search highlighting', function()
     ]])
     feed("gg/li")
     screen:expect([[
-        the first {2:li}ne                        |
+        the first {3:li}ne                        |
         in a little file                      |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /li^                                     |
     ]])
 
     feed("t")
     screen:expect([[
         the first line                        |
-        in a {2:lit}tle file                      |
+        in a {3:lit}tle file                      |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /lit^                                    |
     ]])
 
     feed("<cr>")
     screen:expect([[
         the first line                        |
-        in a {1:^lit}tle file                      |
+        in a {2:^lit}tle file                      |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /lit                                    |
     ]])
 
     feed("/fir")
     screen:expect([[
-        the {2:fir}st line                        |
-        in a {1:lit}tle file                      |
+        the {3:fir}st line                        |
+        in a {2:lit}tle file                      |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /fir^                                    |
     ]])
 
@@ -150,11 +146,11 @@ describe('search highlighting', function()
     feed("<esc>/ttle")
     screen:expect([[
         the first line                        |
-        in a {1:li}{2:ttle} file                      |
+        in a {2:li}{3:ttle} file                      |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /ttle^                                   |
     ]])
   end)
@@ -168,12 +164,12 @@ describe('search highlighting', function()
 
     feed("gg/mat/e")
     screen:expect([[
-      not the {2:mat}ch you're looking for        |
+      not the {3:mat}ch you're looking for        |
       the match is here                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /mat/e^                                  |
     ]])
 
@@ -181,22 +177,22 @@ describe('search highlighting', function()
     feed("<esc>2/mat/e")
     screen:expect([[
       not the match you're looking for        |
-      the {2:mat}ch is here                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      the {3:mat}ch is here                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /mat/e^                                  |
     ]])
 
     feed("<cr>")
     screen:expect([[
-      not the {1:mat}ch you're looking for        |
-      the {1:ma^t}ch is here                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      not the {2:mat}ch you're looking for        |
+      the {2:ma^t}ch is here                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       /mat/e                                  |
     ]])
   end)
@@ -207,28 +203,37 @@ describe('search highlighting', function()
     feed('/line\\na<cr>')
     screen:expect([[
                                               |
-      a  repeated {1:^line}                        |
-      {1:a}  repeated {1:line}                        |
-      {1:a}  repeated {1:line}                        |
-      {1:a}  repeated line                        |
-      ~                                       |
-      {3:search hit BOTTOM, continuing at TOP}    |
+      a  repeated {2:^line}                        |
+      {2:a}  repeated {2:line}                        |
+      {2:a}  repeated {2:line}                        |
+      {2:a}  repeated line                        |
+      {1:~                                       }|
+      {4:search hit BOTTOM, continuing at TOP}    |
     ]])
 
     -- it redraws rows above the changed one
     feed('4Grb')
     screen:expect([[
                                               |
-      a  repeated {1:line}                        |
-      {1:a}  repeated line                        |
-      ^b  repeated {1:line}                        |
-      {1:a}  repeated line                        |
-      ~                                       |
-      {3:search hit BOTTOM, continuing at TOP}    |
+      a  repeated {2:line}                        |
+      {2:a}  repeated line                        |
+      ^b  repeated {2:line}                        |
+      {2:a}  repeated line                        |
+      {1:~                                       }|
+      {4:search hit BOTTOM, continuing at TOP}    |
     ]])
   end)
 
   it('works with matchadd and syntax', function()
+    screen:set_default_attr_ids( {
+        [1] = {bold=true, foreground=Screen.colors.Blue},
+        [2] = {background = colors.Yellow},
+        [3] = {reverse = true},
+        [4] = {foreground = colors.Red},
+        [5] = {bold = true, background = colors.Green},
+        [6] = {italic = true, background = colors.Magenta},
+        [7] = {bold = true, background = colors.Yellow},
+    } )
     execute('set hlsearch')
     insert([[
       very special text
@@ -243,25 +248,23 @@ describe('search highlighting', function()
     -- is used (and matches with lower priorities are not combined)
     execute("/ial te")
     screen:expect([[
-        very {4:spec^ial}{1: te}{5:xt}                     |
+        very {5:spec^ial}{2: te}{6:xt}                     |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      {3:search hit BOTTOM, continuing at TOP}    |
-    ]], {[1] = {background = hl_colors.Search}, [2] = {reverse = true},
-    [3] = {foreground = hl_colors.Message}, [4] = {bold = true, background =
-    colors.Green}, [5] = {italic = true, background = colors.Magenta}})
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {4:search hit BOTTOM, continuing at TOP}    |
+    ]])
 
     execute("call clearmatches()")
     screen:expect([[
-        very spec{1:^ial te}xt                     |
+        very spec{2:^ial te}xt                     |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       :call clearmatches()                    |
     ]])
 
@@ -269,16 +272,14 @@ describe('search highlighting', function()
     -- nonconflicting attributes are combined
     execute("syntax keyword MyGroup special")
     screen:expect([[
-        very {4:spec}{5:^ial}{1: te}xt                     |
+        very {5:spec}{7:^ial}{2: te}xt                     |
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       :syntax keyword MyGroup special         |
-    ]], {[1] = {background =  hl_colors.Search}, [2] = {reverse = true},
-    [3] = {foreground = hl_colors.Message}, [4] = {bold = true,
-    background = colors.Green}, [5] = {bold = true, background = hl_colors.Search}})
+    ]])
 
   end)
 end)
diff --git a/test/functional/ui/sign_spec.lua b/test/functional/ui/sign_spec.lua
index c32a7b9381..d02fc83809 100644
--- a/test/functional/ui/sign_spec.lua
+++ b/test/functional/ui/sign_spec.lua
@@ -1,7 +1,9 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
 
+if helpers.pending_win32(pending) then return end
+
 describe('Signs', function()
   local screen
 
@@ -9,7 +11,11 @@ describe('Signs', function()
     clear()
     screen = Screen.new()
     screen:attach()
-    screen:set_default_attr_ignore( {{}, {bold=true, foreground=255}} ) 
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {background = Screen.colors.Yellow},
+      [2] = {foreground = Screen.colors.DarkBlue, background = Screen.colors.Grey},
+    } )
   end)
 
   after_each(function()
@@ -25,19 +31,19 @@ describe('Signs', function()
       execute('sign place 2 line=3 name=piet buffer=1')
       execute('sign place 3 line=1 name=pietx buffer=1')
       screen:expect([[
-        >!a                                                  |
-          b                                                  |
-        >>c                                                  |
-          ^                                                   |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
-          ~                                                  |
+        {1:>!}a                                                  |
+        {2:  }b                                                  |
+        {1:>>}c                                                  |
+        {2:  }^                                                   |
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
+        {2:  }{0:~                                                  }|
         :sign place 3 line=1 name=pietx buffer=1             |
       ]])
     end)
diff --git a/test/functional/ui/syntax_conceal_spec.lua b/test/functional/ui/syntax_conceal_spec.lua
index 66ea779011..ee3e4fa32a 100644
--- a/test/functional/ui/syntax_conceal_spec.lua
+++ b/test/functional/ui/syntax_conceal_spec.lua
@@ -1,22 +1,26 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
 local insert = helpers.insert
 
+if helpers.pending_win32(pending) then return end
+
 describe('Screen', function()
-  local screen  
+  local screen
 
-  before_each(function() 
+  before_each(function()
     clear()
     screen = Screen.new(nil,10)
     screen:attach()
-    screen:set_default_attr_ignore( {{bold=true, foreground=255}} )
-    screen:set_default_attr_ids( {{foreground = Screen.colors.LightGrey, background = Screen.colors.DarkGray}} )
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=Screen.colors.Blue},
+      [1] = {foreground = Screen.colors.LightGrey, background = Screen.colors.DarkGray}
+    } )
   end)
-  
+
   after_each(function()
     screen:detach()
-  end)  
+  end)
 
   describe("match and conceal", function()
 
@@ -46,13 +50,13 @@ describe('Screen', function()
             {1:∧}                                                    |
             {1:∧}                                                    |
             ^                                                     |
-            ~                                                    |
-            ~                                                    |
+            {0:~                                                    }|
+            {0:~                                                    }|
             :syn match dAmpersand '[&][&]' conceal cchar=∧       |
           ]])
       end)
 
-      it('double characters and move the cursor one line up.', function() 
+      it('double characters and move the cursor one line up.', function()
         feed("k")
         screen:expect([[
           {1:∧}                                                    |
@@ -62,8 +66,8 @@ describe('Screen', function()
           {1:∧}                                                    |
           ^&&                                                   |
                                                                |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn match dAmpersand '[&][&]' conceal cchar=∧       |
         ]])
       end)
@@ -78,13 +82,13 @@ describe('Screen', function()
           {1:∧}                                                    |
           {1:∧}                                                    |
                                                                |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn match dAmpersand '[&][&]' conceal cchar=∧       |
         ]])
       end)
 
-      it('double characters and move the cursor to the second line in the file.', function() 
+      it('double characters and move the cursor to the second line in the file.', function()
         feed("ggj")
         screen:expect([[
           {1:∧}                                                    |
@@ -94,13 +98,13 @@ describe('Screen', function()
           {1:∧}                                                    |
           {1:∧}                                                    |
                                                                |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn match dAmpersand '[&][&]' conceal cchar=∧       |
         ]])
       end)
 
-      it('double characters and then move the cursor to the beginning of the file and back to the end of the file.', function() 
+      it('double characters and then move the cursor to the beginning of the file and back to the end of the file.', function()
         feed("ggG")
         screen:expect([[
           {1:∧}                                                    |
@@ -110,13 +114,13 @@ describe('Screen', function()
           {1:∧}                                                    |
           {1:∧}                                                    |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn match dAmpersand '[&][&]' conceal cchar=∧       |
         ]])
       end)
-    end) -- multiple 
-      
+    end) -- multiple
+
     it("keyword instances in initially in the document.", function()
       feed("2ilambda<cr><ESC>")
       execute("let &conceallevel=1")
@@ -125,36 +129,36 @@ describe('Screen', function()
         {1:λ}                                                    |
         {1:λ}                                                    |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :syn keyword kLambda lambda conceal cchar=λ          |
       ]])
     end) -- Keyword
 
     describe("regions in the document", function()
 
-      before_each(function() 
+      before_each(function()
         feed("2")
         insert("<r> a region of text </r>\n")
         execute("let &conceallevel=1")
       end)
-      
-      it('initially and conceal it.', function()  
+
+      it('initially and conceal it.', function()
         execute("syn region rText start='<r>' end='</r>' conceal cchar=R")
         screen:expect([[
           {1:R}                                                    |
           {1:R}                                                    |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
                                                                |
         ]])
       end)
@@ -167,18 +171,18 @@ describe('Screen', function()
           {1: } a region of text {1:-}                                 |
           {1: } a region of text {1:-}                                 |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
                                                                |
         ]])
       end)
-       
+
       it('that are nested and conceal the nested region\'s start and end tags.', function()
-        execute("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")  
+        execute("syn region rText contains=rText matchgroup=rMatch start='<r>' end='</r>' concealends cchar=-")
         insert("<r> A region with <r> a nested <r> nested region.</r> </r> </r>\n")
         screen:expect([[
           {1: } a region of text {1:-}                                 |
@@ -186,18 +190,18 @@ describe('Screen', function()
           {1: } A region with {1: } a nested {1: } nested region.{1:-}         |
            {1:-} {1:-}                                                 |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
                                                                |
         ]])
       end)
     end) -- regions in the document
 
     describe("a region of text", function()
-      before_each(function() 
-        execute("syntax conceal on") 
+      before_each(function()
+        execute("syntax conceal on")
         feed("2")
         insert("<r> a region of text </r>\n")
         execute("syn region rText start='<r>' end='</r>' cchar=-")
@@ -208,12 +212,12 @@ describe('Screen', function()
           {1:-}                                                    |
           {1:-}                                                    |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn region rText start='<r>' end='</r>' cchar=-     |
         ]])
       end)
@@ -229,10 +233,10 @@ describe('Screen', function()
           <i> italian text </i>                                |
           <i> italian text </i>                                |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn region iText start='<i>' end='</i>' cchar=*     |
         ]])
         execute("syntax conceal on")
@@ -243,27 +247,27 @@ describe('Screen', function()
           {1:*}                                                    |
           {1:*}                                                    |
           ^                                                     |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
-          ~                                                    |
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
+          {0:~                                                    }|
           :syn region iText start='<i>' end='</i>' cchar=*     |
         ]])
       end)
     end) -- a region of text (implicit concealing)
   end) -- match and conceal
 
-  describe("let the conceal level be", function() 
+  describe("let the conceal level be", function()
     before_each(function()
-      insert("// No Conceal\n") 
-      insert('"Conceal without a cchar"\n') 
-      insert("+ With cchar\n\n") 
+      insert("// No Conceal\n")
+      insert('"Conceal without a cchar"\n')
+      insert("+ With cchar\n\n")
       execute("syn match noConceal '^//.*$'")
       execute("syn match concealNoCchar '\".\\{-}\"$' conceal")
       execute("syn match concealWCchar '^+.\\{-}$' conceal cchar=C")
     end)
-    
-    it("0. No concealing.", function()    
+
+    it("0. No concealing.", function()
       execute("let &conceallevel=0")
       screen:expect([[
         // No Conceal                                        |
@@ -271,14 +275,14 @@ describe('Screen', function()
         + With cchar                                         |
                                                              |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :let &conceallevel=0                                 |
       ]])
     end)
-    
+
     it("1. Conceal using cchar or reference listchars.", function()
       execute("let &conceallevel=1")
       screen:expect([[
@@ -287,14 +291,14 @@ describe('Screen', function()
         {1:C}                                                    |
                                                              |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :let &conceallevel=1                                 |
       ]])
     end)
-    
+
     it("2. Hidden unless cchar is set.", function()
       execute("let &conceallevel=2")
       screen:expect([[
@@ -303,15 +307,15 @@ describe('Screen', function()
         {1:C}                                                    |
                                                              |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :let &conceallevel=2                                 |
       ]])
     end)
-    
-    it("3. Hide all concealed text.", function() 
+
+    it("3. Hide all concealed text.", function()
       execute("let &conceallevel=3")
       screen:expect([[
         // No Conceal                                        |
@@ -319,10 +323,10 @@ describe('Screen', function()
                                                              |
                                                              |
         ^                                                     |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
-        ~                                                    |
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
+        {0:~                                                    }|
         :let &conceallevel=3                                 |
       ]])
     end)
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index c57d4abcbf..6a6dc99c3d 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -1,8 +1,10 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, execute = helpers.clear, helpers.feed, helpers.execute
 local funcs = helpers.funcs
 
+if helpers.pending_win32(pending) then return end
+
 describe("'wildmode'", function()
   local screen
 
@@ -39,7 +41,7 @@ describe('command line completion', function()
     clear()
     screen = Screen.new(40, 5)
     screen:attach()
-    screen:set_default_attr_ignore({{bold=true, foreground=Screen.colors.Blue}})
+    screen:set_default_attr_ids({[1]={bold=true, foreground=Screen.colors.Blue}})
   end)
 
   after_each(function()
@@ -55,9 +57,9 @@ describe('command line completion', function()
     feed(':!<tab><bs>')
     screen:expect([[
                                               |
-      ~                                       |
-      ~                                       |
-      ~                                       |
+      {1:~                                       }|
+      {1:~                                       }|
+      {1:~                                       }|
       :!Xtest-functional-viml-compl-dir^       |
     ]])
   end)
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index 2b3844bf6d..cd5f4260e0 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -1,9 +1,11 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed = helpers.clear, helpers.feed
 local eval, eq, neq = helpers.eval, helpers.eq, helpers.neq
 local execute, source, expect = helpers.execute, helpers.source, helpers.expect
 
+if helpers.pending_win32(pending) then return end
+
 describe('completion', function()
   local screen
 
@@ -11,8 +13,8 @@ describe('completion', function()
     clear()
     screen = Screen.new(60, 8)
     screen:attach()
-    screen:set_default_attr_ignore({{bold=true, foreground=Screen.colors.Blue}})
     screen:set_default_attr_ids({
+      [0] = {bold=true, foreground=Screen.colors.Blue},
       [1] = {background = Screen.colors.LightMagenta},
       [2] = {background = Screen.colors.Grey},
       [3] = {bold = true},
@@ -20,6 +22,8 @@ describe('completion', function()
       [5] = {foreground = Screen.colors.Red},
       [6] = {background = Screen.colors.Black},
       [7] = {foreground = Screen.colors.White, background = Screen.colors.Red},
+      [8] = {reverse = true},
+      [9] = {bold = true, reverse = true},
     })
   end)
 
@@ -32,22 +36,22 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         foo^                                                         |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) The only match}           |
       ]])
       feed('<C-e>')
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<ESC>')
@@ -95,12 +99,12 @@ describe('completion', function()
       eq('foo', eval('getline(1)'))
       screen:expect([[
         foo^                                                         |
-        {2:bar  foobaz baz  }                                           |
-        {1:abbr kind   menu }                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:bar  foobaz baz  }{0:                                           }|
+        {1:abbr kind   menu }{0:                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Omni completion (^O^N^P) }{4:match 1 of 2}                    |
       ]])
       eq({word = 'foo', abbr = 'bar', menu = 'baz',
@@ -125,11 +129,11 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<C-x>')
@@ -137,22 +141,22 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)}                    |
       ]])
       feed('<C-n>')
       screen:expect([[
         foo                                                         |
         foo^                                                         |
-        {2:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) The only match}           |
       ]])
       feed('bar<ESC>')
@@ -162,10 +166,10 @@ describe('completion', function()
         foo                                                         |
         foobar                                                      |
         foo^                                                         |
-        {2:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       eq('foo', eval('getline(3)'))
@@ -176,22 +180,22 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        {2:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) The only match}           |
       ]])
       feed('<C-y>')
       screen:expect([[
         foo                                                         |
         foo^                                                         |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<ESC>')
@@ -201,10 +205,10 @@ describe('completion', function()
         foo                                                         |
         foo                                                         |
         ^                                                            |
-        {2:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<C-y><ESC>')
@@ -216,22 +220,22 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        {1:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) }{5:Back at original}         |
       ]])
       feed('b')
       screen:expect([[
         foo                                                         |
         b^                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) }{5:Back at original}         |
       ]])
       feed('ar<ESC>')
@@ -241,10 +245,10 @@ describe('completion', function()
         foo                                                         |
         bar                                                         |
         ^                                                            |
-        {1:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('bar<ESC>')
@@ -256,22 +260,22 @@ describe('completion', function()
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        {1:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- Keyword Local completion (^N^P) }{5:Back at original}         |
       ]])
       feed('<ESC>')
       screen:expect([[
         foo                                                         |
         ^                                                            |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
                                                                     |
       ]])
       eq('', eval('getline(2)'))
@@ -280,10 +284,10 @@ describe('completion', function()
         foo                                                         |
                                                                     |
         ^                                                            |
-        {1:foo            }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:foo            }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<ESC>')
@@ -291,10 +295,10 @@ describe('completion', function()
         foo                                                         |
                                                                     |
         ^                                                            |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
                                                                     |
       ]])
       eq('', eval('getline(3)'))
@@ -313,6 +317,62 @@ describe('completion', function()
     end)
   end)
 
+  describe('completeopt+=noinsert does not add blank undo items', function()
+    before_each(function()
+      source([[
+      function! TestComplete() abort
+        call complete(1, ['foo', 'bar'])
+        return ''
+      endfunction
+      ]])
+      execute('set completeopt+=noselect,noinsert')
+      execute('inoremap <right> <c-r>=TestComplete()<cr>')
+    end)
+
+    local tests = {
+      ['<up>, <down>, <cr>'] = {'<down><cr>', '<up><cr>'},
+      ['<c-n>, <c-p>, <c-y>'] = {'<c-n><c-y>', '<c-p><c-y>'},
+    }
+
+    for name, seq in pairs(tests) do
+      it('using ' .. name, function()
+        feed('iaaa<esc>')
+        feed('A<right>' .. seq[1] .. '<esc>')
+        feed('A<right><esc>A<right><esc>')
+        feed('A<cr>bbb<esc>')
+        feed('A<right>' .. seq[2] .. '<esc>')
+        feed('A<right><esc>A<right><esc>')
+        feed('A<cr>ccc<esc>')
+        feed('A<right>' .. seq[1] .. '<esc>')
+        feed('A<right><esc>A<right><esc>')
+
+        local expected = {
+          {'foo', 'bar', 'foo'},
+          {'foo', 'bar', 'ccc'},
+          {'foo', 'bar'},
+          {'foo', 'bbb'},
+          {'foo'},
+          {'aaa'},
+          {''},
+        }
+
+        for i = 1, #expected do
+          if i > 1 then
+            feed('u')
+          end
+          eq(expected[i], eval('getline(1, "$")'))
+        end
+
+        for i = #expected, 1, -1 do
+          if i < #expected then
+            feed('<c-r>')
+          end
+          eq(expected[i], eval('getline(1, "$")'))
+        end
+      end)
+    end
+  end)
+
   describe("refresh:always", function()
     before_each(function()
       source([[
@@ -344,56 +404,56 @@ describe('completion', function()
       feed('i<C-x><C-u>')
       screen:expect([[
         ^                                                            |
-        {1:January        }{6: }                                            |
-        {1:February       }{6: }                                            |
-        {1:March          }{6: }                                            |
-        {1:April          }{2: }                                            |
-        {1:May            }{2: }                                            |
-        {1:June           }{2: }                                            |
+        {1:January        }{6: }{0:                                            }|
+        {1:February       }{6: }{0:                                            }|
+        {1:March          }{6: }{0:                                            }|
+        {1:April          }{2: }{0:                                            }|
+        {1:May            }{2: }{0:                                            }|
+        {1:June           }{2: }{0:                                            }|
         {3:-- User defined completion (^U^N^P) }{5:Back at original}        |
       ]])
       feed('u')
       screen:expect([[
         u^                                                           |
-        {1:January        }                                             |
-        {1:February       }                                             |
-        {1:June           }                                             |
-        {1:July           }                                             |
-        {1:August         }                                             |
-        ~                                                           |
+        {1:January        }{0:                                             }|
+        {1:February       }{0:                                             }|
+        {1:June           }{0:                                             }|
+        {1:July           }{0:                                             }|
+        {1:August         }{0:                                             }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{5:Back at original}        |
       ]])
       feed('g')
       screen:expect([[
         ug^                                                          |
-        {1:August         }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:August         }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{5:Back at original}        |
       ]])
       feed('<Down>')
       screen:expect([[
         ug^                                                          |
-        {2:August         }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {2:August         }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) The only match}          |
       ]])
       feed('<C-y>')
       screen:expect([[
         August^                                                      |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
       expect('August')
@@ -403,55 +463,55 @@ describe('completion', function()
       screen:expect([[
                                                                     |
         Ja^                                                          |
-        {1:January        }                                             |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {1:January        }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{5:Back at original}        |
       ]])
       feed('<BS>')
       screen:expect([[
                                                                     |
         J^                                                           |
-        {1:January        }                                             |
-        {1:June           }                                             |
-        {1:July           }                                             |
-        ~                                                           |
-        ~                                                           |
+        {1:January        }{0:                                             }|
+        {1:June           }{0:                                             }|
+        {1:July           }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{5:Back at original}        |
       ]])
       feed('<C-n>')
       screen:expect([[
                                                                     |
         January^                                                     |
-        {2:January        }                                             |
-        {1:June           }                                             |
-        {1:July           }                                             |
-        ~                                                           |
-        ~                                                           |
+        {2:January        }{0:                                             }|
+        {1:June           }{0:                                             }|
+        {1:July           }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{4:match 1 of 3}            |
       ]])
       feed('<C-n>')
       screen:expect([[
                                                                     |
         June^                                                        |
-        {1:January        }                                             |
-        {2:June           }                                             |
-        {1:July           }                                             |
-        ~                                                           |
-        ~                                                           |
+        {1:January        }{0:                                             }|
+        {2:June           }{0:                                             }|
+        {1:July           }{0:                                             }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- User defined completion (^U^N^P) }{4:match 2 of 3}            |
       ]])
       feed('<Esc>')
       screen:expect([[
                                                                     |
         Jun^e                                                        |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
                                                                     |
       ]])
       feed('.')
@@ -459,14 +519,14 @@ describe('completion', function()
                                                                     |
         June                                                        |
         Jun^e                                                        |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
                                                                     |
       ]])
       expect([[
-        
+
         June
         June]])
     end)
@@ -487,45 +547,45 @@ describe('completion', function()
       feed('i<C-r>=TestComplete()<CR>')
       screen:expect([[
         ^                                                            |
-        {1:0              }{6: }                                            |
-        {1:1              }{2: }                                            |
-        {1:2              }{2: }                                            |
-        {1:3              }{2: }                                            |
-        {1:4              }{2: }                                            |
-        {1:5              }{2: }                                            |
+        {1:0              }{6: }{0:                                            }|
+        {1:1              }{2: }{0:                                            }|
+        {1:2              }{2: }{0:                                            }|
+        {1:3              }{2: }{0:                                            }|
+        {1:4              }{2: }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('7')
       screen:expect([[
         7^                                                           |
-        {1:7              }{6: }                                            |
-        {1:70             }{6: }                                            |
-        {1:71             }{6: }                                            |
-        {1:72             }{2: }                                            |
-        {1:73             }{2: }                                            |
-        {1:74             }{2: }                                            |
+        {1:7              }{6: }{0:                                            }|
+        {1:70             }{6: }{0:                                            }|
+        {1:71             }{6: }{0:                                            }|
+        {1:72             }{2: }{0:                                            }|
+        {1:73             }{2: }{0:                                            }|
+        {1:74             }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<c-n>')
       screen:expect([[
         7^                                                           |
-        {2:7              }{6: }                                            |
-        {1:70             }{6: }                                            |
-        {1:71             }{6: }                                            |
-        {1:72             }{2: }                                            |
-        {1:73             }{2: }                                            |
-        {1:74             }{2: }                                            |
+        {2:7              }{6: }{0:                                            }|
+        {1:70             }{6: }{0:                                            }|
+        {1:71             }{6: }{0:                                            }|
+        {1:72             }{2: }{0:                                            }|
+        {1:73             }{2: }{0:                                            }|
+        {1:74             }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<c-n>')
       screen:expect([[
         70^                                                          |
-        {1:7              }{6: }                                            |
-        {2:70             }{6: }                                            |
-        {1:71             }{6: }                                            |
-        {1:72             }{2: }                                            |
-        {1:73             }{2: }                                            |
-        {1:74             }{2: }                                            |
+        {1:7              }{6: }{0:                                            }|
+        {2:70             }{6: }{0:                                            }|
+        {1:71             }{6: }{0:                                            }|
+        {1:72             }{2: }{0:                                            }|
+        {1:73             }{2: }{0:                                            }|
+        {1:74             }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
     end)
@@ -534,111 +594,111 @@ describe('completion', function()
       feed('i<C-r>=TestComplete()<CR>')
       screen:expect([[
         ^                                                            |
-        {1:0              }{6: }                                            |
-        {1:1              }{2: }                                            |
-        {1:2              }{2: }                                            |
-        {1:3              }{2: }                                            |
-        {1:4              }{2: }                                            |
-        {1:5              }{2: }                                            |
+        {1:0              }{6: }{0:                                            }|
+        {1:1              }{2: }{0:                                            }|
+        {1:2              }{2: }{0:                                            }|
+        {1:3              }{2: }{0:                                            }|
+        {1:4              }{2: }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageDown>')
       screen:expect([[
         ^                                                            |
-        {1:0              }{6: }                                            |
-        {1:1              }{2: }                                            |
-        {1:2              }{2: }                                            |
-        {2:3               }                                            |
-        {1:4              }{2: }                                            |
-        {1:5              }{2: }                                            |
+        {1:0              }{6: }{0:                                            }|
+        {1:1              }{2: }{0:                                            }|
+        {1:2              }{2: }{0:                                            }|
+        {2:3               }{0:                                            }|
+        {1:4              }{2: }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageDown>')
       screen:expect([[
         ^                                                            |
-        {1:5              }{6: }                                            |
-        {1:6              }{2: }                                            |
-        {2:7               }                                            |
-        {1:8              }{2: }                                            |
-        {1:9              }{2: }                                            |
-        {1:10             }{2: }                                            |
+        {1:5              }{6: }{0:                                            }|
+        {1:6              }{2: }{0:                                            }|
+        {2:7               }{0:                                            }|
+        {1:8              }{2: }{0:                                            }|
+        {1:9              }{2: }{0:                                            }|
+        {1:10             }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<Down>')
       screen:expect([[
         ^                                                            |
-        {1:5              }{6: }                                            |
-        {1:6              }{2: }                                            |
-        {1:7              }{2: }                                            |
-        {2:8               }                                            |
-        {1:9              }{2: }                                            |
-        {1:10             }{2: }                                            |
+        {1:5              }{6: }{0:                                            }|
+        {1:6              }{2: }{0:                                            }|
+        {1:7              }{2: }{0:                                            }|
+        {2:8               }{0:                                            }|
+        {1:9              }{2: }{0:                                            }|
+        {1:10             }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageUp>')
       screen:expect([[
         ^                                                            |
-        {1:2              }{6: }                                            |
-        {1:3              }{2: }                                            |
-        {2:4               }                                            |
-        {1:5              }{2: }                                            |
-        {1:6              }{2: }                                            |
-        {1:7              }{2: }                                            |
+        {1:2              }{6: }{0:                                            }|
+        {1:3              }{2: }{0:                                            }|
+        {2:4               }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
+        {1:6              }{2: }{0:                                            }|
+        {1:7              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageUp>') -- stop on first item
       screen:expect([[
         ^                                                            |
-        {2:0              }{6: }                                            |
-        {1:1              }{2: }                                            |
-        {1:2              }{2: }                                            |
-        {1:3              }{2: }                                            |
-        {1:4              }{2: }                                            |
-        {1:5              }{2: }                                            |
+        {2:0              }{6: }{0:                                            }|
+        {1:1              }{2: }{0:                                            }|
+        {1:2              }{2: }{0:                                            }|
+        {1:3              }{2: }{0:                                            }|
+        {1:4              }{2: }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageUp>') -- when on first item, unselect
       screen:expect([[
         ^                                                            |
-        {1:0              }{6: }                                            |
-        {1:1              }{2: }                                            |
-        {1:2              }{2: }                                            |
-        {1:3              }{2: }                                            |
-        {1:4              }{2: }                                            |
-        {1:5              }{2: }                                            |
+        {1:0              }{6: }{0:                                            }|
+        {1:1              }{2: }{0:                                            }|
+        {1:2              }{2: }{0:                                            }|
+        {1:3              }{2: }{0:                                            }|
+        {1:4              }{2: }{0:                                            }|
+        {1:5              }{2: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageUp>') -- when unselected, select last item
       screen:expect([[
         ^                                                            |
-        {1:95             }{2: }                                            |
-        {1:96             }{2: }                                            |
-        {1:97             }{2: }                                            |
-        {1:98             }{2: }                                            |
-        {1:99             }{2: }                                            |
-        {2:100            }{6: }                                            |
+        {1:95             }{2: }{0:                                            }|
+        {1:96             }{2: }{0:                                            }|
+        {1:97             }{2: }{0:                                            }|
+        {1:98             }{2: }{0:                                            }|
+        {1:99             }{2: }{0:                                            }|
+        {2:100            }{6: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<PageUp>')
       screen:expect([[
         ^                                                            |
-        {1:94             }{2: }                                            |
-        {1:95             }{2: }                                            |
-        {2:96              }                                            |
-        {1:97             }{2: }                                            |
-        {1:98             }{2: }                                            |
-        {1:99             }{6: }                                            |
+        {1:94             }{2: }{0:                                            }|
+        {1:95             }{2: }{0:                                            }|
+        {2:96              }{0:                                            }|
+        {1:97             }{2: }{0:                                            }|
+        {1:98             }{2: }{0:                                            }|
+        {1:99             }{6: }{0:                                            }|
         {3:-- INSERT --}                                                |
       ]])
       feed('<cr>')
       screen:expect([[
         96^                                                          |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
-        ~                                                           |
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
+        {0:~                                                           }|
         {3:-- INSERT --}                                                |
       ]])
     end)
@@ -651,22 +711,22 @@ describe('completion', function()
     screen:expect([[
               ^foo                                                 |
               bar                                                 |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
                                                                   |
     ]])
     feed('A<C-x><C-l>')
     screen:expect([[
               foo^                                                 |
               bar                                                 |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
       {3:-- Whole line completion (^L^N^P) }{7:Pattern not found}         |
     ]])
     eq(-1, eval('foldclosed(1)'))
@@ -679,11 +739,11 @@ describe('completion', function()
     screen:expect([[
       foobar fooegg                                               |
       fooegg^                                                      |
-      {1:foobar         }                                             |
-      {2:fooegg         }                                             |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
+      {1:foobar         }{0:                                             }|
+      {2:fooegg         }{0:                                             }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
       {3:-- Keyword completion (^N^P) }{4:match 1 of 2}                   |
     ]])
 
@@ -692,11 +752,11 @@ describe('completion', function()
     screen:expect([[
       foobar fooegg                                               |
       fooegg^                                                      |
-      {1:foobar         }                                             |
-      {2:fooegg         }                                             |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
+      {1:foobar         }{0:                                             }|
+      {2:fooegg         }{0:                                             }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
       {3:-- Keyword completion (^N^P) }{4:match 1 of 2}                   |
     ]])
 
@@ -705,15 +765,15 @@ describe('completion', function()
     screen:expect([[
       foobar fooegg                                               |
       foobar^                                                      |
-      {2:foobar         }                                             |
-      {1:fooegg         }                                             |
-      ~                                                           |
-      ~                                                           |
-      ~                                                           |
+      {2:foobar         }{0:                                             }|
+      {1:fooegg         }{0:                                             }|
+      {0:~                                                           }|
+      {0:~                                                           }|
+      {0:~                                                           }|
       {3:-- Keyword completion (^N^P) }{4:match 2 of 2}                   |
     ]])
   end)
-  
+
   describe('from the commandline window', function()
 
     it('is cleared after CTRL-C', function ()
@@ -722,43 +782,137 @@ describe('completion', function()
       screen:expect([[
                                                                     |
         {8:[No Name]                                                   }|
-        :foo faa fee f^                                              |
-        :~                                                          |
-        :~                                                          |
-        :~                                                          |
+        {0::}foo faa fee f^                                              |
+        {0::~                                                          }|
+        {0::~                                                          }|
+        {0::~                                                          }|
         {9:[Command Line]                                              }|
         {3:-- INSERT --}                                                |
-      ]], {[3] = {bold = true},
-           [4] = {bold = true, foreground = Screen.colors.SeaGreen},
-           [8] = {reverse = true},
-           [9] = {bold = true, reverse = true}})
+      ]] )
       feed('<c-x><c-n>')
       screen:expect([[
                                                                     |
         {8:[No Name]                                                   }|
-        :foo faa fee foo^                                            |
-        :~          {2: foo            }                                |
-        :~          {1: faa            }                                |
-        :~          {1: fee            }                                |
+        {0::}foo faa fee foo^                                            |
+        {0::~          }{2: foo            }{0:                                }|
+        {0::~          }{1: faa            }{0:                                }|
+        {0::~          }{1: fee            }{0:                                }|
         {9:[Command Line]                                              }|
         {3:-- Keyword Local completion (^N^P) }{4:match 1 of 3}             |
-      ]],{[1] = {background = Screen.colors.LightMagenta},
-          [2] = {background = Screen.colors.Grey},
-          [3] = {bold = true},
-          [4] = {bold = true, foreground = Screen.colors.SeaGreen},
-          [8] = {reverse = true},
-          [9] = {bold = true, reverse = true}})
+      ]])
       feed('<c-c>')
       screen:expect([[
                                                                     |
         {8:[No Name]                                                   }|
-        :foo faa fee foo                                            |
-        :~                                                          |
-        :~                                                          |
-        :~                                                          |
+        {0::}foo faa fee foo                                            |
+        {0::~                                                          }|
+        {0::~                                                          }|
+        {0::~                                                          }|
         {9:[Command Line]                                              }|
         :foo faa fee foo^                                            |
-      ]], {[8] = {reverse = true}, [9] = {bold = true, reverse = true}})
+      ]])
+    end)
+  end)
+
+end)
+
+describe('External completion popupmenu', function()
+  local screen
+  local items, selected, anchor
+  before_each(function()
+    clear()
+    screen = Screen.new(60, 8)
+    screen:attach({rgb=true, popupmenu_external=true})
+    screen:set_default_attr_ids({
+      [1] = {bold=true, foreground=Screen.colors.Blue},
+      [2] = {bold = true},
+    })
+    screen:set_on_event_handler(function(name, data)
+      if name == "popupmenu_show" then
+        local row, col
+        items, selected, row, col = unpack(data)
+        anchor = {row, col}
+      elseif name == "popupmenu_select" then
+        selected = data[1]
+      elseif name == "popupmenu_hide" then
+        items = nil
+      end
+    end)
+  end)
+
+  it('works', function()
+    source([[
+      function! TestComplete() abort
+        call complete(1, ['foo', 'bar', 'spam'])
+        return ''
+      endfunction
+    ]])
+    local expected = {
+      {'foo', '', '', ''},
+      {'bar', '', '', ''},
+      {'spam', '', '', ''},
+    }
+    feed('o<C-r>=TestComplete()<CR>')
+    screen:expect([[
+                                                                  |
+      foo^                                                         |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {2:-- INSERT --}                                                |
+    ]], nil, nil, function()
+      eq(expected, items)
+      eq(0, selected)
+      eq({1,0}, anchor)
+    end)
+
+    feed('<c-p>')
+    screen:expect([[
+                                                                  |
+      ^                                                            |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {2:-- INSERT --}                                                |
+    ]], nil, nil, function()
+      eq(expected, items)
+      eq(-1, selected)
+      eq({1,0}, anchor)
+    end)
+
+    -- down moves the selection in the menu, but does not insert anything
+    feed('<down><down>')
+    screen:expect([[
+                                                                  |
+      ^                                                            |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {2:-- INSERT --}                                                |
+    ]], nil, nil, function()
+      eq(expected, items)
+      eq(1, selected)
+      eq({1,0}, anchor)
+    end)
+
+    feed('<cr>')
+    screen:expect([[
+                                                                  |
+      bar^                                                         |
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {1:~                                                           }|
+      {2:-- INSERT --}                                                |
+    ]], nil, nil, function()
+      eq(nil, items) -- popupmenu was hidden
     end)
   end)
 end)
diff --git a/test/functional/viml/errorlist_spec.lua b/test/functional/viml/errorlist_spec.lua
index 30cb86f8d1..f889ca9adc 100644
--- a/test/functional/viml/errorlist_spec.lua
+++ b/test/functional/viml/errorlist_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local clear = helpers.clear
 local command = helpers.command
@@ -18,9 +18,9 @@ describe('setqflist()', function()
   end)
 
   it('requires a string for {action}', function()
-    eq('Vim(call):E114: String required', exc_exec('call setqflist([], 5)'))
-    eq('Vim(call):E114: String required', exc_exec('call setqflist([], [])'))
-    eq('Vim(call):E114: String required', exc_exec('call setqflist([], {})'))
+    eq('Vim(call):E928: String required', exc_exec('call setqflist([], 5)'))
+    eq('Vim(call):E928: String required', exc_exec('call setqflist([], [])'))
+    eq('Vim(call):E928: String required', exc_exec('call setqflist([], {})'))
   end)
 
   it('sets w:quickfix_title', function()
@@ -56,9 +56,9 @@ describe('setloclist()', function()
   end)
 
   it('requires a string for {action}', function()
-    eq('Vim(call):E114: String required', exc_exec('call setloclist(0, [], 5)'))
-    eq('Vim(call):E114: String required', exc_exec('call setloclist(0, [], [])'))
-    eq('Vim(call):E114: String required', exc_exec('call setloclist(0, [], {})'))
+    eq('Vim(call):E928: String required', exc_exec('call setloclist(0, [], 5)'))
+    eq('Vim(call):E928: String required', exc_exec('call setloclist(0, [], [])'))
+    eq('Vim(call):E928: String required', exc_exec('call setloclist(0, [], {})'))
   end)
 
   it('sets w:quickfix_title for the correct window', function()
diff --git a/test/functional/viml/function_spec.lua b/test/functional/viml/function_spec.lua
index 665f5d4467..776e760aaf 100644
--- a/test/functional/viml/function_spec.lua
+++ b/test/functional/viml/function_spec.lua
@@ -1,4 +1,4 @@
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 
 local clear = helpers.clear
 local eq = helpers.eq
diff --git a/test/functional/viml/lang_spec.lua b/test/functional/viml/lang_spec.lua
new file mode 100644
index 0000000000..a27e18f695
--- /dev/null
+++ b/test/functional/viml/lang_spec.lua
@@ -0,0 +1,22 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq
+local execute, source = helpers.execute, helpers.source
+
+describe('viml', function()
+  before_each(clear)
+
+  it('parses `<SID>` with turkish locale', function()
+    execute('lang ctype tr_TR.UTF-8')
+    if string.find(eval('v:errmsg'), '^E197: ') then
+      pending("Locale tr_TR.UTF-8 not supported")
+      return
+    end
+    source([[
+      func! <sid>_dummy_function()
+        echo 1
+      endfunc
+      au VimEnter * call <sid>_dummy_function()
+    ]])
+    eq(nil, string.find(eval('v:errmsg'), '^E129'))
+  end)
+end)
diff --git a/test/helpers.lua b/test/helpers.lua
new file mode 100644
index 0000000000..3f7a9c2b74
--- /dev/null
+++ b/test/helpers.lua
@@ -0,0 +1,121 @@
+local assert = require('luassert')
+local lfs = require('lfs')
+
+local check_logs_useless_lines = {
+  ['Warning: noted but unhandled ioctl']=1,
+  ['could cause spurious value errors to appear']=2,
+  ['See README_MISSING_SYSCALL_OR_IOCTL for guidance']=3,
+}
+
+local eq = function(exp, act)
+  return assert.are.same(exp, act)
+end
+local neq = function(exp, act)
+  return assert.are_not.same(exp, act)
+end
+local ok = function(res)
+  return assert.is_true(res)
+end
+
+local function check_logs()
+  local log_dir = os.getenv('LOG_DIR')
+  local runtime_errors = 0
+  if log_dir and lfs.attributes(log_dir, 'mode') == 'directory' then
+    for tail in lfs.dir(log_dir) do
+      if tail:sub(1, 30) == 'valgrind-' or tail:find('san%.') then
+        local file = log_dir .. '/' .. tail
+        local fd = io.open(file)
+        local start_msg = ('='):rep(20) .. ' File ' .. file .. ' ' .. ('='):rep(20)
+        local lines = {}
+        local warning_line = 0
+        for line in fd:lines() do
+          local cur_warning_line = check_logs_useless_lines[line]
+          if cur_warning_line == warning_line + 1 then
+            warning_line = cur_warning_line
+          else
+            lines[#lines + 1] = line
+          end
+        end
+        fd:close()
+        os.remove(file)
+        if #lines > 0 then
+          -- local out = os.getenv('TRAVIS_CI_BUILD') and io.stdout or io.stderr
+          local out = io.stdout
+          out:write(start_msg .. '\n')
+          out:write('= ' .. table.concat(lines, '\n= ') .. '\n')
+          out:write(select(1, start_msg:gsub('.', '=')) .. '\n')
+          runtime_errors = runtime_errors + 1
+        end
+      end
+    end
+  end
+  assert(0 == runtime_errors)
+end
+
+-- Tries to get platform name from $SYSTEM_NAME, uname; fallback is "Windows".
+local uname = (function()
+  local platform = nil
+  return (function()
+    if platform then
+      return platform
+    end
+
+    platform = os.getenv("SYSTEM_NAME")
+    if platform then
+      return platform
+    end
+
+    local status, f = pcall(io.popen, "uname -s")
+    if status then
+      platform = f:read("*l")
+      f:close()
+    else
+      platform = 'Windows'
+    end
+    return platform
+  end)
+end)()
+
+local function tmpname()
+  local fname = os.tmpname()
+  if uname() == 'Windows' and fname:sub(1, 2) == '\\s' then
+    -- In Windows tmpname() returns a filename starting with
+    -- special sequence \s, prepend $TEMP path
+    local tmpdir = os.getenv('TEMP')
+    return tmpdir..fname
+  elseif fname:match('^/tmp') and uname() == 'Darwin' then
+    -- In OS X /tmp links to /private/tmp
+    return '/private'..fname
+  else
+    return fname
+  end
+end
+
+local function map(func, tab)
+  local rettab = {}
+  for k, v in pairs(tab) do
+    rettab[k] = func(v)
+  end
+  return rettab
+end
+
+local function filter(filter_func, tab)
+  local rettab = {}
+  for _, entry in pairs(tab) do
+    if filter_func(entry) then
+      table.insert(rettab, entry)
+    end
+  end
+  return rettab
+end
+
+return {
+  eq = eq,
+  neq = neq,
+  ok = ok,
+  check_logs = check_logs,
+  uname = uname,
+  tmpname = tmpname,
+  map = map,
+  filter = filter,
+}
diff --git a/test/unit/api/helpers.lua b/test/unit/api/helpers.lua
new file mode 100644
index 0000000000..883e1c6c19
--- /dev/null
+++ b/test/unit/api/helpers.lua
@@ -0,0 +1,156 @@
+local helpers = require('test.unit.helpers')
+local eval_helpers = require('test.unit.eval.helpers')
+
+local cimport = helpers.cimport
+local to_cstr = helpers.to_cstr
+local ffi = helpers.ffi
+
+local list_type = eval_helpers.list_type
+local dict_type = eval_helpers.dict_type
+local func_type = eval_helpers.func_type
+local nil_value = eval_helpers.nil_value
+local int_type = eval_helpers.int_type
+local flt_type = eval_helpers.flt_type
+local type_key = eval_helpers.type_key
+
+local api = cimport('./src/nvim/api/private/defs.h',
+                    './src/nvim/api/private/helpers.h',
+                    './src/nvim/memory.h')
+
+local obj2lua
+
+local obj2lua_tab = {
+  [tonumber(api.kObjectTypeArray)] = function(obj)
+    local ret = {[type_key]=list_type}
+    for i = 1,tonumber(obj.data.array.size) do
+      ret[i] = obj2lua(obj.data.array.items[i - 1])
+    end
+    if ret[1] then
+      ret[type_key] = nil
+    end
+    return ret
+  end,
+  [tonumber(api.kObjectTypeDictionary)] = function(obj)
+    local ret = {}
+    for i = 1,tonumber(obj.data.dictionary.size) do
+      local kv_pair = obj.data.dictionary.items[i - 1]
+      ret[ffi.string(kv_pair.key.data, kv_pair.key.size)] = obj2lua(kv_pair.value)
+    end
+    return ret
+  end,
+  [tonumber(api.kObjectTypeBoolean)] = function(obj)
+    if obj.data.boolean == false then
+      return false
+    else
+      return true
+    end
+  end,
+  [tonumber(api.kObjectTypeNil)] = function(_)
+    return nil_value
+  end,
+  [tonumber(api.kObjectTypeFloat)] = function(obj)
+    return tonumber(obj.data.floating)
+  end,
+  [tonumber(api.kObjectTypeInteger)] = function(obj)
+    return {[type_key]=int_type, value=tonumber(obj.data.integer)}
+  end,
+  [tonumber(api.kObjectTypeString)] = function(obj)
+    return ffi.string(obj.data.string.data, obj.data.string.size)
+  end,
+}
+
+obj2lua = function(obj)
+  return ((obj2lua_tab[tonumber(obj['type'])] or function(obj_inner)
+    assert(false, 'Converting ' .. tostring(tonumber(obj_inner['type'])) .. ' is not implementing yet')
+  end)(obj))
+end
+
+local obj = function(typ, data)
+  return ffi.gc(ffi.new('Object', {['type']=typ, data=data}),
+                api.api_free_object)
+end
+
+local lua2obj
+
+local lua2obj_type_tab = {
+  [int_type] = function(l)
+    return obj(api.kObjectTypeInteger, {integer=l.value})
+  end,
+  [flt_type] = function(l)
+    return obj(api.kObjectTypeFloat, {floating=l})
+  end,
+  [list_type] = function(l)
+    local len = #l
+    local arr = obj(api.kObjectTypeArray, {array={
+      size=len,
+      capacity=len,
+      items=ffi.cast('Object *', api.xmalloc(len * ffi.sizeof('Object'))),
+    }})
+    for i = 1, len do
+      arr.data.array.items[i - 1] = ffi.gc(lua2obj(l[i]), nil)
+    end
+    return arr
+  end,
+  [dict_type] = function(l)
+    local kvs = {}
+    for k, v in pairs(l) do
+      if type(k) == 'string' then
+        kvs[#kvs + 1] = {k, v}
+      end
+    end
+    local len = #kvs
+    local dct = obj(api.kObjectTypeDictionary, {dictionary={
+      size=len,
+      capacity=len,
+      items=ffi.cast('KeyValuePair *',
+                     api.xmalloc(len * ffi.sizeof('KeyValuePair'))),
+    }})
+    for i = 1, len do
+      local key, val = table.unpack(kvs[i])
+      dct.data.dictionary.items[i - 1] = ffi.new(
+          'KeyValuePair', {key=ffi.gc(lua2obj(key), nil).data.string,
+                           value=ffi.gc(lua2obj(val), nil)})
+    end
+    return dct
+  end,
+}
+
+lua2obj = function(l)
+  if type(l) == 'table' then
+    if l[type_key] then
+      return lua2obj_type_tab[l[type_key]](l)
+    else
+      if l[1] then
+        return lua2obj_type_tab[list_type](l)
+      else
+        return lua2obj_type_tab[dict_type](l)
+      end
+    end
+  elseif type(l) == 'number' then
+    return lua2obj_type_tab[flt_type](l)
+  elseif type(l) == 'boolean' then
+    return obj(api.kObjectTypeBoolean, {boolean=l})
+  elseif type(l) == 'string' then
+    return obj(api.kObjectTypeString, {string={
+      size=#l,
+      data=api.xmemdupz(to_cstr(l), #l),
+    }})
+  elseif l == nil or l == nil_value then
+    return obj(api.kObjectTypeNil, {integer=0})
+  end
+end
+
+return {
+  list_type=list_type,
+  dict_type=dict_type,
+  func_type=func_type,
+  int_type=int_type,
+  flt_type=flt_type,
+
+  nil_value=nil_value,
+
+  type_key=type_key,
+
+  obj2lua=obj2lua,
+  lua2obj=lua2obj,
+}
diff --git a/test/unit/api/private_helpers_spec.lua b/test/unit/api/private_helpers_spec.lua
new file mode 100644
index 0000000000..8c54ea6a2a
--- /dev/null
+++ b/test/unit/api/private_helpers_spec.lua
@@ -0,0 +1,105 @@
+local helpers = require('test.unit.helpers')
+local eval_helpers = require('test.unit.eval.helpers')
+local api_helpers = require('test.unit.api.helpers')
+
+local cimport = helpers.cimport
+local NULL = helpers.NULL
+local eq = helpers.eq
+
+local lua2typvalt = eval_helpers.lua2typvalt
+local typvalt2lua = eval_helpers.typvalt2lua
+local typvalt = eval_helpers.typvalt
+
+local nil_value = api_helpers.nil_value
+local list_type = api_helpers.list_type
+local int_type = api_helpers.int_type
+local type_key = api_helpers.type_key
+local obj2lua = api_helpers.obj2lua
+local func_type = api_helpers.func_type
+
+local api = cimport('./src/nvim/api/private/helpers.h')
+
+describe('vim_to_object', function()
+  local vim_to_object = function(l)
+    return obj2lua(api.vim_to_object(lua2typvalt(l)))
+  end
+
+  local different_output_test = function(name, input, output)
+    it(name, function()
+      eq(output, vim_to_object(input))
+    end)
+  end
+
+  local simple_test = function(name, l)
+    different_output_test(name, l, l)
+  end
+
+  simple_test('converts true', true)
+  simple_test('converts false', false)
+  simple_test('converts nil', nil_value)
+  simple_test('converts 1', 1)
+  simple_test('converts -1.5', -1.5)
+  simple_test('converts empty string', '')
+  simple_test('converts non-empty string', 'foobar')
+  simple_test('converts integer 10', {[type_key]=int_type, value=10})
+  simple_test('converts empty dictionary', {})
+  simple_test('converts dictionary with scalar values', {test=10, test2=true, test3='test'})
+  simple_test('converts dictionary with containers inside', {test={}, test2={1, 2}})
+  simple_test('converts empty list', {[type_key]=list_type})
+  simple_test('converts list with scalar values', {1, 2, 'test', 'foo'})
+  simple_test('converts list with containers inside', {{}, {test={}, test3={test4=true}}})
+
+  local dct = {}
+  dct.dct = dct
+  different_output_test('outputs nil for nested dictionaries (1 level)', dct, {dct=nil_value})
+
+  local lst = {}
+  lst[1] = lst
+  different_output_test('outputs nil for nested lists (1 level)', lst, {nil_value})
+
+  local dct2 = {test=true, dict=nil_value}
+  dct2.dct = {dct2}
+  different_output_test('outputs nil for nested dictionaries (2 level, in list)',
+                        dct2, {dct={nil_value}, test=true, dict=nil_value})
+
+  local dct3 = {test=true, dict=nil_value}
+  dct3.dct = {dctin=dct3}
+  different_output_test('outputs nil for nested dictionaries (2 level, in dict)',
+                        dct3, {dct={dctin=nil_value}, test=true, dict=nil_value})
+
+  local lst2 = {}
+  lst2[1] = {lst2}
+  different_output_test('outputs nil for nested lists (2 level, in list)', lst2, {{nil_value}})
+
+  local lst3 = {nil, true, false, 'ttest'}
+  lst3[1] = {lst=lst3}
+  different_output_test('outputs nil for nested lists (2 level, in dict)',
+                        lst3, {{lst=nil_value}, true, false, 'ttest'})
+
+  it('outputs empty list for NULL list', function()
+    local tt = typvalt('VAR_LIST', {v_list=NULL})
+    eq(nil, tt.vval.v_list)
+    eq({[type_key]=list_type}, obj2lua(api.vim_to_object(tt)))
+  end)
+
+  it('outputs empty dict for NULL dict', function()
+    local tt = typvalt('VAR_DICT', {v_dict=NULL})
+    eq(nil, tt.vval.v_dict)
+    eq({}, obj2lua(api.vim_to_object(tt)))
+  end)
+
+  it('regression: partials in a list', function()
+    local llist = {
+      {
+        [type_key]=func_type,
+        value='printf',
+        args={'%s'},
+        dict={v=1},
+      },
+      {},
+    }
+    local list = lua2typvalt(llist)
+    eq(llist, typvalt2lua(list))
+    eq({nil_value, {}}, obj2lua(api.vim_to_object(list)))
+  end)
+end)
diff --git a/test/unit/buffer_spec.lua b/test/unit/buffer_spec.lua
index b7f82064d7..49a4d84279 100644
--- a/test/unit/buffer_spec.lua
+++ b/test/unit/buffer_spec.lua
@@ -1,10 +1,9 @@
 
-local assert = require("luassert")
 local helpers = require("test.unit.helpers")
 
 local to_cstr = helpers.to_cstr
+local get_str = helpers.ffi.string
 local eq      = helpers.eq
-local neq     = helpers.neq
 local NULL    = helpers.NULL
 
 local globals = helpers.cimport("./src/nvim/globals.h")
@@ -88,7 +87,7 @@ describe('buffer functions', function()
     it('should find exact matches', function()
       local buf = buflist_new(path1, buffer.BLN_LISTED)
 
-      eq(buf.b_fnum, buflist_findpat(path1, ONLY_LISTED))
+      eq(buf.handle, buflist_findpat(path1, ONLY_LISTED))
 
       close_buffer(NULL, buf, buffer.DOBUF_WIPE, 0)
     end)
@@ -98,9 +97,9 @@ describe('buffer functions', function()
       local buf2 = buflist_new(path2, buffer.BLN_LISTED)
       local buf3 = buflist_new(path3, buffer.BLN_LISTED)
 
-      eq(buf1.b_fnum, buflist_findpat("test", ONLY_LISTED))
-      eq(buf2.b_fnum, buflist_findpat("file", ONLY_LISTED))
-      eq(buf3.b_fnum, buflist_findpat("path", ONLY_LISTED))
+      eq(buf1.handle, buflist_findpat("test", ONLY_LISTED))
+      eq(buf2.handle, buflist_findpat("file", ONLY_LISTED))
+      eq(buf3.handle, buflist_findpat("path", ONLY_LISTED))
 
       close_buffer(NULL, buf1, buffer.DOBUF_WIPE, 0)
       close_buffer(NULL, buf2, buffer.DOBUF_WIPE, 0)
@@ -114,7 +113,7 @@ describe('buffer functions', function()
       local buf3 = buflist_new(path3, buffer.BLN_LISTED)
 
       -- Then: buf2 is the buffer that is found
-      eq(buf2.b_fnum, buflist_findpat("test", ONLY_LISTED))
+      eq(buf2.handle, buflist_findpat("test", ONLY_LISTED))
       --}
 
       --{ When: We close buf2
@@ -124,7 +123,7 @@ describe('buffer functions', function()
       local buf1 = buflist_new(path1, buffer.BLN_LISTED)
 
       -- Then: buf3 is found since 'file' appears at the end of the name
-      eq(buf3.b_fnum, buflist_findpat("file", ONLY_LISTED))
+      eq(buf3.handle, buflist_findpat("file", ONLY_LISTED))
       --}
 
       close_buffer(NULL, buf1, buffer.DOBUF_WIPE, 0)
@@ -136,7 +135,7 @@ describe('buffer functions', function()
       local buf2 = buflist_new(path2, buffer.BLN_LISTED)
       local buf3 = buflist_new(path3, buffer.BLN_LISTED)
 
-      eq(buf3.b_fnum, buflist_findpat("_test_", ONLY_LISTED))
+      eq(buf3.handle, buflist_findpat("_test_", ONLY_LISTED))
 
       close_buffer(NULL, buf1, buffer.DOBUF_WIPE, 0)
       close_buffer(NULL, buf2, buffer.DOBUF_WIPE, 0)
@@ -148,7 +147,7 @@ describe('buffer functions', function()
       local buf3 = buflist_new(path3, buffer.BLN_LISTED)
 
       -- Then: We should find the buffer when it is given a unique pattern
-      eq(buf3.b_fnum, buflist_findpat("_test_", ONLY_LISTED))
+      eq(buf3.handle, buflist_findpat("_test_", ONLY_LISTED))
       --}
 
       --{ When: We unlist the buffer
@@ -158,7 +157,7 @@ describe('buffer functions', function()
       eq(-1, buflist_findpat("_test_", ONLY_LISTED))
 
       -- And: It should find the buffer when including unlisted buffers
-      eq(buf3.b_fnum, buflist_findpat("_test_", ALLOW_UNLISTED))
+      eq(buf3.handle, buflist_findpat("_test_", ALLOW_UNLISTED))
       --}
 
       --{ When: We wipe the buffer
@@ -176,7 +175,7 @@ describe('buffer functions', function()
       local buf2 = buflist_new(path2, buffer.BLN_LISTED)
 
       -- Then: The first buffer is preferred when both are listed
-      eq(buf1.b_fnum, buflist_findpat("test", ONLY_LISTED))
+      eq(buf1.handle, buflist_findpat("test", ONLY_LISTED))
       --}
 
       --{ When: The first buffer is unlisted
@@ -184,13 +183,13 @@ describe('buffer functions', function()
 
       -- Then: The second buffer is preferred because
       --       unlisted buffers are not allowed
-      eq(buf2.b_fnum, buflist_findpat("test", ONLY_LISTED))
+      eq(buf2.handle, buflist_findpat("test", ONLY_LISTED))
       --}
 
       --{ When: We allow unlisted buffers
       -- Then: The second buffer is still preferred
       --       because listed buffers are preferred to unlisted
-      eq(buf2.b_fnum, buflist_findpat("test", ALLOW_UNLISTED))
+      eq(buf2.handle, buflist_findpat("test", ALLOW_UNLISTED))
       --}
 
       --{ When: We unlist the second buffer
@@ -199,7 +198,7 @@ describe('buffer functions', function()
       -- Then: The first buffer is preferred again
       --       because buf1 matches better which takes precedence
       --       when both buffers have the same listing status.
-      eq(buf1.b_fnum, buflist_findpat("test", ALLOW_UNLISTED))
+      eq(buf1.handle, buflist_findpat("test", ALLOW_UNLISTED))
 
       -- And: Neither buffer is returned when ignoring unlisted
       eq(-1, buflist_findpat("test", ONLY_LISTED))
@@ -211,93 +210,246 @@ describe('buffer functions', function()
   end)
 
   describe('build_stl_str_hl', function()
+    local buffer_byte_size = 100
+    local STL_MAX_ITEM = 80
+    local output_buffer = ''
+
+    -- This function builds the statusline
+    --
+    -- @param arg Optional arguments are:
+    --    .pat The statusline format string
+    --    .fillchar The fill character used in the statusline
+    --    .maximum_cell_count The number of cells available in the statusline
+    local function build_stl_str_hl(arg)
+      output_buffer = to_cstr(string.rep(" ", buffer_byte_size))
+
+      local pat = arg.pat or ''
+      local fillchar = arg.fillchar or (' '):byte()
+      local maximum_cell_count = arg.maximum_cell_count or buffer_byte_size
 
-    local output_buffer = to_cstr(string.rep(" ", 100))
-
-    local build_stl_str_hl = function(pat)
       return buffer.build_stl_str_hl(globals.curwin,
                                      output_buffer,
-                                     100,
+                                     buffer_byte_size,
                                      to_cstr(pat),
                                      false,
-                                     32,
-                                     80,
+                                     fillchar,
+                                     maximum_cell_count,
                                      NULL,
                                      NULL)
     end
 
-    it('should copy plain text', function()
-      local width = build_stl_str_hl("this is a test")
-
-      eq(14, width)
-      eq("this is a test", helpers.ffi.string(output_buffer, width))
-
-    end)
-
-    it('should print no file name', function()
-      local width = build_stl_str_hl("%f")
-
-      eq(9, width)
-      eq("[No Name]", helpers.ffi.string(output_buffer, width))
-
-    end)
-
-    it('should print the relative file name', function()
-      buffer.setfname(globals.curbuf, to_cstr("Makefile"), NULL, 1)
-      local width = build_stl_str_hl("%f")
-
-      eq(8, width)
-      eq("Makefile", helpers.ffi.string(output_buffer, width))
-
-    end)
-
-    it('should print the full file name', function()
-      buffer.setfname(globals.curbuf, to_cstr("Makefile"), NULL, 1)
-
-      local width = build_stl_str_hl("%F")
-
-      assert.is_true(8 < width)
-      neq(NULL, string.find(helpers.ffi.string(output_buffer, width), "Makefile"))
-
-    end)
-
-    it('should print the tail file name', function()
-      buffer.setfname(globals.curbuf, to_cstr("src/nvim/buffer.c"), NULL, 1)
-
-      local width = build_stl_str_hl("%t")
-
-      eq(8, width)
-      eq("buffer.c", helpers.ffi.string(output_buffer, width))
-
-    end)
-
-    it('should print the buffer number', function()
-      buffer.setfname(globals.curbuf, to_cstr("src/nvim/buffer.c"), NULL, 1)
-
-      local width = build_stl_str_hl("%n")
-
-      eq(1, width)
-      eq("1", helpers.ffi.string(output_buffer, width))
-    end)
-
-    it('should print the current line number in the buffer', function()
-      buffer.setfname(globals.curbuf, to_cstr("test/unit/buffer_spec.lua"), NULL, 1)
-
-      local width = build_stl_str_hl("%l")
-
-      eq(1, width)
-      eq("0", helpers.ffi.string(output_buffer, width))
-
-    end)
-
-    it('should print the number of lines in the buffer', function()
-      buffer.setfname(globals.curbuf, to_cstr("test/unit/buffer_spec.lua"), NULL, 1)
-
-      local width = build_stl_str_hl("%L")
+    -- Use this function to simplify testing the comparison between
+    --  the format string and the resulting statusline.
+    --
+    -- @param description The description of what the test should be doing
+    -- @param statusline_cell_count The number of cells available in the statusline
+    -- @param input_stl The format string for the statusline
+    -- @param expected_stl The expected result string for the statusline
+    --
+    -- @param arg Options can be placed in an optional dictionary as the last parameter
+    --    .expected_cell_count The expected number of cells build_stl_str_hl will return
+    --    .expected_byte_length The expected byte length of the string
+    --    .file_name The name of the file to be tested (useful in %f type tests)
+    --    .fillchar The character that will be used to fill any 'extra' space in the stl
+    local function statusline_test (description,
+                                    statusline_cell_count,
+                                    input_stl,
+                                    expected_stl,
+                                    arg)
+
+      -- arg is the optional parameter
+      -- so we either fill in option with arg or an empty dictionary
+      local option = arg or {}
+
+      local fillchar = option.fillchar or (' '):byte()
+      local expected_cell_count = option.expected_cell_count or statusline_cell_count
+      local expected_byte_length = option.expected_byte_length or expected_cell_count
+
+      it(description, function()
+        if option.file_name then
+          buffer.setfname(globals.curbuf, to_cstr(option.file_name), NULL, 1)
+        else
+          buffer.setfname(globals.curbuf, nil, NULL, 1)
+        end
+
+        local result_cell_count = build_stl_str_hl{pat=input_stl,
+                                                   maximum_cell_count=statusline_cell_count,
+                                                   fillchar=fillchar}
+
+        eq(expected_stl, get_str(output_buffer, expected_byte_length))
+        eq(expected_cell_count, result_cell_count)
+      end)
+    end
 
-      eq(1, width)
-      eq("1", helpers.ffi.string(output_buffer, width))
+    -- file name testing
+    statusline_test('should print no file name', 10,
+      '%f',                  '[No Name]',
+      {expected_cell_count=9})
+    statusline_test('should print the relative file name', 30,
+      '%f',                  'test/unit/buffer_spec.lua',
+      {file_name='test/unit/buffer_spec.lua', expected_cell_count=25})
+    statusline_test('should print the full file name', 40,
+      '%F',                  '/test/unit/buffer_spec.lua',
+      {file_name='/test/unit/buffer_spec.lua', expected_cell_count=26})
+
+    -- fillchar testing
+    statusline_test('should handle `!` as a fillchar', 10,
+      'abcde%=',             'abcde!!!!!',
+      {fillchar=('!'):byte()})
+    statusline_test('should handle `~` as a fillchar', 10,
+      '%=abcde',             '~~~~~abcde',
+      {fillchar=('~'):byte()})
+    statusline_test('should put fillchar `!` in between text', 10,
+      'abc%=def',            'abc!!!!def',
+      {fillchar=('!'):byte()})
+    statusline_test('should put fillchar `~` in between text', 10,
+      'abc%=def',            'abc~~~~def',
+      {fillchar=('~'):byte()})
+    statusline_test('should print the tail file name', 80,
+      '%t',                  'buffer_spec.lua',
+      {file_name='test/unit/buffer_spec.lua', expected_cell_count=15})
+
+    -- standard text testing
+    statusline_test('should copy plain text', 80,
+      'this is a test',      'this is a test',
+      {expected_cell_count=14})
+
+    -- line number testing
+    statusline_test('should print the buffer number', 80,
+      '%n',                  '1',
+      {expected_cell_count=1})
+    statusline_test('should print the current line number in the buffer', 80,
+      '%l',                  '0',
+      {expected_cell_count=1})
+    statusline_test('should print the number of lines in the buffer', 80,
+      '%L',                  '1',
+      {expected_cell_count=1})
+
+    -- truncation testing
+    statusline_test('should truncate when standard text pattern is too long', 10,
+      '0123456789abcde',     '<6789abcde')
+    statusline_test('should truncate when using =', 10,
+      'abcdef%=ghijkl',      'abcdef<jkl')
+    statusline_test('should truncate centered text when using ==', 10,
+      'abcde%=gone%=fghij',  'abcde<ghij')
+    statusline_test('should respect the `<` marker', 10,
+      'abc%<defghijkl',      'abc<ghijkl')
+    statusline_test('should truncate at `<` with one `=`, test 1', 10,
+      'abc%<def%=ghijklmno', 'abc<jklmno')
+    statusline_test('should truncate at `<` with one `=`, test 2', 10,
+      'abcdef%=ghijkl%<mno', 'abcdefghi>')
+    statusline_test('should truncate at `<` with one `=`, test 3', 10,
+      'abc%<def%=ghijklmno', 'abc<jklmno')
+    statusline_test('should truncate at `<` with one `=`, test 4', 10,
+      'abc%<def%=ghij',     'abcdefghij')
+    statusline_test('should truncate at `<` with one `=`, test 4', 10,
+      'abc%<def%=ghijk',     'abc<fghijk')
+
+    statusline_test('should truncate at `<` with many `=`, test 4', 10,
+      'ab%<cdef%=g%=h%=ijk', 'ab<efghijk')
+
+    statusline_test('should truncate at the first `<`', 10,
+      'abc%<def%<ghijklm',   'abc<hijklm')
+
+    -- alignment testing
+    statusline_test('should right align when using =', 20,
+      'neo%=vim',            'neo              vim')
+    statusline_test('should, when possible, center text when using %=text%=', 20,
+      'abc%=neovim%=def',    'abc    neovim    def')
+    statusline_test('should handle uneven spacing in the buffer when using %=text%=', 20,
+      'abc%=neo_vim%=def',   'abc   neo_vim    def')
+    statusline_test('should have equal spaces even with non-equal sides when using =', 20,
+      'foobar%=test%=baz',   'foobar   test    baz')
+    statusline_test('should have equal spaces even with longer right side when using =', 20,
+      'a%=test%=longtext',   'a   test    longtext')
+    statusline_test('should handle an empty left side when using ==', 20,
+      '%=test%=baz',         '      test       baz')
+    statusline_test('should handle an empty right side when using ==', 20,
+      'foobar%=test%=',      'foobar     test     ')
+    statusline_test('should handle consecutive empty ==', 20,
+      '%=%=test%=',          '          test      ')
+    statusline_test('should handle an = alone', 20,
+      '%=',                  '                    ')
+    statusline_test('should right align text when it is alone with =', 20,
+      '%=foo',               '                 foo')
+    statusline_test('should left align text when it is alone with =', 20,
+      'foo%=',               'foo                 ')
+
+    statusline_test('should approximately center text when using %=text%=', 21,
+      'abc%=neovim%=def',    'abc    neovim     def')
+    statusline_test('should completely fill the buffer when using %=text%=', 21,
+      'abc%=neo_vim%=def',   'abc    neo_vim    def')
+    statusline_test('should have equal spaces even with non-equal sides when using =', 21,
+      'foobar%=test%=baz',   'foobar    test    baz')
+    statusline_test('should have equal spaces even with longer right side when using =', 21,
+      'a%=test%=longtext',   'a    test    longtext')
+    statusline_test('should handle an empty left side when using ==', 21,
+      '%=test%=baz',         '       test       baz')
+    statusline_test('should handle an empty right side when using ==', 21,
+      'foobar%=test%=',      'foobar     test      ')
+
+    statusline_test('should quadrant the text when using 3 %=', 40,
+      'abcd%=n%=eovim%=ef',  'abcd         n         eovim          ef')
+    statusline_test('should work well with %t', 40,
+      '%t%=right_aligned',   'buffer_spec.lua            right_aligned',
+      {file_name='test/unit/buffer_spec.lua'})
+    statusline_test('should work well with %t and regular text', 40,
+      'l%=m_l %t m_r%=r',    'l       m_l buffer_spec.lua m_r        r',
+      {file_name='test/unit/buffer_spec.lua'})
+    statusline_test('should work well with %=, %t, %L, and %l', 40,
+      '%t %= %L %= %l',      'buffer_spec.lua           1            0',
+      {file_name='test/unit/buffer_spec.lua'})
+
+    statusline_test('should quadrant the text when using 3 %=', 41,
+      'abcd%=n%=eovim%=ef',  'abcd         n         eovim           ef')
+    statusline_test('should work well with %t', 41,
+      '%t%=right_aligned',   'buffer_spec.lua             right_aligned',
+      {file_name='test/unit/buffer_spec.lua'})
+    statusline_test('should work well with %t and regular text', 41,
+      'l%=m_l %t m_r%=r',    'l        m_l buffer_spec.lua m_r        r',
+      {file_name='test/unit/buffer_spec.lua'})
+    statusline_test('should work well with %=, %t, %L, and %l', 41,
+      '%t %= %L %= %l',      'buffer_spec.lua            1            0',
+      {file_name='test/unit/buffer_spec.lua'})
+
+    statusline_test('should work with 10 %=', 50,
+      'aaaa%=b%=c%=d%=e%=fg%=hi%=jk%=lmnop%=qrstuv%=wxyz',
+      'aaaa  b  c  d  e  fg  hi  jk  lmnop  qrstuv   wxyz')
+
+    -- maximum stl item testing
+    statusline_test('should handle a much larger amount of = than buffer locations', 20,
+      ('%='):rep(STL_MAX_ITEM - 1),
+      '                    ') -- Should be fine, because within limit
+    statusline_test('should handle a much larger amount of = than stl max item', 20,
+      ('%='):rep(STL_MAX_ITEM + 1),
+      '                E541') -- Should show the VIM error
+    statusline_test('should handle many extra characters', 20,
+      'a' .. ('a'):rep(STL_MAX_ITEM * 4),
+      '<aaaaaaaaaaaaaaaaaaa') -- Does not show the error because there are no items
+    statusline_test('should handle almost maximum of characters and flags', 20,
+      'a' .. ('%=a'):rep(STL_MAX_ITEM - 1),
+      'a<aaaaaaaaaaaaaaaaaa') -- Should not show the VIM error
+    statusline_test('should handle many extra characters and flags', 20,
+      'a' .. ('%=a'):rep(STL_MAX_ITEM),
+      'a<aaaaaaaaaaaaa E541') -- Should show the VIM error
+    statusline_test('should handle many extra characters and flags', 20,
+      'a' .. ('%=a'):rep(STL_MAX_ITEM * 2),
+      'a<aaaaaaaaaaaaa E541') -- Should show the VIM error
+    statusline_test('should handle many extra characters and flags with truncation', 20,
+      'aaa%<' .. ('%=a'):rep(STL_MAX_ITEM),
+      'aaa<aaaaaaaaaaa E541') -- Should show the VIM error
+    statusline_test('should handle many characters and flags before and after truncation', 20,
+      'a%=a%=a%<' .. ('%=a'):rep(STL_MAX_ITEM),
+      'aaa<aaaaaaaaaaa E541') -- Should show the VIM error
+
+
+    -- multi-byte testing
+    statusline_test('should handle multibyte characters', 10,
+      'Ĉ%=x',                'Ĉ        x',
+      {expected_byte_length=11})
+    statusline_test('should handle multibyte characters and different fillchars', 10,
+      'Ą%=mid%=end',         'Ą@mid@@end',
+      {fillchar=('@'):byte(), expected_byte_length=11})
 
-    end)
   end)
 end)
diff --git a/test/unit/eval/decode_spec.lua b/test/unit/eval/decode_spec.lua
index d94d809c14..742b754d8a 100644
--- a/test/unit/eval/decode_spec.lua
+++ b/test/unit/eval/decode_spec.lua
@@ -32,7 +32,7 @@ describe('json_decode_string()', function()
   it('does not overflow when running with `n…`, `t…`, `f…`', function()
     local rettv = ffi.new('typval_T', {v_type=decode.VAR_UNKNOWN})
     decode.emsg_silent = 1
-    -- This will not crash, but if `len` argument will be ignored it will parse 
+    -- This will not crash, but if `len` argument will be ignored it will parse
     -- `null` as `null` and if not it will parse `null` as `n`.
     eq(0, decode.json_decode_string('null', 1, rettv))
     eq(decode.VAR_UNKNOWN, rettv.v_type)
diff --git a/test/unit/eval/encode_spec.lua b/test/unit/eval/encode_spec.lua
index f151a191fb..98fc8305e0 100644
--- a/test/unit/eval/encode_spec.lua
+++ b/test/unit/eval/encode_spec.lua
@@ -27,74 +27,74 @@ describe('encode_list_write()', function()
   it('writes ASCII string literal with printable characters', function()
     local l = list()
     eq(0, encode_list_write(l, 'abc'))
-    eq({[type_key]=list_type, 'abc'}, lst2tbl(l))
+    eq({'abc'}, lst2tbl(l))
   end)
 
   it('writes string starting with NL', function()
     local l = list()
     eq(0, encode_list_write(l, '\nabc'))
-    eq({[type_key]=list_type, null_string, 'abc'}, lst2tbl(l))
+    eq({null_string, 'abc'}, lst2tbl(l))
   end)
 
   it('writes string starting with NL twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\nabc'))
-    eq({[type_key]=list_type, null_string, 'abc'}, lst2tbl(l))
+    eq({null_string, 'abc'}, lst2tbl(l))
     eq(0, encode_list_write(l, '\nabc'))
-    eq({[type_key]=list_type, null_string, 'abc', 'abc'}, lst2tbl(l))
+    eq({null_string, 'abc', 'abc'}, lst2tbl(l))
   end)
 
   it('writes string ending with NL', function()
     local l = list()
     eq(0, encode_list_write(l, 'abc\n'))
-    eq({[type_key]=list_type, 'abc', null_string}, lst2tbl(l))
+    eq({'abc', null_string}, lst2tbl(l))
   end)
 
   it('writes string ending with NL twice', function()
     local l = list()
     eq(0, encode_list_write(l, 'abc\n'))
-    eq({[type_key]=list_type, 'abc', null_string}, lst2tbl(l))
+    eq({'abc', null_string}, lst2tbl(l))
     eq(0, encode_list_write(l, 'abc\n'))
-    eq({[type_key]=list_type, 'abc', 'abc', null_string}, lst2tbl(l))
+    eq({'abc', 'abc', null_string}, lst2tbl(l))
   end)
 
   it('writes string starting, ending and containing NL twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\na\nb\n'))
-    eq({[type_key]=list_type, null_string, 'a', 'b', null_string}, lst2tbl(l))
+    eq({null_string, 'a', 'b', null_string}, lst2tbl(l))
     eq(0, encode_list_write(l, '\na\nb\n'))
-    eq({[type_key]=list_type, null_string, 'a', 'b', null_string, 'a', 'b', null_string}, lst2tbl(l))
+    eq({null_string, 'a', 'b', null_string, 'a', 'b', null_string}, lst2tbl(l))
   end)
 
   it('writes string starting, ending and containing NUL with NL between twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\0\n\0\n\0'))
-    eq({[type_key]=list_type, '\n', '\n', '\n'}, lst2tbl(l))
+    eq({'\n', '\n', '\n'}, lst2tbl(l))
     eq(0, encode_list_write(l, '\0\n\0\n\0'))
-    eq({[type_key]=list_type, '\n', '\n', '\n\n', '\n', '\n'}, lst2tbl(l))
+    eq({'\n', '\n', '\n\n', '\n', '\n'}, lst2tbl(l))
   end)
 
   it('writes string starting, ending and containing NL with NUL between twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\n\0\n\0\n'))
-    eq({[type_key]=list_type, null_string, '\n', '\n', null_string}, lst2tbl(l))
+    eq({null_string, '\n', '\n', null_string}, lst2tbl(l))
     eq(0, encode_list_write(l, '\n\0\n\0\n'))
-    eq({[type_key]=list_type, null_string, '\n', '\n', null_string, '\n', '\n', null_string}, lst2tbl(l))
+    eq({null_string, '\n', '\n', null_string, '\n', '\n', null_string}, lst2tbl(l))
   end)
 
   it('writes string containing a single NL twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\n'))
-    eq({[type_key]=list_type, null_string, null_string}, lst2tbl(l))
+    eq({null_string, null_string}, lst2tbl(l))
     eq(0, encode_list_write(l, '\n'))
-    eq({[type_key]=list_type, null_string, null_string, null_string}, lst2tbl(l))
+    eq({null_string, null_string, null_string}, lst2tbl(l))
   end)
 
   it('writes string containing a few NLs twice', function()
     local l = list()
     eq(0, encode_list_write(l, '\n\n\n'))
-    eq({[type_key]=list_type, null_string, null_string, null_string, null_string}, lst2tbl(l))
+    eq({null_string, null_string, null_string, null_string}, lst2tbl(l))
     eq(0, encode_list_write(l, '\n\n\n'))
-    eq({[type_key]=list_type, null_string, null_string, null_string, null_string, null_string, null_string, null_string}, lst2tbl(l))
+    eq({null_string, null_string, null_string, null_string, null_string, null_string, null_string}, lst2tbl(l))
   end)
 end)
diff --git a/test/unit/eval/helpers.lua b/test/unit/eval/helpers.lua
index 2367f03e0d..c3c27e4fed 100644
--- a/test/unit/eval/helpers.lua
+++ b/test/unit/eval/helpers.lua
@@ -5,12 +5,32 @@ local to_cstr = helpers.to_cstr
 local ffi = helpers.ffi
 local eq = helpers.eq
 
-local eval = cimport('./src/nvim/eval.h', './src/nvim/eval_defs.h')
+local eval = cimport('./src/nvim/eval.h', './src/nvim/eval_defs.h',
+                     './src/nvim/hashtab.h')
 
 local null_string = {[true]='NULL string'}
 local null_list = {[true]='NULL list'}
+local null_dict = {[true]='NULL dict'}
 local type_key = {[true]='type key'}
 local list_type = {[true]='list type'}
+local dict_type = {[true]='dict type'}
+local func_type = {[true]='func type'}
+local int_type = {[true]='int type'}
+local flt_type = {[true]='flt type'}
+
+local nil_value = {[true]='nil'}
+
+local lua2typvalt
+
+local function li_alloc(nogc)
+  local gcfunc = eval.listitem_free
+  if nogc then gcfunc = nil end
+  local li = ffi.gc(eval.listitem_alloc(), gcfunc)
+  li.li_next = nil
+  li.li_prev = nil
+  li.li_tv = {v_type=eval.VAR_UNKNOWN, v_lock=eval.VAR_UNLOCKED}
+  return li
+end
 
 local function list(...)
   local ret = ffi.gc(eval.list_alloc(), eval.list_unref)
@@ -18,55 +38,380 @@ local function list(...)
   ret.lv_refcount = 1
   for i = 1, select('#', ...) do
     local val = select(i, ...)
-    local typ = type(val)
-    if typ == 'string' then
-      eval.list_append_string(ret, to_cstr(val))
-    elseif typ == 'table' and val == null_string then
-      eval.list_append_string(ret, nil)
-    elseif typ == 'table' and val == null_list then
-      eval.list_append_list(ret, nil)
-    elseif typ == 'table' and val[type_key] == list_type then
-      local itemlist = ffi.gc(list(table.unpack(val)), nil)
-      eq(1, itemlist.lv_refcount)
-      itemlist.lv_refcount = 0
-      eval.list_append_list(ret, itemlist)
+    local li_tv = ffi.gc(lua2typvalt(val), nil)
+    local li = li_alloc(true)
+    li.li_tv = li_tv
+    eval.tv_list_append(ret, li)
+  end
+  return ret
+end
+
+local special_tab = {
+  [eval.kSpecialVarFalse] = false,
+  [eval.kSpecialVarNull] = nil_value,
+  [eval.kSpecialVarTrue] = true,
+}
+
+local ptr2key = function(ptr)
+  return tostring(ptr)
+end
+
+local lst2tbl
+local dct2tbl
+
+local typvalt2lua
+local typvalt2lua_tab
+
+typvalt2lua_tab = {
+  [tonumber(eval.VAR_SPECIAL)] = function(t)
+    return special_tab[t.vval.v_special]
+  end,
+  [tonumber(eval.VAR_NUMBER)] = function(t)
+    return {[type_key]=int_type, value=tonumber(t.vval.v_number)}
+  end,
+  [tonumber(eval.VAR_FLOAT)] = function(t)
+    return tonumber(t.vval.v_float)
+  end,
+  [tonumber(eval.VAR_STRING)] = function(t)
+    local str = t.vval.v_string
+    if str == nil then
+      return null_string
     else
-      assert(false, 'Not implemented yet')
+      return ffi.string(str)
+    end
+  end,
+  [tonumber(eval.VAR_LIST)] = function(t, processed)
+    return lst2tbl(t.vval.v_list, processed)
+  end,
+  [tonumber(eval.VAR_DICT)] = function(t, processed)
+    return dct2tbl(t.vval.v_dict, processed)
+  end,
+  [tonumber(eval.VAR_FUNC)] = function(t, processed)
+    return {[type_key]=func_type, value=typvalt2lua_tab[eval.VAR_STRING](t, processed or {})}
+  end,
+  [tonumber(eval.VAR_PARTIAL)] = function(t, processed)
+    local p_key = ptr2key(t)
+    if processed[p_key] then
+      return processed[p_key]
+    end
+    local pt = t.vval.v_partial
+    local value, auto, dict, argv = nil, nil, nil, nil
+    if pt ~= nil then
+      value = ffi.string(pt.pt_name)
+      auto = pt.pt_auto and true or nil
+      argv = {}
+      for i = 1, pt.pt_argc do
+        argv[i] = typvalt2lua(pt.pt_argv[i - 1], processed)
+      end
+      if pt.pt_dict ~= nil then
+        dict = dct2tbl(pt.pt_dict)
+      end
+    end
+    return {
+      [type_key]=func_type,
+      value=value,
+      auto=auto,
+      args=argv,
+      dict=dict,
+    }
+  end,
+}
+
+typvalt2lua = function(t, processed)
+  return ((typvalt2lua_tab[tonumber(t.v_type)] or function(t_inner)
+    assert(false, 'Converting ' .. tonumber(t_inner.v_type) .. ' was not implemented yet')
+  end)(t, processed or {}))
+end
+
+local function list_iter(l)
+  local init_s = {
+    idx=0,
+    li=l.lv_first,
+  }
+  local function f(s, _)
+    -- (listitem_T *) NULL is equal to nil, but yet it is not false.
+    if s.li == nil then
+      return nil
     end
+    local ret_li = s.li
+    s.li = s.li.li_next
+    s.idx = s.idx + 1
+    return s.idx, ret_li
+  end
+  return f, init_s, nil
+end
+
+local function list_items(l)
+  local ret = {}
+  for i, li in list_iter(l) do
+    ret[i] = li
   end
   return ret
 end
 
-local lst2tbl = function(l)
-  local ret = {[type_key]=list_type}
+lst2tbl = function(l, processed)
   if l == nil then
+    return null_list
+  end
+  processed = processed or {}
+  local p_key = ptr2key(l)
+  if processed[p_key] then
+    return processed[p_key]
+  end
+  local ret = {[type_key]=list_type}
+  processed[p_key] = ret
+  for i, li in list_iter(l) do
+    ret[i] = typvalt2lua(li.li_tv, processed)
+  end
+  if ret[1] then
+    ret[type_key] = nil
+  end
+  return ret
+end
+
+local hi_key_removed = eval._hash_key_removed()
+
+local function dict_iter(d, return_hi)
+  local init_s = {
+    todo=d.dv_hashtab.ht_used,
+    hi=d.dv_hashtab.ht_array,
+  }
+  local function f(s, _)
+    if s.todo == 0 then return nil end
+    while s.todo > 0 do
+      if s.hi.hi_key ~= nil and s.hi.hi_key ~= hi_key_removed then
+        local key = ffi.string(s.hi.hi_key)
+        local ret
+        if return_hi then
+          ret = s.hi
+        else
+          ret = ffi.cast('dictitem_T*',
+                         s.hi.hi_key - ffi.offsetof('dictitem_T', 'di_key'))
+        end
+        s.todo = s.todo - 1
+        s.hi = s.hi + 1
+        return key, ret
+      end
+      s.hi = s.hi + 1
+    end
+  end
+  return f, init_s, nil
+end
+
+local function first_di(d)
+  local f, init_s, v = dict_iter(d)
+  return select(2, f(init_s, v))
+end
+
+local function dict_items(d)
+  local ret = {[0]=0}
+  for k, hi in dict_iter(d) do
+    ret[k] = hi
+    ret[0] = ret[0] + 1
+    ret[ret[0]] = hi
+  end
+  return ret
+end
+
+dct2tbl = function(d, processed)
+  if d == nil then
+    return null_dict
+  end
+  processed = processed or {}
+  local p_key = ptr2key(d)
+  if processed[p_key] then
+    return processed[p_key]
+  end
+  local ret = {}
+  processed[p_key] = ret
+  for k, di in dict_iter(d) do
+    ret[k] = typvalt2lua(di.di_tv, processed)
+  end
+  return ret
+end
+
+local typvalt = function(typ, vval)
+  if typ == nil then
+    typ = eval.VAR_UNKNOWN
+  elseif type(typ) == 'string' then
+    typ = eval[typ]
+  end
+  return ffi.gc(ffi.new('typval_T', {v_type=typ, vval=vval}), eval.clear_tv)
+end
+
+local lua2typvalt_type_tab = {
+  [int_type] = function(l, _)
+    return typvalt(eval.VAR_NUMBER, {v_number=l.value})
+  end,
+  [flt_type] = function(l, processed)
+    return lua2typvalt(l.value, processed)
+  end,
+  [list_type] = function(l, processed)
+    if processed[l] then
+      processed[l].lv_refcount = processed[l].lv_refcount + 1
+      return typvalt(eval.VAR_LIST, {v_list=processed[l]})
+    end
+    local lst = eval.list_alloc()
+    lst.lv_refcount = 1
+    processed[l] = lst
+    local ret = typvalt(eval.VAR_LIST, {v_list=lst})
+    for i = 1, #l do
+      local item_tv = ffi.gc(lua2typvalt(l[i], processed), nil)
+      eval.list_append_tv(lst, item_tv)
+      eval.clear_tv(item_tv)
+    end
+    return ret
+  end,
+  [dict_type] = function(l, processed)
+    if processed[l] then
+      processed[l].dv_refcount = processed[l].dv_refcount + 1
+      return typvalt(eval.VAR_DICT, {v_dict=processed[l]})
+    end
+    local dct = eval.dict_alloc()
+    dct.dv_refcount = 1
+    processed[l] = dct
+    local ret = typvalt(eval.VAR_DICT, {v_dict=dct})
+    for k, v in pairs(l) do
+      if type(k) == 'string' then
+        local di = eval.dictitem_alloc(to_cstr(k))
+        local val_tv = ffi.gc(lua2typvalt(v, processed), nil)
+        eval.copy_tv(val_tv, di.di_tv)
+        eval.clear_tv(val_tv)
+        eval.dict_add(dct, di)
+      end
+    end
     return ret
+  end,
+  [func_type] = function(l, processed)
+    if processed[l] then
+      processed[l].pt_refcount = processed[l].pt_refcount + 1
+      return typvalt(eval.VAR_PARTIAL, {v_partial=processed[l]})
+    end
+    if l.args or l.dict then
+      local pt = ffi.gc(ffi.cast('partial_T*', eval.xmalloc(ffi.sizeof('partial_T'))), nil)
+      processed[l] = pt
+      local argv = nil
+      if l.args and #l.args > 0 then
+        argv = ffi.gc(ffi.cast('typval_T*', eval.xmalloc(ffi.sizeof('typval_T') * #l.args)), nil)
+        for i, arg in ipairs(l.args) do
+          local arg_tv = ffi.gc(lua2typvalt(arg, processed), nil)
+          eval.copy_tv(arg_tv, argv[i - 1])
+          eval.clear_tv(arg_tv)
+        end
+      end
+      local dict = nil
+      if l.dict then
+        local dict_tv = ffi.gc(lua2typvalt(l.dict, processed), nil)
+        assert(dict_tv.v_type == eval.VAR_DICT)
+        dict = dict_tv.vval.v_dict
+      end
+      pt.pt_refcount = 1
+      pt.pt_name = eval.xmemdupz(to_cstr(l.value), #l.value)
+      pt.pt_auto = not not l.auto
+      pt.pt_argc = l.args and #l.args or 0
+      pt.pt_argv = argv
+      pt.pt_dict = dict
+      return typvalt(eval.VAR_PARTIAL, {v_partial=pt})
+    else
+      return typvalt(eval.VAR_FUNC, {
+        v_string=eval.xmemdupz(to_cstr(l.value), #l.value)
+      })
+    end
+  end,
+}
+
+local special_vals = {
+  [null_string] = {eval.VAR_STRING, {v_string=ffi.cast('char_u*', nil)}},
+  [null_list] = {eval.VAR_LIST, {v_list=ffi.cast('list_T*', nil)}},
+  [null_dict] = {eval.VAR_DICT, {v_dict=ffi.cast('dict_T*', nil)}},
+  [nil_value] = {eval.VAR_SPECIAL, {v_special=eval.kSpecialVarNull}},
+  [true] = {eval.VAR_SPECIAL, {v_special=eval.kSpecialVarTrue}},
+  [false] = {eval.VAR_SPECIAL, {v_special=eval.kSpecialVarFalse}},
+}
+
+for k, v in pairs(special_vals) do
+  local tmp = function(typ, vval)
+    special_vals[k] = function()
+      return typvalt(typ, vval)
+    end
   end
-  local li = l.lv_first
-  -- (listitem_T *) NULL is equal to nil, but yet it is not false.
-  while li ~= nil do
-    local typ = li.li_tv.v_type
-    if typ == eval.VAR_STRING then
-      local str = li.li_tv.vval.v_string
-      if str == nil then
-        ret[#ret + 1] = null_string
+  tmp(v[1], v[2])
+end
+
+lua2typvalt = function(l, processed)
+  processed = processed or {}
+  if l == nil or l == nil_value then
+    return special_vals[nil_value]()
+  elseif special_vals[l] then
+    return special_vals[l]()
+  elseif type(l) == 'table' then
+    if l[type_key] then
+      return lua2typvalt_type_tab[l[type_key]](l, processed)
+    else
+      if l[1] then
+        return lua2typvalt_type_tab[list_type](l, processed)
       else
-        ret[#ret + 1] = ffi.string(str)
+        return lua2typvalt_type_tab[dict_type](l, processed)
       end
-    else
-      assert(false, 'Not implemented yet')
     end
-    li = li.li_next
+  elseif type(l) == 'number' then
+    return typvalt(eval.VAR_FLOAT, {v_float=l})
+  elseif type(l) == 'string' then
+    return typvalt(eval.VAR_STRING, {v_string=eval.xmemdupz(to_cstr(l), #l)})
+  elseif type(l) == 'cdata' then
+    local tv = typvalt(eval.VAR_UNKNOWN)
+    eval.tv_copy(l, tv)
+    return tv
   end
-  return ret
 end
 
+local function void(ptr)
+  return ffi.cast('void*', ptr)
+end
+
+local alloc_logging_helpers = {
+  list = function(l) return {func='calloc', args={1, ffi.sizeof('list_T')}, ret=void(l)} end,
+  li = function(li) return {func='malloc', args={ffi.sizeof('listitem_T')}, ret=void(li)} end,
+  dict = function(d) return {func='malloc', args={ffi.sizeof('dict_T')}, ret=void(d)} end,
+  di = function(di, size)
+    return {func='malloc', args={ffi.offsetof('dictitem_T', 'di_key') + size + 1}, ret=void(di)}
+  end,
+  str = function(s, size) return {func='malloc', args={size + 1}, ret=void(s)} end,
+
+  freed = function(p) return {func='free', args={p and void(p)}} end,
+}
+
 return {
   null_string=null_string,
   null_list=null_list,
+  null_dict=null_dict,
   list_type=list_type,
+  dict_type=dict_type,
+  func_type=func_type,
+  int_type=int_type,
+  flt_type=flt_type,
+
+  nil_value=nil_value,
+
   type_key=type_key,
 
   list=list,
   lst2tbl=lst2tbl,
+  dct2tbl=dct2tbl,
+
+  lua2typvalt=lua2typvalt,
+  typvalt2lua=typvalt2lua,
+
+  typvalt=typvalt,
+
+  li_alloc=li_alloc,
+
+  dict_iter=dict_iter,
+  list_iter=list_iter,
+  first_di=first_di,
+
+  alloc_logging_helpers=alloc_logging_helpers,
+
+  list_items=list_items,
+  dict_items=dict_items,
 }
diff --git a/test/unit/eval/tv_clear_spec.lua b/test/unit/eval/tv_clear_spec.lua
new file mode 100644
index 0000000000..96eccdbd71
--- /dev/null
+++ b/test/unit/eval/tv_clear_spec.lua
@@ -0,0 +1,127 @@
+local helpers = require('test.unit.helpers')
+local eval_helpers = require('test.unit.eval.helpers')
+
+local alloc_log_new = helpers.alloc_log_new
+local cimport = helpers.cimport
+local ffi = helpers.ffi
+local eq = helpers.eq
+
+local a = eval_helpers.alloc_logging_helpers
+local type_key = eval_helpers.type_key
+local list_type = eval_helpers.list_type
+local list_items = eval_helpers.list_items
+local dict_items = eval_helpers.dict_items
+local lua2typvalt = eval_helpers.lua2typvalt
+
+local lib = cimport('./src/nvim/eval_defs.h', './src/nvim/eval.h')
+
+local alloc_log = alloc_log_new()
+
+before_each(function()
+  alloc_log:before_each()
+end)
+
+after_each(function()
+  alloc_log:after_each()
+end)
+
+describe('clear_tv()', function()
+  it('successfully frees all lists in [&l [1], *l, *l]', function()
+    local l_inner = {1}
+    local list = {l_inner, l_inner, l_inner}
+    local list_tv = ffi.gc(lua2typvalt(list), nil)
+    local list_p = list_tv.vval.v_list
+    local lis = list_items(list_p)
+    local list_inner_p = lis[1].li_tv.vval.v_list
+    local lis_inner = list_items(list_inner_p)
+    alloc_log:check({
+      a.list(list_p),
+      a.list(list_inner_p),
+      a.li(lis_inner[1]),
+      a.li(lis[1]),
+      a.li(lis[2]),
+      a.li(lis[3]),
+    })
+    eq(3, list_inner_p.lv_refcount)
+    lib.clear_tv(list_tv)
+    alloc_log:check({
+      a.freed(lis_inner[1]),
+      a.freed(list_inner_p),
+      a.freed(lis[1]),
+      a.freed(lis[2]),
+      a.freed(lis[3]),
+      a.freed(list_p),
+    })
+  end)
+  it('successfully frees all lists in [&l [], *l, *l]', function()
+    local l_inner = {[type_key]=list_type}
+    local list = {l_inner, l_inner, l_inner}
+    local list_tv = ffi.gc(lua2typvalt(list), nil)
+    local list_p = list_tv.vval.v_list
+    local lis = list_items(list_p)
+    local list_inner_p = lis[1].li_tv.vval.v_list
+    alloc_log:check({
+      a.list(list_p),
+      a.list(list_inner_p),
+      a.li(lis[1]),
+      a.li(lis[2]),
+      a.li(lis[3]),
+    })
+    eq(3, list_inner_p.lv_refcount)
+    lib.clear_tv(list_tv)
+    alloc_log:check({
+      a.freed(list_inner_p),
+      a.freed(lis[1]),
+      a.freed(lis[2]),
+      a.freed(lis[3]),
+      a.freed(list_p),
+    })
+  end)
+  it('successfully frees all dictionaries in [&d {}, *d]', function()
+    local d_inner = {}
+    local list = {d_inner, d_inner}
+    local list_tv = ffi.gc(lua2typvalt(list), nil)
+    local list_p = list_tv.vval.v_list
+    local lis = list_items(list_p)
+    local dict_inner_p = lis[1].li_tv.vval.v_dict
+    alloc_log:check({
+      a.list(list_p),
+      a.dict(dict_inner_p),
+      a.li(lis[1]),
+      a.li(lis[2]),
+    })
+    eq(2, dict_inner_p.dv_refcount)
+    lib.clear_tv(list_tv)
+    alloc_log:check({
+      a.freed(dict_inner_p),
+      a.freed(lis[1]),
+      a.freed(lis[2]),
+      a.freed(list_p),
+    })
+  end)
+  it('successfully frees all dictionaries in [&d {a: 1}, *d]', function()
+    local d_inner = {a=1}
+    local list = {d_inner, d_inner}
+    local list_tv = ffi.gc(lua2typvalt(list), nil)
+    local list_p = list_tv.vval.v_list
+    local lis = list_items(list_p)
+    local dict_inner_p = lis[1].li_tv.vval.v_dict
+    local dis = dict_items(dict_inner_p)
+    alloc_log:check({
+      a.list(list_p),
+      a.dict(dict_inner_p),
+      a.di(dis.a, 1),
+      a.li(lis[1]),
+      a.li(lis[2]),
+    })
+    eq(2, dict_inner_p.dv_refcount)
+    lib.clear_tv(list_tv)
+    alloc_log:check({
+      a.freed(dis.a),
+      a.freed(dict_inner_p),
+      a.freed(lis[1]),
+      a.freed(lis[2]),
+      a.freed(list_p),
+    })
+  end)
+end)
diff --git a/test/unit/fixtures/multiqueue.c b/test/unit/fixtures/multiqueue.c
new file mode 100644
index 0000000000..da63e55919
--- /dev/null
+++ b/test/unit/fixtures/multiqueue.c
@@ -0,0 +1,16 @@
+#include <string.h>
+#include <stdlib.h>
+#include "nvim/event/multiqueue.h"
+#include "multiqueue.h"
+
+
+void ut_multiqueue_put(MultiQueue *this, const char *str)
+{
+  multiqueue_put(this, NULL, 1, str);
+}
+
+const char *ut_multiqueue_get(MultiQueue *this)
+{
+  Event event = multiqueue_get(this);
+  return event.argv[0];
+}
diff --git a/test/unit/fixtures/multiqueue.h b/test/unit/fixtures/multiqueue.h
new file mode 100644
index 0000000000..78a3a89063
--- /dev/null
+++ b/test/unit/fixtures/multiqueue.h
@@ -0,0 +1,4 @@
+#include "nvim/event/multiqueue.h"
+
+void ut_multiqueue_put(MultiQueue *queue, const char *str);
+const char *ut_multiqueue_get(MultiQueue *queue);
diff --git a/test/unit/fixtures/queue.c b/test/unit/fixtures/queue.c
deleted file mode 100644
index bbb6274b21..0000000000
--- a/test/unit/fixtures/queue.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-#include "nvim/event/queue.h"
-#include "queue.h"
-
-
-void ut_queue_put(Queue *queue, const char *str)
-{
-  queue_put(queue, NULL, 1, str);
-}
-
-const char *ut_queue_get(Queue *queue)
-{
-  Event event = queue_get(queue);
-  return event.argv[0];
-}
diff --git a/test/unit/fixtures/queue.h b/test/unit/fixtures/queue.h
deleted file mode 100644
index ae949c9f29..0000000000
--- a/test/unit/fixtures/queue.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "nvim/event/queue.h"
-
-void ut_queue_put(Queue *queue, const char *str);
-const char *ut_queue_get(Queue *queue);
diff --git a/test/unit/formatc.lua b/test/unit/formatc.lua
index 00637e0b8d..e288081960 100644
--- a/test/unit/formatc.lua
+++ b/test/unit/formatc.lua
@@ -219,13 +219,7 @@ local function standalone(...)  -- luacheck: ignore
   Preprocess.add_to_include_path('./../../build/include')
   Preprocess.add_to_include_path('./../../.deps/usr/include')
 
-  local input = Preprocess.preprocess_stream(arg[1])
-  local raw = input:read('*all')
-  input:close()
-
-  if raw == nil then
-    print("ERROR: Preprocess.preprocess_stream():read() returned empty")
-  end
+  local raw = Preprocess.preprocess('', arg[1])
 
   local formatted
   if #arg == 2 and arg[2] == 'no' then
diff --git a/test/unit/garray_spec.lua b/test/unit/garray_spec.lua
index 9694e3c427..422ef7b36a 100644
--- a/test/unit/garray_spec.lua
+++ b/test/unit/garray_spec.lua
@@ -198,8 +198,8 @@ describe('garray', function()
     local function new_and_grow(itemsize_, growsize_, req)
       local garr = new_garray()
       ga_init(garr, itemsize_, growsize_)
-      eq(0, ga_size(garr))         -- should be 0 at first     
-      eq(NULL, ga_data(garr))      -- should be NULL           
+      eq(0, ga_size(garr))         -- should be 0 at first
+      eq(NULL, ga_data(garr))      -- should be NULL
       ga_grow(garr, req)           -- add space for `req` items
       return garr
     end
@@ -209,7 +209,7 @@ describe('garray', function()
       growsize = 4
       local grow_by = growsize - 1
       local garr = new_and_grow(itemsize, growsize, grow_by)
-      neq(NULL, ga_data(garr))       -- data should be a ptr to memory        
+      neq(NULL, ga_data(garr))       -- data should be a ptr to memory
       eq(growsize, ga_maxlen(garr))  -- we requested LESS than growsize, so...
     end)
 
@@ -218,7 +218,7 @@ describe('garray', function()
       growsize = 4
       local grow_by = growsize + 1
       local garr = new_and_grow(itemsize, growsize, grow_by)
-      neq(NULL, ga_data(garr))       -- data should be a ptr to memory        
+      neq(NULL, ga_data(garr))       -- data should be a ptr to memory
       eq(grow_by, ga_maxlen(garr))   -- we requested MORE than growsize, so...
     end)
 
diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua
index 426ae2d9e0..1bfdd32739 100644
--- a/test/unit/helpers.lua
+++ b/test/unit/helpers.lua
@@ -1,9 +1,19 @@
-local assert = require('luassert')
 local ffi = require('ffi')
 local formatc = require('test.unit.formatc')
 local Set = require('test.unit.set')
 local Preprocess = require('test.unit.preprocess')
 local Paths = require('test.config.paths')
+local global_helpers = require('test.helpers')
+
+local neq = global_helpers.neq
+local eq = global_helpers.eq
+local ok = global_helpers.ok
+
+-- C constants.
+local NULL = ffi.cast('void*', 0)
+
+local OK = 1
+local FAIL = 0
 
 -- add some standard header locations
 for _, p in ipairs(Paths.include_paths) do
@@ -31,7 +41,9 @@ local function filter_complex_blocks(body)
     if not (string.find(line, "(^)", 1, true) ~= nil
             or string.find(line, "_ISwupper", 1, true)
             or string.find(line, "msgpack_zone_push_finalizer")
-            or string.find(line, "msgpack_unpacker_reserve_buffer")) then
+            or string.find(line, "msgpack_unpacker_reserve_buffer")
+            or string.find(line, "UUID_NULL")  -- static const uuid_t UUID_NULL = {...}
+            or string.find(line, "inline _Bool")) then
       result[#result + 1] = line
     end
   end
@@ -39,6 +51,8 @@ local function filter_complex_blocks(body)
   return table.concat(result, "\n")
 end
 
+local previous_defines = ''
+
 -- use this helper to import C files, you can pass multiple paths at once,
 -- this helper will return the C namespace of the nvim library.
 local function cimport(...)
@@ -60,17 +74,8 @@ local function cimport(...)
     return libnvim
   end
 
-  local body = nil
-  for _ = 1, 10 do
-    local stream = Preprocess.preprocess_stream(unpack(paths))
-    body = stream:read("*a")
-    stream:close()
-    if body ~= nil then break end
-  end
-
-  if body == nil then
-    print("ERROR: helpers.lua: Preprocess.preprocess_stream():read() returned empty")
-  end
+  local body
+  body, previous_defines = Preprocess.preprocess(previous_defines, unpack(paths))
 
   -- format it (so that the lines are "unique" statements), also filter out
   -- Objective-C blocks
@@ -119,6 +124,67 @@ local function cppimport(path)
   return cimport(Paths.test_include_path .. '/' .. path)
 end
 
+local function alloc_log_new()
+  local log = {
+    log={},
+    lib=cimport('./src/nvim/memory.h'),
+    original_functions={},
+    null={['\0:is_null']=true},
+  }
+  local allocator_functions = {'malloc', 'free', 'calloc', 'realloc'}
+  function log:save_original_functions()
+    for _, funcname in ipairs(allocator_functions) do
+      self.original_functions[funcname] = self.lib['mem_' .. funcname]
+    end
+  end
+  function log:set_mocks()
+    for _, k in ipairs(allocator_functions) do
+      do
+        local kk = k
+        self.lib['mem_' .. k] = function(...)
+          local log_entry = {func=kk, args={...}}
+          self.log[#self.log + 1] = log_entry
+          if kk == 'free' then
+            self.original_functions[kk](...)
+          else
+            log_entry.ret = self.original_functions[kk](...)
+          end
+          for i, v in ipairs(log_entry.args) do
+            if v == nil then
+              -- XXX This thing thinks that {NULL} ~= {NULL}.
+              log_entry.args[i] = self.null
+            end
+          end
+          if self.hook then self:hook(log_entry) end
+          if log_entry.ret then
+            return log_entry.ret
+          end
+        end
+      end
+    end
+  end
+  function log:clear()
+    self.log = {}
+  end
+  function log:check(exp)
+    eq(exp, self.log)
+    self:clear()
+  end
+  function log:restore_original_functions()
+    for k, v in pairs(self.original_functions) do
+      self.lib['mem_' .. k] = v
+    end
+  end
+  function log:before_each()
+    log:save_original_functions()
+    log:set_mocks()
+  end
+  function log:after_each()
+    log:restore_original_functions()
+  end
+  return log
+end
+
 cimport('./src/nvim/types.h')
 
 -- take a pointer to a C-allocated string and return an interned
@@ -130,7 +196,7 @@ end
 
 local cstr = ffi.typeof('char[?]')
 local function to_cstr(string)
-  return cstr((string.len(string)) + 1, string)
+  return cstr(#string + 1, string)
 end
 
 -- initialize some global variables, this is still necessary to unit test
@@ -143,27 +209,19 @@ do
   main.event_init()
 end
 
--- C constants.
-local NULL = ffi.cast('void*', 0)
-
-local OK = 1
-local FAIL = 0
-
 return {
   cimport = cimport,
   cppimport = cppimport,
   internalize = internalize,
-  eq = function(expected, actual)
-    return assert.are.same(expected, actual)
-  end,
-  neq = function(expected, actual)
-    return assert.are_not.same(expected, actual)
-  end,
+  ok = ok,
+  eq = eq,
+  neq = neq,
   ffi = ffi,
   lib = libnvim,
   cstr = cstr,
   to_cstr = to_cstr,
   NULL = NULL,
   OK = OK,
-  FAIL = FAIL
+  FAIL = FAIL,
+  alloc_log_new = alloc_log_new,
 }
diff --git a/test/unit/memory_spec.lua b/test/unit/memory_spec.lua
new file mode 100644
index 0000000000..73a32724ef
--- /dev/null
+++ b/test/unit/memory_spec.lua
@@ -0,0 +1,51 @@
+local helpers = require("test.unit.helpers")
+
+local cimport = helpers.cimport
+local cstr = helpers.cstr
+local eq = helpers.eq
+local ffi = helpers.ffi
+local to_cstr = helpers.to_cstr
+
+local cimp = cimport('stdlib.h', './src/nvim/memory.h')
+
+describe('xstrlcat()', function()
+  local function test_xstrlcat(dst, src, dsize)
+    assert.is_true(dsize >= 1 + string.len(dst))  -- sanity check for tests
+    local dst_cstr = cstr(dsize, dst)
+    local src_cstr = to_cstr(src)
+    eq(string.len(dst .. src), cimp.xstrlcat(dst_cstr, src_cstr, dsize))
+    return ffi.string(dst_cstr)
+  end
+
+  local function test_xstrlcat_overlap(dst, src_idx, dsize)
+    assert.is_true(dsize >= 1 + string.len(dst))  -- sanity check for tests
+    local dst_cstr = cstr(dsize, dst)
+    local src_cstr = dst_cstr + src_idx  -- pointer into `dst` (overlaps)
+    eq(string.len(dst) + string.len(dst) - src_idx,
+       cimp.xstrlcat(dst_cstr, src_cstr, dsize))
+    return ffi.string(dst_cstr)
+  end
+
+  it('concatenates strings', function()
+    eq('ab', test_xstrlcat('a', 'b', 3))
+    eq('ab', test_xstrlcat('a', 'b', 4096))
+    eq('ABCיהZdefgiיהZ',  test_xstrlcat('ABCיהZ', 'defgiיהZ',  4096))
+    eq('b',  test_xstrlcat('',  'b', 4096))
+    eq('a',  test_xstrlcat('a', '',  4096))
+  end)
+
+  it('concatenates overlapping strings', function()
+    eq('abcabc',  test_xstrlcat_overlap('abc', 0, 7))
+    eq('abca',    test_xstrlcat_overlap('abc', 0, 5))
+    eq('abcb',    test_xstrlcat_overlap('abc', 1, 5))
+    eq('abcc',    test_xstrlcat_overlap('abc', 2, 10))
+    eq('abcabc',  test_xstrlcat_overlap('abc', 0, 2343))
+  end)
+
+  it('truncates if `dsize` is too small', function()
+    eq('a', test_xstrlcat('a', 'b', 2))
+    eq('', test_xstrlcat('', 'b', 1))
+    eq('ABCיהZd',  test_xstrlcat('ABCיהZ', 'defgiיהZ',  10))
+  end)
+
+end)
diff --git a/test/unit/queue_spec.lua b/test/unit/multiqueue_spec.lua
index 9326c1cad6..c7f8dd8328 100644
--- a/test/unit/queue_spec.lua
+++ b/test/unit/multiqueue_spec.lua
@@ -3,28 +3,28 @@ local helpers = require("test.unit.helpers")
 local ffi     = helpers.ffi
 local eq      = helpers.eq
 
-local queue = helpers.cimport("./test/unit/fixtures/queue.h")
+local multiqueue = helpers.cimport("./test/unit/fixtures/multiqueue.h")
 
-describe('queue', function()
+describe("multiqueue (multi-level event-queue)", function()
   local parent, child1, child2, child3
 
   local function put(q, str)
-    queue.ut_queue_put(q, str)
+    multiqueue.ut_multiqueue_put(q, str)
   end
 
   local function get(q)
-    return ffi.string(queue.ut_queue_get(q))
+    return ffi.string(multiqueue.ut_multiqueue_get(q))
   end
 
   local function free(q)
-    queue.queue_free(q)
+    multiqueue.multiqueue_free(q)
   end
 
   before_each(function()
-    parent = queue.queue_new_parent(ffi.NULL, ffi.NULL)
-    child1 = queue.queue_new_child(parent)
-    child2 = queue.queue_new_child(parent)
-    child3 = queue.queue_new_child(parent)
+    parent = multiqueue.multiqueue_new_parent(ffi.NULL, ffi.NULL)
+    child1 = multiqueue.multiqueue_new_child(parent)
+    child2 = multiqueue.multiqueue_new_child(parent)
+    child3 = multiqueue.multiqueue_new_child(parent)
     put(child1, 'c1i1')
     put(child1, 'c1i2')
     put(child2, 'c2i1')
@@ -36,6 +36,27 @@ describe('queue', function()
     put(child3, 'c3i2')
   end)
 
+  it('keeps count of added events', function()
+    eq(3, multiqueue.multiqueue_size(child1))
+    eq(4, multiqueue.multiqueue_size(child2))
+    eq(2, multiqueue.multiqueue_size(child3))
+  end)
+
+  it('keeps count of removed events', function()
+    multiqueue.multiqueue_get(child1)
+    eq(2, multiqueue.multiqueue_size(child1))
+    multiqueue.multiqueue_get(child1)
+    eq(1, multiqueue.multiqueue_size(child1))
+    multiqueue.multiqueue_get(child1)
+    eq(0, multiqueue.multiqueue_size(child1))
+    put(child1, 'c2ixx')
+    eq(1, multiqueue.multiqueue_size(child1))
+    multiqueue.multiqueue_get(child1)
+    eq(0, multiqueue.multiqueue_size(child1))
+    multiqueue.multiqueue_get(child1)
+    eq(0, multiqueue.multiqueue_size(child1))
+  end)
+
   it('removing from parent removes from child', function()
     eq('c1i1', get(parent))
     eq('c1i2', get(parent))
diff --git a/test/unit/option_spec.lua b/test/unit/option_spec.lua
new file mode 100644
index 0000000000..8bab0194a2
--- /dev/null
+++ b/test/unit/option_spec.lua
@@ -0,0 +1,51 @@
+local helpers = require("test.unit.helpers")
+
+local to_cstr = helpers.to_cstr
+local eq      = helpers.eq
+
+local option = helpers.cimport("./src/nvim/option.h")
+local globals = helpers.cimport("./src/nvim/globals.h")
+
+local check_ff_value = function(ff)
+  return option.check_ff_value(to_cstr(ff))
+end
+
+describe('check_ff_value', function()
+
+  it('views empty string as valid', function()
+    eq(1, check_ff_value(""))
+  end)
+
+  it('views "unix", "dos" and "mac" as valid', function()
+    eq(1, check_ff_value("unix"))
+    eq(1, check_ff_value("dos"))
+    eq(1, check_ff_value("mac"))
+  end)
+
+  it('views "foo" as invalid', function()
+    eq(0, check_ff_value("foo"))
+  end)
+end)
+
+describe('get_sts_value', function()
+  it([[returns 'softtabstop' when it is non-negative]], function()
+    globals.curbuf.b_p_sts = 5
+    eq(5, option.get_sts_value())
+
+    globals.curbuf.b_p_sts = 0
+    eq(0, option.get_sts_value())
+  end)
+
+  it([[returns "effective shiftwidth" when 'softtabstop' is negative]], function()
+    local shiftwidth = 2
+    globals.curbuf.b_p_sw = shiftwidth
+    local tabstop = 5
+    globals.curbuf.b_p_ts = tabstop
+    globals.curbuf.b_p_sts = -2
+    eq(shiftwidth, option.get_sts_value())
+
+    shiftwidth = 0
+    globals.curbuf.b_p_sw = shiftwidth
+    eq(tabstop, option.get_sts_value())
+  end)
+end)
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index 9e00a3e8f8..64bbaaa8c2 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -10,19 +10,19 @@ local NULL = helpers.NULL
 
 require('lfs')
 
-local env = cimport('./src/nvim/os/os.h')
+local cimp = cimport('./src/nvim/os/os.h')
 
 describe('env function', function()
   local function os_setenv(name, value, override)
-    return env.os_setenv((to_cstr(name)), (to_cstr(value)), override)
+    return cimp.os_setenv((to_cstr(name)), (to_cstr(value)), override)
   end
 
   local function os_unsetenv(name, _, _)
-    return env.os_unsetenv((to_cstr(name)))
+    return cimp.os_unsetenv((to_cstr(name)))
   end
 
   local function os_getenv(name)
-    local rval = env.os_getenv((to_cstr(name)))
+    local rval = cimp.os_getenv((to_cstr(name)))
     if rval ~= NULL then
       return ffi.string(rval)
     else
@@ -88,14 +88,14 @@ describe('env function', function()
       local i = 0
       local names = { }
       local found_name = false
-      local name = env.os_getenvname_at_index(i)
+      local name = cimp.os_getenvname_at_index(i)
       while name ~= NULL do
         table.insert(names, ffi.string(name))
         if (ffi.string(name)) == test_name then
           found_name = true
         end
         i = i + 1
-        name = env.os_getenvname_at_index(i)
+        name = cimp.os_getenvname_at_index(i)
       end
       eq(true, (table.getn(names)) > 0)
       eq(true, found_name)
@@ -104,15 +104,15 @@ describe('env function', function()
     it('returns NULL if the index is out of bounds', function()
       local huge = ffi.new('size_t', 10000)
       local maxuint32 = ffi.new('size_t', 4294967295)
-      eq(NULL, env.os_getenvname_at_index(huge))
-      eq(NULL, env.os_getenvname_at_index(maxuint32))
+      eq(NULL, cimp.os_getenvname_at_index(huge))
+      eq(NULL, cimp.os_getenvname_at_index(maxuint32))
 
       if ffi.abi('64bit') then
         -- couldn't use a bigger number because it gets converted to
         -- double somewere, should be big enough anyway
         -- maxuint64 = ffi.new 'size_t', 18446744073709551615
         local maxuint64 = ffi.new('size_t', 18446744073709000000)
-        eq(NULL, env.os_getenvname_at_index(maxuint64))
+        eq(NULL, cimp.os_getenvname_at_index(maxuint64))
       end
     end)
   end)
@@ -124,10 +124,10 @@ describe('env function', function()
         local stat_str = stat_file:read('*l')
         stat_file:close()
         local pid = tonumber((stat_str:match('%d+')))
-        eq(pid, tonumber(env.os_get_pid()))
+        eq(pid, tonumber(cimp.os_get_pid()))
       else
         -- /proc is not available on all systems, test if pid is nonzero.
-        eq(true, (env.os_get_pid() > 0))
+        eq(true, (cimp.os_get_pid() > 0))
       end
     end)
   end)
@@ -138,7 +138,7 @@ describe('env function', function()
       local hostname = handle:read('*l')
       handle:close()
       local hostname_buf = cstr(255, '')
-      env.os_get_hostname(hostname_buf, 255)
+      cimp.os_get_hostname(hostname_buf, 255)
       eq(hostname, (ffi.string(hostname_buf)))
     end)
   end)
@@ -155,39 +155,52 @@ describe('env function', function()
       local output_buff1 = cstr(255, '')
       local output_buff2 = cstr(255, '')
       local output_expected = 'NEOVIM_UNIT_TEST_EXPAND_ENV_ESCV/test'
-      env.expand_env_esc(input1, output_buff1, 255, false, true, NULL)
-      env.expand_env_esc(input2, output_buff2, 255, false, true, NULL)
+      cimp.expand_env_esc(input1, output_buff1, 255, false, true, NULL)
+      cimp.expand_env_esc(input2, output_buff2, 255, false, true, NULL)
       eq(output_expected, ffi.string(output_buff1))
       eq(output_expected, ffi.string(output_buff2))
     end)
 
-    it('expands ~ once when one is true', function()
+    it('expands ~ once when `one` is true', function()
       local input = '~/foo ~ foo'
       local homedir = cstr(255, '')
-      env.expand_env_esc(to_cstr('~'), homedir, 255, false, true, NULL)
+      cimp.expand_env_esc(to_cstr('~'), homedir, 255, false, true, NULL)
       local output_expected = ffi.string(homedir) .. "/foo ~ foo"
       local output = cstr(255, '')
-      env.expand_env_esc(to_cstr(input), output, 255, false, true, NULL)
+      cimp.expand_env_esc(to_cstr(input), output, 255, false, true, NULL)
       eq(ffi.string(output), ffi.string(output_expected))
     end)
 
-    it('expands ~ every time when one is false', function()
+    it('expands ~ every time when `one` is false', function()
       local input = to_cstr('~/foo ~ foo')
-      local homedir = cstr(255, '')
-      env.expand_env_esc(to_cstr('~'), homedir, 255, false, true, NULL)
-      homedir = ffi.string(homedir)
+      local dst = cstr(255, '')
+      cimp.expand_env_esc(to_cstr('~'), dst, 255, false, true, NULL)
+      local homedir = ffi.string(dst)
       local output_expected = homedir .. "/foo " .. homedir .. " foo"
       local output = cstr(255, '')
-      env.expand_env_esc(input, output, 255, false, false, NULL)
+      cimp.expand_env_esc(input, output, 255, false, false, NULL)
       eq(output_expected, ffi.string(output))
     end)
 
-    it('respects the dstlen parameter without expansion', function()
+    it('does not crash #3725', function()
+      local name_out = ffi.new('char[100]')
+      cimp.os_get_user_name(name_out, 100)
+      local curuser = ffi.string(name_out)
+
+      local src = to_cstr("~"..curuser.."/Vcs/django-rest-framework/rest_framework/renderers.py")
+      local dst = cstr(256, "~"..curuser)
+      cimp.expand_env_esc(src, dst, 1024, false, false, NULL)
+      local len = string.len(ffi.string(dst))
+      assert.True(len > 56)
+      assert.True(len < 99)
+    end)
+
+    it('respects `dstlen` without expansion', function()
       local input = to_cstr('this is a very long thing that will not fit')
       -- The buffer is long enough to actually contain the full input in case the
       -- test fails, but we don't tell expand_env_esc that
       local output = cstr(255, '')
-      env.expand_env_esc(input, output, 5, false, true, NULL)
+      cimp.expand_env_esc(input, output, 5, false, true, NULL)
       -- Make sure the first few characters are copied properly and that there is a
       -- terminating null character
       for i=0,3 do
@@ -196,17 +209,17 @@ describe('env function', function()
       eq(0, output[4])
     end)
 
-    it('respects the dstlen parameter with expansion', function()
+    it('respects `dstlen` with expansion', function()
       local varname = to_cstr('NVIM_UNIT_TEST_EXPAND_ENV_ESC_DSTLENN')
       local varval = to_cstr('NVIM_UNIT_TEST_EXPAND_ENV_ESC_DSTLENV')
-      env.os_setenv(varname, varval, 1)
+      cimp.os_setenv(varname, varval, 1)
       -- TODO(bobtwinkles) This test uses unix-specific environment variable accessing,
       -- should have some alternative for windows
       local input = to_cstr('$NVIM_UNIT_TEST_EXPAND_ENV_ESC_DSTLENN/even more stuff')
       -- The buffer is long enough to actually contain the full input in case the
       -- test fails, but we don't tell expand_env_esc that
       local output = cstr(255, '')
-      env.expand_env_esc(input, output, 5, false, true, NULL)
+      cimp.expand_env_esc(input, output, 5, false, true, NULL)
       -- Make sure the first few characters are copied properly and that there is a
       -- terminating null character
       -- expand_env_esc SHOULD NOT expand the variable if there is not enough space to
diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
new file mode 100644
index 0000000000..5358022422
--- /dev/null
+++ b/test/unit/os/fileio_spec.lua
@@ -0,0 +1,365 @@
+local lfs = require('lfs')
+
+local helpers = require('test.unit.helpers')
+
+local eq = helpers.eq
+local ffi = helpers.ffi
+local cimport = helpers.cimport
+
+local m = cimport('./src/nvim/os/fileio.h')
+
+local fcontents = ''
+for i = 0, 255 do
+  fcontents = fcontents .. (i == 0 and '\0' or ('%c'):format(i))
+end
+fcontents = fcontents:rep(16)
+
+local dir = 'Xtest-unit-file_spec.d'
+local file1 = dir .. '/file1.dat'
+local file2 = dir .. '/file2.dat'
+local linkf = dir .. '/file.lnk'
+local linkb = dir .. '/broken.lnk'
+local filec = dir .. '/created-file.dat'
+
+before_each(function()
+  lfs.mkdir(dir);
+
+  local f1 = io.open(file1, 'w')
+  f1:write(fcontents)
+  f1:close()
+
+  local f2 = io.open(file2, 'w')
+  f2:write(fcontents)
+  f2:close()
+
+  lfs.link('file1.dat', linkf, true)
+  lfs.link('broken.dat', linkb, true)
+end)
+
+after_each(function()
+  os.remove(file1)
+  os.remove(file2)
+  os.remove(linkf)
+  os.remove(linkb)
+  os.remove(filec)
+  lfs.rmdir(dir)
+end)
+
+local function file_open(fname, flags, mode)
+  local ret2 = ffi.new('FileDescriptor')
+  local ret1 = m.file_open(ret2, fname, flags, mode)
+  return ret1, ret2
+end
+
+local function file_open_new(fname, flags, mode)
+  local ret1 = ffi.new('int[?]', 1, {0})
+  local ret2 = ffi.gc(m.file_open_new(ret1, fname, flags, mode), nil)
+  return ret1[0], ret2
+end
+
+local function file_write(fp, buf)
+  return m.file_write(fp, buf, #buf)
+end
+
+local function file_read(fp, size)
+  local buf = nil
+  if size == nil then
+    size = 0
+  else
+    -- For some reason if length of NUL-bytes-string is the same as `char[?]`
+    -- size luajit garbage collector crashes. But it does not do so in
+    -- os_read[v] tests in os/fs_spec.lua.
+    buf = ffi.new('char[?]', size + 1, ('\0'):rep(size))
+  end
+  local ret1 = m.file_read(fp, buf, size)
+  local ret2 = ''
+  if buf ~= nil then
+    ret2 = ffi.string(buf, size)
+  end
+  return ret1, ret2
+end
+
+local function file_fsync(fp)
+  return m.file_fsync(fp)
+end
+
+local function file_skip(fp, size)
+  return m.file_skip(fp, size)
+end
+
+describe('file_open', function()
+  it('can create a rwx------ file with kFileCreate', function()
+    local err, fp = file_open(filec, m.kFileCreate, 448)
+    eq(0, err)
+    local attrs = lfs.attributes(filec)
+    eq('rwx------', attrs.permissions)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can create a rw------- file with kFileCreate', function()
+    local err, fp = file_open(filec, m.kFileCreate, 384)
+    eq(0, err)
+    local attrs = lfs.attributes(filec)
+    eq('rw-------', attrs.permissions)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can create a rwx------ file with kFileCreateOnly', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 448)
+    eq(0, err)
+    local attrs = lfs.attributes(filec)
+    eq('rwx------', attrs.permissions)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can create a rw------- file with kFileCreateOnly', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    local attrs = lfs.attributes(filec)
+    eq('rw-------', attrs.permissions)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('fails to open an existing file with kFileCreateOnly', function()
+    local err, _ = file_open(file1, m.kFileCreateOnly, 384)
+    eq(m.UV_EEXIST, err)
+  end)
+
+  it('fails to open an symlink with kFileNoSymlink', function()
+    local err, _ = file_open(linkf, m.kFileNoSymlink, 384)
+    -- err is UV_EMLINK in FreeBSD, but if I use `ok(err == m.UV_ELOOP or err ==
+    -- m.UV_EMLINK)`, then I loose the ability to see actual `err` value.
+    if err ~= m.UV_ELOOP then eq(m.UV_EMLINK, err) end
+  end)
+
+  it('can open an existing file write-only with kFileCreate', function()
+    local err, fp = file_open(file1, m.kFileCreate, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can open an existing file read-only with zero', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can open an existing file read-only with kFileReadOnly', function()
+    local err, fp = file_open(file1, m.kFileReadOnly, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can open an existing file read-only with kFileNoSymlink', function()
+    local err, fp = file_open(file1, m.kFileNoSymlink, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can truncate an existing file with kFileTruncate', function()
+    local err, fp = file_open(file1, m.kFileTruncate, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    eq(0, m.file_close(fp))
+    local attrs = lfs.attributes(file1)
+    eq(0, attrs.size)
+  end)
+
+  it('can open an existing file write-only with kFileWriteOnly', function()
+    local err, fp = file_open(file1, m.kFileWriteOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    eq(0, m.file_close(fp))
+    local attrs = lfs.attributes(file1)
+    eq(4096, attrs.size)
+  end)
+
+  it('fails to create a file with just kFileWriteOnly', function()
+    local err, _ = file_open(filec, m.kFileWriteOnly, 384)
+    eq(m.UV_ENOENT, err)
+    local attrs = lfs.attributes(filec)
+    eq(nil, attrs)
+  end)
+
+  it('can truncate an existing file with kFileTruncate when opening a symlink',
+  function()
+    local err, fp = file_open(linkf, m.kFileTruncate, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    eq(0, m.file_close(fp))
+    local attrs = lfs.attributes(file1)
+    eq(0, attrs.size)
+  end)
+
+  it('fails to open a directory write-only', function()
+    local err, _ = file_open(dir, m.kFileWriteOnly, 384)
+    eq(m.UV_EISDIR, err)
+  end)
+
+  it('fails to open a broken symbolic link write-only', function()
+    local err, _ = file_open(linkb, m.kFileWriteOnly, 384)
+    eq(m.UV_ENOENT, err)
+  end)
+
+  it('fails to open a broken symbolic link read-only', function()
+    local err, _ = file_open(linkb, m.kFileReadOnly, 384)
+    eq(m.UV_ENOENT, err)
+  end)
+end)
+
+describe('file_open_new', function()
+  it('can open a file read-only', function()
+    local err, fp = file_open_new(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq(0, m.file_free(fp))
+  end)
+
+  it('fails to open an existing file with kFileCreateOnly', function()
+    local err, fp = file_open_new(file1, m.kFileCreateOnly, 384)
+    eq(m.UV_EEXIST, err)
+    eq(nil, fp)
+  end)
+end)
+
+-- file_close is called above, so it is not tested directly
+
+describe('file_fsync', function()
+  it('can flush writes to disk', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, file_fsync(fp))
+    eq(0, err)
+    eq(0, lfs.attributes(filec).size)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, file_fsync(fp))
+    eq(wsize, lfs.attributes(filec).size)
+    eq(0, m.file_close(fp))
+  end)
+end)
+
+describe('file_read', function()
+  it('can read small chunks of input until eof', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    local shift = 0
+    while shift < #fcontents do
+      local size = 3
+      local exp_err = size
+      local exp_s = fcontents:sub(shift + 1, shift + size)
+      if shift + size >= #fcontents then
+        exp_err = #fcontents - shift
+        exp_s = (fcontents:sub(shift + 1, shift + size)
+                 .. (('\0'):rep(size - exp_err)))
+      end
+      eq({exp_err, exp_s}, {file_read(fp, size)})
+      shift = shift + size
+    end
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can read the whole file at once', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
+    eq({0, ('\0'):rep(#fcontents)}, {file_read(fp, #fcontents)})
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can read more then 1024 bytes after reading a small chunk', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq({5, fcontents:sub(1, 5)}, {file_read(fp, 5)})
+    eq({#fcontents - 5, fcontents:sub(6) .. (('\0'):rep(5))},
+       {file_read(fp, #fcontents)})
+    eq(0, m.file_close(fp))
+  end)
+
+  it('can read file by 768-byte-chunks', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    local shift = 0
+    while shift < #fcontents do
+      local size = 768
+      local exp_err = size
+      local exp_s = fcontents:sub(shift + 1, shift + size)
+      if shift + size >= #fcontents then
+        exp_err = #fcontents - shift
+        exp_s = (fcontents:sub(shift + 1, shift + size)
+                 .. (('\0'):rep(size - exp_err)))
+      end
+      eq({exp_err, exp_s}, {file_read(fp, size)})
+      shift = shift + size
+    end
+    eq(0, m.file_close(fp))
+  end)
+end)
+
+describe('file_write', function()
+  it('can write the whole file at once', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    local wr = file_write(fp, fcontents)
+    eq(#fcontents, wr)
+    eq(0, m.file_close(fp))
+    eq(wr, lfs.attributes(filec).size)
+    eq(fcontents, io.open(filec):read('*a'))
+  end)
+
+  it('can write the whole file by small chunks', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    local shift = 0
+    while shift < #fcontents do
+      local size = 3
+      local s = fcontents:sub(shift + 1, shift + size)
+      local wr = file_write(fp, s)
+      eq(wr, #s)
+      shift = shift + size
+    end
+    eq(0, m.file_close(fp))
+    eq(#fcontents, lfs.attributes(filec).size)
+    eq(fcontents, io.open(filec):read('*a'))
+  end)
+
+  it('can write the whole file by 768-byte-chunks', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    local shift = 0
+    while shift < #fcontents do
+      local size = 768
+      local s = fcontents:sub(shift + 1, shift + size)
+      local wr = file_write(fp, s)
+      eq(wr, #s)
+      shift = shift + size
+    end
+    eq(0, m.file_close(fp))
+    eq(#fcontents, lfs.attributes(filec).size)
+    eq(fcontents, io.open(filec):read('*a'))
+  end)
+end)
+
+describe('file_skip', function()
+  it('can skip 3 bytes', function()
+    local err, fp = file_open(file1, 0, 384)
+    eq(0, err)
+    eq(false, fp.wr)
+    eq(3, file_skip(fp, 3))
+    local rd, s = file_read(fp, 3)
+    eq(3, rd)
+    eq(fcontents:sub(4, 6), s)
+    eq(0, m.file_close(fp))
+  end)
+end)
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 857a5001f1..5d889d6e33 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -6,6 +6,7 @@ local helpers = require('test.unit.helpers')
 local cimport = helpers.cimport
 local cppimport = helpers.cppimport
 local internalize = helpers.internalize
+local ok = helpers.ok
 local eq = helpers.eq
 local neq = helpers.neq
 local ffi = helpers.ffi
@@ -27,6 +28,12 @@ cppimport('sys/stat.h')
 cppimport('fcntl.h')
 cppimport('uv-errno.h')
 
+local s = ''
+for i = 0, 255 do
+  s = s .. (i == 0 and '\0' or ('%c'):format(i))
+end
+local fcontents = s:rep(16)
+
 local buffer = ""
 local directory = nil
 local absolute_executable = nil
@@ -68,6 +75,8 @@ describe('fs function', function()
 
     io.open('unit-test-directory/test_2.file', 'w').close()
     lfs.link('test.file', 'unit-test-directory/test_link.file', true)
+
+    lfs.link('non_existing_file.file', 'unit-test-directory/test_broken_link.file', true)
     -- Since the tests are executed, they are called by an executable. We use
     -- that executable for several asserts.
     absolute_executable = arg[0]
@@ -81,6 +90,7 @@ describe('fs function', function()
     os.remove('unit-test-directory/test_2.file')
     os.remove('unit-test-directory/test_link.file')
     os.remove('unit-test-directory/test_hlink.file')
+    os.remove('unit-test-directory/test_broken_link.file')
     lfs.rmdir('unit-test-directory')
   end)
 
@@ -150,11 +160,11 @@ describe('fs function', function()
     local function os_can_exe(name)
       local buf = ffi.new('char *[1]')
       buf[0] = NULL
-      local ok = fs.os_can_exe(to_cstr(name), buf, true)
+      local ce_ret = fs.os_can_exe(to_cstr(name), buf, true)
 
       -- When os_can_exe returns true, it must set the path.
       -- When it returns false, the path must be NULL.
-      if ok then
+      if ce_ret then
         neq(NULL, buf[0])
         return internalize(buf[0])
       else
@@ -196,8 +206,8 @@ describe('fs function', function()
 
       lfs.chdir(directory)
 
-      -- Rely on currentdir to resolve symlinks, if any. Testing against 
-      -- the absolute path taken from arg[0] may result in failure where 
+      -- Rely on currentdir to resolve symlinks, if any. Testing against
+      -- the absolute path taken from arg[0] may result in failure where
       -- the path has a symlink in it.
       local canonical = lfs.currentdir() .. '/' .. executable_name
       local expected = exe(canonical)
@@ -356,8 +366,8 @@ describe('fs function', function()
   end)
 
   describe('file operations', function()
-    local function os_file_exists(filename)
-      return fs.os_file_exists((to_cstr(filename)))
+    local function os_path_exists(filename)
+      return fs.os_path_exists((to_cstr(filename)))
     end
     local function os_rename(path, new_path)
       return fs.os_rename((to_cstr(path)), (to_cstr(new_path)))
@@ -368,14 +378,67 @@ describe('fs function', function()
     local function os_open(path, flags, mode)
       return fs.os_open((to_cstr(path)), flags, mode)
     end
+    local function os_close(fd)
+      return fs.os_close(fd)
+    end
+    -- For some reason if length of NUL-bytes-string is the same as `char[?]`
+    -- size luajit crashes. Though it does not do so in this test suite, better
+    -- be cautios and allocate more elements then needed. I only did this to
+    -- strings.
+    local function os_read(fd, size)
+      local buf = nil
+      if size == nil then
+        size = 0
+      else
+        buf = ffi.new('char[?]', size + 1, ('\0'):rep(size))
+      end
+      local eof = ffi.new('bool[?]', 1, {true})
+      local ret2 = fs.os_read(fd, eof, buf, size)
+      local ret1 = eof[0]
+      local ret3 = ''
+      if buf ~= nil then
+        ret3 = ffi.string(buf, size)
+      end
+      return ret1, ret2, ret3
+    end
+    local function os_readv(fd, sizes)
+      local bufs = {}
+      for i, size in ipairs(sizes) do
+        bufs[i] = {
+          iov_base=ffi.new('char[?]', size + 1, ('\0'):rep(size)),
+          iov_len=size,
+        }
+      end
+      local iov = ffi.new('struct iovec[?]', #sizes, bufs)
+      local eof = ffi.new('bool[?]', 1, {true})
+      local ret2 = fs.os_readv(fd, eof, iov, #sizes)
+      local ret1 = eof[0]
+      local ret3 = {}
+      for i = 1,#sizes do
+        -- Warning: iov may not be used.
+        ret3[i] = ffi.string(bufs[i].iov_base, bufs[i].iov_len)
+      end
+      return ret1, ret2, ret3
+    end
+    local function os_write(fd, data)
+      return fs.os_write(fd, data, data and #data or 0)
+    end
 
-    describe('os_file_exists', function()
+    describe('os_path_exists', function()
       it('returns false when given a non-existing file', function()
-        eq(false, (os_file_exists('non-existing-file')))
+        eq(false, (os_path_exists('non-existing-file')))
       end)
 
       it('returns true when given an existing file', function()
-        eq(true, (os_file_exists('unit-test-directory/test.file')))
+        eq(true, (os_path_exists('unit-test-directory/test.file')))
+      end)
+
+      it('returns false when given a broken symlink', function()
+        eq(false, (os_path_exists('unit-test-directory/test_broken_link.file')))
+      end)
+
+      it('returns true when given a directory', function()
+        eq(true, (os_path_exists('unit-test-directory')))
       end)
     end)
 
@@ -385,8 +448,8 @@ describe('fs function', function()
 
       it('can rename file if destination file does not exist', function()
         eq(OK, (os_rename(test, not_exist)))
-        eq(false, (os_file_exists(test)))
-        eq(true, (os_file_exists(not_exist)))
+        eq(false, (os_path_exists(test)))
+        eq(true, (os_path_exists(not_exist)))
         eq(OK, (os_rename(not_exist, test)))  -- restore test file
       end)
 
@@ -402,8 +465,8 @@ describe('fs function', function()
         file:close()
 
         eq(OK, (os_rename(other, test)))
-        eq(false, (os_file_exists(other)))
-        eq(true, (os_file_exists(test)))
+        eq(false, (os_path_exists(other)))
+        eq(true, (os_path_exists(test)))
         file = io.open(test, 'r')
         eq('other', (file:read('*all')))
         file:close()
@@ -432,30 +495,34 @@ describe('fs function', function()
     end)
 
     describe('os_open', function()
+      local new_file = 'test_new_file'
+      local existing_file = 'unit-test-directory/test_existing.file'
+
       before_each(function()
-        io.open('unit-test-directory/test_existing.file', 'w').close()
+        (io.open(existing_file, 'w')):close()
       end)
 
       after_each(function()
-        os.remove('unit-test-directory/test_existing.file')
-        os.remove('test_new_file')
+        os.remove(existing_file)
+        os.remove(new_file)
       end)
 
-      local new_file = 'test_new_file'
-      local existing_file = 'unit-test-directory/test_existing.file'
-
       it('returns UV_ENOENT for O_RDWR on a non-existing file', function()
         eq(ffi.C.UV_ENOENT, (os_open('non-existing-file', ffi.C.kO_RDWR, 0)))
       end)
 
-      it('returns non-negative for O_CREAT on a non-existing file', function()
+      it('returns non-negative for O_CREAT on a non-existing file which then can be closed', function()
         assert_file_does_not_exist(new_file)
-        assert.is_true(0 <= (os_open(new_file, ffi.C.kO_CREAT, 0)))
+        local fd = os_open(new_file, ffi.C.kO_CREAT, 0)
+        assert.is_true(0 <= fd)
+        eq(0, os_close(fd))
       end)
 
-      it('returns non-negative for O_CREAT on a existing file', function()
+      it('returns non-negative for O_CREAT on a existing file which then can be closed', function()
         assert_file_exists(existing_file)
-        assert.is_true(0 <= (os_open(existing_file, ffi.C.kO_CREAT, 0)))
+        local fd = os_open(existing_file, ffi.C.kO_CREAT, 0)
+        assert.is_true(0 <= fd)
+        eq(0, os_close(fd))
       end)
 
       it('returns UV_EEXIST for O_CREAT|O_EXCL on a existing file', function()
@@ -463,24 +530,181 @@ describe('fs function', function()
         eq(ffi.C.kUV_EEXIST, (os_open(existing_file, (bit.bor(ffi.C.kO_CREAT, ffi.C.kO_EXCL)), 0)))
       end)
 
-      it('sets `rwx` permissions for O_CREAT 700', function()
+      it('sets `rwx` permissions for O_CREAT 700 which then can be closed', function()
         assert_file_does_not_exist(new_file)
         --create the file
-        os_open(new_file, ffi.C.kO_CREAT, tonumber("700", 8))
+        local fd = os_open(new_file, ffi.C.kO_CREAT, tonumber("700", 8))
         --verify permissions
         eq('rwx------', lfs.attributes(new_file)['permissions'])
+        eq(0, os_close(fd))
       end)
 
-      it('sets `rw` permissions for O_CREAT 600', function()
+      it('sets `rw` permissions for O_CREAT 600 which then can be closed', function()
         assert_file_does_not_exist(new_file)
         --create the file
-        os_open(new_file, ffi.C.kO_CREAT, tonumber("600", 8))
+        local fd = os_open(new_file, ffi.C.kO_CREAT, tonumber("600", 8))
         --verify permissions
         eq('rw-------', lfs.attributes(new_file)['permissions'])
+        eq(0, os_close(fd))
+      end)
+
+      it('returns a non-negative file descriptor for an existing file which then can be closed', function()
+        local fd = os_open(existing_file, ffi.C.kO_RDWR, 0)
+        assert.is_true(0 <= fd)
+        eq(0, os_close(fd))
+      end)
+    end)
+
+    describe('os_close', function()
+      it('returns EBADF for negative file descriptors', function()
+        eq(ffi.C.UV_EBADF, os_close(-1))
+        eq(ffi.C.UV_EBADF, os_close(-1000))
+      end)
+    end)
+
+    describe('os_read', function()
+      local file = 'test-unit-os-fs_spec-os_read.dat'
+
+      before_each(function()
+        local f = io.open(file, 'w')
+        f:write(fcontents)
+        f:close()
+      end)
+
+      after_each(function()
+        os.remove(file)
+      end)
+
+      it('can read zero bytes from a file', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, 0, ''}, {os_read(fd, nil)})
+        eq({false, 0, ''}, {os_read(fd, 0)})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read from a file multiple times', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, 2, '\000\001'}, {os_read(fd, 2)})
+        eq({false, 2, '\002\003'}, {os_read(fd, 2)})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read the whole file at once and then report eof', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, #fcontents, fcontents}, {os_read(fd, #fcontents)})
+        eq({true, 0, ('\0'):rep(#fcontents)}, {os_read(fd, #fcontents)})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read the whole file in two calls, one partially', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, #fcontents * 3/4, fcontents:sub(1, #fcontents * 3/4)},
+           {os_read(fd, #fcontents * 3/4)})
+        eq({true,
+            (#fcontents * 1/4),
+            fcontents:sub(#fcontents * 3/4 + 1) .. ('\0'):rep(#fcontents * 2/4)},
+           {os_read(fd, #fcontents * 3/4)})
+        eq(0, os_close(fd))
+      end)
+    end)
+
+    describe('os_readv', function()
+      -- Function may be absent
+      if not pcall(function() return fs.os_readv end) then
+        return
+      end
+      local file = 'test-unit-os-fs_spec-os_readv.dat'
+
+      before_each(function()
+        local f = io.open(file, 'w')
+        f:write(fcontents)
+        f:close()
+      end)
+
+      after_each(function()
+        os.remove(file)
+      end)
+
+      it('can read zero bytes from a file', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, 0, {}}, {os_readv(fd, {})})
+        eq({false, 0, {'', '', ''}}, {os_readv(fd, {0, 0, 0})})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read from a file multiple times to a differently-sized buffers', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, 2, {'\000\001'}}, {os_readv(fd, {2})})
+        eq({false, 5, {'\002\003', '\004\005\006'}}, {os_readv(fd, {2, 3})})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read the whole file at once and then report eof', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false,
+            #fcontents,
+            {fcontents:sub(1, #fcontents * 1/4),
+             fcontents:sub(#fcontents * 1/4 + 1, #fcontents * 3/4),
+             fcontents:sub(#fcontents * 3/4 + 1, #fcontents * 15/16),
+             fcontents:sub(#fcontents * 15/16 + 1, #fcontents)}},
+           {os_readv(fd, {#fcontents * 1/4,
+                          #fcontents * 2/4,
+                          #fcontents * 3/16,
+                          #fcontents * 1/16})})
+        eq({true, 0, {'\0'}}, {os_readv(fd, {1})})
+        eq(0, os_close(fd))
+      end)
+
+      it('can read the whole file in two calls, one partially', function()
+        local fd = os_open(file, ffi.C.kO_RDONLY, 0)
+        ok(fd >= 0)
+        eq({false, #fcontents * 3/4, {fcontents:sub(1, #fcontents * 3/4)}},
+           {os_readv(fd, {#fcontents * 3/4})})
+        eq({true,
+            (#fcontents * 1/4),
+            {fcontents:sub(#fcontents * 3/4 + 1) .. ('\0'):rep(#fcontents * 2/4)}},
+           {os_readv(fd, {#fcontents * 3/4})})
+        eq(0, os_close(fd))
+      end)
+    end)
+
+    describe('os_write', function()
+      -- Function may be absent
+      local file = 'test-unit-os-fs_spec-os_write.dat'
+
+      before_each(function()
+        local f = io.open(file, 'w')
+        f:write(fcontents)
+        f:close()
+      end)
+
+      after_each(function()
+        os.remove(file)
+      end)
+
+      it('can write zero bytes to a file', function()
+        local fd = os_open(file, ffi.C.kO_WRONLY, 0)
+        ok(fd >= 0)
+        eq(0, os_write(fd, ''))
+        eq(0, os_write(fd, nil))
+        eq(fcontents, io.open(file, 'r'):read('*a'))
+        eq(0, os_close(fd))
       end)
 
-      it('returns a non-negative file descriptor for an existing file', function()
-        assert.is_true(0 <= (os_open(existing_file, ffi.C.kO_RDWR, 0)))
+      it('can write some data to a file', function()
+        local fd = os_open(file, ffi.C.kO_WRONLY, 0)
+        ok(fd >= 0)
+        eq(3, os_write(fd, 'abc'))
+        eq(4, os_write(fd, ' def'))
+        eq('abc def' .. fcontents:sub(8), io.open(file, 'r'):read('*a'))
+        eq(0, os_close(fd))
       end)
     end)
 
diff --git a/test/unit/os/shell_spec.lua b/test/unit/os/shell_spec.lua
index 93103e4e8c..3603403daf 100644
--- a/test/unit/os/shell_spec.lua
+++ b/test/unit/os/shell_spec.lua
@@ -1,15 +1,3 @@
--- not all operating systems support the system()-tests, as of yet.
-local allowed_os = {
-  Linux = true,
-  OSX = true,
-  BSD = true,
-  POSIX = true
-}
-
-if allowed_os[jit.os] ~= true then
-  return
-end
-
 local helpers = require('test.unit.helpers')
 local cimported = helpers.cimport(
   './src/nvim/os/shell.h',
@@ -24,14 +12,12 @@ local to_cstr = helpers.to_cstr
 local NULL = ffi.cast('void *', 0)
 
 describe('shell functions', function()
-  setup(function()
+  before_each(function()
     -- os_system() can't work when the p_sh and p_shcf variables are unset
     cimported.p_sh = to_cstr('/bin/bash')
     cimported.p_shcf = to_cstr('-c')
-  end)
-
-  teardown(function()
-    cimported.event_teardown()
+    cimported.p_sxq = to_cstr('')
+    cimported.p_sxe = to_cstr('')
   end)
 
   local function shell_build_argv(cmd, extra_args)
@@ -130,5 +116,50 @@ describe('shell functions', function()
           '-c', 'abc  def'},
          shell_build_argv('abc  def', 'ghi  jkl'))
     end)
+
+    it('applies shellxescape (p_sxe) and shellxquote (p_sxq)', function()
+      cimported.p_sxq = to_cstr('(')
+      cimported.p_sxe = to_cstr('"&|<>()@^')
+
+      local argv = ffi.cast('char**',
+                        cimported.shell_build_argv(to_cstr('echo &|<>()@^'), nil))
+      eq(ffi.string(argv[0]), '/bin/bash')
+      eq(ffi.string(argv[1]), '-c')
+      eq(ffi.string(argv[2]), '(echo ^&^|^<^>^(^)^@^^)')
+      eq(nil, argv[3])
+    end)
+
+    it('applies shellxquote="(', function()
+      cimported.p_sxq = to_cstr('"(')
+      cimported.p_sxe = to_cstr('"&|<>()@^')
+
+      local argv = ffi.cast('char**', cimported.shell_build_argv(
+                                          to_cstr('echo -n some text'), nil))
+      eq(ffi.string(argv[0]), '/bin/bash')
+      eq(ffi.string(argv[1]), '-c')
+      eq(ffi.string(argv[2]), '"(echo -n some text)"')
+      eq(nil, argv[3])
+    end)
+
+    it('applies shellxquote="', function()
+      cimported.p_sxq = to_cstr('"')
+      cimported.p_sxe = to_cstr('')
+
+      local argv = ffi.cast('char**', cimported.shell_build_argv(
+                                          to_cstr('echo -n some text'), nil))
+      eq(ffi.string(argv[0]), '/bin/bash')
+      eq(ffi.string(argv[1]), '-c')
+      eq(ffi.string(argv[2]), '"echo -n some text"')
+      eq(nil, argv[3])
+    end)
+
+    it('with empty shellxquote/shellxescape', function()
+      local argv = ffi.cast('char**', cimported.shell_build_argv(
+                                          to_cstr('echo -n some text'), nil))
+      eq(ffi.string(argv[0]), '/bin/bash')
+      eq(ffi.string(argv[1]), '-c')
+      eq(ffi.string(argv[2]), 'echo -n some text')
+      eq(nil, argv[3])
+    end)
   end)
 end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 9b76834383..ccaf0228ab 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -336,6 +336,17 @@ describe('more path function', function()
       eq(FAIL, result)
     end)
 
+    it('fails safely if given length is wrong #5737', function()
+      local force_expansion = 1
+      local filename = 'foo/bar/bazzzzzzz/buz/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/a'
+      local too_short_len = 8
+      local buf = cstr(too_short_len, '')
+      local result = path.vim_FullName(filename, buf, too_short_len, force_expansion)
+      local expected = string.sub(filename, 1, (too_short_len - 1))
+      eq(expected, (ffi.string(buf)))
+      eq(FAIL, result)
+    end)
+
     it('uses the filename if the filename is a URL', function()
       local force_expansion = 1
       local filename = 'http://www.neovim.org'
diff --git a/test/unit/preprocess.lua b/test/unit/preprocess.lua
index e5c838b13b..1c9b290462 100644
--- a/test/unit/preprocess.lua
+++ b/test/unit/preprocess.lua
@@ -7,22 +7,22 @@ local ccs = {}
 
 local env_cc = os.getenv("CC")
 if env_cc then
-  table.insert(ccs, {path = "/usr/bin/env " .. tostring(env_cc), type = "gcc"})
+  table.insert(ccs, {path = {"/usr/bin/env", env_cc}, type = "gcc"})
 end
 
 if ffi.os == "Windows" then
-  table.insert(ccs, {path = "cl", type = "msvc"})
+  table.insert(ccs, {path = {"cl"}, type = "msvc"})
 end
 
-table.insert(ccs, {path = "/usr/bin/env cc", type = "gcc"})
-table.insert(ccs, {path = "/usr/bin/env gcc", type = "gcc"})
-table.insert(ccs, {path = "/usr/bin/env gcc-4.9", type = "gcc"})
-table.insert(ccs, {path = "/usr/bin/env gcc-4.8", type = "gcc"})
-table.insert(ccs, {path = "/usr/bin/env gcc-4.7", type = "gcc"})
-table.insert(ccs, {path = "/usr/bin/env clang", type = "clang"})
-table.insert(ccs, {path = "/usr/bin/env icc", type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "cc"}, type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "gcc"}, type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "gcc-4.9"}, type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "gcc-4.8"}, type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "gcc-4.7"}, type = "gcc"})
+table.insert(ccs, {path = {"/usr/bin/env", "clang"}, type = "clang"})
+table.insert(ccs, {path = {"/usr/bin/env", "icc"}, type = "gcc"})
 
-local quote_me = '[^%w%+%-%=%@%_%/]' -- complement (needn't quote)
+local quote_me = '[^.%w%+%-%@%_%/]' -- complement (needn't quote)
 local function shell_quote(str)
   if string.find(str, quote_me) or str == '' then
     return "'" .. string.gsub(str, "'", [['"'"']]) .. "'"
@@ -61,12 +61,12 @@ end
 -- will produce a string that represents a meta C header file that includes
 -- all the passed in headers. I.e.:
 --
--- headerize({"stdio.h", "math.h", true}
+-- headerize({"stdio.h", "math.h"}, true)
 -- produces:
 -- #include <stdio.h>
 -- #include <math.h>
 --
--- headerize({"vim.h", "memory.h", false}
+-- headerize({"vim.h", "memory.h"}, false)
 -- produces:
 -- #include "vim.h"
 -- #include "memory.h"
@@ -79,8 +79,7 @@ local function headerize(headers, global)
   end
 
   local formatted = {}
-  for i = 1, #headers do
-    local hdr = headers[i]
+  for _, hdr in ipairs(headers) do
     formatted[#formatted + 1] = "#include " ..
                                 tostring(pre) ..
                                 tostring(hdr) ..
@@ -91,44 +90,78 @@ local function headerize(headers, global)
 end
 
 local Gcc = {
+  preprocessor_extra_flags = {},
+  get_defines_extra_flags = {'-std=c99', '-dM', '-E'},
+  get_declarations_extra_flags = {'-std=c99', '-P', '-E'},
+}
+
+function Gcc:define(name, args, val)
+  local define = '-D' .. name
+  if args ~= nil then
+    define = define .. '(' .. table.concat(args, ',') .. ')'
+  end
+  if val ~= nil then
+    define = define .. '=' .. val
+  end
+  self.preprocessor_extra_flags[#self.preprocessor_extra_flags + 1] = define
+end
+
+function Gcc:undefine(name)
+  self.preprocessor_extra_flags[#self.preprocessor_extra_flags + 1] = (
+      '-U' .. name)
+end
+
+function Gcc:init_defines()
   -- preprocessor flags that will hopefully make the compiler produce C
   -- declarations that the LuaJIT ffi understands.
-  preprocessor_extra_flags = {
-   '-D "aligned(ARGS)="',
-   '-D "__attribute__(ARGS)="',
-   '-D "__asm(ARGS)="',
-   '-D "__asm__(ARGS)="',
-   '-D "__inline__="',
-   '-D "EXTERN=extern"',
-   '-D "INIT(...)="',
-   '-D_GNU_SOURCE',
-   '-DINCLUDE_GENERATED_DECLARATIONS',
-
-   -- Needed for FreeBSD
-   '-D "_Thread_local="'
-  }
-}
+  self:define('aligned', {'ARGS'}, '')
+  self:define('__attribute__', {'ARGS'}, '')
+  self:define('__asm', {'ARGS'}, '')
+  self:define('__asm__', {'ARGS'}, '')
+  self:define('__inline__', nil, '')
+  self:define('EXTERN', nil, 'extern')
+  self:define('INIT', {'...'}, '')
+  self:define('_GNU_SOURCE')
+  self:define('INCLUDE_GENERATED_DECLARATIONS')
+  self:define('UNIT_TESTING')
+  -- Needed for FreeBSD
+  self:define('_Thread_local', nil, '')
+  -- Needed for macOS Sierra
+  self:define('_Nullable', nil, '')
+  self:define('_Nonnull', nil, '')
+  self:undefine('__BLOCKS__')
+end
 
 function Gcc:new(obj)
   obj = obj or {}
   setmetatable(obj, self)
   self.__index = self
+  self:init_defines()
   return obj
 end
 
 function Gcc:add_to_include_path(...)
-  local paths = {...}
-  for i = 1, #paths do
-    local path = paths[i]
-    local directive = '-I ' .. '"' .. path .. '"'
+  for i = 1, select('#', ...) do
+    local path = select(i, ...)
     local ef = self.preprocessor_extra_flags
-    ef[#ef + 1] = directive
+    ef[#ef + 1] = '-I' .. path
+  end
+end
+
+local function argss_to_cmd(...)
+  local cmd = ''
+  for i = 1, select('#', ...) do
+    for _, arg in ipairs(select(i, ...)) do
+      cmd = cmd .. ' ' .. shell_quote(arg)
+    end
   end
+  return cmd
 end
 
 -- returns a list of the headers files upon which this file relies
 function Gcc:dependencies(hdr)
-  local out = io.popen(tostring(self.path) .. " -M " .. tostring(hdr) .. " 2>&1")
+  local cmd = argss_to_cmd(self.path, {'-M', hdr}) .. ' 2>&1'
+  local out = io.popen(cmd)
   local deps = out:read("*a")
   out:close()
   if deps then
@@ -138,23 +171,51 @@ function Gcc:dependencies(hdr)
   end
 end
 
+local function repeated_call(...)
+  local cmd = argss_to_cmd(...)
+  for _ = 1, 10 do
+    local stream = io.popen(cmd)
+    local ret = stream:read('*a')
+    stream:close()
+    if ret then
+      return ret
+    end
+  end
+  print('ERROR: preprocess.lua: Failed to execute ' .. cmd .. ': nil return after 10 attempts')
+  return nil
+end
+
 -- returns a stream representing a preprocessed form of the passed-in headers.
 -- Don't forget to close the stream by calling the close() method on it.
-function Gcc:preprocess_stream(...)
+function Gcc:preprocess(previous_defines, ...)
   -- create pseudo-header
   local pseudoheader = headerize({...}, false)
-  local defines = table.concat(self.preprocessor_extra_flags, ' ')
-  local cmd = ("echo $hdr | " ..
-               tostring(self.path) ..
-               " " ..
-               tostring(defines) ..
-               " -std=c99 -P -E -"):gsub('$hdr', shell_quote(pseudoheader))
+  local pseudoheader_fname = 'tmp_pseudoheader.h'
+  local pseudoheader_file = io.open(pseudoheader_fname, 'w')
+  pseudoheader_file:write(previous_defines)
+  pseudoheader_file:write("\n")
+  pseudoheader_file:write(pseudoheader)
+  pseudoheader_file:flush()
+  pseudoheader_file:close()
+
+  local defines = repeated_call(self.path, self.preprocessor_extra_flags,
+                                self.get_defines_extra_flags,
+                                {pseudoheader_fname})
+
   -- lfs = require("lfs")
   -- print("CWD: #{lfs.currentdir!}")
   -- print("CMD: #{cmd}")
   -- io.stderr\write("CWD: #{lfs.currentdir!}\n")
   -- io.stderr\write("CMD: #{cmd}\n")
-  return io.popen(cmd)
+
+  local declarations = repeated_call(self.path, self.preprocessor_extra_flags,
+                                     self.get_declarations_extra_flags,
+                                     {pseudoheader_fname})
+
+  os.remove(pseudoheader_fname)
+
+  assert(declarations and defines)
+  return declarations, defines
 end
 
 local Clang = Gcc:new()
@@ -192,8 +253,8 @@ return {
   includes = function(hdr)
     return cc:dependencies(hdr)
   end,
-  preprocess_stream = function(...)
-    return cc:preprocess_stream(...)
+  preprocess = function(...)
+    return cc:preprocess(...)
   end,
   add_to_include_path = function(...)
     return cc:add_to_include_path(...)
diff --git a/test/unit/strings_spec.lua b/test/unit/strings_spec.lua
index e935d2af6a..072701ea78 100644
--- a/test/unit/strings_spec.lua
+++ b/test/unit/strings_spec.lua
@@ -8,11 +8,43 @@ local to_cstr = helpers.to_cstr
 local strings = cimport('stdlib.h', './src/nvim/strings.h',
                         './src/nvim/memory.h')
 
+describe('vim_strsave_escaped()', function()
+  local vim_strsave_escaped = function(s, chars)
+    local res = strings.vim_strsave_escaped(to_cstr(s), to_cstr(chars))
+    local ret = ffi.string(res)
+
+    -- Explicitly free memory so we are sure it is allocated: if it was not it
+    -- will crash.
+    strings.xfree(res)
+    return ret
+  end
+
+  it('precedes by a backslash all chars from second argument', function()
+    eq([[\a\b\c\d]], vim_strsave_escaped('abcd','abcd'))
+  end)
+
+  it('precedes by a backslash chars only from second argument', function()
+    eq([[\a\bcd]], vim_strsave_escaped('abcd','ab'))
+  end)
+
+  it('returns a copy of passed string if second argument is empty', function()
+    eq('text \n text', vim_strsave_escaped('text \n text',''))
+  end)
+
+  it('returns an empty string if first argument is empty string', function()
+    eq('', vim_strsave_escaped('','\r'))
+  end)
+
+  it('returns a copy of passed string if it does not contain chars from 2nd argument', function()
+    eq('some text', vim_strsave_escaped('some text', 'a'))
+  end)
+end)
+
 describe('vim_strnsave_unquoted()', function()
   local vim_strnsave_unquoted = function(s, len)
     local res = strings.vim_strnsave_unquoted(to_cstr(s), len or #s)
     local ret = ffi.string(res)
-    -- Explicitly free memory so we are sure it is allocated: if it was not it 
+    -- Explicitly free memory so we are sure it is allocated: if it was not it
     -- will crash.
     strings.xfree(res)
     return ret
diff --git a/test/unit/tempfile_spec.lua b/test/unit/tempfile_spec.lua
index 7975d11aed..cf0d78b7a7 100644
--- a/test/unit/tempfile_spec.lua
+++ b/test/unit/tempfile_spec.lua
@@ -43,7 +43,7 @@ describe('tempfile related functions', function()
     it('generate name of non-existing file', function()
       local file = vim_tempname()
       assert.truthy(file)
-      assert.False(os.os_file_exists(file))
+      assert.False(os.os_path_exists(file))
     end)
 
     it('generate different names on each call', function()
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index f584815499..f0bc41fef6 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -5,6 +5,12 @@ project(NEOVIM_DEPS)
 # Point CMake at any custom modules we may ship
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
+# In Windows/MSVC CMAKE_BUILD_TYPE changes the paths/linking of the build
+# recipes (libuv, msgpack), make sure it is set
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release)
+endif()
+
 set(DEPS_INSTALL_DIR "${CMAKE_BINARY_DIR}/usr" CACHE PATH "Dependencies install directory.")
 set(DEPS_BIN_DIR "${DEPS_INSTALL_DIR}/bin" CACHE PATH "Dependencies binary install directory.")
 set(DEPS_LIB_DIR "${DEPS_INSTALL_DIR}/lib" CACHE PATH "Dependencies library install directory.")
@@ -26,6 +32,12 @@ option(USE_BUNDLED_LUV "Use the bundled version of luv." ${USE_BUNDLED})
 # build it unless explicitly requested
 option(USE_BUNDLED_LUA "Use the bundled version of lua." OFF)
 
+if(USE_BUNDLED  AND (NOT WIN32))
+  option(USE_BUNDLED_GPERF "Use the bundled version of gperf." ON)
+else()
+  option(USE_BUNDLED_GPERF "Use the bundled version of gperf." OFF)
+endif()
+
 option(USE_EXISTING_SRC_DIR "Skip download of deps sources in case of existing source directory." OFF)
 
 if(UNIX)
@@ -75,8 +87,8 @@ endif()
 
 include(ExternalProject)
 
-set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.8.0.tar.gz)
-set(LIBUV_SHA256 906e1a5c673c95cb261adeacdb7308a65b4a8f7c9c50d85f3021364951fa9cde)
+set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.9.1.tar.gz)
+set(LIBUV_SHA256 a6ca9f0648973d1463f46b495ce546ddcbe7cce2f04b32e802a15539e46c57ad)
 
 set(MSGPACK_URL https://github.com/msgpack/msgpack-c/archive/cpp-1.0.0.tar.gz)
 set(MSGPACK_SHA256 afda64ca445203bb7092372b822bae8b2539fdcebbfc3f753f393628c2bcfe7d)
@@ -84,8 +96,8 @@ set(MSGPACK_SHA256 afda64ca445203bb7092372b822bae8b2539fdcebbfc3f753f393628c2bcf
 set(LUAJIT_URL https://github.com/neovim/deps/raw/master/opt/LuaJIT-2.0.4.tar.gz)
 set(LUAJIT_SHA256 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d)
 
-set(LUA_URL https://github.com/lua/lua/archive/5.1.5.tar.gz)
-set(LUA_SHA256 1cd642c4c39778306a14e62ccddace5c7a4fb2257b0b06f43bc81cf305c7415f)
+set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz)
+set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333)
 
 set(LUAROCKS_URL https://github.com/keplerproject/luarocks/archive/5d8a16526573b36d5b22aa74866120c998466697.tar.gz)
 set(LUAROCKS_SHA256 cae709111c5701235770047dfd7169f66b82ae1c7b9b79207f9df0afb722bfd9)
@@ -93,17 +105,23 @@ set(LUAROCKS_SHA256 cae709111c5701235770047dfd7169f66b82ae1c7b9b79207f9df0afb722
 set(UNIBILIUM_URL https://github.com/mauke/unibilium/archive/v1.2.0.tar.gz)
 set(UNIBILIUM_SHA256 623af1099515e673abfd3cae5f2fa808a09ca55dda1c65a7b5c9424eb304ead8)
 
-set(LIBTERMKEY_URL http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.18.tar.gz)
-set(LIBTERMKEY_SHA256 239746de41c845af52bb3c14055558f743292dd6c24ac26c2d6567a5a6093926)
+set(LIBTERMKEY_URL http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.19.tar.gz)
+set(LIBTERMKEY_SHA256 c505aa4cb48c8fa59c526265576b97a19e6ebe7b7da20f4ecaae898b727b48b7)
 
 set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c.tar.gz)
 set(LIBVTERM_SHA256 1a4272be91d9614dc183a503786df83b6584e4afaab7feaaa5409f841afbd796)
 
-set(JEMALLOC_URL https://github.com/jemalloc/jemalloc/releases/download/4.0.2/jemalloc-4.0.2.tar.bz2)
-set(JEMALLOC_SHA256 0d8a9c8a98adb6983e0ccb521d45d9db1656ef3e71d0b14fb333f2c8138f4611)
-            
-set(LUV_URL https://github.com/luvit/luv/archive/146f1ce4c08c3b67f604c9ee1e124b1cf5c15cf3.tar.gz)
-set(LUV_SHA256 3d537f8eb9fa5adb146a083eae22af886aee324ec268e2aa0fa75f2f1c52ca7a)
+set(JEMALLOC_URL https://github.com/jemalloc/jemalloc/releases/download/4.3.1/jemalloc-4.3.1.tar.bz2)
+set(JEMALLOC_SHA256 f7bb183ad8056941791e0f075b802e8ff10bd6e2d904e682f87c8f6a510c278b)
+
+set(LUV_URL https://github.com/luvit/luv/archive/1.9.1-0.tar.gz)
+set(LUV_SHA256 86a199403856018cd8e5529c8527450c83664a3d36f52d5253cbe909ea6c5a06)
+
+set(GPERF_URL http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.4.tar.gz)
+set(GPERF_SHA256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e)
+
+set(WIN32YANK_URL https://github.com/equalsraf/win32yank/releases/download/v0.0.2/win32yank.zip)
+set(WIN32YANK_SHA256 78869bf68565607cda1b6a3d549e2487d59d6f0f16f9b003e123c0086f90309d)
 
 if(USE_BUNDLED_UNIBILIUM)
   include(BuildUnibilium)
@@ -145,6 +163,17 @@ if(USE_BUNDLED_LUV)
   include(BuildLuv)
 endif()
 
+if(USE_BUNDLED_GPERF)
+  include(BuildGperf)
+endif()
+
+include(GetBinaryDeps)
+
+if(WIN32)
+  GetBinaryDep(TARGET win32yank
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E copy win32yank.exe ${DEPS_INSTALL_DIR}/bin)
+endif()
+
 add_custom_target(clean-shared-libraries
   COMMAND ${CMAKE_COMMAND}
     -DREMOVE_FILE_GLOB=${DEPS_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}*${CMAKE_SHARED_LIBRARY_SUFFIX}*
diff --git a/third-party/cmake/BuildGperf.cmake b/third-party/cmake/BuildGperf.cmake
new file mode 100644
index 0000000000..494d0d9717
--- /dev/null
+++ b/third-party/cmake/BuildGperf.cmake
@@ -0,0 +1,51 @@
+# Gperf recipe. Gperf is only required when building Neovim, when
+# cross compiling we still want to build for the HOST system, whenever
+# writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables
+# instead of DEPS_* - check the main CMakeLists.txt for a list.
+
+# BuildGperf(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
+# Reusable function to build Gperf, wraps ExternalProject_Add.
+# Failing to pass a command argument will result in no command being run
+function(BuildGperf)
+  cmake_parse_arguments(_gperf
+    ""
+    ""
+    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
+    ${ARGN})
+
+  if(NOT _gperf_CONFIGURE_COMMAND AND NOT _gperf_BUILD_COMMAND
+        AND NOT _gperf_INSTALL_COMMAND)
+    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
+  endif()
+
+  ExternalProject_Add(gperf
+    PREFIX ${DEPS_BUILD_DIR}
+    URL ${GPERF_URL}
+    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/gperf
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+      -DPREFIX=${DEPS_BUILD_DIR}
+      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/gperf
+      -DURL=${GPERF_URL}
+      -DEXPECTED_SHA256=${GPERF_SHA256}
+      -DTARGET=gperf
+      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND "${_gperf_CONFIGURE_COMMAND}"
+    BUILD_COMMAND "${_gperf_BUILD_COMMAND}"
+    INSTALL_COMMAND "${_gperf_INSTALL_COMMAND}")
+endfunction()
+
+set(GPERF_BUILDARGS CC=${HOSTDEPS_C_COMPILER} LD=${HOSTDEPS_C_COMPILER})
+
+if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
+
+  BuildGperf(
+    CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/gperf/configure
+      --prefix=${HOSTDEPS_INSTALL_DIR}
+    INSTALL_COMMAND ${MAKE_PRG} install)
+
+else()
+  message(FATAL_ERROR "Trying to build gperf in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
+endif()
+
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake
index 1d8d69e64e..5482f28557 100644
--- a/third-party/cmake/BuildLibuv.cmake
+++ b/third-party/cmake/BuildLibuv.cmake
@@ -5,7 +5,7 @@ include(CMakeParseArguments)
 # Failing to pass a command argument will result in no command being run
 function(BuildLibuv)
   cmake_parse_arguments(_libuv
-    ""
+    "BUILD_IN_SOURCE"
     "TARGET"
     "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
     ${ARGN})
@@ -30,6 +30,7 @@ function(BuildLibuv)
       -DTARGET=${_libuv_TARGET}
       -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+    BUILD_IN_SOURCE ${_libuv_BUILD_IN_SOURCE}
     CONFIGURE_COMMAND "${_libuv_CONFIGURE_COMMAND}"
     BUILD_COMMAND "${_libuv_BUILD_COMMAND}"
     INSTALL_COMMAND "${_libuv_INSTALL_COMMAND}")
@@ -56,6 +57,16 @@ elseif(MINGW AND CMAKE_CROSSCOMPILING)
     CONFIGURE_COMMAND ${UNIX_CFGCMD} --host=${CROSS_TARGET}
     INSTALL_COMMAND ${MAKE_PRG} V=1 install)
 
+elseif(MINGW)
+
+  # Native MinGW
+  BuildLibUv(BUILD_IN_SOURCE
+    BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} -f Makefile.mingw
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/libuv/libuv.a ${DEPS_INSTALL_DIR}/lib
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPS_BUILD_DIR}/src/libuv/include ${DEPS_INSTALL_DIR}/include
+    )
 
 elseif(WIN32 AND MSVC)
 
@@ -70,11 +81,17 @@ elseif(WIN32 AND MSVC)
   else()
     set(VS_ARCH x64)
   endif()
-  BuildLibuv(
-    # By default this creates Debug builds
-    BUILD_COMMAND set PYTHON=${PYTHON_EXECUTABLE} COMMAND ${DEPS_BUILD_DIR}/src/libuv/vcbuild.bat static debug ${VS_ARCH}
+  string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_BUILD_TYPE)
+  set(UV_OUTPUT_DIR ${DEPS_BUILD_DIR}/src/libuv/${CMAKE_BUILD_TYPE})
+  BuildLibUv(
+    BUILD_COMMAND set PYTHON=${PYTHON_EXECUTABLE} COMMAND ${DEPS_BUILD_DIR}/src/libuv/vcbuild.bat shared ${LOWERCASE_BUILD_TYPE} ${VS_ARCH}
     INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/libuv/Debug/lib/libuv.lib ${DEPS_INSTALL_DIR}/lib
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin
+      COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.lib ${DEPS_INSTALL_DIR}/lib
+      # Some applications (lua-client/luarocks) look for uv.lib instead of libuv.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.lib ${DEPS_INSTALL_DIR}/lib/uv.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.dll ${DEPS_INSTALL_DIR}/bin/
+      COMMAND ${CMAKE_COMMAND} -E copy ${UV_OUTPUT_DIR}/libuv.dll ${DEPS_INSTALL_DIR}/bin/uv.dll
       COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${DEPS_BUILD_DIR}/src/libuv/include ${DEPS_INSTALL_DIR}/include)
 
diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake
index ec9ba0d741..5ea8314da5 100644
--- a/third-party/cmake/BuildLibvterm.cmake
+++ b/third-party/cmake/BuildLibvterm.cmake
@@ -1,26 +1,59 @@
+include(CMakeParseArguments)
+
+# BuildLibvterm(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
+# Failing to pass a command argument will result in no command being run
+function(BuildLibvterm)
+  cmake_parse_arguments(_libvterm
+    ""
+    ""
+    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
+    ${ARGN})
+
+  if(NOT _libvterm_CONFIGURE_COMMAND AND NOT _libvterm_BUILD_COMMAND
+       AND NOT _libvterm_INSTALL_COMMAND)
+    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND, BUILD_COMMAND, INSTALL_COMMAND")
+  endif()
+
+  ExternalProject_Add(libvterm
+    PREFIX ${DEPS_BUILD_DIR}
+    URL ${LIBVTERM_URL}
+    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+      -DPREFIX=${DEPS_BUILD_DIR}
+      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libvterm
+      -DURL=${LIBVTERM_URL}
+      -DEXPECTED_SHA256=${LIBVTERM_SHA256}
+      -DTARGET=libvterm
+      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+    CONFIGURE_COMMAND ""
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND "${_libvterm_CONFIGURE_COMMAND}"
+    BUILD_COMMAND "${_libvterm_BUILD_COMMAND}"
+    INSTALL_COMMAND "${_libvterm_INSTALL_COMMAND}")
+endfunction()
+
 if(WIN32)
-  message(STATUS "Building libvterm in Windows is not supported (skipping)")
-  return()
+  # MinGW
+  set(LIBVTERM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+	  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt
+	  ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt
+	COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libvterm
+      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+      "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC"
+      -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+  set(LIBVTERM_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE})
+  set(LIBVTERM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
+else()
+  set(LIBVTERM_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
+                                PREFIX=${DEPS_INSTALL_DIR}
+                                CFLAGS=-fPIC
+                                install)
 endif()
 
-ExternalProject_Add(libvterm
-  PREFIX ${DEPS_BUILD_DIR}
-  URL ${LIBVTERM_URL}
-  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm
-  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-    -DPREFIX=${DEPS_BUILD_DIR}
-    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libvterm
-    -DURL=${LIBVTERM_URL}
-    -DEXPECTED_SHA256=${LIBVTERM_SHA256}
-    -DTARGET=libvterm
-    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-  CONFIGURE_COMMAND ""
-  BUILD_IN_SOURCE 1
-  BUILD_COMMAND ""
-  INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
-                              PREFIX=${DEPS_INSTALL_DIR}
-                              CFLAGS=-fPIC
-                              install)
+BuildLibvterm(CONFIGURE_COMMAND ${LIBVTERM_CONFIGURE_COMMAND}
+  BUILD_COMMAND ${LIBVTERM_BUILD_COMMAND}
+  INSTALL_COMMAND ${LIBVTERM_INSTALL_COMMAND})
 
 list(APPEND THIRD_PARTY_DEPS libvterm)
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake
index 83aceecb59..c8eee282bf 100644
--- a/third-party/cmake/BuildLuajit.cmake
+++ b/third-party/cmake/BuildLuajit.cmake
@@ -40,7 +40,6 @@ set(INSTALLCMD_UNIX ${MAKE_PRG} CFLAGS=-fPIC
                                 CFLAGS+=-DLUA_USE_APICHECK
                                 CFLAGS+=-DLUA_USE_ASSERT
                                 CCDEBUG+=-g
-                                BUILDMODE=static
                                 Q=
                                 install)
 
@@ -71,13 +70,36 @@ elseif(MINGW AND CMAKE_CROSSCOMPILING)
         Q=
         INSTALL_TSYMNAME=luajit.exe)
 
-elseif(WIN32 AND MSVC)
+elseif(MINGW)
+
+
+	BuildLuaJit(BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} CC=${DEPS_C_COMPILER}
+                                PREFIX=${DEPS_INSTALL_DIR}
+                                CFLAGS+=-DLUAJIT_DISABLE_JIT
+                                CFLAGS+=-DLUA_USE_APICHECK
+                                CFLAGS+=-DLUA_USE_ASSERT
+                                CCDEBUG+=-g
+                                BUILDMODE=static
+                      # Build a DLL too
+                      COMMAND ${CMAKE_MAKE_PROGRAM} CC=${DEPS_C_COMPILER} BUILDMODE=dynamic
+
+          INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin
+	    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/luajit.exe ${DEPS_INSTALL_DIR}/bin
+	    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.dll ${DEPS_INSTALL_DIR}/bin
+	    COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib
+	    # Luarocks searches for lua51.dll in lib
+	    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.dll ${DEPS_INSTALL_DIR}/lib
+	    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/libluajit.a ${DEPS_INSTALL_DIR}/lib
+	    COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include/luajit-2.0
+	    COMMAND ${CMAKE_COMMAND} -DFROM_GLOB=${DEPS_BUILD_DIR}/src/luajit/src/*.h -DTO=${DEPS_INSTALL_DIR}/include/luajit-2.0 -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CopyFilesGlob.cmake
+          )
+elseif(MSVC)
 
   BuildLuaJit(
-    BUILD_COMMAND ${CMAKE_COMMAND} -E chdir ${DEPS_BUILD_DIR}/src/luajit/src ${DEPS_BUILD_DIR}/src/luajit/src/msvcbuild.bat static
+    BUILD_COMMAND ${CMAKE_COMMAND} -E chdir ${DEPS_BUILD_DIR}/src/luajit/src ${DEPS_BUILD_DIR}/src/luajit/src/msvcbuild.bat
     INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin
       COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/luajit.exe ${DEPS_INSTALL_DIR}/bin
-      COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.lib ${DEPS_INSTALL_DIR}/bin
+      COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.dll ${DEPS_INSTALL_DIR}/bin
       COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/lib
       COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_BUILD_DIR}/src/luajit/src/lua51.lib ${DEPS_INSTALL_DIR}/lib
       COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/include/luajit-2.0
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 1662f89b24..268df7c62f 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -3,11 +3,7 @@
 # writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables
 # instead of DEPS_* - check the main CMakeLists.txt for a list.
 
-if(MSVC)
-  message(STATUS "Building busted in Windows is not supported (skipping)")
-else()
-  option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
-endif()
+option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON)
 
 # BuildLuarocks(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
 # Reusable function to build luarocks, wraps ExternalProject_Add.
@@ -46,11 +42,9 @@ endfunction()
 set(LUAROCKS_BINARY ${HOSTDEPS_BIN_DIR}/luarocks)
 
 # Arguments for calls to 'luarocks build'
-if(MSVC)
-  # In native Win32 don't pass the compiler/linker to luarocks, the bundled
+if(NOT MSVC)
+  # In MSVC don't pass the compiler/linker to luarocks, the bundled
   # version already knows, and passing them here breaks the build
-  set(LUAROCKS_BUILDARGS CFLAGS=/MT)
-else()
   set(LUAROCKS_BUILDARGS CC=${HOSTDEPS_C_COMPILER} LD=${HOSTDEPS_C_COMPILER})
 endif()
 
@@ -67,8 +61,12 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
       --prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS}
       --lua-suffix=jit
     INSTALL_COMMAND ${MAKE_PRG} bootstrap)
+elseif(MSVC OR MINGW)
+
+  if(MINGW)
+    set(MINGW_FLAG /MW)
+  endif()
 
-elseif(MSVC)
   # Ignore USE_BUNDLED_LUAJIT - always ON for native Win32
   BuildLuarocks(INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F
     /LUA ${DEPS_INSTALL_DIR}
@@ -78,6 +76,7 @@ elseif(MSVC)
     /P ${DEPS_INSTALL_DIR} /TREE ${DEPS_INSTALL_DIR}
     /SCRIPTS ${DEPS_BIN_DIR}
     /CMOD ${DEPS_BIN_DIR}
+    ${MINGW_FLAG}
     /LUAMOD ${DEPS_BIN_DIR}/lua)
 
   set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/2.2/luarocks.bat)
@@ -114,17 +113,43 @@ add_custom_target(lpeg
 
 list(APPEND THIRD_PARTY_DEPS lpeg)
 
+add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/inspect
+  COMMAND ${LUAROCKS_BINARY}
+  ARGS build inspect ${LUAROCKS_BUILDARGS}
+  DEPENDS mpack)
+add_custom_target(inspect
+  DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/inspect)
+
+list(APPEND THIRD_PARTY_DEPS inspect)
+
 if(USE_BUNDLED_BUSTED)
-  add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted
+
+  find_program(UNZIP_PRG unzip)
+  if(NOT UNZIP_PRG)
+    message(FATAL_ERROR "'unzip' must be installed to allow for penlight installation")
+  endif()
+  add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2
+    COMMAND ${LUAROCKS_BINARY}
+    ARGS build penlight 1.3.2-2 ${LUAROCKS_BUILDARGS}
+    DEPENDS inspect)
+  add_custom_target(penlight
+    DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2)
+
+  if(WIN32)
+    set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat")
+  else()
+    set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted")
+  endif()
+  add_custom_command(OUTPUT ${BUSTED_EXE}
     COMMAND ${LUAROCKS_BINARY}
     ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS}
-    DEPENDS lpeg)
+    DEPENDS penlight)
   add_custom_target(busted
-    DEPENDS ${HOSTDEPS_BIN_DIR}/busted)
+    DEPENDS ${BUSTED_EXE})
 
   add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/luacheck
     COMMAND ${LUAROCKS_BINARY}
-    ARGS build https://raw.githubusercontent.com/mpeterv/luacheck/3929eaa3528be2a8a50c593d687c8625205a2033/luacheck-scm-1.rockspec ${LUAROCKS_BUILDARGS}
+    ARGS build https://raw.githubusercontent.com/mpeterv/luacheck/master/luacheck-scm-1.rockspec ${LUAROCKS_BUILDARGS}
     DEPENDS busted)
   add_custom_target(luacheck
     DEPENDS ${HOSTDEPS_BIN_DIR}/luacheck)
@@ -133,9 +158,13 @@ if(USE_BUNDLED_BUSTED)
   if(MINGW AND CMAKE_CROSSCOMPILING)
     set(LUV_DEPS ${LUV_DEPS} libuv_host)
   endif()
+  set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC")
+  if(USE_BUNDLED_LIBUV)
+    list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR})
+  endif()
   add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv
     COMMAND ${LUAROCKS_BINARY}
-    ARGS make ${LUAROCKS_BUILDARGS} LIBUV_DIR=${HOSTDEPS_INSTALL_DIR} CFLAGS='-O0 -g3 -fPIC'
+    ARGS make ${LUAROCKS_BUILDARGS} ${LUV_ARGS}
     WORKING_DIRECTORY ${DEPS_BUILD_DIR}/src/luv
     DEPENDS ${LUV_DEPS})
   add_custom_target(luv
@@ -143,7 +172,7 @@ if(USE_BUNDLED_BUSTED)
 
   add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
     COMMAND ${LUAROCKS_BINARY}
-    ARGS build https://raw.githubusercontent.com/neovim/lua-client/0.0.1-24/nvim-client-0.0.1-24.rockspec ${LUAROCKS_BUILDARGS}
+    ARGS build https://raw.githubusercontent.com/neovim/lua-client/0.0.1-25/nvim-client-0.0.1-25.rockspec ${LUAROCKS_BUILDARGS}
     DEPENDS luv)
   add_custom_target(nvim-client
     DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client)
diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake
index 3060590bce..8ba4a0b41b 100644
--- a/third-party/cmake/BuildLuv.cmake
+++ b/third-party/cmake/BuildLuv.cmake
@@ -43,6 +43,7 @@ set(LUV_PATCH_COMMAND
 
 set(LUV_CONFIGURE_COMMAND_COMMON
   ${CMAKE_COMMAND} ${LUV_SRC_DIR}
+  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
   -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
   -DLUA_BUILD_TYPE=System
   -DWITH_SHARED_LIBUV=ON
diff --git a/third-party/cmake/BuildMsgpack.cmake b/third-party/cmake/BuildMsgpack.cmake
index 4b6b361e85..6b38508b0b 100644
--- a/third-party/cmake/BuildMsgpack.cmake
+++ b/third-party/cmake/BuildMsgpack.cmake
@@ -37,10 +37,12 @@ set(MSGPACK_CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/msgpack
   -DMSGPACK_BUILD_TESTS=OFF
   -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC")
+  -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+  "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1} -fPIC"
+  -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
 
-set(MSGPACK_BUILD_COMMAND ${CMAKE_COMMAND} --build .)
-set(MSGPACK_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install)
+set(MSGPACK_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE})
+set(MSGPACK_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
 
 if(MINGW AND CMAKE_CROSSCOMPILING)
   get_filename_component(TOOLCHAIN ${CMAKE_TOOLCHAIN_FILE} REALPATH)
@@ -50,6 +52,7 @@ if(MINGW AND CMAKE_CROSSCOMPILING)
     -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
     # Pass toolchain
     -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     # Hack to avoid -rdynamic in Mingw
     -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="")
 elseif(MSVC)
@@ -60,12 +63,13 @@ elseif(MSVC)
     -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     "-DCMAKE_C_FLAGS:STRING=${CMAKE_C_COMPILER_ARG1}"
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     # Make sure we use the same generator, otherwise we may
     # accidentaly end up using different MSVC runtimes
-    -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-    # Use static runtime
-    -DCMAKE_C_FLAGS_DEBUG="-MTd"
-    -DCMAKE_C_FLAGS_RELEASE="-MT")
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
+  # Place the DLL in the bin folder
+  set(MSGPACK_INSTALL_COMMAND ${MSGPACK_INSTALL_COMMAND}
+    COMMAND ${CMAKE_COMMAND} -E copy ${DEPS_INSTALL_DIR}/lib/msgpack.dll ${DEPS_INSTALL_DIR}/bin)
 endif()
 
 BuildMsgpack(CONFIGURE_COMMAND ${MSGPACK_CONFIGURE_COMMAND}
diff --git a/third-party/cmake/CopyFilesGlob.cmake b/third-party/cmake/CopyFilesGlob.cmake
index 056da32fd4..8950ead1e5 100644
--- a/third-party/cmake/CopyFilesGlob.cmake
+++ b/third-party/cmake/CopyFilesGlob.cmake
@@ -9,6 +9,8 @@ if(NOT TO)
   message(FATAL_ERROR "TO must be set")
 endif()
 
+execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TO})
+
 file(GLOB files ${FROM_GLOB})
 foreach(file ${files})
   execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${file} ${TO} RESULT_VARIABLE rv)
diff --git a/third-party/cmake/GetBinaryDeps.cmake b/third-party/cmake/GetBinaryDeps.cmake
new file mode 100644
index 0000000000..cdc8ac051e
--- /dev/null
+++ b/third-party/cmake/GetBinaryDeps.cmake
@@ -0,0 +1,46 @@
+# Download and install binary dependencies for windows
+include(CMakeParseArguments)
+
+# This is similar to the build recipes, but instead downloads a third party
+# binary and installs it under the the DEPS_PREFIX. The INSTALL_COMMAND is
+# executed in the folder where downloaded files are extracted and the
+# ${DEPS_INSTALL_DIR} holds the path to the third-party install root.
+function(GetBinaryDep)
+  cmake_parse_arguments(_gettool
+    "BUILD_IN_SOURCE"
+    "TARGET"
+    "INSTALL_COMMAND"
+    ${ARGN})
+
+  if(NOT _gettool_TARGET OR NOT _gettool_INSTALL_COMMAND)
+    message(FATAL_ERROR "Must pass INSTALL_COMMAND and TARGET")
+  endif()
+
+  string(TOUPPER "${_gettool_TARGET}_URL" URL_VARNAME)
+  string(TOUPPER "${_gettool_TARGET}_SHA256" HASH_VARNAME)
+  set(URL ${${URL_VARNAME}})
+  set(HASH ${${HASH_VARNAME}})
+  if(NOT URL OR NOT HASH )
+	  message(FATAL_ERROR "${URL_VARNAME} and ${HASH_VARNAME} must be set")
+  endif()
+
+  ExternalProject_Add(${_gettool_TARGET}
+    PREFIX ${DEPS_BUILD_DIR}
+    URL ${URL}
+    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}
+    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+      -DPREFIX=${DEPS_BUILD_DIR}
+      -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}
+      -DURL=${URL}
+      -DEXPECTED_SHA256=${HASH}
+      -DTARGET=${_gettool_TARGET}
+      -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+      -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+    CONFIGURE_COMMAND ""
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ${CMAKE_COMMAND} -E make_directory ${DEPS_INSTALL_DIR}/bin
+		COMMAND "${_gettool_INSTALL_COMMAND}")
+  list(APPEND THIRD_PARTY_DEPS ${__gettool_TARGET})
+endfunction()
diff --git a/third-party/cmake/LibvtermCMakeLists.txt b/third-party/cmake/LibvtermCMakeLists.txt
new file mode 100644
index 0000000000..72183e4b4c
--- /dev/null
+++ b/third-party/cmake/LibvtermCMakeLists.txt
@@ -0,0 +1,72 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(libvterm LANGUAGES C)
+
+include(GNUInstallDirs)
+find_package(Perl REQUIRED)
+
+if(MSVC)
+  add_definitions(/W3 -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+else()
+  add_definitions(-Wall -std=c99)
+endif()
+
+# Generate includes from tables
+file(GLOB TBL_FILES ${CMAKE_SOURCE_DIR}/src/encoding/*.tbl)
+set(TBL_FILES_HEADERS)
+foreach(file ${TBL_FILES})
+  get_filename_component(basename ${file} NAME_WE)
+  set(tname encoding/${basename}.inc)
+  add_custom_command(OUTPUT
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/encoding/
+    COMMAND ${PERL_EXECUTABLE} -CSD ${CMAKE_SOURCE_DIR}/tbl2inc_c.pl ${file} > ${CMAKE_BINARY_DIR}/${tname}
+    COMMENT "Generating ${tname}"
+    OUTPUT ${CMAKE_BINARY_DIR}/${tname}
+    )
+  list(APPEND TBL_FILES_HEADERS ${tname})
+endforeach()
+
+include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR})
+
+file(GLOB VTERM_SOURCES ${CMAKE_SOURCE_DIR}/src/*.c)
+add_library(vterm ${VTERM_SOURCES} ${TBL_FILES_HEADERS})
+install(TARGETS vterm ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+add_library(vterm-shared SHARED ${VTERM_SOURCES} ${TBL_FILES_HEADERS})
+set_target_properties(vterm-shared PROPERTIES
+  OUTPUT_NAME vterm
+  SOVERSION 0)
+install(TARGETS vterm-shared
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+install(FILES include/vterm.h include/vterm_keycodes.h
+  DESTINATION include)
+
+if(NOT WIN32)
+  file(GLOB BIN_SOURCES ${CMAKE_SOURCE_DIR}/bin/*.c)
+  foreach(EXE_C ${BIN_SOURCES})
+    get_filename_component(target_name ${EXE_C} NAME_WE)
+    add_executable(${target_name} ${EXE_C})
+    target_link_libraries(${target_name} vterm)
+    install(TARGETS ${target_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+  endforeach()
+endif()
+
+# Tests
+add_executable(harness EXCLUDE_FROM_ALL t/harness.c)
+target_link_libraries(harness vterm)
+set_target_properties(harness PROPERTIES
+  # run-test.pl expects to find the harness in t/.libs/
+  RUNTIME_OUTPUT_DIRECTORY t/.libs)
+
+file(GLOB TESTFILES ${CMAKE_SOURCE_DIR}/t/*.test)
+add_custom_target(check)
+foreach(testfile ${TESTFILES})
+  get_filename_component(target_name ${testfile} NAME_WE)
+  add_custom_target(${target_name}
+    COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/t/run-test.pl ${testfile}
+    COMMENT "**${target_name} **"
+    DEPENDS harness)
+  add_dependencies(check ${target_name})
+endforeach()
diff --git a/unicode/CaseFolding.txt b/unicode/CaseFolding.txt
index 0197a6c40f..372ee68bd8 100644
--- a/unicode/CaseFolding.txt
+++ b/unicode/CaseFolding.txt
@@ -1,10 +1,11 @@
-# CaseFolding-8.0.0.txt
-# Date: 2015-01-13, 18:16:36 GMT [MD]
+# CaseFolding-9.0.0.txt
+# Date: 2016-03-02, 18:54:54 GMT
+# © 2016 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
 #
 # Unicode Character Database
-# Copyright (c) 1991-2015 Unicode, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-# For documentation, see http://www.unicode.org/reports/tr44/
+#   For documentation, see http://www.unicode.org/reports/tr44/
 #
 # Case Folding Properties
 #
@@ -593,6 +594,15 @@
 13FB; C; 13F3; # CHEROKEE SMALL LETTER YU
 13FC; C; 13F4; # CHEROKEE SMALL LETTER YV
 13FD; C; 13F5; # CHEROKEE SMALL LETTER MV
+1C80; C; 0432; # CYRILLIC SMALL LETTER ROUNDED VE
+1C81; C; 0434; # CYRILLIC SMALL LETTER LONG-LEGGED DE
+1C82; C; 043E; # CYRILLIC SMALL LETTER NARROW O
+1C83; C; 0441; # CYRILLIC SMALL LETTER WIDE ES
+1C84; C; 0442; # CYRILLIC SMALL LETTER TALL TE
+1C85; C; 0442; # CYRILLIC SMALL LETTER THREE-LEGGED TE
+1C86; C; 044A; # CYRILLIC SMALL LETTER TALL HARD SIGN
+1C87; C; 0463; # CYRILLIC SMALL LETTER TALL YAT
+1C88; C; A64B; # CYRILLIC SMALL LETTER UNBLENDED UK
 1E00; C; 1E01; # LATIN CAPITAL LETTER A WITH RING BELOW
 1E02; C; 1E03; # LATIN CAPITAL LETTER B WITH DOT ABOVE
 1E04; C; 1E05; # LATIN CAPITAL LETTER B WITH DOT BELOW
@@ -1163,6 +1173,7 @@ A7AA; C; 0266; # LATIN CAPITAL LETTER H WITH HOOK
 A7AB; C; 025C; # LATIN CAPITAL LETTER REVERSED OPEN E
 A7AC; C; 0261; # LATIN CAPITAL LETTER SCRIPT G
 A7AD; C; 026C; # LATIN CAPITAL LETTER L WITH BELT
+A7AE; C; 026A; # LATIN CAPITAL LETTER SMALL CAPITAL I
 A7B0; C; 029E; # LATIN CAPITAL LETTER TURNED K
 A7B1; C; 0287; # LATIN CAPITAL LETTER TURNED T
 A7B2; C; 029D; # LATIN CAPITAL LETTER J WITH CROSSED-TAIL
@@ -1327,6 +1338,42 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 10425; C; 1044D; # DESERET CAPITAL LETTER ENG
 10426; C; 1044E; # DESERET CAPITAL LETTER OI
 10427; C; 1044F; # DESERET CAPITAL LETTER EW
+104B0; C; 104D8; # OSAGE CAPITAL LETTER A
+104B1; C; 104D9; # OSAGE CAPITAL LETTER AI
+104B2; C; 104DA; # OSAGE CAPITAL LETTER AIN
+104B3; C; 104DB; # OSAGE CAPITAL LETTER AH
+104B4; C; 104DC; # OSAGE CAPITAL LETTER BRA
+104B5; C; 104DD; # OSAGE CAPITAL LETTER CHA
+104B6; C; 104DE; # OSAGE CAPITAL LETTER EHCHA
+104B7; C; 104DF; # OSAGE CAPITAL LETTER E
+104B8; C; 104E0; # OSAGE CAPITAL LETTER EIN
+104B9; C; 104E1; # OSAGE CAPITAL LETTER HA
+104BA; C; 104E2; # OSAGE CAPITAL LETTER HYA
+104BB; C; 104E3; # OSAGE CAPITAL LETTER I
+104BC; C; 104E4; # OSAGE CAPITAL LETTER KA
+104BD; C; 104E5; # OSAGE CAPITAL LETTER EHKA
+104BE; C; 104E6; # OSAGE CAPITAL LETTER KYA
+104BF; C; 104E7; # OSAGE CAPITAL LETTER LA
+104C0; C; 104E8; # OSAGE CAPITAL LETTER MA
+104C1; C; 104E9; # OSAGE CAPITAL LETTER NA
+104C2; C; 104EA; # OSAGE CAPITAL LETTER O
+104C3; C; 104EB; # OSAGE CAPITAL LETTER OIN
+104C4; C; 104EC; # OSAGE CAPITAL LETTER PA
+104C5; C; 104ED; # OSAGE CAPITAL LETTER EHPA
+104C6; C; 104EE; # OSAGE CAPITAL LETTER SA
+104C7; C; 104EF; # OSAGE CAPITAL LETTER SHA
+104C8; C; 104F0; # OSAGE CAPITAL LETTER TA
+104C9; C; 104F1; # OSAGE CAPITAL LETTER EHTA
+104CA; C; 104F2; # OSAGE CAPITAL LETTER TSA
+104CB; C; 104F3; # OSAGE CAPITAL LETTER EHTSA
+104CC; C; 104F4; # OSAGE CAPITAL LETTER TSHA
+104CD; C; 104F5; # OSAGE CAPITAL LETTER DHA
+104CE; C; 104F6; # OSAGE CAPITAL LETTER U
+104CF; C; 104F7; # OSAGE CAPITAL LETTER WA
+104D0; C; 104F8; # OSAGE CAPITAL LETTER KHA
+104D1; C; 104F9; # OSAGE CAPITAL LETTER GHA
+104D2; C; 104FA; # OSAGE CAPITAL LETTER ZA
+104D3; C; 104FB; # OSAGE CAPITAL LETTER ZHA
 10C80; C; 10CC0; # OLD HUNGARIAN CAPITAL LETTER A
 10C81; C; 10CC1; # OLD HUNGARIAN CAPITAL LETTER AA
 10C82; C; 10CC2; # OLD HUNGARIAN CAPITAL LETTER EB
@@ -1410,5 +1457,39 @@ FF3A; C; FF5A; # FULLWIDTH LATIN CAPITAL LETTER Z
 118BD; C; 118DD; # WARANG CITI CAPITAL LETTER SSUU
 118BE; C; 118DE; # WARANG CITI CAPITAL LETTER SII
 118BF; C; 118DF; # WARANG CITI CAPITAL LETTER VIYO
+1E900; C; 1E922; # ADLAM CAPITAL LETTER ALIF
+1E901; C; 1E923; # ADLAM CAPITAL LETTER DAALI
+1E902; C; 1E924; # ADLAM CAPITAL LETTER LAAM
+1E903; C; 1E925; # ADLAM CAPITAL LETTER MIIM
+1E904; C; 1E926; # ADLAM CAPITAL LETTER BA
+1E905; C; 1E927; # ADLAM CAPITAL LETTER SINNYIIYHE
+1E906; C; 1E928; # ADLAM CAPITAL LETTER PE
+1E907; C; 1E929; # ADLAM CAPITAL LETTER BHE
+1E908; C; 1E92A; # ADLAM CAPITAL LETTER RA
+1E909; C; 1E92B; # ADLAM CAPITAL LETTER E
+1E90A; C; 1E92C; # ADLAM CAPITAL LETTER FA
+1E90B; C; 1E92D; # ADLAM CAPITAL LETTER I
+1E90C; C; 1E92E; # ADLAM CAPITAL LETTER O
+1E90D; C; 1E92F; # ADLAM CAPITAL LETTER DHA
+1E90E; C; 1E930; # ADLAM CAPITAL LETTER YHE
+1E90F; C; 1E931; # ADLAM CAPITAL LETTER WAW
+1E910; C; 1E932; # ADLAM CAPITAL LETTER NUN
+1E911; C; 1E933; # ADLAM CAPITAL LETTER KAF
+1E912; C; 1E934; # ADLAM CAPITAL LETTER YA
+1E913; C; 1E935; # ADLAM CAPITAL LETTER U
+1E914; C; 1E936; # ADLAM CAPITAL LETTER JIIM
+1E915; C; 1E937; # ADLAM CAPITAL LETTER CHI
+1E916; C; 1E938; # ADLAM CAPITAL LETTER HA
+1E917; C; 1E939; # ADLAM CAPITAL LETTER QAAF
+1E918; C; 1E93A; # ADLAM CAPITAL LETTER GA
+1E919; C; 1E93B; # ADLAM CAPITAL LETTER NYA
+1E91A; C; 1E93C; # ADLAM CAPITAL LETTER TU
+1E91B; C; 1E93D; # ADLAM CAPITAL LETTER NHA
+1E91C; C; 1E93E; # ADLAM CAPITAL LETTER VA
+1E91D; C; 1E93F; # ADLAM CAPITAL LETTER KHA
+1E91E; C; 1E940; # ADLAM CAPITAL LETTER GBE
+1E91F; C; 1E941; # ADLAM CAPITAL LETTER ZAL
+1E920; C; 1E942; # ADLAM CAPITAL LETTER KPO
+1E921; C; 1E943; # ADLAM CAPITAL LETTER SHA
 #
 # EOF
diff --git a/unicode/EastAsianWidth.txt b/unicode/EastAsianWidth.txt
index b72970e171..5a2ede5d59 100644
--- a/unicode/EastAsianWidth.txt
+++ b/unicode/EastAsianWidth.txt
@@ -1,35 +1,34 @@
-# EastAsianWidth-8.0.0.txt
-# Date: 2015-02-10, 21:00:00 GMT [KW, LI]
+# EastAsianWidth-9.0.0.txt
+# Date: 2016-05-27, 17:00:00 GMT [KW, LI]
+# © 2016 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Unicode Character Database
+# For documentation, see http://www.unicode.org/reports/tr44/
 #
 # East_Asian_Width Property
 #
 # This file is an informative contributory data file in the
 # Unicode Character Database.
 #
-# Copyright (c) 1991-2015 Unicode, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 # The format is two fields separated by a semicolon.
 # Field 0: Unicode code point value or range of code point values
 # Field 1: East_Asian_Width property, consisting of one of the following values:
-#         "N", "A", "H", "W", "F", "Na"
+#         "A", "F", "H", "N", "Na", "W"
 #  - All code points, assigned or unassigned, that are not listed
-#         explicitly are given the value "N".
-# The unassigned code points that default to "W" include ranges in the
-# following blocks:
-#     CJK Unified Ideographs Extension A:       U+3400..U+4DBF
-#     CJK Unified Ideographs:                   U+4E00..U+9FFF
-#     CJK Compatibility Ideographs:             U+F900..U+FAFF
-#     CJK Unified Ideographs Extension B:      U+20000..U+2A6DF
-#     CJK Unified Ideographs Extension C:      U+2A700..U+2B73F
-#     CJK Unified Ideographs Extension D:      U+2B740..U+2B81F
-#     CJK Unified Ideographs Extension E:      U+2B820..U+2CEAF
-#     CJK Compatibility Ideographs Supplement: U+2F800..U+2FA1F
-#     and any other reserved code points on
-#         Planes 2 and 3:                      U+20000..U+2FFFD
-#                                              U+30000..U+3FFFD
-#  - Character ranges are specified as for other property files in
-#         the Unicode Character Database.
+#      explicitly are given the value "N".
+#  - The unassigned code points in the following blocks default to "W":
+#         CJK Unified Ideographs Extension A: U+3400..U+4DBF
+#         CJK Unified Ideographs:             U+4E00..U+9FFF
+#         CJK Compatibility Ideographs:       U+F900..U+FAFF
+#  - All undesignated code points in Planes 2 and 3, whether inside or
+#      outside of allocated blocks, default to "W":
+#         Plane 2:                            U+20000..U+2FFFD
+#         Plane 3:                            U+30000..U+3FFFD
+#
+# Character ranges are specified as for other property files in the
+# Unicode Character Database.
 #
 # For legacy reasons, there are no spaces before or after the semicolon
 # which separates the two fields. The comments following the number sign
@@ -330,6 +329,9 @@
 0859..085B;N     # Mn     [3] MANDAIC AFFRICATION MARK..MANDAIC GEMINATION MARK
 085E;N           # Po         MANDAIC PUNCTUATION
 08A0..08B4;N     # Lo    [21] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER KAF WITH DOT BELOW
+08B6..08BD;N     # Lo     [8] ARABIC LETTER BEH WITH SMALL MEEM ABOVE..ARABIC LETTER AFRICAN NOON
+08D4..08E1;N     # Mn    [14] ARABIC SMALL HIGH WORD AR-RUB..ARABIC SMALL HIGH SIGN SAFHA
+08E2;N           # Cf         ARABIC DISPUTED END OF AYAH
 08E3..08FF;N     # Mn    [29] ARABIC TURNED DAMMA BELOW..ARABIC MARK SIDEWAYS NOON GHUNNA
 0900..0902;N     # Mn     [3] DEVANAGARI SIGN INVERTED CANDRABINDU..DEVANAGARI SIGN ANUSVARA
 0903;N           # Mc         DEVANAGARI SIGN VISARGA
@@ -491,6 +493,7 @@
 0C66..0C6F;N     # Nd    [10] TELUGU DIGIT ZERO..TELUGU DIGIT NINE
 0C78..0C7E;N     # No     [7] TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR..TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR
 0C7F;N           # So         TELUGU SIGN TUUMU
+0C80;N           # Lo         KANNADA SIGN SPACING CANDRABINDU
 0C81;N           # Mn         KANNADA SIGN CANDRABINDU
 0C82..0C83;N     # Mc     [2] KANNADA SIGN ANUSVARA..KANNADA SIGN VISARGA
 0C85..0C8C;N     # Lo     [8] KANNADA LETTER A..KANNADA LETTER VOCALIC L
@@ -525,11 +528,14 @@
 0D4A..0D4C;N     # Mc     [3] MALAYALAM VOWEL SIGN O..MALAYALAM VOWEL SIGN AU
 0D4D;N           # Mn         MALAYALAM SIGN VIRAMA
 0D4E;N           # Lo         MALAYALAM LETTER DOT REPH
+0D4F;N           # So         MALAYALAM SIGN PARA
+0D54..0D56;N     # Lo     [3] MALAYALAM LETTER CHILLU M..MALAYALAM LETTER CHILLU LLL
 0D57;N           # Mc         MALAYALAM AU LENGTH MARK
+0D58..0D5E;N     # No     [7] MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH..MALAYALAM FRACTION ONE FIFTH
 0D5F..0D61;N     # Lo     [3] MALAYALAM LETTER ARCHAIC II..MALAYALAM LETTER VOCALIC LL
 0D62..0D63;N     # Mn     [2] MALAYALAM VOWEL SIGN VOCALIC L..MALAYALAM VOWEL SIGN VOCALIC LL
 0D66..0D6F;N     # Nd    [10] MALAYALAM DIGIT ZERO..MALAYALAM DIGIT NINE
-0D70..0D75;N     # No     [6] MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE QUARTERS
+0D70..0D78;N     # No     [9] MALAYALAM NUMBER TEN..MALAYALAM FRACTION THREE SIXTEENTHS
 0D79;N           # So         MALAYALAM DATE MARK
 0D7A..0D7F;N     # Lo     [6] MALAYALAM LETTER CHILLU NN..MALAYALAM LETTER CHILLU K
 0D82..0D83;N     # Mc     [2] SINHALA SIGN ANUSVARAYA..SINHALA SIGN VISARGAYA
@@ -732,7 +738,9 @@
 1820..1842;N     # Lo    [35] MONGOLIAN LETTER A..MONGOLIAN LETTER CHI
 1843;N           # Lm         MONGOLIAN LETTER TODO LONG VOWEL SIGN
 1844..1877;N     # Lo    [52] MONGOLIAN LETTER TODO E..MONGOLIAN LETTER MANCHU ZHA
-1880..18A8;N     # Lo    [41] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER MANCHU ALI GALI BHA
+1880..1884;N     # Lo     [5] MONGOLIAN LETTER ALI GALI ANUSVARA ONE..MONGOLIAN LETTER ALI GALI INVERTED UBADAMA
+1885..1886;N     # Mn     [2] MONGOLIAN LETTER ALI GALI BALUDA..MONGOLIAN LETTER ALI GALI THREE BALUDA
+1887..18A8;N     # Lo    [34] MONGOLIAN LETTER ALI GALI A..MONGOLIAN LETTER MANCHU ALI GALI BHA
 18A9;N           # Mn         MONGOLIAN LETTER ALI GALI DAGALGA
 18AA;N           # Lo         MONGOLIAN LETTER MANCHU ALI GALI LHA
 18B0..18F5;N     # Lo    [70] CANADIAN SYLLABICS OY..CANADIAN SYLLABICS CARRIER DENTAL S
@@ -832,6 +840,7 @@
 1C5A..1C77;N     # Lo    [30] OL CHIKI LETTER LA..OL CHIKI LETTER OH
 1C78..1C7D;N     # Lm     [6] OL CHIKI MU TTUDDAG..OL CHIKI AHAD
 1C7E..1C7F;N     # Po     [2] OL CHIKI PUNCTUATION MUCAAD..OL CHIKI PUNCTUATION DOUBLE MUCAAD
+1C80..1C88;N     # Ll     [9] CYRILLIC SMALL LETTER ROUNDED VE..CYRILLIC SMALL LETTER UNBLENDED UK
 1CC0..1CC7;N     # Po     [8] SUNDANESE PUNCTUATION BINDU SURYA..SUNDANESE PUNCTUATION BINDU BA SATANGA
 1CD0..1CD2;N     # Mn     [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
 1CD3;N           # Po         VEDIC SIGN NIHSHVASA
@@ -853,7 +862,7 @@
 1D80..1D9A;N     # Ll    [27] LATIN SMALL LETTER B WITH PALATAL HOOK..LATIN SMALL LETTER EZH WITH RETROFLEX HOOK
 1D9B..1DBF;N     # Lm    [37] MODIFIER LETTER SMALL TURNED ALPHA..MODIFIER LETTER SMALL THETA
 1DC0..1DF5;N     # Mn    [54] COMBINING DOTTED GRAVE ACCENT..COMBINING UP TACK ABOVE
-1DFC..1DFF;N     # Mn     [4] COMBINING DOUBLE INVERTED BREVE BELOW..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
+1DFB..1DFF;N     # Mn     [5] COMBINING DELETION MARK..COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW
 1E00..1EFF;N     # L&   [256] LATIN CAPITAL LETTER A WITH RING BELOW..LATIN SMALL LETTER Y WITH LOOP
 1F00..1F15;N     # L&    [22] GREEK SMALL LETTER ALPHA WITH PSILI..GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
 1F18..1F1D;N     # Lu     [6] GREEK CAPITAL LETTER EPSILON WITH PSILI..GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
@@ -1092,7 +1101,9 @@
 230B;N           # Pe         RIGHT FLOOR
 230C..2311;N     # So     [6] BOTTOM RIGHT CROP..SQUARE LOZENGE
 2312;A           # So         ARC
-2313..231F;N     # So    [13] SEGMENT..BOTTOM RIGHT CORNER
+2313..2319;N     # So     [7] SEGMENT..TURNED NOT SIGN
+231A..231B;W     # So     [2] WATCH..HOURGLASS
+231C..231F;N     # So     [4] TOP LEFT CORNER..BOTTOM RIGHT CORNER
 2320..2321;N     # Sm     [2] TOP HALF INTEGRAL..BOTTOM HALF INTEGRAL
 2322..2328;N     # So     [7] FROWN..KEYBOARD
 2329;W           # Ps         LEFT-POINTING ANGLE BRACKET
@@ -1103,7 +1114,13 @@
 239B..23B3;N     # Sm    [25] LEFT PARENTHESIS UPPER HOOK..SUMMATION BOTTOM
 23B4..23DB;N     # So    [40] TOP SQUARE BRACKET..FUSE
 23DC..23E1;N     # Sm     [6] TOP PARENTHESIS..BOTTOM TORTOISE SHELL BRACKET
-23E2..23FA;N     # So    [25] WHITE TRAPEZIUM..BLACK CIRCLE FOR RECORD
+23E2..23E8;N     # So     [7] WHITE TRAPEZIUM..DECIMAL EXPONENT SYMBOL
+23E9..23EC;W     # So     [4] BLACK RIGHT-POINTING DOUBLE TRIANGLE..BLACK DOWN-POINTING DOUBLE TRIANGLE
+23ED..23EF;N     # So     [3] BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR..BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR
+23F0;W           # So         ALARM CLOCK
+23F1..23F2;N     # So     [2] STOPWATCH..TIMER CLOCK
+23F3;W           # So         HOURGLASS WITH FLOWING SAND
+23F4..23FE;N     # So    [11] BLACK MEDIUM LEFT-POINTING TRIANGLE..POWER SLEEP SYMBOL
 2400..2426;N     # So    [39] SYMBOL FOR NULL..SYMBOL FOR SUBSTITUTE FORM TWO
 2440..244A;N     # So    [11] OCR HOOK..OCR DOUBLE BACKSLASH
 2460..249B;A     # No    [60] CIRCLED DIGIT ONE..NUMBER TWENTY FULL STOP
@@ -1142,7 +1159,9 @@
 25E6..25EE;N     # So     [9] WHITE BULLET..UP-POINTING TRIANGLE WITH RIGHT HALF BLACK
 25EF;A           # So         LARGE CIRCLE
 25F0..25F7;N     # So     [8] WHITE SQUARE WITH UPPER LEFT QUADRANT..WHITE CIRCLE WITH UPPER RIGHT QUADRANT
-25F8..25FF;N     # Sm     [8] UPPER LEFT TRIANGLE..LOWER RIGHT TRIANGLE
+25F8..25FC;N     # Sm     [5] UPPER LEFT TRIANGLE..BLACK MEDIUM SQUARE
+25FD..25FE;W     # Sm     [2] WHITE MEDIUM SMALL SQUARE..BLACK MEDIUM SMALL SQUARE
+25FF;N           # Sm         LOWER RIGHT TRIANGLE
 2600..2604;N     # So     [5] BLACK SUN WITH RAYS..COMET
 2605..2606;A     # So     [2] BLACK STAR..WHITE STAR
 2607..2608;N     # So     [2] LIGHTNING..THUNDERSTORM
@@ -1150,7 +1169,7 @@
 260A..260D;N     # So     [4] ASCENDING NODE..OPPOSITION
 260E..260F;A     # So     [2] BLACK TELEPHONE..WHITE TELEPHONE
 2610..2613;N     # So     [4] BALLOT BOX..SALTIRE
-2614..2615;A     # So     [2] UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
+2614..2615;W     # So     [2] UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
 2616..261B;N     # So     [6] WHITE SHOGI PIECE..BLACK RIGHT POINTING INDEX
 261C;A           # So         WHITE LEFT POINTING INDEX
 261D;N           # So         WHITE UP POINTING INDEX
@@ -1159,7 +1178,9 @@
 2640;A           # So         FEMALE SIGN
 2641;N           # So         EARTH
 2642;A           # So         MALE SIGN
-2643..265F;N     # So    [29] JUPITER..BLACK CHESS PAWN
+2643..2647;N     # So     [5] JUPITER..PLUTO
+2648..2653;W     # So    [12] ARIES..PISCES
+2654..265F;N     # So    [12] WHITE CHESS KING..BLACK CHESS PAWN
 2660..2661;A     # So     [2] BLACK SPADE SUIT..WHITE HEART SUIT
 2662;N           # So         WHITE DIAMOND SUIT
 2663..2665;A     # So     [3] BLACK CLUB SUIT..BLACK HEART SUIT
@@ -1169,22 +1190,56 @@
 266C..266D;A     # So     [2] BEAMED SIXTEENTH NOTES..MUSIC FLAT SIGN
 266E;N           # So         MUSIC NATURAL SIGN
 266F;A           # Sm         MUSIC SHARP SIGN
-2670..269D;N     # So    [46] WEST SYRIAC CROSS..OUTLINED WHITE STAR
+2670..267E;N     # So    [15] WEST SYRIAC CROSS..PERMANENT PAPER SIGN
+267F;W           # So         WHEELCHAIR SYMBOL
+2680..2692;N     # So    [19] DIE FACE-1..HAMMER AND PICK
+2693;W           # So         ANCHOR
+2694..269D;N     # So    [10] CROSSED SWORDS..OUTLINED WHITE STAR
 269E..269F;A     # So     [2] THREE LINES CONVERGING RIGHT..THREE LINES CONVERGING LEFT
-26A0..26BD;N     # So    [30] WARNING SIGN..SOCCER BALL
-26BE..26BF;A     # So     [2] BASEBALL..SQUARED KEY
+26A0;N           # So         WARNING SIGN
+26A1;W           # So         HIGH VOLTAGE SIGN
+26A2..26A9;N     # So     [8] DOUBLED FEMALE SIGN..HORIZONTAL MALE WITH STROKE SIGN
+26AA..26AB;W     # So     [2] MEDIUM WHITE CIRCLE..MEDIUM BLACK CIRCLE
+26AC..26BC;N     # So    [17] MEDIUM SMALL WHITE CIRCLE..SESQUIQUADRATE
+26BD..26BE;W     # So     [2] SOCCER BALL..BASEBALL
+26BF;A           # So         SQUARED KEY
 26C0..26C3;N     # So     [4] WHITE DRAUGHTS MAN..BLACK DRAUGHTS KING
-26C4..26CD;A     # So    [10] SNOWMAN WITHOUT SNOW..DISABLED CAR
-26CE;N           # So         OPHIUCHUS
-26CF..26E1;A     # So    [19] PICK..RESTRICTED LEFT ENTRY-2
+26C4..26C5;W     # So     [2] SNOWMAN WITHOUT SNOW..SUN BEHIND CLOUD
+26C6..26CD;A     # So     [8] RAIN..DISABLED CAR
+26CE;W           # So         OPHIUCHUS
+26CF..26D3;A     # So     [5] PICK..CHAINS
+26D4;W           # So         NO ENTRY
+26D5..26E1;A     # So    [13] ALTERNATE ONE-WAY LEFT WAY TRAFFIC..RESTRICTED LEFT ENTRY-2
 26E2;N           # So         ASTRONOMICAL SYMBOL FOR URANUS
 26E3;A           # So         HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE
 26E4..26E7;N     # So     [4] PENTAGRAM..INVERTED PENTAGRAM
-26E8..26FF;A     # So    [24] BLACK CROSS ON SHIELD..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
-2700..273C;N     # So    [61] BLACK SAFETY SCISSORS..OPEN CENTRE TEARDROP-SPOKED ASTERISK
+26E8..26E9;A     # So     [2] BLACK CROSS ON SHIELD..SHINTO SHRINE
+26EA;W           # So         CHURCH
+26EB..26F1;A     # So     [7] CASTLE..UMBRELLA ON GROUND
+26F2..26F3;W     # So     [2] FOUNTAIN..FLAG IN HOLE
+26F4;A           # So         FERRY
+26F5;W           # So         SAILBOAT
+26F6..26F9;A     # So     [4] SQUARE FOUR CORNERS..PERSON WITH BALL
+26FA;W           # So         TENT
+26FB..26FC;A     # So     [2] JAPANESE BANK SYMBOL..HEADSTONE GRAVEYARD SYMBOL
+26FD;W           # So         FUEL PUMP
+26FE..26FF;A     # So     [2] CUP ON BLACK SQUARE..WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE
+2700..2704;N     # So     [5] BLACK SAFETY SCISSORS..WHITE SCISSORS
+2705;W           # So         WHITE HEAVY CHECK MARK
+2706..2709;N     # So     [4] TELEPHONE LOCATION SIGN..ENVELOPE
+270A..270B;W     # So     [2] RAISED FIST..RAISED HAND
+270C..2727;N     # So    [28] VICTORY HAND..WHITE FOUR POINTED STAR
+2728;W           # So         SPARKLES
+2729..273C;N     # So    [20] STRESS OUTLINED WHITE STAR..OPEN CENTRE TEARDROP-SPOKED ASTERISK
 273D;A           # So         HEAVY TEARDROP-SPOKED ASTERISK
-273E..2756;N     # So    [25] SIX PETALLED BLACK AND WHITE FLORETTE..BLACK DIAMOND MINUS WHITE X
-2757;A           # So         HEAVY EXCLAMATION MARK SYMBOL
+273E..274B;N     # So    [14] SIX PETALLED BLACK AND WHITE FLORETTE..HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
+274C;W           # So         CROSS MARK
+274D;N           # So         SHADOWED WHITE CIRCLE
+274E;W           # So         NEGATIVE SQUARED CROSS MARK
+274F..2752;N     # So     [4] LOWER RIGHT DROP-SHADOWED WHITE SQUARE..UPPER RIGHT SHADOWED WHITE SQUARE
+2753..2755;W     # So     [3] BLACK QUESTION MARK ORNAMENT..WHITE EXCLAMATION MARK ORNAMENT
+2756;N           # So         BLACK DIAMOND MINUS WHITE X
+2757;W           # So         HEAVY EXCLAMATION MARK SYMBOL
 2758..2767;N     # So    [16] LIGHT VERTICAL BAR..ROTATED FLORAL HEART BULLET
 2768;N           # Ps         MEDIUM LEFT PARENTHESIS ORNAMENT
 2769;N           # Pe         MEDIUM RIGHT PARENTHESIS ORNAMENT
@@ -1202,7 +1257,12 @@
 2775;N           # Pe         MEDIUM RIGHT CURLY BRACKET ORNAMENT
 2776..277F;A     # No    [10] DINGBAT NEGATIVE CIRCLED DIGIT ONE..DINGBAT NEGATIVE CIRCLED NUMBER TEN
 2780..2793;N     # No    [20] DINGBAT CIRCLED SANS-SERIF DIGIT ONE..DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
-2794..27BF;N     # So    [44] HEAVY WIDE-HEADED RIGHTWARDS ARROW..DOUBLE CURLY LOOP
+2794;N           # So         HEAVY WIDE-HEADED RIGHTWARDS ARROW
+2795..2797;W     # So     [3] HEAVY PLUS SIGN..HEAVY DIVISION SIGN
+2798..27AF;N     # So    [24] HEAVY SOUTH EAST ARROW..NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
+27B0;W           # So         CURLY LOOP
+27B1..27BE;N     # So    [14] NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW..OPEN-OUTLINED RIGHTWARDS ARROW
+27BF;W           # So         DOUBLE CURLY LOOP
 27C0..27C4;N     # Sm     [5] THREE DIMENSIONAL ANGLE..OPEN SUPERSET
 27C5;N           # Ps         LEFT S-SHAPED BAG DELIMITER
 27C6;N           # Pe         RIGHT S-SHAPED BAG DELIMITER
@@ -1253,12 +1313,17 @@
 29FD;N           # Pe         RIGHT-POINTING CURVED ANGLE BRACKET
 29FE..29FF;N     # Sm     [2] TINY..MINY
 2A00..2AFF;N     # Sm   [256] N-ARY CIRCLED DOT OPERATOR..N-ARY WHITE VERTICAL BAR
-2B00..2B2F;N     # So    [48] NORTH EAST WHITE ARROW..WHITE VERTICAL ELLIPSE
+2B00..2B1A;N     # So    [27] NORTH EAST WHITE ARROW..DOTTED SQUARE
+2B1B..2B1C;W     # So     [2] BLACK LARGE SQUARE..WHITE LARGE SQUARE
+2B1D..2B2F;N     # So    [19] BLACK VERY SMALL SQUARE..WHITE VERTICAL ELLIPSE
 2B30..2B44;N     # Sm    [21] LEFT ARROW WITH SMALL CIRCLE..RIGHTWARDS ARROW THROUGH SUPERSET
 2B45..2B46;N     # So     [2] LEFTWARDS QUADRUPLE ARROW..RIGHTWARDS QUADRUPLE ARROW
 2B47..2B4C;N     # Sm     [6] REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW..RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
-2B4D..2B54;N     # So     [8] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..WHITE RIGHT-POINTING PENTAGON
-2B55..2B59;A     # So     [5] HEAVY LARGE CIRCLE..HEAVY CIRCLED SALTIRE
+2B4D..2B4F;N     # So     [3] DOWNWARDS TRIANGLE-HEADED ZIGZAG ARROW..SHORT BACKSLANTED SOUTH ARROW
+2B50;W           # So         WHITE MEDIUM STAR
+2B51..2B54;N     # So     [4] BLACK SMALL STAR..WHITE RIGHT-POINTING PENTAGON
+2B55;W           # So         HEAVY LARGE CIRCLE
+2B56..2B59;A     # So     [4] HEAVY OVAL WITH OVAL INSIDE..HEAVY CIRCLED SALTIRE
 2B5A..2B73;N     # So    [26] SLANTED NORTH ARROW WITH HOOKED HEAD..DOWNWARDS TRIANGLE-HEADED ARROW TO BAR
 2B76..2B95;N     # So    [32] NORTH WEST TRIANGLE-HEADED ARROW TO BAR..RIGHTWARDS BLACK ARROW
 2B98..2BB9;N     # So    [34] THREE-D TOP-LIGHTED LEFTWARDS EQUILATERAL ARROWHEAD..UP ARROWHEAD IN A RECTANGLE BOX
@@ -1332,6 +1397,7 @@
 2E40;N           # Pd         DOUBLE HYPHEN
 2E41;N           # Po         REVERSED COMMA
 2E42;N           # Ps         DOUBLE LOW-REVERSED-9 QUOTATION MARK
+2E43..2E44;N     # Po     [2] DASH WITH LEFT UPTURN..DOUBLE SUSPENSION MARK
 2E80..2E99;W     # So    [26] CJK RADICAL REPEAT..CJK RADICAL RAP
 2E9B..2EF3;W     # So    [89] CJK RADICAL CHOKE..CJK RADICAL C-SIMPLIFIED TURTLE
 2F00..2FD5;W     # So   [214] KANGXI RADICAL ONE..KANGXI RADICAL FLUTE
@@ -1450,7 +1516,7 @@ A788;N           # Lm         MODIFIER LETTER LOW CIRCUMFLEX ACCENT
 A789..A78A;N     # Sk     [2] MODIFIER LETTER COLON..MODIFIER LETTER SHORT EQUALS SIGN
 A78B..A78E;N     # L&     [4] LATIN CAPITAL LETTER SALTILLO..LATIN SMALL LETTER L WITH RETROFLEX HOOK AND BELT
 A78F;N           # Lo         LATIN LETTER SINOLOGICAL DOT
-A790..A7AD;N     # L&    [30] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER L WITH BELT
+A790..A7AE;N     # L&    [31] LATIN CAPITAL LETTER N WITH DESCENDER..LATIN CAPITAL LETTER SMALL CAPITAL I
 A7B0..A7B7;N     # L&     [8] LATIN CAPITAL LETTER TURNED K..LATIN SMALL LETTER OMEGA
 A7F7;N           # Lo         LATIN EPIGRAPHIC LETTER SIDEWAYS I
 A7F8..A7F9;N     # Lm     [2] MODIFIER LETTER CAPITAL H WITH STROKE..MODIFIER LETTER SMALL LIGATURE OE
@@ -1476,7 +1542,7 @@ A874..A877;N     # Po     [4] PHAGS-PA SINGLE HEAD MARK..PHAGS-PA MARK DOUBLE SH
 A880..A881;N     # Mc     [2] SAURASHTRA SIGN ANUSVARA..SAURASHTRA SIGN VISARGA
 A882..A8B3;N     # Lo    [50] SAURASHTRA LETTER A..SAURASHTRA LETTER LLA
 A8B4..A8C3;N     # Mc    [16] SAURASHTRA CONSONANT SIGN HAARU..SAURASHTRA VOWEL SIGN AU
-A8C4;N           # Mn         SAURASHTRA SIGN VIRAMA
+A8C4..A8C5;N     # Mn     [2] SAURASHTRA SIGN VIRAMA..SAURASHTRA SIGN CANDRABINDU
 A8CE..A8CF;N     # Po     [2] SAURASHTRA DANDA..SAURASHTRA DOUBLE DANDA
 A8D0..A8D9;N     # Nd    [10] SAURASHTRA DIGIT ZERO..SAURASHTRA DIGIT NINE
 A8E0..A8F1;N     # Mn    [18] COMBINING DEVANAGARI DIGIT ZERO..COMBINING DEVANAGARI SIGN AVAGRAHA
@@ -1726,7 +1792,7 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 10175..10178;N   # No     [4] GREEK ONE HALF SIGN..GREEK THREE QUARTERS SIGN
 10179..10189;N   # So    [17] GREEK YEAR SIGN..GREEK TRYBLION BASE SIGN
 1018A..1018B;N   # No     [2] GREEK ZERO SIGN..GREEK ONE QUARTER SIGN
-1018C;N          # So         GREEK SINUSOID SIGN
+1018C..1018E;N   # So     [3] GREEK SINUSOID SIGN..NOMISMA SIGN
 10190..1019B;N   # So    [12] ROMAN SEXTANS SIGN..ROMAN CENTURIAL SIGN
 101A0;N          # So         GREEK SYMBOL TAU RHO
 101D0..101FC;N   # So    [45] PHAISTOS DISC SIGN PEDESTRIAN..PHAISTOS DISC SIGN WAVY BAND
@@ -1753,6 +1819,8 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 10450..1047F;N   # Lo    [48] SHAVIAN LETTER PEEP..SHAVIAN LETTER YEW
 10480..1049D;N   # Lo    [30] OSMANYA LETTER ALEF..OSMANYA LETTER OO
 104A0..104A9;N   # Nd    [10] OSMANYA DIGIT ZERO..OSMANYA DIGIT NINE
+104B0..104D3;N   # Lu    [36] OSAGE CAPITAL LETTER A..OSAGE CAPITAL LETTER ZHA
+104D8..104FB;N   # Ll    [36] OSAGE SMALL LETTER A..OSAGE SMALL LETTER ZHA
 10500..10527;N   # Lo    [40] ELBASAN LETTER A..ELBASAN LETTER KHE
 10530..10563;N   # Lo    [52] CAUCASIAN ALBANIAN LETTER ALT..CAUCASIAN ALBANIAN LETTER KIW
 1056F;N          # Po         CAUCASIAN ALBANIAN CITATION MARK
@@ -1880,6 +1948,7 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 11235;N          # Mc         KHOJKI SIGN VIRAMA
 11236..11237;N   # Mn     [2] KHOJKI SIGN NUKTA..KHOJKI SIGN SHADDA
 11238..1123D;N   # Po     [6] KHOJKI DANDA..KHOJKI ABBREVIATION SIGN
+1123E;N          # Mn         KHOJKI SIGN SUKUN
 11280..11286;N   # Lo     [7] MULTANI LETTER A..MULTANI LETTER GA
 11288;N          # Lo         MULTANI LETTER GHA
 1128A..1128D;N   # Lo     [4] MULTANI LETTER CA..MULTANI LETTER JJA
@@ -1912,6 +1981,18 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 11362..11363;N   # Mc     [2] GRANTHA VOWEL SIGN VOCALIC L..GRANTHA VOWEL SIGN VOCALIC LL
 11366..1136C;N   # Mn     [7] COMBINING GRANTHA DIGIT ZERO..COMBINING GRANTHA DIGIT SIX
 11370..11374;N   # Mn     [5] COMBINING GRANTHA LETTER A..COMBINING GRANTHA LETTER PA
+11400..11434;N   # Lo    [53] NEWA LETTER A..NEWA LETTER HA
+11435..11437;N   # Mc     [3] NEWA VOWEL SIGN AA..NEWA VOWEL SIGN II
+11438..1143F;N   # Mn     [8] NEWA VOWEL SIGN U..NEWA VOWEL SIGN AI
+11440..11441;N   # Mc     [2] NEWA VOWEL SIGN O..NEWA VOWEL SIGN AU
+11442..11444;N   # Mn     [3] NEWA SIGN VIRAMA..NEWA SIGN ANUSVARA
+11445;N          # Mc         NEWA SIGN VISARGA
+11446;N          # Mn         NEWA SIGN NUKTA
+11447..1144A;N   # Lo     [4] NEWA SIGN AVAGRAHA..NEWA SIDDHI
+1144B..1144F;N   # Po     [5] NEWA DANDA..NEWA ABBREVIATION SIGN
+11450..11459;N   # Nd    [10] NEWA DIGIT ZERO..NEWA DIGIT NINE
+1145B;N          # Po         NEWA PLACEHOLDER MARK
+1145D;N          # Po         NEWA INSERTION SIGN
 11480..114AF;N   # Lo    [48] TIRHUTA ANJI..TIRHUTA LETTER HA
 114B0..114B2;N   # Mc     [3] TIRHUTA VOWEL SIGN AA..TIRHUTA VOWEL SIGN II
 114B3..114B8;N   # Mn     [6] TIRHUTA VOWEL SIGN U..TIRHUTA VOWEL SIGN VOCALIC LL
@@ -1945,6 +2026,7 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 11641..11643;N   # Po     [3] MODI DANDA..MODI ABBREVIATION SIGN
 11644;N          # Lo         MODI SIGN HUVA
 11650..11659;N   # Nd    [10] MODI DIGIT ZERO..MODI DIGIT NINE
+11660..1166C;N   # Po    [13] MONGOLIAN BIRGA WITH ORNAMENT..MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT
 11680..116AA;N   # Lo    [43] TAKRI LETTER A..TAKRI LETTER RRA
 116AB;N          # Mn         TAKRI SIGN ANUSVARA
 116AC;N          # Mc         TAKRI SIGN VISARGA
@@ -1969,6 +2051,26 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 118EA..118F2;N   # No     [9] WARANG CITI NUMBER TEN..WARANG CITI NUMBER NINETY
 118FF;N          # Lo         WARANG CITI OM
 11AC0..11AF8;N   # Lo    [57] PAU CIN HAU LETTER PA..PAU CIN HAU GLOTTAL STOP FINAL
+11C00..11C08;N   # Lo     [9] BHAIKSUKI LETTER A..BHAIKSUKI LETTER VOCALIC L
+11C0A..11C2E;N   # Lo    [37] BHAIKSUKI LETTER E..BHAIKSUKI LETTER HA
+11C2F;N          # Mc         BHAIKSUKI VOWEL SIGN AA
+11C30..11C36;N   # Mn     [7] BHAIKSUKI VOWEL SIGN I..BHAIKSUKI VOWEL SIGN VOCALIC L
+11C38..11C3D;N   # Mn     [6] BHAIKSUKI VOWEL SIGN E..BHAIKSUKI SIGN ANUSVARA
+11C3E;N          # Mc         BHAIKSUKI SIGN VISARGA
+11C3F;N          # Mn         BHAIKSUKI SIGN VIRAMA
+11C40;N          # Lo         BHAIKSUKI SIGN AVAGRAHA
+11C41..11C45;N   # Po     [5] BHAIKSUKI DANDA..BHAIKSUKI GAP FILLER-2
+11C50..11C59;N   # Nd    [10] BHAIKSUKI DIGIT ZERO..BHAIKSUKI DIGIT NINE
+11C5A..11C6C;N   # No    [19] BHAIKSUKI NUMBER ONE..BHAIKSUKI HUNDREDS UNIT MARK
+11C70..11C71;N   # Po     [2] MARCHEN HEAD MARK..MARCHEN MARK SHAD
+11C72..11C8F;N   # Lo    [30] MARCHEN LETTER KA..MARCHEN LETTER A
+11C92..11CA7;N   # Mn    [22] MARCHEN SUBJOINED LETTER KA..MARCHEN SUBJOINED LETTER ZA
+11CA9;N          # Mc         MARCHEN SUBJOINED LETTER YA
+11CAA..11CB0;N   # Mn     [7] MARCHEN SUBJOINED LETTER RA..MARCHEN VOWEL SIGN AA
+11CB1;N          # Mc         MARCHEN VOWEL SIGN I
+11CB2..11CB3;N   # Mn     [2] MARCHEN VOWEL SIGN U..MARCHEN VOWEL SIGN E
+11CB4;N          # Mc         MARCHEN VOWEL SIGN O
+11CB5..11CB6;N   # Mn     [2] MARCHEN SIGN ANUSVARA..MARCHEN SIGN CANDRABINDU
 12000..12399;N   # Lo   [922] CUNEIFORM SIGN A..CUNEIFORM SIGN U U
 12400..1246E;N   # Nl   [111] CUNEIFORM NUMERIC SIGN TWO ASH..CUNEIFORM NUMERIC SIGN NINE U VARIANT FORM
 12470..12474;N   # Po     [5] CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER..CUNEIFORM PUNCTUATION SIGN DIAGONAL QUADCOLON
@@ -1998,6 +2100,9 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 16F51..16F7E;N   # Mc    [46] MIAO SIGN ASPIRATION..MIAO VOWEL SIGN NG
 16F8F..16F92;N   # Mn     [4] MIAO TONE RIGHT..MIAO TONE BELOW
 16F93..16F9F;N   # Lm    [13] MIAO LETTER TONE-2..MIAO LETTER REFORMED TONE-8
+16FE0;W          # Lm         TANGUT ITERATION MARK
+17000..187EC;W   # Lo  [6125] TANGUT IDEOGRAPH-17000..TANGUT IDEOGRAPH-187EC
+18800..18AF2;W   # Lo   [755] TANGUT COMPONENT-001..TANGUT COMPONENT-755
 1B000..1B001;W   # Lo     [2] KATAKANA LETTER ARCHAIC E..HIRAGANA LETTER ARCHAIC YE
 1BC00..1BC6A;N   # Lo   [107] DUPLOYAN LETTER H..DUPLOYAN LETTER VOCALIC M
 1BC70..1BC7C;N   # Lo    [13] DUPLOYAN AFFIX LEFT HORIZONTAL SECANT..DUPLOYAN AFFIX ATTACHED TANGENT HOOK
@@ -2079,9 +2184,18 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 1DA87..1DA8B;N   # Po     [5] SIGNWRITING COMMA..SIGNWRITING PARENTHESIS
 1DA9B..1DA9F;N   # Mn     [5] SIGNWRITING FILL MODIFIER-2..SIGNWRITING FILL MODIFIER-6
 1DAA1..1DAAF;N   # Mn    [15] SIGNWRITING ROTATION MODIFIER-2..SIGNWRITING ROTATION MODIFIER-16
+1E000..1E006;N   # Mn     [7] COMBINING GLAGOLITIC LETTER AZU..COMBINING GLAGOLITIC LETTER ZHIVETE
+1E008..1E018;N   # Mn    [17] COMBINING GLAGOLITIC LETTER ZEMLJA..COMBINING GLAGOLITIC LETTER HERU
+1E01B..1E021;N   # Mn     [7] COMBINING GLAGOLITIC LETTER SHTA..COMBINING GLAGOLITIC LETTER YATI
+1E023..1E024;N   # Mn     [2] COMBINING GLAGOLITIC LETTER YU..COMBINING GLAGOLITIC LETTER SMALL YUS
+1E026..1E02A;N   # Mn     [5] COMBINING GLAGOLITIC LETTER YO..COMBINING GLAGOLITIC LETTER FITA
 1E800..1E8C4;N   # Lo   [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON
 1E8C7..1E8CF;N   # No     [9] MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE
 1E8D0..1E8D6;N   # Mn     [7] MENDE KIKAKUI COMBINING NUMBER TEENS..MENDE KIKAKUI COMBINING NUMBER MILLIONS
+1E900..1E943;N   # L&    [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA
+1E944..1E94A;N   # Mn     [7] ADLAM ALIF LENGTHENER..ADLAM NUKTA
+1E950..1E959;N   # Nd    [10] ADLAM DIGIT ZERO..ADLAM DIGIT NINE
+1E95E..1E95F;N   # Po     [2] ADLAM INITIAL EXCLAMATION MARK..ADLAM INITIAL QUESTION MARK
 1EE00..1EE03;N   # Lo     [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL
 1EE05..1EE1F;N   # Lo    [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF
 1EE21..1EE22;N   # Lo     [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM
@@ -2116,11 +2230,14 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 1EEA5..1EEA9;N   # Lo     [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH
 1EEAB..1EEBB;N   # Lo    [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1EEF0..1EEF1;N   # Sm     [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
-1F000..1F02B;N   # So    [44] MAHJONG TILE EAST WIND..MAHJONG TILE BACK
+1F000..1F003;N   # So     [4] MAHJONG TILE EAST WIND..MAHJONG TILE NORTH WIND
+1F004;W          # So         MAHJONG TILE RED DRAGON
+1F005..1F02B;N   # So    [39] MAHJONG TILE GREEN DRAGON..MAHJONG TILE BACK
 1F030..1F093;N   # So   [100] DOMINO TILE HORIZONTAL BACK..DOMINO TILE VERTICAL-06-06
 1F0A0..1F0AE;N   # So    [15] PLAYING CARD BACK..PLAYING CARD KING OF SPADES
 1F0B1..1F0BF;N   # So    [15] PLAYING CARD ACE OF HEARTS..PLAYING CARD RED JOKER
-1F0C1..1F0CF;N   # So    [15] PLAYING CARD ACE OF DIAMONDS..PLAYING CARD BLACK JOKER
+1F0C1..1F0CE;N   # So    [14] PLAYING CARD ACE OF DIAMONDS..PLAYING CARD KING OF DIAMONDS
+1F0CF;W          # So         PLAYING CARD BLACK JOKER
 1F0D1..1F0F5;N   # So    [37] PLAYING CARD ACE OF CLUBS..PLAYING CARD TRUMP-21
 1F100..1F10A;A   # No    [11] DIGIT ZERO FULL STOP..DIGIT NINE COMMA
 1F10B..1F10C;N   # No     [2] DINGBAT CIRCLED SANS-SERIF DIGIT ZERO..DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ZERO
@@ -2128,22 +2245,64 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 1F12E;N          # So         CIRCLED WZ
 1F130..1F169;A   # So    [58] SQUARED LATIN CAPITAL LETTER A..NEGATIVE CIRCLED LATIN CAPITAL LETTER Z
 1F16A..1F16B;N   # So     [2] RAISED MC SIGN..RAISED MD SIGN
-1F170..1F19A;A   # So    [43] NEGATIVE SQUARED LATIN CAPITAL LETTER A..SQUARED VS
+1F170..1F18D;A   # So    [30] NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED SA
+1F18E;W          # So         NEGATIVE SQUARED AB
+1F18F..1F190;A   # So     [2] NEGATIVE SQUARED WC..SQUARE DJ
+1F191..1F19A;W   # So    [10] SQUARED CL..SQUARED VS
+1F19B..1F1AC;A   # So    [18] SQUARED THREE D..SQUARED VOD
 1F1E6..1F1FF;N   # So    [26] REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
 1F200..1F202;W   # So     [3] SQUARE HIRAGANA HOKA..SQUARED KATAKANA SA
-1F210..1F23A;W   # So    [43] SQUARED CJK UNIFIED IDEOGRAPH-624B..SQUARED CJK UNIFIED IDEOGRAPH-55B6
+1F210..1F23B;W   # So    [44] SQUARED CJK UNIFIED IDEOGRAPH-624B..SQUARED CJK UNIFIED IDEOGRAPH-914D
 1F240..1F248;W   # So     [9] TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C..TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557
 1F250..1F251;W   # So     [2] CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT
-1F300..1F3FA;N   # So   [251] CYCLONE..AMPHORA
-1F3FB..1F3FF;N   # Sk     [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
-1F400..1F579;N   # So   [378] RAT..JOYSTICK
-1F57B..1F5A3;N   # So    [41] LEFT HAND TELEPHONE RECEIVER..BLACK DOWN POINTING BACKHAND INDEX
-1F5A5..1F5FF;N   # So    [91] DESKTOP COMPUTER..MOYAI
-1F600..1F64F;N   # So    [80] GRINNING FACE..PERSON WITH FOLDED HANDS
+1F300..1F320;W   # So    [33] CYCLONE..SHOOTING STAR
+1F321..1F32C;N   # So    [12] THERMOMETER..WIND BLOWING FACE
+1F32D..1F335;W   # So     [9] HOT DOG..CACTUS
+1F336;N          # So         HOT PEPPER
+1F337..1F37C;W   # So    [70] TULIP..BABY BOTTLE
+1F37D;N          # So         FORK AND KNIFE WITH PLATE
+1F37E..1F393;W   # So    [22] BOTTLE WITH POPPING CORK..GRADUATION CAP
+1F394..1F39F;N   # So    [12] HEART WITH TIP ON THE LEFT..ADMISSION TICKETS
+1F3A0..1F3CA;W   # So    [43] CAROUSEL HORSE..SWIMMER
+1F3CB..1F3CE;N   # So     [4] WEIGHT LIFTER..RACING CAR
+1F3CF..1F3D3;W   # So     [5] CRICKET BAT AND BALL..TABLE TENNIS PADDLE AND BALL
+1F3D4..1F3DF;N   # So    [12] SNOW CAPPED MOUNTAIN..STADIUM
+1F3E0..1F3F0;W   # So    [17] HOUSE BUILDING..EUROPEAN CASTLE
+1F3F1..1F3F3;N   # So     [3] WHITE PENNANT..WAVING WHITE FLAG
+1F3F4;W          # So         WAVING BLACK FLAG
+1F3F5..1F3F7;N   # So     [3] ROSETTE..LABEL
+1F3F8..1F3FA;W   # So     [3] BADMINTON RACQUET AND SHUTTLECOCK..AMPHORA
+1F3FB..1F3FF;W   # Sk     [5] EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
+1F400..1F43E;W   # So    [63] RAT..PAW PRINTS
+1F43F;N          # So         CHIPMUNK
+1F440;W          # So         EYES
+1F441;N          # So         EYE
+1F442..1F4FC;W   # So   [187] EAR..VIDEOCASSETTE
+1F4FD..1F4FE;N   # So     [2] FILM PROJECTOR..PORTABLE STEREO
+1F4FF..1F53D;W   # So    [63] PRAYER BEADS..DOWN-POINTING SMALL RED TRIANGLE
+1F53E..1F54A;N   # So    [13] LOWER RIGHT SHADOWED WHITE CIRCLE..DOVE OF PEACE
+1F54B..1F54E;W   # So     [4] KAABA..MENORAH WITH NINE BRANCHES
+1F54F;N          # So         BOWL OF HYGIEIA
+1F550..1F567;W   # So    [24] CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
+1F568..1F579;N   # So    [18] RIGHT SPEAKER..JOYSTICK
+1F57A;W          # So         MAN DANCING
+1F57B..1F594;N   # So    [26] LEFT HAND TELEPHONE RECEIVER..REVERSED VICTORY HAND
+1F595..1F596;W   # So     [2] REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+1F597..1F5A3;N   # So    [13] WHITE DOWN POINTING LEFT HAND INDEX..BLACK DOWN POINTING BACKHAND INDEX
+1F5A4;W          # So         BLACK HEART
+1F5A5..1F5FA;N   # So    [86] DESKTOP COMPUTER..WORLD MAP
+1F5FB..1F5FF;W   # So     [5] MOUNT FUJI..MOYAI
+1F600..1F64F;W   # So    [80] GRINNING FACE..PERSON WITH FOLDED HANDS
 1F650..1F67F;N   # So    [48] NORTH WEST POINTING LEAF..REVERSE CHECKER BOARD
-1F680..1F6D0;N   # So    [81] ROCKET..PLACE OF WORSHIP
-1F6E0..1F6EC;N   # So    [13] HAMMER AND WRENCH..AIRPLANE ARRIVING
+1F680..1F6C5;W   # So    [70] ROCKET..LEFT LUGGAGE
+1F6C6..1F6CB;N   # So     [6] TRIANGLE WITH ROUNDED CORNERS..COUCH AND LAMP
+1F6CC;W          # So         SLEEPING ACCOMMODATION
+1F6CD..1F6CF;N   # So     [3] SHOPPING BAGS..BED
+1F6D0..1F6D2;W   # So     [3] PLACE OF WORSHIP..SHOPPING TROLLEY
+1F6E0..1F6EA;N   # So    [11] HAMMER AND WRENCH..NORTHEAST-POINTING AIRPLANE
+1F6EB..1F6EC;W   # So     [2] AIRPLANE DEPARTURE..AIRPLANE ARRIVING
 1F6F0..1F6F3;N   # So     [4] SATELLITE..PASSENGER SHIP
+1F6F4..1F6F6;W   # So     [3] SCOOTER..CANOE
 1F700..1F773;N   # So   [116] ALCHEMICAL SYMBOL FOR QUINTESSENCE..ALCHEMICAL SYMBOL FOR HALF OUNCE
 1F780..1F7D4;N   # So    [85] BLACK LEFT-POINTING ISOSCELES RIGHT TRIANGLE..HEAVY TWELVE POINTED PINWHEEL STAR
 1F800..1F80B;N   # So    [12] LEFTWARDS ARROW WITH SMALL TRIANGLE ARROWHEAD..DOWNWARDS ARROW WITH LARGE TRIANGLE ARROWHEAD
@@ -2151,9 +2310,14 @@ FFFD;A           # So         REPLACEMENT CHARACTER
 1F850..1F859;N   # So    [10] LEFTWARDS SANS-SERIF ARROW..UP DOWN SANS-SERIF ARROW
 1F860..1F887;N   # So    [40] WIDE-HEADED LEFTWARDS LIGHT BARB ARROW..WIDE-HEADED SOUTH WEST VERY HEAVY BARB ARROW
 1F890..1F8AD;N   # So    [30] LEFTWARDS TRIANGLE ARROWHEAD..WHITE ARROW SHAFT WIDTH TWO THIRDS
-1F910..1F918;N   # So     [9] ZIPPER-MOUTH FACE..SIGN OF THE HORNS
-1F980..1F984;N   # So     [5] CRAB..UNICORN FACE
-1F9C0;N          # So         CHEESE WEDGE
+1F910..1F91E;W   # So    [15] ZIPPER-MOUTH FACE..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F920..1F927;W   # So     [8] FACE WITH COWBOY HAT..SNEEZING FACE
+1F930;W          # So         PREGNANT WOMAN
+1F933..1F93E;W   # So    [12] SELFIE..HANDBALL
+1F940..1F94B;W   # So    [12] WILTED FLOWER..MARTIAL ARTS UNIFORM
+1F950..1F95E;W   # So    [15] CROISSANT..PANCAKES
+1F980..1F991;W   # So    [18] CRAB..SQUID
+1F9C0;W          # So         CHEESE WEDGE
 20000..2A6D6;W   # Lo [42711] CJK UNIFIED IDEOGRAPH-20000..CJK UNIFIED IDEOGRAPH-2A6D6
 2A6D7..2A6FF;W   # Cn    [41] <reserved-2A6D7>..<reserved-2A6FF>
 2A700..2B734;W   # Lo  [4149] CJK UNIFIED IDEOGRAPH-2A700..CJK UNIFIED IDEOGRAPH-2B734
diff --git a/unicode/UnicodeData.txt b/unicode/UnicodeData.txt
index aa0e914f84..a756976461 100644
--- a/unicode/UnicodeData.txt
+++ b/unicode/UnicodeData.txt
@@ -616,7 +616,7 @@
 0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;;
 0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197
 0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196
-026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;;;
+026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;A7AE;;A7AE
 026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62
 026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;A7AD;;A7AD
 026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;;
@@ -2093,6 +2093,29 @@
 08B2;ARABIC LETTER ZAIN WITH INVERTED V ABOVE;Lo;0;AL;;;;;N;;;;;
 08B3;ARABIC LETTER AIN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
 08B4;ARABIC LETTER KAF WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+08B6;ARABIC LETTER BEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B7;ARABIC LETTER PEH WITH SMALL MEEM ABOVE;Lo;0;AL;;;;;N;;;;;
+08B8;ARABIC LETTER TEH WITH SMALL TEH ABOVE;Lo;0;AL;;;;;N;;;;;
+08B9;ARABIC LETTER REH WITH SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BA;ARABIC LETTER YEH WITH TWO DOTS BELOW AND SMALL NOON ABOVE;Lo;0;AL;;;;;N;;;;;
+08BB;ARABIC LETTER AFRICAN FEH;Lo;0;AL;;;;;N;;;;;
+08BC;ARABIC LETTER AFRICAN QAF;Lo;0;AL;;;;;N;;;;;
+08BD;ARABIC LETTER AFRICAN NOON;Lo;0;AL;;;;;N;;;;;
+08D4;ARABIC SMALL HIGH WORD AR-RUB;Mn;230;NSM;;;;;N;;;;;
+08D5;ARABIC SMALL HIGH SAD;Mn;230;NSM;;;;;N;;;;;
+08D6;ARABIC SMALL HIGH AIN;Mn;230;NSM;;;;;N;;;;;
+08D7;ARABIC SMALL HIGH QAF;Mn;230;NSM;;;;;N;;;;;
+08D8;ARABIC SMALL HIGH NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08D9;ARABIC SMALL LOW NOON WITH KASRA;Mn;230;NSM;;;;;N;;;;;
+08DA;ARABIC SMALL HIGH WORD ATH-THALATHA;Mn;230;NSM;;;;;N;;;;;
+08DB;ARABIC SMALL HIGH WORD AS-SAJDA;Mn;230;NSM;;;;;N;;;;;
+08DC;ARABIC SMALL HIGH WORD AN-NISF;Mn;230;NSM;;;;;N;;;;;
+08DD;ARABIC SMALL HIGH WORD SAKTA;Mn;230;NSM;;;;;N;;;;;
+08DE;ARABIC SMALL HIGH WORD QIF;Mn;230;NSM;;;;;N;;;;;
+08DF;ARABIC SMALL HIGH WORD WAQFA;Mn;230;NSM;;;;;N;;;;;
+08E0;ARABIC SMALL HIGH FOOTNOTE MARKER;Mn;230;NSM;;;;;N;;;;;
+08E1;ARABIC SMALL HIGH SIGN SAFHA;Mn;230;NSM;;;;;N;;;;;
+08E2;ARABIC DISPUTED END OF AYAH;Cf;0;AN;;;;;N;;;;;
 08E3;ARABIC TURNED DAMMA BELOW;Mn;220;NSM;;;;;N;;;;;
 08E4;ARABIC CURLY FATHA;Mn;230;NSM;;;;;N;;;;;
 08E5;ARABIC CURLY DAMMA;Mn;230;NSM;;;;;N;;;;;
@@ -2765,6 +2788,7 @@
 0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
 0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
 0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;;
+0C80;KANNADA SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
 0C81;KANNADA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2923,7 +2947,18 @@
 0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;;
 0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
 0D4E;MALAYALAM LETTER DOT REPH;Lo;0;L;;;;;N;;;;;
+0D4F;MALAYALAM SIGN PARA;So;0;L;;;;;N;;;;;
+0D54;MALAYALAM LETTER CHILLU M;Lo;0;L;;;;;N;;;;;
+0D55;MALAYALAM LETTER CHILLU Y;Lo;0;L;;;;;N;;;;;
+0D56;MALAYALAM LETTER CHILLU LLL;Lo;0;L;;;;;N;;;;;
 0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0D58;MALAYALAM FRACTION ONE ONE-HUNDRED-AND-SIXTIETH;No;0;L;;;;1/160;N;;;;;
+0D59;MALAYALAM FRACTION ONE FORTIETH;No;0;L;;;;1/40;N;;;;;
+0D5A;MALAYALAM FRACTION THREE EIGHTIETHS;No;0;L;;;;3/80;N;;;;;
+0D5B;MALAYALAM FRACTION ONE TWENTIETH;No;0;L;;;;1/20;N;;;;;
+0D5C;MALAYALAM FRACTION ONE TENTH;No;0;L;;;;1/10;N;;;;;
+0D5D;MALAYALAM FRACTION THREE TWENTIETHS;No;0;L;;;;3/20;N;;;;;
+0D5E;MALAYALAM FRACTION ONE FIFTH;No;0;L;;;;1/5;N;;;;;
 0D5F;MALAYALAM LETTER ARCHAIC II;Lo;0;L;;;;;N;;;;;
 0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
 0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
@@ -2945,6 +2980,9 @@
 0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
 0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
 0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0D76;MALAYALAM FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+0D77;MALAYALAM FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+0D78;MALAYALAM FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
 0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;;
 0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;;
 0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;;
@@ -5458,8 +5496,8 @@
 1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
 1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;;
 1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;;
-1885;MONGOLIAN LETTER ALI GALI BALUDA;Lo;0;L;;;;;N;;;;;
-1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Lo;0;L;;;;;N;;;;;
+1885;MONGOLIAN LETTER ALI GALI BALUDA;Mn;0;NSM;;;;;N;;;;;
+1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Mn;0;NSM;;;;;N;;;;;
 1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;;
 1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;;
 1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;;
@@ -6319,6 +6357,15 @@
 1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
 1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
 1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
+1C80;CYRILLIC SMALL LETTER ROUNDED VE;Ll;0;L;;;;;N;;;0412;;0412
+1C81;CYRILLIC SMALL LETTER LONG-LEGGED DE;Ll;0;L;;;;;N;;;0414;;0414
+1C82;CYRILLIC SMALL LETTER NARROW O;Ll;0;L;;;;;N;;;041E;;041E
+1C83;CYRILLIC SMALL LETTER WIDE ES;Ll;0;L;;;;;N;;;0421;;0421
+1C84;CYRILLIC SMALL LETTER TALL TE;Ll;0;L;;;;;N;;;0422;;0422
+1C85;CYRILLIC SMALL LETTER THREE-LEGGED TE;Ll;0;L;;;;;N;;;0422;;0422
+1C86;CYRILLIC SMALL LETTER TALL HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+1C87;CYRILLIC SMALL LETTER TALL YAT;Ll;0;L;;;;;N;;;0462;;0462
+1C88;CYRILLIC SMALL LETTER UNBLENDED UK;Ll;0;L;;;;;N;;;A64A;;A64A
 1CC0;SUNDANESE PUNCTUATION BINDU SURYA;Po;0;L;;;;;N;;;;;
 1CC1;SUNDANESE PUNCTUATION BINDU PANGLONG;Po;0;L;;;;;N;;;;;
 1CC2;SUNDANESE PUNCTUATION BINDU PURNAMA;Po;0;L;;;;;N;;;;;
@@ -6614,6 +6661,7 @@
 1DF3;COMBINING LATIN SMALL LETTER O WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF4;COMBINING LATIN SMALL LETTER U WITH DIAERESIS;Mn;230;NSM;;;;;N;;;;;
 1DF5;COMBINING UP TACK ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DFB;COMBINING DELETION MARK;Mn;230;NSM;;;;;N;;;;;
 1DFC;COMBINING DOUBLE INVERTED BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
 1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
 1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
@@ -8083,6 +8131,10 @@
 23F8;DOUBLE VERTICAL BAR;So;0;ON;;;;;N;;;;;
 23F9;BLACK SQUARE FOR STOP;So;0;ON;;;;;N;;;;;
 23FA;BLACK CIRCLE FOR RECORD;So;0;ON;;;;;N;;;;;
+23FB;POWER SYMBOL;So;0;ON;;;;;N;;;;;
+23FC;POWER ON-OFF SYMBOL;So;0;ON;;;;;N;;;;;
+23FD;POWER ON SYMBOL;So;0;ON;;;;;N;;;;;
+23FE;POWER SLEEP SYMBOL;So;0;ON;;;;;N;;;;;
 2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
 2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
 2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
@@ -10561,6 +10613,8 @@
 2E40;DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
 2E41;REVERSED COMMA;Po;0;ON;;;;;N;;;;;
 2E42;DOUBLE LOW-REVERSED-9 QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+2E43;DASH WITH LEFT UPTURN;Po;0;ON;;;;;N;;;;;
+2E44;DOUBLE SUSPENSION MARK;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -13889,6 +13943,7 @@ A7AA;LATIN CAPITAL LETTER H WITH HOOK;Lu;0;L;;;;;N;;;;0266;
 A7AB;LATIN CAPITAL LETTER REVERSED OPEN E;Lu;0;L;;;;;N;;;;025C;
 A7AC;LATIN CAPITAL LETTER SCRIPT G;Lu;0;L;;;;;N;;;;0261;
 A7AD;LATIN CAPITAL LETTER L WITH BELT;Lu;0;L;;;;;N;;;;026C;
+A7AE;LATIN CAPITAL LETTER SMALL CAPITAL I;Lu;0;L;;;;;N;;;;026A;
 A7B0;LATIN CAPITAL LETTER TURNED K;Lu;0;L;;;;;N;;;;029E;
 A7B1;LATIN CAPITAL LETTER TURNED T;Lu;0;L;;;;;N;;;;0287;
 A7B2;LATIN CAPITAL LETTER J WITH CROSSED-TAIL;Lu;0;L;;;;;N;;;;029D;
@@ -14085,6 +14140,7 @@ A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
 A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
 A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
 A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+A8C5;SAURASHTRA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;;
 A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
@@ -16834,6 +16890,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;;
 1018B;GREEK ONE QUARTER SIGN;No;0;ON;;;;1/4;N;;;;;
 1018C;GREEK SINUSOID SIGN;So;0;ON;;;;;N;;;;;
+1018D;GREEK INDICTION SIGN;So;0;L;;;;;N;;;;;
+1018E;NOMISMA SIGN;So;0;L;;;;;N;;;;;
 10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;;
 10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;;
 10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;;
@@ -17354,6 +17412,78 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104B0;OSAGE CAPITAL LETTER A;Lu;0;L;;;;;N;;;;104D8;
+104B1;OSAGE CAPITAL LETTER AI;Lu;0;L;;;;;N;;;;104D9;
+104B2;OSAGE CAPITAL LETTER AIN;Lu;0;L;;;;;N;;;;104DA;
+104B3;OSAGE CAPITAL LETTER AH;Lu;0;L;;;;;N;;;;104DB;
+104B4;OSAGE CAPITAL LETTER BRA;Lu;0;L;;;;;N;;;;104DC;
+104B5;OSAGE CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;104DD;
+104B6;OSAGE CAPITAL LETTER EHCHA;Lu;0;L;;;;;N;;;;104DE;
+104B7;OSAGE CAPITAL LETTER E;Lu;0;L;;;;;N;;;;104DF;
+104B8;OSAGE CAPITAL LETTER EIN;Lu;0;L;;;;;N;;;;104E0;
+104B9;OSAGE CAPITAL LETTER HA;Lu;0;L;;;;;N;;;;104E1;
+104BA;OSAGE CAPITAL LETTER HYA;Lu;0;L;;;;;N;;;;104E2;
+104BB;OSAGE CAPITAL LETTER I;Lu;0;L;;;;;N;;;;104E3;
+104BC;OSAGE CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;104E4;
+104BD;OSAGE CAPITAL LETTER EHKA;Lu;0;L;;;;;N;;;;104E5;
+104BE;OSAGE CAPITAL LETTER KYA;Lu;0;L;;;;;N;;;;104E6;
+104BF;OSAGE CAPITAL LETTER LA;Lu;0;L;;;;;N;;;;104E7;
+104C0;OSAGE CAPITAL LETTER MA;Lu;0;L;;;;;N;;;;104E8;
+104C1;OSAGE CAPITAL LETTER NA;Lu;0;L;;;;;N;;;;104E9;
+104C2;OSAGE CAPITAL LETTER O;Lu;0;L;;;;;N;;;;104EA;
+104C3;OSAGE CAPITAL LETTER OIN;Lu;0;L;;;;;N;;;;104EB;
+104C4;OSAGE CAPITAL LETTER PA;Lu;0;L;;;;;N;;;;104EC;
+104C5;OSAGE CAPITAL LETTER EHPA;Lu;0;L;;;;;N;;;;104ED;
+104C6;OSAGE CAPITAL LETTER SA;Lu;0;L;;;;;N;;;;104EE;
+104C7;OSAGE CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;104EF;
+104C8;OSAGE CAPITAL LETTER TA;Lu;0;L;;;;;N;;;;104F0;
+104C9;OSAGE CAPITAL LETTER EHTA;Lu;0;L;;;;;N;;;;104F1;
+104CA;OSAGE CAPITAL LETTER TSA;Lu;0;L;;;;;N;;;;104F2;
+104CB;OSAGE CAPITAL LETTER EHTSA;Lu;0;L;;;;;N;;;;104F3;
+104CC;OSAGE CAPITAL LETTER TSHA;Lu;0;L;;;;;N;;;;104F4;
+104CD;OSAGE CAPITAL LETTER DHA;Lu;0;L;;;;;N;;;;104F5;
+104CE;OSAGE CAPITAL LETTER U;Lu;0;L;;;;;N;;;;104F6;
+104CF;OSAGE CAPITAL LETTER WA;Lu;0;L;;;;;N;;;;104F7;
+104D0;OSAGE CAPITAL LETTER KHA;Lu;0;L;;;;;N;;;;104F8;
+104D1;OSAGE CAPITAL LETTER GHA;Lu;0;L;;;;;N;;;;104F9;
+104D2;OSAGE CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;104FA;
+104D3;OSAGE CAPITAL LETTER ZHA;Lu;0;L;;;;;N;;;;104FB;
+104D8;OSAGE SMALL LETTER A;Ll;0;L;;;;;N;;;104B0;;104B0
+104D9;OSAGE SMALL LETTER AI;Ll;0;L;;;;;N;;;104B1;;104B1
+104DA;OSAGE SMALL LETTER AIN;Ll;0;L;;;;;N;;;104B2;;104B2
+104DB;OSAGE SMALL LETTER AH;Ll;0;L;;;;;N;;;104B3;;104B3
+104DC;OSAGE SMALL LETTER BRA;Ll;0;L;;;;;N;;;104B4;;104B4
+104DD;OSAGE SMALL LETTER CHA;Ll;0;L;;;;;N;;;104B5;;104B5
+104DE;OSAGE SMALL LETTER EHCHA;Ll;0;L;;;;;N;;;104B6;;104B6
+104DF;OSAGE SMALL LETTER E;Ll;0;L;;;;;N;;;104B7;;104B7
+104E0;OSAGE SMALL LETTER EIN;Ll;0;L;;;;;N;;;104B8;;104B8
+104E1;OSAGE SMALL LETTER HA;Ll;0;L;;;;;N;;;104B9;;104B9
+104E2;OSAGE SMALL LETTER HYA;Ll;0;L;;;;;N;;;104BA;;104BA
+104E3;OSAGE SMALL LETTER I;Ll;0;L;;;;;N;;;104BB;;104BB
+104E4;OSAGE SMALL LETTER KA;Ll;0;L;;;;;N;;;104BC;;104BC
+104E5;OSAGE SMALL LETTER EHKA;Ll;0;L;;;;;N;;;104BD;;104BD
+104E6;OSAGE SMALL LETTER KYA;Ll;0;L;;;;;N;;;104BE;;104BE
+104E7;OSAGE SMALL LETTER LA;Ll;0;L;;;;;N;;;104BF;;104BF
+104E8;OSAGE SMALL LETTER MA;Ll;0;L;;;;;N;;;104C0;;104C0
+104E9;OSAGE SMALL LETTER NA;Ll;0;L;;;;;N;;;104C1;;104C1
+104EA;OSAGE SMALL LETTER O;Ll;0;L;;;;;N;;;104C2;;104C2
+104EB;OSAGE SMALL LETTER OIN;Ll;0;L;;;;;N;;;104C3;;104C3
+104EC;OSAGE SMALL LETTER PA;Ll;0;L;;;;;N;;;104C4;;104C4
+104ED;OSAGE SMALL LETTER EHPA;Ll;0;L;;;;;N;;;104C5;;104C5
+104EE;OSAGE SMALL LETTER SA;Ll;0;L;;;;;N;;;104C6;;104C6
+104EF;OSAGE SMALL LETTER SHA;Ll;0;L;;;;;N;;;104C7;;104C7
+104F0;OSAGE SMALL LETTER TA;Ll;0;L;;;;;N;;;104C8;;104C8
+104F1;OSAGE SMALL LETTER EHTA;Ll;0;L;;;;;N;;;104C9;;104C9
+104F2;OSAGE SMALL LETTER TSA;Ll;0;L;;;;;N;;;104CA;;104CA
+104F3;OSAGE SMALL LETTER EHTSA;Ll;0;L;;;;;N;;;104CB;;104CB
+104F4;OSAGE SMALL LETTER TSHA;Ll;0;L;;;;;N;;;104CC;;104CC
+104F5;OSAGE SMALL LETTER DHA;Ll;0;L;;;;;N;;;104CD;;104CD
+104F6;OSAGE SMALL LETTER U;Ll;0;L;;;;;N;;;104CE;;104CE
+104F7;OSAGE SMALL LETTER WA;Ll;0;L;;;;;N;;;104CF;;104CF
+104F8;OSAGE SMALL LETTER KHA;Ll;0;L;;;;;N;;;104D0;;104D0
+104F9;OSAGE SMALL LETTER GHA;Ll;0;L;;;;;N;;;104D1;;104D1
+104FA;OSAGE SMALL LETTER ZA;Ll;0;L;;;;;N;;;104D2;;104D2
+104FB;OSAGE SMALL LETTER ZHA;Ll;0;L;;;;;N;;;104D3;;104D3
 10500;ELBASAN LETTER A;Lo;0;L;;;;;N;;;;;
 10501;ELBASAN LETTER BE;Lo;0;L;;;;;N;;;;;
 10502;ELBASAN LETTER CE;Lo;0;L;;;;;N;;;;;
@@ -19180,6 +19310,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1123B;KHOJKI SECTION MARK;Po;0;L;;;;;N;;;;;
 1123C;KHOJKI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
 1123D;KHOJKI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+1123E;KHOJKI SIGN SUKUN;Mn;0;NSM;;;;;N;;;;;
 11280;MULTANI LETTER A;Lo;0;L;;;;;N;;;;;
 11281;MULTANI LETTER I;Lo;0;L;;;;;N;;;;;
 11282;MULTANI LETTER U;Lo;0;L;;;;;N;;;;;
@@ -19372,6 +19503,98 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11372;COMBINING GRANTHA LETTER NA;Mn;230;NSM;;;;;N;;;;;
 11373;COMBINING GRANTHA LETTER VI;Mn;230;NSM;;;;;N;;;;;
 11374;COMBINING GRANTHA LETTER PA;Mn;230;NSM;;;;;N;;;;;
+11400;NEWA LETTER A;Lo;0;L;;;;;N;;;;;
+11401;NEWA LETTER AA;Lo;0;L;;;;;N;;;;;
+11402;NEWA LETTER I;Lo;0;L;;;;;N;;;;;
+11403;NEWA LETTER II;Lo;0;L;;;;;N;;;;;
+11404;NEWA LETTER U;Lo;0;L;;;;;N;;;;;
+11405;NEWA LETTER UU;Lo;0;L;;;;;N;;;;;
+11406;NEWA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11407;NEWA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11408;NEWA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11409;NEWA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1140A;NEWA LETTER E;Lo;0;L;;;;;N;;;;;
+1140B;NEWA LETTER AI;Lo;0;L;;;;;N;;;;;
+1140C;NEWA LETTER O;Lo;0;L;;;;;N;;;;;
+1140D;NEWA LETTER AU;Lo;0;L;;;;;N;;;;;
+1140E;NEWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1140F;NEWA LETTER KHA;Lo;0;L;;;;;N;;;;;
+11410;NEWA LETTER GA;Lo;0;L;;;;;N;;;;;
+11411;NEWA LETTER GHA;Lo;0;L;;;;;N;;;;;
+11412;NEWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+11413;NEWA LETTER NGHA;Lo;0;L;;;;;N;;;;;
+11414;NEWA LETTER CA;Lo;0;L;;;;;N;;;;;
+11415;NEWA LETTER CHA;Lo;0;L;;;;;N;;;;;
+11416;NEWA LETTER JA;Lo;0;L;;;;;N;;;;;
+11417;NEWA LETTER JHA;Lo;0;L;;;;;N;;;;;
+11418;NEWA LETTER NYA;Lo;0;L;;;;;N;;;;;
+11419;NEWA LETTER NYHA;Lo;0;L;;;;;N;;;;;
+1141A;NEWA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1141B;NEWA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1141C;NEWA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1141D;NEWA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1141E;NEWA LETTER NNA;Lo;0;L;;;;;N;;;;;
+1141F;NEWA LETTER TA;Lo;0;L;;;;;N;;;;;
+11420;NEWA LETTER THA;Lo;0;L;;;;;N;;;;;
+11421;NEWA LETTER DA;Lo;0;L;;;;;N;;;;;
+11422;NEWA LETTER DHA;Lo;0;L;;;;;N;;;;;
+11423;NEWA LETTER NA;Lo;0;L;;;;;N;;;;;
+11424;NEWA LETTER NHA;Lo;0;L;;;;;N;;;;;
+11425;NEWA LETTER PA;Lo;0;L;;;;;N;;;;;
+11426;NEWA LETTER PHA;Lo;0;L;;;;;N;;;;;
+11427;NEWA LETTER BA;Lo;0;L;;;;;N;;;;;
+11428;NEWA LETTER BHA;Lo;0;L;;;;;N;;;;;
+11429;NEWA LETTER MA;Lo;0;L;;;;;N;;;;;
+1142A;NEWA LETTER MHA;Lo;0;L;;;;;N;;;;;
+1142B;NEWA LETTER YA;Lo;0;L;;;;;N;;;;;
+1142C;NEWA LETTER RA;Lo;0;L;;;;;N;;;;;
+1142D;NEWA LETTER RHA;Lo;0;L;;;;;N;;;;;
+1142E;NEWA LETTER LA;Lo;0;L;;;;;N;;;;;
+1142F;NEWA LETTER LHA;Lo;0;L;;;;;N;;;;;
+11430;NEWA LETTER WA;Lo;0;L;;;;;N;;;;;
+11431;NEWA LETTER SHA;Lo;0;L;;;;;N;;;;;
+11432;NEWA LETTER SSA;Lo;0;L;;;;;N;;;;;
+11433;NEWA LETTER SA;Lo;0;L;;;;;N;;;;;
+11434;NEWA LETTER HA;Lo;0;L;;;;;N;;;;;
+11435;NEWA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11436;NEWA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11437;NEWA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+11438;NEWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11439;NEWA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1143A;NEWA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+1143B;NEWA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+1143C;NEWA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1143D;NEWA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+1143E;NEWA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1143F;NEWA VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11440;NEWA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11441;NEWA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+11442;NEWA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+11443;NEWA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11444;NEWA SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11445;NEWA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11446;NEWA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+11447;NEWA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11448;NEWA SIGN FINAL ANUSVARA;Lo;0;L;;;;;N;;;;;
+11449;NEWA OM;Lo;0;L;;;;;N;;;;;
+1144A;NEWA SIDDHI;Lo;0;L;;;;;N;;;;;
+1144B;NEWA DANDA;Po;0;L;;;;;N;;;;;
+1144C;NEWA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+1144D;NEWA COMMA;Po;0;L;;;;;N;;;;;
+1144E;NEWA GAP FILLER;Po;0;L;;;;;N;;;;;
+1144F;NEWA ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+11450;NEWA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11451;NEWA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11452;NEWA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11453;NEWA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11454;NEWA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11455;NEWA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11456;NEWA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11457;NEWA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11458;NEWA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11459;NEWA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1145B;NEWA PLACEHOLDER MARK;Po;0;L;;;;;N;;;;;
+1145D;NEWA INSERTION SIGN;Po;0;L;;;;;N;;;;;
 11480;TIRHUTA ANJI;Lo;0;L;;;;;N;;;;;
 11481;TIRHUTA LETTER A;Lo;0;L;;;;;N;;;;;
 11482;TIRHUTA LETTER AA;Lo;0;L;;;;;N;;;;;
@@ -19625,6 +19848,19 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11657;MODI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 11658;MODI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 11659;MODI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11660;MONGOLIAN BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11661;MONGOLIAN ROTATED BIRGA;Po;0;ON;;;;;N;;;;;
+11662;MONGOLIAN DOUBLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11663;MONGOLIAN TRIPLE BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11664;MONGOLIAN BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11665;MONGOLIAN ROTATED BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+11666;MONGOLIAN ROTATED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11667;MONGOLIAN INVERTED BIRGA;Po;0;ON;;;;;N;;;;;
+11668;MONGOLIAN INVERTED BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+11669;MONGOLIAN SWIRL BIRGA;Po;0;ON;;;;;N;;;;;
+1166A;MONGOLIAN SWIRL BIRGA WITH ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166B;MONGOLIAN SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
+1166C;MONGOLIAN TURNED SWIRL BIRGA WITH DOUBLE ORNAMENT;Po;0;ON;;;;;N;;;;;
 11680;TAKRI LETTER A;Lo;0;L;;;;;N;;;;;
 11681;TAKRI LETTER AA;Lo;0;L;;;;;N;;;;;
 11682;TAKRI LETTER I;Lo;0;L;;;;;N;;;;;
@@ -19889,6 +20125,171 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 11AF6;PAU CIN HAU LOW-FALLING TONE LONG FINAL;Lo;0;L;;;;;N;;;;;
 11AF7;PAU CIN HAU LOW-FALLING TONE FINAL;Lo;0;L;;;;;N;;;;;
 11AF8;PAU CIN HAU GLOTTAL STOP FINAL;Lo;0;L;;;;;N;;;;;
+11C00;BHAIKSUKI LETTER A;Lo;0;L;;;;;N;;;;;
+11C01;BHAIKSUKI LETTER AA;Lo;0;L;;;;;N;;;;;
+11C02;BHAIKSUKI LETTER I;Lo;0;L;;;;;N;;;;;
+11C03;BHAIKSUKI LETTER II;Lo;0;L;;;;;N;;;;;
+11C04;BHAIKSUKI LETTER U;Lo;0;L;;;;;N;;;;;
+11C05;BHAIKSUKI LETTER UU;Lo;0;L;;;;;N;;;;;
+11C06;BHAIKSUKI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+11C07;BHAIKSUKI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+11C08;BHAIKSUKI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+11C0A;BHAIKSUKI LETTER E;Lo;0;L;;;;;N;;;;;
+11C0B;BHAIKSUKI LETTER AI;Lo;0;L;;;;;N;;;;;
+11C0C;BHAIKSUKI LETTER O;Lo;0;L;;;;;N;;;;;
+11C0D;BHAIKSUKI LETTER AU;Lo;0;L;;;;;N;;;;;
+11C0E;BHAIKSUKI LETTER KA;Lo;0;L;;;;;N;;;;;
+11C0F;BHAIKSUKI LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C10;BHAIKSUKI LETTER GA;Lo;0;L;;;;;N;;;;;
+11C11;BHAIKSUKI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11C12;BHAIKSUKI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C13;BHAIKSUKI LETTER CA;Lo;0;L;;;;;N;;;;;
+11C14;BHAIKSUKI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C15;BHAIKSUKI LETTER JA;Lo;0;L;;;;;N;;;;;
+11C16;BHAIKSUKI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11C17;BHAIKSUKI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C18;BHAIKSUKI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11C19;BHAIKSUKI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11C1A;BHAIKSUKI LETTER DDA;Lo;0;L;;;;;N;;;;;
+11C1B;BHAIKSUKI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+11C1C;BHAIKSUKI LETTER NNA;Lo;0;L;;;;;N;;;;;
+11C1D;BHAIKSUKI LETTER TA;Lo;0;L;;;;;N;;;;;
+11C1E;BHAIKSUKI LETTER THA;Lo;0;L;;;;;N;;;;;
+11C1F;BHAIKSUKI LETTER DA;Lo;0;L;;;;;N;;;;;
+11C20;BHAIKSUKI LETTER DHA;Lo;0;L;;;;;N;;;;;
+11C21;BHAIKSUKI LETTER NA;Lo;0;L;;;;;N;;;;;
+11C22;BHAIKSUKI LETTER PA;Lo;0;L;;;;;N;;;;;
+11C23;BHAIKSUKI LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C24;BHAIKSUKI LETTER BA;Lo;0;L;;;;;N;;;;;
+11C25;BHAIKSUKI LETTER BHA;Lo;0;L;;;;;N;;;;;
+11C26;BHAIKSUKI LETTER MA;Lo;0;L;;;;;N;;;;;
+11C27;BHAIKSUKI LETTER YA;Lo;0;L;;;;;N;;;;;
+11C28;BHAIKSUKI LETTER RA;Lo;0;L;;;;;N;;;;;
+11C29;BHAIKSUKI LETTER LA;Lo;0;L;;;;;N;;;;;
+11C2A;BHAIKSUKI LETTER VA;Lo;0;L;;;;;N;;;;;
+11C2B;BHAIKSUKI LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C2C;BHAIKSUKI LETTER SSA;Lo;0;L;;;;;N;;;;;
+11C2D;BHAIKSUKI LETTER SA;Lo;0;L;;;;;N;;;;;
+11C2E;BHAIKSUKI LETTER HA;Lo;0;L;;;;;N;;;;;
+11C2F;BHAIKSUKI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+11C30;BHAIKSUKI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+11C31;BHAIKSUKI VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+11C32;BHAIKSUKI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11C33;BHAIKSUKI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+11C34;BHAIKSUKI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+11C35;BHAIKSUKI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+11C36;BHAIKSUKI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+11C38;BHAIKSUKI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11C39;BHAIKSUKI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+11C3A;BHAIKSUKI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+11C3B;BHAIKSUKI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+11C3C;BHAIKSUKI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11C3D;BHAIKSUKI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11C3E;BHAIKSUKI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11C3F;BHAIKSUKI SIGN VIRAMA;Mn;9;L;;;;;N;;;;;
+11C40;BHAIKSUKI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+11C41;BHAIKSUKI DANDA;Po;0;L;;;;;N;;;;;
+11C42;BHAIKSUKI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+11C43;BHAIKSUKI WORD SEPARATOR;Po;0;L;;;;;N;;;;;
+11C44;BHAIKSUKI GAP FILLER-1;Po;0;L;;;;;N;;;;;
+11C45;BHAIKSUKI GAP FILLER-2;Po;0;L;;;;;N;;;;;
+11C50;BHAIKSUKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+11C51;BHAIKSUKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+11C52;BHAIKSUKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+11C53;BHAIKSUKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+11C54;BHAIKSUKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+11C55;BHAIKSUKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+11C56;BHAIKSUKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+11C57;BHAIKSUKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+11C58;BHAIKSUKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+11C59;BHAIKSUKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+11C5A;BHAIKSUKI NUMBER ONE;No;0;L;;;;1;N;;;;;
+11C5B;BHAIKSUKI NUMBER TWO;No;0;L;;;;2;N;;;;;
+11C5C;BHAIKSUKI NUMBER THREE;No;0;L;;;;3;N;;;;;
+11C5D;BHAIKSUKI NUMBER FOUR;No;0;L;;;;4;N;;;;;
+11C5E;BHAIKSUKI NUMBER FIVE;No;0;L;;;;5;N;;;;;
+11C5F;BHAIKSUKI NUMBER SIX;No;0;L;;;;6;N;;;;;
+11C60;BHAIKSUKI NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+11C61;BHAIKSUKI NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+11C62;BHAIKSUKI NUMBER NINE;No;0;L;;;;9;N;;;;;
+11C63;BHAIKSUKI NUMBER TEN;No;0;L;;;;10;N;;;;;
+11C64;BHAIKSUKI NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+11C65;BHAIKSUKI NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+11C66;BHAIKSUKI NUMBER FORTY;No;0;L;;;;40;N;;;;;
+11C67;BHAIKSUKI NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+11C68;BHAIKSUKI NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+11C69;BHAIKSUKI NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+11C6A;BHAIKSUKI NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+11C6B;BHAIKSUKI NUMBER NINETY;No;0;L;;;;90;N;;;;;
+11C6C;BHAIKSUKI HUNDREDS UNIT MARK;No;0;L;;;;100;N;;;;;
+11C70;MARCHEN HEAD MARK;Po;0;L;;;;;N;;;;;
+11C71;MARCHEN MARK SHAD;Po;0;L;;;;;N;;;;;
+11C72;MARCHEN LETTER KA;Lo;0;L;;;;;N;;;;;
+11C73;MARCHEN LETTER KHA;Lo;0;L;;;;;N;;;;;
+11C74;MARCHEN LETTER GA;Lo;0;L;;;;;N;;;;;
+11C75;MARCHEN LETTER NGA;Lo;0;L;;;;;N;;;;;
+11C76;MARCHEN LETTER CA;Lo;0;L;;;;;N;;;;;
+11C77;MARCHEN LETTER CHA;Lo;0;L;;;;;N;;;;;
+11C78;MARCHEN LETTER JA;Lo;0;L;;;;;N;;;;;
+11C79;MARCHEN LETTER NYA;Lo;0;L;;;;;N;;;;;
+11C7A;MARCHEN LETTER TA;Lo;0;L;;;;;N;;;;;
+11C7B;MARCHEN LETTER THA;Lo;0;L;;;;;N;;;;;
+11C7C;MARCHEN LETTER DA;Lo;0;L;;;;;N;;;;;
+11C7D;MARCHEN LETTER NA;Lo;0;L;;;;;N;;;;;
+11C7E;MARCHEN LETTER PA;Lo;0;L;;;;;N;;;;;
+11C7F;MARCHEN LETTER PHA;Lo;0;L;;;;;N;;;;;
+11C80;MARCHEN LETTER BA;Lo;0;L;;;;;N;;;;;
+11C81;MARCHEN LETTER MA;Lo;0;L;;;;;N;;;;;
+11C82;MARCHEN LETTER TSA;Lo;0;L;;;;;N;;;;;
+11C83;MARCHEN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+11C84;MARCHEN LETTER DZA;Lo;0;L;;;;;N;;;;;
+11C85;MARCHEN LETTER WA;Lo;0;L;;;;;N;;;;;
+11C86;MARCHEN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+11C87;MARCHEN LETTER ZA;Lo;0;L;;;;;N;;;;;
+11C88;MARCHEN LETTER -A;Lo;0;L;;;;;N;;;;;
+11C89;MARCHEN LETTER YA;Lo;0;L;;;;;N;;;;;
+11C8A;MARCHEN LETTER RA;Lo;0;L;;;;;N;;;;;
+11C8B;MARCHEN LETTER LA;Lo;0;L;;;;;N;;;;;
+11C8C;MARCHEN LETTER SHA;Lo;0;L;;;;;N;;;;;
+11C8D;MARCHEN LETTER SA;Lo;0;L;;;;;N;;;;;
+11C8E;MARCHEN LETTER HA;Lo;0;L;;;;;N;;;;;
+11C8F;MARCHEN LETTER A;Lo;0;L;;;;;N;;;;;
+11C92;MARCHEN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+11C93;MARCHEN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+11C94;MARCHEN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+11C95;MARCHEN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+11C96;MARCHEN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+11C97;MARCHEN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+11C98;MARCHEN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+11C99;MARCHEN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+11C9A;MARCHEN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+11C9B;MARCHEN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+11C9C;MARCHEN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+11C9D;MARCHEN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+11C9E;MARCHEN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+11C9F;MARCHEN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+11CA0;MARCHEN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+11CA1;MARCHEN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+11CA2;MARCHEN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+11CA3;MARCHEN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+11CA4;MARCHEN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+11CA5;MARCHEN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
+11CA6;MARCHEN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+11CA7;MARCHEN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+11CA9;MARCHEN SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+11CAA;MARCHEN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
+11CAB;MARCHEN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+11CAC;MARCHEN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+11CAD;MARCHEN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+11CAE;MARCHEN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+11CAF;MARCHEN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+11CB0;MARCHEN VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+11CB1;MARCHEN VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+11CB2;MARCHEN VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+11CB3;MARCHEN VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+11CB4;MARCHEN VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+11CB5;MARCHEN SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11CB6;MARCHEN SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -23685,6 +24086,764 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 16F9D;MIAO LETTER REFORMED TONE-5;Lm;0;L;;;;;N;;;;;
 16F9E;MIAO LETTER REFORMED TONE-6;Lm;0;L;;;;;N;;;;;
 16F9F;MIAO LETTER REFORMED TONE-8;Lm;0;L;;;;;N;;;;;
+16FE0;TANGUT ITERATION MARK;Lm;0;L;;;;;N;;;;;
+17000;<Tangut Ideograph, First>;Lo;0;L;;;;;N;;;;;
+187EC;<Tangut Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+18800;TANGUT COMPONENT-001;Lo;0;L;;;;;N;;;;;
+18801;TANGUT COMPONENT-002;Lo;0;L;;;;;N;;;;;
+18802;TANGUT COMPONENT-003;Lo;0;L;;;;;N;;;;;
+18803;TANGUT COMPONENT-004;Lo;0;L;;;;;N;;;;;
+18804;TANGUT COMPONENT-005;Lo;0;L;;;;;N;;;;;
+18805;TANGUT COMPONENT-006;Lo;0;L;;;;;N;;;;;
+18806;TANGUT COMPONENT-007;Lo;0;L;;;;;N;;;;;
+18807;TANGUT COMPONENT-008;Lo;0;L;;;;;N;;;;;
+18808;TANGUT COMPONENT-009;Lo;0;L;;;;;N;;;;;
+18809;TANGUT COMPONENT-010;Lo;0;L;;;;;N;;;;;
+1880A;TANGUT COMPONENT-011;Lo;0;L;;;;;N;;;;;
+1880B;TANGUT COMPONENT-012;Lo;0;L;;;;;N;;;;;
+1880C;TANGUT COMPONENT-013;Lo;0;L;;;;;N;;;;;
+1880D;TANGUT COMPONENT-014;Lo;0;L;;;;;N;;;;;
+1880E;TANGUT COMPONENT-015;Lo;0;L;;;;;N;;;;;
+1880F;TANGUT COMPONENT-016;Lo;0;L;;;;;N;;;;;
+18810;TANGUT COMPONENT-017;Lo;0;L;;;;;N;;;;;
+18811;TANGUT COMPONENT-018;Lo;0;L;;;;;N;;;;;
+18812;TANGUT COMPONENT-019;Lo;0;L;;;;;N;;;;;
+18813;TANGUT COMPONENT-020;Lo;0;L;;;;;N;;;;;
+18814;TANGUT COMPONENT-021;Lo;0;L;;;;;N;;;;;
+18815;TANGUT COMPONENT-022;Lo;0;L;;;;;N;;;;;
+18816;TANGUT COMPONENT-023;Lo;0;L;;;;;N;;;;;
+18817;TANGUT COMPONENT-024;Lo;0;L;;;;;N;;;;;
+18818;TANGUT COMPONENT-025;Lo;0;L;;;;;N;;;;;
+18819;TANGUT COMPONENT-026;Lo;0;L;;;;;N;;;;;
+1881A;TANGUT COMPONENT-027;Lo;0;L;;;;;N;;;;;
+1881B;TANGUT COMPONENT-028;Lo;0;L;;;;;N;;;;;
+1881C;TANGUT COMPONENT-029;Lo;0;L;;;;;N;;;;;
+1881D;TANGUT COMPONENT-030;Lo;0;L;;;;;N;;;;;
+1881E;TANGUT COMPONENT-031;Lo;0;L;;;;;N;;;;;
+1881F;TANGUT COMPONENT-032;Lo;0;L;;;;;N;;;;;
+18820;TANGUT COMPONENT-033;Lo;0;L;;;;;N;;;;;
+18821;TANGUT COMPONENT-034;Lo;0;L;;;;;N;;;;;
+18822;TANGUT COMPONENT-035;Lo;0;L;;;;;N;;;;;
+18823;TANGUT COMPONENT-036;Lo;0;L;;;;;N;;;;;
+18824;TANGUT COMPONENT-037;Lo;0;L;;;;;N;;;;;
+18825;TANGUT COMPONENT-038;Lo;0;L;;;;;N;;;;;
+18826;TANGUT COMPONENT-039;Lo;0;L;;;;;N;;;;;
+18827;TANGUT COMPONENT-040;Lo;0;L;;;;;N;;;;;
+18828;TANGUT COMPONENT-041;Lo;0;L;;;;;N;;;;;
+18829;TANGUT COMPONENT-042;Lo;0;L;;;;;N;;;;;
+1882A;TANGUT COMPONENT-043;Lo;0;L;;;;;N;;;;;
+1882B;TANGUT COMPONENT-044;Lo;0;L;;;;;N;;;;;
+1882C;TANGUT COMPONENT-045;Lo;0;L;;;;;N;;;;;
+1882D;TANGUT COMPONENT-046;Lo;0;L;;;;;N;;;;;
+1882E;TANGUT COMPONENT-047;Lo;0;L;;;;;N;;;;;
+1882F;TANGUT COMPONENT-048;Lo;0;L;;;;;N;;;;;
+18830;TANGUT COMPONENT-049;Lo;0;L;;;;;N;;;;;
+18831;TANGUT COMPONENT-050;Lo;0;L;;;;;N;;;;;
+18832;TANGUT COMPONENT-051;Lo;0;L;;;;;N;;;;;
+18833;TANGUT COMPONENT-052;Lo;0;L;;;;;N;;;;;
+18834;TANGUT COMPONENT-053;Lo;0;L;;;;;N;;;;;
+18835;TANGUT COMPONENT-054;Lo;0;L;;;;;N;;;;;
+18836;TANGUT COMPONENT-055;Lo;0;L;;;;;N;;;;;
+18837;TANGUT COMPONENT-056;Lo;0;L;;;;;N;;;;;
+18838;TANGUT COMPONENT-057;Lo;0;L;;;;;N;;;;;
+18839;TANGUT COMPONENT-058;Lo;0;L;;;;;N;;;;;
+1883A;TANGUT COMPONENT-059;Lo;0;L;;;;;N;;;;;
+1883B;TANGUT COMPONENT-060;Lo;0;L;;;;;N;;;;;
+1883C;TANGUT COMPONENT-061;Lo;0;L;;;;;N;;;;;
+1883D;TANGUT COMPONENT-062;Lo;0;L;;;;;N;;;;;
+1883E;TANGUT COMPONENT-063;Lo;0;L;;;;;N;;;;;
+1883F;TANGUT COMPONENT-064;Lo;0;L;;;;;N;;;;;
+18840;TANGUT COMPONENT-065;Lo;0;L;;;;;N;;;;;
+18841;TANGUT COMPONENT-066;Lo;0;L;;;;;N;;;;;
+18842;TANGUT COMPONENT-067;Lo;0;L;;;;;N;;;;;
+18843;TANGUT COMPONENT-068;Lo;0;L;;;;;N;;;;;
+18844;TANGUT COMPONENT-069;Lo;0;L;;;;;N;;;;;
+18845;TANGUT COMPONENT-070;Lo;0;L;;;;;N;;;;;
+18846;TANGUT COMPONENT-071;Lo;0;L;;;;;N;;;;;
+18847;TANGUT COMPONENT-072;Lo;0;L;;;;;N;;;;;
+18848;TANGUT COMPONENT-073;Lo;0;L;;;;;N;;;;;
+18849;TANGUT COMPONENT-074;Lo;0;L;;;;;N;;;;;
+1884A;TANGUT COMPONENT-075;Lo;0;L;;;;;N;;;;;
+1884B;TANGUT COMPONENT-076;Lo;0;L;;;;;N;;;;;
+1884C;TANGUT COMPONENT-077;Lo;0;L;;;;;N;;;;;
+1884D;TANGUT COMPONENT-078;Lo;0;L;;;;;N;;;;;
+1884E;TANGUT COMPONENT-079;Lo;0;L;;;;;N;;;;;
+1884F;TANGUT COMPONENT-080;Lo;0;L;;;;;N;;;;;
+18850;TANGUT COMPONENT-081;Lo;0;L;;;;;N;;;;;
+18851;TANGUT COMPONENT-082;Lo;0;L;;;;;N;;;;;
+18852;TANGUT COMPONENT-083;Lo;0;L;;;;;N;;;;;
+18853;TANGUT COMPONENT-084;Lo;0;L;;;;;N;;;;;
+18854;TANGUT COMPONENT-085;Lo;0;L;;;;;N;;;;;
+18855;TANGUT COMPONENT-086;Lo;0;L;;;;;N;;;;;
+18856;TANGUT COMPONENT-087;Lo;0;L;;;;;N;;;;;
+18857;TANGUT COMPONENT-088;Lo;0;L;;;;;N;;;;;
+18858;TANGUT COMPONENT-089;Lo;0;L;;;;;N;;;;;
+18859;TANGUT COMPONENT-090;Lo;0;L;;;;;N;;;;;
+1885A;TANGUT COMPONENT-091;Lo;0;L;;;;;N;;;;;
+1885B;TANGUT COMPONENT-092;Lo;0;L;;;;;N;;;;;
+1885C;TANGUT COMPONENT-093;Lo;0;L;;;;;N;;;;;
+1885D;TANGUT COMPONENT-094;Lo;0;L;;;;;N;;;;;
+1885E;TANGUT COMPONENT-095;Lo;0;L;;;;;N;;;;;
+1885F;TANGUT COMPONENT-096;Lo;0;L;;;;;N;;;;;
+18860;TANGUT COMPONENT-097;Lo;0;L;;;;;N;;;;;
+18861;TANGUT COMPONENT-098;Lo;0;L;;;;;N;;;;;
+18862;TANGUT COMPONENT-099;Lo;0;L;;;;;N;;;;;
+18863;TANGUT COMPONENT-100;Lo;0;L;;;;;N;;;;;
+18864;TANGUT COMPONENT-101;Lo;0;L;;;;;N;;;;;
+18865;TANGUT COMPONENT-102;Lo;0;L;;;;;N;;;;;
+18866;TANGUT COMPONENT-103;Lo;0;L;;;;;N;;;;;
+18867;TANGUT COMPONENT-104;Lo;0;L;;;;;N;;;;;
+18868;TANGUT COMPONENT-105;Lo;0;L;;;;;N;;;;;
+18869;TANGUT COMPONENT-106;Lo;0;L;;;;;N;;;;;
+1886A;TANGUT COMPONENT-107;Lo;0;L;;;;;N;;;;;
+1886B;TANGUT COMPONENT-108;Lo;0;L;;;;;N;;;;;
+1886C;TANGUT COMPONENT-109;Lo;0;L;;;;;N;;;;;
+1886D;TANGUT COMPONENT-110;Lo;0;L;;;;;N;;;;;
+1886E;TANGUT COMPONENT-111;Lo;0;L;;;;;N;;;;;
+1886F;TANGUT COMPONENT-112;Lo;0;L;;;;;N;;;;;
+18870;TANGUT COMPONENT-113;Lo;0;L;;;;;N;;;;;
+18871;TANGUT COMPONENT-114;Lo;0;L;;;;;N;;;;;
+18872;TANGUT COMPONENT-115;Lo;0;L;;;;;N;;;;;
+18873;TANGUT COMPONENT-116;Lo;0;L;;;;;N;;;;;
+18874;TANGUT COMPONENT-117;Lo;0;L;;;;;N;;;;;
+18875;TANGUT COMPONENT-118;Lo;0;L;;;;;N;;;;;
+18876;TANGUT COMPONENT-119;Lo;0;L;;;;;N;;;;;
+18877;TANGUT COMPONENT-120;Lo;0;L;;;;;N;;;;;
+18878;TANGUT COMPONENT-121;Lo;0;L;;;;;N;;;;;
+18879;TANGUT COMPONENT-122;Lo;0;L;;;;;N;;;;;
+1887A;TANGUT COMPONENT-123;Lo;0;L;;;;;N;;;;;
+1887B;TANGUT COMPONENT-124;Lo;0;L;;;;;N;;;;;
+1887C;TANGUT COMPONENT-125;Lo;0;L;;;;;N;;;;;
+1887D;TANGUT COMPONENT-126;Lo;0;L;;;;;N;;;;;
+1887E;TANGUT COMPONENT-127;Lo;0;L;;;;;N;;;;;
+1887F;TANGUT COMPONENT-128;Lo;0;L;;;;;N;;;;;
+18880;TANGUT COMPONENT-129;Lo;0;L;;;;;N;;;;;
+18881;TANGUT COMPONENT-130;Lo;0;L;;;;;N;;;;;
+18882;TANGUT COMPONENT-131;Lo;0;L;;;;;N;;;;;
+18883;TANGUT COMPONENT-132;Lo;0;L;;;;;N;;;;;
+18884;TANGUT COMPONENT-133;Lo;0;L;;;;;N;;;;;
+18885;TANGUT COMPONENT-134;Lo;0;L;;;;;N;;;;;
+18886;TANGUT COMPONENT-135;Lo;0;L;;;;;N;;;;;
+18887;TANGUT COMPONENT-136;Lo;0;L;;;;;N;;;;;
+18888;TANGUT COMPONENT-137;Lo;0;L;;;;;N;;;;;
+18889;TANGUT COMPONENT-138;Lo;0;L;;;;;N;;;;;
+1888A;TANGUT COMPONENT-139;Lo;0;L;;;;;N;;;;;
+1888B;TANGUT COMPONENT-140;Lo;0;L;;;;;N;;;;;
+1888C;TANGUT COMPONENT-141;Lo;0;L;;;;;N;;;;;
+1888D;TANGUT COMPONENT-142;Lo;0;L;;;;;N;;;;;
+1888E;TANGUT COMPONENT-143;Lo;0;L;;;;;N;;;;;
+1888F;TANGUT COMPONENT-144;Lo;0;L;;;;;N;;;;;
+18890;TANGUT COMPONENT-145;Lo;0;L;;;;;N;;;;;
+18891;TANGUT COMPONENT-146;Lo;0;L;;;;;N;;;;;
+18892;TANGUT COMPONENT-147;Lo;0;L;;;;;N;;;;;
+18893;TANGUT COMPONENT-148;Lo;0;L;;;;;N;;;;;
+18894;TANGUT COMPONENT-149;Lo;0;L;;;;;N;;;;;
+18895;TANGUT COMPONENT-150;Lo;0;L;;;;;N;;;;;
+18896;TANGUT COMPONENT-151;Lo;0;L;;;;;N;;;;;
+18897;TANGUT COMPONENT-152;Lo;0;L;;;;;N;;;;;
+18898;TANGUT COMPONENT-153;Lo;0;L;;;;;N;;;;;
+18899;TANGUT COMPONENT-154;Lo;0;L;;;;;N;;;;;
+1889A;TANGUT COMPONENT-155;Lo;0;L;;;;;N;;;;;
+1889B;TANGUT COMPONENT-156;Lo;0;L;;;;;N;;;;;
+1889C;TANGUT COMPONENT-157;Lo;0;L;;;;;N;;;;;
+1889D;TANGUT COMPONENT-158;Lo;0;L;;;;;N;;;;;
+1889E;TANGUT COMPONENT-159;Lo;0;L;;;;;N;;;;;
+1889F;TANGUT COMPONENT-160;Lo;0;L;;;;;N;;;;;
+188A0;TANGUT COMPONENT-161;Lo;0;L;;;;;N;;;;;
+188A1;TANGUT COMPONENT-162;Lo;0;L;;;;;N;;;;;
+188A2;TANGUT COMPONENT-163;Lo;0;L;;;;;N;;;;;
+188A3;TANGUT COMPONENT-164;Lo;0;L;;;;;N;;;;;
+188A4;TANGUT COMPONENT-165;Lo;0;L;;;;;N;;;;;
+188A5;TANGUT COMPONENT-166;Lo;0;L;;;;;N;;;;;
+188A6;TANGUT COMPONENT-167;Lo;0;L;;;;;N;;;;;
+188A7;TANGUT COMPONENT-168;Lo;0;L;;;;;N;;;;;
+188A8;TANGUT COMPONENT-169;Lo;0;L;;;;;N;;;;;
+188A9;TANGUT COMPONENT-170;Lo;0;L;;;;;N;;;;;
+188AA;TANGUT COMPONENT-171;Lo;0;L;;;;;N;;;;;
+188AB;TANGUT COMPONENT-172;Lo;0;L;;;;;N;;;;;
+188AC;TANGUT COMPONENT-173;Lo;0;L;;;;;N;;;;;
+188AD;TANGUT COMPONENT-174;Lo;0;L;;;;;N;;;;;
+188AE;TANGUT COMPONENT-175;Lo;0;L;;;;;N;;;;;
+188AF;TANGUT COMPONENT-176;Lo;0;L;;;;;N;;;;;
+188B0;TANGUT COMPONENT-177;Lo;0;L;;;;;N;;;;;
+188B1;TANGUT COMPONENT-178;Lo;0;L;;;;;N;;;;;
+188B2;TANGUT COMPONENT-179;Lo;0;L;;;;;N;;;;;
+188B3;TANGUT COMPONENT-180;Lo;0;L;;;;;N;;;;;
+188B4;TANGUT COMPONENT-181;Lo;0;L;;;;;N;;;;;
+188B5;TANGUT COMPONENT-182;Lo;0;L;;;;;N;;;;;
+188B6;TANGUT COMPONENT-183;Lo;0;L;;;;;N;;;;;
+188B7;TANGUT COMPONENT-184;Lo;0;L;;;;;N;;;;;
+188B8;TANGUT COMPONENT-185;Lo;0;L;;;;;N;;;;;
+188B9;TANGUT COMPONENT-186;Lo;0;L;;;;;N;;;;;
+188BA;TANGUT COMPONENT-187;Lo;0;L;;;;;N;;;;;
+188BB;TANGUT COMPONENT-188;Lo;0;L;;;;;N;;;;;
+188BC;TANGUT COMPONENT-189;Lo;0;L;;;;;N;;;;;
+188BD;TANGUT COMPONENT-190;Lo;0;L;;;;;N;;;;;
+188BE;TANGUT COMPONENT-191;Lo;0;L;;;;;N;;;;;
+188BF;TANGUT COMPONENT-192;Lo;0;L;;;;;N;;;;;
+188C0;TANGUT COMPONENT-193;Lo;0;L;;;;;N;;;;;
+188C1;TANGUT COMPONENT-194;Lo;0;L;;;;;N;;;;;
+188C2;TANGUT COMPONENT-195;Lo;0;L;;;;;N;;;;;
+188C3;TANGUT COMPONENT-196;Lo;0;L;;;;;N;;;;;
+188C4;TANGUT COMPONENT-197;Lo;0;L;;;;;N;;;;;
+188C5;TANGUT COMPONENT-198;Lo;0;L;;;;;N;;;;;
+188C6;TANGUT COMPONENT-199;Lo;0;L;;;;;N;;;;;
+188C7;TANGUT COMPONENT-200;Lo;0;L;;;;;N;;;;;
+188C8;TANGUT COMPONENT-201;Lo;0;L;;;;;N;;;;;
+188C9;TANGUT COMPONENT-202;Lo;0;L;;;;;N;;;;;
+188CA;TANGUT COMPONENT-203;Lo;0;L;;;;;N;;;;;
+188CB;TANGUT COMPONENT-204;Lo;0;L;;;;;N;;;;;
+188CC;TANGUT COMPONENT-205;Lo;0;L;;;;;N;;;;;
+188CD;TANGUT COMPONENT-206;Lo;0;L;;;;;N;;;;;
+188CE;TANGUT COMPONENT-207;Lo;0;L;;;;;N;;;;;
+188CF;TANGUT COMPONENT-208;Lo;0;L;;;;;N;;;;;
+188D0;TANGUT COMPONENT-209;Lo;0;L;;;;;N;;;;;
+188D1;TANGUT COMPONENT-210;Lo;0;L;;;;;N;;;;;
+188D2;TANGUT COMPONENT-211;Lo;0;L;;;;;N;;;;;
+188D3;TANGUT COMPONENT-212;Lo;0;L;;;;;N;;;;;
+188D4;TANGUT COMPONENT-213;Lo;0;L;;;;;N;;;;;
+188D5;TANGUT COMPONENT-214;Lo;0;L;;;;;N;;;;;
+188D6;TANGUT COMPONENT-215;Lo;0;L;;;;;N;;;;;
+188D7;TANGUT COMPONENT-216;Lo;0;L;;;;;N;;;;;
+188D8;TANGUT COMPONENT-217;Lo;0;L;;;;;N;;;;;
+188D9;TANGUT COMPONENT-218;Lo;0;L;;;;;N;;;;;
+188DA;TANGUT COMPONENT-219;Lo;0;L;;;;;N;;;;;
+188DB;TANGUT COMPONENT-220;Lo;0;L;;;;;N;;;;;
+188DC;TANGUT COMPONENT-221;Lo;0;L;;;;;N;;;;;
+188DD;TANGUT COMPONENT-222;Lo;0;L;;;;;N;;;;;
+188DE;TANGUT COMPONENT-223;Lo;0;L;;;;;N;;;;;
+188DF;TANGUT COMPONENT-224;Lo;0;L;;;;;N;;;;;
+188E0;TANGUT COMPONENT-225;Lo;0;L;;;;;N;;;;;
+188E1;TANGUT COMPONENT-226;Lo;0;L;;;;;N;;;;;
+188E2;TANGUT COMPONENT-227;Lo;0;L;;;;;N;;;;;
+188E3;TANGUT COMPONENT-228;Lo;0;L;;;;;N;;;;;
+188E4;TANGUT COMPONENT-229;Lo;0;L;;;;;N;;;;;
+188E5;TANGUT COMPONENT-230;Lo;0;L;;;;;N;;;;;
+188E6;TANGUT COMPONENT-231;Lo;0;L;;;;;N;;;;;
+188E7;TANGUT COMPONENT-232;Lo;0;L;;;;;N;;;;;
+188E8;TANGUT COMPONENT-233;Lo;0;L;;;;;N;;;;;
+188E9;TANGUT COMPONENT-234;Lo;0;L;;;;;N;;;;;
+188EA;TANGUT COMPONENT-235;Lo;0;L;;;;;N;;;;;
+188EB;TANGUT COMPONENT-236;Lo;0;L;;;;;N;;;;;
+188EC;TANGUT COMPONENT-237;Lo;0;L;;;;;N;;;;;
+188ED;TANGUT COMPONENT-238;Lo;0;L;;;;;N;;;;;
+188EE;TANGUT COMPONENT-239;Lo;0;L;;;;;N;;;;;
+188EF;TANGUT COMPONENT-240;Lo;0;L;;;;;N;;;;;
+188F0;TANGUT COMPONENT-241;Lo;0;L;;;;;N;;;;;
+188F1;TANGUT COMPONENT-242;Lo;0;L;;;;;N;;;;;
+188F2;TANGUT COMPONENT-243;Lo;0;L;;;;;N;;;;;
+188F3;TANGUT COMPONENT-244;Lo;0;L;;;;;N;;;;;
+188F4;TANGUT COMPONENT-245;Lo;0;L;;;;;N;;;;;
+188F5;TANGUT COMPONENT-246;Lo;0;L;;;;;N;;;;;
+188F6;TANGUT COMPONENT-247;Lo;0;L;;;;;N;;;;;
+188F7;TANGUT COMPONENT-248;Lo;0;L;;;;;N;;;;;
+188F8;TANGUT COMPONENT-249;Lo;0;L;;;;;N;;;;;
+188F9;TANGUT COMPONENT-250;Lo;0;L;;;;;N;;;;;
+188FA;TANGUT COMPONENT-251;Lo;0;L;;;;;N;;;;;
+188FB;TANGUT COMPONENT-252;Lo;0;L;;;;;N;;;;;
+188FC;TANGUT COMPONENT-253;Lo;0;L;;;;;N;;;;;
+188FD;TANGUT COMPONENT-254;Lo;0;L;;;;;N;;;;;
+188FE;TANGUT COMPONENT-255;Lo;0;L;;;;;N;;;;;
+188FF;TANGUT COMPONENT-256;Lo;0;L;;;;;N;;;;;
+18900;TANGUT COMPONENT-257;Lo;0;L;;;;;N;;;;;
+18901;TANGUT COMPONENT-258;Lo;0;L;;;;;N;;;;;
+18902;TANGUT COMPONENT-259;Lo;0;L;;;;;N;;;;;
+18903;TANGUT COMPONENT-260;Lo;0;L;;;;;N;;;;;
+18904;TANGUT COMPONENT-261;Lo;0;L;;;;;N;;;;;
+18905;TANGUT COMPONENT-262;Lo;0;L;;;;;N;;;;;
+18906;TANGUT COMPONENT-263;Lo;0;L;;;;;N;;;;;
+18907;TANGUT COMPONENT-264;Lo;0;L;;;;;N;;;;;
+18908;TANGUT COMPONENT-265;Lo;0;L;;;;;N;;;;;
+18909;TANGUT COMPONENT-266;Lo;0;L;;;;;N;;;;;
+1890A;TANGUT COMPONENT-267;Lo;0;L;;;;;N;;;;;
+1890B;TANGUT COMPONENT-268;Lo;0;L;;;;;N;;;;;
+1890C;TANGUT COMPONENT-269;Lo;0;L;;;;;N;;;;;
+1890D;TANGUT COMPONENT-270;Lo;0;L;;;;;N;;;;;
+1890E;TANGUT COMPONENT-271;Lo;0;L;;;;;N;;;;;
+1890F;TANGUT COMPONENT-272;Lo;0;L;;;;;N;;;;;
+18910;TANGUT COMPONENT-273;Lo;0;L;;;;;N;;;;;
+18911;TANGUT COMPONENT-274;Lo;0;L;;;;;N;;;;;
+18912;TANGUT COMPONENT-275;Lo;0;L;;;;;N;;;;;
+18913;TANGUT COMPONENT-276;Lo;0;L;;;;;N;;;;;
+18914;TANGUT COMPONENT-277;Lo;0;L;;;;;N;;;;;
+18915;TANGUT COMPONENT-278;Lo;0;L;;;;;N;;;;;
+18916;TANGUT COMPONENT-279;Lo;0;L;;;;;N;;;;;
+18917;TANGUT COMPONENT-280;Lo;0;L;;;;;N;;;;;
+18918;TANGUT COMPONENT-281;Lo;0;L;;;;;N;;;;;
+18919;TANGUT COMPONENT-282;Lo;0;L;;;;;N;;;;;
+1891A;TANGUT COMPONENT-283;Lo;0;L;;;;;N;;;;;
+1891B;TANGUT COMPONENT-284;Lo;0;L;;;;;N;;;;;
+1891C;TANGUT COMPONENT-285;Lo;0;L;;;;;N;;;;;
+1891D;TANGUT COMPONENT-286;Lo;0;L;;;;;N;;;;;
+1891E;TANGUT COMPONENT-287;Lo;0;L;;;;;N;;;;;
+1891F;TANGUT COMPONENT-288;Lo;0;L;;;;;N;;;;;
+18920;TANGUT COMPONENT-289;Lo;0;L;;;;;N;;;;;
+18921;TANGUT COMPONENT-290;Lo;0;L;;;;;N;;;;;
+18922;TANGUT COMPONENT-291;Lo;0;L;;;;;N;;;;;
+18923;TANGUT COMPONENT-292;Lo;0;L;;;;;N;;;;;
+18924;TANGUT COMPONENT-293;Lo;0;L;;;;;N;;;;;
+18925;TANGUT COMPONENT-294;Lo;0;L;;;;;N;;;;;
+18926;TANGUT COMPONENT-295;Lo;0;L;;;;;N;;;;;
+18927;TANGUT COMPONENT-296;Lo;0;L;;;;;N;;;;;
+18928;TANGUT COMPONENT-297;Lo;0;L;;;;;N;;;;;
+18929;TANGUT COMPONENT-298;Lo;0;L;;;;;N;;;;;
+1892A;TANGUT COMPONENT-299;Lo;0;L;;;;;N;;;;;
+1892B;TANGUT COMPONENT-300;Lo;0;L;;;;;N;;;;;
+1892C;TANGUT COMPONENT-301;Lo;0;L;;;;;N;;;;;
+1892D;TANGUT COMPONENT-302;Lo;0;L;;;;;N;;;;;
+1892E;TANGUT COMPONENT-303;Lo;0;L;;;;;N;;;;;
+1892F;TANGUT COMPONENT-304;Lo;0;L;;;;;N;;;;;
+18930;TANGUT COMPONENT-305;Lo;0;L;;;;;N;;;;;
+18931;TANGUT COMPONENT-306;Lo;0;L;;;;;N;;;;;
+18932;TANGUT COMPONENT-307;Lo;0;L;;;;;N;;;;;
+18933;TANGUT COMPONENT-308;Lo;0;L;;;;;N;;;;;
+18934;TANGUT COMPONENT-309;Lo;0;L;;;;;N;;;;;
+18935;TANGUT COMPONENT-310;Lo;0;L;;;;;N;;;;;
+18936;TANGUT COMPONENT-311;Lo;0;L;;;;;N;;;;;
+18937;TANGUT COMPONENT-312;Lo;0;L;;;;;N;;;;;
+18938;TANGUT COMPONENT-313;Lo;0;L;;;;;N;;;;;
+18939;TANGUT COMPONENT-314;Lo;0;L;;;;;N;;;;;
+1893A;TANGUT COMPONENT-315;Lo;0;L;;;;;N;;;;;
+1893B;TANGUT COMPONENT-316;Lo;0;L;;;;;N;;;;;
+1893C;TANGUT COMPONENT-317;Lo;0;L;;;;;N;;;;;
+1893D;TANGUT COMPONENT-318;Lo;0;L;;;;;N;;;;;
+1893E;TANGUT COMPONENT-319;Lo;0;L;;;;;N;;;;;
+1893F;TANGUT COMPONENT-320;Lo;0;L;;;;;N;;;;;
+18940;TANGUT COMPONENT-321;Lo;0;L;;;;;N;;;;;
+18941;TANGUT COMPONENT-322;Lo;0;L;;;;;N;;;;;
+18942;TANGUT COMPONENT-323;Lo;0;L;;;;;N;;;;;
+18943;TANGUT COMPONENT-324;Lo;0;L;;;;;N;;;;;
+18944;TANGUT COMPONENT-325;Lo;0;L;;;;;N;;;;;
+18945;TANGUT COMPONENT-326;Lo;0;L;;;;;N;;;;;
+18946;TANGUT COMPONENT-327;Lo;0;L;;;;;N;;;;;
+18947;TANGUT COMPONENT-328;Lo;0;L;;;;;N;;;;;
+18948;TANGUT COMPONENT-329;Lo;0;L;;;;;N;;;;;
+18949;TANGUT COMPONENT-330;Lo;0;L;;;;;N;;;;;
+1894A;TANGUT COMPONENT-331;Lo;0;L;;;;;N;;;;;
+1894B;TANGUT COMPONENT-332;Lo;0;L;;;;;N;;;;;
+1894C;TANGUT COMPONENT-333;Lo;0;L;;;;;N;;;;;
+1894D;TANGUT COMPONENT-334;Lo;0;L;;;;;N;;;;;
+1894E;TANGUT COMPONENT-335;Lo;0;L;;;;;N;;;;;
+1894F;TANGUT COMPONENT-336;Lo;0;L;;;;;N;;;;;
+18950;TANGUT COMPONENT-337;Lo;0;L;;;;;N;;;;;
+18951;TANGUT COMPONENT-338;Lo;0;L;;;;;N;;;;;
+18952;TANGUT COMPONENT-339;Lo;0;L;;;;;N;;;;;
+18953;TANGUT COMPONENT-340;Lo;0;L;;;;;N;;;;;
+18954;TANGUT COMPONENT-341;Lo;0;L;;;;;N;;;;;
+18955;TANGUT COMPONENT-342;Lo;0;L;;;;;N;;;;;
+18956;TANGUT COMPONENT-343;Lo;0;L;;;;;N;;;;;
+18957;TANGUT COMPONENT-344;Lo;0;L;;;;;N;;;;;
+18958;TANGUT COMPONENT-345;Lo;0;L;;;;;N;;;;;
+18959;TANGUT COMPONENT-346;Lo;0;L;;;;;N;;;;;
+1895A;TANGUT COMPONENT-347;Lo;0;L;;;;;N;;;;;
+1895B;TANGUT COMPONENT-348;Lo;0;L;;;;;N;;;;;
+1895C;TANGUT COMPONENT-349;Lo;0;L;;;;;N;;;;;
+1895D;TANGUT COMPONENT-350;Lo;0;L;;;;;N;;;;;
+1895E;TANGUT COMPONENT-351;Lo;0;L;;;;;N;;;;;
+1895F;TANGUT COMPONENT-352;Lo;0;L;;;;;N;;;;;
+18960;TANGUT COMPONENT-353;Lo;0;L;;;;;N;;;;;
+18961;TANGUT COMPONENT-354;Lo;0;L;;;;;N;;;;;
+18962;TANGUT COMPONENT-355;Lo;0;L;;;;;N;;;;;
+18963;TANGUT COMPONENT-356;Lo;0;L;;;;;N;;;;;
+18964;TANGUT COMPONENT-357;Lo;0;L;;;;;N;;;;;
+18965;TANGUT COMPONENT-358;Lo;0;L;;;;;N;;;;;
+18966;TANGUT COMPONENT-359;Lo;0;L;;;;;N;;;;;
+18967;TANGUT COMPONENT-360;Lo;0;L;;;;;N;;;;;
+18968;TANGUT COMPONENT-361;Lo;0;L;;;;;N;;;;;
+18969;TANGUT COMPONENT-362;Lo;0;L;;;;;N;;;;;
+1896A;TANGUT COMPONENT-363;Lo;0;L;;;;;N;;;;;
+1896B;TANGUT COMPONENT-364;Lo;0;L;;;;;N;;;;;
+1896C;TANGUT COMPONENT-365;Lo;0;L;;;;;N;;;;;
+1896D;TANGUT COMPONENT-366;Lo;0;L;;;;;N;;;;;
+1896E;TANGUT COMPONENT-367;Lo;0;L;;;;;N;;;;;
+1896F;TANGUT COMPONENT-368;Lo;0;L;;;;;N;;;;;
+18970;TANGUT COMPONENT-369;Lo;0;L;;;;;N;;;;;
+18971;TANGUT COMPONENT-370;Lo;0;L;;;;;N;;;;;
+18972;TANGUT COMPONENT-371;Lo;0;L;;;;;N;;;;;
+18973;TANGUT COMPONENT-372;Lo;0;L;;;;;N;;;;;
+18974;TANGUT COMPONENT-373;Lo;0;L;;;;;N;;;;;
+18975;TANGUT COMPONENT-374;Lo;0;L;;;;;N;;;;;
+18976;TANGUT COMPONENT-375;Lo;0;L;;;;;N;;;;;
+18977;TANGUT COMPONENT-376;Lo;0;L;;;;;N;;;;;
+18978;TANGUT COMPONENT-377;Lo;0;L;;;;;N;;;;;
+18979;TANGUT COMPONENT-378;Lo;0;L;;;;;N;;;;;
+1897A;TANGUT COMPONENT-379;Lo;0;L;;;;;N;;;;;
+1897B;TANGUT COMPONENT-380;Lo;0;L;;;;;N;;;;;
+1897C;TANGUT COMPONENT-381;Lo;0;L;;;;;N;;;;;
+1897D;TANGUT COMPONENT-382;Lo;0;L;;;;;N;;;;;
+1897E;TANGUT COMPONENT-383;Lo;0;L;;;;;N;;;;;
+1897F;TANGUT COMPONENT-384;Lo;0;L;;;;;N;;;;;
+18980;TANGUT COMPONENT-385;Lo;0;L;;;;;N;;;;;
+18981;TANGUT COMPONENT-386;Lo;0;L;;;;;N;;;;;
+18982;TANGUT COMPONENT-387;Lo;0;L;;;;;N;;;;;
+18983;TANGUT COMPONENT-388;Lo;0;L;;;;;N;;;;;
+18984;TANGUT COMPONENT-389;Lo;0;L;;;;;N;;;;;
+18985;TANGUT COMPONENT-390;Lo;0;L;;;;;N;;;;;
+18986;TANGUT COMPONENT-391;Lo;0;L;;;;;N;;;;;
+18987;TANGUT COMPONENT-392;Lo;0;L;;;;;N;;;;;
+18988;TANGUT COMPONENT-393;Lo;0;L;;;;;N;;;;;
+18989;TANGUT COMPONENT-394;Lo;0;L;;;;;N;;;;;
+1898A;TANGUT COMPONENT-395;Lo;0;L;;;;;N;;;;;
+1898B;TANGUT COMPONENT-396;Lo;0;L;;;;;N;;;;;
+1898C;TANGUT COMPONENT-397;Lo;0;L;;;;;N;;;;;
+1898D;TANGUT COMPONENT-398;Lo;0;L;;;;;N;;;;;
+1898E;TANGUT COMPONENT-399;Lo;0;L;;;;;N;;;;;
+1898F;TANGUT COMPONENT-400;Lo;0;L;;;;;N;;;;;
+18990;TANGUT COMPONENT-401;Lo;0;L;;;;;N;;;;;
+18991;TANGUT COMPONENT-402;Lo;0;L;;;;;N;;;;;
+18992;TANGUT COMPONENT-403;Lo;0;L;;;;;N;;;;;
+18993;TANGUT COMPONENT-404;Lo;0;L;;;;;N;;;;;
+18994;TANGUT COMPONENT-405;Lo;0;L;;;;;N;;;;;
+18995;TANGUT COMPONENT-406;Lo;0;L;;;;;N;;;;;
+18996;TANGUT COMPONENT-407;Lo;0;L;;;;;N;;;;;
+18997;TANGUT COMPONENT-408;Lo;0;L;;;;;N;;;;;
+18998;TANGUT COMPONENT-409;Lo;0;L;;;;;N;;;;;
+18999;TANGUT COMPONENT-410;Lo;0;L;;;;;N;;;;;
+1899A;TANGUT COMPONENT-411;Lo;0;L;;;;;N;;;;;
+1899B;TANGUT COMPONENT-412;Lo;0;L;;;;;N;;;;;
+1899C;TANGUT COMPONENT-413;Lo;0;L;;;;;N;;;;;
+1899D;TANGUT COMPONENT-414;Lo;0;L;;;;;N;;;;;
+1899E;TANGUT COMPONENT-415;Lo;0;L;;;;;N;;;;;
+1899F;TANGUT COMPONENT-416;Lo;0;L;;;;;N;;;;;
+189A0;TANGUT COMPONENT-417;Lo;0;L;;;;;N;;;;;
+189A1;TANGUT COMPONENT-418;Lo;0;L;;;;;N;;;;;
+189A2;TANGUT COMPONENT-419;Lo;0;L;;;;;N;;;;;
+189A3;TANGUT COMPONENT-420;Lo;0;L;;;;;N;;;;;
+189A4;TANGUT COMPONENT-421;Lo;0;L;;;;;N;;;;;
+189A5;TANGUT COMPONENT-422;Lo;0;L;;;;;N;;;;;
+189A6;TANGUT COMPONENT-423;Lo;0;L;;;;;N;;;;;
+189A7;TANGUT COMPONENT-424;Lo;0;L;;;;;N;;;;;
+189A8;TANGUT COMPONENT-425;Lo;0;L;;;;;N;;;;;
+189A9;TANGUT COMPONENT-426;Lo;0;L;;;;;N;;;;;
+189AA;TANGUT COMPONENT-427;Lo;0;L;;;;;N;;;;;
+189AB;TANGUT COMPONENT-428;Lo;0;L;;;;;N;;;;;
+189AC;TANGUT COMPONENT-429;Lo;0;L;;;;;N;;;;;
+189AD;TANGUT COMPONENT-430;Lo;0;L;;;;;N;;;;;
+189AE;TANGUT COMPONENT-431;Lo;0;L;;;;;N;;;;;
+189AF;TANGUT COMPONENT-432;Lo;0;L;;;;;N;;;;;
+189B0;TANGUT COMPONENT-433;Lo;0;L;;;;;N;;;;;
+189B1;TANGUT COMPONENT-434;Lo;0;L;;;;;N;;;;;
+189B2;TANGUT COMPONENT-435;Lo;0;L;;;;;N;;;;;
+189B3;TANGUT COMPONENT-436;Lo;0;L;;;;;N;;;;;
+189B4;TANGUT COMPONENT-437;Lo;0;L;;;;;N;;;;;
+189B5;TANGUT COMPONENT-438;Lo;0;L;;;;;N;;;;;
+189B6;TANGUT COMPONENT-439;Lo;0;L;;;;;N;;;;;
+189B7;TANGUT COMPONENT-440;Lo;0;L;;;;;N;;;;;
+189B8;TANGUT COMPONENT-441;Lo;0;L;;;;;N;;;;;
+189B9;TANGUT COMPONENT-442;Lo;0;L;;;;;N;;;;;
+189BA;TANGUT COMPONENT-443;Lo;0;L;;;;;N;;;;;
+189BB;TANGUT COMPONENT-444;Lo;0;L;;;;;N;;;;;
+189BC;TANGUT COMPONENT-445;Lo;0;L;;;;;N;;;;;
+189BD;TANGUT COMPONENT-446;Lo;0;L;;;;;N;;;;;
+189BE;TANGUT COMPONENT-447;Lo;0;L;;;;;N;;;;;
+189BF;TANGUT COMPONENT-448;Lo;0;L;;;;;N;;;;;
+189C0;TANGUT COMPONENT-449;Lo;0;L;;;;;N;;;;;
+189C1;TANGUT COMPONENT-450;Lo;0;L;;;;;N;;;;;
+189C2;TANGUT COMPONENT-451;Lo;0;L;;;;;N;;;;;
+189C3;TANGUT COMPONENT-452;Lo;0;L;;;;;N;;;;;
+189C4;TANGUT COMPONENT-453;Lo;0;L;;;;;N;;;;;
+189C5;TANGUT COMPONENT-454;Lo;0;L;;;;;N;;;;;
+189C6;TANGUT COMPONENT-455;Lo;0;L;;;;;N;;;;;
+189C7;TANGUT COMPONENT-456;Lo;0;L;;;;;N;;;;;
+189C8;TANGUT COMPONENT-457;Lo;0;L;;;;;N;;;;;
+189C9;TANGUT COMPONENT-458;Lo;0;L;;;;;N;;;;;
+189CA;TANGUT COMPONENT-459;Lo;0;L;;;;;N;;;;;
+189CB;TANGUT COMPONENT-460;Lo;0;L;;;;;N;;;;;
+189CC;TANGUT COMPONENT-461;Lo;0;L;;;;;N;;;;;
+189CD;TANGUT COMPONENT-462;Lo;0;L;;;;;N;;;;;
+189CE;TANGUT COMPONENT-463;Lo;0;L;;;;;N;;;;;
+189CF;TANGUT COMPONENT-464;Lo;0;L;;;;;N;;;;;
+189D0;TANGUT COMPONENT-465;Lo;0;L;;;;;N;;;;;
+189D1;TANGUT COMPONENT-466;Lo;0;L;;;;;N;;;;;
+189D2;TANGUT COMPONENT-467;Lo;0;L;;;;;N;;;;;
+189D3;TANGUT COMPONENT-468;Lo;0;L;;;;;N;;;;;
+189D4;TANGUT COMPONENT-469;Lo;0;L;;;;;N;;;;;
+189D5;TANGUT COMPONENT-470;Lo;0;L;;;;;N;;;;;
+189D6;TANGUT COMPONENT-471;Lo;0;L;;;;;N;;;;;
+189D7;TANGUT COMPONENT-472;Lo;0;L;;;;;N;;;;;
+189D8;TANGUT COMPONENT-473;Lo;0;L;;;;;N;;;;;
+189D9;TANGUT COMPONENT-474;Lo;0;L;;;;;N;;;;;
+189DA;TANGUT COMPONENT-475;Lo;0;L;;;;;N;;;;;
+189DB;TANGUT COMPONENT-476;Lo;0;L;;;;;N;;;;;
+189DC;TANGUT COMPONENT-477;Lo;0;L;;;;;N;;;;;
+189DD;TANGUT COMPONENT-478;Lo;0;L;;;;;N;;;;;
+189DE;TANGUT COMPONENT-479;Lo;0;L;;;;;N;;;;;
+189DF;TANGUT COMPONENT-480;Lo;0;L;;;;;N;;;;;
+189E0;TANGUT COMPONENT-481;Lo;0;L;;;;;N;;;;;
+189E1;TANGUT COMPONENT-482;Lo;0;L;;;;;N;;;;;
+189E2;TANGUT COMPONENT-483;Lo;0;L;;;;;N;;;;;
+189E3;TANGUT COMPONENT-484;Lo;0;L;;;;;N;;;;;
+189E4;TANGUT COMPONENT-485;Lo;0;L;;;;;N;;;;;
+189E5;TANGUT COMPONENT-486;Lo;0;L;;;;;N;;;;;
+189E6;TANGUT COMPONENT-487;Lo;0;L;;;;;N;;;;;
+189E7;TANGUT COMPONENT-488;Lo;0;L;;;;;N;;;;;
+189E8;TANGUT COMPONENT-489;Lo;0;L;;;;;N;;;;;
+189E9;TANGUT COMPONENT-490;Lo;0;L;;;;;N;;;;;
+189EA;TANGUT COMPONENT-491;Lo;0;L;;;;;N;;;;;
+189EB;TANGUT COMPONENT-492;Lo;0;L;;;;;N;;;;;
+189EC;TANGUT COMPONENT-493;Lo;0;L;;;;;N;;;;;
+189ED;TANGUT COMPONENT-494;Lo;0;L;;;;;N;;;;;
+189EE;TANGUT COMPONENT-495;Lo;0;L;;;;;N;;;;;
+189EF;TANGUT COMPONENT-496;Lo;0;L;;;;;N;;;;;
+189F0;TANGUT COMPONENT-497;Lo;0;L;;;;;N;;;;;
+189F1;TANGUT COMPONENT-498;Lo;0;L;;;;;N;;;;;
+189F2;TANGUT COMPONENT-499;Lo;0;L;;;;;N;;;;;
+189F3;TANGUT COMPONENT-500;Lo;0;L;;;;;N;;;;;
+189F4;TANGUT COMPONENT-501;Lo;0;L;;;;;N;;;;;
+189F5;TANGUT COMPONENT-502;Lo;0;L;;;;;N;;;;;
+189F6;TANGUT COMPONENT-503;Lo;0;L;;;;;N;;;;;
+189F7;TANGUT COMPONENT-504;Lo;0;L;;;;;N;;;;;
+189F8;TANGUT COMPONENT-505;Lo;0;L;;;;;N;;;;;
+189F9;TANGUT COMPONENT-506;Lo;0;L;;;;;N;;;;;
+189FA;TANGUT COMPONENT-507;Lo;0;L;;;;;N;;;;;
+189FB;TANGUT COMPONENT-508;Lo;0;L;;;;;N;;;;;
+189FC;TANGUT COMPONENT-509;Lo;0;L;;;;;N;;;;;
+189FD;TANGUT COMPONENT-510;Lo;0;L;;;;;N;;;;;
+189FE;TANGUT COMPONENT-511;Lo;0;L;;;;;N;;;;;
+189FF;TANGUT COMPONENT-512;Lo;0;L;;;;;N;;;;;
+18A00;TANGUT COMPONENT-513;Lo;0;L;;;;;N;;;;;
+18A01;TANGUT COMPONENT-514;Lo;0;L;;;;;N;;;;;
+18A02;TANGUT COMPONENT-515;Lo;0;L;;;;;N;;;;;
+18A03;TANGUT COMPONENT-516;Lo;0;L;;;;;N;;;;;
+18A04;TANGUT COMPONENT-517;Lo;0;L;;;;;N;;;;;
+18A05;TANGUT COMPONENT-518;Lo;0;L;;;;;N;;;;;
+18A06;TANGUT COMPONENT-519;Lo;0;L;;;;;N;;;;;
+18A07;TANGUT COMPONENT-520;Lo;0;L;;;;;N;;;;;
+18A08;TANGUT COMPONENT-521;Lo;0;L;;;;;N;;;;;
+18A09;TANGUT COMPONENT-522;Lo;0;L;;;;;N;;;;;
+18A0A;TANGUT COMPONENT-523;Lo;0;L;;;;;N;;;;;
+18A0B;TANGUT COMPONENT-524;Lo;0;L;;;;;N;;;;;
+18A0C;TANGUT COMPONENT-525;Lo;0;L;;;;;N;;;;;
+18A0D;TANGUT COMPONENT-526;Lo;0;L;;;;;N;;;;;
+18A0E;TANGUT COMPONENT-527;Lo;0;L;;;;;N;;;;;
+18A0F;TANGUT COMPONENT-528;Lo;0;L;;;;;N;;;;;
+18A10;TANGUT COMPONENT-529;Lo;0;L;;;;;N;;;;;
+18A11;TANGUT COMPONENT-530;Lo;0;L;;;;;N;;;;;
+18A12;TANGUT COMPONENT-531;Lo;0;L;;;;;N;;;;;
+18A13;TANGUT COMPONENT-532;Lo;0;L;;;;;N;;;;;
+18A14;TANGUT COMPONENT-533;Lo;0;L;;;;;N;;;;;
+18A15;TANGUT COMPONENT-534;Lo;0;L;;;;;N;;;;;
+18A16;TANGUT COMPONENT-535;Lo;0;L;;;;;N;;;;;
+18A17;TANGUT COMPONENT-536;Lo;0;L;;;;;N;;;;;
+18A18;TANGUT COMPONENT-537;Lo;0;L;;;;;N;;;;;
+18A19;TANGUT COMPONENT-538;Lo;0;L;;;;;N;;;;;
+18A1A;TANGUT COMPONENT-539;Lo;0;L;;;;;N;;;;;
+18A1B;TANGUT COMPONENT-540;Lo;0;L;;;;;N;;;;;
+18A1C;TANGUT COMPONENT-541;Lo;0;L;;;;;N;;;;;
+18A1D;TANGUT COMPONENT-542;Lo;0;L;;;;;N;;;;;
+18A1E;TANGUT COMPONENT-543;Lo;0;L;;;;;N;;;;;
+18A1F;TANGUT COMPONENT-544;Lo;0;L;;;;;N;;;;;
+18A20;TANGUT COMPONENT-545;Lo;0;L;;;;;N;;;;;
+18A21;TANGUT COMPONENT-546;Lo;0;L;;;;;N;;;;;
+18A22;TANGUT COMPONENT-547;Lo;0;L;;;;;N;;;;;
+18A23;TANGUT COMPONENT-548;Lo;0;L;;;;;N;;;;;
+18A24;TANGUT COMPONENT-549;Lo;0;L;;;;;N;;;;;
+18A25;TANGUT COMPONENT-550;Lo;0;L;;;;;N;;;;;
+18A26;TANGUT COMPONENT-551;Lo;0;L;;;;;N;;;;;
+18A27;TANGUT COMPONENT-552;Lo;0;L;;;;;N;;;;;
+18A28;TANGUT COMPONENT-553;Lo;0;L;;;;;N;;;;;
+18A29;TANGUT COMPONENT-554;Lo;0;L;;;;;N;;;;;
+18A2A;TANGUT COMPONENT-555;Lo;0;L;;;;;N;;;;;
+18A2B;TANGUT COMPONENT-556;Lo;0;L;;;;;N;;;;;
+18A2C;TANGUT COMPONENT-557;Lo;0;L;;;;;N;;;;;
+18A2D;TANGUT COMPONENT-558;Lo;0;L;;;;;N;;;;;
+18A2E;TANGUT COMPONENT-559;Lo;0;L;;;;;N;;;;;
+18A2F;TANGUT COMPONENT-560;Lo;0;L;;;;;N;;;;;
+18A30;TANGUT COMPONENT-561;Lo;0;L;;;;;N;;;;;
+18A31;TANGUT COMPONENT-562;Lo;0;L;;;;;N;;;;;
+18A32;TANGUT COMPONENT-563;Lo;0;L;;;;;N;;;;;
+18A33;TANGUT COMPONENT-564;Lo;0;L;;;;;N;;;;;
+18A34;TANGUT COMPONENT-565;Lo;0;L;;;;;N;;;;;
+18A35;TANGUT COMPONENT-566;Lo;0;L;;;;;N;;;;;
+18A36;TANGUT COMPONENT-567;Lo;0;L;;;;;N;;;;;
+18A37;TANGUT COMPONENT-568;Lo;0;L;;;;;N;;;;;
+18A38;TANGUT COMPONENT-569;Lo;0;L;;;;;N;;;;;
+18A39;TANGUT COMPONENT-570;Lo;0;L;;;;;N;;;;;
+18A3A;TANGUT COMPONENT-571;Lo;0;L;;;;;N;;;;;
+18A3B;TANGUT COMPONENT-572;Lo;0;L;;;;;N;;;;;
+18A3C;TANGUT COMPONENT-573;Lo;0;L;;;;;N;;;;;
+18A3D;TANGUT COMPONENT-574;Lo;0;L;;;;;N;;;;;
+18A3E;TANGUT COMPONENT-575;Lo;0;L;;;;;N;;;;;
+18A3F;TANGUT COMPONENT-576;Lo;0;L;;;;;N;;;;;
+18A40;TANGUT COMPONENT-577;Lo;0;L;;;;;N;;;;;
+18A41;TANGUT COMPONENT-578;Lo;0;L;;;;;N;;;;;
+18A42;TANGUT COMPONENT-579;Lo;0;L;;;;;N;;;;;
+18A43;TANGUT COMPONENT-580;Lo;0;L;;;;;N;;;;;
+18A44;TANGUT COMPONENT-581;Lo;0;L;;;;;N;;;;;
+18A45;TANGUT COMPONENT-582;Lo;0;L;;;;;N;;;;;
+18A46;TANGUT COMPONENT-583;Lo;0;L;;;;;N;;;;;
+18A47;TANGUT COMPONENT-584;Lo;0;L;;;;;N;;;;;
+18A48;TANGUT COMPONENT-585;Lo;0;L;;;;;N;;;;;
+18A49;TANGUT COMPONENT-586;Lo;0;L;;;;;N;;;;;
+18A4A;TANGUT COMPONENT-587;Lo;0;L;;;;;N;;;;;
+18A4B;TANGUT COMPONENT-588;Lo;0;L;;;;;N;;;;;
+18A4C;TANGUT COMPONENT-589;Lo;0;L;;;;;N;;;;;
+18A4D;TANGUT COMPONENT-590;Lo;0;L;;;;;N;;;;;
+18A4E;TANGUT COMPONENT-591;Lo;0;L;;;;;N;;;;;
+18A4F;TANGUT COMPONENT-592;Lo;0;L;;;;;N;;;;;
+18A50;TANGUT COMPONENT-593;Lo;0;L;;;;;N;;;;;
+18A51;TANGUT COMPONENT-594;Lo;0;L;;;;;N;;;;;
+18A52;TANGUT COMPONENT-595;Lo;0;L;;;;;N;;;;;
+18A53;TANGUT COMPONENT-596;Lo;0;L;;;;;N;;;;;
+18A54;TANGUT COMPONENT-597;Lo;0;L;;;;;N;;;;;
+18A55;TANGUT COMPONENT-598;Lo;0;L;;;;;N;;;;;
+18A56;TANGUT COMPONENT-599;Lo;0;L;;;;;N;;;;;
+18A57;TANGUT COMPONENT-600;Lo;0;L;;;;;N;;;;;
+18A58;TANGUT COMPONENT-601;Lo;0;L;;;;;N;;;;;
+18A59;TANGUT COMPONENT-602;Lo;0;L;;;;;N;;;;;
+18A5A;TANGUT COMPONENT-603;Lo;0;L;;;;;N;;;;;
+18A5B;TANGUT COMPONENT-604;Lo;0;L;;;;;N;;;;;
+18A5C;TANGUT COMPONENT-605;Lo;0;L;;;;;N;;;;;
+18A5D;TANGUT COMPONENT-606;Lo;0;L;;;;;N;;;;;
+18A5E;TANGUT COMPONENT-607;Lo;0;L;;;;;N;;;;;
+18A5F;TANGUT COMPONENT-608;Lo;0;L;;;;;N;;;;;
+18A60;TANGUT COMPONENT-609;Lo;0;L;;;;;N;;;;;
+18A61;TANGUT COMPONENT-610;Lo;0;L;;;;;N;;;;;
+18A62;TANGUT COMPONENT-611;Lo;0;L;;;;;N;;;;;
+18A63;TANGUT COMPONENT-612;Lo;0;L;;;;;N;;;;;
+18A64;TANGUT COMPONENT-613;Lo;0;L;;;;;N;;;;;
+18A65;TANGUT COMPONENT-614;Lo;0;L;;;;;N;;;;;
+18A66;TANGUT COMPONENT-615;Lo;0;L;;;;;N;;;;;
+18A67;TANGUT COMPONENT-616;Lo;0;L;;;;;N;;;;;
+18A68;TANGUT COMPONENT-617;Lo;0;L;;;;;N;;;;;
+18A69;TANGUT COMPONENT-618;Lo;0;L;;;;;N;;;;;
+18A6A;TANGUT COMPONENT-619;Lo;0;L;;;;;N;;;;;
+18A6B;TANGUT COMPONENT-620;Lo;0;L;;;;;N;;;;;
+18A6C;TANGUT COMPONENT-621;Lo;0;L;;;;;N;;;;;
+18A6D;TANGUT COMPONENT-622;Lo;0;L;;;;;N;;;;;
+18A6E;TANGUT COMPONENT-623;Lo;0;L;;;;;N;;;;;
+18A6F;TANGUT COMPONENT-624;Lo;0;L;;;;;N;;;;;
+18A70;TANGUT COMPONENT-625;Lo;0;L;;;;;N;;;;;
+18A71;TANGUT COMPONENT-626;Lo;0;L;;;;;N;;;;;
+18A72;TANGUT COMPONENT-627;Lo;0;L;;;;;N;;;;;
+18A73;TANGUT COMPONENT-628;Lo;0;L;;;;;N;;;;;
+18A74;TANGUT COMPONENT-629;Lo;0;L;;;;;N;;;;;
+18A75;TANGUT COMPONENT-630;Lo;0;L;;;;;N;;;;;
+18A76;TANGUT COMPONENT-631;Lo;0;L;;;;;N;;;;;
+18A77;TANGUT COMPONENT-632;Lo;0;L;;;;;N;;;;;
+18A78;TANGUT COMPONENT-633;Lo;0;L;;;;;N;;;;;
+18A79;TANGUT COMPONENT-634;Lo;0;L;;;;;N;;;;;
+18A7A;TANGUT COMPONENT-635;Lo;0;L;;;;;N;;;;;
+18A7B;TANGUT COMPONENT-636;Lo;0;L;;;;;N;;;;;
+18A7C;TANGUT COMPONENT-637;Lo;0;L;;;;;N;;;;;
+18A7D;TANGUT COMPONENT-638;Lo;0;L;;;;;N;;;;;
+18A7E;TANGUT COMPONENT-639;Lo;0;L;;;;;N;;;;;
+18A7F;TANGUT COMPONENT-640;Lo;0;L;;;;;N;;;;;
+18A80;TANGUT COMPONENT-641;Lo;0;L;;;;;N;;;;;
+18A81;TANGUT COMPONENT-642;Lo;0;L;;;;;N;;;;;
+18A82;TANGUT COMPONENT-643;Lo;0;L;;;;;N;;;;;
+18A83;TANGUT COMPONENT-644;Lo;0;L;;;;;N;;;;;
+18A84;TANGUT COMPONENT-645;Lo;0;L;;;;;N;;;;;
+18A85;TANGUT COMPONENT-646;Lo;0;L;;;;;N;;;;;
+18A86;TANGUT COMPONENT-647;Lo;0;L;;;;;N;;;;;
+18A87;TANGUT COMPONENT-648;Lo;0;L;;;;;N;;;;;
+18A88;TANGUT COMPONENT-649;Lo;0;L;;;;;N;;;;;
+18A89;TANGUT COMPONENT-650;Lo;0;L;;;;;N;;;;;
+18A8A;TANGUT COMPONENT-651;Lo;0;L;;;;;N;;;;;
+18A8B;TANGUT COMPONENT-652;Lo;0;L;;;;;N;;;;;
+18A8C;TANGUT COMPONENT-653;Lo;0;L;;;;;N;;;;;
+18A8D;TANGUT COMPONENT-654;Lo;0;L;;;;;N;;;;;
+18A8E;TANGUT COMPONENT-655;Lo;0;L;;;;;N;;;;;
+18A8F;TANGUT COMPONENT-656;Lo;0;L;;;;;N;;;;;
+18A90;TANGUT COMPONENT-657;Lo;0;L;;;;;N;;;;;
+18A91;TANGUT COMPONENT-658;Lo;0;L;;;;;N;;;;;
+18A92;TANGUT COMPONENT-659;Lo;0;L;;;;;N;;;;;
+18A93;TANGUT COMPONENT-660;Lo;0;L;;;;;N;;;;;
+18A94;TANGUT COMPONENT-661;Lo;0;L;;;;;N;;;;;
+18A95;TANGUT COMPONENT-662;Lo;0;L;;;;;N;;;;;
+18A96;TANGUT COMPONENT-663;Lo;0;L;;;;;N;;;;;
+18A97;TANGUT COMPONENT-664;Lo;0;L;;;;;N;;;;;
+18A98;TANGUT COMPONENT-665;Lo;0;L;;;;;N;;;;;
+18A99;TANGUT COMPONENT-666;Lo;0;L;;;;;N;;;;;
+18A9A;TANGUT COMPONENT-667;Lo;0;L;;;;;N;;;;;
+18A9B;TANGUT COMPONENT-668;Lo;0;L;;;;;N;;;;;
+18A9C;TANGUT COMPONENT-669;Lo;0;L;;;;;N;;;;;
+18A9D;TANGUT COMPONENT-670;Lo;0;L;;;;;N;;;;;
+18A9E;TANGUT COMPONENT-671;Lo;0;L;;;;;N;;;;;
+18A9F;TANGUT COMPONENT-672;Lo;0;L;;;;;N;;;;;
+18AA0;TANGUT COMPONENT-673;Lo;0;L;;;;;N;;;;;
+18AA1;TANGUT COMPONENT-674;Lo;0;L;;;;;N;;;;;
+18AA2;TANGUT COMPONENT-675;Lo;0;L;;;;;N;;;;;
+18AA3;TANGUT COMPONENT-676;Lo;0;L;;;;;N;;;;;
+18AA4;TANGUT COMPONENT-677;Lo;0;L;;;;;N;;;;;
+18AA5;TANGUT COMPONENT-678;Lo;0;L;;;;;N;;;;;
+18AA6;TANGUT COMPONENT-679;Lo;0;L;;;;;N;;;;;
+18AA7;TANGUT COMPONENT-680;Lo;0;L;;;;;N;;;;;
+18AA8;TANGUT COMPONENT-681;Lo;0;L;;;;;N;;;;;
+18AA9;TANGUT COMPONENT-682;Lo;0;L;;;;;N;;;;;
+18AAA;TANGUT COMPONENT-683;Lo;0;L;;;;;N;;;;;
+18AAB;TANGUT COMPONENT-684;Lo;0;L;;;;;N;;;;;
+18AAC;TANGUT COMPONENT-685;Lo;0;L;;;;;N;;;;;
+18AAD;TANGUT COMPONENT-686;Lo;0;L;;;;;N;;;;;
+18AAE;TANGUT COMPONENT-687;Lo;0;L;;;;;N;;;;;
+18AAF;TANGUT COMPONENT-688;Lo;0;L;;;;;N;;;;;
+18AB0;TANGUT COMPONENT-689;Lo;0;L;;;;;N;;;;;
+18AB1;TANGUT COMPONENT-690;Lo;0;L;;;;;N;;;;;
+18AB2;TANGUT COMPONENT-691;Lo;0;L;;;;;N;;;;;
+18AB3;TANGUT COMPONENT-692;Lo;0;L;;;;;N;;;;;
+18AB4;TANGUT COMPONENT-693;Lo;0;L;;;;;N;;;;;
+18AB5;TANGUT COMPONENT-694;Lo;0;L;;;;;N;;;;;
+18AB6;TANGUT COMPONENT-695;Lo;0;L;;;;;N;;;;;
+18AB7;TANGUT COMPONENT-696;Lo;0;L;;;;;N;;;;;
+18AB8;TANGUT COMPONENT-697;Lo;0;L;;;;;N;;;;;
+18AB9;TANGUT COMPONENT-698;Lo;0;L;;;;;N;;;;;
+18ABA;TANGUT COMPONENT-699;Lo;0;L;;;;;N;;;;;
+18ABB;TANGUT COMPONENT-700;Lo;0;L;;;;;N;;;;;
+18ABC;TANGUT COMPONENT-701;Lo;0;L;;;;;N;;;;;
+18ABD;TANGUT COMPONENT-702;Lo;0;L;;;;;N;;;;;
+18ABE;TANGUT COMPONENT-703;Lo;0;L;;;;;N;;;;;
+18ABF;TANGUT COMPONENT-704;Lo;0;L;;;;;N;;;;;
+18AC0;TANGUT COMPONENT-705;Lo;0;L;;;;;N;;;;;
+18AC1;TANGUT COMPONENT-706;Lo;0;L;;;;;N;;;;;
+18AC2;TANGUT COMPONENT-707;Lo;0;L;;;;;N;;;;;
+18AC3;TANGUT COMPONENT-708;Lo;0;L;;;;;N;;;;;
+18AC4;TANGUT COMPONENT-709;Lo;0;L;;;;;N;;;;;
+18AC5;TANGUT COMPONENT-710;Lo;0;L;;;;;N;;;;;
+18AC6;TANGUT COMPONENT-711;Lo;0;L;;;;;N;;;;;
+18AC7;TANGUT COMPONENT-712;Lo;0;L;;;;;N;;;;;
+18AC8;TANGUT COMPONENT-713;Lo;0;L;;;;;N;;;;;
+18AC9;TANGUT COMPONENT-714;Lo;0;L;;;;;N;;;;;
+18ACA;TANGUT COMPONENT-715;Lo;0;L;;;;;N;;;;;
+18ACB;TANGUT COMPONENT-716;Lo;0;L;;;;;N;;;;;
+18ACC;TANGUT COMPONENT-717;Lo;0;L;;;;;N;;;;;
+18ACD;TANGUT COMPONENT-718;Lo;0;L;;;;;N;;;;;
+18ACE;TANGUT COMPONENT-719;Lo;0;L;;;;;N;;;;;
+18ACF;TANGUT COMPONENT-720;Lo;0;L;;;;;N;;;;;
+18AD0;TANGUT COMPONENT-721;Lo;0;L;;;;;N;;;;;
+18AD1;TANGUT COMPONENT-722;Lo;0;L;;;;;N;;;;;
+18AD2;TANGUT COMPONENT-723;Lo;0;L;;;;;N;;;;;
+18AD3;TANGUT COMPONENT-724;Lo;0;L;;;;;N;;;;;
+18AD4;TANGUT COMPONENT-725;Lo;0;L;;;;;N;;;;;
+18AD5;TANGUT COMPONENT-726;Lo;0;L;;;;;N;;;;;
+18AD6;TANGUT COMPONENT-727;Lo;0;L;;;;;N;;;;;
+18AD7;TANGUT COMPONENT-728;Lo;0;L;;;;;N;;;;;
+18AD8;TANGUT COMPONENT-729;Lo;0;L;;;;;N;;;;;
+18AD9;TANGUT COMPONENT-730;Lo;0;L;;;;;N;;;;;
+18ADA;TANGUT COMPONENT-731;Lo;0;L;;;;;N;;;;;
+18ADB;TANGUT COMPONENT-732;Lo;0;L;;;;;N;;;;;
+18ADC;TANGUT COMPONENT-733;Lo;0;L;;;;;N;;;;;
+18ADD;TANGUT COMPONENT-734;Lo;0;L;;;;;N;;;;;
+18ADE;TANGUT COMPONENT-735;Lo;0;L;;;;;N;;;;;
+18ADF;TANGUT COMPONENT-736;Lo;0;L;;;;;N;;;;;
+18AE0;TANGUT COMPONENT-737;Lo;0;L;;;;;N;;;;;
+18AE1;TANGUT COMPONENT-738;Lo;0;L;;;;;N;;;;;
+18AE2;TANGUT COMPONENT-739;Lo;0;L;;;;;N;;;;;
+18AE3;TANGUT COMPONENT-740;Lo;0;L;;;;;N;;;;;
+18AE4;TANGUT COMPONENT-741;Lo;0;L;;;;;N;;;;;
+18AE5;TANGUT COMPONENT-742;Lo;0;L;;;;;N;;;;;
+18AE6;TANGUT COMPONENT-743;Lo;0;L;;;;;N;;;;;
+18AE7;TANGUT COMPONENT-744;Lo;0;L;;;;;N;;;;;
+18AE8;TANGUT COMPONENT-745;Lo;0;L;;;;;N;;;;;
+18AE9;TANGUT COMPONENT-746;Lo;0;L;;;;;N;;;;;
+18AEA;TANGUT COMPONENT-747;Lo;0;L;;;;;N;;;;;
+18AEB;TANGUT COMPONENT-748;Lo;0;L;;;;;N;;;;;
+18AEC;TANGUT COMPONENT-749;Lo;0;L;;;;;N;;;;;
+18AED;TANGUT COMPONENT-750;Lo;0;L;;;;;N;;;;;
+18AEE;TANGUT COMPONENT-751;Lo;0;L;;;;;N;;;;;
+18AEF;TANGUT COMPONENT-752;Lo;0;L;;;;;N;;;;;
+18AF0;TANGUT COMPONENT-753;Lo;0;L;;;;;N;;;;;
+18AF1;TANGUT COMPONENT-754;Lo;0;L;;;;;N;;;;;
+18AF2;TANGUT COMPONENT-755;Lo;0;L;;;;;N;;;;;
 1B000;KATAKANA LETTER ARCHAIC E;Lo;0;L;;;;;N;;;;;
 1B001;HIRAGANA LETTER ARCHAIC YE;Lo;0;L;;;;;N;;;;;
 1BC00;DUPLOYAN LETTER H;Lo;0;L;;;;;N;;;;;
@@ -26154,6 +27313,44 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1DAAD;SIGNWRITING ROTATION MODIFIER-14;Mn;0;NSM;;;;;N;;;;;
 1DAAE;SIGNWRITING ROTATION MODIFIER-15;Mn;0;NSM;;;;;N;;;;;
 1DAAF;SIGNWRITING ROTATION MODIFIER-16;Mn;0;NSM;;;;;N;;;;;
+1E000;COMBINING GLAGOLITIC LETTER AZU;Mn;230;NSM;;;;;N;;;;;
+1E001;COMBINING GLAGOLITIC LETTER BUKY;Mn;230;NSM;;;;;N;;;;;
+1E002;COMBINING GLAGOLITIC LETTER VEDE;Mn;230;NSM;;;;;N;;;;;
+1E003;COMBINING GLAGOLITIC LETTER GLAGOLI;Mn;230;NSM;;;;;N;;;;;
+1E004;COMBINING GLAGOLITIC LETTER DOBRO;Mn;230;NSM;;;;;N;;;;;
+1E005;COMBINING GLAGOLITIC LETTER YESTU;Mn;230;NSM;;;;;N;;;;;
+1E006;COMBINING GLAGOLITIC LETTER ZHIVETE;Mn;230;NSM;;;;;N;;;;;
+1E008;COMBINING GLAGOLITIC LETTER ZEMLJA;Mn;230;NSM;;;;;N;;;;;
+1E009;COMBINING GLAGOLITIC LETTER IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00A;COMBINING GLAGOLITIC LETTER INITIAL IZHE;Mn;230;NSM;;;;;N;;;;;
+1E00B;COMBINING GLAGOLITIC LETTER I;Mn;230;NSM;;;;;N;;;;;
+1E00C;COMBINING GLAGOLITIC LETTER DJERVI;Mn;230;NSM;;;;;N;;;;;
+1E00D;COMBINING GLAGOLITIC LETTER KAKO;Mn;230;NSM;;;;;N;;;;;
+1E00E;COMBINING GLAGOLITIC LETTER LJUDIJE;Mn;230;NSM;;;;;N;;;;;
+1E00F;COMBINING GLAGOLITIC LETTER MYSLITE;Mn;230;NSM;;;;;N;;;;;
+1E010;COMBINING GLAGOLITIC LETTER NASHI;Mn;230;NSM;;;;;N;;;;;
+1E011;COMBINING GLAGOLITIC LETTER ONU;Mn;230;NSM;;;;;N;;;;;
+1E012;COMBINING GLAGOLITIC LETTER POKOJI;Mn;230;NSM;;;;;N;;;;;
+1E013;COMBINING GLAGOLITIC LETTER RITSI;Mn;230;NSM;;;;;N;;;;;
+1E014;COMBINING GLAGOLITIC LETTER SLOVO;Mn;230;NSM;;;;;N;;;;;
+1E015;COMBINING GLAGOLITIC LETTER TVRIDO;Mn;230;NSM;;;;;N;;;;;
+1E016;COMBINING GLAGOLITIC LETTER UKU;Mn;230;NSM;;;;;N;;;;;
+1E017;COMBINING GLAGOLITIC LETTER FRITU;Mn;230;NSM;;;;;N;;;;;
+1E018;COMBINING GLAGOLITIC LETTER HERU;Mn;230;NSM;;;;;N;;;;;
+1E01B;COMBINING GLAGOLITIC LETTER SHTA;Mn;230;NSM;;;;;N;;;;;
+1E01C;COMBINING GLAGOLITIC LETTER TSI;Mn;230;NSM;;;;;N;;;;;
+1E01D;COMBINING GLAGOLITIC LETTER CHRIVI;Mn;230;NSM;;;;;N;;;;;
+1E01E;COMBINING GLAGOLITIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+1E01F;COMBINING GLAGOLITIC LETTER YERU;Mn;230;NSM;;;;;N;;;;;
+1E020;COMBINING GLAGOLITIC LETTER YERI;Mn;230;NSM;;;;;N;;;;;
+1E021;COMBINING GLAGOLITIC LETTER YATI;Mn;230;NSM;;;;;N;;;;;
+1E023;COMBINING GLAGOLITIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+1E024;COMBINING GLAGOLITIC LETTER SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E026;COMBINING GLAGOLITIC LETTER YO;Mn;230;NSM;;;;;N;;;;;
+1E027;COMBINING GLAGOLITIC LETTER IOTATED SMALL YUS;Mn;230;NSM;;;;;N;;;;;
+1E028;COMBINING GLAGOLITIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E029;COMBINING GLAGOLITIC LETTER IOTATED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+1E02A;COMBINING GLAGOLITIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
 1E800;MENDE KIKAKUI SYLLABLE M001 KI;Lo;0;R;;;;;N;;;;;
 1E801;MENDE KIKAKUI SYLLABLE M002 KA;Lo;0;R;;;;;N;;;;;
 1E802;MENDE KIKAKUI SYLLABLE M003 KU;Lo;0;R;;;;;N;;;;;
@@ -26367,6 +27564,93 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1E8D4;MENDE KIKAKUI COMBINING NUMBER TEN THOUSANDS;Mn;220;NSM;;;;;N;;;;;
 1E8D5;MENDE KIKAKUI COMBINING NUMBER HUNDRED THOUSANDS;Mn;220;NSM;;;;;N;;;;;
 1E8D6;MENDE KIKAKUI COMBINING NUMBER MILLIONS;Mn;220;NSM;;;;;N;;;;;
+1E900;ADLAM CAPITAL LETTER ALIF;Lu;0;R;;;;;N;;;;1E922;
+1E901;ADLAM CAPITAL LETTER DAALI;Lu;0;R;;;;;N;;;;1E923;
+1E902;ADLAM CAPITAL LETTER LAAM;Lu;0;R;;;;;N;;;;1E924;
+1E903;ADLAM CAPITAL LETTER MIIM;Lu;0;R;;;;;N;;;;1E925;
+1E904;ADLAM CAPITAL LETTER BA;Lu;0;R;;;;;N;;;;1E926;
+1E905;ADLAM CAPITAL LETTER SINNYIIYHE;Lu;0;R;;;;;N;;;;1E927;
+1E906;ADLAM CAPITAL LETTER PE;Lu;0;R;;;;;N;;;;1E928;
+1E907;ADLAM CAPITAL LETTER BHE;Lu;0;R;;;;;N;;;;1E929;
+1E908;ADLAM CAPITAL LETTER RA;Lu;0;R;;;;;N;;;;1E92A;
+1E909;ADLAM CAPITAL LETTER E;Lu;0;R;;;;;N;;;;1E92B;
+1E90A;ADLAM CAPITAL LETTER FA;Lu;0;R;;;;;N;;;;1E92C;
+1E90B;ADLAM CAPITAL LETTER I;Lu;0;R;;;;;N;;;;1E92D;
+1E90C;ADLAM CAPITAL LETTER O;Lu;0;R;;;;;N;;;;1E92E;
+1E90D;ADLAM CAPITAL LETTER DHA;Lu;0;R;;;;;N;;;;1E92F;
+1E90E;ADLAM CAPITAL LETTER YHE;Lu;0;R;;;;;N;;;;1E930;
+1E90F;ADLAM CAPITAL LETTER WAW;Lu;0;R;;;;;N;;;;1E931;
+1E910;ADLAM CAPITAL LETTER NUN;Lu;0;R;;;;;N;;;;1E932;
+1E911;ADLAM CAPITAL LETTER KAF;Lu;0;R;;;;;N;;;;1E933;
+1E912;ADLAM CAPITAL LETTER YA;Lu;0;R;;;;;N;;;;1E934;
+1E913;ADLAM CAPITAL LETTER U;Lu;0;R;;;;;N;;;;1E935;
+1E914;ADLAM CAPITAL LETTER JIIM;Lu;0;R;;;;;N;;;;1E936;
+1E915;ADLAM CAPITAL LETTER CHI;Lu;0;R;;;;;N;;;;1E937;
+1E916;ADLAM CAPITAL LETTER HA;Lu;0;R;;;;;N;;;;1E938;
+1E917;ADLAM CAPITAL LETTER QAAF;Lu;0;R;;;;;N;;;;1E939;
+1E918;ADLAM CAPITAL LETTER GA;Lu;0;R;;;;;N;;;;1E93A;
+1E919;ADLAM CAPITAL LETTER NYA;Lu;0;R;;;;;N;;;;1E93B;
+1E91A;ADLAM CAPITAL LETTER TU;Lu;0;R;;;;;N;;;;1E93C;
+1E91B;ADLAM CAPITAL LETTER NHA;Lu;0;R;;;;;N;;;;1E93D;
+1E91C;ADLAM CAPITAL LETTER VA;Lu;0;R;;;;;N;;;;1E93E;
+1E91D;ADLAM CAPITAL LETTER KHA;Lu;0;R;;;;;N;;;;1E93F;
+1E91E;ADLAM CAPITAL LETTER GBE;Lu;0;R;;;;;N;;;;1E940;
+1E91F;ADLAM CAPITAL LETTER ZAL;Lu;0;R;;;;;N;;;;1E941;
+1E920;ADLAM CAPITAL LETTER KPO;Lu;0;R;;;;;N;;;;1E942;
+1E921;ADLAM CAPITAL LETTER SHA;Lu;0;R;;;;;N;;;;1E943;
+1E922;ADLAM SMALL LETTER ALIF;Ll;0;R;;;;;N;;;1E900;;1E900
+1E923;ADLAM SMALL LETTER DAALI;Ll;0;R;;;;;N;;;1E901;;1E901
+1E924;ADLAM SMALL LETTER LAAM;Ll;0;R;;;;;N;;;1E902;;1E902
+1E925;ADLAM SMALL LETTER MIIM;Ll;0;R;;;;;N;;;1E903;;1E903
+1E926;ADLAM SMALL LETTER BA;Ll;0;R;;;;;N;;;1E904;;1E904
+1E927;ADLAM SMALL LETTER SINNYIIYHE;Ll;0;R;;;;;N;;;1E905;;1E905
+1E928;ADLAM SMALL LETTER PE;Ll;0;R;;;;;N;;;1E906;;1E906
+1E929;ADLAM SMALL LETTER BHE;Ll;0;R;;;;;N;;;1E907;;1E907
+1E92A;ADLAM SMALL LETTER RA;Ll;0;R;;;;;N;;;1E908;;1E908
+1E92B;ADLAM SMALL LETTER E;Ll;0;R;;;;;N;;;1E909;;1E909
+1E92C;ADLAM SMALL LETTER FA;Ll;0;R;;;;;N;;;1E90A;;1E90A
+1E92D;ADLAM SMALL LETTER I;Ll;0;R;;;;;N;;;1E90B;;1E90B
+1E92E;ADLAM SMALL LETTER O;Ll;0;R;;;;;N;;;1E90C;;1E90C
+1E92F;ADLAM SMALL LETTER DHA;Ll;0;R;;;;;N;;;1E90D;;1E90D
+1E930;ADLAM SMALL LETTER YHE;Ll;0;R;;;;;N;;;1E90E;;1E90E
+1E931;ADLAM SMALL LETTER WAW;Ll;0;R;;;;;N;;;1E90F;;1E90F
+1E932;ADLAM SMALL LETTER NUN;Ll;0;R;;;;;N;;;1E910;;1E910
+1E933;ADLAM SMALL LETTER KAF;Ll;0;R;;;;;N;;;1E911;;1E911
+1E934;ADLAM SMALL LETTER YA;Ll;0;R;;;;;N;;;1E912;;1E912
+1E935;ADLAM SMALL LETTER U;Ll;0;R;;;;;N;;;1E913;;1E913
+1E936;ADLAM SMALL LETTER JIIM;Ll;0;R;;;;;N;;;1E914;;1E914
+1E937;ADLAM SMALL LETTER CHI;Ll;0;R;;;;;N;;;1E915;;1E915
+1E938;ADLAM SMALL LETTER HA;Ll;0;R;;;;;N;;;1E916;;1E916
+1E939;ADLAM SMALL LETTER QAAF;Ll;0;R;;;;;N;;;1E917;;1E917
+1E93A;ADLAM SMALL LETTER GA;Ll;0;R;;;;;N;;;1E918;;1E918
+1E93B;ADLAM SMALL LETTER NYA;Ll;0;R;;;;;N;;;1E919;;1E919
+1E93C;ADLAM SMALL LETTER TU;Ll;0;R;;;;;N;;;1E91A;;1E91A
+1E93D;ADLAM SMALL LETTER NHA;Ll;0;R;;;;;N;;;1E91B;;1E91B
+1E93E;ADLAM SMALL LETTER VA;Ll;0;R;;;;;N;;;1E91C;;1E91C
+1E93F;ADLAM SMALL LETTER KHA;Ll;0;R;;;;;N;;;1E91D;;1E91D
+1E940;ADLAM SMALL LETTER GBE;Ll;0;R;;;;;N;;;1E91E;;1E91E
+1E941;ADLAM SMALL LETTER ZAL;Ll;0;R;;;;;N;;;1E91F;;1E91F
+1E942;ADLAM SMALL LETTER KPO;Ll;0;R;;;;;N;;;1E920;;1E920
+1E943;ADLAM SMALL LETTER SHA;Ll;0;R;;;;;N;;;1E921;;1E921
+1E944;ADLAM ALIF LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E945;ADLAM VOWEL LENGTHENER;Mn;230;NSM;;;;;N;;;;;
+1E946;ADLAM GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1E947;ADLAM HAMZA;Mn;230;NSM;;;;;N;;;;;
+1E948;ADLAM CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E949;ADLAM GEMINATE CONSONANT MODIFIER;Mn;230;NSM;;;;;N;;;;;
+1E94A;ADLAM NUKTA;Mn;7;NSM;;;;;N;;;;;
+1E950;ADLAM DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+1E951;ADLAM DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+1E952;ADLAM DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+1E953;ADLAM DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+1E954;ADLAM DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+1E955;ADLAM DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+1E956;ADLAM DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+1E957;ADLAM DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+1E958;ADLAM DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+1E959;ADLAM DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+1E95E;ADLAM INITIAL EXCLAMATION MARK;Po;0;R;;;;;N;;;;;
+1E95F;ADLAM INITIAL QUESTION MARK;Po;0;R;;;;;N;;;;;
 1EE00;ARABIC MATHEMATICAL ALEF;Lo;0;AL;<font> 0627;;;;N;;;;;
 1EE01;ARABIC MATHEMATICAL BEH;Lo;0;AL;<font> 0628;;;;N;;;;;
 1EE02;ARABIC MATHEMATICAL JEEM;Lo;0;AL;<font> 062C;;;;N;;;;;
@@ -26883,6 +28167,24 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F198;SQUARED SOS;So;0;L;;;;;N;;;;;
 1F199;SQUARED UP WITH EXCLAMATION MARK;So;0;L;;;;;N;;;;;
 1F19A;SQUARED VS;So;0;L;;;;;N;;;;;
+1F19B;SQUARED THREE D;So;0;L;;;;;N;;;;;
+1F19C;SQUARED SECOND SCREEN;So;0;L;;;;;N;;;;;
+1F19D;SQUARED TWO K;So;0;L;;;;;N;;;;;
+1F19E;SQUARED FOUR K;So;0;L;;;;;N;;;;;
+1F19F;SQUARED EIGHT K;So;0;L;;;;;N;;;;;
+1F1A0;SQUARED FIVE POINT ONE;So;0;L;;;;;N;;;;;
+1F1A1;SQUARED SEVEN POINT ONE;So;0;L;;;;;N;;;;;
+1F1A2;SQUARED TWENTY-TWO POINT TWO;So;0;L;;;;;N;;;;;
+1F1A3;SQUARED SIXTY P;So;0;L;;;;;N;;;;;
+1F1A4;SQUARED ONE HUNDRED TWENTY P;So;0;L;;;;;N;;;;;
+1F1A5;SQUARED LATIN SMALL LETTER D;So;0;L;;;;;N;;;;;
+1F1A6;SQUARED HC;So;0;L;;;;;N;;;;;
+1F1A7;SQUARED HDR;So;0;L;;;;;N;;;;;
+1F1A8;SQUARED HI-RES;So;0;L;;;;;N;;;;;
+1F1A9;SQUARED LOSSLESS;So;0;L;;;;;N;;;;;
+1F1AA;SQUARED SHV;So;0;L;;;;;N;;;;;
+1F1AB;SQUARED UHD;So;0;L;;;;;N;;;;;
+1F1AC;SQUARED VOD;So;0;L;;;;;N;;;;;
 1F1E6;REGIONAL INDICATOR SYMBOL LETTER A;So;0;L;;;;;N;;;;;
 1F1E7;REGIONAL INDICATOR SYMBOL LETTER B;So;0;L;;;;;N;;;;;
 1F1E8;REGIONAL INDICATOR SYMBOL LETTER C;So;0;L;;;;;N;;;;;
@@ -26955,6 +28257,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F238;SQUARED CJK UNIFIED IDEOGRAPH-7533;So;0;L;<square> 7533;;;;N;;;;;
 1F239;SQUARED CJK UNIFIED IDEOGRAPH-5272;So;0;L;<square> 5272;;;;N;;;;;
 1F23A;SQUARED CJK UNIFIED IDEOGRAPH-55B6;So;0;L;<square> 55B6;;;;N;;;;;
+1F23B;SQUARED CJK UNIFIED IDEOGRAPH-914D;So;0;L;<square> 914D;;;;N;;;;;
 1F240;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C;So;0;L;<compat> 3014 672C 3015;;;;N;;;;;
 1F241;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<compat> 3014 4E09 3015;;;;N;;;;;
 1F242;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<compat> 3014 4E8C 3015;;;;N;;;;;
@@ -27600,6 +28903,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F577;SPIDER;So;0;ON;;;;;N;;;;;
 1F578;SPIDER WEB;So;0;ON;;;;;N;;;;;
 1F579;JOYSTICK;So;0;ON;;;;;N;;;;;
+1F57A;MAN DANCING;So;0;ON;;;;;N;;;;;
 1F57B;LEFT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
 1F57C;TELEPHONE RECEIVER WITH PAGE;So;0;ON;;;;;N;;;;;
 1F57D;RIGHT HAND TELEPHONE RECEIVER;So;0;ON;;;;;N;;;;;
@@ -27641,6 +28945,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F5A1;SIDEWAYS BLACK DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
 1F5A2;BLACK UP POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
 1F5A3;BLACK DOWN POINTING BACKHAND INDEX;So;0;ON;;;;;N;;;;;
+1F5A4;BLACK HEART;So;0;ON;;;;;N;;;;;
 1F5A5;DESKTOP COMPUTER;So;0;ON;;;;;N;;;;;
 1F5A6;KEYBOARD AND MOUSE;So;0;ON;;;;;N;;;;;
 1F5A7;THREE NETWORKED COMPUTERS;So;0;ON;;;;;N;;;;;
@@ -27941,6 +29246,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6CE;BELLHOP BELL;So;0;ON;;;;;N;;;;;
 1F6CF;BED;So;0;ON;;;;;N;;;;;
 1F6D0;PLACE OF WORSHIP;So;0;ON;;;;;N;;;;;
+1F6D1;OCTAGONAL SIGN;So;0;ON;;;;;N;;;;;
+1F6D2;SHOPPING TROLLEY;So;0;ON;;;;;N;;;;;
 1F6E0;HAMMER AND WRENCH;So;0;ON;;;;;N;;;;;
 1F6E1;SHIELD;So;0;ON;;;;;N;;;;;
 1F6E2;OIL DRUM;So;0;ON;;;;;N;;;;;
@@ -27958,6 +29265,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F6F1;ONCOMING FIRE ENGINE;So;0;ON;;;;;N;;;;;
 1F6F2;DIESEL LOCOMOTIVE;So;0;ON;;;;;N;;;;;
 1F6F3;PASSENGER SHIP;So;0;ON;;;;;N;;;;;
+1F6F4;SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F5;MOTOR SCOOTER;So;0;ON;;;;;N;;;;;
+1F6F6;CANOE;So;0;ON;;;;;N;;;;;
 1F700;ALCHEMICAL SYMBOL FOR QUINTESSENCE;So;0;ON;;;;;N;;;;;
 1F701;ALCHEMICAL SYMBOL FOR AIR;So;0;ON;;;;;N;;;;;
 1F702;ALCHEMICAL SYMBOL FOR FIRE;So;0;ON;;;;;N;;;;;
@@ -28316,11 +29626,78 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F916;ROBOT FACE;So;0;ON;;;;;N;;;;;
 1F917;HUGGING FACE;So;0;ON;;;;;N;;;;;
 1F918;SIGN OF THE HORNS;So;0;ON;;;;;N;;;;;
+1F919;CALL ME HAND;So;0;ON;;;;;N;;;;;
+1F91A;RAISED BACK OF HAND;So;0;ON;;;;;N;;;;;
+1F91B;LEFT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91C;RIGHT-FACING FIST;So;0;ON;;;;;N;;;;;
+1F91D;HANDSHAKE;So;0;ON;;;;;N;;;;;
+1F91E;HAND WITH INDEX AND MIDDLE FINGERS CROSSED;So;0;ON;;;;;N;;;;;
+1F920;FACE WITH COWBOY HAT;So;0;ON;;;;;N;;;;;
+1F921;CLOWN FACE;So;0;ON;;;;;N;;;;;
+1F922;NAUSEATED FACE;So;0;ON;;;;;N;;;;;
+1F923;ROLLING ON THE FLOOR LAUGHING;So;0;ON;;;;;N;;;;;
+1F924;DROOLING FACE;So;0;ON;;;;;N;;;;;
+1F925;LYING FACE;So;0;ON;;;;;N;;;;;
+1F926;FACE PALM;So;0;ON;;;;;N;;;;;
+1F927;SNEEZING FACE;So;0;ON;;;;;N;;;;;
+1F930;PREGNANT WOMAN;So;0;ON;;;;;N;;;;;
+1F933;SELFIE;So;0;ON;;;;;N;;;;;
+1F934;PRINCE;So;0;ON;;;;;N;;;;;
+1F935;MAN IN TUXEDO;So;0;ON;;;;;N;;;;;
+1F936;MOTHER CHRISTMAS;So;0;ON;;;;;N;;;;;
+1F937;SHRUG;So;0;ON;;;;;N;;;;;
+1F938;PERSON DOING CARTWHEEL;So;0;ON;;;;;N;;;;;
+1F939;JUGGLING;So;0;ON;;;;;N;;;;;
+1F93A;FENCER;So;0;ON;;;;;N;;;;;
+1F93B;MODERN PENTATHLON;So;0;ON;;;;;N;;;;;
+1F93C;WRESTLERS;So;0;ON;;;;;N;;;;;
+1F93D;WATER POLO;So;0;ON;;;;;N;;;;;
+1F93E;HANDBALL;So;0;ON;;;;;N;;;;;
+1F940;WILTED FLOWER;So;0;ON;;;;;N;;;;;
+1F941;DRUM WITH DRUMSTICKS;So;0;ON;;;;;N;;;;;
+1F942;CLINKING GLASSES;So;0;ON;;;;;N;;;;;
+1F943;TUMBLER GLASS;So;0;ON;;;;;N;;;;;
+1F944;SPOON;So;0;ON;;;;;N;;;;;
+1F945;GOAL NET;So;0;ON;;;;;N;;;;;
+1F946;RIFLE;So;0;ON;;;;;N;;;;;
+1F947;FIRST PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F948;SECOND PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F949;THIRD PLACE MEDAL;So;0;ON;;;;;N;;;;;
+1F94A;BOXING GLOVE;So;0;ON;;;;;N;;;;;
+1F94B;MARTIAL ARTS UNIFORM;So;0;ON;;;;;N;;;;;
+1F950;CROISSANT;So;0;ON;;;;;N;;;;;
+1F951;AVOCADO;So;0;ON;;;;;N;;;;;
+1F952;CUCUMBER;So;0;ON;;;;;N;;;;;
+1F953;BACON;So;0;ON;;;;;N;;;;;
+1F954;POTATO;So;0;ON;;;;;N;;;;;
+1F955;CARROT;So;0;ON;;;;;N;;;;;
+1F956;BAGUETTE BREAD;So;0;ON;;;;;N;;;;;
+1F957;GREEN SALAD;So;0;ON;;;;;N;;;;;
+1F958;SHALLOW PAN OF FOOD;So;0;ON;;;;;N;;;;;
+1F959;STUFFED FLATBREAD;So;0;ON;;;;;N;;;;;
+1F95A;EGG;So;0;ON;;;;;N;;;;;
+1F95B;GLASS OF MILK;So;0;ON;;;;;N;;;;;
+1F95C;PEANUTS;So;0;ON;;;;;N;;;;;
+1F95D;KIWIFRUIT;So;0;ON;;;;;N;;;;;
+1F95E;PANCAKES;So;0;ON;;;;;N;;;;;
 1F980;CRAB;So;0;ON;;;;;N;;;;;
 1F981;LION FACE;So;0;ON;;;;;N;;;;;
 1F982;SCORPION;So;0;ON;;;;;N;;;;;
 1F983;TURKEY;So;0;ON;;;;;N;;;;;
 1F984;UNICORN FACE;So;0;ON;;;;;N;;;;;
+1F985;EAGLE;So;0;ON;;;;;N;;;;;
+1F986;DUCK;So;0;ON;;;;;N;;;;;
+1F987;BAT;So;0;ON;;;;;N;;;;;
+1F988;SHARK;So;0;ON;;;;;N;;;;;
+1F989;OWL;So;0;ON;;;;;N;;;;;
+1F98A;FOX FACE;So;0;ON;;;;;N;;;;;
+1F98B;BUTTERFLY;So;0;ON;;;;;N;;;;;
+1F98C;DEER;So;0;ON;;;;;N;;;;;
+1F98D;GORILLA;So;0;ON;;;;;N;;;;;
+1F98E;LIZARD;So;0;ON;;;;;N;;;;;
+1F98F;RHINOCEROS;So;0;ON;;;;;N;;;;;
+1F990;SHRIMP;So;0;ON;;;;;N;;;;;
+1F991;SQUID;So;0;ON;;;;;N;;;;;
 1F9C0;CHEESE WEDGE;So;0;ON;;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
diff --git a/unicode/emoji-data.txt b/unicode/emoji-data.txt
new file mode 100644
index 0000000000..731b62c4c1
--- /dev/null
+++ b/unicode/emoji-data.txt
@@ -0,0 +1,403 @@
+# emoji-data.txt
+# Date: 2016-06-02, 09:26:10 GMT
+# © 2016 Unicode®, Inc.
+# Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# Emoji Data for UTR #51
+# Version: 3.0
+#
+# For documentation and usage, see http://www.unicode.org/reports/tr51
+#
+# Warning: the format has changed from Version 1.0
+# Format: 
+# codepoint(s) ; property(=Yes) # version [count] name(s) 
+
+# ================================================
+
+# All omitted code points have Emoji=No 
+# @missing: 0000..10FFFF  ; Emoji ; No
+
+0023          ; Emoji                # 1.1  [1] (#)       NUMBER SIGN
+002A          ; Emoji                # 1.1  [1] (*)       ASTERISK
+0030..0039    ; Emoji                # 1.1 [10] (0..9)    DIGIT ZERO..DIGIT NINE
+00A9          ; Emoji                # 1.1  [1] (©)       COPYRIGHT SIGN
+00AE          ; Emoji                # 1.1  [1] (®)       REGISTERED SIGN
+203C          ; Emoji                # 1.1  [1] (‼)       DOUBLE EXCLAMATION MARK
+2049          ; Emoji                # 3.0  [1] (⁉)       EXCLAMATION QUESTION MARK
+2122          ; Emoji                # 1.1  [1] (™)       TRADE MARK SIGN
+2139          ; Emoji                # 3.0  [1] (ℹ)       INFORMATION SOURCE
+2194..2199    ; Emoji                # 1.1  [6] (↔..↙)    LEFT RIGHT ARROW..SOUTH WEST ARROW
+21A9..21AA    ; Emoji                # 1.1  [2] (↩..↪)    LEFTWARDS ARROW WITH HOOK..RIGHTWARDS ARROW WITH HOOK
+231A..231B    ; Emoji                # 1.1  [2] (⌚..⌛)    WATCH..HOURGLASS
+2328          ; Emoji                # 1.1  [1] (⌨)       KEYBOARD
+23CF          ; Emoji                # 4.0  [1] (⏏)       EJECT SYMBOL
+23E9..23F3    ; Emoji                # 6.0 [11] (⏩..⏳)    BLACK RIGHT-POINTING DOUBLE TRIANGLE..HOURGLASS WITH FLOWING SAND
+23F8..23FA    ; Emoji                # 7.0  [3] (⏸..⏺)    DOUBLE VERTICAL BAR..BLACK CIRCLE FOR RECORD
+24C2          ; Emoji                # 1.1  [1] (Ⓜ)       CIRCLED LATIN CAPITAL LETTER M
+25AA..25AB    ; Emoji                # 1.1  [2] (▪..▫)    BLACK SMALL SQUARE..WHITE SMALL SQUARE
+25B6          ; Emoji                # 1.1  [1] (▶)       BLACK RIGHT-POINTING TRIANGLE
+25C0          ; Emoji                # 1.1  [1] (◀)       BLACK LEFT-POINTING TRIANGLE
+25FB..25FE    ; Emoji                # 3.2  [4] (◻..◾)    WHITE MEDIUM SQUARE..BLACK MEDIUM SMALL SQUARE
+2600..2604    ; Emoji                # 1.1  [5] (☀..☄)    BLACK SUN WITH RAYS..COMET
+260E          ; Emoji                # 1.1  [1] (☎)       BLACK TELEPHONE
+2611          ; Emoji                # 1.1  [1] (☑)       BALLOT BOX WITH CHECK
+2614..2615    ; Emoji                # 4.0  [2] (☔..☕)    UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
+2618          ; Emoji                # 4.1  [1] (☘)       SHAMROCK
+261D          ; Emoji                # 1.1  [1] (☝)       WHITE UP POINTING INDEX
+2620          ; Emoji                # 1.1  [1] (☠)       SKULL AND CROSSBONES
+2622..2623    ; Emoji                # 1.1  [2] (☢..☣)    RADIOACTIVE SIGN..BIOHAZARD SIGN
+2626          ; Emoji                # 1.1  [1] (☦)       ORTHODOX CROSS
+262A          ; Emoji                # 1.1  [1] (☪)       STAR AND CRESCENT
+262E..262F    ; Emoji                # 1.1  [2] (☮..☯)    PEACE SYMBOL..YIN YANG
+2638..263A    ; Emoji                # 1.1  [3] (☸..☺)    WHEEL OF DHARMA..WHITE SMILING FACE
+2648..2653    ; Emoji                # 1.1 [12] (♈..♓)    ARIES..PISCES
+2660          ; Emoji                # 1.1  [1] (♠)       BLACK SPADE SUIT
+2663          ; Emoji                # 1.1  [1] (♣)       BLACK CLUB SUIT
+2665..2666    ; Emoji                # 1.1  [2] (♥..♦)    BLACK HEART SUIT..BLACK DIAMOND SUIT
+2668          ; Emoji                # 1.1  [1] (♨)       HOT SPRINGS
+267B          ; Emoji                # 3.2  [1] (♻)       BLACK UNIVERSAL RECYCLING SYMBOL
+267F          ; Emoji                # 4.1  [1] (♿)       WHEELCHAIR SYMBOL
+2692..2694    ; Emoji                # 4.1  [3] (⚒..⚔)    HAMMER AND PICK..CROSSED SWORDS
+2696..2697    ; Emoji                # 4.1  [2] (⚖..⚗)    SCALES..ALEMBIC
+2699          ; Emoji                # 4.1  [1] (⚙)       GEAR
+269B..269C    ; Emoji                # 4.1  [2] (⚛..⚜)    ATOM SYMBOL..FLEUR-DE-LIS
+26A0..26A1    ; Emoji                # 4.0  [2] (⚠..⚡)    WARNING SIGN..HIGH VOLTAGE SIGN
+26AA..26AB    ; Emoji                # 4.1  [2] (⚪..⚫)    MEDIUM WHITE CIRCLE..MEDIUM BLACK CIRCLE
+26B0..26B1    ; Emoji                # 4.1  [2] (⚰..⚱)    COFFIN..FUNERAL URN
+26BD..26BE    ; Emoji                # 5.2  [2] (⚽..⚾)    SOCCER BALL..BASEBALL
+26C4..26C5    ; Emoji                # 5.2  [2] (⛄..⛅)    SNOWMAN WITHOUT SNOW..SUN BEHIND CLOUD
+26C8          ; Emoji                # 5.2  [1] (⛈)       THUNDER CLOUD AND RAIN
+26CE          ; Emoji                # 6.0  [1] (⛎)       OPHIUCHUS
+26CF          ; Emoji                # 5.2  [1] (⛏)       PICK
+26D1          ; Emoji                # 5.2  [1] (⛑)       HELMET WITH WHITE CROSS
+26D3..26D4    ; Emoji                # 5.2  [2] (⛓..⛔)    CHAINS..NO ENTRY
+26E9..26EA    ; Emoji                # 5.2  [2] (⛩..⛪)    SHINTO SHRINE..CHURCH
+26F0..26F5    ; Emoji                # 5.2  [6] (⛰..⛵)    MOUNTAIN..SAILBOAT
+26F7..26FA    ; Emoji                # 5.2  [4] (⛷..⛺)    SKIER..TENT
+26FD          ; Emoji                # 5.2  [1] (⛽)       FUEL PUMP
+2702          ; Emoji                # 1.1  [1] (✂)       BLACK SCISSORS
+2705          ; Emoji                # 6.0  [1] (✅)       WHITE HEAVY CHECK MARK
+2708..2709    ; Emoji                # 1.1  [2] (✈..✉)    AIRPLANE..ENVELOPE
+270A..270B    ; Emoji                # 6.0  [2] (✊..✋)    RAISED FIST..RAISED HAND
+270C..270D    ; Emoji                # 1.1  [2] (✌..✍)    VICTORY HAND..WRITING HAND
+270F          ; Emoji                # 1.1  [1] (✏)       PENCIL
+2712          ; Emoji                # 1.1  [1] (✒)       BLACK NIB
+2714          ; Emoji                # 1.1  [1] (✔)       HEAVY CHECK MARK
+2716          ; Emoji                # 1.1  [1] (✖)       HEAVY MULTIPLICATION X
+271D          ; Emoji                # 1.1  [1] (✝)       LATIN CROSS
+2721          ; Emoji                # 1.1  [1] (✡)       STAR OF DAVID
+2728          ; Emoji                # 6.0  [1] (✨)       SPARKLES
+2733..2734    ; Emoji                # 1.1  [2] (✳..✴)    EIGHT SPOKED ASTERISK..EIGHT POINTED BLACK STAR
+2744          ; Emoji                # 1.1  [1] (❄)       SNOWFLAKE
+2747          ; Emoji                # 1.1  [1] (❇)       SPARKLE
+274C          ; Emoji                # 6.0  [1] (❌)       CROSS MARK
+274E          ; Emoji                # 6.0  [1] (❎)       NEGATIVE SQUARED CROSS MARK
+2753..2755    ; Emoji                # 6.0  [3] (❓..❕)    BLACK QUESTION MARK ORNAMENT..WHITE EXCLAMATION MARK ORNAMENT
+2757          ; Emoji                # 5.2  [1] (❗)       HEAVY EXCLAMATION MARK SYMBOL
+2763..2764    ; Emoji                # 1.1  [2] (❣..❤)    HEAVY HEART EXCLAMATION MARK ORNAMENT..HEAVY BLACK HEART
+2795..2797    ; Emoji                # 6.0  [3] (➕..➗)    HEAVY PLUS SIGN..HEAVY DIVISION SIGN
+27A1          ; Emoji                # 1.1  [1] (➡)       BLACK RIGHTWARDS ARROW
+27B0          ; Emoji                # 6.0  [1] (➰)       CURLY LOOP
+27BF          ; Emoji                # 6.0  [1] (➿)       DOUBLE CURLY LOOP
+2934..2935    ; Emoji                # 3.2  [2] (⤴..⤵)    ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS..ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
+2B05..2B07    ; Emoji                # 4.0  [3] (⬅..⬇)    LEFTWARDS BLACK ARROW..DOWNWARDS BLACK ARROW
+2B1B..2B1C    ; Emoji                # 5.1  [2] (⬛..⬜)    BLACK LARGE SQUARE..WHITE LARGE SQUARE
+2B50          ; Emoji                # 5.1  [1] (⭐)       WHITE MEDIUM STAR
+2B55          ; Emoji                # 5.2  [1] (⭕)       HEAVY LARGE CIRCLE
+3030          ; Emoji                # 1.1  [1] (〰)       WAVY DASH
+303D          ; Emoji                # 3.2  [1] (〽)       PART ALTERNATION MARK
+3297          ; Emoji                # 1.1  [1] (㊗)       CIRCLED IDEOGRAPH CONGRATULATION
+3299          ; Emoji                # 1.1  [1] (㊙)       CIRCLED IDEOGRAPH SECRET
+1F004         ; Emoji                # 5.1  [1] (🀄)       MAHJONG TILE RED DRAGON
+1F0CF         ; Emoji                # 6.0  [1] (🃏)       PLAYING CARD BLACK JOKER
+1F170..1F171  ; Emoji                # 6.0  [2] (🅰..🅱)    NEGATIVE SQUARED LATIN CAPITAL LETTER A..NEGATIVE SQUARED LATIN CAPITAL LETTER B
+1F17E         ; Emoji                # 6.0  [1] (🅾)       NEGATIVE SQUARED LATIN CAPITAL LETTER O
+1F17F         ; Emoji                # 5.2  [1] (🅿)       NEGATIVE SQUARED LATIN CAPITAL LETTER P
+1F18E         ; Emoji                # 6.0  [1] (🆎)       NEGATIVE SQUARED AB
+1F191..1F19A  ; Emoji                # 6.0 [10] (🆑..🆚)    SQUARED CL..SQUARED VS
+1F1E6..1F1FF  ; Emoji                # 6.0 [26] (🇦..🇿)    REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
+1F201..1F202  ; Emoji                # 6.0  [2] (🈁..🈂)    SQUARED KATAKANA KOKO..SQUARED KATAKANA SA
+1F21A         ; Emoji                # 5.2  [1] (🈚)       SQUARED CJK UNIFIED IDEOGRAPH-7121
+1F22F         ; Emoji                # 5.2  [1] (🈯)       SQUARED CJK UNIFIED IDEOGRAPH-6307
+1F232..1F23A  ; Emoji                # 6.0  [9] (🈲..🈺)    SQUARED CJK UNIFIED IDEOGRAPH-7981..SQUARED CJK UNIFIED IDEOGRAPH-55B6
+1F250..1F251  ; Emoji                # 6.0  [2] (🉐..🉑)    CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT
+1F300..1F320  ; Emoji                # 6.0 [33] (🌀..🌠)    CYCLONE..SHOOTING STAR
+1F321         ; Emoji                # 7.0  [1] (🌡)       THERMOMETER
+1F324..1F32C  ; Emoji                # 7.0  [9] (🌤..🌬)    WHITE SUN WITH SMALL CLOUD..WIND BLOWING FACE
+1F32D..1F32F  ; Emoji                # 8.0  [3] (🌭..🌯)    HOT DOG..BURRITO
+1F330..1F335  ; Emoji                # 6.0  [6] (🌰..🌵)    CHESTNUT..CACTUS
+1F336         ; Emoji                # 7.0  [1] (🌶)       HOT PEPPER
+1F337..1F37C  ; Emoji                # 6.0 [70] (🌷..🍼)    TULIP..BABY BOTTLE
+1F37D         ; Emoji                # 7.0  [1] (🍽)       FORK AND KNIFE WITH PLATE
+1F37E..1F37F  ; Emoji                # 8.0  [2] (🍾..🍿)    BOTTLE WITH POPPING CORK..POPCORN
+1F380..1F393  ; Emoji                # 6.0 [20] (🎀..🎓)    RIBBON..GRADUATION CAP
+1F396..1F397  ; Emoji                # 7.0  [2] (🎖..🎗)    MILITARY MEDAL..REMINDER RIBBON
+1F399..1F39B  ; Emoji                # 7.0  [3] (🎙..🎛)    STUDIO MICROPHONE..CONTROL KNOBS
+1F39E..1F39F  ; Emoji                # 7.0  [2] (🎞..🎟)    FILM FRAMES..ADMISSION TICKETS
+1F3A0..1F3C4  ; Emoji                # 6.0 [37] (🎠..🏄)    CAROUSEL HORSE..SURFER
+1F3C5         ; Emoji                # 7.0  [1] (🏅)       SPORTS MEDAL
+1F3C6..1F3CA  ; Emoji                # 6.0  [5] (🏆..🏊)    TROPHY..SWIMMER
+1F3CB..1F3CE  ; Emoji                # 7.0  [4] (🏋..🏎)    WEIGHT LIFTER..RACING CAR
+1F3CF..1F3D3  ; Emoji                # 8.0  [5] (🏏..🏓)    CRICKET BAT AND BALL..TABLE TENNIS PADDLE AND BALL
+1F3D4..1F3DF  ; Emoji                # 7.0 [12] (🏔..🏟)    SNOW CAPPED MOUNTAIN..STADIUM
+1F3E0..1F3F0  ; Emoji                # 6.0 [17] (🏠..🏰)    HOUSE BUILDING..EUROPEAN CASTLE
+1F3F3..1F3F5  ; Emoji                # 7.0  [3] (🏳..🏵)    WAVING WHITE FLAG..ROSETTE
+1F3F7         ; Emoji                # 7.0  [1] (🏷)       LABEL
+1F3F8..1F3FF  ; Emoji                # 8.0  [8] (🏸..🏿)    BADMINTON RACQUET AND SHUTTLECOCK..EMOJI MODIFIER FITZPATRICK TYPE-6
+1F400..1F43E  ; Emoji                # 6.0 [63] (🐀..🐾)    RAT..PAW PRINTS
+1F43F         ; Emoji                # 7.0  [1] (🐿)       CHIPMUNK
+1F440         ; Emoji                # 6.0  [1] (👀)       EYES
+1F441         ; Emoji                # 7.0  [1] (👁)       EYE
+1F442..1F4F7  ; Emoji                # 6.0[182] (👂..📷)    EAR..CAMERA
+1F4F8         ; Emoji                # 7.0  [1] (📸)       CAMERA WITH FLASH
+1F4F9..1F4FC  ; Emoji                # 6.0  [4] (📹..📼)    VIDEO CAMERA..VIDEOCASSETTE
+1F4FD         ; Emoji                # 7.0  [1] (📽)       FILM PROJECTOR
+1F4FF         ; Emoji                # 8.0  [1] (📿)       PRAYER BEADS
+1F500..1F53D  ; Emoji                # 6.0 [62] (🔀..🔽)    TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE
+1F549..1F54A  ; Emoji                # 7.0  [2] (🕉..🕊)    OM SYMBOL..DOVE OF PEACE
+1F54B..1F54E  ; Emoji                # 8.0  [4] (🕋..🕎)    KAABA..MENORAH WITH NINE BRANCHES
+1F550..1F567  ; Emoji                # 6.0 [24] (🕐..🕧)    CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
+1F56F..1F570  ; Emoji                # 7.0  [2] (🕯..🕰)    CANDLE..MANTELPIECE CLOCK
+1F573..1F579  ; Emoji                # 7.0  [7] (🕳..🕹)    HOLE..JOYSTICK
+1F57A         ; Emoji                # 9.0  [1] (🕺)       MAN DANCING
+1F587         ; Emoji                # 7.0  [1] (🖇)       LINKED PAPERCLIPS
+1F58A..1F58D  ; Emoji                # 7.0  [4] (🖊..🖍)    LOWER LEFT BALLPOINT PEN..LOWER LEFT CRAYON
+1F590         ; Emoji                # 7.0  [1] (🖐)       RAISED HAND WITH FINGERS SPLAYED
+1F595..1F596  ; Emoji                # 7.0  [2] (🖕..🖖)    REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+1F5A4         ; Emoji                # 9.0  [1] (🖤)       BLACK HEART
+1F5A5         ; Emoji                # 7.0  [1] (🖥)       DESKTOP COMPUTER
+1F5A8         ; Emoji                # 7.0  [1] (🖨)       PRINTER
+1F5B1..1F5B2  ; Emoji                # 7.0  [2] (🖱..🖲)    THREE BUTTON MOUSE..TRACKBALL
+1F5BC         ; Emoji                # 7.0  [1] (🖼)       FRAME WITH PICTURE
+1F5C2..1F5C4  ; Emoji                # 7.0  [3] (🗂..🗄)    CARD INDEX DIVIDERS..FILE CABINET
+1F5D1..1F5D3  ; Emoji                # 7.0  [3] (🗑..🗓)    WASTEBASKET..SPIRAL CALENDAR PAD
+1F5DC..1F5DE  ; Emoji                # 7.0  [3] (🗜..🗞)    COMPRESSION..ROLLED-UP NEWSPAPER
+1F5E1         ; Emoji                # 7.0  [1] (🗡)       DAGGER KNIFE
+1F5E3         ; Emoji                # 7.0  [1] (🗣)       SPEAKING HEAD IN SILHOUETTE
+1F5E8         ; Emoji                # 7.0  [1] (🗨)       LEFT SPEECH BUBBLE
+1F5EF         ; Emoji                # 7.0  [1] (🗯)       RIGHT ANGER BUBBLE
+1F5F3         ; Emoji                # 7.0  [1] (🗳)       BALLOT BOX WITH BALLOT
+1F5FA         ; Emoji                # 7.0  [1] (🗺)       WORLD MAP
+1F5FB..1F5FF  ; Emoji                # 6.0  [5] (🗻..🗿)    MOUNT FUJI..MOYAI
+1F600         ; Emoji                # 6.1  [1] (😀)       GRINNING FACE
+1F601..1F610  ; Emoji                # 6.0 [16] (😁..😐)    GRINNING FACE WITH SMILING EYES..NEUTRAL FACE
+1F611         ; Emoji                # 6.1  [1] (😑)       EXPRESSIONLESS FACE
+1F612..1F614  ; Emoji                # 6.0  [3] (😒..😔)    UNAMUSED FACE..PENSIVE FACE
+1F615         ; Emoji                # 6.1  [1] (😕)       CONFUSED FACE
+1F616         ; Emoji                # 6.0  [1] (😖)       CONFOUNDED FACE
+1F617         ; Emoji                # 6.1  [1] (😗)       KISSING FACE
+1F618         ; Emoji                # 6.0  [1] (😘)       FACE THROWING A KISS
+1F619         ; Emoji                # 6.1  [1] (😙)       KISSING FACE WITH SMILING EYES
+1F61A         ; Emoji                # 6.0  [1] (😚)       KISSING FACE WITH CLOSED EYES
+1F61B         ; Emoji                # 6.1  [1] (😛)       FACE WITH STUCK-OUT TONGUE
+1F61C..1F61E  ; Emoji                # 6.0  [3] (😜..😞)    FACE WITH STUCK-OUT TONGUE AND WINKING EYE..DISAPPOINTED FACE
+1F61F         ; Emoji                # 6.1  [1] (😟)       WORRIED FACE
+1F620..1F625  ; Emoji                # 6.0  [6] (😠..😥)    ANGRY FACE..DISAPPOINTED BUT RELIEVED FACE
+1F626..1F627  ; Emoji                # 6.1  [2] (😦..😧)    FROWNING FACE WITH OPEN MOUTH..ANGUISHED FACE
+1F628..1F62B  ; Emoji                # 6.0  [4] (😨..😫)    FEARFUL FACE..TIRED FACE
+1F62C         ; Emoji                # 6.1  [1] (😬)       GRIMACING FACE
+1F62D         ; Emoji                # 6.0  [1] (😭)       LOUDLY CRYING FACE
+1F62E..1F62F  ; Emoji                # 6.1  [2] (😮..😯)    FACE WITH OPEN MOUTH..HUSHED FACE
+1F630..1F633  ; Emoji                # 6.0  [4] (😰..😳)    FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE
+1F634         ; Emoji                # 6.1  [1] (😴)       SLEEPING FACE
+1F635..1F640  ; Emoji                # 6.0 [12] (😵..🙀)    DIZZY FACE..WEARY CAT FACE
+1F641..1F642  ; Emoji                # 7.0  [2] (🙁..🙂)    SLIGHTLY FROWNING FACE..SLIGHTLY SMILING FACE
+1F643..1F644  ; Emoji                # 8.0  [2] (🙃..🙄)    UPSIDE-DOWN FACE..FACE WITH ROLLING EYES
+1F645..1F64F  ; Emoji                # 6.0 [11] (🙅..🙏)    FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS
+1F680..1F6C5  ; Emoji                # 6.0 [70] (🚀..🛅)    ROCKET..LEFT LUGGAGE
+1F6CB..1F6CF  ; Emoji                # 7.0  [5] (🛋..🛏)    COUCH AND LAMP..BED
+1F6D0         ; Emoji                # 8.0  [1] (🛐)       PLACE OF WORSHIP
+1F6D1..1F6D2  ; Emoji                # 9.0  [2] (🛑..🛒)    OCTAGONAL SIGN..SHOPPING TROLLEY
+1F6E0..1F6E5  ; Emoji                # 7.0  [6] (🛠..🛥)    HAMMER AND WRENCH..MOTOR BOAT
+1F6E9         ; Emoji                # 7.0  [1] (🛩)       SMALL AIRPLANE
+1F6EB..1F6EC  ; Emoji                # 7.0  [2] (🛫..🛬)    AIRPLANE DEPARTURE..AIRPLANE ARRIVING
+1F6F0         ; Emoji                # 7.0  [1] (🛰)       SATELLITE
+1F6F3         ; Emoji                # 7.0  [1] (🛳)       PASSENGER SHIP
+1F6F4..1F6F6  ; Emoji                # 9.0  [3] (🛴..🛶)    SCOOTER..CANOE
+1F910..1F918  ; Emoji                # 8.0  [9] (🤐..🤘)    ZIPPER-MOUTH FACE..SIGN OF THE HORNS
+1F919..1F91E  ; Emoji                # 9.0  [6] (🤙..🤞)    CALL ME HAND..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F920..1F927  ; Emoji                # 9.0  [8] (🤠..🤧)    FACE WITH COWBOY HAT..SNEEZING FACE
+1F930         ; Emoji                # 9.0  [1] (🤰)       PREGNANT WOMAN
+1F933..1F93A  ; Emoji                # 9.0  [8] (🤳..🤺)    SELFIE..FENCER
+1F93C..1F93E  ; Emoji                # 9.0  [3] (🤼..🤾)    WRESTLERS..HANDBALL
+1F940..1F945  ; Emoji                # 9.0  [6] (🥀..🥅)    WILTED FLOWER..GOAL NET
+1F947..1F94B  ; Emoji                # 9.0  [5] (🥇..🥋)    FIRST PLACE MEDAL..MARTIAL ARTS UNIFORM
+1F950..1F95E  ; Emoji                # 9.0 [15] (🥐..🥞)    CROISSANT..PANCAKES
+1F980..1F984  ; Emoji                # 8.0  [5] (🦀..🦄)    CRAB..UNICORN FACE
+1F985..1F991  ; Emoji                # 9.0 [13] (🦅..🦑)    EAGLE..SQUID
+1F9C0         ; Emoji                # 8.0  [1] (🧀)       CHEESE WEDGE
+
+# Total elements: 1123
+
+# ================================================
+
+# All omitted code points have Emoji_Presentation=No 
+# @missing: 0000..10FFFF  ; Emoji_Presentation ; No
+
+231A..231B    ; Emoji_Presentation   # 1.1  [2] (⌚..⌛)    WATCH..HOURGLASS
+23E9..23EC    ; Emoji_Presentation   # 6.0  [4] (⏩..⏬)    BLACK RIGHT-POINTING DOUBLE TRIANGLE..BLACK DOWN-POINTING DOUBLE TRIANGLE
+23F0          ; Emoji_Presentation   # 6.0  [1] (⏰)       ALARM CLOCK
+23F3          ; Emoji_Presentation   # 6.0  [1] (⏳)       HOURGLASS WITH FLOWING SAND
+25FD..25FE    ; Emoji_Presentation   # 3.2  [2] (◽..◾)    WHITE MEDIUM SMALL SQUARE..BLACK MEDIUM SMALL SQUARE
+2614..2615    ; Emoji_Presentation   # 4.0  [2] (☔..☕)    UMBRELLA WITH RAIN DROPS..HOT BEVERAGE
+2648..2653    ; Emoji_Presentation   # 1.1 [12] (♈..♓)    ARIES..PISCES
+267F          ; Emoji_Presentation   # 4.1  [1] (♿)       WHEELCHAIR SYMBOL
+2693          ; Emoji_Presentation   # 4.1  [1] (⚓)       ANCHOR
+26A1          ; Emoji_Presentation   # 4.0  [1] (⚡)       HIGH VOLTAGE SIGN
+26AA..26AB    ; Emoji_Presentation   # 4.1  [2] (⚪..⚫)    MEDIUM WHITE CIRCLE..MEDIUM BLACK CIRCLE
+26BD..26BE    ; Emoji_Presentation   # 5.2  [2] (⚽..⚾)    SOCCER BALL..BASEBALL
+26C4..26C5    ; Emoji_Presentation   # 5.2  [2] (⛄..⛅)    SNOWMAN WITHOUT SNOW..SUN BEHIND CLOUD
+26CE          ; Emoji_Presentation   # 6.0  [1] (⛎)       OPHIUCHUS
+26D4          ; Emoji_Presentation   # 5.2  [1] (⛔)       NO ENTRY
+26EA          ; Emoji_Presentation   # 5.2  [1] (⛪)       CHURCH
+26F2..26F3    ; Emoji_Presentation   # 5.2  [2] (⛲..⛳)    FOUNTAIN..FLAG IN HOLE
+26F5          ; Emoji_Presentation   # 5.2  [1] (⛵)       SAILBOAT
+26FA          ; Emoji_Presentation   # 5.2  [1] (⛺)       TENT
+26FD          ; Emoji_Presentation   # 5.2  [1] (⛽)       FUEL PUMP
+2705          ; Emoji_Presentation   # 6.0  [1] (✅)       WHITE HEAVY CHECK MARK
+270A..270B    ; Emoji_Presentation   # 6.0  [2] (✊..✋)    RAISED FIST..RAISED HAND
+2728          ; Emoji_Presentation   # 6.0  [1] (✨)       SPARKLES
+274C          ; Emoji_Presentation   # 6.0  [1] (❌)       CROSS MARK
+274E          ; Emoji_Presentation   # 6.0  [1] (❎)       NEGATIVE SQUARED CROSS MARK
+2753..2755    ; Emoji_Presentation   # 6.0  [3] (❓..❕)    BLACK QUESTION MARK ORNAMENT..WHITE EXCLAMATION MARK ORNAMENT
+2757          ; Emoji_Presentation   # 5.2  [1] (❗)       HEAVY EXCLAMATION MARK SYMBOL
+2795..2797    ; Emoji_Presentation   # 6.0  [3] (➕..➗)    HEAVY PLUS SIGN..HEAVY DIVISION SIGN
+27B0          ; Emoji_Presentation   # 6.0  [1] (➰)       CURLY LOOP
+27BF          ; Emoji_Presentation   # 6.0  [1] (➿)       DOUBLE CURLY LOOP
+2B1B..2B1C    ; Emoji_Presentation   # 5.1  [2] (⬛..⬜)    BLACK LARGE SQUARE..WHITE LARGE SQUARE
+2B50          ; Emoji_Presentation   # 5.1  [1] (⭐)       WHITE MEDIUM STAR
+2B55          ; Emoji_Presentation   # 5.2  [1] (⭕)       HEAVY LARGE CIRCLE
+1F004         ; Emoji_Presentation   # 5.1  [1] (🀄)       MAHJONG TILE RED DRAGON
+1F0CF         ; Emoji_Presentation   # 6.0  [1] (🃏)       PLAYING CARD BLACK JOKER
+1F18E         ; Emoji_Presentation   # 6.0  [1] (🆎)       NEGATIVE SQUARED AB
+1F191..1F19A  ; Emoji_Presentation   # 6.0 [10] (🆑..🆚)    SQUARED CL..SQUARED VS
+1F1E6..1F1FF  ; Emoji_Presentation   # 6.0 [26] (🇦..🇿)    REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
+1F201         ; Emoji_Presentation   # 6.0  [1] (🈁)       SQUARED KATAKANA KOKO
+1F21A         ; Emoji_Presentation   # 5.2  [1] (🈚)       SQUARED CJK UNIFIED IDEOGRAPH-7121
+1F22F         ; Emoji_Presentation   # 5.2  [1] (🈯)       SQUARED CJK UNIFIED IDEOGRAPH-6307
+1F232..1F236  ; Emoji_Presentation   # 6.0  [5] (🈲..🈶)    SQUARED CJK UNIFIED IDEOGRAPH-7981..SQUARED CJK UNIFIED IDEOGRAPH-6709
+1F238..1F23A  ; Emoji_Presentation   # 6.0  [3] (🈸..🈺)    SQUARED CJK UNIFIED IDEOGRAPH-7533..SQUARED CJK UNIFIED IDEOGRAPH-55B6
+1F250..1F251  ; Emoji_Presentation   # 6.0  [2] (🉐..🉑)    CIRCLED IDEOGRAPH ADVANTAGE..CIRCLED IDEOGRAPH ACCEPT
+1F300..1F320  ; Emoji_Presentation   # 6.0 [33] (🌀..🌠)    CYCLONE..SHOOTING STAR
+1F32D..1F32F  ; Emoji_Presentation   # 8.0  [3] (🌭..🌯)    HOT DOG..BURRITO
+1F330..1F335  ; Emoji_Presentation   # 6.0  [6] (🌰..🌵)    CHESTNUT..CACTUS
+1F337..1F37C  ; Emoji_Presentation   # 6.0 [70] (🌷..🍼)    TULIP..BABY BOTTLE
+1F37E..1F37F  ; Emoji_Presentation   # 8.0  [2] (🍾..🍿)    BOTTLE WITH POPPING CORK..POPCORN
+1F380..1F393  ; Emoji_Presentation   # 6.0 [20] (🎀..🎓)    RIBBON..GRADUATION CAP
+1F3A0..1F3C4  ; Emoji_Presentation   # 6.0 [37] (🎠..🏄)    CAROUSEL HORSE..SURFER
+1F3C5         ; Emoji_Presentation   # 7.0  [1] (🏅)       SPORTS MEDAL
+1F3C6..1F3CA  ; Emoji_Presentation   # 6.0  [5] (🏆..🏊)    TROPHY..SWIMMER
+1F3CF..1F3D3  ; Emoji_Presentation   # 8.0  [5] (🏏..🏓)    CRICKET BAT AND BALL..TABLE TENNIS PADDLE AND BALL
+1F3E0..1F3F0  ; Emoji_Presentation   # 6.0 [17] (🏠..🏰)    HOUSE BUILDING..EUROPEAN CASTLE
+1F3F4         ; Emoji_Presentation   # 7.0  [1] (🏴)       WAVING BLACK FLAG
+1F3F8..1F3FF  ; Emoji_Presentation   # 8.0  [8] (🏸..🏿)    BADMINTON RACQUET AND SHUTTLECOCK..EMOJI MODIFIER FITZPATRICK TYPE-6
+1F400..1F43E  ; Emoji_Presentation   # 6.0 [63] (🐀..🐾)    RAT..PAW PRINTS
+1F440         ; Emoji_Presentation   # 6.0  [1] (👀)       EYES
+1F442..1F4F7  ; Emoji_Presentation   # 6.0[182] (👂..📷)    EAR..CAMERA
+1F4F8         ; Emoji_Presentation   # 7.0  [1] (📸)       CAMERA WITH FLASH
+1F4F9..1F4FC  ; Emoji_Presentation   # 6.0  [4] (📹..📼)    VIDEO CAMERA..VIDEOCASSETTE
+1F4FF         ; Emoji_Presentation   # 8.0  [1] (📿)       PRAYER BEADS
+1F500..1F53D  ; Emoji_Presentation   # 6.0 [62] (🔀..🔽)    TWISTED RIGHTWARDS ARROWS..DOWN-POINTING SMALL RED TRIANGLE
+1F54B..1F54E  ; Emoji_Presentation   # 8.0  [4] (🕋..🕎)    KAABA..MENORAH WITH NINE BRANCHES
+1F550..1F567  ; Emoji_Presentation   # 6.0 [24] (🕐..🕧)    CLOCK FACE ONE OCLOCK..CLOCK FACE TWELVE-THIRTY
+1F57A         ; Emoji_Presentation   # 9.0  [1] (🕺)       MAN DANCING
+1F595..1F596  ; Emoji_Presentation   # 7.0  [2] (🖕..🖖)    REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+1F5A4         ; Emoji_Presentation   # 9.0  [1] (🖤)       BLACK HEART
+1F5FB..1F5FF  ; Emoji_Presentation   # 6.0  [5] (🗻..🗿)    MOUNT FUJI..MOYAI
+1F600         ; Emoji_Presentation   # 6.1  [1] (😀)       GRINNING FACE
+1F601..1F610  ; Emoji_Presentation   # 6.0 [16] (😁..😐)    GRINNING FACE WITH SMILING EYES..NEUTRAL FACE
+1F611         ; Emoji_Presentation   # 6.1  [1] (😑)       EXPRESSIONLESS FACE
+1F612..1F614  ; Emoji_Presentation   # 6.0  [3] (😒..😔)    UNAMUSED FACE..PENSIVE FACE
+1F615         ; Emoji_Presentation   # 6.1  [1] (😕)       CONFUSED FACE
+1F616         ; Emoji_Presentation   # 6.0  [1] (😖)       CONFOUNDED FACE
+1F617         ; Emoji_Presentation   # 6.1  [1] (😗)       KISSING FACE
+1F618         ; Emoji_Presentation   # 6.0  [1] (😘)       FACE THROWING A KISS
+1F619         ; Emoji_Presentation   # 6.1  [1] (😙)       KISSING FACE WITH SMILING EYES
+1F61A         ; Emoji_Presentation   # 6.0  [1] (😚)       KISSING FACE WITH CLOSED EYES
+1F61B         ; Emoji_Presentation   # 6.1  [1] (😛)       FACE WITH STUCK-OUT TONGUE
+1F61C..1F61E  ; Emoji_Presentation   # 6.0  [3] (😜..😞)    FACE WITH STUCK-OUT TONGUE AND WINKING EYE..DISAPPOINTED FACE
+1F61F         ; Emoji_Presentation   # 6.1  [1] (😟)       WORRIED FACE
+1F620..1F625  ; Emoji_Presentation   # 6.0  [6] (😠..😥)    ANGRY FACE..DISAPPOINTED BUT RELIEVED FACE
+1F626..1F627  ; Emoji_Presentation   # 6.1  [2] (😦..😧)    FROWNING FACE WITH OPEN MOUTH..ANGUISHED FACE
+1F628..1F62B  ; Emoji_Presentation   # 6.0  [4] (😨..😫)    FEARFUL FACE..TIRED FACE
+1F62C         ; Emoji_Presentation   # 6.1  [1] (😬)       GRIMACING FACE
+1F62D         ; Emoji_Presentation   # 6.0  [1] (😭)       LOUDLY CRYING FACE
+1F62E..1F62F  ; Emoji_Presentation   # 6.1  [2] (😮..😯)    FACE WITH OPEN MOUTH..HUSHED FACE
+1F630..1F633  ; Emoji_Presentation   # 6.0  [4] (😰..😳)    FACE WITH OPEN MOUTH AND COLD SWEAT..FLUSHED FACE
+1F634         ; Emoji_Presentation   # 6.1  [1] (😴)       SLEEPING FACE
+1F635..1F640  ; Emoji_Presentation   # 6.0 [12] (😵..🙀)    DIZZY FACE..WEARY CAT FACE
+1F641..1F642  ; Emoji_Presentation   # 7.0  [2] (🙁..🙂)    SLIGHTLY FROWNING FACE..SLIGHTLY SMILING FACE
+1F643..1F644  ; Emoji_Presentation   # 8.0  [2] (🙃..🙄)    UPSIDE-DOWN FACE..FACE WITH ROLLING EYES
+1F645..1F64F  ; Emoji_Presentation   # 6.0 [11] (🙅..🙏)    FACE WITH NO GOOD GESTURE..PERSON WITH FOLDED HANDS
+1F680..1F6C5  ; Emoji_Presentation   # 6.0 [70] (🚀..🛅)    ROCKET..LEFT LUGGAGE
+1F6CC         ; Emoji_Presentation   # 7.0  [1] (🛌)       SLEEPING ACCOMMODATION
+1F6D0         ; Emoji_Presentation   # 8.0  [1] (🛐)       PLACE OF WORSHIP
+1F6D1..1F6D2  ; Emoji_Presentation   # 9.0  [2] (🛑..🛒)    OCTAGONAL SIGN..SHOPPING TROLLEY
+1F6EB..1F6EC  ; Emoji_Presentation   # 7.0  [2] (🛫..🛬)    AIRPLANE DEPARTURE..AIRPLANE ARRIVING
+1F6F4..1F6F6  ; Emoji_Presentation   # 9.0  [3] (🛴..🛶)    SCOOTER..CANOE
+1F910..1F918  ; Emoji_Presentation   # 8.0  [9] (🤐..🤘)    ZIPPER-MOUTH FACE..SIGN OF THE HORNS
+1F919..1F91E  ; Emoji_Presentation   # 9.0  [6] (🤙..🤞)    CALL ME HAND..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F920..1F927  ; Emoji_Presentation   # 9.0  [8] (🤠..🤧)    FACE WITH COWBOY HAT..SNEEZING FACE
+1F930         ; Emoji_Presentation   # 9.0  [1] (🤰)       PREGNANT WOMAN
+1F933..1F93A  ; Emoji_Presentation   # 9.0  [8] (🤳..🤺)    SELFIE..FENCER
+1F93C..1F93E  ; Emoji_Presentation   # 9.0  [3] (🤼..🤾)    WRESTLERS..HANDBALL
+1F940..1F945  ; Emoji_Presentation   # 9.0  [6] (🥀..🥅)    WILTED FLOWER..GOAL NET
+1F947..1F94B  ; Emoji_Presentation   # 9.0  [5] (🥇..🥋)    FIRST PLACE MEDAL..MARTIAL ARTS UNIFORM
+1F950..1F95E  ; Emoji_Presentation   # 9.0 [15] (🥐..🥞)    CROISSANT..PANCAKES
+1F980..1F984  ; Emoji_Presentation   # 8.0  [5] (🦀..🦄)    CRAB..UNICORN FACE
+1F985..1F991  ; Emoji_Presentation   # 9.0 [13] (🦅..🦑)    EAGLE..SQUID
+1F9C0         ; Emoji_Presentation   # 8.0  [1] (🧀)       CHEESE WEDGE
+
+# Total elements: 910
+
+# ================================================
+
+# All omitted code points have Emoji_Modifier=No 
+# @missing: 0000..10FFFF  ; Emoji_Modifier ; No
+
+1F3FB..1F3FF  ; Emoji_Modifier       # 8.0  [5] (🏻..🏿)    EMOJI MODIFIER FITZPATRICK TYPE-1-2..EMOJI MODIFIER FITZPATRICK TYPE-6
+
+# Total elements: 5
+
+# ================================================
+
+# All omitted code points have Emoji_Modifier_Base=No 
+# @missing: 0000..10FFFF  ; Emoji_Modifier_Base ; No
+
+261D          ; Emoji_Modifier_Base  # 1.1  [1] (☝)       WHITE UP POINTING INDEX
+26F9          ; Emoji_Modifier_Base  # 5.2  [1] (⛹)       PERSON WITH BALL
+270A..270B    ; Emoji_Modifier_Base  # 6.0  [2] (✊..✋)    RAISED FIST..RAISED HAND
+270C..270D    ; Emoji_Modifier_Base  # 1.1  [2] (✌..✍)    VICTORY HAND..WRITING HAND
+1F385         ; Emoji_Modifier_Base  # 6.0  [1] (🎅)       FATHER CHRISTMAS
+1F3C3..1F3C4  ; Emoji_Modifier_Base  # 6.0  [2] (🏃..🏄)    RUNNER..SURFER
+1F3CA         ; Emoji_Modifier_Base  # 6.0  [1] (🏊)       SWIMMER
+1F3CB         ; Emoji_Modifier_Base  # 7.0  [1] (🏋)       WEIGHT LIFTER
+1F442..1F443  ; Emoji_Modifier_Base  # 6.0  [2] (👂..👃)    EAR..NOSE
+1F446..1F450  ; Emoji_Modifier_Base  # 6.0 [11] (👆..👐)    WHITE UP POINTING BACKHAND INDEX..OPEN HANDS SIGN
+1F466..1F469  ; Emoji_Modifier_Base  # 6.0  [4] (👦..👩)    BOY..WOMAN
+1F46E         ; Emoji_Modifier_Base  # 6.0  [1] (👮)       POLICE OFFICER
+1F470..1F478  ; Emoji_Modifier_Base  # 6.0  [9] (👰..👸)    BRIDE WITH VEIL..PRINCESS
+1F47C         ; Emoji_Modifier_Base  # 6.0  [1] (👼)       BABY ANGEL
+1F481..1F483  ; Emoji_Modifier_Base  # 6.0  [3] (💁..💃)    INFORMATION DESK PERSON..DANCER
+1F485..1F487  ; Emoji_Modifier_Base  # 6.0  [3] (💅..💇)    NAIL POLISH..HAIRCUT
+1F4AA         ; Emoji_Modifier_Base  # 6.0  [1] (💪)       FLEXED BICEPS
+1F575         ; Emoji_Modifier_Base  # 7.0  [1] (🕵)       SLEUTH OR SPY
+1F57A         ; Emoji_Modifier_Base  # 9.0  [1] (🕺)       MAN DANCING
+1F590         ; Emoji_Modifier_Base  # 7.0  [1] (🖐)       RAISED HAND WITH FINGERS SPLAYED
+1F595..1F596  ; Emoji_Modifier_Base  # 7.0  [2] (🖕..🖖)    REVERSED HAND WITH MIDDLE FINGER EXTENDED..RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS
+1F645..1F647  ; Emoji_Modifier_Base  # 6.0  [3] (🙅..🙇)    FACE WITH NO GOOD GESTURE..PERSON BOWING DEEPLY
+1F64B..1F64F  ; Emoji_Modifier_Base  # 6.0  [5] (🙋..🙏)    HAPPY PERSON RAISING ONE HAND..PERSON WITH FOLDED HANDS
+1F6A3         ; Emoji_Modifier_Base  # 6.0  [1] (🚣)       ROWBOAT
+1F6B4..1F6B6  ; Emoji_Modifier_Base  # 6.0  [3] (🚴..🚶)    BICYCLIST..PEDESTRIAN
+1F6C0         ; Emoji_Modifier_Base  # 6.0  [1] (🛀)       BATH
+1F918         ; Emoji_Modifier_Base  # 8.0  [1] (🤘)       SIGN OF THE HORNS
+1F919..1F91E  ; Emoji_Modifier_Base  # 9.0  [6] (🤙..🤞)    CALL ME HAND..HAND WITH INDEX AND MIDDLE FINGERS CROSSED
+1F926         ; Emoji_Modifier_Base  # 9.0  [1] (🤦)       FACE PALM
+1F930         ; Emoji_Modifier_Base  # 9.0  [1] (🤰)       PREGNANT WOMAN
+1F933..1F939  ; Emoji_Modifier_Base  # 9.0  [7] (🤳..🤹)    SELFIE..JUGGLING
+1F93C..1F93E  ; Emoji_Modifier_Base  # 9.0  [3] (🤼..🤾)    WRESTLERS..HANDBALL
+
+# Total elements: 83
+
+#EOF